*** empty log message ***

4740 files changed, 115687 insertions, 30805 deletions

diff --git a/app-admin/fpm/ChangeLog b/app-admin/fpm/ChangeLog
index 1c96ddead6b3..c4476ccacfb8 100644
--- a/app-admin/fpm/ChangeLog
+++ b/app-admin/fpm/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for app-admin/fpm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/ChangeLog,v 1.1 2003/12/06 00:38:03 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/ChangeLog,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> fpm-0.59.ebuild,
+  fpm-0.60.ebuild:
+  Masked fpm-0.60.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> fpm-0.59.ebuild:
+  Masked fpm-0.59.ebuild stable for ppc
+
+  23 Jul 2004; Travis Tilley <lv@gentoo.org> fpm-0.60.ebuild:
+  stable on amd64
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> fpm-0.60.ebuild:
+  Removed S=.
+
+  06 Mar 2004; Chuck Short <zul@gentoo.org> fpm-0.60.ebuild:
+  Marked stable for x86.
+
+*fpm-0.60 (29 Dec 2003)
+
+  29 Dec 2003; Chuck Short <zul@gentoo.org> fpm-0.60.ebuild:
+  Version bump.
+
+  29 Dec 2003; Chuck Short <zul@gentoo.org> fpm-0.59.ebuild:
+  Marked stable on x86.
+
+  08 Dec 2003; Chuck Short <zul@gentoo.org> fpm-0.59.ebuild:
+  Fixes cvs issue. Fixes #35207.
+  Ebuild improvements.
 
 *fpm-0.59 (05 Dec 2003)
 
diff --git a/app-admin/fpm/Manifest b/app-admin/fpm/Manifest
index c60b9a15b0bc..c0dd045ecc12 100644
--- a/app-admin/fpm/Manifest
+++ b/app-admin/fpm/Manifest
@@ -1,2 +1,6 @@
-MD5 a18a1da8955a44c712397596cecf7ded fpm-0.59.ebuild 676
+MD5 5ee3d1b3d82861ace123c968a58a61b9 ChangeLog 1138
+MD5 c08900d24b20570ec37f314e8b0b1cc1 fpm-0.59.ebuild 761
+MD5 55651ae73d0eac9547598ba4479d0b87 fpm-0.60.ebuild 737
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
 MD5 4e5cac87c0eedbc94af5c328b8dedd8b files/digest-fpm-0.59 60
+MD5 f91c5af118c5e3bf81ca6fd8a7249e92 files/digest-fpm-0.60 60
diff --git a/app-admin/fpm/fpm-0.59.ebuild b/app-admin/fpm/fpm-0.59.ebuild
index 3d9c62bd32ec..48f17a9d5ed4 100644
--- a/app-admin/fpm/fpm-0.59.ebuild
+++ b/app-admin/fpm/fpm-0.59.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.59.ebuild,v 1.1 2003/12/06 00:38:03 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.59.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
-DESCRIPTION="A password manager for gnome."
+DESCRIPTION="A password manager for gnome"
+HOMEPAGE="http://fpm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fpm/${P}.tar.gz"
-HOMEPAGE="http://fpm.sourceforge.net"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
 IUSE="nls"
 
-DEPEND="virtual/glibc
-		gnome-base/gnome-libs
-		>=dev-libs/libxml2-2.5.7-r2
-		x11-libs/gtk+
-		dev-libs/glib
-		nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S="${WORKDIR}/${P}"
+DEPEND="virtual/libc
+	gnome-base/gnome-libs
+	>=dev-libs/libxml2-2.5.7-r2
+	x11-libs/gtk+
+	dev-libs/glib
+	nls? ( sys-devel/gettext )"
+DEPEND="${DEPEND}
+	dev-util/cvs"
 
 src_compile() {
 	./autogen.sh --prefix=/usr \
-	./configure --prefix=/usr \
+	./configure --prefix=/usr
 	emake || die "Make failed"
 }
 
 src_install() {
-	make prefix=${D}/usr install
+	make prefix=${D}/usr install || die
 	dodoc NEWS README ChangeLog TODO
 }
diff --git a/app-admin/fpm/fpm-0.60.ebuild b/app-admin/fpm/fpm-0.60.ebuild
index bb2acda588f0..3e7944447dd2 100644
--- a/app-admin/fpm/fpm-0.60.ebuild
+++ b/app-admin/fpm/fpm-0.60.ebuild
@@ -1,26 +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/app-admin/fpm/fpm-0.60.ebuild,v 1.1 2003/12/30 01:05:57 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fpm/fpm-0.60.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
-DESCRIPTION="A password manager for gnome."
-SRC_URI="mirror://sourceforge/fpm/${P}.tar.gz"
+DESCRIPTION="A password manager for gnome"
 HOMEPAGE="http://fpm.sourceforge.net"
+SRC_URI="mirror://sourceforge/fpm/${P}.tar.gz"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc"
 IUSE="nls"
 
-DEPEND="virtual/glibc
-		gnome-base/gnome-libs
-		>=dev-libs/libxml2-2.5.7-r2
-		x11-libs/gtk+
-		dev-libs/glib
-		nls? ( sys-devel/gettext )"
+DEPEND="virtual/libc
+	gnome-base/gnome-libs
+	>=dev-libs/libxml2-2.5.7-r2
+	x11-libs/gtk+
+	dev-libs/glib
+	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}
-		dev-util/cvs"
-
-S="${WORKDIR}/${P}"
+	dev-util/cvs"
 
 src_compile() {
 	./configure --prefix=/usr
@@ -28,6 +26,6 @@ src_compile() {
 }
 
 src_install() {
-	make prefix=${D}/usr install
+	make prefix=${D}/usr install || die
 	dodoc NEWS README ChangeLog TODO
 }
diff --git a/app-admin/metadata.xml b/app-admin/metadata.xml
index 9c1f68037f83..585ebf4971cf 100644
--- a/app-admin/metadata.xml
+++ b/app-admin/metadata.xml
@@ -5,5 +5,27 @@
 		The app-admin category contains non-core applications which relate to
 		system administration.
 	</longdescription>
+	<longdescription lang="es">
+		La categoría app-admin contiene aplicaciones para la administración
+		del sistema.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-admin enthält Applikationen zur Systemadministration,
+		die nicht Bestandteil des Basissystems sind.
+	</longdescription>
+	<longdescription lang="ja">
+		app-adminカテゴリにはnon-corシステム管理に関連したアプリケーションが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-admin categorie bevat applicaties met betrekking tot systeem
+		administratie.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-admin category chứa các ứng dụng liên quan
+		đến quản trị hệ thống (không tính các ứng dụng lõi).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-admin contiene applicazioni per l'amministrazione del sistema.
+	</longdescription>
 </catmetadata>
 
diff --git a/app-admin/ranpwd/ChangeLog b/app-admin/ranpwd/ChangeLog
index 937c62b75106..4b2d5633fb23 100644
--- a/app-admin/ranpwd/ChangeLog
+++ b/app-admin/ranpwd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/ranpwd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ChangeLog,v 1.1 2005/02/26 00:32:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ChangeLog,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
+
+  07 Sep 2005; Luis Medinas <metalgod@gentoo.org> ranpwd-1.1.ebuild:
+  Added ~amd64 keyword.
+
+  07 Sep 2005; Joseph Jezak <josejx@gentoo.org> ranpwd-1.1.ebuild:
+  Marked ppc stable for bug #105012.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> ranpwd-1.1.ebuild:
+  Added to ~ppc.
 
 *ranpwd-1.1 (26 Feb 2005)
 
diff --git a/app-admin/ranpwd/Manifest b/app-admin/ranpwd/Manifest
index 35b9ff8126d1..24a686483d1f 100644
--- a/app-admin/ranpwd/Manifest
+++ b/app-admin/ranpwd/Manifest
@@ -1,2 +1,14 @@
-MD5 93bb6dd2fa2aeacbb3a7536138691414 ranpwd-1.1.ebuild 580
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95bc19a70a486754b6749e9e16844a2a ChangeLog 694
+MD5 343ab9ff256ebcfbe3849cb14a554de5 metadata.xml 402
+MD5 9e0de848ef3f7f13fabef09135e78a30 ranpwd-1.1.ebuild 692
 MD5 6f3a2d17842220454b0514d8ebd2e27a files/digest-ranpwd-1.1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFDHmw/wUpWvClEHQoRAkYqAJQOCE4bT87PSzmBkffESdhHzuzrAJ9+UkBD
+MqQW+d2MV6Hp0WYg03r19g==
+=xw+U
+-----END PGP SIGNATURE-----
diff --git a/app-admin/ranpwd/ranpwd-1.1.ebuild b/app-admin/ranpwd/ranpwd-1.1.ebuild
index 317fc64a6652..7ecddca2738c 100644
--- a/app-admin/ranpwd/ranpwd-1.1.ebuild
+++ b/app-admin/ranpwd/ranpwd-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/app-admin/ranpwd/ranpwd-1.1.ebuild,v 1.1 2005/02/26 00:32:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ranpwd-1.1.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
 DESCRIPTION="A program to generate random passwords using the in-kernel cryptographically secure random number generator.."
 HOMEPAGE="http://ftp.lug.ro/kernel/software/utils/admin/ranpwd/"
 SRC_URI="http://ftp.lug.ro/kernel/software/utils/admin/ranpwd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/app-admin/skey/skey-1.1.5-r4.ebuild b/app-admin/skey/skey-1.1.5-r4.ebuild
index 0ea949395c42..0a37f77fe24e 100644
--- a/app-admin/skey/skey-1.1.5-r4.ebuild
+++ b/app-admin/skey/skey-1.1.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/app-admin/skey/skey-1.1.5-r4.ebuild,v 1.1 2004/09/23 10:22:21 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/skey/skey-1.1.5-r4.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
 inherit flag-o-matic ccc eutils
 
@@ -10,11 +10,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD X11"
 SLOT="0"
-KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="sys-libs/cracklib
-	sys-apps/shadow
 	dev-lang/perl
 	virtual/libc"
 # XXX: skeyaudit requires mailx.
@@ -46,6 +45,13 @@ src_compile() {
 	# skeyprune wont honour @sysconfdir@
 	sed -i 's#/etc/skeykeys#/etc/skey/skeykeys#g' skeyprune.pl skeyprune.8
 
+	# skeyprune uses a case sensitive regex to check for zeroed entries
+	sed -i 's#\(if ( ! /.*/\)#\1i#g' skeyprune.pl
+
+	# skeyinit(1) describes md4 as the default hash algorithm, which 
+	# is no longer the case. #64971
+	sed -i 's#\(md4\) \((the default)\), \(md5\) or \(sha1.\)#\1, \3 \2 or \4#g' skeyinit.1
+
 	econf --sysconfdir=/etc/skey || die
 	emake || die
 }
@@ -53,7 +59,7 @@ src_compile() {
 src_install() {
 	doman skey.1 skeyaudit.1 skeyinfo.1 skeyinit.1 skeyprune.8
 	dobin skey skeyinit skeyinfo || die
-	newbin skeyprune.pl skeyprune
+	newsbin skeyprune.pl skeyprune
 	newbin skeyaudit.sh skeyaudit
 	dolib.a libskey.a
 	dolib.so libskey.so.1.1.5 libskey.so.1.1 libskey.so.1 libskey.so
@@ -79,9 +85,12 @@ pkg_postinst() {
 	# do not include /etc/skey/skeykeys in the package, as quickpkg
 	# may package personal files.
 	# This also fixes the etc-update issue with #64974.
-	touch /etc/skey/skeykeys && chmod 0600 /etc/skey/skeykeys || {
-		ewarn "Please verify the permissions of /etc/skey/skeykeys are 0600."
-	}
+
+	# skeyinit will not function if this file is not present.
+	touch /etc/skey/skeykeys
+
+	# these permissions are applied by the skey system if missing.
+	chmod 0600 /etc/skey/skeykeys
 
 	einfo "For an instroduction into using s/key authentication, take"
 	einfo "a look at the EXAMPLES section from the skey(1) manpage."
diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 887ed8f68212..b2fa6f9d4283 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for app-admin/testdisk
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.1 2004/04/24 20:14:37 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> testdisk-5.9.ebuild:
+  Stable on ppc.
+
+  07 Nov 2005; Daniel Black <dragonheart@gentoo.org> testdisk-5.9.ebuild,
+  testdisk-6.2.ebuild:
+  changed sys-fs/progsreiserfs dependancy to sys-fs/reiserfsprogs thanks to
+  Chris Gianellonis suggestion in bug #84514. Made version 5.9 x86 stable
+
+*testdisk-6.2 (07 Nov 2005)
+
+  07 Nov 2005; Daniel Black <dragonheart@gentoo.org> testdisk-5.2.ebuild,
+  +testdisk-6.2.ebuild:
+  added version 6.2 - bug #111042 thanks to Francisco Jose Canizares
+  Santofimia. version 6.2 uses 'static' instead of 'smallstatic' bug #105035
+  thanks 4nykey@nm.ru. version 5.2 now uses mirror://gentoo
+
+*testdisk-5.9 (04 Sep 2005)
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> -testdisk-5.6.ebuild,
+  testdisk-5.7.ebuild, +testdisk-5.9.ebuild:
+  version bump. QA stop installing INSTALL, COPYING. x86 stable on testdisk-5.7
+  old version cleanout.
+
+  16 Aug 2005; Simon Stelling <blubb@gentoo.org> testdisk-5.7.ebuild:
+  added ~amd64 keyword
+
+  27 May 2005; Lars Weiler <pylon@gentoo.org> testdisk-5.2.ebuild:
+  Stable on ppc.
+
+  18 May 2005; Robin H. Johnson <robbat2@gentoo.org> testdisk-5.7.ebuild:
+  Bug #93021, ntfsprogs minimum version.
+
+*testdisk-5.7 (30 Apr 2005)
+
+  30 Apr 2005; Daniel Black <dragonheart@gentoo.org> testdisk-5.2.ebuild,
+  -testdisk-5.3.ebuild, -testdisk-5.5.ebuild, testdisk-5.6.ebuild,
+  +testdisk-5.7.ebuild:
+  Version bump. better descriptions added. old versions removed. added
+  reiserfs USE flag to include/exclude a reiserfs libs as per bug
+  #84514 by Alexey Maximov <amax@mail.ru>.
+
+*testdisk-5.6 (02 Mar 2005)
+
+  02 Mar 2005; Daniel Black <dragonheart@gentoo.org> testdisk-5.5.ebuild,
+  +testdisk-5.6.ebuild:
+  Added reiserfsprogs dependancy as per bug #82913. Version bump to 5.6 
+  (email by author Christophe GRENIER <grenier@cgsecurity.org>. Bug 
+  #82913 by Chris Slycord <slycorc@cc.wwu.edu>
+
+*testdisk-5.5 (26 Jan 2005)
+
+  26 Jan 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  +testdisk-5.5.ebuild:
+  version bump. Added forensic herd to maintainers
+
+  19 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> testdisk-5.3.ebuild:
+  Added to ~ppc.
+
+  17 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> testdisk-5.2.ebuild:
+  stable old version.
+
+*testdisk-5.3 (17 Jul 2004)
+
+  17 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> testdisk-5.3.ebuild:
+  bug #55347, version bump.
 
 *testdisk-5.2 (24 Apr 2004)
 
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 1959dc64efe6..b850f446b1b6 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1,10 @@
-MD5 51452449070955996b9223a126b861b8 testdisk-5.2.ebuild 584
+MD5 1c483a4d558771cc952bbe909107de1d ChangeLog 2891
 MD5 c20ec4c0b429ad420cd79fa49b334e24 files/digest-testdisk-5.2 64
+MD5 38ac24202d2e5ac3b576956cca428e4e files/digest-testdisk-5.7 64
+MD5 c590941db124e10085899f3724557022 files/digest-testdisk-5.9 68
+MD5 8ad7771dcf24e978d4b1084629fea125 files/digest-testdisk-6.2 69
+MD5 e18eb10540dc80dac5f436b82cd48528 metadata.xml 398
+MD5 60fd4cf89afdb8428dee1477dd67c8e9 testdisk-5.2.ebuild 882
+MD5 8a20706de4506c16a11cf363e05a0016 testdisk-5.7.ebuild 1093
+MD5 e4aa0b948ea9b9fa782622667d360ac9 testdisk-5.9.ebuild 1131
+MD5 8e0fadaf04e3e90dda99bbb1746bf55e testdisk-6.2.ebuild 1064
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 02e945c7cb52..91186c326a59 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>no-herd</herd>
+    <herd>forensics</herd>
+    <maintainer>
+        <email>forensics@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
     <maintainer>
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
diff --git a/app-admin/testdisk/testdisk-5.2.ebuild b/app-admin/testdisk/testdisk-5.2.ebuild
index 06ba7b0c7da9..8e39f050c06f 100644
--- a/app-admin/testdisk/testdisk-5.2.ebuild
+++ b/app-admin/testdisk/testdisk-5.2.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.2.ebuild,v 1.1 2004/04/24 20:14:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.2.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others"
+DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory."
 HOMEPAGE="http://www.cgsecurity.org/index.html?testdisk.html"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE=""
 DEPEND=">=sys-fs/ntfsprogs-1.9.0
-	>=sys-fs/reiserfsprogs-3.6.13
 	>=sys-fs/e2fsprogs-1.35"
 
 src_compile() {
diff --git a/app-admin/testdisk/testdisk-5.7.ebuild b/app-admin/testdisk/testdisk-5.7.ebuild
index ce202241d22b..3d52d8d47bcb 100644
--- a/app-admin/testdisk/testdisk-5.7.ebuild
+++ b/app-admin/testdisk/testdisk-5.7.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-admin/testdisk/testdisk-5.7.ebuild,v 1.1 2005/04/30 02:05:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.7.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
 DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory."
 HOMEPAGE="http://www.cgsecurity.org/index.html?testdisk.html"
 SRC_URI="http://www.cgsecurity.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static reiserfs"
 DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-fs/ntfsprogs-1.9.0
+	>=sys-fs/ntfsprogs-1.9.4
 	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
 	>=sys-fs/e2fsprogs-1.35"
 
@@ -30,6 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
+	rm ${D}/usr/share/doc/${PF}/COPYING ${D}/usr/share/doc/${PF}/INSTALL
 }
 
diff --git a/app-admin/testdisk/testdisk-5.9.ebuild b/app-admin/testdisk/testdisk-5.9.ebuild
index a7507a656f35..7df27cc023fa 100644
--- a/app-admin/testdisk/testdisk-5.9.ebuild
+++ b/app-admin/testdisk/testdisk-5.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-admin/testdisk/testdisk-5.9.ebuild,v 1.1 2005/09/04 03:05:44 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-5.9.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
 
 MY_P=${P}-WIP
@@ -10,11 +10,11 @@ HOMEPAGE="http://www.cgsecurity.org/index.html?testdisk.html"
 SRC_URI="http://www.cgsecurity.org/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="static reiserfs ntfs"
 DEPEND=">=sys-libs/ncurses-5.2
 	ntfs? ( >=sys-fs/ntfsprogs-1.9.4 )
-	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	reiserfs? ( sys-fs/reiserfsprogs )
 	>=sys-fs/e2fsprogs-1.35"
 RDEPEND="!static? ( ${DEPEND} )"
 
diff --git a/app-admin/testdisk/testdisk-6.2.ebuild b/app-admin/testdisk/testdisk-6.2.ebuild
index 2e8fb1a54078..dab4a9906b41 100644
--- a/app-admin/testdisk/testdisk-6.2.ebuild
+++ b/app-admin/testdisk/testdisk-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-admin/testdisk/testdisk-6.2.ebuild,v 1.1 2005/11/07 11:57:01 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.2.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
 
 MY_P=${P}-WIP
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static reiserfs ntfs"
 DEPEND=">=sys-libs/ncurses-5.2
 	ntfs? ( >=sys-fs/ntfsprogs-1.9.4 )
-	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	reiserfs? ( sys-fs/reiserfsprogs )
 	>=sys-fs/e2fsprogs-1.35"
 RDEPEND="!static? ( ${DEPEND} )"
 
diff --git a/app-admin/yaala/ChangeLog b/app-admin/yaala/ChangeLog
index 8cb1be90b7bf..3bf27ff04fe2 100644
--- a/app-admin/yaala/ChangeLog
+++ b/app-admin/yaala/ChangeLog
@@ -1,8 +1,32 @@
 # ChangeLog for app-admin/yaala
-# Copyright 1999-2003 Gentoo Technologies, Inc.; Distributed under the GPLv2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/ChangeLog,v 1.1 2003/01/22 05:35:01 lostlogic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/ChangeLog,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> yaala-0.4.2.ebuild,
+  yaala-0.6.3.ebuild, yaala-0.7.2.ebuild:
+  Don't use -d option with cp.
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org> yaala-0.4.2.ebuild,
+  yaala-0.6.3.ebuild:
+  Fixed SRC_URI because it pointed to the wrong file.
+
+  07 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  yaala-0.4.2.ebuild, yaala-0.6.3.ebuild, yaala-0.7.2.ebuild:
+  QA - IUSE fix
+
+*yaala-0.7.2 (14 May 2004)
+
+  14 May 2004; Brandon Low <lostlogic@gentoo.org> +yaala-0.7.2.ebuild:
+  Bump
+
+*yaala-0.6.3 (05 May 2003)
+
+  05 May 2003; Brandon Low <lostlogic@gentoo.org> yaala-0.6.3.ebuild:
+  Well this has needed bumping for a long time, MUCH improved new version
 
 *yaala-0.4.2 (21 Jan 2003)
 
+  28 Mar 2003; has matured to ppc
+
   21 Jan 2003; Brandon Low <lostlogic@gentoo.org>
   Added to unstable... my personal favorite apache log analzyer.
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
index c3d7729a22cb..e5a5403e123e 100644
--- a/app-admin/yaala/Manifest
+++ b/app-admin/yaala/Manifest
@@ -1,5 +1,18 @@
-MD5 3542294256a2406ba953645066609c91 yaala-0.4.2.ebuild 504
-MD5 beb18bffb9a12ba44e104447329fa903 ChangeLog 392
-MD5 a05bb240af0eaaf768c2f88590e314c1 yaala-0.6.3.ebuild 496
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e046dd4f52b1dbfd659b2b34488821cc yaala-0.6.3.ebuild 486
+MD5 4e281e129dcfb8fddf259e9d77178f1d ChangeLog 1106
+MD5 04dc922eda5ec93576bd738e5c3a5de4 yaala-0.7.2.ebuild 496
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 4df417ff2c77ba0a7580af4509d0f955 yaala-0.4.2.ebuild 487
 MD5 b881d864bfecedf6f8dd76051a0ed515 files/digest-yaala-0.4.2 63
+MD5 70b5808757730a555aae96e0c901c182 files/digest-yaala-0.7.2 63
 MD5 4f153d2fde47e0b93e74015e260058fb files/digest-yaala-0.6.3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGEQtj5H05b2HAEkRAq5zAKCbUUvNtzIp/0KfoPqqIvrs0noBEgCdEIc2
+ihOdyZYlQxcVn+Bd1b0J8JE=
+=y14n
+-----END PGP SIGNATURE-----
diff --git a/app-admin/yaala/yaala-0.4.2.ebuild b/app-admin/yaala/yaala-0.4.2.ebuild
index 9c0d31932f9e..3b14742490fd 100644
--- a/app-admin/yaala/yaala-0.4.2.ebuild
+++ b/app-admin/yaala/yaala-0.4.2.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/app-admin/yaala/yaala-0.4.2.ebuild,v 1.1 2003/01/22 05:35:01 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/yaala-0.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
-SRC_URI="http://verplant.org/yaala/yaala-0.4.2.tar.bz2"
-HOMEPAGE="http://verplant.org/yaala/"
-DEPEND="virtual/glibc"
-LICENSE="GPLv2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
 DESCRIPTION="Yet Another Log Analyzer"
+HOMEPAGE="http://yaala.org/"
+SRC_URI="http://yaala.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 src_install() {
 	dodir /usr/share/yaala
-	cp -dpRx * ${D}usr/share/yaala
-	dodir /usr/bin
-	dosym /usr/share/yaala/yaala /usr/bin/yaala
+	cp -pRx * ${D}/usr/share/yaala/
 }
diff --git a/app-admin/yaala/yaala-0.6.3.ebuild b/app-admin/yaala/yaala-0.6.3.ebuild
index f028634ac95a..0d8a7538c8a9 100644
--- a/app-admin/yaala/yaala-0.6.3.ebuild
+++ b/app-admin/yaala/yaala-0.6.3.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/app-admin/yaala/yaala-0.6.3.ebuild,v 1.1 2003/05/05 16:54:29 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/yaala-0.6.3.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
+
+DESCRIPTION="Yet Another Log Analyzer"
+HOMEPAGE="http://yaala.org/"
+SRC_URI="http://yaala.org/files/${P}.tar.bz2"
 
-SRC_URI="http://verplant.org/yaala/${P}.tar.bz2"
-HOMEPAGE="http://verplant.org/yaala/"
-DEPEND="virtual/glibc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc"
-DESCRIPTION="Yet Another Log Analyzer"
+KEYWORDS="x86 ppc"
+IUSE=""
+
+DEPEND="virtual/libc"
 
-src_install(){
+src_install() {
 	dodir /usr/share/yaala
-	cp -dpRx * ${D}usr/share/yaala
+	cp -pRx * ${D}/usr/share/yaala/
 }
diff --git a/app-admin/yaala/yaala-0.7.2.ebuild b/app-admin/yaala/yaala-0.7.2.ebuild
index 59f5440c260d..0e0672ce6685 100644
--- a/app-admin/yaala/yaala-0.7.2.ebuild
+++ b/app-admin/yaala/yaala-0.7.2.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/app-admin/yaala/yaala-0.7.2.ebuild,v 1.1 2004/05/14 16:21:02 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/yaala-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:59:41 chriswhite Exp $
 
-SRC_URI="http://www.yaala.org/files/${P}.tar.bz2"
+DESCRIPTION="Yet Another Log Analyzer"
 HOMEPAGE="http://www.yaala.org/"
-DEPEND="virtual/glibc"
+SRC_URI="http://www.yaala.org/files/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-DESCRIPTION="Yet Another Log Analyzer"
+IUSE=""
+
+DEPEND="virtual/libc"
 
-src_install(){
+src_install() {
 	dodir /usr/share/yaala
-	cp -dpRx * ${D}usr/share/yaala
+	cp -pRx * ${D}/usr/share/yaala/
 }
diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index 483dd9fad25d..b498a78986f7 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for app-office/abiword-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.1 2005/10/30 02:28:29 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
+
+  02 Nov 2005; Herbie Hopkins <herbs@gentoo.org>
+  abiword-plugins-2.4.1-r2.ebuild:
+  Marked ~amd64 wrt bug #110858.
+
+*abiword-plugins-2.4.1-r2 (31 Oct 2005)
+
+  31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +abiword-plugins-2.4.1-r2.ebuild:
+  Added 'bzip2', 'debug', 'pdf', 'readline' and 'wmf' USE flags. Added
+  libgsf dependency to enable some document filters by default. Removed
+  duplicated aiksaurus dependency. Added fribidi dependency. Fixed libgda
+  dependencies. Updated other dependencies version numbers. Don't install
+  COPYING. Misc.  clean-ups.
+
+  31 Oct 2005; Brent Baude <ranger@gentoo.org>
+  abiword-plugins-2.4.1-r1.ebuild:
+  Marking abiword-plugins-2.4.1-r1 ~ppc64 for bug 110858
+
+  31 Oct 2005; Jason Wever <weeve@gentoo.org>
+  abiword-plugins-2.4.1-r1.ebuild:
+  Added ~sparc keyword wrt bug #110858.
+
+*abiword-plugins-2.4.1-r1 (30 Oct 2005)
+
+  30 Oct 2005; Joe McCann <joem@gentoo.org>
+  +abiword-plugins-2.4.1-r1.ebuild:
+  Adding two new use flags for thesaurus and wordperfect support. Disabling
+  unsupported psiconv and libwmf.
+
+  30 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  abiword-plugins-2.4.1.ebuild:
+  Marked ~ppc
 
 *abiword-plugins-2.4.1 (30 Oct 2005)
 
diff --git a/app-office/abiword-plugins/Manifest b/app-office/abiword-plugins/Manifest
index 82a537e12c26..586b766d95dc 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -1,4 +1,16 @@
-MD5 b21c42fd9cb4d5d8f4bec3cfe9e61c73 ChangeLog 343
-MD5 8fb96a505a79d0f0d10ea8f7e937203c abiword-plugins-2.4.1.ebuild 1316
-MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1 68
-MD5 6335b6382b6a4268a1852aefe1e33384 metadata.xml 342
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a03302a2cbd1dfa401ac4709a13adc7c ChangeLog 1601
+MD5 e88aea36421897bd94592e363e18ef69 abiword-plugins-2.4.1-r1.ebuild 1638
+MD5 4b7301c34dba6e7841696ee04d885e75 abiword-plugins-2.4.1-r2.ebuild 2042
+MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1-r1 68
+MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1-r2 68
+MD5 48bd81fe7d336ec791cfef178ede4ed3 metadata.xml 349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaJqS2G5bA0cA/ScRAjAXAKCcGGpjmPR5uv3mDC3Jv/s/9fSwVQCg52Ss
+wJ5zzP21UygV85Vof62n7XE=
+=CjO3
+-----END PGP SIGNATURE-----
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.1-r1.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.1-r1.ebuild
index 2576f8ce2600..babeedefb90d 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.1-r1.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.1-r1.ebuild,v 1.1 2005/10/30 18:19:12 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
 
 DESCRIPTION="Set of plugins for abiword"
 HOMEPAGE="http://www.abisource.com/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 IUSE="gnome grammar jpeg math svg libgda thesaurus wordperfect"
 S=${WORKDIR}/abiword-${PV}/${PN}
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
index f90c14f16b5c..6aa1acb32301 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.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/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild,v 1.1 2005/10/31 21:41:07 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
 
 DESCRIPTION="Set of plugins for abiword"
 HOMEPAGE="http://www.abisource.com/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 debug gnome grammar jpeg libgda math pdf readline svg thesaurus wmf wordperfect"
 S=${WORKDIR}/abiword-${PV}/${PN}
 
diff --git a/app-office/abiword-plugins/metadata.xml b/app-office/abiword-plugins/metadata.xml
index a475a716fe9f..5d079dccec5b 100644
--- a/app-office/abiword-plugins/metadata.xml
+++ b/app-office/abiword-plugins/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>gnome</herd>
+	<herd>gnome-office</herd>
 	<maintainer>
 		<email>joem@gentoo.org</email>
 		<name>Joe McCann</name>
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 308fc8237595..984f0fe4d43e 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,579 @@
 # ChangeLog for app-office/abiword
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
+
+  30 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> abiword-2.2.11.ebuild:
+  Stable on ia64.
+
+  30 Oct 2005; Leonardo Boshell <leonardop@gentoo.org> abiword-2.4.1.ebuild:
+  Moved libgnomeprint(ui) dependencies since they are not optional (bug
+  #110865). Updated dependencies (zlib, libbonobo, glib, pango). Misc.
+  clean-ups.
+
+*abiword-2.4.1 (30 Oct 2005)
+
+  30 Oct 2005; Joe McCann <joem@gentoo.org> +abiword-2.4.1.ebuild:
+  New 2.4 version. I have split the plugins out from this version and into
+  their own package called abiword-plugins
+
+  28 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  abiword-2.2.11.ebuild:
+  Added missing popt dependency (bug #109736).
+
+  19 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> abiword-2.2.11.ebuild:
+  stable on alpha as per bug #109157
+
+  19 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.2.11.ebuild:
+  Back to hppa, ppc, ppc64 & sparc stable, blame dang
+
+  19 Oct 2005; <dang@gentoo.org> abiword-2.2.11.ebuild:
+  Marked stable on amd64
+
+  19 Oct 2005; Brent Baude <ranger@gentoo.org> abiword-2.2.11.ebuild:
+  Marking abiword-2.2.11 ppc65 stable for bug 109157
+
+  18 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> abiword-2.2.11.ebuild:
+  Stable on hppa, ppc.
+
+  18 Oct 2005; Ferris McCormick <fmccor@gentoo.org> abiword-2.2.11.ebuild:
+  Stable on sparc, Security Bug #109157.
+
+*abiword-2.2.11 (18 Oct 2005)
+
+  18 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +abiword-2.2.11.ebuild:
+  new version, fix for #109157
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> abiword-2.2.10.ebuild:
+  Mark 2.2.10 stable on ia64
+
+  29 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> abiword-2.2.10.ebuild:
+  stable on alpha wrt bug #107351
+
+  28 Sep 2005; Paul Varner <fuzzyray@gentoo.org> abiword-2.2.10.ebuild:
+  Stable on x86. Builds and appears to work fine. Bug# 107351
+
+  28 Sep 2005; Markus Rothe <corsair@gentoo.org> abiword-2.2.10.ebuild:
+  Stable on ppc64
+
+  28 Sep 2005; Luis Medinas <metalgod@gentoo.org> abiword-2.2.10.ebuild:
+  Marked Stable on amd64. Bug #107351.
+
+  28 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> abiword-2.2.10.ebuild:
+  Stable on hppa and ppc.
+
+  28 Sep 2005; Ferris McCormick <fmccor@gentoo.org> abiword-2.2.10.ebuild:
+  Stable on sparc, as requested in Security Bug #107351.  Builds on sparc
+  without incident and appears to work fine.
+
+*abiword-2.2.10 (28 Sep 2005)
+
+  28 Sep 2005; Mike Gardiner <obz@gentoo.org> +abiword-2.2.10.ebuild:
+  New version, including bugfixes and a security update, see bug #107351.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> abiword-2.2.8-r1.ebuild:
+  stable on ia64
+
+  22 Aug 2005; Luis Medinas <metalgod@gentoo.org> abiword-2.2.8-r1.ebuild:
+  Marked Stable on AMD64.
+
+  13 Aug 2005; Guy Martin <gmsoft@gentoo.org> abiword-2.2.8-r1.ebuild:
+  Stable on hppa.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> abiword-2.2.8-r1.ebuild:
+  Stable on ppc64
+
+  05 Aug 2005; Joseph Jezak <josejx@gentoo.org> abiword-2.2.8-r1.ebuild:
+  Marked ppc stable.
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  abiword-2.2.8-r1.ebuild:
+  Stable on alpha.
+
+  01 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  abiword-2.2.8-r1.ebuild:
+  Stable on sparc
+
+*abiword-2.2.9 (01 Aug 2005)
+
+  01 Aug 2005; Marinus Schraal <foser@gentoo.org> abiword-2.2.9.ebuild :
+  Rather fresh release
+
+  14 Jul 2005; Guy Martin <gmsoft@gentoo.org> abiword-2.2.7-r1.ebuild:
+  Stable on hppa.
+
+*abiword-2.2.8-r1 (03 Jul 2005)
+*abiword-2.2.7-r1 (03 Jul 2005)
+*abiword-2.2.5-r1 (03 Jul 2005)
+
+  03 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/abiword-security-fix.patch, -abiword-2.2.5.ebuild,
+  +abiword-2.2.5-r1.ebuild, -abiword-2.2.7.ebuild, +abiword-2.2.7-r1.ebuild,
+  -abiword-2.2.8.ebuild, +abiword-2.2.8-r1.ebuild:
+  security fix for #96991, all ebuilds have patch applied.
+
+  23 Jun 2005; Tony Vroon <chainsaw@gentoo.org> +files/2.2.8-gcc4.patch,
+  abiword-2.2.8.ebuild:
+  Add upstream patch to allow compilation with GCC 4. Closes bug #96796.
+
+  19 Jun 2005; Markus Rothe <corsair@gentoo.org> abiword-2.2.7.ebuild:
+  Stable on ppc64
+
+  18 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> abiword-2.2.7.ebuild:
+  Stable on alpha
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> abiword-2.2.7.ebuild:
+  Stable on ppc.
+
+  17 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.2.7.ebuild:
+  Stable on sparc
+
+*abiword-2.2.8 (16 Jun 2005)
+
+  16 Jun 2005; Marinus Schraal <foser@gentoo.org> abiword-2.2.8.ebuild :
+  New release
+
+  15 May 2005; Aron Griffis <agriffis@gentoo.org> abiword-2.2.7.ebuild:
+  add ~ia64
+
+  01 May 2005; Guy Martin <gmsoft@gentoo.org> abiword-2.2.5.ebuild:
+  Stable on hppa.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> abiword-2.2.5.ebuild:
+  Stable on alpha.
+
+  20 Apr 2005; Simon Stelling <blubb@gentoo.org> abiword-2.2.5.ebuild:
+  stable on amd64
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> abiword-2.2.5.ebuild:
+  Stable on ppc.
+
+  18 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.2.5.ebuild:
+  Stable on sparc
+
+*abiword-2.2.7 (17 Apr 2005)
+
+  17 Apr 2005; foser <foser@gentoo.org> abiword-2.2.7.ebuild :
+  new release
+  use alternatives eclass for versionless executable binary symlik (#89373)
+
+  03 Apr 2005; Joseph Jezak <josejx@gentoo.org> abiword-2.2.3.ebuild:
+  Marked ppc stable.
+
+  27 Mar 2005; Guy Martin <gmsoft@gentoo.org> abiword-2.2.3.ebuild:
+  Stable on hppa.
+
+  22 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.2.3.ebuild:
+  Stable on sparc
+
+  06 Mar 2005; Heinrich Wendel <lanius@gentoo.org> abiword-2.2.3.ebuild:
+  stable on amd64
+
+  26 Jan 2005; Guy Martin <gmsoft@gentoo.org> abiword-2.2.2.ebuild:
+  Stable on hppa.
+
+  18 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.2.2.ebuild:
+  Stable on sparc
+
+*abiword-2.2.3 (18 Jan 2005)
+
+  18 Jan 2005; foser <foser@gentoo.org> abiword-2.2.3.ebuild :
+  New release, minor ebuild fixes
+
+  06 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> abiword-2.0.10.ebuild:
+  Stable on alpha.
+
+*abiword-2.2.2 (19 Dec 2004)
+
+  19 Dec 2004; foser <foser@gentoo.org> abiword-2.2.2.ebuild :
+  Finally add this one, add mime eclass for the desktop file
+  Remove docs installation for now until someone figures what exactly to install
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> abiword-2.0.10.ebuild:
+  Stable on amd64.
+
+  19 Sep 2004; Luca Barbato <lu_zero@gentoo.org> abiword-2.0.10.ebuild,
+  abiword-2.0.7.ebuild:
+  Marked ppc, work with gcc-3.4
+
+  07 Sep 2004; Tom Gall <tgall@gentoo.org> abiword-2.0.11.ebuild:
+  Added ~ppc64, bug #57192
+
+  06 Sep 2004; Guy Martin <gmsoft@gentoo.org> abiword-2.0.10.ebuild:
+  Marked stable on hppa.
+
+  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.0.10.ebuild:
+  Stable on sparc
+
+*abiword-2.0.11 (30 Aug 2004)
+
+  30 Aug 2004; foser <foser@gentoo.org> abiword-2.0.11.ebuild :
+  New release
+
+  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.0.7.ebuild:
+  Stable on sparc
+
+*abiword-2.0.10 (19 Aug 2004)
+
+  19 Aug 2004; foser <foser@gentoo.org> abiword-2.0.10.ebuild :
+  New release, fresh from the press (#57680)
+
+  11 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> abiword-2.0.6.ebuild:
+  Stable on alpha.
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> abiword-2.0.2.ebuild,
+  abiword-2.0.5.ebuild, abiword-2.0.6.ebuild, abiword-2.0.7.ebuild:
+  sync IUSE (+debug, -doc)
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> abiword-2.0.7.ebuild:
+  marking stable on amd64 ahead of schedule for the gcc 3.4 fix
+
+  26 May 2004; Luca Barbato <lu_zero@gentoo.org> abiword-2.0.6.ebuild:
+  Marked ppc
+
+*abiword-2.0.7 (24 May 2004)
+
+  24 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/abiword-2.0.7-gcc-3.4.patch, +abiword-2.0.7.ebuild:
+  New version and gcc-3.4 fix
+
+  11 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.0.6.ebuild:
+  Stable on hppa
+
+  07 May 2004; Ferris McCormick <fmccor@gentoo.org> abiword-2.0.6.ebuild:
+  Marked stable on sparc.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> abiword-2.0.5.ebuild:
+  Stable on alpha.
+
+  23 Apr 2004; Ferris McCormick <fmccor@gentoo.org> abiword-2.0.5.ebuild:
+  Mark stable for sparc.
+
+  20 Apr 2004; foser <foser@gentoo.org> abiword-2* :
+  Disable debugging to be on the safe side, it's a bit too intrusive
+
+  20 Apr 2004; Guy Martin <gmsoft@gentoo.org> abiword-2.0.5.ebuild:
+  Marked stable on hppa.
+
+*abiword-2.0.6 (17 Apr 2004)
+
+  17 Apr 2004; <khai@gentoo.org> abiword-2.0.5.ebuild, abiword-2.0.6.ebuild:
+  Added the gnome-vfs fix again because it might still break with some specific
+  setups.
+
+  11 Apr 2004; <khai@gentoo.org> :
+  Bug fix release, should deprecate the amd64 patch.
+
+  25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> abiword-2.0.1.ebuild,
+  abiword-2.0.2.ebuild, abiword-2.0.3-r1.ebuild, abiword-2.0.5.ebuild:
+  don't use deprecated ? : use syntax
+
+*abiword-2.0.5 (13 Mar 2004)
+
+  13 Mar 2004; foser <foser@gentoo.org> abiword-2.0.5.ebuild :
+  New wrap up, this should us free of the 2.0.4 misery
+
+*abiword-2.0.4 (07 Mar 2004)
+
+  08 Mar 2004; foser <foser@gentoo.org> abiword-2.0.4.ebuild :
+  Fix gtk+ dep to 2.2
+  Disable gucharmap support, it is still borked
+  Fix digest, upstream changed binaries again :( #43984
+  Run autogen.sh trying to fix problems reported in #43984
+
+  07 Mar 2004; foser <foser@gentoo.org> abiword-2.0.4.ebuild :
+  New release, make user docs not optional (#36974)
+
+  02 Mar 2004; <augustus@gentoo.org> abiword-2.0.3-r1.ebuild,
+  files/abiword-2.0.3-amd64.patch:
+  Added support for amd64 via a small patch which fixes pointer to 32-bit data
+  type conversion. Marked ~amd64 for now.
+
+*abiword-2.0.3-r1 (18 Feb 2004)
+
+  18 Feb 2004; foser <foser@gentoo.org> abiword-2.0.3-r1.ebuild :
+  Add documentation support per USE flag, fix provided by khai in #36974
+
+  09 Feb 2004; <gustavoz@gentoo.org> abiword-2.0.2.ebuild:
+  stable on hppa and sparc
+
+*abiword-2.0.3 (07 Feb 2004)
+
+  07 Feb 2004; foser <foser@gentoo.org> abiword-2.0.3.ebuild :
+  New release
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> abiword-2.0.1.ebuild:
+  set ppc in keywords
+
+  09 Jan 2004; <gustavoz@gentoo.org> abiword-2.0.1.ebuild:
+  marked stable on sparc
+
+  07 Jan 2004; <gustavoz@gentoo.org> abiword-2.0.1.ebuild:
+  marked stable on hppa
+
+*abiword-2.0.2 (15 Dec 2003)
+
+  15 Dec 2003; foser <foser@gentoo.org> abiword-2.0.2.ebuild :
+  New release (#35832), minor dep fixes, add debug USE switch
+  remove the autogen stuff, doesn't seem to be needed anymore
+  plugins now moved into main pack
+
+  17 Nov 2003; <spider@gentoo.org> abiword-2.0.1.ebuild:
+  stable on x86
+
+  09 Nov 2003; Jason Wever <weeve@gentoo.org> abiword-2.0.0.ebuild:
+  Marked stable for sparc.
+
+*abiword-2.0.1 (30 Oct 2003)
+
+  30 Oct 2003; foser <foser@gentoo.org> abiword-2.0.1.ebuild :
+  remove libunicode dep, seems unneeded
+
+  28 Sep 2003; foser <foser@gentoo.org> abiword-2.0.0.ebuild :
+  Fix wv dep to 1
+
+  15 Sep 2003; Alastair Tse <liquidx@gentoo.org> :
+  digests recalculated yet again
+
+*abiword-2.0.0 (13 Sep 2003)
+
+  13 Sep 2003; foser <foser@gentoo.org> abiword-2.0.0.ebuild :
+  New version, first stable gtk+-2 release
+  updated enchant dep
+  now use the package provided .desktop
+  also added imagemagick disabling switch to plugins
+
+*abiword-1.99.5 (27 Aug 2003)
+
+  27 Aug 2003; foser <foser@gentoo.org> abiword-1.99.5.ebuild :
+  New version with patch to get around gcc bug
+  Hardcode disable perl, hope it fixes (#27225)
+
+*abiword-1.99.4-r2 (19 Aug 2003)
+
+  19 Aug 2003; foser <foser@gentoo.org> abiword-1.99.4-r2.ebuild :
+  Added ots plugin patch (#26824), harcode imagemagick disabling (#25721)
+ 
+*abiword-1.99.4-r1 (15 Aug 2003)
+
+  15 Aug 2003; <spider@gentoo.org> abiword-1.99.4-r1.ebuild,
+  abiword-1.99.4.ebuild:
+  A fix for gcc 3.3.1 and the -pedantic CFLAGS
+
+*abiword-1.99.4 (15 Aug 2003)
+
+  15 Aug 2003; <spider@gentoo.org> abiword-1.99.4.ebuild:
+  Version bump
+
+*abiword-1.99.3 (28 Jul 2003)
+
+  28 Jul 2003; foser <foser@gentoo.org> abiword-1.99.3.ebuild :
+  New version, use enchant for spell USE flag, now really fix #24705
+
+*abiword-1.99.2 (27 Jul 2003)
+
+  27 Jul 2003; foser <foser@gentoo.org> abiword-1.99.2.ebuild :
+  New version, added plugins building, removed libole2 dep
+  made .desktop file install by default
+  Kudos to mg <markgilbert@hotpop.com> for providing these improvements (#23558, #24705) 
+
+  19 Jul 2003; Alastair Tse <liquidx@gentoo.org> abiword-1.9.1.ebuild:
+  putting dev versions back in ~x86
+
+  20 Jun 2003; Jason Wever <weeve@gentoo.org> abiword-1.0.6-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*abiword-1.99.1 (18 Jun 2003)
+
+  18 Jun 2003; foser <foser@gentoo.org> abiword-1.99.1.ebuild :
+  New development version, updated wv dep
+  again disabled wv_configure patch since i can't reproduce the problem anymore
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> abiword-1.0.2-r1.ebuild,
+  abiword-1.0.3.ebuild:
+  fix gal deps
+
+*abiword-1.0.6-r1 (07 Jun 2003)
+
+  07 Jun 2003; foser <foser@gentoo.org> abiword-1.0.6-r1.ebuild :
+  reenabled gnome USE
+
+*abiword-1.0.6 (01 Jun 2003)
+
+  01 Jun 2003; Brandon Low <lostlogic@gentoo.org> abiword-1.0.6.ebuild:
+  Bump
+
+*abiword-1.9.1 (16 May 2003)
+
+  10 Jun 2003; foser <foser@gentoo.org> abiword-1.9.1.ebuild :
+  Added missing libglade dep as noticed by <cesarb@nitnet.com.br> in #21346
+
+  16 May 2003; foser <foser@gentoo.org> abiword-1.9.1.ebuild :
+  Disabled perl, removed bash-completion block 
+  Added debug inheritance, since this is a dev version
+
+*abiword-1.9.0 (23 Apr 2003)
+
+  23 Apr 2003; foser <foser@gentoo.org> abiword-1.9.0.ebuild :
+  Was a bit too early with disbling the patch (#19821)
+
+  23 Apr 2003; foser <foser@gentoo.org> abiword-1.9.0.ebuild :
+  New devel version, removed the wv configure patch, doesn't seem necessary anymore
+
+*abiword-1.1.4 (31 Mar 2003)
+
+  08 Apr 2003; foser <foser@gentoo.org> abiword-1.1.4.ebuild :
+  Moved the fribidi lib from app-text to dev-libs
+  fixed ebuild to reflect the move
+
+  01 Apr 2003; foser <foser@gentoo.org> abiword-1.1.4.ebuild :
+  Added patch for configure to make the wv tests work
+
+  31 Mar 2003; foser <foser@gentoo.org> abiword-1.1.4.ebuild :
+  GTK+2 development release
+
+*abiword-1.0.5 (16 Mar 2003)
+
+  26 Mar 2003; Jason Wever <weeve@gentoo.org> abiword-1.0.5.ebuild:
+  Added ~sparc to keywords.
+
+  24 Mar 2003; foser <foser@gentoo.org> abiword-1.0.5.ebuild :
+  Lowered optimizations to -O1 as suggested in to fix on-exit crash (#8100)
+
+  16 Mar 2003; foser <foser@gentoo.org> abiword-1.0.5.ebuild :
+  New version
+  disabled gnome USE because it breaks
+  disabled perl USE because it never really worked
+
+*abiword-1.0.4 (26 Jan 2003)
+  
+  16 Mar 2003: Alastair Tse <liquidx@gentoo.org> files/Abiword.desktop :
+  Added Office category to gnome menu entry. Solves #17200.
+  
+  04 Feb 2003; Jack Morgan <jmorgan@gentoo.org> abiword-1.0.3.ebuild :
+  Changed ~sparc to sparc; added ~sparc to abiword-1.0.4_pre1-r2
+
+  26 Jan 2003; foser <foser@gentoo.org> abiword-1.0.4.ebuild :
+  New version
+  changed SLOT to 1, fixed SRC_URI to use mirror:// (thnx mg)
+
+*abiword-1.0.4_pre1-r2 (22 Dec 2002)
+
+  22 Dec 2002; foser <foser@gentoo.org> abiword-1.0.4_pre1-r2.ebuild :
+  And we're giving the perl stuff a chance again
+
+*abiword-1.0.4_pre1-r1 (19 Nov 2002)
+
+  16 Dec 2002; Jack Morgan <jmorgan@gentoo.org> abiword-1.0.3.ebuild :
+  Added ~sparc keywords
+
+  19 Nov 2002; foser <foser@gentoo.org> abiword-1.0.4_pre1-r1.ebuild :
+  Disabled all scripting (perl) due to extensive problems
+
+*abiword-1.0.4_pre1 (17 Nov 2002)
+
+  17 Nov 2002; foser <foser@gentoo.org> abiword-1.0.4_pre1.ebuild :
+  New version, should fix aspell problems
+  Big thanks to mg of the AbiWord team for this ebuild and the help provided
+
+*abiword-1.0.3 (17 Oct 2002)
+
+  17 Oct 2002; foser <foser@gentoo.org> abiword-1.0.3.ebuild :
+  New version, new aspell fix
+  Block bash-completion because of bug #7467
+
+*abiword-1.0.2-r1 (02 Sep 2002)
+
+  02 Sep 2002; Seemant Kulleen <seemant@gentoo.org> abiword-1.0.2-r1.ebuild
+  files/digest-abiword-1.0.2-r1 :
+
+  Compile against the new aspell.  Thanks to dom the abiword project lead
+  (dom on #abiword at irc.gnome.org).
+
+*abiword-1.0.2 (??)
+
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords, please when doing revision bumps make
+  sure to add a ChangeLog entry! :)
+
+
+*abiword-1.0.1 (8 Jun 2002)
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> abiword-1.0.1.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  8 Jun 2002; Martin Schlemmer <azarah@gentoo.org> abiword-1.0.2.ebuild :
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> abiword-1.0.2.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  Version update.
+
+*abiword-1.0.1 (8 May 2002)
+
+  8 May 2002; Martin Schlemmer <azarah@gentoo.org> abiword-1.0.1.ebuild :
+
+  Version update.
+
+*abiword-1.0.0-r1 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> abiword-1.0.0-r1.ebuild files/digest-abiword-1.0.0-r1:
+
+  Bonobo is only required if the gnome USE flag is set.
+
+  Removed abiword-1.0.0.ebuild files/digest-abiword-1.0.0
+
+*abiword-0.99.5-r1 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> abiword-0.99.5-r1.ebuild files/digest-abiword-0.99.5-r1:
+
+  Bonobo is only required if the gnome USE flag is set.
+
+  Removed abiword-0.99.5.ebuild files/digest-abiword-0.99.5
+
+*abiword-0.99.3-r2 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> abiword-0.99.3-r2.ebuild files/digest-abiword-0.99.3-r2:
+
+  Bonobo is only required if the gnome USE flag is set.
+
+  Removed abiword-0.99.3-r1.ebuild files/digest-abiword-0.99.3-r1
+
+*abiword-1.0.0 (25 Apr 2002)
+
+  25 Apr 2002; Grant Goodyear <g2boojum@gentoo.org> abiword-1.0.0.ebuild :
+
+  New version.
+
+*abiword-0.99.5 (15 Apr 2002)
+
+*abiword-0.99.3-r1 (13 Apr 2002)
+
+  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org> abiword-0.99.3-r1.ebuild :
+
+  Jon Nelson (jnelson@gentoo.org) discovered that there is absolutely no
+  dependency on freetype fonts (bug #1411).  This is true, as the AbiSuite
+  applications tend to install their own fonts into /usr/share/AbiSuite 
+  anyway.  Hence, freetype has been removed from the DEPEND list, and
+  other intuitive deends like glibc, automake etc have been removed as well.
+
+*abiword-0.99.3-r1 (12 Apr 2002)
+  12 Apr 2002; Spider <spider@gentoo.org>
+  force recompile with new -r due to libpng changes
+  
+  3 Apr 2002; M.Schlemmer <azarah@gentoo.org> abiword-0.99.3.ebuild :
+
+  Fix DEPEND for 'spell' USE var.
+
+*abiword-0.99.3 (21 March 2002)
+
+*abiword-0.99.2 (25 Feb 2002)
 
 *abiword-0.9.6.1-r1 (1 Feb 2002)
 
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index e69de29bb2d1..e7da9930b480 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -0,0 +1,8 @@
+MD5 30cfa297f8769ed82df7775de3e2c4c5 ChangeLog 19219
+MD5 aeb219db77df24fb0917fc9ce671ea47 abiword-2.2.10.ebuild 2333
+MD5 e1270e73ea706c7672e6e248490c448c abiword-2.2.11.ebuild 2346
+MD5 2312cbc24cd08c002733e625ce8f8fc6 abiword-2.4.1.ebuild 2361
+MD5 8b023d31957e4d3d1684959d96564364 files/digest-abiword-2.2.10 69
+MD5 a8522f74aea43b8fe31b8075165da843 files/digest-abiword-2.2.11 69
+MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-2.4.1 68
+MD5 3b7f9b4ae874f21ec05137f8038bdd69 metadata.xml 165
diff --git a/app-office/abiword/abiword-2.2.10.ebuild b/app-office/abiword/abiword-2.2.10.ebuild
index f3acb6a963e1..b20a1cd53215 100644
--- a/app-office/abiword/abiword-2.2.10.ebuild
+++ b/app-office/abiword/abiword-2.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.10.ebuild,v 1.1 2005/09/28 15:53:19 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.10.ebuild,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.abisource.com"
 
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 SLOT="2"
 
diff --git a/app-office/abiword/abiword-2.2.11.ebuild b/app-office/abiword/abiword-2.2.11.ebuild
index 4e63edb4df9d..0dbaa279be22 100644
--- a/app-office/abiword/abiword-2.2.11.ebuild
+++ b/app-office/abiword/abiword-2.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.11.ebuild,v 1.1 2005/10/18 15:16:51 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.11.ebuild,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.abisource.com"
 
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 SLOT="2"
 
@@ -26,6 +26,7 @@ RDEPEND="virtual/x11
 	>=gnome-base/libglade-2
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
+	dev-libs/popt
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
 	xml2? ( >=dev-libs/libxml2-2.4.10 )
 	!xml2? ( dev-libs/expat )
diff --git a/app-office/abiword/abiword-2.4.1.ebuild b/app-office/abiword/abiword-2.4.1.ebuild
index 73481961c78f..c3c3ddc6ced8 100644
--- a/app-office/abiword/abiword-2.4.1.ebuild
+++ b/app-office/abiword/abiword-2.4.1.ebuild
@@ -1,70 +1,72 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.1.ebuild,v 1.1 2005/10/30 02:25:13 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:03 chriswhite Exp $
 
 inherit eutils fdo-mime alternatives
 
-IUSE="gnome jpeg spell xml2 debug"
-
-S_P=${S}/${PN}-plugins
 S=${WORKDIR}/${P}/abi
 
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com"
+HOMEPAGE="http://www.abisource.com/"
 
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnome spell xml2"
+
 LICENSE="GPL-2"
 SLOT="2"
 
 RDEPEND="virtual/x11
 	virtual/xft
-	>=media-libs/fontconfig-2.1
-	media-libs/libpng
+	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.2
 	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	sys-libs/zlib
+	>=media-libs/libpng-1.2
+	dev-libs/popt
+	>=media-libs/fontconfig-2.1
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
-	dev-libs/popt
 	xml2? ( >=dev-libs/libxml2-2.4.10 )
 	!xml2? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1.1 )
-	gnome? ( >=gnome-base/libgnomeui-2.2
-		>=gnome-base/libgnomeprint-2.2.1
-		>=gnome-base/libgnomeprintui-2.2.1
+	gnome? (
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnomeui-2.2
 		>=gnome-extra/gucharmap-1.4 )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	>=dev-util/pkgconfig-0.9"
 
-src_compile() {
 
-	# this is a hack since I don't want to go hack in the gnome-vfs headerfiles.
-	# The issue is about gnome-vfs containing "long long" which makes gcc 3.3.1 balk
-	cp configure configure.old
-	cat configure.old |sed s:-pedantic::g >configure
-	rm -f configure.old
-
-	econf \
-		`use_enable gnome` \
-		`use_enable gnome gucharmap` \
-		`use_with xml2 libxml2` \
-		`use_enable spell enchant` \
-		`use_enable debug` \
-		--enable-threads \
-		--without-ImageMagick \
+src_compile() {
+	# this is a hack since I don't want to go hack in the gnome-vfs
+	# headerfiles. The issue is about gnome-vfs containing "long long"
+	# which makes gcc 3.3.1 balk
+	sed -i -e 's:-pedantic::g' configure
+
+	local myconf="$(use_enable gnome) \
+		$(use_enable gnome gucharmap) \
+		$(use_enable spell enchant)   \
+		$(use_enable debug)           \
+		$(use_with xml2 libxml2)      \
+		--enable-threads    \
 		--disable-scripting \
-		--with-sys-wv || die
+		--with-sys-wv"
+
+	econf $myconf || die "./configure failed"
 
-	emake all-recursive || die
+	emake all-recursive || die "Compilation failed"
 }
 
 src_install() {
-
 	dodir /usr/{bin,lib}
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "Installation failed"
 
 	dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop
 
@@ -72,11 +74,10 @@ src_install() {
 	rm -f ${D}/usr/bin/abiword
 	dosym AbiWord-2.4 /usr/bin/abiword-2.4
 
-	dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
+	dodoc *.TXT docs/build/BUILD.TXT user/wp/readme.txt
 }
 
 pkg_postinst() {
-
 	fdo-mime_desktop_database_update
 
 	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index da6fd63d0085..669f23da60ac 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<herd>gnome-office</herd>
 </pkgmetadata>
diff --git a/app-office/borg/ChangeLog b/app-office/borg/ChangeLog
index 8a6b49410452..6df2d0854809 100644
--- a/app-office/borg/ChangeLog
+++ b/app-office/borg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/borg
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.1 2004/10/05 19:22:39 axxo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> borg-1.4.ebuild:
+  Added to ~ppc.
+
+*borg-1.4 (18 Dec 2004)
+
+  18 Dec 2004; Chris Aniszczyk <zx@gentoo.org> +borg-1.4.ebuild:
+  Version bump. Closes #72042
 
 *borg-1.3.2 (05 Oct 2004)
 
diff --git a/app-office/borg/Manifest b/app-office/borg/Manifest
index 3380f38283a5..c5a40868f4c5 100644
--- a/app-office/borg/Manifest
+++ b/app-office/borg/Manifest
@@ -1,4 +1,4 @@
-MD5 7e0ce41a968df423d50ac384660edf71 borg-1.3.2.ebuild 766
+MD5 82795b1ded966aa80ccafbf9155ae265 ChangeLog 615
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 89231d4a3aa849fcb3b5cb6e8af9103f files/digest-borg-1.3 61
-MD5 2e3ed875caa0037c530fd81875801a04 files/digest-borg-1.3.2 63
+MD5 245b18810acced0769004b0befa7d655 borg-1.4.ebuild 889
+MD5 b9b26f87940f58677145382f1828b66e files/digest-borg-1.4 62
diff --git a/app-office/borg/borg-1.4.ebuild b/app-office/borg/borg-1.4.ebuild
index 97aff4a86bdc..d25892b0954a 100644
--- a/app-office/borg/borg-1.4.ebuild
+++ b/app-office/borg/borg-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/app-office/borg/borg-1.4.ebuild,v 1.1 2004/12/19 04:41:15 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.4.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 inherit java-pkg
 
@@ -9,11 +9,12 @@ HOMEPAGE="http://borg-calendar.sourceforge.net/"
 SRC_URI="mirror://sourceforge/borg-calendar/borg_src_${PV}.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.4.1"
-RDEPEND=">=virtual/jdk-1.4"
+	app-arch/unzip
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/borg_src/BORG Calendar Common/"
 
diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index d366a2960075..2c89155066f4 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,9 +1,269 @@
 # ChangeLog for app-office/dia
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.1.1.1 2005/11/30 09:58:58 chriswhite Exp $
+
+*dia-0.94-r4 (02 Nov 2005)
+
+  02 Nov 2005; Mike Gardiner <obz@gentoo.org> +files/dia-0.94-png.patch,
+  +files/dia-0.94-sheets-png.tar.bz2, +dia-0.94-r4.ebuild:
+  Moved all of the xpm's to png's for the sheets. See bug #103401, and Gnome
+  Bug, #154079 for more information.
+
+  04 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r3.ebuild:
+  Stable on ppc.
+
+  03 Oct 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r3.ebuild:
+  Stable on ppc64 (bug #107916)
+
+  03 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> dia-0.94-r3.ebuild:
+  stable on alpha wrt bug #107916
+
+  03 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r3.ebuild:
+  Stable on sparc wrt #107916
+
+  03 Oct 2005; <mkay@gentoo.org> dia-0.94-r3.ebuild:
+  Marked stable on x86
+
+  03 Oct 2005; <dang@gentoo.org> dia-0.94-r3.ebuild:
+  Marked stable on amd64
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r3.ebuild:
+  Mark 0.94-r3 stable on ia64 #107916
+
+*dia-0.94-r3 (03 Oct 2005)
+
+  03 Oct 2005; <dang@gentoo.org> +files/dia-0.94-secure-eval.patch,
+  +dia-0.94-r3.ebuild:
+  Fix insecure python eval. Bug #107916
+
+  03 Oct 2005; Hardave Riar <hardave@gentoo.org> dia-0.94-r2.ebuild:
+  Keyworded ~mips.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r2.ebuild:
+  Mark 0.94-r2 stable on ia64
+
+  09 Sep 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r2.ebuild:
+  Mark 0.94-r2 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on ppc.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> dia-0.94-r2.ebuild:
+  add ~ia64
+
+  24 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on amd64, closes bug 103540.
+
+  23 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on sparc
+
+  23 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r2.ebuild:
+  Stable on x86.
+
+*dia-0.94-r2 (12 Jul 2005)
+
+  12 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r2.ebuild,
+  files/dia-0.94-db2man.patch:
+  New revision. Added patch from upstream's CVS repository to correctly
+  generate the man page, resolves bug #98610.
+
+  13 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> dia-0.94-r1.ebuild:
+  alpha stable
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r1.ebuild:
+  Stable on ppc64; dependency for bug #92995
+
+  27 May 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild:
+  Added dependency to docbook-xml-dtd-4.2. Resolves bug #93967.
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> dia-0.94-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/0.94-disable_python_gtk_import.patch, dia-0.94-r1.ebuild:
+  taking out python gtk check to avoid problems for people building with X
+  (#31589)
+
+  17 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/dia-0.94-gcc4.patch,
+  dia-0.94-r1.ebuild:
+  Adding patch to fix GCC4 compilation issues.
+
+  11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.94-r1.ebuild:
+  Stable on sparc
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> dia-0.94-r1.ebuild:
+  Stable on ppc.
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org> dia-0.94-r1.ebuild:
+  stable on amd64
+
+  09 Apr 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild:
+  Marked stable on x86.
+
+*dia-0.94-r1 (17 Mar 2005)
+
+  17 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> dia-0.94-r1.ebuild,
+  files/dia-0.94-no_font_cache.patch, files/dia-0.94-help.patch:
+  New revision. Added the `static' use flag. Added a patch to fix incorrect
+  font display due to a buggy cache implementation. Resolves bug #81227 and
+  possibly #67999. Thanks to Markus Luisser for his help on bug #81227.
+  Added a patch to fix the Help->Manual action under gnome. See bug #83726.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.93.ebuild:
+  Stable on alpha.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dia-0.93.ebuild:
+  stable on amd64.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> dia-0.93.ebuild:
+  Masked dia-0.93.ebuild stable for ppc
+
+*dia-0.94 (03 Sep 2004)
+
+  03 Sep 2004; L. Boshell <leonardop@gentoo.org> dia-0.94.ebuild:
+  New release.
+
+  20 Aug 2004; foser <foser@gentoo.org> dia-0.92.2.ebuild :
+  Added patch by Benoit Boissinot fixing the FT includes (#44113)
+
+  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.93.ebuild:
+  Stable on sparc
+
+  26 Jul 2004; Mike Gardiner <obz@gentoo.org> dia-0.93.ebuild:
+  Marked 0.93 x86, as requested in bug #57564
+
+  14 Jun 2004; L. Boshell <leonardop@gentoo.org> dia-0.93.ebuild:
+  Inherit from eutils.
+
+*dia-0.93 (07 Jun 2004)
+
+  07 Jun 2004; L. Boshell <leonardop@gentoo.org> dia-0.93.ebuild,
+  files/dia-0.93-fix_py_prefix.patch:
+  New release, resolves bug #50144. Dependencies corrections. Patch that
+  fixes python-related checks in the configure script.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> dia-0.92.2.ebuild:
+  Stable on alpha.
+
+  03 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> dia-0.92.2.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> dia-0.92.2.ebuild:
+  added amd64 keyword.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> dia-0.92.2.ebuild:
+  set ppc in keywords
+
+  10 Nov 2003; Aron Griffis <agriffis@gentoo.org> dia-0.92.2.ebuild:
+  Add ~alpha
+
+*dia-0.92.2 (07 Nov 2003)
+
+  07 Nov 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92.2.ebuild:
+  version bump
+
+*dia-0.92.1 (28 Oct 2003)
+
+  28 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92.1.ebuild:
+  bugfix release that solves a couple show stopping font bugs
+
+*dia-0.92 (21 Oct 2003)
+
+  21 Oct 2003; foser <foser@gentoo.org> dia-0.92.ebuild :
+  New stable release, remove some obsolete cruft and smoothen deps
+
+*dia-0.92_pre7 (15 Oct 2003)
+
+  15 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92_pre7.ebuild:
+  preemptive version bump because _pre4 had problems with non latin chars
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92_pre4.ebuild:
+  re-add cisco shapes patch
+
+*dia-0.92_pre4 (10 Oct 2003)
+
+  10 Oct 2003; Alastair Tse <liquidx@gentoo.org> dia-0.92_pre4.ebuild:
+  version bump. this is more stable than 0.91 and also fixes the pango text
+  problem with >=1.2.4
+
+*dia-0.91 (26 Mar 2003)
+
+  21 Sep 2003; foser <foser@gentoo.org> dia-0.91.ebuild :
+  Add gcc33 patch as supplied by brandy@gentoo.org (#21940)
+  Fix pango dep (#29121)
+  Use gnome2 eclass
+
+  31 Mar 2003; Alastair Tse <liquidx@gentoo.org> dia-0.91.ebuild:
+  fix dia menu desktop entry. python, pygtk and gnome dep fixes.
+
+  30 Mar 2003; Martin Holzer <mholzer@gentoo.org> dia-0.91.ebuild:
+  fixed pango dependency. closes #18480.
+
+  26 Mar 2003: Jungmin Seo <seo@gentoo.org> dia-0.91.ebuild :
+  Fixed 'SRC_URI'
+
+  26 Mar 2003; Jungmin Seo <seo@gentoo.org> dia-0.91.ebuild :
+  New version. now supports gtk+-2. 
+
+*dia-0.90-r2 (22 Oct 2002)
+
+  13 Feb 2003; Mark Guertin <gerk@gentoo.org> dia-0.90-r2.ebuild :
+  set ppc in keywords
+
+  11 Jan 2003; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Fixed png deps (bug #13408)
+
+  15 Dev 2002; Jack Morgan <jmorgan@gentoo.org> dia-0.90-r2.ebuild :
+  Added ~sparc keyword
+
+  23 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Added libart_lgpl dep for png USE
+  Thanks go to Ryan Tolboom <rxt1077@njit.edu> for notifying
+
+  22 Oct 2002; foser <foser@gentoo.org> dia-0.90-r2.ebuild :
+  Added truetype and png USE flags (bug #8916)
+
+*dia-0.90-r1 (21 Jun 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> dia-0.90-r1.ebuild :
+
+  LFH compliance and massive cleanup
+
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia-0.90.ebuild :
+  Added KEYWORDS.
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia-0.90-r1.ebuild :
+  Added KEYWORDS.
+
+  21 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
+
+  Added missing dep to dev-libs/libunicode. Fixes bug #3959
+
+
+*dia-0.90 (20 Jun 2002)
+
+  20 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
+
+  New version, SLOT, LICENSE added, and updated dependencies.
+
 
 *dia-0.88.1-r1 (1 Feb 2002)
 
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia-0.88.1-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index e69de29bb2d1..4dfd6e73bd45 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -0,0 +1,18 @@
+MD5 5c1fc913a41a807ab3e428cec7b0b990 ChangeLog 9070
+MD5 a2e230eb1d422d8da320507fb3de7838 dia-0.94-r1.ebuild 1479
+MD5 e64a64c8b1e5e3be5cf29d34c7374513 dia-0.94-r2.ebuild 1655
+MD5 126c5416e6df9153e3d83cc38a6559b6 dia-0.94-r3.ebuild 1738
+MD5 0246566e2cfd2158ad43ea52cb27c8c8 dia-0.94-r4.ebuild 2019
+MD5 275b4e09a76a808202872cae5ac90f7c files/0.94-disable_python_gtk_import.patch 313
+MD5 bf246d9c1eae9246fd3026d76077d7c3 files/dia-0.94-db2man.patch 901
+MD5 159070f80a109b691f1a945755bf2b7c files/dia-0.94-gcc4.patch 934
+MD5 364d452e7bd501c01910f613c066608e files/dia-0.94-help.patch 2766
+MD5 5825798492b196ec96d3757e9e1d0de8 files/dia-0.94-no_font_cache.patch 473
+MD5 8e5bd10e3f779bffcb360641329e3ef1 files/dia-0.94-png.patch 3093
+MD5 84f2dd6bc760e8dce273ceda328ef76e files/dia-0.94-secure-eval.patch 1940
+MD5 8905a098072f0dbd22a14ea86e790b85 files/dia-0.94-sheets-png.tar.bz2 5449
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r1 62
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r2 62
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r3 62
+MD5 c6257d6dad2b46a83757991db3f3e6c5 files/digest-dia-0.94-r4 62
+MD5 005c0ccc7908df18dd83361a36ed07ee metadata.xml 596
diff --git a/app-office/dia/dia-0.94-r1.ebuild b/app-office/dia/dia-0.94-r1.ebuild
index 6df77008389b..10c5a8d34b55 100644
--- a/app-office/dia/dia-0.94-r1.ebuild
+++ b/app-office/dia/dia-0.94-r1.ebuild
@@ -1,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-office/dia/dia-0.94-r1.ebuild,v 1.1 2005/03/17 08:12:06 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:58 chriswhite Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/dia/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="gnome png python static zlib"
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -24,7 +24,8 @@ RDEPEND=">=x11-libs/gtk+-2
 	gnome? ( >=gnome-base/libgnome-2.0
 		>=gnome-base/libgnomeui-2.0 )
 	python? ( >=dev-lang/python-1.5.2
-		>=dev-python/pygtk-1.99 )"
+		>=dev-python/pygtk-1.99 )
+	=app-text/docbook-xml-dtd-4.2*"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21
@@ -37,9 +38,15 @@ DOCS="AUTHORS ChangeLog KNOWN_BUGS NEWS README RELEASE-PROCESS THANKS TODO"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	# Disable python -c 'import gtk' during compile to prevent using
+	# X being involved (#31589)
+	epatch ${FILESDIR}/${PV}-disable_python_gtk_import.patch
+	autoconf
 
 	# Disable buggy font cache. See bug #81227.
 	epatch ${FILESDIR}/${P}-no_font_cache.patch
 	# Fix help display. See bug #83726.
 	epatch ${FILESDIR}/${P}-help.patch
+	# GCC 4 compile fixes
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
diff --git a/app-office/dia/dia-0.94-r2.ebuild b/app-office/dia/dia-0.94-r2.ebuild
index 9b3da9303d7a..18efe4424ff2 100644
--- a/app-office/dia/dia-0.94-r2.ebuild
+++ b/app-office/dia/dia-0.94-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r2.ebuild,v 1.1 2005/07/12 09:51:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:58 chriswhite Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/dia/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gnome png python static zlib"
 
 RDEPEND=">=x11-libs/gtk+-2
diff --git a/app-office/dia/dia-0.94-r3.ebuild b/app-office/dia/dia-0.94-r3.ebuild
index ebfe19d94a04..a6d71f7b3a32 100644
--- a/app-office/dia/dia-0.94-r3.ebuild
+++ b/app-office/dia/dia-0.94-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/app-office/dia/dia-0.94-r3.ebuild,v 1.1 2005/10/03 16:09:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r3.ebuild,v 1.1.1.1 2005/11/30 09:58:58 chriswhite Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/dia/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gnome png python static zlib"
 
 RDEPEND=">=x11-libs/gtk+-2
diff --git a/app-office/dia/dia-0.94-r4.ebuild b/app-office/dia/dia-0.94-r4.ebuild
index 5731ce2e6816..91e6cf5bf975 100644
--- a/app-office/dia/dia-0.94-r4.ebuild
+++ b/app-office/dia/dia-0.94-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/app-office/dia/dia-0.94-r4.ebuild,v 1.1 2005/11/02 14:07:25 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.94-r4.ebuild,v 1.1.1.1 2005/11/30 09:58:58 chriswhite Exp $
 
 inherit eutils gnome2 libtool
 
diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index da6fd63d0085..93a76132bc41 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome-office</herd>
+  <longdescription>
+    Dia is a gtk+ based diagram creation program. It can be used to
+    draw many different kinds of diagrams. It currently has special
+    objects to help draw entity relationship diagrams, UML diagrams,
+    flowcharts, network diagrams, and simple circuits. It is also
+    possible to add support for new shapes by writing simple XML
+    files, using a subset of SVG to draw the shape.
+  </longdescription>
 </pkgmetadata>
diff --git a/app-office/dia2code/ChangeLog b/app-office/dia2code/ChangeLog
index 38fcd1ad681e..fe6024cb315d 100644
--- a/app-office/dia2code/ChangeLog
+++ b/app-office/dia2code/ChangeLog
@@ -1,9 +1,33 @@
 # ChangeLog for app-office/dia2code
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/ChangeLog,v 1.1 2002/06/20 21:32:45 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/ChangeLog,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> dia2code-0.8.1.ebuild:
+  Mark 0.8.1 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> dia2code-0.8.1.ebuild:
+  add ~ia64
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> dia2code-0.8.1.ebuild:
+  Stable on sparc.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> dia2code-0.8.1.ebuild:
+  Added ~sparc keyword.
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> dia2code-0.8.1.ebuild:
+  Don't assign default to S; header fix
 
 *dia2code-0.8.1 (20 Jun 2002)
 
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  30 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> dia2code-0.8.1.ebuild:
+  Corrected a typo.
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> dia2code-0.8.1.ebuild :
+  Added LICENSE, KEYWORDS.
+
   20 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> dia2code-0.8.1.ebuild :
  
   Initial cvs import.
diff --git a/app-office/dia2code/Manifest b/app-office/dia2code/Manifest
index e69de29bb2d1..4f40d1e763a6 100644
--- a/app-office/dia2code/Manifest
+++ b/app-office/dia2code/Manifest
@@ -0,0 +1,4 @@
+MD5 123c302d75f14b55ad637c931e36841d ChangeLog 1165
+MD5 418e0cb97e7af4db6b9c8affbab4cd27 dia2code-0.8.1.ebuild 806
+MD5 3443ab8d52c02556db96eafb035b3521 files/digest-dia2code-0.8.1 65
+MD5 add4556f7fbed381a299100d2457069f metadata.xml 167
diff --git a/app-office/dia2code/dia2code-0.8.1.ebuild b/app-office/dia2code/dia2code-0.8.1.ebuild
index f61a87d55d94..7646907496d3 100644
--- a/app-office/dia2code/dia2code-0.8.1.ebuild
+++ b/app-office/dia2code/dia2code-0.8.1.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.1.ebuild,v 1.1 2002/06/20 21:32:45 stroke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Convert UML diagrams produced with Dia to various source code
-flavours."
+inherit flag-o-matic
+
+DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours."
+HOMEPAGE="http://dia2code.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://dia2code.sourceforge.net"
+
+LICENSE="GPL-2"
 SLOT="0"
-LICENCE="GPL-2"
+KEYWORDS="amd64 ia64 ppc sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-libs/libxml2"
-
 RDEPEND="${DEPEND}
 	>=app-office/dia-0.90.0"
 
-
 src_compile () {
 	# libxml2 header fix
-	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
-	./configure --prefix=/usr \
-                --host="${CHOST}"
+	append-flags -I/usr/include/libxml2/libxml
+	econf || die
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog README TODO
 	doman dia2code.1
 }
-
diff --git a/app-office/eqe/ChangeLog b/app-office/eqe/ChangeLog
index 4633ca686a66..6c72ee8cdd14 100644
--- a/app-office/eqe/ChangeLog
+++ b/app-office/eqe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/eqe
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/eqe/ChangeLog,v 1.1 2005/05/29 05:00:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/eqe/ChangeLog,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> eqe-1.0.4.ebuild:
+  Added to ~ppc.
 
 *eqe-1.0.4 (29 May 2005)
 
diff --git a/app-office/eqe/Manifest b/app-office/eqe/Manifest
index 095d0a720b13..75576c413644 100644
--- a/app-office/eqe/Manifest
+++ b/app-office/eqe/Manifest
@@ -1,2 +1,4 @@
-MD5 d4cbe7f7404293be270b0bad91b1ed51 eqe-1.0.4.ebuild 479
+MD5 dfc4e8d52950b79b3f9d9ac88830a724 ChangeLog 498
+MD5 97b2f4f9456d947a91b9a803efe96bae eqe-1.0.4.ebuild 576
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 ffa1708417bfe68b46bfc9bb36f06ab9 files/digest-eqe-1.0.4 61
diff --git a/app-office/eqe/eqe-1.0.4.ebuild b/app-office/eqe/eqe-1.0.4.ebuild
index d68c8d1bc383..94997ddd1cf6 100644
--- a/app-office/eqe/eqe-1.0.4.ebuild
+++ b/app-office/eqe/eqe-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/app-office/eqe/eqe-1.0.4.ebuild,v 1.1 2005/05/29 05:00:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/eqe/eqe-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 DESCRIPTION="A small LaTeX editor that produces images, with drag and drop
 support."
@@ -9,7 +9,7 @@ SRC_URI="http://rlehy.free.fr/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND="dev-perl/gtk2-perl
diff --git a/app-office/facturalux/ChangeLog b/app-office/facturalux/ChangeLog
index d70e0dd3643e..009d128b8ed8 100644
--- a/app-office/facturalux/ChangeLog
+++ b/app-office/facturalux/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for app-office/facturalux
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/facturalux/ChangeLog,v 1.1 2003/11/06 12:13:11 brandy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/facturalux/ChangeLog,v 1.1.1.1 2005/11/30 09:58:54 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> facturalux-0.4.ebuild:
+  Fix qt dep
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> facturalux-0.4.ebuild:
+  sync IUSE (missing)
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> facturalux-0.4.ebuild:
+  Don't assign default to S; header fix
 
 *facturalux-0.4 (07 Nov 2003)
 
   07 Nov 2003; Brandy Westcott brandy@gentoo.org facturalux-0.4.ebuild:
-  Initial import. Thanks to Miguel Revilla Rodr�guez <yo@miguelrevilla.com> for
+  Initial import. Thanks to Miguel Revilla Rodríguez <yo@miguelrevilla.com> for
   providing the ebuild template. Closes bug #20503.
 
diff --git a/app-office/facturalux/Manifest b/app-office/facturalux/Manifest
index e6b3e87f13cd..5a2d3453ff3b 100644
--- a/app-office/facturalux/Manifest
+++ b/app-office/facturalux/Manifest
@@ -1,5 +1,15 @@
-MD5 5d190a095fee4c43f45be947c3efc42d facturalux-0.4.ebuild 1355
-MD5 65c807581c66ce3ed58964d04fc6a3e5 ChangeLog 460
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee3c74dd610a241f94d600e5ad011dff facturalux-0.4.ebuild 1321
+MD5 58e46bc39246adefa47c7cc741dde06b ChangeLog 862
 MD5 3364b5f5a39640c81b871eb91173ff75 files/facturalux-0.4-gentoo.patch 2042
 MD5 8cc773b781c5ea9afc0bedc6a8a7500b files/facturalux-base-0.0-gentoo.patch 3416
 MD5 6f37b351d44e9d4cd4a1cbe8d05be6dc files/digest-facturalux-0.4 145
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDKzrfLLFUmVNQ7rkRAut0AJ4yAlNTtIWqQzrqGq/018sFSMFoIgCeIAnL
+trH0lniGjmv5iLbkqxddsv4=
+=kMPf
+-----END PGP SIGNATURE-----
diff --git a/app-office/facturalux/facturalux-0.4.ebuild b/app-office/facturalux/facturalux-0.4.ebuild
index 60fcf456b6b0..88ce49f8359c 100644
--- a/app-office/facturalux/facturalux-0.4.ebuild
+++ b/app-office/facturalux/facturalux-0.4.ebuild
@@ -1,54 +1,48 @@
-# Copyright 1999-2003 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-office/facturalux/facturalux-0.4.ebuild,v 1.1 2003/11/06 12:13:11 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/facturalux/facturalux-0.4.ebuild,v 1.1.1.1 2005/11/30 09:58:54 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="General purpose ERP/CRM software"
-HOMEPAGE="http://www.facturalux.org"
+HOMEPAGE="http://www.facturalux.org/"
 SRC_URI="mirror://sourceforge/facturalux/${P}.tar.bz2
 	mirror://sourceforge/facturalux/personalizacion-base-0.0.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
-DEPEND=">=x11-libs/qt-3
+DEPEND="=x11-libs/qt-3*
 	sys-libs/zlib"
 RDEPEND="dev-db/postgresql"
 
 src_unpack() {
-
 	unpack ${A}
-	cd ${WORKDIR}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 	epatch ${FILESDIR}/${PN}-base-0.0-gentoo.patch
-
 }
 
 src_compile() {
-
 	cd ${S}
 	econf || die "configure failed"
 	emake || die "parallel make failed"
 	cd ${WORKDIR}/base-0.0
 	econf || die "base-0.0 configure failed"
 	emake || die "base-0.0 parallel make failed"
-
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die "install failed"
 	cd ${WORKDIR}/base-0.0
 	make DESTDIR=${D} install || die "base-0.0 install failed"
 
 	cd ${S}
-	dodoc AUTHORS ChangeLog COPYING INSTALL LEEME NOTES README TODO
-
+	dodoc AUTHORS ChangeLog INSTALL LEEME NOTES README TODO
 }
 
 pkg_postinst() {
-
 	einfo
 	einfo "You must create a new database and a proper user:"
 	einfo
@@ -56,5 +50,4 @@ pkg_postinst() {
 	einfo "$ createdb -E UNICODE facturalux"
 	einfo "$ createuser --pwprompt password"
 	einfo
-
 }
diff --git a/app-office/gbib/ChangeLog b/app-office/gbib/ChangeLog
index a29b1c76f08d..102a744c4db0 100644
--- a/app-office/gbib/ChangeLog
+++ b/app-office/gbib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/gbib
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/ChangeLog,v 1.1 2004/02/23 18:00:29 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/ChangeLog,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> gbib-0.1.2.ebuild:
+  Stable on sparc
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> gbib-0.1.2.ebuild:
+  Added ~sparc keyword.
+
+  05 May 2004; Mamoru KOMACHI <usata@gentoo.org> gbib-0.1.2.ebuild:
+  Stable on x86
 
 *gbib-0.1.2 (24 Feb 2004)
 
diff --git a/app-office/gbib/Manifest b/app-office/gbib/Manifest
index b6e5e2c54302..3c25c075a12d 100644
--- a/app-office/gbib/Manifest
+++ b/app-office/gbib/Manifest
@@ -1,3 +1,5 @@
-MD5 6fcd2af3a7a64d72a4dcb1e970e8da18 gbib-0.1.2.ebuild 1338
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 13954c77e7a61feff9e972191f23d2ef gbib-0.1.2.ebuild 1193
+MD5 bb387bf3639772f7778f0d18acbd661b ChangeLog 707
 MD5 0ceb1e8222c34d072cc89b137d119fbd files/gbib-gentoo.patch 12670
 MD5 7bfe9650fdddf48a274cf10b0430e7ba files/digest-gbib-0.1.2 62
diff --git a/app-office/gbib/gbib-0.1.2.ebuild b/app-office/gbib/gbib-0.1.2.ebuild
index 27a0892c871e..b24485fc9c3e 100644
--- a/app-office/gbib/gbib-0.1.2.ebuild
+++ b/app-office/gbib/gbib-0.1.2.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/gbib-0.1.2.ebuild,v 1.1 2004/02/23 18:00:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gbib/gbib-0.1.2.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
-DESCRIPTION="gBib is a user-friendly editor and browser for BibTeX bibliographic databases."
-HOMEPAGE="http://gbib.seul.org"
+inherit eutils
+
+DESCRIPTION="user-friendly editor and browser for BibTeX bibliographic databases"
+HOMEPAGE="http://gbib.seul.org/"
 SRC_URI="ftp://ftp.seul.org/pub/gbib/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
@@ -30,7 +32,7 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D} || die
-	dodoc ABOUT-NLS AUTHORS CHANGES COPYING INSTALL README TODO || die
+	dodoc ABOUT-NLS AUTHORS CHANGES INSTALL README TODO || die
 }
 
 pkg_postinst() {
diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog
index 6438e0e172ba..cf9f1db2a54b 100644
--- a/app-office/glabels/ChangeLog
+++ b/app-office/glabels/ChangeLog
@@ -1,6 +1,74 @@
 # ChangeLog for app-office/glabels
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.1 2004/08/10 23:21:02 leonardop Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> glabels-2.0.3.ebuild:
+  Stable on ppc.
+
+  13 Aug 2005; Luis Medinas <metalgod@gentoo.org> glabels-2.0.3.ebuild:
+  Stable on AMD64.
+
+  08 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> glabels-2.0.3.ebuild:
+  Stable on sparc
+
+  07 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> glabels-2.0.3.ebuild:
+  Stable on x86.
+
+*glabels-2.0.3 (03 Jul 2005)
+
+  03 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> glabels-2.0.3.ebuild,
+  files/glabels-2.0.3-update_dbs_switch.patch:
+  New release. Modified patch to enable/disable running
+  update-{mime,desktop}-database.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> glabels-2.0.2.ebuild:
+  stable on amd64
+
+  11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> glabels-2.0.2.ebuild:
+  Stable on sparc
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> glabels-2.0.2.ebuild:
+  Stable on ppc.
+
+  09 Apr 2005; Leonardo Boshell <leonardop@gentoo.org> glabels-2.0.2.ebuild:
+  Marked stable on x86.
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> glabels-2.0.1.ebuild:
+  Stable on ppc.
+
+*glabels-2.0.2 (07 Mar 2005)
+
+  07 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> glabels-2.0.2.ebuild,
+  files/glabels-2.0.2-no_update_desktop_db.patch:
+  New release. Updated patch.
+
+  29 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> glabels-2.0.1.ebuild:
+  Stable on sparc
+
+  25 Nov 2004; Leonardo Boshell <leonardop@gentoo.org> glabels-2.0.1.ebuild:
+  Marked stable on x86. Added support for the `static' USE flag.
+
+  26 Nov 2004; Mike Gardiner <obz@gentoo.org> glabels-1.93.3.ebuild,
+  glabels-2.0.1.ebuild:
+  Added app-text/scrollkeeper dep, see bug #72477
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  glabels-1.93.3.ebuild:
+  Masked glabels-1.93.3.ebuild stable for ppc
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> glabels-1.93.3.ebuild,
+  glabels-2.0.1.ebuild:
+  fix depend syntax 58347
+
+*glabels-2.0.1 (03 Sep 2004)
+
+  03 Sep 2004; L. Boshell <leonardop@gentoo.org> glabels-2.0.1.ebuild,
+  files/glabels-2.0.1-sandbox_fix.patch:
+  New version. Added patch to fix a potential sandbox violation when
+  desktop-file-utils is installed. Resolves bug #60545.
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> glabels-1.93.3.ebuild:
+  Stable on sparc
 
 *glabels-2.0.0 (10 Aug 2004)
 
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index ec05d70899f8..1653c698a8e1 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1,6 +1,5 @@
-MD5 0a96e44a1ce9d8922b1051217c2230e5 ChangeLog 1824
-MD5 54b7f17aa1f3cf4e8cc03858fd99070c metadata.xml 554
-MD5 6532b3dacea2acc13f27ef2f96b2f3b8 glabels-1.93.3.ebuild 961
-MD5 fe4974f637d8581daf311534bcf79cb8 glabels-2.0.0.ebuild 1032
-MD5 beeadac937d901cb1fe5fb039672d3cc files/digest-glabels-2.0.0 66
-MD5 9e2ffe73924322314756d4f75f0f7298 files/digest-glabels-1.93.3 67
+MD5 2daf317fbd1c5396efdce300069b0b31 ChangeLog 4241
+MD5 994518077c87cf6a6ec073abb4d0ba34 files/digest-glabels-2.0.3 66
+MD5 b001ec5708baea159cec920921192618 files/glabels-2.0.3-update_dbs_switch.patch 2017
+MD5 fa8b5751b5daa763f2bbe486b09ce5f3 glabels-2.0.3.ebuild 1310
+MD5 7a0a5767404a0f47126ba1db87515d51 metadata.xml 561
diff --git a/app-office/glabels/glabels-2.0.3.ebuild b/app-office/glabels/glabels-2.0.3.ebuild
index f290dfb25302..4c1632a0d14b 100644
--- a/app-office/glabels/glabels-2.0.3.ebuild
+++ b/app-office/glabels/glabels-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-office/glabels/glabels-2.0.3.ebuild,v 1.1 2005/07/03 14:14:59 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 inherit eutils gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="static"
 
 RDEPEND=">=dev-libs/glib-2.2
@@ -31,8 +31,11 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-G2CONF="${G2CONF} --disable-update-mimedb --disable-update-desktopdb \
-$(use_enable static)"
+
+pkg_setup() {
+	G2CONF="--disable-update-mimedb --disable-update-desktopdb \
+		$(use_enable static)"
+}
 
 src_unpack() {
 	unpack ${A}
@@ -41,12 +44,8 @@ src_unpack() {
 	# Avoid sandbox violation. See bug #60545.
 	epatch ${FILESDIR}/${P}-update_dbs_switch.patch
 
-	einfo "Running aclocal"
-	aclocal || die "Aclocal failed"
-	einfo "Running autoconf"
-	autoconf || die "Autoconf failed"
-	einfo "Running automake"
-	automake || die "Automake failed"
-	einfo "Running libtoolize"
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
 	libtoolize --copy --force
 }
diff --git a/app-office/glabels/metadata.xml b/app-office/glabels/metadata.xml
index f7e7b529baea..92e6d3b05b42 100644
--- a/app-office/glabels/metadata.xml
+++ b/app-office/glabels/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>gnome</herd>
+  <herd>gnome-office</herd>
   <maintainer>
     <email>leonardop@gentoo.org</email>
     <name>Leonardo Boshell</name>
diff --git a/app-office/gnofin/ChangeLog b/app-office/gnofin/ChangeLog
index 38817a977d10..93556972551c 100644
--- a/app-office/gnofin/ChangeLog
+++ b/app-office/gnofin/ChangeLog
@@ -1,9 +1,27 @@
 # ChangeLog for app-office/gnofin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnofin/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnofin/ChangeLog,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> gnofin-0.8.4.ebuild:
+  Added ~sparc keyword.
+
+  23 Nov 2004; Jason Huebel,,, <jhuebel@gentoo.org> gnofin-0.8.4.ebuild:
+  stable on amd64
+
+  18 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> gnofin-0.8.4.ebuild:
+  add missing IUSE; die instead of assert; tidy
+
+  25 Mar 2004; Jason Huebel,,, <jhuebel@gentoo.org> gnofin-0.8.4.ebuild:
+  updated ebuild to inherit gnuconfig and run gnuconfig_update
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gnofin-0.8.4.ebuild:
+  Don't assign default to S; header fix
 
 *gnofin-0.8.4 (1 Feb 2002)
 
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> gnofin-0.8.4.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/app-office/gnofin/Manifest b/app-office/gnofin/Manifest
index e69de29bb2d1..df9fcb9d70d4 100644
--- a/app-office/gnofin/Manifest
+++ b/app-office/gnofin/Manifest
@@ -0,0 +1,4 @@
+MD5 55df9be189cd461b0672395f18f61aaf ChangeLog 1333
+MD5 c7ecd0f11a7a12976e3fa838d3979ae1 files/digest-gnofin-0.8.4 64
+MD5 c9db82f60dfe868c86439ccef4e820cb gnofin-0.8.4.ebuild 954
+MD5 add4556f7fbed381a299100d2457069f metadata.xml 167
diff --git a/app-office/gnofin/files/digest-gnofin-0.8.4 b/app-office/gnofin/files/digest-gnofin-0.8.4
index ef296ed7caeb..f67c617a25a3 100644
--- a/app-office/gnofin/files/digest-gnofin-0.8.4
+++ b/app-office/gnofin/files/digest-gnofin-0.8.4
@@ -1 +1 @@
-MD5 eb552f99fcf605b699519671ca4102f1 gnofin-0.8.4.tar.gz
+MD5 eb552f99fcf605b699519671ca4102f1 gnofin-0.8.4.tar.gz 413231
diff --git a/app-office/gnofin/gnofin-0.8.4.ebuild b/app-office/gnofin/gnofin-0.8.4.ebuild
index bfbc4113e8c0..27f01b80d236 100644
--- a/app-office/gnofin/gnofin-0.8.4.ebuild
+++ b/app-office/gnofin/gnofin-0.8.4.ebuild
@@ -1,32 +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>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnofin/gnofin-0.8.4.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnofin/gnofin-0.8.4.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="a personal finance application for GNOME"
-SRC_URI="ftp://gnofin.sourceforge.net/pub/gnofin/stable/source/${A}
-	 http://download.sourceforge.net/gnofin/${A}
-	 http://jagger.ME.Berkley.EDU/~dfisher/gnofin/stable/source/${A}"
+inherit gnuconfig
 
+DESCRIPTION="a personal finance application for GNOME"
 HOMEPAGE="http://gnofin.sourceforge.net"
+SRC_URI="ftp://gnofin.sourceforge.net/pub/gnofin/stable/source/${P}.tar.gz
+	 http://download.sourceforge.net/gnofin/${P}.tar.gz"
 
-DEPEND=">=gnome-base/gnome-libs-1.2.4
-	>=gnome-base/libxml-1.8.10"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-  try make
-}
-
-src_install() {                               
-  try make prefix=${D}/opt/gnome install
-  dodoc AUTHORS COPYING* ChangeLog NEWS
-  dodoc README*
-}
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 ~sparc"
+IUSE=""
 
+DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
+	>=dev-libs/libxml-1.8.10"
 
+src_compile() {
+	gnuconfig_update
 
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc					\
+		    --localstatedir=/var/lib || die
+	emake || die
+}
 
+src_install() {
+	make prefix=${D}/usr						\
+	     sysconfdir=${D}/etc					\
+	     localstatedir=${D}/var/lib install || die
 
+	dodoc AUTHORS COPYING* ChangeLog NEWS README*
+}
diff --git a/app-office/gnotime/ChangeLog b/app-office/gnotime/ChangeLog
index 45b14146e9d0..aca074ea7715 100644
--- a/app-office/gnotime/ChangeLog
+++ b/app-office/gnotime/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for app-office/gnotime
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/ChangeLog,v 1.1 2003/08/27 08:44:06 obz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/ChangeLog,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
+
+  02 Nov 2005; Mike Gardiner <obz@gentoo.org> gnotime-2.2.1.ebuild:
+  Moved dependency on libgtkhtml to get the correct slot (3.1), see bug #110463
+
+*gnotime-2.2.1 (26 Sep 2005)
+
+  26 Sep 2005; Mike Gardiner <obz@gentoo.org> +gnotime-2.2.1.ebuild:
+  Version bump as requested (many times) in bug #48893. Thanks to all for
+  testing, and patience.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> gnotime-2.1.7.ebuild:
+  Added to ~ppc.
+
+  02 May 2005; Alex Howells <astinus@gentoo.org> gnotime-2.1.7.ebuild:
+  Keywording ~amd64 with regards to Bug:91202
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> gnotime-2.1.7.ebuild:
+  Stable on sparc.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> gnotime-2.1.7.ebuild:
+  Added ~sparc keyword.
+
+*gnotime-2.1.7 (14 Feb 2004)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> gnotime-2.1.7.ebuild:
+  version bump
+
+  18 Nov 2003; Mike Gardiner <obz@gentoo.org> gnotime-2.1.6.ebuild:
+  Corrected libgtkhtml dep to be =version-2* to emerge the correct version.
+  Fixes bug #33673
+
+  06 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> gnotime-2.1.6.ebuild:
+  foser said it was ok to mark stable.
+
+  27 Aug 2003; Mike Gardiner <obz@gentoo.org> gnotime-2.1.6.ebuild:
+  Added intltool to DEPENDS
 
 *gnotime-2.1.6 (27 Aug 2003)
 
diff --git a/app-office/gnotime/Manifest b/app-office/gnotime/Manifest
index 71e1c14e2509..8d1f21db8ec1 100644
--- a/app-office/gnotime/Manifest
+++ b/app-office/gnotime/Manifest
@@ -1,2 +1,8 @@
-MD5 c2b3d01c073085469862c0b4e890fa09 gnotime-2.1.6.ebuild 751
+MD5 98e52fb309f3e5e11b1f707c8e109025 ChangeLog 1550
 MD5 18a75209188e9df91af0dd0569bf2634 files/digest-gnotime-2.1.6 65
+MD5 e16e9c282906881d9c0c8796358d7bda files/digest-gnotime-2.1.7 65
+MD5 f905bf17fba79f2ef4439a7d7ac1b2c4 files/digest-gnotime-2.2.1 66
+MD5 d8d55d3bde3b20f13229747fa1c20392 gnotime-2.1.6.ebuild 909
+MD5 3675f1a9a321d393facf561d5db90fa9 gnotime-2.1.7.ebuild 923
+MD5 217c64be543e18e7a56c3690e7a5c8be gnotime-2.2.1.ebuild 985
+MD5 9793bc407b43b97148304cead5e3ce50 metadata.xml 169
diff --git a/app-office/gnotime/gnotime-2.1.6.ebuild b/app-office/gnotime/gnotime-2.1.6.ebuild
index 0fadfe16af82..7decdacc7788 100644
--- a/app-office/gnotime/gnotime-2.1.6.ebuild
+++ b/app-office/gnotime/gnotime-2.1.6.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/app-office/gnotime/gnotime-2.1.6.ebuild,v 1.1 2003/08/27 08:44:06 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/gnotime-2.1.6.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit gnome2
 
-DESCRIPTION="A GNOME utility for tracking the amount of time spent on activities, and calculating data, such as pay rates, from those times."
+DESCRIPTION="A utility for tracking the amount of time spent on activities, and calculating data, such as pay rates, from those times."
 HOMEPAGE="http://gttr.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gttr/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 RDEPEND=">=gnome-base/libgnome-2.0
 	>=gnome-base/libgnomeui-2.0.3
 	>=gnome-base/libglade-2.0
-	>=gnome-extra/libgtkhtml-2.0
+	=gnome-extra/libgtkhtml-2*
 	>=gnome-base/gconf-2.0
 	dev-libs/libxml2
 	dev-util/guile
 	dev-libs/popt"
-	
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	dev-util/intltool
 	>=app-text/scrollkeeper-0.3.11"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/app-office/gnotime/gnotime-2.1.7.ebuild b/app-office/gnotime/gnotime-2.1.7.ebuild
index d0321b289a3d..510885f857da 100644
--- a/app-office/gnotime/gnotime-2.1.7.ebuild
+++ b/app-office/gnotime/gnotime-2.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/gnotime-2.1.7.ebuild,v 1.1 2004/02/14 14:43:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/gnotime-2.1.7.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gttr/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc sparc ~x86"
 IUSE=""
 
 RDEPEND=">=gnome-base/libgnome-2.0
diff --git a/app-office/gnotime/gnotime-2.2.1.ebuild b/app-office/gnotime/gnotime-2.2.1.ebuild
index 1e5244c8186b..addfe535b104 100644
--- a/app-office/gnotime/gnotime-2.2.1.ebuild
+++ b/app-office/gnotime/gnotime-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/app-office/gnotime/gnotime-2.2.1.ebuild,v 1.1 2005/09/26 16:50:35 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/gnotime-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit gnome2
 
@@ -18,7 +18,7 @@ RDEPEND=">=gnome-base/libgnome-2.0
 	>=gnome-base/gnome-vfs-2
 	>=dev-libs/glib-2
 	>=gnome-base/libglade-2.0
-	>=gnome-extra/libgtkhtml-3.1
+	=gnome-extra/libgtkhtml-3.2*
 	>=gnome-base/gconf-2.0
 	x11-libs/pango
 	dev-libs/libxml2
diff --git a/app-office/gnotime/metadata.xml b/app-office/gnotime/metadata.xml
index 2bee4083167b..e63e8476f479 100644
--- a/app-office/gnotime/metadata.xml
+++ b/app-office/gnotime/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-<herd>gnome</herd>
-<maintainer>
-	<email>gnome@gentoo.org</email>
-</maintainer>
+  <herd>gnome-office</herd>
 </pkgmetadata>
 
diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index e7bc7fd8bf69..e98d589e36fd 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,293 @@
 # ChangeLog for app-office/gnucash
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
+
+*gnucash-1.8.12 (27 Oct 2005)
+
+  27 Oct 2005; Seemant Kulleen <seemant@gentoo.org> +gnucash-1.8.12.ebuild:
+  version bump thanks to: Sascha Silbe for opening bug #109920 and Brian
+  Dolbec for debugging the version bump extensively
+
+  16 Sep 2005; Seemant Kulleen <seemant@gentoo.org> -gnucash-1.8.8.ebuild:
+  remove old cruft version
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> gnucash-1.8.11.ebuild:
+  add ~ia64
+
+  05 Aug 2005; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.8.ebuild,
+  gnucash-1.8.9.ebuild, -gnucash-1.8.10.ebuild, gnucash-1.8.11.ebuild:
+  fix mentions of xorg-x11 to virtual/x11. Closes bug #85495 by Sergey Okhapkin
+
+  17 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.9.ebuild:
+  bump docs to 1.8.5, closing bug #74291 by James M <Mess1214@hotmail.com>.
+  Sorry for the delay, guys
+
+*gnucash-1.8.11 (14 Mar 2005)
+
+  14 Mar 2005; Seemant Kulleen <seemant@gentoo.org> +gnucash-1.8.11.ebuild:
+  version bump thanks to: Urs Joss <tschenturs@gmx.ch> in bug #81224
+
+  14 Feb 2005; Simon Stelling <blubb@gentoo.org> gnucash-1.8.10.ebuild:
+  added ~amd64
+
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> gnucash-1.8.9.ebuild:
+  Stable on alpha.
+
+  13 Jan 2005; Hanno Boeck <hanno@gentoo.org> gnucash-1.8.10.ebuild:
+  Change dep from aqhbci-wizard-kde to aqhbci-qt-wizard.
+
+  02 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> gnucash-1.8.10.ebuild:
+  ~alpha keyword, bug 73702.
+
+  03 Jan 2005; Chris White <chriswhite@gentoo.org> gnucash-1.8.10.ebuild:
+  ~ppc marked per bug #73702.
+
+  30 Dec 2004; Jason Wever <weeve@gentoo.org> gnucash-1.8.10.ebuild:
+  Added ~sparc keyword wrt bug #73702.
+
+  30 Dec 2004; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.10.ebuild,
+  gnucash-1.8.8.ebuild, gnucash-1.8.9.ebuild:
+  added a check for whether bitmap-fonts support exists in xorg-x11. Closes
+  bug #75910 by Volkov Peter <torre_cremata@mail.ru>
+
+  30 Dec 2004; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.10.ebuild:
+  changed hbci dependency from aqhbci to aqhbci-wizard-kde, closing bug #75961
+  by Arudil <mmueller12345@yahoo.de>. Note that this now adds qt as a big fat
+  dependency for gnucash, so be aware. Remove alpha and sparc keywords
+  again.
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gnucash-1.8.10.ebuild:
+  Add back ~alpha keyword, bug 73702.
+
+  26 Dec 2004; Jason Wever <weeve@gentoo.org> gnucash-1.8.10.ebuild:
+  Added ~sparc keyword wrt bug #73702.
+
+*gnucash-1.8.10 (26 Dec 2004)
+
+  26 Dec 2004; Seemant Kulleen <seemant@gentoo.org> +gnucash-1.8.10.ebuild,
+  gnucash-1.8.9.ebuild:
+  version bump, thanks to: Martin Gramatke <xmit@gmx.de> and Urs Joss
+  <tschenturs@gmx.ch> in bug #73702
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> gnucash-1.8.9.ebuild:
+  Stable on sparc.
+
+  10 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> gnucash-1.8.9.ebuild:
+  Fixed missing eclass in inherit (eutils). Neccessary for get_libdir().
+
+  18 Oct 2004; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.8.ebuild:
+  Change gnucash-docs to 1.8.4 to solve a similar problem with gnucash-1.8.8
+  that was solved earlier with 1.8.9. Closes bug #67966 by Bruce Guenter
+  <bruceg@em.ca>
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnucash-1.8.7.ebuild, gnucash-1.8.8.ebuild, gnucash-1.8.9.ebuild:
+  Masked gnucash-1.8.9.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnucash-1.8.7.ebuild, gnucash-1.8.8.ebuild:
+  Masked gnucash-1.8.8.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnucash-1.8.7.ebuild:
+  Masked gnucash-1.8.7.ebuild stable for ppc
+
+  19 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> gnucash-1.8.9.ebuild:
+  Marked ~amd64. Fixes BUG #39937.
+
+  22 Jul 2004; Seemant Kulleen <seemant@gentoo.org> -gnucash-1.8.4.ebuild,
+  -gnucash-1.8.5.ebuild, -gnucash-1.8.6.ebuild, gnucash-1.8.9.ebuild:
+  info pages fix thanks to: Doug Weimer <dweimer@socal.rr.com> who provided the
+  fix in bug #52171 by Alan Schmitt <alan.schmitt@polytechnique.org>. Also, move
+  1.8.9 to stable to fix the compilation issue being reported on the forums
+
+  21 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> gnucash-1.6.8.ebuild,
+  gnucash-1.8.4.ebuild, gnucash-1.8.5.ebuild, gnucash-1.8.6.ebuild,
+  gnucash-1.8.7.ebuild, gnucash-1.8.8.ebuild, gnucash-1.8.9.ebuild:
+  don't install COPYING
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnucash-1.6.8.ebuild,
+  gnucash-1.8.4.ebuild, gnucash-1.8.5.ebuild, gnucash-1.8.6.ebuild,
+  gnucash-1.8.7.ebuild, gnucash-1.8.8.ebuild, gnucash-1.8.9.ebuild:
+  Fix use invocation
+
+  11 May 2004; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.9.ebuild:
+  added quotes local USE flag to enable online stock quote retrieval. Closes
+  bug #29083 by SpanKY <vapier@gentoo.org>
+
+*gnucash-1.8.9 (11 May 2004)
+
+  11 May 2004; Seemant Kulleen <seemant@gentoo.org> +gnucash-1.8.9.ebuild:
+  version bump, as per bug #47679 by: Urs Joss <tschenturs@gmx.ch>. This should
+  also close bug #27978 by Carl A. Dunham <gentoo-bugs@carldunham.com>, which
+  was as a result of invaluable assistance from: Chris Lyttle (Wilddev)
+  <chris@wilddev.net>
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> gnucash-1.6.8.ebuild:
+  Add die following econf for bug 48950
+
+  10 Apr 2004; Jason Wever <weeve@gentoo.org> gnucash-1.8.8.ebuild:
+  Added ~sparc keyword, helps resolve bug #47243.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gnucash-1.8.8.ebuild:
+  stable on alpha
+
+  01 Jan 2004; <spider@gentoo.org> gnucash-1.8.8.ebuild:
+  KEYWORDS="x86"
+
+*gnucash-1.8.8 (01 Dec 2003)
+
+  01 Dec 2003; <spider@gentoo.org> gnucash-1.8.8.ebuild:
+  Versionbump. Seems to work nicely
+
+  18 Nov 2003; Aron Griffis <agriffis@gentoo.org> gnucash-1.8.7.ebuild:
+  Stable on x86 and alpha
+
+*gnucash-1.8.7 (16 Sep 2003)
+
+  16 Sep 2003; Aron Griffis <agriffis@gentoo.org> gnucash-1.8.7.ebuild:
+  Version bump to 1.8.7 and remove the libofx hack (no longer needed)
+
+*gnucash-1.8.6 (14 Sep 2003)
+
+  14 Sep 2003; Aron Griffis <agriffis@gentoo.org> gnucash-1.8.6.ebuild:
+  Version bump
+
+  05 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.4.ebuild,
+  gnucash-1.8.5.ebuild:
+  added docbook-xml-dtd-4.1.2 dep (#27932)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.5.ebuild:
+  1.8.5 should dep on openhbci-0.9.13
+
+*gnucash-1.8.5 (02 Sep 2003)
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> :
+  version bump. made user docs install without doc useflag. updated docs to
+  version 1.8.3
+
+  24 Jul 2003; Tavis Ormandy <taviso@gentoo.org> gnucash-1.8.4.ebuild:
+  ~alpha
+
+  16 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.4.ebuild:
+  marked stable for x86
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.2.ebuild,
+  gnucash-1.8.4.ebuild:
+  added pkgconfig dep
+
+  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org> gnucash-1.8.4.ebuild:
+  xpm is provided by xfree
+
+  12 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.4.ebuild:
+  filtering -fno-inline because gnucash uses GLIB_INLINEs (#22591)
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.6.8.ebuild,
+  gnucash-1.8.1.ebuild, gnucash-1.8.2-r1.ebuild, gnucash-1.8.2.ebuild,
+  gnucash-1.8.3-r1.ebuild, gnucash-1.8.3.ebuild, gnucash-1.8.4.ebuild,
+  files/gnucash-1.8.3-qif-file.patch:
+  cleanup and fixed gal deps
+
+*gnucash-1.8.4 (27 May 2003)
+
+  27 May 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.4.ebuild:
+  version bump. removed backported patch for QIF import
+
+*gnucash-1.8.3-r1 (18 May 2003)
+
+  18 May 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.3-r1.ebuild,
+  files/gnucash-1.8.3-qif-file.patch:
+  adds fix for qif import thanks to Chris Lyttle (#17277)
+
+*gnucash-1.8.3 (14 May 2003)
+
+  16 May 2003; foser <foser@gentoo.org> gnucash-1.{6.8,8.3}.ebuild :
+  Added popt dep (#21088)
+
+  14 May 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.3.ebuild:
+  version bump
+
+  01 May 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.2-r1.ebuild:
+  fixed scrollkeeper problem and digest
+
+*gnucash-1.8.2-r1 (28 Apr 2003)
+
+  28 Apr 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.2-r1.ebuild:
+  added docs support
+  workaround ./configure doesn't accept --disable-*
+
+  28 Apr 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.8.2-r1.ebuild:
+  new gnucash that has ofx and hbci support.
+  also depends on new guile-1.6.x
+
+*gnucash-1.8.2 (21 Mar 2003)
+
+  21 Mar 2003; foser <foser@gentoo.org> gnucash-1.8.2.ebuild :
+  Fixed SRC_URI and a couple of other minor things
+ 
+*gnucash-1.8.1 (17 Mar 2003)
+
+  19 Mar 2003; Jon Nall <nall@gentoo.org> gnucash-1.8.1.ebuild :
+  added ~ppc
+
+  17 Mar 2003; Carl Perry <edolnx@gentoo.org> gnucash-1.8.1.ebuild, 
+  gnucash-1.6.8.ebuild: Fixed broken dependancy in 1.8.1 so it compiles 
+  now and modified g-wrap dependancy in 1.6.8 to require a version less 
+  than 1.3 - both compile cleanly on a virgin system or if the other was
+  already installed.
+
+*gnucash-1.8.1 (17 Mar 2003)
+ 
+  17 Mar 2003; Carl Perry <edolnx@gentoo.org> gnucash-1.8.1.ebuild:
+  Added new release of gnucash for testing, contains many bug fixes and
+  start of small business support.
+
+*gnucash-1.6.8 (05 Sep 2002)
+
+  16 Mar 2003; Martin Holzer <mholzer@gentoo.org> gnucash-1.6.6-r1.ebuild,
+  gnucash-1.6.6.ebuild, gnucash-1.6.7.ebuild, gnucash-1.6.8.ebuild:
+  Changed SRC_URI to use mirror://sf.
+
+  16 Mar 2003; Martin Holzer <mholzer@gentoo.org> gnucash-1.6.8.ebuild:
+  fixed type in ebuild
+
+  03 Mar 2003; foser <foser@gentoo.org> gnucash-1.6.8.ebuild :
+  Added some more flag-o-matic stuff (#14808)
+
+  06 Nov 2002: L. Boshell <leonardop@gentoo.org> : Remove the
+  `--enable-profile' argument for ./configure. Fixes bug #6769.
+  
+  05 Nov 2002; L. Boshell <leonardop@gentoo.org> gnucash-1.6.8.ebuild :
+  Fixed guile dep (bug #10306).
+  
+  05 Sep 2002; Chris Houser <chouser@gentoo.org> gnucash-1.6.8.ebuild :
+  Bump up to latest version of gnucash.  Both 1.6.7 and this version failed to
+  build for me with "postgres" in my use settings.  I added a patch to this
+  version that seems to fix it.
+
+*gnucash-1.6.7 (19 Aug 2002)
+  19 Aug 2002; Spider <spider@gentoo.org> gnucash-1.6.7.ebuild :
+  filter out -fomit-frame-pointer as it fails to build with this
+  update to last version
+  
+*gnucash-1.6.6-r1 (07 Aug 2002)
+
+  19 Aug 2002; L. Boshell <leonardop@gentoo.org> gnucash-1.6.6-r1.ebuild:
+  Make sure to avoid the C flag `-fomit-frame-pointer', since it causes
+  problems in the compilation phase. Thanks to Jacob Perkins and Paul Belt
+  for pointing this out on bug #6193.
+
+  07 Aug 2002; L. Boshell <leonardop@gentoo.org> gnucash-1.6.6-r1.ebuild:
+  Reworked dependencies. Add support for PostgreSQL.
+
+*gnucash-1.6.6 (28 Mar 2002)
+
+  25 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> gnucash-1.6.6.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gnucash-1.6.6.ebuild :
+
+  Version bump
 
 *gnucash-1.6.5-r1 (1 Feb 2002)
 
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index c1d827bc5424..6f348ff5b1c2 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,9 +1,8 @@
-MD5 e3d18ed3efea4f733fc69662fcb83405 ChangeLog 3392
-MD5 b8e0eec1a6bcd963f2ce26db9abf9b9f gnucash-1.8.1.ebuild 1455
-MD5 54902cd500c04f0659cd9a7d3438f1cd gnucash-1.8.2.ebuild 1546
-MD5 4800e560c499c667d2c95a7e3b01c42b gnucash-1.6.8.ebuild 1882
-MD5 832a41ac0535a02b3b049140d5919e93 gnucash-1.8.2-r1.ebuild 1776
-MD5 e298b9154a60df27ab519e6b88dd4c47 files/digest-gnucash-1.8.1 66
-MD5 cdaa1f2adfbd3112916a8c2076fa04bd files/digest-gnucash-1.8.2 66
-MD5 cdaa1f2adfbd3112916a8c2076fa04bd files/digest-gnucash-1.8.2-r1 66
-MD5 8ccd6e0765bb53caad58e8f736b020e9 files/digest-gnucash-1.6.8 67
+MD5 10910cfa66a43117f07ae444f7919cde ChangeLog 11478
+MD5 c9962cd943ec225b72ff0b1c8a40f84c files/digest-gnucash-1.8.11 138
+MD5 1b3addbc18910fb6369f03587ff0e1ef files/digest-gnucash-1.8.12 138
+MD5 401c4d468ff7625a2832b89fde8c4aa4 files/digest-gnucash-1.8.9 137
+MD5 7982aedf84ec1463507c054a079bbb10 gnucash-1.8.11.ebuild 3533
+MD5 c3a339dc43bf28d691a3d6a0c7f9eed3 gnucash-1.8.12.ebuild 3922
+MD5 62c0823f30b3adcfc14258f393231dae gnucash-1.8.9.ebuild 3511
+MD5 7a7f2ee070fc06a3289520b81a77a43a metadata.xml 259
diff --git a/app-office/gnucash/files/digest-gnucash-1.8.9 b/app-office/gnucash/files/digest-gnucash-1.8.9
index bfbd3463bd0a..66fdda1a7e8b 100644
--- a/app-office/gnucash/files/digest-gnucash-1.8.9
+++ b/app-office/gnucash/files/digest-gnucash-1.8.9
@@ -1,2 +1,2 @@
 MD5 5ad11fbc5c86316632c5f9ec44dba659 gnucash-1.8.9.tar.gz 7786000
-MD5 1fdf06623188da87af43c7bb4f4d84e0 gnucash-docs-1.8.4.tar.gz 1658889
+MD5 9758d8e523530c2509912761e327a9d5 gnucash-docs-1.8.5.tar.gz 1680438
diff --git a/app-office/gnucash/gnucash-1.8.11.ebuild b/app-office/gnucash/gnucash-1.8.11.ebuild
index 537f05cf367b..62a7b190af78 100644
--- a/app-office/gnucash/gnucash-1.8.11.ebuild
+++ b/app-office/gnucash/gnucash-1.8.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/app-office/gnucash/gnucash-1.8.11.ebuild,v 1.1 2005/03/14 17:22:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.11.ebuild,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.gnucash.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	>=dev-util/guile-1.6
@@ -41,9 +41,9 @@ RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	=app-text/docbook-xml-dtd-4.1.2*
 	=sys-libs/db-1*
 	ofx? ( >=dev-libs/libofx-0.7.0 )
-	hbci? ( net-libs/aqhbci-qt-tools )
-	chipcard? ( sys-libs/libchipcard
-		net-libs/aqhbci-ddvcard )
+	hbci? ( net-libs/aqbanking
+		chipcard? ( sys-libs/libchipcard )
+	)
 	quotes? ( dev-perl/DateManip
 		dev-perl/Finance-Quote
 		dev-perl/HTML-TableExtract )
@@ -61,15 +61,15 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
-	if built_with_use xorg-x11 bitmap-fonts
+	if built_with_use virtual/x11 bitmap-fonts
 	then
-		einfo "bitmap-fonts support is enabled in xorg-x11, continuing..."
+		einfo "bitmap-fonts support is enabled in virtual/x11, continuing..."
 	else
-		eerror "Please rebuild xorg-x11 with bitmap font support!"
-		eerror "To do so: USE=\"bitmap-fonts\" emerge xorg-x11"
+		eerror "Please rebuild virtual/x11 with bitmap font support!"
+		eerror "To do so: USE=\"bitmap-fonts\" emerge virtual/x11"
 		eerror "Or, add \"bitmap-fonts\" to your USE string in"
 		eerror "/etc/make.conf"
-		die "Will not build gnucash without bitmap-fonts support in xorg-x11"
+		die "Will not build gnucash without bitmap-fonts support in virtual/x11"
 	fi
 }
 
diff --git a/app-office/gnucash/gnucash-1.8.12.ebuild b/app-office/gnucash/gnucash-1.8.12.ebuild
index d1807c365227..b38cbfb61890 100644
--- a/app-office/gnucash/gnucash-1.8.12.ebuild
+++ b/app-office/gnucash/gnucash-1.8.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/app-office/gnucash/gnucash-1.8.12.ebuild,v 1.1 2005/10/27 12:48:50 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.12.ebuild,v 1.1.1.1 2005/11/30 09:58:58 chriswhite Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/app-office/gnucash/gnucash-1.8.9.ebuild b/app-office/gnucash/gnucash-1.8.9.ebuild
index 04a6b6ae894f..5f90af5ed38a 100644
--- a/app-office/gnucash/gnucash-1.8.9.ebuild
+++ b/app-office/gnucash/gnucash-1.8.9.ebuild
@@ -1,28 +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/app-office/gnucash/gnucash-1.8.9.ebuild,v 1.1 2004/05/11 09:38:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.9.ebuild,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
 
-inherit flag-o-matic libtool
+inherit flag-o-matic libtool eutils
 
 # won't configure with this
 filter-flags -fomit-frame-pointer
 # gnucash uses GLIB_INLINE, this will break it
 filter-flags -fno-inline
 
-DOC_VER="1.8.4"
-IUSE="nls postgres ofx hbci"
+DOC_VER="1.8.5"
+IUSE="nls postgres ofx hbci quotes"
 
 DESCRIPTION="A personal finance manager"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.gz"
 HOMEPAGE="http://www.gnucash.org/"
 
-KEYWORDS="x86 alpha ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 alpha ppc sparc ~amd64"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	>=dev-util/guile-1.6
+	amd64? ( >=dev-util/guile-1.6.4-r2 )
 	>=dev-libs/slib-2.3.8
 	>=media-libs/libpng-1.0.9
 	>=media-libs/jpeg-6b
@@ -39,8 +40,12 @@ RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	app-text/docbook-xsl-stylesheets
 	=app-text/docbook-xml-dtd-4.1.2*
 	=sys-libs/db-1*
+	ofx? ( >=dev-libs/libofx-0.6.4
+		<dev-libs/libofx-0.7.0 )
 	hbci? ( >=net-libs/openhbci-0.9.13 )
-	ofx? ( >=dev-libs/libofx-0.6.4 )
+	quotes? ( dev-perl/DateManip
+		dev-perl/Finance-Quote
+		dev-perl/HTML-TableExtract )
 	postgres? ( dev-db/postgresql )"
 
 DEPEND="${RDEPEND}
@@ -54,9 +59,23 @@ DEPEND="${RDEPEND}
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if built_with_use virtual/x11 bitmap-fonts
+	then
+		einfo "bitmap-fonts support is enabled in virtual/x11, continuing..."
+	else
+		eerror "Please rebuild virtual/x11 with bitmap font support!"
+		eerror "To do so: USE=\"bitmap-fonts\" emerge virtual/x11"
+		eerror "Or, add \"bitmap-fonts\" to your USE string in"
+		eerror "/etc/make.conf"
+		die "Will not build gnucash without bitmap-fonts support in virtual/x11"
+	fi
+}
+
 src_compile() {
 	elibtoolize
 
+	append-ldflags -L/usr/X11R6/$(get_libdir)
 	econf \
 		--enable-etags \
 		--enable-ctags \
@@ -70,6 +89,9 @@ src_compile() {
 
 	emake || die "make failed"
 
+	cd ${WORKDIR}/${P}/src/doc/design
+	emake gnucash-design || die "make gnucash-design failed"
+
 	cd ${WORKDIR}/${PN}-docs-${DOC_VER}
 	econf --localstatedir=/var/lib || die "doc configure failed"
 	emake || die "doc make failed"
@@ -77,7 +99,7 @@ src_compile() {
 
 src_install() {
 	einstall pkgdatadir=${D}/usr/share/gnucash || die "install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
+	dodoc ABOUT-NLS AUTHORS ChangeLog HACKING NEWS README* TODO
 	dodoc docs/README*
 
 	cd ${WORKDIR}/${PN}-docs-${DOC_VER}
@@ -92,6 +114,13 @@ pkg_postinst() {
 		echo ">>> Updating Scrollkeeper"
 		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
 	fi
+
+	if ! use quotes; then
+		ewarn
+		einfo "If you wish to enable Online Stock Quotes Retrieval,"
+		einfo "Please re-emerge gnucash with USE=\"quotes\""
+		ewarn
+	fi
 }
 
 pkg_postrm() {
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index da6fd63d0085..3930a8699891 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/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>gnome</herd>
+<herd>gnome-office</herd>
+<maintainer>
+  <email>seemant@gentoo.org</email>
+  <name>Seemant Kulleen</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 4a3909cc1cce..c2d257675cb9 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,11 +1,471 @@
 # ChangeLog for app-office/gnumeric
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
+
+  01 Nov 2005; Jose Luis Rivero <yoswink@gentoo.org> gnumeric-1.6.0.ebuild:
+  Added ~alpha keyword wrt bug #110767
+
+  01 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnumeric-1.6.0.ebuild:
+  Moved G2CONF declaration to pkg_setup(). Added zlib dependency. Misc.
+  clean-ups.
+
+  01 Nov 2005; Martin Schlemmer <azarah@gentoo.org> gnumeric-1.6.0.ebuild:
+  Add ~amd64 keyword.
+
+  31 Oct 2005; Brent Baude <ranger@gentoo.org> gnumeric-1.6.0.ebuild:
+  Marking gnumeric-1.6.0 ~ppc64 to support bug 110767
+
+  31 Oct 2005; Jason Wever <weeve@gentoo.org> gnumeric-1.6.0.ebuild:
+  Added ~sparc keyword wrt bug #110767.
+
+  29 Oct 2005; Luca Barbato <lu_zero@gentoo.org> gnumeric-1.6.0.ebuild:
+  Marked ~ppc
+
+*gnumeric-1.6.0 (29 Oct 2005)
+
+  29 Oct 2005; Joe McCann <joem@gentoo.org> +gnumeric-1.6.0.ebuild:
+  New version of gnumeric. Cleaned up ebuild, remove libgda support(requires
+  dev version), and update deps. Removing other archs until goffice has the
+  proper keywords. Closes bug #108969
+
+*gnumeric-1.4.3-r3 (05 Oct 2005)
+
+  05 Oct 2005; <dang@gentoo.org> +gnumeric-1.4.3-r3.ebuild:
+  Revbump to build ssindex for beagle. bug #108177
+
+  07 Sep 2005; Aron Griffis <agriffis@gentoo.org> gnumeric-1.4.3-r2.ebuild:
+  Mark 1.4.3-r2 stable on ia64
+
+  02 Sep 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  gnumeric-1.4.3-r2.ebuild:
+  Stable on alpha due to security bug #104010
+
+  01 Sep 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.3-r2.ebuild:
+  Stable on ppc64 (bug #104010)
+
+  01 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gnumeric-1.4.3-r2.ebuild:
+  Stable on ppc and hppa.
+
+  01 Sep 2005; Luis Medinas <metalgod@gentoo.org> gnumeric-1.4.3-r2.ebuild:
+  Marked Stable on AMD64. Fixes bug #104010.
+
+  01 Sep 2005; Ian Leitch <port001@gentoo.org> ChangeLog:
+  Stable on x86, bug #104010
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnumeric-1.4.3-r2.ebuild:
+  Stable on sparc wrt #104010
+
+*gnumeric-1.4.3-r2 (01 Sep 2005)
+
+  01 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gnumeric-1.4.3-pcre_int_overflow.patch, +gnumeric-1.4.3-r2.ebuild:
+  Added patch for a potential integer overflow in pcre (bug #104010). Modified
+  pkg_setup() to avoid having pkgconfig as a run-time dependency.
+
+  27 Aug 2005; Guy Martin <gmsoft@gentoo.org> gnumeric-1.4.3-r1.ebuild:
+  Stable on hppa.
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> gnumeric-1.4.3-r1.ebuild:
+  stable on ia64
+
+  19 Aug 2005; Luis Medinas <metalgod@gentoo.org> gnumeric-1.4.3-r1.ebuild:
+  Marked Stable on AMD64.
+
+  09 Aug 2005; Joseph Jezak <josejx@gentoo.org> gnumeric-1.4.3-r1.ebuild:
+  Marked ppc stable.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.3-r1.ebuild:
+  Stable on ppc64
+
+  03 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  gnumeric-1.4.3-r1.ebuild:
+  stable on alpha
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnumeric-1.4.3-r1.ebuild:
+  Stable on sparc
+
+  01 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnumeric-1.4.3-r1.ebuild:
+  Stable on x86.
+
+*gnumeric-1.4.3-r1 (22 Jul 2005)
+
+  22 Jul 2005; Marinus Schraal <foser@gentoo.org> gnumeric-1.4.3-r1.ebuild :
+  Add patch to work with newer libgsf (#96590)
+
+  18 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> gnumeric-1.4.3.ebuild:
+  Stable on alpha
+
+  08 Jun 2005; Guy Martin <gmsoft@gentoo.org> gnumeric-1.4.3.ebuild:
+  Stable on hppa.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.3.ebuild:
+  Stable on ppc64
+
+  04 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gnumeric-1.4.3.ebuild:
+  Stable on ppc.
+
+  03 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.4.3.ebuild:
+  Stable on sparc
+
+  03 Jun 2005; foser <foser@gentoo.org> gnumeric-1.4.{2,3}.ebuild :
+  Fix libgsf dep to =1.10 , it won't work with newer or older versions (#94890)
+
+  20 May 2005; Fernando J. Pereda <ferdy@gentoo.org> gnumeric-1.4.2.ebuild:
+  alpha stable
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.2.ebuild,
+  gnumeric-1.4.3.ebuild:
+  Stable on ppc64; added ~ppc64 to KEYWORDS
+
+  07 May 2005; Aron Griffis <agriffis@gentoo.org> gnumeric-1.4.2.ebuild:
+  stable on ia64
+
+  01 May 2005; Guy Martin <gmsoft@gentoo.org> gnumeric-1.4.2.ebuild:
+  Stable on hppa.
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gnumeric-1.4.2.ebuild:
+  Stable on ppc.
+
+  18 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.4.2.ebuild:
+  Stable on sparc
+
+*gnumeric-1.4.3 (17 Apr 2005)
+
+  17 Apr 2005; foser <foser@gentoo.org> gnumeric-1.4.3.ebuild :
+  New release
+  Add makejobs fix (#78828) for multiplejobs compile
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.1.ebuild:
+  Stable on ppc64
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> gnumeric-1.4.1.ebuild:
+  Stable on ppc.
+
+  06 Mar 2005; Heinrich Wendel <lanius@gentoo.org> gnumeric-1.4.2.ebuild:
+  stable on amd64
+
+  01 Feb 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Jan 2005; Guy Martin <gmsoft@gentoo.org> gnumeric-1.4.1.ebuild:
+  Stable on hppa.
+
+*gnumeric-1.4.2 (14 Feb 2005)
+
+  14 Feb 2005; foser <foser@gentoo.org> gnumeric-1.4.2.ebuild :
+  New release, fixup help location symlink
+  Add jobs cap (#78828)
+  Add sheet object patch (#80565), thnx to Jean Bréfort
+
+  17 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.4.1.ebuild:
+  Stable on sparc
+
+  06 Jan 2005; foser <foser@gentoo.org> gnumeric-1.4.1.ebuild :
+  Add pkgconfig as a buildtime dep (#67107)
+
+  29 Dec 2004; Joseph Jezak <josejx@gentoo.org> gnumeric-1.2.13.ebuild:
+  Marked ppc stable.
+
+*gnumeric-1.4.1 (13 Dec 2004)
+
+  13 Dec 2004; foser <foser@gentoo.org> gnumeric-1.4.1.ebuild :
+  New release, dep & USE flag fixes
+
+  09 Dec 2004; Guy Martin <gmsoft@gentoo.org> gnumeric-1.2.13.ebuild:
+  Stable on hppa.
+
+  25 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.2.13.ebuild:
+  Stable on sparc
+
+  13 Oct 2004; Tom Martin <slarti@gentoo.org> gnumeric-1.2.12.ebuild:
+  Stable on amd64, bug 67183.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnumeric-1.0.13-r1.ebuild, gnumeric-1.2.12.ebuild, gnumeric-1.2.6.ebuild:
+  Masked gnumeric-1.2.6.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnumeric-1.0.13-r1.ebuild, gnumeric-1.2.12.ebuild:
+  Masked gnumeric-1.2.12.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnumeric-1.0.13-r1.ebuild:
+  Masked gnumeric-1.0.13-r1.ebuild stable for ppc
+
+  15 Aug 2004; Mike Gardiner <obz@gentoo.org> gnumeric-1.2.12.ebuild,
+  gnumeric-1.2.13.ebuild, gnumeric-1.2.2.ebuild, gnumeric-1.2.6.ebuild:
+  Updated HOMEPAGE, as noted in but #60394
+
+  12 Aug 2004; Guy Martin <gmsoft@gentoo.org> gnumeric-1.2.12.ebuild:
+  Stable on hppa.
+
+  09 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.2.12.ebuild:
+  Stable on sparc
+
+*gnumeric-1.2.13 (09 Aug 2004)
+
+  09 Aug 2004; foser <foser@gentoo.org> gnumeric-1.2.1{2,3}.ebuild :
+  New release (#57464)
+  Add ugly, ugly bad hack to check for libgsf-gnome (#53467), i'm a sinner
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnumeric-1.0.13-r1.ebuild,
+  gnumeric-1.2.12.ebuild, gnumeric-1.2.2.ebuild, gnumeric-1.2.4.ebuild,
+  gnumeric-1.2.6.ebuild:
+  Fix use invocation
+
+  02 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> gnumeric-1.2.2.ebuild:
+  sync IUSE
+
+*gnumeric-1.2.12 (05 May 2004)
+
+  05 May 2004; foser <foser@gentoo.org> gnumeric-1.2.12.ebuild :
+  New release, fix deps & cleanup
+
+  06 Apr 2004; Guy Martin <gmsoft@gentoo.org> gnumeric-1.2.6.ebuild:
+  Marked stable on hppa.
+
+  19 Mar 2004; Aron Griffis <agriffis@gentoo.org> gnumeric-1.2.6.ebuild:
+  stable on alpha and ia64
+
+  03 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnumeric-1.2.6.ebuild:
+  stable on sparc
+
+*gnumeric-1.2.6 (14 Feb 2004)
+
+  01 Mar 2004; foser <foser@gentoo.org> gnumeric-1.2.6.ebuild :
+  filter -Os flag, it can corrup the build (#41612)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> gnumeric-1.2.0.ebuild,
+  gnumeric-1.2.1.ebuild, gnumeric-1.2.6.ebuild:
+  version bump
+
+  25 Jan 2004; <gustavoz@gentoo.org> gnumeric-1.2.2.ebuild:
+  marked stable on sparc
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> gnumeric-1.2.2.ebuild:
+  set ppc in keywords
+
+  14 Jan 2004; <gustavoz@gentoo.org> gnumeric-1.2.2.ebuild:
+  stable on hppa
+
+*gnumeric-1.2.4 (07 Jan 2004)
+
+  08 Jan 2003; foser <foser@gentoo.org> gnumeric-1.2.4.ebuild :
+  Rerun aclocal to get rid of XML-Parser dep
+
+  07 Jan 2003; foser <foser@gentoo.org> gnumeric-1.2.4.ebuild :
+  New release, minor ebuild fixes
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> gnumeric-1.0.13-r1.ebuild,
+  gnumeric-1.2.0.ebuild, gnumeric-1.2.1.ebuild, gnumeric-1.2.2.ebuild:
+  Marked 1.2.1 stable on sparc and adjusted the copyright dates for all of the
+  ebuilds.
+
+  17 Dec 2003; Guy Martin <gmsoft@gentoo.org> gnumeric-1.2.1.ebuild:
+  Marked stable on hppa.
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> gnumeric-1.2.2.ebuild:
+  mark stable on amd64
+
+  07 Dec 2003; <spider@gentoo.org> gnumeric-1.0.13-r1.ebuild:
+  Removed lacking gnome-extra/gb dependency
+
+*gnumeric-1.2.2 (27 Nov 2003)
+
+  27 Nov 2003; foser <foser@gentoo.org> gnumeric-1.2.2.ebuild :
+  New release, requested in #34492
+  updated deps
+
+  12 Nov 2003; Jason Wever <weeve@gentoo.org> gnumeric-1.2.0.ebuild:
+  Marked stable on sparc, fixes bug #32405.
+
+  14 Oct 2003; Jason Wever <weeve@gentoo.org> gnumeric-1.0.8.ebuild:
+  Added ~sparc keyword.  Fixes bug #31150.
+
+*gnumeric-1.2.1 (10 Oct 2003)
+
+  10 Oct 2003; foser <foser@gentoo.org> gnumeric-1.2.1.ebuild :
+  New version, updated doc fix
+
+  25 Sep 2003; Todd Sunderlin <todd@gentoo.org> gnumeric-1.2.0.ebuild:
+  added ~sparc keyword
+
+*gnumeric-1.2.0 (17 Sep 2003)
+
+  21 Sep 2003; foser <foser@gentoo.org> gnumeric-1.2.0.ebuild :
+  Added patch to fix gcc2 compilation, provided by 
+  Tristan Henderson <T.Henderson@cs.ucl.ac.uk> (#29181)
+
+  17 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.2.0.ebuild,
+  files/gnumeric-1.2.0-fix_doc_destdir_install.patch:
+  version bump. patch for docs thanks to Andy Pyles <a_pyles@yahoo.com> (#28946)
+
+*gnumeric-1.1.90 (14 Sep 2003)
+
+  14 Sep 2003; foser <foser@gentoo.org> gnumeric-1.1.90.ebuild :
+  New development version
+
+*gnumeric-1.1.20 (22 Aug 2003)
+
+  22 Aug 2003; foser <foser@gentoo.org> gnumeric-1.1.20.ebuild :
+  Remove gal dep, no longer needed. Brought to my attention by amd on irc
+
+  22 Aug 2003; foser <foser@gentoo.org> gnumeric-1.1.20.ebuild :
+  New version, fixed some deps, added gnomedb USE which doesn't work cause we need to up our version
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.0.12.ebuild,
+  gnumeric-1.0.13-r1.ebuild, gnumeric-1.0.13.ebuild, gnumeric-1.0.8.ebuild:
+  fixed gal deps
+
+*gnumeric-1.1.19 (08 Jun 2003)
+
+  09 Jun 2003; foser <foser@gentoo.org> gnumeric-1.1.19.ebuild :
+  New development version, remove perl USE from deps as well
+
+*gnumeric-1.0.13-r1 (07 Jun 2003)
+
+  07 Jun 2003; foser <foser@gentoo.org> gnumeric-1.0.13-r1.ebuild :
+  reenable guile support, since 1.6 moved out of p.mask
+  add info at the end of ebuild that guppi is needed for plotting support (#22370)
+
+*gnumeric-1.1.17 (13 May 2003)
+
+  13 May 2003; foser <foser@gentoo.org> gnumeric-1.1.17.ebuild :
+  New dev version, bonobo USE flag added, removed nls and perl flags
+  general cleanup and dep fixes
+
+  04 May 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.1.16-r1.ebuild:
+  changed to use new gnome2_omf_fix
+
+*gnumeric-1.1.16-r1 (15 Apr 2003)
+
+  15 Apr 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.1.16-r1.ebuild,
+  files/gnumeric-1.1.16-scrollkeeper.patch:
+  enabled bonobo support. fixed installation paths with new gnome2 eclass.
+  fix scrollkeeper paths.
+
+*gnumeric-1.0.13 (14 Apr 2003)
+
+  22 Apr 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.0.12.ebuild,
+  gnumeric-1.0.13.ebuild:
+  fix runaway scrollkeeper dir placement
+
+  14 Apr 2003; foser <foser@gentoo.org> gnumeric-1.0.13.ebuild :
+  New stable release
+  Fixed evolution dep, probably doesn't work with the gtk2 version
+
+*gnumeric-1.1.16 (16 Mar 2003)
+
+  31 Mar 2003; foser <foser@gentoo.org> gnumeric-1.1.16.ebuild :
+  Some minor cleanups
+
+  16 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.1.16.ebuild:
+  version bump. reinstated libgda dependency. now depends on gal-1.99 
+  instead of gal2.
+
+*gnumeric-1.1.15 (05 Jan 2003)
+
+  22 Jan 2003; Jon Nall <nall@gentoo.org> gnumeric-1.1.15.ebuild :
+  added ~ppc
+
+  05 Jan 2003; foser <foser@gentoo.org> gnumeric-1.1.15.ebuild :
+  New development gnome2 version
+
+*gnumeric-1.0.12 (05 Jan 2003)
+
+  01 Apr 2003; foser <foser@gentoo.org> gnumeric-1.0.12.ebuild :
+  Disable nls, doesn't seem to work anymore (#18607)
+
+  16 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.0.12.ebuild,
+  gnumeric-1.0.8.ebuild, gnumeric-1.0.9.ebuild, gnumeric-1.1.6.ebuild,
+  gnumeric-1.1.6.ebuild, gnumeric-1.1.8.ebuild, gnumeric-1.1.8.ebuild:
+  1.0.x series use older libgda
+
+  05 Jan 2003; foser <foser@gentoo.org> gnumeric-1.0.12.ebuild :
+  New gtk1 version, some dep fixes now uses gnome.org eclass
+
+  10 Dec 2002; foser <foser@gentoo.org> gnumeric-1.1.6.ebuild gnumeric-1.1.8.ebuild :
+  Fixed deps (bug #11634)
+  Converted partialy to gnome2 eclass
+
+*gnumeric-1.1.8 (02 Sep 2002)
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> gnumeric-1.1.8.ebuild :
+  Added ppc to KEYWORDS.
+
+  02 Sep 2002; Spider <spider@gentoo.org> gnumeric-1.1.8.ebuild :
+  hadto change the make install / einstall to make this build work with sandbox again. problems with configure / Makefile doing variable expansion when we dont want it to do so.
+
+  
+*gnumeric-1.1.6 (06 Aug 2002)
+  06 Aug 2002 ; Gabriele Giorgetti <stroke@gentoo.org> gnumeric-1.1.6.ebuild ChangeLog:
+  New version, updated deps, added new dep to gnome-extra/libgsf. 
+  Also closes bug #5395
+
+*gnumeric-1.0.9 (29 Jul 2002)
+
+  09 Dec 2002; Martin Holzer <mholzer@gentoo.org gnumeric-1.0.9.ebuild gnumeric-1.0.8.ebuild Changelog :
+  Fixed SRC_URI.
+
+  29 Jul 2002; Spider <spider@gentoo.org> gnumeric-1.0.9.ebuild gnumeric-1.0.8.ebuild gnumeric-1.1.5.ebuild :
+  bump version, add KEYWORDS to all versions.
+
+*gnumeric-1.0.8 (30 Jun 2002)
+  30 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Bump version.  Also fix all the SLOT's.
+
+gnumeric-1.1.5 (13 Jun 2002)
+  13 Jun 2002 ; Spider <spider@gentoo.org> gnumeric-1.1.5.ebuild ChangeLog :
+  fix gnomeprint deps
+  fix ChangeLog entry from 22 and 29 May 
+  
+*gnumeric-1.0.7 (6 Jun 2002)
+  7 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Bump version.
+
+*gnumeric-1.1.5 (29 May 2002)
+  29 May 2002; Spider <spider@gentoo.org> gnumeric-1.1.5.ebuild :
+  schema installations now happen properly
+  update to latest version
+
+
+*gnumeric-1.1.3-r1 (22 May 2002)
+  22 May 2002; Spider <spider@gentoo.org> gnumeric-1.1.3-r1.ebuild :
+  Gnome2 Branch
+
+*gnumeric-1.0.6 (21 Apr 2002)
+
+*gnumeric-1.0.5-r2 (9 Apr 2002)
+
+  9 Apr 2002; M.Schlemmer <azarah@gentoo.org> gnumeric-1.0.5-r2.ebuild :
+  Update to use the virtualx eclass for enabling build in console.
+
+*gnumeric-1.0.5-r1 (4 Apr 2002)
+
+  4 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gnumeric-1.0.5-r1.ebuild :
+  Added Mandrake's fix to allow gnumeric to be compiled without the DISPLAY
+  being set.  Clever -- it uses Xvfb.
+
+*gnumeric-1.0.5 (11 March 2002)
+
+  19 Feb 2002; M.Schlemmer <azarah@gentoo.org> gnumeric-1.0.4-r1.ebuild :
+  Enable Gnome Basic support that was broken for a while.  Added EOG to RDEPEND
+  for image support.
+
+*gnumeric-1.0.4 (2 Feb 2002)
 
 *gnumeric-1.0.3 (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/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index c247d170911f..a79620a9f76a 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,10 +1,11 @@
-MD5 1bdcc2dcab869f25c1d68f8ede7e02bf ChangeLog 4109
-MD5 92c92e4e88e0a27c175ffe2a839d8e04 gnumeric-1.0.12.ebuild 2900
-MD5 e98f3966b2cdec5bd009d11a5b9e9634 gnumeric-1.0.8.ebuild 3310
-MD5 d56d6198a7417cfab13c5fd5908b147b gnumeric-1.1.16.ebuild 2356
-MD5 d649b85924af69de4941cf0c624b16f3 files/digest-gnumeric-1.0.12 69
-MD5 a88fe4d27bf9a2579f4f3db0ca6f355f files/digest-gnumeric-1.0.8 69
-MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493
-MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.7-docbuild.patch 728
-MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.8-docbuild.patch 728
-MD5 bbafb282a7d40a0947d7ab6b6f53d773 files/digest-gnumeric-1.1.16 70
+MD5 4d9cea150329c4c95621976070a59227 ChangeLog 16150
+MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r2 69
+MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r3 69
+MD5 b76afee2920aebc8fd632925765c3c70 files/digest-gnumeric-1.6.0 69
+MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
+MD5 3fab812a68d5849434ba8d7ee3ef2887 files/gnumeric-1.4.3-new_gsf_api.patch 3308
+MD5 00512bbcd353d056c02b62335dfd87d1 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
+MD5 05cab453a958d1d24692202747791548 gnumeric-1.4.3-r2.ebuild 2572
+MD5 2644f43aa2b70a69568b5fe657d03f03 gnumeric-1.4.3-r3.ebuild 2597
+MD5 e31ee656aaf8a2f6c6660d39150c358d gnumeric-1.6.0.ebuild 1981
+MD5 add4556f7fbed381a299100d2457069f metadata.xml 167
diff --git a/app-office/gnumeric/gnumeric-1.4.3-r2.ebuild b/app-office/gnumeric/gnumeric-1.4.3-r2.ebuild
index d0dd8eb58c47..13533ab2db74 100644
--- a/app-office/gnumeric/gnumeric-1.4.3-r2.ebuild
+++ b/app-office/gnumeric/gnumeric-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/app-office/gnumeric/gnumeric-1.4.3-r2.ebuild,v 1.1 2005/09/01 10:50:46 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 inherit virtualx eutils flag-o-matic gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="gnome libgda python static"
 # bonobo gnomedb
diff --git a/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild b/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
index 02715dc03964..acc94dd65a74 100644
--- a/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.4.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/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild,v 1.1 2005/10/05 20:04:46 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 inherit virtualx eutils flag-o-matic gnome2
 
diff --git a/app-office/gnumeric/gnumeric-1.6.0.ebuild b/app-office/gnumeric/gnumeric-1.6.0.ebuild
index 6af74a1d1084..a0c48c777a4c 100644
--- a/app-office/gnumeric/gnumeric-1.6.0.ebuild
+++ b/app-office/gnumeric/gnumeric-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/app-office/gnumeric/gnumeric-1.6.0.ebuild,v 1.1 2005/10/29 06:11:26 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 inherit eutils flag-o-matic gnome2
 
@@ -9,12 +9,13 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gnome python static"
-# bonobo gnomedb libgda
+# bonobo libgda
 
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND="sys-libs/zlib
+	>=dev-libs/glib-2.6
 	>=gnome-extra/libgsf-1.13.2
 	>=x11-libs/goffice-0.1.0
 	>=dev-libs/libxml2-2.4.12
@@ -35,19 +36,25 @@ RDEPEND=">=dev-libs/glib-2.6
 	python? (
 		>=dev-lang/python-2
 		>=dev-python/pygtk-2 )"
-	#libgda? ( >=gnome-extra/libgda-1.0.1 )
-#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
+	# libgda? (
+	#	>=gnome-extra/libgda-1.3
+	#	>=gnome-extra/libgnomedb-1.3 )
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.29
 	>=dev-util/pkgconfig-0.9
 	app-text/scrollkeeper"
 
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
+DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 USE_DESTDIR="1"
 
 
 pkg_setup() {
+	G2CONF="--enable-ssindex \
+		$(use_with python) \
+		$(use_with gnome)  \
+		$(use_enable static)"
+
 	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
 		einfo "libgsf needs to be compiled with gnome in USE"
 		einfo "for this version of gnumeric to work. Rebuild"
@@ -55,24 +62,22 @@ pkg_setup() {
 		einfo "USE=gnome emerge libgsf -vp"
 		die "libgsf was built without gnome support..."
 	fi
+
 	#gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
 	replace-flags "-Os" "-O2"
 }
 
 src_unpack() {
 	unpack "${A}"
-	gnome2_omf_fix
-	cd ${S}/doc/C
-	gnome2_omf_fix Makefile.in
+	gnome2_omf_fix ${S}/doc/C/Makefile.in
 }
 
-G2CONF="${G2CONF} $(use_with python) $(use_with gnome) $(use_enable static) --enable-ssindex"
 
 src_install() {
 
 	gnome2_src_install
 
-	# make gnumeric find it's help
+	# make gnumeric find its help
 	dosym \
 		/usr/share/gnome/help/gnumeric \
 		/usr/share/${PN}/${PV}/doc
diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index da6fd63d0085..20d13ee7e217 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome-office</herd>
 </pkgmetadata>
diff --git a/app-office/grisbi/ChangeLog b/app-office/grisbi/ChangeLog
index ec88c3487d86..ca92b0ed588e 100644
--- a/app-office/grisbi/ChangeLog
+++ b/app-office/grisbi/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for app-office/grisbi
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.1 2004/07/13 20:55:40 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
+
+  19 Nov 2005; Simon Stelling <blubb@gentoo.org> grisbi-0.5.7.ebuild:
+  stable on amd64
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> grisbi-0.5.7.ebuild:
+  Stable on x86; bug #108914
+
+  08 Jul 2005; Seemant Kulleen <seemant@gentoo.org> grisbi-0.5.6.ebuild,
+  grisbi-0.5.7.ebuild:
+  fix the depend/rdepend thansk to swegener
+
+*grisbi-0.5.7 (27 Jun 2005)
+
+  27 Jun 2005; Seemant Kulleen <seemant@gentoo.org> +grisbi-0.5.7.ebuild:
+  Version bump, coming from: Guillaume Castagnino <guilc@fr.st> in bug #94866
+
+*grisbi-0.5.6 (16 May 2005)
+
+  16 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  +files/grisbi-0.5.6-latex-unicode.patch, -grisbi-0.5.4-r1.ebuild,
+  -grisbi-0.5.5.ebuild, -grisbi-0.5.5.20050410.ebuild, +grisbi-0.5.6.ebuild:
+  version bump, thanks to: Guillaume Castagnino <guilc@fr.st> in bug #92674
+  repoman happy
+
+  10 May 2005; Seemant Kulleen <seemant@gentoo.org> grisbi-0.5.5.ebuild:
+  get the doc.patch business out of SRC_URI, it's breaking things
+
+*grisbi-0.5.5.20050410 (11 Apr 2005)
+
+  11 Apr 2005; Seemant Kulleen <seemant@gentoo.org> +files/grisbi.desktop,
+  -grisbi-0.5.2.ebuild, grisbi-0.5.4-r1.ebuild, grisbi-0.5.5.ebuild,
+  +grisbi-0.5.5.20050410.ebuild:
+  Version bump to cvs snapshot which fixes segfault on edit->preferences
+  issue, as reported in bug #87468 by Will Wilson <wilson.william@gmail.com>.
+  The snapshot was taken and ebuilt by: Guillaume Castagnino <guilc@fr.st> in
+  the same bug. He also added a nice .desktop file for this.
+
+*grisbi-0.5.5 (25 Feb 2005)
+
+  25 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/grisbi-0.5.5-latex-unicode.patch, +grisbi-0.5.5.ebuild:
+  version bump
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> grisbi-0.5.4-r1.ebuild:
+  Added ~sparc keyword.
+
+*grisbi-0.5.4-r1 (28 Dec 2004)
+
+  28 Dec 2004; Seemant Kulleen <seemant@gentoo.org> +grisbi-0.5.4-r1.ebuild:
+  revision bump for new digest -- upstream changed the tarball hours after
+  package added to portage. shame on them.
+
+*grisbi-0.5.4 (27 Dec 2004)
+
+  27 Dec 2004; Seemant Kulleen <seemant@gentoo.org> +grisbi-0.5.4.ebuild:
+  version bump thanks to: Guillaume Castagnino <guilc@fr.st>. Sorry about not
+  getting to the previous bump in time.
+
+*grisbi-0.5.2 (21 Oct 2004)
+
+  21 Oct 2004; Seemant Kulleen <seemant@gentoo.org> +grisbi-0.5.2.ebuild:
+  version bump thanks to: Guillaume Castagnino <guilc@fr.st> in bug #67566
+
+*grisbi-0.5.2_pre1 (08 Oct 2004)
+
+  08 Oct 2004; Seemant Kulleen <seemant@gentoo.org> grisbi-0.5.0-r1.ebuild,
+  +grisbi-0.5.2_pre1.ebuild:
+  Version bump; adds support for ofx and nls USE flags. Ebuild by: Guillaume
+  Castagnino <guilc@laposte.net> via email
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> grisbi-0.5.0-r1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Corrected metadata.xml to match DTD.
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> grisbi-0.5.0-r1.ebuild:
+  Typo in DESCRIPTION: personnal -> personal. Bug 59717.
+
+  18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> grisbi-0.5.0-r1.ebuild:
+  Added amd64 keyword, closing #57016.
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> grisbi-0.5.0-r1.ebuild:
+  Added to ~ppc.
 
 *grisbi-0.5.0-r1 (13 Jul 2004)
 
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index d7b8a25a1a6c..3d7799496fd7 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,2 +1,8 @@
-MD5 ce9073665fab882d6172069cee44ce0c grisbi-0.5.0-r1.ebuild 1387
-MD5 ccc62cf2f2a9ecc58aebb729a2cca5c4 files/digest-grisbi-0.5.0-r1 64
+MD5 713c4a3408be6d1e1e7a307be699b067 ChangeLog 3693
+MD5 62448d1154588cf7e57683b4721338dd grisbi-0.5.6.ebuild 1678
+MD5 774d9960746e5591c3238b298d186ad4 grisbi-0.5.7.ebuild 1681
+MD5 a48d108f2e513a7b1672281c91550df5 metadata.xml 356
+MD5 25fe3a6e8d61a4ff5e7209f41d101e10 files/digest-grisbi-0.5.6 65
+MD5 4b586e8dc048875af95711c52e2f7ab3 files/grisbi-0.5.6-latex-unicode.patch 461
+MD5 3a58ad7603fa0514804ef4027dd31201 files/digest-grisbi-0.5.7 65
+MD5 34efdef1d5896910c218177e358bb019 files/grisbi.desktop 207
diff --git a/app-office/grisbi/grisbi-0.5.6.ebuild b/app-office/grisbi/grisbi-0.5.6.ebuild
index 7222e8530be6..b256110a952e 100644
--- a/app-office/grisbi/grisbi-0.5.6.ebuild
+++ b/app-office/grisbi/grisbi-0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.6.ebuild,v 1.1 2005/05/16 12:39:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.6.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
 inherit eutils
 
@@ -16,12 +16,12 @@ KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
 DEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.2.0
-	ofx? ( >=dev-libs/libofx-0.7.0 )"
-
-RDEPEND="${DEPEND}
+	ofx? ( >=dev-libs/libofx-0.7.0 )
 	print? ( virtual/tetex
 	>=dev-tex/latex-unicode-20041017 )"
 
+RDEPEND="${DEPEND}"
+
 pkg_setup() {
 	if ! use print; then
 		echo
diff --git a/app-office/grisbi/grisbi-0.5.7.ebuild b/app-office/grisbi/grisbi-0.5.7.ebuild
index 724c0a1271b2..49fb46c8e47c 100644
--- a/app-office/grisbi/grisbi-0.5.7.ebuild
+++ b/app-office/grisbi/grisbi-0.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.7.ebuild,v 1.1 2005/06/27 12:13:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.7.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
 inherit eutils
 
@@ -12,16 +12,16 @@ SRC_URI="mirror://sourceforge/grisbi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 DEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.2.0
-	ofx? ( >=dev-libs/libofx-0.7.0 )"
-
-RDEPEND="${DEPEND}
+	ofx? ( >=dev-libs/libofx-0.7.0 )
 	print? ( virtual/tetex
 	>=dev-tex/latex-unicode-20041017 )"
 
+RDEPEND="${DEPEND}"
+
 pkg_setup() {
 	if ! use print; then
 		echo
diff --git a/app-office/grisbi/metadata.xml b/app-office/grisbi/metadata.xml
index 6a7f40e32dec..846b7d3ba5c9 100644
--- a/app-office/grisbi/metadata.xml
+++ b/app-office/grisbi/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>office</herd>
+<herd>gnome-office</herd>
 <maintainer>
   <email>guilc@fr.st</email>
   <name>Guillaume Castagnino</name>
-  <description>third party maintainer</description>
+  <description>Third party maintainer, through the gnome-office herd 
+    as a proxy</description>
 </maintainer>
-<maintainer>
-  <email>seemant@gentoo.org</email>
-  <name>Seemant Kulleen</name>
-  <description>Proxy maintainer</description>
 </pkgmetadata>
diff --git a/app-office/ical/ChangeLog b/app-office/ical/ChangeLog
index ff60c6e2a267..237020e19c33 100644
--- a/app-office/ical/ChangeLog
+++ b/app-office/ical/ChangeLog
@@ -1,8 +1,37 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.1 2002/08/01 03:14:35 chadh Exp $
+# ChangeLog for app-office/ical
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ChangeLog,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> ical-2.2.1.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.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ical-2.2.1.ebuild:
+  Stable on ppc.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> ical-2.2.1.ebuild:
+  Masked ical-2.2.1.ebuild testing for ppc
+
+  18 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> ical-2.2.1.ebuild:
+  IUSE; error check sed; tidy
+
+  06 Jun 2004; Seemant Kulleen <seemant@gentoo.org> ical-2.2.1.ebuild:
+  Fix compile error reported by Daniel Webert <daniel_webert@web.de> in bug
+  #52883, which was caused by the sed statement not actually acting on any
+  files. The fix was found by stan <stan@saticed.me.uk>. Additionally, man pages
+  were going into /usr/man not /usr/share/man, so fixed that too.
+
+  14 Mar 2004; Seemant Kulleen <seemant@gentoo.org> ical-2.2.1.ebuild:
+  clean ups for bug #44712 by Michael Sterret <mr_bones_@gentoo.org>
+
+  15 Nov 2003; Brandy Westcott brandy@gentoo.org ical-2.2.1.ebuild:
+  Fixed up ebuild to play nice with tcl. Added patch for tcl-8.4. Closes bug
+  #22924.
 
 *ical-2.2.1 (31 Jul 2002)
+  03 Aug 2002; Chad Huneycutt <chadh@gentoo.org> ical-2.2.1.ebuild: added die
+  clause to patch commands to catch errors.
 
   31 Jul 2002; Chad Huneycutt <chadh@gentoo.org> ical-2.2.1.ebuild: Initial
   import. Most of the patches to get this to compile were taken from the srpm
diff --git a/app-office/ical/Manifest b/app-office/ical/Manifest
index e69de29bb2d1..4647d9b8f714 100644
--- a/app-office/ical/Manifest
+++ b/app-office/ical/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7d0d1a2856e55b23ed9c73c5233be280 ChangeLog 1736
+MD5 d2bc892a42d09ce669a9fc5419279a6b files/digest-ical-2.2.1 136
+MD5 e6a77487b51ba1a26a2949eaf74c9ee2 ical-2.2.1.ebuild 1229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Y4LI1lqEGTUzyQRAogCAKCL0lnog5SDem61eIHpEXf+6t99ogCfY2WW
+2hrIdK++V6VTnV5mb9Ll3Sw=
+=7kJv
+-----END PGP SIGNATURE-----
diff --git a/app-office/ical/files/digest-ical-2.2.1 b/app-office/ical/files/digest-ical-2.2.1
index 3931fe89e6e3..a9019e31f817 100644
--- a/app-office/ical/files/digest-ical-2.2.1
+++ b/app-office/ical/files/digest-ical-2.2.1
@@ -1,2 +1,2 @@
 MD5 246de6b4f477805db9b15239f4f85473 ical-2.2.1a.tar.bz2 221779
-MD5 33be1cf24c5629a8fc893a6f0f2a3ee2 ical-2.2.1a.patch.tar.bz2 3696
+MD5 13b925ed2c1f0df710157dc13a12bfb3 ical-2.2.1a.patch-0.1.tar.bz2 3712
diff --git a/app-office/ical/ical-2.2.1.ebuild b/app-office/ical/ical-2.2.1.ebuild
index ed3106000e40..d6d6fadc4fbb 100644
--- a/app-office/ical/ical-2.2.1.ebuild
+++ b/app-office/ical/ical-2.2.1.ebuild
@@ -1,46 +1,54 @@
-# 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-office/ical/ical-2.2.1.ebuild,v 1.1 2002/08/01 03:14:35 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ical/ical-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
-DESCRIPTION="Calendar program"
+inherit eutils
+
+PATCH_VER="0.1"
+MY_P=${P}a
+DESCRIPTION="Tk-based Calendar program"
 HOMEPAGE="http://www.fnal.gov/docs/products/tktools/ical.html"
-SRC_URI="http://helios.dii.utk.edu/ftp/pub/tcl/apps/ical/${P}a.tar.bz2
-		 http://www.ibiblio.org/gentoo/distfiles/${P}a.patch.tar.bz2"
+SRC_URI="http://helios.dii.utk.edu/ftp/pub/tcl/apps/ical/${MY_P}.tar.bz2
+	 http://www.ibiblio.org/gentoo/distfiles/${MY_P}.patch-${PATCH_VER}.tar.bz2"
+
 LICENSE="as-is GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
+IUSE=""
 
-DEPEND="dev-lang/tcl dev-lang/tk sys-devel/autoconf"
-RDEPEND="dev-lang/tcl dev-lang/tk"
+RDEPEND="dev-lang/tcl
+	dev-lang/tk"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	sys-devel/autoconf"
 
-S=${WORKDIR}/${P}a
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
 
-	patch -p0 < ${P}a-newtcl.patch
-	patch -p0 < ${P}a-hack.patch
-	patch -p0 < ${P}a-glibc22.patch
-	patch -p0 < ${P}a-print.patch
+	epatch ${MY_P}-newtcl.patch
+	epatch ${MY_P}-hack.patch
+	epatch ${MY_P}-glibc22.patch
+	epatch ${MY_P}-print.patch
 
-	D=${S}/ dosed "s: \@TCL_LIBS\@::" Makefile.in
-	D=${S}/ dosed "s:mkdir:mkdir -p:" Makefile.in
+	sed -i \
+		-e "s: \@TCL_LIBS\@::" \
+		-e "s:mkdir:mkdir -p:" \
+		${S}/Makefile.in \
+		|| die "sed Makefile.in failed"
 
+	has_version '=dev-lang/tcl-8.4*' && epatch ${MY_P}-tcl8.4.patch
 }
 
 src_compile() {
 	autoconf
-	econf
-	emake || die
+	econf --with-tclsh=/usr/bin/tclsh || die
+	emake -j1 || die "make failed"
 }
 
-src_install () {
-	#make DESTDIR=${D} install || die
-	mkdir -p ${D}/usr
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+src_install() {
+	einstall \
+		MANDIR="${D}/usr/share/man" || die "install failed"
 }
diff --git a/app-office/imposter/ChangeLog b/app-office/imposter/ChangeLog
index 91c41e584d00..e535d5f6a6bf 100644
--- a/app-office/imposter/ChangeLog
+++ b/app-office/imposter/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for app-office/imposter
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/ChangeLog,v 1.1 2004/06/15 19:54:21 squinky86 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/ChangeLog,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
+
+*imposter-0.3 (27 Oct 2005)
+
+  27 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/imposter-0.3-ignore-modifiers.patch, +imposter-0.3.ebuild:
+  Update to the latest release, closes bug #87889
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  imposter-0.2.ebuild:
+  Masked imposter-0.2.ebuild stable for ppc
+
+*imposter-0.2-r1 (15 Aug 2004)
+
+  15 Aug 2004; Jon Hood <squinky86@gentoo.org> +imposter-0.2-r1.ebuild,
+  imposter-0.2.ebuild:
+  Stable on x86, add iksemel USE flag with an -r bump.
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> imposter-0.2.ebuild:
+  Added to ~ppc.
 
 *imposter-0.2 (15 Jun 2004)
 
diff --git a/app-office/imposter/Manifest b/app-office/imposter/Manifest
index 018fd563c584..b320cb07cf1c 100644
--- a/app-office/imposter/Manifest
+++ b/app-office/imposter/Manifest
@@ -1,2 +1,7 @@
-MD5 b431d5af84939cfae11bec93b60a8b94 imposter-0.2.ebuild 668
+MD5 d35c238df4f93d55f6a08ba81aad14d2 ChangeLog 1076
 MD5 6e279e1f215934444a96133afe8e7929 files/digest-imposter-0.2 64
+MD5 c3141c32fa0aa6afba08615aa1403968 files/digest-imposter-0.3 64
+MD5 39b28bfda02c7292dbc807eae41543f3 files/imposter-0.3-ignore-modifiers.patch 695
+MD5 ec8a8ba4be9806a37d9c4d4af0bb242c imposter-0.2.ebuild 747
+MD5 3e275a9567ddae33c0a4090f6bc90759 imposter-0.3.ebuild 944
+MD5 b590f3f0a2ce3f620006995e5243fa6f metadata.xml 163
diff --git a/app-office/imposter/imposter-0.2.ebuild b/app-office/imposter/imposter-0.2.ebuild
index e76bddee55cc..0ba2f187f5e3 100644
--- a/app-office/imposter/imposter-0.2.ebuild
+++ b/app-office/imposter/imposter-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/app-office/imposter/imposter-0.2.ebuild,v 1.1 2004/06/15 19:54:21 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.2.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 DESCRIPTION="Imposter is a standalone viewer for the presentations created by OpenOffice.org Impress software"
 HOMEPAGE="http://imposter.sourceforge.net/"
@@ -10,7 +10,7 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 IUSE=""
 DEPEND="virtual/x11
diff --git a/app-office/imposter/imposter-0.3.ebuild b/app-office/imposter/imposter-0.3.ebuild
index 0c7f9ed2bc38..9c6ea3447d88 100644
--- a/app-office/imposter/imposter-0.3.ebuild
+++ b/app-office/imposter/imposter-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-office/imposter/imposter-0.3.ebuild,v 1.1 2005/10/27 16:35:54 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/imposter/imposter-0.3.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-office/imposter/metadata.xml b/app-office/imposter/metadata.xml
index ac76df960980..fb56680f3630 100644
--- a/app-office/imposter/metadata.xml
+++ b/app-office/imposter/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>openoffice</herd>
-<maintainer>
-	<email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/app-office/indeview/ChangeLog b/app-office/indeview/ChangeLog
index ebd045d84585..8ce005d00343 100644
--- a/app-office/indeview/ChangeLog
+++ b/app-office/indeview/ChangeLog
@@ -1,10 +1,43 @@
 # ChangeLog for app-office/indeview
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/ChangeLog,v 1.1 2004/04/22 17:00:17 kanaka Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/ChangeLog,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
+
+  26 Aug 2005; Joel Martin <kanaka@gentoo.org> -indeview-0.6.5.ebuild,
+  indeview-0.6.6.ebuild:
+  Change cp -a to cp -pPR to be less GNU-ish (bug #103487), remove version
+  0.6.5 since we have newer stable 0.6.6
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> indeview-0.6.5.ebuild,
+  indeview-0.6.6.ebuild:
+  Fix qt dep per bug #100235
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> indeview-0.6.5.ebuild,
+  indeview-0.6.6.ebuild:
+  Fix qmake dir per bug #97535
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> indeview-0.6.6.ebuild:
+  Stable on ppc.
+
+*indeview-0.6.6 (12 Apr 2005)
+
+  12 Apr 2005; Joel Martin <kanaka@gentoo.org> indeview-0.6.6.ebuild:
+  Move indeview-0.6.6 to stable
+
+  10 Mar 2005; Joel Martin <kanaka@gentoo.org> :
+  Bump version
+
+  22 Apr 2004; David Holm <dholm@gentoo.org> indeview-0.6.5.ebuild:
+  Added to ~ppc.
+
+  22 Apr 2004; Joel Martin <kanaka@gentoo.org> indeview-0.6.5.ebuild:
+  Fix kpr2iv.sh root data path
+
+  22 Apr 2004; Joel Martin <kanaka@gentoo.org> indeview-0.6.5.ebuild:
+  Be more graceful about openoffice (non) existence
 
 *indeview-0.6.5 (22 Apr 2004)
 
   22 Apr 2004; Joel Martin <kanaka@gentoo.org> indeview-0.6.5.ebuild,
   metadata.xml:
-  New ebuild, bug 46520
+  New ebuild, bug #46520
 
diff --git a/app-office/indeview/Manifest b/app-office/indeview/Manifest
index 677d1908b2d5..07aebbf6b548 100644
--- a/app-office/indeview/Manifest
+++ b/app-office/indeview/Manifest
@@ -1,2 +1,4 @@
-MD5 1e103b16f5be393a589167881e168db8 indeview-0.6.5.ebuild 2380
-MD5 af867adfa8e9bd51546181498d308927 files/digest-indeview-0.6.5 64
+MD5 0eb28b45a9a626c9a7056b28cf40e37b ChangeLog 1425
+MD5 2014ba8791d9410a02f165065a161f9f indeview-0.6.6.ebuild 2754
+MD5 999957c815f1f66cd06973b1da035051 metadata.xml 218
+MD5 27ca16448a510baad8ef2438527d7d03 files/digest-indeview-0.6.6 64
diff --git a/app-office/indeview/indeview-0.6.6.ebuild b/app-office/indeview/indeview-0.6.6.ebuild
index 5e35e7c7d885..2895667e14eb 100644
--- a/app-office/indeview/indeview-0.6.6.ebuild
+++ b/app-office/indeview/indeview-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/app-office/indeview/indeview-0.6.6.ebuild,v 1.1 2005/03/10 19:24:06 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/indeview-0.6.6.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 DESCRIPTION="Convert OpenOffice/KOffice to run independently on Linux, OSX, or Windows"
 HOMEPAGE="http://www.indeview.org/"
@@ -8,14 +8,14 @@ SRC_URI="http://www.${PN}.org/download/${P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
-RDEPEND="x11-libs/qt"
+RDEPEND="=x11-libs/qt-3*"
 
 S=${WORKDIR}/${P}/Viewer
 
 src_compile() {
-	qmake || die "qmake failed"
+	${QTDIR}/bin/qmake || die "qmake failed"
 	make || die "make failed"
 
 	# Fix up the OpenOffice macro file
@@ -28,7 +28,7 @@ src_compile() {
 	sed -i -e 's/</\&lt;/g' IndeViewExport.mo.bas
 	sed -i -e 's/>/\&gt;/g' IndeViewExport.mo.bas
 	sed -i -e "s/'/\&apos;/g" IndeViewExport.mo.bas
-	sed -i -e 's/�/o/g' IndeViewExport.mo.bas
+	sed -i -e 's/ö/o/g' IndeViewExport.mo.bas
 
 	cat >> IndeViewExport.xba << _EOF_
 <?xml version="1.0" encoding="UTF-8"?>
@@ -53,7 +53,7 @@ src_install() {
 	dodoc LICENSE README AUTHORS
 
 	dodir /usr/share/IndeView
-	cp -a ${S}/../ROOT_DATA ${D}/usr/share/IndeView/
+	cp -pPR ${S}/../ROOT_DATA ${D}/usr/share/IndeView/
 
 	dodir /opt/OpenOffice.org/share/basic/Tools
 	insinto /opt/OpenOffice.org/share/basic/Tools
diff --git a/app-office/karbon/ChangeLog b/app-office/karbon/ChangeLog
index 2e03e1da79ba..93ccb353c73a 100644
--- a/app-office/karbon/ChangeLog
+++ b/app-office/karbon/ChangeLog
@@ -1,10 +1,66 @@
 # ChangeLog for app-office/karbon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.1 2005/01/29 13:21:33 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/ChangeLog,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
-*karbon-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> karbon-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +karbon-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> karbon-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*karbon-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +karbon-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> karbon-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> karbon-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> karbon-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> karbon-1.4.1.ebuild:
+  Stable on x86.
+
+*karbon-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +karbon-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> karbon-1.3.5.ebuild:
+  Marked ppc stable.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> karbon-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> karbon-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*karbon-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +karbon-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> karbon-1.3.5.ebuild,
+  karbon-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*karbon-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +karbon-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> karbon-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> karbon-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*karbon-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> karbon-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/karbon/Manifest b/app-office/karbon/Manifest
index 19599e11e690..aa0c15308ac1 100644
--- a/app-office/karbon/Manifest
+++ b/app-office/karbon/Manifest
@@ -1,3 +1,8 @@
-MD5 b8cc731fe2c991670527bffb83389027 prova 1121
-MD5 b8cc731fe2c991670527bffb83389027 karbon-1.3.5.ebuild 1121
+MD5 c6e54aeb9ff0bc8471c1ebfeff93efa1 ChangeLog 2037
+MD5 951dfb5ac028d5d4efa041ce58e0de87 karbon-1.3.5.ebuild 1234
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 2f250fcc2c7c9a0dfe62c471d6c78cc1 karbon-1.4.1.ebuild 1177
+MD5 bcc4bcdadf35e5e49bf960fd5d9c7b60 karbon-1.4.2.ebuild 1185
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-karbon-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-karbon-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-karbon-1.4.2 68
diff --git a/app-office/karbon/karbon-1.3.5.ebuild b/app-office/karbon/karbon-1.3.5.ebuild
index b81befa3f802..050e8b275947 100644
--- a/app-office/karbon/karbon-1.3.5.ebuild
+++ b/app-office/karbon/karbon-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/app-office/karbon/karbon-1.3.5.ebuild,v 1.1 2005/01/29 13:21:33 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/karbon/karbon-1.4.1.ebuild b/app-office/karbon/karbon-1.4.1.ebuild
index e55ed4d6e4a2..ac0c9bee3426 100644
--- a/app-office/karbon/karbon-1.4.1.ebuild
+++ b/app-office/karbon/karbon-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/app-office/karbon/karbon-1.4.1.ebuild,v 1.1 2005/07/25 20:19:34 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/karbon/karbon-1.4.2.ebuild b/app-office/karbon/karbon-1.4.2.ebuild
index c92e99f83be8..e2acb5bb6023 100644
--- a/app-office/karbon/karbon-1.4.2.ebuild
+++ b/app-office/karbon/karbon-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.4.2.ebuild,v 1.1 2005/10/10 22:03:09 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/karbon/karbon-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/karbon/metadata.xml b/app-office/karbon/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/karbon/metadata.xml
+++ b/app-office/karbon/metadata.xml
@@ -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/app-office/kbudget/ChangeLog b/app-office/kbudget/ChangeLog
index 78f35dab81b3..b6b9b3bd1068 100644
--- a/app-office/kbudget/ChangeLog
+++ b/app-office/kbudget/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for app-office/kbudget
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kbudget/ChangeLog,v 1.1 2003/11/14 14:54:59 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kbudget/ChangeLog,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> kbudget-0.6.ebuild:
+  Added to ~ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> kbudget-0.6.ebuild:
+  stable on amd64
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> kbudget-0.6.ebuild:
+  Stable on sparc.
+
+  01 May 2004; Dominik Stadler <centic@gentoo.org> kbudget-0.5.ebuild,
+  kbudget-0.6.ebuild:
+  Add missing IUSE and mark 0.6 stable on x86
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> kbudget-0.6.ebuild:
+  Added ~sparc keyword.
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> kbudget-0.6.ebuild:
+  Adding amd64 keyword. Closing #37454.
+
+*kbudget-0.6 (03 Jan 2004)
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> kbudget-0.6.ebuild,
+  kbudget-0.6_rc1.ebuild:
+  New version
+
+*kbudget-0.6_rc1 (24 Dec 2003)
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kbudget-0.6_rc1.ebuild:
+  New version
 
 *kbudget-0.5 (14 Nov 2003)
 
diff --git a/app-office/kbudget/Manifest b/app-office/kbudget/Manifest
index 5d4e3a55a786..02ca22b3adda 100644
--- a/app-office/kbudget/Manifest
+++ b/app-office/kbudget/Manifest
@@ -1,3 +1,4 @@
-MD5 fdffe76a400c9fead347945cc47932b3 kbudget-0.5.ebuild 506
-MD5 ac49835c1e3ebc7ae263d49782715b70 ChangeLog 240
-MD5 9ff15f9cd1a6b54aa2290c97200f1f9d files/digest-kbudget-0.5 64
+MD5 23bd613fffc5d27a01d6a35a05f178f0 ChangeLog 1173
+MD5 470b16899d6660efda858323e647133f kbudget-0.6.ebuild 488
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ec6f48d40d0d0c004eab129991d75c5d files/digest-kbudget-0.6 64
diff --git a/app-office/kbudget/kbudget-0.6.ebuild b/app-office/kbudget/kbudget-0.6.ebuild
index 33dfaa3d1512..7837fe4bd7dc 100644
--- a/app-office/kbudget/kbudget-0.6.ebuild
+++ b/app-office/kbudget/kbudget-0.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/app-office/kbudget/kbudget-0.6.ebuild,v 1.1 2004/01/04 01:34:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kbudget/kbudget-0.6.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 inherit kde
 need-kde 3.0
@@ -8,6 +8,10 @@ need-kde 3.0
 DESCRIPTION="A budgeting and money management program for KDE."
 SRC_URI="http://www.garandnet.net/kbudget/downloads/${P}.tar.bz2"
 HOMEPAGE="http://www.garandnet.net/kbudget/"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+SLOT="0"
+IUSE=""
+
diff --git a/app-office/kbudget/metadata.xml b/app-office/kbudget/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/app-office/kbudget/metadata.xml
+++ b/app-office/kbudget/metadata.xml
@@ -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/app-office/kchart/ChangeLog b/app-office/kchart/ChangeLog
index c7b0e3e1e5cc..dbe8ed785051 100644
--- a/app-office/kchart/ChangeLog
+++ b/app-office/kchart/ChangeLog
@@ -1,10 +1,69 @@
 # ChangeLog for app-office/kchart
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.1 2005/01/29 13:21:59 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/ChangeLog,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
-*kchart-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kchart-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kchart-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> kchart-1.4.1.ebuild:
+  Marking ppc64 stable for kword security fix
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> kchart-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kchart-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kchart-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kchart-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kchart-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kchart-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kchart-1.4.1.ebuild:
+  Stable on x86.
+
+*kchart-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kchart-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kchart-1.3.5.ebuild:
+  Marked ppc stable.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kchart-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kchart-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*kchart-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kchart-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kchart-1.3.5.ebuild,
+  kchart-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kchart-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kchart-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kchart-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kchart-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*kchart-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kchart-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kchart/Manifest b/app-office/kchart/Manifest
index 37bbd5984c32..12782506263a 100644
--- a/app-office/kchart/Manifest
+++ b/app-office/kchart/Manifest
@@ -1,2 +1,8 @@
-MD5 5a3688790ab0ef080769921534c00384 kchart-1.3.5.ebuild 805
+MD5 5989281119fdf0f1b408e3f7bf7d72dd ChangeLog 2152
+MD5 2408b345851a8f95fc4e156294f91682 kchart-1.3.5.ebuild 920
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 b4f932f94e43ec9cc8cf381c327d9b64 kchart-1.4.1.ebuild 902
+MD5 06d49833937ebeac9183cddc77b4b192 kchart-1.4.2.ebuild 913
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kchart-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kchart-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kchart-1.4.2 68
diff --git a/app-office/kchart/kchart-1.3.5.ebuild b/app-office/kchart/kchart-1.3.5.ebuild
index 89ef6a3086b8..16c75d663c59 100644
--- a/app-office/kchart/kchart-1.3.5.ebuild
+++ b/app-office/kchart/kchart-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/app-office/kchart/kchart-1.3.5.ebuild,v 1.1 2005/01/29 13:21:59 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/kchart/kchart-1.4.1.ebuild b/app-office/kchart/kchart-1.4.1.ebuild
index 3386c6c1b589..f5e0b8e7327c 100644
--- a/app-office/kchart/kchart-1.4.1.ebuild
+++ b/app-office/kchart/kchart-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/app-office/kchart/kchart-1.4.1.ebuild,v 1.1 2005/07/25 20:23:55 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kchart/kchart-1.4.2.ebuild b/app-office/kchart/kchart-1.4.2.ebuild
index a75f74327317..c1a96e8ce82a 100644
--- a/app-office/kchart/kchart-1.4.2.ebuild
+++ b/app-office/kchart/kchart-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.4.2.ebuild,v 1.1 2005/10/10 22:03:38 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kchart/kchart-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kchart/metadata.xml b/app-office/kchart/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kchart/metadata.xml
+++ b/app-office/kchart/metadata.xml
@@ -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/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index 52d3dcf637f8..0b93c80f0151 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.1 2005/06/03 15:16:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kexi-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> kexi-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kexi-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kexi-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kexi-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kexi-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kexi-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kexi-1.4.1.ebuild:
+  Stable on x86.
+
+*kexi-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kexi-1.4.1.ebuild:
+  New version.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kexi-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kexi-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+  22 Jun 2005; David Holm <dholm@gentoo.org> kexi-1.4.0.ebuild:
+  Added to ~ppc.
+
+*kexi-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kexi-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kexi-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+  05 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> kexi-1.4.0_rc1.ebuild:
+  Marked ~amd64, bug 95128.
 
 *kexi-1.4.0_rc1 (03 Jun 2005)
 
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 6210c596db61..93ae0fa6182e 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,4 +1,6 @@
+MD5 9b706075cb522ff4f3b8ba5f05473c6a ChangeLog 1784
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 93fb86808a03dc6b6a309aa9bc5921d1 ChangeLog 374
-MD5 1eed064109cb00df658ea6777d218ba8 kexi-1.4.0_rc1.ebuild 965
-MD5 115a377f43af7c4116229b38631f80bc files/digest-kexi-1.4.0_rc1 69
+MD5 90a8b21bfe0797419089980639fd6eb3 kexi-1.4.1.ebuild 1074
+MD5 2b47d8d6f70a23d663833b1226284708 kexi-1.4.2.ebuild 1082
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kexi-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2 68
diff --git a/app-office/kexi/kexi-1.4.1.ebuild b/app-office/kexi/kexi-1.4.1.ebuild
index a9ff7ec5a983..d550849602d3 100644
--- a/app-office/kexi/kexi-1.4.1.ebuild
+++ b/app-office/kexi/kexi-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/app-office/kexi/kexi-1.4.1.ebuild,v 1.1 2005/07/25 20:20:11 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="mysql postgres"
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kexi/kexi-1.4.2.ebuild b/app-office/kexi/kexi-1.4.2.ebuild
index 43db87a9eed7..49d12755d79b 100644
--- a/app-office/kexi/kexi-1.4.2.ebuild
+++ b/app-office/kexi/kexi-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.4.2.ebuild,v 1.1 2005/10/10 22:04:12 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="mysql postgres"
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kformula/ChangeLog b/app-office/kformula/ChangeLog
index 0559a3334ca6..46bd1220a3ef 100644
--- a/app-office/kformula/ChangeLog
+++ b/app-office/kformula/ChangeLog
@@ -1,10 +1,67 @@
 # ChangeLog for app-office/kformula
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.1 2005/01/29 13:22:23 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/ChangeLog,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
-*kformula-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kformula-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kformula-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> kformula-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kformula-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kformula-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kformula-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kformula-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kformula-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kformula-1.4.1.ebuild:
+  Stable on x86.
+
+*kformula-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kformula-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kformula-1.3.5.ebuild:
+  Marked ppc stable, thanks bambam.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kformula-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kformula-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*kformula-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kformula-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kformula-1.3.5.ebuild,
+  kformula-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kformula-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kformula-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kformula-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kformula-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*kformula-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kformula-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kformula/Manifest b/app-office/kformula/Manifest
index 01cd7a21ca6b..8418d2fcb740 100644
--- a/app-office/kformula/Manifest
+++ b/app-office/kformula/Manifest
@@ -1,3 +1,8 @@
-MD5 a2e734d7f29507f5cf3a8934e908aa95 prova 798
-MD5 a2e734d7f29507f5cf3a8934e908aa95 kformula-1.3.5.ebuild 798
+MD5 b07202f40c1d76638dca5f91c0ca26bf ChangeLog 2104
+MD5 f39d98fa9efce32ffc3da9f51fd6592b kformula-1.3.5.ebuild 917
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 06ec3dd9f141552ef0d2794d7394e58b kformula-1.4.1.ebuild 852
+MD5 0af8257a1128eb9b500197112fe889b6 kformula-1.4.2.ebuild 860
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kformula-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kformula-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kformula-1.4.2 68
diff --git a/app-office/kformula/kformula-1.3.5.ebuild b/app-office/kformula/kformula-1.3.5.ebuild
index 20f68d5cb38f..535d069e44cc 100644
--- a/app-office/kformula/kformula-1.3.5.ebuild
+++ b/app-office/kformula/kformula-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/app-office/kformula/kformula-1.3.5.ebuild,v 1.1 2005/01/29 13:22:23 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/kformula/kformula-1.4.1.ebuild b/app-office/kformula/kformula-1.4.1.ebuild
index 4df13a9c641f..a23a82a3ac08 100644
--- a/app-office/kformula/kformula-1.4.1.ebuild
+++ b/app-office/kformula/kformula-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/app-office/kformula/kformula-1.4.1.ebuild,v 1.1 2005/07/25 20:24:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kformula/kformula-1.4.2.ebuild b/app-office/kformula/kformula-1.4.2.ebuild
index 9c34504efc73..f2b2dd283ad2 100644
--- a/app-office/kformula/kformula-1.4.2.ebuild
+++ b/app-office/kformula/kformula-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.4.2.ebuild,v 1.1 2005/10/10 22:04:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kformula/kformula-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kformula/metadata.xml b/app-office/kformula/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kformula/metadata.xml
+++ b/app-office/kformula/metadata.xml
@@ -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/app-office/khacc/ChangeLog b/app-office/khacc/ChangeLog
index d4011c6ba91b..c680133daaba 100644
--- a/app-office/khacc/ChangeLog
+++ b/app-office/khacc/ChangeLog
@@ -1,8 +1,64 @@
 # ChangeLog for app-office/khacc
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/khacc/ChangeLog,v 1.1 2003/10/10 13:44:52 caleb Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/khacc/ChangeLog,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
-*khacc-2.9 (12 Aug 2003)
+*khacc-3.3 (03 Jul 2005)
+
+  03 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +khacc-3.3.ebuild:
+  version bump
+
+*khacc-3.2.3 (24 Dec 2004)
+
+  24 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +khacc-3.2.3.ebuild:
+  version bump
+
+  31 Oct 2004; Carsten Lohrke <carlo@gentoo.org> -khacc-1.7.2.ebuild,
+  -khacc-1.7.8.ebuild, -khacc-1.7.9.ebuild:
+  clean up
+
+*khacc-3.2.2 (29 Oct 2004)
+
+  29 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +khacc-3.2.2.ebuild:
+  version bump
+
+  20 Oct 2004; Jason Wever <weeve@gentoo.org> khacc-3.2.1.ebuild:
+  Stable on sparc wrt bug #67169.
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> khacc-3.2.1.ebuild:
+  stable on x86
+
+  20 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +files/khacc-3.2.1.diff:
+  oops, forgot patch for 3.2.1
+
+*khacc-3.2.1 (13 Sep 2004)
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +khacc-3.2.1.ebuild:
+  version bump
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> khacc-1.7.8.ebuild:
+  Stable on sparc.
+
+  02 May 2004; David Holm <dholm@gentoo.org> khacc-1.7.9.ebuild:
+  Added to ~ppc.
+
+*khacc-1.7.9 (01 May 2004)
+
+  01 May 2004; Dominik Stadler <centic@gentoo.org> khacc-1.7.2.ebuild,
+  khacc-1.7.8.ebuild, +khacc-1.7.9.ebuild:
+  Mark 1.7.8 stable, add new Version 1.7.9, add missing IUSE
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> khacc-1.7.8.ebuild:
+  Added ~sparc keyword.
+
+  09 Mar 2004; Dominik Stadler <centic@gentoo.org> khacc-1.7.8.ebuild:
+  Add einfo for necessary action for qhacc, see Bug 38825
+
+*khacc-1.7.8 (07 Mar 2004)
+
+  07 Mar 2004; Dominik Stadler <centic@gentoo.org> khacc-1.7.8.ebuild:
+  Version bump, thanks to Charles Phoenix <phoenixreads@rogers.com>, Bug# 38825
+
+*khacc-1.7.2 (12 Aug 2003)
 
   10 Oct 2003; Caleb Tennis <caleb@gentoo.org> khacc-1.7.2.ebuild:
   Initial ebuild - closes bug #7146
diff --git a/app-office/khacc/Manifest b/app-office/khacc/Manifest
index 64bd93034907..8c38431aa317 100644
--- a/app-office/khacc/Manifest
+++ b/app-office/khacc/Manifest
@@ -1,4 +1,11 @@
-MD5 8691a395b3d09028790f522d6bef4014 khacc-1.7.2.ebuild 477
-MD5 da36ef196eb2c446e20b00f7c0c75ec1 ChangeLog 345
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
-MD5 51ee80d47afaa16d79ecabd545fae66d files/digest-khacc-1.7.2 64
+MD5 94132b4398a547f181e263a8f0be6f42 khacc-3.2.1.ebuild 1010
+MD5 62a419ea0bc149abdef2959f5e716eb6 khacc-3.2.3.ebuild 893
+MD5 3e9e3f0460f8371e826698d795f5ef4f khacc-3.2.2.ebuild 1018
+MD5 069c92b778a522bdcc67ff29a0853c05 ChangeLog 1982
+MD5 1b130ac5a966422e8cc8645a74b8c432 khacc-3.3.ebuild 884
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 f70407552ca37deca54854350c31c316 files/digest-khacc-3.3 61
+MD5 7110503bd51fe6625682c349b38b4365 files/khacc-3.2.1.diff 636
+MD5 f2c91ee22c7b060012be71a8aeb151c8 files/digest-khacc-3.2.1 63
+MD5 1aba912a14f8f976fefc840fda9c1d4a files/digest-khacc-3.2.2 63
+MD5 8f0e0033c83efd511004b732e8b6dd46 files/digest-khacc-3.2.3 63
diff --git a/app-office/khacc/khacc-3.2.1.ebuild b/app-office/khacc/khacc-3.2.1.ebuild
index c0af1c42b80d..6695635946c8 100644
--- a/app-office/khacc/khacc-3.2.1.ebuild
+++ b/app-office/khacc/khacc-3.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-office/khacc/khacc-3.2.1.ebuild,v 1.1 2004/09/13 19:33:59 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/khacc/khacc-3.2.1.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 inherit kde eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://qhacc.sourceforge.net"
 SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ppc"
 LICENSE="GPL-2"
 IUSE=""
 
diff --git a/app-office/khacc/khacc-3.2.2.ebuild b/app-office/khacc/khacc-3.2.2.ebuild
index fe94f0307435..858ea5887c53 100644
--- a/app-office/khacc/khacc-3.2.2.ebuild
+++ b/app-office/khacc/khacc-3.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-office/khacc/khacc-3.2.2.ebuild,v 1.1 2004/10/29 19:01:25 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/khacc/khacc-3.2.2.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 inherit kde eutils
 
diff --git a/app-office/khacc/khacc-3.2.3.ebuild b/app-office/khacc/khacc-3.2.3.ebuild
index 8051d1e7dc53..eb2e0784e434 100644
--- a/app-office/khacc/khacc-3.2.3.ebuild
+++ b/app-office/khacc/khacc-3.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/app-office/khacc/khacc-3.2.3.ebuild,v 1.1 2004/12/23 23:38:33 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/khacc/khacc-3.2.3.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 inherit kde
 
diff --git a/app-office/khacc/khacc-3.3.ebuild b/app-office/khacc/khacc-3.3.ebuild
index b054cc1a3242..5adce2221f5d 100644
--- a/app-office/khacc/khacc-3.3.ebuild
+++ b/app-office/khacc/khacc-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/app-office/khacc/khacc-3.3.ebuild,v 1.1 2005/07/03 21:07:38 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/khacc/khacc-3.3.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 inherit kde
 
diff --git a/app-office/khacc/metadata.xml b/app-office/khacc/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/khacc/metadata.xml
+++ b/app-office/khacc/metadata.xml
@@ -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/app-office/kivio/ChangeLog b/app-office/kivio/ChangeLog
index a107997f40fd..da5a3db4b0c7 100644
--- a/app-office/kivio/ChangeLog
+++ b/app-office/kivio/ChangeLog
@@ -1,10 +1,66 @@
 # ChangeLog for app-office/kivio
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.1 2005/01/29 13:22:50 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/ChangeLog,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
-*kivio-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kivio-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kivio-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> kivio-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kivio-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kivio-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kivio-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kivio-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kivio-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kivio-1.4.1.ebuild:
+  Stable on x86.
+
+*kivio-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kivio-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kivio-1.3.5.ebuild:
+  Marked ppc stable. Thanks bambam.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kivio-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kivio-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*kivio-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kivio-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kivio-1.3.5.ebuild,
+  kivio-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kivio-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kivio-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kivio-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kivio-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*kivio-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kivio-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kivio/Manifest b/app-office/kivio/Manifest
index 57845dc50530..5ae708f38f0e 100644
--- a/app-office/kivio/Manifest
+++ b/app-office/kivio/Manifest
@@ -1,2 +1,8 @@
-MD5 62e3753663a116014837cc3aaedacb34 kivio-1.3.5.ebuild 889
+MD5 db38e134d2c62e43520a23ab01304582 ChangeLog 2027
+MD5 d1244d1d7526b8f9c008f1c5cfb91b39 kivio-1.3.5.ebuild 1002
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 c32f282e2aaedf170b5d1139752dcef9 kivio-1.4.1.ebuild 845
+MD5 9813f2089c7ba8634d7d2f144d71502b kivio-1.4.2.ebuild 853
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kivio-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kivio-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kivio-1.4.2 68
diff --git a/app-office/kivio/kivio-1.3.5.ebuild b/app-office/kivio/kivio-1.3.5.ebuild
index f349e4866d10..88036c1e4ae6 100644
--- a/app-office/kivio/kivio-1.3.5.ebuild
+++ b/app-office/kivio/kivio-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/app-office/kivio/kivio-1.3.5.ebuild,v 1.1 2005/01/29 13:22:50 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/kivio/kivio-1.4.1.ebuild b/app-office/kivio/kivio-1.4.1.ebuild
index e311eade2658..dcf87c42aa26 100644
--- a/app-office/kivio/kivio-1.4.1.ebuild
+++ b/app-office/kivio/kivio-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/app-office/kivio/kivio-1.4.1.ebuild,v 1.1 2005/07/25 20:20:39 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kivio/kivio-1.4.2.ebuild b/app-office/kivio/kivio-1.4.2.ebuild
index b74fb5715558..2b0bd0bfee8b 100644
--- a/app-office/kivio/kivio-1.4.2.ebuild
+++ b/app-office/kivio/kivio-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.4.2.ebuild,v 1.1 2005/10/10 22:05:10 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kivio/metadata.xml b/app-office/kivio/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kivio/metadata.xml
+++ b/app-office/kivio/metadata.xml
@@ -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/app-office/kletterwizard/ChangeLog b/app-office/kletterwizard/ChangeLog
index 33204da59f37..4036e2374d19 100644
--- a/app-office/kletterwizard/ChangeLog
+++ b/app-office/kletterwizard/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for app-office/kletterwizard
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.1 2004/06/22 23:17:32 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/ChangeLog,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
+
+  21 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kletterwizard-0.9.6.ebuild:
+  Correct KDE dependency (#83058).
+
+  22 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kletterwizard-0.9.6.ebuild:
+  Added to ~ppc.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kletterwizard-0.9.2.ebuild,
+  kletterwizard-0.9.4.ebuild, kletterwizard-0.9.6.ebuild:
+  Changed dep on kdegraphics to accept kdegraphics-meta, the split 'meta'
+  package. This dep will be narrowed down in the future to the precise split
+  packages required.
+
+  30 Dec 2004; Jason Wever <weeve@gentoo.org> kletterwizard-0.9.6.ebuild:
+  Added ~sparc keyword.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  kletterwizard-0.9.6.ebuild:
+  Stable on amd64 and x86.
+
+  26 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kletterwizard-0.9.6.ebuild:
+  QA: place need-kde after R/DEPEND (again!)
+
+*kletterwizard-0.9.6 (25 Jul 2004)
+
+  25 Jul 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/kletterwizard-0.9.6-gentoo.diff, kletterwizard-0.9.2.ebuild,
+  kletterwizard-0.9.4.ebuild, +kletterwizard-0.9.6.ebuild:
+  Version bump. Had to work around sandbox violations associated with
+  kletterwizard's new latex class. All other ebuilds were fixed to depend on
+  virtual/tetex to fix bug #57175.
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> kletterwizard-0.9.4.ebuild:
+  Added to ~ppc.
+
+*kletterwizard-0.9.4 (30 Jun 2004)
+
+  30 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kletterwizard-0.9.2.ebuild,
+  +kletterwizard-0.9.4.ebuild:
+  version bump, QA: IUSE (#52160), need-kde (#25013)
+
+  23 Jun 2004; Dylan Carlson <absinthe@gentoo.org> kletterwizard-0.9.2.ebuild:
+  Added DEPEND for kde-base/kdegraphics to provide kghostview.
 
 *kletterwizard-0.9.2 (22 Jun 2004)
 
diff --git a/app-office/kletterwizard/Manifest b/app-office/kletterwizard/Manifest
index 48e91daf2044..e62bfe818ca1 100644
--- a/app-office/kletterwizard/Manifest
+++ b/app-office/kletterwizard/Manifest
@@ -1,2 +1,5 @@
-MD5 77f73cbeb17c055931152d42391b4a57 kletterwizard-0.9.2.ebuild 500
-MD5 abb91ac9161eb87b157654c2a511ad33 files/digest-kletterwizard-0.9.2 72
+MD5 771900411731330925dd4e7f7dfd64cc metadata.xml 224
+MD5 46703a11cde864da9e0dc370079eeb5c ChangeLog 2081
+MD5 985918558c70e1ee526b74bf181f2f19 kletterwizard-0.9.6.ebuild 966
+MD5 bead1367fe377e3aa71427f048472657 files/kletterwizard-0.9.6-gentoo.diff 1505
+MD5 b28a8de5a4b3cca948dbc0b34cc67768 files/digest-kletterwizard-0.9.6 71
diff --git a/app-office/kletterwizard/kletterwizard-0.9.6.ebuild b/app-office/kletterwizard/kletterwizard-0.9.6.ebuild
index 559ee10337ee..f76f952ff54a 100644
--- a/app-office/kletterwizard/kletterwizard-0.9.6.ebuild
+++ b/app-office/kletterwizard/kletterwizard-0.9.6.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/app-office/kletterwizard/kletterwizard-0.9.6.ebuild,v 1.1 2004/07/25 20:06:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kletterwizard/kletterwizard-0.9.6.ebuild,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="KLetterWizard is a KDE application which simplifies letter writing and produces output via LaTeX."
 HOMEPAGE="http://www.kluenter.de/klw.html"
 SRC_URI="http://www.kluenter.de/${P}.tar.gz"
+LICENSE="GPL-2"
 
 SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/tetex
-		>=dev-tex/g-brief-4.0.1
-		>=kde-base/kdegraphics-3.2.0"
+	>=dev-tex/g-brief-4.0.1
+	|| ( kde-base/kghostview >=kde-base/kdegraphics-3.2.0 )"
+
+need-kde 3.2
 
 src_unpack() {
 	kde_src_unpack
diff --git a/app-office/kmymoney2/ChangeLog b/app-office/kmymoney2/ChangeLog
index 1f0f00a6b3dc..405fc0bc9665 100644
--- a/app-office/kmymoney2/ChangeLog
+++ b/app-office/kmymoney2/ChangeLog
@@ -1,6 +1,143 @@
-# ChangeLog for x11-libs/qt
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.1 2003/05/29 03:45:40 caleb Exp $
+# ChangeLog for app-office/kmymoney2
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
+
+*kmymoney2-0.8.1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kmymoney2-0.8.1.ebuild:
+  New version (#112474).
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> kmymoney2-0.8.ebuild:
+  Stable on ppc.
+
+  24 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmymoney2-0.8.ebuild:
+  Stable on x86; bug #109721
+
+  22 Oct 2005; Jason Wever <weeve@gentoo.org> kmymoney2-0.8.ebuild:
+  Stable on SPARC wrt bug #109721.
+
+  18 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> kmymoney2-0.8.ebuild:
+  Marked stable on amd64, bug 109721.
+
+*kmymoney2-0.8 (14 Aug 2005)
+
+  14 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +kmymoney2-0.8.ebuild:
+  New version (#102384).
+
+*kmymoney2-0.7.5 (31 Jul 2005)
+
+  31 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +kmymoney2-0.7.5.ebuild:
+  version bump
+
+*kmymoney2-0.7.4 (19 Jul 2005)
+
+  19 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +kmymoney2-0.7.4.ebuild:
+  version bump
+
+  13 Jul 2005; Joseph Jezak <josejx@gentoo.org> kmymoney2-0.6.4.ebuild:
+  Marked ppc stable for bug #98809.
+
+  10 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kmymoney2-0.7.3.ebuild:
+  Disable gcc visibility support for bug #98582.
+
+*kmymoney2-0.7.3 (10 Jul 2005)
+
+  10 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kmymoney2-0.7.3.ebuild:
+  New version (#95070).
+
+*kmymoney2-0.7.1-r1 (29 May 2005)
+
+  29 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kmymoney2-0.7.1-csv-export.patch, +kmymoney2-0.7.1-r1.ebuild:
+  Correct libofx dependency. Add patch for bug #94379, thanks to
+  <le.petit.fou@gmx.de>.
+
+*kmymoney2-0.7.1 (22 May 2005)
+
+  22 May 2005; Carsten Lohrke <carlo@gentoo.org> +kmymoney2-0.7.1.ebuild:
+  version bump
+
+*kmymoney2-0.7.0 (17 May 2005)
+
+  17 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kmymoney2-0.7.0.ebuild:
+  New version (#92715).
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> kmymoney2-0.6.4.ebuild:
+  stable on amd64
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmymoney2-0.6.4.ebuild:
+  Stable on sparc
+
+  24 Feb 2005; Dominik Stadler <centic@gentoo.org> kmymoney2-0.6.4.ebuild:
+  Mark stable on x86
+
+  05 Feb 2005; Simone Gotti <motaboy@gentoo.org>
+  +files/kmymoney2-0.6.2-configure-arts.patch,
+  +files/kmymoney2-0.6.4-configure-arts.patch, kmymoney2-0.6.2.ebuild,
+  kmymoney2-0.6.4.ebuild:
+  Add a configure script patch to honor the arts USE flag. Fixes bug #80461.
+
+*kmymoney2-0.6.4 (23 Jan 2005)
+
+  23 Jan 2005; Dominik Stadler <centic@gentoo.org> +kmymoney2-0.6.4.ebuild:
+  Add new Version 0.6.4
+
+  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> kmymoney2-0.6.2.ebuild:
+  Stable on sparc
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kmymoney2-0.6.2.ebuild:
+  stable on x86
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> kmymoney2-0.5.1.ebuild:
+  Stable on sparc.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> kmymoney2-0.6.2.ebuild:
+  Added ~sparc keyword.
+
+*kmymoney2-0.6.2 (26 Sep 2004)
+
+  26 Sep 2004; Dominik Stadler <centic@gentoo.org> +kmymoney2-0.6.2.ebuild,
+  -kmymoney2-0.6_rc3.ebuild, -kmymoney2-0.6_rc4.ebuild:
+  Removed old release candidates and add new Version 0.6.2, fixes Bug 65355
+
+  23 Aug 2004; Douglas Russell,,, <puggy@gentoo.org> kmymoney2-0.6.1.ebuild:
+  0.6.1 works on ppc
+
+*kmymoney2-0.6.1 (20 Jul 2004)
+
+  20 Jul 2004; Dominik Stadler <centic@gentoo.org> +kmymoney2-0.6.1.ebuild:
+  Add new Version 0.6.1
+
+  18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> kmymoney2-0.6.ebuild:
+  Added amd64 keyword, closing #56981.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kmymoney2-0.5.1.ebuild,
+  kmymoney2-0.6.ebuild, kmymoney2-0.6_rc3.ebuild, kmymoney2-0.6_rc4.ebuild:
+  QA: kde-base -> kde, need-kde
+
+*kmymoney2-0.6 (18 Jun 2004)
+
+  18 Jun 2004; Dominik Stadler <centic@gentoo.org> +kmymoney2-0.6.ebuild:
+  Add new version 0.6
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> kmymoney2-0.6_rc4.ebuild:
+  Added to ~ppc.
+
+*kmymoney2-0.6_rc4 (25 Apr 2004)
+
+  25 Apr 2004; Dominik Stadler <centic@gentoo.org> +kmymoney2-0.6_rc4.ebuild:
+  Add version 0.6rc4, see Bug 48938. Correct dependencies in all ebuilds.
+
+*kmymoney2-0.6_rc3 (20 Mar 2004)
+
+  20 Mar 2004; Dominik Stadler <centic@gentoo.org> kmymoney2-0.6_rc3.ebuild:
+  Add new Version 0.6rc3, may fix Bug 39510
+
+  19 Jun 2003; Alastair Tse <liquidx@gentoo.org> kmymoney2-0.5.1.ebuild:
+  moved libxml++ to libxmlpp
+
+  06 Jun 2003; Jason Wever <weeve@gentoo.org> kmymoney2-0.5.1.ebuild:
+  Added ~sparc to keywords.
 
 *kmymoney2-0.5.1 (28 May 2003)
 
diff --git a/app-office/kmymoney2/Manifest b/app-office/kmymoney2/Manifest
index 48a8b4e109a2..edd94c16e7be 100644
--- a/app-office/kmymoney2/Manifest
+++ b/app-office/kmymoney2/Manifest
@@ -1,2 +1,9 @@
-MD5 db46b72192348c3aed1ddeea70d3b3cd kmymoney2-0.5.1.ebuild 403
-MD5 1e021f274fd4522ebc21d1efaa886126 files/digest-kmymoney2-0.5.1 69
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 98328b7b92716fd54a4e395ccaf52e96 ChangeLog 4754
+MD5 f89ae557f762bf894669b2f0b2a3af8f kmymoney2-0.6.4.ebuild 604
+MD5 077b7b737ada5603a62cfe16e96024e1 kmymoney2-0.8.ebuild 782
+MD5 6205153abe0b22a4f3c321d82eee7d6a kmymoney2-0.8.1.ebuild 788
+MD5 4858dd29941b51d0944ff1066f30af13 files/digest-kmymoney2-0.6.4 69
+MD5 fa6af21632e62a658f44f23999defe50 files/digest-kmymoney2-0.8 67
+MD5 e548b46016c0cae59266ac01e45fc5e0 files/digest-kmymoney2-0.8.1 69
+MD5 c3b80300877c3e8f27d4b4a87895799a files/kmymoney2-0.6.4-configure-arts.patch 3565
diff --git a/app-office/kmymoney2/kmymoney2-0.6.4.ebuild b/app-office/kmymoney2/kmymoney2-0.6.4.ebuild
index bb2985cc07df..e41b64197810 100644
--- a/app-office/kmymoney2/kmymoney2-0.6.4.ebuild
+++ b/app-office/kmymoney2/kmymoney2-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/app-office/kmymoney2/kmymoney2-0.6.4.ebuild,v 1.1 2005/01/23 19:15:42 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
 
 inherit kde
 
@@ -9,12 +9,17 @@ HOMEPAGE="http://kmymoney2.sourceforge.net"
 SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 
-IUSE=""
+IUSE="arts"
 SLOT="0"
 
 DEPEND="dev-libs/libxml2
 	dev-cpp/libxmlpp"
 need-kde 3
 
+src_unpack() {
+	kde_src_unpack
+
+	use arts || epatch ${FILESDIR}/${P}-configure-arts.patch
+}
diff --git a/app-office/kmymoney2/kmymoney2-0.8.1.ebuild b/app-office/kmymoney2/kmymoney2-0.8.1.ebuild
index ec0a23676f81..51d6656ba7b0 100644
--- a/app-office/kmymoney2/kmymoney2-0.8.1.ebuild
+++ b/app-office/kmymoney2/kmymoney2-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-office/kmymoney2/kmymoney2-0.8.1.ebuild,v 1.1 2005/11/16 15:27:53 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
 
 inherit kde
 
diff --git a/app-office/kmymoney2/kmymoney2-0.8.ebuild b/app-office/kmymoney2/kmymoney2-0.8.ebuild
index bb24ece6313f..e98c602dd42a 100644
--- a/app-office/kmymoney2/kmymoney2-0.8.ebuild
+++ b/app-office/kmymoney2/kmymoney2-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-office/kmymoney2/kmymoney2-0.8.ebuild,v 1.1 2005/08/14 14:35:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="crypt ofx"
 
 DEPEND="dev-libs/libxml2
@@ -24,16 +24,7 @@ need-kde 3.2
 # TODO: support maketest
 # (needs cppunit in DEPEND)
 
-src_unpack() {
-	# override kde_src_unpack and remove visibility support manually:
-	# regenerating the configure script is too error-prone with this
-	# package, which uses a lot of custom macros in acinclude.m4.
-	unpack ${A}
-}
-
 src_compile() {
-	export kde_cv_prog_cxx_fvisibility_hidden=no
-
 	local myconf="$(use_enable ofx ofxplugin)
 	              --disable-kbanking
 	              --disable-cppunit"
diff --git a/app-office/kmymoney2/metadata.xml b/app-office/kmymoney2/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/app-office/kmymoney2/metadata.xml
+++ b/app-office/kmymoney2/metadata.xml
@@ -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/app-office/koffice-data/ChangeLog b/app-office/koffice-data/ChangeLog
index 34e8fbfdec8b..337768ce8cdc 100644
--- a/app-office/koffice-data/ChangeLog
+++ b/app-office/koffice-data/ChangeLog
@@ -1,10 +1,79 @@
 # ChangeLog for app-office/koffice-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.1 2005/01/29 13:23:15 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/ChangeLog,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
-*koffice-data-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> koffice-data-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +koffice-data-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> koffice-data-1.4.1.ebuild:
+  Marking ppc64 stable for kword security fix
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> koffice-data-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> koffice-data-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*koffice-data-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-data-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> koffice-data-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  koffice-data-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  koffice-data-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> koffice-data-1.4.1.ebuild:
+  Stable on x86.
+
+*koffice-data-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-data-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> koffice-data-1.3.5.ebuild:
+  Marked ppc stable.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> koffice-data-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  koffice-data-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*koffice-data-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-data-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> koffice-data-1.3.5.ebuild,
+  koffice-data-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*koffice-data-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-data-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> koffice-data-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> koffice-data-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*koffice-data-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> koffice-data-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest
index 925f13082dfc..7cf452c05061 100644
--- a/app-office/koffice-data/Manifest
+++ b/app-office/koffice-data/Manifest
@@ -1,3 +1,8 @@
-MD5 2656c111c02bfec573159167f0930834 koffice-data-1.3.5.ebuild 515
-MD5 2656c111c02bfec573159167f0930834 prova 515
+MD5 07ecee190f2c1a4afa28e0ba5ce93bb9 ChangeLog 2419
+MD5 ff86db9b4c4b9baa551529583cc6604b koffice-data-1.3.5.ebuild 643
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 6bf3fd044c457d9b24b21fd49e8e6935 koffice-data-1.4.1.ebuild 589
+MD5 3e96d8d716ef22988f4c9427a789e39b koffice-data-1.4.2.ebuild 600
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-koffice-data-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-data-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-data-1.4.2 68
diff --git a/app-office/koffice-data/koffice-data-1.3.5.ebuild b/app-office/koffice-data/koffice-data-1.3.5.ebuild
index 56265cbcad8c..600e594a2ccb 100644
--- a/app-office/koffice-data/koffice-data-1.3.5.ebuild
+++ b/app-office/koffice-data/koffice-data-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/app-office/koffice-data/koffice-data-1.3.5.ebuild,v 1.1 2005/01/29 13:23:15 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/koffice-data/koffice-data-1.4.1.ebuild b/app-office/koffice-data/koffice-data-1.4.1.ebuild
index 7ec289daf8d5..29a585de0795 100644
--- a/app-office/koffice-data/koffice-data-1.4.1.ebuild
+++ b/app-office/koffice-data/koffice-data-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/app-office/koffice-data/koffice-data-1.4.1.ebuild,v 1.1 2005/07/25 20:21:06 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-office/koffice-data/koffice-data-1.4.2.ebuild b/app-office/koffice-data/koffice-data-1.4.2.ebuild
index 5fa388ba3196..3b84d8b8bb5d 100644
--- a/app-office/koffice-data/koffice-data-1.4.2.ebuild
+++ b/app-office/koffice-data/koffice-data-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.4.2.ebuild,v 1.1 2005/10/10 22:06:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-office/koffice-data/metadata.xml b/app-office/koffice-data/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/koffice-data/metadata.xml
+++ b/app-office/koffice-data/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd> 
+<herd>kde</herd> 
 </pkgmetadata>
diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index 6e59af663ddd..9ba05f932641 100644
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,10 +1,86 @@
 # ChangeLog for app-office/koffice-libs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.1 2005/01/29 13:23:40 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
-*koffice-libs-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> koffice-libs-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +koffice-libs-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> koffice-libs-1.4.1.ebuild:
+  Marking ppc64 stable for kword security fix
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> koffice-libs-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*koffice-libs-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-libs-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> koffice-libs-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  koffice-libs-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  koffice-libs-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> koffice-libs-1.4.1.ebuild:
+  Stable on x86.
+
+*koffice-libs-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-libs-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> koffice-libs-1.3.5.ebuild:
+  Marked ppc stable.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> koffice-libs-1.4.0-r1.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  koffice-libs-1.4.0-r1.ebuild:
+  Added ~alpha wrt #95128
+
+  22 Jun 2005; Markus Rothe <corsair@gentoo.org> koffice-libs-1.3.5.ebuild,
+  koffice-libs-1.4.0.ebuild:
+  Added ~ppc64
+
+*koffice-libs-1.4.0-r1 (22 Jun 2005)
+
+  22 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/koffice-1.4.0-save.patch, +koffice-libs-1.4.0-r1.ebuild:
+  Add patch to fix critical problem when saving from koshell.
+
+*koffice-libs-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-libs-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  12 Jun 2005; Tom Gall <tgall@gentoo.org>
+  office-libs-1.3.5.ebuild:
+  added ~ppc64
+
+*koffice-libs-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-libs-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> koffice-libs-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> koffice-libs-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*koffice-libs-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> koffice-libs-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 9bad592656dd..0f94464ce8dc 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,2 +1,8 @@
-MD5 d983a6c8db9fcb6bb344090a4e67dfac koffice-libs-1.3.5.ebuild 890
+MD5 70bfd8eeef55dceb9a77a85d4c971a24 ChangeLog 2616
+MD5 55f12d79d5cefe0f41b485310ece9042 koffice-libs-1.3.5.ebuild 1012
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 9b4169aaf39808a2bd04b8b0909d49ea koffice-libs-1.4.1.ebuild 1181
+MD5 6501035935bc4f5c5df68f52bfd724b3 koffice-libs-1.4.2.ebuild 1192
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-koffice-libs-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-libs-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-libs-1.4.2 68
diff --git a/app-office/koffice-libs/koffice-libs-1.3.5.ebuild b/app-office/koffice-libs/koffice-libs-1.3.5.ebuild
index f84b5496364e..77a9d09e1dfb 100644
--- a/app-office/koffice-libs/koffice-libs-1.3.5.ebuild
+++ b/app-office/koffice-libs/koffice-libs-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/app-office/koffice-libs/koffice-libs-1.3.5.ebuild,v 1.1 2005/01/29 13:23:40 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/koffice-libs/koffice-libs-1.4.1.ebuild b/app-office/koffice-libs/koffice-libs-1.4.1.ebuild
index 3169bc8b2241..f8c230791c30 100644
--- a/app-office/koffice-libs/koffice-libs-1.4.1.ebuild
+++ b/app-office/koffice-libs/koffice-libs-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/app-office/koffice-libs/koffice-libs-1.4.1.ebuild,v 1.1 2005/07/25 20:25:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)"
diff --git a/app-office/koffice-libs/koffice-libs-1.4.2.ebuild b/app-office/koffice-libs/koffice-libs-1.4.2.ebuild
index 1433cd0f454d..45c5771686af 100644
--- a/app-office/koffice-libs/koffice-libs-1.4.2.ebuild
+++ b/app-office/koffice-libs/koffice-libs-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.4.2.ebuild,v 1.1 2005/10/10 22:06:55 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)"
diff --git a/app-office/koffice-libs/metadata.xml b/app-office/koffice-libs/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/koffice-libs/metadata.xml
+++ b/app-office/koffice-libs/metadata.xml
@@ -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/app-office/koffice-meta/ChangeLog b/app-office/koffice-meta/ChangeLog
index d28221d99bf5..29a5923a5b31 100644
--- a/app-office/koffice-meta/ChangeLog
+++ b/app-office/koffice-meta/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for app-office/koffice-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.1 2005/01/29 13:24:08 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/ChangeLog,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> koffice-meta-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> koffice-meta-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*koffice-meta-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-meta-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> koffice-meta-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  koffice-meta-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  koffice-meta-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> koffice-meta-1.4.1.ebuild:
+  Stable on x86.
+
+*koffice-meta-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-meta-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> koffice-meta-1.3.5.ebuild:
+  Marked ppc stable, thanks bambam.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> koffice-meta-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> koffice-meta-1.4.0.ebuild:
+  Marked ~ppc for bug #95128.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  koffice-meta-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+  22 Jun 2005; Markus Rothe <corsair@gentoo.org> koffice-meta-1.3.5.ebuild,
+  koffice-meta-1.4.0.ebuild:
+  Added ~ppc64
+
+*koffice-meta-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-meta-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  05 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org>
+  koffice-meta-1.4.0_rc1.ebuild:
+  Marked ~amd64, bug 95128.
+
+*koffice-meta-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +koffice-meta-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice. Introduces two new
+  applications: kexi and krita.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> koffice-meta-1.3.5.ebuild:
+  Marked ~amd64 wrt bug #90533.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> koffice-meta-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> koffice-meta-1.3.5.ebuild:
+  Stable on x86.
 
 *koffice-meta-1.3.5 (29 Jan 2005)
 
diff --git a/app-office/koffice-meta/Manifest b/app-office/koffice-meta/Manifest
index 434a74cdfdb2..df80650e860e 100644
--- a/app-office/koffice-meta/Manifest
+++ b/app-office/koffice-meta/Manifest
@@ -1,2 +1,8 @@
-MD5 362bc65639787069f00b92184fb58e13 koffice-meta-1.3.5.ebuild 965
+MD5 d035cad8826e94f7a430cd2ffe2ae0e4 ChangeLog 2630
+MD5 b4042651574f73021ff281333f665144 koffice-meta-1.3.5.ebuild 1091
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 e318fad91a47d4bb1d4fadede5c84cce koffice-meta-1.4.1.ebuild 1141
+MD5 fe85cda5cb7e58d3a8062dd3b316a774 koffice-meta-1.4.2.ebuild 1149
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.3.5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.4.2 0
diff --git a/app-office/koffice-meta/koffice-meta-1.3.5.ebuild b/app-office/koffice-meta/koffice-meta-1.3.5.ebuild
index 430502c4d25d..f2f7a64ea099 100644
--- a/app-office/koffice-meta/koffice-meta-1.3.5.ebuild
+++ b/app-office/koffice-meta/koffice-meta-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/app-office/koffice-meta/koffice-meta-1.3.5.ebuild,v 1.1 2005/01/29 13:24:08 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 MAXKOFFICEVER=1.3.5
 
 inherit kde-functions
@@ -8,8 +8,8 @@ DESCRIPTION="koffice - merge this to pull in all koffice-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
-SLOT="3.3"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE=""
 
 # Note most packages didn't change between koffice 1.3.4 and 1.3.5
diff --git a/app-office/koffice-meta/koffice-meta-1.4.1.ebuild b/app-office/koffice-meta/koffice-meta-1.4.1.ebuild
index 449b52f5b78a..4d810c8e654f 100644
--- a/app-office/koffice-meta/koffice-meta-1.4.1.ebuild
+++ b/app-office/koffice-meta/koffice-meta-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/app-office/koffice-meta/koffice-meta-1.4.1.ebuild,v 1.1 2005/07/25 20:21:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 inherit kde-functions
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
diff --git a/app-office/koffice-meta/koffice-meta-1.4.2.ebuild b/app-office/koffice-meta/koffice-meta-1.4.2.ebuild
index 6f381867c312..bf9baf2ce698 100644
--- a/app-office/koffice-meta/koffice-meta-1.4.2.ebuild
+++ b/app-office/koffice-meta/koffice-meta-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.4.2.ebuild,v 1.1 2005/10/10 22:07:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 inherit kde-functions
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
diff --git a/app-office/koffice-meta/metadata.xml b/app-office/koffice-meta/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/koffice-meta/metadata.xml
+++ b/app-office/koffice-meta/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd> 
+<herd>kde</herd> 
 </pkgmetadata>
diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index ea27320884e3..0da75ad899ea 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,510 @@
 # ChangeLog for app-office/koffice
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> koffice-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
+
+  16 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> koffice-1.4.2.ebuild:
+  Sorry, kdebindings was still present here for an artifact, going back on
+  kjsembed, dep tree still broken for monolithic ebuilds.
+
+  15 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> koffice-1.4.2.ebuild:
+  Added missing dependency on kdebindings for javascript, unbreaking deps for
+  monolithic ebuilds.
+
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> koffice-1.4.1-r1.ebuild:
+  Marking koffice-1.4.1-r1 for security fix
+
+  12 Oct 2005; Joseph Jezak <josejx@gentoo.org> koffice-1.4.1-r1.ebuild:
+  Marked ppc stable for bug #108411.
+
+  12 Oct 2005; Jason Wever <weeve@gentoo.org> koffice-1.4.1-r1.ebuild:
+  Stable on SPARC wrt security bug #108411.
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> koffice-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+  11 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  koffice-1.4.1-r1.ebuild:
+  Stable on alpha, bug 108411.
+
+  11 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> koffice-1.4.1-r1.ebuild:
+  Stable on amd64, bug 108411.
+
+*koffice-1.3.5-r3 (11 Oct 2005)
+
+  11 Oct 2005; Carsten Lohrke <carlo@gentoo.org> +koffice-1.3.5-r3.ebuild,
+  koffice-1.4.1-r1.ebuild:
+  fix for buffer overflow in rtf import, stable on x86
+
+*koffice-1.4.2 (10 Oct 2005)
+*koffice-1.4.1-r1 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/koffice-1.4.1-rtfimport.patch, +koffice-1.4.1-r1.ebuild,
+  +koffice-1.4.2.ebuild:
+  New version. Includes fix for buffer overflow in RTF import. Fix applied to
+  1.4.1, too.
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> koffice-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> koffice-1.4.1.ebuild:
+  Stable on amd64.
+
+  29 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> koffice-1.4.1.ebuild:
+  Stable on sparc
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> koffice-1.4.1.ebuild:
+  Stable on x86.
+
+*koffice-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +koffice-1.4.1.ebuild:
+  New version.
+
+*koffice-1.4.0-r2 (15 Jul 2005)
+
+  15 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +koffice-1.4.0-r2.ebuild:
+  Add patchset 1.4.0b from koffice.org (#98803).
+
+  01 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  koffice-1.4.0-r1.ebuild:
+  Keyworded ~sparc wrt #95128
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> koffice-1.4.0-r1.ebuild:
+  Added ~ppc for bug #95128.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  koffice-1.4.0-r1.ebuild:
+  Added ~alpha wrt #95128
+
+  23 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> koffice-1.4.0-r1.ebuild:
+  Correct dependency on lcms (#96851).
+
+*koffice-1.4.0-r1 (22 Jun 2005)
+
+  22 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/koffice-1.4.0-save.patch, +koffice-1.4.0-r1.ebuild:
+  Add patch to fix critical problem when saving from koshell.
+
+*koffice-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +koffice-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> koffice-1.4.0_rc1.ebuild:
+  Added ~ppc64
+
+  05 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org>
+  koffice-1.4.0_rc1.ebuild:
+  Marked ~amd64, bug 95128.
+
+*koffice-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +koffice-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice. Introduces two new
+  applications: kexi and krita.
+
+  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> koffice-1.3.5-r1.ebuild,
+  koffice-1.3.5-r2.ebuild:
+  Add blockers on split packages derived from koffice.
+
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  koffice-1.3.5-r2.ebuild:
+  Stable on alpha, bug 78620.
+
+  21 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> koffice-1.3.5-r2.ebuild:
+  Stable on sparc wrt #78620
+
+  21 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  koffice-1.3.5-r2.ebuild:
+  Stable on ppc.
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/koffice_1_3_4_xpdf_security_integer_overflow.diff,
+  -files/xpdf-CESA-2004-007-xpdf2-newer.diff, -koffice-1.3.3-r2.ebuild,
+  -koffice-1.3.4-r1.ebuild, -koffice-1.3.5.ebuild:
+  clean up
+
+  21 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  koffice-1.3.5-r2.ebuild:
+  Stable on amd64, bug #78620
+
+  20 Jan 2005; Markus Rothe <corsair@gentoo.org> koffice-1.3.5-r2.ebuild:
+  Stable on ppc64; bug #78620
+
+*koffice-1.3.5-r2 (19 Jan 2005)
+
+  19 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/CAN-2005-0064.patch,
+  +koffice-1.3.5-r2.ebuild:
+  fix for xpdf makeFileKey2 stack overflow, #78620
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Dec 2004; Joseph Jezak <josejx@gentoo.org> koffice-1.3.5-r1.ebuild:
+  Marked ppc stable.
+
+  23 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  koffice-1.3.5-r1.ebuild:
+  Stable on alpha, bug 75203.
+
+  23 Dec 2004; Markus Rothe <corsair@gentoo.org> koffice-1.3.5-r1.ebuild:
+  Stable on ppc64
+
+  22 Dec 2004; Dylan Carlson <absinthe@gentoo.org> koffice-1.3.5-r1.ebuild:
+  Stable on amd64, bug 75203.
+
+  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> koffice-1.3.5-r1.ebuild:
+  Stable on sparc wrt #75203
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  files/koffice_1_3_xpdf_buffer_overflow.diff:
+  oops, forgot to merge the diffs
+
+*koffice-1.3.5-r1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_xpdf_buffer_overflow.diff, +koffice-1.3.5-r1.ebuild:
+  fix for xpdf buffer overflow, #75203
+
+  21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.5.ebuild:
+  Stable on alpha.
+
+*koffice-1.3.5-r1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_xpdf_buffer_overflow.diff, +koffice-1.3.5-r1.ebuild:
+  fix for xpdf buffer overflow, #75203
+
+  15 Dec 2004; Dylan Carlson <absinthe@gentoo.org> koffice-1.3.5.ebuild:
+  Stable on amd64.
+
+  12 Dec 2004; Jason Wever <weeve@gentoo.org> koffice-1.3.5.ebuild:
+  Stable on sparc.
+
+  12 Dec 2004; Carsten Lohrke <carlo@gentoo.org> koffice-1.3.5.ebuild:
+  stable on x86
+
+  01 Dec 2004; Carsten Lohrke <carlo@gentoo.org> metadata.xml:
+  QA: brain is not a Gentoo dev anymore
+
+  26 Nov 2004; Jason Wever <weeve@gentoo.org> koffice-1.3.4-r1.ebuild:
+  Stable on sparc.
+
+*koffice-1.3.5 (23 Nov 2004)
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +koffice-1.3.5.ebuild:
+  version bump
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> koffice-1.3.4-r1.ebuild:
+  stable on x86
+
+  03 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/koffice-1.2.1-kword-crashes.diff, -files/koffice-1.3.1-gcc34.patch,
+  -koffice-1.2.1-r1.ebuild, -koffice-1.3.1-r1.ebuild, -koffice-1.3.1.ebuild,
+  -koffice-1.3.2.ebuild, -koffice-1.3.3-r1.ebuild, -koffice-1.3.3.ebuild,
+  -koffice-1.3.4.ebuild, -koffice-1.3.ebuild:
+  clean up
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> koffice-1.3.4-r1.ebuild:
+  Stable on ppc64, bug #69624
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  koffice-1.3.3.ebuild, koffice-1.3.4-r1.ebuild:
+  Stable amd64.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  koffice-1.3.4-r1.ebuild:
+  Stable on alpha, bug 69624.
+
+  31 Oct 2004; Jason Wever <weeve@gentoo.org> koffice-1.3.3-r2.ebuild:
+  Stable on sparc wrt security bug #69624.
+
+  31 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> koffice-1.3.4-r1.ebuild:
+  Stable on ppc.
+
+*koffice-1.3.3-r2 (31 Oct 2004)
+
+  31 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_4_xpdf_security_integer_overflow.diff,
+  +koffice-1.3.3-r2.ebuild, +koffice-1.3.4-r1.ebuild:
+  integer overflow vulnerability fix, #69624
+
+  27 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> koffice-1.3.3-r1.ebuild:
+  Marked stable on amd64.
+
+*koffice-1.3.4 (26 Oct 2004)
+
+  26 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +koffice-1.3.4.ebuild:
+  version bump
+
+  26 Oct 2004; <SeJo@gentoo.org> koffice-1.3.3-r1.ebuild:
+  stable on ppc gsla: 65319
+
+  26 Oct 2004; Simone Gotti <motaboy@gentoo.org> koffice-1.3.3-r1.ebuild:
+  Don't compile "kpresenter" (and its filters) if the arts USE flag is
+  disabled. See bug #65319
+
+  24 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.3-r1.ebuild:
+  Stable on alpha, bug 68665.
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> koffice-1.3.3-r1.ebuild:
+  Stable on sparc.
+
+*koffice-1.3.3-r1 (24 Oct 2004)
+
+  24 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/xpdf-CESA-2004-007-xpdf2-newer.diff, +koffice-1.3.3-r1.ebuild:
+  patch against xpdf integer overflow, #68665
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> koffice-1.3.1.ebuild,
+  koffice-1.3.2.ebuild, koffice-1.3.3.ebuild:
+  stable on amd64.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  koffice-1.3.1-r1.ebuild, koffice-1.3.2.ebuild, koffice-1.3.3.ebuild:
+  Masked koffice-1.3.3.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  koffice-1.3.1-r1.ebuild, koffice-1.3.2.ebuild:
+  Masked koffice-1.3.2.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  koffice-1.3.1-r1.ebuild:
+  Masked koffice-1.3.1-r1.ebuild stable for ppc
+
+*koffice-1.3.3 (19 Sep 2004)
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> +koffice-1.3.3.ebuild:
+  Version bump
+
+  27 Aug 2004; Tom Gall <tgall@gentoo.org> koffice-1.3.2.ebuild:
+  stable on ppc64, bug #58711
+
+  16 Aug 2004; Jason Wever <weeve@gentoo.org> koffice-1.3.2.ebuild:
+  Stable on sparc.
+
+  14 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.2.ebuild:
+  Stable on alpha.
+
+*koffice-1.3.2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> koffice-1.3.2.ebuild:
+  Marking x86 stable
+
+  09 Jul 2004; Carsten Lohrke <carlo@gentoo.org> :
+  version bump
+
+  02 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  files/koffice-1.3.1-gcc34.patch:
+  Fix the gcc34 patch based on bug #53397
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> koffice-1.2.1-r1.ebuild,
+  koffice-1.3.1-r1.ebuild, koffice-1.3.1.ebuild, koffice-1.3.ebuild:
+  QA: kde-base -> kde, need-kde after DEPEND
+
+*koffice-1.3.1-r1 (09 Jun 2004)
+
+  09 Jun 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/koffice-1.3.1-gcc34.patch, +koffice-1.3.1-r1.ebuild:
+  Patch added for gcc 3.4 compatibility to close bug #50210. (Thanks to G.L.
+  Emigh, A. Rusnak). Marked stable on amd64.
+
+  14 May 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.1.ebuild:
+  Keyword ~alpha.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.2.1-r1.ebuild:
+  Stable on alpha.
+
+*koffice-1.3.1 (04 May 2004)
+
+  04 May 2004; Caleb Tennis <caleb@gentoo.org> koffice-1.3.1.ebuild:
+  Version bump
+
+  04 May 2004; Dominik Stadler <centic@gentoo.org> koffice-1.2.1-r1.ebuild,
+  koffice-1.3.ebuild:
+  Add missing IUSE.
+
+  28 Apr 2004; Jon Portnoy <avenj@gentoo.org> koffice-1.3.ebuild :
+  Stable on AMD64.
+
+  22 Apr 2004; Caleb Tennis <caleb@gentoo.org> koffice-1.2.1-r1.ebuild,
+  koffice-1.3.ebuild:
+  Move python stuff out of global scope
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> koffice-1.2.1-r1.ebuild:
+  fixing qa issue with autoconf/automake
+
+  15 Apr 2004; Caleb Tennis <caleb@gentoo.org> :
+  Fix automake and autoconf wantages
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> koffice-1.3.ebuild:
+  Stable on sparc.
+
+  14 Feb 2004; Jason Wever <weeve@gentoo.org> koffice-1.3.ebuild:
+  Added ~sparc keyword.
+
+  09 Feb 2004; David Holm <dholm@gentoo.org> koffice-1.3.ebuild:
+  Added to ~ppc.
+
+*koffice-1.3 (29 Jan 2004)
+
+  29 Jan 2004; Caleb Tennis <caleb@gentoo.org> :
+  New stable version
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> koffice-1.2.1-r1.ebuild:
+  add ~alpha
+
+*koffice-1.3_rc2 (18 Dec 2003)
+
+  18 Dec 2003; Caleb Tennis <caleb@gentoo.org> koffice-1.3_rc2.ebuild:
+  Second release candidate
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> koffice-1.3_rc1.ebuild:
+  amd64 users need to reemerge imagemagick and jbigkit off a 
+  fresh portage sync. But after doing so, this build works fine
+
+*koffice-1.3_rc1 (31 Oct 2003)
+
+  31 Oct 2003; Caleb Tennis <caleb@gentoo.org> koffice-1.3_rc1.ebuild:
+  New version
+
+*koffice-1.3_beta4
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> koffice-1.1.1.ebuild,
+  koffice-1.2-r1.ebuild, koffice-1.2-r2.ebuild, koffice-1.2.ebuild,
+  koffice-1.2_beta2.ebuild, koffice-1.2_rc1.ebuild, koffice-1.3_beta1.ebuild,
+  koffice-1.3_beta2.ebuild, files/koffice-1.1.1-gentoo.diff,
+  files/koffice-1.2-kspread_cell.diff,
+  files/koffice-1.3_beta1-fontconfig-2.2-support.diff:
+  removed stale versions
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> :
+  New beta version
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> koffice-1.3_beta3.ebuild:
+  Add compiler fix patch for gcc33 (bug #27315)
+
+*koffice-1.3_beta3 (26 Aug 2003)
+
+  26 Aug 2003; Caleb Tennis <caleb@gentoo.org> koffice-1.3_beta3.ebuild:
+  Version bump.
+
+*koffice-1.3_beta2 (03 Jul 2003)
+
+  03 Jul 2003; Michele Balistreri <brain@gentoo.org> koffice-1.3_beta2.ebuild:
+  Second beta of koffice-1.3. This will remain masked
+  
+  20 Jun 2003; Jason Wever <weeve@gentoo.org> koffice-1.2.1-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*koffice-1.3_beta1 (16 Apr 2003)
+
+  16 Apr 2003; Dan Armak <danarmak@gentoo.org> koffice-1.3_beta1.ebuild:
+  A new release. The sources are NOT yet generally available so this is masked.
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> koffice-1.2.1.ebuild :
+  Marked ppc stable
+
+  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.
+
+*koffice-1.2.1-r1 (28 Jan 2003)
+
+  18 Mar 2003; Jason Wever <weeve@gentoo.org> koffice-1.2.1-r1.ebuild:
+  Added ~sparc to keywords.
+
+  28 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  We forgot to add changelog information for 1.2.1, so here goes: it's a
+  new bugfix release from upstream. 1.2.1-r1 adds a patch from upstream that
+  fixes two bugs in kword.
+
+*koffice-1.2.1 (04 Dec 2002)
+
+*koffice-1.2-r2 (24 Nov 2002)
+
+  24 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #11058: add a patch that fixes a grave bug in kspread.
+
+*koffice-1.2-r1 (24 Nov 2002)
+
+  24 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix #7893: add a patch that fixes the kivio connector tool.
+
+*koffice-1.2 (15 Sep 2002)
+
+  15 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New release; koffice 1.2-final. Masked for a little time, waiting for
+  Verwilst's approval.
+
+*koffice-1.2_rc1 (11 Aug 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+
+  Added ppc keyword
+
+  09 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Remove -fomit-frame-pointer optimization flag from kugar/kudesigner
+  directory to fix bug #4572.
+
+*koffice-1.2_beta2 (27 June 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Added KEYWORDS.
+
+*koffice-1.2_beta1-r2 (27 May 2002)
+
+  27 May 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  koffice-1.2_beta1-r2.ebuild, files/digest-koffice-1.2_beta1-r2,
+  files/koffice-1.2-beta1-gcc31-gentoo.patch :
+
+  Code patch to support gcc-3.1. May not be necessary with next
+  release of koffice.
+
+*koffice-1.2_beta1-r1 (27 April 2002)
+
+  27 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  Seemed i was still pointing to the kde-packagers URL..
+  And the real URL seems to have all patches included already..
+  This revision also fixes the docbook errors most of you were having.
+  And i changed the description of the ebuild :o)
+
+*koffice-1.2_beta1 (26 April 2002)
+
+  26 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  First beta released! Since i'm a kde packager now, much more
+  post-beta1 bugs have been patched, and the package is much more tested
+  than the other previous koffice releases.. Enjoy! 
+
+*koffice-1.2_pre20020402 (2 April 2002)
+
+  2 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  This Koffice works with KDE/QT 3. It's MUCH better than the 1.x 
+  releases, and IMHO is the first version that's useable for real work,
+  like writing my thesis. Because there isn't an official version out just 
+  yet, this snapshot will be our official koffice version for Gentoo..
+  If you have any problems, just bugreport them to bugs.kde.org, and if 
+  it's a grave bug, and it's fixed in a more current snapshot, tell me, 
+  and i'll consider upgrading this gentoo-snapshot to the one with the 
+  bugfixes. Enjoy!  
 
 *koffice-1.1.1 (1 Feb 2002)
 
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 28145f81b852..0997c18afeb7 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,23 +1,14 @@
-MD5 aae91cf6b00df2f62381e45b73173473 koffice-1.2-r1.ebuild 887
-MD5 cd7530c334d300a44640540064734d7d koffice-1.2.1.ebuild 774
-MD5 bd5dab4e58c73ac69462457eb3bf62d0 koffice-1.2.1-r1.ebuild 826
-MD5 41f373b330594e41454feaf1d1ec7cf6 koffice-1.2_beta2.ebuild 1105
-MD5 2e2842e7db798be596acdcb2f5a39e17 koffice-1.2.ebuild 770
-MD5 9a620860de6fc04a27efe67c76f8c71d koffice-1.2-r2.ebuild 963
-MD5 a3bc4bf636ce8262caa00859806a1767 koffice-1.3_beta1.ebuild 814
-MD5 8d25144bc3f609caab76c82bc069a66b koffice-1.2_rc1.ebuild 847
-MD5 c286c5cdcc826bca829d7cb96900a014 koffice-1.1.1.ebuild 1148
-MD5 b5b9d8823bde655018ed815018a05273 ChangeLog 3949
-MD5 7eb5f8e0051bdfa9d39ddc41d0f2b11e files/digest-koffice-1.2_beta2 71
-MD5 362c1081c562d8405d25be71122ca125 files/koffice-1.2-connectortool.diff 493
-MD5 0fdb0d815d97087336270d8b09d82018 files/koffice-1.1.1-gentoo.diff 978
-MD5 284b55785dbede2c02523d9f341ac94a files/digest-koffice-1.3_beta1 69
-MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
-MD5 539a2c71f344995967d87d9662175330 files/koffice-1.2-kspread_cell.diff 2373
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r1 65
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r2 65
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2 65
-MD5 4372c7005e477861f588fc5a4839127d files/digest-koffice-1.1.1 67
-MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1 67
-MD5 f8969b89924fa67d77c0deb8127cf159 files/digest-koffice-1.2_rc1 69
-MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
+MD5 8c0490de03609871cb8cbfd862da2413 ChangeLog 17284
+MD5 bdcb79a8db04904d6e6c7110e0ff3ec9 koffice-1.3.5-r2.ebuild 1211
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 216a4ec901dca4c7e574aae8a09c40da koffice-1.4.1.ebuild 1538
+MD5 9242394dfa6049940585a4d3fa962907 koffice-1.3.5-r3.ebuild 1289
+MD5 3dd6867f27cde022182ed16a091cb0c0 koffice-1.4.1-r1.ebuild 1747
+MD5 e4e61e21c697ca741e33be86595c4167 koffice-1.4.2.ebuild 1548
+MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
+MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koffice-1.4.1 68
+MD5 fcd72b8c0a0e8d1e8bbf6b76ed92c5cc files/digest-koffice-1.3.5-r3 144
+MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-koffice-1.4.1-r1 144
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koffice-1.4.2 68
diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r3 b/app-office/koffice/files/digest-koffice-1.3.5-r3
index 4835c6338154..5405ead6b8f9 100644
--- a/app-office/koffice/files/digest-koffice-1.3.5-r3
+++ b/app-office/koffice/files/digest-koffice-1.3.5-r3
@@ -1 +1,2 @@
 MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
+MD5 71a1baa8244dbcc1bfc2bd3c3e3dd40f post-koffice-1.3.5-rtfimport.diff 8620
diff --git a/app-office/koffice/files/digest-koffice-1.4.1-r1 b/app-office/koffice/files/digest-koffice-1.4.1-r1
index 47d9bab5c838..6a96a65f5dd7 100644
--- a/app-office/koffice/files/digest-koffice-1.4.1-r1
+++ b/app-office/koffice/files/digest-koffice-1.4.1-r1
@@ -1 +1,2 @@
 MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338
+MD5 9f77b327119fd1db0752dab785e2a975 post-koffice-1.4.1-rtfimport.diff 8614
diff --git a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
index b808182c86cc..dfcc74d0ac12 100644
--- a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
+++ b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
@@ -16,3 +16,34 @@ diff -u -r1.3 -r1.3.2.1
  	maskObj.arrayGet(i, &obj1);
  	maskColors[i] = obj1.getInt();
  	obj1.free();
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v
+retrieving revision 1.3
+retrieving revision 1.3.2.2
+diff -u -r1.3 -r1.3.2.2
+--- filters/kword/pdf/xpdf/xpdf/GfxState.cc	2003/01/25 23:17:44	1.3
++++ filters/kword/pdf/xpdf/xpdf/GfxState.cc	2004/12/22 13:50:53	1.3.2.2
+@@ -682,6 +682,11 @@
+   }
+   nCompsA = obj2.getInt();
+   obj2.free();
++  if (nCompsA > gfxColorMaxComps) {
++    error(-1, "ICCBased color space with too many (%d > %d) components",
++	  nCompsA, gfxColorMaxComps);
++    nCompsA = gfxColorMaxComps;
++  }
+   if (dict->lookup("Alternate", &obj2)->isNull() ||
+       !(altA = GfxColorSpace::parse(&obj2))) {
+     switch (nCompsA) {
+@@ -1023,6 +1028,11 @@
+     goto err2;
+   }
+   nCompsA = obj1.arrayGetLength();
++  if (nCompsA > gfxColorMaxComps) {
++    error(-1, "DeviceN color space with too many (%d > %d) components",
++        nCompsA, gfxColorMaxComps);
++    nCompsA = gfxColorMaxComps;
++  }
+   for (i = 0; i < nCompsA; ++i) {
+     if (!obj1.arrayGet(i, &obj2)->isName()) {
+       error(-1, "Bad DeviceN color space (names)");
diff --git a/app-office/koffice/koffice-1.3.5-r2.ebuild b/app-office/koffice/koffice-1.3.5-r2.ebuild
index 68ed61dfcd94..0d4ae6e65dc1 100644
--- a/app-office/koffice/koffice-1.3.5-r2.ebuild
+++ b/app-office/koffice/koffice-1.3.5-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-office/koffice/koffice-1.3.5-r2.ebuild,v 1.1 2005/01/19 12:41:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
-inherit kde eutils
+inherit kde kde-functions eutils
 
 # TODO : mysql support
 # other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
@@ -12,12 +12,18 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc ~alpha ~ppc64"
+KEYWORDS="x86 amd64 ppc sparc alpha ppc64"
 
 IUSE=""
 SLOT="0"
+# add blockers on split packages derived from this one
+for x in $(get-child-packages ${CATEGORY}/${PN}); do
+	DEPEND="${DEPEND} !${x}"
+	RDEPEND="${RDEPEND} !${x}"
+done
 
-DEPEND=">=dev-lang/python-2.2.1
+DEPEND="${DEPEND}
+	>=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5
 	>=app-text/wv2-0.1.8
diff --git a/app-office/koffice/koffice-1.3.5-r3.ebuild b/app-office/koffice/koffice-1.3.5-r3.ebuild
index f72ecc489666..b0b1b0d749d1 100644
--- a/app-office/koffice/koffice-1.3.5-r3.ebuild
+++ b/app-office/koffice/koffice-1.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/app-office/koffice/koffice-1.3.5-r3.ebuild,v 1.1 2005/10/11 14:49:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r3.ebuild,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
 inherit kde kde-functions eutils
 
@@ -9,7 +9,8 @@ inherit kde kde-functions eutils
 
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2
+	mirror://kde/security_patches/post-koffice-1.3.5-rtfimport.diff"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
@@ -32,7 +33,7 @@ need-kde 3.1
 
 PATCHES="${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
 	${FILESDIR}/CAN-2005-0064.patch
-	${FILESDIR}/koffice-1.4.1-rtfimport.patch"
+	${DISTDIR}/post-koffice-1.3.5-rtfimport.diff"
 
 src_compile() {
 	export LIBPYTHON="`python-config --libs`"
diff --git a/app-office/koffice/koffice-1.4.1-r1.ebuild b/app-office/koffice/koffice-1.4.1-r1.ebuild
index ea359a075e30..318b4fc8dc25 100644
--- a/app-office/koffice/koffice-1.4.1-r1.ebuild
+++ b/app-office/koffice/koffice-1.4.1-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.1-r1.ebuild,v 1.1 2005/10/10 22:06:00 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="An integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2
+	mirror://kde/security_patches/post-koffice-1.4.1-rtfimport.diff"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="doc javascript mysql postgres"
 
 RDEPEND=">=media-gfx/imagemagick-5.5.2
@@ -48,7 +49,7 @@ src_unpack() {
 	kde_src_unpack
 
 	# Fix RTF import buffer overflow. Applied in 1.4.2.
-	epatch "${FILESDIR}/koffice-1.4.1-rtfimport.patch"
+	epatch "${DISTDIR}/post-koffice-1.4.1-rtfimport.diff"
 }
 
 src_compile() {
diff --git a/app-office/koffice/koffice-1.4.1.ebuild b/app-office/koffice/koffice-1.4.1.ebuild
index 8f704394b2d7..cdc864e303d0 100644
--- a/app-office/koffice/koffice-1.4.1.ebuild
+++ b/app-office/koffice/koffice-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/app-office/koffice/koffice-1.4.1.ebuild,v 1.1 2005/07/25 20:24:59 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 IUSE="doc javascript mysql postgres"
 
 RDEPEND=">=media-gfx/imagemagick-5.5.2
diff --git a/app-office/koffice/koffice-1.4.2.ebuild b/app-office/koffice/koffice-1.4.2.ebuild
index 22974df8b2c5..34ace502d4ef 100644
--- a/app-office/koffice/koffice-1.4.2.ebuild
+++ b/app-office/koffice/koffice-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2.ebuild,v 1.1 2005/10/10 22:06:00 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="doc javascript mysql postgres"
 
 RDEPEND=">=media-gfx/imagemagick-5.5.2
diff --git a/app-office/koffice/metadata.xml b/app-office/koffice/metadata.xml
index 2625aeee3bcb..3399d0876645 100644
--- a/app-office/koffice/metadata.xml
+++ b/app-office/koffice/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>kde-other</herd>
-<maintainer>
-  <email>brain@gentoo.org</email>
-</mantainer>  
+<herd>kde</herd> 
 </pkgmetadata>
diff --git a/app-office/koshell/ChangeLog b/app-office/koshell/ChangeLog
index 9b26e05c5b6e..5b5251fc60a4 100644
--- a/app-office/koshell/ChangeLog
+++ b/app-office/koshell/ChangeLog
@@ -1,10 +1,66 @@
 # ChangeLog for app-office/koshell
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.1 2005/01/29 13:24:36 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/ChangeLog,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
-*koshell-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> koshell-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +koshell-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> koshell-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*koshell-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +koshell-1.4.2.ebuild:
+  New version.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> koshell-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> koshell-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> koshell-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> koshell-1.4.1.ebuild:
+  Stable on x86.
+
+*koshell-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +koshell-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> koshell-1.3.5.ebuild:
+  Marked ppc stable, thanks bambam.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> koshell-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> koshell-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*koshell-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +koshell-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> koshell-1.3.5.ebuild,
+  koshell-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*koshell-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +koshell-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> koshell-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> koshell-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*koshell-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> koshell-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/koshell/Manifest b/app-office/koshell/Manifest
index 9f2f29a35700..5e8755ffefce 100644
--- a/app-office/koshell/Manifest
+++ b/app-office/koshell/Manifest
@@ -1,2 +1,8 @@
-MD5 d13d1e54747480b35bcd8d009eb021ac koshell-1.3.5.ebuild 763
+MD5 0ac77d19f3c28c6e5c2f419b2068f74e ChangeLog 2077
+MD5 8ee9db7d7a4d915c5c3c51ad5a331ce2 koshell-1.3.5.ebuild 880
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 d13e068bbea2d8dedb4e258e348fabbf koshell-1.4.1.ebuild 815
+MD5 d470c11fc5972cb2a39f0d0c75ddb1b6 koshell-1.4.2.ebuild 823
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-koshell-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-koshell-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-koshell-1.4.2 68
diff --git a/app-office/koshell/koshell-1.3.5.ebuild b/app-office/koshell/koshell-1.3.5.ebuild
index eb4db0877da7..4cb6e2cb7cd5 100644
--- a/app-office/koshell/koshell-1.3.5.ebuild
+++ b/app-office/koshell/koshell-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/app-office/koshell/koshell-1.3.5.ebuild,v 1.1 2005/01/29 13:24:36 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 MAXKOFFICEVER=1.3.5
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/koshell/koshell-1.4.1.ebuild b/app-office/koshell/koshell-1.4.1.ebuild
index a8a6c86fa8c2..9a2eb70a0a7f 100644
--- a/app-office/koshell/koshell-1.4.1.ebuild
+++ b/app-office/koshell/koshell-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/app-office/koshell/koshell-1.4.1.ebuild,v 1.1 2005/07/25 20:25:52 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/koshell/koshell-1.4.2.ebuild b/app-office/koshell/koshell-1.4.2.ebuild
index 60f6e4150c0b..8febc42de9db 100644
--- a/app-office/koshell/koshell-1.4.2.ebuild
+++ b/app-office/koshell/koshell-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.4.2.ebuild,v 1.1 2005/10/10 22:07:46 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/koshell/metadata.xml b/app-office/koshell/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/koshell/metadata.xml
+++ b/app-office/koshell/metadata.xml
@@ -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/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog
index 3ee034a0eeee..00fff58fc662 100644
--- a/app-office/kpresenter/ChangeLog
+++ b/app-office/kpresenter/ChangeLog
@@ -1,10 +1,69 @@
 # ChangeLog for app-office/kpresenter
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.1 2005/01/29 13:25:03 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
-*kpresenter-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kpresenter-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kpresenter-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> kpresenter-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kpresenter-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kpresenter-1.4.2.ebuild:
+  New version.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kpresenter-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kpresenter-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kpresenter-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kpresenter-1.4.1.ebuild:
+  Stable on x86.
+
+*kpresenter-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kpresenter-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kpresenter-1.3.5.ebuild:
+  Marked ppc stable.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kpresenter-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  kpresenter-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*kpresenter-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kpresenter-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kpresenter-1.3.5.ebuild,
+  kpresenter-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kpresenter-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kpresenter-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kpresenter-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kpresenter-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*kpresenter-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kpresenter-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest
index 60e35239d8db..140b076a5f63 100644
--- a/app-office/kpresenter/Manifest
+++ b/app-office/kpresenter/Manifest
@@ -1,3 +1,8 @@
-MD5 675657bab66003ab6f12ce3c66c70aca prova 1077
-MD5 675657bab66003ab6f12ce3c66c70aca kpresenter-1.3.5.ebuild 1077
+MD5 b1eb91d64a8cd7cfd768083ade258e85 ChangeLog 2143
+MD5 9ffc1503ed714d7c7ceeec7d185cdd92 kpresenter-1.3.5.ebuild 1198
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 aadfc215eb5f814265e416547593c004 kpresenter-1.4.1.ebuild 1084
+MD5 311c30992b264a5070be8fcdb1be1c83 kpresenter-1.4.2.ebuild 1092
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kpresenter-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kpresenter-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kpresenter-1.4.2 68
diff --git a/app-office/kpresenter/kpresenter-1.3.5.ebuild b/app-office/kpresenter/kpresenter-1.3.5.ebuild
index 344fc2eacd8b..cdf4911cfbf5 100644
--- a/app-office/kpresenter/kpresenter-1.3.5.ebuild
+++ b/app-office/kpresenter/kpresenter-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/app-office/kpresenter/kpresenter-1.3.5.ebuild,v 1.1 2005/01/29 13:25:03 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.3.5
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/kpresenter/kpresenter-1.4.1.ebuild b/app-office/kpresenter/kpresenter-1.4.1.ebuild
index cb68125458e7..8a483bec601e 100644
--- a/app-office/kpresenter/kpresenter-1.4.1.ebuild
+++ b/app-office/kpresenter/kpresenter-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/app-office/kpresenter/kpresenter-1.4.1.ebuild,v 1.1 2005/07/25 20:22:17 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kpresenter/kpresenter-1.4.2.ebuild b/app-office/kpresenter/kpresenter-1.4.2.ebuild
index eabe3ea3a125..4a92ab81648d 100644
--- a/app-office/kpresenter/kpresenter-1.4.2.ebuild
+++ b/app-office/kpresenter/kpresenter-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.4.2.ebuild,v 1.1 2005/10/10 22:08:13 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:01 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kpresenter/metadata.xml b/app-office/kpresenter/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kpresenter/metadata.xml
+++ b/app-office/kpresenter/metadata.xml
@@ -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/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index b3a19754f36b..afd25cfe3ace 100644
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.1 2005/06/03 15:21:18 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> krita-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
+
+  16 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> krita-1.4.2.ebuild:
+  Sorry, kdebindings was still present here for an artifact, going back on
+  kjsembed, dep tree still broken for monolithic ebuilds.
+
+  15 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> krita-1.4.2.ebuild:
+  Added missing dependency on kdebindings for javascript, unbreaking deps for
+  monolithic ebuilds.
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> krita-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*krita-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +krita-1.4.2.ebuild:
+  New version.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> krita-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> krita-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> krita-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> krita-1.4.1.ebuild:
+  Stable on x86.
+
+*krita-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +krita-1.4.1.ebuild:
+  New version.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> krita-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> krita-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+  23 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> krita-1.4.0.ebuild:
+  Correct dependency on lcms (#96851).
+
+  22 Jun 2005; David Holm <dholm@gentoo.org> krita-1.4.0.ebuild:
+  Added to ~ppc.
+
+*krita-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +krita-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> krita-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+  05 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> krita-1.4.0_rc1.ebuild:
+  Marked ~amd64, bug 95128.
 
 *krita-1.4.0_rc1 (03 Jun 2005)
 
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index 85f42ac2d7d0..9ccaa440eadc 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,4 +1,6 @@
+MD5 6f06d0c4801fa0dabd9611a8dfcaa3cb ChangeLog 2296
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 fbafd8a0dc525475d5dd1a3acaa4a8ae krita-1.4.0_rc1.ebuild 943
-MD5 8e3fd708c236784bea1c0e524156bb9a ChangeLog 378
-MD5 115a377f43af7c4116229b38631f80bc files/digest-krita-1.4.0_rc1 69
+MD5 d83915e44160ac970929eedbbd070839 krita-1.4.1.ebuild 953
+MD5 c38336fefd7e3e27fe9a8a8fa79ae4a9 krita-1.4.2.ebuild 961
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-krita-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-krita-1.4.2 68
diff --git a/app-office/krita/krita-1.4.1.ebuild b/app-office/krita/krita-1.4.1.ebuild
index f0adf074f85e..9dde4fbbb04e 100644
--- a/app-office/krita/krita-1.4.1.ebuild
+++ b/app-office/krita/krita-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/app-office/krita/krita-1.4.1.ebuild,v 1.1 2005/07/25 20:26:18 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="javascript"
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/krita/krita-1.4.2.ebuild b/app-office/krita/krita-1.4.2.ebuild
index 03d3cb177344..126e56305884 100644
--- a/app-office/krita/krita-1.4.2.ebuild
+++ b/app-office/krita/krita-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.4.2.ebuild,v 1.1 2005/10/10 22:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="javascript"
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kspread/ChangeLog b/app-office/kspread/ChangeLog
index 661425b0a5fe..c154525de292 100644
--- a/app-office/kspread/ChangeLog
+++ b/app-office/kspread/ChangeLog
@@ -1,10 +1,73 @@
 # ChangeLog for app-office/kspread
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.1 2005/01/29 13:25:30 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/ChangeLog,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
-*kspread-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kspread-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kspread-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> kspread-1.4.1.ebuild:
+  Marking ppc64 stable for kword security fix
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> kspread-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kspread-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kspread-1.4.2.ebuild:
+  New version.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kspread-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kspread-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kspread-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kspread-1.4.1.ebuild:
+  Stable on x86.
+
+*kspread-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kspread-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kspread-1.3.5.ebuild:
+  Marked ppc stable, thanks bambam.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kspread-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kspread-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*kspread-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kspread-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kspread-1.3.5.ebuild,
+  kspread-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kspread-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kspread-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kspread-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kspread-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+  20 Mar 2005; Simone Gotti <motaboy@gentoo.org> kspread-1.3.5.ebuild:
+  Added dep on kchart instead of only a KMEXTRACTONLY="kchart", so it won't
+  lose the ability to create charts. Fixes bug #85138.
+
+*kspread-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kspread-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index f31801637c00..8bf00f7bb776 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,2 +1,8 @@
-MD5 db90b883c11099fd79e506cf312d66c4 kspread-1.3.5.ebuild 1110
+MD5 92aec478bb35480a7836ce142e7ea02b ChangeLog 2396
+MD5 ef06322f8a12885dd5dfeea8d2d244ee kspread-1.3.5.ebuild 1275
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 b321e3aa2a3ef585f20372811611557e kspread-1.4.1.ebuild 1158
+MD5 c52da8c7b3f6f622efe93d00893e58f8 kspread-1.4.2.ebuild 1169
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kspread-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kspread-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kspread-1.4.2 68
diff --git a/app-office/kspread/kspread-1.3.5.ebuild b/app-office/kspread/kspread-1.3.5.ebuild
index 06d3525bbfe5..a3dca761049c 100644
--- a/app-office/kspread/kspread-1.3.5.ebuild
+++ b/app-office/kspread/kspread-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/app-office/kspread/kspread-1.3.5.ebuild,v 1.1 2005/01/29 13:25:30 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.3.5
@@ -11,12 +11,13 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
 
 DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
+	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
 	dev-util/pkgconfig"
 
 KMCOPYLIB="
diff --git a/app-office/kspread/kspread-1.4.1.ebuild b/app-office/kspread/kspread-1.4.1.ebuild
index f92f16fcf8ed..37065085040c 100644
--- a/app-office/kspread/kspread-1.4.1.ebuild
+++ b/app-office/kspread/kspread-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/app-office/kspread/kspread-1.4.1.ebuild,v 1.1 2005/07/25 20:22:43 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kspread/kspread-1.4.2.ebuild b/app-office/kspread/kspread-1.4.2.ebuild
index 62f64eea370a..530e4fb2c1a8 100644
--- a/app-office/kspread/kspread-1.4.2.ebuild
+++ b/app-office/kspread/kspread-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.4.2.ebuild,v 1.1 2005/10/10 22:09:09 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kspread/metadata.xml b/app-office/kspread/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kspread/metadata.xml
+++ b/app-office/kspread/metadata.xml
@@ -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/app-office/kugar/ChangeLog b/app-office/kugar/ChangeLog
index cecde9baf7cf..9a389eaa64d3 100644
--- a/app-office/kugar/ChangeLog
+++ b/app-office/kugar/ChangeLog
@@ -1,10 +1,66 @@
 # ChangeLog for app-office/kugar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.1 2005/01/29 13:25:55 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/ChangeLog,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
-*kugar-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kugar-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kugar-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> kugar-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+*kugar-1.4.2 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kugar-1.4.2.ebuild:
+  New version.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kugar-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kugar-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kugar-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kugar-1.4.1.ebuild:
+  Stable on x86.
+
+*kugar-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kugar-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kugar-1.3.5.ebuild:
+  Marked ppc stable.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kugar-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kugar-1.4.0.ebuild:
+  Added ~alpha wrt #95128
+
+*kugar-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kugar-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kugar-1.3.5.ebuild,
+  kugar-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kugar-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kugar-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kugar-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kugar-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*kugar-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kugar-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kugar/Manifest b/app-office/kugar/Manifest
index cc27db79cab2..d61f49428e08 100644
--- a/app-office/kugar/Manifest
+++ b/app-office/kugar/Manifest
@@ -1,2 +1,8 @@
-MD5 fec69386ce447355d6ee5c0fb0e0c551 kugar-1.3.5.ebuild 804
+MD5 a6a0a1a8c7dfceef5b68cbd00602a162 ChangeLog 2012
+MD5 d6e43c2a1976864f65664538821c3260 kugar-1.3.5.ebuild 917
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 892b86999bc34d871328cbd358e7cb2c kugar-1.4.1.ebuild 854
+MD5 3a4bb63af2a963428d397d5211ad32f2 kugar-1.4.2.ebuild 862
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kugar-1.3.5 211
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kugar-1.4.1 68
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kugar-1.4.2 68
diff --git a/app-office/kugar/kugar-1.3.5.ebuild b/app-office/kugar/kugar-1.3.5.ebuild
index ec0165aa9b84..c336a958eca5 100644
--- a/app-office/kugar/kugar-1.3.5.ebuild
+++ b/app-office/kugar/kugar-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/app-office/kugar/kugar-1.3.5.ebuild,v 1.1 2005/01/29 13:25:55 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.3.5
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 
 IUSE=""
 SLOT="0"
diff --git a/app-office/kugar/kugar-1.4.1.ebuild b/app-office/kugar/kugar-1.4.1.ebuild
index 2568384cd9e9..02e3d2180cb8 100644
--- a/app-office/kugar/kugar-1.4.1.ebuild
+++ b/app-office/kugar/kugar-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/app-office/kugar/kugar-1.4.1.ebuild,v 1.1 2005/07/25 20:26:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kugar/kugar-1.4.2.ebuild b/app-office/kugar/kugar-1.4.2.ebuild
index 26f7d4e49dde..1ab8aa387148 100644
--- a/app-office/kugar/kugar-1.4.2.ebuild
+++ b/app-office/kugar/kugar-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.4.2.ebuild,v 1.1 2005/10/10 22:09:38 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
diff --git a/app-office/kugar/metadata.xml b/app-office/kugar/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kugar/metadata.xml
+++ b/app-office/kugar/metadata.xml
@@ -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/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 9e8c7620b346..2d557a1cb340 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,10 +1,88 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.1 2005/01/29 13:26:21 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
-*kword-1.3.5 (29 Jan 2005)
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> kword-1.4.2.ebuild:
+  Stable on ppc64; bug #112840
 
-  29 Jan 2005; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
-  +kword-1.3.5.ebuild:
-  Adding koffice's splitted ebuilds to portage.
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> kword-1.4.1-r1.ebuild:
+  Marking kword-1.4.1-r1 for security bug.
+
+  12 Oct 2005; Joseph Jezak <josejx@gentoo.org> kword-1.4.1-r1.ebuild:
+  Marked ppc stable for bug #108411.
+
+  11 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> kword-1.4.1-r1.ebuild:
+  Stable on alpha, bug 108411.
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> kword-1.4.2.ebuild:
+  Mark 1.4.2 ~ia64
+
+  11 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> kword-1.4.1-r1.ebuild:
+  Stable on amd64, bug 108411.
+
+*kword-1.3.5-r1 (11 Oct 2005)
+
+  11 Oct 2005; Carsten Lohrke <carlo@gentoo.org> +kword-1.3.5-r1.ebuild,
+  kword-1.4.1-r1.ebuild:
+  fix for buffer overflow in rtf import, stable on x86
+
+*kword-1.4.2 (10 Oct 2005)
+*kword-1.4.1-r1 (10 Oct 2005)
+
+  10 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/koffice-1.4.1-rtfimport.patch, +kword-1.4.1-r1.ebuild,
+  +kword-1.4.2.ebuild:
+  New version. Includes fix for buffer overflow in RTF import. Fix applied to
+  1.4.1, too.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kword-1.4.1.ebuild:
+  Mark 1.4.1 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kword-1.4.1.ebuild:
+  Stable on ppc.
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kword-1.4.1.ebuild:
+  Stable on amd64, closes bug 104377.
+
+  27 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kword-1.4.1.ebuild:
+  Stable on x86.
+
+*kword-1.4.1 (25 Jul 2005)
+
+  25 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kword-1.4.1.ebuild:
+  New version.
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kword-1.3.5.ebuild:
+  Marked ppc stable for bug #98788.  Thanks bambam.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kword-1.4.0.ebuild:
+  Added ~sparc keyword.
+
+  29 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> ChangeLog:
+  Added ~alpha wrt #95128
+
+*kword-1.4.0 (21 Jun 2005)
+
+  21 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kword-1.4.0.ebuild:
+  Final release of KOffice 1.4.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kword-1.3.5.ebuild,
+  kword-1.4.0_rc1.ebuild:
+  Added ~ppc64; bug #95128
+
+*kword-1.4.0_rc1 (03 Jun 2005)
+
+  03 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +kword-1.4.0_rc1.ebuild:
+  Release candidate for new version of KOffice.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> kword-1.3.5.ebuild:
+  Marked ~amd64.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> kword-1.3.5.ebuild:
+  Marked ~ppc for bug #87780.
+
+*kword-1.3.5 (05 Mar 2005)
+
+  05 Mar 2005; Simone Gotti <motaboy@gentoo.org> kword-1.3.5.ebuild:
+  Stable on x86.
 
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 152c8f075fcd..3c3e06144b2f 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,4 +1,14 @@
-MD5 5999287f2994bf5afe1cb239991f15e7 kword-1.3.5.ebuild 1270
+MD5 db590b4e22fb851aa8386ce278f27315 ChangeLog 2830
+MD5 5948a99247e2967f49cbd364cbe194d7 kword-1.3.5.ebuild 1378
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 18ae024a439fc6a208affee87245e886 kword-1.4.1.ebuild 1200
+MD5 113e6434c255e20ee8de241c0a1b53bd kword-1.3.5-r1.ebuild 1440
+MD5 4a5def53a5e48ab29b32d9ddcd601258 kword-1.4.1-r1.ebuild 1396
+MD5 38d86b48e7a8e0bc11c2292cf2662662 kword-1.4.2.ebuild 1208
 MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
-MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
 MD5 12d141df83ce3d5769387e780ee073f7 files/digest-kword-1.3.5 211
+MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 79e9d059a9a700c3c8009978d0aa0ce3 files/digest-kword-1.4.1 68
+MD5 4db1fd7ff582f6437830745f93412312 files/digest-kword-1.3.5-r1 287
+MD5 59512f920182567b8e9420e5e3d1bc9b files/digest-kword-1.4.1-r1 144
+MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kword-1.4.2 68
diff --git a/app-office/kword/files/digest-kword-1.3.5-r1 b/app-office/kword/files/digest-kword-1.3.5-r1
index 4dc2ef3e1dd3..de0cb893c168 100644
--- a/app-office/kword/files/digest-kword-1.3.5-r1
+++ b/app-office/kword/files/digest-kword-1.3.5-r1
@@ -1,3 +1,4 @@
 MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924
 MD5 18f35fd33b62d4d0549130eceb6fca38 koffice-1.3.4-1.3.5.tar.xdelta 340954
 MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
+MD5 71a1baa8244dbcc1bfc2bd3c3e3dd40f post-koffice-1.3.5-rtfimport.diff 8620
diff --git a/app-office/kword/files/digest-kword-1.4.1-r1 b/app-office/kword/files/digest-kword-1.4.1-r1
index 47d9bab5c838..6a96a65f5dd7 100644
--- a/app-office/kword/files/digest-kword-1.4.1-r1
+++ b/app-office/kword/files/digest-kword-1.4.1-r1
@@ -1 +1,2 @@
 MD5 91a7b68757addc5934c5a8209a4926d5 koffice-1.4.1.tar.bz2 19364338
+MD5 9f77b327119fd1db0752dab785e2a975 post-koffice-1.4.1-rtfimport.diff 8614
diff --git a/app-office/kword/kword-1.3.5-r1.ebuild b/app-office/kword/kword-1.3.5-r1.ebuild
index e93efec33bd3..41c8626ab987 100644
--- a/app-office/kword/kword-1.3.5-r1.ebuild
+++ b/app-office/kword/kword-1.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/app-office/kword/kword-1.3.5-r1.ebuild,v 1.1 2005/10/11 14:54:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.3.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.3.5
@@ -8,7 +8,8 @@ inherit kde-meta eutils
 
 DESCRIPTION="KOffice Word Processor"
 HOMEPAGE="http://www.koffice.org/"
-SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
+SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2
+	mirror://kde/security_patches/post-koffice-1.3.5-rtfimport.diff"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE=""
@@ -41,7 +42,7 @@ need-kde 3.1
 
 PATCHES="${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
 	${FILESDIR}/CAN-2005-0064.patch
-	${FILESDIR}/koffice-1.4.1-rtfimport.patch"
+	${DISTDIR}/post-koffice-1.3.5-rtfimport.diff"
 
 src_unpack() {
 	kde-meta_src_unpack unpack
diff --git a/app-office/kword/kword-1.3.5.ebuild b/app-office/kword/kword-1.3.5.ebuild
index b4d39de6f9ad..9bf98f5b02c2 100644
--- a/app-office/kword/kword-1.3.5.ebuild
+++ b/app-office/kword/kword-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/app-office/kword/kword-1.3.5.ebuild,v 1.1 2005/01/29 13:26:21 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=1.3.5
@@ -10,7 +10,7 @@ DESCRIPTION="KOffice Word Processor"
 HOMEPAGE="http://www.koffice.org/"
 SRC_URI="$SRC_URI mirror://kde/stable/${KMNAME}/src/${KMNAME}-${PV}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
 IUSE=""
 SLOT="0"
 DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kword/kword-1.4.1-r1.ebuild b/app-office/kword/kword-1.4.1-r1.ebuild
index 56edef90b495..fddae227ea44 100644
--- a/app-office/kword/kword-1.4.1-r1.ebuild
+++ b/app-office/kword/kword-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/app-office/kword/kword-1.4.1-r1.ebuild,v 1.1 2005/10/10 22:10:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -10,8 +10,11 @@ DESCRIPTION="KOffice word processor."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
+SRC_URI="${SRC_URI}
+	mirror://kde/security_patches/post-koffice-1.4.1-rtfimport.diff"
+
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
@@ -48,7 +51,7 @@ src_unpack() {
 	kde-meta_src_unpack unpack
 
 	# Fix RTF import buffer overflow. Applied in 1.4.2.
-	epatch "${FILESDIR}/koffice-1.4.1-rtfimport.patch"
+	epatch "${DISTDIR}/post-koffice-1.4.1-rtfimport.diff"
 
 	# We need to compile liboofilter first
 	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
diff --git a/app-office/kword/kword-1.4.1.ebuild b/app-office/kword/kword-1.4.1.ebuild
index c86a5439a9de..6f798cef8db8 100644
--- a/app-office/kword/kword-1.4.1.ebuild
+++ b/app-office/kword/kword-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/app-office/kword/kword-1.4.1.ebuild,v 1.1 2005/07/25 20:23:09 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kword/kword-1.4.2.ebuild b/app-office/kword/kword-1.4.2.ebuild
index bc4cad24f030..a9a3dcfcbef5 100644
--- a/app-office/kword/kword-1.4.2.ebuild
+++ b/app-office/kword/kword-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2.ebuild,v 1.1 2005/10/10 22:10:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 KMNAME=koffice
 MAXKOFFICEVER=${PV}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
diff --git a/app-office/kword/metadata.xml b/app-office/kword/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/app-office/kword/metadata.xml
+++ b/app-office/kword/metadata.xml
@@ -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/app-office/lahelper/ChangeLog b/app-office/lahelper/ChangeLog
index 0b5a9be36f4c..96db947b4740 100644
--- a/app-office/lahelper/ChangeLog
+++ b/app-office/lahelper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/lahelper
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lahelper/ChangeLog,v 1.1 2004/11/15 14:02:19 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lahelper/ChangeLog,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> lahelper-0.6.3.ebuild:
+  Added to ~ppc.
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> lahelper-0.6.3.ebuild:
+  Added ~sparc keyword.
 
 *lahelper-0.6.3 (15 Nov 2004)
 
diff --git a/app-office/lahelper/Manifest b/app-office/lahelper/Manifest
index 07b0b82dc18b..c8c15418b220 100644
--- a/app-office/lahelper/Manifest
+++ b/app-office/lahelper/Manifest
@@ -1,2 +1,5 @@
-MD5 4275e28b73a90ee07a1907cfdeca9b48 lahelper-0.6.3.ebuild 1011
+MD5 00b24f5e97bb1f304342e8339943dcf5 ChangeLog 638
+MD5 9eacfa04eb258e2dc02cb940cbeb92cb lahelper-0.6.3.ebuild 1044
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 e237d5fbab9fde60bb295a94527d1c06 files/digest-lahelper-0.6.3 65
+MD5 862fdfd90490e2e78f1ca4f6809dd92e files/lahelper-0.6.3-gentoo.diff 238
diff --git a/app-office/lahelper/lahelper-0.6.3.ebuild b/app-office/lahelper/lahelper-0.6.3.ebuild
index af977d03daf3..7c6f8af4bb10 100644
--- a/app-office/lahelper/lahelper-0.6.3.ebuild
+++ b/app-office/lahelper/lahelper-0.6.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/app-office/lahelper/lahelper-0.6.3.ebuild,v 1.1 2004/11/15 14:02:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lahelper/lahelper-0.6.3.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lahelper/${P}-1.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*
diff --git a/app-office/linuxtrade/ChangeLog b/app-office/linuxtrade/ChangeLog
index 8126a6a15d8d..2548652ab6cc 100644
--- a/app-office/linuxtrade/ChangeLog
+++ b/app-office/linuxtrade/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/linuxtrade
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/linuxtrade/ChangeLog,v 1.1 2004/07/20 00:06:04 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/linuxtrade/ChangeLog,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> linuxtrade-3.65.ebuild:
+  Added ~sparc keyword.
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> linuxtrade-3.65.ebuild:
+  Added to ~ppc.
+
+  19 Jul 2004; Aron Griffis <agriffis@gentoo.org> linuxtrade-3.65.ebuild:
+  add ~alpha
 
 *linuxtrade-3.65 (19 Jul 2004)
 
diff --git a/app-office/linuxtrade/Manifest b/app-office/linuxtrade/Manifest
index 089ad23d59fb..9959f5aa9878 100644
--- a/app-office/linuxtrade/Manifest
+++ b/app-office/linuxtrade/Manifest
@@ -1,3 +1,5 @@
-MD5 d9e68e9734cd860b52175f5353990213 linuxtrade-3.65.ebuild 716
-MD5 9578561316ef42794a3138b64b61ec17 wget-log 360
+MD5 d0e3bf4baa3d00184f4bf00d90a45bd0 metadata.xml 743
+MD5 efd3b16662f3438f6775eae91f96cd41 linuxtrade-3.65.ebuild 1110
+MD5 97419c9a335629854e9706274c610f1a ChangeLog 714
 MD5 94a86d8c8973fd2e07442f8bc93eae64 files/digest-linuxtrade-3.65 140
+MD5 746e0c767fd4bfb38b1137309c45d8b0 files/linuxtrade-3.65-bool.patch 1037
diff --git a/app-office/linuxtrade/linuxtrade-3.65.ebuild b/app-office/linuxtrade/linuxtrade-3.65.ebuild
index 42138fd9a702..c1ffb35d9d2d 100644
--- a/app-office/linuxtrade/linuxtrade-3.65.ebuild
+++ b/app-office/linuxtrade/linuxtrade-3.65.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-office/linuxtrade/linuxtrade-3.65.ebuild,v 1.1 2004/07/20 00:06:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/linuxtrade/linuxtrade-3.65.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${P/-/_}.orig.tar.gz
 	mirror://debian/pool/main/l/${PN}/${P/-/_}-5.diff.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/app-office/lxbank/ChangeLog b/app-office/lxbank/ChangeLog
index 45e7c6ecfadb..f8e49408accc 100644
--- a/app-office/lxbank/ChangeLog
+++ b/app-office/lxbank/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for app-office/lxbank
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lxbank/ChangeLog,v 1.1 2003/06/22 19:49:45 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lxbank/ChangeLog,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> lxbank-0.1.8.ebuild,
+  lxbank-0.1.9.ebuild:
+  Change qt dep per bug #100235
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> lxbank-0.1.9.ebuild:
+  inherit eutils
+
+  27 Jun 2004; Hanno Boeck <hanno@gentoo.org> +files/lxbank_gcc34.gz,
+  lxbank-0.1.9.ebuild:
+  Fix for gcc 3.4.
+
+  11 Mar 2004; Hanno Boeck <hanno@gentoo.org> lxbank-0.1.9.ebuild:
+  Marked stable on x86.
+
+*lxbank-0.1.9 (06 Mar 2004)
+
+  06 Mar 2004; Hanno Boeck <hanno@gentoo.org> lxbank-0.1.9.ebuild:
+  Version bump.
+
+  10 Feb 2004; Hanno Boeck <hanno@gentoo.org> lxbank-0.1.8.ebuild:
+  Marked stable x86.
+
+*lxbank-0.1.8 (23 Dec 2003)
+
+  23 Dec 2003; Hanno Boeck <hanno@gentoo.org> lxbank-0.1.8.ebuild:
+  Version bump.
+
+*lxbank-0.1.7 (08 Aug 2003)
+
+  08 Aug 2003; Hanno Boeck <hanno@gentoo.org> lxbank-0.1.7.ebuild:
+  Version bump.
 
 *lxbank-0.1.6 (22 Jun 2003)
 
diff --git a/app-office/lxbank/Manifest b/app-office/lxbank/Manifest
index b6005032fd7e..b1d9b3e409a5 100644
--- a/app-office/lxbank/Manifest
+++ b/app-office/lxbank/Manifest
@@ -1,2 +1,7 @@
-MD5 c280456ef3aa6d45e2d74dede5279e8f lxbank-0.1.6.ebuild 516
-MD5 0461c750f2207ee0ffb0dcd4532f14f3 files/digest-lxbank-0.1.6 64
+MD5 9dc55b5cc202acfcb8bcae7ae725c09d lxbank-0.1.8.ebuild 651
+MD5 ba7654d2fd3f70bdca4f457cc9f8f05f ChangeLog 1197
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 6a064c44737a9bb357ba2dfcc0cd71e1 lxbank-0.1.9.ebuild 725
+MD5 98f56d29901fc0ce656ba59843f95b8a files/digest-lxbank-0.1.8 64
+MD5 750bd1fa5f28f637b29af14ddf36fdef files/digest-lxbank-0.1.9 64
+MD5 227d8abcdc0c7a30e998c2e157928f7e files/lxbank_gcc34.gz 206
diff --git a/app-office/lxbank/lxbank-0.1.8.ebuild b/app-office/lxbank/lxbank-0.1.8.ebuild
index c79504d8b9d3..2ad10f2b08dd 100644
--- a/app-office/lxbank/lxbank-0.1.8.ebuild
+++ b/app-office/lxbank/lxbank-0.1.8.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lxbank/lxbank-0.1.8.ebuild,v 1.1 2003/12/23 21:20:20 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lxbank/lxbank-0.1.8.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+inherit qt3
 
 DESCRIPTION="Graphical HBCI online banking tool"
 HOMEPAGE="http://lxbank.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lxbank/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=">=net-libs/openhbci-0.9.11
-	>=x11-libs/qt-3.0.5
+	$(qt_min_version 3.1)
 	>=sys-libs/libchipcard-0.9
 	app-misc/ktoblzcheck"
 
diff --git a/app-office/lxbank/lxbank-0.1.9.ebuild b/app-office/lxbank/lxbank-0.1.9.ebuild
index 38b12fae1d86..78d62994b131 100644
--- a/app-office/lxbank/lxbank-0.1.9.ebuild
+++ b/app-office/lxbank/lxbank-0.1.9.ebuild
@@ -1,19 +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/app-office/lxbank/lxbank-0.1.9.ebuild,v 1.1 2004/03/06 15:55:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lxbank/lxbank-0.1.9.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+inherit eutils qt3
 
 DESCRIPTION="Graphical HBCI online banking tool"
 HOMEPAGE="http://lxbank.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lxbank/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=">=net-libs/openhbci-0.9.11
-	>=x11-libs/qt-3.0.5
+	$(qt_min_version 3.1)
 	>=sys-libs/libchipcard-0.9
 	app-misc/ktoblzcheck"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/lxbank_gcc34.gz
+}
+
 src_compile() {
 	econf --with-qt-includes=/usr/qt/3/include/ || die
 	emake || die
diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index e54a66122dd0..d58a1d78e708 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,296 @@
 # ChangeLog for app-office/lyx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> lyx-1.3.5-r2.ebuild:
+  Stable on amd64.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> lyx-1.3.5-r2.ebuild:
+  Stable on ppc.
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> lyx-1.3.5-r2.ebuild:
+  Stable on sparc
+
+*lyx-1.3.6 (31 Jul 2005)
+
+  31 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/lyx-1.3.6-gentoo.diff, lyx-1.3.5-r2.ebuild, +lyx-1.3.6.ebuild:
+  Version bumped; bug #99784.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> lyx-1.3.4.ebuild,
+  lyx-1.3.5.ebuild, lyx-1.3.5-r1.ebuild, lyx-1.3.5-r2.ebuild:
+  Change qt dep to =x11-libs/qt-3*
+
+  04 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org> lyx-1.3.5-r1.ebuild:
+  Stable on ppc.
+
+  29 May 2005; Marcus D. Hanwell <cryos@gentoo.org> lyx-1.3.5-r1.ebuild:
+  Stable on amd64.
+
+  26 May 2005; Jason Wever <weeve@gentoo.org> lyx-1.3.5-r1.ebuild:
+  Stable on SPARC.
+
+*lyx-1.3.5-r2 (22 May 2005)
+
+  22 May 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5-r1.ebuild,
+  +lyx-1.3.5-r2.ebuild:
+  Fixed bug #91108, bug #92579 and bug #89796.
+
+  17 May 2005; <pclouds@gentoo.org> lyx-1.3.5-r1.ebuild:
+  Fixed #92759
+
+  11 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5-r1.ebuild:
+  Added a test for -fno-stack-protector; bug #88560.
+
+  06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5-r1.ebuild:
+  Fixed xforms dependency when cjk is enabled. Bug #88140. Moved back
+  to unstable (I mistakenly committed the ebuild as stable. sorry)
+
+*lyx-1.3.5-r1 (03 Apr 2005)
+
+  03 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +lyx-1.3.5-r1.ebuild:
+  Added cjk USE flag to build CJK-LyX. Thanks to Josh Glover
+  <jmglov@gentoo.org>, Jackey Yang <043936y@acadiau.ca>, Matsui Tetsushi
+  <VED03370@nifty.ne.jp>, and Ulrich Plate <plate@gentoo.org>.
+  This closes bug #14751.
+
+  08 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5.ebuild:
+  Filters -Os (may result in compilation failure on some systems); bug #73984.
+
+  15 Dec 2004; Dylan Carlson <absinthe@gentoo.org> lyx-1.3.5.ebuild:
+  Stable on amd64.
+
+  03 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> files/lyx.desktop,
+  lyx-1.3.5.ebuild:
+  Use CXXFLAGS instead of CFLAGS (bug #73164) and pass -fno-stack-protector
+  (bug #72875). Also corrected Desktop Entry for LyX (bug #72808).
+
+  17 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> lyx-1.3.5.ebuild:
+  Stable on sparc
+
+  15 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.4.ebuild,
+  lyx-1.3.5.ebuild:
+  Fixed inappropriate einfo lines; bug #71063.
+  Marked 1.3.5 stable on x86 and ppc.
+
+  25 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.4.ebuild,
+  lyx-1.3.5.ebuild:
+  Changed app-text/gv -> virtual/psviewer and app-text/xpdf ->
+  virtual/pdfviewer; bug #50423.
+
+  22 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.4.ebuild,
+  lyx-1.3.5.ebuild:
+  Added -j1 to emake; bug #57479.
+
+  13 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/lyx-1.3.5-boost.patch, lyx-1.3.5.ebuild:
+  Added a patch to fix compile problem with gcc 3.4.2. Thanks to Ed Catmur
+  <ed@catmur.co.uk>, closing bug #67131.
+
+*lyx-1.3.5 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> +lyx-1.3.5.ebuild:
+  Version bumped; bug #66922.
+
+  09 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +files/lyx-1.3.4-gcc34.patch,
+  lyx-1.3.4.ebuild:
+  Applied a patch to make lyx compile on gcc 3.4; bug #62126.
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> lyx-1.3.4.ebuild:
+  Stable on sparc.
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> lyx-1.3.4.ebuild:
+  Fix use invocation
+
+  11 May 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.4.ebuild, files/lyx-1.3.2-configure.diff:
+  Fixed several bugs. See bug #50703. Removed previous version.
+
+  08 May 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.2.1.ebuild,
+  lyx-1.3.2-r1.ebuild, lyx-1.3.4.ebuild:
+  Stable on x86 and ppc. Removed old ebuild.
+
+*lyx-1.3.4 (22 Feb 2004)
+
+  22 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.4.ebuild:
+  Version bumped.  Added a notice for people who have a multi-head setup
+  but choose xforms instead of qt interface. This closes bug #43092
+
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> lyx-1.3.3.ebuild:
+  added amd64 keyword.
+
+  31 Dec 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.2.ebuild, lyx-1.3.3.ebuild:
+  Removed ~alpha from 1.3.x, seems the keyword was carried over from the 1.2.x
+  series, but xforms isn't marked on alpha
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> lyx-1.2.1.ebuild,
+  lyx-1.3.2-r1.ebuild, lyx-1.3.2.ebuild, lyx-1.3.3.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  10 Oct 2003; Jason Wever <weeve@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.3.ebuild:
+  Added ~sparc keyword, resolved bug #30753.
+
+  09 Oct 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.3.ebuild:
+  Added latex-xft-fonts which should pick the long running mathematical symbols
+  problems, seebug #15629
+
+  08 Oct 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.2.ebuild, lyx-1.3.3.ebuild, files/lyx.desktop:
+  Added lyx.desktop menu entry for gnome if USE='gnome is set
+
+*lyx-1.3.3 (07 Oct 2003)
+
+  07 Oct 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.3.ebuild,
+  files/lyx-1.3.3-configure-diff:
+  New version, thanks to <felix@fkurth.de> on bug #30512 for the configure 
+  patch.
+
+  06 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> lyx-1.2.1.ebuild,
+  lyx-1.3.2.ebuild, lyx-1.3.2-r1.ebuild:
+  Changed app-text/tetex to virtual/tetex
+
+  02 Oct 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.2-r1.ebuild:
+  Marked stable on x86
+
+  26 Sep 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.2.ebuild:
+  Really fixed the missing Aiksaurus header problem, by really using all of
+  brandy's patch, bug # as before.
+
+  20 Sep 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.2.ebuild, files/lyx-1.3.2-nomktex.patch:
+  Added fix for sandbox violations, thanks to <brandy@gentoo.org> for the patch,
+  and bug #22224
+
+  20 Sep 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.2.ebuild, metadata.xml:
+  Added Aiksaurus fix for missing header, re bug: 27658, and fix by
+  <brandy@gentoo.org>
+
+*lyx-1.3.2-r1 (11 Jun 2003)
+
+  11 Jun 2003; Dan Armak <danarmak@gentoo.org> lyx-1.3.2-r1.ebuild:
+  New revision that installs the bind file for Hebrew editing as well as a
+  sample preferences file for same. For more info, see
+  http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html (items 5, 6).
+
+  09 Jun 2003; satai <satai@gentoo.org> lyx-1.2.0.20020705.ebuild,
+  lyx-1.2.1.ebuild, lyx-1.2.3.ebuild, lyx-1.3.0.ebuild, lyx-1.3.1.ebuild,
+  lyx-1.3.2.ebuild:
+  Fixed to reflect app-text entries that were moved to dev-tex
+
+*lyx-1.3.2 (12 May 2003)
+
+  12 May 2003: Caleb Tennis <caleb@gentoo.org> lyx-1.3.2.ebuild:
+  Version bump, does not need patches from previous version as they have
+  been merged into the upstream package (#20708 by Rob Holland).
+  Also incorporate a small patch to fix sandbox violations (#15766), and
+  hopefully some font problems (#15629)
+
+
+  07 Apr 2003; Dan Armak <danarmak@gentoo.org> lyx-1.3.1.ebuild:
+  Fetch the .tar.bz2 not the .tar.gz, as it is considerably smaller. Closes
+  #17853 - thanks to John Steele Scott for noticing.
+
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> lyx-1.3.1.ebuild:
+  Add stable x86 keyword.
+
+  20 Mar 2003; Luca Barbato <lu_zero@gentoo.org> lyx-1.3.1.ebuild:
+  Add ~alpha to KEYWORDS
+
+*lyx-1.3.1 (19 Mar 2003)
+
+  22 Apr 2003; Graham Forest <vladimir@gentoo.org> lyx-1.2.1.ebuild,
+  lyx-1.2.3.ebuild, lyx-1.3.0.ebuild, lyx-1.3.1.ebuild:
+  app-text/aspell -> virtual/aspell-dict
+
+  19 Mar 2003; Dan Armak <danarmak@gentoo.org> lyx-1.3.1.ebuild:
+  
+  New bugfix release.
+
+*lyx-1.3.0 (12 Feb 2003)
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> lyx-1.3.0.ebuild:
+  Add ~alpha to KEYWORDS
+
+  05 Mar 2003; Dan Armak <danarmak@gentoo.org> lyx-1.3.0.ebuild:
+  Fix bug #15692 - a compile problem, especially with gcc 2.x, where the
+  default compile flags weren't being added, which made the compile fail.
+
+  12 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+  A new major version. Among many other nice things this adds a qt3 interface,
+  which is used instead of the xforms one if 'qt' USE flag is on. The qt
+  interface provides antialiasing and suhc stuff, as well as qt3's unicode
+  input management support (so you don't need to deal with lyx-style keymap
+  files).
+
+  13 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Mark lyx 1.2.3 as stable on x86.
+
+*lyx-1.2.3 (10 Jan 2003)
+
+  10 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Another bugfix release from upstream.
+
+*lyx-1.2.2 (01 Jan 2003)
+
+  01 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  An important bugfix release.
+
+*lyx-1.2.1 (22 Aug 2002)
+
+  14 Sep 2002; Seemant Kulleen <seemant@gentoo.org> lyx-1.2.1.ebuild :
+
+  man pages in LFH correct locations.
+
+  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> lyx-1.2.1.ebuild :
+
+  Changed spell dependency to aspell from ispell, from a request by
+  tester@videotron.ca (Olivier Crete) in bug #7557
+
+  04 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bugs like #7323: make the dep on xforms =xforms-1*, so that the old
+  and broken xforms-089 package doesn't satisfy it anymore.
+
+  02 Sep 2002; Owen Stampflee <owen@gentoo.org> lyx-1.2.1.ebuild ChangeLog :
+  
+  Added PPC To KEYWORDS.
+  
+  22 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release that fixes many issues.
+
+*lyx-1.2.0.20020705 (05 Jul 2002)
+
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  05 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  This is a 20020705 snapshot of the lyx cvs 1.2.x branch - i.e. 1.2.0 plus
+  all the bugfixes made
+  so far, working towards a 1.2.1 release. It fixes fex. #3538.
+
+  7 Jun 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Add dev-tex/chktex dep since that ebuild now works.
+
+*lyx-1.2.0 (1 Jun 2002)
+
+  1 Jun 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  The great new release of lyx (see changelog).
+  The lyx=lyx-base+lyx-utils scheme has been abandoned; the app-office/lyx-base
+  and app-office/lyx-utils ebuilds have been deprecated. I think they are
+  unnecessary. From now on, app-office/lyx will both install lyx itslf and 
+  depend on all the lyx utils.
 
 *lyx-1.1.6.4 (1 Feb 2002)
 
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 4b3220b5836a..58e16a4f7947 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,14 +1,26 @@
-MD5 a7006d64197842d1565108d6bc62d65c ChangeLog 3972
-MD5 6bfb88452d5ee7ee31a8524974775fa7 lyx-1.2.0.20020705.ebuild 1804
-MD5 6d34f15fbdb9f0f4fc4b0ce0e18571c2 lyx-1.2.1.ebuild 1726
-MD5 d4a547dc4ac19a37350317d968a51532 lyx-1.2.3.ebuild 1726
-MD5 5e5854aa4115c041233c8a978eeda647 lyx-1.3.0.ebuild 2612
-MD5 a1288c569867ab2d203b487961d5edf8 lyx-1.3.1.ebuild 2557
-MD5 5bd1551a209feb15ad54144e16964096 files/digest-lyx-1.2.0.20020705 72
-MD5 adf50f8b30bcf7f72ae36842b3fce02d files/digest-lyx-1.2.1 62
-MD5 ddda22cd4c3a6a4e40821722c7df3657 files/digest-lyx-1.2.3 62
-MD5 349d1c6bf70b9b2c0947e04dfe2a036f files/digest-lyx-1.3.0 62
-MD5 23edc3b998f98c60c164b9afd311b7b5 files/lyx-1.3.0-autogen.sh.diff 487
-MD5 17a1fa88c4632fb75580f64bcda5de20 files/lyx-1.3.0-configure.in 9947
-MD5 8225853c7de8cf0ed5139011bf45125f files/lyx-1.3.0-glibc31.diff 737
-MD5 a992c696a49b26da5c45a7c666810589 files/digest-lyx-1.3.1 340
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 895daf39c7f268ca69242ab4d5e6b185 lyx-1.3.4.ebuild 3103
+MD5 9257cf14df16f1d22e3cd6d65f2dbccf lyx-1.3.6.ebuild 4273
+MD5 85c91dd1e7126db67b96932bb898dcf6 lyx-1.3.5-r2.ebuild 4365
+MD5 9b0aac9341f4a2e88d5cf99274878a5e ChangeLog 10973
+MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
+MD5 cbf7e117745080595fa57af4f76c112b lyx-1.3.5-r1.ebuild 4219
+MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
+MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
+MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
+MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
+MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
+MD5 7fd22c8db1af17ba2d9abcb3548320ef files/lyx-1.3.6-gentoo.diff 1108
+MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
+MD5 59ef4c27ebcfafc671cfb41e266b0967 files/digest-lyx-1.3.6 381
+MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381
+MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r2 381
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDERMuntT9W3vfTuoRAvf2AJ9GEoNCjxwVDIk9S1LDlu5pTidqogCfTT2B
+rOZaKPWbDwmGTpOL5F7FYEo=
+=cidh
+-----END PGP SIGNATURE-----
diff --git a/app-office/lyx/files/lyx.desktop b/app-office/lyx/files/lyx.desktop
index 278f8baf1e3d..1c1b33e8738e 100644
--- a/app-office/lyx/files/lyx.desktop
+++ b/app-office/lyx/files/lyx.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Name=Lyx
-Comment=Latex WYSIWYG Editor
+Comment=Latex WYSIWYM Editor
 Icon=/usr/share/lyx/images/lyx.xpm
 Exec=lyx
 Terminal=false
 Type=Application
 StartupNotify=false
+Categories=GNOME;Application;Office;
 
diff --git a/app-office/lyx/lyx-1.3.4.ebuild b/app-office/lyx/lyx-1.3.4.ebuild
index d37b6f4d9089..aef57e722b88 100644
--- a/app-office/lyx/lyx-1.3.4.ebuild
+++ b/app-office/lyx/lyx-1.3.4.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/app-office/lyx/lyx-1.3.4.ebuild,v 1.1 2004/02/21 20:04:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
-inherit kde-functions
+inherit kde-functions eutils libtool
 
 DESCRIPTION="WYSIWYM frontend for LaTeX"
 HOMEPAGE="http://www.lyx.org/"
@@ -10,10 +10,10 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 	http://movementarian.org/latex-xft-fonts-0.1.tar.gz
 	http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind
 	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="nls cups qt debug gnome"
 
 # these dependencies need looking at.
@@ -24,13 +24,13 @@ DEPEND="virtual/x11
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( >=x11-libs/qt-3 ) !qt? ( =x11-libs/xforms-1* )"
+	qt? ( =x11-libs/qt-3* ) !qt? ( =x11-libs/xforms-1* )"
 
 RDEPEND="${DEPEND}
 	virtual/ghostscript
-	app-text/xpdf
+	virtual/pdfviewer
+	virtual/psviewer
 	virtual/aspell-dict
-	app-text/gv
 	dev-tex/latex2html
 	media-gfx/imagemagick
 	cups? ( virtual/lpr )
@@ -43,15 +43,18 @@ RDEPEND="${DEPEND}
 DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${P}.tar.bz2
+	unpack latex-xft-fonts-0.1.tar.gz
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
 	epatch ${FILESDIR}/${PN}-1.3.3-configure-diff
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	elibtoolize || die
 }
 
 src_compile() {
 	local myconf=""
-	if [ -n "`use qt`" ]; then
+	if use qt ; then
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
@@ -69,18 +72,20 @@ src_compile() {
 		${myconf} \
 		--enable-optimization="$flags" \
 		|| die
-	emake || die "emake failed"
+	# bug 57479
+	emake -j1 || die "emake failed"
 
 }
 
 src_install() {
-	einstall
-	dodoc README* UPGRADING INSTALL* ChangeLog NEWS COPYING ANNOUNCE ABOUT-NLS $DISTDIR/preferences
+	einstall || die
+	dodoc README* UPGRADING INSTALL* ChangeLog NEWS COPYING \
+		ANNOUNCE ABOUT-NLS ${DISTDIR}/preferences
 	insinto /usr/share/lyx/bind
-	doins $DISTDIR/hebrew.bind
+	doins ${DISTDIR}/hebrew.bind
 
 	# gnome menu entry
-	if [ -n "`use gnome`" ]; then
+	if use gnome; then
 		insinto /usr/share/applications
 		doins ${FILESDIR}/lyx.desktop
 	fi
@@ -98,8 +103,7 @@ pkg_postinst() {
 	einfo "Updating the font cache"
 	fc-cache -f --system-only
 
-	einfo ""
-	einfo "================"
+	draw_line
 	einfo ""
 	einfo "How to use Hebrew in LyX:"
 	einfo "1. emerge app-text/ivritex."
@@ -107,4 +111,13 @@ pkg_postinst() {
 	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
 	einfo "for instructions on using lyx's own preferences dialog to equal effect."
 	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo ""
+
+	if ! useq qt ; then
+	draw_line
+	einfo ""
+	einfo "If you have a multi-head setup not using xinerama you can only use lyx"
+	einfo "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392."
+	einfo ""
+	fi
 }
diff --git a/app-office/lyx/lyx-1.3.5-r1.ebuild b/app-office/lyx/lyx-1.3.5-r1.ebuild
index 17e209c95993..dfbb8b0e588b 100644
--- a/app-office/lyx/lyx-1.3.5-r1.ebuild
+++ b/app-office/lyx/lyx-1.3.5-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/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.1 2005/04/03 05:05:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
-inherit kde-functions eutils libtool
+inherit kde-functions eutils libtool flag-o-matic
 
 DESCRIPTION="WYSIWYM frontend for LaTeX"
 HOMEPAGE="http://www.lyx.org/"
@@ -15,8 +15,8 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE="cjk nls cups qt debug gnome"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="cjk cups debug nls qt"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
@@ -26,7 +26,9 @@ DEPEND="virtual/x11
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( >=x11-libs/qt-3 ) !qt? ( =x11-libs/xforms-1* )"
+	qt? ( =x11-libs/qt-3* )
+	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+		!cjk? ( =x11-libs/xforms-1* ) )"
 
 RDEPEND="${DEPEND}
 	virtual/ghostscript
@@ -36,8 +38,6 @@ RDEPEND="${DEPEND}
 	dev-tex/latex2html
 	media-gfx/imagemagick
 	cups? ( virtual/lpr )
-	app-text/rcs
-	dev-util/cvs
 	app-text/sgmltools-lite
 	app-text/noweb
 	dev-tex/chktex"
@@ -53,7 +53,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-boost.patch
 	if use cjk && use qt ; then
 		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-1.patch
-	elif use cjk && built_with_use 'x11-libs/xforms' cjk ; then
+	elif use cjk && built_with_use '=x11-libs/xforms-1.0-r1' cjk ; then
 		epatch ${DISTDIR}/CJK-LyX-xforms-${PV}-1.patch
 	elif use cjk ; then
 		eerror
@@ -65,6 +65,7 @@ src_unpack() {
 		eerror 'or'
 		eerror '3) USE="-cjk" emerge lyx (normal LyX will be built)'
 		eerror
+		die "Please remerge xforms-1.0-r1 with cjk USE flag enabled."
 	fi
 	elibtoolize || die
 }
@@ -81,7 +82,7 @@ src_compile() {
 
 	export WANT_AUTOCONF=2.5
 
-	local flags="${CXXFLAGS} -fno-stack-protector"
+	local flags="${CXXFLAGS} $(test_flag -fno-stack-protector) $(test_flag -fno-stack-protector-all)"
 	unset CFLAGS
 	unset CXXFLAGS
 	econf \
@@ -102,11 +103,7 @@ src_install() {
 	insinto /usr/share/lyx/bind
 	doins ${DISTDIR}/hebrew.bind
 
-	# gnome menu entry
-	if use gnome; then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/lyx.desktop
-	fi
+	domenu ${FILESDIR}/lyx.desktop
 
 	# install the latex-xft fonts, which should fix
 	# the problems outlined in bug #15629
diff --git a/app-office/lyx/lyx-1.3.5-r2.ebuild b/app-office/lyx/lyx-1.3.5-r2.ebuild
index f93d0a3e7c98..fd1fbb7efbb0 100644
--- a/app-office/lyx/lyx-1.3.5-r2.ebuild
+++ b/app-office/lyx/lyx-1.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/app-office/lyx/lyx-1.3.5-r2.ebuild,v 1.1 2005/05/22 12:24:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
@@ -15,8 +15,8 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="cjk nls cups qt debug gnome"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="cjk cups debug nls qt"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
@@ -26,7 +26,7 @@ DEPEND="virtual/x11
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( >=x11-libs/qt-3 )
+	qt? ( =x11-libs/qt-3* )
 	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
 		!cjk? ( =x11-libs/xforms-1* ) )"
 
diff --git a/app-office/lyx/lyx-1.3.6.ebuild b/app-office/lyx/lyx-1.3.6.ebuild
index abc15b07e26b..b263a95b20bd 100644
--- a/app-office/lyx/lyx-1.3.6.ebuild
+++ b/app-office/lyx/lyx-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/app-office/lyx/lyx-1.3.6.ebuild,v 1.1 2005/07/31 10:23:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.6.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index 06689a1a9114..3a525bc0e09e 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>text-markup</herd>
+<herd>cjk</herd>
 </pkgmetadata>
diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 3cdf64a2f359..e10747c7f533 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,69 @@
 # ChangeLog for app-office/magicpoint
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.1 2003/12/15 17:47:45 usata Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
+
+  29 Sep 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/magicpoint-1.10a-r1-gentoo.diff, -magicpoint-1.10a-r1.ebuild,
+  magicpoint-1.11b.ebuild:
+  Fixed compile error wrt xorg-x11 header path change; bug #103007.
+
+  06 May 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/magicpoint-1.11b-mng_optional.patch, magicpoint-1.11b.ebuild:
+  Fixed mng dep. Thanks to James Rowe <jnrowe@ukfsn.org>; bug #91644.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> magicpoint-1.11b.ebuild:
+  stable on amd64
+
+  18 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> magicpoint-1.10a-r1.ebuild,
+  magicpoint-1.11b.ebuild:
+  Use giflib instead of libungif; bug #85720.
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  magicpoint-1.10a-r1.ebuild, magicpoint-1.11b.ebuild:
+  Homepage moved, bug 80903.
+
+  05 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> magicpoint-1.11b.ebuild:
+  Added --x-libraries to econf to fix bug #77946.
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> magicpoint-1.11b.ebuild:
+  Stable on sparc.
+
+  04 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> magicpoint-1.11b.ebuild:
+  Stable on x86, alpha and ppc.
+
+*magicpoint-1.11b (06 Oct 2004)
+
+  06 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/magicpoint-1.11b-gentoo.diff, +magicpoint-1.11b.ebuild:
+  Version bumped.
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  magicpoint-1.10a-r1.ebuild:
+  Masked magicpoint-1.10a-r1.ebuild stable for ppc
+
+*magicpoint-1.11a (15 Sep 2004)
+
+  15 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/magicpoint-1.10a-gentoo.diff, +files/magicpoint-1.11a-gentoo.diff,
+  +magicpoint-1.11a.ebuild:
+  Version bumped. Added m17n-lib USE flag.
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> magicpoint-1.10a-r1.ebuild:
+  Fix use invocation
+
+  15 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> magicpoint-1.10a-r1.ebuild:
+  marked ~amd64
+
+  10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  magicpoint-1.10a-r1.ebuild:
+  don't assign default to S; tidy
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  magicpoint-1.09a-r1.ebuild, magicpoint-1.10a.ebuild:
+  clean old versions
+
+  13 Jan 2004; Marius Mauch <genone@gentoo.org> magicpoint-1.10a-r1.ebuild:
+  install the HTML docs in the correct location
 
 *magicpoint-1.10a (16 Dec 2003)
 
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index a5d4d8e2dbd2..71cf133b6b00 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -1,11 +1,7 @@
-MD5 78d9829985d21c702638193f071919d5 magicpoint-1.09a-r1.ebuild 1533
-MD5 11e7184f45ed39a540f9e44809a9b9c5 magicpoint-1.10a.ebuild 2178
-MD5 61f1f4acbdb65d4d73f3a45458b94b14 magicpoint-1.10a-r1.ebuild 1991
-MD5 6b7cd0adedd7e7d060a8bbbf7e17209e ChangeLog 3591
-MD5 4f629e05f82550ea37f2488b5d6fc7a9 metadata.xml 509
-MD5 6ac7b3bc9c394f597bf182a0509154fc files/digest-magicpoint-1.10a 68
-MD5 21ae8d72d1c351d19bc611f80ec31b63 files/magicpoint-1.10a-gentoo.diff 1668
-MD5 67c776708a4de3107f171f72100bd27e files/digest-magicpoint-1.09a-r1 68
-MD5 6ac7b3bc9c394f597bf182a0509154fc files/digest-magicpoint-1.10a-r1 68
-MD5 3948d3f1ee43af2138ad361b1bcab87b files/magicpoint-1.10a-r1-gentoo.diff 1833
+MD5 573654ef9de75c1540561e8bce48858b ChangeLog 5680
+MD5 5d3d26a4ffdc4a76caefc88561b4e202 magicpoint-1.11b.ebuild 2705
+MD5 cca347d4b0e88766d322951ccf1e97e7 metadata.xml 570
 MD5 63a502fcee80a92007cd49e113116b04 files/50mgp-mode-gentoo.el 167
+MD5 b274f550ccb53c3e1057c561dcfaa2a7 files/magicpoint-1.11b-mng_optional.patch 1670
+MD5 02b686f1f35a47738d8938fb0151d3d0 files/digest-magicpoint-1.11b 68
+MD5 fb8540abfe6224103b5d68b722e78119 files/magicpoint-1.11b-gentoo.diff 1412
diff --git a/app-office/magicpoint/magicpoint-1.11b.ebuild b/app-office/magicpoint/magicpoint-1.11b.ebuild
index 014ac45ec78c..e05c987b6e0a 100644
--- a/app-office/magicpoint/magicpoint-1.11b.ebuild
+++ b/app-office/magicpoint/magicpoint-1.11b.ebuild
@@ -1,26 +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/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.1 2004/10/06 11:40:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.11b.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
 
-inherit elisp-common eutils
+inherit elisp-common eutils fixheadtails
 
 DESCRIPTION="an X11 based presentation tool"
 SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/${P}.tar.gz
 	ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
-HOMEPAGE="http://www.mew.org/mgp/"
+HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
-IUSE="cjk nls m17n-lib emacs truetype gif imlib"
+KEYWORDS="x86 alpha sparc ppc amd64"
+IUSE="cjk nls m17n-lib emacs truetype gif imlib mng"
 
-DEPEND="virtual/x11
-	gif? ( >=media-libs/libungif-4.0.1 )
+MY_DEPEND="virtual/x11
+	gif? ( >=media-libs/giflib-4.0.1 )
 	imlib? ( media-libs/imlib )
 	truetype? ( virtual/xft )
 	emacs? ( virtual/emacs )
-	m17n-lib? ( dev-libs/m17n-lib )"
-RDEPEND="${DEPEND}
+	m17n-lib? ( dev-libs/m17n-lib )
+	mng? ( media-libs/libmng )"
+DEPEND="${MY_DEPEND}
+	sys-devel/autoconf"
+RDEPEND="${MY_DEPEND}
 	nls? ( sys-devel/gettext )
 	truetype? ( cjk? ( media-fonts/sazanami ) )"
 
@@ -38,18 +41,27 @@ has_emacs() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-mng_optional.patch
+
+	# bug #85720
+	sed -i -e "s/ungif/gif/g" configure.in || die
+	ht_fix_file configure.in
+	autoreconf
 }
 
 src_compile() {
 	econf \
 		$(use_enable gif) \
 		$(use_enable imlib) \
+		$(use_enable mng) \
 		$(use_enable nls locale) \
 		$(use_enable truetype xft2) \
 		$(use_with m17n-lib) \
 		--disable-vflib \
-		--disable-freetype || die
+		--disable-freetype \
+		--x-libraries=/usr/X11R6/lib \
+		--x-includes=/usr/X11R6/include || die
 
 	xmkmf || die
 	make Makefiles || die
diff --git a/app-office/magicpoint/metadata.xml b/app-office/magicpoint/metadata.xml
index 792efb24c909..d68dd5484763 100644
--- a/app-office/magicpoint/metadata.xml
+++ b/app-office/magicpoint/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+  <email>usata@gentoo.org</email>
+</maintainer>
 <longdescription>
 Magic Point is an X11 based presentation tool. It is designed to make
 simple presentations easy while to make complicated presentations
diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 689e8c353348..8b7e9ca62671 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for app-office/mdbtools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.1 2002/11/20 18:53:36 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> mdbtools-0.5.ebuild:
+  Stable on ppc64
+
+  01 Feb 2005; Markus Rothe <corsair@gentoo.org> mdbtools-0.5.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Sep 2004; <rmoss@gentoo.org> mdbtools-0.5.ebuild:
+  Adding GCC 3.4 compile fix submitted by Ed Catmur (ed@catmur.co.uk) and
+  updated for odbc support by Mihai Limbasan (mihailim@yahoo.com).
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> mdbtools-0.4.ebuild:
+  sync IUSE (+odbc)
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> mdbtools-0.5.ebuild:
+  set ppc in keywords
+
+  17 Dec 2003; Guy Martin <gmsoft@gentoo.org> mdbtools-0.5.ebuild:
+  Marked stable on hppa.
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> mdbtools-0.5.ebuild:
+  mark stable on amd64
+
+  12 Nov 2003; Jason Wever <weeve@gentoo.org> mdbtools-0.5.ebuild:
+  Marked stable on sparc.
+
+  09 Nov 2003; Jason Wever <weeve@gentoo.org> mdbtools-0.5.ebuild:
+  Added ~sparc keyword.
+
+  24 Aug 2003; Luca Barbato <lu_zero@gentoo.org> mdbtools-0.5.ebuild:
+  Marked ~ppc
+
+  27 Jun 2003; Alastair Tse <liquidx@gentoo.org> mdbtools-0.5.ebuild:
+  bumping to stable
+
+*mdbtools-0.5 (03 Jun 2003)
+
+  03 Jun 2003; Alastair Tse <liquidx@gentoo.org> mdbtools-0.5.ebuild:
+  version bump (libgda needs 0.5) and cleanups. gui protected by X useflag
+  and deps updated to gtk2/gnome2
 
 *mdbtools-0.4 (20 Nov 2002)
 
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index e69de29bb2d1..8c03d80c8c45 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -0,0 +1,7 @@
+MD5 2645a03cc95e6c55a714f5b22b3ab69b ChangeLog 1690
+MD5 656da105f920c8956b290d5b7769c170 mdbtools-0.4.ebuild 1486
+MD5 102947d45df5e57ed7ab7906d48ef08b mdbtools-0.5.ebuild 1175
+MD5 48d861b456922a79e1c3ddf47137ced9 files/digest-mdbtools-0.4 64
+MD5 402da6348fabe50879d699674f8239ea files/digest-mdbtools-0.5 64
+MD5 d056516aee83f6794540f87e15521059 files/mdbtools-0.4-termcap.diff 412
+MD5 96e88f8e3b0a2ffc9628083a8b924d71 files/mdbtools-0.5-gcc34.patch 1682
diff --git a/app-office/mdbtools/mdbtools-0.4.ebuild b/app-office/mdbtools/mdbtools-0.4.ebuild
index e120c550092d..589a5dcc7302 100644
--- a/app-office/mdbtools/mdbtools-0.4.ebuild
+++ b/app-office/mdbtools/mdbtools-0.4.ebuild
@@ -1,26 +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/app-office/mdbtools/mdbtools-0.4.ebuild,v 1.1 2002/11/20 18:53:36 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.4.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
 HOMEPAGE="http://sourceforge.net/projects/mdbtools/"
-
-S="${WORKDIR}/${P}"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL LGPL"
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="x86"
+IUSE="odbc"
 
 DEPEND=">=x11-libs/gtk+-1.2.0
 	>=sys-libs/libtermcap-compat-1.2.3
 	>=sys-devel/flex-2.5.0
 	>=sys-devel/bison-1.35
-	odbc? ( >= dev-db/unixODBC-2.0 )"
+	odbc? ( >=dev-db/unixODBC-2.0 )"
 
 src_unpack() {
-	unpack ${A} || die
+	unpack ${A}
 	cd ${S} || die
 	patch -p1 <${FILESDIR}/mdbtools-0.4-termcap.diff || die
 }
diff --git a/app-office/mdbtools/mdbtools-0.5.ebuild b/app-office/mdbtools/mdbtools-0.5.ebuild
index 57a5cc4bd2f7..3d116c40b16c 100644
--- a/app-office/mdbtools/mdbtools-0.5.ebuild
+++ b/app-office/mdbtools/mdbtools-0.5.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/app-office/mdbtools/mdbtools-0.5.ebuild,v 1.1 2003/06/03 10:06:22 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.5.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
 HOMEPAGE="http://sourceforge.net/projects/mdbtools/"
@@ -9,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 IUSE="odbc X"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc amd64 hppa alpha ppc64"
 
 DEPEND=">=dev-libs/glib-2
 	sys-libs/ncurses
@@ -21,6 +23,12 @@ DEPEND=">=dev-libs/glib-2
 		>=gnome-base/libgnomeui-2 )
 	odbc? ( >=dev-db/unixODBC-2.0 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile() {
 	local myconf
 	use odbc && myconf="${myconf} --with-unixodbc=/usr"
@@ -34,7 +42,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
-	
+
 	# add a compat symlink
 	dosym /usr/bin/gmdb2 /usr/bin/gmdb
 }
diff --git a/app-office/metadata.xml b/app-office/metadata.xml
index bb7594c71fc6..d3357c3d1ea3 100644
--- a/app-office/metadata.xml
+++ b/app-office/metadata.xml
@@ -5,5 +5,29 @@
 		The app-office category contains 'office' (word processing,
 		spreadsheets, presentation) software packages.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-office enthält Bürosoftware (Textverarbeitung,
+		Tabellenkalkulation, Präsentation).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-office contiene paquetes de oficina 
+		(procesadores de palabras, hojas de balance, presentación).
+	</longdescription>
+	<longdescription lang="ja">
+		app-officeカテゴリには「オフィス」(ワープロや表計算やプレゼンテーション)
+		と言うソフトウェアパッケージが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-office categorie bevat applicaties voor kantoorwerk, zoals text-
+		verwerkers, spreadsheets, presentatiehulpmiddelen enz.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-office chứa các ứng dụng 'văn phòng' (soạn
+		thảo văn bản, bảng tính, trình diễn).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-office contiene pacchetti per ufficio
+		(videoscrittura, fogli elettronici, presentazioni).
+	</longdescription>
 </catmetadata>
 
diff --git a/app-office/mozilla-sunbird-bin/ChangeLog b/app-office/mozilla-sunbird-bin/ChangeLog
index 5b637cd57f85..56fb323484ad 100644
--- a/app-office/mozilla-sunbird-bin/ChangeLog
+++ b/app-office/mozilla-sunbird-bin/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for app-office/mozilla-sunbird-bin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.1 2004/08/20 03:54:45 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mozilla-sunbird-bin-0.2.ebuild, mozilla-sunbird-bin-0.2.20050724.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
+
+*mozilla-sunbird-bin-0.2.20050724 (27 Jul 2005)
+
+  27 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/app-chrome.manifest-0.2.20050724,
+  +mozilla-sunbird-bin-0.2.20050724.ebuild:
+  Update to 20050724 nightly snapshot
+
+  25 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  mozilla-sunbird-bin-0.2.ebuild:
+  Require mozilla-launcher-1.44 which has the -calendar hack
+
+*mozilla-sunbird-bin-0.2 (25 Jul 2005)
+
+  25 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-sunbird-bin-0.2.ebuild, -mozilla-sunbird-bin-0.2.20040812.ebuild,
+  -mozilla-sunbird-bin-0.2.20041112.ebuild:
+  Bump to 0.2 release, which doesn't work any better for me than the previous
+  stuff, but hey maybe this pmasked package will work for somebody #75167
+  #78374 #80902 #80829
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  mozilla-sunbird-bin-0.2.20040812.ebuild,
+  mozilla-sunbird-bin-0.2.20041112.ebuild:
+  mozilla-launcher to www-client from net-www
+
+  14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mozilla-sunbird-bin-0.2.20040812.ebuild,
+  mozilla-sunbird-bin-0.2.20041112.ebuild:
+  back to amd64 from of emul-linux-x86
+
+  12 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mozilla-sunbird-bin-0.2.20040812.ebuild,
+  mozilla-sunbird-bin-0.2.20041112.ebuild:
+  migrated from amd64? to emul-linux-x86? dependency.
+
+*mozilla-sunbird-bin-0.2.20041112 (18 Nov 2004)
+
+  18 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-sunbird-bin-0.2.20041112.ebuild:
+  Update to 0.2 beta #69100
 
 *mozilla-sunbird-bin-0.2.20040812 (19 Aug 2004)
 
diff --git a/app-office/mozilla-sunbird-bin/Manifest b/app-office/mozilla-sunbird-bin/Manifest
index 1cd9f2c930ed..98c78ba0515a 100644
--- a/app-office/mozilla-sunbird-bin/Manifest
+++ b/app-office/mozilla-sunbird-bin/Manifest
@@ -1,2 +1,19 @@
-MD5 954607cb52075b52b9582cdc3bf12433 mozilla-sunbird-bin-0.2.20040812.ebuild 1811
-MD5 e0bba3fd8ec5b2e7a7894d053162e4ad files/digest-mozilla-sunbird-bin-0.2.20040812 80
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2976a36768636c85ac287550400d2472 ChangeLog 2238
+MD5 1eeffcd3ff167327159ba35f72ec0017 mozilla-sunbird-bin-0.2.ebuild 1818
+MD5 f3b96ee305fb7e3d3b082cf90f203c5a mozilla-sunbird-bin-0.2.20050724.ebuild 2032
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 19aa4d6cfb9d80bd12d521ff72517722 files/app-chrome.manifest-0.2.20050724 1288
+MD5 4b0b77beb6e9d3122c6101aa5f37b6a2 files/digest-mozilla-sunbird-bin-0.2 84
+MD5 5a39653cb1d47b96143a679acb9dfd7f files/digest-mozilla-sunbird-bin-0.2.20050724 90
+MD5 4496a3c35ce5936332ac41702c3e32f7 files/icon/mozillasunbird-bin.desktop 199
+MD5 fa424078d248f495300ecc507858beb2 files/icon/mozillasunbird-bin-icon.png 6418
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+7Toj5H05b2HAEkRApLlAKCSHaqWmXSmaehEHIgb+ozo93nCEQCeLPv8
+pl7QTRB+46jA3WtLSlNS9+s=
+=drhG
+-----END PGP SIGNATURE-----
diff --git a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20050724.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20050724.ebuild
index bfe972b8c92f..d4cc89101d5d 100644
--- a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20050724.ebuild
+++ b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20050724.ebuild
@@ -1,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-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20050724.ebuild,v 1.1 2005/07/27 16:22:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20050724.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit mozilla-launcher multilib
 
@@ -28,10 +28,12 @@ RDEPEND="virtual/x11
 
 S=${WORKDIR}/sunbird
 
-# This is a binary x86 package => ABI=x86
-# Please keep this in future versions
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-has_multilib_profile && ABI="x86"
+pkg_config() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
 
 src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/sunbird
diff --git a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild
index 7413a5434e68..dfbaba4542f1 100644
--- a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild
+++ b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-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/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild,v 1.1 2005/07/25 03:37:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
 inherit mozilla-launcher multilib
 
@@ -24,14 +24,16 @@ RDEPEND="virtual/x11
 		>=app-emulation/emul-linux-x86-baselibs-1.0
 		>=app-emulation/emul-linux-x86-gtklibs-1.0
 	)
-	>=www-client/mozilla-launcher-1.42"
+	>=www-client/mozilla-launcher-1.44"
 
 S=${WORKDIR}/sunbird
 
-# This is a binary x86 package => ABI=x86
-# Please keep this in future versions
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-has_multilib_profile && ABI="x86"
+pkg_config() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
 
 src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/sunbird
diff --git a/app-office/ooextras/ChangeLog b/app-office/ooextras/ChangeLog
index f2cd9305f062..d0ef237965e7 100644
--- a/app-office/ooextras/ChangeLog
+++ b/app-office/ooextras/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for app-office/ooextras
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ooextras/ChangeLog,v 1.1 2005/01/16 18:28:45 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooextras/ChangeLog,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ooextras-20050216.ebuild:
+  Stable on ppc.
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ooextras-20050216.ebuild:
+  Stable on sparc
+
+  30 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  ooextras-20050216.ebuild:
+  Mark stable on x86
+
+*ooextras-20050216 (05 Mar 2005)
+
+  05 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  ooextras-20031206.ebuild, +ooextras-20050216.ebuild:
+  New release with lots of new templates
+
+  20 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  ooextras-20031206.ebuild:
+  Marking stable on x86
 
 *ooextras-20031206 (16 Jan 2005)
 
diff --git a/app-office/ooextras/Manifest b/app-office/ooextras/Manifest
index fe59760a8fe7..727a5113a793 100644
--- a/app-office/ooextras/Manifest
+++ b/app-office/ooextras/Manifest
@@ -1,2 +1,4 @@
-MD5 f26648401b766f118951e7c77734a659 ooextras-20031206.ebuild 619
-MD5 65262c01ffb7b021f15aa0f7a6ac9f8e files/digest-ooextras-20031206 66
+MD5 f086e74786b85f81b0876d2f3bfa5061 ChangeLog 1007
+MD5 fe6865428a25f234ba32ffa472b9e1c3 files/digest-ooextras-20050216 67
+MD5 5ac368ff6f08c4adb0aa222ed00a3c9c metadata.xml 393
+MD5 91df64f16a3446ff4ef0ce26f0429403 ooextras-20050216.ebuild 830
diff --git a/app-office/ooextras/ooextras-20050216.ebuild b/app-office/ooextras/ooextras-20050216.ebuild
index 5c7fd9892888..6acc6c9ed106 100644
--- a/app-office/ooextras/ooextras-20050216.ebuild
+++ b/app-office/ooextras/ooextras-20050216.ebuild
@@ -1,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-office/ooextras/ooextras-20050216.ebuild,v 1.1 2005/03/05 18:17:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooextras/ooextras-20050216.ebuild,v 1.1.1.1 2005/11/30 09:59:07 chriswhite Exp $
 
 DESCRIPTION="OOExtras: Extra Templates for OpenOffice.org!"
 HOMEPAGE="http://ooextras.sourceforge.net/"
@@ -11,7 +11,7 @@ S="${WORKDIR}/downloads"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~amd64 ppc sparc"
 IUSE=""
 RDEPEND="virtual/ooo"
 DEPEND="${RDEPEND}"
diff --git a/app-office/ooodi/ChangeLog b/app-office/ooodi/ChangeLog
index 0a41ad6f085a..f9302922f389 100644
--- a/app-office/ooodi/ChangeLog
+++ b/app-office/ooodi/ChangeLog
@@ -1,9 +1,55 @@
 # ChangeLog for app-office/ooodi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ooodi/ChangeLog,v 1.1 2002/11/29 17:52:10 sethbc Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooodi/ChangeLog,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> ooodi-0.68.ebuild:
+  stable on amd64
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> ooodi-0.68.ebuild:
+  Stable on sparc
+
+  25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> ooodi-0.68.ebuild:
+  Marked ~amd64.
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> ooodi-0.68.ebuild:
+  Keyworded ~sparc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> ooodi-0.68.ebuild:
+  Masked ooodi-0.68.ebuild stable for ppc
+
+  24 May 2004; Heinrich Wendel <lanius@gentoo.org> ooodi-0.68.ebuild:
+  add dep to libglade, bug #51587
+
+  15 May 2004; Heinrich Wendel <lanius@gentoo.org> ooodi-0.68.ebuild:
+  mark stable on x86
+
+  15 Apr 2004; David Holm <dholm@gentoo.org> ooodi-0.68.ebuild:
+  Added to ~ppc.
+
+*ooodi-0.68 (14 Apr 2004)
+
+  14 Apr 2004; Heinrich Wendel <lanius@gentoo.org> metadata.xml,
+  ooodi-0.68.ebuild:
+  version bump; add metadata.xml
+
+  02 Mar 2004; <augustus@gentoo.org> ooodi-0.55.ebuild:
+  Added ~amd64 keyword.
+
+  31 Jul 2003; <paul@gentoo.org> ooodi-0.61.ebuild:
+  Mark ooodi-0.61 as broken as there are gtk issues, and the dictionary url does
+  not work
+
+*ooodi-0.61 (06 Jun 2003)
+
+  06 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> ooodi-0.61.ebuild:
+  Version bump of installer, the old version uses obsolete locations, roken list
+  of hypenation files. This concerns esp the Dutch hypenation file.
 
 *ooodi-0.55 (29 Nov 2002)
 
+  18 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Ebuild fixed/cleaned up and fix #15919.
+
   29 Nov 2002: Seth Chandler <sethbc@gentoo.org>: ooodi-0.55.ebuild
   added ooodi-0.55 to portage.  Ebuild submitted by David Holm 
   (dholm@telia.com).
diff --git a/app-office/ooodi/Manifest b/app-office/ooodi/Manifest
index e69de29bb2d1..576d119f9046 100644
--- a/app-office/ooodi/Manifest
+++ b/app-office/ooodi/Manifest
@@ -0,0 +1,6 @@
+MD5 26fa42bcc3e200cb1e006731888361e1 ChangeLog 1861
+MD5 b590f3f0a2ce3f620006995e5243fa6f metadata.xml 163
+MD5 8fc44dcc9bddefdda1333e0fac5d3e3d ooodi-0.55.ebuild 671
+MD5 81ccff52c25e787f4f78c2056f16ad54 ooodi-0.68.ebuild 698
+MD5 3b56ec8506ed8634051dc090a3916962 files/digest-ooodi-0.55 62
+MD5 46d77626c4a6f8a6885b8a7c3c06cc8b files/digest-ooodi-0.68 64
diff --git a/app-office/ooodi/ooodi-0.55.ebuild b/app-office/ooodi/ooodi-0.55.ebuild
index b704ddb70bd4..40b7c37bef6e 100644
--- a/app-office/ooodi/ooodi-0.55.ebuild
+++ b/app-office/ooodi/ooodi-0.55.ebuild
@@ -1,35 +1,28 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: David Holm <david@realityrift.com>
-# $Header: /var/cvsroot/gentoo-x86/app-office/ooodi/ooodi-0.55.ebuild,v 1.1 2002/11/29 17:52:10 sethbc Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooodi/ooodi-0.55.ebuild,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
 
-# This ebuild was generated by Ebuilder v0.4.
-
-DESCRIPTION="OOodi provides an automated dictionary installer for the OpenOffice.org word processer. It uses GTK+ for the user interface and libcurl for automated download of selected dictionaries."
-SRC_URI="http://switch.dl.sourceforge.net/sourceforge/ooodi/OOodi-0.55.tar.gz"
+MY_P="OOodi-${PV}"
+DESCRIPTION="automated dictionary installer for OpenOffice"
 HOMEPAGE="http://ooodi.sourceforge.net/"
-LICENSE="GPL-2"
+SRC_URI="mirror://sourceforge/ooodi/${MY_P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND="net-ftp/curl
-	x11-libs/gtk+"
+KEYWORDS="x86 ~amd64"
+IUSE="nls"
 
-P="OOodi-0.55"
+DEPEND="net-misc/curl
+	=x11-libs/gtk+-1*"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf `use_enable nls` || die
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
-
-
diff --git a/app-office/ooodi/ooodi-0.68.ebuild b/app-office/ooodi/ooodi-0.68.ebuild
index 91bc96138ebf..32567fe9568e 100644
--- a/app-office/ooodi/ooodi-0.68.ebuild
+++ b/app-office/ooodi/ooodi-0.68.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-office/ooodi/ooodi-0.68.ebuild,v 1.1 2004/04/14 12:55:09 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooodi/ooodi-0.68.ebuild,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
 
 MY_P="OOodi2-${PV}"
 DESCRIPTION="automated dictionary installer for OpenOffice"
@@ -9,11 +9,12 @@ SRC_URI="mirror://sourceforge/ooodi/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-x86"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="nls"
 
 DEPEND="net-misc/curl
-	=x11-libs/gtk+-2*"
+	=x11-libs/gtk+-2*
+	gnome-base/libglade"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/app-office/oooqs/ChangeLog b/app-office/oooqs/ChangeLog
index 37d47da9dafa..300ff336d9d2 100644
--- a/app-office/oooqs/ChangeLog
+++ b/app-office/oooqs/ChangeLog
@@ -1,6 +1,62 @@
 # ChangeLog for app-office/oooqs
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/ChangeLog,v 1.1 2003/02/01 00:16:06 sethbc Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/ChangeLog,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+*oooqs-2.0.3-r2 (30 Oct 2005)
+
+  30 Oct 2005; Andreas Proschofsky <suka@gentoo.org> +files/oooqs-20.patch,
+  +oooqs-2.0.3-r2.ebuild:
+  New release, with some fixes to work with OpenOffice.org 2.0.0
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org> files/fixxooo.patch:
+  Fix icons to correctly display for both openoffice and openoffice-ximian,
+  closes bug #94857
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> oooqs-2.0.3.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> oooqs-2.0.3.ebuild:
+  stable on amd64
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> oooqs-2.0.3.ebuild:
+  Stable on sparc.
+
+*oooqs-2.0.3-r1 (25 Aug 2004)
+
+  25 Aug 2004; suka@gentoo.org +files/fixxooo.patch, +oooqs-2.0.3-r1.ebuild:
+  New version: oooqs now also works with openoffice-ximian, thanks to jstubbs
+  for helping me out with the patch!
+  
+  This also closes bug #54403
+
+  25 Aug 2004; suka@gentoo.org oooqs-2.0.3.ebuild:
+  marking 2.0.3 stable on x86, add metadata.xml
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> oooqs-1.0_rc3.ebuild,
+  oooqs-2.0.2.ebuild, oooqs-2.0.3.ebuild:
+  sync IUSE (missing)
+
+  25 May 2004; David Holm <dholm@gentoo.org> oooqs-2.0.3.ebuild:
+  Added to ~ppc.
+
+  03 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> oooqs-2.0.3.ebuild:
+  Adding amd64 keyword, closing #46503.
+
+  25 Mar 2004; Jason Wever <weeve@gentoo.org> oooqs-2.0.3.ebuild:
+  Added ~sparc keyword.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> oooqs-1.0_rc3.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*oooqs-2.0.3 (13 Mar 2004)
+
+  13 Mar 2004; Markus Nigbur <pyrania@gentoo.org> oooqs-2.0.3.ebuild:
+  Version bump.
+
+*oooqs-2.0.2 (31 Oct 2003)
+
+  31 Oct 2003; Caleb Tennis <caleb@gentoo.org> oooqs-2.0.2.ebuild:
+  New version, ebuild from bug #32125
 
 *oooqs-1.0_rc3 (31 Jan 2003)
 
diff --git a/app-office/oooqs/Manifest b/app-office/oooqs/Manifest
index 03e819f576e9..b6bc44a46289 100644
--- a/app-office/oooqs/Manifest
+++ b/app-office/oooqs/Manifest
@@ -1,4 +1,10 @@
-MD5 c360d1f570edb812002e0728848e11e8 oooqs-1.0_rc3.ebuild 583
-MD5 449d296acfbfbc4a250c2951278ab97d ChangeLog 395
-MD5 259ec7b89b16f4a1b616951ebfa38ee7 files/digest-oooqs-1.0_rc3 65
-MD5 cebd3549322f47de78aba8649828f420 files/oooqs-debug.patch 683
+MD5 cbddf52718af38704b4f1de59bb0f358 ChangeLog 2170
+MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3 63
+MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3-r1 63
+MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3-r2 63
+MD5 d5a62d4399d509af355598951028ec8f files/fixxooo.patch 3350
+MD5 700208645159ca465baafc9e22eacde7 files/oooqs-20.patch 2256
+MD5 d89f6d524fdd9cce162c5959fa9fed1b metadata.xml 269
+MD5 f3855b265eefcd0fa1f90489b077cf74 oooqs-2.0.3-r1.ebuild 971
+MD5 0012fdfa31d1fa9339a7466e3d069656 oooqs-2.0.3-r2.ebuild 624
+MD5 1b4a6eb83c4267e11b9089d34206029b oooqs-2.0.3.ebuild 664
diff --git a/app-office/oooqs/files/fixxooo.patch b/app-office/oooqs/files/fixxooo.patch
index c3afe7a9d528..a1c2d609b14e 100644
--- a/app-office/oooqs/files/fixxooo.patch
+++ b/app-office/oooqs/files/fixxooo.patch
@@ -1,5 +1,6 @@
---- src/oooqs.cpp 2004-08-25 13:57:33.801575240 +0200
-+++ src/oooqs.cpp 2004-08-25 13:57:33.802575088 +0200
+diff -ru oooqs-2.0.3/src/oooqs.cpp oooqs-2.0.3-fixed/src/oooqs.cpp
+--- oooqs-2.0.3/src/oooqs.cpp	2005-06-01 20:08:30.000000000 +0300
++++ oooqs-2.0.3-fixed/src/oooqs.cpp	2005-06-01 20:07:55.000000000 +0300
 @@ -3,6 +3,7 @@
  */
  
@@ -8,7 +9,59 @@
  #include <qmap.h>
  
  #include <kaboutdata.h>
-@@ -92,9 +93,15 @@
+@@ -44,21 +45,36 @@
+ 	*/
+ 	KPopupMenu* menu = contextMenu();
+ 
+-	( new KAction( i18n( "Textdocument" ),
+-	               "ooo_writer", 0, this,
+-	               SLOT( startWriter() ), this ) ) ->plug( menu );
+-	( new KAction( i18n( "Spreadsheet" ),
+-	               "ooo_calc", 0, this,
+-	               SLOT( startCalc() ), this ) ) ->plug( menu );
+-	( new KAction( i18n( "Presentation" ),
+-	               "ooo_impress", 0, this,
+-	               SLOT( startImpress() ), this ) ) ->plug( menu );
+-	( new KAction( i18n( "Drawing" ),
+-	               "ooo_draw", 0, this,
+-	               SLOT( startDraw() ), this ) ) ->plug( menu );
+-	( new KAction( i18n( "From Template" ),
+-	               "wizard", 0, this,
+-	               SLOT( startTemplate() ), this ) ) ->plug( menu );
++	if ( QFile::exists( QDir::homeDirPath() + QDir::separator() + ".xversionrc" ) ) {
++		( new KAction( i18n( "Textdocument" ),
++		               "ximian-openoffice-writer", 0, this,
++		               SLOT( startWriter() ), this ) ) ->plug( menu );
++		( new KAction( i18n( "Spreadsheet" ),
++		               "ximian-openoffice-calc", 0, this,
++		               SLOT( startCalc() ), this ) ) ->plug( menu );
++		( new KAction( i18n( "Presentation" ),
++		               "ximian-openoffice-impress", 0, this,
++		               SLOT( startImpress() ), this ) ) ->plug( menu );
++		( new KAction( i18n( "Drawing" ),
++		               "ximian-openoffice-draw", 0, this,
++		               SLOT( startDraw() ), this ) ) ->plug( menu );
++		} else {
++		( new KAction( i18n( "Textdocument" ),
++		               "ooo_writer", 0, this,
++		               SLOT( startWriter() ), this ) ) ->plug( menu );
++		( new KAction( i18n( "Spreadsheet" ),
++		               "ooo_calc", 0, this,
++		               SLOT( startCalc() ), this ) ) ->plug( menu );
++		( new KAction( i18n( "Presentation" ),
++		               "ooo_impress", 0, this,
++		               SLOT( startImpress() ), this ) ) ->plug( menu );
++		( new KAction( i18n( "Drawing" ),
++		               "ooo_draw", 0, this,
++		               SLOT( startDraw() ), this ) ) ->plug( menu );
++		}
++		( new KAction( i18n( "From Template" ),
++		               "wizard", 0, this,
++		               SLOT( startTemplate() ), this ) ) ->plug( menu );
+ 	menu->insertSeparator();
+ 	( new KAction( i18n( "Open Document" ),
+ 	               "fileopen", 0, this,
+@@ -92,9 +108,15 @@
  	Try to autodetect settings if they aren't found in our own config.
  	*/
  	if ( _exec.length() < 2 ) {
@@ -17,13 +70,13 @@
 -		                + ".sversionrc", true );
 +		if ( QFile::exists( QDir::homeDirPath() + QDir::separator() + ".xversionrc" ) ) {
 +			oooConfig = new KSimpleConfig(
-+   			QDir::homeDirPath() + QDir::separator()
-+			+ ".xversionrc", true );
-+ 			} else {
++				QDir::homeDirPath() + QDir::separator()
++				+ ".xversionrc", true );
++			} else {
 +			oooConfig = new KSimpleConfig(
-+			QDir::homeDirPath() + QDir::separator()
-+			+ ".sversionrc", true );
-+}
++				QDir::homeDirPath() + QDir::separator()
++				+ ".sversionrc", true );
++		}
  		oooConfig->setGroup( "Versions" );
  		versions = oooConfig->entryMap( "Versions" );
  		/**
diff --git a/app-office/oooqs/oooqs-2.0.3-r1.ebuild b/app-office/oooqs/oooqs-2.0.3-r1.ebuild
index 10e3c6dabc33..66a55841d727 100644
--- a/app-office/oooqs/oooqs-2.0.3-r1.ebuild
+++ b/app-office/oooqs/oooqs-2.0.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/app-office/oooqs/oooqs-2.0.3-r1.ebuild,v 1.1 2004/08/25 15:00:35 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/oooqs-2.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 inherit kde eutils
 
diff --git a/app-office/oooqs/oooqs-2.0.3-r2.ebuild b/app-office/oooqs/oooqs-2.0.3-r2.ebuild
index a8d98b1ee38b..3be806860883 100644
--- a/app-office/oooqs/oooqs-2.0.3-r2.ebuild
+++ b/app-office/oooqs/oooqs-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/app-office/oooqs/oooqs-2.0.3-r2.ebuild,v 1.1 2005/10/30 07:13:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/oooqs-2.0.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 inherit kde eutils
 
diff --git a/app-office/oooqs/oooqs-2.0.3.ebuild b/app-office/oooqs/oooqs-2.0.3.ebuild
index 312cec30730a..fc39d55aaf9c 100644
--- a/app-office/oooqs/oooqs-2.0.3.ebuild
+++ b/app-office/oooqs/oooqs-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/oooqs-2.0.3.ebuild,v 1.1 2004/03/13 14:09:17 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/oooqs-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 inherit kde
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://segfaultskde.berlios.de/index.php"
 SRC_URI="http://download.berlios.de/segfaultskde/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc amd64 ppc"
+IUSE=""
 
 pkg_postinst()
 {
diff --git a/app-office/ooqstart-gnome/ChangeLog b/app-office/ooqstart-gnome/ChangeLog
index d81b8d5159f1..abd3fc8a9a8c 100644
--- a/app-office/ooqstart-gnome/ChangeLog
+++ b/app-office/ooqstart-gnome/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for app-office/ooqstart-gnome
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ChangeLog,v 1.1 2005/01/16 15:05:34 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ChangeLog,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
+
+*ooqstart-gnome-0.8.3-r1 (29 Oct 2005)
+
+  29 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/ooqstart-gnome-0.8.3-optflags.diff,
+  +files/ooqstart-gnome-0.8.3-options-2.0.diff,
+  +files/gnome2update-2.0.patch.bz2, +ooqstart-gnome-0.8.3-r1.ebuild:
+  Update for OpenOffice.org 2.0, hopefully the last one before we get a proper
+  solution. Patches taken from openSUSE.
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> ooqstart-gnome-0.8.3.ebuild:
+  Added to ~ppc.
+
+  03 Jun 2005; <halcyon@gentoo.org> +files/ooqstart-gnome-0.8.3-gcc4.patch,
+  ooqstart-gnome-0.8.3.ebuild:
+  Patch to fix compilation with gcc4
+
+  10 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  ooqstart-gnome-0.8.3.ebuild:
+  Mark stable on x86
+
+  09 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  ooqstart-gnome-0.8.3.ebuild:
+  added ~amd64
 
   16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/gnome-ooqstart.png, +files/gnome2update.patch:
diff --git a/app-office/ooqstart-gnome/Manifest b/app-office/ooqstart-gnome/Manifest
index 7239b9247e32..de3955b9b996 100644
--- a/app-office/ooqstart-gnome/Manifest
+++ b/app-office/ooqstart-gnome/Manifest
@@ -1,3 +1,12 @@
-MD5 b4d1c233221a2da6ead0617ba04b7b9f ooqstart-gnome-0.8.3.ebuild 963
-MD5 9417f9daf23a906d29a86e26310791c4 files/gnome2update.patch 38538
+MD5 6829ba1df4aa50c6564e6e12373f5a43 ChangeLog 1239
 MD5 d262aad066c0dd58486d7a8a095b598d files/digest-ooqstart-gnome-0.8.3 62
+MD5 d262aad066c0dd58486d7a8a095b598d files/digest-ooqstart-gnome-0.8.3-r1 62
+MD5 b8e5e4d8a4016a754ab52481fc66a00d files/gnome-ooqstart.png 3962
+MD5 aec87f5e26fbdbbedd42473dbbdf228c files/gnome2update-2.0.patch.bz2 8007
+MD5 6e3446ddec68a391cd1f63851e4942c6 files/gnome2update.patch.bz2 8004
+MD5 d44da1879b15d8fd3f96d3cbfd54d0d1 files/ooqstart-gnome-0.8.3-gcc4.patch 350
+MD5 22042fb74e51648408c4c53d3e7bff1b files/ooqstart-gnome-0.8.3-optflags.diff 852
+MD5 a5ea839758de85725f08a887a5fe5ea1 files/ooqstart-gnome-0.8.3-options-2.0.diff 938
+MD5 6e27642eb774b668fe48a47e475f2495 metadata.xml 400
+MD5 73f3a3d398ef7132e5fc68b318852946 ooqstart-gnome-0.8.3-r1.ebuild 1190
+MD5 6db62b4aff56a6bb7a2d976611e76ac2 ooqstart-gnome-0.8.3.ebuild 1114
diff --git a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild
index b6528bf52f2d..f8d3d56aeba0 100644
--- a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild
+++ b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.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/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild,v 1.1 2005/10/29 22:20:37 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild
index 489a303e3f56..e1d10b02204c 100644
--- a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild
+++ b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.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/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild,v 1.1 2005/01/16 15:05:34 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
-inherit gnome2 eutils
+inherit eutils
 
 DESCRIPTION="OpenOffice.org Quickstarter Applet for Gnome 2.x"
 HOMEPAGE="http://ooqstart.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ooqstart/ooqstart-${PV}.tgz"
-S=${WORKDIR}/ooqstart-${PV}
+MY_P="ooqstart-${PV}"
+SRC_URI="mirror://sourceforge/ooqstart/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 SLOT="0"
 
@@ -26,11 +27,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/gnome2update.patch
-}
-
-src_compile() {
-	make DESTDIR=${D} || die "make failed"
+	epatch ${FILESDIR}/gnome2update.patch.bz2
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_install() {
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 06bb23cc3c98..782bb66ab44d 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,517 @@
 # ChangeLog for app-office/openoffice-bin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.1 2002/04/20 21:59:14 azarah Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
+
+  29 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.0.0.ebuild:
+  Finally mark stable on x86
+
+  22 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.0.0.ebuild:
+  Postinstall fix for PaX
+
+  21 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.0.0.ebuild:
+  We really should depend on sys-libs/glibc instead of virtual/libc
+
+  29 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.0.0.ebuild:
+  Some reorganizations to be more in-line with the source-based build, further
+  cleanups include the mime and icon stuff. This also removes the need for the
+  "kde" use-flag. Don't fear, this doesn't remove kde-integration, the use-flag
+  was only used for mime type stuff.
+
+  23 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.0.0.ebuild:
+  Add russian translation, closes bug #110251
+
+*openoffice-bin-2.0.0 (20 Oct 2005)
+
+  20 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-2.0.0.ebuild:
+  OpenOffice.org 2.0, finally. Time to celebrate.
+
+*openoffice-bin-2.0.0_rc3 (15 Oct 2005)
+
+  15 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-2.0.0_rc3.ebuild:
+  New and hopefully final release candidate
+
+  12 Oct 2005; Andreas Proschofsky <suka@gentoo.org> ChangeLog:
+  Add missing mozilla dependency.
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  -files/1.1.1/ooffice-wrapper-1.3, -openoffice-bin-1.1.1.ebuild:
+  Remove the ancient openoffice-bin 1.1.1 as it has security issues and the
+  ppc-herd prefers to have it removed, see bug #97907
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org> ChangeLog:
+  Another shot at the icon dir permission problem
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.0.0_rc2.ebuild:
+  Fix user install dir to be in-line with the source based ebuild
+
+  08 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/ooo-wrapper2, openoffice-bin-2.0.0_rc2.ebuild:
+  clean up wrapper
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  openoffice-bin-2.0.0_rc1.ebuild:
+  add forgotten has_multilib_profile in front of ABI=x86
+
+*openoffice-bin-2.0.0_rc2 (08 Oct 2005)
+
+  08 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-2.0.0_rc2.ebuild:
+  New Release Candidate, most language packs are still rc1 as no new ones have
+  been provided, fixed a few bugs and backed out AMD64 changes as they break
+  x86
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  openoffice-bin-2.0.0_rc1.ebuild:
+  fix bug 107568
+
+*openoffice-bin-2.0.0_rc1 (27 Sep 2005)
+
+  27 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/ooo-wrapper2, +openoffice-bin-2.0.0_rc1.ebuild:
+  First Release Candidate for OpenOffice.org 2.0! Don't let yourself be fooled
+  by the About box this is NOT (yet) the final release. This release also adds
+  back all the missing language packs of the last release and even a few more,
+  so now the ebuild supports 50 different LINGUAS settings.
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.5.ebuild, openoffice-bin-1.9.130.ebuild:
+  Getting rid of the old mimetype stuff which causes broken behaviour for kde,
+  see bug #92767
+
+  22 Sep 2005; Luis Medinas <metalgod@gentoo.org>
+  openoffice-bin-1.1.5.ebuild:
+  Marked Stable on amd64.
+
+*openoffice-bin-1.9.130 (18 Sep 2005)
+
+  18 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.130.ebuild:
+  New beta-release for OOo 2.0, unfortunately a bunch more translations
+  missing, as upstream did not provide language packs, on the other hands a
+  few other have been added (from the "unofficial" translations)
+
+  18 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.5.ebuild:
+  Marking stable on x86
+
+*openoffice-bin-1.1.5 (14 Sep 2005)
+
+  14 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/ooffice-wrapper-1.3, +openoffice-bin-1.1.5.ebuild:
+  Version bump
+
+  14 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.128.ebuild:
+  fix variable declaration, see bug #105618
+
+  10 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.128.ebuild:
+  Fix startup problems on non-java systems, see bug #99366
+
+  10 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.128.ebuild:
+  Work around some icon dir weirdness for bug #99366
+
+*openoffice-bin-1.9.128 (09 Sep 2005)
+
+  09 Sep 2005; Andreas Proschofsky <suka@gentoo.org> files/1.9/ooo-wrapper2,
+  -openoffice-bin-1.9.122.ebuild, +openoffice-bin-1.9.128.ebuild:
+  New development release, pt_BR localization unfortunately missing, as it
+  wasn't provide by upstream. Also this marks the change of the install dir to
+  /usr/lib/openoffice
+
+  23 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.4-r1.ebuild:
+  Correct cp -a to cp -pPR for bug #103487
+
+*openoffice-bin-1.9.122 (03 Aug 2005)
+
+  03 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.122.ebuild:
+  New testing release, ebuild simplified a bit, thanks to some saner packaging
+  on behalf of the OOo-people
+
+*openoffice-bin-1.9.118 (21 Jul 2005)
+
+  21 Jul 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.118.ebuild:
+  New testing release
+
+*openoffice-bin-1.9.109 (16 Jun 2005)
+
+  16 Jun 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.9/ooo-wrapper2, +openoffice-bin-1.9.109.ebuild:
+  New beta version of OOo 2.0. This uses a new wrapper, also adds two new
+  languages (hr and lt) plus some minor fixes and the user install dir
+  has changed.
+
+  05 Jun 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.104.ebuild:
+  Make the LINGUAS-stuff a little bit smarter to not break en_GB, closes bug
+  #93826
+
+  21 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.104.ebuild:
+  Missed two new rpms, which breaks stuff for some. Fixed. Install 
+  changing all the time is really anoying.
+
+*openoffice-bin-1.9.104 (20 May 2005)
+
+  20 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.104.ebuild:
+  New beta release, some modifications to the ebuild as the language pack
+  format has changed. Again.
+
+*openoffice-bin-1.9.95 (23 Apr 2005)
+
+  23 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.95.ebuild:
+  Another new development release, this also now includes a fix for the recent
+  security problem
+
+  20 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.93.ebuild:
+  fixed certain language installations
+
+*openoffice-bin-1.9.93 (15 Apr 2005)
+
+  15 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.93.ebuild:
+  New prerelease of OOo 2.0, this still has no fix for the security bug
+  #88863, so use with care
+
+  13 Apr 2005; Homer Parker <hparker@gentoo.org>
+  openoffice-bin-1.1.4-r1.ebuild:
+  Mark stable for bug #88863
+
+  12 Apr 2005; Olivier Crête <tester@gentoo.org>
+  openoffice-bin-1.1.4-r1.ebuild:
+  Stable on x86 per security bug #88863
+
+*openoffice-bin-1.1.4-r1 (12 Apr 2005)
+
+  12 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.1.4-r1.ebuild:
+  revision bump for security fix, see bug #88863
+
+*openoffice-bin-1.9.91-r2 (10 Apr 2005)
+
+  10 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.91-r2.ebuild:
+  Another revision, which adds some 20 new unofficial translations, also this
+  uses another translation for german, which was borked in -r1
+
+  09 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.91-r1.ebuild:
+  remove addpredicts to make genstef happy ;)
+
+*openoffice-bin-1.9.91-r1 (08 Apr 2005)
+
+  09 Apr 2005; Brian Harring <ferringb@gentoo.org> openoffice-bin-1.9.91-r1.ebuild:
+  s:/usr/portage/distfiles/:${DISTDIR}:g , bug 88452
+
+  08 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.91-r1.ebuild:
+  New revision, adds LINGUAS support! Additional language packs will be
+  downloaded and installed if your LINGUAS settings are set correctly.
+
+  Closes bug #44944 and lots of other longstanding bugs.
+
+*openoffice-bin-1.9.91 (08 Apr 2005)
+
+  08 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-bin-1.9.91.ebuild:
+  New beta release of OOo 2.0
+
+  31 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.87.ebuild:
+  Fix to make the KDE mime system happy
+
+*openoffice-bin-1.9.87 (30 Mar 2005)
+
+  30 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.9/ooffice-wrapper-1.9, +openoffice-bin-1.9.87.ebuild:
+  First pre-release of OpenOffice.org 2.0. Please remember:
+  
+  *) This is a pre-release so expect breakage, its use is totally at your own
+  risk
+  
+  *) The ebuild is not finished, but should generally work, just don't expect
+  a "smooth" upgrade path for your user install to future versions
+  
+  Other than that: Enjoy!
+
+  30 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3, openoffice-bin-1.1.4.ebuild:
+  Simplify menu entry installation, see bug #81902, also fix problem with
+  newer findutils, bug#86974
+
+  24 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3:
+  Add check for mounted /proc to wrapper, OOo will fail without it
+
+  24 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3:
+  Remove unused UPDATEFLAG from wrapper
+
+  23 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3:
+  Fix for wrapper-file to automatically find all fonts in /usr/share/fonts,
+  also remove some unneeded stuff
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.4.ebuild:
+  Some ebuild and dependency cleanups
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.4.ebuild:
+  Clean up dependencies, also don't hard-depend on java anymore, as it is not
+  needed, close the ancien bug #32315
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.4.ebuild:
+  Prevent OOo from double installing menu entries, closes bug #53752
+
+  14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.3.ebuild,
+  openoffice-bin-1.1.4.ebuild:
+  back to amd64 from of emul-linux-x86
+
+  12 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.3.ebuild,
+  openoffice-bin-1.1.4.ebuild:
+  migrated from amd64? to emul-linux-x86? dependency.
+
+  12 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.4.ebuild:
+  Mark 1.1.4 stable on x86
+
+*openoffice-bin-1.1.4 (23 Dec 2004)
+
+  23 Dec 2004; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/ooffice-wrapper-1.3, +openoffice-bin-1.1.4.ebuild:
+  New release, wrapper updated for smooth transition
+
+  12 Nov 2004; suka@gentoo.org openoffice-bin-1.1.1.ebuild,
+  openoffice-bin-1.1.3.ebuild:
+  Fix ewarn messages, closes bug #70850
+
+  12 Oct 2004; suka@gentoo.org openoffice-bin-1.1.3.ebuild:
+  mark stable on x86 for bug #63556
+
+  10 Oct 2004; Simon Stelling <blubb@gentoo.org>
+  openoffice-bin-1.1.3.ebuild:
+  stable on amd64 for bug #63556
+
+*openoffice-bin-1.1.3 (02 Oct 2004)
+
+  02 Oct 2004; suka@gentoo.org +files/1.1.3/ooffice-wrapper-1.3,
+  +openoffice-bin-1.1.3.ebuild:
+  Version bump. Masked for now, will unmask after the official release
+  announcement
+
+  19 Sep 2004; Travis Tilley <lv@gentoo.org> openoffice-bin-1.1.2.ebuild:
+  stable on amd64
+
+  20 Aug 2004; suka@gentoo.org openoffice-bin-1.1.2.ebuild:
+  fixing some sandbox issues and marking stable on x86, at last
+
+  30 Jun 2004; <augustus@gentoo.org> openoffice-bin-1.1.2.ebuild:
+  Added ~amd64 keyword. Bug 55743.
+
+*openoffice-bin-1.1.2 (17 Jun 2004)
+
+  17 Jun 2004; suka@gentoo.org +files/1.1.2/ooffice-wrapper-1.3,
+  +openoffice-bin-1.1.2.ebuild:
+  New version, user install migration from 1.1.1 should work fine this time
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-bin-1.0.3.1.ebuild, openoffice-bin-1.1.0.ebuild,
+  openoffice-bin-1.1.1.ebuild:
+  Fix use invocation
+
+  11 May 2004; Travis Tilley <lv@gentoo.org> openoffice-bin-1.1.1.ebuild:
+  added back in amd64 support and added ~amd64 keyword
+
+  04 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> openoffice-bin-1.1.1.ebuild:
+  Made ebuild ppc compatible
+
+  01 Apr 2004; suka@gentoo.org openoffice-bin-1.1.1.ebuild,
+  files/1.1.1/ooffice-wrapper-1.3:
+  User settings migration does not work as there have been some changes to the
+  user install :-( Removing the migration stuff, you will have to redo your
+  settings after upgrading
+
+*openoffice-bin-1.1.1 (30 Mar 2004)
+
+  30 Mar 2004; suka@gentoo.org openoffice-bin-1.1.1.ebuild,
+  files/1.1.1/ooffice-wrapper-1.3:
+  New version, masked for now to do some further testing
+
+  24 Jan 2004; suka <suka@gentoo.org> openoffice-bin-1.1.0.ebuild:
+  Just some cleanups to the ebuild
+
+  24 Jan 2004; suka <suka@gentoo.org> openoffice-bin-1.0.3.ebuild,
+  openoffice-bin-1.1_rc4.ebuild, files/ooffice-wrapper-1.3:
+  Removing some old versions
+
+  17 Jan 2004; <suka@gentoo.org> openoffice-bin-1.1.0.ebuild:
+  Bug fixes for install and desktop entries (bug #32418)
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> openoffice-bin-1.1.0.ebuild:
+  let openoffice-bin install on amd64 using compat libs
+
+  07 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-bin-1.1.0.ebuild:
+  Add a predict for /root/.gconfd to the ebuild, just like in the from-source
+  version
+
+  04 Nov 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1.0.ebuild:
+  Stable on x86
+
+*openoffice-bin-1.1.0 (05 Oct 2003)
+
+  05 Oct 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1.0.ebuild,
+  files/1.1.0/ooffice-wrapper-1.3:
+  Bump to 1.1.0 final release version.
+
+*openoffice-bin-1.1_rc4 (15 Sep 2003)
+
+  15 Sep 2003; Brandon Low <lostlogic@gentoo.org>
+  openoffice-bin-1.1_rc4.ebuild, files/ooffice-wrapper-1.3:
+  Bump to rc4, note ppc users, this is -ppc masked, and there is _no_ ppc src
+  for this version.
+
+*openoffice-bin-1.1_rc3 (17 Aug 2003)
+
+  04 Aug 2003; Brad Laue <brad@gentoo.org> files/1.1_rc2/ooffice-wrapper-1.3:
+  Copy ooffice-wrapper over from app-office/openoffice, as it will properly
+  launch OpenOffice when only the minor or RC revision has changed.
+
+*openoffice-bin-1.1_rc2 (02 Aug 2003)
+
+  02 Aug 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1_rc2.ebuild,
+  files/1.1_rc2/ooffice-wrapper-1.3:
+  Add 1.1_rc2
+
+*openoffice-bin-1.1_rc1 (24 Jul 2003)
+
+  31 Jul 2003; Todd Heim <heim@gentoo.org> Manifest openoffice-bin-1.1_beta2-r1.ebuild openoffice-bin-1.1_rc1.ebuild files/digest-openoffice-bin-1.1_beta2-r1 files/digest-openoffice-bin-1.1_rc1 :
+  fixed URL's for ppc binaries; installer dies with glibc errors.
+
+  24 Jul 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1_rc1.ebuild,
+  files/1.1_rc1/ooffice-wrapper-1.3:
+  Add openoffice-bin 1.1_rc1; presently x86 only
+
+  30 Jun 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1_beta2-r1.ebuild:
+  Add ooweb symlink
+
+*openoffice-bin-1.1_beta2-r1 (30 Jun 2003)
+
+  30 Jun 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1_beta2-r1.ebuild:
+  Correct an issue where KDE menu items show up twice - directory name changed
+  on us.
+
+  20 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.1_beta2.ebuild, files/1.1_beta2/ooffice-wrapper-1.3:
+  Fix some errors concerning the versions
+
+  19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.1_beta-r1.ebuild, openoffice-bin-1.1_beta2.ebuild:
+  Make sure that the timestamps of files are updated so the files are not
+  removed when portage believes it are old files:#22593
+
+*openoffice-bin-1.1_beta2 (19 Jun 2003)
+
+  19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.1_beta2.ebuild:
+  Add openoffice 1.1beta2 and fix the scripts (taken from the source version).
+  This fixes a number of bugs: #19797 #22872
+
+*openoffice-bin-1.0.3.1 (08 Jun 2003)
+
+  08 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.0.3.1.ebuild:
+  Make a new ebuild with the printing fixed. It uses a patch as the difference
+  is only in one file, and having users download oo anew would be overdoing.
+
+*openoffice-bin-1.1_beta-r1 (08 Jun 2003)
+
+  08 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-bin-1.1_beta-r1.ebuild:
+  Fix installation of kde menu items. This fixes bug #20428.
+
+*openoffice-bin-1.0.3 (Apr 07 2003)
+
+  26 Jul 2003; Todd Heim <heim@gentoo.org> Manifest openoffice-bin-1.0.3.ebuild files/digest-openoffice-bin-1.0.3 :
+  fixed url for ppc binary, changed to ~ppc
+  07 Apr 2003; Seth Chandler <sethbc@gentoo.org>; openoffice-bin-1.0.3.ebuild:
+  added 1.0.3 to portage, but printing is broken, there should be a fix out 
+  shortly
+
+*openoffice-bin-1.1_Beta (Apr 03 2003)
+  03 Apr 2003; Seth Chandler <sethbc@gentoo.org>; openoffice-bin-1.1_beta.ebuild:
+  added 1.1_beta to portage, there are still a LOT of issues with 1.1_beta
+  some with the software itself, others with the ebuild, i'm working on them
+
+*openoffice-bin-1.0.2 (Jan 29 2003)
+
+  19 Mar 2003; Seth Chandler <sethbc@gentoo.org>; openoffice-bin-1.0.2.ebuild:
+  some wrapper work plus a symlink fix
+
+  27 Jan 2003; Mark Guertin <gerk@gentoo.org> openoffice-bin-1.0.2.ebuild :
+  Fixed MY_PV for installation path issue on PPC and added ppc digest.  Tested
+  and set to ~ppc.  Was no initial ChangeLog entry for this ebuild.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*openoffice-bin-1.0.1 (15 Sep 2002)
+  05 Dec 2002; Seth Chandler <sethbc@gentoo.org> openoffice-bin-1.0.1.ebuild :
+  Add "addpredict" 's to fix sandbox issues; closes bug 8063.
+
+*openoffice-bin-1.0.1 (15 Sep 2002)
+  1 Oct 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-bin-1.0.1.ebuild :
+  Add "addpredict" 's to fix sandbox issues; closes bug 8587.
+
+  24 Sep 2002; Owen Stampflee <owen@gentoo.org> openoffice-bin-1.0.1.ebuild :
+  Extend ebuild to include support for the PPC version of OpenOffice-bin.
+
+  15 Sep 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-bin-1.0.1.ebuild :
+  New version.  Cleanups.  Install the Menu shortcuts.
+
+*openoffice-bin-1.0.0-r3 (9 Sep 2002)
+
+  9 Sep 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-bin-1.0.0-r3.ebuild :
+  Get a src_install() that actually should work properl (tm).
+
+*openoffice-bin-1.0.0-r2 (15 Jul 2002)
+
+  15 Jul 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-bin-1.0.0-r2.ebuild :
+  Fix the registry for 1.0.
+
+  06 Aug 2002; Preston A. Elder <prez@gentoo.org> :
+  Fixed read_ins.pl to be able make all DONT_DELETE directories
+  explicitly, and to put quotes around most references, as some
+  contain a directory name with spaces.
+
+*openoffice-bin-1.0.0-r1 (12 May 2002)
+
+  12 May 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-bin-1.0.0-r1.ebuild :
+
+  Move the registry to ibiblio again, as it is a bit too big.
+
+*openoffice-bin-1.0.0 (10 May 2002)
+
+  10 May 2002; Preston Elder <prez@gentoo.org> openoffice-bin-1.0.0.ebuild :
+
+  Added v1.0, submitted by Michael M Nazaroff <naz@themoonsofjupiter.net>
 
 *openoffice-bin-641d (20 Apr 2002)
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 25d7a7a07d67..3e57ade5b9d0 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,18 +1,8 @@
-MD5 5f51c534950d6335529dd78c3895a08f openoffice-bin-1.0.2.ebuild 6149
-MD5 b221cf945d38e9e31215107f8d084063 openoffice-bin-1.0.1.ebuild 5603
-MD5 386b573b3398aaa0d6022495a21c6bd2 openoffice-bin-1.1_beta.ebuild 5937
-MD5 5f51c534950d6335529dd78c3895a08f openoffice-bin-1.0.3.ebuild 6149
-MD5 583bb2a3fcf66696f1c3c389874b82c9 openoffice-bin-1.0.0-r3.ebuild 2912
-MD5 d67186fbafba4cb628127208f37e9a92 ChangeLog 2852
-MD5 9f6fa2caffbec422160157fb68966b37 files/digest-openoffice-bin-1.0.0-r3 82
-MD5 7339447c6b75b9d8cad638a824041ba5 files/digest-openoffice-bin-1.1_beta 84
-MD5 9f9a6ba9924997dd5a42c2b374ea6aa8 files/digest-openoffice-bin-1.0.1 165
-MD5 6bb2dccd6a53a5457be6670d628c77d3 files/digest-openoffice-bin-1.0.2 168
-MD5 e345ca755fa551b18c20129ebb7da224 files/digest-openoffice-bin-1.0.3 82
-MD5 5a94d8a00337486aa37f121370c18eba files/1.1_beta/ooffice-wrapper-1.2 8223
-MD5 31dc859e113fcefc3b4aaaab55d54bb9 files/1.0.0/read_ins.pl 9753
-MD5 5ec13ed7c68a3af10ef7d74bf104fb3d files/1.0.0/regcomp-1.0.0.tbz2 11185
-MD5 92e731a066e45536e55b07894f18096c files/1.0.1/ooffice-wrapper-1.1 7460
-MD5 9d58d18cf68c1b88732eeae0c52767da files/1.0.1/ooffice-wrapper 7406
-MD5 92e731a066e45536e55b07894f18096c files/1.0.2/ooffice-wrapper-1.1 7460
-MD5 271539dafab707398e9b806eef8f250a files/1.0.2/ooffice-wrapper-1.2 8220
+MD5 be72a02d285bc05e13246fec51df05bf ChangeLog 19651
+MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
+MD5 2919847c6afebe7fd157c48e78fb5770 files/2.0.0/ooo-wrapper2 3703
+MD5 5828bbd9e0139dae2ff43c23a65a844b files/digest-openoffice-bin-1.1.5 82
+MD5 72776dcacfb2853f6056793f531d7986 files/digest-openoffice-bin-2.0.0 4709
+MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
+MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718
+MD5 202d0c8998f71a7448550ba373cdfa7c openoffice-bin-2.0.0.ebuild 6873
diff --git a/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2 b/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2
index 8222add9ae93..e67fd85a5843 100755
--- a/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2
+++ b/app-office/openoffice-bin/files/2.0.0/ooo-wrapper2
@@ -25,27 +25,16 @@ use IO::Handle;
 use Fcntl ':flock';
 
 my $Debug = $ENV{OOO_DEBUG};
-my $DebugRH = $ENV{OOO_RH_DEBUG};
 
-# Define the vendor of this particular OOo pacakge
+# Define the vendor of this particular OOo package
 my $VendorName = 'Gentoo';
 # Define system installation directory
 # Autoconf totally sucks for @libdir@ type substitution
-my $SystemInstallDir = '/usr/lib/openoffice';
+my $SystemInstallDir = 'INSTDIR';
 # Suffix for parallel installable versioning
 my $BinSuffix = '2';
 # ooo-build version
 my $OOO_BUILDVERSION = 'PV';
-# Debugging
-
-if ( $DebugRH ) {
-	$Debug = 1;
-	$VendorName = "RedHat";
-}
-if ($Debug && $BinSuffix =~ /^\@/) {
-    $SystemInstallDir = "/usr/lib/ooo-1.9";
-    $BinSuffix = '1.9';
-}
 
 #=============================================================================
 # Main
@@ -64,7 +53,7 @@ while ($ARGV[0]) {
 	(defined $widgets_set) || die "Error: The option --widgets-set requires a value\n" .
 	                            "For example: --widgets-set gtk\n";
     } elsif (m/^--version/) {
-	print "This is OpenOffice.org built with ooo-build-$OOO_BUILDVERSION\n";
+	print "This is OpenOffice.org $OOO_BUILDVERSION\n";
 	exit 0;
     } else {
         push @ooo_argv, $_;
@@ -102,7 +91,7 @@ if ($session_quickstart) {
 # FIXME: the following two fixes should be done by OOo itself
 # create the user config directory  with safe rights 700 if it we find
 # the right path and the directory does not exist
-if (open BOOTSTRAPRC, "/usr/lib/openoffice/program/bootstraprc") {
+if (open BOOTSTRAPRC, "$SystemInstallDir/program/bootstraprc") {
     while (my $line = <BOOTSTRAPRC>) {
 	chomp $line;
     	if (($line =~ m/^\s*UserInstallation\s*=\s*([^\s]*)\s*$/) && ($1)) {
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-2.0.0 b/app-office/openoffice-bin/files/digest-openoffice-bin-2.0.0
index f77dc25d10bf..6d840c86d4a5 100644
--- a/app-office/openoffice-bin/files/digest-openoffice-bin-2.0.0
+++ b/app-office/openoffice-bin/files/digest-openoffice-bin-2.0.0
@@ -22,6 +22,7 @@ MD5 453a79de1d517d4980bc9e8c401f0418 OOo_2.0.0rc2_051005_LinuxIntel_langpack_nn.
 MD5 0edf453a43b65ed77e7403cf117fa633 OOo_2.0.0rc2_051005_LinuxIntel_langpack_pa-IN.tar.gz 13365947
 MD5 3c280f1474b42b9395d08870d54eced1 OOo_2.0.0rc2_051005_LinuxIntel_langpack_pl.tar.gz 13630834
 MD5 2ccd6396330ab28efd592ec900a8b00f OOo_2.0.0rc2_051005_LinuxIntel_langpack_pt-BR.tar.gz 14098232
+MD5 bfc5dc1ce032aede7e0500375fc37577 OOo_2.0.0rc2_051005_LinuxIntel_langpack_ru.tar.gz 14703980
 MD5 4cc2f3d419b1bbe3aabe888dadc89e9c OOo_2.0.0rc2_051005_LinuxIntel_langpack_rw.tar.gz 13637426
 MD5 1ba901ab46483ed3278c1c97f4c78a4d OOo_2.0.0rc2_051005_LinuxIntel_langpack_sh-YU.tar.gz 13324346
 MD5 d13d5077b3285ecce886fe2f4728f090 OOo_2.0.0rc2_051005_LinuxIntel_langpack_sk.tar.gz 13869339
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild
index eab3bb17a4d1..d5edb2ed8071 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-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/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild,v 1.1 2005/09/14 17:32:02 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.5.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -8,7 +8,7 @@
 
 inherit eutils fdo-mime
 
-IUSE="java kde"
+IUSE="java"
 
 INSTDIR="/opt/OpenOffice.org"
 MY_P="OOo_${PV}_LinuxIntel_install"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 
 RDEPEND="!app-office/openoffice
 	virtual/x11
@@ -116,8 +116,6 @@ src_install() {
 	dodir /usr/share
 	cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-	use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
-
 	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
 		# We have to handle soffice and setup differently
 		sed -i -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
diff --git a/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild b/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild
index 803bd780897b..9f8404f201dc 100644
--- a/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.0.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/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild,v 1.1 2005/10/20 13:29:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 inherit eutils fdo-mime rpm multilib
 
-IUSE="gnome java kde"
+IUSE="gnome java"
 
 MY_PV="${PV}rc2"
 MY_PV2="${MY_PV}_051005"
@@ -52,6 +52,7 @@ SRC_URI="mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.tar.gz
 	linguas_pa_IN? ( ${LANGPACKPATH}_pa-IN.tar.gz )
 	linguas_pl? ( ${LANGPACKPATH}_pl.tar.gz )
 	linguas_pt_BR? ( ${LANGPACKPATH}_pt-BR.tar.gz )
+	linguas_ru? ( ${LANGPACKPATH}_ru.tar.gz )
 	linguas_rw? ( ${LANGPACKPATH}_rw.tar.gz )
 	linguas_sh_YU? ( ${LANGPACKPATH}_sh-YU.tar.gz )
 	linguas_sk? ( ${LANGPACKPATH}_sk.tar.gz )
@@ -71,11 +72,11 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 RDEPEND="!app-office/openoffice
 	virtual/x11
-	virtual/libc
+	sys-libs/glibc
 	>=dev-lang/perl-5.0
 	app-arch/zip
 	app-arch/unzip
@@ -99,12 +100,11 @@ src_unpack() {
 	done
 
 	rpm_unpack ${S}/desktop-integration/openoffice.org-freedesktop-menus-${PV}-3.noarch.rpm
-	use kde && rpm_unpack ${S}/desktop-integration/openoffice.org-suse-menus-${PV}-3.noarch.rpm
 
 	use gnome && rpm_unpack ${S}/openoffice.org-gnome-integration-${PV}-3.i586.rpm
 	use java && rpm_unpack ${S}/openoffice.org-javafilter-${PV}-3.i586.rpm
 
-	strip-linguas en af be_BY bg bn br ca cs cy da de el en_GB es et fi fr ga gu_IN hr hu it ja km ko lt lv mk nb ne nl nn ns pa_IN pl pt_BR rw sh_YU sk sl sr_CS sv sw_TZ tn tr vi xh zh_CN zh_TW zu
+	strip-linguas en af be_BY bg bn br ca cs cy da de el en_GB es et fi fr ga gu_IN hr hu it ja km ko lt lv mk nb ne nl nn ns pa_IN pl pt_BR ru rw sh_YU sk sl sr_CS sv sw_TZ tn tr vi xh zh_CN zh_TW zu
 
 	for i in ${LINGUAS}; do
 		i="${i/_/-}"
@@ -125,24 +125,24 @@ src_install () {
 
 	einfo "Installing OpenOffice.org into build root..."
 	dodir ${INSTDIR}
-	dodir /usr/share/icons
-	dodir /usr/share/mime
 	mv ${WORKDIR}/opt/openoffice.org2.0/* ${D}${INSTDIR}
-	mv ${WORKDIR}/usr/share/icons/* ${D}/usr/share/icons
 
-	use kde && dodir /usr/share/mimelnk/application && mv ${WORKDIR}/opt/kde3/share/mimelnk/application/* ${D}/usr/share/mimelnk/application
-
-	#Menu entries
+	#Menu entries, icons and mime-types
 	cd ${D}${INSTDIR}/share/xdg/
-
 	sed -i -e s/'Exec=openoffice.org-2.0-printeradmin'/'Exec=oopadmin2'/g printeradmin.desktop || die
 
-	for desk in base calc draw impress math writer printeradmin; do
+	for desk in base calc draw impress math printeradmin writer; do
 		mv ${desk}.desktop openoffice.org-2.0-${desk}.desktop
 		sed -i -e s/openoffice.org-2.0/ooffice2/g openoffice.org-2.0-${desk}.desktop || die
+		sed -i -e s/openofficeorg-20-${desk}/ooo-${desk}2/g openoffice.org-2.0-${desk}.desktop || die
 		domenu openoffice.org-2.0-${desk}.desktop
+		insinto /usr/share/pixmaps
+		newins ${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg-20-${desk}.png ooo-${desk}2.png
 	done
 
+	insinto /usr/share/mime/packages
+	doins ${WORKDIR}/usr/share/mime/packages/openoffice.org.xml
+
 	# Install wrapper script
 	newbin ${FILESDIR}/${PV}/ooo-wrapper2 ooffice2
 	sed -i -e s/PV/${PV}/g ${D}/usr/bin/ooffice2 || die
@@ -158,17 +158,8 @@ src_install () {
 	# Change user install dir
 	sed -i -e s/.openoffice.org2/.ooo-2.0/g ${D}${INSTDIR}/program/bootstraprc || die
 
-	# Fixing some icon dir permissions
-	chmod 755 -R ${D}/usr/share/icons/ || die
-
-	# Icon symlinks for gnome
-	dodir /usr/share/pixmaps
-	for app in base calc draw impress math printeradmin writer; do
-		dosym /usr/share/icons/gnome/32x32/apps/openofficeorg-20-${app}.png /usr/share/pixmaps/openofficeorg-20-${app}.png
-	done
-
 	# Non-java weirdness see bug #99366
-	use java || rm -f ${D}${INSTDIR}/program/javaldx
+	use !java && rm -f ${D}${INSTDIR}/program/javaldx
 }
 
 pkg_postinst() {
@@ -176,6 +167,8 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 
+	[ -x /sbin/chpax ] && [ -e /usr/lib/openoffice/program/soffice.bin ] && chpax -zm /usr/lib/openoffice/program/soffice.bin
+
 	einfo " To start OpenOffice.org, run:"
 	einfo
 	einfo "   $ ooffice2"
diff --git a/app-office/openoffice-ximian-bin/ChangeLog b/app-office/openoffice-ximian-bin/ChangeLog
index cae1a770145b..8265766f7eb8 100644
--- a/app-office/openoffice-ximian-bin/ChangeLog
+++ b/app-office/openoffice-ximian-bin/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for app-office/openoffice-ximian-bin
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/ChangeLog,v 1.1 2004/04/02 14:15:43 suka Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
+
+*openoffice-ximian-bin-1.3.15 (26 Jul 2005)
+
+  26 Jul 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-ximian-bin-1.3.15.ebuild:
+  New release.
+
+*openoffice-ximian-bin-1.3.11 (07 May 2005)
+
+  07 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/xooffice-wrapper-1.3, +openoffice-ximian-bin-1.3.11.ebuild:
+  Finally a new version of openoffice-ximian-bin. This is as up-to-date as
+  possible and should make both kde and gnome fans happy. Binary is taken from
+  Novell, so don't be scared by the splash.
+
+  12 Nov 2004; suka@gentoo.org openoffice-ximian-bin-1.1.53.ebuild:
+  fix ewarn issues
+
+  20 Aug 2004; suka@gentoo.org openoffice-ximian-bin-1.1.53.ebuild:
+  fix for some sandbox issues
+
+*openoffice-ximian-bin-1.1.53 (01 Aug 2004)
+
+  01 Aug 2004; suka@gentoo.org -files/1.1.1/DicOOo.sxw,
+  openoffice-ximian-bin-1.1.52.ebuild, +openoffice-ximian-bin-1.1.53.ebuild:
+  A - very - late update to 1.1.53, also some cleanup to keep the portage dir
+  smaller
+
+  17 Jul 2004; suka@gentoo.org openoffice-ximian-bin-1.1.52.ebuild:
+  fix for stupid sandbox troubles
+
+  15 Jul 2004; suka@gentoo.org openoffice-ximian-bin-1.1.52.ebuild:
+  Remove unneeded stuff from user install, thanks to brad[] for pointing out
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-ximian-bin-1.1.52.ebuild:
+  Fix use invocation
 
 *openoffice-ximian-bin-1.1.52 (02 Apr 2004)
 
diff --git a/app-office/openoffice-ximian-bin/Manifest b/app-office/openoffice-ximian-bin/Manifest
index 20cfd8b05d3f..09dc9d2f2c86 100644
--- a/app-office/openoffice-ximian-bin/Manifest
+++ b/app-office/openoffice-ximian-bin/Manifest
@@ -1,8 +1,5 @@
-MD5 388c82dba64318f1d21451fcb9ca5b28 openoffice-ximian-bin-1.1.52.ebuild 5074
-MD5 76a0067d18bdd0972ca894c983dbecd7 ChangeLog 613
+MD5 f3896b424a8a5c55fa455f7f79605595 openoffice-ximian-bin-1.3.15.ebuild 3384
+MD5 ee37a01b2a2c2d25e244c679c08a39d6 ChangeLog 1945
 MD5 873dfcb3f5c44688deeb32472cef90c3 metadata.xml 268
-MD5 8ee72ad56fa593f36ecb2f2d5756ad78 files/digest-openoffice-ximian-bin-1.1.52 177
-MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980
-MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298
-MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221
-MD5 d81e72b4b1e953b67ca20b17aa8e75f6 files/1.1.1/DicOOo.sxw 85349
+MD5 9b42652b118f904d8c2995b90b89d163 files/digest-openoffice-ximian-bin-1.3.15 416
+MD5 59aa5496699827b1cefbd461c1623642 files/1.1.4/xooffice-wrapper-1.3 6893
diff --git a/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.3.15.ebuild b/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.3.15.ebuild
index 53dd894964d9..89fff68d13bd 100644
--- a/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.3.15.ebuild
+++ b/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.3.15.ebuild,v 1.1 2005/07/26 06:44:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian-bin/openoffice-ximian-bin-1.3.15.ebuild,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
 
 inherit fdo-mime rpm
 
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 26deff04fa41..51b10bd50fd2 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,858 @@
 # ChangeLog for app-office/openoffice-ximian
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.1 2003/11/04 11:21:20 pauldv Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.1.1.1 2005/11/30 09:59:05 chriswhite Exp $
+
+  20 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/build-new-xslt.diff, openoffice-ximian-1.3.9-r1.ebuild:
+  Also provide the build fix for the new libxslt to 1.3.9-r1
+
+  07 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.9.199.ebuild:
+  Marked ~sparc to get users over to openoffice-2.0
+
+*openoffice-ximian-1.9.199 (20 Oct 2005)
+
+  20 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-ximian-1.9.199.ebuild:
+  Add dummy ebuild to get people moving over to app-office/openoffice
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.16.ebuild:
+  Getting rid of the old mimetype stuff which causes broken behaviour for kde,
+  see bug #92767
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/build-new-xslt.diff, openoffice-ximian-1.3.16.ebuild:
+  Fix building without java and libxslt >=1.1.5, closes bug #106174
+
+  17 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.5/gentoo-1.3.16.patch:
+  Fix our patch to actually work...
+
+*openoffice-ximian-1.3.16 (17 Sep 2005)
+
+  17 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/javafix.patch, +files/1.1.5/gentoo-1.3.16.patch,
+  -files/1.1.4/regcompfix.patch, +files/1.1.5/STLport-vector.patch,
+  +files/1.1.5/gcc-instlib.patch, +files/1.1.5/gentoo-splash.diff,
+  +files/1.1.5/getcompver.awk.patch, +files/1.1.5/hardened-link.patch,
+  +files/1.1.5/newstlportfix.patch, +files/1.1.5/nptl.patch,
+  +files/1.1.5/pthreadlink-fix.patch, +files/1.1.5/pyunolink-fix.patch,
+  +files/1.1.5/xooffice-wrapper-1.3, +openoffice-ximian-1.3.16.ebuild:
+  New patch revision, first to be based on OpenOffice.org 1.1.5. Other than
+  that mostly bug fixes, see
+  
+  http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.12&only_with_tag=ooo-
+  build-1-3&view=markup
+  
+  for more information
+
+  23 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.14.ebuild:
+  Correct cp -a to cp -pPR for bug #103487
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild:
+  Marked ppc stable for bug #98980.
+
+  29 Jun 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/vcl-unx-gtk-frame-m110.diff, openoffice-ximian-1.3.14.ebuild:
+  Fix for non-working dead keys, this closes bug #88868
+
+  24 Jun 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/vcl-gtk-mainloop-m79.diff, openoffice-ximian-1.3.14.ebuild:
+  Fix for broken oslCondition reset / signalling in vcl / gtk. This silently
+  lifts the version to 1.3.15, just not doing a revision bump for a sole
+  patch.
+
+*openoffice-ximian-1.3.14 (17 Jun 2005)
+
+  17 Jun 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/gentoo-1.3.14.patch, +openoffice-ximian-1.3.14.ebuild:
+  New patch revision, no new features, just some more bug fixes
+
+  31 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/sd-slide-naming.diff, openoffice-ximian-1.3.11.ebuild:
+  Another bug fix for slide naming, in sync with upstream ooo-build 1.3.13
+
+  19 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/fpicker-kde-filter-name.diff,
+  openoffice-ximian-1.3.11.ebuild:
+  Adding another kde-file-picker fix. No revision bump as this is a minor 
+  fix, and would mean an unnecessary recompile for a lot of people. With 
+  this patch this actually is no the same as the upstream ooo-build-1.3.12
+
+*openoffice-ximian-1.3.11 (09 May 2005)
+
+  09 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/gentoo-1.3.11.patch, +openoffice-ximian-1.3.11.ebuild:
+  New patch release, fixes nasty crasher in calc
+
+  03 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.6-r1.ebuild, openoffice-ximian-1.3.9-r1.ebuild,
+  openoffice-ximian-1.3.10.ebuild:
+  LIBC set in the environment breaks the build, so we manually unset it now,
+  see bug #91179
+
+*openoffice-ximian-1.3.10 (23 Apr 2005)
+
+  23 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-ximian-1.3.10.ebuild:
+  New patch release, for details see:
+  
+  http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.6&only_with_tag=ooo-b
+  uild-1-3&view=markup
+
+  21 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild:
+  Add missing cups dependency
+
+  15 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild:
+  Stable on sparc wrt #88863
+
+  13 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild:
+  Marking stable on x86 for bug #88863
+
+  12 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openoffice-ximian-1.3.6-r1.ebuild:
+  Stable on ppc.
+
+*openoffice-ximian-1.3.9-r1 (12 Apr 2005)
+*openoffice-ximian-1.3.7-r1 (12 Apr 2005)
+*openoffice-ximian-1.3.6-r1 (12 Apr 2005)
+
+  12 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-ximian-1.3.6-r1.ebuild, +openoffice-ximian-1.3.7-r1.ebuild,
+  +openoffice-ximian-1.3.9-r1.ebuild:
+  Multiple revision bumps for security fix, see bug #88863
+
+  11 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9.ebuild:
+  Add ooo-build version info to the About-Dialog
+
+  10 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9.ebuild:
+  Remove system-python support for now, it tends to break the build, see bug
+  #82143
+
+  09 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9.ebuild:
+  Add another addpredict, closes bug #83406
+
+  09 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9.ebuild:
+  Pushing 1.3.9 to stable on x86 as this fixes a bunch of crasher bugs
+
+  09 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9.ebuild:
+  Add note about localized helpcontent, closes bug #87199
+
+*openoffice-ximian-1.3.9 (05 Apr 2005)
+
+  05 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/gentoo-1.3.9.patch, +openoffice-ximian-1.3.9.ebuild:
+  New release of the patchset, which contains lots of fixes, for more details
+  see here:
+  
+  http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.5&only_with_tag=ooo-b
+  uild-1-3&view=markup
+
+  31 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/gcc34-nptl-fix.patch:
+  Re-adding a patch which is necessary for oox-1.3.6
+
+  28 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/getcompver.awk.patch, openoffice-ximian-1.3.6.ebuild,
+  openoffice-ximian-1.3.7.ebuild:
+  Fix bug #82385 also in older versions
+
+  06 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/gentoo-1.3.8.patch, +files/1.1.4/getcompver.awk.patch,
+  openoffice-ximian-1.3.8.ebuild:
+  Fix some build problem related to gcc-naming, closes bug #82385, also back
+  out evolution-data-server-support for the time being
+
+  04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  Stable on sparc and went into hiding
+
+  17 Feb 2005; Jason Wever <weeve@gentoo.org>
+  openoffice-ximian-1.3.8.ebuild:
+  Added ~sparc keyword and ran like hell.
+
+  04 Feb 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/gentoo-1.3.8.patch,
+  +files/1.1.4/gtk-printer-update-on-focus-change.diff,
+  openoffice-ximian-1.3.8.ebuild:
+  Bunch of fixes / news:
+  
+  *) Fix for cups printing problems, taken from upstream, closes bug #78289.
+  If this still doesn't work for you after rebuilding, please delete your
+  user-install (~/.xopenoffice and ~/.xversionrc), should work afterwards
+  
+  *) If USE="gnome" is set, support for Evolution data server is now also
+  built, this adds another dependency
+  
+  *) We are now using system-python and -nas if present, especially the first
+  one should reduce build time quite a bit
+  
+  *) Dependency fixes
+
+  03 Feb 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  GCC 3.4 patches also work fine with GCC 3.3.x so they are applied by default
+  now. This also fixes some further problems on hardened gccs, closes bug
+  #79815
+
+  31 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild, openoffice-ximian-1.3.8.ebuild:
+  Add another addpredict to work around Sandbox problems, closes bug #79084
+
+  29 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.8.ebuild:
+  *) Fix kde path detection, closes bug #79827.
+  *) Provide virtual/ooo
+  *) further ebuild cleanups
+
+  28 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/gentoo-1.3.8.patch, openoffice-ximian-1.3.8.ebuild:
+  The GCC 3.4 patches also work with gcc 3.3.x, so we don't have to check for
+  gcc-version before applying them. That's fine cause now we can let the
+  ooo-patchset do the work, which cleans up the ebuild a bit.
+
+  28 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.8.ebuild:
+  Use CXXFLAGS instead of CFLAGS, closes bug #79828
+
+  28 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/gentoo-1.3.8.patch:
+  Fix the -gnome -kde bug, again. Closes bug #79831
+
+*openoffice-ximian-1.3.8 (28 Jan 2005)
+
+  28 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/STLport-vector.patch, +files/1.1.4/config-db-checkfix.patch,
+  +files/1.1.4/gcc-instlib.patch, +files/1.1.4/gentoo-1.3.8.patch,
+  +files/1.1.4/gentoo-splash.diff, +files/1.1.4/hardened-link.patch,
+  +files/1.1.4/javafix.patch, +files/1.1.4/newstlportfix.patch,
+  +files/1.1.4/nptl.patch, +files/1.1.4/pthreadlink-fix.patch,
+  +files/1.1.4/pyunolink-fix.patch, +files/1.1.4/regcompfix.patch,
+  +files/1.1.4/xooffice-wrapper-1.3, +openoffice-ximian-1.3.8.ebuild:
+  New patch version release, the first one based on OOo 1.1.4. Also includes a
+  patch for a new build problem introduced in 1.3.8. A list of other changes
+  and improvements can be found here:
+  
+  http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.4&only_with_tag=ooo-b
+  uild-1-3&view=auto
+
+  24 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/xooffice-wrapper-1.3:
+  Add check for mounted /proc to wrapper, OOo will fail without it
+
+  24 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/xooffice-wrapper-1.3:
+  Remove unused UPDATEFLAG from wrapper
+
+  23 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/xooffice-wrapper-1.3:
+  clean up the wrapper file
+
+  22 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  The ebuild now uses the LINGUAS environment variable to determine for which
+  language to build, the first one in your LINGUAS-settings that is supported
+  is used for this. Please note, that the old LANGUAGE=ENUS|PORT... way does
+  NOT work anymore. While doing this added some more languages to the
+  supported list, see the ebuild for more infos. Also added some dependencies
+  for japanese and chinese builds.
+  
+  This closes a number of bugs: #40896, #44209. #51331, #70302, #71216 and
+  #77128
+
+  21 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/gentoo-1.3.7.patch:
+  Remove on patch from the buildset, which creates problems in oocalc, closes
+  bug #74595
+
+  20 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  Marking stable on x86
+
+  18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  -files/1.1.3/gcc34-nptl-fix.patch, +files/1.1.3/nptl.patch,
+  +files/1.1.3/pyunolink-fix.patch, openoffice-ximian-1.3.7.ebuild:
+  Fixes for nptl and pyuno build breakage, should close quite some bugs, if
+  this works out
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/gcc-instlib.patch, openoffice-ximian-1.3.7.ebuild:
+  Mostly ebuild cleanup and sync with vanilla OOo, remove some useless stuff
+  and add another patch for gccinstlib
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  Add support for localized helpcontent. For it to work you will have to
+  download the correct helpcontent file from one of the OOo-mirrors (it's in
+  the contrib/helpcontent/ directory, for instance:
+  http://ftp.stardiv.de/pub/OpenOffice.org/contrib/helpcontent/) and put it in
+  you distfiles-directory. Closes bug #30668
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  As everyone is now on Gnome 2.8: remove old mime stuff, add fdo-mime refresh
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/hardened-link.patch, +files/1.1.3/pthreadlink-fix.patch,
+  openoffice-ximian-1.3.7.ebuild:
+  Try to fix build problems with hardened-gccs, patches provided by
+  Kevin F. Quinn <co@kevquinn.com> in bug #52642
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  Fix einfo message, symlink is called xoohtml not xooweb, closes bug #74594
+
+  14 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.3.7.ebuild:
+  Keyworded ~sparc
+
+  14 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/javafix.patch, openoffice-ximian-1.3.7.ebuild:
+  Another fix for java build problems, closes bug #77866
+
+  14 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.3/gentoo-1.3.7.patch:
+  Fix for building with -gnome and -kde, closes bug#77911
+
+*openoffice-ximian-1.3.7 (13 Jan 2005)
+
+  13 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/gcc34-sal-link-to-libsupc++.diff,
+  +files/1.1.3/gcc34_2.patch.bz2, +files/1.1.3/gentoo-1.3.7.patch,
+  +files/1.1.3/nojvmfwk-fix.patch, -openoffice-ximian-1.1.55.ebuild,
+  +openoffice-ximian-1.3.7.ebuild:
+  New release, closes bug #73171. This mainly fixes some bugs, most
+  importantly the crasher bug when deleting a line in Calc, closes bug #71600
+  
+  For more infos see the entry for 1.3.7 under:
+  
+  http://go-oo.org/ooo-build/NEWS
+
+  08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openoffice-ximian-1.3.6.ebuild:
+  Stable on ppc.
+
+  08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/1.1.3/STLport-vector.patch, openoffice-ximian-1.3.6.ebuild:
+  Added patch from bug 65883.
+
+  18 Nov 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.3.6.ebuild:
+  Added to ~ppc.
+
+  15 Nov 2004; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.3.5-r1.ebuild,
+  openoffice-ximian-1.3.6.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass
+
+*openoffice-ximian-1.3.6 (14 Nov 2004)
+
+  14 Nov 2004; suka@gentoo.org +files/1.1.3/gcc34-gnome.patch,
+  +files/1.1.3/gcc34-nojava-fix.patch, +files/1.1.3/gcc34-nptl-fix.patch,
+  +files/1.1.3/gcc34.patch.bz2, +files/1.1.3/gentoo-1.3.6.patch,
+  +files/1.1.3/gentoo-splash.diff, +files/1.1.3/newstlportfix.patch,
+  +files/1.1.3/ximian-openoffice.applications,
+  +files/1.1.3/ximian-openoffice.keys, +files/1.1.3/xooffice-wrapper-1.3,
+  +openoffice-ximian-1.3.6.ebuild:
+  New release with some major goodies. First and most importantly this should
+  now compile fine with gcc 3.4.x, the credit for this goes mostly to Hanno
+  Meyer-Thurow (h.mth@web.de), thanks a lot. Also this is the first version
+  based on OOo 1.1.3. Added to this we have the usual round of bug fixes and
+  enhancements of the ximian-patchset, see http://ooo.ximian.com/NEWS for the
+  full rundown.
+
+  12 Nov 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.3.5-r1.ebuild, openoffice-ximian-1.3.5.ebuild:
+  Fix ewarn messages, closes bug #70852
+
+  23 Oct 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.3.5-r1.ebuild, openoffice-ximian-1.3.5.ebuild:
+  Filter another CFLAG which breaks the build
+
+  18 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.3.5-r1.ebuild:
+  Stable on sparc wrt #63556
+
+  15 Oct 2004; suka@gentoo.org openoffice-ximian-1.3.5-r1.ebuild:
+  Mark stable on x86 for bug #63556, also conditionalize curl dependency
+
+*openoffice-ximian-1.3.5-r1 (12 Oct 2004)
+
+  12 Oct 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.5-r1.patch,
+  +openoffice-ximian-1.3.5-r1.ebuild:
+  New patch release (1.3.5.5) mainly bugfixes, a lot of them for the kde
+  integration, hope to push this into stable soon
+
+  29 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.1.61.ebuild:
+  Stable on sparc
+
+*openoffice-ximian-1.3.5 (19 Sep 2004)
+
+  19 Sep 2004; suka@gentoo.org -files/1.1.2/gentoo-1.3.3-r1.patch,
+  -files/1.1.2/gentoo-1.3.3.patch, +files/1.1.2/gentoo-1.3.5.patch,
+  -openoffice-ximian-1.3.3-r1.ebuild, -openoffice-ximian-1.3.3.ebuild,
+  +openoffice-ximian-1.3.5.ebuild:
+  new patch release, mainly bug fixes.
+
+*openoffice-ximian-1.3.4 (09 Sep 2004)
+
+  09 Sep 2004; suka@gentoo.org -files/1.1.2/gentoo-1.3.2.patch,
+  +files/1.1.2/gentoo-1.3.4.patch, -openoffice-ximian-1.3.2.ebuild,
+  +openoffice-ximian-1.3.4.ebuild:
+  New patch version, this now also integrates all the changes from 1.3.3-r1 so
+  pleas be sure to read the old Changelog entry about ooo-kde being deprecated
+
+*openoffice-ximian-1.3.3-r1 (06 Sep 2004)
+
+  06 Sep 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.3-r1.patch,
+  +openoffice-ximian-1.3.3-r1.ebuild:
+  New revision, hard masked for testing as it has some significant changes.
+  
+  1) Java is back: If you have java installed, java functionality will be
+  available in OOo. If you don't have java installed the build will work too-
+  
+  2) Better optimization: The build should now be more optimized, your CFLAGS
+  are used in more places
+  
+  3) Removal of ooo-kde local use flag: It's simply not necessary anymore, gnome
+  and kde functionality is enabled through the corresponding use flags. If you
+  have provide both, both native styles will be built, according to your desktop
+  environment, the right one will be shown, you can force the other look by
+  using OOO_FORCE_DESKTOP=KDE|gnome xoowriter. This funcitionality has only one
+  drawback: If you want to have KDE icons, be sure to have -gnome +kde in your
+  USE-flags, icons are not yet parallel installable.
+  
+  and a lot of restructuring in the ebuild
+
+*openoffice-ximian-1.3.3 (04 Sep 2004)
+
+  04 Sep 2004; suka@gentoo.org -files/1.1.2/fpickerkdefix.diff,
+  -files/1.1.2/gentoo-1.3.0.patch, +files/1.1.2/gentoo-1.3.3.patch,
+  -openoffice-ximian-1.3.0.ebuild, +openoffice-ximian-1.3.3.ebuild:
+  New version of the ooo-build patchset, fixing a few problems, most notably bug
+  #62611 (does not print).
+  
+  Also remove the quite broken 1.3.0 version
+
+  04 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.1.61.ebuild:
+  Forgot little sparc fix
+
+  04 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.1.61.ebuild:
+  Keyworded ~sparc
+
+  02 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-ximian-1.3.2.ebuild:
+  Keyworded ~sparc - but don't dream on stable since we're affected by bug #62611
+
+  29 Aug 2004; suka@gentoo.org openoffice-ximian-1.3.2.ebuild:
+  backing out parallel build stuff, seems to break the build for some :(
+
+  28 Aug 2004; suka@gentoo.org openoffice-ximian-1.3.2.ebuild:
+  At last enable parallel build! Should work fine now, although number of
+  parallel processes is limited to 10, otherwise dmake will fail
+
+*openoffice-ximian-1.3.2 (28 Aug 2004)
+
+  28 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.2.patch,
+  +openoffice-ximian-1.3.2.ebuild:
+  New patch version, this solves a lot of the troubles people seemed to have
+  with 1.3.0, for instance the kde file selector crash should be gone (closes
+  bug #61588), also OOO_FORCE_DESKTOP=KDE|Gnome should be working fine now,
+  which is especially handy for non-kde/gnome users. On the feature side, this
+  adds suport for Wordperfect documents.
+  
+  For a full list of changes, see like always:
+  
+  http://ooo.ximian.com/ooo-build/NEWS
+
+  23 Aug 2004; suka@gentoo.org files/1.1.2/gentoo-1.3.0.patch,
+  openoffice-ximian-1.3.0.ebuild:
+  Fixed a build problem with ooo-kde (introduced by myself in the last commit :(
+  ) . In return KDE users get some added bonus features (which gnome users
+  already had), like startup notfication, Lotus Document support and the removal
+  of the annoying double install of menu entries, the last one should also solve
+  bug #53752
+
+  22 Aug 2004; suka@gentoo.org files/1.1.2/gentoo-1.3.0.patch,
+  +files/1.1.2/gentoo-splash.diff, openoffice-ximian-1.3.0.ebuild:
+  Do some branding action, or as I'd like to call it: We've now got our own
+  shiny splash screen! This has been done by myself, so blame me and not
+  seemant if you don't like it. (although he requested it!) ;-)
+
+  21 Aug 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.61.ebuild, openoffice-ximian-1.3.0.ebuild:
+  Add pam to dependencies, closes bug #57195
+
+  21 Aug 2004; suka@gentoo.org openoffice-ximian-1.1.61.ebuild:
+  push 1.1.61 to stable on x86
+
+  21 Aug 2004; suka@gentoo.org +files/1.1.2/fpickerkdefix.diff,
+  openoffice-ximian-1.3.0.ebuild:
+  Fixes for the KDE stuff, so moving out of package.mask :-)
+
+  21 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.0.patch,
+  openoffice-ximian-1.3.0.ebuild:
+  remove Evolution 2 stuff, as this requires evolution-data-server which is
+  still in package mask, closes bug #61054
+
+  20 Aug 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.61.ebuild, openoffice-ximian-1.3.0.ebuild:
+  fix some sandbox issues and fix gcc-statement (this package only works with
+  gcc 3.2 or gcc 3.3 atm)
+
+*openoffice-ximian-1.3.0 (20 Aug 2004)
+
+  20 Aug 2004; suka@gentoo.org -files/1.1.2/gentoo-1.1.60.patch,
+  -files/1.1.2/nativefix.diff, -files/1.1.2/print-fontconfig.diff,
+  -openoffice-ximian-1.1.60.ebuild, +openoffice-ximian-1.3.0.ebuild:
+  Great new release of the Ximian patchset, which brings lots of goodies:
+  Native fileselectors for GNOME and KDE are just the highlight. Take a look at
+  
+  http://ooo.ximian.com/NEWS
+  
+  for more infos.
+  
+  Unfortunately the ooo-kde-build is broken for the moment, so this version is
+  in package.mask for now, if you don't use that use-flag you should happily be
+  able to unmask it.
+
+*openoffice-ximian-1.1.61 (01 Aug 2004)
+
+  01 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.1.61.patch,
+  +files/1.1.2/rm-nonexistant.diff, +openoffice-ximian-1.1.61.ebuild:
+  A - late - update to 1.1.61, next version seems to take some time so providing
+  this in the mean time
+
+  01 Aug 2004; suka@gentoo.org +files/1.1.2/curlfix.patch,
+  openoffice-ximian-1.1.60.ebuild:
+  Fix compile with curl-7.12.0, this closes bug #58983
+
+  17 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild:
+  fix stupid sandbox troubles
+
+  15 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild:
+  Do not install unneeded old gnome and kde menu items in the user dir, thanks
+  to brad[] for pointing out
+
+  13 Jul 2004; suka@gentoo.org +files/1.1.2/nativefix.diff,
+  -files/1.1.2/nativewidgets-vcl.diff, openoffice-ximian-1.1.60.ebuild:
+  waste less space on the mirrors
+
+  02 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild:
+  filter another use flag creating runtime problems: -fstack-protector
+
+*openoffice-ximian-1.1.60 (30 Jun 2004)
+
+  30 Jun 2004; suka@gentoo.org +files/1.1.2/fixscale.patch,
+  +files/1.1.2/gentoo-1.1.60.patch, +files/1.1.2/nativewidgets-vcl.diff,
+  +files/1.1.2/newstlportfix.patch, +files/1.1.2/print-fontconfig.diff,
+  +files/1.1.2/ximian-openoffice.applications,
+  +files/1.1.2/ximian-openoffice.keys, +files/1.1.2/xooffice-wrapper-1.3,
+  +openoffice-ximian-1.1.60.ebuild:
+  New patch version. The first one based on OOo 1.1.2 ! Had to do some
+  workarounds as two patches are faulty, but everything should be fine now
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-ximian-1.1.51-r1.ebuild, openoffice-ximian-1.1.55.ebuild,
+  openoffice-ximian-1.1.57.ebuild, openoffice-ximian-1.1.59.ebuild:
+  kill sparc64 use flag
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.59.ebuild:
+  Added to ~ppc.
+
+  07 Jun 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.57.ebuild:
+  Added to ~ppc.
+
+*openoffice-ximian-1.1.59 (06 Jun 2004)
+
+  06 Jun 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.59.patch,
+  openoffice-ximian-1.1.55.ebuild, +openoffice-ximian-1.1.59.ebuild:
+  Mark 1.1.55 stable for x86. Also new version for unstable, mainly bugfixes
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  openoffice-ximian-1.1.51-r1.ebuild, openoffice-ximian-1.1.53.ebuild,
+  openoffice-ximian-1.1.54.ebuild, openoffice-ximian-1.1.55-r1.ebuild,
+  openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.1.57.ebuild:
+  Fix use invocation
+
+*openoffice-ximian-1.1.57 (28 May 2004)
+
+  28 May 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.57.patch,
+  +openoffice-ximian-1.1.57.ebuild:
+  Version bump, this is also the first unmasked version with the native widget
+  stuff
+
+  19 May 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.55.ebuild:
+  Readded to ~ppc (-r1 is package-masked).
+
+  19 May 2004; David Holm <dholm@gentoo.org>
+  openoffice-ximian-1.1.55-r1.ebuild:
+  Readded to ~ppc.
+
+  12 May 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.55.patch,
+  openoffice-ximian-1.1.55-r1.ebuild:
+  Enable Native Widget stuff also for the gtk build, also some further cleanups
+
+*openoffice-ximian-1.1.55-r1 (07 May 2004)
+
+  07 May 2004; suka@gentoo.org -files/1.1.1/distro_kde.patch,
+  openoffice-ximian-1.1.53.ebuild, openoffice-ximian-1.1.54.ebuild,
+  +openoffice-ximian-1.1.55-r1.ebuild, openoffice-ximian-1.1.55.ebuild:
+  Back out KDE integration stuff of 1.1.54 and 1.1.55, if you want to try it
+  out, use 1.1.55-r1 which is hard-masked, as there are still some known
+  problems
+
+*openoffice-ximian-1.1.55 (06 May 2004)
+
+  06 May 2004; suka@gentoo.org -files/1.1.1/neon.patch,
+  +openoffice-ximian-1.1.55.ebuild:
+  New version of the Ximian patchset, see:
+  
+  http://ooo.ximian.com/NEWS
+  
+  for a list of changes
+
+  05 May 2004; suka@gentoo.org :
+  First shot at KDE integration work. If you want to use the NWF and icon stuff
+  for kde instead of the default Ximian look put ooo-kde in your use flags or
+  emerge the ebuild with USE="ooo-kde" emerge openoffice-ximian
+
+  This is based mainly on the work of sayap@sayap.net in bug #49042. Thanks!
+
+  05 May 2004; suka@gentoo.org openoffice-ximian-1.1.51-r1.ebuild,
+  openoffice-ximian-1.1.53.ebuild, openoffice-ximian-1.1.54.ebuild:
+  Filter another evil CFLAG
+
+*openoffice-ximian-1.1.54 (30 Apr 2004)
+
+  30 Apr 2004; suka@gentoo.org +openoffice-ximian-1.1.54.ebuild:
+  New version of the Ximian patchset, see:
+  
+  http://ooo.ximian.com/openoffice/NEWS
+  
+  for further details
+
+*openoffice-ximian-1.1.51-r1 (25 Apr 2004)
+
+  25 Apr 2004; suka@gentoo.org +openoffice-ximian-1.1.51-r1.ebuild,
+  -openoffice-ximian-1.1.51.ebuild, -openoffice-ximian-1.1.52.ebuild:
+  revision bump for security fix
+
+  24 Apr 2004; suka@gentoo.org +files/1.1.0/neon.patch,
+  +files/1.1.1/neon.patch, openoffice-ximian-1.1.51.ebuild,
+  openoffice-ximian-1.1.52.ebuild:
+  Security fix, see:
+  http://secunia.com/advisories/11364/
+
+  20 Apr 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.53.ebuild:
+  Added to ~ppc.
+
+*openoffice-ximian-1.1.53 (17 Apr 2004)
+
+  17 Apr 2004; suka@gentoo.org +openoffice-ximian-1.1.53.ebuild:
+  New patch-version, also some small bug fixes
+
+  11 Apr 2004; suka@gentoo.org openoffice-ximian-1.1.52.ebuild,
+  files/1.1.1/build.patch:
+  Add temporary patch provided by scout@scoutheeten.com on bug #46945 to work
+  around build breakage caused by recent sandbox problems in portage.
+  Also use newer source tarball.
+
+  04 Apr 2004; Lars Weiler <pylon@gentoo.org> openoffice-ximian-1.1.51.ebuild,
+  openoffice-ximian-1.1.52.ebuild:
+  1.1.51 stable on ppc, 1.1.52 masked testing on ppc
+
+*openoffice-ximian-1.1.52 (01 Apr 2004)
+
+  01 Apr 2004; suka@gentoo.org openoffice-ximian-1.1.52.ebuild,
+  files/1.1.1/newstlportfix.patch, files/1.1.1/nptl.patch,
+  files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch,
+  files/1.1.1/openoffice-1.1.0-sparc64-fix.patch,
+  files/1.1.1/ximian-openoffice.applications,
+  files/1.1.1/ximian-openoffice.keys, files/1.1.1/xooffice-wrapper-1.3:
+  New version of Ximian patchset, this is the first version that is based on
+  OpenOffice.org 1.1.1! Please be aware that you will have to redo your user
+  settings as some user install things have changed and so we can't migrate your
+  old settigns to the new version
+
+  07 Mar 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.51.ebuild:
+  Added to ~ppc.
+
+*openoffice-ximian-1.1.51 (06 Mar 2004)
+
+  06 Mar 2004; <suka@gentoo.org> openoffice-ximian-1.1.51.ebuild:
+  New version of the Ximian patchset, provides some font rendering speedups,
+  lots of bug fixes and other goodies
+
+  22 Feb 2004; <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild:
+  Now uses newest icon package, .desktop file installation simplified
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.50.ebuild:
+  Added to ~ppc, closing bug #40801.
+
+  05 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild:
+  Now stripping the binaries during install, this reduces the size of the
+  installation by some nice 30 MB, also should speedup startup. Additionaly
+  conditionalized mime-type installation on gnome and kde use-flags
+
+  04 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild,
+  files/1.1.0/ximian-openoffice.keys:
+  GNOME mime type installation was incomplete, openoffice-ximian now registers
+  itself again as default application
+
+  03 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild:
+  This update further simplifies the ebuild and aims to fix the distcc
+  problems. Even better parallel build COULD now work for you, at least it does
+  for me, as it is not tested enough you will have to explicitely force the
+  ebuild to build in parallel / use more cpus. If you dare to try out emerge the
+  ebuild like:
+  
+  'ECPUS="n" emerge openoffice-ximian'
+  
+  where n has to be exchanged with the number of processes / CPUs you want to
+  use. No guarantee whatsoever that it will work for you :-)
+
+  28 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.46.ebuild,
+  openoffice-ximian-1.1.47.3.ebuild, openoffice-ximian-1.1.49.2-r1.ebuild,
+  openoffice-ximian-1.1.49.2.ebuild, openoffice-ximian-1.1.50.ebuild:
+  Install Ximians OpenSymbol-Font to resolve bullets (and other) problems,
+  closes bug #39637
+
+*openoffice-ximian-1.1.50 (25 Jan 2004)
+
+  25 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild:
+  New Version, removes the need for some workarounds
+
+  23 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.49.2-r1.ebuild,
+  openoffice-ximian-1.1.49.2.ebuild, files/1.1.0/norecent.patch:
+  Removing borked recent-files-patch, this should close bug #39050
+
+*openoffice-ximian-1.1.49.2-r1 (21 Jan 2004)
+
+  21 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.49.2-r1.ebuild,
+  files/1.1.0/ximian-openoffice.applications, files/1.1.0/xoo-drawing.desktop,
+  files/1.1.0/xoo-presentation.desktop, files/1.1.0/xoo-spreadsheet.desktop,
+  files/1.1.0/xoo-textdoc.desktop, files/1.1.0/xooffice-wrapper-1.3:
+  Two major changes to the ebuild: openoffice-ximian now keeps its own settings
+  dir in ~/.xopenoffice, old installs are transfered over automatically. This
+  means that it no longer blocks on vanilla openoffice, both can easily be
+  installed alongside each other.
+  
+  Also the CXXFLAGS settings are now actually applied to the build, until now we
+  built with generic settings, so more chance for optimizations or breakage ;-)
+  
+  Hard masked this for now
+
+  19 Jan 2004; Luca Barbato <lu_zero@gentoo.org>
+  openoffice-ximian-1.1.49.2.ebuild:
+  Marked ~ppc
+
+  17 Jan 2004; <suka@gentoo.org> openoffice-ximian-1.1.46.ebuild,
+  openoffice-ximian-1.1.47.3.ebuild, openoffice-ximian-1.1.49.2.ebuild,
+  files/1.1.0/fixed-gcc.patch, files/1.1.0/norecent.patch,
+  files/1.1.0/oo_1.1-nptl.patch,
+  files/1.1.0/openoffice-1.1.0-sparc64-fix.patch,
+  files/1.1.0/recent-files.diff:
+  Part 2 of the big clean up work:
+  
+  *) Fixed some dependencies
+  *) Filter another flag to combat compile breakage
+  *) Correct pentium4 replacement
+  *) Further cleanups
+  
+  openoffice-ximian-1.1.49.2 got some additional love:
+  
+  *) Major cleanup of build process
+  *) Remove need for virtualmake
+  *) Fix for PPC compile breakage. Closes bug #38411
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  openoffice-ximian-1.1.46.ebuild:
+  set ppc in keywords
+
+  14 Jan 2004; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-ximian-1.1.49.2.ebuild:
+  cleaned up ebuild. Not revision dumping as the time between commits is very
+  short
+
+*openoffice-ximian-1.1.49.2 (14 Jan 2004)
+
+  14 Jan 2004; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-ximian-1.1.49.2.ebuild:
+  For suka <suka@t0.or.at>:
+  *) Updated Ximian patchset
+  *) Removed work-arounds which are not necessary anymore
+  *) Some dependency cleanup
+
+  12 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  openoffice-ximian-1.1.48.ebuild:
+  1.13.92-r3 fixes the tar problem, so removed that explicit dependency
+
+*openoffice-ximian-1.1.48 (11 Jan 2004)
+
+  11 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-ximian-1.1.48.ebuild:
+  Committing for suka@t0.or.at: 
+  *) The desktop files are now provided in the Files-Dir, as Ximian 
+     creates them now in their own build process (which we dont use) 
+  *) There are two new patches, which I had to add, because one of the Ximian-patches breaks the build. 
+  *) KDE menu entries are now created 
+  *) The ebuild is now depending on <app-arch/tar-1.13.92 to bypass the 
+     tar-problems 
+  *) Installed Freetype is now used 
+  *) ATM I have not optionalized to use the system-db, as it seemed to 
+     break things for me
+
+*openoffice-ximian-1.1.47.3 (25 Dec 2003)
+
+  25 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  openoffice-ximian-1.1.47.3.ebuild:
+  version bump thanks to suka <suka@t0.or.at> in bug #35464
+
+  14 Dec 2003; Luca Barbato <lu_zero@gentoo.org>
+  openoffice-ximian-1.1.46.ebuild:
+  Marked ~ppc
+
+*openoffice-ximian-1.1.46 (12 Nov 2003)
+
+  12 Nov 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-ximian-1.1.46.ebuild:
+  New ximian version, and change the name to use ximian's version, not
+  openoffices
+
+  12 Nov 2003; Luca Barbato <lu_zero@gentoo.org>
+  openoffice-ximian-1.1.0-r1.ebuild:
+  Marked ~ppc
+
+  05 Nov 2003; Paul de Vrieze <pauldv@gentoo.org>
+  files/1.1.0/ooffice-wrapper-1.3:
+  Fix the wrapper script for the openoffice location
+
+*openoffice-ximian-1.1.0-r1 (04 Nov 2003)
+
+  04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-ximian-1.1.0-r1.ebuild:
+  Add a revised version with newer ximian patches and without a need for java.
+  Again mostly based on <suka@t0.or.at> in bug #25241
+
+  04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org>
+  openoffice-ximian-1.1.0.ebuild:
+  Fix a small bug indicated by suka@t0.or.at
 
 *openoffice-ximian-1.1.0 (04 Nov 2003)
 
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 71f5b1adbe3b..d4ea70506018 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,8 +1,35 @@
-MD5 7368723dde9d4cb4088cedb318dacb9b openoffice-ximian-1.1.0.ebuild 19297
-MD5 06b11dad767b42f319fd60d1c369619e files/digest-openoffice-ximian-1.1.0 212
-MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
-MD5 028fbe21a2c72ae662729ed63a72cd80 files/1.1.0/solar_segfix.patch 577
-MD5 35644fff64e993d64c44a56383263186 files/1.1.0/oo_1.1-nptl.patch 538
-MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502
-MD5 9d6957b6b4f84033d6073c3acdd2928f files/1.1.0/ooffice-wrapper-1.3 8952
-MD5 fa0af18a5e8a31bf68e0cdbb2f0e4981 files/1.1.0/fixed-gcc.patch 644
+MD5 2be2059daebdf1991f994960fb765f4b ChangeLog 35093
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
+MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
+MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.9.patch 859
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.4/gentoo-splash.diff 890
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
+MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
+MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
+MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393
+MD5 09e70c259e5c6767251d0e22f6775a8d files/1.1.5/gentoo-1.3.16.patch 1120
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.5/gentoo-splash.diff 890
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
+MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
+MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638
+MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.5/nptl.patch 243
+MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.5/pthreadlink-fix.patch 1163
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
+MD5 ba6affa60977e5d658fe5a2125abb691 files/1.1.5/xooffice-wrapper-1.3 6091
+MD5 53867a5ca81d65d0139b4334ef63bd72 files/digest-openoffice-ximian-1.3.16 490
+MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openoffice-ximian-1.9.199 0
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 a05de7453d373da927b2b9c6cc6c7bbe openoffice-ximian-1.3.16.ebuild 17873
+MD5 78ae49ad978e18d00d11830ec7dc740f openoffice-ximian-1.3.9-r1.ebuild 18015
+MD5 6dae04bd5081afc57b675e437606b798 openoffice-ximian-1.9.199.ebuild 1358
diff --git a/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch b/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch
index 8b1aa89f2f34..b4179079b6a7 100644
--- a/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch
+++ b/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch
@@ -1,5 +1,5 @@
---- patches/OOO_1_1_4/apply.orig	2004-12-02 00:07:00.659646960 +0100
-+++ patches/OOO_1_1_4/apply	2004-12-02 00:07:18.119992584 +0100
+--- patches/OOO_1_1_5/apply.orig	2004-12-02 00:07:00.659646960 +0100
++++ patches/OOO_1_1_5/apply	2004-12-02 00:07:18.119992584 +0100
 @@ -33,9 +33,10 @@
  PLD  : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath
  KDE  : LinuxCommon, FilePickers, KDEOnly, NoRpath
@@ -14,8 +14,6 @@
  
  # somewhat odder:
  Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only, NoRpath
---- patches/OOO_1_1_5/apply 
-+++ patches/OOO_1_1_5/apply.new 
 @@ -1306,11 +1306,6 @@
  
  ########################################################
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
index f5af159f7404..093ff48d425a 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-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/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild,v 1.1 2005/09/17 07:33:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild,v 1.1.1.1 2005/11/30 09:59:06 chriswhite Exp $
 
 # Notes:
 #
@@ -131,7 +131,7 @@ pkg_setup() {
 
 set_languages () {
 
-	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb nn pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
 	if [ -n "${LINGUAS}" ] ; then
 		# use the leftmost value
 		temp_lang=( ${LINGUAS} )
@@ -171,7 +171,9 @@ set_languages () {
 			;;
 		sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
 			;;
-		no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
+		nn ) OOLANGNO=79; OOLANGNAME=NORNYN; OOLFULLNAME="Norwegian"
+			;;
+		nb ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
 			;;
 		pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
 			;;
@@ -268,6 +270,9 @@ src_unpack() {
 	#fix for bug #82385
 	epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch
 
+	#Allow building with libxslt >= 1.1.15
+	use java || epatch ${FILESDIR}/${OO_VER}/build-new-xslt.diff
+
 	#Workaround for bug #73940, may break debug use flag on ppc
 	if use ppc; then
 		epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch
@@ -574,12 +579,6 @@ src_install() {
 	insinto /usr/share/applications
 	doins *.desktop
 
-	if use kde
-	then
-		insinto /usr/share/mimelnk/application
-		doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/*
-	fi
-
 	# Install corrected Symbol Font
 	insinto /usr/share/fonts/TTF/
 	doins ${PATCHDIR}/fonts/*.ttf
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
index f65e84a3b9bc..1d1240c59a62 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.1 2005/04/12 17:51:35 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
 # Notes:
 #
@@ -51,7 +51,7 @@ HOMEPAGE="http://go-oo.org"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="ppc sparc x86"
 
 RDEPEND="!app-office/openoffice-ximian-bin
 	virtual/x11
@@ -79,7 +79,7 @@ RDEPEND="!app-office/openoffice-ximian-bin
 	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
 
 DEPEND="${RDEPEND}
-	virtual/lpr
+	net-print/cups
 	>=sys-apps/findutils-4.1.20-r1
 	app-shells/tcsh
 	dev-util/pkgconfig
@@ -268,8 +268,11 @@ src_unpack() {
 	# fix for bug #82385
 	epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch
 
+	#Allow building with libxslt >= 1.1.15
+	use java || epatch ${FILESDIR}/${OO_VER}/build-new-xslt.diff
+
 	# Security fix, bug #88863
-	epatch ${FILESDIR}/${OO_VER}/crash-objstream.diff
+	epatch ${FILESDIR}/${OO_VER}/cws-heapbug_CAN-2005-0941.diff
 
 	# Workaround for bug #73940, may break debug use flag on ppc
 	if use ppc; then
@@ -316,14 +319,14 @@ src_unpack() {
 
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S} || die
-	cp -af ${ICONDIR}/* ${S} || die
+	cp -pPRf ${ICONDIR}/* ${S} || die
 
 	einfo "Copying splash screens in place"
-	cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
+	cp -pPRf ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
 
 	einfo "Copying libpwd tarball in build dir"
 	mkdir -p ${S}/libwpd/download/ || die
-	cp -af ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die
+	cp -pPRf ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die
 
 	einfo "Munging font mappings ..."
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die
@@ -344,6 +347,7 @@ get_EnvSet() {
 
 src_compile() {
 
+	unset LIBC
 	addpredict "/bin"
 	addpredict "/root/.gconfd"
 	addpredict "/root/.gnome"
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild
index 7e7807518781..03c9e4760da6 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild
@@ -1,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-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild,v 1.1 2005/10/20 18:46:21 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild,v 1.1.1.1 2005/11/30 09:59:05 chriswhite Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://go-oo.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c7607bfa78ab..575618172e55 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,814 @@
 # ChangeLog for app-office/openoffice
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.1 2002/04/24 21:57:15 azarah Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.1.1.1 2005/11/30 09:58:50 chriswhite Exp $
+
+  20 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/build-new-xslt.diff, openoffice-1.1.4-r1.ebuild:
+  Also add build fix for new libxslt to 1.1.4-r1
+
+  16 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Add -fno-strict-aliasing to CFLAGS to fix problems with Excel import, see
+  bug #112655
+
+  02 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Fix for people having en_US in their LINGUAS, closes bug #111265
+
+  01 Nov 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff:
+  Fix for build problem with not fully translated languages, closes bug #110340.
+
+  31 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Keyworded ~sparc, don't use java though, doesn't work
+
+  29 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff:
+  Remove oohtml2 symlink, it doesn't do anything, ooweb2 is what you want
+
+  28 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff, -files/2.0.0/Filter.xcu,
+  -files/2.0.0/build-beanshell-fix.diff,
+  +files/2.0.0/buildfix-new-xslt.diff,
+  +files/2.0.0/nojava-fix-stringparam.diff, openoffice-2.0.0.ebuild:
+  Implement a proper solution for the --without-java issue
+
+  26 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0.diff, openoffice-2.0.0.ebuild:
+  Desktop files are now handled correctly in package-ooo, so no need anymore
+  for shuffling them around, this also removes the non-harmful error message
+  at the end of the build
+
+  26 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Install man-file into the correct path, fixes bug #110510
+
+  26 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  New ooo-build-release, 2.0.0.1 just adds some minor fixes, see:
+  
+  http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.87.2.3&only_with_tag=ooo-b
+  uild-2-0&view=markup
+  
+  for the full list of changes
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/gentoo-2.0.0.diff, +files/2.0.0/build-beanshell-fix.diff,
+  openoffice-2.0.0.ebuild:
+  Minor build fix for beanshell-project (for a problem which normally does not
+  show up)
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Another shot at the quick fix for -java to make it also work for other 
+  languages than en_US. The only downside remaining atm is that the 
+  descriptions for the filters are not translated. Still a hack though.
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Build fix in regard to setting "en" in LINGUAS
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/Filter.xcu, openoffice-2.0.0.ebuild:
+  Temporary fix for the build without java, see bug #110131. Real solution
+  should replace this asap
+
+  23 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Disable the post-install-scripts of ooo-build which actually do nothing but
+  updating the mime database, which we do later anyway (and which results in
+  sandbox-problems when called from ooo-build), see bug #110209
+
+  22 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Add gtk use-flag for all the people wanting gtk-style (and the industrial
+  icons) but not all the other gnome-stuff (gnome-vfs, lockdown). If using the
+  gnome use-flag the gtk use-flag setting is overridden. Closes bug #110155
+
+  21 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Remove the python use-flag, we are now using system-python by default. Makes
+  no sense to have it anyway, as portage needs python, and
+  --without-system-python just grows the build and currently results in build
+  breakage, see bug #109996
+
+  21 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Add dependency to >=dev-java/java-config-1.2.11-r1 as some people seem to be
+  building OOo 2.0.0 on stable, and the build will fail without the newest
+  version of java-config
+
+*openoffice-2.0.0 (20 Oct 2005)
+
+  20 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +openoffice-2.0.0.ebuild:
+  OpenOffice.org 2.0 is ready! All patches moved to upstream, also ppc is
+  supported now.
+
+  19 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/stlport-vector-ppc-buildfix.diff:
+  remove -D_STLP_DEBUG also from gcc-3.0.mak for PPC
+
+  18 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/stlport-vector-ppc-buildfix.diff:
+  Add missing patch, ooops.
+
+  18 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0_rc3.diff, openoffice-2.0.0_rc3.ebuild:
+  Build fix for stlport on ppc
+
+*openoffice-2.0.0_rc3 (18 Oct 2005)
+
+  18 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/gentoo-2.0.0_rc3.diff, +openoffice-2.0.0_rc3.ebuild:
+  New release candidate, also fix the distcc stuff
+
+  12 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0_rc2.ebuild:
+  Fix build problem with certain languages, see bug #108989
+
+  12 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0_rc2.diff, openoffice-2.0.0_rc2.ebuild:
+  Some more cleanups, also depend on libxml2 if building without java. Also
+  using an updated version of ooo-build-2.0.0_rc2 now.
+
+  12 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/no-ldap-mozilla.diff, files/2.0.0/gentoo-2.0.0_rc2.diff,
+  openoffice-2.0.0_rc2.ebuild:
+  Really fix the build with -ldap
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.0/gentoo-2.0.0_rc2.diff,
+  +files/2.0.0/config_office-openldap-fix.diff, openoffice-2.0.0_rc2.ebuild:
+  First shot at fixing bug #108898, added patch to fix broken OOo
+  configure-script
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0_rc2.ebuild:
+  Fix SRC_URI for the crystal icons
+
+*openoffice-2.0.0_rc2 (11 Oct 2005)
+
+  11 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/gentoo-2.0.0_rc2.diff, +openoffice-2.0.0_rc2.ebuild:
+  Release Candidate for OpenOffice.org 2.0, still masked, should work fine
+  though.
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.5.ebuild:
+  Getting rid of the old mimetype stuff which causes broken behaviour for kde,
+  see bug #92767
+
+  24 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/build-new-xslt.diff, openoffice-1.1.5.ebuild:
+  Fix building without java and libxslt >=1.1.5, closes bug #106174
+
+  19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openoffice-1.1.5.ebuild:
+  Back to ~ppc, sorry for the trouble. My script for listing ebuilds needing
+  stabelizing has a bug and I didn't check enough.
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openoffice-1.1.5.ebuild:
+  Stable on ppc.
+
+*openoffice-1.1.5 (14 Sep 2005)
+
+  14 Sep 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.5/gcc34-nojava-fix.patch, +files/1.1.5/hardened-link.patch,
+  +files/1.1.5/ooffice-wrapper-1.3, +files/1.1.5/freetype-217.patch,
+  +files/1.1.5/STLport-vector.patch, +files/1.1.5/gcc-instlib.patch,
+  +files/1.1.5/gcc34-sal-link-to-libsupc++.diff,
+  +files/1.1.5/gcc34.patch.bz2, +files/1.1.5/getcompver.awk.patch,
+  +files/1.1.5/javafix.patch, +files/1.1.5/newstlportfix.patch,
+  +files/1.1.5/nptl.patch, +files/1.1.5/openoffice-java.patch,
+  +files/1.1.5/pthreadlink-fix.patch, +files/1.1.5/pyunolink-fix.patch,
+  +openoffice-1.1.5.ebuild:
+  New upstream version of the 1.1.x-series. Most important change:
+  OpenOffice.org 1.1.5 now supports the reading of OpenDocument-Files (which
+  will be the default in 2.0)
+
+  23 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4-r1.ebuild:
+  Correct cp -a to cp -pPR for bug #103487
+
+  03 May 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4-r1.ebuild:
+  LIBC set in the environment breaks the build, so we manually unset it now,
+  see bug #91179
+
+  15 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openoffice-1.1.4-r1.ebuild:
+  Into -sparc for the time being, use openoffice-ximian
+
+  13 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4-r1.ebuild:
+  Marking stable on x86 for bug #88863
+
+  12 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  openoffice-1.1.4-r1.ebuild:
+  Stable on ppc.
+
+*openoffice-1.1.4-r1 (12 Apr 2005)
+
+  12 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/crash-objstream.diff, +openoffice-1.1.4-r1.ebuild:
+  Revision bump for security fix, see bug #88863
+
+  09 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Add note about localized helpcontent, closes bug #87199
+
+  30 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Fix for bug #81835, gcc 3.4-patches need to be applied globally, hardened
+  also needs them
+
+  30 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3, openoffice-1.1.4.ebuild:
+  Simplify menu entry installation, see bug #81902, also fix problem with
+  newer findutils, bug#86974
+
+  28 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/getcompver.awk.patch, openoffice-1.1.4.ebuild:
+  Build fix for recent gcc-versions, closes bug #84548
+
+  04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> openoffice-1.1.4.ebuild:
+  Stable on sparc
+
+  24 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3:
+  Add check for mounted /proc to wrapper, OOo will fail without it
+
+  24 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3:
+  Remove unused UPDATEFLAG from wrapper
+
+  23 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/ooffice-wrapper-1.3:
+  Fix for wrapper-file to automatically find all fonts in /usr/share/fonts,
+  also remove some unneeded stuff
+
+  22 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  The ebuild now uses the LINGUAS environment variable to determine for which
+  language to build, the first one in your LINGUAS-settings that is supported
+  is used for this. Please note, that the old LANGUAGE=ENUS|PORT... way does
+  NOT work anymore. While doing this added some more languages to the
+  supported list, see the ebuild for more infos. Also added some dependencies
+  for japanese and chinese builds.
+  
+  This closes a number of bugs: #40896, #44209. #51331, #70302, #71216 and
+  #77128
+
+  18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild, -files/1.1.4/gcc34-nptl-fix.patch,
+  files/1.1.4/nptl.patch:
+  Remove gcc34-nptl-fix as this is now incorporated in the regular nptl-patch
+
+  18 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild, +files/1.1.4/nptl.patch:
+  Some fixes for nptl-systems
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/gcc34-sal-link-to-libsupc++.diff, openoffice-1.1.4.ebuild:
+  Cleanup and sync with openoffice-ximian, also add another patch for gcc 3.4
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Add support for localized helpcontent. For it to work you will have to
+  download the correct helpcontent file from one of the OOo-mirrors (it's in
+  the contrib/helpcontent/ directory, for instance:
+  http://ftp.stardiv.de/pub/OpenOffice.org/contrib/helpcontent/) and put it in
+  you distfiles-directory. Closes bug #30668
+
+  17 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> openoffice-1.1.4.ebuild:
+  Keyworded ~sparc
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Add support for localized helpcontent. For it to work you will have to
+  download the correct helpcontent file from one of the OOo-mirrors (it's in
+  the contrib/helpcontent/ directory, for instance:
+  http://ftp.stardiv.de/pub/OpenOffice.org/contrib/helpcontent/) and put it in
+  you distfiles-directory. Closes bug #30668
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/hardened-link.patch, +files/1.1.4/pthreadlink-fix.patch:
+  Try to fix build problems with hardened-gccs, patches provided by
+  Kevin F. Quinn <co@kevquinn.com> in bug #52642
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Prevent OOo from double installing menu entries, closes bug #53752
+
+  14 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/javafix.patch, openoffice-1.1.4.ebuild:
+  Another fix for a java related build problem, closes bug #77866
+
+  12 Jan 2005; Andreas Proschofsky <suka@gentoo.org> :
+  Mark 1.1.4 stable on x86
+
+  07 Jan 2005; Joseph Jezak <josejx@gentoo.org> openoffice-1.1.4.ebuild:
+  Fixed SRC_URI
+
+  07 Jan 2005; Joseph Jezak <josejx@gentoo.org>
+  +files/1.1.4/STLport-vector.patch, openoffice-1.1.4.ebuild:
+  Added a workaround for compiling openoffice on ppc with gcc 3.4.3. This
+  might break the debug use flag, but I'm not entirely sure. This fixes bug
+  #73940. Also, marked ppc stable for bug #71268.
+
+  01 Jan 2005; Joseph Jezak <josejx@gentoo.org> openoffice-1.1.4.ebuild:
+  Marked ~ppc.  Still only compiles on ppc with gcc 3.4.1 (not 3.4.3).
+
+*openoffice-1.1.4 (28 Dec 2004)
+
+  28 Dec 2004; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.4/gcc-instlib.patch, +files/1.1.4/gcc34-nojava-fix.patch,
+  +files/1.1.4/gcc34-nptl-fix.patch, +files/1.1.4/gcc34.patch.bz2,
+  +files/1.1.4/newstlportfix-patch, +files/1.1.4/ooffice-wrapper-1.3,
+  +files/1.1.4/openoffice-java.patch, +openoffice-1.1.4.ebuild:
+  Revison bump, closes bug #75378 Also includes a fix for build problems
+  with recent freetype versions, taken from Mandrake.
+
+  04 Dec 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries for the ppc files.
+
+  04 Dec 2004; Joseph Jezak <josejx@gentoo.org> openoffice-1.1.3-r1.ebuild:
+  Added missing files for ppc build and marked ~ppc, see bug #71286.
+
+  17 Nov 2004; Jason Wever <weeve@gentoo.org> openoffice-1.1.3.ebuild:
+  Stable on sparc.
+
+  15 Nov 2004; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.1-r1.ebuild, openoffice-1.1.3-r1.ebuild,
+  openoffice-1.1.3.ebuild:
+  Use toolchains-func.eclass instead of gcc.eclass
+
+*openoffice-1.1.3-r1 (14 Nov 2004)
+
+  14 Nov 2004; suka@gentoo.org +files/1.1.3/gcc34-nojava-fix.patch,
+  +files/1.1.3/gcc34-nptl-fix.patch, +files/1.1.3/gcc34.patch.bz2,
+  +files/1.1.3/newstlportfix2.patch, +openoffice-1.1.3-r1.ebuild:
+  This should now compile fine with gcc 3.4.x, the credit for this goes mostly
+  to Hanno Meyer-Thurow (h.mth@web.de), thanks a lot. Java check is also gone
+  as this should now also work fine with other jdks than blackdown.
+
+  12 Nov 2004; suka@gentoo.org openoffice-1.0.3-r2.ebuild,
+  openoffice-1.1.0-r4.ebuild, openoffice-1.1.1-r1.ebuild,
+  openoffice-1.1.3.ebuild:
+  Fix ewarn messages, closes bug #70851
+
+  31 Oct 2004; Jason Wever <weeve@gentoo.org> openoffice-1.1.3.ebuild:
+  Added a fix for sparc and ~sparc keyword.
+
+  23 Oct 2004; suka@gentoo.org openoffice-1.1.3.ebuild:
+  Filter another CFLAG which breaks the build
+
+  15 Oct 2004; suka@gentoo.org openoffice-1.1.3.ebuild:
+  depend on curl only if the appropiate use flag is set
+
+  12 Oct 2004; suka@gentoo.org openoffice-1.1.3.ebuild:
+  mark stable on x86 for bug #63556
+
+  08 Oct 2004; suka@gentoo.org openoffice-1.1.3.ebuild:
+  Builds now also without java, use libart instead of gpc, system zlib and
+  freetype: Other than that: cleanups
+
+*openoffice-1.1.3 (07 Oct 2004)
+
+  07 Oct 2004; suka@gentoo.org +files/1.1.3/gcc-instlib.patch,
+  +files/1.1.3/newstlportfix.patch, +files/1.1.3/ooffice-wrapper-1.3,
+  +files/1.1.3/openoffice-java.patch, +openoffice-1.1.3.ebuild:
+  Version bump, this closes bug #65987
+  
+  27 Sep 2004; <pauldv@gentoo.org> +files/1.1.2/gcc-instlib.patch,
+  openoffice-1.1.2.ebuild:
+  Fix language issues (bug #65379) thanks to Mark Kusch 
+  <foobar@init-0.org> for providing the patch.
+
+  21 Aug 2004; suka@gentoo.org openoffice-1.0.3-r2.ebuild,
+  openoffice-1.1.0-r4.ebuild, openoffice-1.1.0-r5.ebuild,
+  openoffice-1.1.1-r1.ebuild, openoffice-1.1.2.ebuild:
+  add pam to dependencies, close bug #57195
+
+  20 Aug 2004; suka@gentoo.org openoffice-1.1.2.ebuild:
+  fixing some sandbox issues and marking stable on x86, at last
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> openoffice-1.0.3-r2.ebuild,
+  openoffice-1.1.0-r4.ebuild, openoffice-1.1.0-r5.ebuild,
+  openoffice-1.1.1-r1.ebuild, openoffice-1.1.2.ebuild:
+  kill sparc64 use flag
+
+*openoffice-1.1.2 (18 Jun 2004)
+
+  18 Jun 2004; suka@gentoo.org +files/1.1.2/linux-sparc.patch,
+  +files/1.1.2/newstlportfix.patch, +files/1.1.2/ooffice-wrapper-1.3,
+  +files/1.1.2/openoffice-java.patch, +openoffice-1.1.2.ebuild:
+  New version, updating for 1.1.1 should work fine this time
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> openoffice-1.0.3-r2.ebuild,
+  openoffice-1.1.0-r4.ebuild, openoffice-1.1.0-r5.ebuild,
+  openoffice-1.1.1-r1.ebuild:
+  Fix use invocation
+
+  25 May 2004; Jason Wever <weeve@gentoo.org> +files/1.1.1/linux-sparc.patch,
+  openoffice-1.1.1-r1.ebuild:
+  Added patches to fix bug #46089 and added ~sparc keyword to openoffice-1.1.1-r1
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r2.ebuild:
+  removed hardened-gcc check and CC variable modification
+
+  05 May 2004; suka@gentoo.org openoffice-1.1.0-r4.ebuild,
+  openoffice-1.1.0-r5.ebuild, openoffice-1.1.1-r1.ebuild:
+  filter another evil CFLAG
+
+  05 May 2004; suka@gentoo.org -openoffice-1.0.3-r1.ebuild,
+  openoffice-1.0.3-r2.ebuild, openoffice-1.1.0-r4.ebuild,
+  openoffice-1.1.0-r5.ebuild, openoffice-1.1.1-r1.ebuild:
+  Dependency fix
+
+*openoffice-1.0.3-r2 (05 May 2004)
+
+  05 May 2004; suka@gentoo.org +files/1.0.3/neon.patch,
+  +openoffice-1.0.3-r2.ebuild:
+  Ancient versions also like their share of security love...
+
+*openoffice-1.1.0-r5 (25 Apr 2004)
+*openoffice-1.1.0-r4 (25 Apr 2004)
+*openoffice-1.1.1-r1 (25 Apr 2004)
+
+  25 Apr 2004; suka@gentoo.org -openoffice-1.1.0-r2.ebuild,
+  -openoffice-1.1.0-r3.ebuild, +openoffice-1.1.0-r4.ebuild,
+  +openoffice-1.1.0-r5.ebuild, +openoffice-1.1.1-r1.ebuild,
+  -openoffice-1.1.1.ebuild:
+  revision bump for security fix
+
+  24 Apr 2004; suka@gentoo.org +files/1.1.0/neon.patch,
+  +files/1.1.1/neon.patch, openoffice-1.1.0-r2.ebuild,
+  openoffice-1.1.0-r3.ebuild, openoffice-1.1.1.ebuild:
+  Security fix, see:
+  http://secunia.com/advisories/11364/
+
+  16 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.1.ebuild:
+  Filter out LC_ALL as it breaks things
+
+  11 Apr 2004; suka@gentoo.org openoffice-1.1.1.ebuild,
+  files/1.1.1/build.patch:
+  Add temporary patch provided by scout@scoutheeten.com on bug #46945 to work 
+  around build breakage caused by recent sandbox problems in portage.
+
+  09 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.1.ebuild:
+  Change the source file. As the only change in the source file concerns
+  building under windows we will not bump the version
+
+  01 Apr 2004; suka@gentoo.org openoffice-1.1.1.ebuild,
+  files/1.1.1/ooffice-wrapper-1.3:
+  User settings migration does not work as there have been some changes to the
+  user install :-( Removing the migration stuff, you will have to redo your
+  settings after upgrade
+
+*openoffice-1.1.1 (31 Mar 2004)
+
+  31 Mar 2004; suka@gentoo.org openoffice-1.1.1.ebuild,
+  files/1.1.1/newstlportfix.patch, files/1.1.1/nptl.patch,
+  files/1.1.1/ooffice-wrapper-1.3, files/1.1.1/openoffice-java.patch:
+  New version masked for now, as we do some further testing
+
+  28 Mar 2004; suka@gentoo.org openoffice-1.1.1_rc1.ebuild:
+  Add some missing dependencies
+
+  28 Mar 2004; root <root@gentoo.org> openoffice-1.1.0-r2.ebuild:
+  Stable on sparc thanks to stable gcc-3.3.3 :)
+
+*openoffice-1.1.1_rc1 (07 Mar 2004)
+
+  07 Mar 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.1_rc1.ebuild,
+  openoffice-1.1.1b.ebuild:
+  Add a new release candidate. Remove the old beta as the versioning was wrong
+
+  10 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r3.ebuild,
+  openoffice-1.1.1b.ebuild, files/1.1.0/openoffice-java.patch,
+  files/1.1.1b/openoffice-java.patch:
+  A patch to fix compiling with sun-jdk. Thanks to jgonzalez@opentechnet.com in
+  bug #40942
+
+*openoffice-1.1.1b (08 Feb 2004)
+
+  08 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.1b.ebuild,
+  files/1.1.1b/fixed-gcc.patch, files/1.1.1b/newstlportfix.patch,
+  files/1.1.1b/no-mozab.patch, files/1.1.1b/nptl.patch,
+  files/1.1.1b/ooffice-wrapper-1.3:
+  A new upstream prerelease. Hopefully it compiles correctly ;-)
+
+  05 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r3.ebuild:
+  Change the installation database so that the desktop bindings will not get
+  installed for users. They are allready installed globally
+
+  03 Feb 2004; suka <suka@gentoo.org> openoffice-1.1.0-r3.ebuild:
+  This update further simplifies the ebuild and aims to fix the distcc problems.
+  Even better parallel build COULD now work for you, at least it does for me, as
+  it is not tested enough you will have to explicitely force the ebuild to build
+  in parallel / use more cpus. If you dare to try out emerge the ebuild like:
+  
+  'ECPUS="n" emerge openoffice'
+  
+  where n has to be exchanged with the number of processes / CPUs you want to
+  use. No guarantee whatsoever that it will work for you :-)
+
+  24 Jan 2004; <paul@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild:
+  Cleaning up old versions
+
+*openoffice-1.1.0-r3 (24 Jan 2004)
+
+  24 Jan 2004; suka <suka@gentoo.org> openoffice-1.1.0-r2.ebuild,
+  openoffice-1.1.0-r3.ebuild:
+  Big rework of the ebuild:
+  
+  *) Convert build system to bash 
+  *) This also removes the blocker on app-arch/star
+  *) Corrected java check (we look now explecitely for blackdown-jdk,
+  see bug #38646)
+  *) CXXFLAGS are now actually applied
+  *) Dropped virtualmake
+  *) Lots of cleanups
+  
+  This is all in openoffice-1.1.0-r3, -r2 only got the java check-fix
+
+  17 Jan 2004; <suka@gentoo.org> openoffice-1.1.0-r2.ebuild:
+  Compile fixes especially for Pentium4, also closes bug #32418 (broken menu
+  entry)
+
+  14 Nov 2003; Sven Blumenstein <bazik@gentoo.org> openoffice-1.1.0-r2.ebuild:
+  Removed -r3 and added the change to -r2 to make seemant happy
+
+*openoffice-1.1.0-r3 (14 Nov 2003)
+
+  14 Nov 2003; Sven Blumenstein <bazik@gentoo.org> openoffice-1.1.0-r3.ebuild,
+  files/1.1.0/openoffice-1.1.0-sparc64-fix.patch:
+  New revision. Added a patch which lets it build on sparc64.
+  This is no offical patch but it works for me. Please test 
+  and report back directly to me - thanks!
+
+*openoffice-1.1.0-r2 (09 Nov 2003)
+
+  09 Nov 2003; <paul@gentoo.org> openoffice-1.1.0-r2.ebuild:
+  Add -fno-strict-aliasing to make excel import work
+
+  28 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild:
+  Add predict for stupid gconf sandbox error
+
+  25 Oct 2003; <paul@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild:
+  Fix error in the pentium4+gcc3.2 check
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild:
+  Depend on newest findutils so that the xargs problem is aleviated at least
+  temporarilly
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild:
+  Add kernel 2.6.0 patch
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild:
+  Do some flag-o-matic to prevent -march=pentium4 from failing on 3.2 compilers
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild, openoffice-1.1_rc3.ebuild:
+  fixed DUTCH 03 -> 31
+
+  19 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild, openoffice-1.1_rc3.ebuild:
+  Fix jdk dependency to depend on 1.4.1 or greater
+
+*openoffice-1.1.0-r1 (17 Oct 2003)
+
+  17 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0-r1.ebuild,
+  openoffice-1.1.0.ebuild, files/1.1.0/nptl.patch:
+  Add cretin@gentoo.org's nptl patch. This should fix compilation on nptl
+  systems and 2.6.0 kernel systems. Further mark 1.1.0 stable.
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r1.ebuild:
+  changed hardened-gcc flags
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r1.ebuild:
+  added new hppa dependent hardened-gcc flags
+
+  08 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0.ebuild:
+  Fix ccache test so that the old style ccache works again (if replaced by elif)
+
+  07 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0.ebuild:
+  Add a hack to make nationalised builds work
+
+*openoffice-1.1.0 (03 Oct 2003)
+
+  03 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0.ebuild,
+  openoffice-1.1_beta2-r1.ebuild, openoffice-1.1_rc1.ebuild,
+  openoffice-1.1_rc2.ebuild, files/1.1_beta2/newstlportfix.patch,
+  files/1.1_beta2/no-mozab.patch, files/1.1_beta2/ooffice-wrapper-1.3,
+  files/1.1_beta2/openoffice-xrender.patch, files/1.1_rc1/newstlportfix.patch,
+  files/1.1_rc1/no-mozab.patch, files/1.1_rc1/ooffice-wrapper-1.3,
+  files/1.1_rc1/openoffice-xrender.patch, files/1.1_rc2/newstlportfix.patch,
+  files/1.1_rc2/no-crashrep.patch, files/1.1_rc2/no-mozab.patch,
+  files/1.1_rc2/ooffice-wrapper-1.3, files/1.1_rc2/openoffice-xrender.patch:
+  Add the openoffice release version. It should be stable very soon. Also remove
+  all but the latest release candidate. rc3 will be removed as 1.1.0 is marked
+  stable
+
+  19 Sep 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1_rc2.ebuild,
+  openoffice-1.1_rc3.ebuild:
+  Fix stupid mistake in the german language number
+
+  07 Sep 2003; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r1.ebuild:
+  added hardened-gcc exclude flags
+
+  03 Sep 2003; Jason Wever <weeve@gentoo.org> openoffice-1.0.3-r1.ebuild,
+  files/1.0.3/openoffice-1.0.1-sparc.patch.bz2,
+  files/1.0.3/openoffice-1.0.3-sparc-gentoo.patch:
+  Added ~sparc to keywords. This fixes bug #10381 and finally gets sparc going
+  on OO. Many thanks to "The Shrink" who's asm patch made this possible (see
+  case notes for more details).
+
+*openoffice-1.1_rc3 (20 Aug 2003)
+
+  20 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1_rc3.ebuild,
+  files/1.1_rc3/fixed-gcc.patch, files/1.1_rc3/newstlportfix.patch,
+  files/1.1_rc3/no-crashrep.patch, files/1.1_rc3/no-mozab.patch,
+  files/1.1_rc3/ooffice-wrapper-1.3:
+  New upstream version
+
+  17 Aug 2003; <paul@gentoo.org> openoffice-1.1_rc1.ebuild:
+  Also fix mirrors in rc1
+
+  17 Aug 2003; <paul@gentoo.org> openoffice-1.1_rc2.ebuild:
+  Use the updated openoffice mirror list
+
+*openoffice-1.1_rc2 (12 Aug 2003)
+
+  12 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1_rc2.ebuild,
+  files/1.1_rc2/newstlportfix.patch, files/1.1_rc2/no-crashrep.patch,
+  files/1.1_rc2/no-mozab.patch, files/1.1_rc2/ooffice-wrapper-1.3,
+  files/1.1_rc2/openoffice-xrender.patch:
+  A new release candidate. This ebuild should be faster as it does now stop
+  building all languages and instead uses a large case statement to find out
+  which language needs to be built. For that reason it also should take less
+  diskspace. Further it does not built the crashreport application as it is
+  currenlty broken and would introduce a dependency on gtk so I don't want to go
+  and make it work.
+
+  07 Aug 2003; <paul@gentoo.org> openoffice-1.0.3-r1.ebuild,
+  openoffice-1.1_beta2-r1.ebuild, openoffice-1.1_rc1.ebuild:
+  Have the builds block on star as it is not compatible enough to gnutar
+
+  27 Jul 2003; <paul@gentoo.org> openoffice-1.1_rc1.ebuild:
+  Add dependency on gtk+ to rc1 (fixes bug #25297)
+
+*openoffice-1.1_rc1 (20 Jul 2003)
+
+  20 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.0.2-r1.ebuild,
+  openoffice-1.0.2.ebuild, openoffice-1.1_beta2.ebuild,
+  openoffice-1.1_rc1.ebuild, files/1.1_rc1/newstlportfix.patch,
+  files/1.1_rc1/no-mozab.patch, files/1.1_rc1/ooffice-wrapper-1.3,
+  files/1.1_rc1/openoffice-xrender.patch:
+  Add the release candidate, and clean up some old versions
+
+  08 Jul 2003; <paul@gentoo.org> openoffice-1.1_beta2-r1.ebuild:
+  Block on glibc-2.3.1 as it won't work (bug #24085 and oo bug #10210)
+
+  30 Jun 2003; Brad Laue <brad@gentoo.org> openoffice-1.1_beta2-r1.ebuild:
+  Add ooweb symlink
+
+*openoffice-1.1_beta2-r1 (30 Jun 2003)
+
+  30 Jun 2003; Brad Laue <brad@gentoo.org> openoffice-1.1_beta2-r1.ebuild:
+  Correct an issue where KDE menu items show up twice - directory name changed
+  on us.
+
+  20 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1_beta2.ebuild,
+  files/1.1_beta2/ooffice-wrapper-1.3:
+  Fix version problem that slipped through
+
+*openoffice-1.1_beta (18 Jun 2003)
+
+  18 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.0.3-r1.ebuild,
+  openoffice-1.1_beta.ebuild, openoffice-1.1_beta2.ebuild:
+  Fix small problem in 1.0.3 ebuild concerning oopadmin not working. Also added
+  a new openoffice-1.1_beta2 ebuild. This obsoletes the never working beta1,
+  which is now removed. Note that beta2 does not build with gcc-3.3.
+
+*openoffice-1.0.3-r1 (25 May 2003)
+
+  25 May 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.0.3-r1.ebuild,
+  files/1.0.3/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch:
+  Apply a patch found from openoffice bugzilla that should fix the printing
+  problem that caused an 1.0.3.1 release for the binary version.
+
+*openoffice-1.0.3 (07 Apr 2003)
+  07 Apr 2003; Seth Chandler <sethbc@gentoo.org>;
+  added 1.0.3 to portage, but its not a good bet becuase printing doesn't work
+
+*openoffice-1.1beta (03 Apr 2003)
+  03 Apr 2003; Seth Chandler <sethbc@gentoo.org>;
+  do not build this package, it doesn't yet work
+
+*openoffice-1.0.2-r2 (09 Apr 2003)
+
+  02 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*openoffice-1.0.2-r1 (31 Mar 2003)
+
+  31 Mar 2003; Seth Chandler <sethbc@gentoo.org>; 
+  openoffice-1.0.2-r1.ebuild,
+  files/1.0.2/openoffice-1.0.2-default-fonts.patch,
+  files/1.0.2/openoffice-1.0.2-ft-antialias-advice.patch:
+  big openoffice cleanups, introduction of 1.0.2-r1 with better AA text support
+  =)
+
+*openoffice-1.0.1-r3 (12 Dec 2002)
+
+  12 Jan 2003; Seth Chandler <sethbc@gentoo.org> openoffice-1.0.1-r3.ebuild
+  Fixed several java problems, as well as a generic fix for the libstdc++ 
+  stuff.  Should fix most of the open compile error bugs in bugzilla.
+
+  23 Dec 2002; Seth Chandler<sethbc@gentoo.org> openoffice-1.0.1.ebuild-r3 :
+  Put in an addpredict to predict writes to /user and /share (same fix
+  applied to openoffice-bin ebuild).  I'm looking for a permanent fix to this
+  (i.e. not one which uses addpredict) and will update again when its ready =)  
+
+  12 Dec 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-1.0.1.ebuild-r3 :
+  Fix to work with a gcc-config enabled gcc ...
+
+*openoffice-1.0.1-r2 (02 Dec 2002)
+
+  02 Dec 2002; Seth Chandler <sethbc@gentoo.org> openoffice-1.0.1-r2.ebuild:
+  Add -r2 to portage.  I'm requiring jdk 1.4.0 becuase i'm not yet sure if 
+  it works with a 1.3 jdk (some fixes applied to make blackdown 1.4 beta build
+  may break 1.3.X jdk's).  sun-jdk is still unsupported and will definately
+  break the compile.  The wrapper script has been updated to do ld_preload
+  for fonts (ooffice-wrapper-1.1) and 2 other patches were added:
+  openoffice-1.0.1-use-libstdc++-5.0.1.patch: for people running ~arch and
+  openoffice-1.0.1-fix-jdk-1.4.0.patch: which fixes the aformentioned java
+  bugs.  Please please please submit any bugs you find to me ASAP ;-)
+
+  02 Dec 2002; Seth Chandler <sethbc@gentoo.org> openoffice-1.0.1-r1.ebuild:
+  Fix Az's freetype change so it actually works :-)
+
+  01 Dec 2002; Martin Schlemmer <azarah@gentoo.org> openoffice-1.0.1.ebuild-r1 :
+  Change it to use freetype-2.1.2.tar.bz2, as I was braindead at the time
+  and used the .tar.gz.  Also convert to use epatch().
+
+*openoffice-1.0.1-r1 (22 Sep 2002)
+
+  05 Nov 2002; Mark Guertin <gerk@gentoo.org> openoffice-1.0.1-r1.ebuild :
+  added ppc to keywords, set it to require latest glibc (required for ppc) 
+  and at least gcc 3.2
+
+  03 Nov 2002; Jon Nall <nall@gentoo.org> openoffice-1.0.1-r1.ebuild :
+  added ~ppc to KEYWORDS
+
+  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> openoffice-1.0.1-r1.ebuild :
+  Added IUSE.
+
+  22 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Enable bytecode interpreter, and build against freetype-2.1.2,
+  based on great work from Paul de Vrieze <gentoo-bugs@devrieze.net>.
+  This should close bug #8096.
+
+  17 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Fix openoffice-1.0.1-parallel-build.patch, as stupid
+  cvs expanded the keywords in it.
+
+*openoffice-1.0.1 (15 Sep 2002)
+
+  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> openoffice-1.0.1.ebuild :
+  Added IUSE.
+
+  15 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.  New install method.  Install menu shortcuts.
+  Lots of cleanups and other stuff I forgot.
+
+*openoffice-1.0.0-r2 (15 Jul 2002)
+
+  15 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  General updates to handle changes in our gcc ebuilds;
+  Support for gcc-3.1.1.  Also updated the registry .. old
+  had version 641 in title, etc.
+
+  06 Aug 2002; Preston A. Elder <prez@gentoo.org> :
+  Fixed read_ins.pl to be able make all DONT_DELETE directories
+  explicitly, and to put quotes around most references, as some
+  contain a directory name with spaces.
+
+*openoffice-1.0.0-r1 (7 Jun 2002)
+
+  7 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Update to build with gcc-3.1.
+
+*openoffice-1.0.0 (21 May 2002)
 
 *openoffice-641d (24 Apr 2002)
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6bac171e93b5..20a493161a39 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,45 +1,44 @@
-MD5 7ec7b2a4bccf2a8b47afe171def93125 openoffice-1.0.3.ebuild 18329
-MD5 2bcfc01a7018c7309e5afe484897f1ba openoffice-1.1_beta.ebuild 16779
-MD5 042262baad13a7a5a5b17a6fe1cf2e85 manifest 2178
-MD5 460ff929624efb91c3bd1b41d72bd27d openoffice-1.0.2-r2.ebuild 20934
-MD5 3d1de45989289e7ec5223c0c8cb45868 openoffice-1.0.2.ebuild 18274
-MD5 58f842fee23dd5bb144251bd3543016e ChangeLog 4519
-MD5 142125805450e0dff55c8797670fba2a openoffice-1.0.2-r1.ebuild 18438
-MD5 370c4f2c49610b60253acee9d14c0c33 files/digest-openoffice-1.1_beta 197
-MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2 260
-MD5 c56306dc30d42e900fc11e14338fee9f files/digest-openoffice-1.0.3 260
-MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2-r1 260
-MD5 b58bd85a59e18b13fe10d416940da3de files/digest-openoffice-1.0.2-r2 1170
-MD5 271539dafab707398e9b806eef8f250a files/1.1_beta/ooffice-wrapper-1.2 8220
-MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta/openoffice-xrender.patch 330
-MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta/newstlportfix.patch 10531
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.2/openoffice-1.0.1-fix-asm.patch 2207
-MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.2/freetype-2.1.3.patch 1367
-MD5 271539dafab707398e9b806eef8f250a files/1.0.2/ooffice-wrapper-1.2 8220
-MD5 bda06da1ebc54aa07da68831cb77480f files/1.0.2/openoffice-1.0.1-dont-unset-home.patch 1000
-MD5 92e731a066e45536e55b07894f18096c files/1.0.2/ooffice-wrapper 7460
-MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.2/openoffice-1.0.1-xinteraction-fix.patch 1052
-MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.2/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.2/openoffice-1.0.2-default-fonts.patch 15285
-MD5 3834566292e23e2832f625e0b5accf85 files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.2/openoffice-1.0.1-no-mozab.patch 2496
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.2/openoffice-errno.patch 291
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.2/openoffice-1.0.1-compiler-flags.patch 954
-MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.2/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
-MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.2/openoffice-1.0.2-ft-antialias-advice.patch 596
-MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
-MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
-MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
-MD5 bda06da1ebc54aa07da68831cb77480f files/1.0.3/openoffice-1.0.1-dont-unset-home.patch 1000
-MD5 92e731a066e45536e55b07894f18096c files/1.0.3/ooffice-wrapper 7460
-MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
-MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
-MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
-MD5 aae1ec77961ab6273026a12a6cf9804c files/1.0.3/openoffice-1.0.2-default-fonts.patch 15285
-MD5 3834566292e23e2832f625e0b5accf85 files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch 10485
-MD5 d1194605b25954eaa73f74d9d3982a9b files/1.0.3/openoffice-1.0.1-no-mozab.patch 2496
-MD5 d61186f38b5e704b69af03ce33a9053d files/1.0.3/openoffice-errno.patch 291
-MD5 3fe10dea0d52c0779a9929b021d84e43 files/1.0.3/openoffice-1.0.1-compiler-flags.patch 954
-MD5 edb031b5b0c87b33ff0cd9b5a6fc4a79 files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch 14774
-MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch 596
+MD5 2028d1a080a66f4ff191da67b3a4f15b ChangeLog 34024
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
+MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
+MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
+MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
+MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
+MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
+MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650
+MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393
+MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.5/gcc34-nojava-fix.patch 329
+MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.5/gcc34-sal-link-to-libsupc++.diff 405
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
+MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
+MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785
+MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
+MD5 2871ab2688ee93c187ff98445e5ea0ca files/2.0.0/buildfix-new-xslt.diff 1336
+MD5 77216afa8932c17cbbc581728ea334b7 files/2.0.0/gentoo-2.0.0.diff 1937
+MD5 1aff6980adcc3f4704c3ef5959e0f165 files/2.0.0/nojava-fix-stringparam.diff 1682
+MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
+MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
+MD5 039f6964d10fd36776620f93b84705dd files/digest-openoffice-2.0.0 478
+MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
+MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
+MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
+MD5 a692cb616c3d2887beb403a4ad3e08f8 openoffice-2.0.0.ebuild 7142
diff --git a/app-office/openoffice/files/1.1.4/javafix.patch b/app-office/openoffice/files/1.1.4/javafix.patch
index f5c242ef34e2..e2d9ccf723b1 100644
--- a/app-office/openoffice/files/1.1.4/javafix.patch
+++ b/app-office/openoffice/files/1.1.4/javafix.patch
@@ -1,27 +1,27 @@
---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx	24 Apr 2003 13:20:29 -0000	1.4

-+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx	27 Dec 2004 09:35:38 -0000

-@@ -184,7 +184,12 @@

- 	{

- 		jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");

- 		if(id)

--			return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));

-+			return copyArrayAndDelete(

-+                t.pEnv,

-+                (jobjectArray)t.pEnv->GetObjectField( object, id),

-+                static_cast< const ::rtl::OUString* >( NULL ),

-+                static_cast< const java_lang_String* >( NULL )

-+            );

- 	} //t.pEnv

- 	return Sequence< ::rtl::OUString>();

- }

---- connectivity/source/inc/java/tools.hxx	1 Nov 2002 10:58:49 -0000	1.5

-+++ connectivity/source/inc/java/tools.hxx	27 Dec 2004 09:35:42 -0000

-@@ -101,7 +101,7 @@

- 

- 	java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);

- 

--    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)

-+    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )

- 	{

-                 ::com::sun::star::uno::Sequence< T > xOut;

- 		if(_Array)

+--- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
++++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+@@ -184,7 +184,12 @@
+ 	{
+ 		jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;");
+ 		if(id)
+-			return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL));
++			return copyArrayAndDelete(
++		t.pEnv,
++		(jobjectArray)t.pEnv->GetObjectField( object, id),
++		static_cast< const ::rtl::OUString* >( NULL ),
++		static_cast< const java_lang_String* >( NULL )
++		);
+ 	} //t.pEnv
+ 	return Sequence< ::rtl::OUString>();
+ }
+--- connectivity/source/inc/java/tools.hxx
++++ connectivity/source/inc/java/tools.hxx
+@@ -101,7 +101,7 @@
+ 
+ 	java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ 
+-    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const  T& _rD1,const  JT& _rD2)
++    template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* )
+ 	{
+                 ::com::sun::star::uno::Sequence< T > xOut;
+ 		if(_Array)
diff --git a/app-office/openoffice/files/1.1.4/nptl.patch b/app-office/openoffice/files/1.1.4/nptl.patch
index 7a17bcc79fdc..996a7ceec67d 100644
--- a/app-office/openoffice/files/1.1.4/nptl.patch
+++ b/app-office/openoffice/files/1.1.4/nptl.patch
@@ -11,11 +11,15 @@
  	InfoMemoryTypeAccess( t_short );
 *** sal/osl/unx/process.c.orig
 --- sal/osl/unx/process.c
-@@ -1020,7 +1020,7 @@
- #if defined(LINUX)
-             /* mfe: linux likes to have just one thread when the exec family is called */
-             /*      this np function has this purpose ...                              */
+@@ -1017,11 +1017,6 @@
+ 			for (i = 0; data.m_pszEnv[i] != NULL; i++)
+ 	     		putenv(data.m_pszEnv[i]);
+ 
+-#if defined(LINUX)
+-            /* mfe: linux likes to have just one thread when the exec family is called */
+-            /*      this np function has this purpose ...                              */
 -            pthread_kill_other_threads_np();
-+            /*pthread_kill_other_threads_np();*/
- #endif
+-#endif
              OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
+      
+ 			/* Connect std IO to pipe ends */
diff --git a/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
index bb980f3f6082..c12d92e91bd1 100644
--- a/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
+++ b/app-office/openoffice/files/1.1.4/ooffice-wrapper-1.3
@@ -43,6 +43,10 @@ if [ -e "$HOME/.sversionrc" ] ; then
      sed -i -e s/1.1.3/1.1.4/g $HOME/.sversionrc
 fi
 
+if [ ! -f "/proc/version" ] ; then
+    echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---"
+fi
+
 ###
 ### Get user settings directory from ~/.sversionrc and echo directory name to stdout
 ### get_settings_dir <Version>
@@ -76,41 +80,18 @@ if [ $? -eq 2 ] ; then
 fi
 
 ##
-## Unset SESSION_MANAGER if gnome-session is the session manager
-## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
+## Add /usr/share/fonts to font search path
 ##
-SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
-if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
 
-  SESMGR="`readlink -f /proc/$SMPID/exe`"
-  case "$SESMGR" in
-      /usr/bin/gnome-session*)
-      echo "Gnome session manager detected - session management disabled"
-      unset SESSION_MANAGER
-      ;;
-  esac
-fi
+# Default font path.  This is used if SAL_FONTPATH_PRIVATE is not defined.
 
-##
-## Add known Debian fonts locations to search path
-##
-## Please report if you have problems with fonts, or know of non-defoma integrated packages that place fonts in other
-## paths.
-##
-
-# Default font path.  This is used if SAL_FONTPATH_USER is not defined.
-DEBOO_FONTPATH="/usr/lib/X11/fonts/misc/;/usr/lib/X11/fonts/cyrillic/;\
-/usr/lib/X11/fonts/100dpi/:unscaled;/usr/lib/X11/fonts/75dpi/:unscaled;\
-/usr/lib/X11/fonts/Type1/;/usr/lib/X11/fonts/CID;/usr/lib/X11/fonts/Speedo/;\
-/usr/lib/X11/fonts/100dpi/;/usr/lib/X11/fonts/75dpi/;\
-/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType;\
-/usr/lib/X11/fonts/TrueType;\
-/usr/share/fonts/truetype/kochi;\
-/usr/lib/X11/fonts/TrueType/larabie-straight;\
-/usr/lib/X11/fonts/TrueType/larabie-uncommon"
+GENTOO_FONTPATH=""
+for d in `find /usr/share/fonts -maxdepth 1 -mindepth 1 -type d` ; do
+    GENTOO_FONTPATH="$GENTOO_FONTPATH;$d"
+done
 
-SAL_FONTPATH_USER=${SAL_FONTPATH_USER:-"$DEBOO_FONTPATH"}
-export SAL_FONTPATH_USER
+SAL_FONTPATH_PRIVATE=${SAL_FONTPATH_PRIVATE:-"$GENTOO_FONTPATH"}
+export SAL_FONTPATH_PRIVATE
 
 ## search LOCALE
 if [ -n "$LC_ALL" ]; then
@@ -138,15 +119,6 @@ if [ -z "$OOHOME" ] ; then
   if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \
     grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then
 
-#	Do not take old settings as migration results in broken behaviour
-#
-#	UPDATEFLAG=""
-#    if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
-#      OOHOME="$oldhome"
-#      echo "Using settings from 1.0.3: /${oldhome}"
-#      /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
-#		UPDATEFLAG="-update:/$oldhome"
-#    fi
       # first install
       OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
              sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
@@ -159,14 +131,11 @@ if [ -z "$OOHOME" ] ; then
       fi
 
       echo "running openoffice.org setup..."
-      if ! /opt/OpenOffice.org/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
+      if ! /opt/OpenOffice.org/program/setup -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
         echo "setup failed.. abort"
         exit 1
       fi
 
-
-#    fi
-    
     echo "Setup complete.  Running openoffice.org..."
 
 else
@@ -187,8 +156,8 @@ if [ $# = 0 ]; then
     oodraw) set -- private:factory/sdraw;;
     ooimpress) set -- private:factory/simpress;;
     oomath) set -- private:factory/smath;;
+    ooweb) set -- private:factory/swriter/web;;
     oowriter) set -- private:factory/swriter;;
-    oohtml) set -- private:factory/swriter/web;;
     oomaster) set -- private:factory/swriter/Global;;
   esac
 fi
@@ -196,23 +165,6 @@ fi
 ## Previous dead installation?
 [ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
 
-# There is no locale import file
-## Change the ooLocale key in SETUPFILE acording to LOCALE
-#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
-#	cat >${TMPFILE} <<EOF
-#<?xml version="1.0" encoding="UTF-8"?>
-#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
-# <node oor:name="L10N">
-#  <prop oor:name="ooLocale" oor:type="xs:string">
-#   <value>$LOCALEOO</value>
-#  </prop>
-# </node>
-#</oor:node>
-#EOF
-#	ooconfigimport $TMPFILE >/dev/null
-#	rm -f ${TMPFILE}
-#}
-
 # Check whether the programs actually link to anything, or are from an old
 # version.
 
@@ -243,37 +195,3 @@ case `basename $0` in
     *) exec "$OOHOME/soffice" "$@"
     ;;
 esac
-## Changelog
-# 2003/04/01 halls
-#   * Version 1.1beta
-# 2003/02/03 halls
-#   * Check for nonexistent ooLocale every run
-# 2003/01/09 halls
-#   * Version 1.0.2
-# 12/15 saviot
-#   * Change ooLocale at startup in Setup.xml
-#   <ooLocale cfg:type="string"/> doesn't work for help.
-# 12/03 challs
-#   * Add Debian font paths to user font path
-# 11/14 saviot
-#   * correct handling of UI language
-#   * don't change Linguistic.xml after first startup(#168780)
-#   * TODO: provide better defaults on first startup
-# 10/03 challs
-#   * Fix use with LC_ALL
-# 07/10 challs
-#   * use 1.0.1 directory and improve error checking
-# 07/02 challs
-#   * use readlink in /proc/PID/exe to get
-#     real session manager name
-# 06/12 challs
-#   * merge into main package
-#   * change $@ to "$@"
-#   * source configuration file: 
-#       /etc/openoffice/openoffice.conf
-# 06/12 mquinson
-#   * strace only when DEBUG is set to yes
-#   * readd the $@ to pass the args to soffice
-# 06/06 mquinson
-#   * Make sure the OLDLOCALE is never empty
-#   * handle the case where the locale is C
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
index 495ac50f5f45..4f051187135a 100644
--- a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
@@ -1,12 +1,50 @@
 --- patches/OOO_2_0/apply 
 +++ patches/OOO_2_0/apply
-@@ -496,6 +496,9 @@
- buildfix-ucb-without-stlport4.diff
- buildfix-svx-without-stlport4.diff
+@@ -742,6 +742,9 @@
+ default-system-fpicker.diff
+ # Fix for build breakage on PPC
+ stlport-ppc-buildfix.diff
++# Fix for broken filters without java i#56619
++nojava-fix-stringparam.diff
++buildfix-new-xslt.diff
  
-+# Fix beanshell dep
-+build-beanshell-fix.diff
-+
- [ ArkOnly ]
- system-db-4.3-use-lpthread.diff
- # FIXME this is generally useful -- currently applied here only because
+ #
+ # NOTE: 64 bit OOo is work in progress!
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -50,7 +50,7 @@
+ 	mkdir -p $MANDIR/man1
+ 	cp -f $OOBUILDDIR/ooo-wrapper$BINSUFFIX $PREFIX/bin
+ 	chmod +x $PREFIX/bin/ooo-wrapper$BINSUFFIX
+-	for app in base calc draw fromtemplate html impress math web writer ffice; do
++	for app in base calc draw fromtemplate impress math web writer ffice; do
+ 		ln -sf ooo-wrapper${BINSUFFIX} $PREFIX/bin/oo${app}${BINSUFFIX}
+ 		if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zSUSE" -o "z$VENDORNAME" = "zPLD" \
+ 		        -o "z$VENDORNAME" = "zDebian"; then
+@@ -124,11 +124,11 @@
+   	# Menu icons are currently made in debian/rules
+ 	;;
+   *)
+-	mkdir -p $OODESTDIR/opt/gnome/share/applications
++	mkdir -p $OODESTDIR/usr/share/applications
+ 	cd $TOOLSDIR/desktop
+ 	for source in *.desktop; do
+ 	    dest=`echo $source | sed "s|.desktop\$||"`
+-	    dest="$OODESTDIR/opt/gnome/share/applications/$dest$BINSUFFIX.desktop"
++	    dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop"
+ 	    add_version=
+ 	    test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
+ 	    sed -e "s|@BINSUFFIX@|$BINSUFFIX|g
+@@ -215,8 +215,10 @@
+ 
+ echo "Done";
+ 
+-# Java-disabled builds do not create help
+-if test -d $OOINSTDIR/help; then
++# Check if the English help is installed and is in the main package (is first on the list)
++# Note that Java-disabled builds do not create help at all.
++if test -f $OOINSTDIR/help/en/sbasic.cfg -a \
++        "`for lang in $OOO_LANGS_LIST ; do echo $lang ; break ; done`" = "en-US" ; then
+     echo "Removing duplicated English help..."
+   
+     for lang in $OOO_LANGS_LIST ; do
diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0 b/app-office/openoffice/files/digest-openoffice-2.0.0
index 84c205801cc2..a363fb788151 100644
--- a/app-office/openoffice/files/digest-openoffice-2.0.0
+++ b/app-office/openoffice/files/digest-openoffice-2.0.0
@@ -3,5 +3,5 @@ MD5 8aa0c6463dc517723f9f4d4a3f0191a0 OOO_2_0_0-lang.tar.bz2 33103772
 MD5 a6f4b2ef7d1fae927cedbd45e6dd403d OOO_2_0_0-system.tar.bz2 19324775
 MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
 MD5 f34404f8dc6123aca156d203c37e3e5d libwpd-0.8.3.tar.gz 482757
-MD5 e12441b6fa94576760e7ef060530b475 ooo-build-2.0.0.tar.gz 4220677
+MD5 87f4f018023c03927bab935cc122158e ooo-build-2.0.0.1.tar.gz 4182998
 MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872
diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
index 679814941332..f7c02cdafe04 100644
--- a/app-office/openoffice/openoffice-1.1.4-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.1 2005/04/12 18:05:35 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:51 chriswhite Exp $
 
 # Notes:
 #
@@ -24,7 +24,7 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils fdo-mime flag-o-matic toolchain-funcs
 
 IUSE="curl hardened java kde nptl zlib"
 
@@ -42,7 +42,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc -sparc"
 
 RDEPEND="!app-office/openoffice-bin
 	virtual/x11
@@ -251,12 +251,14 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/getcompver.awk.patch
 
 	# Security fix, bug #88863
-	epatch ${FILESDIR}/${PV}/crash-objstream.diff
+	epatch ${FILESDIR}/${PV}/cws-heapbug_CAN-2005-0941.diff
 
 	# Workaround for bug #73940, may break debug use flag on ppc
 	if use ppc; then
 		epatch ${FILESDIR}/${PV}/STLport-vector.patch
 	fi
+	#Allow building with libxslt >= 1.1.15
+	use java || epatch ${FILESDIR}/${PV}/build-new-xslt.diff
 
 	#Fixes for nptl
 	if use nptl; then
@@ -299,6 +301,7 @@ get_EnvSet() {
 
 src_compile() {
 
+	unset LIBC
 	addpredict /bin
 	addpredict /root/.gconfd
 	export MYCONF=""
@@ -510,9 +513,9 @@ src_install() {
 
 	einfo "Installing menu shortcuts..."
 	dodir /usr/share
-	cp -a ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+	cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-	use kde && cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
+	use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
 
 	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
 		# We have to handle soffice and setup differently
diff --git a/app-office/openoffice/openoffice-1.1.5.ebuild b/app-office/openoffice/openoffice-1.1.5.ebuild
index 7b6554ceed98..f317a7260e51 100644
--- a/app-office/openoffice/openoffice-1.1.5.ebuild
+++ b/app-office/openoffice/openoffice-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/app-office/openoffice/openoffice-1.1.5.ebuild,v 1.1 2005/09/14 20:05:04 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.5.ebuild,v 1.1.1.1 2005/11/30 09:58:50 chriswhite Exp $
 
 # Notes:
 #
@@ -26,7 +26,7 @@
 
 inherit eutils fdo-mime flag-o-matic toolchain-funcs
 
-IUSE="curl hardened java kde nptl zlib"
+IUSE="curl hardened java nptl zlib"
 
 INSTDIR="/opt/OpenOffice.org"
 S="${WORKDIR}/OOo_${PV}"
@@ -42,7 +42,7 @@ HOMEPAGE="http://www.openoffice.org/"
 
 LICENSE="|| ( LGPL-2  SISSL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="~ppc -sparc ~x86"
 
 RDEPEND="!app-office/openoffice-bin
 	virtual/x11
@@ -111,7 +111,7 @@ pkg_setup() {
 
 set_languages () {
 
-	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
+	strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb nn pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he
 	if [ -n "${LINGUAS}" ] ; then
 		# use the leftmost value
 		temp_lang=( ${LINGUAS} )
@@ -151,7 +151,9 @@ set_languages () {
 			;;
 		sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish
 			;;
-		no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
+		nn ) OOLANGNO=79; OOLANGNAME=NORNYN; OOLFULLNAME="Norwegian"
+			;;
+		nb ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian"
 			;;
 		pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish
 			;;
@@ -255,6 +257,9 @@ src_unpack() {
 		epatch ${FILESDIR}/${PV}/STLport-vector.patch
 	fi
 
+	#Allow building with libxslt >= 1.1.15
+	use java || epatch ${FILESDIR}/${PV}/build-new-xslt.diff
+
 	#Fixes for nptl
 	if use nptl; then
 		epatch ${FILESDIR}/${PV}/nptl.patch
@@ -510,8 +515,6 @@ src_install() {
 	dodir /usr/share
 	cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-	use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
-
 	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
 		# We have to handle soffice and setup differently
 		sed -i -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index b4eda039cf6b..cfb7d9ba2080 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.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/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.1 2005/10/20 18:04:44 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
-IUSE="curl eds gnome java kde ldap mozilla nas python zlib xml2"
+IUSE="curl eds gnome gtk java kde ldap mozilla nas zlib xml2"
 
+MY_PV="${PV}.1"
 PATCHLEVEL="OOO680"
-PATCHDIR="${WORKDIR}/ooo-build-${PV}"
+PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}"
 SRC="OOO_2_0_0"
 S="${WORKDIR}/${SRC}"
 CONFFILE="${PATCHDIR}/distro-configs/Gentoo.conf.in"
@@ -16,7 +17,7 @@ DESCRIPTION="OpenOffice.org, a full office productivity suite."
 SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2
 	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2
 	http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2
-	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
+	http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
 	http://go-ooo.org/packages/libwpd/libwpd-0.8.3.tar.gz
 	kde? ( http://go-oo.org/packages/SRC680/ooo_crystal_images-6.tar.bz2 )
 	http://go-oo.org/packages/SRC680/extras-2.tar.bz2"
@@ -25,7 +26,7 @@ HOMEPAGE="http://go-oo.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND="!app-office/openoffice-bin
 	!app-office/openoffice-ximian-bin
@@ -36,6 +37,7 @@ RDEPEND="!app-office/openoffice-bin
 	gnome? ( >=x11-libs/gtk+-2.4
 		>=gnome-base/gnome-vfs-2.6
 		>=gnome-base/gconf-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.4 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
 	kde? ( kde-base/kdelibs )
 	mozilla? ( >=www-client/mozilla-1.7.10 )
@@ -66,12 +68,13 @@ DEPEND="${RDEPEND}
 	zlib? ( sys-libs/zlib )
 	sys-libs/pam
 	!dev-util/dmake
+	>=dev-lang/python-2.3.4
 	java? ( =virtual/jdk-1.4*
-		dev-java/ant-core )
+		dev-java/ant-core
+		>=dev-java/java-config-1.2.11-r1 )
 	!java? ( dev-libs/libxslt
 		>=dev-libs/libxml2-2.0 )
 	ldap? ( net-nds/openldap )
-	python? ( >=dev-lang/python-2.3.4 )
 	xml2? ( >=dev-libs/libxml2-2.0 )"
 
 PROVIDE="virtual/ooo"
@@ -96,8 +99,10 @@ pkg_setup() {
 		ewarn " To get a localized build, set the according LINGUAS variable(s). "
 		ewarn
 	else
-		export LINGUAS_OOO="${LINGUAS//_/-}"
-		export LINGUAS_OOO="${LINGUAS_OOO//en /en-US }"
+		export LINGUAS_OOO="${LINGUAS//en/en_US}"
+		export LINGUAS_OOO="${LINGUAS_OOO//en_US_GB/en_GB}"
+		export LINGUAS_OOO="${LINGUAS_OOO//en_US_US/en_US}"
+		export LINGUAS_OOO="${LINGUAS_OOO//_/-}"
 	fi
 
 	if use !java; then
@@ -114,7 +119,15 @@ pkg_setup() {
 src_unpack() {
 
 	cd ${WORKDIR}
-	unpack ooo-build-${PV}.tar.gz
+	unpack ooo-build-${MY_PV}.tar.gz
+
+	#Some fixes for our patchset
+	cd ${PATCHDIR}
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+
+	#Additional and new patches get here
+	cp -pPRf ${FILESDIR}/${PV}/nojava-fix-stringparam.diff ${PATCHDIR}/patches/src680 || die
+	cp -pPRf ${FILESDIR}/${PV}/buildfix-new-xslt.diff ${PATCHDIR}/patches/src680 || die
 
 	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
 	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"
@@ -124,7 +137,6 @@ src_unpack() {
 
 	echo "`use_with curl system-curl`" >> ${CONFFILE}
 	echo "`use_with nas system-nas`" >> ${CONFFILE}
-	echo "`use_with python system-python`" >> ${CONFFILE}
 	echo "`use_with xml2 system-libxml`" >> ${CONFFILE}
 	echo "`use_with zlib system-zlib`" >> ${CONFFILE}
 
@@ -147,9 +159,12 @@ src_compile() {
 
 	# Should the build use multiprocessing? Not enabled by default, as it tends to break 
 	if [ "${WANT_DISTCC}" == "true" ]; then
-		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` && [ ${JOBS} -gt 10 ] && export JOBS="10"
+		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
 	fi
 
+	# Make sure gnome-users get gtk-support
+	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
+
 	cd ${PATCHDIR}
 	autoconf || die
 	./configure ${MYCONF} \
@@ -161,11 +176,13 @@ src_compile() {
 		--with-num-cpus="${JOBS}" \
 		--with-binsuffix="2" \
 		--with-installed-ooo-dirname="openoffice" \
-		`use_enable gnome gtk` \
+		"${GTKFLAG}" \
 		`use_enable kde` \
 		--disable-access \
 		--disable-mono \
 		--disable-cairo \
+		--disable-post-install-scripts \
+		--mandir=/usr/share/man \
 		|| die "Configuration failed!"
 
 	# Compile problems with these ...
@@ -175,6 +192,7 @@ src_compile() {
 	filter-flags "-fno-default-inline"
 	filter-flags "-fstack-protector"
 	filter-flags "-ftracer"
+	append-flags "-fno-strict-aliasing"
 	replace-flags "-O3" "-O2"
 	replace-flags "-Os" "-O2"
 
@@ -193,11 +211,6 @@ src_install() {
 	cd ${PATCHDIR}
 	make DESTDIR=${D} install || die "Installation failed!"
 
-	#Correcting location of menu entries, this should really be handled in ooo-build / setup.in
-	mkdir ${D}/usr/share/applications
-	mv ${D}/opt/gnome/share/applications/* ${D}/usr/share/applications/
-	rmdir ${D}/opt/gnome/share/applications/ -p
-
 	# Install corrected Symbol Font
 	insinto /usr/share/fonts/TTF/
 	doins ${PATCHDIR}/fonts/*.ttf
diff --git a/app-office/passepartout/ChangeLog b/app-office/passepartout/ChangeLog
index f97eff70fe64..8942000549dd 100644
--- a/app-office/passepartout/ChangeLog
+++ b/app-office/passepartout/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/passepartout
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.1 2004/11/07 18:07:21 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
+
+*passepartout-0.6 (02 Apr 2005)
+
+  02 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +passepartout-0.6.ebuild:
+  Version bumped. This closes bug #77652.
 
 *passepartout-0.5 (08 Nov 2004)
 
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest
index 1a348ea9bd30..d63de83c864c 100644
--- a/app-office/passepartout/Manifest
+++ b/app-office/passepartout/Manifest
@@ -1,2 +1,6 @@
-MD5 72bacbb9a5a8818e9263564066d9cd9e passepartout-0.5.ebuild 644
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 f1fa3a2e3a6ce22a84beaf710d94c386 passepartout-0.6.ebuild 689
+MD5 1b1e48f0e86e7eeae7b9af2b1a6caf97 ChangeLog 579
+MD5 bbd870cdb771f25e028f0882dae45e1c passepartout-0.5.ebuild 688
 MD5 34ea5a29ae5e1101593e83dd9829cc79 files/digest-passepartout-0.5 69
+MD5 f657b97bd6ce720fa98a561674558974 files/digest-passepartout-0.6 69
diff --git a/app-office/passepartout/passepartout-0.5.ebuild b/app-office/passepartout/passepartout-0.5.ebuild
index 891da03d2b6b..9797afb79d26 100644
--- a/app-office/passepartout/passepartout-0.5.ebuild
+++ b/app-office/passepartout/passepartout-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/app-office/passepartout/passepartout-0.5.ebuild,v 1.1 2004/11/07 18:07:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.5.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 inherit gnome2
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.stacken.kth.se/project/pptout/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="=dev-cpp/libxmlpp-1.0*
 	dev-libs/libxslt
diff --git a/app-office/passepartout/passepartout-0.6.ebuild b/app-office/passepartout/passepartout-0.6.ebuild
index ee162f7035fa..929cf4c5f864 100644
--- a/app-office/passepartout/passepartout-0.6.ebuild
+++ b/app-office/passepartout/passepartout-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/app-office/passepartout/passepartout-0.6.ebuild,v 1.1 2005/04/02 04:31:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.6.ebuild,v 1.1.1.1 2005/11/30 09:59:00 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/app-office/plan/ChangeLog b/app-office/plan/ChangeLog
index e72da8db8a95..a2898bc92ed2 100644
--- a/app-office/plan/ChangeLog
+++ b/app-office/plan/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-office/plan
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/plan/ChangeLog,v 1.1 2003/10/17 12:33:02 brandy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/plan/ChangeLog,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
+
+  23 May 2005; David Holm <dholm@gentoo.org> plan-1.8.7.ebuild:
+  Fixed bug #63533
+
+  02 Jul 2004; Aron Griffis <agriffis@gentoo.org> plan-1.8.6.ebuild,
+  plan-1.8.7.ebuild:
+  sync IUSE (missing)
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> plan-1.8.6.ebuild:
+  Stable on sparc.
+
+*plan-1.8.7 (18 Jun 2004)
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> +plan-1.8.7.ebuild:
+  Version bumped, and added to ~ppc.
+
+  18 Mar 2004; Jason Wever <weeve@gentoo.org> plan-1.8.6.ebuild:
+  Added ~sparc keyword.
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> plan-1.8.6.ebuild:
+  fixed motif dep
 
 *plan-1.8.6 (18 Oct 2003)
 
diff --git a/app-office/plan/Manifest b/app-office/plan/Manifest
index de83314401c1..0416dc7fdf11 100644
--- a/app-office/plan/Manifest
+++ b/app-office/plan/Manifest
@@ -1,5 +1,7 @@
-MD5 bba369475d2011e06ff33bf79f66d810 plan-1.8.6.ebuild 1514
-MD5 1de087795f313d837f136c0fe88deb35 ChangeLog 438
+MD5 e18508cc3cb85f4d92b26bd4dd059fff ChangeLog 1019
 MD5 7e4f3a18ef9764bf465ba82385e6234e metadata.xml 235
-MD5 43079e6d1e3b9dc22ce03a1e94758e02 files/plan-1.8.6-gentoo.tar.bz2 5744
+MD5 d814a6993df6192fe8585f96861d74ce plan-1.8.6.ebuild 1539
+MD5 efb7d483d368672b7ee50381a9394d21 plan-1.8.7.ebuild 1721
 MD5 c838bc0cc918e443a78714c31ff2cb27 files/digest-plan-1.8.6 62
+MD5 43079e6d1e3b9dc22ce03a1e94758e02 files/plan-1.8.6-gentoo.tar.bz2 5744
+MD5 9782b3dd9e3676b0f2fd6b076687be03 files/digest-plan-1.8.7 130
diff --git a/app-office/plan/plan-1.8.6.ebuild b/app-office/plan/plan-1.8.6.ebuild
index 044ae47db29e..0f65b1cae584 100644
--- a/app-office/plan/plan-1.8.6.ebuild
+++ b/app-office/plan/plan-1.8.6.ebuild
@@ -1,33 +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/app-office/plan/plan-1.8.6.ebuild,v 1.1 2003/10/17 12:33:02 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/plan/plan-1.8.6.ebuild,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
+
+inherit eutils
 
-S="${WORKDIR}/${P}/src"
 DESCRIPTION="Motif based schedule planner"
 HOMEPAGE="http://www.bitrot.de/plan.html"
 SRC_URI="ftp://plan.ftp.fu-berlin.de/${P}.tar.gz"
 
-KEYWORDS="~x86"
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="~x86 sparc"
+IUSE=""
 
 DEPEND="virtual/x11
-	virtual/motif"
+	x11-libs/openmotif"
 
-src_unpack() {
+S=${WORKDIR}/${P}/src
 
+src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.tar.bz2
-
 }
 
 src_compile() {
-
 	make linux || die "make failed"
-
 }
-src_install() {
 
+src_install() {
 	make DESTDIR=${D} install || die
 	keepdir /usr/share/plan/netplan.dir
 
diff --git a/app-office/plan/plan-1.8.7.ebuild b/app-office/plan/plan-1.8.7.ebuild
index dbe9b881fcb0..3e16ad55d651 100644
--- a/app-office/plan/plan-1.8.7.ebuild
+++ b/app-office/plan/plan-1.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/plan/plan-1.8.7.ebuild,v 1.1 2004/06/18 13:31:33 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/plan/plan-1.8.7.ebuild,v 1.1.1.1 2005/11/30 09:58:57 chriswhite Exp $
 
 inherit eutils
 
@@ -12,6 +12,7 @@ SRC_URI="ftp://plan.ftp.fu-berlin.de/${P}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
 
 DEPEND="virtual/x11
 	x11-libs/openmotif"
@@ -26,11 +27,14 @@ src_unpack() {
 }
 
 src_compile() {
-	make linux || die "make failed"
+	make SHARE=/usr/share/plan linux || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make \
+		DESTDIR=${D} \
+		SHARE=/usr/share/plan \
+		install || die "install failed"
 	keepdir /usr/share/plan/netplan.dir
 
 	cd ${S}/..
diff --git a/app-office/planner/ChangeLog b/app-office/planner/ChangeLog
index 89ae460177e0..ae7f8567803c 100644
--- a/app-office/planner/ChangeLog
+++ b/app-office/planner/ChangeLog
@@ -1,6 +1,77 @@
-# ChangeLog for app-office/mrproject
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/planner/ChangeLog,v 1.1 2003/12/14 18:16:03 spider Exp $
+# ChangeLog for app-office/planner
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/ChangeLog,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+*planner-0.13 (04 Jun 2005)
+
+  04 Jun 2005; Marinus Schraal <foser@gentoo.org> planner-0.13.ebuild :
+  New release (#85328)
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> planner-0.12.1.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> planner-0.12.1.ebuild:
+  Stable on alpha.
+
+  31 Mar 2005; <blubb@gentoo.org> planner-0.12.1.ebuild:
+  stable on amd64
+
+  08 Mar 2005; foser <foser@gentoo.org> planner-0.12.1.ebuild :
+  Ugly fix for #83947
+
+  03 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> planner-0.12.1.ebuild:
+  Stable on sparc
+
+  04 Feb 2005; Joe McCann <joem@gentoo.org> planner-0.11.ebuild:
+  remove old intltool workaround, closes bug 80708
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*planner-0.12.1 (09 Nov 2004)
+
+  09 Nov 2004; Mike Gardiner <obz@gentoo.org> +planner-0.12.1.ebuild:
+  New version, a bugfix release, as requested in bug #62265
+
+  23 Oct 2004; Alastair Tse <liquidx@gentoo.org> planner-0.11.ebuild,
+  planner-0.12-r1.ebuild:
+  add aclocal/automake/autoconf if calling intltoolize (#68514)
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  planner-0.11.ebuild:
+  Masked planner-0.11.ebuild stable for ppc
+
+*planner-0.12-r1 (14 Jul 2004)
+
+  14 Jul 2004; foser <foser@gentoo.org> planner-0.12-r1.ebuild :
+  Fix pygtk dep to a sandbox safe version (#56995)
+
+  14 Jul 2004; <spider@gentoo.org> +planner-0.12-r1.ebuild:
+  ugh. I goofed up and didnt notice the new python bindings, revamped the ebuild
+  to manage those with USE flags, and changed to the libgda interface instead of
+  direct postgres dep.
+
+*planner-0.12-r1 14 Jul 2004
+
+  14 Jul 2004; Spider <spider@gentoo.org> 
+  # INSERT ENTRY HERE
+
+*planner-0.12 (11 Jul 2004)
+
+  11 Jul 2004; <spider@gentoo.org> +planner-0.12.ebuild:
+  Version bump
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> planner-0.11.ebuild:
+  Stable on sparc.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> planner-0.11.ebuild:
+  Stable on alpha.
+
+  03 Apr 2004; <spider@gentoo.org> planner-0.11.ebuild:
+  Move to stable, removing mrproject from the tree now.
+
+  17 Dec 2003; <spider@gentoo.org> planner-0.11.ebuild:
+  Added warning about removing mrproject & libmrproject
 
 *planner-0.11 (14 Dec 2003)
 
diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index 473c44f90dad..6673ce1b49c8 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,4 +1,6 @@
-MD5 dc86714fcad309830b952e6d32c58b03 ChangeLog 3392
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 943b43ccf077152cfb50339680640dc5 planner-0.11.ebuild 1023
-MD5 a21f93754b9f061f7db90951d5d9a660 files/digest-planner-0.11 66
+MD5 91d4d41cffa5cc44839493da7bad620c ChangeLog 5893
+MD5 e49141a0cda3e7c464ad9536a5ffab0c files/digest-planner-0.12.1 68
+MD5 d2e2bc10d96d6ab685dc36c91de5598d files/digest-planner-0.13 66
+MD5 add4556f7fbed381a299100d2457069f metadata.xml 167
+MD5 64576a281b5a8efc2d7582a6fbe5ee9b planner-0.12.1.ebuild 1566
+MD5 d5b41ff3d59b514e969da8c3e896d49c planner-0.13.ebuild 1353
diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
index da6fd63d0085..20d13ee7e217 100644
--- a/app-office/planner/metadata.xml
+++ b/app-office/planner/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome-office</herd>
 </pkgmetadata>
diff --git a/app-office/planner/planner-0.12.1.ebuild b/app-office/planner/planner-0.12.1.ebuild
index 3c245d682d53..07d1d7340358 100644
--- a/app-office/planner/planner-0.12.1.ebuild
+++ b/app-office/planner/planner-0.12.1.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/app-office/planner/planner-0.12.1.ebuild,v 1.1 2004/11/09 08:39:08 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.12.1.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 fdo-mime
 
 DESCRIPTION="Project manager for Gnome2"
 HOMEPAGE="http://planner.imendio.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 IUSE="doc libgda python"
 
 RDEPEND=">=x11-libs/gtk+-2.0.5
@@ -30,7 +30,7 @@ RDEPEND=">=x11-libs/gtk+-2.0.5
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	dev-util/intltool
-	doc?( >=dev-util/gtk-doc-0.10 )"
+	doc? ( >=dev-util/gtk-doc-0.10 )"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL README"
 
@@ -38,10 +38,21 @@ DOCS="AUTHORS COPYING ChangeLog INSTALL README"
 MAKEOPTS="${MAKEOPTS} -j1"
 G2CONF="${G2CONF} $(use_enable libgda database) $(use_enable python) --disable-dotnet"
 
+src_install() {
+
+	gnome2_src_install
+
+	# ugly fix for #83947 - FIXME : write some config magic
+	rm -fr ${D}/usr/share/mime/{XMLnamespaces,globs,magic}
+
+}
+
 pkg_postinst () {
+
 	gnome2_pkg_postinst
 	einfo "You will have to unmerge mrproject and libmrproject after this"
 	einfo "those projects will soon dissapear, as soon as we can mark planner as stable"
 	echo ""
 	einfo "emerge unmerge mrproject libmrproject"
+
 }
diff --git a/app-office/planner/planner-0.13.ebuild b/app-office/planner/planner-0.13.ebuild
index 619b0ea74331..667a5667872d 100644
--- a/app-office/planner/planner-0.13.ebuild
+++ b/app-office/planner/planner-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/app-office/planner/planner-0.13.ebuild,v 1.1 2005/06/04 18:37:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.13.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
 
 inherit gnome2 fdo-mime
 
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	app-text/scrollkeeper
 	dev-util/intltool
-	doc?( >=dev-util/gtk-doc-0.10 )"
+	doc? ( >=dev-util/gtk-doc-0.10 )"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL README"
 
diff --git a/app-office/pointless/ChangeLog b/app-office/pointless/ChangeLog
index 1d0aa0e95acb..78d1c8e2f1b7 100644
--- a/app-office/pointless/ChangeLog
+++ b/app-office/pointless/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/pointless
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/pointless/ChangeLog,v 1.1 2004/03/01 00:49:31 humpback Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/pointless/ChangeLog,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
+
+  28 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>; pointless-0.5.ebuild:
+  Removing freetype from use flag's.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> pointless-0.5.ebuild:
+  Added to ~ppc.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> pointless-0.5.ebuild:
+  Added ~sparc keyword.
 
 *pointless-0.5 (01 Mar 2004)
 
diff --git a/app-office/pointless/Manifest b/app-office/pointless/Manifest
index 6aab6f0602fb..e5fa0a4d008c 100644
--- a/app-office/pointless/Manifest
+++ b/app-office/pointless/Manifest
@@ -1,2 +1,3 @@
-MD5 ef3d9737ea213a160de71b78ddc8fb57 pointless-0.5.ebuild 996
+MD5 5a82056c7fd598ebecfb82201aa879b0 ChangeLog 701
+MD5 7d47cbd40096562120254fdb9f6f3207 pointless-0.5.ebuild 998
 MD5 4312f2ad98982827b01bb9ceeaa075b5 files/digest-pointless-0.5 66
diff --git a/app-office/pointless/pointless-0.5.ebuild b/app-office/pointless/pointless-0.5.ebuild
index 90128f7757a8..087440c90782 100644
--- a/app-office/pointless/pointless-0.5.ebuild
+++ b/app-office/pointless/pointless-0.5.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/pointless/pointless-0.5.ebuild,v 1.1 2004/03/01 00:49:31 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/pointless/pointless-0.5.ebuild,v 1.1.1.1 2005/11/30 09:59:10 chriswhite Exp $
 
 DESCRIPTION="A presentation tool using markup-language"
 HOMEPAGE="http://www.pointless.dk/"
-SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/pointless/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/pointless/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc ~ppc"
 
-IUSE="X freetype doc sdl nls"
+IUSE="X doc sdl nls"
 
 DEPEND="X? ( virtual/x11 )
 	>=media-fonts/freefonts-0.10
 	>=dev-lang/python-2.2.0
-	freetype? ( >=media-libs/freetype-2.1.5 )
+	>=media-libs/freetype-2.1.5
 	sdl? ( >=media-libs/libsdl-1.2.6 )
 	nls? ( >=sys-devel/gettext-0.12.1 )"
 
 
 src_compile() {
-	use freetype	|| myconf="${myconf} --disable-freetypetest"
 	use doc		&& myconf="${myconf} --enable-html"
 	use sdl		&& myconf="${myconf} --enable-sdl"
 	use sdl		|| myconf="${myconf} --disable-sdltest"
diff --git a/app-office/pybliographer/ChangeLog b/app-office/pybliographer/ChangeLog
index 64948a5cd923..b5dd8d4f8add 100644
--- a/app-office/pybliographer/ChangeLog
+++ b/app-office/pybliographer/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for app-office/pybliographer
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/ChangeLog,v 1.1 2004/10/17 10:50:52 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/ChangeLog,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org> pybliographer-1.2.4.ebuild:
+  Marked ppc stable for bug #99175.
+
+*pybliographer-1.2.6.2 (02 Jul 2005)
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> pybliographer-1.2.4.ebuild,
+  +pybliographer-1.2.6.2.ebuild:
+  Version bumped; bug #97664.
+
+  28 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  pybliographer-1.2.4.ebuild:
+  fix for access violation due to gnome2 eclass change, see bug #92920
+
+  11 Apr 2005; Simon Stelling <blubb@gentoo.org> pybliographer-1.2.4.ebuild:
+  added ~amd64
+
+  17 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> pybliographer-1.2.4.ebuild:
+  Added to ~ppc; bug #70211.
+
+  21 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/pybliographer-1.2.4-gentoo.diff, pybliographer-1.2.4.ebuild:
+  Disables setup-check.py; bug #68309.
+
+  21 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> pybliographer-1.2.4.ebuild:
+  Uses gnome2.eclass.
 
 *pybliographer-1.2.4 (17 Oct 2004)
 
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index 76e4d578cb02..1bd9a7be490c 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,2 +1,17 @@
-MD5 776bc81581c4a5a0d996333e176b02c5 pybliographer-1.2.4.ebuild 1549
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cf18947ebe119b670ff5d92ac1caebfd ChangeLog 1433
+MD5 a093c3da7b945d656d4546b1ad0f5fa4 pybliographer-1.2.4.ebuild 934
+MD5 684b7118ace06f88d4bdca2407ddc818 metadata.xml 184
+MD5 a546c39aa4f3d663078f822f72507001 pybliographer-1.2.6.2.ebuild 944
 MD5 6dae340ffb9ad302fa14fc5098ca48d4 files/digest-pybliographer-1.2.4 71
+MD5 f7fc4731f103ab717d15a45fbddd01af files/pybliographer-1.2.4-gentoo.diff 1255
+MD5 e91367c36c5694e58a92c601b6d71614 files/digest-pybliographer-1.2.6.2 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2StdcsIHjyDViGQRAo5bAKCf5CMk5pGUetZn7w5FqOa4YpKF8QCdEh9B
+6YmeMh0JU9iT9A0LL4kaK8Q=
+=1cye
+-----END PGP SIGNATURE-----
diff --git a/app-office/pybliographer/pybliographer-1.2.4.ebuild b/app-office/pybliographer/pybliographer-1.2.4.ebuild
index dd980b7f1681..64a840d111ab 100644
--- a/app-office/pybliographer/pybliographer-1.2.4.ebuild
+++ b/app-office/pybliographer/pybliographer-1.2.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/app-office/pybliographer/pybliographer-1.2.4.ebuild,v 1.1 2004/10/17 10:50:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:59:11 chriswhite Exp $
+
+inherit gnome2 eutils
 
 DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
 HOMEPAGE="http://pybliographer.org/"
@@ -8,18 +10,27 @@ SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc x86"
 
 IUSE=""
 
+# gnome2.eclass
+USE_DESTDIR=1
+DOCS="AUTHORS COPYING ChangeLog* INSTALL NEWS TODO README"
+
 DEPEND="virtual/python
 	>=dev-libs/glib-2
 	>=app-text/recode-3.6-r1
 	>=dev-python/gnome-python-2
 	>=dev-python/python-bibtex-1.2.1"
 
-src_install() {
-	make DESTDIR=${D} install || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
 
-	dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS TODO README
+src_install() {
+	# fix for access violation due to eclass change
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 }
diff --git a/app-office/pybliographer/pybliographer-1.2.6.2.ebuild b/app-office/pybliographer/pybliographer-1.2.6.2.ebuild
index d167f2891587..b33627446705 100644
--- a/app-office/pybliographer/pybliographer-1.2.6.2.ebuild
+++ b/app-office/pybliographer/pybliographer-1.2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.6.2.ebuild,v 1.1 2005/07/02 08:12:56 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.6.2.ebuild,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/app-office/qbankmanager/ChangeLog b/app-office/qbankmanager/ChangeLog
index dba4ee4c22ec..74c28d9c4cb2 100644
--- a/app-office/qbankmanager/ChangeLog
+++ b/app-office/qbankmanager/ChangeLog
@@ -1,6 +1,64 @@
 # ChangeLog for app-office/qbankmanager
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/ChangeLog,v 1.1 2004/12/21 17:35:41 hanno Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/ChangeLog,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
+
+  28 Sep 2005; Hanno Boeck <hanno@gentoo.org> qbankmanager-0.9.29.ebuild:
+  Add note if aqbanking built without qt.
+
+*qbankmanager-0.9.29 (26 Sep 2005)
+
+  26 Sep 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/editcategoryreport.ui.gz, +qbankmanager-0.9.29.ebuild:
+  Version bump.
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> qbankmanager-0.9.15.ebuild,
+  qbankmanager-0.9.16.ebuild, qbankmanager-0.9.18.ebuild,
+  qbankmanager-0.9.21.ebuild, qbankmanager-0.9.23.ebuild:
+  Change qt deps again per bug #100235
+
+  13 Jul 2005; David Holm <dholm@gentoo.org> qbankmanager-0.9.23.ebuild:
+  Added to ~ppc.
+
+*qbankmanager-0.9.23 (12 Jul 2005)
+
+  12 Jul 2005; Hanno Boeck <hanno@gentoo.org> +qbankmanager-0.9.23.ebuild:
+  Version bump.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> qbankmanager-0.9.15.ebuild,
+  qbankmanager-0.9.16.ebuild, qbankmanager-0.9.18.ebuild,
+  qbankmanager-0.9.21.ebuild:
+  Fix qt dep
+
+*qbankmanager-0.9.21 (13 Apr 2005)
+
+  13 Apr 2005; Hanno Boeck <hanno@gentoo.org> +qbankmanager-0.9.21.ebuild:
+  Version bump.
+
+*qbankmanager-0.9.18 (13 Mar 2005)
+
+  13 Mar 2005; Hanno Boeck <hanno@gentoo.org> +qbankmanager-0.9.18.ebuild:
+  Version bump.
+
+*qbankmanager-0.9.16 (01 Feb 2005)
+
+  01 Feb 2005; Hanno Boeck <hanno@gentoo.org> +qbankmanager-0.9.16.ebuild:
+  Version bump.
+
+*qbankmanager-0.9.15 (23 Jan 2005)
+
+  23 Jan 2005; Hanno Boeck <hanno@gentoo.org> +qbankmanager-0.9.15.ebuild:
+  Version bump.
+
+*qbankmanager-0.9.13_beta (13 Jan 2005)
+
+  13 Jan 2005; Hanno Boeck <hanno@gentoo.org>
+  +qbankmanager-0.9.13_beta.ebuild:
+  Version bump.
+
+  10 Jan 2005; Hanno Boeck <hanno@gentoo.org>
+  qbankmanager-0.9.12_beta.ebuild:
+  Added aqhbci-wizard-kde to the dependencies, because it doesn't make
+  any sense to run qbankmanager without it.
 
 *qbankmanager-0.9.12_beta (21 Dec 2004)
 
diff --git a/app-office/qbankmanager/Manifest b/app-office/qbankmanager/Manifest
index 8257175a8255..a0117de4ecf0 100644
--- a/app-office/qbankmanager/Manifest
+++ b/app-office/qbankmanager/Manifest
@@ -1,4 +1,15 @@
-MD5 37d6acdb026fc200fd6080602775df5f qbankmanager-0.9.12_beta.ebuild 710
-MD5 b063e12b93cdb69d51bc7a27ec64f800 ChangeLog 360
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 32d9d82012c0927e71298ad971497819 ChangeLog 2117
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
-MD5 efe0648de0c723d0f2d9d6dd9e0bf7c8 files/digest-qbankmanager-0.9.12_beta 75
+MD5 b6b69331283df7db4b5859a2bd5947b2 qbankmanager-0.9.29.ebuild 1079
+MD5 69bfc13da9bf05db8ed8130680aa9820 files/digest-qbankmanager-0.9.29 71
+MD5 513e5771877e65400c1b4641105070a8 files/editcategoryreport.ui.gz 2306
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOojjr2QksT29OyARAtgsAKCCIy2YU/1Yl5QzB1s0d3BEHMyNXgCeNXNp
+XFcaMrfSDOvH+Jbl3jUR1v4=
+=woTD
+-----END PGP SIGNATURE-----
diff --git a/app-office/qbankmanager/qbankmanager-0.9.29.ebuild b/app-office/qbankmanager/qbankmanager-0.9.29.ebuild
index 9197751c36d5..5bc9d736a2d2 100644
--- a/app-office/qbankmanager/qbankmanager-0.9.29.ebuild
+++ b/app-office/qbankmanager/qbankmanager-0.9.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/qbankmanager-0.9.29.ebuild,v 1.1 2005/09/26 16:19:50 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/qbankmanager-0.9.29.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 inherit eutils qt3
 
@@ -16,6 +16,14 @@ IUSE="debug"
 DEPEND=">=net-libs/aqbanking-1.6.0_beta
 	=x11-libs/qt-3*"
 
+pkg_setup() {
+	if ! built_with_use net-libs/aqbanking qt; then
+		einfo "qbankmanager needs the qt-bindings of aqbanking."
+		einfo "TO enable them, rebuild aqbanking with qt in USE."
+		die "aqbanking was built without qt support."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cp ${FILESDIR}/editcategoryreport.ui.gz ${S}/src/kbanking/libs/reports
diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog
index aa018891f225..853de88bb441 100644
--- a/app-office/qhacc/ChangeLog
+++ b/app-office/qhacc/ChangeLog
@@ -1,6 +1,101 @@
-# ChangeLog for app-office/kmymoney2
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.1 2003/08/12 19:05:02 caleb Exp $
+# ChangeLog for app-office/qhacc
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
+
+  18 Jul 2005; Carsten Lohrke <carlo@gentoo.org> qhacc-3.4.ebuild:
+  minor clean up on unmerge fix
+
+*qhacc-3.4 (03 Jul 2005)
+
+  03 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +qhacc-3.4.ebuild:
+  version bump
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*qhacc-3.2.3 (24 Dec 2004)
+
+  24 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +qhacc-3.2.3.ebuild:
+  version bump
+
+  12 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/qhacc-2.9-gentoo.patch, -files/qhacc-2.9-mysqlplugin-gcc-3.3.patch,
+  -qhacc-2.9.8.ebuild, -qhacc-2.9.9.ebuild, -qhacc-2.9.ebuild:
+  clean up
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> qhacc-3.2.1.ebuild:
+  Stable on alpha.
+
+*qhacc-3.2.2 (29 Oct 2004)
+
+  29 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/qhacc-3.2.2-sandbox.patch, qhacc-3.2.1.ebuild, +qhacc-3.2.2.ebuild:
+  version bump
+
+  20 Oct 2004; Jason Wever <weeve@gentoo.org> qhacc-3.2.1.ebuild:
+  Stable on sparc wrt bug #67169.
+
+  20 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  files/qhacc-3.2.1-sandbox.patch, qhacc-3.2.1.ebuild:
+  fixed patch
+
+  15 Oct 2004; <dams@gentoo.org> +files/qhacc-3.2.1-mysql_plugin_libs.patch,
+  +files/qhacc-3.2.1-psql_plugin_libs.patch, qhacc-3.2.1.ebuild:
+  . mysql and psql plugin lib location
+  . unified patch application
+
+  14 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/qhacc-3.2.1-sandbox.patch, qhacc-3.2.1.ebuild:
+  lovely sandbox access violations
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> qhacc-3.2.1.ebuild:
+  removed stale xml use flag
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> qhacc-3.2.1.ebuild:
+  stable on x86
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> qhacc-2.9.8.ebuild,
+  qhacc-2.9.ebuild:
+  Masked qhacc-2.9.ebuild stable for ppc
+
+  05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> qhacc-2.9.8.ebuild:
+  Masked qhacc-2.9.8.ebuild stable for ppc
+
+*qhacc-3.2.1 (13 Sep 2004)
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +qhacc-3.2.1.ebuild:
+  version bump
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> qhacc-2.9.8.ebuild:
+  Stable on sparc.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> qhacc-2.9.8.ebuild:
+  Stable on alpha.
+
+  01 May 2004; Dominik Stadler <centic@gentoo.org> qhacc-2.9.8.ebuild:
+  Mark 2.9.8 stable on x86
+
+*qhacc-2.9.9 (01 May 2004)
+
+  01 May 2004; Dominik Stadler <centic@gentoo.org> +qhacc-2.9.9.ebuild:
+  Add version 2.9.9, see Bug 47272
+
+*qhacc-2.9.8 (07 Mar 2004)
+
+  07 Mar 2004; Dominik Stadler <centic@gentoo.org> qhacc-2.9.8.ebuild:
+  Version bump, thanks to Charles Phoenix <phoenixreads@rogers.com>, Bug# 38825
+  Patches are not needed any more.
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> qhacc-2.9.ebuild:
+  Put the qt dependency directly in the ebuild, remove the need kde as I don't
+  believe it's needed anymore.
+
+  16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> qhacc-2.9.ebuild,
+  files/qhacc-2.9-gentoo.patch, files/qhacc-2.9-mysqlplugin-gcc-3.3.patch:
+  Now, qhacc actually compiles! Additionally, install locations are fixed,
+  symlinks are fixed, mysql plugin compiles now. Basically, this is what the
+  ebuild should have been. Thanks to Brandy Westcott <brandy@gentoo.org> for
+  finding and fixing this.
 
 *qhacc-2.9 (12 Aug 2003)
 
diff --git a/app-office/qhacc/Manifest b/app-office/qhacc/Manifest
index b25d65775540..d985babb90dc 100644
--- a/app-office/qhacc/Manifest
+++ b/app-office/qhacc/Manifest
@@ -1,4 +1,14 @@
-MD5 c8ea2fe4846eb11f4d05f559904454bb qhacc-2.9.ebuild 678
-MD5 c8ea2fe4846eb11f4d05f559904454bb qhacc-2.8.ebuild 678
-MD5 27693bc7d2672c43e6bd6dabdeb1a7e7 files/digest-qhacc-2.8 61
-MD5 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
+MD5 56971cbde6c4abf8668a914ee3392f80 qhacc-3.2.1.ebuild 1907
+MD5 25350c0e8e29a52cf235265fd29add7a qhacc-3.2.3.ebuild 1792
+MD5 e374ba6e85769d18d5517e631e46e0a4 qhacc-3.4.ebuild 2051
+MD5 dbd0aa4ee10c10342b218bb3b7bb0b10 qhacc-3.2.2.ebuild 1939
+MD5 7066ee619833bfe2f1e8492bc883e4db ChangeLog 3569
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 27867aca5f38687a4e9bd740005e9996 files/qhacc-3.2.2-sandbox.patch 21441
+MD5 5d4fad5c5dece54cf6376b1cbf836667 files/qhacc-3.2.1-mysql_plugin_libs.patch 834
+MD5 2f6b026212a58b32e415bede86478bba files/qhacc-3.2.1-psql_plugin_libs.patch 822
+MD5 8ad038ef57072d0bd84121a74aa30c59 files/digest-qhacc-3.2.1 63
+MD5 4fe6fcff9b37a9455d289ec9e47705e6 files/digest-qhacc-3.2.2 63
+MD5 fb2b096b85559fe250f03874aad9b7d9 files/digest-qhacc-3.2.3 63
+MD5 912dd361b66263aabb1ee365ba285bf9 files/digest-qhacc-3.4 61
+MD5 a17438e255e4c609d23b7db1e10761c9 files/qhacc-3.2.1-sandbox.patch 14903
diff --git a/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch b/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
index 74d4cd7a11ce..f547bd0da2cb 100644
--- a/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
+++ b/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
@@ -143,3 +143,170 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
+--- plugins/ofx/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/ofx/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -267,7 +267,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/qif/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/qif/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -266,7 +266,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/xml/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/xml/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -274,7 +274,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/psql/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/psql/Makefile.in	2004-10-20 19:13:54.000000000 +0200
+@@ -274,7 +274,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -524,9 +524,9 @@
+ @PSQL_TRUE@	mkdir -p $(dbdir)
+ @PSQL_TRUE@	if test ! -L $(dbdir)/libpsqlio.so ; then cd $(dbdir); ln -s $(libdir)/libpsqlio.so $(dbdir) ; fi
+ @PSQL_TRUE@	mkdir -p $(importdir)
+-@PSQL_TRUE@	if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s ../../lib/libpsqlio.so $(importdir) ; fi
++@PSQL_TRUE@	if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s $(libdir)/libpsqlio.so $(importdir) ; fi
+ @PSQL_TRUE@	mkdir -p $(exportdir)
+-@PSQL_TRUE@	if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s ../../lib/libpsqlio.so $(exportdir) ; fi
++@PSQL_TRUE@	if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s $(libdir)/libpsqlio.so $(exportdir) ; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- plugins/reports/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/reports/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -385,7 +385,7 @@
+ 	$(RANLIB) libtemp.a
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
++++ plugins/mysql/Makefile.in	2004-10-20 19:13:32.000000000 +0200
+--- plugins/mysql/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
+@@ -274,7 +274,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -524,9 +524,9 @@
+ @MYSQL_TRUE@	mkdir -p $(dbdir)
+ @MYSQL_TRUE@	if test ! -L $(dbdir)/libmysqlio.so ; then cd $(dbdir); ln -s $(libdir)/libmysqlio.so $(dbdir) ; fi
+ @MYSQL_TRUE@	mkdir -p $(importdir)
+-@MYSQL_TRUE@	if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s ../../lib/libmysqlio.so $(importdir) ; fi
++@MYSQL_TRUE@	if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s $(libdir)/libmysqlio.so $(importdir) ; fi
+ @MYSQL_TRUE@	mkdir -p $(exportdir)
+-@MYSQL_TRUE@	if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s ../../lib/libmysqlio.so $(exportdir) ; fi
++@MYSQL_TRUE@	if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s $(libdir)/libmysqlio.so $(exportdir) ; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- plugins/cliimp/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/cliimp/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -265,7 +265,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/extprg/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/extprg/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -274,7 +274,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/graphs/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/graphs/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -331,7 +331,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/generator/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/generator/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -271,7 +271,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/archiver/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/archiver/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -265,7 +265,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/upgrade/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/upgrade/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -272,7 +272,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+--- plugins/sqlite/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/sqlite/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -284,7 +284,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
diff --git a/app-office/qhacc/qhacc-3.2.1.ebuild b/app-office/qhacc/qhacc-3.2.1.ebuild
index 9be2c956f5b4..119f63cc6367 100644
--- a/app-office/qhacc/qhacc-3.2.1.ebuild
+++ b/app-office/qhacc/qhacc-3.2.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.1 2004/09/13 19:31:36 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 inherit libtool kde-functions eutils
 
-DESCRIPTION="Personal Finance for QT"
+DESCRIPTION="Personal Finance for Qt"
 HOMEPAGE="http://qhacc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="doc mysql postgres sqlite xml"
+KEYWORDS="x86 ppc sparc alpha ~hppa"
+IUSE="doc mysql postgres sqlite"
 
 DEPEND="mysql? ( dev-db/mysql++ )
 	postgres? ( dev-db/postgresql )
@@ -21,15 +21,18 @@ RDEPEND="mysql? ( dev-db/mysql++ )
 	sqlite? ( dev-db/sqlite )"
 need-qt 3
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	elibtoolize
+	epatch ${FILESDIR}/${P}-sandbox.patch
+}
 
+src_compile() {
 	local myconf="--libdir=/usr/lib/qhacc --bindir=/usr/bin --includedir=/usr/include --datadir=/usr/share/qhacc
 			$(use_enable mysql)
 			$(use_enable postgres psql)
-			$(use_enable mysql)"
-	# libofx would need to be patched 
-	# $(use_enable ofx) $(use_enable ofx ofx-includes /usr/include/libofx)
+			$(use_enable sqlite)"
 
 	econf ${myconf} || die "./configure failed"
 	emake -j 1 || die "make failed"
@@ -40,10 +43,8 @@ src_install() {
 	# can't do this and I'm too lazy to patch all the Makefiles
 	# mv ${D}/usr/plugins ${D}/usr/lib/qhacc
 	dodir /usr/share/doc/${PF}
-	use doc && mv ${D}/${D}/usr/share/doc/* ${D}/usr/share/doc/${PF}
-	rm -rf ${D}/${D}/usr/share/doc
-	dodir /usr/share/qhacc
-	mv ${D}/${D}/usr/share/* ${D}/usr/share/qhacc
+	use doc && mv ${D}/usr/share/qhacc/doc/* ${D}/usr/share/doc/${PF}
+	rm -rf ${D}/usr/share/qhacc/doc
 	rm ${S}/contrib/easysetup/Makefile*
 	insinto /usr/share/qhacc/easysetup
 	doins ${S}/contrib/easysetup/*
@@ -52,10 +53,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
+	echo ""
 	einfo "A sample configuration is provided in /usr/share/qhacc/easysetup."
 	einfo "copy files: \`mkdir ~/.qhacc ; cp /usr/share/qhacc/easysetup/* ~/.qhacc\`"
 	einfo "run program: \`qhacc -f ~/.qhacc/\`"
 	einfo "set alias: \`echo -e \\\n \"alias qhacc=\\\"qhacc -f ~/.qhacc\\\"\" >> ~/.bashrc\`"
-	echo
+	echo ""
 }
diff --git a/app-office/qhacc/qhacc-3.2.2.ebuild b/app-office/qhacc/qhacc-3.2.2.ebuild
index 118164361c5e..ba408dc93370 100644
--- a/app-office/qhacc/qhacc-3.2.2.ebuild
+++ b/app-office/qhacc/qhacc-3.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-office/qhacc/qhacc-3.2.2.ebuild,v 1.1 2004/10/29 19:00:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.2.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 inherit libtool kde-functions eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~alpha ~hppa ~ppc ~sparc ~x86"
 IUSE="doc mysql ofx postgres sqlite"
 
 DEPEND="ofx? ( ~dev-libs/libofx-0.7.0 )
@@ -31,14 +31,18 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--libdir=/usr/lib/qhacc --bindir=/usr/bin --includedir=/usr/include --datadir=/usr/share/qhacc
-			$(use_enable mysql)
-			$(use_enable postgres psql)
-			$(use_enable sqlite)
-			$(use_enable ofx) $(use_with ofx ofx-includes /usr/include/libofx)"
-
-	econf ${myconf} || die "./configure failed"
-	emake -j 1 || die "make failed"
+	econf \
+		--libdir=/usr/lib/qhacc \
+		--bindir=/usr/bin \
+		--includedir=/usr/include \
+		--datadir=/usr/share/qhacc \
+		$(use_enable mysql) \
+		$(use_enable postgres psql) \
+		$(use_enable sqlite) \
+		$(use_enable ofx) \
+		$(use_with ofx ofx-includes /usr/include/libofx) \
+		|| die "./configure failed"
+	emake -j1 || die "make failed"
 }
 
 src_install() {
@@ -50,7 +54,7 @@ src_install() {
 	insinto /usr/share/qhacc/easysetup
 	doins ${S}/contrib/easysetup/*
 	rm -rf ${D}/var
-	dodoc AUTHORS ChangeLog COPYING FILE_FORMAT INSTALL NEWS README THANKS TODO UPGRADE
+	dodoc AUTHORS ChangeLog FILE_FORMAT INSTALL NEWS README THANKS TODO UPGRADE
 }
 
 pkg_postinst() {
diff --git a/app-office/qhacc/qhacc-3.2.3.ebuild b/app-office/qhacc/qhacc-3.2.3.ebuild
index d43445161612..9f28e046c417 100644
--- a/app-office/qhacc/qhacc-3.2.3.ebuild
+++ b/app-office/qhacc/qhacc-3.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/app-office/qhacc/qhacc-3.2.3.ebuild,v 1.1 2004/12/23 23:36:29 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.3.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 inherit libtool kde-functions eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~hppa ~ppc ~sparc ~x86"
-IUSE="doc mysql ofx postgres sqlite"
+IUSE="mysql ofx postgres sqlite"
 
 DEPEND="ofx? ( ~dev-libs/libofx-0.7.0 )
 	mysql? ( dev-db/mysql++ )
diff --git a/app-office/qhacc/qhacc-3.4.ebuild b/app-office/qhacc/qhacc-3.4.ebuild
index ce839d7ae41e..bd25ba2adde9 100644
--- a/app-office/qhacc/qhacc-3.4.ebuild
+++ b/app-office/qhacc/qhacc-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/app-office/qhacc/qhacc-3.4.ebuild,v 1.1 2005/07/03 21:06:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.4.ebuild,v 1.1.1.1 2005/11/30 09:59:08 chriswhite Exp $
 
 inherit libtool kde-functions eutils
 
@@ -63,3 +63,8 @@ pkg_postinst() {
 	ewarn "To update from a previous version, please read /usr/share/doc/${PF}/UPGRADE.gz"
 	echo ""
 }
+
+pkg_postrm() {
+	# Portage doesn't eat stale symlinks...
+	[ -n "${PF}" ] && rm -rf /usr/share/doc/${PF}
+}
\ No newline at end of file
diff --git a/app-office/sc/ChangeLog b/app-office/sc/ChangeLog
index d04cbb84c76c..50f481f9bad8 100644
--- a/app-office/sc/ChangeLog
+++ b/app-office/sc/ChangeLog
@@ -1,9 +1,41 @@
 # ChangeLog for app-office/sc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.1 2002/02/01 21:53:09 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:54 chriswhite Exp $
+
+*sc-7.16 (12 Jul 2005)
+
+  12 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/sc-7.16-amd64.patch, +sc-7.16.ebuild:
+  Bump to a version that's only two and a half years old. This appears
+  unmaintained and I intend to leave it that way for now, so please kick me if
+  I'm wrong.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> sc-7.12.ebuild:
+  stable on amd64
+
+  02 Jul 2004; Aron Griffis <agriffis@gentoo.org> sc-7.12.ebuild:
+  sync IUSE (missing)
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> sc-7.12.ebuild:
+  Stable on sparc.
+
+  18 Mar 2004; Jason Wever <weeve@gentoo.org> sc-7.12.ebuild:
+  Added ~sparc keyword.
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> sc-7.12.ebuild:
+  Don't assign default to S; header fix
 
 *sc-7.12 (1 Feb 2002)
 
+  13 Feb 2003; Seemant Kulleen <seemant@gentoo.org> sc-7.12.ebuild :
+  fixed  in man page. Thanks to Martin Kuehl <perdix@web.de> in bug #15635
+
+  19 Sept 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added HOMEPAGE variable
+
+  06 Aug 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/app-office/sc/Manifest b/app-office/sc/Manifest
index e69de29bb2d1..8d80343f5395 100644
--- a/app-office/sc/Manifest
+++ b/app-office/sc/Manifest
@@ -0,0 +1,7 @@
+MD5 7427dd3c555dc435d531506f6db5571a ChangeLog 1700
+MD5 ee1770a30ee38da7ae9f4170d8288c69 sc-7.12.ebuild 1062
+MD5 76e1fe14bf021d9240cafc785a91ddd6 sc-7.16.ebuild 1065
+MD5 fab940f86eb4bdbabeb882376309f5a6 files/digest-sc-7.16 59
+MD5 f47369435a7c7e6fd45629852c8ec440 files/digest-sc-7.12 59
+MD5 b80148293ba40aff64b004432edf0e21 files/sc-7.12-amd64.patch 309
+MD5 b80148293ba40aff64b004432edf0e21 files/sc-7.16-amd64.patch 309
diff --git a/app-office/sc/files/digest-sc-7.12 b/app-office/sc/files/digest-sc-7.12
index f4fa1c7d6ad5..2919935cccfd 100644
--- a/app-office/sc/files/digest-sc-7.12
+++ b/app-office/sc/files/digest-sc-7.12
@@ -1 +1 @@
-MD5 dd9f172ad3c93d70cfacbebc6d5105d2 sc-7.12.tar.gz
+MD5 dd9f172ad3c93d70cfacbebc6d5105d2 sc-7.12.tar.gz 173817
diff --git a/app-office/sc/sc-7.12.ebuild b/app-office/sc/sc-7.12.ebuild
index 7cc0fb556cf6..20e545c7944e 100644
--- a/app-office/sc/sc-7.12.ebuild
+++ b/app-office/sc/sc-7.12.ebuild
@@ -1,30 +1,42 @@
-# Copyright 1999-2001 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/app-office/sc/sc-7.12.ebuild,v 1.1 2001/05/16 14:51:39 achim Exp $
-
-#P=
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.12.ebuild,v 1.1.1.1 2005/11/30 09:58:55 chriswhite Exp $
+
+inherit eutils
+
 DESCRIPTION="sc is a free curses-based spreadsheet program that uses key bindings similar to vi and less."
-SRC_URI="ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/${A}"
-HOMEPAGE=""
+SRC_URI="ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/${P}.tar.gz"
+HOMEPAGE="http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/"
 
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2"
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-amd64.patch
+}
 
 src_compile() {
-    try make CFLAGS=\"-DSYSV3 $CFLAGS\" prefix=/usr
+	make CFLAGS="-DSYSV3 $CFLAGS" prefix=/usr || die
 }
 
 src_install () {
-    dodir /usr/bin
-    dodir /usr/share/man/man1
-    dodir /usr/lib/sc
-    try make prefix=${D}/usr MANDIR=${D}/usr/share/man/man1 install
- 
-    dodoc CHANGES README sc.doc psc.doc tutorial.sc
-    dodoc VMS_NOTES ${P}.lsm TODO SC.MACROS
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodir /usr/lib/sc
+	make prefix=${D}/usr MANDIR=${D}/usr/share/man/man1 install || die
+
+	sed -i "s:${D}::g" sc.1
+	doman sc.1 psc.1
+
+	dodoc CHANGES README sc.doc psc.doc tutorial.sc
+	dodoc VMS_NOTES ${P}.lsm TODO SC.MACROS
 }
 
 # vim: ai et sw=4 ts=4
diff --git a/app-office/sc/sc-7.16.ebuild b/app-office/sc/sc-7.16.ebuild
index b4c8b9a97036..cede24f44475 100644
--- a/app-office/sc/sc-7.16.ebuild
+++ b/app-office/sc/sc-7.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/app-office/sc/sc-7.16.ebuild,v 1.1 2005/07/12 07:48:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16.ebuild,v 1.1.1.1 2005/11/30 09:58:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 2a1515118d2d..b49b6ed89219 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,11 +1,259 @@
 # ChangeLog for app-office/scribus
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# Author: Francisco Gimeno <kikov@fco-gimeno.com>
-# Maintainer: Jos� Alberto Su�rez L�pez <bass@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.1 2002/06/12 01:53:03 bass Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
+
+*scribus-1.3.1 (09 Oct 2005)
+
+  09 Oct 2005; Hanno Boeck <hanno@gentoo.org> +scribus-1.3.1.ebuild:
+  Development version, in package.mask, needs cairo 1.0 before unmasking.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> scribus-1.2.2.1.ebuild:
+  Stable on ppc64
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  scribus-1.2.2.1.ebuild:
+  Stable on ppc.
+
+  14 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  scribus-1.2.2.1.ebuild:
+  Stable on sparc
+
+  13 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> scribus-1.2.2.1.ebuild:
+  Stable on amd64.
+
+*scribus-1.2.3 (13 Sep 2005)
+
+  13 Sep 2005; Hanno Boeck <hanno@gentoo.org> +scribus-1.2.3.ebuild:
+  Version bump and fix for doc-symlink.
+
+  13 Sep 2005; Hanno Boeck <hanno@gentoo.org> scribus-1.2.2.1.ebuild:
+  Stable on x86.
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> scribus-1.2.ebuild,
+  scribus-1.2.1.ebuild, scribus-1.2.2.ebuild, scribus-1.2.2-r1.ebuild:
+  Change qt dep per bug #100235
+
+  13 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> scribus-1.2.2.1.ebuild:
+  Switch from kde-functions.eclass to qt3.eclass. Also fixes bug #97956.
+
+*scribus-1.2.2.1 (07 Jul 2005)
+
+  07 Jul 2005; Hanno Boeck <hanno@gentoo.org> +scribus-1.2.2.1.ebuild:
+  Version bump.
+
+*scribus-1.2.2-r1 (04 Jul 2005)
+
+  04 Jul 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/scribus-1.2.2-crash-fix.diff, +scribus-1.2.2-r1.ebuild:
+  Fix for crash bug.
+
+*scribus-1.2.2 (04 Jul 2005)
+
+  04 Jul 2005; <hanno@gentoo.org> +scribus-1.2.2.ebuild:
+  Version bump.
+
+  20 Apr 2005; Markus Rothe <corsair@gentoo.org> scribus-1.2.1.ebuild:
+  Stable on ppc64
+
+  09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> scribus-1.2.1.ebuild:
+  Stable on ppc.
+
+  06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> scribus-1.2.1.ebuild:
+  Marked stable on amd64.
+
+  24 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> scribus-1.2.1.ebuild:
+  Stable on sparc
+
+  22 Feb 2005; Hanno Boeck <hanno@gentoo.org> scribus-1.2.1.ebuild:
+  Stable on x86.
+
+  27 Jan 2005; Hanno Boeck <hanno@gentoo.org> scribus-1.2.1.ebuild:
+  Make menu entry work and use portage macros domenu and doicon.
+
+*scribus-1.2.1 (08 Jan 2005)
+
+  08 Jan 2005; Hanno Boeck <hanno@gentoo.org> +scribus-1.2.1.ebuild:
+  Version bump.
+
+  23 Nov 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.2.ebuild:
+  Update dependency to qt-3.3.3 (see bug #65419).
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> scribus-1.1.7.ebuild,
+  scribus-1.2.ebuild:
+  stable on amd64.
+
+  25 Sep 2004; Jason Wever <weeve@gentoo.org> scribus-1.2.ebuild:
+  Stable on sparc.
+
+  20 Sep 2004; <SeJo@gentoo.org> scribus-1.2.ebuild:
+  stable on ppc requested by: 64668
+
+  20 Sep 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.2.ebuild:
+  Stable on x86.
+
+  03 Sep 2004; Tom Gall <tgall@gentoo.org> scribus-1.2.ebuild:
+  added ~ppc64, bug #62704
+
+*scribus-1.2 (30 Aug 2004)
+
+  30 Aug 2004; Hanno Boeck <hanno@gentoo.org> +scribus-1.2.ebuild:
+  Version bump.
+
+  24 Aug 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.1.7.ebuild:
+  Clean up dependencies.
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> scribus-1.1.6.ebuild:
+  Marked stable on amd64.
+
+  12 Jun 2004; Jason Wever <weeve@gentoo.org> scribus-1.1.6.ebuild:
+  Stable on sparc.
+
+*scribus-1.1.7 (07 Jun 2004)
+
+  07 Jun 2004; Hanno Boeck <hanno@gentoo.org> +scribus-1.1.7.ebuild:
+  Version bump.
+
+  01 Jun 2004; Aron Griffis <agriffis@gentoo.org> scribus-1.1.4.ebuild,
+  scribus-1.1.5.ebuild, scribus-1.1.6.ebuild:
+  Fix use invocation
+
+  28 Apr 2004; Jon Portnoy <avenj@gentoo.org> scribus-1.1.6.ebuild :
+  Stable on AMD64.
+
+*scribus-1.1.6 (28 Mar 2004)
+
+  28 Mar 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.1.6.ebuild:
+  Version bump.
+
+  13 Mar 2004; Jason Wever <weeve@gentoo.org> scribus-1.1.5.ebuild:
+  Stable on sparc.
+
+  05 Mar 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.1.5.ebuild:
+  Compilation fix (bug #43498).
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> scribus-1.1.4.ebuild:
+  Stable on sparc.
+
+*scribus-1.1.5 (19 Feb 2004)
+
+  19 Feb 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.1.5.ebuild:
+  Version bump.
+
+  09 Feb 2004; Hanno Boeck <hanno@gentoo.org> scribus-1.1.4.ebuild:
+  Mark x86 stable.
+
+  09 Feb 2004; Dylan Carlson <absinthe@gentoo.org> scribus-1.1.4.ebuild:
+  added amd64 keyword.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> scribus-1.1.4.ebuild:
+  set ppc in keywords
+
+*scribus-1.1.4 (20 Dec 2003)
+
+  20 Dec 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.1.4.ebuild:
+  Version bump.
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> scribus-1.1.2.ebuild:
+  Marked stable on sparc.
+
+*scribus-1.1.3 (01 Dec 2003)
+
+  01 Dec 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.1.3.ebuild:
+  Version bump. Removed fix for python 2.3, it is integrated upstream.
+
+  14 Nov 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.1.2.ebuild:
+  Patch to compile with python 2.3 from Marc Chabrol (bug #32775).
+
+*scribus-1.1.2 (02 Nov 2003)
+
+  02 Nov 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.1.2.ebuild:
+  Version bump.
+
+  11 Oct 2003; Jason Wever <weeve@gentoo.org> scribus-1.1.1.ebuild:
+  Added ~sparc keywords, fixes bug #30932.
+
+*scribus-1.1.1 (11 Oct 2003)
+
+  11 Oct 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.1.1.ebuild:
+  Version bump.
+
+*scribus-1.1.0 (11 Sep 2003)
+
+  11 Sep 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.1.0.ebuild:
+  Version bump.
+
+  24 Aug 2003; Heinrich Wendel <lanius@gentoo.org> scribus-0.8.ebuild,
+  scribus-1.0_rc1.ebuild:
+  bug #21382
+
+*scribus-1.0.1 (20 Aug 2003)
+
+  20 Aug 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.0.1.ebuild,
+  scribus-1.0.ebuild:
+  Version bump.
+
+*scribus-1.0 (16 Jul 2003)
+
+  16 Jul 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.0.ebuild:
+  Version bump.
+
+*scribus-1.0_rc1 (23 Jun 2003)
+
+  23 Jun 2003; Hanno Boeck <hanno@gentoo.org> scribus-1.0_rc1.ebuild:
+  Version bump. Makes scribus-svg obsolete.
+
+*scribus-0.9.10 (18 May 2003)
+
+  18 May 2003; Hanno Boeck <hanno@gentoo.org> scribus-0.9.10.ebuild:
+  Version bump.
+
+*scribus-0.9.7 (01 Mar 2003)
+
+  01 Mar 2003; Hanno Boeck <hanno@gentoo.org> scribus-0.9.7.ebuild :
+  New development version.
+
+*scribus-0.9.6 (12 Jan 2003)
+
+  12 Jan 2003; Hanno Boeck <hanno@gentoo.org> scribus-0.9.6.ebuild :
+  New development version.
+
+*scribus-0.9.4 (15 Dec 2002)
+
+  15 Dec 2002; Hanno Boeck <hanno@gentoo.org> scribus-0.9.4.ebuild :
+  New development-version.
+
+  28 Nov 2002; Hanno Boeck <hanno@gentoo.org> scribus-0.9.2.ebuild
+  scribus-0.8.ebuild :
+  Added zlib as a dependency, should resolve bug #11270.
+
+*scribus-0.9.2 (17 Nov 2002)
+
+  17 Nov 2002; Hanno Boeck <hanno@gentoo.org> scribus-0.9.2.ebuild :
+  Added new development-version.
+  Removed patches, as they are already in the release.
+
+*scribus-0.8 (27 Oct 2002)
+
+  27 Oct 2002; Hanno Boeck <hanno@gentoo.org> scribus-0.8.ebuild :
+  Version updated.
+  Added two patches by the author and a compile fix for the CXXFLAGS.
 
 *scribus-0.7.4-r1 (09 Jun 2002)
 
+  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> scribus-0.7.4-r1.ebuild :
+  Added IUSE.
+
+  16 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Make kde .desktop file installation routine use eclasses to find out kde's
+  path instead of hardcoding it.
+
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
   09 Jun 2002; Francisco Gimeno <kikov@fco-gimeno.com> scribus-0.7.4-r1.ebuild: 
   The initial package.
   
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 56aad82a2d04..4c4d1d1a09fa 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,9 +1,18 @@
-MD5 80e90e785d7e651a68f612019f849d80 ChangeLog 1711
-MD5 0b4b29270a29cd6cba36a659c6ee809f scribus-0.8.ebuild 1356
-MD5 3ba8127f9ae1aca66ac819b91b744ed9 scribus-0.9.7.ebuild 1245
-MD5 7658419daf991946ec3c20950ef28c3b scribus-0.9.10.ebuild 1101
-MD5 418671b40c4b08e6ce65a757c0999753 files/Fonts.diff 843
-MD5 34060ad84b63c66cd7a8e223e2c3efd6 files/Palette.diff 2322
-MD5 123bb39628fb75fc8db1967bab163f1d files/digest-scribus-0.8 64
-MD5 ab4d0d9200f26e3d89d1587a256043ac files/digest-scribus-0.9.7 66
-MD5 e5163bdcfba08bff69322ac9c37260e4 files/digest-scribus-0.9.10 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 29760ad55ec9722e31f912c3bc1dfdb2 ChangeLog 7584
+MD5 ad6a8f28302ba5f2cd6602f15dcf8f0b files/digest-scribus-1.2.2.1 69
+MD5 5bb23dbcb9bbf3ed3c858a67aeb084f9 files/digest-scribus-1.2.3 67
+MD5 ccc6537c02e7409e9a57042e16571e0c files/digest-scribus-1.3.1 67
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 22b9b515efb9df74f82a0d388b40ea32 scribus-1.2.2.1.ebuild 1043
+MD5 543928f3e03bb416a4cfa620e392411e scribus-1.2.3.ebuild 1044
+MD5 d6c11de9419f09836510b84720f65c43 scribus-1.3.1.ebuild 1101
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSX/8r2QksT29OyARAmA1AJ0RMih3GTtk7tiDcW+vB5vva4GcaACeK8T4
+SB2f8v6o7ZR5oACC8DdZzJg=
+=wgOF
+-----END PGP SIGNATURE-----
diff --git a/app-office/scribus/scribus-1.2.2.1.ebuild b/app-office/scribus/scribus-1.2.2.1.ebuild
index 7a0228c42847..0940060297ec 100644
--- a/app-office/scribus/scribus-1.2.2.1.ebuild
+++ b/app-office/scribus/scribus-1.2.2.1.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.2.2.1.ebuild,v 1.1 2005/07/07 17:51:26 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
-inherit kde-functions eutils
-need-qt 3
+inherit qt3 eutils
 
 DESCRIPTION="Desktop Publishing (DTP) and Layout program for Linux."
 HOMEPAGE="http://www.scribus.net"
 SRC_URI="http://www.scribus.org.uk/downloads/${PV}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-3.3.3
+DEPEND="$(qt_min_version 3.3.4)
 	>=media-libs/freetype-2.1
 	>=media-libs/lcms-1.09
 	media-libs/tiff
@@ -21,7 +20,8 @@ DEPEND=">=x11-libs/qt-3.3.3
 	>=sys-devel/gcc-3.0.0
 	>=dev-libs/libxml2-2.6.0"
 
-RDEPEND="virtual/ghostscript"
+RDEPEND="${DEPEND}
+	virtual/ghostscript"
 
 src_compile() {
 	econf || die
@@ -36,5 +36,6 @@ src_install() {
 	domenu scribus.desktop
 	doicon scribus/icons/scribusicon.png
 
-	dosym /usr/share/scribus/doc /usr/share/doc/${PF}/html
+	mkdir -p ${D}/usr/share/doc/${P}
+	mv ${D}/usr/share/scribus/doc ${D}/usr/share/doc/${P}/html
 }
diff --git a/app-office/scribus/scribus-1.2.3.ebuild b/app-office/scribus/scribus-1.2.3.ebuild
index 318873142ef8..538f4253c6ab 100644
--- a/app-office/scribus/scribus-1.2.3.ebuild
+++ b/app-office/scribus/scribus-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/app-office/scribus/scribus-1.2.3.ebuild,v 1.1 2005/09/13 22:36:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 inherit qt3 eutils
 
diff --git a/app-office/scribus/scribus-1.3.1.ebuild b/app-office/scribus/scribus-1.3.1.ebuild
index 80927bf82121..5ac38470530d 100644
--- a/app-office/scribus/scribus-1.3.1.ebuild
+++ b/app-office/scribus/scribus-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/app-office/scribus/scribus-1.3.1.ebuild,v 1.1 2005/10/09 20:36:52 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.3.1.ebuild,v 1.1.1.1 2005/11/30 09:58:59 chriswhite Exp $
 
 inherit qt3 eutils
 
diff --git a/app-office/taskjuggler/ChangeLog b/app-office/taskjuggler/ChangeLog
index 8226b580ef08..21eeda0d4c8f 100644
--- a/app-office/taskjuggler/ChangeLog
+++ b/app-office/taskjuggler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/taskjuggler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taskjuggler/ChangeLog,v 1.1 2005/08/11 20:15:51 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskjuggler/ChangeLog,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
+
+*taskjuggler-2.1.1-r1 (12 Aug 2005)
+
+  12 Aug 2005; Michael Imhof <tantive@gentoo.org>
+  +taskjuggler-2.1.1-r1.ebuild:
+  Closes #102236.
 
 *taskjuggler-2.1.1 (11 Aug 2005)
 
diff --git a/app-office/taskjuggler/Manifest b/app-office/taskjuggler/Manifest
index 9324825c6405..5b3a66914cec 100644
--- a/app-office/taskjuggler/Manifest
+++ b/app-office/taskjuggler/Manifest
@@ -1,3 +1,15 @@
-MD5 771147b26aef4e7a049b705c17b57684 taskjuggler-2.1.1.ebuild 1995
-MD5 f9cefcba3c47bdcc240f50c02e9b3c95 ChangeLog 268
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d783ab97133eb86959ee788e3d25af55 taskjuggler-2.1.1.ebuild 2105
+MD5 0f89c1c14bf7523acf0491197636900c ChangeLog 501
+MD5 c0398ee91c8fb0f1d1015260a6fea3a4 taskjuggler-2.1.1-r1.ebuild 2150
 MD5 581699911e03fcfe610df0a2b1efeeb0 files/digest-taskjuggler-2.1.1 71
+MD5 581699911e03fcfe610df0a2b1efeeb0 files/digest-taskjuggler-2.1.1-r1 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC/SU0KtJO8LeSoosRApt3AJ9ccH7RfvK6v0RMFc+kX9m65HWaiwCdFDg5
+NiBQaA0uFpp7OnRVXKaeWbI=
+=BvKK
+-----END PGP SIGNATURE-----
diff --git a/app-office/taskjuggler/taskjuggler-2.1.1-r1.ebuild b/app-office/taskjuggler/taskjuggler-2.1.1-r1.ebuild
index 1c007ee70758..3fb9ebb63788 100644
--- a/app-office/taskjuggler/taskjuggler-2.1.1-r1.ebuild
+++ b/app-office/taskjuggler/taskjuggler-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/app-office/taskjuggler/taskjuggler-2.1.1-r1.ebuild,v 1.1 2005/08/12 22:38:25 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskjuggler/taskjuggler-2.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 inherit eutils qt3
 
diff --git a/app-office/taskjuggler/taskjuggler-2.1.1.ebuild b/app-office/taskjuggler/taskjuggler-2.1.1.ebuild
index e31bfc13c5fc..d074286b6ddb 100644
--- a/app-office/taskjuggler/taskjuggler-2.1.1.ebuild
+++ b/app-office/taskjuggler/taskjuggler-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/app-office/taskjuggler/taskjuggler-2.1.1.ebuild,v 1.1 2005/08/11 20:15:51 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskjuggler/taskjuggler-2.1.1.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 inherit eutils qt3
 
diff --git a/app-office/tedia2sql/ChangeLog b/app-office/tedia2sql/ChangeLog
index a007d81dae74..384f1e1b85b6 100644
--- a/app-office/tedia2sql/ChangeLog
+++ b/app-office/tedia2sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/tedia2sql
-# Copyright 2000-2004Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/tedia2sql/ChangeLog,v 1.1 2004/01/14 21:43:11 rphillips Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/tedia2sql/ChangeLog,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
+
+  22 Jul 2005; David Holm <dholm@gentoo.org> tedia2sql-1.2.8.ebuild:
+  Added to ~ppc.
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> tedia2sql-1.2.8.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
 
 *tedia2sql-1.2.8 (14 Jan 2004)
 
diff --git a/app-office/tedia2sql/Manifest b/app-office/tedia2sql/Manifest
index 23700df82968..dad487e3483d 100644
--- a/app-office/tedia2sql/Manifest
+++ b/app-office/tedia2sql/Manifest
@@ -1,2 +1,4 @@
-MD5 f264cdd73d462e06e610b3cb1c526bc8 tedia2sql-1.2.8.ebuild 745
+MD5 1345e32672a436955f79fd16b6e6f066 ChangeLog 598
+MD5 5e5ea1b731cfe3b4ff2db4581eab0fdf tedia2sql-1.2.8.ebuild 818
 MD5 b7216ba0bec6c1dedf761cd7e98d8bfb files/digest-tedia2sql-1.2.8 64
+MD5 b4240fe6e788b7ed6a160bc21f254664 files/tedia2sql-gentoo.patch 664
diff --git a/app-office/tedia2sql/tedia2sql-1.2.8.ebuild b/app-office/tedia2sql/tedia2sql-1.2.8.ebuild
index 84925ee53029..94ad557c9d23 100644
--- a/app-office/tedia2sql/tedia2sql-1.2.8.ebuild
+++ b/app-office/tedia2sql/tedia2sql-1.2.8.ebuild
@@ -1,30 +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/app-office/tedia2sql/tedia2sql-1.2.8.ebuild,v 1.1 2004/01/14 21:43:11 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/tedia2sql/tedia2sql-1.2.8.ebuild,v 1.1.1.1 2005/11/30 09:58:56 chriswhite Exp $
 
-mypv=$(echo ${PV} | sed s/\\.//g)
+inherit eutils
 
+MY_PV=${PV//.}
 DESCRIPTION="Convert database ERD designed in Dia into SQL DDL scripts."
 HOMEPAGE="http://tedia2sql.tigris.org/"
-SRC_URI="http://tedia2sql.tigris.org/files/documents/282/2144/${PN}-${mypv}.tar.gz"
+SRC_URI="http://tedia2sql.tigris.org/files/documents/282/2144/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="~ppc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/perl-5.8
-		>=dev-perl/XML-DOM-1.43
-		>=dev-perl/Digest-MD5-2.24"
+	>=dev-perl/XML-DOM-1.43
+	>=perl-core/Digest-MD5-2.24"
 
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-gentoo.patch || die
+	epatch ${FILESDIR}/${PN}-gentoo.patch
 }
 
 src_install() {
@@ -32,6 +31,6 @@ src_install() {
 	doins tedia2sqlrc
 
 	dobin tedia2sql
-	dodoc LICENSE README
+	dodoc README
 	use doc && dohtml -A sql -A dia www/*
 }
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 8ec1ca5b3812..4053f4eafbe5 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,10 +1,180 @@
 # ChangeLog for app-office/texmacs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47
-gbevin Exp
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
+
+*texmacs-1.0.5.6 (08 Aug 2005)
+
+  08 Aug 2005; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.4.7.ebuild,
+  -texmacs-1.0.5.ebuild, +texmacs-1.0.5.6.ebuild:
+  Version bumped.
+
+*texmacs-1.0.5.2 (29 May 2005)
+
+  29 May 2005; Mamoru KOMACHI <usata@gentoo.org> +texmacs-1.0.5.2.ebuild:
+  Version bumped. This closes bug #94250.
+
+*texmacs-1.0.5 (21 May 2005)
+
+  21 May 2005; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.4.4.ebuild,
+  -texmacs-1.0.4.5.ebuild, +texmacs-1.0.5.ebuild:
+  Version bumped. This closes bug #91064.
+
+*texmacs-1.0.4.7 (12 Apr 2005)
+
+  12 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +texmacs-1.0.4.7.ebuild:
+  Version bumped.
+
+  21 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> texmacs-1.0.4.5.ebuild:
+  added ~amd64 to KEYWORDS. fixes #71106
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> texmacs-1.0.4-r1.ebuild:
+  Stable on sparc.
+
+*texmacs-1.0.4.5 (11 Dec 2004)
+
+  11 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.4.3.ebuild,
+  +texmacs-1.0.4.5.ebuild:
+  Version bumped.
+
+*texmacs-1.0.4.4 (15 Nov 2004)
+
+  15 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.3-r1.ebuild,
+  +texmacs-1.0.4.4.ebuild, -texmacs-1.0.4.ebuild:
+  Version bumped. Added static USE flag. This closes bug #71195.
+
+  04 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.4-r1.ebuild,
+  -texmacs-1.0.4.1.ebuild:
+  Marked 1.0.4-r1 stable on x86, ppc and alpha.
+
+*texmacs-1.0.4.3 (10 Oct 2004)
+*texmacs-1.0.4-r1 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.3.10.ebuild,
+  +texmacs-1.0.4-r1.ebuild, texmacs-1.0.4.1.ebuild, +texmacs-1.0.4.3.ebuild,
+  texmacs-1.0.4.ebuild:
+  Version bumped.
+
+*texmacs-1.0.4.1 (28 Aug 2004)
+
+  28 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.3.9.ebuild,
+  -texmacs-1.0.3.ebuild, +texmacs-1.0.4.1.ebuild, +texmacs-1.0.4.ebuild:
+  Version bumped. Removed old ebuilds.
+
+*texmacs-1.0.3.10 (07 Jul 2004)
+
+  07 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> +texmacs-1.0.3.10.ebuild,
+  -texmacs-1.0.3.7.ebuild:
+  Version bumped.
+
+*texmacs-1.0.3.9 (23 Jun 2004)
+
+  23 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.3-r1.ebuild,
+  +texmacs-1.0.3.9.ebuild, texmacs-1.0.3.ebuild:
+  Version bumped. Marked 1.0.3 stable.
+
+  01 May 2004; Jason Wever <weeve@gentoo.org> texmacs-1.0.3.7.ebuild:
+  Added ~sparc keyword to help resolve #49540.
+
+  26 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> texmacs-1.0.3.7.ebuild:
+  Keyworded ~alpha, requested by Decade at freenode/#gentoo-alpha.
+
+*texmacs-1.0.3.7 (26 Apr 2004)
+*texmacs-1.0.3-r1 (26 Apr 2004)
+
+  26 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.1-r1.ebuild,
+  texmacs-1.0.2.4.ebuild, texmacs-1.0.3-r1.ebuild, texmacs-1.0.3.3.ebuild,
+  texmacs-1.0.3.7.ebuild, texmacs-1.0.3.ebuild:
+  Added ebuilds from stable and development branch. Marked 1.0.3
+  stable on x86. Added flag-o-matic back. (it is actually in portage
+  functions but it is recommended to inherit it)
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> texmacs-1.0.1-r1.ebuild:
+  Add die following econf for bug 48950
+
+*texmacs-1.0.3.3 (21 Feb 2004)
+*texmacs-1.0.3 (21 Feb 2004)
+
+  12 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.3.3.ebuild,
+  texmacs-1.0.3.ebuild, files/TeXmacs.desktop:
+  Added TeXmacs appliations menu entry, contributed by Keith Lea
+  <keith@cs.oswego.edu>. Closing bug #43545
+
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.1-r1.ebuild,
+  texmacs-1.0.1.23.ebuild, texmacs-1.0.1.ebuild, texmacs-1.0.2.4.ebuild,
+  texmacs-1.0.3.3.ebuild, texmacs-1.0.3.ebuild:
+  Version bumped, closing bug #38894. Removed old versions.
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> texmacs-1.0.1-r1.ebuild,
+  texmacs-1.0.1.23.ebuild, texmacs-1.0.1.ebuild, texmacs-1.0.2.4.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+*texmacs-1.0.2.4 (28 Oct 2003)
+
+  28 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.1-r1.ebuild,
+  texmacs-1.0.1.23.ebuild, texmacs-1.0.1.ebuild, texmacs-1.0.2.4.ebuild:
+  Version bumped. Changed app-text/tetex to virtual/tetex.
+  Closing Bug #31032.
+
+  14 Sep 2003; Mike Gardiner <obz@gentoo.org> texmacs-1.0.0.19.ebuild:
+  Removed old version
+
+*texmacs-1.0.1.23 (14 Sep 2003)
+
+  14 Sep 2003; Mike Gardiner <obz@gentoo.org> texmacs-1.0.1.23.ebuild:
+  New version
+
+*texmacs-1.0.1-r1 (13 Sep 2003)
+
+  13 Sep 2003; Mike Gardiner <obz@gentoo.org> texmacs-1.0.1-r1.ebuild:
+  New revision adding spell support through ispell
+
+  12 Jun 2003; <msterret@gentoo.org> texmacs-1.0.0.19.ebuild,
+  texmacs-1.0.1.ebuild:
+  fix Header
+
+*texmacs-1.0.1 (02 Jan 2002)
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> texmacs-1.0.0.19.ebuild,
+  texmacs-1.0.1.ebuild:
+  Change supersed dependencies
+
+  17 Mar 2003; Graham Forest <vladimir@gentoo.org> texmacs-1.0.1.ebuild:
+  set ~ppc in keywords
+
+  02 Jan 2002; Matthew Turk <satai@gentoo.org> texmacs-1.0.1.ebuild :
+
+  Included some opts, manually turned off all inlining.  Hopefully this'll work
+  nicely.  Also bumped version.
+
+*texmacs-1.0.0.19 (23 Oct 2002)
+
+  06 Nov 2002; Seemant Kulleen <seemant@gentoo.org> texmacs-1.0.0.19.ebuild :
+
+  Changed to use econf so things get installed in the correct locations 
+  and custom CXXFLAGS settings.  Closes bug #10220 by:
+  jap1@ionet.net (Jacob Perkins)
+
+  23 Oct 2002; Matthew Turk <satai@gentoo.org> :
+
+  New version, testing.  Changing to unstable.
+
+*texmacs-1.0.0.16 (13 Sep 2002)
+
+  13 Sep 2002; Matthew Turk <satai@gentoo.org> ChangeLog  :
+
+  New version, close submission #7860
+
+*texmacs-1.0.0.8 (03 Jul 2002)
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New version, close submission #4277
 
 *texmacs-1.0 (29 May 2002)
 
   29 May 2002; Dan Armak <danarmak@gentoo.org> changelog:
   
-  Initial ebuild. Based on bug #.
\ No newline at end of file
+  Initial ebuild. Based on bug #.
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 068f5fc3eace..001da26e0eff 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,5 +1,19 @@
-MD5 f6d41ec6c50082888d51edd3d4d277d8 texmacs-1.0.0.19.ebuild 972
-MD5 4011fc1d93416dca9795446d70a9e4ce texmacs-1.0.1.ebuild 1073
-MD5 1f74716f5b48309af65e70587dac3fac ChangeLog 1423
-MD5 4e64086a3b4c9a500cf4d4bbd8ca3e5f files/digest-texmacs-1.0.0.19 146
-MD5 e66f431d3e08f7c71c8b3838c9601369 files/digest-texmacs-1.0.1 143
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7a07d47548b05fd9a20af75707a4042e ChangeLog 6028
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 a6a6e1a15283fe95614f260d519b7caa texmacs-1.0.5.2.ebuild 1623
+MD5 d27656f3467bb1da5fa6a251451e9b73 texmacs-1.0.4-r1.ebuild 1480
+MD5 415c72fdeb0b47c4b125d1c7ee62e12b texmacs-1.0.5.6.ebuild 1623
+MD5 381e39eb44d0fad159f7759dc7d2c27d files/digest-texmacs-1.0.5.6 145
+MD5 5a26d5f6c64dce62d33f64ab8e62177c files/digest-texmacs-1.0.5.2 145
+MD5 2d501a8fe39616f98bc65ec3f7343548 files/TeXmacs.desktop 266
+MD5 bf93b125609bba4a0caf22c50fd0c084 files/digest-texmacs-1.0.4-r1 146
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC93g2VWNWqTUmv+0RAr+VAKCZTmvsvIWRK+AEd+Sdc1MkY3IHzACeJ6Fn
+PNNfpwA6UcVi0EqajEORNV0=
+=yqlb
+-----END PGP SIGNATURE-----
diff --git a/app-office/texmacs/texmacs-1.0.4-r1.ebuild b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
index cc746a79e6aa..ad72cca7b886 100644
--- a/app-office/texmacs/texmacs-1.0.4-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.1 2004/10/09 21:59:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="spell"
 # TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ppc alpha sparc"
 
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.4
diff --git a/app-office/texmacs/texmacs-1.0.5.2.ebuild b/app-office/texmacs/texmacs-1.0.5.2.ebuild
index d7638697ea13..5756d285c32e 100644
--- a/app-office/texmacs/texmacs-1.0.5.2.ebuild
+++ b/app-office/texmacs/texmacs-1.0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.2.ebuild,v 1.1 2005/05/29 04:36:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.2.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
diff --git a/app-office/texmacs/texmacs-1.0.5.6.ebuild b/app-office/texmacs/texmacs-1.0.5.6.ebuild
index 590876b41950..4ee7341b9b4c 100644
--- a/app-office/texmacs/texmacs-1.0.5.6.ebuild
+++ b/app-office/texmacs/texmacs-1.0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.1 2005/08/08 15:33:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.1.1.1 2005/11/30 09:59:02 chriswhite Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 687bc79bdf0e..72bcce0e67a7 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for app-office/texmaker
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.1 2004/11/07 07:32:51 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
+
+*texmaker-1.11-r1 (02 Jul 2005)
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> +texmaker-1.11-r1.ebuild:
+  Added desktop entry; bug #97126. Thanks to Sebastian Kemper
+  <sebastian_ml@gmx.net>.
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> texmaker-1.11.ebuild:
+  Fix qmake bin path per bug #97535
+
+  28 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> texmaker-1.11.ebuild:
+  added ~amd64 to KEYWORDS. fixes #71354
+
+  02 Jan 2005; Joseph Jezak <josejx@gentoo.org> texmaker-1.11.ebuild:
+  Marked ~ppc.
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> texmaker-1.11.ebuild:
+  Added ~sparc keyword.
+
+  26 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> texmaker-1.11.ebuild:
+  Use kde-functions.eclass. This fixes bug #72515.
 
 *texmaker-1.11 (07 Nov 2004)
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index fec1c86ada6c..421251825d3d 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,2 +1,6 @@
-MD5 05b58e1357ba7c7c77077da19062c1f7 texmaker-1.11.ebuild 1304
+MD5 0f066587d60dbdf5769790c3191e57e6 ChangeLog 1142
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 4795d01e61e250245aef7dfeabff2d9a texmaker-1.11.ebuild 1395
+MD5 b6d6970bed253b1b6426c1d64a01c91f texmaker-1.11-r1.ebuild 1499
 MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11 66
+MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11-r1 66
diff --git a/app-office/texmaker/texmaker-1.11-r1.ebuild b/app-office/texmaker/texmaker-1.11-r1.ebuild
index eed46a8e689b..95b8a326c4f7 100644
--- a/app-office/texmaker/texmaker-1.11-r1.ebuild
+++ b/app-office/texmaker/texmaker-1.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/app-office/texmaker/texmaker-1.11-r1.ebuild,v 1.1 2005/07/02 08:58:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
 
 inherit kde-functions eutils
 
diff --git a/app-office/texmaker/texmaker-1.11.ebuild b/app-office/texmaker/texmaker-1.11.ebuild
index 1e8359a9ae11..b8f857359f75 100644
--- a/app-office/texmaker/texmaker-1.11.ebuild
+++ b/app-office/texmaker/texmaker-1.11.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-office/texmaker/texmaker-1.11.ebuild,v 1.1 2004/11/07 07:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.11.ebuild,v 1.1.1.1 2005/11/30 09:59:04 chriswhite Exp $
+
+inherit kde-functions
 
 DESCRIPTION="a nice LaTeX-IDE"
 
@@ -11,17 +13,18 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
 IUSE=""
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3.2*
 	virtual/tetex
 	app-text/psutils
 	virtual/ghostscript
 	media-libs/netpbm"
 
+need-qt 3.2
+
 src_compile() {
 	einfo "using QTDIR: '$QTDIR'."
 
@@ -31,18 +34,15 @@ src_compile() {
 	DYLD_LIBRARY_PATH=${QTDIR}/lib:${DYLD_LIBRARY_PATH}
 	export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
 
-	qmake -unix texmaker.pro || die "qmake failed"
+	${QTDIR}/bin/qmake -unix texmaker.pro || die "qmake failed"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe texmaker || die "doexe failed"
+	dobin texmaker || die "doexe failed"
 
-	PIX=/usr/share/pixmaps/texmaker
-	dodir ${PIX}
-	insinto ${PIX}
+	insinto /usr/share/pixmaps/texmaker
 	doins utilities/texmaker*.png || die "doins failed."
 
 	dodoc utilities/{AUTHORS,COPYING} || die "dodoc failed"
diff --git a/app-office/tpp/ChangeLog b/app-office/tpp/ChangeLog
index 7a8f66ac6a85..4ec1459dc324 100644
--- a/app-office/tpp/ChangeLog
+++ b/app-office/tpp/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-office/tpp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/tpp/ChangeLog,v 1.1 2005/03/02 12:39:08 citizen428 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/tpp/ChangeLog,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
+
+  19 Nov 2005; Joseph Jezak <josejx@gentoo.org> tpp-1.3.ebuild:
+  Marked ppc stable for bug #111215.
+
+  02 Nov 2005; Andrej Kacian <ticho@gentoo.org> tpp-1.3.ebuild:
+  Stable on x86, bug #111215.
+
+  14 Jul 2005; David Holm <dholm@gentoo.org> tpp-1.3.ebuild:
+  Added to ~ppc.
+
+*tpp-1.3 (13 Jul 2005)
+
+  13 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/tpp-1.3-Makefile.patch, +tpp-1.3.ebuild:
+  (#98817) Version bump on behalf of the ruby herd.
 
 *tpp-1.1.1 (02 Mar 2005)
 
diff --git a/app-office/tpp/Manifest b/app-office/tpp/Manifest
index f6146ca04b76..9f522af5f0c8 100644
--- a/app-office/tpp/Manifest
+++ b/app-office/tpp/Manifest
@@ -1,3 +1,18 @@
-MD5 1f368c948a85f4b38614367d86f51e03 tpp-1.1.1.ebuild 610
-MD5 b522b82d2c47bc548a6607f0f577ab5e metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 25928c6eb39d81ec2208ae5c31d7badf ChangeLog 899
 MD5 88742db74aaaa305de59c9405e8f39c5 files/digest-tpp-1.1.1 60
+MD5 b3c88b7d5e7dd93b4d4dc2335271d73f files/digest-tpp-1.3 58
+MD5 a68630d34ea6a5425f0cbb36fb0af210 files/tpp-1.1.1-Makefile.patch 700
+MD5 d63676d4a066b5b404797b5aad05b7da files/tpp-1.3-Makefile.patch 893
+MD5 b522b82d2c47bc548a6607f0f577ab5e metadata.xml 158
+MD5 75d4015f47059c554ee9e90a045d5b9d tpp-1.1.1.ebuild 707
+MD5 12395970f873e6c8a6be979049154fe1 tpp-1.3.ebuild 704
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf1k0csIHjyDViGQRAoYrAKDggmnInYFkQ+4ml+51BbhOEEbC9gCfa8jC
+TgnH1ZUE6PCUidEITy5QSp0=
+=e8Xm
+-----END PGP SIGNATURE-----
diff --git a/app-office/tpp/tpp-1.1.1.ebuild b/app-office/tpp/tpp-1.1.1.ebuild
index 673ab9257e3b..a96efc2b22ec 100644
--- a/app-office/tpp/tpp-1.1.1.ebuild
+++ b/app-office/tpp/tpp-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/app-office/tpp/tpp-1.1.1.ebuild,v 1.1 2005/03/02 12:39:08 citizen428 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/tpp/tpp-1.1.1.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 inherit eutils ruby
 
diff --git a/app-office/tpp/tpp-1.3.ebuild b/app-office/tpp/tpp-1.3.ebuild
index 8cc2d7d85b34..59322ef56689 100644
--- a/app-office/tpp/tpp-1.3.ebuild
+++ b/app-office/tpp/tpp-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/app-office/tpp/tpp-1.3.ebuild,v 1.1 2005/07/13 17:25:14 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/tpp/tpp-1.3.ebuild,v 1.1.1.1 2005/11/30 09:58:49 chriswhite Exp $
 
 inherit eutils ruby
 
@@ -10,7 +10,7 @@ SRC_URI="http://synflood.at/tpp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE="figlet"
 
 USE_RUBY="ruby18"
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 920d488a8e2b..2710292520d9 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,241 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.1 2002/02/20 06:12:22 tod Exp $
+# ChangeLog for dev-lang/R
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> R-2.1.1.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> R-2.1.1.ebuild:
+  Stable on ppc.
+
+  22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.1.1.ebuild:
+  Stable on sparc
+
+  22 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-2.0.1.ebuild,
+  R-2.1.1.ebuild:
+  Removed old version. Stable on amd64 and x86.
+
+*R-2.1.1 (01 Jul 2005)
+
+  01 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.1.ebuild,
+  R-2.1.0-r1.ebuild, +R-2.1.1.ebuild:
+  Moved 64bit check to pkg_setup() to make fortran.eclass work again. Bumped
+  to version 2.1.1
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> R-2.1.0-r1.ebuild:
+  Stable on ppc64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> R-2.1.0-r1.ebuild:
+  Stable on ppc.
+
+  13 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.1.0-r1.ebuild:
+  Stable on sparc
+
+  12 Jun 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-1.9.0-r1.ebuild:
+  Removing old version. Closes bug 91512.
+
+  11 Jun 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.1.0-r1.ebuild:
+  Stable on amd64 and x86.
+
+  07 Jun 2005; Patrick Kursawe <phosphan@gentoo.org> R-2.0.1.ebuild,
+  R-2.1.0-r1.ebuild:
+  Added LDPATH to R libs, bug #90601
+
+  01 Jun 2005; Mike Frysinger <vapier@gentoo.org> R-1.9.0-r1.ebuild,
+  R-2.0.1.ebuild:
+  Change USE=bzlib to USE=bzip2.
+
+*R-1.9.0-r1 (25 May 2005)
+
+  25 May 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-1.9.0-r1.ebuild:
+  Bring back R-1.9.0-r1 until <=dev-python/rpy-0.3.5-r1 are removed from
+  portage.
+
+  25 May 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-1.9.0-r1.ebuild:
+  Removed old version.
+
+  25 May 2005; Luca Barbato <lu_zero@gentoo.org> R-2.0.1.ebuild:
+  Marked ppc
+
+  24 May 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.0.1.ebuild:
+  Updated 64 bit detection code.
+
+  10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.0.1.ebuild:
+  Stable on sparc
+
+  08 May 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-1.9.1.ebuild,
+  -R-2.0.0.ebuild, R-2.0.1.ebuild, -R-2.1.0.ebuild, R-2.1.0-r1.ebuild:
+  Marked 2.0.1 stable on amd64 and x86, cleaned out old ebuilds. Added new 64
+  bit detection code to 2.1.0-r1 as per bug 91512.
+
+*R-2.1.0-r1 (29 Apr 2005)
+
+  29 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-2.1.0-r1.ebuild:
+  Get rid of obsolete USE flags, tidy up deps a little. Thanks to MATSUU
+  Takuto <matsuu@gentoo.org> in bug 67834 for the patch.
+
+  21 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.1.0.ebuild:
+  Update deps to reflect new USE flags.
+
+*R-2.1.0 (20 Apr 2005)
+
+  20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-2.1.0.ebuild:
+  Version bump, ebuild cleanups and some additional USE flags. Thanks to
+  matsuu for some of the suggestions in bug 67834.
+
+*R-2.0.1 (21 Feb 2005)
+
+  21 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.0.ebuild,
+  +R-2.0.1.ebuild:
+  Fixed a sandbox violation in R-2.0.0 (BUG #79004) and marked stabled on
+  amd64. Added R-2.0.1 (BUG #72313).
+
+  17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> R-1.9.1.ebuild:
+  ~alpha keyword.
+
+  02 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.0.ebuild:
+  GNU Fortran 77 profile name changed to g77 in fortran.eclass
+
+  17 Nov 2004; Markus Rothe <corsair@gentoo.org> R-2.0.0.ebuild:
+  stable on ppc64
+
+  10 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> -R-1.8.1.ebuild,
+  R-1.9.0-r1.ebuild, R-2.0.0.ebuild:
+  R-2.0.0 now in testing on x86,sparc,amd64,ppc and ppc64; using new
+  fortran.eclass. R-1.9.0-r1 stable on all arches. Removed obsolete R-1.8.1.
+
+*R-2.0.0 (07 Oct 2004)
+
+  07 Oct 2004; George Shapovalov <george@gentoo.org> R-2.0.0 :
+  new version, masked with KEYWORDS="-*" to get a bit more testing
+
+  30 Sep 2004; Ferris McCormick <fmccor@gentoo.org> R-1.9.0-r1.ebuild:
+  Stable for sparc.
+
+  12 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.9.0-r1.ebuild,
+  R-1.9.1.ebuild:
+  Removed f2c support for dev-lang/R on 64-bit arches. This is entirely R's
+  fault. f2c works perfectly right. Future versions of dev-lang/R will check for
+  this in ./configure. For R-1.9.{0,1} the ebuild checks for it. Fixes BUG
+  #61042.
+
+*R-1.9.1 (22 Aug 2004)
+
+  09 Sep 2004; Philippe Trottier <tchiwam@gentoo.org> R-1.9.1.ebuild,
+  marked ~ppc64
+
+  22 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> -R-1.9.0.ebuild,
+  +R-1.9.1.ebuild:
+  Version bump to 1.9.1 (current stable). Removed obsolete 1.9.0.
+
+  06 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.9.0-r1.ebuild:
+  Marked stable on amd64.
+
+  11 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.8.1.ebuild,
+  R-1.9.0-r1.ebuild, R-1.9.0.ebuild:
+  Fixed BUG #56616. Tidied up g77/f2c check in >=R-1.9.0. Added f2c USE flag.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> R-1.8.1.ebuild,
+  R-1.9.0-r1.ebuild, R-1.9.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.8.1.ebuild,
+  R-1.9.0-r1.ebuild, R-1.9.0.ebuild:
+  Fixed BUG #55386 for amd64. Pending for rest of arches.
+
+*R-1.9.0-r1 (05 Jun 2004)
+
+  05 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0-r1.ebuild:
+  Added a few USE flags according to suggestions by Leo Chen <lcheu@cs.sfu.ca>
+
+  28 May 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild:
+  Removing the f77 USE flag check - just giving a hint when no g77 found.
+
+  17 May 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild:
+  adding f77 to IUSE
+
+  11 May 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild:
+  pkg_setup checks for g77 presence now.
+
+  20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild:
+  Changed dependency - works also with current libglade, see bug #47825
+
+*R-1.9.0 (13 Apr 2004)
+
+  13 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.1.ebuild,
+  R-1.9.0.ebuild:
+  Version bump, added write permission for /var/cache/fonts
+
+  01 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.0.ebuild,
+  R-1.8.1.ebuild:
+  1.8.1 is stable
+
+  22 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.1.ebuild:
+  Fixing bug #40100 (problems with newer Xfree)
+
+  25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.4.1-r1.ebuild,
+  R-1.4.1.ebuild, R-1.5.1.ebuild, R-1.6.1.ebuild, R-1.6.2.ebuild,
+  R-1.7.0.ebuild, R-1.7.1.ebuild, R-1.8.0.ebuild, files/R-1.5.1-tcltk.diff:
+  Big cleanup, marking 1.8.0 as stable
+
+*R-1.8.1 (17 Feb 2004)
+
+  17 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.1.ebuild:
+  Version bump
+
+  21 Oct 2003; David Holm <dholm@gentoo.org> R-1.8.0.ebuild:
+  Added to ~ppc.
+
+*R-1.8.0 (16 Oct 2003)
+
+  16 Oct 2003; George Shapovalov <george@gentoo.org> R-1.8.0 :
+  new version (#30784), fixes gnome? dependencies
+  thanks to kdh <bolter111@hotmail.com> for an update
+
+*R-1.7.1 (19 Jun 2003)
+
+  19 Jun 2003; George Shapovalov <george@gentoo.org> R-1.7.1 :
+  new version (#23012), now correctly builds tcltk support
+  fix and update by Tristan Henderson <T.Henderson@cs.ucl.ac.uk>
+
+*R-1.7.0 (29 May 2003)
+
+  29 May 2003; Grant Goodyear <g2boojum@gentoo.org> R-1.7.0.ebuild:
+  Version update.  Thanks to Stuart Luppescu for the heads-up.
+
+*R-1.6.2 (12 Apr 2003)
+
+  12 Apr 2003; Grant Goodyear <g2boojum@gentoo.org> Manifest, R-1.6.2.ebuild:
+  Version bump
+
+*R-1.6.1 (12 Dec 2002)
+
+  12 Dec 2002; George Shapovalov <george@gentoo.org> R-1.6.1.ebuild :
+
+  version update, patching is unnecessary now. 
+  Update subitted by  Sam Wouters <sam.wouters@esat.kuleuven.ac.be>, see #11313
+
+* Autoupdate keywords (12-6-02)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*R-1.5.1 (11 July 2002)
+
+  09 Aug 2002; George Shapovalov <george@gentoo.org> R-1.5.1.ebuild :
+
+  fixed the wrappers:
+  R installs two identical wrappers (R that invoke R.bin) under /usr/bin and 
+  /usr/lib/R/bin/. Only one of these was modified to have correct R_HOME_DIR
+  Changed ebuild to modify R under /usr/lib/R/bin and symlink it into /usr/bin
+
+  11 July 2002; George Shapovalov <george@gentoo.org> R-1.5.1.ebuild, files/digest-R-1.5.1 :
+  
+  upped version
+  new version submitted by Tristan Henderson <T.Henderson@cs.ucl.ac.uk>
+
+*R-1.4.1-r1 (11 Apr 2002)
+  11 Apr 2002; Spider <spider@gentoo.org>
+  Forcing an upgrade due to libpng upgrade.
+
 
 *R-1.4.1 (19 Feb 2002)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 2ff6265552cd..47bcdb6329ff 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,14 +1,8 @@
-MD5 02cecc45d628a9cb29f2f1e1716a977d ChangeLog 1961
-MD5 a129dec8f541cb4e8b21f51511d50b81 R-1.4.1-r1.ebuild 2469
-MD5 06575366d8d0a2f47dfa6a7478af1694 R-1.4.1.ebuild 2466
-MD5 13e45453d57b8713d4640ae079b05fd6 R-1.5.1.ebuild 2764
-MD5 69e7caa2fa11325d1729eb41abfd4e0e R-1.6.2.ebuild 2672
-MD5 69e7caa2fa11325d1729eb41abfd4e0e R-1.6.1.ebuild 2672
-MD5 4d6a8f6796e8abc204cd16638749ddae files/digest-R-1.6.2 57
-MD5 f695db67db56e52a2f19cff1e64a6e97 files/R-1.5.1-tcltk.diff 503
+MD5 a3a1c8a3904d0fff5302f70020643371 ChangeLog 9085
+MD5 fc5ae27d8f8ad03adc952dc27fe62c8b R-2.1.0-r1.ebuild 2659
+MD5 37b3a648e27472743621326bce756212 R-2.1.1.ebuild 2654
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
-MD5 0980ed6af02571cc8a1dc58941c5d2bf files/digest-R-1.4.1 57
-MD5 0980ed6af02571cc8a1dc58941c5d2bf files/digest-R-1.4.1-r1 57
-MD5 d8807f86bf0814c5b3d0f603d65e239f files/digest-R-1.5.1 57
-MD5 922fc77976474c4c66e5d8357894907f files/digest-R-1.6.1 57
+MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0-r1 61
+MD5 1be6338417fd08a609cb02164398a26b files/digest-R-2.1.1 61
diff --git a/dev-lang/R/R-2.1.0-r1.ebuild b/dev-lang/R/R-2.1.0-r1.ebuild
index f39106e2728b..b71a2acbb3ed 100644
--- a/dev-lang/R/R-2.1.0-r1.ebuild
+++ b/dev-lang/R/R-2.1.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.0-r1.ebuild,v 1.1 2005/04/29 18:54:00 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
 
-inherit 64-bit fortran
+inherit fortran toolchain-funcs
 
 IUSE="blas jpeg nls png readline tcltk X"
 DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
@@ -12,7 +12,7 @@ SRC_URI="http://cran.r-project.org/src/base/R-2/${P}.tar.gz"
 HOMEPAGE="http://www.r-project.org/"
 DEPEND="virtual/libc
 		>=dev-lang/perl-5.6.1-r3
-		readline? (>=sys-libs/readline-4.1-r3)
+		readline? ( >=sys-libs/readline-4.1-r3 )
 		jpeg? ( >=media-libs/jpeg-6b-r2 )
 		png? ( >=media-libs/libpng-1.2.1 )
 		blas? ( virtual/blas )
@@ -20,8 +20,21 @@ DEPEND="virtual/libc
 		tcltk? ( dev-lang/tk )"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64"
-64-bit || FORTRAN="g77" # No f2c on 64-bit archs anymore.
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+pkg_setup() {
+	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
+	# Thanks to vapier for providing the test.
+	echo 'int main(){}' > test.c
+	$(tc-getCC) -c test.c -o test.o
+	if file test.o | grep -qs 64-bit ; then
+		einfo "64 bit architecture detected, using g77."
+		FORTRAN="g77"
+	else
+		FORTRAN="g77 f2c"
+	fi
+	fortran_pkg_setup
+}
 
 src_compile() {
 	local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"
@@ -65,6 +78,8 @@ src_install() {
 	cd ${D}/usr/bin/
 	rm R
 	dosym ../$(get_libdir)/R/bin/R /usr/bin/R
+	dodir /etc/env.d
+	echo > ${D}/etc/env.d/99R "LDPATH=/usr/$(get_libdir)/R/lib"
 	cd ${S}
 
 	dodoc AUTHORS BUGS COPYING* ChangeLog FAQ *NEWS README \
diff --git a/dev-lang/R/R-2.1.1.ebuild b/dev-lang/R/R-2.1.1.ebuild
index 4078260be8a0..e00032743c1e 100644
--- a/dev-lang/R/R-2.1.1.ebuild
+++ b/dev-lang/R/R-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.1 2005/07/01 11:53:30 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
 
 inherit fortran toolchain-funcs
 
@@ -20,7 +20,7 @@ DEPEND="virtual/libc
 		tcltk? ( dev-lang/tk )"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 pkg_setup() {
 	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
diff --git a/dev-lang/blassic/ChangeLog b/dev-lang/blassic/ChangeLog
index a023239f2d44..bf74634c325a 100644
--- a/dev-lang/blassic/ChangeLog
+++ b/dev-lang/blassic/ChangeLog
@@ -1,6 +1,77 @@
 # ChangeLog for dev-lang/blassic
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/ChangeLog,v 1.1 2003/07/31 21:45:01 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/ChangeLog,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> blassic-0.10.0.ebuild:
+  Marked ~ppc-macos (bug #110815)
+
+  24 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> -blassic-0.5.4.ebuild,
+  -blassic-0.8.1.ebuild:
+  clean out old versions
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> blassic-0.10.0.ebuild:
+  Stable on hppa.
+
+  17 Mar 2005; Joseph Jezak <josejx@gentoo.org> blassic-0.10.0.ebuild:
+  Marked ppc for bug #84754.
+
+  10 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> blassic-0.10.0.ebuild:
+  Stable for x86
+
+*blassic-0.10.0 (12 Feb 2005)
+
+  12 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +blassic-0.10.0.ebuild:
+  version bump (bug #81760)
+
+  24 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> -blassic-0.7.2.ebuild,
+  -blassic-0.8.0.ebuild:
+  clean out older ebuilds
+
+  20 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> blassic-0.5.4.ebuild:
+  IUSE; tidy
+
+  16 Apr 2004; Guy Martin <gmsoft@gentoo.org> blassic-0.8.1.ebuild:
+  Marked stable on hppa.
+
+*blassic-0.8.1 (09 Feb 2004)
+
+  09 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> blassic-0.5.4.ebuild,
+  blassic-0.7.2.ebuild, blassic-0.8.1.ebuild:
+  version bump
+
+*blassic-0.8.0 (22 Jan 2004)
+
+  22 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> blassic-0.8.0.ebuild:
+  version bump
+
+  22 Jan 2003; Guy Martin <gmsoft@gentoo.org> blassic-0.7.2.ebuild :
+  Marked stable on hppa.
+
+  28 Sep 2003; Michael Sterrett <msterret@gentoo.org> blassic-0.7.2.ebuild:
+  mark stable for x86
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+*blassic-0.7.2 (21 Sep 2003)
+
+  21 Sep 2003; Michael Sterrett <msterret@gentoo.org> blassic-0.7.2.ebuild:
+  version bump
+
+*blassic-0.7.1 (07 Sep 2003)
+
+  07 Sep 2003; Michael Sterrett <msterret@gentoo.org> blassic-0.7.1.ebuild:
+  version bump
+
+*blassic-0.7.0 (28 Aug 2003)
+
+  28 Aug 2003; Michael Sterrett <msterret@gentoo.org> blassic-0.7.0.ebuild:
+  version bump
+
+*blassic-0.6.1 (22 Aug 2003)
+
+  22 Aug 2003; Michael Sterrett <msterret@gentoo.org> blassic-0.6.1.ebuild:
+  version bump
 
 *blassic-0.5.4 (31 Jul 2003)
 
diff --git a/dev-lang/blassic/Manifest b/dev-lang/blassic/Manifest
index dff2cb207c21..79e9d04c6d53 100644
--- a/dev-lang/blassic/Manifest
+++ b/dev-lang/blassic/Manifest
@@ -1,3 +1,4 @@
-MD5 d23bf719eb32ac00cfa4f5a2799d7c65 files/digest-blassic-0.5.4 62
-MD5 3e452b08588e169745a6284aa3c107c3 ChangeLog 383
-MD5 b7a90dcc054c608396a440bb8ad0fe7b blassic-0.5.4.ebuild 583
+MD5 8811f88b14a9e3a8061b7a074f0687fa blassic-0.10.0.ebuild 767
+MD5 378ec5532e33dacb488ab16c72e1c4c8 ChangeLog 2391
+MD5 161648a71c6e30291c65378c52e8ea7e metadata.xml 565
+MD5 40aa7e6ecf5577a7c6b4af3e729a5fd0 files/digest-blassic-0.10.0 63
diff --git a/dev-lang/blassic/blassic-0.10.0.ebuild b/dev-lang/blassic/blassic-0.10.0.ebuild
index b197cdba82fb..70c12deb2488 100644
--- a/dev-lang/blassic/blassic-0.10.0.ebuild
+++ b/dev-lang/blassic/blassic-0.10.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/dev-lang/blassic/blassic-0.10.0.ebuild,v 1.1 2005/02/12 19:54:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/blassic-0.10.0.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
 
 DESCRIPTION="classic Basic interpreter"
-HOMEPAGE="http://www.blassic.org"
-SRC_URI="http://www.blassic.org/bin/${P}.tgz"
+HOMEPAGE="http://blassic.org"
+SRC_URI="http://blassic.org/bin/${P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~hppa ~ppc ~x86"
+KEYWORDS="hppa ppc ~ppc-macos x86"
 SLOT="0"
 IUSE="svga X"
 
diff --git a/dev-lang/blassic/metadata.xml b/dev-lang/blassic/metadata.xml
index 60b4d8955d3f..51f4369ca47d 100644
--- a/dev-lang/blassic/metadata.xml
+++ b/dev-lang/blassic/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>msterret@gentoo.org</email>
+  <email>mr_bones_@gentoo.org</email>
   <name>Michael Sterrett</name>
 </maintainer>
 <longdescription>
 Blassic is a classic Basic interpreter. The line numbers are mandatory,
-and it has PEEK & POKE. The main goal is to execute programs written in
+and it has PEEK &amp; POKE. The main goal is to execute programs written in
 old interpreters, but it can be used as a scripting language.  Many examples
 are included in /usr/share/blassic/examples/.
 </longdescription>
diff --git a/dev-lang/boo/ChangeLog b/dev-lang/boo/ChangeLog
index 28282f740149..011beb292b3b 100644
--- a/dev-lang/boo/ChangeLog
+++ b/dev-lang/boo/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for dev-lang/boo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/ChangeLog,v 1.1 2005/05/13 01:52:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/ChangeLog,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
+
+  14 Nov 2005; Peter Johanson <latexer@gentoo.org> boo-0.7.0.1921.ebuild:
+  Add error messages and die pre-emptively when an older version of boo is
+  found present on the system when trying to install. See bug #108520.
+
+  08 Nov 2005; Peter Johanson <latexer@gentoo.org> boo-0.7.0.1921.ebuild:
+  Fix for resource/locale issue. See bug #109351.
+
+*boo-0.7.0.1921 (06 Oct 2005)
+
+  06 Oct 2005; Peter Johanson <latexer@gentoo.org> +boo-0.7.0.1921.ebuild:
+  Bump.
+
+*boo-0.6.0.1858 (08 Sep 2005)
+
+  08 Sep 2005; Peter Johanson <latexer@gentoo.org> +boo-0.6.0.1858.ebuild:
+  Bump.
+
+  05 Jun 2005; David Holm <dholm@gentoo.org> boo-0.5.5.1651.ebuild:
+  Added to ~ppc.
+
+*boo-0.5.5.1651 (31 May 2005)
+
+  31 May 2005; Peter Johanson <latexer@gentoo.org> +boo-0.5.5.1651.ebuild:
+  Bump.
+
+*boo-0.5.4.1629 (24 May 2005)
+
+  24 May 2005; Peter Johanson <latexer@gentoo.org> +boo-0.5.4.1629.ebuild:
+  Bump.
+
+  19 May 2005; Tom Martin <slarti@gentoo.org> boo-0.5.3.1544.ebuild:
+  Marked ~amd64.
 
 *boo-0.5.3.1544 (13 May 2005)
 
diff --git a/dev-lang/boo/Manifest b/dev-lang/boo/Manifest
index 6311b0dc07c2..f69355e6ff63 100644
--- a/dev-lang/boo/Manifest
+++ b/dev-lang/boo/Manifest
@@ -1,2 +1,12 @@
-MD5 bb107d036e4773eec699b16d3a535495 boo-0.5.3.1544.ebuild 682
+MD5 a04defa7030d43d593bafbc609d3c757 boo-0.5.3.1544.ebuild 785
+MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
+MD5 3dad3687cfedb14aeacb11189db355e5 ChangeLog 1342
+MD5 ff4a81e4a8fc1781063e4e3e4a3f987a boo-0.5.4.1629.ebuild 1004
+MD5 051648b66e18bb0c06f435bc2a9ba272 boo-0.5.5.1651.ebuild 1007
+MD5 73d55666859a1b72edc827bec07f0e77 boo-0.6.0.1858.ebuild 816
+MD5 93960942fe7065b528a0784dfa62d4b1 boo-0.7.0.1921.ebuild 1322
 MD5 d8e8a5727bdfb8086ded71c915d905da files/digest-boo-0.5.3.1544 72
+MD5 60be7aea7d4d4e9141c3043c9defef93 files/digest-boo-0.5.4.1629 72
+MD5 6cdc9176e0de62aa279c4e2eee14438f files/digest-boo-0.5.5.1651 72
+MD5 1de3863c497999e7660d8dc83c4f61cf files/digest-boo-0.6.0.1858 72
+MD5 15ea379034d13526f930f80782ad32cc files/digest-boo-0.7.0.1921 72
diff --git a/dev-lang/boo/boo-0.5.3.1544.ebuild b/dev-lang/boo/boo-0.5.3.1544.ebuild
index 18b383c96ed8..2e4fc743b687 100644
--- a/dev-lang/boo/boo-0.5.3.1544.ebuild
+++ b/dev-lang/boo/boo-0.5.3.1544.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.5.3.1544.ebuild,v 1.1 2005/05/13 01:52:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.5.3.1544.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit mono fdo-mime eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://dist.codehaus.org/boo/distributions/${P}-src.tar.bz2"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/mono-1.1.4
diff --git a/dev-lang/boo/boo-0.5.4.1629.ebuild b/dev-lang/boo/boo-0.5.4.1629.ebuild
index 8c9adb3ed0fa..260a1f03af11 100644
--- a/dev-lang/boo/boo-0.5.4.1629.ebuild
+++ b/dev-lang/boo/boo-0.5.4.1629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.5.4.1629.ebuild,v 1.1 2005/05/24 02:04:31 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.5.4.1629.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit mono fdo-mime eutils
 
diff --git a/dev-lang/boo/boo-0.5.5.1651.ebuild b/dev-lang/boo/boo-0.5.5.1651.ebuild
index 688d37013ec1..13c743be5d49 100644
--- a/dev-lang/boo/boo-0.5.5.1651.ebuild
+++ b/dev-lang/boo/boo-0.5.5.1651.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.5.5.1651.ebuild,v 1.1 2005/05/31 11:41:14 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.5.5.1651.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit mono fdo-mime eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://dist.codehaus.org/boo/distributions/${P}-src.tar.bz2"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/mono-1.1.4
diff --git a/dev-lang/boo/boo-0.6.0.1858.ebuild b/dev-lang/boo/boo-0.6.0.1858.ebuild
index e40712b9345a..cd7d3ff3956e 100644
--- a/dev-lang/boo/boo-0.6.0.1858.ebuild
+++ b/dev-lang/boo/boo-0.6.0.1858.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.6.0.1858.ebuild,v 1.1 2005/09/08 20:32:22 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.6.0.1858.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit mono fdo-mime eutils
 
diff --git a/dev-lang/boo/boo-0.7.0.1921.ebuild b/dev-lang/boo/boo-0.7.0.1921.ebuild
index 973e598c1643..b4f9158da09b 100644
--- a/dev-lang/boo/boo-0.7.0.1921.ebuild
+++ b/dev-lang/boo/boo-0.7.0.1921.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.7.0.1921.ebuild,v 1.1 2005/10/06 22:52:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.7.0.1921.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit mono fdo-mime eutils
 
@@ -20,18 +20,29 @@ DEPEND=">=dev-lang/mono-1.1.4
 		x11-misc/shared-mime-info
 		>=x11-libs/gtksourceview-1.0.1"
 
-
 src_unpack() {
+	if best_version "dev-lang/boo"; then
+		if ! has_version ">=dev-lang/boo-0.7.0.1921"; then
+			eerror "This version of boo has a problem compiling when an older"
+			eerror "of boo is present on the system. Please unmerge boo and"
+			eerror "then try emerging this version of boo. See bug #108520"
+			eerror "at https://bugs.gentoo.org/show_bug.cgi?id=108520 for more"
+			eerror "details."
+			die "Version of boo installed will cause compilation errors."
+		fi
+	fi
+
 	unpack ${A}
 	cd ${S}
 }
 
 src_compile() {
-	nant -D:install.prefix=/usr || die
+	LC_ALL="C" LANG="C" nant -D:install.prefix=/usr || die
 }
 
 src_install() {
-	nant install -D:install.destdir=${D} -D:install.prefix=/usr || die
+	LC_ALL="C" LANG="C" nant install \
+		-D:install.destdir=${D} -D:install.prefix=/usr || die
 }
 
 pkg_postinst() {
diff --git a/dev-lang/caml-light/ChangeLog b/dev-lang/caml-light/ChangeLog
index 231bbafbbe43..95af4fc2a48e 100644
--- a/dev-lang/caml-light/ChangeLog
+++ b/dev-lang/caml-light/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/caml-light
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/caml-light/ChangeLog,v 1.1 2005/02/06 16:09:57 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/caml-light/ChangeLog,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
+
+  18 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> caml-light-0.75.ebuild:
+  Fix path bug.
 
 *caml-light-0.75 (06 Feb 2005)
 
diff --git a/dev-lang/caml-light/Manifest b/dev-lang/caml-light/Manifest
index 9538d5186aec..d10413494eb0 100644
--- a/dev-lang/caml-light/Manifest
+++ b/dev-lang/caml-light/Manifest
@@ -1,3 +1,4 @@
-MD5 c04ea73e2bc22620c613580b7b3b1204 caml-light-0.75.ebuild 1342
+MD5 1348e53efa3aa66aed4d71583f60a50f caml-light-0.75.ebuild 1387
+MD5 3d7ea7377476f48d80b36797f789fe69 ChangeLog 610
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 c34d5b839fddfbac9d4547af9fa85aa8 files/digest-caml-light-0.75 61
diff --git a/dev-lang/caml-light/caml-light-0.75.ebuild b/dev-lang/caml-light/caml-light-0.75.ebuild
index 295660896267..641e0b97c8e5 100644
--- a/dev-lang/caml-light/caml-light-0.75.ebuild
+++ b/dev-lang/caml-light/caml-light-0.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/caml-light/caml-light-0.75.ebuild,v 1.1 2005/02/06 16:09:57 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/caml-light/caml-light-0.75.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -38,7 +38,10 @@ src_compile() {
 		MANDIR=/usr/share/man \
 		configure || die
 
-	make world || die
+	make BINDIR=/usr/bin \
+		LIBDIR=/usr/lib/caml-light \
+		MANDIR=/usr/share/man \
+		world || die
 }
 
 src_install() {
diff --git a/dev-lang/ccc/ChangeLog b/dev-lang/ccc/ChangeLog
index 850ac4b77242..77f965a25113 100644
--- a/dev-lang/ccc/ChangeLog
+++ b/dev-lang/ccc/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for dev-lang/ccc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ChangeLog,v 1.1 2003/04/12 03:44:48 agriffis Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:11 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ccc-6.5.6.002.ebuild,
+  ccc-6.5.9.001-r1.ebuild, ccc-6.5.9.001-r2.ebuild, ccc-6.5.9.001-r3.ebuild,
+  ccc-6.5.9.001.ebuild:
+  virtual/glibc -> virtual/libc
+
+*ccc-6.5.9.001-r3 (19 Feb 2004)
+
+  19 Feb 2004; Tavis Ormandy <taviso@gentoo.org> ccc-6.5.9.001-r3.ebuild:
+  use rpm.eclass
+
+*ccc-6.5.9.001-r2 (08 Feb 2004)
+
+  08 Feb 2004; Aron Griffis <agriffis@gentoo.org> ccc-6.5.9.001-r2.ebuild,
+  files/create-comp-config.patch:
+  Add patch to sort gcc-lib include paths last. Thanks to Marc Giger for
+  figuring this out
+
+*ccc-6.5.9.001-r1 (06 Feb 2004)
+
+  06 Feb 2004; Aron Griffis <agriffis@gentoo.org> ccc-6.5.9.001-r1.ebuild:
+  Fix config script to work with gcc-3
+
+  23 Jun 2003; Tavis Ormandy <taviso@gentoo.org> ccc-6.5.9.001.ebuild:
+  stable on alpha
+
+*ccc-6.5.9.001 (15 Apr 2003)
+
+  18 Apr 2003; Aron Griffis <agriffis@gentoo.org> ccc-6.5.9.001.ebuild:
+  Fix some dependency issues and fix problem with gpg not decrypting due to
+  missing /root/.gnupg
+
+  15 Apr 2003; Tavis Ormandy <taviso@gentoo.org> ccc-6.5.9.001.ebuild:
+  Updated ebuild to latest release of ccc. 
+  Changed rdepend of libcpml to >=libcpml-5.2.01-r2, this should fix the probe problem. 
+  Modified ebuild to read a variable to unlock the new distribution (requires gpg).
 
 *ccc-6.5.6.002 (11 Apr 2003)
 
diff --git a/dev-lang/ccc/Manifest b/dev-lang/ccc/Manifest
index e69de29bb2d1..dbd4bce464fd 100644
--- a/dev-lang/ccc/Manifest
+++ b/dev-lang/ccc/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 09c89a5a17f81afa4a47aac82bfebfb9 ChangeLog 1687
+MD5 7f9a2f15bf1aa6895c8ff44d081a6955 ccc-6.5.6.002.ebuild 4961
+MD5 42c814b55097eae4f8fdb34b6894caf9 ccc-6.5.9.001-r1.ebuild 6737
+MD5 8f6344cefcab2663f44485ce5f1d5eef ccc-6.5.9.001-r2.ebuild 6899
+MD5 ac83384cf9f64c07357758b8807cc677 ccc-6.5.9.001-r3.ebuild 5380
+MD5 6c96ea01ea8ca79dce09d6563302a511 ccc-6.5.9.001.ebuild 5858
+MD5 30ceacf36e8d8764f23f73153a5f38d8 files/create-comp-config.patch 866
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ccc-6.5.6.002 0
+MD5 6522dec4654d037ce4a5a1e8987807b1 files/digest-ccc-6.5.9.001 77
+MD5 6522dec4654d037ce4a5a1e8987807b1 files/digest-ccc-6.5.9.001-r1 77
+MD5 6522dec4654d037ce4a5a1e8987807b1 files/digest-ccc-6.5.9.001-r2 77
+MD5 6522dec4654d037ce4a5a1e8987807b1 files/digest-ccc-6.5.9.001-r3 77
+MD5 091d23a4c0875c38225effcdc1c668a8 metadata.xml 1506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0BNtI1lqEGTUzyQRAi2JAJsFTf7puVB5exajyc1aRt9w6HzPagCgytSZ
+mOoDmQ2qflkDTxoMZ7f9Txw=
+=+0vr
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ccc/ccc-6.5.6.002.ebuild b/dev-lang/ccc/ccc-6.5.6.002.ebuild
index da19ae567de9..a672cbb4eb0c 100644
--- a/dev-lang/ccc/ccc-6.5.6.002.ebuild
+++ b/dev-lang/ccc/ccc-6.5.6.002.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.6.002.ebuild,v 1.1 2003/04/12 03:44:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.6.002.ebuild,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -25,7 +25,7 @@ DEPEND="sys-devel/gcc-config
 	app-arch/rpm2targz
 	>=sys-apps/sed-4"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
 	dev-libs/libcpml"
 
@@ -38,13 +38,13 @@ src_unpack() {
 	local ccc_rpm="ccc-${ccc_release}.alpha.rpm"
 
 	if [ ! -f ${DISTDIR}/${ccc_rpm} ]; then
-		eerror ""
-		eerror "Please download ${ccc_rpm} from" 
+		eerror
+		eerror "Please download ${ccc_rpm} from"
 		eerror "${HOMEPAGE}, and place it in"
 		eerror "${DISTDIR}"
-		eerror ""
+		eerror
 		eerror "Then restart this emerge."
-		eerror ""
+		eerror
 		die "ccc distribution (${ccc_rpm}) not found"
 	fi
 
@@ -151,13 +151,13 @@ pkg_postinst () {
 	ewarn "to complete the installation"
 	ewarn
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with ccc "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with ccc"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 }
diff --git a/dev-lang/ccc/ccc-6.5.9.001-r1.ebuild b/dev-lang/ccc/ccc-6.5.9.001-r1.ebuild
index 2a8704f910bd..442d121a67a5 100644
--- a/dev-lang/ccc/ccc-6.5.9.001-r1.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r1.ebuild,v 1.1 2004/02/07 02:27:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -20,7 +20,7 @@ SLOT="0"
 # NOTE: ALPHA Only!
 KEYWORDS="-* alpha"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
 	>=dev-libs/libcpml-5.2.01-r2"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	local ccc_rpm="ccc-${ccc_release}.alpha.rpm"
 
 	if [ -z ${CCC_LICENSE_KEY} ]; then
-		eerror ""
+		eerror
 		eerror "You have not set the environment variable"
 		eerror "\$CCC_LICENSE_KEY, this should be set to"
 		eerror "the password you were sent when you applied"
@@ -51,7 +51,7 @@ src_unpack() {
 		eerror "license."
 		eerror "If you do not have a license key, apply for one"
 		eerror "here ${ee_license_reg}"
-		eerror ""
+		eerror
 		die "no license key in \$CCC_LICENSE_KEY"
 	fi
 
@@ -197,14 +197,14 @@ pkg_postinst () {
 
 	echo
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with ccc "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with ccc"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 
 	echo
diff --git a/dev-lang/ccc/ccc-6.5.9.001-r2.ebuild b/dev-lang/ccc/ccc-6.5.9.001-r2.ebuild
index 432d832ee9ab..6601e9cba3b9 100644
--- a/dev-lang/ccc/ccc-6.5.9.001-r2.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r2.ebuild,v 1.1 2004/02/08 05:37:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -22,7 +22,7 @@ SLOT="0"
 # NOTE: ALPHA Only!
 KEYWORDS="-* alpha"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
 	>=dev-libs/libcpml-5.2.01-r2"
 
@@ -45,7 +45,7 @@ src_unpack() {
 	local ccc_rpm="ccc-${ccc_release}.alpha.rpm"
 
 	if [ -z ${CCC_LICENSE_KEY} ]; then
-		eerror ""
+		eerror
 		eerror "You have not set the environment variable"
 		eerror "\$CCC_LICENSE_KEY, this should be set to"
 		eerror "the password you were sent when you applied"
@@ -53,7 +53,7 @@ src_unpack() {
 		eerror "license."
 		eerror "If you do not have a license key, apply for one"
 		eerror "here ${ee_license_reg}"
-		eerror ""
+		eerror
 		die "no license key in \$CCC_LICENSE_KEY"
 	fi
 
@@ -203,14 +203,14 @@ pkg_postinst () {
 
 	echo
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with ccc "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with ccc"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 
 	echo
diff --git a/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild b/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild
index c4c4bfe60802..dc34580a39ff 100644
--- a/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild,v 1.1 2004/02/19 15:43:34 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001-r3.ebuild,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -21,7 +21,7 @@ LICENSE="PLDSPv2"
 SLOT="0"
 KEYWORDS="-* ~alpha"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
 	>=dev-libs/libcpml-5.2.01-r2"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	local ccc_rpm="ccc-${ccc_release}.alpha.rpm"
 
 	if [ -z ${CCC_LICENSE_KEY} ]; then
-		eerror ""
+		eerror
 		eerror "You have not set the environment variable"
 		eerror "\$CCC_LICENSE_KEY, this should be set to"
 		eerror "the password you were sent when you applied"
@@ -51,7 +51,7 @@ src_unpack() {
 		eerror "license."
 		eerror "If you do not have a license key, apply for one"
 		eerror "here ${ee_license_reg}"
-		eerror ""
+		eerror
 		die "no license key in \$CCC_LICENSE_KEY"
 	fi
 
@@ -166,14 +166,14 @@ pkg_postinst () {
 
 	echo
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with ccc "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with ccc"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 
 	echo
diff --git a/dev-lang/ccc/ccc-6.5.9.001.ebuild b/dev-lang/ccc/ccc-6.5.9.001.ebuild
index 6410fadf547f..613a8f693995 100644
--- a/dev-lang/ccc/ccc-6.5.9.001.ebuild
+++ b/dev-lang/ccc/ccc-6.5.9.001.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001.ebuild,v 1.1 2003/04/15 01:09:37 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ccc/ccc-6.5.9.001.ebuild,v 1.1.1.1 2005/11/30 09:58:11 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -18,19 +18,21 @@ S=${WORKDIR}
 LICENSE="PLDSPv2"
 SLOT="0"
 # NOTE: ALPHA Only!
-KEYWORDS="-* ~alpha"
+KEYWORDS="-* alpha"
 
-DEPEND="sys-devel/gcc-config
+RDEPEND="virtual/libc
+	dev-libs/libots
+	>=dev-libs/libcpml-5.2.01-r2"
+
+DEPEND="${RDEPEND}
+	sys-devel/gcc-config
 	app-arch/rpm2targz
 	>=sys-apps/sed-4
 	app-crypt/gnupg
 	>=app-shells/bash-2.05b
+	>=dev-libs/libcpml-5.2.01-r2
 	"
 
-RDEPEND="virtual/glibc
-	dev-libs/libots
-	>=dev-libs/libcpml-5.2.01-r2"
-
 # These variables are not used by Portage, but is used by the functions
 # below.
 ccc_release="${PV}-6"
@@ -39,9 +41,9 @@ ee_license_reg="http://h18000.www1.hp.com/products/software/alpha-tools/ee-licen
 src_unpack() {
 	# convert rpm into tar archive
 	local ccc_rpm="ccc-${ccc_release}.alpha.rpm"
-	
+
 	if [ -z ${CCC_LICENSE_KEY} ]; then
-		eerror ""
+		eerror
 		eerror "You have not set the environment variable"
 		eerror "\$CCC_LICENSE_KEY, this should be set to"
 		eerror "the password you were sent when you applied"
@@ -49,17 +51,25 @@ src_unpack() {
 		eerror "license."
 		eerror "If you do not have a license key, apply for one"
 		eerror "here ${ee_license_reg}"
-		eerror ""
+		eerror
 		die "no license key in \$CCC_LICENSE_KEY"
 	fi
 
 	# :-NULL safeguards against bash bug.
 	einfo "Decrypting ccc distribution..."
-	gpg --quiet --passphrase-fd 0 --output ${ccc_rpm} \
+	gpg --quiet \
+		--homedir=${T} --no-permission-warning \
+		--no-mdc-warning \
+		--passphrase-fd 0 \
+		--output ${ccc_rpm} \
 		--decrypt ${DISTDIR}/${ccc_rpm}.crypt \
-		<<< ${CCC_LICENSE_KEY:-NULL} >/dev/null 2>&1 || \
-		die "Sorry, your license key doesnt seem to unlock the distribution"
-	
+		<<< ${CCC_LICENSE_KEY:-NULL}
+
+	# Test PIPESTATUS for gpg result since last thing in pipeline is grep
+	#if [ ${PIPESTATUS[0]} -ne 0 ]; then
+	#	die "Sorry, your license key doesnt seem to unlock the distribution"
+	#fi
+
 	ebegin "Unpacking ccc distribution..."
 	# This is the same as using rpm2targz then extracting 'cept that
 	# it's faster, less work, and less hard disk space.  rpmoffset is
@@ -116,7 +126,7 @@ src_compile() {
 	# package
 	#
 	# this should no longer be nescessary with RDEPEND requiring >=libcpml-5.2.01-r2
-	
+
 	#sed -i 's/^  version_high_enough /  true /' \
 	#		usr/lib/compaq/ccc-${ccc_release}/alpha-linux/bin/probe_linux.sh
 
@@ -167,13 +177,13 @@ pkg_postinst () {
 	ewarn "to complete the installation"
 	ewarn
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with ccc "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with ccc"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 }
diff --git a/dev-lang/ccc/files/digest-ccc-6.5.9.001 b/dev-lang/ccc/files/digest-ccc-6.5.9.001
index 6945e1624886..8e917a78390d 100644
--- a/dev-lang/ccc/files/digest-ccc-6.5.9.001
+++ b/dev-lang/ccc/files/digest-ccc-6.5.9.001
@@ -1 +1 @@
-MD5 446e0c53fcc135b30ccf9e6af5031c18 ccc-6.5.9.001-6.alpha.rpm.crypt 712841
+MD5 446e0c53fcc135b30ccf9e6af5031c18 ccc-6.5.9.001-6.alpha.rpm.crypt 7128419
diff --git a/dev-lang/cfal/ChangeLog b/dev-lang/cfal/ChangeLog
index c8614def263d..25c042235904 100644
--- a/dev-lang/cfal/ChangeLog
+++ b/dev-lang/cfal/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for dev-lang/cfal
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cfal/ChangeLog,v 1.1 2003/08/19 22:24:41 taviso Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cfal/ChangeLog,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> cfal-1.2.0.4.ebuild:
+  Don't call chown with root:root.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cfal-1.2.0.4.ebuild:
+  virtual/glibc -> virtual/libc
 
 *cfal-1.2.0.4 (19 Aug 2003)
 
   19 Aug 2003; Tavis Ormandy <taviso@gentoo.org> cfal-1.2.0.4.ebuild:
-  Initial import, ebuild contributed by Jesse Becker <jbecker@speakeasy.net> in
-  #25902
+  Initial import, ebuild contributed by Jesse Becker in #25902
 
diff --git a/dev-lang/cfal/Manifest b/dev-lang/cfal/Manifest
index c711d848a168..171e6847c160 100644
--- a/dev-lang/cfal/Manifest
+++ b/dev-lang/cfal/Manifest
@@ -1,2 +1,13 @@
-MD5 39279f98950713da817d930caa6375d0 cfal-1.2.0.4-r1.ebuild 6769
-MD5 459fdd606a760e1b9bb6ea8c50d58b7c files/digest-cfal-1.2.0.4-r1 144
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d0d63e0ce869d7e1641fbe164cee1d86 ChangeLog 586
+MD5 b1d9ae567e4af9fa44124cf7016b31b6 cfal-1.2.0.4.ebuild 3863
+MD5 459fdd606a760e1b9bb6ea8c50d58b7c files/digest-cfal-1.2.0.4 144
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDCWuj5H05b2HAEkRAs2NAJ9wsDJNg75PTAFJCBbOQRSmmd7YsQCcCK4B
+umXV10NHu3VShZTCDj/jrvs=
+=xFR6
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/cfal/cfal-1.2.0.4.ebuild b/dev-lang/cfal/cfal-1.2.0.4.ebuild
index 359f08997ba2..8f4023c67fcc 100644
--- a/dev-lang/cfal/cfal-1.2.0.4.ebuild
+++ b/dev-lang/cfal/cfal-1.2.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cfal/cfal-1.2.0.4.ebuild,v 1.1 2003/08/19 22:24:41 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cfal/cfal-1.2.0.4.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.support.compaq.com/alpha-tools"
 
 # its okay to set a SRC_URI here, as the rpm is gpg encrypted
 # and user must agree to the license before getting access
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/crypt/cfal-1.2.0-4.alpha.rpm.crypt 
+SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/crypt/cfal-1.2.0-4.alpha.rpm.crypt
 	ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/cfalrtl-1.2.0-3.alpha.rpm"
 
 S=${WORKDIR}
@@ -18,7 +18,7 @@ SLOT="0"
 # NOTE: ALPHA Only!
 KEYWORDS="-* ~alpha"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
 	>=dev-libs/libcpml-5.2.01-r2
 	dev-libs/libcxml"
@@ -40,7 +40,7 @@ src_unpack() {
 	# convert rpm into tar archive
 	local cfal_rpm="cfal-${cfal_release}.alpha.rpm"
 	local cfalrtl_rpm="cfalrtl-${cfalrtl_release}.alpha.rpm"
-	
+
 	if [ -z ${CFAL_LICENSE_KEY} ]; then
 		eerror ""
 		eerror "You have not set the environment variable"
@@ -62,7 +62,7 @@ src_unpack() {
 		--passphrase-fd 0 \
 		--output ${cfal_rpm} \
 		--decrypt ${DISTDIR}/${cfal_rpm}.crypt
-	
+
 	ebegin "Unpacking cfal distribution..."
 	# This is the same as using rpm2targz then extracting 'cept that
 	# it's faster, less work, and less hard disk space.  rpmoffset is
@@ -84,7 +84,7 @@ src_unpack() {
 src_compile() {
 	# shuffling around some directories
 	einfo "Fixing permissions..."
-	chown -R root:root ${S}/usr ${S}/lib
+	chown -R root:0 ${S}/usr ${S}/lib
 	chmod 755 ${S}/lib
 
 	einfo "Fixing man pages..."
@@ -95,7 +95,7 @@ src_compile() {
 	mv ${S}/usr/doc/cfal-1.2.0/README ${S}/usr/doc/cfal-1.2.0/fort.man \
 		${S}/usr/doc/cfal-1.2.0/decfortran90.hlp ${S}
 	rm -rf ${S}/usr/doc
-	
+
 	# fix up lib paths - bug #15719, comment 6
 	einfo "Copying crtbegin/crtend from gcc..."
 	gcc_libs_path="`gcc-config --get-lib-path`"
@@ -110,12 +110,12 @@ src_compile() {
 src_install() {
 	# move files over
 	mv usr ${D} || die "cfal installation failed"
-	
+
 	dodoc README fort.man decfortran90.hlp
 
 	dodir /lib
 	dosym /usr/lib/compaq/cfal/fpp /lib/fpp
-	
+
 	prepalldocs
 	prepallman
 }
diff --git a/dev-lang/cll1h/ChangeLog b/dev-lang/cll1h/ChangeLog
index a16fbf087614..b2795e4fbecf 100644
--- a/dev-lang/cll1h/ChangeLog
+++ b/dev-lang/cll1h/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/cll1h
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cll1h/ChangeLog,v 1.1 2005/07/06 05:28:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cll1h/ChangeLog,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> cll1h-0.6.ebuild:
+  Marked ~ppc-macos (bug #110816)
+
+  07 Jul 2005; David Holm <dholm@gentoo.org> cll1h-0.6.ebuild:
+  Added to ~ppc.
 
 *cll1h-0.6 (06 Jul 2005)
 
diff --git a/dev-lang/cll1h/Manifest b/dev-lang/cll1h/Manifest
index 228a6e2f759b..02957e9aa8bc 100644
--- a/dev-lang/cll1h/Manifest
+++ b/dev-lang/cll1h/Manifest
@@ -1,2 +1,3 @@
-MD5 b05cf44aa1878caa836ffa323dd6de56 cll1h-0.6.ebuild 448
+MD5 817e4909cdde2c5aa1a11e2f4935bf02 cll1h-0.6.ebuild 557
+MD5 5fd9c7f8393afa57cdcf4cb025b81082 ChangeLog 540
 MD5 5698529f2d85065d4e6b72997c865041 files/digest-cll1h-0.6 59
diff --git a/dev-lang/cll1h/cll1h-0.6.ebuild b/dev-lang/cll1h/cll1h-0.6.ebuild
index 71eed7a99b42..0cdd7ea9a2af 100644
--- a/dev-lang/cll1h/cll1h-0.6.ebuild
+++ b/dev-lang/cll1h/cll1h-0.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cll1h/cll1h-0.6.ebuild,v 1.1 2005/07/06 05:28:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cll1h/cll1h-0.6.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
 DESCRIPTION="C<<1 programming language system"
 HOMEPAGE="http://gpl.arachne.cz/"
 SRC_URI="http://gpl.arachne.cz/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~ppc-macos ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="sys-devel/gcc"
diff --git a/dev-lang/cm3-bin/ChangeLog b/dev-lang/cm3-bin/ChangeLog
index 4d7e579b316c..90736d004637 100644
--- a/dev-lang/cm3-bin/ChangeLog
+++ b/dev-lang/cm3-bin/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/cm3-bin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/ChangeLog,v 1.1 2003/07/17 17:11:38 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:30 chriswhite Exp $
+
+  26 Apr 2005; Aron Griffis <agriffis@gentoo.org> cm3-bin-5.2.6.ebuild,
+  cm3-bin-5.2.7_pre050331.ebuild:
+  add PROVIDE=virtual/m3
+
+*cm3-bin-5.2.7_pre050331 (02 Apr 2005)
+
+  02 Apr 2005; Mike Frysinger <vapier@gentoo.org> files/cm3.cfg,
+  +cm3-bin-5.2.7_pre050331.ebuild:
+  Version bump #81799 by Stefan Sperling.
+
+  28 Jul 2003; Michael Sterrett <msterret@gentoo.org> cm3-bin-5.2.6.ebuild:
+  only IUSE if actually used
 
 *cm3-bin-5.2.6 (17 Jul 2003)
 
diff --git a/dev-lang/cm3-bin/Manifest b/dev-lang/cm3-bin/Manifest
index 1e01da9c3a90..8d2fbe9c50df 100644
--- a/dev-lang/cm3-bin/Manifest
+++ b/dev-lang/cm3-bin/Manifest
@@ -1,7 +1,10 @@
-MD5 1fd947daffe3f9585c39c14161c27871 cm3-bin-5.2.6.ebuild 1313
-MD5 eed3b35e5a0c140d4858a5a9f8b33221 files/digest-cm3-bin-5.2.6 80
-MD5 b59e89e23c56831be2c1552870f15afb files/cm3.cfg 13025
-MD5 9e6999a8078829ff6e304a50188d16dc files/m3build 26
-MD5 5e3a7f25af13b2b9d199d0e361f04556 files/m3ship 25
+MD5 4541870caae42bb6dd4ec675e57ba187 cm3-bin-5.2.6.ebuild 1582
+MD5 7e8197cd82f8d8cdcbfe43a9fee32f3a cm3-bin-5.2.7_pre050331.ebuild 1754
+MD5 d5a28c209a2896073282b5040ef1abb2 ChangeLog 753
+MD5 4a92760230ce87e45653db9797a26de6 metadata.xml 1943
 MD5 a071e91cf56b602fba2b046c25fa0826 files/05cm3 26
-MD5 d1b3cd2682c68168a5b72c2e2c4c998a ChangeLog 339
+MD5 8a5aff788e14c6e0b51d9c4364eb892a files/digest-cm3-bin-5.2.7_pre050331 92
+MD5 5e3a7f25af13b2b9d199d0e361f04556 files/m3ship 25
+MD5 9e6999a8078829ff6e304a50188d16dc files/m3build 26
+MD5 14dee9e93009ef0a53a4a8a24968cae2 files/digest-cm3-bin-5.2.6 159
+MD5 b0387f56bb86fe8fdbb31cb841d57161 files/cm3.cfg 4916
diff --git a/dev-lang/cm3-bin/cm3-bin-5.2.6.ebuild b/dev-lang/cm3-bin/cm3-bin-5.2.6.ebuild
index 9b2430a6fb11..b34f2179329f 100644
--- a/dev-lang/cm3-bin/cm3-bin-5.2.6.ebuild
+++ b/dev-lang/cm3-bin/cm3-bin-5.2.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/cm3-bin-5.2.6.ebuild,v 1.1 2003/07/17 17:11:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/cm3-bin-5.2.6.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Critical Mass Modula-3 compiler (binary version)"
 HOMEPAGE="http://www.elegosoft.com/cm3/"
@@ -8,9 +10,11 @@ SRC_URI="x86? ( http://www.elegosoft.com/cm3/cm3-min-POSIX-LINUXLIBC6-${PV}.tgz
 	ppc? ( http://www.elegosoft.com/cm3/cm3-min-POSIX-PPC_LINUX-${PV}.tgz )"
 
 LICENSE="CMASS-M3 DEC-M3"
+KEYWORDS="x86 ppc"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="tcltk"
+IUSE=""
+
+PROVIDE="virtual/m3"
 
 S=${WORKDIR}
 
@@ -18,15 +22,26 @@ src_unpack() {
 	unpack ${A}
 	tar -zxf system.tgz || die "unpacking system.tgz"
 
+	local TARGET
+	local GNU_PLATFORM
+	case ${ARCH} in
+		x86) TARGET=LINUXLIBC6
+			 GNU_PLATFORM=i486--linuxelf
+			;;
+		ppc) TARGET=PPC_LINUX
+			 GNU_PLATFORM=powerpc-apple-linuxelf
+			;;
+	esac
 	sed \
+		-e "s:GENTOO_TARGET:${TARGET}:" \
+		-e "s:GENTOO_GNU_PLATFORM:${GNU_PLATFORM}:" \
 		-e "s:GENTOO_INITIAL_REACTOR_EDITOR:${EDITOR:-/usr/bin/nano}:" \
 		-e "s:GENTOO_INSTALL_ROOT:/usr/lib/cm3/:" \
-		-e "s:GENTOO_GNU_CC:${CC:-gcc}:" \
+		-e "s:GENTOO_GNU_CC:$(tc-getCC):" \
 		-e "s:GENTOO_GNU_CFLAGS:${CFLAGS:--O}:" \
 		-e "s:GENTOO_GNU_MAKE:${MAKE:-make}:" \
+		-e "s:GENTOO_ROOT:/usr/lib/cm3/pkg/:" \
 		${FILESDIR}/cm3.cfg > bin/cm3.cfg
-	echo "ROOT=\"/usr/lib/cm3/pkg/\"" >> bin/cm3.cfg
-	rm -rf doc elisp examples man
 }
 
 src_install() {
diff --git a/dev-lang/cm3-bin/cm3-bin-5.2.7_pre050331.ebuild b/dev-lang/cm3-bin/cm3-bin-5.2.7_pre050331.ebuild
index f49230619cd9..c3e236dc5267 100644
--- a/dev-lang/cm3-bin/cm3-bin-5.2.7_pre050331.ebuild
+++ b/dev-lang/cm3-bin/cm3-bin-5.2.7_pre050331.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/cm3-bin-5.2.7_pre050331.ebuild,v 1.1 2005/04/02 04:11:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3-bin/cm3-bin-5.2.7_pre050331.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="amd64? ( app-emulation/emul-linux-x86-glibc )"
+PROVIDE="virtual/m3"
 
 S=${WORKDIR}
 
diff --git a/dev-lang/cm3-bin/files/cm3.cfg b/dev-lang/cm3-bin/files/cm3.cfg
index bbe323e51431..fd485bd0f07e 100644
--- a/dev-lang/cm3-bin/files/cm3.cfg
+++ b/dev-lang/cm3-bin/files/cm3.cfg
@@ -1,147 +1,65 @@
-% Copyright 1996 Critical Mass, Inc. All rights reserved.
-% 
-% Standard configuration file for LINUX with ELF object files
-%
+% cm3 config file
 
-%-------------------------------------------------- compilation environment ---
-
-%M3_PROFILING = TRUE  % set by cm3 since 5.1.2 (option -profile)
-%M3_PROFILING = FALSE
-
-readonly TARGET       = "LINUXLIBC6"      % code generation target
-if M3_PROFILING 
-  readonly BUILD_DIR  = TARGET & "p"      % code generation target
+readonly TARGET       = "GENTOO_TARGET"
+if M3_PROFILING
+  readonly BUILD_DIR  = TARGET & "p"
 else
-  readonly BUILD_DIR  = TARGET            % directory for results
+  readonly BUILD_DIR  = TARGET
 end
-readonly OS_TYPE      = "POSIX"           % { "WIN32" or "POSIX" }
-readonly WORD_SIZE    = "32BITS"          % { "32BITS" or "64BITS" }
-readonly GNU_PLATFORM = "i486--linuxelf"  % "cpu-vendor-os" string for GNU
-%readonly INSTALL_KEY  = BEGIN_CONFIG
-%  "What is your installation key?"
-%    14 %-- user specified key
-%END_CONFIG
+readonly OS_TYPE      = "POSIX"
+readonly WORD_SIZE    = "32BITS"
+readonly GNU_PLATFORM = "GENTOO_GNU_PLATFORM"
 
 readonly NAMING_CONVENTIONS = "0"
-%                                        object files       libraries
-%  0=Unix                          =>  .o   .io    .mo       libXX.a
-%  1=Unix with a grumpy C compiler =>  .o   _i.o   _m.o      libXX.a
-%  2=Windows NT or Windows 95      =>  .obj .io    .mo       XX.lib
-%
-
-%-------------------------------------------------- default compile options ---
-% "set_config_options" is called before starting the compilation.  It should
-% be used to provide system-wide default options.
 
 proc set_config_options () is
-  m3_option ("-why")   %-- produce a listing that explains what's happening and why
-  m3_debug (TRUE)      %-- produce object code with debugging symbols
-  M3_OPTIONS += "-w1"  %-- produce "level 1" warnings
+  m3_option ("-why")
+  m3_debug (TRUE)
+  M3_OPTIONS += "-w1"
 end
 
-%--------------------------------------------------------- Reactor defaults ---
-% The first time a user runs Reactor, it will configure itself to use
-% the executables defined below.
-
-%INITIAL_REACTOR_BROWSER = BEGIN_CONFIG
-%  "What should be the default World-Wide Web browser for new Reactor users?"
-%     0  "netscape"
-%     6 "/usr/local/bin"           "netscape"
-%     6 "/usr/local/netscape/bin"  "netscape"
-%     6 "/usr/local/netscape/bin"  "netscape-3"
-%     6 "/usr/local/netscape/bin"  "netscape-2"
-%     6 "/usr/local/netscape"      "netscape"
-%     6 "/usr/local/mosaic"        "mosaic"
-%     6 "/usr/local/moasic"        "Xmosaic"
-%END_CONFIG
-% A World-Wide Web browser.  Reactor passes it an initial URL
-% its first command-line argument.
-
 INITIAL_REACTOR_EDITOR = "GENTOO_INITIAL_REACTOR_EDITOR"
-% A text editor.  Reactor passes it "<file> +<line>" on the
-% command-line when it wants to edit <file> initially positioned
-% at <line>.
 
-%------------------------------------------------------------- export paths ---
-% During the installation, destination directories that do not exists 
-% will be created. You need the necessary permissions to do so; otherwise,
-% the installation will fail, but can be restarted after you have 
-% fixed the permissions.
+ROOT="GENTOO_ROOT"
 
 INSTALL_ROOT = "GENTOO_INSTALL_ROOT"
 
-BIN_INSTALL   = INSTALL_ROOT & "/bin"        % executables
-if M3_PROFILING 
-  LIB_INSTALL   = INSTALL_ROOT & "/libp"       % libraries
+BIN_INSTALL     = INSTALL_ROOT & "/bin"
+if M3_PROFILING
+  LIB_INSTALL   = INSTALL_ROOT & "/libp"
 else
-  LIB_INSTALL   = INSTALL_ROOT & "/lib"        % libraries
+  LIB_INSTALL   = INSTALL_ROOT & "/lib"
 end
-PKG_INSTALL   = INSTALL_ROOT & "/pkg"        % packages
-DOC_INSTALL   = INSTALL_ROOT & "/doc"        % documents
-EMACS_INSTALL = INSTALL_ROOT & "/elisp"      % emacs lisp code
-MAN_INSTALL   = INSTALL_ROOT & "/man"        % man pages
-HTML_INSTALL  = INSTALL_ROOT & "/www"        % public hypertext
+PKG_INSTALL   = INSTALL_ROOT & "/pkg"
+DOC_INSTALL   = INSTALL_ROOT & "/doc"
+EMACS_INSTALL = INSTALL_ROOT & "/elisp"
+MAN_INSTALL   = INSTALL_ROOT & "/man"
+HTML_INSTALL  = INSTALL_ROOT & "/www"
 
-% On some systems (e.g. AFS) you must install public files in a different
-% place from where you use them.  If that is the case for your system,
-% specify the "use" location here, otherwise leave them alone.
-%
 USE_ROOT  = INSTALL_ROOT
-BIN_USE   = BIN_INSTALL       % executables
-LIB_USE   = LIB_INSTALL       % libraries
-PKG_USE   = PKG_INSTALL       % packages
+BIN_USE   = BIN_INSTALL
+LIB_USE   = LIB_INSTALL
+PKG_USE   = PKG_INSTALL
 
 readonly INSTALL_IMPLS = TRUE
-% TRUE
-%    => save all source files during the install
-%    => makes debugging easier and browsing more fruitful
-% FALSE
-%    => save only the exported interfaces and templates 
-%    => makes the installed system slightly smaller.
-
-%------------------------------------------------ external system libraries ---
-% SYSTEM_LIBS provides a mapping from Modula-3 names for the common
-% external libraries to site-dependent information about how they
-% are accessed.  If SYSTEM_LIBS{x} is defined it should be a list
-% of linker arguments that are used when linking against that library.
-% If SYSTEM_LIBS{x} is not defined, the Modula-3 system will assume
-% that the library is not available.
 
 SYSTEM_LIBS = {
   "LIBC"       : [ "-lm" ],
-%-- not on most Linux platforms
-% "LEX-YACC"   : [ BEGIN_CONFIG
-%                    "Where are the lex/yacc libraries?"
-%                      11 "libl.a"
-%                      12 "/usr/lib"
-%                      12 "/usr/local/lib"
-%                      12 "/usr/local/gnu/lib"
-%                      13 "/usr/lib"
-%                  END_CONFIG, "-ll" ],
-  "FLEX-BISON" : [ "-L/usr/lib", "-lfl" ],
-%  "POSTGRES95" : [ BEGIN_CONFIG
-%  "OPENGL"     : [ BEGIN_CONFIG
-%  "ODBC"       : [ BEGIN_CONFIG
-%  "MOTIF"      : [ BEGIN_CONFIG
-%  "X11"        : [ BEGIN_CONFIG
+  "FLEX-BISON" : [ "-lfl" ],
+  "OPENGL"     : [ "-lGLU", "-lGL", "-lXext" ],
+  "MOTIF"      : [ "-lXm" ],
+  "X11"        : [ "-lXaw", "-lXmu", "-lXext", "-lXt", "-lSM", "-lICE", "-lX11" ],
+%  "POSTGRES95" : [ ]
+%  "ODBC"       : [ ]
   "TCP"        : [ ]
 }
 
-% SYSTEM_LIBORDER defines the order in which SYSTEM_LIBS should be
-% scanned by the linker.
-
 SYSTEM_LIBORDER = [ "OPENGL", "DECPEX", "MOTIF", "X11", "TCP", "ODBC",
                     "POSTGRES95", "FLEX-BISON", "LEX-YACC", "LIBC" ]
 
-%---------------------------------------------------------- system programs ---
-
-readonly SYSTEM_CC  = "/usr/bin/gcc" % C compiler
-readonly SYSTEM_AR  = "/usr/bin/ar" % Archiver
-readonly SYSTEM_ASM = "/usr/bin/as" % Assembler
-
-%--------------------------------------------------------- Modula-3 backend ---
-% For platforms without an integrated backend, "m3_backend" is called to
-% translate Modula-3 intermediate code to object code.
+readonly SYSTEM_CC  = "gcc"
+readonly SYSTEM_AR  = "ar"
+readonly SYSTEM_ASM = "as"
 
 readonly m3back = "@" & BIN_USE & "/cm3cg"
 
@@ -154,16 +72,6 @@ proc m3_backend (source, object, optimize, debug) is
 end
 
 M3_BACKEND_MODE = "3"
-% -- defines how the frontend, backend, and assembler interact
-%  "0"  -- don't call m3_backend, M3CG produces object code
-%  "1"  -- don't call m3_backend, M3CG produces assembly code
-%  "2"  -- call m3_backend, it produces object code
-%  "3"  -- call m3_backend, it produces assembly code
-
-%--------------------------------------------------------------- C compiler ---
-% "compile_c" is called to compile C source files.  Note that this function
-% is only called if your program or library explicitly includes C source
-% code, the system distributed by Critical Mass does not.
 
 proc compile_c (source, object, options, optimize, debug) is
   local args = [ "-fPIC", options ]
@@ -173,19 +81,10 @@ proc compile_c (source, object, options, optimize, debug) is
   return try_exec ("@" & SYSTEM_CC, args, "-c", source)
 end
 
-%---------------------------------------------------------------- assembler ---
-% "assemble" is called to assemble .s or .asm files.  Note that this function
-% is only called if your program or library explicitly includes assembly source
-% code, the system distributed by Critical Mass does not.
-
 proc assemble (source, object) is
   return try_exec ("@" & SYSTEM_ASM, source, "-o", object)
 end
 
-%--------------------------------------------------------- library creation ---
-% "make_lib" is called to combine a collection of object modules into
-% a library.
-
 GCWRAPFLAGS = "-Wl,--wrap,adjtime,--wrap,getdirentries,--wrap,readv,--wrap,utimes,--wrap,wait3"
 
 proc make_lib (lib, options, objects, imported_libs, shared) is
@@ -227,11 +126,6 @@ proc make_lib (lib, options, objects, imported_libs, shared) is
   return 0
 end
 
-%-------------------------------------------------------------------
-% "skip_lib" is called when the compiler decides it doesn't need to
-% call "make_lib", but it wants to discover the names of the derived
-% files that should be deleted or shipped.
-
 proc skip_lib (lib, shared) is
   local lib_so   = format ("lib%s.so", lib)
   local lib_sox  = format ("lib%s.so.5", lib)
@@ -250,10 +144,6 @@ proc skip_lib (lib, shared) is
   return 0
 end
 
-%------------------------------------------------------------------- linker ---
-% "m3_link" is called to produce a final executable.
-%---  "-pdb:none" enables the use of windbg with the resulting executable.
-
 proc m3_link (prog, options, objects, imported_libs, shared) is
   local args = []
   if M3_PROFILING args += "-pg" end
@@ -267,84 +157,25 @@ proc m3_link (prog, options, objects, imported_libs, shared) is
   end
 end
 
-%-------------------------------------------------------------------
-% "skip_link" is called when the compiler decides it doesn't need to
-% call "m3_link", but it wants to discover the names of the derived
-% files that should be deleted or shipped.
-
 proc skip_link (prog, shared) is
   return 0
 end
 
-%------------------------------------------------------------ misc. options ---
-% Note, most of these options can be set from the command line.  Otherwise,
-% they can be set "permanently" here in the config file or in as needed
-% in user's m3makefiles.
-
 M3_FRONT_FLAGS = [ ]
-% --- internal configuration options passed directly to the Modula-3 front-end
-
 M3_OPTIONS = [ ]
-% --- user options passed directly to the Modula-3 front-end
-
 % M3_KEEP_FILES = TRUE
-% --- keep intermediate and temporary files
-
 M3_WINDOWS_GUI = FALSE
-% --- generate a Windows GUI subsystem program instead of a console one.
-
 % M3_COVERAGE = TRUE
-% --- compile & link with coverage options
-
 M3_COVERAGE_LIB = LIB_USE & "/report_coverage.o"
-% --- library linked in programs compiled with "-Z" coverage option
-
 M3_SPLIT_LIBNAMES = TRUE
-% --- split library names and pass -L/-l arguments to the linker
-
 M3_SHARED_LIB_ARG = "-Wl,-R"
-% --- pass "-R" flags to the linker too...
-
 % M3_BOOTSTRAP = TRUE
-% --- generate bootstrap code (assembly) instead of finaly object code
-
 % M3_COMPILE_ONCE = TRUE
-% --- don't recompile code to improve opaque object references
-
 % SYS_HAS_LOADER = TRUE
-% --- generate a loader info file with objects, libraries and timestamps
-
 % M3_SKIP_LINK = TRUE
-% --- skip the final link for programs, presumably to use the loader instead
-
 % M3_MAIN_IN_C = TRUE
-% --- generate the Modula-3 main program as C code
-
 % X11_WITH_SHARED_MEM = TRUE
-% --- X11 libraries include the shared memory extensions (XShm...)
-
 %M3_NEED_STANDALONE_LINKS = TRUE
-% --- linker is broken and we need to build a directory of symbolic
-%     links pointing to the non-shared libraries.
-
-%-------------------------------------------------------------------- emacs ---
-% If you have emacs and want to compile ".el" files to ".elc" files,
-% fill in the function below.  Otherwise, comment out or delete the
-% entire function.  Note, the distributed code assumes gnuemacs version 19
-% or later.
-
-%readonly proc emacs_compile (el) is
-%  exec ("emacs -batch -f batch-byte-compile", el)
-%end
-
-%------------------------------------------------------------- GNU variants ---
-% The two large pieces of GNU software used by the Modula-3 system
-% gcc(=m3cc) and gdb(=m3gdb) often require slightly different C compilers
-% or flags.  They are specified here.  Note that they may be overridden
-% from the m3build command line.
-%
-% To use the GNU defaults for CC and CFLAGS, specify "*".
-%
 
 GNU_CC     = "GENTOO_GNU_CC"
 GNU_CFLAGS = "GENTOO_GNU_CFLAGS"
diff --git a/dev-lang/cm3-bin/files/digest-cm3-bin-5.2.6 b/dev-lang/cm3-bin/files/digest-cm3-bin-5.2.6
index 3156fc7472b5..c789e549cdd9 100644
--- a/dev-lang/cm3-bin/files/digest-cm3-bin-5.2.6
+++ b/dev-lang/cm3-bin/files/digest-cm3-bin-5.2.6
@@ -1 +1,2 @@
 MD5 c473f5c15072c4b454ec193ea8d672ac cm3-min-POSIX-LINUXLIBC6-5.2.6.tgz 5552629
+MD5 bd8335491d56af80c874d695b169ce76 cm3-min-POSIX-PPC_LINUX-5.2.6.tgz 5580764
diff --git a/dev-lang/cm3-bin/metadata.xml b/dev-lang/cm3-bin/metadata.xml
index 5d4bbc40ed5b..a6d903896ca0 100644
--- a/dev-lang/cm3-bin/metadata.xml
+++ b/dev-lang/cm3-bin/metadata.xml
@@ -14,16 +14,16 @@ available so far. The changes made by Critical Mass, Inc. since their CM3 4.1
 release include:
 
     * Modula-3 modules loadable at runtime
-    * <*IMPLICIT*> exceptions (changes language semantics)
+    * *IMPLICIT* exceptions (changes language semantics)
     * checked runtime errors are mapped to the implicit exception RuntimeError.E
     * garbage collector failures are also mapped to implicit exceptions
     * COM-compatible object layout (for WIN32)
     * Unicode support: WIDECHAR, Text, Text8, Text16, Unicode interfaces
     * extended ASSERT pragma:
-      <*ASSERT condition [ ("," | WITH) msg ] *>>
+      *ASSERT condition [ ("," | WITH) msg ] *
     * new DEBUG pragma:
-      <*DEBUG condition [ ("," | WITH) msg {, msg} ] *>
-      <*DEBUG [ msg {, msg } ] *>
+      *DEBUG condition [ ("," | WITH) msg {, msg} ] *
+      *DEBUG [ msg {, msg } ] *
     * 64 bit support for 64 bit machines
 
 There have been many more changes, and the 4.1 release also contained lots of 
diff --git a/dev-lang/cm3/ChangeLog b/dev-lang/cm3/ChangeLog
index 8ae5866ba1b3..d9ce24b2d43b 100644
--- a/dev-lang/cm3/ChangeLog
+++ b/dev-lang/cm3/ChangeLog
@@ -1,9 +1,23 @@
 # ChangeLog for dev-lang/cm3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3/ChangeLog,v 1.1 2003/04/17 16:10:51 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3/ChangeLog,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
+
+*cm3-5.2.7_pre050331 (02 Apr 2005)
+
+  02 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +cm3-5.2.7_pre050331.ebuild:
+  Version bump #81798 by Stefan Sperling.
+
+*cm3-5.2.6 (17 Jul 2003)
+
+  17 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump !  glibc-2.3.x errno fixes + ppc support :D
 
 *cm3-5.2.4 (17 Apr 2003)
 
+  30 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  mmm should be all set now ... src_install has been all fleshed out
+
   17 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
   It is incomplete though ... i dont use m3, i cant really test it ;)
diff --git a/dev-lang/cm3/Manifest b/dev-lang/cm3/Manifest
index 58de7e73f832..138eb15308d6 100644
--- a/dev-lang/cm3/Manifest
+++ b/dev-lang/cm3/Manifest
@@ -1,6 +1,10 @@
-MD5 b1cce283f981d75a9d8134efc0faded9 cm3-5.2.4.ebuild 2362
-MD5 f1ad63aa94bbd4189d3f1770d22cd63e ChangeLog 519
-MD5 f79ef9c07b92317474ce2d48ecae0d6d files/digest-cm3-5.2.4 148
+MD5 265b1d9d60328bc587974b87989bd4fd ChangeLog 808
+MD5 4a92760230ce87e45653db9797a26de6 metadata.xml 1943
+MD5 ccab8b43f06a258e11ba91e58572d8ff cm3-5.2.7_pre050331.ebuild 1919
+MD5 873b1d73ec7a62d2f694a9c6fcabc70e cm3-5.2.6.ebuild 2324
+MD5 a071e91cf56b602fba2b046c25fa0826 files/05cm3 26
 MD5 b59e89e23c56831be2c1552870f15afb files/cm3.cfg 13025
-MD5 9e6999a8078829ff6e304a50188d16dc files/m3build 26
-MD5 5e3a7f25af13b2b9d199d0e361f04556 files/m3ship 25
+MD5 288b8f9b71b91ebd331a54a79abcfcd0 files/m3build 33
+MD5 6013cd456a4381ba3abd48bddba25305 files/digest-cm3-5.2.6 68
+MD5 697094d1f2a7219c52ebdd86dfbd9a8b files/m3ship 32
+MD5 65b3003c4f6af3ee0d2e3e9f4dd00c90 files/digest-cm3-5.2.7_pre050331 80
diff --git a/dev-lang/cm3/cm3-5.2.6.ebuild b/dev-lang/cm3/cm3-5.2.6.ebuild
index 7c96b107d668..33082ceed722 100644
--- a/dev-lang/cm3/cm3-5.2.6.ebuild
+++ b/dev-lang/cm3/cm3-5.2.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3/cm3-5.2.6.ebuild,v 1.1 2003/07/17 17:19:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3/cm3-5.2.6.ebuild,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
+
+inherit fixheadtails
 
 DESCRIPTION="Critical Mass Modula-3 compiler"
 HOMEPAGE="http://www.elegosoft.com/cm3/"
@@ -8,24 +10,49 @@ SRC_URI="http://www.elegosoft.com/cm3/${PN}-src-all-${PV}.tgz"
 
 LICENSE="CMASS-M3 DEC-M3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE="tcltk"
 
-DEPEND="tcltk? ( dev-lang/tcl )
+RDEPEND="tcltk? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
 	sys-devel/gcc
 	dev-lang/cm3-bin"
+PROVIDE="virtual/m3"
 
 S=${WORKDIR}
 
-export GCC_BACKEND="yes"
-export M3GDB="no"
-export HAVE_SERIAL="no"
-unset M3GC_SIMPLE
-[ `use tcltk` ] \
-	&& HAVE_TCL="yes" \
-	|| HAVE_TCL="no"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	ht_fix_file \
+		m3-comm/rdwr/test/john/src/Main.m3 \
+		m3-demo/mentor/src/unionfind/junoLogs/reorder \
+		m3-sys/m3cc/gcc/config.guess--cfl \
+		m3-sys/m3cc/gcc/configure \
+		m3-sys/m3cc/gcc/configure--cfl \
+		m3-sys/m3cc/gcc/contrib/test_summary \
+		m3-sys/m3cc/gcc/gcc/configure \
+		m3-sys/m3cc/gcc/gcc/configure--cfl \
+		m3-sys/m3cc/gcc/gcc/configure.in \
+		m3-sys/m3cc/gcc/ltcf-c.sh \
+		m3-sys/m3cc/gcc/ltcf-gcj.sh \
+		m3-sys/m3gdb/gdb/configure \
+		m3-sys/m3tests/src/m3makefile \
+		scripts/pkginfo.sh
+}
+
+setup_env() {
+	export GCC_BACKEND="yes"
+	export M3GDB="no"
+	export HAVE_SERIAL="no"
+	unset M3GC_SIMPLE
+	use tcltk \
+		&& HAVE_TCL="yes" \
+		|| HAVE_TCL="no"
+}
 
 src_compile() {
+	setup_env
 	cd scripts
 	for s in do-cm3-core do-cm3-base ; do
 		env -u P ROOT=${S} ./${s}.sh build || die "building ${s}"
@@ -33,6 +60,7 @@ src_compile() {
 }
 
 src_install() {
+	setup_env
 	local TARGET=`grep 'TARGET.*=' /usr/bin/cm3.cfg | awk '{print $4}' | sed 's:"::g'`
 	sed -i "s:\"/usr/lib/cm3/:\"${D}/usr/lib/cm3/:g" `find -name .M3SHIP` || die "fixing .M3SHIP"
 
@@ -42,7 +70,7 @@ src_install() {
 		env -u P ROOT=${S} ./${s}.sh ship || die "shipping ${s}"
 	done
 	cd ${D}/usr/lib/cm3/pkg
-	sed -i "s:${S}/.*-.*/:/usr/lib/cm3/pkg/:" `grep -RIl /var/tmp/portage *` || die "fixing .M3EXPORTS"
+	sed -i "s:${S}/*[^/-]*-[^/\"]*:/usr/lib/cm3/pkg:" `grep -RIl ${PORTAGE_TMPDIR}/portage *` || die "fixing .M3EXPORTS"
 
 	# do all this crazy linking so as to overwrite cm3-bin stuff
 	dodir /usr/bin
@@ -56,69 +84,4 @@ src_install() {
 
 	insinto /etc/env.d
 	doins ${FILESDIR}/05cm3
-	return 0
-
-	# old code left in so i can save it in cvs if i need it in the future ...
-	local pkgs=""
-	grep P= do-cm3-base.sh > my-base-pkgs ; echo 'echo $P' >> my-base-pkgs
-	grep P= do-cm3-core.sh > my-core-pkgs ; echo 'echo $P' >> my-core-pkgs
-	pkgs="$(export TARGET=${TARGET}; source my-base-pkgs ; source my-core-pkgs )"
-	dodir /usr/lib/cm3/pkg
-	for p in ${pkgs} ; do
-		pdir=`find ${S} -type d -name ${p} -maxdepth 2 -mindepth 2`
-		pkg=`basename ${p}`
-		[ -e ${D}/usr/lib/cm3/pkg/${pkg} ] && continue
-
-		# install by hand ...
-		#cp -rf ${pdir} ${D}/usr/lib/cm3/pkg/${pkg}
-		#cd ${D}/usr/lib/cm3/pkg/${pkg}/${TARGET}
-		#rm *.{i,m}o .M3SHIP
-		#cd ${D}/usr/lib/cm3/pkg/${pkg}/src
-		#find -type f \
-		#	! -name '*.i3' -a \
-		#	! -name '*.m3' -a \
-		#	! -name '*.ig' -a \
-		#	! -name '*.mg' -a \
-		#	! -name '*.c' -a \
-		#	! -name '*.h' -a \
-		#	! -name '*.tmpl' \
-		#	-exec rm '{}' \;
-
-		# translate m3ship file into portage
-		cd ${pdir}/${TARGET}
-		echo "=== package ${pdir} ==="	# mimic cm3 output
-		my_m3ship
-		echo " ==> ${pdir} done"
-		echo
-	done
-}
-
-my_m3ship() {
-	[ ! -e .M3SHIP ] && echo "package was built with overrides, not shipping." && return 0
-	local act
-	local src
-	local dst
-	local perms
-	local l
-	while read LINE ; do
-		# each line has the format:
-		# action("source file", "dest file", "permissions")
-		# unless of course the action doesnt need the extra params (i.e. make_dir)
-		# we translate it into 'action sourcefile destfile permissions'
-		l=$(echo ${LINE} | sed -e 's:[" )]::g' -e 's:[(,]: :g')
-		set -- ${l}
-		act=${1}
-		src=${2}
-		dst=${3}
-		perms=${4}
-		case ${act} in
-			install_file)	insinto ${dst}
-					doins ${src}
-					fperms ${perms} ${dst}/$(basename ${src});;
-			make_dir)	dodir ${src};;
-			link_file)	dosym ${src} ${dst};;
-			*)		die "unknown M3SHIP action ${act}";;
-		esac
-		debug-print ACT: ${act} SRC: ${src} DST: ${dst} PERMS: ${perms}
-	done < .M3SHIP
 }
diff --git a/dev-lang/cm3/cm3-5.2.7_pre050331.ebuild b/dev-lang/cm3/cm3-5.2.7_pre050331.ebuild
index acf4e17772b8..6847ce08f016 100644
--- a/dev-lang/cm3/cm3-5.2.7_pre050331.ebuild
+++ b/dev-lang/cm3/cm3-5.2.7_pre050331.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3/cm3-5.2.7_pre050331.ebuild,v 1.1 2005/04/02 04:30:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cm3/cm3-5.2.7_pre050331.ebuild,v 1.1.1.1 2005/11/30 09:58:48 chriswhite Exp $
 
 inherit fixheadtails
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.elegosoft.com/cm3/${PN}-src-all-d${MY_PV}.tgz"
 
 LICENSE="CMASS-M3 DEC-M3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86"
 IUSE="tcltk"
 
 RDEPEND="tcltk? ( dev-lang/tcl )"
diff --git a/dev-lang/cm3/files/digest-cm3-5.2.6 b/dev-lang/cm3/files/digest-cm3-5.2.6
index fb016cf882aa..12093fde0015 100644
--- a/dev-lang/cm3/files/digest-cm3-5.2.6
+++ b/dev-lang/cm3/files/digest-cm3-5.2.6
@@ -1,2 +1 @@
 MD5 44fd8c9c905707e4f9835eaf6b747127 cm3-src-all-5.2.6.tgz 30410022
-MD5 c473f5c15072c4b454ec193ea8d672ac cm3-min-POSIX-LINUXLIBC6-5.2.6.tgz 5552629
diff --git a/dev-lang/cm3/files/m3build b/dev-lang/cm3/files/m3build
index 15f78321353f..6c0b9cdbd7a2 100644
--- a/dev-lang/cm3/files/m3build
+++ b/dev-lang/cm3/files/m3build
@@ -1,2 +1,2 @@
 #!/bin/bash
-cm3 -build $@
+exec cm3 -build "$@"
diff --git a/dev-lang/cm3/files/m3ship b/dev-lang/cm3/files/m3ship
index a816c7ae8a8f..01edd3ec55e7 100644
--- a/dev-lang/cm3/files/m3ship
+++ b/dev-lang/cm3/files/m3ship
@@ -1,2 +1,2 @@
 #!/bin/bash
-cm3 -ship $@
+exec cm3 -ship "$@"
diff --git a/dev-lang/cm3/metadata.xml b/dev-lang/cm3/metadata.xml
index 5d4bbc40ed5b..a6d903896ca0 100644
--- a/dev-lang/cm3/metadata.xml
+++ b/dev-lang/cm3/metadata.xml
@@ -14,16 +14,16 @@ available so far. The changes made by Critical Mass, Inc. since their CM3 4.1
 release include:
 
     * Modula-3 modules loadable at runtime
-    * <*IMPLICIT*> exceptions (changes language semantics)
+    * *IMPLICIT* exceptions (changes language semantics)
     * checked runtime errors are mapped to the implicit exception RuntimeError.E
     * garbage collector failures are also mapped to implicit exceptions
     * COM-compatible object layout (for WIN32)
     * Unicode support: WIDECHAR, Text, Text8, Text16, Unicode interfaces
     * extended ASSERT pragma:
-      <*ASSERT condition [ ("," | WITH) msg ] *>>
+      *ASSERT condition [ ("," | WITH) msg ] *
     * new DEBUG pragma:
-      <*DEBUG condition [ ("," | WITH) msg {, msg} ] *>
-      <*DEBUG [ msg {, msg } ] *>
+      *DEBUG condition [ ("," | WITH) msg {, msg} ] *
+      *DEBUG [ msg {, msg } ] *
     * 64 bit support for 64 bit machines
 
 There have been many more changes, and the 4.1 release also contained lots of 
diff --git a/dev-lang/confluence/ChangeLog b/dev-lang/confluence/ChangeLog
index 707f0f0ad2cd..ef206d193ee2 100644
--- a/dev-lang/confluence/ChangeLog
+++ b/dev-lang/confluence/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/confluence
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/ChangeLog,v 1.1 2004/08/09 11:16:26 mattam Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/ChangeLog,v 1.1.1.1 2005/11/30 09:58:44 chriswhite Exp $
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> confluence-0.9.1.ebuild:
+  Mark 0.9.1 stable on alpha
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> confluence-0.9.1.ebuild:
+  stable on ia64
+
+  09 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  confluence-0.9.1.ebuild:
+  header fix; tidy
 
 *confluence-0.9.1 (09 Aug 2004)
 
diff --git a/dev-lang/confluence/Manifest b/dev-lang/confluence/Manifest
index a8a0e7281e10..f61aa09aea6e 100644
--- a/dev-lang/confluence/Manifest
+++ b/dev-lang/confluence/Manifest
@@ -1,4 +1,4 @@
-MD5 b200e9c8e0235dc2e4c05603de0b2eab template.cf 1242
-MD5 9fb04a4bc61e424fb63466c446bf9a1a confluence-0.9.1.ebuild 693
-MD5 420a725401d6b29e485574c30f2b72bd files/digest-confluence-0.9.1_rc1 72
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 fe97416944159c98d6439097d54ffd45 ChangeLog 791
+MD5 3127d10c7dbec8a6dbd403b64e878a40 confluence-0.9.1.ebuild 719
 MD5 6d6e7fe79d26d2ccc54ac17ecab31489 files/digest-confluence-0.9.1 68
diff --git a/dev-lang/confluence/confluence-0.9.1.ebuild b/dev-lang/confluence/confluence-0.9.1.ebuild
index 32682425e0f3..fae5b3af43e9 100644
--- a/dev-lang/confluence/confluence-0.9.1.ebuild
+++ b/dev-lang/confluence/confluence-0.9.1.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/confluence-0.9.1.ebuild,v 1.1 2004/08/09 11:16:26 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/confluence-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:58:44 chriswhite Exp $
 
 DESCRIPTION="a functional programming language for reactive system design (digital logic, hard-real-time software)"
-SRC_URI="http://www.confluent.org/download/confluence/${P}.tar.gz"
 HOMEPAGE="http://www.confluent.org/"
-
-S="${WORKDIR}/${P}"
-
-DEPEND="dev-lang/ocaml"
+SRC_URI="http://www.confluent.org/download/confluence/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~ia64"
+KEYWORDS="alpha ia64 ~ppc ~sparc x86"
 IUSE=""
 
+DEPEND="dev-lang/ocaml"
+
 src_compile() {
 	make PREFIX=${D}/usr OCAMLLIB=`ocamlc -where` || die
 }
 
 src_install() {
 	make PREFIX=${D}/usr OCAMLLIB=`ocamlc -where` install || die
-
-	dodoc LICENSE_GPL LICENSE_LGPL INSTALL NEWS
+	dodoc INSTALL NEWS
 }
diff --git a/dev-lang/cxx/ChangeLog b/dev-lang/cxx/ChangeLog
index ff391ceaea50..b4a9560e2ff2 100644
--- a/dev-lang/cxx/ChangeLog
+++ b/dev-lang/cxx/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for dev-lang/cxx
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/ChangeLog,v 1.1 2003/04/15 14:49:59 taviso Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/ChangeLog,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
+
+  18 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Fix digest, bug 70478.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cxx-6.5.9.31-r1.ebuild, cxx-6.5.9.31.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jun 2003; Tavis Ormandy <taviso@gentoo.org> cxx-6.5.9.31-r1.ebuild:
+  stable on alpha
+
+  15 Jun 2003; Tavis Ormandy <taviso@gentoo.org> cxx-6.5.9.31-r1.ebuild:
+  ccc must be installed first.
+
+*cxx-6.5.9.31-r1 (16 Apr 2003)
+
+  18 Apr 2003; Tavis Ormandy <taviso@gentoo.org> cxx-6.5.9.31-r1.ebuild:
+  Integrating agriffis' gpg fixes from ccc.
+  Updating dependencies.
+
+  16 Apr 2003; Tavis Ormandy <taviso@gentoo.org> cxx-6.5.9.31-r1.ebuild:
+  Permissions on some of the cxx includes were not being updated, now explicitly
+  changed to root:root when unpacked. version bump.
 
 *cxx-6.5.9.31 (15 Apr 2003)
 
diff --git a/dev-lang/cxx/Manifest b/dev-lang/cxx/Manifest
index e69de29bb2d1..1e52a8398445 100644
--- a/dev-lang/cxx/Manifest
+++ b/dev-lang/cxx/Manifest
@@ -0,0 +1,6 @@
+MD5 05a53b25858e223a4b6e13855119cb25 cxx-6.5.9.31-r1.ebuild 5660
+MD5 b28df93f5e740fc22bf2c6eaa3e3d054 cxx-6.5.9.31.ebuild 5581
+MD5 78f45036751e04f60161031af9333101 ChangeLog 1137
+MD5 1301db74278b5d421b45dc4c906b0796 metadata.xml 874
+MD5 d359bacc658abbc5ea74e553d1a76cd8 files/digest-cxx-6.5.9.31 76
+MD5 d359bacc658abbc5ea74e553d1a76cd8 files/digest-cxx-6.5.9.31-r1 76
diff --git a/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild b/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild
index 28e6061d96ec..710d30918027 100644
--- a/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild
+++ b/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild,v 1.1 2003/04/16 21:51:49 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/cxx-6.5.9.31-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -19,17 +19,21 @@ S=${WORKDIR}
 LICENSE="PLDSPv2"
 SLOT="0"
 # NOTE: ALPHA Only!
-KEYWORDS="-* ~alpha"
+KEYWORDS="-* alpha"
 
 DEPEND="sys-devel/gcc-config
 	app-arch/rpm2targz
 	>=sys-apps/sed-4
 	app-crypt/gnupg
-	>=app-shells/bash-2.05b"
+	>=app-shells/bash-2.05b
+	>=dev-libs/libcpml-5.2.01-r2
+	dev-libs/libots
+	dev-lang/ccc"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
-	>=dev-libs/libcpml-5.2.01-r2"
+	>=dev-libs/libcpml-5.2.01-r2
+	dev-lang/ccc"
 
 # The variables below are not used by Portage, but are used by the functions
 # below.
@@ -41,7 +45,7 @@ src_unpack() {
 	local cxx_rpm="cxx-${cxx_release}.alpha.rpm"
 
 	if [ -z ${CXX_LICENSE_KEY} ]; then
-		eerror ""
+		eerror
 		eerror "You have not set the environment variable"
 		eerror "\$CXX_LICENSE_KEY, this should be set to"
 		eerror "the password you were sent when you applied"
@@ -49,16 +53,19 @@ src_unpack() {
 		eerror "license."
 		eerror "If you do not have a license key, apply for one"
 		eerror "here ${ee_license_reg}"
-		eerror ""
+		eerror
 		die "no license key in \$CXX_LICENSE_KEY"
 	fi
-	
+
 	# :-NULL safeguards against bash bug.
 	einfo "Decrypting cxx distribution..."
-	gpg --quiet --passphrase-fd 0 --output ${cxx_rpm} \
+	gpg --quiet \
+		--homedir=${T} --no-permission-warning \
+		--no-mdc-warning \
+		--passphrase-fd 0 \
+		--output ${cxx_rpm} \
 		--decrypt ${DISTDIR}/${cxx_rpm}.crypt \
-		<<< ${CXX_LICENSE_KEY:-NULL} >/dev/null 2>&1 || \
-		die "Sorry, your license key doesnt seem to unlock the distribution"
+		<<< ${CXX_LICENSE_KEY:-NULL}
 
 	ebegin "Unpacking cxx distribution..."
 	# This is the same as using rpm2targz then extracting 'cept that
@@ -68,7 +75,7 @@ src_unpack() {
 	dd ibs=`rpmoffset < ${i}` skip=1 if=$i 2>/dev/null \
 		| gzip -dc | cpio -idmu 2>/dev/null \
 		&& find usr -type d -print0 | xargs -0 chmod a+rx \
-		&& chmod -R g-w usr && chown -R root:root usr
+		&& chmod -R g-w usr && chown -R root:0 usr
 	eend ${?}
 	assert "Failed to unpack ${cxx_rpm}"
 }
@@ -115,7 +122,7 @@ src_compile() {
 	# is the wrong approach, but it will do for the first pass at this
 	# package
 	#
-	# update: No longer nescessary with >=libcpml-5.2.01-r2 
+	# update: No longer nescessary with >=libcpml-5.2.01-r2
 	#
 	#sed -i 's/^  version_high_enough /  true /' \
 	#	usr/lib/compaq/cxx-${cxx_release}/alpha-linux/bin/probe_linux.sh
@@ -165,13 +172,13 @@ pkg_postinst () {
 	ewarn "to complete the installation"
 	ewarn
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with cxx "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with cxx"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 }
diff --git a/dev-lang/cxx/cxx-6.5.9.31.ebuild b/dev-lang/cxx/cxx-6.5.9.31.ebuild
index 62dce7a9b0aa..4554abe0a230 100644
--- a/dev-lang/cxx/cxx-6.5.9.31.ebuild
+++ b/dev-lang/cxx/cxx-6.5.9.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/cxx-6.5.9.31.ebuild,v 1.1 2003/04/15 14:49:59 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/cxx/cxx-6.5.9.31.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 #
 # Ebuild contributed by Tavis Ormandy <taviso@sdf.lonestar.org>
 # and edited by Aron Griffis <agriffis@gentoo.org>
@@ -27,7 +27,7 @@ DEPEND="sys-devel/gcc-config
 	app-crypt/gnupg
 	>=app-shells/bash-2.05b"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	dev-libs/libots
 	>=dev-libs/libcpml-5.2.01-r2"
 
@@ -41,7 +41,7 @@ src_unpack() {
 	local cxx_rpm="cxx-${cxx_release}.alpha.rpm"
 
 	if [ -z ${CXX_LICENSE_KEY} ]; then
-		eerror ""
+		eerror
 		eerror "You have not set the environment variable"
 		eerror "\$CXX_LICENSE_KEY, this should be set to"
 		eerror "the password you were sent when you applied"
@@ -49,10 +49,10 @@ src_unpack() {
 		eerror "license."
 		eerror "If you do not have a license key, apply for one"
 		eerror "here ${ee_license_reg}"
-		eerror ""
+		eerror
 		die "no license key in \$CXX_LICENSE_KEY"
 	fi
-	
+
 	# :-NULL safeguards against bash bug.
 	einfo "Decrypting cxx distribution..."
 	gpg --quiet --passphrase-fd 0 --output ${cxx_rpm} \
@@ -115,7 +115,7 @@ src_compile() {
 	# is the wrong approach, but it will do for the first pass at this
 	# package
 	#
-	# update: No longer nescessary with >=libcpml-5.2.01-r2 
+	# update: No longer nescessary with >=libcpml-5.2.01-r2
 	#
 	#sed -i 's/^  version_high_enough /  true /' \
 	#	usr/lib/compaq/cxx-${cxx_release}/alpha-linux/bin/probe_linux.sh
@@ -165,13 +165,13 @@ pkg_postinst () {
 	ewarn "to complete the installation"
 	ewarn
 	einfo "Hopefullly soon we will get a ccc USE flag"
-	einfo "on packages (or at least individual       "
+	einfo "on packages (or at least individual"
 	einfo "components) that can be successfully built"
-	einfo "using this compiler, until then you will  "
-	einfo "just have to experiment :)                "
+	einfo "using this compiler, until then you will"
+	einfo "just have to experiment :)"
 	einfo
-	einfo "Please report successes/failures with cxx "
-	einfo "to http://bugs.gentoo.org so that the USE "
-	einfo "flags can be updated.                     "
+	einfo "Please report successes/failures with cxx"
+	einfo "to http://bugs.gentoo.org so that the USE"
+	einfo "flags can be updated."
 	einfo
 }
diff --git a/dev-lang/cxx/files/digest-cxx-6.5.9.31 b/dev-lang/cxx/files/digest-cxx-6.5.9.31
index cb4b21f51052..9d5cb383784e 100644
--- a/dev-lang/cxx/files/digest-cxx-6.5.9.31
+++ b/dev-lang/cxx/files/digest-cxx-6.5.9.31
@@ -1 +1 @@
-MD5 915146572fe6711827f486af40544877 cxx-6.5.9.31-1.alpha.rpm.crypt 968355
+MD5 915146572fe6711827f486af40544877 cxx-6.5.9.31-1.alpha.rpm.crypt 9683556
diff --git a/dev-lang/cxx/files/digest-cxx-6.5.9.31-r1 b/dev-lang/cxx/files/digest-cxx-6.5.9.31-r1
index cb4b21f51052..9d5cb383784e 100644
--- a/dev-lang/cxx/files/digest-cxx-6.5.9.31-r1
+++ b/dev-lang/cxx/files/digest-cxx-6.5.9.31-r1
@@ -1 +1 @@
-MD5 915146572fe6711827f486af40544877 cxx-6.5.9.31-1.alpha.rpm.crypt 968355
+MD5 915146572fe6711827f486af40544877 cxx-6.5.9.31-1.alpha.rpm.crypt 9683556
diff --git a/dev-lang/eleven/ChangeLog b/dev-lang/eleven/ChangeLog
index bfe442790271..f06e6d81069b 100644
--- a/dev-lang/eleven/ChangeLog
+++ b/dev-lang/eleven/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/eleven
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/eleven/ChangeLog,v 1.1 2005/02/28 02:51:29 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/eleven/ChangeLog,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
+
+  04 May 2005; David Holm <dholm@gentoo.org> eleven-1.0.ebuild:
+  Added to ~ppc.
 
 *eleven-1.0 (28 Feb 2005)
 
diff --git a/dev-lang/eleven/Manifest b/dev-lang/eleven/Manifest
index 29668e429aef..faf22ec49b54 100644
--- a/dev-lang/eleven/Manifest
+++ b/dev-lang/eleven/Manifest
@@ -1,3 +1,4 @@
-MD5 6be6ef0f478b39247a2fe22c19a6d714 eleven-1.0.ebuild 501
+MD5 52c0ec6e013772e9f541304227e50b7b ChangeLog 411
+MD5 e40ec5ab62fbac9d5bcecaf0b569a2f5 eleven-1.0.ebuild 600
 MD5 c7e3ff0cf399130a0e60e11bac4e6e61 metadata.xml 827
 MD5 6878ca9d4cdb4d9176dc8e4e2e403ca1 files/digest-eleven-1.0 62
diff --git a/dev-lang/eleven/eleven-1.0.ebuild b/dev-lang/eleven/eleven-1.0.ebuild
index 0feb7d957da0..67adef115f89 100644
--- a/dev-lang/eleven/eleven-1.0.ebuild
+++ b/dev-lang/eleven/eleven-1.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/dev-lang/eleven/eleven-1.0.ebuild,v 1.1 2005/02/28 02:51:29 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/eleven/eleven-1.0.ebuild,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
 
 DESCRIPTION="A programming language for creating robust, scalable Web applications quickly and easily."
 HOMEPAGE="http://eleven.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 RDEPEND="dev-util/guile"
 DEPEND="${RDEPEND} sys-devel/bison"
diff --git a/dev-lang/entity/ChangeLog b/dev-lang/entity/ChangeLog
index bd899643de79..983b8c51f456 100644
--- a/dev-lang/entity/ChangeLog
+++ b/dev-lang/entity/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-lang/entity
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/ChangeLog,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> entity-0.7.2-r1.ebuild,
+  entity-0.7.2.ebuild:
+  Don't assign default to S; header fix
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *entity-0.7.2-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/dev-lang/entity/Manifest b/dev-lang/entity/Manifest
index e69de29bb2d1..8098e407844a 100644
--- a/dev-lang/entity/Manifest
+++ b/dev-lang/entity/Manifest
@@ -0,0 +1,5 @@
+MD5 8e9392ddc73f9638d15b90513e3c65d5 entity-0.7.2-r1.ebuild 2309
+MD5 d68f9ae1b5c241f77db28a267e488c97 ChangeLog 892
+MD5 ce6353b540b0a9529d63cdf14ca30210 entity-0.7.2.ebuild 2291
+MD5 ca78150c48e85c015a89488ab2ac3e66 files/digest-entity-0.7.2-r1 64
+MD5 ca78150c48e85c015a89488ab2ac3e66 files/digest-entity-0.7.2 64
diff --git a/dev-lang/entity/entity-0.7.2-r1.ebuild b/dev-lang/entity/entity-0.7.2-r1.ebuild
index 9799ecad7aa0..4c49f6db6e05 100644
--- a/dev-lang/entity/entity-0.7.2-r1.ebuild
+++ b/dev-lang/entity/entity-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2-r1.ebuild,v 1.1 2002/01/15 01:27:50 gbevin Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
+
+IUSE="sdl gnome ssl opengl python tcltk perl"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An XML Framework"
 SRC_URI="http://www.entity.cx/Download/files/${P}.tar.gz"
 HOMEPAGE="http://www.entity.cx"
@@ -11,89 +11,80 @@ HOMEPAGE="http://www.entity.cx"
 DEPEND=">=media-libs/imlib-1.9.10-r1
 	>=dev-libs/libpcre-3.2
 	tcltk? ( >=dev-lang/tk-8.1.1 )
-	perl? ( >=sys-devel/perl-5.6 )
+	perl? ( >=dev-lang/perl-5.6 )
 	python? ( >=dev-lang/python-2.0-r4 )
 	sdl? ( >=media-libs/libsdl-1.1.7 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	opengl? ( >=x11-libs/gtkglarea-1.2.2 )
-	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )"
-
-RDEPEND=">=media-libs/imlib-1.9.10-r1
-	>=dev-libs/libpcre-3.2
-	tcltk? ( >=dev-lang/tk-8.1.1 )
-	perl? ( >=sys-devel/perl-5.6 )
-	python? ( >=dev-lang/python-2.0i-r4 )
-	sdl? ( >=media-libs/libsdl-1.1.7 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	opengl? ( >=x11-libs/gtkglarea-1.2.2-r1 )
+	opengl? ( <x11-libs/gtkglarea-1.99.0 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="x86 sparc"
+
+
 src_compile() {
 
-    local myconf
-    if [ "`use tcltk`" ]
-    then
-        myconf="--enable-tcl=module --with-tcl=/usr/lib"
-    else
-        myconf="--enable-tcl=no"
-    fi
-    if [ "`use perl`" ]
-    then
-        myconf="$myconf --enable-perl=static"
-    else
-        myconf="$myconf --enable-perl=no"
-    fi
-    if [ "`use python`" ]
-    then
-	myconf="$myconf --enable-python=static"
-    else
-        myconf="$myconf --enable-python=no"
-    fi
-    if [ "`use ssl`" ]
-    then
-	myconf="$myconf --enable-openssl"
-    fi
-    if [ "`use sdl`" ]
-    then
-	myconf="$myconf --enable-sdl"
-    fi
-    if [ "`use gnome`" ]
-    then
-	myconf="$myconf --enable-gnome --enable-gdkimlib"
-    fi
-    if [ "`use opengl`" ]
-    then
-	myconf="$myconf --enable-gtkgl"
-    fi
-    try DEBIAN_ENTITY_MAGIC="voodoo" CFLAGS="$CFLAGS -I/usr/X11R6/include" ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
-	--enable-exec-class=yes \
-	--enable-gtk=module \
-	--enable-c=module $myconf \
-	--enable-javascript=yes --with-included-njs --enable-csinc
-    try make LDFLAGS="-L/usr/lib/python2.0/config/ -lpython2.0 `python-config --libs`"
+	local myconf
+	use tcltk \
+		&& myconf="--enable-tcl=module --with-tcl=/usr/lib" \
+		|| myconf="--enable-tcl=no"
+
+	use perl \
+		&& myconf="${myconf} --enable-perl=static" \
+		|| myconf="${myconf} --enable-perl=no"
+
+	use python \
+		&& myconf="${myconf} --enable-python=static" \
+		|| myconf="${myconf} --enable-python=no"
+
+	use ssl \
+		&& myconf="${myconf} --enable-openssl"
+
+	use sdl \
+		&& myconf="${myconf} --enable-sdl"
+
+	use gnome \
+		&& myconf="${myconf} --enable-gnome --enable-gdkimlib"
+
+	use opengl \
+		&& myconf="${myconf} --enable-gtkgl"
+
+	DEBIAN_ENTITY_MAGIC="voodoo" CFLAGS="$CFLAGS -I/usr/X11R6/include" \
+		econf \
+			--enable-exec-class=yes \
+			--enable-gtk=module \
+			--enable-c=module \
+			--enable-javascript=yes \
+			--with-included-njs \
+			--enable-csinc \
+			${myconf} || die
+
+	make \
+	LDFLAGS="-L/usr/lib/python2.0/config/ -lpython2.0 `python-config --libs`" \
+		|| die
 }
 
 src_install () {
-    make DESTDIR=${D} LD_LIBRARY_PATH=${D}/usr/lib install
-    insinto /usr/share/entity/stembuilder
-    doins stembuilder/*.e
-    chmod +x ${D}/usr/share/entity/stembuilder/stembuilder.e
-    insinto /usr/share/entity/apps
-    doins apps/*.e
-    chmod +x ${D}/usr/share/entity/apps/{enview,ev}.e
-    exeinto /usr/share/entity/examples
-    doexe examples/*.e
-    insinto /usr/share/entity/stembuilder/images
-    doins stembuilder/images/*.xpm
-
-    dodoc AUTHORS COPYING ChangeLog LICENSE NEWS README TODO 
-    docinto txt
-    dodoc docs/README* docs/*.txt docs/*.ascii
-    docinto html
-    dodoc docs/*.html
-    docinto print
-    dodoc docs/*.ps
-    docinto sgml
-    dodoc docs/*.sgml
-}
+	make DESTDIR=${D} LD_LIBRARY_PATH=${D}/usr/lib install || die
 
+	insinto /usr/share/entity/stembuilder
+	doins stembuilder/*.e
+	chmod +x ${D}/usr/share/entity/stembuilder/stembuilder.e
+	insinto /usr/share/entity/apps
+	doins apps/*.e
+	chmod +x ${D}/usr/share/entity/apps/{enview,ev}.e
+	exeinto /usr/share/entity/examples
+	doexe examples/*.e
+	insinto /usr/share/entity/stembuilder/images
+	doins stembuilder/images/*.xpm
+
+	dodoc AUTHORS COPYING ChangeLog LICENSE NEWS README TODO
+	docinto txt
+	dodoc docs/README* docs/*.txt docs/*.ascii
+	dohtml -r docs
+	docinto print
+	dodoc docs/*.ps
+	docinto sgml
+	dodoc docs/*.sgml
+}
diff --git a/dev-lang/entity/entity-0.7.2.ebuild b/dev-lang/entity/entity-0.7.2.ebuild
index 6f411586e69b..1f0614748ac7 100644
--- a/dev-lang/entity/entity-0.7.2.ebuild
+++ b/dev-lang/entity/entity-0.7.2.ebuild
@@ -1,35 +1,89 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.1 2001/04/28 13:02:22 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
+
+IUSE="sdl gnome ssl opengl python tcltk perl"
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="An XML Framework"
-SRC_URI="http://www.entity.cx/Download/files/${A}"
+SRC_URI="http://www.entity.cx/Download/files/${P}.tar.gz"
 HOMEPAGE="http://www.entity.cx"
 
-DEPEND=">=media-libs/imlib-1.9.8.1
+DEPEND=">=media-libs/imlib-1.9.10-r1
 	>=dev-libs/libpcre-3.2
-	>=dev-lang/tcl-tk-8.1.1
-	>=sys-devel/perl-5.6"
+	tcltk? ( >=dev-lang/tk-8.1.1 )
+	perl? ( >=dev-lang/perl-5.6 )
+	python? ( >=dev-lang/python-2.0-r4 )
+	sdl? ( >=media-libs/libsdl-1.1.7 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	opengl? ( <x11-libs/gtkglarea-1.99.0 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+
 
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="x86 sparc"
 
 src_compile() {
 
-    try DEBIAN_ENTITY_MAGIC=voodoo ./configure --prefix=/usr --host=${CHOST} \
-	--enable-exec-class=yes \
-	--enable-gtk=module \
-	--enable-perl=static --enable-python=no \
-	--enable-tcl=module  --with-tcl=/usr/lib \
-	--enable-c=module \
-	--enable-javascript=yes --with-included-njs 
-    try make
+	local myconf
+	use tcltk \
+		&& myconf="--enable-tcl=module --with-tcl=/usr/lib" \
+		|| myconf="--enable-tcl=no"
+
+	use perl \
+		&& myconf="${myconf} --enable-perl=static" \
+		|| myconf="${myconf} --enable-perl=no"
+
+	use python \
+		&& myconf="${myconf} --enable-python=static" \
+		|| myconf="${myconf} --enable-python=no"
+
+	use ssl \
+		&& myconf="${myconf} --enable-openssl"
 
+	use sdl \
+		&& myconf="${myconf} --enable-sdl"
+
+	use gnome \
+		&& myconf="${myconf} --enable-gnome --enable-gdkimlib"
+
+	use opengl \
+		&& myconf="${myconf} --enable-gtkgl"
+
+	DEBIAN_ENTITY_MAGIC="voodoo" CFLAGS="$CFLAGS -I/usr/X11R6/include" \
+		econf \
+		--enable-exec-class=yes \
+		--enable-gtk=module \
+		--enable-c=module \
+		--enable-javascript=yes \
+		--with-included-njs \
+		--enable-csinc \
+		${myconf} || die
+
+	make \
+	LDFLAGS="-L/usr/lib/python2.0/config/ -lpython2.0 `python-config --libs`" \
+		|| die
 }
 
 src_install () {
+	make DESTDIR=${D} LD_LIBRARY_PATH=${D}/usr/lib install
+	insinto /usr/share/entity/stembuilder
+	doins stembuilder/*.e
+	chmod +x ${D}/usr/share/entity/stembuilder/stembuilder.e
+	insinto /usr/share/entity/apps
+	doins apps/*.e
+	chmod +x ${D}/usr/share/entity/apps/{enview,ev}.e
+	exeinto /usr/share/entity/examples
+	doexe examples/*.e
+	insinto /usr/share/entity/stembuilder/images
+	doins stembuilder/images/*.xpm
 
-    make DESTDIR=${D} install
+	dodoc AUTHORS COPYING ChangeLog LICENSE NEWS README TODO
+	docinto txt
+	dodoc docs/README* docs/*.txt docs/*.ascii
+	dohtml -r docs
+	docinto print
+	dodoc docs/*.ps
+	docinto sgml
+	dodoc docs/*.sgml
 }
-
diff --git a/dev-lang/entity/files/digest-entity-0.7.2 b/dev-lang/entity/files/digest-entity-0.7.2
index 3c2dc3e147eb..d5d1f54cc3f9 100644
--- a/dev-lang/entity/files/digest-entity-0.7.2
+++ b/dev-lang/entity/files/digest-entity-0.7.2
@@ -1 +1 @@
-MD5 e3c99f264d40c7ae822033d2f77be293 entity-0.7.2.tar.gz
+MD5 e3c99f264d40c7ae822033d2f77be293 entity-0.7.2.tar.gz 803955
diff --git a/dev-lang/entity/files/digest-entity-0.7.2-r1 b/dev-lang/entity/files/digest-entity-0.7.2-r1
index fc05108ce791..d5d1f54cc3f9 100644
--- a/dev-lang/entity/files/digest-entity-0.7.2-r1
+++ b/dev-lang/entity/files/digest-entity-0.7.2-r1
@@ -1 +1 @@
-MD5 e3c99f264d40c7ae822033d2f77be293 entity-0.7.2.tar.gz 806912
+MD5 e3c99f264d40c7ae822033d2f77be293 entity-0.7.2.tar.gz 803955
diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 7681e1dcedf9..1abedf8f1090 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,13 +1,118 @@
 # ChangeLog for dev-lang/erlang
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.1 2002/11/02 05:40:54 george Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
-*erlang-8b (01 Nov 2002)
+*erlang-10.2.7 (29 Oct 2005)
 
-  01 Nov 2002; George Shapovalov <george@gentoo.org> erlang-8b.ebuild :
+  29 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/erlang-10.2.7-export-TARGET.patch,
+  +files/10.2.7-manpage-emacs-gentoo.patch, +erlang-10.2.7.ebuild:
+  New upstream version; Added epoll support and condition support for
+  dev-lang/tk via X USE flag; Resolves Bug #106208.
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> erlang-10.2.5.ebuild:
+  Stable on SPARC.
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> erlang-10.2.5.ebuild:
+  Stable on ppc.
+
+*erlang-10.2.5 (24 Aug 2005)
+
+  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +erlang-10.2.5.ebuild:
+  Add a version which works with wings #97798.
+
+  18 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/10.2.6-manpage-emacs-gentoo.patch, files/50erlang-gentoo.el,
+  metadata.xml, erlang-10.2.6.ebuild:
+  Added Emacs Herd to metadata.xml.
+
+  18 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/10.2.6-manpage-emacs-gentoo.patch, files/50erlang-gentoo.el,
+  erlang-10.2.6.ebuild:
+  Support man-page documentation in Emacs erlang-mode; Install Erlang
+  man-pages and HTML documentation via "doc" USE flag; Add missing
+  dependencies for Java and ODBC support via "odbc" and "java" USE flags;
+  Rename Erlang man-pages with "erl" suffix to avoid namespace collision; New
+  upstream version.
+
+*erlang-10.2.6 (02 Jul 2005)
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org> +erlang-10.2.6.ebuild:
+  Version bump.
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/erlang-10.2.6-export-TARGET.patch, erlang-10.2.0.ebuild:
+  Fix host detection #94090 by Matthew Kennedy.
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org> erlang-9c-r2.ebuild,
+  erlang-9c-r3.ebuild, erlang-10.2.0.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> erlang-10.2.0.ebuild:
+  Small multilib issue, fixes bug #89938
+
+  20 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/50erlang-gentoo.el, erlang-10.2.0.ebuild:
+  USE support for "emacs"; Resolves Bug #78557
+
+*erlang-10.2.0 (07 Oct 2004)
+
+  07 Oct 2004; George Shapovalov <george@gentoo.org> erlang-10.2.0.ebuild :
+  new version out, adjusted versioning scheme as was previously discussed 
+  (retaining 1st number, then letters A->1, B->2, ... and adding the "revision")
+  thus this corresponds to R10B-0
+  also adjusted openssl dependency to point to >=0.9.7d
 
-  first inclusion
+*erlang-9c-r3 (02 Aug 2004)
 
+  02 Aug 2004; George Shapovalov <george@gentoo.org> erlang-9c-r3.ebuild :
+  fixed some stray ${D}'s in wrappers (#58901), added support for ~amd64
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; erlang-8b.ebuild,
+  erlang-9c-r1.ebuild, erlang-9c-r2.ebuild, erlang-9c.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+*erlang-9c-r2 (21 Feb 2004)
+
+  21 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26420.
+
+*erlang-9c-r1 (01 Jul 2003)
+
+  28 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added 'addpredict' to /dev/pts to fix issues w/emerging in XTerm #25366.
+
+  03 Jul 2003; George Shapovalov <george@gentoo.org> erlang-9c-r1.ebuild :
+  incorporated fix for weird install on some systems from #20625
+  Thanks to Claes Wikstrom <klacke@hyber.org> for the patch
+
+  01 Jul 2003; George Shapovalov <george@gentoo.org> erlang-9c-r1.ebuild :
+  incorporated patch to make erlang read nsswitch.conf in 
+  addition to host.conf (#22836)
+  Thanks to Claes Wikstrom <klacke@hyber.org> for the patch
+
+*erlang-9c (09 May 2003)
+
+  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up and made the ebuild more 'portage' like ... changed sed cmds to dosed
+
+  09 May 2003; George Shapovalov <george@gentoo.org> erlang-9c.ebuild :
+  new version (#20625), original versio n is R9B-1, 9c seems to be the only approximation
+  that works and is considered newer by portage
+  (anyway, 'B' seems to be invariant in upstream naming scheme)
+  Thanks to Claes Wikstrom <klacke@hyber.org> for an update.
+
+*erlang-9b (07 Jan 2003)
+
+  07 Jan 2003; George Shapovalov <george@gentoo.org> erlang-8b.ebuild, erlang-9b.ebuild :
+  new version,
+  cleaned up erlang-8b.ebuild and added IUSE
+ 
+*erlang-8b (01 Nov 2002)
+
+  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up and made the ebuild more 'portage' like ... changed sed cmds to dosed
+
+  01 Nov 2002; George Shapovalov <george@gentoo.org> erlang-8b.ebuild :
   Erlang is a programming language, runtime environment and a large collection of
-  libraries.
-  ebuild submitted by Charlie Mac <charzilla@yahoo.com>
+  libraries.  Ebuild submitted by Charlie Mac <charzilla@yahoo.com>
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index e69de29bb2d1..7f58916530ed 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -0,0 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 940fb0ab72c04e957c1d31a0d0b42435 ChangeLog 4710
+MD5 dc1d9134a5f6e8146cc4ca6c5e130f0a erlang-10.2.0.ebuild 2372
+MD5 363c1727652dbfbd85dbff66e246b467 erlang-10.2.5.ebuild 2944
+MD5 f710894b1b9115ed6aa49b7abf22e22f erlang-10.2.6.ebuild 2938
+MD5 842590cfaa161fada943481a9cdd0e32 erlang-10.2.7.ebuild 3086
+MD5 f947170e5f0fef952a0efc7dcc947f37 erlang-8b.ebuild 1178
+MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686
+MD5 4df8bcb2597f95b5d00f898f0dbc9e96 erlang-9c-r2.ebuild 1808
+MD5 92087ace1ec7f4f5fafb31419db5fafa erlang-9c-r3.ebuild 1822
+MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505
+MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348
+MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.7-manpage-emacs-gentoo.patch 1348
+MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140
+MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005
+MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67
+MD5 915a9f490e6f58cafe26c3f6f6aeb54d files/digest-erlang-10.2.5 209
+MD5 935d6f9403c781eb7c3234136b1684e0 files/digest-erlang-10.2.6 210
+MD5 9a4549378412ae567bc58f2d7a9336a3 files/digest-erlang-10.2.7 280
+MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67
+MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66
+MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
+MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66
+MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66
+MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242
+MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.7-export-TARGET.patch 242
+MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503
+MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDY9qxyiNZaEAZA+ARAoUCAKCCnqpUqlqnhAV9y322HJ6O0VRt9gCfQzGj
+hjpi70szvr0PnW83ux8MiNw=
+=/Gk+
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-10.2.0.ebuild b/dev-lang/erlang/erlang-10.2.0.ebuild
index 1a8338ebf9c6..6b9ecbbea484 100644
--- a/dev-lang/erlang/erlang-10.2.0.ebuild
+++ b/dev-lang/erlang/erlang-10.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.1 2004/10/08 00:03:02 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
-inherit eutils gcc flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic elisp-common
 
 #erlang uses a really weird versioning scheme which caused quite a few problems already
 #Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420)
@@ -17,27 +17,40 @@ SRC_URI="http://www.erlang.org/download/${MY_P}-0.tar.gz"
 LICENSE="EPL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="X ssl"
+IUSE="X ssl emacs"
 
 DEPEND=">=dev-lang/perl-5.6.1
 	X? ( virtual/x11 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )"
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )"
 
 S=${WORKDIR}/${MY_P}_${MyDate}
 
+SITEFILE=50erlang-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-10.2.6-export-TARGET.patch
+}
+
 src_compile() {
 	[ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse
 	[ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse
 	addpredict /dev/pty # Bug #25366
 
-	#erlang configure seems to "misdetect" CHOST on amd64
-	[ "${ARCH}" = "amd64" ] && CHOST="x86_64-unknown-linux-gnu"
 	econf --enable-threads || die
 	make || die
+
+	if use emacs; then
+		pushd ${D}/lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
 }
 
 src_install() {
-	ERL_LIBDIR="/usr/lib/erlang"
+	ERL_LIBDIR="/usr/$(get_libdir)/erlang"
 
 	make INSTALL_PREFIX=${D} install || die
 	dodoc AUTHORS EPLICENCE README
@@ -57,4 +70,19 @@ src_install() {
 
 	## Clean up the no longer needed files
 	rm ${D}/${ERL_LIBDIR}/Install
+
+	if use emacs; then
+		pushd ${S}
+		elisp-install erlang lib/tools/emacs/*.el
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		popd
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/dev-lang/erlang/erlang-10.2.5.ebuild b/dev-lang/erlang/erlang-10.2.5.ebuild
index 62448593d927..aa40bfa781ec 100644
--- a/dev-lang/erlang/erlang-10.2.5.ebuild
+++ b/dev-lang/erlang/erlang-10.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/dev-lang/erlang/erlang-10.2.5.ebuild,v 1.1 2005/08/24 00:48:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.5.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 inherit eutils multilib flag-o-matic elisp-common
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="doc emacs java odbc ssl X"
 
 RDEPEND=">=dev-lang/perl-5.6.1
diff --git a/dev-lang/erlang/erlang-10.2.6.ebuild b/dev-lang/erlang/erlang-10.2.6.ebuild
index 80f22d31dc0d..ff779fcef64a 100644
--- a/dev-lang/erlang/erlang-10.2.6.ebuild
+++ b/dev-lang/erlang/erlang-10.2.6.ebuild
@@ -1,26 +1,33 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.1 2005/07/02 22:01:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.6.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
-inherit eutils toolchain-funcs flag-o-matic elisp-common
+inherit eutils multilib flag-o-matic elisp-common
 
 #erlang uses a really weird versioning scheme which caused quite a few problems already
 #Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420)
 #the next line selects the right source.
-MY_P=otp_src_R10B-6
+MY_PV=R10B-6
+MY_P=otp_src_${MY_PV}
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
 HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
+SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
+		http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="X ssl emacs"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE="doc emacs java odbc ssl X"
 
-DEPEND=">=dev-lang/perl-5.6.1
+RDEPEND=">=dev-lang/perl-5.6.1
 	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )
-	emacs? ( virtual/emacs )"
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2 )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	dev-lang/tk"
 
 S=${WORKDIR}/${MY_P}
 
@@ -30,26 +37,27 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-export-TARGET.patch
+	epatch "${FILESDIR}"/${PV}-manpage-emacs-gentoo.patch
+	use odbc || sed -i 's: odbc : :' lib/Makefile
 }
 
 src_compile() {
-	[ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse
-	[ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse
-	addpredict /dev/pty # Bug #25366
-
-	# erlang configure botches the CHOST test
-	econf --enable-threads || die
+	use java || export JAVAC=false
+	econf \
+		--enable-threads \
+		$(use_with ssl) \
+		|| die
 	make || die
 
 	if use emacs ; then
-		pushd "${D}"/lib/tools/emacs
+		pushd lib/tools/emacs
 		elisp-compile *.el
 		popd
 	fi
 }
 
 src_install() {
-	ERL_LIBDIR="/usr/$(get_libdir)/erlang"
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
 
 	make INSTALL_PREFIX="${D}" install || die
 	dodoc AUTHORS EPLICENCE README
@@ -68,12 +76,25 @@ src_install() {
 	grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-* | xargs sed -i -e "s:${D}::g"
 
 	## Clean up the no longer needed files
-	rm ${D}/${ERL_LIBDIR}/Install
+	rm "${D}"/${ERL_LIBDIR}/Install
+
+	if use doc ; then
+		for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+			# Avoid namespace collisions
+			local newfile=${file}erl
+			cp $file $newfile
+			# Man page processing tools expect a capitalized "SEE ALSO" section
+			# header
+			sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' $newfile
+			doman ${newfile}
+		done
+		dohtml -A README,erl,hrl,c,h,kwc,info -r "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
+	fi
 
 	if use emacs ; then
 		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.el
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 		popd
 	fi
 }
diff --git a/dev-lang/erlang/erlang-10.2.7.ebuild b/dev-lang/erlang/erlang-10.2.7.ebuild
index e043725cee1f..e37156bb0799 100644
--- a/dev-lang/erlang/erlang-10.2.7.ebuild
+++ b/dev-lang/erlang/erlang-10.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.7.ebuild,v 1.1 2005/10/29 20:25:08 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.7.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 inherit eutils multilib flag-o-matic elisp-common
 
diff --git a/dev-lang/erlang/erlang-8b.ebuild b/dev-lang/erlang/erlang-8b.ebuild
index 840e69029d3a..3af68f8a6981 100644
--- a/dev-lang/erlang/erlang-8b.ebuild
+++ b/dev-lang/erlang/erlang-8b.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.1 2002/11/02 05:40:54 george Exp $
-
-IUSE="X ssl"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
+MY_P=otp_src_R8B-2
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
 HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_R8B-2.tar.gz"
-S="${WORKDIR}/otp_src_R8B-2"
+SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+KEYWORDS="x86 ppc sparc"
+IUSE="X ssl"
 
-RDEPEND=">=sys-devel/perl-5.6.1
-	X?	( >=x11-base/xfree-4.2.0-r12 )
-	ssl?	( >=dev-libs/openssl-0.9.6d )"
+DEPEND=">=dev-lang/perl-5.6.1
+	X? ( virtual/x11 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )"
+
+S=${WORKDIR}/${MY_P}
+
+addpredict /dev/pty # Bug #25366
 
 src_compile() {
 	econf --enable-threads || die "./configure failed"
@@ -24,30 +27,18 @@ src_compile() {
 
 src_install() {
 	ERL_LIBDIR="/usr/lib/erlang"
-	
+
 	make INSTALL_PREFIX=${D} install || die
-		
+	dodoc AUTHORS EPLICENCE README
+
 	dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl
 	dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc
 	dosym ${ERL_LIBDIR}/erts-5.1.2/bin/epmd ${ERL_LIBDIR}/bin/
-	
+
 	## Remove ${D} from the /usr/lib/erlang/bin/erl and start script
-	
-	cd ${D}/${ERL_LIBDIR}/bin
-	sed -e "s;${D};;" erl > erl.tmp
-	mv ./erl.tmp ./erl
-	sed -e "s;${D};;" start > start.tmp
-	mv ./start.tmp ./start
-	
-	chmod 755 ./erl ./start
-	
-	
+	dosed ${ERL_LIBDIR}/bin/erl
+	dosed ${ERL_LIBDIR}/bin/start
+
 	## Clean up the no longer needed
-	
 	rm ${D}/${ERL_LIBDIR}/Install
-	
-	cd ${S}
-	dodoc AUTHORS EPLICENCE README
 }
-
-	      
diff --git a/dev-lang/erlang/erlang-9c-r1.ebuild b/dev-lang/erlang/erlang-9c-r1.ebuild
index 8c9b1e9caae9..42fabfefbb7d 100644
--- a/dev-lang/erlang/erlang-9c-r1.ebuild
+++ b/dev-lang/erlang/erlang-9c-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/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.1 2003/07/02 02:53:52 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
+
+inherit eutils
 
 MY_P=otp_src_R9B-1
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
@@ -9,22 +11,24 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="X ssl"
 
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	#a conviniece fix, ||die is not necessary
-	gzcat ${FILESDIR}/${P}-nsswitch-2.patch.gz | patch -p0 lib/kernel/src/inet_config.erl
-}
-
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( >=x11-base/xfree-4.2.0-r12 )
+	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}
 
+addpredict /dev/pty # Bug #25366
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	#combines nsswitch.conf parsing and a fix for strange install behaviour on some systems
+	epatch ${FILESDIR}/${P}.patch.gz
+}
+
 src_compile() {
 	econf --enable-threads || die "./configure failed"
 	make || die
diff --git a/dev-lang/erlang/erlang-9c-r2.ebuild b/dev-lang/erlang/erlang-9c-r2.ebuild
index 004193ddc20a..ee03a9636065 100644
--- a/dev-lang/erlang/erlang-9c-r2.ebuild
+++ b/dev-lang/erlang/erlang-9c-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r2.ebuild,v 1.1 2004/02/21 12:37:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
-inherit eutils gcc flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=otp_src_R9C-0
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
@@ -11,11 +11,11 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X? ( >=x11-base/xfree-4.2.0-r12 )
+	X? ( virtual/x11 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
 S=${WORKDIR}/${MY_P}
@@ -28,6 +28,7 @@ src_unpack(){
 }
 
 src_compile() {
+	[ "`gcc-fullversion`" == "3.3.2" ] && filter-mfpmath sse
 	[ "`gcc-fullversion`" == "3.3.3" ] && filter-mfpmath sse
 	addpredict /dev/pty # Bug #25366
 	econf --enable-threads || die
diff --git a/dev-lang/erlang/erlang-9c-r3.ebuild b/dev-lang/erlang/erlang-9c-r3.ebuild
index 4f532d309aca..e8654b0bc1c7 100644
--- a/dev-lang/erlang/erlang-9c-r3.ebuild
+++ b/dev-lang/erlang/erlang-9c-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r3.ebuild,v 1.1 2004/08/03 01:25:59 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r3.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
-inherit eutils gcc flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=otp_src_R9C-0
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
diff --git a/dev-lang/erlang/erlang-9c.ebuild b/dev-lang/erlang/erlang-9c.ebuild
index e1167c9fd0d0..a37634f31941 100644
--- a/dev-lang/erlang/erlang-9c.ebuild
+++ b/dev-lang/erlang/erlang-9c.ebuild
@@ -1,22 +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/dev-lang/erlang/erlang-9c.ebuild,v 1.1 2003/05/10 18:59:14 george Exp $
-
-IUSE="X ssl"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
+MY_P=otp_src_R9B-1
 DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
 HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_R9B-1.tar.gz"
-S="${WORKDIR}/otp_src_R9B-1"
+SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz"
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~sparc"
+IUSE="X ssl"
 
 DEPEND=">=dev-lang/perl-5.6.1
-	X?	( >=x11-base/xfree-4.2.0-r12 )
-	ssl?	( >=dev-libs/openssl-0.9.6d )"
+	X? ( virtual/x11 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )"
 
+S=${WORKDIR}/${MY_P}
+
+addpredict /dev/pty # Bug #25366
 
 src_compile() {
 	econf --enable-threads || die "./configure failed"
@@ -27,6 +29,7 @@ src_install() {
 	ERL_LIBDIR="/usr/lib/erlang"
 
 	make INSTALL_PREFIX=${D} install || die
+	dodoc AUTHORS EPLICENCE README
 
 	dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl
 	dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc
@@ -36,30 +39,16 @@ src_install() {
 	dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript
 
 	## Remove ${D} from the following files
-
-	cd ${D}/${ERL_LIBDIR}/bin
-	sed -e "s;${D};;" erl > erl.tmp
-	mv ./erl.tmp ./erl
-	sed -e "s;${D};;" start > start.tmp
-	mv ./start.tmp ./start
-	sed -e "s;${D};;" ecc > ecc.tmp
-	mv ./ecc.tmp ./ecc
-	sed -e "s;${D};;" ear > ear.tmp
-	mv ./ear.tmp ./ear
-	sed -e "s;${D};;" elink > elink.tmp
-	mv ./elink.tmp ./elink
-	sed -e "s;${D};;" escript > escript.tmp
-	mv ./escript.tmp ./escript
-	sed -e "s;${D};;" esh > esh.tmp
-	mv ./esh.tmp ./esh
-
-	chmod 755 ./erl ./start ./ecc ./ear ./elink ./escript ./esh
-
+	dosed ${ERL_LIBDIR}/bin/erl
+	dosed ${ERL_LIBDIR}/bin/start
+	dosed ${ERL_LIBDIR}/bin/ecc
+	dosed ${ERL_LIBDIR}/bin/ear
+	dosed ${ERL_LIBDIR}/bin/elink
+	dosed ${ERL_LIBDIR}/bin/escript
+	dosed ${ERL_LIBDIR}/bin/esh
+	dosed ${ERL_LIBDIR}/erts-*/bin/erl
+	dosed ${ERL_LIBDIR}/erts-*/bin/start
 
 	## Clean up the no longer needed files
-
 	rm ${D}/${ERL_LIBDIR}/Install
-
-	cd ${S}
-	dodoc AUTHORS EPLICENCE README
 }
diff --git a/dev-lang/erlang/files/50erlang-gentoo.el b/dev-lang/erlang/files/50erlang-gentoo.el
index 439d3b33a94e..468726a6d158 100644
--- a/dev-lang/erlang/files/50erlang-gentoo.el
+++ b/dev-lang/erlang/files/50erlang-gentoo.el
@@ -2,3 +2,4 @@
 
 (add-to-list 'load-path "@SITELISP@")
 (load-library "erlang-start")
+(setq erlang-root-dir "/usr/share")
diff --git a/dev-lang/erlang/files/digest-erlang-10.2.6 b/dev-lang/erlang/files/digest-erlang-10.2.6
index 0a5b9ef538e7..4a1cf692b626 100644
--- a/dev-lang/erlang/files/digest-erlang-10.2.6
+++ b/dev-lang/erlang/files/digest-erlang-10.2.6
@@ -1 +1,3 @@
 MD5 6463f70b40e2a6c3587e54653add8414 otp_src_R10B-6.tar.gz 10037987
+MD5 0243d2ff01fb2bac03115bcbe2284b20 otp_doc_man_R10B-6.tar.gz 601812
+MD5 9f50340fd1c25af5d5a6fcf9f14b2e49 otp_doc_html_R10B-6.tar.gz 4602685
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 8b3b1a4834d8..989022db6e2d 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -1,13 +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>george@gentoo.org</email>
-</maintainer>
-<maintainer>
-  <email>vapier@gentoo.org</email>
-</maintainer>
+<herd>lang-misc</herd>
+<herd>emacs</herd>
 <longdescription>
 Erlang is a programming language designed at the Ericsson 
 Computer Science Laboratory. Open-source Erlang is being 
diff --git a/dev-lang/ezm3/ChangeLog b/dev-lang/ezm3/ChangeLog
index 6e7eb28dc515..fd767fd8a9e6 100644
--- a/dev-lang/ezm3/ChangeLog
+++ b/dev-lang/ezm3/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-lang/ezm3
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ezm3/ChangeLog,v 1.1 2004/07/11 15:50:22 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ezm3/ChangeLog,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 
 *ezm3-1.2 (11 Jul 2004)
 
diff --git a/dev-lang/ezm3/Manifest b/dev-lang/ezm3/Manifest
index 782b7100ac88..28f0259c48ab 100644
--- a/dev-lang/ezm3/Manifest
+++ b/dev-lang/ezm3/Manifest
@@ -1,3 +1,14 @@
-MD5 c276f3932107957cefa2ec3703e7b9fd ezm3-1.2.ebuild 2176
-MD5 7b781d9962b858ab2add0c5a1cf7f9af files/digest-ezm3-1.1 145
-MD5 5cb3092c2d71d381f7f9adb6b14f29bf files/digest-ezm3-1.2 217
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76be14d520fa8faafe6f02e09f20323e metadata.xml 295
+MD5 f7afc354378931d4ee94353c315bd702 ChangeLog 321
+MD5 b97be2b1794d9f24457183dada276c1d ezm3-1.2.ebuild 2214
+MD5 f203f577cc77069c4649a5acb239ab59 files/digest-ezm3-1.2 294
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC74OgIKl8Uu19MoRAl0JAJ99T7uUmo+1YQp1YfcuoDaWMry5mQCcD3O5
+hDRZouhElKYvleYSRbB90OE=
+=D6BX
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ezm3/ezm3-1.2.ebuild b/dev-lang/ezm3/ezm3-1.2.ebuild
index 29cb693e3024..4b16a8616026 100644
--- a/dev-lang/ezm3/ezm3-1.2.ebuild
+++ b/dev-lang/ezm3/ezm3-1.2.ebuild
@@ -1,24 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ezm3/ezm3-1.2.ebuild,v 1.1 2004/07/11 15:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ezm3/ezm3-1.2.ebuild,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 
 inherit eutils
 
-MY_P="${P/-/-snap-}"
-EZM3="ezm3-1.1"
-EZM3_TARGET="LINUXLIBC6"
-
 DESCRIPTION="stripped down m3 compiler for building cvsup"
 HOMEPAGE="http://www.polstra.com/projects/freeware/ezm3/"
 SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/${P}-src.tar.bz2
 	x86? ( ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/${P}-LINUXLIBC6-boot.tar.bz2 )
+	ppc? ( mirror://gentoo/${P}-PPC_LINUX-boot.tar.bz2 )
 	mirror://gentoo/${P}-PPC_LINUX.patch.bz2"
-#	ppc? ( mirror://gentoo/${P}-PPC_LINUX-boot.tar.bz2 )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* x86 ppc"
-IUSE="X opengl static"
+IUSE="X opengl"
 
 DEPEND="virtual/libc
 	dev-util/yacc
@@ -31,6 +27,13 @@ seduse() {
 	useq !${1} && echo "${2}" || echo ":"
 }
 
+ezm3target() {
+	case ${ARCH} in
+		x86)	echo LINUXLIBC6;;
+		ppc)	echo PPC_LINUX;;
+	esac
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -43,9 +46,9 @@ src_compile() {
 	# (to not violate sandbox)
 	sed -i \
 		-e "s:/usr/local:/usr:" \
-		m3config/src/${EZM3_TARGET} \
-		|| die "sed ${EZM3_TARGET} failed"
-	echo "M3CC_MAKE = [\"make\", \"BISON=yacc\"]" >> m3config/src/${EZM3_TARGET}
+		m3config/src/$(ezm3target) \
+		|| die "sed $(ezm3target) failed"
+	echo "M3CC_MAKE = [\"make\", \"BISON=yacc\"]" >> m3config/src/$(ezm3target)
 
 	# now we disable X and OpenGL if the user doesnt have them in their USE var
 	sed -i \
@@ -66,7 +69,7 @@ src_compile() {
 }
 
 src_install() {
-	cd binaries/${EZM3_TARGET}
-	cp -a usr ${D}/ || die
+	cd binaries/$(ezm3target)
+	cp -pPR usr ${D}/ || die
 	rm -rf ${D}/usr/man
 }
diff --git a/dev-lang/ezm3/files/digest-ezm3-1.2 b/dev-lang/ezm3/files/digest-ezm3-1.2
index ad814d539d68..b225cead8882 100644
--- a/dev-lang/ezm3/files/digest-ezm3-1.2
+++ b/dev-lang/ezm3/files/digest-ezm3-1.2
@@ -1,3 +1,4 @@
 MD5 41ac38cc9a57d7498b2ce7705792e2d8 ezm3-1.2-src.tar.bz2 10727649
 MD5 1cecf4fea71a00a78387d148745193cb ezm3-1.2-LINUXLIBC6-boot.tar.bz2 1445569
+MD5 26d5827409c749d42323a1f0c51e0018 ezm3-1.2-PPC_LINUX-boot.tar.bz2 1474750
 MD5 9361fd7c2ceb289cdb556f3875627bc2 ezm3-1.2-PPC_LINUX.patch.bz2 10024
diff --git a/dev-lang/f2c/ChangeLog b/dev-lang/f2c/ChangeLog
index 42ca823c4c91..e8ea1b646e9b 100644
--- a/dev-lang/f2c/ChangeLog
+++ b/dev-lang/f2c/ChangeLog
@@ -1,8 +1,45 @@
 # ChangeLog for dev-lang/f2c
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/f2c/ChangeLog,v 1.1 2003/04/12 19:33:15 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/f2c/ChangeLog,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
-*f2c-20030320.ebuild (12 Apr 2003)
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> f2c-20030320-r1.ebuild:
+  Mark 20030320-r1 stable on alpha
+
+  17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> f2c-20030320-r1.ebuild:
+  ~alpha keyword.
+
+  29 Jan 2005; Yuta SATOH <nigoro@gentoo.org> f2c-20030320-r1.ebuild:
+  Stable on ppc64
+
+  27 Jan 2005; Ferris McCormick <fmccor@gentoo.org> f2c-20030320-r1.ebuild:
+  Stable for sparc (Security Bugs 79725, 77570).
+
+*f2c-20030320-r1 (27 Jan 2005)
+
+  27 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
+  +files/f2c-20030320-CAN-2005-0017.patch, +f2c-20030320-r1.ebuild:
+  Fixing security BUG #77570 (CAN-2005-0017). Stable on amd64, ppc and x86.
+
+  10 Jan 2005; Markus Rothe <corsair@gentoo.org> f2c-20030320.ebuild:
+  Stable on ppc64
+
+  09 Sep 2004; Philippe Trottier <tchiwam@gentoo.org> f2c-20030320.ebuild:
+  Marked ~ppc64
+
+  06 Aug 2004; Ferris McCormick <fmccor@gentoo.org> f2c-20030320.ebuild:
+  Stable for sparc (part of bug 55386).
+
+  06 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> f2c-20030320.ebuild:
+  Marked stable on amd64 and ppc.
+
+  01 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> +metadata.xml,
+  f2c-20030320.ebuild:
+  Marked ~sparc on behalf of ciaranm.
+
+  01 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> f2c-20030320.ebuild:
+  Marked ~ppc
+
+*f2c-20030320 (12 Apr 2003)
 
   12 Apr 2003; George Shapovalov <george@gentoo.org> f2c-20030320.ebuild, files/digest-f2c-20030320 :
   initial release (#17451)
diff --git a/dev-lang/f2c/Manifest b/dev-lang/f2c/Manifest
index e69de29bb2d1..6fa2ed810724 100644
--- a/dev-lang/f2c/Manifest
+++ b/dev-lang/f2c/Manifest
@@ -0,0 +1,7 @@
+MD5 0be2692c334a5b3f66cff66ba19092fb f2c-20030320.ebuild 629
+MD5 c552a7b1e8c4008a9d2b99d52ab40306 metadata.xml 697
+MD5 b57b3e538fc7c0e9a934be1a29e02882 ChangeLog 1710
+MD5 58b7e8dffb7e86da0e9a2ecd336ef2f8 f2c-20030320-r1.ebuild 739
+MD5 1e6410fad56afd14c53e1efeb94fe240 files/digest-f2c-20030320 64
+MD5 9b85cfecd938c408c4c07f437308ba43 files/f2c-20030320-CAN-2005-0017.patch 1933
+MD5 1e6410fad56afd14c53e1efeb94fe240 files/digest-f2c-20030320-r1 64
diff --git a/dev-lang/f2c/f2c-20030320-r1.ebuild b/dev-lang/f2c/f2c-20030320-r1.ebuild
index 60c8709eaf0a..53b1634caf68 100644
--- a/dev-lang/f2c/f2c-20030320-r1.ebuild
+++ b/dev-lang/f2c/f2c-20030320-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/f2c/f2c-20030320-r1.ebuild,v 1.1 2005/01/27 16:23:26 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/f2c/f2c-20030320-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="libf2c"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc ~ppc64 ~sparc"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 IUSE=""
 DEPEND="dev-libs/libf2c"
diff --git a/dev-lang/f2c/f2c-20030320.ebuild b/dev-lang/f2c/f2c-20030320.ebuild
index 4db9b7db8ef5..b1fcfdf8b889 100644
--- a/dev-lang/f2c/f2c-20030320.ebuild
+++ b/dev-lang/f2c/f2c-20030320.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/f2c/f2c-20030320.ebuild,v 1.1 2003/04/12 19:33:15 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/f2c/f2c-20030320.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
 DESCRIPTION="Fortran to C converter"
 HOMEPAGE="http://www.netlib.org/f2c"
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="libf2c"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ppc ppc64 sparc"
 
 IUSE=""
 DEPEND="dev-libs/libf2c"
diff --git a/dev-lang/f2c/metadata.xml b/dev-lang/f2c/metadata.xml
index e99de68107cb..82a7f49d5365 100644
--- a/dev-lang/f2c/metadata.xml
+++ b/dev-lang/f2c/metadata.xml
@@ -5,4 +5,14 @@
 	<maintainer>
 		<email>kugelfang@gentoo.org</email>
 	</maintainer>
+	<longdescription lang="en">
+		F2C compiles FORTRAN 77 sources by converting to C/C++ sources and
+		compiling the later with gcc. The resulting binaries depend on the
+		libf2c runtime library.
+	</longdescription>
+	<longdescription lang="de">
+		F2C kompiliert FORTRAN 77 Quellcode durch Konvertierung in C/C++
+		Quellcode und deren anschließendes Kompilieren mit Hilfe von gcc. Die
+		produzierten Binärdateien benötigen die Laufzeitbibliothek libf2c.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-lang/ferite/ChangeLog b/dev-lang/ferite/ChangeLog
index 13e80bd030e3..21e7c24bc957 100644
--- a/dev-lang/ferite/ChangeLog
+++ b/dev-lang/ferite/ChangeLog
@@ -1,10 +1,46 @@
 # ChangeLog for dev-lang/ferite
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ChangeLog,v 1.1.1.1 2005/11/30 09:58:11 chriswhite Exp $
 
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ferite-0.99.6.ebuild:
+  Stable on ppc.
+
+  22 Apr 2005; Simon Stelling <blubb@gentoo.org> ferite-0.99.6.ebuild:
+  stable on amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ferite-0.99.4.ebuild,
+  ferite-0.99.5.ebuild, ferite-0.99.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  05 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> ferite-0.99.6.ebuild:
+  stable on sparc
+
+*ferite-0.99.6 (09 Jan 2003)
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> ferrite-0.99.6.ebuild
+  files/digest-ferite-0.99.6 ChangeLog :
+  Version bumped. Submitted by alex@linuxhacker.org in #13571.
+
+*ferite-0.99.5 (17 Aug 2002)
+
+  24 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added econf in place of configure.  Fix for #14463.
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> ferrite-0.99.5.ebuild :
+  Changed SRC_URI to mirror://sf
+
+  17 Nov 2002; Jon Nall <nall@gentoo.org> ferrite-0.99.5.ebuild :
+  added ~ppc to KEYWORDS
+
+  17 Aug 2002; G.Shapovalov <george@gentoo.org> ChangeLog :
+  new version
+  also modified ebuild to fix sandbox violation
 
 *ferite-0.99.4 (1 May 2002)
 
-  1 May 2002; G.Saraber <gsaraber@rarcoa.com> ChangeLog :
+  24 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added econf in place of configure.  Fix for #14463.
 
+  1 May 2002; G.Saraber <gsaraber@rarcoa.com> ChangeLog :
   modified the glib ebuild into ferite :)
   original by Achim Gottinger <achim@gentoo.org>
diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest
index e69de29bb2d1..b43648a3b984 100644
--- a/dev-lang/ferite/Manifest
+++ b/dev-lang/ferite/Manifest
@@ -0,0 +1,7 @@
+MD5 f98dd3d6de3e9ab2f7bd22bfae9a027d ferite-0.99.5.ebuild 655
+MD5 b2f4aa46eb26620641f7abc4298d7ecf ChangeLog 1593
+MD5 e3331019ac8e658cb010f6e257479c06 ferite-0.99.6.ebuild 647
+MD5 64d40bddce41555508fa99a9a15c9e46 ferite-0.99.4.ebuild 633
+MD5 89ddb8d251023fd2527d27023094cf20 files/digest-ferite-0.99.5 65
+MD5 49ba474e748ba23fdfc3c1f4f4fa1055 files/digest-ferite-0.99.4 65
+MD5 1793a7095e25b69c800aabac6049e033 files/digest-ferite-0.99.6 66
diff --git a/dev-lang/ferite/ferite-0.99.4.ebuild b/dev-lang/ferite/ferite-0.99.4.ebuild
index a6e27676e623..ba60172a1f9d 100644
--- a/dev-lang/ferite/ferite-0.99.4.ebuild
+++ b/dev-lang/ferite/ferite-0.99.4.ebuild
@@ -1,36 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Gerard Saraber <gsaraber@rarcoa.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.4.ebuild,v 1.1 2002/05/20 22:37:59 blauwers Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.4.ebuild,v 1.1.1.1 2005/11/30 09:58:11 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-
-DESCRIPTION="ferite is a scripting engine and language written in c for complete portability."
-
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/ferite/${P}.tar.gz"
+DESCRIPTION="scripting engine and language written in c for complete portability"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.ferite.org/"
 
-DEPEND="virtual/glibc
-		dev-libs/libpcre
-		dev-libs/libxml2"
+DEPEND="virtual/libc
+	dev-libs/libpcre
+	dev-libs/libxml2"
+
 SLOT="1"
+LICENSE="as-is"
+KEYWORDS="x86 sparc"
+IUSE=""
 
 src_compile() {
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man || die
-
+	econf || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
-	     install || die
-    
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-
+	einstall || die
+	dodoc AUTHORS ChangeLog README*
 	dohtml -r docs
 }
diff --git a/dev-lang/ferite/ferite-0.99.5.ebuild b/dev-lang/ferite/ferite-0.99.5.ebuild
index 0fb44b54fa43..49c2d8eb59cd 100644
--- a/dev-lang/ferite/ferite-0.99.5.ebuild
+++ b/dev-lang/ferite/ferite-0.99.5.ebuild
@@ -1,41 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.5.ebuild,v 1.1 2002/08/17 16:51:16 george Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.5.ebuild,v 1.1.1.1 2005/11/30 09:58:11 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-
-DESCRIPTION="ferite is a scripting engine and language written in c for complete portability."
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/ferite/${P}.tar.gz"
+DESCRIPTION="scripting engine and language written in c for complete portability"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.ferite.org/"
 
-DEPEND="virtual/glibc
-		dev-libs/libpcre
-		dev-libs/libxml2"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc
+	dev-libs/libpcre
+	dev-libs/libxml2"
 
 SLOT="1"
 LICENSE="as-is"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 ~ppc sparc"
+IUSE=""
 
 src_compile() {
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man || die
-
+	econf || die
 	emake || die
 }
 
 src_install() {
-	#make prefix=${D}/usr \
-	#	 infodir=${D}/usr/share/info \
-	#	 mandir=${D}/usr/share/man \
-	#	 libdir=${D}/usr/lib \
-	#	 install || die
-	
 	make DESTDIR=${D} install || die
-	
-	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-
+	dodoc AUTHORS ChangeLog README*
 	dohtml -r docs
 }
diff --git a/dev-lang/ferite/ferite-0.99.6.ebuild b/dev-lang/ferite/ferite-0.99.6.ebuild
index 5a90ed0a77f4..80afaacde773 100644
--- a/dev-lang/ferite/ferite-0.99.6.ebuild
+++ b/dev-lang/ferite/ferite-0.99.6.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/dev-lang/ferite/ferite-0.99.6.ebuild,v 1.1 2003/02/09 22:43:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-0.99.6.ebuild,v 1.1.1.1 2005/11/30 09:58:11 chriswhite Exp $
 
 DESCRIPTION="A clean, lightweight, object oriented scripting language"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.ferite.org/"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-libs/libpcre
 	dev-libs/libxml2"
 
 SLOT="1"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ppc amd64"
+IUSE=""
 
 src_compile() {
 	econf || die
diff --git a/dev-lang/fpc-bin/ChangeLog b/dev-lang/fpc-bin/ChangeLog
index bad8017b191b..bbd352d21bbb 100644
--- a/dev-lang/fpc-bin/ChangeLog
+++ b/dev-lang/fpc-bin/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for dev-lang/fpc
+# ChangeLog for dev-lang/fpc-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-bin/ChangeLog,v 1.1 2005/01/20 22:18:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
+
+  11 Apr 2005; Seemant Kulleen <seemant@gentoo.org> metadata.xml:
+  assign lang-misc in the metadata, no personal maintainer any more
 
 *fpc-bin-1.0.10 (21 Jan 2005)
 
diff --git a/dev-lang/fpc-bin/Manifest b/dev-lang/fpc-bin/Manifest
index e784df941503..477ad8628127 100644
--- a/dev-lang/fpc-bin/Manifest
+++ b/dev-lang/fpc-bin/Manifest
@@ -1,6 +1,6 @@
-MD5 88a95c13b5e36e9aa2759346284960b3 ChangeLog 1336
-MD5 421607ea0a7cc894e3da1cf891e1996a fpc-bin-1.9.4.ebuild 865
-MD5 f5f1522837a3398846f77d381fda47ec metadata.xml 226
-MD5 4dd2f5c7859ce38bcb7509aafaf6cd9b fpc-bin-1.0.10.ebuild 866
+MD5 6f075e110a953c2984782b2bfbd46c1e ChangeLog 1670
+MD5 cee52716bdae39a3e22a474a24b41f44 fpc-bin-1.0.10.ebuild 867
+MD5 b455eb842300873952d0f2186c492547 fpc-bin-1.9.4.ebuild 866
+MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
 MD5 332b84767ddcc966fd2bf724ba8c5961 files/digest-fpc-bin-1.0.10 61
 MD5 31bc5d0091da58e3ea79cb36fdfa5c32 files/digest-fpc-bin-1.9.4 60
diff --git a/dev-lang/fpc-bin/fpc-bin-1.0.10.ebuild b/dev-lang/fpc-bin/fpc-bin-1.0.10.ebuild
index 01c74e799e8d..80e278f64848 100644
--- a/dev-lang/fpc-bin/fpc-bin-1.0.10.ebuild
+++ b/dev-lang/fpc-bin/fpc-bin-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/dev-lang/fpc-bin/fpc-bin-1.0.10.ebuild,v 1.1 2005/01/20 22:18:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-bin/fpc-bin-1.0.10.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
 
 MY_P="${P/-bin/}"
 
diff --git a/dev-lang/fpc-bin/fpc-bin-1.9.4.ebuild b/dev-lang/fpc-bin/fpc-bin-1.9.4.ebuild
index 6d6f0a682f87..e0dfec524a36 100644
--- a/dev-lang/fpc-bin/fpc-bin-1.9.4.ebuild
+++ b/dev-lang/fpc-bin/fpc-bin-1.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/dev-lang/fpc-bin/fpc-bin-1.9.4.ebuild,v 1.1 2005/01/20 22:18:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-bin/fpc-bin-1.9.4.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
 
 MY_P="${P/-bin/}"
 
diff --git a/dev-lang/fpc-bin/metadata.xml b/dev-lang/fpc-bin/metadata.xml
index b452dec7e591..f376edc581d2 100644
--- a/dev-lang/fpc-bin/metadata.xml
+++ b/dev-lang/fpc-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>no-herd</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>lang-misc</herd>
 </pkgmetadata>
diff --git a/dev-lang/fpc-ide/ChangeLog b/dev-lang/fpc-ide/ChangeLog
index 7b1ffa46f826..4f091d57af1b 100644
--- a/dev-lang/fpc-ide/ChangeLog
+++ b/dev-lang/fpc-ide/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/fpc-ide
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/ChangeLog,v 1.1 2005/03/31 01:58:21 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/ChangeLog,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> fpc-ide-2.0.0.ebuild:
+  Marked ~amd64 wrt bug #112786.
+
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> fpc-ide-2.0.0.ebuild:
+  Keyworded ~sparc
+
+*fpc-ide-2.0.0 (06 Oct 2005)
+
+  06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> +fpc-ide-2.0.0.ebuild:
+  Revbump and keyworded ~ppc ~x86, should fix #106202
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
 
 *fpc-ide-2.0.0_rc2 (31 Mar 2005)
 
diff --git a/dev-lang/fpc-ide/Manifest b/dev-lang/fpc-ide/Manifest
index bcfa6a904410..393aa5c8ec7b 100644
--- a/dev-lang/fpc-ide/Manifest
+++ b/dev-lang/fpc-ide/Manifest
@@ -1,2 +1,16 @@
-MD5 796c83e86db5c32fbe17329acc1d3550 fpc-ide-2.0.0_rc2.ebuild 808
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3e86f210652cade8ccc5fe4a36bf14cb ChangeLog 905
+MD5 cd231688f22b41aaa230f7deb4752a05 files/digest-fpc-ide-2.0.0 70
 MD5 0a08fa163a3c573b43867be33e766913 files/digest-fpc-ide-2.0.0_rc2 70
+MD5 0e1d8a51556d26b05b6b23158872702f fpc-ide-2.0.0.ebuild 954
+MD5 3dc5d26bf2c9d541e3decd3a0f755df6 fpc-ide-2.0.0_rc2.ebuild 952
+MD5 c968f4c3107ca7cbf3d0699f1bf341e0 metadata.xml 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfFiJ2G5bA0cA/ScRArw9AJ4qEm1ExncLh7V0H6OVLL/pJkELFQCgxOoc
+d/XMPesFGvI6b1yARkRnI/E=
+=Pv8Q
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/fpc-ide/fpc-ide-2.0.0.ebuild b/dev-lang/fpc-ide/fpc-ide-2.0.0.ebuild
index 1c0dd77a5b5c..eb805779f658 100644
--- a/dev-lang/fpc-ide/fpc-ide-2.0.0.ebuild
+++ b/dev-lang/fpc-ide/fpc-ide-2.0.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/dev-lang/fpc-ide/fpc-ide-2.0.0.ebuild,v 1.1 2005/10/06 14:50:53 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 MY_P="2.0.0"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 DESCRIPTION="Free Pascal Compiler Integrated Development Environment"
 HOMEPAGE="http://www.freepascal.org/"
 IUSE=""
diff --git a/dev-lang/fpc-ide/fpc-ide-2.0.0_rc2.ebuild b/dev-lang/fpc-ide/fpc-ide-2.0.0_rc2.ebuild
index 08e8f0541cc3..2c2d41db38f3 100644
--- a/dev-lang/fpc-ide/fpc-ide-2.0.0_rc2.ebuild
+++ b/dev-lang/fpc-ide/fpc-ide-2.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.0.0_rc2.ebuild,v 1.1 2005/03/31 01:58:21 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.0.0_rc2.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 MY_P="1.9.8"
 
diff --git a/dev-lang/fpc-ide/metadata.xml b/dev-lang/fpc-ide/metadata.xml
index 66ce5b5a6508..112bf101a3cd 100644
--- a/dev-lang/fpc-ide/metadata.xml
+++ b/dev-lang/fpc-ide/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>lang-misc</herd>
-<maintainer>
-	<email>chriswhite@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 A command line ide for the Free Pascal Compiler.
 </longdescription>
diff --git a/dev-lang/fpc-source/ChangeLog b/dev-lang/fpc-source/ChangeLog
index 565cb792763a..362eed5a2c35 100644
--- a/dev-lang/fpc-source/ChangeLog
+++ b/dev-lang/fpc-source/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for dev-lang/fpc-source
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/ChangeLog,v 1.1 2004/08/21 16:40:44 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/ChangeLog,v 1.1.1.1 2005/11/30 09:58:23 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> fpc-source-2.0.0.ebuild:
+  Marked ~amd64.
+
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  fpc-source-2.0.0.ebuild:
+  Keyworded ~sparc
+
+  06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  fpc-source-2.0.0.ebuild:
+  Fix path wrt #100131
+
+  06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  fpc-source-2.0.0.ebuild:
+  Keyworded ~ppc
+
+*fpc-source-2.0.0 (25 Jun 2005)
+
+  25 Jun 2005; Aron Griffis <agriffis@gentoo.org> +fpc-source-2.0.0.ebuild:
+  Update to 2.0.0 #93233
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*fpc-source-2.0.0_rc2 (02 Apr 2005)
+
+  02 Apr 2005; Chris White <chriswhite@gentoo.org>
+  +fpc-source-2.0.0_rc2.ebuild:
+  Added fpc-source update for lazarus new ebuild. Fixeds bug #87371. Thanks to
+  expose for the ebuild.
+
+  26 Aug 2004; Chris White <chriswhite@gentoo.org>
+  fpc-source-1.9.5_pre20040820.ebuild:
+  FPC asm doesn't go too well with amd64.  -arch marking.  Used zhen's dev box to verify this.
+
+  22 Aug 2004; Chris White <chriswhite@gentoo.org>
+  fpc-source-1.9.5_pre20040820.ebuild:
+  Changed to emake -j1 since the makefile apparently doesn't like parallel makes.
+
+  22 Aug 2004; Chris White <chriswhite@gentoo.org>
+  fpc-source-1.9.5_pre20040820.ebuild:
+  Added fpc blocker.
 
 *fpc-source-1.9.5_pre20040820 (22 Aug 2004)
 
diff --git a/dev-lang/fpc-source/Manifest b/dev-lang/fpc-source/Manifest
index f1fcf6cc9b17..f386129ca136 100644
--- a/dev-lang/fpc-source/Manifest
+++ b/dev-lang/fpc-source/Manifest
@@ -1,2 +1,18 @@
-MD5 00dfb2f28271c5e4ccd18123aa44b6cd fpc-source-1.9.5_pre20040820.ebuild 1518
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95432a54454cce73eb23ce36b6038eb4 ChangeLog 1756
 MD5 3197b41dcf78a69bd6aba5c9f97a3cb7 files/digest-fpc-source-1.9.5_pre20040820 141
+MD5 cd231688f22b41aaa230f7deb4752a05 files/digest-fpc-source-2.0.0 70
+MD5 0a08fa163a3c573b43867be33e766913 files/digest-fpc-source-2.0.0_rc2 70
+MD5 cbf4c3b52cbba187c1dd222521df21f7 fpc-source-1.9.5_pre20040820.ebuild 1719
+MD5 0c2efdd784b18bf9b9bcd6af397e4650 fpc-source-2.0.0.ebuild 1361
+MD5 bab07a6688abb4e82baf0c99b60b6c15 fpc-source-2.0.0_rc2.ebuild 1847
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfFfe2G5bA0cA/ScRAjQ0AKCsGhvNI4bqrOK64kuW/VptvzwlvgCgxxQ4
+qvYzl0nrVlpxsr0xuViRt+4=
+=Z+qc
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/fpc-source/fpc-source-1.9.5_pre20040820.ebuild b/dev-lang/fpc-source/fpc-source-1.9.5_pre20040820.ebuild
index 39b5712aa105..1014d1b03393 100644
--- a/dev-lang/fpc-source/fpc-source-1.9.5_pre20040820.ebuild
+++ b/dev-lang/fpc-source/fpc-source-1.9.5_pre20040820.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/fpc-source-1.9.5_pre20040820.ebuild,v 1.1 2004/08/21 16:40:44 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/fpc-source-1.9.5_pre20040820.ebuild,v 1.1.1.1 2005/11/30 09:58:23 chriswhite Exp $
 
 inherit eutils
 
@@ -12,16 +12,17 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 		doc? ( ftp://ftp.freepascal.org/pub/fpc/docs/doc-html.zip )"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 -amd64"
 IUSE="doc"
-DEPEND=""
+DEPEND="!dev-lang/fpc"
 S=${WORKDIR}/fpc-${FPC_V}
 
 src_compile() {
 	cd ${S}
 
 	einfo "Building the fpc compiler and units"
-	emake \
+	# have to use -j1 as it doesn't seem to like -j2+
+	emake -j1 \
 	build \
 	OS_TARGET=linux \
 	PP=${S}/ppc386 \
@@ -32,7 +33,7 @@ src_compile() {
 src_install() {
 
 	einfo "Installing the fpc compiler and units"
-	emake \
+	emake -j1 \
 	install \
 	OS_TARGET=linux \
 	PP=${S}/ppc386 \
diff --git a/dev-lang/fpc-source/fpc-source-2.0.0.ebuild b/dev-lang/fpc-source/fpc-source-2.0.0.ebuild
index 8f2c1aec848a..219ba42e96a4 100644
--- a/dev-lang/fpc-source/fpc-source-2.0.0.ebuild
+++ b/dev-lang/fpc-source/fpc-source-2.0.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/dev-lang/fpc-source/fpc-source-2.0.0.ebuild,v 1.1 2005/06/25 22:52:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/fpc-source-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:58:23 chriswhite Exp $
 
-# Needed to release candidates etc.
+# Needed for release candidates etc.
 MY_PV="2.0.0"
 
 SLOT="0" # Read src_install notes!
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 DESCRIPTION="Free Pascal Compiler Sources"
 HOMEPAGE="http://www.freepascal.org/"
 IUSE=""
@@ -41,6 +41,6 @@ src_install () {
 		--exclude="*.xvpics" \
 		--exclude="*.~*" \
 		--exclude="CVS" \
-		${WORKDIR}/fpc ${D}usr/lib/fpc/src 
+		${WORKDIR}/fpc/ ${D}usr/lib/fpc/src
 	eend $? || die
 }
diff --git a/dev-lang/fpc-source/fpc-source-2.0.0_rc2.ebuild b/dev-lang/fpc-source/fpc-source-2.0.0_rc2.ebuild
index fcb96c3e770b..f1af3b21284d 100644
--- a/dev-lang/fpc-source/fpc-source-2.0.0_rc2.ebuild
+++ b/dev-lang/fpc-source/fpc-source-2.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/fpc-source-2.0.0_rc2.ebuild,v 1.1 2005/04/01 18:51:38 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-source/fpc-source-2.0.0_rc2.ebuild,v 1.1.1.1 2005/11/30 09:58:23 chriswhite Exp $
 
 MY_P="1.9.8"
 
diff --git a/dev-lang/fpc-source/metadata.xml b/dev-lang/fpc-source/metadata.xml
index b452dec7e591..20ce219711a2 100644
--- a/dev-lang/fpc-source/metadata.xml
+++ b/dev-lang/fpc-source/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/dev-lang/fpc/ChangeLog b/dev-lang/fpc/ChangeLog
index 3d12d7456aea..826261fb8342 100644
--- a/dev-lang/fpc/ChangeLog
+++ b/dev-lang/fpc/ChangeLog
@@ -1,9 +1,69 @@
 # ChangeLog for dev-lang/fpc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.1 2003/08/26 21:43:29 hanno Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
-*fpc-1.0.10 (26 Aug 2003)
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> fpc-2.0.0-r1.ebuild:
+  Added sparc support and keyworded accordingly
 
-  26 Aug 2003; Hanno Boeck <hanno@gentoo.org> fpc-1.0.10.ebuild:
-  The Free Pascal Compiler.
+  15 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  fpc-1.9.5_pre20040820.ebuild:
+  Add app-arch/unzip to DEPEND for bug 69831.
 
+  24 Jul 2005; Herbie Hopkins <herbs@gentoo.org> fpc-2.0.0-r1.ebuild:
+  Added amd64 support thanks to Matthias Jansen.
+
+*fpc-2.0.0-r1 (03 Jul 2005)
+
+  03 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +fpc-2.0.0-r1.ebuild:
+  added optional documentation
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org> fpc-2.0.0_rc2.ebuild,
+  fpc-2.0.0.ebuild:
+  Fix src_compile to call set_pp instead of set_compiler
+
+  26 Jun 2005; David Holm <dholm@gentoo.org> fpc-2.0.0.ebuild:
+  Added to ~ppc.
+
+  25 Jun 2005; Aron Griffis <agriffis@gentoo.org> fpc-2.0.0.ebuild:
+  Install the man-pages too
+
+*fpc-2.0.0 (25 Jun 2005)
+
+  25 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  fpc-1.9.5_pre20040820.ebuild, fpc-2.0.0_rc2.ebuild, +fpc-2.0.0.ebuild:
+  Update to 2.0.0 and clean up these ebuilds #93233
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  31 Mar 2005; Chris White <chriswhite@gentoo.org> fpc-2.0.0_rc2.ebuild:
+  Wasn't supposed to be stable marked when imported.
+
+*fpc-2.0.0_rc2 (31 Mar 2005)
+
+  31 Mar 2005; Chris White <chriswhite@gentoo.org> +fpc-2.0.0_rc2.ebuild:
+  Closing part 1 of 2 for Bug #87337.  Thanks to expose for the ebuild.
+
+*fpc-1.9.5_pre20040820 (21 Jan 2005)
+
+  21 Jan 2005; Chris White <chriswhite@gentoo.org> +metadata.xml,
+  +fpc-1.9.5_pre20040820.ebuild:
+  Fixing bug #71677.  Renaming fpc-source to fpc.
+
+  26 Aug 2004; Chris White <chriswhite@gentoo.org>
+  fpc-source-1.9.5_pre20040820.ebuild:
+  FPC asm doesn't go too well with amd64.  -arch marking.  Used zhen's dev box to verify this.
+
+  22 Aug 2004; Chris White <chriswhite@gentoo.org>
+  fpc-source-1.9.5_pre20040820.ebuild:
+  Changed to emake -j1 since the makefile apparently doesn't like parallel makes.
+
+  22 Aug 2004; Chris White <chriswhite@gentoo.org>
+  fpc-source-1.9.5_pre20040820.ebuild:
+  Added fpc blocker.
+
+*fpc-source-1.9.5_pre20040820 (22 Aug 2004)
+
+  22 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml,
+  +fpc-source-1.9.5_pre20040820.ebuild:
+  Initial package import.  Adding myself as maintainer.
diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index b05d41344aad..51cb0ede8349 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -1,2 +1,20 @@
-MD5 c2c8b79a4f15364d9006ec2d850e7f38 fpc-1.0.10.ebuild 545
-MD5 5c1bfc2f4cd68b7149ecfb6894315a80 files/digest-fpc-1.0.10 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e1b8dffe04f771397949e785e148f3d6 ChangeLog 2516
+MD5 765515c95e92cbeb5061c5eb1978eb68 files/digest-fpc-1.9.5_pre20040820 58
+MD5 21228ac75288afaff37b7e0e236ed8bd files/digest-fpc-2.0.0 215
+MD5 0ca342f79113c71c07c127c02f7cdd4d files/digest-fpc-2.0.0-r1 360
+MD5 35b2220a69ffb4f90c2d27e905024582 files/digest-fpc-2.0.0_rc2 126
+MD5 81dc5a334516f896c2fea40e67799cb5 fpc-1.9.5_pre20040820.ebuild 1722
+MD5 435f744baa26a90a434823d0ee528d0e fpc-2.0.0-r1.ebuild 3999
+MD5 c2c4474a4cc7fc2d545bb6ef85f28f15 fpc-2.0.0.ebuild 2899
+MD5 930a09fa6ce48effa0410e573e34a8a7 fpc-2.0.0_rc2.ebuild 2246
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDT+7QKRy60XGEcJIRAl4mAKCCK3bAh+9x0TtsRCJXJeeq+yZDUwCfQVVC
+5fT0jXxMCHcYZ4cyGqqEF90=
+=D2FV
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/fpc/files/digest-fpc-2.0.0 b/dev-lang/fpc/files/digest-fpc-2.0.0
index 413073422791..93a6707256ae 100644
--- a/dev-lang/fpc/files/digest-fpc-2.0.0
+++ b/dev-lang/fpc/files/digest-fpc-2.0.0
@@ -1,2 +1,3 @@
 MD5 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz 21040763
 MD5 5f0a5fba632a811dcfdafe0ff80476a3 fpc-2.0.0.i386-linux.tar 21360640
+MD5 7019384e09411902e530dfe55d4ff145 fpc-2.0.0.powerpc-linux.tar 22231040
diff --git a/dev-lang/fpc/files/digest-fpc-2.0.0-r1 b/dev-lang/fpc/files/digest-fpc-2.0.0-r1
index 93a6707256ae..c63dc4510d1e 100644
--- a/dev-lang/fpc/files/digest-fpc-2.0.0-r1
+++ b/dev-lang/fpc/files/digest-fpc-2.0.0-r1
@@ -1,3 +1,5 @@
-MD5 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz 21040763
 MD5 5f0a5fba632a811dcfdafe0ff80476a3 fpc-2.0.0.i386-linux.tar 21360640
 MD5 7019384e09411902e530dfe55d4ff145 fpc-2.0.0.powerpc-linux.tar 22231040
+MD5 3f9c64d0146a3631f6963fd7477776d1 fpc-2.0.0.source.tar.gz 21040763
+MD5 dd8925ce8ce93309456c3072e6e4d14d fpc-2.0.0.sparc-linux.tar 22272000
+MD5 36270de604c6b5ad3af8aaa08143e88f fpc-2.0.0.x86_64-linux.tar 18380800
diff --git a/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild b/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild
index 3a2e6a1ade6f..3563ddbccd9b 100644
--- a/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild
+++ b/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild,v 1.1 2005/01/20 22:45:19 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-1.9.5_pre20040820.ebuild,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
 inherit eutils
 
@@ -13,34 +13,32 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 -amd64"
 IUSE="doc"
-DEPEND="!dev-lang/fpc-bin"
-S=${WORKDIR}/fpc-${FPC_V}
+RDEPEND="!dev-lang/fpc-bin"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )"
+S="${WORKDIR}/fpc-${FPC_V}"
 
 src_compile() {
 	cd ${S}
 
 	einfo "Building the fpc compiler and units"
 	# have to use -j1 as it doesn't seem to like -j2+
-	emake -j1 \
-	build \
-	OS_TARGET=linux \
-	PP=${S}/ppc386 \
-	PREFIX=${D}/usr \
-	|| die "Free Pascal Compiler build process failed!"
+	emake -j1 build \
+		OS_TARGET=linux \
+		PP=${S}/ppc386 \
+		PREFIX=${D}/usr \
+		|| die "Free Pascal Compiler build process failed!"
 }
 
 src_install() {
-
 	einfo "Installing the fpc compiler and units"
-	emake -j1 \
-	install \
-	OS_TARGET=linux \
-	PP=${S}/ppc386 \
-	PREFIX=${D}/usr \
-	|| die "Free Pascal Compiler install failed!"
-
-	if use doc
-	then
+	make install \
+		OS_TARGET=linux \
+		PP=${S}/ppc386 \
+		PREFIX=${D}/usr \
+		|| die "Free Pascal Compiler install failed!"
+
+	if use doc; then
 		#install the html docs
 		einfo "Installing html docs"
 		mkdir ${D}/usr/share/doc/fpc-${FPC_V}/html
diff --git a/dev-lang/fpc/fpc-2.0.0-r1.ebuild b/dev-lang/fpc/fpc-2.0.0-r1.ebuild
index 5eeee77c957a..18c492dbf0cf 100644
--- a/dev-lang/fpc/fpc-2.0.0-r1.ebuild
+++ b/dev-lang/fpc/fpc-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/dev-lang/fpc/fpc-2.0.0-r1.ebuild,v 1.1 2005/07/03 17:42:51 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
 inherit eutils
 
@@ -9,13 +9,15 @@ STABLE="2.0.0"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 DESCRIPTION="Free Pascal Compiler"
 HOMEPAGE="http://www.freepascal.org/"
 IUSE="doc"
 SRC_URI="mirror://sourceforge/freepascal/fpc-${MY_PV}.source.tar.gz
 	 x86? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.i386-linux.tar )
-	 ppc? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.powerpc-linux.tar )"
+	 sparc? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.sparc-linux.tar )
+	 ppc? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.powerpc-linux.tar )
+	 amd64? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.x86_64-linux.tar )"
 DEPEND="!dev-lang/fpc-bin
 	doc? ( dev-tex/tex4ht )"
 RDEPEND="!dev-lang/fpc-bin"
@@ -28,10 +30,20 @@ src_unpack() {
 		tar -xf binary.i386-linux.tar || die "Unpacking binary.i386-linux.tar failed!"
 		tar -zxf base.i386-linux.tar.gz || die "Unpacking base.i386-linux.tar.gz failed!"
 		;;
+	sparc)
+		tar -xf binary.sparc-linux.tar || die "Unpacking binary.sparc-linux.tar
+		failed!"
+		tar -zxf base.sparc-linux.tar.gz || die "Unpacking
+		base.sparc-linux.tar.gz failed!"
+		;;
 	ppc)
 		tar -xf binary.powerpc-linux.tar || die "Unpacking binary.powerpc-linux.tar failed!"
 		tar -zxf base.powerpc-linux.tar.gz || die "Unpacking base.powerpc-linux.tar.gz failed!"
 		;;
+	amd64)
+		tar -xf binary.x86_64-linux.tar || die "Unpacking binary.x86_64-linux.tar failed!"
+		tar -zxf base.x86_64-linux.tar.gz || die "Unpacking base.x86_64-linux.tar.gz failed!"
+		;;
 	esac
 }
 
@@ -40,9 +52,15 @@ set_pp() {
 	x86)
 		FPCARCH=386
 		;;
+	sparc)
+		FPCARCH=sparc
+		;;
 	ppc)
 		FPCARCH=ppc
 		;;
+	amd64)
+		FPCARCH=x64
+		;;
 	esac
 
 	case $1 in
@@ -102,9 +120,15 @@ pkg_preinst() {
 	x86)
 		FPCARCH=386
 		;;
+	sparc)
+		FPCARCH=sparc
+		;;
 	ppc)
 		FPCARCH=ppc
 		;;
+	amd64)
+		FPCARCH=x64
+		;;
 	esac
 	ln -s ../lib/fpc/${MY_PV}/ppc${FPCARCH} ${IMAGE}/usr/bin/
 }
@@ -122,9 +146,15 @@ pkg_postinst() {
 	x86)
 		FPCARCH=386
 		;;
+	sparc)
+		FPCARCH=sparc
+		;;
 	ppc)
 		FPCARCH=ppc
 		;;
+	amd64)
+		FPCARCH=x64
+		;;
 	esac
 	einfo "/usr/bin/ppc${FPCARCH} now points to the new binary:"
 	einfo "			/usr/lib/${PN}/${MY_PV}/ppc${FPCARCH}"
diff --git a/dev-lang/fpc/fpc-2.0.0.ebuild b/dev-lang/fpc/fpc-2.0.0.ebuild
index 53b9a0a3a085..170afc236ee9 100644
--- a/dev-lang/fpc/fpc-2.0.0.ebuild
+++ b/dev-lang/fpc/fpc-2.0.0.ebuild
@@ -1,35 +1,52 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0.ebuild,v 1.1 2005/06/25 22:26:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
 inherit eutils
 
 MY_PV="2.0.0"
 STABLE="2.0.0"
-ARCH="386"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 DESCRIPTION="Free Pascal Compiler"
 HOMEPAGE="http://www.freepascal.org/"
 IUSE=""
 SRC_URI="mirror://sourceforge/freepascal/fpc-${MY_PV}.source.tar.gz
-	 mirror://sourceforge/freepascal/fpc-${MY_PV}.i386-linux.tar"
+	 x86? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.i386-linux.tar )
+	 ppc? ( mirror://sourceforge/freepascal/fpc-${MY_PV}.powerpc-linux.tar )"
 DEPEND="!dev-lang/fpc-bin"
 RDEPEND="!dev-lang/fpc-bin"
 S=${WORKDIR}/fpc
 
 src_unpack() {
 	unpack ${A} || die "Unpacking ${A} failed!"
-	tar -xf binary.i386-linux.tar || die "Unpacking binary.i386-linux.tar failed!"
-	tar -zxf base.i386-linux.tar.gz || die "Unpacking base.i386-linux.tar.gz failed!"
+	case ${ARCH} in
+	x86)
+		tar -xf binary.i386-linux.tar || die "Unpacking binary.i386-linux.tar failed!"
+		tar -zxf base.i386-linux.tar.gz || die "Unpacking base.i386-linux.tar.gz failed!"
+		;;
+	ppc)
+		tar -xf binary.powerpc-linux.tar || die "Unpacking binary.powerpc-linux.tar failed!"
+		tar -zxf base.powerpc-linux.tar.gz || die "Unpacking base.powerpc-linux.tar.gz failed!"
+		;;
+	esac
 }
 
 set_pp() {
+	case ${ARCH} in
+	x86)
+		FPCARCH=386
+		;;
+	ppc)
+		FPCARCH=ppc
+		;;
+	esac
+
 	case $1 in
-		bootstrap) pp=${WORKDIR}/lib/fpc/${STABLE}/ppc${ARCH} ;;
-		new) pp=${S}/compiler/ppc${ARCH} ;;
+		bootstrap) pp=${WORKDIR}/lib/fpc/${STABLE}/ppc${FPCARCH} ;;
+		new) pp=${S}/compiler/ppc${FPCARCH} ;;
 		*) die "set_pp: unknown argument: $1" ;;
 	esac
 }
@@ -43,7 +60,7 @@ src_compile() {
 		|| die "make compiler_cycle failed!"
 
 	# Using the new compiler.
-	set_compiler new
+	set_pp new
 
 	# We cannot do this at once!
 	for d in rtl packages fcl; do
@@ -61,14 +78,24 @@ src_install() {
 	local pp
 	set_pp new
 
-	make compiler_install rtl_install fcl_install packages_install utils_install \
-		PP=${pp} FPCMAKE=${S}/utils/fpcm/fpcmake INSTALL_PREFIX=${D}usr \
+	make compiler_install rtl_install fcl_install \
+		packages_install utils_install man_install \
+		PP=${pp} FPCMAKE=${S}/utils/fpcm/fpcmake \
+		INSTALL_PREFIX=${D}usr INSTALL_MANDIR=${D}usr/share/man \
 		|| die "make install failed!"
 }
 
 pkg_preinst() {
 	${IMAGE}/usr/lib/fpc/${MY_PV}/samplecfg /usr/lib/fpc/${MY_PV} ${IMAGE}/etc
-	ln -s ../lib/fpc/${MY_PV}/ppc386 ${IMAGE}/usr/bin/
+	case ${ARCH} in
+	x86)
+		FPCARCH=386
+		;;
+	ppc)
+		FPCARCH=ppc
+		;;
+	esac
+	ln -s ../lib/fpc/${MY_PV}/ppc${FPCARCH} ${IMAGE}/usr/bin/
 }
 
 pkg_postinst() {
@@ -80,6 +107,14 @@ pkg_postinst() {
 		echo
 		ebeep
 	fi
-	einfo "/usr/bin/ppc386 now points to the new binary:"
-	einfo "			/usr/lib/${PN}/${MY_PV}/ppc${ARCH}"
+	case ${ARCH} in
+	x86)
+		FPCARCH=386
+		;;
+	ppc)
+		FPCARCH=ppc
+		;;
+	esac
+	einfo "/usr/bin/ppc${FPCARCH} now points to the new binary:"
+	einfo "			/usr/lib/${PN}/${MY_PV}/ppc${FPCARCH}"
 }
diff --git a/dev-lang/fpc/fpc-2.0.0_rc2.ebuild b/dev-lang/fpc/fpc-2.0.0_rc2.ebuild
index 703749985cff..68a2ce9bdf77 100644
--- a/dev-lang/fpc/fpc-2.0.0_rc2.ebuild
+++ b/dev-lang/fpc/fpc-2.0.0_rc2.ebuild
@@ -1,98 +1,84 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0_rc2.ebuild,v 1.1 2005/03/31 01:48:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.0.0_rc2.ebuild,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
 inherit eutils
 
-MY_P="1.9.8"
+MY_PV="1.9.8"
 STABLE="1.0.10"
 ARCH="386"
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-FPC"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 DESCRIPTION="Free Pascal Compiler"
 HOMEPAGE="http://www.freepascal.org/"
 IUSE=""
-SRC_URI="ftp://ftp.freepascal.org/pub/fpc/beta/source-${MY_P}/fpc-${MY_P}.source.tar.gz
+SRC_URI="ftp://ftp.freepascal.org/pub/fpc/beta/source-${MY_PV}/fpc-${MY_PV}.source.tar.gz
 	 ftp://ftp.freepascal.org/pub/fpc/dist/Linux/i386/separate/binary.tar"
 DEPEND="!dev-lang/fpc-bin"
 RDEPEND="!dev-lang/fpc-bin"
 S=${WORKDIR}/fpc
 
-src_unpack () {
+src_unpack() {
 	unpack ${A} || die "Unpacking ${A} failed!"
 	tar -zxf baselinux.tar.gz || die "Unpacking baselinux.tar.gz failed!"
 }
 
-src_compile () {
+set_pp() {
+	case $1 in
+		bootstrap) pp=${WORKDIR}/lib/fpc/${STABLE}/ppc${ARCH} ;;
+		new) pp=${S}/compiler/ppc${ARCH} ;;
+		*) die "set_pp: unknown argument: $1" ;;
+	esac
+}
+
+src_compile() {
+	local pp d
+
 	# Using the bootstrap compiler.
-	COMPILER=${WORKDIR}/lib/fpc/${STABLE}/ppc${ARCH}
-	emake -j1 \
-		compiler_cycle \
-	PP=${COMPILER} \
+	set_pp bootstrap
+	emake -j1 compiler_cycle PP=${pp} \
 		|| die "make compiler_cycle failed!"
 
 	# Using the new compiler.
-	COMPILER=${S}/compiler/ppc${ARCH}
+	set_pp new
 
 	# We cannot do this at once!
-	clean_subdir "rtl"
-	clean_subdir "packages"
-	clean_subdir "fcl"
+	for d in rtl packages fcl; do
+		emake -j1 -C $d clean PP=${pp} || die "make -C $d clean failed!"
+	done
 
-	emake -j1 \
-		rtl \
-		packages_base_all \
-		fcl \
-		packages_extra_all \
-	PP=${COMPILER} \
-	|| die "make rtl packages_base_all fcl packages_extra_all failed!"
+	emake -j1 rtl packages_base_all fcl packages_extra_all PP=${pp} \
+		|| die "make rtl packages_base_all fcl packages_extra_all failed!"
 
-	DATA2INC=${S}/utils/data2inc
-	emake -j1 \
-	utils \
-	PP=${COMPILER} \
-	DATA2INC=${DATA2INC} \
-	|| die "make utils failed!"
+	emake -j1 utils PP=${pp} DATA2INC=${S}/utils/data2inc \
+		|| die "make utils failed!"
 }
 
-src_install () {
-	FPCMAKE=${S}/utils/fpcm/fpcmake
-	emake -j1 \
-		compiler_install \
-		rtl_install \
-		fcl_install \
-		packages_install \
-		utils_install \
-	PP=${COMPILER} \
-	FPCMAKE=${FPCMAKE} \
-	INSTALL_PREFIX=${D}usr \
-	|| die "make compiler_install rtl_install fcl_install packages_install utils_install failed!"
+src_install() {
+	local pp
+	set_pp new
+
+	make compiler_install rtl_install fcl_install packages_install utils_install \
+		PP=${pp} FPCMAKE=${S}/utils/fpcm/fpcmake INSTALL_PREFIX=${D}usr \
+		|| die "make install failed!"
 }
 
-pkg_preinst () {
-	${D}usr/lib/fpc/${MY_P}/samplecfg /usr/lib/fpc/${MY_P} ${D}etc
-	ln -s ../lib/fpc/${MY_P}/ppc386 ${D}usr/bin/
+pkg_preinst() {
+	${IMAGE}/usr/lib/fpc/${MY_PV}/samplecfg /usr/lib/fpc/${MY_PV} ${IMAGE}/etc
+	ln -s ../lib/fpc/${MY_PV}/ppc386 ${IMAGE}/usr/bin/
 }
 
-pkg_postinst () {
-	# Using ewarn - it is really important for other ebuilds.
+pkg_postinst() {
+	# Using ewarn - it is really important for other ebuilds (e.g. Lazarus)
 	if [ -e /etc/._cfg0000_fpc.cfg ]; then
-		ewarn
-		ewarn "Make sure you update /etc/fpc.cfg !"
+		echo
+		ewarn "Make sure you etc-update /etc/fpc.cfg"
 		ewarn "Otherwise FPC will not work correctly."
-		ewarn
+		echo
 		ebeep
 	fi
-	einfo "/usr/bin/ppc386 now points to the new binary."
-	echo $D
-}
-
-clean_subdir() {
-	emake -j1 \
-	-C $1 \
-	clean \
-	PP=${COMPILER} \
-	|| die "make -C $1 clean failed!"
+	einfo "/usr/bin/ppc386 now points to the new binary:"
+	einfo "			/usr/lib/${PN}/${MY_PV}/ppc${ARCH}"
 }
diff --git a/dev-lang/fpc/metadata.xml b/dev-lang/fpc/metadata.xml
index b452dec7e591..20ce219711a2 100644
--- a/dev-lang/fpc/metadata.xml
+++ b/dev-lang/fpc/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/dev-lang/fpcsrc/ChangeLog b/dev-lang/fpcsrc/ChangeLog
index 22ec796b4c33..5bcfcff3bd4f 100644
--- a/dev-lang/fpcsrc/ChangeLog
+++ b/dev-lang/fpcsrc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/fpcsrc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpcsrc/ChangeLog,v 1.1 2004/10/31 04:20:05 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpcsrc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
 
 *fpcsrc-1.9.4 (31 Oct 2004)
 
diff --git a/dev-lang/fpcsrc/Manifest b/dev-lang/fpcsrc/Manifest
index d4b9f2246d87..81226485d826 100644
--- a/dev-lang/fpcsrc/Manifest
+++ b/dev-lang/fpcsrc/Manifest
@@ -1,2 +1,14 @@
-MD5 6c98e10007ed29aca8b95c67ac9a7050 fpcsrc-1.9.4.ebuild 919
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
+MD5 bd1060ef4ef43f9494215a51950e32bb fpcsrc-1.9.4.ebuild 922
+MD5 fb9adab753b953a33ef55bec059f2bbd ChangeLog 539
 MD5 783dc1c979114969b57f724d3fd92d18 files/digest-fpcsrc-1.9.4 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZN4QjUHll2nfF60RAqLbAJsFrE0zvFqLPLXcOkscHZbA/wAYNQCgve6a
+HNRTKd5pnzhDBKNQt6WEF1Q=
+=sSsM
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/fpcsrc/fpcsrc-1.9.4.ebuild b/dev-lang/fpcsrc/fpcsrc-1.9.4.ebuild
index 64eab1619260..577e728bde6b 100644
--- a/dev-lang/fpcsrc/fpcsrc-1.9.4.ebuild
+++ b/dev-lang/fpcsrc/fpcsrc-1.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpcsrc/fpcsrc-1.9.4.ebuild,v 1.1 2004/10/31 04:20:05 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpcsrc/fpcsrc-1.9.4.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
 inherit rpm
 
diff --git a/dev-lang/fpcsrc/metadata.xml b/dev-lang/fpcsrc/metadata.xml
index 95652dbdf3cb..f376edc581d2 100644
--- a/dev-lang/fpcsrc/metadata.xml
+++ b/dev-lang/fpcsrc/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>lang-misc</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/gauche/ChangeLog b/dev-lang/gauche/ChangeLog
index 896178ed508e..13354505e664 100644
--- a/dev-lang/gauche/ChangeLog
+++ b/dev-lang/gauche/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for dev-lang/gauche
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/ChangeLog,v 1.1 2004/07/11 08:56:12 hattya Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/ChangeLog,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
+
+  16 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  gauche-0.8.6-r1.ebuild:
+  Marking stable on x86 wrt bug #112577.
+
+*gauche-0.8.6-r1 (16 Nov 2005)
+
+  16 Nov 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/gauche-runpath.diff, -gauche-0.8.6.ebuild, +gauche-0.8.6-r1.ebuild:
+  fixes bug #112577.
+
+*gauche-0.8.6 (13 Nov 2005)
+
+  13 Nov 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/gauche-gauche.m4-cc.diff, +gauche-0.8.6.ebuild:
+  new upstream release.
+
+  13 Nov 2005; Akinori Hattori <hattya@gentoo.org> gauche-0.8.5.ebuild:
+  stable on x86.
+
+  13 Oct 2005; Luis Medinas <metalgod@gentoo.org> gauche-0.8.5.ebuild:
+  Added ~amd64 keyword. Bug #108735.
+
+  24 Jul 2005; Akinori Hattori <hattya@gentoo.org> -gauche-0.8.4.ebuild:
+  0.8.5 is the bug fix release of this.
+
+*gauche-0.8.5 (24 Jul 2005)
+
+  24 Jul 2005; Akinori Hattori <hattya@gentoo.org> +gauche-0.8.5.ebuild:
+  new upstream release.
+
+*gauche-0.8.4 (04 Jun 2005)
+
+  04 Jun 2005; Akinori Hattori <hattya@gentoo.org>
+  -files/gauche-extract-1.13.diff, +files/gauche-aclocal.m4-cc.diff,
+  -gauche-0.8.ebuild, -gauche-0.8.1.ebuild, +gauche-0.8.4.ebuild:
+  new upstream release.
+
+  04 May 2005; Akinori Hattori <hattya@gentoo.org>
+  files/gauche-aclocal.m4-1.31.diff:
+  remove Id. fixes bug #89136.
+
+  23 Apr 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/gauche-aclocal.m4-1.31.diff, gauche-0.8.3.ebuild:
+  fixes bug #89136.
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org> gauche-0.8.3.ebuild:
+  stable on ia64
+
+  26 Jan 2005; Akinori Hattori <hattya@gentoo.org> gauche-0.8.3.ebuild:
+  stable on x86.
+
+  14 Dec 2004; Akinori Hattori <hattya@gentoo.org> gauche-0.8.1.ebuild,
+  gauche-0.8.ebuild:
+  remove RESTRICT=nomirror.
+
+*gauche-0.8.3 (14 Dec 2004)
+
+  14 Dec 2004; Akinori Hattori <hattya@gentoo.org> +gauche-0.8.3.ebuild:
+  new upstream release.
+
+  05 Dec 2004; Jason Wever <weeve@gentoo.org> gauche-0.8.1.ebuild:
+  Added ~sparc keyword.
+
+  17 Oct 2004; Akinori Hattori <hattya@gentoo.org> gauche-0.8.1.ebuild:
+  stable on ia64.
+
+  07 Sep 2004; Akinori Hattori <hattya@gentoo.org> gauche-0.8.1.ebuild:
+  add ~ia64
+
+  07 Sep 2004; Akinori Hattori <hattya@gentoo.org> -gauche-0.7.3.ebuild,
+  -gauche-0.7.4.1.ebuild, -gauche-0.7.4.2.ebuild, gauche-0.8.1.ebuild:
+  cleaned out old ebuilds.
+
+  07 Sep 2004; Akinori Hattori <hattya@gentoo.org> gauche-0.8.1.ebuild:
+  stable on x86.
+
+*gauche-0.8.1 (06 Aug 2004)
+
+  06 Aug 2004; Akinori Hattori <hattya@gentoo.org> +gauche-0.8.1.ebuild:
+  new upstream release.
 
 *gauche-0.8 (11 Jul 2004)
 
diff --git a/dev-lang/gauche/Manifest b/dev-lang/gauche/Manifest
index 1863cb08b10c..f5e5969dc5c7 100644
--- a/dev-lang/gauche/Manifest
+++ b/dev-lang/gauche/Manifest
@@ -1,10 +1,13 @@
-MD5 1502c9e5eded6d389b82b175d8e598ac ChangeLog 3771
-MD5 86605d94396b111144e49cb45e9057aa gauche-0.7.3.ebuild 1374
-MD5 03738208c7aebe76207f8ac3fb3f9edb gauche-0.7.4.1.ebuild 1198
-MD5 1d3a67811aee2b795b5ca9227f559767 gauche-0.7.4.2.ebuild 1267
-MD5 efd5e31bad0cc7dd7f0b91deb325ff78 gauche-0.8.ebuild 1261
+MD5 8e13033048c63af6af5aafc338c576ce ChangeLog 6559
+MD5 27605cb14e108b005797503b884e6e67 files/digest-gauche-0.8.3 62
+MD5 662729c0ca18c20cd945fb332874362a files/digest-gauche-0.8.5 62
+MD5 19f67365f4ce8133b2c98c2e2f525914 files/digest-gauche-0.8.6-r1 62
+MD5 58ca35453cb35833ef880d3e1d3ea5d2 files/gauche-aclocal.m4-1.31.diff 1099
+MD5 7bc4cbd7c32584661896116bd48fdee0 files/gauche-aclocal.m4-cc.diff 479
+MD5 62aab943eb7c2154815470d7b813948f files/gauche-gauche.m4-cc.diff 489
+MD5 177cc4fa4c84d465bab80e5b3adb5cc1 files/gauche-gdbm-gentoo.diff 729
+MD5 c69e08c5d4d4342092d1d973bc0eeed2 files/gauche-runpath.diff 509
+MD5 38d46371d4968b1adc706d093858b6ef gauche-0.8.3.ebuild 1122
+MD5 f6ba9a9c631f6bb6f74186ac98077b25 gauche-0.8.5.ebuild 1128
+MD5 97492a113346f0ab95d38b0629475060 gauche-0.8.6-r1.ebuild 1213
 MD5 e9fa98743d1cf3b213a4b04f52baf5f8 metadata.xml 619
-MD5 c72a63369fdb0fee8a8f45533b69fe5f files/digest-gauche-0.7.3 62
-MD5 89966637512684b9b73c898b067cf740 files/digest-gauche-0.7.4.1 64
-MD5 506a28faf2e5a3d88f080e411dff706c files/digest-gauche-0.7.4.2 64
-MD5 0f8ed13a6cb96a582a2cb357dd817608 files/digest-gauche-0.8 60
diff --git a/dev-lang/gauche/files/gauche-aclocal.m4-1.31.diff b/dev-lang/gauche/files/gauche-aclocal.m4-1.31.diff
index e917f6f51d4f..8b7c85599eb7 100644
--- a/dev-lang/gauche/files/gauche-aclocal.m4-1.31.diff
+++ b/dev-lang/gauche/files/gauche-aclocal.m4-1.31.diff
@@ -5,13 +5,6 @@ retrieving revision 1.31
 diff -u -r1.30 -r1.31
 --- gauche/Gauche/aclocal.m4	2004/07/15 07:09:24	1.30
 +++ gauche/Gauche/aclocal.m4	2004/12/21 22:49:36	1.31
-@@ -1,5 +1,5 @@
- dnl Gauche-specific autoconf macros.
--dnl $Id: gauche-aclocal.m4-1.31.diff,v 1.1 2005/04/23 12:39:20 hattya Exp $
-+dnl $Id: gauche-aclocal.m4-1.31.diff,v 1.1 2005/04/23 12:39:20 hattya Exp $
- 
- dnl AC_GAUCHE_INIT_EXT
- dnl   Sets some parameters about installed Gauche package. 
 @@ -93,19 +93,21 @@
  dnl   The main configure and gc's configure also use this.
  AC_DEFUN([AC_GAUCHE_OPTFLAGS],
diff --git a/dev-lang/gauche/gauche-0.8.3.ebuild b/dev-lang/gauche/gauche-0.8.3.ebuild
index c0de2f3f31ea..f4a70ec243af 100644
--- a/dev-lang/gauche/gauche-0.8.3.ebuild
+++ b/dev-lang/gauche/gauche-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/dev-lang/gauche/gauche-0.8.3.ebuild,v 1.1 2004/12/14 11:18:07 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/gauche-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://gauche.sf.net/"
 SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
 
 LICENSE="BSD"
-KEYWORDS="~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="ia64 ~ppc ~sparc x86"
 SLOT="0"
 S="${WORKDIR}/${MY_P}"
 
@@ -25,6 +25,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gdbm-gentoo.diff
+	epatch ${FILESDIR}/${PN}-aclocal.m4-1.31.diff
 	autoconf
 
 }
diff --git a/dev-lang/gauche/gauche-0.8.5.ebuild b/dev-lang/gauche/gauche-0.8.5.ebuild
index cfd89cb244bc..fa014ce68dfc 100644
--- a/dev-lang/gauche/gauche-0.8.5.ebuild
+++ b/dev-lang/gauche/gauche-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/dev-lang/gauche/gauche-0.8.5.ebuild,v 1.1 2005/07/24 14:21:07 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/gauche-0.8.5.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://gauche.sf.net/"
 SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
 
 LICENSE="BSD"
-KEYWORDS="~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc x86"
 SLOT="0"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-lang/gauche/gauche-0.8.6-r1.ebuild b/dev-lang/gauche/gauche-0.8.6-r1.ebuild
index 9a8e867b8195..28a52bb39225 100644
--- a/dev-lang/gauche/gauche-0.8.6-r1.ebuild
+++ b/dev-lang/gauche/gauche-0.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/gauche-0.8.6-r1.ebuild,v 1.1 2005/11/16 10:45:43 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/gauche-0.8.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://gauche.sf.net/"
 SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc x86"
 SLOT="0"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-lang/gforth/ChangeLog b/dev-lang/gforth/ChangeLog
index fa9f7fef1581..af2849b79db9 100644
--- a/dev-lang/gforth/ChangeLog
+++ b/dev-lang/gforth/ChangeLog
@@ -1,8 +1,66 @@
 # ChangeLog for dev-lang/gforth
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/ChangeLog,v 1.1 2003/01/05 06:16:38 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/ChangeLog,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
-*gforth-0.5.0.ebuild (04 ��� 2003)
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org> gforth-0.6.2.ebuild:
+  Marked ~ppc-macos (bug #110818)
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> gforth-0.6.2.ebuild:
+  Stable on ppc.
+
+  22 Apr 2005; Simon Stelling <blubb@gentoo.org> gforth-0.6.2.ebuild:
+  stable on amd64
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> gforth-0.6.2.ebuild:
+  Added to ~ppc.
+
+  06 Aug 2004; Malcolm Lashley <malc@gentoo.org> gforth-0.6.2.ebuild:
+  Add ~amd64, closes bug #57634
+
+*gforth-0.5.0-r1 (28 Jul 2004)
+
+  28 Jul 2004; Jeremy Maitin-Shepard <jbms@gentoo.org> gforth-0.5.0-r1.ebuild:
+  Fixed sandbox violation, and added proper handling for Emacs support
+  Resolves Bug #54084
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gforth-0.5.0.ebuild,
+  gforth-0.6.1-r1.ebuild, gforth-0.6.1.ebuild, gforth-0.6.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> gforth-0.6.1-r1.ebuild,
+  gforth-0.6.2.ebuild:
+  Add die following econf for bug 48950
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gforth-0.5.0.ebuild,
+  gforth-0.6.1-r1.ebuild, gforth-0.6.1.ebuild, gforth-0.6.2.ebuild:
+  strip-flags into src_compile; don't assign default to S; header fix
+
+  15 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org>
+  files/gforth.el-gentoo.patch:
+  generate epatch compatible patch
+
+*gforth-0.6.2 (14 Oct 2003)
+
+  14 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> gforth-0.6.1-r1.ebuild,
+  gforth-0.6.2.ebuild:
+  minor version bump and fix for bug 31089
+
+*gforth-0.6.1-r1 (14 Oct 2003)
+
+  14 Oct 2003; Matthew Kennedy <mkennedy@gentoo.org> gforth-0.6.1-r1.ebuild,
+  gforth-0.6.2.ebuild:
+  minor version bump and fix for bug 31089
+
+*gforth-0.6.1 (02 Apr 2003)
+
+  02 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> gforth-0.6.1.ebuild,
+  files/50gforth-gentoo.el, files/gforth.el-gentoo.patch:
+  minor version bump, ebuild clean up, support for emacs USE flag
+
+*gforth-0.5.0.ebuild (04 Jan 2003)
 
   04 Jan 2003; George Shapovalov <george@gentoo.org> ChangeLog, gforth-0.5.0.ebuild, files/digest-gforth-0.5.0 :
   initial release (#11677)
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index e69de29bb2d1..21b279872911 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -0,0 +1,5 @@
+MD5 b1b4b6a2dc1e8dab38ab5096b2f9b45e gforth-0.6.2.ebuild 1384
+MD5 43d87b381f4a89af68765d200e853089 ChangeLog 2538
+MD5 eaf0babab3dec9a6b74e876829e1a68a files/gforth.el-gentoo.patch 1518
+MD5 288a9f927bbcb355499af2795baa6248 files/digest-gforth-0.6.2 65
+MD5 74edc6d12c9a8d2858070dc09e2c264c files/50gforth-gentoo.el 200
diff --git a/dev-lang/gforth/files/gforth.el-gentoo.patch b/dev-lang/gforth/files/gforth.el-gentoo.patch
index 163c90858800..7130e18da672 100644
--- a/dev-lang/gforth/files/gforth.el-gentoo.patch
+++ b/dev-lang/gforth/files/gforth.el-gentoo.patch
@@ -1,5 +1,6 @@
---- gforth.el	2003-03-09 09:05:33.000000000 -0600
-+++ gforth.el~	2003-04-02 04:34:42.000000000 -0600
+diff -ur gforth-0.6.2.orig/gforth.el gforth-0.6.2/gforth.el
+--- gforth-0.6.2.orig/gforth.el	2003-08-05 04:12:47.000000000 -0500
++++ gforth-0.6.2/gforth.el	2003-10-15 20:08:42.460949736 -0500
 @@ -65,22 +65,24 @@
    (or (< emacs-major-version major)
        (and (= emacs-major-version major) (< emacs-minor-version minor))))
diff --git a/dev-lang/gforth/gforth-0.6.2.ebuild b/dev-lang/gforth/gforth-0.6.2.ebuild
index d6a89851229e..eb0efdebe35c 100644
--- a/dev-lang/gforth/gforth-0.6.2.ebuild
+++ b/dev-lang/gforth/gforth-0.6.2.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/gforth-0.6.2.ebuild,v 1.1 2003/10/14 18:36:54 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/gforth-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
-IUSE="emacs"
-
-inherit elisp-common
+inherit elisp-common eutils toolchain-funcs
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GNU Forth is a fast and portable implementation of the ANSI Forth language"
 HOMEPAGE="http://www.gnu.org/software/gforth"
 SRC_URI="http://www.complang.tuwien.ac.at/forth/gforth//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ppc ~ppc-macos x86"
+IUSE="emacs"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	emacs? ( virtual/emacs )"
 
 SITEFILE=50gforth-gentoo.el
@@ -26,20 +24,21 @@ src_unpack() {
 }
 
 src_compile() {
-	econf CC="gcc -fno-reorder-blocks -fno-inline" --enable-force-reg
+	econf CC="$(tc-getCC) -fno-reorder-blocks -fno-inline" --enable-force-reg || die "econf failed"
 	make || die
 	use emacs && emacs --batch -f batch-byte-compile --no-site-file --no-init-file *.el
 }
 
-src_install () {
-	make install libdir=${D}/usr/lib \
+src_install() {
+	make \
+		libdir=${D}/usr/lib \
 		infodir=${D}/usr/share/info \
 		mandir=${D}/usr/share/man \
 		datadir=${D}/usr/share \
 		bindir=${D}/usr/bin \
 		install || die
 
-	dodoc AUTHORS BUGS COPYING* ChangeLog NEWS* README* ToDo doc/glossaries.doc doc/*.ps
+	dodoc AUTHORS BUGS ChangeLog NEWS* README* ToDo doc/glossaries.doc doc/*.ps
 
 	if use emacs; then
 		elisp-install ${PN} *.el *.elc
diff --git a/dev-lang/ghc-bin/ChangeLog b/dev-lang/ghc-bin/ChangeLog
index 6cdf8f116060..6c72262e11a3 100644
--- a/dev-lang/ghc-bin/ChangeLog
+++ b/dev-lang/ghc-bin/ChangeLog
@@ -1,8 +1,127 @@
 # ChangeLog for dev-lang/ghc-bin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.1 2002/12/15 06:52:54 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
-*ghc-bin-5.04.2.ebuild (14 ��� 2002)
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ghc-bin-6.2.2-r1.ebuild:
+  Stable on sparc
+
+  31 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> ghc-bin-6.4.ebuild:
+  Version 6.4 for ppc this time
+
+  31 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ghc-bin-6.2.2-r1.ebuild:
+  Built package for ppc to fix #70617 and #98984
+
+  17 Aug 2005; Andres Loeh <loeh@gentoo.org> -ghc-bin-6.0.ebuild,
+  -ghc-bin-6.2.ebuild, -ghc-bin-6.2.1.ebuild, -ghc-bin-6.2.2.ebuild,
+  ghc-bin-6.2.2-r1.ebuild:
+  Marked 6.2.2-r1 stable on x86, and removed old versions.
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> ghc-bin-6.4.ebuild:
+  Updated binary package for ppc64
+
+  26 Jul 2005; <duncan@gentoo.org> ghc-bin-6.2.2-r1.ebuild,
+  ghc-bin-6.4.ebuild:
+  Added new binary packages that are built against readline-5. Also Added
+  a missing dependency on >=dev-libs/gmp-4.1.
+
+*ghc-bin-6.2.2-r1 (20 May 2005)
+
+  20 May 2005; <duncan@gentoo.org> +ghc-bin-6.2.2-r1.ebuild:
+  Add a new ghc-bin-6.2.2-r1 ebuild based on the ghc-bin-6.4 "portage tbz2
+  style" Initially this only covers ~sparc but we'll extend it later to the
+  other arches.
+
+  09 May 2005; Markus Rothe <corsair@gentoo.org> ghc-bin-6.4.ebuild:
+  Created binary and added ~ppc64 to KEYWORDS - bug #68930
+
+*ghc-bin-6.4 (02 May 2005)
+
+  02 May 2005; Andres Loeh <kosmikus@gentoo.org> +ghc-bin-6.4.ebuild:
+  Added a first x86 binary for ghc-6.4. More arches to follow. The binary
+  version of ghc-6.4 will remain masked as long as dev-lang/ghc-6.4 is masked.
+
+  19 Feb 2005; Jason Wever <weeve@gentoo.org> ghc-bin-6.0.ebuild,
+  ghc-bin-6.2.1.ebuild:
+  Masked on SPARC.
+
+  10 Dec 2004; Chris White <chriswhite@gentoo.org> ghc-bin-6.2.2.ebuild:
+  Added arch? based SRC_URI, as ghc-bin will (hopefully) be getting more arches.
+
+  03 Nov 2004; Andres Loeh <kosmikus@gentoo.org> ghc-bin-6.2.1.ebuild:
+  ghc-pkg was not installed properly for amd64 (#56997)
+
+  19 Oct 2004; Andres Loeh <kosmikus@gentoo.org> ghc-bin-6.2.1.ebuild:
+  Fix amd64 version to properly install environment file.
+
+*ghc-bin-6.2.2 (18 Oct 2004)
+
+  18 Oct 2004; Andres Loeh <kosmikus@gentoo.org> ghc-bin-6.2.2.ebuild:
+  Version bump for x86.
+
+*ghc-bin-6.2.1 (17 Oct 2004)
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> +ghc-bin-6.2.1.ebuild:
+  Version bump for amd64 only (~amd64).  Closes #58588.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ghc-bin-5.04.3.ebuild, ghc-bin-6.0.ebuild, ghc-bin-6.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+*ghc-bin-5.04.3 (31 Mar 2004)
+
+  31 Mar 2004; Andres Loeh <kosmikus@gentoo.org> ghc-bin-5.04.3.ebuild:
+  Re-added ghc-bin-5.04.3 because of ppc.
+
+  31 Mar 2004; Andres Loeh <kosmikus@gentoo.org> ghc-bin-5.04.2-r1.ebuild,
+  ghc-bin-5.04.2.ebuild, ghc-bin-5.04.3.ebuild, ghc-bin-6.2.ebuild:
+  Marked 6.2 stable on x86. Removed 5 series.
+
+  23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> ghc-bin-5.04.3.ebuild:
+  Add ppc keyword.
+
+*ghc-bin-6.2 (17 Dec 2003)
+
+  17 Dec 2003; Andres Loeh <kosmikus@gentoo.org> ghc-bin-6.2.ebuild:
+  Version bump.
+
+  21 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-bin-5.04.3.ebuild:
+  ghc 5.04.3 is apparently not available for sparc as binary, changed KEYWORDS
+  accordingly; added the sparc tarballs to the digests for 5.04.2, 5.04.2-r1,
+  hopefully fixing bug #24750
+
+  02 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-bin-5.04.3.ebuild,
+  ghc-bin-6.0.ebuild:
+  Marked 5.04.3 stable. Fixed installation of documentation (now to
+  /usr/share/doc/... The hsc2hs wrapper script no longer contains illegal paths.
+
+*ghc-bin-6.0 (12 Jun 2003)
+
+  12 Jun 2003; Andres Loeh <kosmikus@gentoo.org> ghc-bin-6.0.ebuild:
+  Version bump.
+
+*ghc-bin-5.04.3 (09 May 2003)
+
+  09 May 2003; Andres Loeh <kosmikus@gentoo.org> ghc-bin-5.04.2-r1.ebuild,
+  ghc-bin-5.04.3.ebuild:
+  Installs to /opt/ghc/bin now (bug #20185). Updated to version 5.04.3.
+  Both updates are marked unstable for now.
+
+*ghc-bin-5.04.2-r1 (09 May 2003)
+ 
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*ghc-bin-5.04.2 (21 Mar 2003)
+
+  21 Mar 2003; George Shapovalov <george@gentoo.org> ghc-bin-5.04.2.ebuild :
+  created virtual/ghc, added PROVIDE=virtual/ghc to the ebuild to make dev-lang/ghc bootstrap correctly
+  and without unnecessary steps  (#10155)
+
+  11 Feb 2003; George Shapovalov <george@gentoo.org> ChangeLog, ghc-bin-5.04.2.ebuild :
+  modified ebuild to add sparc support (sparc people, please test!)
+  fixups to wrapper scripts
 
   14 Dec 2002; George Shapovalov <george@gentoo.org> ChangeLog, ghc-bin-5.04.2.ebuild, files/digest-ghc-bin-5.04.2 :
   initial release
diff --git a/dev-lang/ghc-bin/Manifest b/dev-lang/ghc-bin/Manifest
index e69de29bb2d1..d5c30c19ec72 100644
--- a/dev-lang/ghc-bin/Manifest
+++ b/dev-lang/ghc-bin/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9e5e3b68f1863c338a231811b31c00f1 ghc-bin-6.4.ebuild 1137
+MD5 cedfbec21f987358c6e37846bed8a870 ghc-bin-6.2.2-r1.ebuild 1034
+MD5 87f638e52cf614305933dde23f040a8c ghc-bin-5.04.3.ebuild 1500
+MD5 8ebd1ca89127a6d9cc4ac8c969093da1 ChangeLog 5256
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 a82ba08a8abb4ae38bcc8d467c665e7b files/10ghc 40
+MD5 2b726390b70f784de758ee02184ef450 files/digest-ghc-bin-5.04.3 171
+MD5 aeec673d67613d60a91b5d8d3a11b184 files/digest-ghc-bin-6.2.2-r1 218
+MD5 3919aa4d517b8bc37bc59b8e7dc4a334 files/digest-ghc-bin-6.4 356
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDFxWJKRy60XGEcJIRAm0WAJ4/3UNesrTAajwkC25mlCuJ+kwt+gCglu9A
+9vt3eV1GwVdbCpu7ay4YZgo=
+=SI9j
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc-bin/files/10ghc b/dev-lang/ghc-bin/files/10ghc
index 464e53a6661f..064cfb79d5bd 100644
--- a/dev-lang/ghc-bin/files/10ghc
+++ b/dev-lang/ghc-bin/files/10ghc
@@ -1,2 +1,2 @@
 PATH=/opt/ghc/bin
-
+ROOTPATH=/opt/ghc/bin
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-5.04.3 b/dev-lang/ghc-bin/files/digest-ghc-bin-5.04.3
index 5874dc74964a..4deb90cd1343 100644
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-5.04.3
+++ b/dev-lang/ghc-bin/files/digest-ghc-bin-5.04.3
@@ -1 +1,2 @@
+MD5 22eb7880666ded5b8422c527327887a5 ghc-5.04.3-powerpc-unknown-linux.tar.bz2 31613122
 MD5 0307b36a3356e51e7a795dc607ae24a3 ghc-5.04.3-i386-unknown-linux.tar.bz2 15725661
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2-r1 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2-r1
index 3abf017d097e..4cf401d045df 100644
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2-r1
+++ b/dev-lang/ghc-bin/files/digest-ghc-bin-6.2.2-r1
@@ -1 +1,3 @@
-MD5 811a5763546034a428de51f5097bb96a ghc-bin-6.2.2-sparc.tbz2 19477310
+MD5 707ec1a9e6d298c2d357a1be031ead83 ghc-bin-6.2.2-r1-x86.tbz2 14561932
+MD5 99fba74518a903f8406a1785b4b7a5e0 ghc-bin-6.2.2-r1-ppc.tbz2 21018465
+MD5 88c10ab7259bc312a9899d917247a41e ghc-bin-6.2.2-r1-sparc.tbz2 16189582
diff --git a/dev-lang/ghc-bin/files/digest-ghc-bin-6.4 b/dev-lang/ghc-bin/files/digest-ghc-bin-6.4
index 2b7931f218d5..b7a7b10b07ad 100644
--- a/dev-lang/ghc-bin/files/digest-ghc-bin-6.4
+++ b/dev-lang/ghc-bin/files/digest-ghc-bin-6.4
@@ -1 +1,5 @@
-MD5 22015698da84f2eebecb7d5144212d3f ghc-bin-6.4-x86.tbz2 23016897
+MD5 22015698da84f2eebecb7d5144212d3f ghc-bin-6.4-r1-x86.tbz2 23016897
+MD5 0752aa1398dee5a7274396fa4bacfc55 ghc-bin-6.4-r1-amd64.tbz2 25725992
+MD5 a27d3c1fec1340923de2e9177d49b951 ghc-bin-6.4-r1-sparc.tbz2 25574147
+MD5 0eb219a66e697c59f5ed83433fba299c ghc-bin-6.4-r1-ppc.tbz2 30932565
+MD5 0bd05dd01b00722f8e2584c167328ff7 ghc-bin-6.4-r1-ppc64.tbz2 34971099
diff --git a/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild b/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild
index 977482dcf7fb..841bd9016e68 100644
--- a/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild,v 1.1 2003/05/09 09:41:39 kosmikus Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-5.04.3.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 IUSE="opengl"
 
 S="${WORKDIR}/ghc-${PV}"
 DESCRIPTION="Glasgow Haskell Compiler"
-SRC_URI="x86? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-i386-unknown-linux.tar.bz2 )
-	sparc? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-sparc-sun-solaris2.tar.bz2 )"
+SRC_URI=" ppc? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-powerpc-unknown-linux.tar.bz2 )
+x86? ( http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-i386-unknown-linux.tar.bz2 )"
 HOMEPAGE="http://www.haskell.org"
 
 LICENSE="as-is"
-KEYWORDS="~x86 -ppc ~sparc -alpha"
+KEYWORDS="x86 ppc -sparc -alpha"
 SLOT="0"
 
 LOC="/opt/ghc"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=">=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=dev-libs/gmp-4.1
@@ -42,21 +42,22 @@ src_install () {
 	dodoc ANNOUNCE INSTALL LICENSE README VERSION
 
 	cd ${D}${LOC}/share
-	mkdir ${D}${LOC}/doc/${PF}
-	mv hslibs.ps users_guide.ps html/ ${D}${LOC}/doc/${PF}
+	mv hslibs.ps users_guide.ps html ${D}/usr/share/doc/${PF}
 
 	#ghc seems to set locations in wrapper scripts from make install
 	#need to strip the ${D} part out
 	cd ${D}${LOC}/bin
-	mv ghc-${PV} ghc-${PV}-orig
-	sed -e "s:${D}::" ghc-${PV}-orig > ghc-${PV}
-	mv ghci-${PV} ghci-${PV}-orig
-	sed -e "s:${D}::" ghci-${PV}-orig > ghci-${PV}
-	mv ghc-pkg-${PV} ghc-pkg-${PV}-orig
-	sed -e "s:${D}::" ghc-pkg-${PV}-orig > ghc-pkg-${PV}
-	rm ghc-${PV}-orig ghci-${PV}-orig ghc-pkg-${PV}-orig
-	chmod a+x ghc-${PV} ghci-${PV} ghc-pkg-${PV}
+	clean_wrappers ghc-${PV} ghci-${PV} ghc-pkg-${PV} hsc2hs
 
 	insinto /etc/env.d
 	doins ${FILESDIR}/10ghc
 }
+
+clean_wrappers () {
+	for i in $*; do
+		mv ${i} ${i}-orig
+		sed -e "s:${D}::" ${i}-orig > ${i}
+		chmod a+x ${i}
+		rm ${i}-orig
+	done
+}
diff --git a/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild b/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
index b8ad8310a825..c144b9bbe592 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild,v 1.1 2005/05/20 13:40:00 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 IUSE="" # use the non-binary version if you want to have more choice
 
 DESCRIPTION="Glasgow Haskell Compiler"
 # list all arches for proper digest building:
-SRC_URI="sparc? ( mirror://gentoo/${P}-sparc.tbz2 )"
+SRC_URI="x86? (  mirror://gentoo/${P}-r1-x86.tbz2 )
+		ppc? ( mirror://gentoo/${P}-r1-ppc.tbz2 )
+		sparc? ( mirror://gentoo/${P}-r1-sparc.tbz2 )"
 HOMEPAGE="http://www.haskell.org/ghc/"
 
 LICENSE="as-is"
-KEYWORDS="-x86 -amd64 -ppc ~sparc -alpha"
+KEYWORDS="x86 -amd64 ~ppc sparc -alpha"
 SLOT="0"
 
 RESTRICT="nostrip" # already stripped
@@ -20,7 +22,8 @@ LOC="/opt/ghc"
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
-	=sys-libs/readline-4*"
+	>=dev-libs/gmp-4.1
+	=sys-libs/readline-5*"
 
 PROVIDE="virtual/ghc"
 
diff --git a/dev-lang/ghc-bin/ghc-bin-6.4.ebuild b/dev-lang/ghc-bin/ghc-bin-6.4.ebuild
index a03ee14cf481..6d012854f051 100644
--- a/dev-lang/ghc-bin/ghc-bin-6.4.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-6.4.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.ebuild,v 1.1 2005/05/02 14:50:50 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-6.4.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 IUSE="" # use the non-binary version if you want to have more choice
 
 DESCRIPTION="Glasgow Haskell Compiler"
 # list all arches for proper digest building:
-SRC_URI="x86?  ( mirror://gentoo/${P}-x86.tbz2 )"
+SRC_URI="x86?  ( mirror://gentoo/${P}-r1-x86.tbz2 )
+		 amd64? ( mirror://gentoo/${P}-r1-amd64.tbz2 )
+		 sparc? ( mirror://gentoo/${P}-r1-sparc.tbz2 )
+		 ppc? ( mirror://gentoo/${P}-r1-ppc.tbz2 )
+		 ppc64? ( mirror://gentoo/${P}-r1-ppc64.tbz2 )"
 HOMEPAGE="http://www.haskell.org"
 
 LICENSE="as-is"
-KEYWORDS="~x86 -amd64 -ppc -sparc -alpha"
+KEYWORDS="-alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 RESTRICT="nostrip" # already stripped
@@ -20,6 +24,7 @@ LOC="/opt/ghc"
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
+	>=dev-libs/gmp-4.1
 	=sys-libs/readline-5*"
 
 PROVIDE="virtual/ghc"
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 5736b04a4ebf..38d81943badd 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,8 +1,328 @@
 # ChangeLog for dev-lang/ghc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.1 2002/06/10 07:28:29 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
+
+  16 Nov 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.4.1-r1.ebuild:
+  Reduced the amount of output during the build slightly to work around bug
+  #111183.
+
+*ghc-6.4.1-r1 (21 Oct 2005)
+
+  21 Oct 2005; <duncan@gentoo.org> +ghc-6.4.1-r1.ebuild:
+  Add new revision ghc-6.4.1-r1 which now PDEPENDs on cabal.
+
+  06 Oct 2005; <duncan@gentoo.org> ghc-6.4.1.ebuild:
+  Revert to using virtual/ghc in DEPEND since the other method had no advantages.
+
+  06 Oct 2005; <duncan@gentoo.org> +files/depsort.py, files/ghc-updater:
+  Make the ghc-updater script work better.
+
+  04 Oct 2005; Luis F. Araujo <araujo@gentoo.org> ghc-6.2.2.ebuild:
+  Blocked ghc6.4 in ghc6.2.2
+
+  04 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> ghc-6.4.1.ebuild:
+  Back to the ~ppc
+
+  04 Oct 2005; <duncan@gentoo.org> ghc-6.4.1.ebuild:
+  Add ~sparc to KEYWORDS and enable GHCi on sparc.
+
+  23 Sep 2005; <duncan@gentoo.org> ghc-6.4.1.ebuild:
+  Disabled java USE flag due to bug #106992
+
+*ghc-6.4.1 (22 Sep 2005)
+
+  22 Sep 2005; <duncan@gentoo.org> +ghc-6.4.1.ebuild:
+  Version bump.
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> ghc-6.2.2.ebuild:
+  Stable on sparc
+
+  31 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> ghc-6.4.ebuild:
+  Fixed to build on ppc for real
+
+  17 Aug 2005; <duncan@gentoo.org> ghc-6.4.ebuild:
+  Add ~sparc to KEYWORDS since it was missing and we've already got ghc-bin-6.4
+
+  17 Aug 2005; Andres Loeh <loeh@gentoo.org> -files/ghc-5.04.3-r1.patch,
+  -files/ghc-6.2.1-linker.patch.bz2, -files/ghc-6.2.documentation.patch,
+  -files/ghc-6.2.hardened.patch.bz2, -files/lndir.c, -ghc-6.2.ebuild,
+  -ghc-6.2-r1.ebuild, -ghc-6.2.1-r1.ebuild, ghc-6.2.2.ebuild:
+  Removed ~amd64 keyword for ghc-6.2.2, because ghc-6.2.2 is broken on this
+  arch. Cleaned up old versions.
+
+  20 May 2005; <duncan@gentoo.org> ghc-6.2.2.ebuild:
+  Add ~sparc to KEYWORDS and disable GHCi support on sparc since it does not
+  work reliably.
+
+  11 May 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.4.ebuild:
+  Removing ~ppc64 from ghc-6.4 again (hopefully temporarily), see comment #24
+  of bug #68930.
+
+  11 May 2005; Andres Loeh <kosmikus@gentoo.org> files/ghc-updater:
+  Changes to ghc-updater, to make it a bit more useful for the update to ghc-6.4.
+
+  09 May 2005; Markus Rothe <corsair@gentoo.org>
+  +files/ghc-6.4-powerpc.patch, ghc-6.4.ebuild:
+  Added patch for ppc64 and added ~ppc64 to KEYWORDS
+
+  09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ghc-6.2.2.ebuild:
+  Stable on ppc.
+
+  25 Mar 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.2.ebuild,
+  ghc-6.4.ebuild:
+  ghc-6.4 supports registered builds on amd64. ghci is still not supported on
+  amd64, but it fails with a more informative error message now (bug #82541).
+
+  23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.4.ebuild:
+  Added dependency on haddock.
+
+  23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.4.ebuild:
+  Added missing dependency on libxslt, and slightly cleaned up the ebuild.
+
+*ghc-6.4 (11 Mar 2005)
+
+  11 Mar 2005; Andres Loeh <kosmikus@gentoo.org> +ghc-6.4.ebuild,
+  -ghc-6.4_pre20050308.ebuild:
+  Updated ghc-6.4 snapshot to ghc-6.4 release. This version is still masked
+  for testing.
+
+*ghc-6.4_pre20050308 (09 Mar 2005)
+
+  09 Mar 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.4_pre20050308.ebuild:
+  Added a ghc-6.4 snapshot for testing purposes.
+
+  19 Feb 2005; Jason Wever <weeve@gentoo.org> ghc-6.0.1.ebuild,
+  ghc-6.2-r1.ebuild, ghc-6.2.1-r1.ebuild, ghc-6.2.2.ebuild, ghc-6.2.ebuild:
+  Masked on SPARC as it doesn't build.
+
+  25 Jan 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.2.ebuild:
+  Dependency resolution for virtuals changed in portage. Temporily adapted the
+  ebuild to quit with an informative error message until a real solution comes
+  to mind. (Bug #79509)
+
+  19 Jan 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.2.ebuild:
+  Marked stable on x86.
+
+  25 Nov 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.2.ebuild:
+  The amd64 build is unregistered (bug #58588).
+
+  24 Nov 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.2.ebuild:
+  Added ~amd64 flag, cf. bug #58588.
+
+  22 Nov 2004; Andres Loeh <kosmikus@gentoo.org> +files/ghc-updater,
+  ghc-6.2.2.ebuild:
+  Modified ebuild to use ghc-package.eclass (bug #69270) and to include
+  ghc-updater script (bug #69142).
+
+  26 Oct 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.2.ebuild:
+  Modified CFLAG testing code, following discussion in bug #59709.
+
+  24 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> ghc-6.2.2.ebuild:
+  Tested on ppc.
+
+*ghc-6.2.2 (18 Oct 2004)
+
+  18 Oct 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.0.ebuild,
+  ghc-6.2.1-r1.ebuild, ghc-6.2.1.ebuild, ghc-6.2.2.ebuild:
+  New version. Included mattam's fix for #59709. Removed some old versions.
+
+  19 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ghc-6.0.1.ebuild,
+  ghc-6.0.ebuild, ghc-6.2-r1.ebuild, ghc-6.2.1-r1.ebuild, ghc-6.2.1.ebuild,
+  ghc-6.2.ebuild:
+  Fixed missing dependencies; bug #68021.
+
+  24 Sep 2004; <SeJo@gentoo.org> ghc-6.2.ebuild:
+  stable bump due to bug 59753
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ghc-6.0.1.ebuild,
+  ghc-6.0.ebuild, ghc-6.2-r1.ebuild, ghc-6.2.1-r1.ebuild, ghc-6.2.1.ebuild,
+  ghc-6.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+*ghc-6.2.1-r1 (15 Jun 2004)
+
+  15 Jun 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.1-r1.ebuild,
+  files/ghc-6.2.1-linker.patch.bz2:
+  Patch for ghci's linker to help loading HOpenGL. Thanks to Sven Panne.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> ghc-6.0.1.ebuild,
+  ghc-6.0.ebuild, ghc-6.2-r1.ebuild, ghc-6.2.1.ebuild, ghc-6.2.ebuild:
+  Fix use invocation
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> ghc-6.0.1.ebuild,
+  ghc-6.0.ebuild, ghc-6.2-r1.ebuild, ghc-6.2.1.ebuild, ghc-6.2.ebuild:
+  Changed app-text/tetex to virtual/tetex.
+
+  13 May 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.1.ebuild:
+  fixed patch for ghc-6.2.1; threaded rts now enabled by default (#50758)
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> ghc-6.2.1.ebuild:
+  added new hardened PIE SSP switches
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org>
+  -files/ghc-6.2.hardened-gcc.patch.bz2, +files/ghc-6.2.hardened.patch.bz2,
+  ghc-6.0.1.ebuild, ghc-6.2-r1.ebuild, ghc-6.2.ebuild:
+  added new hardened switches for nonPIE and nonSSP building
+
+  02 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> ghc-6.2.1.ebuild:
+  Add support for ppc on ghc-6.2.1.
+
+  31 Mar 2004; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild,
+  ghc-6.2-r1.ebuild:
+  Marked ghc-6.2-r1 stable on x86. Removed 5 series due to bug #46212.
+
+  23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> ghc-6.2.ebuild:
+  Added ~ppc keyword, highly experimental build (linux-ppc is not entirely
+  supported yet).
+
+*ghc-6.2.1 (22 Mar 2004)
+
+  22 Mar 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.1.ebuild:
+  Version bump.
+
+*ghc-6.2-r1 (11 Mar 2004)
+
+  11 Mar 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2-r1.ebuild,
+  files/ghc-6.2.hardened-gcc.patch.bz2:
+  Disabling propolice in the resulting ghc when using gcc-hardened (cf. bug
+  #36154).
+
+  20 Feb 2004; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.ebuild:
+  Fixed a problem building libraries using recent binutils (#40128).
+
+  11 Jan 2004; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild:
+  moved setup checks to pkg_setup (bug #33962).
+
+  22 Dec 2003; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.ebuild:
+  Haddock got called even with USE=-doc.
+
+  19 Dec 2003; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.ebuild:
+  GHC 6.2 needs haddock-0.6 (bug #36108)
+
+*ghc-6.2 (17 Dec 2003)
+
+  17 Dec 2003; Andres Loeh <kosmikus@gentoo.org> ghc-6.2.ebuild,
+  files/ghc-6.2.documentation.patch:
+  New GHC version 6.2.
+
+  17 Dec 2003: Andres Loeh <kosmikus@gentoo.org> ghc-6.0.1.ebuild,
+  files/ghc-6.0.1.haddock.patch:
+  Added patch needed to compile documentation with haddock-0.6.
+
+  11 Nov 2003; Alexander Gabert <pappy@gentoo.org> ghc-5.04.3-r1.ebuild,
+  ghc-6.0.1.ebuild:
+  added ghc-6.0.1 bugfix from ghc-5.04.3-r1 bug30789
+
+  22 Oct 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild,
+  ghc-6.0.1.ebuild, ghc-6.0.ebuild:
+  Added libgmp to runtime dependencies, closing bug #31321.
+
+  12 Oct 2003; Alexander Gabert <pappy@gentoo.org> ghc-5.04.3-r1.ebuild:
+  added hardened-gcc -yet_exec flag mechanism and CFLAGS for ghc if hardened-gcc
+  is used
+
+*ghc-6.0.1 (31 Jul 2003)
+
+  31 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-6.0.1.ebuild:
+  Version bump.
+
+  30 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-6.0.ebuild:
+  Fixed bug that caused ghc to be built with HOpenGL despite -opengl being set.
+
+  29 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild:
+  Marked 5.04.3-r1 stable. It fixes a couple of problems that keep appearing
+  with 5.04.3.
+
+  02 Jul 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild:
+  Removed implicit X11 dependency (bug 23708). Thanks to Aaron Son
+  <aaron@clamp.net> for discovering the problem.
+
+*ghc-6.0 (01 Jun 2003)
+
+  01 Jun 2003; Andres Loeh <kosmikus@gentoo.org> ghc-6.0.ebuild:
+  Version bump. Will probably remain in testing until new version is released,
+  as this version is considered to be beta by the developers. The ebuild has
+  been somewhat simplified: GHC's build system now supports bootstrapping to get
+  GHCi running automatically if necessary.
+
+  21 May 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild,
+  files/ghc-5.04.3-r1.patch:
+  Added a dependency to haddock when generating docs. This should fix bug
+  #20989. Thanks to Mikael A <snikkt@yahoo.com> and Peter Lennartz
+  <peterl@cs.uu.nl> for identifying the problem.
+
+*ghc-5.04.3-r1 (09 May 2003)
+
+  09 May 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild:
+  Fixed bug that caused ghci to fail with glibc-2.3.2 (reported by Ralf Hinze
+  <ralf@informatik.uni-bonn.de>). Also added the generation of documentation
+  again (had been missing for a while). To get full documentation, set the "doc"
+  USE flag.
+
+*ghc-5.04.2 (21 Mar 2003)
+
+  21 Mar 2003; George Shapovalov <george@gentoo.org> ghc-5.04.3.ebuild :
+  new version
+  Now with all virtuals in place should build off existing ghc nicely..
+
+  21 Mar 2003; George Shapovalov <george@gentoo.org> ghc-5.04.2.ebuild :
+  created new virtual: virtual/ghc.
+  Made ghc depend on virtual/ghc (and provide one) instead of on dev-lang/ghc-bin
+  ghc-bin in turn now also provides virtual/ghc, this closes #10155
+
+  13 Mar 2003; George Shapovalov <george@gentoo.org> ghc-5.04.2.ebuild :
+  fix for when ghc gets bootstrapped off different version.
+  Thanks to Andres Loeh <andres@cs.uu.nl> and Ralf Hinze <ralf@informatik.uni-bonn.de>.
+
+  08 Mar 2003; George Shapovalov <george@gentoo.org> ghc-5.04.2.ebuild :
+
+  updated the ebuild to correctly build (namely to build ghci) if bootstrapped off different (older)
+  version. See #10155 for details.
+
+*ghc-5.04i.2 (12 Feb 2003)
+
+  12 Feb 2003; George Shapovalov <george@gentoo.org> ghc-5.04.2.ebuild, files/digest-ghc-5.04.2 :
+
+  The long awaited update. (#10155)
+  Fixes things on x86. !!!Needs testing on sparc!!! (has good chances to work on sparc,
+  provided ghc-bin-5.04.2 works)
+  ebuild bootstraps ghc from ghc-bin and contains remarks 
+  on how to "maintain" it correctly  (in short: for general purpose no special attention required)
+
+  17 Jan 2003; Matthew Turk <satai@gentoo.org> :
+  Looks like it didn't take...  Trying again!
+
+  09 Jan 2003; Matthew Turk <satai@gentoo.org> :
+  Changed the docbook-sgml-dtd dependency to one that *exists*.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ghc-5.04.ebuild (08 Aug 2002)
+
+  19 Aug 2002; George Shapovalov <george@gentoo.org> ghc-5.04.ebuild :
+
+  fixed header, added >=dev-libs/gmp-4.1 dependency
+
+  08 Jul 2002; George Shapovalov <george@gentoo.org> ghc-5.04.ebuild, files/ghc-5.04-gentoo.patch.bz2 :
+
+  new version,
+  bzipped patched (too large otherwise),
+  will keep uncompressed for 5.02.3 anc compressed for 5.04 until new version 
+  is tested (to have one working meanwhile)
+
+  ebuild (and large patching work) submitted by:
+  Sven Moritz Hallberg <pesco@gmx.de>
 
 *ghc-5.02.3.ebuild (09 Jun 2002)
+
+  18 Jun 2002; George Shapovalov <george@gentoo.org> ghc-5.02.3.ebuild :
+
+  Few improvements by Sven Moritz Hallberg :
+  Build DocBook documentation only if USEing 'doc'. Require DocBook DTD 3.1 in
+  that case.
+
+  Thanks to a bug report by Matthew Walton I've noticed that GHC requires the
+  DocBook DTD 3.1, not 4.1.
   
   09 Jun 2002; George Shapovalov <george@gentoo.org> all :
   
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 4cc65ad53a78..46a7b3ed488a 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,16 +1,27 @@
-MD5 c75534de5f96044dbe3fe8011853b472 ChangeLog 4002
-MD5 42b857369c2e24507f00520e99fdaf5a ghc-5.02.3.ebuild 7646
-MD5 4e310a2cb7f0093cd85d9a366f2337cc ghc-5.04.2.ebuild 4536
-MD5 53cadcab720c08f0d03fced644adc7ce ghc-5.04.3.ebuild 4536
-MD5 d1ee334700eb465393538865978531b5 ghc-5.04.ebuild 6950
-MD5 1fbd2d6de29f858af95ea050308d4192 ghc-5.04.3-r1.ebuild 6062
-MD5 2891bd736d41f4aeea530385ef426d6d files/digest-ghc-5.02.3 207
-MD5 199f2676b7f849997c3e45c0c604c4a5 files/digest-ghc-5.04 205
-MD5 7bf7dff845836a99f4b08d8b230d916f files/digest-ghc-5.04.2 68
-MD5 a20f2d9eabadd7ed4890784b905f857c files/digest-ghc-5.04.3 68
-MD5 b5a1b76b1e1f437dcf7b9aa4b1545f40 files/ghc-4.08.2-gentoo.patch.bz2 640
-MD5 cc8947705ec2b2a685edb4eefddeebc2 files/ghc-5.02.3-gentoo.patch.bz2 14489
-MD5 1c126024044290a2f7e501c0f4415169 files/ghc-5.04-gentoo.patch.bz2 68891
-MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050
-MD5 d4a4184d5dcf525047332f9c68e522f7 files/ghc-5.04.3-r1.patch 2717
-MD5 a20f2d9eabadd7ed4890784b905f857c files/digest-ghc-5.04.3-r1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 670ea0013a01dc7771a7ee918ae62187 ghc-6.4.1.ebuild 5943
+MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
+MD5 49113531ecf3c15247194f067ffe00bd ghc-6.2.2.ebuild 5582
+MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
+MD5 08638c0fe1ae3a123b5b3b309e23ee49 ghc-6.4.1-r1.ebuild 6223
+MD5 88adcb2e59b27c32144092710b986578 ChangeLog 13242
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 af174f2e566a288f0e2276883a866827 files/ghc-updater 9075
+MD5 7e423c353b08a2c05693d13f21e067d0 files/depsort.py 1958
+MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
+MD5 ffd472c0685cf2766ce6533265f9a3c9 files/ghc-6.4-powerpc.patch 908
+MD5 7c38a5e2d5ecf8446f38ff41fa4d4152 files/digest-ghc-6.4.1-r1 67
+MD5 d417c9e24a826959ad6d921247e43328 files/digest-ghc-6.0.1 67
+MD5 9e9c22452b545fd9ec1367155c15d8e2 files/digest-ghc-6.2.2 67
+MD5 7c38a5e2d5ecf8446f38ff41fa4d4152 files/digest-ghc-6.4.1 67
+MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
+MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDevvtOKSBj1ObwosRApWUAJ4t+guB9YdIySGWKNckpCUZwZuQ2gCfYYPN
+Xx2HJWcBYtZmFq6oGC6AcyU=
+=UQsB
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/digest-ghc-6.2.2 b/dev-lang/ghc/files/digest-ghc-6.2.2
index f022e58da9e8..826a54976458 100644
--- a/dev-lang/ghc/files/digest-ghc-6.2.2
+++ b/dev-lang/ghc/files/digest-ghc-6.2.2
@@ -1 +1 @@
-MD5 8dc5ab2137ef9593f52180b0b2423d7f ghc-6.2.2-src.tar.bz2 5407409
+MD5 42088bff4de30e7c3a277cfa55d5589e ghc-6.2.2-src.tar.bz2 5406427
diff --git a/dev-lang/ghc/files/ghc-updater b/dev-lang/ghc/files/ghc-updater
index c2111b476f02..e013ee931936 100755
--- a/dev-lang/ghc/files/ghc-updater
+++ b/dev-lang/ghc/files/ghc-updater
@@ -120,6 +120,17 @@ elog() {
 
 setup_portdir
 
+find_in_portdir() {
+	local f
+	for f in ${PORTDIR} ${PORTDIR_OVERLAYS}; do
+		if [[ -f "${f}/${1}" ]]; then
+			echo "${f}/${1}"
+			return 0
+		fi
+	done
+	return 1
+}
+
 if [ -z "${PORTDIR}" ]; then
 	eerror "Unable to proceed. Can not find PORTDIR. Make sure the command:"
 	eerror " "
@@ -178,19 +189,24 @@ eloginfo "Calculating Upgrade Package List .."
 
 PKGS_OK=""
 PKGS_MASKED=""
+PKGS_BLOCKED=""
 PKGS_MISSING=""
 
 MASKED_STRING="been masked"
+BLOCKED_STRING="is blocking"
 MISSING_STRING="there are no masked or unmasked ebuilds to satisfy"
 
 for pkg in ${PKGS_TO_REMERGE}; do
-   emerge_output="$(emerge -p \~$pkg 2>&1)"
+   emerge_output="$(emerge -p '>='$pkg 2>&1)"
    if $(echo "${emerge_output}" | grep "${MASKED_STRING}" > /dev/null); then
       PKGS_MASKED="${PKGS_MASKED} $pkg"
-	  elogecho "$pkg is masked"	  
+	  elogecho ">=$pkg is masked"
+   elif $(echo "${emerge_output}" | grep "${BLOCKED_STRING}" > /dev/null); then
+      PKGS_BLOCKED="${PKGS_BLOCKED} $pkg"
+	  elogecho ">=$pkg is blocked"
    elif $(echo "${emerge_output}" | grep "${MISSING_STRING}" > /dev/null); then
       PKGS_MISSING="${PKGS_MISSING} $pkg"
-	  elogecho "$pkg is missing from portage"
+	  elogecho ">=$pkg is missing from portage"
    else
       PKGS_OK="${PKGS_OK} $pkg"
 	  PKGS_COUNT_REMERGE=$((PKGS_COUNT_REMERGE + 1))
@@ -203,11 +219,16 @@ done
 
 eloginfo "Re-ordering packages to merge .."
 
-PKGS_OK_SORTED="$(${PORTAGE_PYTHON} ${PORTDIR}/dev-lang/python/files/depreorder.py ${PKGS_OK} | xargs)"
+DEPSORT=$(find_in_portdir "dev-lang/ghc/files/depsort.py")
+if [[ -z ${DEPSORT} ]]; then
+	eerror "Fatal error: File dev-lang/ghc/files/depsort.py in portage tree."
+	exit 1
+fi
+PKGS_OK_SORTED="$(${PORTAGE_PYTHON} ${DEPSORT} ${PKGS_OK} | xargs)"
 
 eloginfo "Preparing to merge these packages in this order:"
 for pkg in $PKGS_OK_SORTED; do
-	elogecho "$pkg"
+	elogecho ">=$pkg"
 done
 
 # we emerge each package seperately to ensure we know exactly which ones might
@@ -218,7 +239,7 @@ PKGS_FAILED=""
 if [ "${PRETEND}" != "1" ]; then
 	for pkg in ${PKGS_OK_SORTED}; do
 		eloginfo "Starting to merge ($COUNT/$PKGS_COUNT_REMERGE) $pkg .."
-		if ! emerge --oneshot --nodeps \~$pkg; then
+		if ! emerge --oneshot --nodeps '>='$pkg; then
 			PKGS_FAILED="${PKGS_FAILED} $pkg"
 			elogerr "Failed merging $pkg ($COUNT/$PKGS_COUNT_REMERGE)!"
 		fi
@@ -228,11 +249,13 @@ fi
 
 # final output stuff
 OUTPUT_PKGS_MASKED=""
-for pkg in ${PKGS_MASKED}; do OUTPUT_PKGS_MASKED="${OUTPUT_PKGS_MASKED} \~$pkg"; done
+for pkg in ${PKGS_MASKED}; do OUTPUT_PKGS_MASKED="${OUTPUT_PKGS_MASKED} '>='$pkg"; done
+OUTPUT_PKGS_BLOCKED=""
+for pkg in ${PKGS_BLOCKED}; do OUTPUT_PKGS_BLOCKED="${OUTPUT_PKGS_BLOCKED} $pkg"; done
 OUTPUT_PKGS_MISSING=""
 for pkg in ${PKGS_MISSING}; do OUTPUT_PKGS_MISSING="${OUTPUT_PKGS_MISSING} $pkg"; done
 OUTPUT_PKGS_FAILED=""
-for pkg in ${PKGS_FAILED}; do OUTPUT_PKGS_FAILED="${OUTPUT_PKGS_FAILED} \~$pkg"; done
+for pkg in ${PKGS_FAILED}; do OUTPUT_PKGS_FAILED="${OUTPUT_PKGS_FAILED} '>='$pkg"; done
 
 if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
    echo
@@ -250,12 +273,24 @@ if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
       ewarn " emerge -p ${OUTPUT_PKGS_MASKED}"
       echo
    fi
+   if [ -n "${OUTPUT_PKGS_BLOCKED}" ]; then
+      echo
+      ewarn " Blocked Packages:"
+	  ewarn " -----------------"
+      ewarn " These packages are currently blocked; they might not yet"
+      ewarn " be compatible with the current ghc. You can run ghc-updater"
+      ewarn " again at a later time."
+      echo
+      for x in ${OUTPUT_PKGS_BLOCKED}; do 
+         echo "   ${x}"
+      done
+   fi
    if [ -n "${OUTPUT_PKGS_MISSING}" ]; then
       echo
       ewarn " Missing Packages:"
 	  ewarn " -----------------"
-      ewarn " These packages need to be updated because their versions do"
-      ewarn " not exist in portage anymore."
+      ewarn " These packages cannot be updated because they do not exist"
+      ewarn " in portage anymore."
       echo
       for x in ${OUTPUT_PKGS_MISSING}; do 
          echo "   ${x}"
diff --git a/dev-lang/ghc/ghc-6.0.1.ebuild b/dev-lang/ghc/ghc-6.0.1.ebuild
index 0bccf18b884a..0bb2eab354eb 100644
--- a/dev-lang/ghc/ghc-6.0.1.ebuild
+++ b/dev-lang/ghc/ghc-6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.0.1.ebuild,v 1.1 2003/07/31 10:49:24 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.0.1.ebuild,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -34,7 +34,7 @@ SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc -ppc -alpha"
+KEYWORDS="~x86 -sparc -ppc -alpha"
 
 
 PROVIDE="virtual/ghc"
@@ -49,18 +49,19 @@ DEPEND="virtual/ghc
 	>=dev-libs/gmp-4.1
 	doc? ( >=app-text/openjade-1.3.1
 		>=app-text/sgml-common-0.6.3
-		=app-text/docbook-sgml-dtd-3.1-r1
+		~app-text/docbook-sgml-dtd-3.1
 		>=app-text/docbook-dsssl-stylesheets-1.64
 		>=dev-haskell/haddock-0.4
-		tetex? ( >=app-text/tetex-1.0.7
+		tetex? ( virtual/tetex
 			>=app-text/jadetex-3.12 ) )
 	opengl? ( virtual/opengl
 		virtual/glu
 		virtual/glut )"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	>=sys-devel/gcc-2.95.3
 	>=dev-lang/perl-5.6.1
+	>=dev-libs/gmp-4.1
 	opengl? ( virtual/opengl virtual/glu virtual/glut )"
 
 # extend path to /opt/ghc/bin to guarantee that ghc-bin is found
@@ -69,6 +70,9 @@ GHCPATH="${PATH}:/opt/ghc/bin"
 src_unpack() {
 	base_src_unpack
 
+	# haddock-0.6 cannot parse Control/Monad.hs
+	patch -p0 < ${FILESDIR}/ghc-6.0.1.haddock.patch
+
 	# fix libraries/OpenGL/Makefile
 	cd ${S}
 	pushd libraries/OpenGL
@@ -79,10 +83,16 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if [ `use opengl` ]; then
+	if use opengl; then
 		myconf="--enable-hopengl"
 	fi
 
+	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
+	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
+	# new logic for hardened gcc specs file by pappy
+	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
+	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
+
 	# unset SGML_CATALOG_FILES because documentation installation
 	# breaks otherwise ...
 	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
@@ -106,9 +116,9 @@ src_install () {
 	local mydoc
 
 	# determine what to do with documentation
-	if [ `use doc` ]; then
+	if use doc; then
 		mydoc="html"
-		if [ `use tetex` ]; then
+		if use tetex; then
 			mydoc="${mydoc} ps"
 		fi
 	else
diff --git a/dev-lang/ghc/ghc-6.2.2.ebuild b/dev-lang/ghc/ghc-6.2.2.ebuild
index c380f9f3319d..70abfd2f583e 100644
--- a/dev-lang/ghc/ghc-6.2.2.ebuild
+++ b/dev-lang/ghc/ghc-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/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.1 2004/10/18 17:20:50 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -14,7 +14,7 @@
 # can be removed once an forall after the first succesful install
 # of ghc.
 
-inherit base flag-o-matic eutils
+inherit base flag-o-matic eutils ghc-package
 
 IUSE="doc tetex opengl"
 
@@ -25,19 +25,22 @@ SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 -alpha"
+# removed amd64, because there's no binary to bootstrap from
+KEYWORDS="x86 ppc -alpha -amd64 sparc"
 
 
 PROVIDE="virtual/ghc"
 # FIXME: Add USE support for parallel haskell (requires PVM)
 #	 Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="virtual/ghc
+DEPEND="<virtual/ghc-6.3
+	!>=virtual/ghc-6.4
 	>=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/make-3.79.1
 	>=sys-apps/sed-3.02.80
 	>=sys-devel/flex-2.5.4a
 	>=dev-libs/gmp-4.1
+	>=sys-libs/readline-4.2
 	doc? ( >=app-text/openjade-1.3.1
 		>=app-text/sgml-common-0.6.3
 		~app-text/docbook-sgml-dtd-3.1
@@ -53,28 +56,32 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-2.95.3
 	>=dev-lang/perl-5.6.1
 	>=dev-libs/gmp-4.1
+	>=sys-libs/readline-4.2
 	opengl? ( virtual/opengl virtual/glu virtual/glut )"
 
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
 SUPPORTED_CFLAGS=""
 
 # Setup supported CFLAGS.
-setup_cflag() {
+check_cflags() {
 	OLD_CFLAGS="${CFLAGS}"
-	CFLAGS="${CFLAGS} $1"
+	CFLAGS="$1"
 	strip-unsupported-flags
-
-	if [ "${OLD_CFLAGS}" != "${CFLAGS}" ];
-	then
-		SUPPORTED_CFLAGS="$1 ${SUPPORTED_CFLAGS}"
-	fi
+	SUPPORTED_CFLAGS="${SUPPORTED_CFLAGS} ${CFLAGS}"
+	CFLAGS="${OLD_CFLAGS}"
 }
 
 setup_cflags() {
-	setup_cflag "-fno-pic"
-	setup_cflag "-fno-stack-protector"
+	check_cflags "-nopie -fno-stack-protector -fno-stack-protector-all"
+}
+
+pkg_setup() {
+	if ! has_version virtual/ghc; then
+		eerror "This ebuild needs a version of GHC to bootstrap from."
+		eerror "Please emerge dev-lang/ghc-bin to get a binary version."
+		eerror "You can either use the binary version directly or emerge"
+		eerror "dev-lang/ghc afterwards."
+		die "virtual/ghc version required to build"
+	fi
 }
 
 src_unpack() {
@@ -86,9 +93,10 @@ src_unpack() {
 	cd ${S}/ghc
 	pushd driver
 	setup_cflags
+
 	epatch ${FILESDIR}/${PN}-6.2.hardened.patch
-	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS//-f/-optc-f}|" ghc/ghc.sh
-	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS//-f/-optc-f}|" ghci/ghci.sh
+	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghc/ghc.sh
+	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS// -/ -optc-}|" ghci/ghci.sh
 	popd
 }
 
@@ -105,23 +113,22 @@ src_compile() {
 	# patch included)
 	setup_cflags
 	echo "SRC_CC_OPTS+=${SUPPORTED_CFLAGS}" >> mk/build.mk
-	echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS//-f/-optc-f}" >> mk/build.mk
+	echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS// -/ -optc-}" >> mk/build.mk
 
 	# force the config variable ArSupportsInput to be unset;
 	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
 	# incorrectly by the configure script
 	echo "ArSupportsInput:=" >> mk/build.mk
 
-	# Required under ppc to work around some obscure linker problem.
-	if use ppc;
-	then
-		echo "SplitObjs=NO" >> mk/build.mk
-	fi
+	# Required for some architectures, because they don't support ghc fully ...
+	use ppc || use amd64 || use sparc && echo "SplitObjs=NO" >> mk/build.mk
+	use amd64 && echo "GhcUnregisterised=YES" >> mk/build.mk
+	use amd64 || use sparc && echo "GhcWithInterpreter=NO" >> mk/build.mk
 
 	# unset SGML_CATALOG_FILES because documentation installation
 	# breaks otherwise ...
 	# (--enable-threaded-rts is no longer needed)
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
+	SGML_CATALOG_FILES="" econf \
 		${myconf} || die "econf failed"
 
 	# the build does not seem to work all that
@@ -158,11 +165,14 @@ src_install () {
 	fi
 	echo SGMLDocWays="${mydoc}" >> mk/build.mk
 
+	# the libdir0 setting is needed for amd64, and does not
+	# harm for other arches
 	emake -j1 ${insttarget} \
 		prefix="${D}/usr" \
 		datadir="${D}/usr/share/doc/${PF}" \
 		infodir="${D}/usr/share/info" \
 		mandir="${D}/usr/share/man" \
+		libdir0="${D}/usr/$(get_libdir)" \
 		|| die "make ${insttarget} failed"
 
 	#need to remove ${D} from ghcprof script
@@ -174,10 +184,17 @@ src_install () {
 
 	cd ${S}/ghc
 	dodoc README ANNOUNCE LICENSE VERSION
-}
 
+	dosbin ${FILESDIR}/ghc-updater
+}
 
 pkg_postinst () {
+	ghc-reregister
 	einfo "If you have dev-lang/ghc-bin installed, you might"
-	einfo "want to unmerge it again. It is no longer needed."
+	einfo "want to unmerge it. It is no longer needed."
+	einfo
+	ewarn "If you upgrade from another ghc version, please run"
+	ewarn "/usr/sbin/ghc-updater to re-merge all ghc-based"
+	ewarn "Haskell libraries."
 }
+
diff --git a/dev-lang/ghc/ghc-6.4.1-r1.ebuild b/dev-lang/ghc/ghc-6.4.1-r1.ebuild
index 474d5c33f44d..b37bdba5c67e 100644
--- a/dev-lang/ghc/ghc-6.4.1-r1.ebuild
+++ b/dev-lang/ghc/ghc-6.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/dev-lang/ghc/ghc-6.4.1-r1.ebuild,v 1.1 2005/10/21 11:25:42 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -145,6 +145,11 @@ src_compile() {
 	echo "SRC_CC_OPTS+=${SUPPORTED_CFLAGS}" >> mk/build.mk
 	echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS// -/ -optc-}" >> mk/build.mk
 
+	# circumvent a very strange bug that seems related with ghc producing too much
+	# output while being filtered through tee (e.g. due to portage logging)
+	# reported as bug #111183
+	echo "SRC_HC_OPTS+=-fno-warn-deprecations" >> mk/build.mk
+
 	# force the config variable ArSupportsInput to be unset;
 	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
 	# incorrectly by the configure script
diff --git a/dev-lang/ghc/ghc-6.4.1.ebuild b/dev-lang/ghc/ghc-6.4.1.ebuild
index 3bc6d3c65817..82ae90005e25 100644
--- a/dev-lang/ghc/ghc-6.4.1.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1.ebuild,v 1.1 2005/09/22 13:37:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
-# We abandon virtual/ghc in favor of || dependencies.
-# Here's a brief explanation of the new bootstrap logic:
+# Brief explanation of the bootstrap logic:
 #
 # ghc requires ghc-bin to bootstrap.
 # Therefore, 
-# (1) ghc depends on || (ghc-bin ghc)
-# (2) all packages that need ghc do the same
+# (1) both ghc-bin and ghc provide virtual/ghc
+# (2) virtual/ghc *must* default to ghc-bin
+# (3) ghc depends on virtual/ghc
 #
-# Having the binary first everywhere doesn't force
-# anyone to do the full bootstrap. Still, ghc-bin can
-# be removed from a system after the first successful
-# install of ghc.
+# This solution has the advantage that the binary distribution
+# can be removed once an forall after the first succesful install
+# of ghc.
 
 inherit base flag-o-matic eutils ghc-package
 
-IUSE="doc java opengl"
+IUSE="doc opengl"
+#java use flag disabled because of bug #106992
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -34,15 +34,15 @@ SRC_URI="http://www.haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
 # re-add ~ppc64 once dependencies are fulfilled
-KEYWORDS="-alpha ~amd64 ~x86"
+KEYWORDS="-alpha ~amd64 ~x86 ~sparc ~ppc"
 
 S="${WORKDIR}/${MY_P}"
 
-# we still provide virtual/ghc to maintain compatibility for now
 PROVIDE="virtual/ghc"
 
 # ghc cannot usually be bootstrapped using later versions ...
-DEPEND="|| ( <=dev-lang/ghc-bin-6.5 <=dev-lang/ghc-6.5 )
+DEPEND="<virtual/ghc-6.5
+	!>=virtual/ghc-6.6
 	>=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/make-3.79.1
@@ -53,11 +53,11 @@ DEPEND="|| ( <=dev-lang/ghc-bin-6.5 <=dev-lang/ghc-6.5 )
 	doc? (  ~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
 		>=dev-libs/libxslt-1.1.2
-		>=dev-haskell/haddock-0.6-r2
-		java? ( >=dev-java/fop-0.20.5 ) )
+		>=dev-haskell/haddock-0.6-r2 )
 	opengl? ( virtual/opengl
 		virtual/glu
 		virtual/glut )"
+# removed: java? ( >=dev-java/fop-0.20.5 )
 
 RDEPEND="virtual/libc
 	>=sys-devel/gcc-2.95.3
@@ -124,9 +124,9 @@ src_compile() {
 	# determine what to do with documentation
 	if use doc; then
 		mydoc="html"
-		if use java; then
-			mydoc="${mydoc} ps"
-		fi
+#		if use java; then
+#			mydoc="${mydoc} ps"
+#		fi
 	else
 		mydoc=""
 		# needed to prevent haddock from being called
@@ -149,7 +149,7 @@ src_compile() {
 	echo "ArSupportsInput:=" >> mk/build.mk
 
 	# Required for some architectures, because they don't support ghc fully ...
-	use ppc || use ppc64 && echo "SplitObjs=NO" >> mk/build.mk
+	use ppc || use ppc64 || use sparc && echo "SplitObjs=NO" >> mk/build.mk
 	use ppc64 && echo "GhcWithInterpreter=NO" >> mk/build.mk
 
 	econf ${myconf} || die "econf failed"
diff --git a/dev-lang/ghc/ghc-6.4.ebuild b/dev-lang/ghc/ghc-6.4.ebuild
index 6f07d87407cc..5e80425c0421 100644
--- a/dev-lang/ghc/ghc-6.4.ebuild
+++ b/dev-lang/ghc/ghc-6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.ebuild,v 1.1 2005/03/11 16:30:24 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.ebuild,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -32,7 +32,8 @@ SRC_URI="http://www.haskell.org/ghc/dist/${EXTRA_SRC_URI}/${MY_P}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc -alpha ~amd64 -sparc"
+# re-add ~ppc64 once dependencies are fulfilled
+KEYWORDS="-alpha ~amd64 ~ppc ~sparc ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -49,6 +50,8 @@ DEPEND="virtual/ghc
 	>=sys-libs/readline-4.2
 	doc? (  ~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2
+		>=dev-haskell/haddock-0.6-r2
 		java? ( >=dev-java/fop-0.20.5 ) )
 	opengl? ( virtual/opengl
 		virtual/glu
@@ -76,6 +79,9 @@ setup_cflags() {
 	check_cflags "-nopie -fno-stack-protector -fno-stack-protector-all"
 }
 
+# Portage's resolution of virtuals fails on virtual/ghc in some Portage releases,
+# the following function causes the build to fail with an informative error message
+# in such a case.
 pkg_setup() {
 	if ! has_version virtual/ghc; then
 		eerror "This ebuild needs a version of GHC to bootstrap from."
@@ -89,6 +95,9 @@ pkg_setup() {
 src_unpack() {
 	base_src_unpack
 
+	# This patch is needed for both ppc & ppc64
+	epatch ${FILESDIR}/ghc-6.4-powerpc.patch
+
 	# hardened-gcc needs to be disabled, because the
 	# mangler doesn't accept its output; yes, the 6.2 version
 	# should do ...
@@ -111,6 +120,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
+	local mydoc
+
 	if use opengl; then
 		myconf="--enable-hopengl"
 	fi
@@ -121,7 +132,6 @@ src_compile() {
 	# determine what to do with documentation
 	if use doc; then
 		mydoc="html"
-		insttarget="${insttarget} install-docs"
 		if use java; then
 			mydoc="${mydoc} ps"
 		fi
@@ -147,8 +157,8 @@ src_compile() {
 	echo "ArSupportsInput:=" >> mk/build.mk
 
 	# Required for some architectures, because they don't support ghc fully ...
-	use ppc || use amd64 && echo "SplitObjs=NO" >> mk/build.mk
-	use amd64 && echo "GhcUnregisterised=YES" >> mk/build.mk
+	use ppc || use ppc64 || use amd64 && echo "SplitObjs=NO" >> mk/build.mk
+	use amd64 || use ppc64 && echo "GhcWithInterpreter=NO" >> mk/build.mk
 
 	# (--enable-threaded-rts is no longer needed)
 	econf ${myconf} || die "econf failed"
@@ -168,7 +178,6 @@ src_compile() {
 }
 
 src_install () {
-	local mydoc
 	local insttarget
 
 	insttarget="install"
@@ -201,7 +210,7 @@ pkg_postinst () {
 	ghc-reregister
 	einfo "If you have dev-lang/ghc-bin installed, you might"
 	einfo "want to unmerge it. It is no longer needed."
-	einfo " "
+	einfo
 	ewarn "If you upgrade from another ghc version, please run"
 	ewarn "/usr/sbin/ghc-updater to re-merge all ghc-based"
 	ewarn "Haskell libraries."
diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index e200253023f1..f374c5bc3474 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,9 +1,135 @@
 # ChangeLog for dev-lang/gnat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.1 2003/06/17 21:51:47 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
-*gnat-3.14p.ebuild
-*gnat-3.15p.ebuild (17 Jun 2003)
+  15 Nov 2005; <gerr@gentoo.org> gnat-3.44.ebuild:
+  fix for building gnat when older version is already installed (#86484)
+
+*gnat-3.44 (12 Nov 2005)
+
+  12 Nov 2005; <gerr@gentoo.org> +gnat-3.44.ebuild:
+  new version and a new port to amd64 (#64373)
+
+*gnat-3.15p-r5 (23 Apr 2005)
+
+  23 Apr 2005; David Holm <dholm@gentoo.org> +files/gnat-3.15p-nptl.patch,
+  +gnat-3.15p-r5.ebuild:
+  Added patch for NPTL support from Maxim Reznik <reznikmm (at) front (dot)
+  ru>, bug #76491
+
+*gnat-3.15p-r4 (23 Feb 2005)
+
+  23 Feb 2005; David Holm <dholm@gentoo.org> +gnat-3.15p-r4.ebuild:
+  Added fix for glibc-2.3.4 compatibility submitted by Maxim Reznik <reznikmm
+  (at) front (dot) run> (Bug #27683)
+
+  23 Feb 2005; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Stable on ppc
+
+*gnat-3.43 (11 Dec 2004)
+
+  11 Dec 2004; David Holm <dholm@gentoo.org> +gnat-3.43.ebuild:
+  Version bumped, and fixed bug #69118
+
+  29 Nov 2004; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Fixed bug #39958.
+
+  02 Aug 2004; David Holm <dholm@gentoo.org> gnat-3.41.ebuild,
+  -gnat-5.0_pre20030822.ebuild, -gnat-5.0_pre20031005.ebuild:
+  Removed GNAT 5.0 snapshots and added ppc support to 3.41.
+
+*gnat-3.41 (02 Aug 2004)
+
+  02 Aug 2004; David Holm <dholm@gentoo.org> +gnat-3.41.ebuild:
+  Added the new GCC 3.4.1-based GNAT.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> gnat-3.14p.ebuild:
+  Put gnat-3.14p files on Gentoo mirrors.
+
+  16 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gnat-3.15p-r1.ebuild,
+  gnat-3.15p-r2.ebuild:
+  move inherit to the right place
+
+  29 Dec 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Fixed bug #34021 (some symlinks were pointing to /var/tmp).
+
+*gnat-5.0_pre20031005 (06 Oct 2003)
+
+  06 Oct 2003; David Holm <dholm@gentoo.org> gnat-5.0_pre20031005.ebuild:
+  Updated to a new GNAT-5.0 CVS snapshot.
+
+  06 Oct 2003; David Holm <dholm@gentoo.org> gnat-5.0_pre20030822.ebuild:
+  Small fix for installing the bootstrap compiler on x86.
+
+  06 Oct 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild,
+  gnat-5.0_pre20030822.ebuild:
+  Minor gnat-5.0 ebuild fix.
+  Moved gnat-3.15p-r3 to stable on x86.
+
+  04 Oct 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild,
+  files/gnat-3.15p-i686-pc-linux-gnu-bin.patch:
+  Added installation fix on x86 submitted by Olivier Crete <tester@gentoo.org>.
+
+  30 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Added some more compilation fixes for x86 along with more descripting error
+  messages.
+
+  30 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Compile gnat with "-O2 -gnatpgn" and without "-fPIC" (for static libs) as
+  suggested by Maxim Reznik <max1@mbank.com.ua>. Validated with acats4gnat 0.7.
+
+  29 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Fixed a minor build problem on x86.
+
+*gnat-3.15p-r3 (28 Sep 2003)
+
+  28 Sep 2003; David Holm <dholm@gentoo.org>
+  gnat-3.15p-r3.ebuild, files/gnat-3.15p-gentoo.patch.bz2,
+  files/gnat-3.15p-noaddr2line.patch.bz2:
+  Added gnat-3.15p-r3 which has now passed 26/26 of ACATS tests on x86 and 24/26
+  on ppc (because ppc does not provide a threading system yet).
+
+  20 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r2.ebuild:
+  Placed the powerpc bootstrap compiler on dev.gentoo.org while rsync is being
+  fixed (suggested by seemant).
+
+  18 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r2.ebuild:
+  I forgot to set the CFLAGS before running configure which would cause a
+  failure with unstripped flags in make.conf.
+
+  18 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r2.ebuild,
+  files/gnat-3.15p-gentoo-nonx86.patch.bz2:
+  After a lot of hard work I finally managed to compile a bootstrap compiler for
+  ppc. Currently the ppc version uses a simpler thread model than the x86
+  version, I will look into this at a later time.
+
+  14 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r2.ebuild:
+  Do not attempt any kind of optimizations. This will hopefully clear bug #27683.
+
+*gnat-5.0_pre20030822 (27 Aug 2003)
+
+  27 Aug 2003; David Holm <dholm@gentoo.org> gnat-5.0_pre20030822.ebuild:
+  Added a gnat 5.0 CVS snapshot. It is masked in package.mask because it is
+  unstable, but some people might want it for updating their code or simply to
+  test the new gcc 3-based backend.
+
+  17 Aug 2003; David Holm <dholm@gentoo.org> metadata.xml:
+  Added metadata.xml
+
+*gnat-3.15p-r2 (13 Aug 2003)
+
+  13 Aug 2003; George Shapovalov <george@gentoo.org> gnat-3.15p-r2.ebuild, files/gnat-3.15p-gentoo.patch.bz2 :
+  new revision (#26542) by dholm, fixes #26461 + libs were moved under /usr/lib/ada to 
+  avoid any possible interaction with gcc
+
+*gnat-3.15p-r1 (24 Jul 2003)
+
+  24 Jul 2003; George Shapovalov <george@gentoo.org> gnat-3.15p-r1.ebuild :
+  new revision (by David Holm <dholm@delia.com>) - installs docs + few minor cleanups
+  also static libraries are now installed as well.
+
+*gnat-3.14p (17 Jun 2003)
+*gnat-3.15p (17 Jun 2003)
 
   17 Jun 2003; George Shapovalov <george@gentoo.org> gnat-3.14p.ebuild, gnat-3.14p.ebuild, Manifest, files/digest-gnat-3.1{4,5}p :
   initial release (#13113)
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index 6f385d2d7829..88c4554a30f3 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,5 +1,23 @@
-MD5 981a4dc673c13863b938aaea8d63f7c6 gnat-3.14p.ebuild 5339
-MD5 ed3f5914ed0bad0719551af83891cb8a gnat_inst.log 96002
-MD5 619f99d2a8e83959c2a204bc13ddf085 gnat-3.15p.ebuild 5427
+MD5 e4f4bcb22759655ce164c0b5a903d677 ChangeLog 5452
 MD5 59500f81e672cff22232586fc278547b files/digest-gnat-3.14p 213
 MD5 737e39907fb4f28640a1b4cbbc1cdc78 files/digest-gnat-3.15p 216
+MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r3 378
+MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r4 378
+MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r5 378
+MD5 ffcd9ae5ebd258ffd9c88fc3cf225bd6 files/digest-gnat-3.41 315
+MD5 119e0c400e71cdafcfb3eeca106c7029 files/digest-gnat-3.43 315
+MD5 24fa8c7547a59391c65d8a1f6e28e0ae files/digest-gnat-3.44 382
+MD5 6055ef6f0b3cd0df65743bfedb9de925 files/gnat-3.15p-gentoo-nonx86.patch.bz2 2112
+MD5 f2825770e20893d32738f4106cd3d628 files/gnat-3.15p-gentoo.patch.bz2 3754
+MD5 6c454f942791a6212d8b5cf5c92aa2d0 files/gnat-3.15p-i686-pc-linux-gnu-bin.patch 605
+MD5 7fabcf7198fb4001adfba250899e0024 files/gnat-3.15p-noaddr2line.patch.bz2 542
+MD5 5d64753ce1119bb193bf3c09b43e87b0 files/gnat-3.15p-nptl.patch 1965
+MD5 86fdf8a4f3d7e83edb3bcc0613692225 gnat-3.14p.ebuild 5599
+MD5 ca3b64c8223c3f3781cfe65e4e224ee6 gnat-3.15p-r3.ebuild 6070
+MD5 7d626d97f619615a5722cf1e86d673b2 gnat-3.15p-r4.ebuild 5760
+MD5 9e647fec72de0891860dccad0a12c86a gnat-3.15p-r5.ebuild 5769
+MD5 608766ca2b3f1891c60dc4bf831bf14a gnat-3.15p.ebuild 5655
+MD5 7e1abff13d1add33756c2f586bbb5e63 gnat-3.41.ebuild 4012
+MD5 140f94774ca1df5f61298c4a7982bf3a gnat-3.43.ebuild 4041
+MD5 bd37532108bfba18f717badc3e27ae3b gnat-3.44.ebuild 5491
+MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
diff --git a/dev-lang/gnat/files/digest-gnat-3.41 b/dev-lang/gnat/files/digest-gnat-3.41
index 7f9595fe7070..5fd749ffc912 100644
--- a/dev-lang/gnat/files/digest-gnat-3.41
+++ b/dev-lang/gnat/files/digest-gnat-3.41
@@ -1,3 +1,4 @@
 MD5 4b05b134baf92457494a0f4a28aa5213 gcc-core-3.4.1.tar.bz2 12862544
 MD5 30128194f14bda7cead8f46d9a62a06e gcc-ada-3.4.1.tar.bz2 3460295
 MD5 57c060cd1ccef8b1ae9165b11d98780a gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz 13482938
+MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
diff --git a/dev-lang/gnat/files/gnat-3.15p-gentoo.patch.bz2 b/dev-lang/gnat/files/gnat-3.15p-gentoo.patch.bz2
index 8d3a939c62d0..d5ab8ae3cf1d 100644
--- a/dev-lang/gnat/files/gnat-3.15p-gentoo.patch.bz2
+++ b/dev-lang/gnat/files/gnat-3.15p-gentoo.patch.bz2
diff --git a/dev-lang/gnat/gnat-3.14p.ebuild b/dev-lang/gnat/gnat-3.14p.ebuild
index 13a1ab21d18f..88a5ca294111 100644
--- a/dev-lang/gnat/gnat-3.14p.ebuild
+++ b/dev-lang/gnat/gnat-3.14p.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.14p.ebuild,v 1.1 2003/06/17 21:51:48 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.14p.ebuild,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
 #
 # Never replace this with the Ada compiler in the gcc tree. They are based
 # on the same source but this is the official validated compiler from ACT.
@@ -20,8 +20,8 @@
 DESCRIPTION="GNAT Ada Compiler"
 DEPEND="app-shells/tcsh"
 RDEPEND=""
-SRC_URI="http://gd.tuwien.ac.at/languages/ada/gnat/${PV}/${P}-src.tgz
-	http://gd.tuwien.ac.at/languages/ada/gnat/${PV}/${P}-i686-pc-linux-gnu-bin.tar.gz
+SRC_URI="mirror://gentoo/${P}-src.tgz
+	mirror://gentoo/${P}-i686-pc-linux-gnu-bin.tar.gz
 	ftp://gcc.gnu.org/pub/gcc/old-releases/gcc-2/gcc-2.8.1.tar.bz2"
 HOMEPAGE="http://www.gnat.com/"
 
diff --git a/dev-lang/gnat/gnat-3.15p-r3.ebuild b/dev-lang/gnat/gnat-3.15p-r3.ebuild
index 35bc74ea5af2..7473720339fe 100644
--- a/dev-lang/gnat/gnat-3.15p-r3.ebuild
+++ b/dev-lang/gnat/gnat-3.15p-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r3.ebuild,v 1.1 2003/09/28 10:25:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r3.ebuild,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
+
+inherit gnat
 
 DESCRIPTION="The GNU Ada Toolkit"
 DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
@@ -13,7 +15,7 @@ SRC_URI="http://gd.tuwien.ac.at/languages/ada/gnat/${PV}/${P}-src.tgz
 HOMEPAGE="http://www.gnat.com/"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 LICENSE="GMGPL"
 IUSE=""
 
@@ -29,7 +31,7 @@ case ${ARCH} in
 			;;
 esac
 
-inherit gnat
+CFLAGS="-O2 -gnatpgn"
 
 src_unpack() {
 	unpack ${A}
@@ -37,6 +39,7 @@ src_unpack() {
 	# Install the bootstrap compiler
 	if [ "${ARCH}" = "x86" ]; then
 		cd "${GNATBOOTINST}"
+		patch -p1 < ${FILESDIR}/gnat-3.15p-i686-pc-linux-gnu-bin.patch
 		echo $'\n'3$'\n'${GNATBOOT}$'\n' | ./doconfig > doconfig.log 2>&1
 		./doinstall
 	fi
@@ -49,23 +52,24 @@ src_unpack() {
 	bzcat "${FILESDIR}/${P}-gentoo.patch.bz2" | patch -p1
 	touch ada/treeprs.ads ada/a-[es]info.h ada/nmake.ad[bs]
 
-	if [ "${ARCH}" != "x86" ]; then
+	# Make $local_prefix point to $prefix
+	sed -i -e "s/@local_prefix@/@prefix@/" "${S}/Makefile.in"
+
+	#if [ "${ARCH}" != "x86" ]; then
 		cd "${S}"
 		bzcat "${FILESDIR}/${P}-noaddr2line.patch.bz2" | patch -p1
-	fi
+		sed -i -e "s/-laddr2line//g" ada/Makefile.in
+	#fi
 }
 
 src_compile() {
 	local PATH="${GNATBOOT}/bin:${PATH}"
-	if [ -z ${GNATBOOTINST} ]; then
-		local LDFLAGS="-L${GNATBOOTINST}"
+	local LDFLAGS="-L${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/2.8.1"
+	if [ -d ${GNATBOOTINST} ]; then
+		local LDFLAGS="-L${GNATBOOTINST} ${LDFLAGS}"
 	fi
 
-	# Make $local_prefix point to $prefix
-	sed -i -e "s/@local_prefix@/@prefix@/" "${S}/Makefile.in"
-
 	# Configure gcc
-	local CFLAGS="-O0"
 	cd "${S}"
 	econf --libdir=/usr/lib/ada --program-prefix=gnat \
 		|| die "./configure failed"
@@ -76,20 +80,25 @@ src_compile() {
 
 	# Compile it by first using the bootstrap compiler and then bootstrapping
 	# our own version. Finally compile the libraries and tools.
-	make CC="gcc" CFLAGS="-O0" LANGUAGES="c ada gcov" || \
+	einfo "Building compiler"
+	make CC="gcc" CFLAGS="${CFLAGS}" LANGUAGES="c ada gcov" ||
 		die "Failed while running inital compilation!"
-	make CC="gcc" CFLAGS="-O0" LANGUAGES="c ada gcov" bootstrap || \
+	make CC="gcc" CFLAGS="${CFLAGS}" LANGUAGES="c ada gcov" bootstrap ||
 		die "Died while bootstrapping!"
-	make CC="gcc" CFLAGS="-O0" GNATLIBCFLAGS="-O0" gnatlib-shared || \
+	einfo "Building shared gnatlib"
+	make CC="gcc" CFLAGS="${CFLAGS}" GNATLIBCFLAGS="${CFLAGS} -fPIC" \
+		gnatlib-shared ||
 		die "Failed to build the shared version of gnatlib!"
-	make CC="gcc" CFLAGS="-O0" gnattools || \
+	einfo "Building gnattools"
+	make CC="gcc" CFLAGS="${CFLAGS}" gnattools ||
 		die "Failed to build gnattools!"
 }
 
 src_install() {
 	local PATH="${GNATBOOT}/bin:${PATH}"
-	if [ -z ${GNATBOOTINST} ]; then
-		local LDFLAGS="-L${GNATBOOTINST}"
+	local LDFLAGS="-L${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/2.8.1"
+	if [ -d ${GNATBOOTINST} ]; then
+		local LDFLAGS="${LDFLAGS} -L${GNATBOOTINST}"
 	fi
 
 	# Install gnatgcc, tools and native threads library
@@ -100,7 +109,8 @@ src_install() {
 	touch "${D}/usr/lib/ada/gcc-lib/${CHOST}/2.8.1/include/float.h"
 
 	# Build and install the static version of gnatlib
-	make CC="gcc" CFLAGS="-O0" GNATLIBCFLAGS="-O0 -fPIC" gnatlib ||
+	einfo "Building static gnatlib"
+	make CC="gcc" CFLAGS="${CFLAGS}" GNATLIBCFLAGS="${CFLAGS}" gnatlib ||
 		die "Failed while compiling static gnatlib!"
 	make prefix="${D}/usr" libdir="${D}/usr/lib/ada" \
 		LANGUAGES="c ada gcov" GCC_INSTALL_NAME=gnatgcc install-gnatlib ||
@@ -118,7 +128,8 @@ src_install() {
 
 		# Compile and install the FSU threads library
 		rm stamp-gnatlib1
-		make CC="gcc" CFLAGS="-O0" GNATLIBCFLAGS="-O0 -fPIC" \
+		einfo "Building FSU-threads runtime"
+		make CC="gcc" CFLAGS="${CFLAGS}" GNATLIBCFLAGS="${CFLAGS} -fPIC" \
 			THREAD_KIND="fsu" gnatlib-shared
 		make prefix="${D}/usr" libdir="${D}/usr/lib/ada" install-gnatlib
 		cd "${D}/usr/lib/ada/gcc-lib/${CHOST}/2.8.1"
@@ -140,6 +151,13 @@ src_install() {
 		chmod +x "${D}/usr/bin"
 	fi
 
+	# Fix broken symlinks
+	cd ${D}/usr/lib/ada/gcc-lib/${CHOST}/2.8.1/adalib
+	rm -f libgnarl.so
+	rm -f liblibgnat.so
+	ln -sf libgnarl-3.15.so libgnarl.so
+	ln -sf libgnat-3.15.so libgnat.so
+
 	# Install documentation and examples
 	cd ${WORKDIR}/${P}-src
 	dodoc COPYING README
diff --git a/dev-lang/gnat/gnat-3.15p-r4.ebuild b/dev-lang/gnat/gnat-3.15p-r4.ebuild
index c52e2f8882e4..795deac95306 100644
--- a/dev-lang/gnat/gnat-3.15p-r4.ebuild
+++ b/dev-lang/gnat/gnat-3.15p-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r4.ebuild,v 1.1 2005/02/23 16:14:41 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r4.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
 inherit gnat
 
diff --git a/dev-lang/gnat/gnat-3.15p-r5.ebuild b/dev-lang/gnat/gnat-3.15p-r5.ebuild
index 50895147bad9..0667ea00a440 100644
--- a/dev-lang/gnat/gnat-3.15p-r5.ebuild
+++ b/dev-lang/gnat/gnat-3.15p-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/dev-lang/gnat/gnat-3.15p-r5.ebuild,v 1.1 2005/04/23 12:54:03 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r5.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
 inherit eutils gnat
 
diff --git a/dev-lang/gnat/gnat-3.15p.ebuild b/dev-lang/gnat/gnat-3.15p.ebuild
index 78eb84d7d825..7a9ef09e4a5e 100644
--- a/dev-lang/gnat/gnat-3.15p.ebuild
+++ b/dev-lang/gnat/gnat-3.15p.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p.ebuild,v 1.1 2003/06/17 21:51:48 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 #
 # Never replace this with the Ada compiler in the gcc tree. They are based
 # on the same source but this is the official validated compiler from ACT.
@@ -126,7 +126,7 @@ src_install() {
 	cp "${GNATBOOTINST}/gnathtml.pl" "${D}/usr/bin"
 	chmod +x "${D}/usr/bin"
 
-    # Make native threads the default
+	# Make native threads the default
 	dosym /usr/lib/gcc-lib/${CHOST}/2.8.1/rts-native/adalib \
 		/usr/lib/gcc-lib/${CHOST}/2.8.1/
 	dosym /usr/lib/gcc-lib/${CHOST}/2.8.1/rts-native/adainclude \
diff --git a/dev-lang/gnat/gnat-3.41.ebuild b/dev-lang/gnat/gnat-3.41.ebuild
index 21188c6659dd..35c65d3eeb09 100644
--- a/dev-lang/gnat/gnat-3.41.ebuild
+++ b/dev-lang/gnat/gnat-3.41.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.41.ebuild,v 1.1 2004/08/02 07:46:20 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.41.ebuild,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
 
 inherit gnat
 
@@ -8,19 +8,27 @@ MY_PV=3.4.1
 DESCRIPTION="GNAT Ada Compiler"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${MY_PV}/gcc-core-${MY_PV}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${MY_PV}/gcc-ada-${MY_PV}.tar.bz2
-	x86? ( http://gd.tuwien.ac.at/languages/ada/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz )"
+	x86? ( http://gd.tuwien.ac.at/languages/ada/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz )
+	ppc? ( mirror://gentoo/gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 )"
 HOMEPAGE="http://www.gnat.com/"
 
 DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GMGPL"
 IUSE=""
 
 S="${WORKDIR}/gcc-${MY_PV}"
 GNATBUILD="${WORKDIR}/build"
-GNATBOOT="${WORKDIR}/boot"
-GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+case ${ARCH} in
+	x86)	GNATBOOT="${WORKDIR}/boot"
+			GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+			;;
+	ppc)
+			GNATBOOT="${WORKDIR}/gnat-3.15p-powerpc-unknown-linux-gnu"
+			;;
+esac
+
 
 CFLAGS="-O -gnatpgn"
 
@@ -28,10 +36,12 @@ src_unpack() {
 	unpack ${A}
 
 	# Install the bootstrap compiler
-	cd "${GNATBOOTINST}"
-	patch -p1 < ${FILESDIR}/gnat-3.15p-i686-pc-linux-gnu-bin.patch
-	echo $'\n'3$'\n'${GNATBOOT}$'\n' | ./doconfig > doconfig.log 2>&1
-	./doinstall
+	if [ "${ARCH}" = "x86" ]; then
+		cd "${GNATBOOTINST}"
+		patch -p1 < ${FILESDIR}/gnat-3.15p-i686-pc-linux-gnu-bin.patch
+		echo $'\n'3$'\n'${GNATBOOT}$'\n' | ./doconfig > doconfig.log 2>&1
+		./doinstall
+	fi
 
 	# Prepare the gcc source directory
 	cd "${S}"
diff --git a/dev-lang/gnat/gnat-3.43.ebuild b/dev-lang/gnat/gnat-3.43.ebuild
index beb6f244b9e9..05aae289d28d 100644
--- a/dev-lang/gnat/gnat-3.43.ebuild
+++ b/dev-lang/gnat/gnat-3.43.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.43.ebuild,v 1.1 2004/12/11 20:10:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.43.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
 inherit gnat
 
diff --git a/dev-lang/gnat/gnat-3.44.ebuild b/dev-lang/gnat/gnat-3.44.ebuild
index a79b83ad71c2..c6ca54c63080 100644
--- a/dev-lang/gnat/gnat-3.44.ebuild
+++ b/dev-lang/gnat/gnat-3.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44.ebuild,v 1.1 2005/11/13 17:46:20 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
 inherit gnat flag-o-matic
 
@@ -25,13 +25,19 @@ IUSE=""
 S="${WORKDIR}/gcc-${MY_PV}"
 GNATBUILD="${WORKDIR}/build"
 case ${ARCH} in
-	x86)	GNATBOOT="${WORKDIR}/boot"
-			GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+	x86)
+		GNATBOOT="${WORKDIR}/boot"
+		GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
 		;;
-	ppc)	GNATBOOT="${WORKDIR}/gnat-3.15p-powerpc-unknown-linux-gnu"
-		;;
-	amd64)	GNATBOOT="${WORKDIR}/usr"
+	ppc)
+		GNATBOOT="${WORKDIR}/gnat-3.15p-powerpc-unknown-linux-gnu"
+		GNATBOOTINST="${GNATBOOT}"
+		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
 		;;
+	amd64)
+		GNATBOOT="${WORKDIR}/usr"
+		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc"
 esac
 
 #needed for shared libs
@@ -65,17 +71,22 @@ src_unpack() {
 
 src_compile() {
 	# Set some paths to our bootstrap compiler.
-	case ${ARCH} in
-		x86)    local GCC_EXEC_PREFIX="${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/3.2.3"
-			;;
-		amd64)	local GCC_EXEC_PREFIX="${GNATBOOT}/lib/gcc/x86_64-linux/3.4.5"
-			;;
-	esac
+	local GCC_EXEC_PREFIX=$(echo ${GCC_EXEC_BASE}/*/*)
 	local PATH="${GNATBOOT}/bin:${PATH}"
+
+	# hopefully this will catch one that works
+	local ADA_OBJECTS_PATH
+	local ADA_INCLUDE_PATH
+	for x in $(find "${GCC_EXEC_PREFIX}" -name adalib); do
+	   ADA_OBJECTS_PATH="${x}:${ADA_OBJECTS_PATH}"
+	done
+	for x in $(find "${GCC_EXEC_PREFIX}" -name adainclude); do
+	   ADA_INCLUDE_PATH="${x}:${ADA_INCLUDE_PATH}"
+	done
+
 	local LDFLAGS="-L${GCC_EXEC_PREFIX} -L${GNATBOOTINST}"
 	local CC="${GNATBOOT}/bin/gcc"
-	#simply assigning LD_LIBRARY_PATH, like with the other vars, does not work
-	export "LD_LIBRARY_PATH=${GNATBOOT}/lib"
+	export LD_LIBRARY_PATH="${GNATBOOT}/lib"
 
 	# Configure gcc
 	cd "${GNATBUILD}"
diff --git a/dev-lang/gnu-smalltalk/ChangeLog b/dev-lang/gnu-smalltalk/ChangeLog
index 793a29cf9a12..c964955b6706 100644
--- a/dev-lang/gnu-smalltalk/ChangeLog
+++ b/dev-lang/gnu-smalltalk/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for dev-lang/gnu-smalltalk
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.1 2004/07/09 04:34:37 mkennedy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/ChangeLog,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
+
+  07 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  gnu-smalltalk-2.1.12.ebuild:
+  Keywording ~amd64.
+
+  13 Sep 2005; Ferris McCormick <fmccor@gentoo.org>
+  gnu-smalltalk-2.1.12.ebuild:
+  Add ~sparc keyword.  Appears to build and run fine.
+
+*gnu-smalltalk-2.1.12 (05 Sep 2005)
+
+  05 Sep 2005; Luis F. Araujo <araujo@gentoo.org>
+  +gnu-smalltalk-2.1.12.ebuild:
+  Added new version of GST. Many bugs fixed in the package and the ebuild.
+  (proper amd64 support now, recreate an image with the right kernel path).
+
+  22 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  gnu-smalltalk-2.1.11.ebuild:
+  Add ~sparc keyword.  Builds and runs all tests successfully, and
+  gst has run well on sparc systems for years.
+
+*gnu-smalltalk-2.1.11 (18 Aug 2005)
+
+  18 Aug 2005; Luis F. Araujo <araujo@gentoo.org>
+  +files/2.1.11-gst-image-temp.patch, +gnu-smalltalk-2.1.11.ebuild:
+  Added new version of GNU SmallTalk. Changed some commands to use
+  ebuilds-scripts
+
+  17 May 2005; Luis F. Araujo <araujo@gentoo.org>
+  gnu-smalltalk-2.1.10-r1.ebuild:
+  Change inheriting gcc by toolchain-funcs
+
+*gnu-smalltalk-2.1.10-r1 (09 Apr 2005)
+
+  09 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  -files/2.1.8-gst-package-mktemp-gentoo.patch, -gnu-smalltalk-2.1.8.ebuild,
+  -gnu-smalltalk-2.1.10.ebuild, +gnu-smalltalk-2.1.10-r1.ebuild:
+  Corrected permissions on installed packages.xml (was previously root user
+  read/write)
+
+  03 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  files/50gnu-smalltalk-gentoo.el:
+  Autoload for gst
+
+  03 Apr 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  files/50gnu-smalltalk-gentoo.el, gnu-smalltalk-2.1.10.ebuild:
+  Correct messy Emacs Lisp installation; Include autoload for Emacs
+  interactive function: smalltalk-mode.
+
+  31 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  gnu-smalltalk-2.1.10.ebuild:
+  Fixed tcltk typo
+
+*gnu-smalltalk-2.1.10 (31 Mar 2005)
+
+  31 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/2.1.10-gst-image-temp.patch, metadata.xml,
+  +gnu-smalltalk-2.1.10.ebuild:
+  New upstream version; Resolves Bug #78880; Update contributed by Luis F.
+  Araujo <araujo@gentoo.org>; Created Luis maintainer entry to metadata.xml.
+
+  18 Aug 2004; <mkennedy@gentoo.org> gnu-smalltalk-2.1.8.ebuild:
+  Fixed problem with configuration parameters when tcltk is not in USE
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> gnu-smalltalk-2.1.8.ebuild:
+  Added to ~ppc.
 
 *gnu-smalltalk-2.1.8 (08 Jul 2004)
 
diff --git a/dev-lang/gnu-smalltalk/Manifest b/dev-lang/gnu-smalltalk/Manifest
index 8188bcdb56d5..f11b9137eb05 100644
--- a/dev-lang/gnu-smalltalk/Manifest
+++ b/dev-lang/gnu-smalltalk/Manifest
@@ -1,4 +1,18 @@
-MD5 381e4c2332281d7db7744ba7fa23368a gnu-smalltalk-2.1.8.ebuild~ 1434
-MD5 258106bd90a4f29da0fcfa959177a562 gnu-smalltalk-2.1.8.ebuild 1422
-MD5 c67d223b05922d506793147ed4a212f4 metadata.xml 562
-MD5 66ddf9dc07f2331955851bc54cb3b17f files/digest-gnu-smalltalk-2.1.8 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 316815e07c78fed5846c4e8af781f5c5 ChangeLog 2900
+MD5 21a8210b48bb02fc7aad1a7d58bd7c1d files/2.1.11-gst-image-temp.patch 2123
+MD5 1b43b00217fd402ab0f309202f633e46 files/50gnu-smalltalk-gentoo.el 268
+MD5 96390d8b21fc85acdf2e84a2d91c6a66 files/digest-gnu-smalltalk-2.1.11 69
+MD5 4335632b4c5c11b3d8d38f821befc042 files/digest-gnu-smalltalk-2.1.12 69
+MD5 4e2c598e8cb4ff972704246ffa0af579 gnu-smalltalk-2.1.11.ebuild 2193
+MD5 8838f154d2c96b317aa09d9d8fb8ec06 gnu-smalltalk-2.1.12.ebuild 2208
+MD5 54532d9cd3833e3c65d9136f3a1b6458 metadata.xml 630
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRpLcyiNZaEAZA+ARAna4AJ41koE0q/WVzrPQo2ASkCk2HDFFYQCbBBBn
+3MsE70KOPIx+cDv/GP93k+A=
+=+YkH
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/gnu-smalltalk/files/50gnu-smalltalk-gentoo.el b/dev-lang/gnu-smalltalk/files/50gnu-smalltalk-gentoo.el
index 1915d5c15d97..e9e18d43bb3c 100644
--- a/dev-lang/gnu-smalltalk/files/50gnu-smalltalk-gentoo.el
+++ b/dev-lang/gnu-smalltalk/files/50gnu-smalltalk-gentoo.el
@@ -2,4 +2,6 @@
 ;;; gnu-smalltalk site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.st\\'" . smalltalk-mode))
\ No newline at end of file
+(autoload 'smalltalk-mode "smalltalk-mode" "Autoload for smalltalk-mode" t)
+(autoload 'gst "gst-mode" "Autoload for gst" t)
+(add-to-list 'auto-mode-alist '("\\.st\\'" . smalltalk-mode))
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.11.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.11.ebuild
index 193c8f9ad290..2a1c6fb5f61f 100644
--- a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.11.ebuild
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.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/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.11.ebuild,v 1.1 2005/08/18 01:56:19 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.11.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
 inherit elisp-common flag-o-matic eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/smalltalk/smalltalk.html"
 SRC_URI="http://ftp.gnu.org/gnu/smalltalk/smalltalk-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~sparc ~x86"
 IUSE="tcltk readline emacs gtk gmp"
 
 DEPEND="sys-libs/gdbm
diff --git a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
index ea29619fe708..1be96f572575 100644
--- a/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
+++ b/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild,v 1.1 2005/09/05 19:40:52 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnu-smalltalk/gnu-smalltalk-2.1.12.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
 inherit elisp-common flag-o-matic eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/smalltalk/smalltalk.html"
 SRC_URI="http://ftp.gnu.org/gnu/smalltalk/smalltalk-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~sparc ~x86 ~amd64"
 IUSE="tcltk readline emacs gtk gmp"
 
 DEPEND="sys-libs/gdbm
diff --git a/dev-lang/gnu-smalltalk/metadata.xml b/dev-lang/gnu-smalltalk/metadata.xml
index 7ea302df6fe0..42f65c4d2405 100644
--- a/dev-lang/gnu-smalltalk/metadata.xml
+++ b/dev-lang/gnu-smalltalk/metadata.xml
@@ -5,6 +5,9 @@
   <maintainer>
     <email>mkennedy@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>araujo@gentoo.org</email>
+  </maintainer>
   <longdescription>
     GNU Smalltalk is a free implementation of the Smalltalk-80
     language which runs on most versions on Unix and, in general,
diff --git a/dev-lang/gpc/ChangeLog b/dev-lang/gpc/ChangeLog
index f0af4d4587af..94b7a09c2f2a 100644
--- a/dev-lang/gpc/ChangeLog
+++ b/dev-lang/gpc/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for dev-lang/gpc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/ChangeLog,v 1.1 2002/04/11 05:35:39 george Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:44 chriswhite Exp $
+
+*gpc-20050331 (17 Apr 2005)
+
+  17 Apr 2005; George Shapovalov <george@gentoo.org> gpc-20050331.ebuild :
+  new version, works with gcc-3.4.3 (#74887, #87619)
+  will remove 20040516 when this one is tested
+
+  11 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> -gpc-20030209.ebuild:
+  removed - old and with QA issues.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gpc-20030209.ebuild,
+  gpc-20040516.ebuild:
+  virtual/glibc -> virtual/libc
+
+  14 Jun 2004; George Shapovalov <george@gentoo.org> gpc-20040516.ebuild :
+  parallel build fails, fixed to use "emake -j1"
+
+  12 Jun 2004; George Shapovalov <george@gentoo.org> gpc-20040516.ebuild :
+  new beta out (this package does not have releases at all :), even betas are one a few years)
+  much cleaned and improved ebuild (#48377);
+  removed gpc-2.1
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> gpc-20030209.ebuild:
+  Fix use invocation
+
+*gpc-20030209 (14 Feb 2003)
+
+  14 Feb 2003; George Shapovalov <george@gentoo.org> gpc-20030209.ebuild, files/digest-gpc-20030209 :
+
+  new version, now works with gcc-3.x
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gpc-2.1 (10 May 2002)
+
+  gpc-2.1 has been released. Updated ebuild and removed pre-release versions
+  (otherwise naming conflict is developed - 2.1 is seen as older version 
+  than daily builds)
+
+*gpc-20020410,  (13 Apr 2002)
+
+  10 Apr 2002; G Shapovalov <george@gentoo.org> ChangeLog :
+
+  gpc-r6 has been released. Updated ebuild to use this version (ebuild rename sufficed).
 
 *gpc-20020402,  (10 Apr 2002)
 
diff --git a/dev-lang/gpc/Manifest b/dev-lang/gpc/Manifest
index e69de29bb2d1..7cc4e472546c 100644
--- a/dev-lang/gpc/Manifest
+++ b/dev-lang/gpc/Manifest
@@ -0,0 +1,6 @@
+MD5 1f77a71e0c3fa6606ca65ded8517ba0c gpc-20050331.ebuild 4421
+MD5 18b0357cd7e1abeabb5072b7989b72ad gpc-20040516.ebuild 4518
+MD5 20834287e8e388217c224d8d2d802782 ChangeLog 2197
+MD5 1895a0b05d28c3ad7eaabcd41791e3eb metadata.xml 224
+MD5 7d39eec7b0bdf6f3ba14b266f4799d2a files/digest-gpc-20040516 129
+MD5 1ae0cf0dc51fa1811dc89ec5f4a1ccb4 files/digest-gpc-20050331 130
diff --git a/dev-lang/gpc/gpc-20040516.ebuild b/dev-lang/gpc/gpc-20040516.ebuild
index 22b6e849f2de..648a13e34696 100644
--- a/dev-lang/gpc/gpc-20040516.ebuild
+++ b/dev-lang/gpc/gpc-20040516.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20040516.ebuild,v 1.1 2004/06/13 01:01:55 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20040516.ebuild,v 1.1.1.1 2005/11/30 09:58:44 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,10 +19,10 @@ SRC_URI="http://gnu-pascal.de/beta/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~sparc"
 IUSE="nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 		=sys-devel/gcc-${GCC_PV}*"
 
 S="${WORKDIR}/gcc-${GCC_PV}"
@@ -98,12 +98,9 @@ src_compile() {
 
 	touch ${S}/gcc/c-gperf.h
 
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
 	einfo "Building GPC..."
 	# Fix for our libtool-portage.patc
-	S="${WORKDIR}/build" emake LIBPATH="${LIBPATH}" || die "make failed"
+	S="${WORKDIR}/build" emake -j1 LIBPATH="${LIBPATH}" || die "make failed"
 
 #	P="${SAVEP}"
 }
diff --git a/dev-lang/gpc/gpc-20050331.ebuild b/dev-lang/gpc/gpc-20050331.ebuild
index e1a8d1395139..a8ce8136e9f2 100644
--- a/dev-lang/gpc/gpc-20050331.ebuild
+++ b/dev-lang/gpc/gpc-20050331.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20050331.ebuild,v 1.1 2005/04/17 21:28:18 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20050331.ebuild,v 1.1.1.1 2005/11/30 09:58:44 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog
index 9adeca45df7a..995b5f1efb3a 100644
--- a/dev-lang/gprolog/ChangeLog
+++ b/dev-lang/gprolog/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for dev-lang/gprologp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.1 2002/10/27 09:20:03 george Exp $
+# ChangeLog for dev-lang/gprolog
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/gprolog-1.2.16-gcc4.patch, gprolog-1.2.16.ebuild:
+  Adding patch to fix GCC4 compilation bugs.  Package doesn't compile due to
+  prolog bugs though.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gprolog-1.2.13.ebuild, gprolog-1.2.16.ebuild:
+  virtual/glibc -> virtual/libc
+
+  20 Sep 2003; David Holm <dholm@gentoo.org> gprolog-1.2.16.ebuild:
+  Added to ~ppc.
+
+*gprolog-1.2.16 (15 Apr 2003)
+
+  15 Apr 2003; Tom Payne <twp@gentoo.org> gprolog-1.2.16.ebuild :
+  Version bump. Fixed homepage.
 
 *gprolog-1.2.13
 
diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest
index e69de29bb2d1..95372e45fe02 100644
--- a/dev-lang/gprolog/Manifest
+++ b/dev-lang/gprolog/Manifest
@@ -0,0 +1,7 @@
+MD5 7c537e5e195ee8bf20caab7ca5f62f54 gprolog-1.2.16.ebuild 1105
+MD5 f1f8ec7ca742fbf31d25ed8e65d3b2c3 gprolog-1.2.13.ebuild 1023
+MD5 c2374d52c8611546965295863c03621f ChangeLog 987
+MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
+MD5 11cc47f5ddc2ab3660ba5ecb53107af3 files/gprolog-1.2.16-gcc4.patch 1056
+MD5 343cd0728a313eee77e9f5f9c9f74415 files/digest-gprolog-1.2.13 67
+MD5 dd04de7b5904293113f5838da347c4f9 files/digest-gprolog-1.2.16 67
diff --git a/dev-lang/gprolog/files/digest-gprolog-1.2.16 b/dev-lang/gprolog/files/digest-gprolog-1.2.16
index eb7b3c0a6eb3..3f94566d38a7 100644
--- a/dev-lang/gprolog/files/digest-gprolog-1.2.16
+++ b/dev-lang/gprolog/files/digest-gprolog-1.2.16
@@ -1,2 +1 @@
-MD5 9e019001f5e4b6d16e201f02a53fc11d /gprolog-1.2.16.ebuild 1054
 MD5 d7fe87106cd3e7e770375f04dd0d14c2 gprolog-1.2.16.tar.gz 2478633
diff --git a/dev-lang/gprolog/gprolog-1.2.13.ebuild b/dev-lang/gprolog/gprolog-1.2.13.ebuild
index c8d3cb8f09bf..e5a31ff7ef22 100644
--- a/dev-lang/gprolog/gprolog-1.2.13.ebuild
+++ b/dev-lang/gprolog/gprolog-1.2.13.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.2.13.ebuild,v 1.1 2002/10/27 09:20:03 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.2.13.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
-DEPEND="virtual/glibc"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
 HOMEPAGE="http://www.gnu.org"
@@ -34,5 +36,5 @@ src_install() {
 		HTML_DIR=${D}/usr/share/doc/${P}/html \
 		EXAMPLES_DIR=${D}/usr/share/${P}/examples install || die "install failed"
 	cd ${S}/..
-	dodoc ChangeLog COPYING INSTALL NEWS PROBLEMS README VERSION  
+	dodoc ChangeLog COPYING INSTALL NEWS PROBLEMS README VERSION
 }
diff --git a/dev-lang/gprolog/gprolog-1.2.16.ebuild b/dev-lang/gprolog/gprolog-1.2.16.ebuild
index 61ea9a8bdae4..66a6fb2ddb73 100644
--- a/dev-lang/gprolog/gprolog-1.2.16.ebuild
+++ b/dev-lang/gprolog/gprolog-1.2.16.ebuild
@@ -1,10 +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/dev-lang/gprolog/gprolog-1.2.16.ebuild,v 1.1 2003/04/15 10:09:52 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.2.16.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
 HOMEPAGE="http://pauillac.inria.fr/~diaz/gnu-prolog/"
@@ -13,11 +15,12 @@ S=${WORKDIR}/${P}/src
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch "${FILESDIR}/${P}"-gcc4.patch
 
 	mv Makefile.in Makefile.in.orig
 	sed -e "s/TXT_FILES /#TXT_FILES/" Makefile.in.orig > Makefile.in
@@ -36,5 +39,5 @@ src_install() {
 		HTML_DIR=${D}/usr/share/doc/${P}/html \
 		EXAMPLES_DIR=${D}/usr/share/${P}/examples install || die "install failed"
 	cd ${S}/..
-	dodoc ChangeLog COPYING INSTALL NEWS PROBLEMS README VERSION 
+	dodoc ChangeLog COPYING INSTALL NEWS PROBLEMS README VERSION
 }
diff --git a/dev-lang/gwydion-dylan-bin/ChangeLog b/dev-lang/gwydion-dylan-bin/ChangeLog
index 6eb91796af29..e3b76bc68ffb 100644
--- a/dev-lang/gwydion-dylan-bin/ChangeLog
+++ b/dev-lang/gwydion-dylan-bin/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-lang/gwydion-dylan-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gwydion-dylan-bin/ChangeLog,v 1.1 2005/08/02 02:11:01 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gwydion-dylan-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
 *gwydion-dylan-bin-2.4.0 (02 Aug 2005)
 
diff --git a/dev-lang/gwydion-dylan-bin/Manifest b/dev-lang/gwydion-dylan-bin/Manifest
index 6d75e222c863..5141b17ad73a 100644
--- a/dev-lang/gwydion-dylan-bin/Manifest
+++ b/dev-lang/gwydion-dylan-bin/Manifest
@@ -1,3 +1,5 @@
-MD5 1576baa57b53cb9511a0c28e54a46ea1 gwydion-dylan-bin-2.4.0.ebuild 566
+MD5 07d7d5c26ede62d3c88844c1881e71c8 gwydion-dylan-bin-2.4.0.ebuild 686
 MD5 c034ae089c5a4cfad038e5385b8c3916 metadata.xml 829
+MD5 fc38d63ee79f8a0fec5295a722f5834c ChangeLog 460
+MD5 9087321ca0c7d1d3383ac85442009859 files/20gwydion-dylan 195
 MD5 648d3e87acdb94c535f407c8d72cb7bd files/digest-gwydion-dylan-bin-2.4.0 78
diff --git a/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0.ebuild b/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0.ebuild
index 10087f7b017e..5dae5798fedd 100644
--- a/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0.ebuild
+++ b/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-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/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0.ebuild,v 1.1 2005/08/02 02:11:01 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gwydion-dylan-bin/gwydion-dylan-bin-2.4.0.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
 DESCRIPTION="The Dylan Programming Language Compiler"
 HOMEPAGE="http://www.gwydiondylan.org/"
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/boehm-gc-6.4"
 S="${WORKDIR}"
 
 src_compile() {
-  	mkdir -p ./${LOC}
+	mkdir -p ./${LOC}
 	mv usr/* ./${LOC}
 }
 
diff --git a/dev-lang/gwydion-dylan/ChangeLog b/dev-lang/gwydion-dylan/ChangeLog
index 49d875900f98..6edd6d095644 100644
--- a/dev-lang/gwydion-dylan/ChangeLog
+++ b/dev-lang/gwydion-dylan/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-lang/gwydion-dylan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gwydion-dylan/ChangeLog,v 1.1 2005/08/02 02:21:34 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gwydion-dylan/ChangeLog,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
 *gwydion-dylan-2.4.0 (02 Aug 2005)
 
diff --git a/dev-lang/gwydion-dylan/Manifest b/dev-lang/gwydion-dylan/Manifest
index 1707fb33e8f4..242f24527ab5 100644
--- a/dev-lang/gwydion-dylan/Manifest
+++ b/dev-lang/gwydion-dylan/Manifest
@@ -1,5 +1,16 @@
-MD5 1c0eb2cccd167bddbaab0772f46a92e3 gwydion-dylan-2.4.0.ebuild 1161
-MD5 c034ae089c5a4cfad038e5385b8c3916 metadata.xml 829
-MD5 b7d9302bac13e909d3ba5136c99c4d4b files/50gwydion-dylan-gentoo.el 209
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4c836e4c946aec820211c807f6f6c900 ChangeLog 480
 MD5 ce4153e4868f9a78d5954ef9acab89f5 files/20gwydion-dylan 16
+MD5 b7d9302bac13e909d3ba5136c99c4d4b files/50gwydion-dylan-gentoo.el 209
 MD5 b56cf86c697276c98bcb6dc6b75efa5c files/digest-gwydion-dylan-2.4.0 72
+MD5 b28bc32a9536ac320b76d6f142728252 gwydion-dylan-2.4.0.ebuild 1252
+MD5 c034ae089c5a4cfad038e5385b8c3916 metadata.xml 829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC70k6I1lqEGTUzyQRAiOLAJwNgfgN3ZturEYoiEIjbZpSIvPeXACgoAgY
+xeRZMDcPZzT5InoCPahNGy4=
+=tcMU
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/gwydion-dylan/gwydion-dylan-2.4.0.ebuild b/dev-lang/gwydion-dylan/gwydion-dylan-2.4.0.ebuild
index 10bf62ea0137..f8f6f64dc049 100644
--- a/dev-lang/gwydion-dylan/gwydion-dylan-2.4.0.ebuild
+++ b/dev-lang/gwydion-dylan/gwydion-dylan-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/dev-lang/gwydion-dylan/gwydion-dylan-2.4.0.ebuild,v 1.1 2005/08/02 02:21:34 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gwydion-dylan/gwydion-dylan-2.4.0.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
 inherit elisp-common
 
@@ -41,12 +41,11 @@ src_install() {
 		elisp-install ${PN} ${S}/tools/elisp/*.el ${S}/tools/elisp/*.elc
 		elisp-site-file-install ${FILESDIR}/${SITEFILE}
 	fi
-	insinto /etc/env.d
-	doins ${FILESDIR}/20gwydion-dylan
+	doenvd ${FILESDIR}/20gwydion-dylan
 }
 
 pkg_postinst() {
-    use emacs && elisp-site-regen
+	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index b9884e0b0acd..b02751bb75ea 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for dev-lang/helium
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.1 2003/05/09 10:31:07 kosmikus Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
+
+  24 Jul 2005; <duncan@gentoo.org> helium-1.1.ebuild, helium-1.2-r1.ebuild:
+  Change the ghc dependency to a form that portage can cope with better.
+
+  04 May 2005; David Holm <dholm@gentoo.org> helium-1.2-r1.ebuild:
+  Added to ~ppc.
+
+  19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> helium-1.1.ebuild,
+  helium-1.2-r1.ebuild:
+  Marked helium-1.2 stable on x86. Currently, helium cannot be compiled with
+  ghc-6.4 and is thus blocked by this version.
+
+  19 Feb 2005; Jason Wever <weeve@gentoo.org> helium-1.1.ebuild,
+  helium-1.2-r1.ebuild:
+  Masked on SPARC as dependencies cannot be met.
+
+*helium-1.2-r1 (18 Nov 2004)
+
+  18 Nov 2004; Andres Loeh <kosmikus@gentoo.org>
+  +files/helium-1.2-libraries.patch, files/helium-wrapper,
+  +helium-1.2-r1.ebuild:
+  Made compatible with gcc-3.4 and fixed a bug that caused the wrong set of
+  libraries to be used by default (both bug #71183).
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> helium-1.1.ebuild,
+  helium-1.2.ebuild:
+  dojar --> java-pkg_dojar
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> helium-1.1.ebuild,
+  helium-1.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> helium-1.1.ebuild,
+  helium-1.2.ebuild:
+  Fix use invocation
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> helium-1.1.ebuild,
+  helium-1.2.ebuild:
+  Add die following econf for bug 48950
+
+*helium-1.2 (18 Feb 2004)
+
+  18 Feb 2004; Andres Loeh <kosmikus@gentoo.org> :
+  New version (#40365).
+
+  02 Dec 2003; Andres Loeh <kosmikus@gentoo.org> helium-1.1.ebuild:
+  Corrected source URI's according to bug #34849.
+
+  06 Jun 2003; Andres Loeh <kosmikus@gentoo.org> helium-1.1.ebuild:
+  adapted to GHC 6.0
 
 *helium-1.1 (09 May 2003)
 
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index 1e3c6700ef93..c57f0a4f8eb5 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,5 +1,20 @@
-MD5 a9b68a73f170f715037b47419a0dc72b helium-1.1.ebuild 1628
-MD5 c1557d9dedb1e727fc23d81135ac953d ChangeLog 563
-MD5 9383829eb1e80fc6be12c53d3162d58b files/digest-helium-1.1 119
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70697c96b2d7913ceb3f5761f7980497 helium-1.2-r1.ebuild 2260
+MD5 acb7319252ddecea9420624099713540 helium-1.1.ebuild 1853
+MD5 c128558990ac5e93b48bd93eb49505d9 ChangeLog 2240
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 fb82aad0fbf3d3cb5071c5fef803a7ec files/helium-1.2-readline.patch 1661
+MD5 b52e9cf5c002e2c5ce007e523f7ec7b8 files/helium-wrapper 715
+MD5 24e12289b961bd308d3a79495d55952e files/helium-1.2-libraries.patch 1943
 MD5 538379c81a9dfdc87a15ce0e6a504c8a files/helium-1.1-readline.patch 1710
-MD5 3991ed4891d6455e980008f704211a97 files/helium-wrapper 558
+MD5 9383829eb1e80fc6be12c53d3162d58b files/digest-helium-1.1 119
+MD5 62f20b4dc3f4e34dd748b64d19dbb6c8 files/digest-helium-1.2-r1 120
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC5BmxkyZuKN4EQ6YRAhIVAJ4/stvITUIpzDWzzKGx4a3wzdcOTwCffq1y
+lRVc6VTMU5RBxgwYlVezuKE=
+=CAOp
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/helium/files/digest-helium-1.1 b/dev-lang/helium/files/digest-helium-1.1
index ae0156738df4..ca6e0282e4f1 100644
--- a/dev-lang/helium/files/digest-helium-1.1
+++ b/dev-lang/helium/files/digest-helium-1.1
@@ -1,2 +1,2 @@
 MD5 1c33240ce2d286c8225246d87c353f40 helium-1.1-src.tar.gz 901073
-MD5 dc97a41dfbb9093a2222f7c57d2a0a49 Hint.jar 119347
+MD5 d9caae2afdbd60a4a1f58174d318464a Hint.jar 120170
diff --git a/dev-lang/helium/files/helium-wrapper b/dev-lang/helium/files/helium-wrapper
index e94e05e90d14..7bcd820e0b59 100644
--- a/dev-lang/helium/files/helium-wrapper
+++ b/dev-lang/helium/files/helium-wrapper
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-BINNAME="$(basename $0)"
+BINNAME_LONG="$(basename $0)"
+BINNAME="${BINNAME_LONG%-tc}"
 
 if [ -n "${HELIUM_TEMP}" ]; then
 	TEMP="${HELIUM_TEMP}";
@@ -10,15 +11,22 @@ else
 		mkdir ${TEMP};
 	fi;
 fi
+
+if [ "${BINNAME_LONG}" = "${BINNAME}" ]; then
+	HELIUM_LIBS="/usr/lib/helium/lib";
+else
+	HELIUM_LIBS="/usr/lib/helium/tclib";
+fi
+
 if [ -z "${LVMPATH}" ]; then
-	LVMPATH=".:/usr/lib/helium/lib";
+	LVMPATH=".:${HELIUM_LIBS}";
 else
-	LVMPATH="${LVMPATH}:/usr/lib/helium/lib";
+	LVMPATH="${LVMPATH}:${HELIUM_LIBS}";
 fi
 export LVMPATH
 export TEMP
 
-if [ x${BINNAME} = xhint ]; then
+if [ "${BINNAME}" = "hint" ]; then
 
 	JAVA="$(java-config --java)"
         PROGCALL="${JAVA} -jar -DPATH=${PATH} -DLVMPATH=${LVMPATH} /usr/share/helium/lib/Hint.jar"
diff --git a/dev-lang/helium/helium-1.1.ebuild b/dev-lang/helium/helium-1.1.ebuild
index d44f7569352a..7660ed03bec0 100644
--- a/dev-lang/helium/helium-1.1.ebuild
+++ b/dev-lang/helium/helium-1.1.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.1 2003/05/09 10:31:07 kosmikus Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.1.ebuild,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
+
+inherit java-pkg
 
 DESCRIPTION="Helium (for learning Haskell)"
-SRC_URI="http://www.cs.uu.nl/~afie/helium/distr/${P}-src.tar.gz
-	 http://www.cs.uu.nl/~afie/helium/distr/Hint.jar"
-HOMEPAGE="http://www.cs.uu.nl/~afie/helium"
+HOMEPAGE="http://www.cs.uu.nl/helium"
+SRC_URI="http://www.cs.uu.nl/helium/distr/${P}-src.tar.gz
+	 http://www.cs.uu.nl/helium/distr/Hint.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -sparc"
+IUSE="readline"
 
-DEPEND="virtual/glibc
-	dev-lang/ghc
+DEPEND="virtual/libc
+	<virtual/ghc-6.4
 	readline? ( sys-libs/readline )"
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	virtual/jdk
 	dev-libs/gmp
 	readline? ( sys-libs/readline )"
 
-IUSE="readline"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-
-src_unpack() { 
+src_unpack() {
 	unpack ${P}-src.tar.gz
-	
+
 	# patch for readline support if requested
-	if [ "`use readline`" ]; then
+	if use readline; then
 		patch -p0 -i ${FILESDIR}/${P}-readline.patch || die
 	fi
+	# fix one file due to GHC 6.0's Template Haskell extension
+	einfo modifying ParsecPerm to ensure compatibility with GHC 6.0
+	cd ${S}/parsec
+	mv ParsecPerm.hs ParsecPerm.hs.orig
+	sed -e 's/(\$/(\$ /' ParsecPerm.hs.orig > ParsecPerm.hs
 }
-      
+
 src_compile() {
 	pushd lvm || die
 	pushd src || die
@@ -37,7 +43,7 @@ src_compile() {
 	popd
 	popd
 	pushd heliumNT || die
-	econf --without-upx
+	econf --without-upx || die "econf failed"
 	pushd src || die
 	make depend || die
 	make || die # emake doesn't work safely
@@ -47,11 +53,11 @@ src_install() {
 	cd heliumNT/src || die
 	make prefix=${D}/usr \
 		bindir=${D}/usr/lib/helium/bin \
-        	libdir=${D}/usr/lib/helium/lib \
+		libdir=${D}/usr/lib/helium/lib \
 		demodir=${D}/usr/lib/helium/demo \
 		install || die
 	# install hint
-	dojar ${DISTDIR}/Hint.jar
+	java-pkg_dojar ${DISTDIR}/Hint.jar
 	# create wrappers
 	dobin ${FILESDIR}/helium-wrapper
 	dosym /usr/bin/helium-wrapper /usr/bin/helium
diff --git a/dev-lang/helium/helium-1.2-r1.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild
index b9c221b0f8bb..a14e4f802844 100644
--- a/dev-lang/helium/helium-1.2-r1.ebuild
+++ b/dev-lang/helium/helium-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/dev-lang/helium/helium-1.2-r1.ebuild,v 1.1 2004/11/18 13:36:59 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:16 chriswhite Exp $
 
 inherit eutils java-pkg
 
@@ -11,11 +11,11 @@ SRC_URI="http://www.cs.uu.nl/helium/distr/${P}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 -sparc ~ppc"
 IUSE="readline"
 
 DEPEND="virtual/libc
-	virtual/ghc
+	<virtual/ghc-6.4
 	readline? ( sys-libs/readline )"
 RDEPEND="virtual/libc
 	virtual/jdk
diff --git a/dev-lang/hugs98/ChangeLog b/dev-lang/hugs98/ChangeLog
index 3ff183b7f4ea..3b58179350e6 100644
--- a/dev-lang/hugs98/ChangeLog
+++ b/dev-lang/hugs98/ChangeLog
@@ -1,10 +1,98 @@
 # ChangeLog for dev-lang/hugs98
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.1 2002/04/24 19:43:15 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
-*hugs98-12.2000 (24 Apr 2002)
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> hugs98-2005.3-r1.ebuild:
+  Mark 2005.3-r1 stable on alpha
 
-  24 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> hugs98-12.2000.ebuild files/digest-hugs98-12.2002 :
+  23 Sep 2005; <duncan@gentoo.org> hugs98-2005.3-r1.ebuild:
+  Marked stable on x86.
+
+  18 Aug 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  hugs98-2005.3-r1.ebuild:
+  Keyworded ~alpha wrt #98560
+
+*hugs98-2005.3-r1 (25 Jul 2005)
+
+  25 Jul 2005; <duncan@gentoo.org> +hugs98-2005.3-r1.ebuild:
+  Added an upstream patch. Thanks to Hans Lub <hlub@knoware.nl> (bug #100230)
+  for pointing this out.
+
+  19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> hugs98-2005.3.ebuild:
+  Small fix to make it build on amd64.
+
+*hugs98-2005.3 (18 Mar 2005)
+
+  18 Mar 2005; Andres Loeh <kosmikus@gentoo.org> +hugs98-2005.3.ebuild:
+  Added an ebuild for the March 2005 interim release.
+
+  08 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> hugs98-2003.11.ebuild:
+  Fixed bug #73611.
+
+  08 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> hugs98-2003.11.ebuild:
+  Added to ~ppc
+
+  16 Nov 2004; Andres Loeh <kosmikus@gentoo.org> hugs98-2003.11.ebuild:
+  Added ~amd64 keyword (bug #65074).
+
+  03 Nov 2004; Andres Loeh <kosmikus@gentoo.org> hugs98-2002.11-r1.ebuild,
+  hugs98-2002.11.ebuild, hugs98-2003.11.ebuild,
+  files/hugs98-2003.11-gcc34.patch:
+  Patched for gcc-3.4, thanks to several people (see bug #64426). Cleaned up.
+
+  19 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> hugs98-2003.11.ebuild:
+  Fixed missing dependencies; bug #68021.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hugs98-2002.11-r1.ebuild, hugs98-2002.11.ebuild, hugs98-2003.11.ebuild:
+  virtual/glibc -> virtual/libc
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> hugs98-2003.11.ebuild:
+  Fix use invocation
+
+  03 Mar 2004; Andres Loeh <kosmikus@gentoo.org> hugs98-2000.12-r1.ebuild:
+  Removed version. Sources are no longer available.
+
+  17 Dec 2003; Andres Loeh <kosmikus@gentoo.org> hugs98-2003.11.ebuild:
+  Pthreads and the NVIDIA OpenGL interface do not seem to work well together.
+  Temporarily disabling pthreads if using that interface (compare bug #34858).
+
+*hugs98-2003.11 (01 Dec 2003)
+
+  01 Dec 2003; Andres Loeh <kosmikus@gentoo.org> hugs98-2003.11.ebuild:
+  Version bump. Based on new ebuild submitted by Peter Simons
+  <simons+gentoo@cryp.to> (bug #34404), including additional information
+  provided by Ralf Hinze <ralf@informatik.uni-bonn.de>.
+
+*hugs98-2002.11-r1 (23 Apr 2003)
+
+  23 Apr 2003; Andres Loeh <andres@gentoo.org> hugs98-2002.11-r1.ebuild, files/digest-hugs98-2002.11-r1:
+  Fixed bug that caused some .so libs not to be built. Compare
+  http://forums.gentoo.org/viewtopic.php?t=36909. Thanks to PerdiX and thaldyron
+  for mentioning the problem in the forum.
+
+*hugs98-2002.11 (10 Dec 2002)
+
+  10 Dec 2002; George Shapovalov <george@gentoo.org> hugs98-2002.11.ebuild, files/digest-hugs98-2002.11 :
+
+  new version
+  update submitted by Andres Loeh <andres@cs.uu.nl>, see #11045
+
+* Autoupdate keywords (12-6-02)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*hugs98-2000.12-r1 (08 Aug 2002)
+
+  08 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> hugs98-2000.12-r1.ebuild files/digest-hugs98-2000.12-r1:
+
+  Added support for readline useflag, as patched by 
+  Michal Prada <michal@prihoda.net>. 
+
+  Removed hugs98-2000.12.ebuild files/digest-hugs98-2000.12
+
+*hugs98-2000.12 (24 Apr 2002)
+
+  24 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> hugs98-2000.12.ebuild files/digest-hugs98-2000.12 :
   
   Hugs 98 is a functional programming system based on Haskell 98, the de facto
   standard for non-strict functional programming languages. Hugs 98 provides 
diff --git a/dev-lang/hugs98/Manifest b/dev-lang/hugs98/Manifest
index e69de29bb2d1..237cbf311218 100644
--- a/dev-lang/hugs98/Manifest
+++ b/dev-lang/hugs98/Manifest
@@ -0,0 +1,9 @@
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 be2c5dd116a70673d905d82f0dbf9f6f ChangeLog 4960
+MD5 9dc6f3b3a7078e9c867754ba5110989e hugs98-2005.3.ebuild 2126
+MD5 acd9560964734571829a7a9fa4f09be2 hugs98-2005.3-r1.ebuild 2243
+MD5 82baad88b726920518455a0b2c393f89 hugs98-2003.11.ebuild 2498
+MD5 4c6e27fe15252dea9f141e0f6b06ed36 files/hugs98-2003.11-gcc34.patch 303
+MD5 0f560de47a443f3bea9cf87df2e85b81 files/digest-hugs98-2005.3-r1 133
+MD5 6a471250900fa1157b523eea5bbbe54d files/digest-hugs98-2005.3 67
+MD5 eb7ae57bb23e867135381cbd99c5c1c0 files/digest-hugs98-2003.11 67
diff --git a/dev-lang/hugs98/hugs98-2003.11.ebuild b/dev-lang/hugs98/hugs98-2003.11.ebuild
index b2a360a941d3..4486adb3e700 100644
--- a/dev-lang/hugs98/hugs98-2003.11.ebuild
+++ b/dev-lang/hugs98/hugs98-2003.11.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2003.11.ebuild,v 1.1 2003/12/01 16:52:55 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2003.11.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
+
+inherit base flag-o-matic eutils
 
 IUSE="opengl"
 
@@ -11,17 +13,37 @@ SRC_URI="http://cvs.haskell.org/Hugs/downloads/Nov2003/${MY_P}.tar.gz"
 HOMEPAGE="http://www.haskell.org/hugs/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 LICENSE="as-is"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	opengl? ( virtual/opengl virtual/glu virtual/glut )
-	=app-text/docbook-sgml-dtd-4.2"
+	~app-text/docbook-sgml-dtd-4.2"
+
+src_unpack() {
+	base_src_unpack
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
 
 src_compile() {
 	local myconf
-	if [ `use opengl` ]; then
+
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+	# Strip -O? from CFLAGS because of bugs
+	# in the garbage collection of gcc on ppc.
+	# See bug #73611
+	[ "${ARCH}" = "ppc" ] && filter-flags "-O?"
+
+	if use opengl; then
 		myconf="--enable-hopengl"
+		# the nvidia drivers *seem* not to work together
+		# with pthreads
+		[ ! -f /etc/env.d/09opengl ] \
+			|| [ -z "`grep opengl/nvidia/lib /etc/env.d/09opengl`" ] \
+			&& myconf="$myconf --with-pthreads" \
+			|| myconf="--with-pthreads"
 	fi
 
 	# When timing is enabled, the build will fail at some
@@ -40,7 +62,7 @@ src_compile() {
 	# about how you need to give "--host --target --build",
 	# and sometimes it will refuse to run at all.
 
-	cd ${S}/src/unix || die
+	cd ${S}/src/unix || die "source directory not found"
 	./configure \
 		--host=${CHOST} \
 		--target=${CHOST} \
@@ -53,17 +75,17 @@ src_compile() {
 		--enable-profiling \
 		${myconf} || die "./configure failed"
 	cd ..
-	emake || die
+	emake || die "make failed"
 }
 
 src_install () {
-	cd ${S}/src || die
+	cd ${S}/src || die "source directory not found"
 	make \
 		HUGSDIR=${D}/usr/lib/hugs \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
-		install || die
+		install || die "make install failed"
 
 	#somewhat clean-up installation of few docs
 	cd ${S}
diff --git a/dev-lang/hugs98/hugs98-2005.3-r1.ebuild b/dev-lang/hugs98/hugs98-2005.3-r1.ebuild
index 55a4e1b9695d..a761adbb896c 100644
--- a/dev-lang/hugs98/hugs98-2005.3-r1.ebuild
+++ b/dev-lang/hugs98/hugs98-2005.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3-r1.ebuild,v 1.1 2005/07/25 16:18:11 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit base flag-o-matic eutils versionator
 
@@ -38,7 +38,7 @@ SRC_URI="http://cvs.haskell.org/Hugs/downloads/${MY_PV}/${MY_P}.tar.gz
 HOMEPAGE="http://www.haskell.org/hugs/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 LICENSE="as-is"
 
 DEPEND="virtual/libc
diff --git a/dev-lang/hugs98/hugs98-2005.3.ebuild b/dev-lang/hugs98/hugs98-2005.3.ebuild
index 7dfb0d868a2c..c744116b5c8f 100644
--- a/dev-lang/hugs98/hugs98-2005.3.ebuild
+++ b/dev-lang/hugs98/hugs98-2005.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3.ebuild,v 1.1 2005/03/18 18:06:34 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2005.3.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit base flag-o-matic eutils versionator
 
@@ -69,6 +69,7 @@ src_compile() {
 
 	# cd ${S}/src/unix || die "source directory not found"
 	econf \
+		--build=${CHOST} \
 		--enable-ffi \
 		--enable-profiling \
 		${myconf} || die "econf failed"
diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 2b01b2665626..d56a93b964a6 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,10 +1,169 @@
 # ChangeLog for dev-lang/icc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.1 2002/04/13 20:23:46 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
+
+  30 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org> icc-9.0.021.ebuild:
+  -m Regened digest. Fixed a few minor details. Fixes #100757.
+
+*icc-8.1.028 (24 Jul 2005)
+
+  24 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/8.1.028/icpc, -files/8.1.030/05icc-ifc, -files/8.1.030/icc,
+  -files/8.1.030/iccifc.conf, -files/8.1.030/icpc, +files/8.1.028/05icc-ifc,
+  +files/8.1.028/icc, +files/8.1.028/iccifc.conf, -files/8.1.032/05icc-ifc,
+  -files/8.1.032/icc, -files/8.1.032/iccifc.conf, -files/8.1.032/icpc,
+  +icc-8.1.028.ebuild, -icc-8.1.030.ebuild, -icc-8.1.032.ebuild:
+  Removed unavailable 8.1.x versions, added the publicly available
+  8.1.028 version.
+
+*icc-9.0.021 (05 Jul 2005)
+
+  05 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/9.0.021/05icc-ifc, +files/9.0.021/iccifc.conf, +files/9.0.021/icc,
+  +files/9.0.021/icpc, +icc-9.0.021.ebuild:
+  Old upstream release. But this one is generally available.
+
+  04 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> icc-9.0.023.ebuild:
+  Fixed to work on amd64 and marked accordingly.
+
+*icc-9.0.023 (04 Jul 2005)
+
+  04 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org> +files/9.0.023/icc,
+  +files/9.0.023/05icc-ifc, +files/9.0.023/iccifc.conf, +files/9.0.023/icpc,
+  +icc-9.0.023.ebuild:
+  New upstream release. Tip of the hat to Ed Presutti <epresutti@comcast.net>,
+  even though I didn't take his patch. Fixes #96741.
+
+*icc-8.1.032 (31 May 2005)
+
+  31 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  files/8.1.030/05icc-ifc, files/8.1.030/icpc, files/8.1.030/icc,
+  +files/8.1.032/05icc-ifc, +files/8.1.032/icc, +files/8.1.032/iccifc.conf,
+  +files/8.1.032/icpc, icc-8.1.030.ebuild, +icc-8.1.032.ebuild:
+  New upstream release. Minor path modifications to script files and 
+  old 8.1.x ebuilds: 8.1 now lives in /opt/intel/compiler81
+
+*icc-8.1.030 (26 May 2005)
+
+  26 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org> +files/8.1.030/icc,
+  +files/8.1.030/05icc-ifc, +files/8.1.030/iccifc.conf, +files/8.1.030/icpc,
+  +icc-8.1.030.ebuild:
+  New upstream release.
+
+*icc-8.0.055 (07 Feb 2004)
+
+  13 May 2004; Thomas Veith <xtv@gentoo.org> icc-8.0.055.ebuild:
+  Added DEPEND to sys-libs/lib-compat, bug 48350
+
+  07 Feb 2004; Daniel Robbins <drobbins@gentoo.org> icc-8.0.055.ebuild:
+  New ebuild, partially rewritten from bug #35602. This ebuild is still
+  "iffy" and needs some work as I'm trying to get back to the rpm eclass
+  but haven't incorporated fixes from the most recent ebuild submission
+  on bugzilla. Thanks to Jeremy Warren for this ebuild as well as
+  everyone who helped.
+
+  15 Oct 2003; Jon Portnoy <avenj@gentoo.org> icc-7.1.030.ebuild :
+  Fix rpm_unpack call again.
+
+*icc-7.1.030 (13 Oct 2003)
+
+  13 May 2004; Thomas Veith <xtv@gentoo.org> icc-8.0.055.ebuild:
+  Added DEPEND to sys-libs/lib-compat, bug 48350
+
+  13 Oct 2003; Daniel Robbins <drobbins@gentoo.org> icc-7.1.030.ebuild:
+  New icc version for people with a premier.intel.com account. ~ on 
+  x86 and ia64.
+
+  24 Sep 2003; Jon Portnoy <avenj@gentoo.org> icc-7.1.006.ebuild :
+  Fix rpm_unpack call, bug 29484.
+
+  18 Sep 2003; Jon Portnoy <avenj@gentoo.org> icc-7.1.006.ebuild,
+  icc-7.1.029.ebuild :
+  _Much_ faster unpacking thanks to rpm.eclass and Georgi Georgiev.
+  See bug 23179 for more information.
+
+*icc-7.1.029 (18 Sep 2003)
+
+  13 May 2004; Thomas Veith <xtv@gentoo.org> icc-8.0.055.ebuild:
+  Added DEPEND to sys-libs/lib-compat, bug 48350
+
+  18 Sep 2003; Daniel Robbins <drobbins@gentoo.org> icc-7.1.029.ebuild:
+  new version marked stable for ia64, unstable for x86. ia64 support
+  integrated into this ebuild. Also switched to slower rpm2targz simply
+  because it doesn't require "rpm" to be merged.
+
+*icc-7.1.006 (11 April 2003)
+
+  13 May 2004; Thomas Veith <xtv@gentoo.org> icc-8.0.055.ebuild:
+  Added DEPEND to sys-libs/lib-compat, bug 48350
+
+  11 April 2003; Jon Portnoy <avenj@gentoo.org> icc-7.1.006.ebuild :
+
+  Version bump.
+
+  25 May 2003; Jon Portnoy <avenj@gentoo.org> icc-7.1.006.ebuild :
+
+  Added icpc wrapper.
+
+*icc-7.0.065-r2 (20 Dec 2002)
+
+  20 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065-r2.ebuild :
+
+  Fixed 05icc-ifc to include INTEL_LICENSE_FILE. Bug found by Zadeh
+  (garen@garen.net).
+
+*icc-7.0.065-r1 (11 Dec 2002)
+
+  11 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065-r1.ebuild :
+
+  Changed the "icc" wrapper script to properly translate gcc CFLAGS into
+  icc CFLAGS.
+
+*icc-7.0.065 (10 Dec 2002)
+
+  10 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065.ebuild :
+
+  Changed the naming to more accurately reflect the current ICC
+  version number. Also fixed the primary executable and added a warning
+  about compiling important applications with icc.
+
+  8 Dec 2002 Jon Portnoy <avenj@gentoo.org> icc-7.0.ebuild :
+
+  Added a warning about the behavior of the main executable.
+  'icc' will return errors; 'iccbin' works fine.
+ 
+  Fixed the warning messages to fit a standard terminal.
+
+  Fixed the old version checking statement to avoid matching
+  the current version.
+
+  5 Dec 2002  William McArthur <sandymac@gentoo.org> icc-7.0.ebuild :
+
+  Included some improvments from Jon Portnoy from http://bugs.gentoo.org/show_bug.cgi?id=11211
+
+*icc-7.0
+  25 Nov 2002  William McArthur <sandymac@gentoo.org> icc-7.0.ebuild :
+
+  Basicly just updated the icc-6.0-r1 with new urls and changed the message at the end.
+
+*icc-6.0-r1 (13 May 2002)
+
+  13 May 2002  William McArthur <sandymac@gentoo.org> icc-6.0-r1.ebuild :
+
+  Fixed a problem where I missed a place a file needs to be sed'ed during the
+  install. Change 05icc to 05icc-ifc because both the icc-6 and ifc-6 packages
+  used the same env info and I didn't want duplicate data.
+
+*icc-6.0 (24 Apr 2002)
+
+  24 Apr 2002  William McArthur <sandymac@gentoo.org> icc-6.0.ebuild :
+
+  The icc-6.0.ebuild is functionally identical to the icc-5.0.1.ebuild . A few
+  tweaks were made for the minor differeces in Intel's package.
 
 *icc-5.0.1 (12 Apr 2002)
 
-  12 Apr 2002; William McArthur <Leknor@Leknor.com> ChangeLog :
+  12 Apr 2002; William McArthur <sandymac@gentoo.org> ChangeLog :
 
   Initial Gentoo package. The install from Intel is RPM based so I extract
   the i386 RPMs manually using rpm2cpio and cpio. (Idea taken from the
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index bedd00c1d67a..bab5dfda4c89 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,23 +1,56 @@
-MD5 802afedaca782eaeb567771818bd0e11 ChangeLog 2839
-MD5 64b209941c0edd85ed14c8b6bd2e918b icc-6.0-r1.ebuild 3147
-MD5 6ecfd5d92d233621f56321b5a1d049d9 icc-6.0.ebuild 2948
-MD5 d09b7e959ed5791b6f42586d6e1efc19 icc-7.0.065.ebuild 3189
-MD5 105a26675e3ca104059666d65556e681 icc-7.0.065-r1.ebuild 3242
-MD5 77ebd3c2043ecb0b9654d44bd29606d1 icc-7.0.065-r2.ebuild 3242
-MD5 4b072d064c22cbedb254cfeeb8ab6362 icc-7.1.006.ebuild 3145
-MD5 001566b9beb91011352b3d58a1f20390 files/digest-icc-7.1.006 65
+MD5 f6a6116fc30211d3e17203d5f12cbd9e icc-8.0.055.ebuild 4142
+MD5 144efaddc7758ec6e3ce85f05a97764f icc-7.1.029.ebuild 3817
+MD5 91f94a1c311af7f9100b209c4ac42524 icc-7.1.006.ebuild 3759
+MD5 1b8f52c5f87649ed9d30eacfcc773102 icc-6.0-r1.ebuild 3138
+MD5 2dafaea542266611f6216a992c6be2ee icc-7.0.065-r1.ebuild 3224
+MD5 385282dbe27e11caf860b2d6b317790e icc-8.1.028.ebuild 3821
+MD5 cd7089aefd6e3109e3a1068c51a53087 icc-7.1.030.ebuild 3953
+MD5 555df8ca9389954a8d4b5c7c506484c3 icc-6.0.ebuild 2938
+MD5 b0faf40e03c75af641e5a9962b03d87f icc-9.0.021.ebuild 3656
+MD5 ad67abd8f12e10bdeb828df631295fe5 ChangeLog 6828
+MD5 e5f080f4789ca82a2ac425df46fc95b7 metadata.xml 304
+MD5 c3da1109f83039b1dc6f16e9ad332a34 icc-7.0.065-r2.ebuild 3224
+MD5 8871404a6426584a91fe924946735a62 icc-7.0.065.ebuild 3171
+MD5 f9e2f43ca6f3ea7226ea5b4d6cf8b65d icc-9.0.023.ebuild 3763
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 65
+MD5 451c1e8d20f20a97589c32edecbb422c files/digest-icc-8.0.055 68
+MD5 2f12c0b72e5480eb0cf6838bd14a20a7 files/digest-icc-8.1.028 70
+MD5 fb365f22b358c4b57697ad23c2e2c75a files/digest-icc-9.0.021 69
+MD5 f6ca324e7da69087c3e55683e690b77f files/digest-icc-9.0.023 69
+MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
+MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r2 65
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0-r1 65
 MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065 65
-MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
-MD5 90412c57cdaf14d472fe7bcc10ac9656 files/digest-icc-7.0.065-r2 643
-MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.006/icc 246
-MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.006/05icc-ifc 264
+MD5 5a2e5b03d1de761f8b08ef35070687be files/digest-icc-7.1.006 65
+MD5 f0532a3a488413710b77fe50c5129ffc files/digest-icc-7.1.029 66
+MD5 6163449bc5b6528112995c347c4de85a files/digest-icc-7.1.030 66
 MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0/05icc 225
-MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0-r1/05icc-ifc 225
-MD5 d31447eeea859e4cd01119369a0829a0 files/7.0.065/icc 155
-MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065/05icc-ifc 225
 MD5 0f9e31cf2e796e982b200b3a04038abd files/7.0.065-r1/icc 246
 MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065-r1/05icc-ifc 225
 MD5 0f9e31cf2e796e982b200b3a04038abd files/7.0.065-r2/icc 246
 MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.0.065-r2/05icc-ifc 264
+MD5 d31447eeea859e4cd01119369a0829a0 files/7.0.065/icc 155
+MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065/05icc-ifc 225
+MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.006/05icc-ifc-ia32 264
+MD5 5ff26d89e4874fd86fa2a43ac3d593d8 files/7.1.006/05icc-ifc-ia64 264
+MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.006/icc-ia32 246
+MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.029/05icc-ifc-ia32 264
+MD5 5ff26d89e4874fd86fa2a43ac3d593d8 files/7.1.029/05icc-ifc-ia64 264
+MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.029/icc-ia32 246
+MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0-r1/05icc-ifc 225
+MD5 0fff0e3906e80a6f3211ddd1c2dfb226 files/8.0.055/icc 156
+MD5 69a2a9441333847a134d54a062401a6c files/8.0.055/icpc 157
+MD5 389113e875524af9b87e4073226bd00e files/8.0.055/iccifc.conf 868
+MD5 6c420a8540b22f20a7d5799519ef1b7f files/8.0.055/05icc-ifc 216
+MD5 3e5f45926e3d03276c9b547b1fd29660 files/8.1.028/icc 156
+MD5 c7d2081ea80924fc6d5d2cefac999244 files/8.1.028/icpc 157
+MD5 389113e875524af9b87e4073226bd00e files/8.1.028/iccifc.conf 868
+MD5 a075d6c1511757aa0fdd46a9c5f8c2ed files/8.1.028/05icc-ifc 216
+MD5 d38bb5f7e7bbfb5aef012d3d09d252cf files/9.0.021/icc 283
+MD5 dd511c40eb7f064d6876151913263c18 files/9.0.021/icpc 285
+MD5 389113e875524af9b87e4073226bd00e files/9.0.021/iccifc.conf 868
+MD5 ba372be146addac34b4d6ccf847f00cc files/9.0.021/05icc-ifc 216
+MD5 d38bb5f7e7bbfb5aef012d3d09d252cf files/9.0.023/icc 283
+MD5 dd511c40eb7f064d6876151913263c18 files/9.0.023/icpc 285
+MD5 389113e875524af9b87e4073226bd00e files/9.0.023/iccifc.conf 868
+MD5 ba372be146addac34b4d6ccf847f00cc files/9.0.023/05icc-ifc 216
diff --git a/dev-lang/icc/files/digest-icc-7.1.006 b/dev-lang/icc/files/digest-icc-7.1.006
index a847873aabce..8b5e6fc57872 100644
--- a/dev-lang/icc/files/digest-icc-7.1.006
+++ b/dev-lang/icc/files/digest-icc-7.1.006
@@ -1 +1 @@
-MD5 58551f24cbb28339157760c29465e507 l_cc_p_7.1.006.tar 63406080
+MD5 f1f00b6a3a788b82ea171126ca37f62d l_cc_p_7.1.006.tar 63406080
diff --git a/dev-lang/icc/files/digest-icc-9.0.021 b/dev-lang/icc/files/digest-icc-9.0.021
index 5d83d4be96a3..fdbbe658dacc 100644
--- a/dev-lang/icc/files/digest-icc-9.0.021
+++ b/dev-lang/icc/files/digest-icc-9.0.021
@@ -1 +1 @@
-MD5 bedd32b245b6d381321e94022341e5b1 l_cc_p_9.0.021.tar.gz 201197170
+MD5 48bec7969a1080619ced226da0e07fac l_cc_p_9.0.021.tar.gz 201217259
diff --git a/dev-lang/icc/icc-6.0-r1.ebuild b/dev-lang/icc/icc-6.0-r1.ebuild
index 79a79e8b4732..779272f5edc1 100644
--- a/dev-lang/icc/icc-6.0-r1.ebuild
+++ b/dev-lang/icc/icc-6.0-r1.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: William McArthur <sandymac@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0-r1.ebuild,v 1.1 2002/05/14 03:46:13 sandymac Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 S=${WORKDIR}
 
@@ -14,18 +13,22 @@ SRC_URI2="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_
 SRC_URI3="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
 SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
 
-HOMEPAGE="http://www.intel.com/software/products/compilers/c60l/"
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-6.0"
 
-DEPEND=">=virtual/linux-sources-2.4
+DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.2
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
-RDEPEND=">=virtual/linux-sources-2.4
+RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.2"
 
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
 src_compile() {
 	# Keep disk space to a minimum
 	rm -f intel-*.ia64.rpm
diff --git a/dev-lang/icc/icc-6.0.ebuild b/dev-lang/icc/icc-6.0.ebuild
index c92eb84b7406..5c1e81d052f6 100644
--- a/dev-lang/icc/icc-6.0.ebuild
+++ b/dev-lang/icc/icc-6.0.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: William McArthur <sandymac@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0.ebuild,v 1.1 2002/04/24 06:02:31 sandymac Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 S=${WORKDIR}
 
@@ -14,16 +13,22 @@ SRC_URI2="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_
 SRC_URI3="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
 SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
 
-HOMEPAGE="http://www.intel.com/software/products/compilers/c60l/"
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
-DEPEND=">=sys-kernel/linux-sources-2.4
+LICENSE="icc-6.0"
+
+DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.2
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
-RDEPEND=">=sys-kernel/linux-sources-2.4
+RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.2"
 
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
 src_compile() {
 	# Keep disk space to a minimum
 	rm -f intel-*.ia64.rpm
diff --git a/dev-lang/icc/icc-7.0.065-r1.ebuild b/dev-lang/icc/icc-7.0.065-r1.ebuild
index 8ec5f1de2288..9919ff3f8114 100644
--- a/dev-lang/icc/icc-7.0.065-r1.ebuild
+++ b/dev-lang/icc/icc-7.0.065-r1.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/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.1 2002/12/11 23:24:16 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 S=${WORKDIR}
 
@@ -14,16 +14,16 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-7.0"
 
-DEPEND=">=virtual/linux-sources-2.4
+DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
-RDEPEND=">=virtual/linux-sources-2.4
+RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4"
 
 SLOT="7"
-KEYWORDS="~x86 -ppc -sparc -alpha"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_compile() {
@@ -85,8 +85,6 @@ pkg_postinst () {
 	einfo
 	einfo "You will need to place your license in /opt/intel/licenses/"
 	einfo
-	if [ -d /opt/intel/compiler?0 ]
-	then
 		ewarn
 		ewarn "Packages compiled with older versions of icc will need"
 		ewarn "to be recompiled. Until you do that, old packages will"
@@ -94,10 +92,11 @@ pkg_postinst () {
 		ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
 		ewarn "won't persist and will require you to re-edit after each"
 		ewarn "package you re-install."
-	fi
 	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
 	ewarn "NOTE: Before compiling important applications that your system"
 	ewarn "depends on, read the warning above. This could potentially"
 	ewarn "render your system unusable. This is a problem with Intel's"
 	ewarn "software, _not_ with Gentoo."
+	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
+	ewarn "ebuilds."
 }
diff --git a/dev-lang/icc/icc-7.0.065-r2.ebuild b/dev-lang/icc/icc-7.0.065-r2.ebuild
index b160b2a6582f..c81025e1137f 100644
--- a/dev-lang/icc/icc-7.0.065-r2.ebuild
+++ b/dev-lang/icc/icc-7.0.065-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r2.ebuild,v 1.1 2002/12/20 22:53:51 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:32 chriswhite Exp $
 
 S=${WORKDIR}
 
-DESCRIPTION="Intel C++ Compiler - The Pentium optimized compiler for Linux"
+DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
 
 SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
 SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
@@ -14,16 +14,16 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-7.0"
 
-DEPEND=">=virtual/linux-sources-2.4
+DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
-RDEPEND=">=virtual/linux-sources-2.4
+RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4"
 
 SLOT="7"
-KEYWORDS="~x86 -ppc -sparc -alpha"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_compile() {
@@ -85,8 +85,6 @@ pkg_postinst () {
 	einfo
 	einfo "You will need to place your license in /opt/intel/licenses/"
 	einfo
-	if [ -d /opt/intel/compiler?0 ]
-	then
 		ewarn
 		ewarn "Packages compiled with older versions of icc will need"
 		ewarn "to be recompiled. Until you do that, old packages will"
@@ -94,12 +92,12 @@ pkg_postinst () {
 		ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
 		ewarn "won't persist and will require you to re-edit after each"
 		ewarn "package you re-install."
-	fi
+		ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
+		ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
+		ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
+		ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
+		ewarn "WITH GENTOO."
 	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "NOTE: Before compiling important applications that your system"
-	ewarn "depends on, read the warning above. This could potentially"
-	ewarn "render your system unusable. This is a problem with Intel's"
-	ewarn "software, _not_ with Gentoo."
 	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
 	ewarn "ebuilds."
 }
diff --git a/dev-lang/icc/icc-7.0.065.ebuild b/dev-lang/icc/icc-7.0.065.ebuild
index 1c7d1de07d16..a1b19053afe6 100644
--- a/dev-lang/icc/icc-7.0.065.ebuild
+++ b/dev-lang/icc/icc-7.0.065.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/dev-lang/icc/icc-7.0.065.ebuild,v 1.1 2002/12/10 19:52:58 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065.ebuild,v 1.1.1.1 2005/11/30 09:58:32 chriswhite Exp $
 
 S=${WORKDIR}
 
@@ -14,16 +14,16 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-7.0"
 
-DEPEND=">=virtual/linux-sources-2.4
+DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
-RDEPEND=">=virtual/linux-sources-2.4
+RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4"
 
 SLOT="7"
-KEYWORDS="~x86 -ppc -sparc -alpha"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_compile() {
diff --git a/dev-lang/icc/icc-7.1.006.ebuild b/dev-lang/icc/icc-7.1.006.ebuild
index 3eee97f3e92f..2c14482873e2 100644
--- a/dev-lang/icc/icc-7.1.006.ebuild
+++ b/dev-lang/icc/icc-7.1.006.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.006.ebuild,v 1.1 2003/04/12 02:57:06 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.006.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
+
+inherit rpm
 
 S=${WORKDIR}
 
@@ -14,29 +16,33 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-7.0"
 
-DEPEND=">=virtual/linux-sources-2.4
-		>=sys-libs/glibc-2.2.5
-		sys-apps/cpio
-		app-arch/rpm"
-
-RDEPEND=">=virtual/linux-sources-2.4
-		>=sys-libs/glibc-2.2.4"
+DEPEND=">=sys-libs/glibc-2.2.5 \
+	x86? ( sys-libs/lib-compat )"
 
 SLOT="7"
-KEYWORDS="-* x86"
+KEYWORDS="-* ia64 x86"
 IUSE=""
 
-src_compile() {
-	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
+RESTRICT="nostrip"
 
-	mkdir opt
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	for x in intel-*.i386.rpm
+	# Keep disk space to a minimum
+	if [ "$ARCH" = "x86" ]
+	then
+		rm -f intel-*.ia64.rpm
+	else
+		rm -f intel-*.i386.rpm
+	fi
+
+	for x in *.rpm
 	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
+		rpm_unpack $x
 	done
+}
+src_compile() {
 
 	# From UNTAG_CFG_FILES in 'install'
 	SD=${S}/opt/intel # Build DESTINATION
@@ -58,6 +64,11 @@ src_compile() {
 		mv $SUPPORTFILE.abs $SUPPORTFILE
 		chmod 644 $SUPPORTFILE
 	done
+
+	# these should not be executable
+	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
+	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
+
 }
 
 src_install () {
@@ -65,16 +76,26 @@ src_install () {
 	dodoc clicense
 	cp -a opt ${D}
 
-	# icc enviroment
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc
-	# fix the issue with the primary icc executable
-	exeinto /opt/intel/compiler70/ia32/bin
-	doexe ${FILESDIR}/${PVR}/icc
+	if [ "$ARCH" = "x86" ]
+	then
+		newins ${FILESDIR}/${PVR}/05icc-ifc-ia32 05icc-ifc || die
+		# fix the processor name issue with the primary icc executable
+		exeinto /opt/intel/compiler70/ia32/bin
+		newexe ${FILESDIR}/${PVR}/icc-ia32 icc
+		newexe ${FILESDIR}/${PVR}/icpc-ia32 icc
+	else
+		newins ${FILESDIR}/${PVR}/05icc-ifc-ia64 05icc-ifc || die
+		dodir /usr/bin
+		dosym ../../opt/intel/compiler70/ia64/bin/eccbin /usr/bin/ecc
+		dosym ../../opt/intel/compiler70/ia64/bin/ecpcbin /usr/bin/ecpc
+	fi
+
+
 }
 
 pkg_postinst () {
-	einfo
+	einfo "The ICC compiler for Itanium systems is called \"ecc\"."
 	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
 	einfo "From the above url you can get a free, non-commercial"
 	einfo "license to use the Intel C++ Compiler emailed to you."
diff --git a/dev-lang/icc/icc-7.1.029.ebuild b/dev-lang/icc/icc-7.1.029.ebuild
index 88426d7591ad..c35300f4a33e 100644
--- a/dev-lang/icc/icc-7.1.029.ebuild
+++ b/dev-lang/icc/icc-7.1.029.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.029.ebuild,v 1.1 2003/09/18 18:46:13 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.029.ebuild,v 1.1.1.1 2005/11/30 09:58:32 chriswhite Exp $
+
+inherit rpm
 
 S=${WORKDIR}
 
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium and IA-64 optimizing compiler for Linux"
+DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
 
 SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
 SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
@@ -15,19 +17,22 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 LICENSE="icc-7.0"
 
 DEPEND="virtual/linux-sources
-	>=sys-libs/glibc-2.2.5
-	app-arch/rpm2targz"
+		>=sys-libs/glibc-2.2.5
+		x86? ( sys-libs/lib-compat )"
 
 RDEPEND="virtual/linux-sources
-	>=sys-libs/glibc-2.2.5"
+		>=sys-libs/glibc-2.2.5"
 
 SLOT="7"
-KEYWORDS="-* ia64 ~x86"
+KEYWORDS="-* ~ia64 ~x86"
 IUSE=""
 
 RESTRICT="nostrip"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
 	# Keep disk space to a minimum
 	if [ "$ARCH" = "x86" ]
 	then
@@ -36,17 +41,10 @@ src_compile() {
 		rm -f intel-*.i386.rpm
 	fi
 
-	mkdir opt
+	rpm_unpack *.rpm
 
-	for x in intel-*.rpm
-	do
-		#this takes longer than rpm2cpio (due to the unnecessary gzipping)
-		#but doesn't require a dependency on the rpm ebuild (which is nice.)
-		einfo "Extracting: ${x}"
-		rpm2targz ${x}
-		rm -f ${x/.rpm/.tar.gz}
-		tar xzvf ${x/.rpm/.tar.gz} || die
-	done
+}
+src_compile() {
 
 	# From UNTAG_CFG_FILES in 'install'
 	SD=${S}/opt/intel # Build DESTINATION
@@ -68,6 +66,11 @@ src_compile() {
 		mv $SUPPORTFILE.abs $SUPPORTFILE
 		chmod 644 $SUPPORTFILE
 	done
+
+	# these should not be executable
+	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
+	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
+
 }
 
 src_install () {
@@ -89,11 +92,12 @@ src_install () {
 		dosym ../../opt/intel/compiler70/ia64/bin/eccbin /usr/bin/ecc
 		dosym ../../opt/intel/compiler70/ia64/bin/ecpcbin /usr/bin/ecpc
 	fi
+
+
 }
 
 pkg_postinst () {
 	einfo "The ICC compiler for Itanium systems is called \"ecc\"."
-	einfo
 	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
 	einfo "From the above url you can get a free, non-commercial"
 	einfo "license to use the Intel C++ Compiler emailed to you."
diff --git a/dev-lang/icc/icc-7.1.030.ebuild b/dev-lang/icc/icc-7.1.030.ebuild
index 7437bad8d112..ecf235a51e55 100644
--- a/dev-lang/icc/icc-7.1.030.ebuild
+++ b/dev-lang/icc/icc-7.1.030.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.030.ebuild,v 1.1 2003/10/14 05:08:09 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.030.ebuild,v 1.1.1.1 2005/11/30 09:58:32 chriswhite Exp $
 
 inherit rpm
 
@@ -9,16 +9,18 @@ S=${WORKDIR}
 FILESV=7.1.029
 DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
 
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
+#currently must be downloaded from premier.intel.com
+#SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
+#SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
+SRC_URI="l_cc_pc_${PV}.tar"
 
 HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-7.0"
 
 DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.5"
+		>=sys-libs/glibc-2.2.5
+		x86? ( sys-libs/lib-compat )"
 
 RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.5"
@@ -27,7 +29,7 @@ SLOT="7"
 KEYWORDS="-* ~ia64 ~x86"
 IUSE=""
 
-RESTRICT="nostrip"
+RESTRICT="nostrip fetch"
 
 src_unpack() {
 	unpack ${A}
@@ -41,8 +43,10 @@ src_unpack() {
 		rm -f intel-*.i386.rpm
 	fi
 
-	rpm_unpack *.rpm
-
+	for x in *.rpm
+	do
+		rpm_unpack *.rpm
+	done
 }
 src_compile() {
 
diff --git a/dev-lang/icc/icc-8.0.055.ebuild b/dev-lang/icc/icc-8.0.055.ebuild
index b0a4e84f6303..f785c637a73b 100644
--- a/dev-lang/icc/icc-8.0.055.ebuild
+++ b/dev-lang/icc/icc-8.0.055.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.0.055.ebuild,v 1.1 2004/02/07 23:03:11 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.0.055.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 inherit rpm
 
@@ -20,7 +20,8 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
 LICENSE="icc-7.0"
 
-DEPEND=">=sys-libs/glibc-2.2.5"
+DEPEND=">=sys-libs/glibc-2.2.5
+		x86? ( sys-libs/lib-compat )"
 
 SLOT="8"
 KEYWORDS="~ia64 ~x86"
diff --git a/dev-lang/icc/icc-8.1.028.ebuild b/dev-lang/icc/icc-8.1.028.ebuild
index da5427f3baa1..e050c1dc6f30 100644
--- a/dev-lang/icc/icc-8.1.028.ebuild
+++ b/dev-lang/icc/icc-8.1.028.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.1.028.ebuild,v 1.1 2005/07/24 02:35:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.1.028.ebuild,v 1.1.1.1 2005/11/30 09:58:32 chriswhite Exp $
 
 inherit rpm
 
diff --git a/dev-lang/icc/icc-9.0.021.ebuild b/dev-lang/icc/icc-9.0.021.ebuild
index abf9c7707a7c..d79eb9e59b8a 100644
--- a/dev-lang/icc/icc-9.0.021.ebuild
+++ b/dev-lang/icc/icc-9.0.021.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.021.ebuild,v 1.1 2005/07/05 13:35:50 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.021.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 inherit rpm
 
@@ -58,8 +58,8 @@ src_compile() {
 	if [ -f ${SUPPORTFILE} ]
 	then
 		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
+		sed "s|<installpackageid>|${PACKAGEID}|g" \
+			-i ${SUPPORTFILE}
 		chmod 644 ${SUPPORTFILE}
 	fi
 
@@ -68,15 +68,15 @@ src_compile() {
 	if [ -f ${SUPPORTFILE} ]
 	then
 		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
+		sed -e "s|<INSTALLTIMECOMBOPACKAGEID>|${PACKAGEID}|g" \
+			-i ${SUPPORTFILE}
 		chmod 644 ${SUPPORTFILE}
 	fi
 
 	# These should not be executable
-	find "${S}/opt/intel/cc*/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/cc*/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/idb*/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
+	find "${S}/opt/intel/cc/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
+	find "${S}/opt/intel/cc/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
+	find "${S}/opt/intel/idb/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
 }
 
 src_install () {
diff --git a/dev-lang/icc/icc-9.0.023.ebuild b/dev-lang/icc/icc-9.0.023.ebuild
index 4a4178f51dd2..07ebfa8ea8bf 100644
--- a/dev-lang/icc/icc-9.0.023.ebuild
+++ b/dev-lang/icc/icc-9.0.023.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.023.ebuild,v 1.1 2005/07/04 19:58:22 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.023.ebuild,v 1.1.1.1 2005/11/30 09:58:32 chriswhite Exp $
 
 inherit rpm
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 LICENSE="icc-9.0"
 RDEPEND=">=sys-libs/glibc-2.2.5"
 SLOT="9.0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="nostrip fetch"
 S="${WORKDIR}/l_cc_c_${PV}"
@@ -23,14 +23,17 @@ src_unpack() {
 	# The tarball contains rpms for multiple arches, and a lot of
 	# auxiliary rpms common across arches. We must throw away 
 	# the arch we're not.
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.em64t.rpm
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.em64t.rpm
-		rm -f intel-*.i386.rpm
-	fi
+	case ${ARCH} in
+		amd64)
+			rm -f intel-*.{i386,ia64}.rpm
+			;;
+		ia64)
+			rm -f intel-*.{em64t,i386}.rpm
+			;;
+		x86)
+			rm -f intel-*.{em64t,ia64}.rpm
+			;;
+	esac
 
 	for x in *.rpm
 	do
@@ -51,7 +54,7 @@ src_compile() {
 	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
 
 	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc/9.0/doc/csupport
+	SUPPORTFILE=${S}/opt/intel/cc*/9.0/doc/csupport
 	if [ -f ${SUPPORTFILE} ]
 	then
 		einfo "Untagging: ${SUPPORTFILE}"
@@ -61,7 +64,7 @@ src_compile() {
 	fi
 
 	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb/9.0/doc/idbsupport
+	SUPPORTFILE=${S}/opt/intel/idb*/9.0/doc/idbsupport
 	if [ -f ${SUPPORTFILE} ]
 	then
 		einfo "Untagging: ${SUPPORTFILE}"
@@ -71,9 +74,9 @@ src_compile() {
 	fi
 
 	# These should not be executable
-	find "${S}/opt/intel/cc/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/cc/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/idb/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
+	find "${S}/opt/intel/cc*/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
+	find "${S}/opt/intel/cc*/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
+	find "${S}/opt/intel/idb*/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
 }
 
 src_install () {
@@ -81,8 +84,8 @@ src_install () {
 	dodoc ${S}/lgpltext
 	dodoc ${S}/clicense
 	dodir ${instdir}
-	cp -a opt/intel/cc/9.0/* ${D}/${instdir}
-	cp -a opt/intel/idb/9.0/* ${D}/${instdir}
+	cp -a opt/intel/cc*/9.0/* ${D}/${instdir}
+	cp -a opt/intel/idb*/9.0/* ${D}/${instdir}
 	insinto /etc/env.d
 	doins ${FILESDIR}/${PVR}/05icc-ifc || die
 	exeinto ${instdir}/bin
diff --git a/dev-lang/icc/metadata.xml b/dev-lang/icc/metadata.xml
index e95cc06ed3ea..e2a3a2b83518 100644
--- a/dev-lang/icc/metadata.xml
+++ b/dev-lang/icc/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<name>Jon Portnoy</name>
-<email>avenj@gentoo.org</email>
-<description>Eventually passing on to garen@garen.net</description>
+<email>karltk@gentoo.org</email>
+<name>Karl Trygve Kalleberg</name>
+<description>Also, bug Kugelfang.</description>
 </maintainer>
 </pkgmetadata>
 
diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog
index d4aa5251f785..7fa50e62584a 100644
--- a/dev-lang/icon/ChangeLog
+++ b/dev-lang/icon/ChangeLog
@@ -1,7 +1,27 @@
 # ChangeLog for dev-lang/icon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org> icon-9.4.2.ebuild:
+  Note: 9.4.2 is newer than 9.40.  Marked 9.4.2 ~ppc-macos (bug #110834)
+
+  22 Apr 2005; Simon Stelling <blubb@gentoo.org> icon-9.40.ebuild:
+  re-added ~amd64
+
+  01 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> icon-9.4.2.ebuild:
+  Added to ~alpha.
+
+*icon-9.4.2 (30 Jul 2004)
+
+  30 Jul 2004; George Shapovalov <george@gentoo.org> icon-9.4.2.ebuild :
+  new version (#56013), thanks to Jens Troeger <jens.troeger@light-speed.de> for the report
+  cleaned up and modernized the ebuild. Changed versioning to match upstream. 
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> icon-9.40.ebuild:
+  Fix use invocation
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *icon-9.40 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index e69de29bb2d1..38adea226cba 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -0,0 +1,7 @@
+MD5 c2824694e4de4b334644b76054f9e88d icon-9.4.2.ebuild 1402
+MD5 63ef0efc9bcc177e8b5e8d0cf3d62da0 ChangeLog 1419
+MD5 deb9f7760f1bb045b0b15a93e5297b80 icon-9.40.ebuild 1126
+MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
+MD5 fadf61644e614aee6ca9af4533791738 files/icon-9.40-gentoo.diff 244
+MD5 abd61a0d7e185c2ac47a4539c79e5d0c files/digest-icon-9.40 62
+MD5 640a91b011b92976911ea322c40e60f4 files/digest-icon-9.4.2 62
diff --git a/dev-lang/icon/files/digest-icon-9.40 b/dev-lang/icon/files/digest-icon-9.40
index 29ed32f65e09..8dc0aa428090 100644
--- a/dev-lang/icon/files/digest-icon-9.40
+++ b/dev-lang/icon/files/digest-icon-9.40
@@ -1 +1 @@
-MD5 1e4b77ad34af335d8eb5b64f16f7853a icon.v940src.tgz
+MD5 1e4b77ad34af335d8eb5b64f16f7853a icon.v940src.tgz 3209202
diff --git a/dev-lang/icon/icon-9.4.2.ebuild b/dev-lang/icon/icon-9.4.2.ebuild
index 65e5509b284e..e656cef28307 100644
--- a/dev-lang/icon/icon-9.4.2.ebuild
+++ b/dev-lang/icon/icon-9.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/dev-lang/icon/icon-9.4.2.ebuild,v 1.1 2004/07/31 01:20:54 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 MY_PV=${PV//./}
 SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
@@ -9,7 +9,7 @@ DESCRIPTION="very high level language"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc-macos ~x86"
 IUSE="X"
 
 S=${WORKDIR}/icon.v${MY_PV}src
@@ -25,10 +25,20 @@ src_unpack() {
 }
 
 src_compile() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if use ppc-macos;
+	then
+		mytarget="ppc_macos"
+	else
+		mytarget="linux"
+	fi
+
 	if use X; then
-		emake X-Configure name=linux -j1 || die
+		emake X-Configure name=${mytarget} -j1 || die
 	else
-		emake Configure name=linux -j1 || die
+		emake Configure name=${mytarget} -j1 || die
 	fi
 
 	emake -j1 || die
diff --git a/dev-lang/icon/icon-9.40.ebuild b/dev-lang/icon/icon-9.40.ebuild
index 0145f2f4f51d..cbde7b0a284a 100644
--- a/dev-lang/icon/icon-9.40.ebuild
+++ b/dev-lang/icon/icon-9.40.ebuild
@@ -1,64 +1,59 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.40.ebuild,v 1.1 2001/07/31 22:51:49 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.40.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
-S=${WORKDIR}/icon.v940src
-SRC_URI="http://www.cs.arisona.edu/icon/ftp/packages/unix/icon.v940src.tgz"
+MY_PV=${PV/./}
+SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
+HOMEPAGE="http://www.cs.arizona.edu/icon/"
+DESCRIPTION="very high level language"
 
-HOMEPAGE="http://www.cs.arisona.edu/icon/"
-DESCRIPTION="icon is a v. high level language"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 sparc ~amd64"
+IUSE="X"
+
+S=${WORKDIR}/icon.v${MY_PV}src
 
 DEPEND="X? ( virtual/x11 )
 	sys-devel/gcc"
 
 src_unpack() {
-    
-    cd ${WORKDIR}
-    unpack ${A}
-    cd ${S}/config/unix/intel_linux
-    patch -p0 <${FILESDIR}/${P}-gentoo.diff
-    
+	unpack ${A}
+	cd ${S}/config/unix/intel_linux
+	patch -p0 <${FILESDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
-    
-    cd ${S}
+	if use X; then
+		make X-Configure name=intel_linux || die
+	else
+		make Configure name=intel_linux || die
+	fi
+
+	make || die
+
+	# small builtin test
+	make Samples || die
+	# large builtin test
+	make Test || die
+}
 
-    if [ "`use X`" ]; then
-        try make X-Configure name=intel_linux
-    else
-	try make Configure name=intel_linux
-    fi
-    
-    try make
-    
-    # small builtin test
-    try make Samples
-    # large builtin test
-    try make Test
+src_install() {
+	#make Install dest=${D}/opt/icon || die
+	# fhs-problems, manual rectify
+	into /usr
 
-}
+	cd ${S}/bin
+	rm .placeholder libXpm.a rt.h
+	dobin *
+
+	cd ${S}/lib
+	rm .placeholder
+	dolib *
+
+	cd ${S}/man/man1
+	doman icont.1
 
-src_install () {
-    
-    #try make Install dest=${D}/opt/icon
-    # fhs-problems, manual rectify
-    
-    into /usr
-    
-    cd ${S}/bin
-    rm .placeholder libXpm.a rt.h
-    dobin *
-    
-    cd ${S}/lib
-    rm .placeholder
-    dolib *
-    
-    cd ${S}/man/man1
-    doman icont.1
-    
-    cd ${S}/doc
-    dodoc * ../README
-    
+	cd ${S}/doc
+	dodoc * ../README
 }
diff --git a/dev-lang/ifc/ChangeLog b/dev-lang/ifc/ChangeLog
index 84522e4bf2cd..bf92fe2e152d 100644
--- a/dev-lang/ifc/ChangeLog
+++ b/dev-lang/ifc/ChangeLog
@@ -1,14 +1,19 @@
-# ChangeLog for dev-lang/icc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.1 2002/05/14 03:46:13 sandymac Exp $
+# ChangeLog for dev-lang/ifc
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
-*ifc-6.0 (13 May 2002)
-  
-  13 May 2002  William McArthur <sandymac@gentoo.org> icc-6.0.ebuild :
+  01 Oct 2005; Olivier Fisette <ribosome@gentoo.org> ifc-6.0.ebuild,
+  ifc-7.0.064-r1.ebuild, ifc-9.0.021.ebuild, ifc-9.0.026.ebuild:
+  Replaced GNUish "cp -a" by "cp -pPR" (bug #103487).
 
-  Made some changes to Remco's work to better fit with icc-6.0. Both packages
-  are very similar and can use some of the same files.
+  06 Sep 2005; Danny van Dyk <kugelfang@gentoo.org> ifc-9.0.021.ebuild:
+  Fixed a typo (Bug #104941). Thanks to Martin Mokrejs for spotting this.
+
+*ifc-9.0.026 (02 Sep 2005)
+*ifc-9.0.021 (02 Sep 2005)
+
+  02 Sep 2005; Danny van Dyk <kugelfang@gentoo.org> +files/9.0/05ifc,
+  -ifc-7.0.064.ebuild, +ifc-9.0.021.ebuild, +ifc-9.0.026.ebuild:
+  Added ifc-9.0.021 (public) and ifc-9.0.026 (only available via
+  premier.intel.com). Removed obsolete version 7.0.064.
 
-  10 May 2002 Remco van den Bosch <bosch@muon.xs4all.nl> ifc-6.0.ebuild :
-  
-  Tweaked icc ebuild to install ifc.
diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest
index e69de29bb2d1..73215cb9d257 100644
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@@ -0,0 +1,23 @@
+MD5 2295fb7209357afbb775313acc7a42a4 ifc-8.1.026.ebuild 2219
+MD5 d52d67868066c9717e4f27b7fe0efa8f ifc-6.0.ebuild 2709
+MD5 e4d33baa61b2a37c600e84564a9a2546 ifc-7.1.008.ebuild 2867
+MD5 b0a4c9ae583d130cc6f7781419065a5a ifc-8.1.027.ebuild 2209
+MD5 2eb372dea8fefcbafb0a9756c278a86f ifc-9.0.026.ebuild 3096
+MD5 0d026f9edf8009186429e93e113561c1 ifc-9.0.021.ebuild 3096
+MD5 ba6585c302ac1acbea54d742286c159b ChangeLog 848
+MD5 28752edd8018d353738d45910d4707eb metadata.xml 246
+MD5 f91a5d975a5c27fb6768c6634ba7e13b ifc-7.0.064-r1.ebuild 3425
+MD5 a7997536bb143ec2cc153fd637cb9197 files/digest-ifc-9.0.021 69
+MD5 ea1c561c68aceec4ce4f72c21ec92afe files/digest-ifc-9.0.026 69
+MD5 0e550038b4a16719d30d2c5298ee4a9b files/digest-ifc-6.0 65
+MD5 5edab4cd21580d1e9a97206e9bfcdeab files/digest-ifc-7.0.064-r1 65
+MD5 5910af4ecc62e7a88a980242c3b09f00 files/digest-ifc-7.1.008 65
+MD5 14e49f3d39895d95b854524aeb95f82d files/digest-ifc-8.1.026 69
+MD5 7760fde0aa81f20ef0f50710c47a4637 files/digest-ifc-8.1.027 70
+MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0/05icc-ifc 225
+MD5 80d81ed1d633c84d50a0bcf3d3da6f07 files/9.0/05ifc 210
+MD5 a3b9072faee233848ad6fbd111240a8f files/7.0.064-r1/ifc 155
+MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.064-r1/05icc-ifc 225
+MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.064/05icc-ifc 225
+MD5 a3b9072faee233848ad6fbd111240a8f files/7.1.008/ifc 155
+MD5 8da5731b7a6c2e6bf1ff90fbd47b9266 files/7.1.008/05icc-ifc 148
diff --git a/dev-lang/ifc/ifc-6.0.ebuild b/dev-lang/ifc/ifc-6.0.ebuild
index bfd0479de55f..268d515d5409 100644
--- a/dev-lang/ifc/ifc-6.0.ebuild
+++ b/dev-lang/ifc/ifc-6.0.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: William McArthur <sandymac@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-6.0.ebuild,v 1.1 2002/05/14 03:46:13 sandymac Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-6.0.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 S=${WORKDIR}
-
 DESCRIPTION="Intel Fortran Compiler - The Pentium optimized compiler for Linux"
 
-#RESTRICT="fetch"
-
 SRC_URI1="http://developer.intel.com/software/products/compilers/downloads/l_fc_p_6.0.140.tar"
 SRC_URI2="ftp://download.intel.com/software/products/compilers/downloads/l_fc_p_6.0.140.tar"
 SRC_URI3="ftp://download.intel.co.jp/software/products/compilers/downloads/l_fc_p_6.0.140.tar"
 SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
 
-HOMEPAGE="http://www.intel.com/software/products/compilers/f60l/"
+HOMEPAGE="http://www.intel.com/software/products/compilers/flin/"
 
 # The ifc-6 license is the same copy with minimal name changes.
 LICENSE="icc-6.0"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
 
 DEPEND=">=virtual/linux-sources-2.4
-		>=sys-libs/glibc-2.2.2
-		sys-apps/cpio
-		app-arch/rpm"
+	>=sys-libs/glibc-2.2.2
+	app-arch/cpio
+	app-arch/rpm"
 
 RDEPEND=">=virtual/linux-sources-2.4
-		>=sys-libs/glibc-2.2.2"
+	>=sys-libs/glibc-2.2.2"
 
 src_compile() {
 	# Keep disk space to a minimum
@@ -66,7 +66,7 @@ src_compile() {
 src_install () {
 	dodoc lgpltext
 	dodoc flicense
-	cp -a opt ${D}
+	cp -pPR opt ${D}
 
 	# ifc enviroment
 	insinto /etc/env.d
diff --git a/dev-lang/ifc/ifc-7.0.064-r1.ebuild b/dev-lang/ifc/ifc-7.0.064-r1.ebuild
index ebaea69b4233..68e6f0505c17 100644
--- a/dev-lang/ifc/ifc-7.0.064-r1.ebuild
+++ b/dev-lang/ifc/ifc-7.0.064-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: 
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.0.064-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
+
+inherit rpm
 
 S=${WORKDIR}
 DESCRIPTION="Intel Fortran Compiler - The Pentium optimized compiler for Linux"
@@ -12,31 +14,31 @@ SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
 
 HOMEPAGE="http://developer.intel.com/software/products/compilers/flin/"
 
-  # Effectively the same license as icc
+# Effectively the same license as icc
 LICENSE="icc-7.0"
 SLOT="0"
 KEYWORDS="-* x86"
-
+IUSE=""
 
 DEPEND=">=virtual/linux-sources-2.4
-	>=sys-libs/glibc-2.2.4
-	sys-apps/cpio
-	app-arch/rpm"
+	>=sys-libs/glibc-2.2.4"
 
 RDEPEND=">=virtual/linux-sources-2.4
 	>=sys-libs/glibc-2.2.4"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 	# Keep disk space to a minimum
 	rm -f intel-*.ia64.rpm
 
-	mkdir opt
-
 	for x in intel-*.i386.rpm
 	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
+		rpm_unpack $x
 	done
+}
+
+src_compile() {
 
 	# From UNTAG_CFG_FILES in 'install'
 	SD=${S}/opt/intel # Build DESTINATION
@@ -60,11 +62,15 @@ src_compile() {
 	sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
 	mv $SUPPORTFILE.abs $SUPPORTFILE
 	chmod 644 $SUPPORTFILE
+
+	# these should not be executable
+	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
+	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
 }
 
 src_install () {
 	dodoc flicense
-	cp -a opt ${D}
+	cp -pPR opt ${D}
 
 	# ifc enviroment
 	insinto /etc/env.d
diff --git a/dev-lang/ifc/ifc-7.1.008.ebuild b/dev-lang/ifc/ifc-7.1.008.ebuild
index e9be1c93c936..b7492b1fecda 100644
--- a/dev-lang/ifc/ifc-7.1.008.ebuild
+++ b/dev-lang/ifc/ifc-7.1.008.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.1.008.ebuild,v 1.1 2004/02/09 08:26:16 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.1.008.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit rpm
 
diff --git a/dev-lang/ifc/ifc-8.1.026.ebuild b/dev-lang/ifc/ifc-8.1.026.ebuild
index 45ff9f27d630..4d4f7402d8a8 100644
--- a/dev-lang/ifc/ifc-8.1.026.ebuild
+++ b/dev-lang/ifc/ifc-8.1.026.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-8.1.026.ebuild,v 1.1 2005/05/26 22:50:39 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-8.1.026.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit rpm
 
diff --git a/dev-lang/ifc/ifc-8.1.027.ebuild b/dev-lang/ifc/ifc-8.1.027.ebuild
index 6c32a6dfa266..603ee0c03d4d 100644
--- a/dev-lang/ifc/ifc-8.1.027.ebuild
+++ b/dev-lang/ifc/ifc-8.1.027.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-8.1.027.ebuild,v 1.1 2005/05/26 22:50:39 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-8.1.027.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit rpm
 
diff --git a/dev-lang/ifc/ifc-9.0.021.ebuild b/dev-lang/ifc/ifc-9.0.021.ebuild
index 63037e991954..ab95af2d8bcd 100644
--- a/dev-lang/ifc/ifc-9.0.021.ebuild
+++ b/dev-lang/ifc/ifc-9.0.021.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-9.0.021.ebuild,v 1.1 2005/09/02 23:30:47 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-9.0.021.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit rpm
 
@@ -16,7 +16,7 @@ MMV="9.0"
 SRC_URI="l_fc_p_${PV}.tar.gz"
 DEPEND=">=sys-libs/glibc-2.3.2"
 RDEPEND="sys-devel/gcc"
-S="${WORKDIR}/l_fc_c_${PV}"
+S="${WORKDIR}/l_fc_p_${PV}"
 
 src_unpack() {
 	unpack ${A}
@@ -98,8 +98,8 @@ src_install () {
 	# dodoc ${S}/lgpltext
 	dodoc ${S}/flicense
 	dodir ${instdir}
-	cp -a opt/intel/fc*/9.0/* ${D}/${instdir}
-	cp -a opt/intel/idb*/9.0/* ${D}/${instdir}
+	cp -pPR opt/intel/fc*/9.0/* ${D}/${instdir}
+	cp -pPR opt/intel/idb*/9.0/* ${D}/${instdir}
 	insinto /etc/env.d
 	doins ${FILESDIR}/${MMV}/05ifc || die
 }
diff --git a/dev-lang/ifc/ifc-9.0.026.ebuild b/dev-lang/ifc/ifc-9.0.026.ebuild
index be8f8d192af4..e252b812029e 100644
--- a/dev-lang/ifc/ifc-9.0.026.ebuild
+++ b/dev-lang/ifc/ifc-9.0.026.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-9.0.026.ebuild,v 1.1 2005/09/02 23:30:47 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-9.0.026.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit rpm
 
@@ -98,8 +98,8 @@ src_install () {
 	# dodoc ${S}/lgpltext
 	dodoc ${S}/flicense
 	dodir ${instdir}
-	cp -a opt/intel/fc*/9.0/* ${D}/${instdir}
-	cp -a opt/intel/idb*/9.0/* ${D}/${instdir}
+	cp -pPR opt/intel/fc*/9.0/* ${D}/${instdir}
+	cp -pPR opt/intel/idb*/9.0/* ${D}/${instdir}
 	insinto /etc/env.d
 	doins ${FILESDIR}/${MMV}/05ifc || die
 }
diff --git a/dev-lang/ifc/metadata.xml b/dev-lang/ifc/metadata.xml
index c5d67a611520..e7dba3d5617a 100644
--- a/dev-lang/ifc/metadata.xml
+++ b/dev-lang/ifc/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>sci</herd>
 <maintainer>
-  <email>jhhudso@gentoo.org</email>
+<email>kugelfang@gentoo.org</email>
+<name>Danny van Dyk</name>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/inform/ChangeLog b/dev-lang/inform/ChangeLog
index 9b108ef00fc3..1d15a650136b 100644
--- a/dev-lang/inform/ChangeLog
+++ b/dev-lang/inform/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-lang/inform
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/ChangeLog,v 1.1 2003/03/02 06:43:48 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/ChangeLog,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
+
+  04 May 2005; David Holm <dholm@gentoo.org> inform-6.21.4.ebuild:
+  Added to ~ppc.
+
+  22 Apr 2005; Simon Stelling <blubb@gentoo.org> inform-6.21.4.ebuild:
+  stable on amd64
+
+  12 Dec 2004; Jason Wever <weeve@gentoo.org> inform-6.21.4.ebuild:
+  Added ~sparc keyword.
+
+  06 Aug 2004; Malcolm Lashley <malc@gentoo.org> inform-6.21.4.ebuild:
+  Add ~amd64 closes bug #57637
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> inform-6.21.3.ebuild,
+  inform-6.21.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+*inform-6.21.4 (17 Aug 2003)
+
+  17 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + touch up symlinks for header files #26646.
 
 *inform-6.21.3 (02 Mar 2003)
 
diff --git a/dev-lang/inform/Manifest b/dev-lang/inform/Manifest
index e69de29bb2d1..61fa1dd97607 100644
--- a/dev-lang/inform/Manifest
+++ b/dev-lang/inform/Manifest
@@ -0,0 +1,6 @@
+MD5 2cf8ab9cdf5cfca1f7afd4dc773cf62d ChangeLog 1022
+MD5 139690e40ffcdc872c21b4f6ffbc0469 inform-6.21.3.ebuild 1784
+MD5 755fa07be6b6ac9469947152958d6138 inform-6.21.4.ebuild 1832
+MD5 c38827226877c41b9e3ffad18cfc5c80 metadata.xml 2460
+MD5 2474dc80de3f2983d702bf01bda64cf7 files/digest-inform-6.21.3 124
+MD5 923565593fb09926c934ecbecb5d0027 files/digest-inform-6.21.4 124
diff --git a/dev-lang/inform/inform-6.21.3.ebuild b/dev-lang/inform/inform-6.21.3.ebuild
index babb305fdb9e..3a22184b9109 100644
--- a/dev-lang/inform/inform-6.21.3.ebuild
+++ b/dev-lang/inform/inform-6.21.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/inform-6.21.3.ebuild,v 1.1 2003/03/02 06:43:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/inform-6.21.3.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
 MY_PV=6.21
 LIB_V=610
-DESCRIPTION="Inform is a design system for interactive fiction"
+DESCRIPTION="design system for interactive fiction"
 HOMEPAGE="http://www.inform-fiction.org/"
 SRC_URI="http://mirror.ifarchive.org/if-archive/unprocessed/${P}.tar.gz
 	http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/${P}.tar.gz
@@ -13,9 +13,10 @@ SRC_URI="http://mirror.ifarchive.org/if-archive/unprocessed/${P}.tar.gz
 
 LICENSE="Inform"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-lang/inform/inform-6.21.4.ebuild b/dev-lang/inform/inform-6.21.4.ebuild
index 256c00e528da..39db79314d3d 100644
--- a/dev-lang/inform/inform-6.21.4.ebuild
+++ b/dev-lang/inform/inform-6.21.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/dev-lang/inform/inform-6.21.4.ebuild,v 1.1 2003/08/17 19:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/inform/inform-6.21.4.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
 MY_PV=6.21
 LIB_V=610
@@ -13,9 +13,10 @@ SRC_URI="http://mirror.ifarchive.org/if-archive/unprocessed/${P}.tar.gz
 
 LICENSE="Inform"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64 ~sparc ~ppc"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-lang/io-vm/ChangeLog b/dev-lang/io-vm/ChangeLog
index 4f6b7e9f523a..24366581bdc6 100644
--- a/dev-lang/io-vm/ChangeLog
+++ b/dev-lang/io-vm/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-lang/io-vm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/io-vm/ChangeLog,v 1.1 2003/08/16 01:19:09 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/io-vm/ChangeLog,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> io-vm-20030923.ebuild:
+  Don't refer directly to libdl, use $(dlopen_lib) to get the right library to
+  link to.
+
+  02 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> io-vm-20030923.ebuild:
+  Stable ppc-macos.
+
+  27 Oct 2004; Kito <kito@gentoo.org> io-vm-20030923.ebuild:
+  added ~ppc-macos keyword
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> io-vm-20030923.ebuild:
+  Added to ~ppc.
+
+*io-vm-20030923 (29 Sep 2003)
+
+  29 Sep 2003; Tom Payne <twp@gentoo.org> ion-vm-20030923.ebuild :
+  Version bump. Calculate MY_P automatically.
 
 *io-vm-20030810 (15 Aug 2003)
 
diff --git a/dev-lang/io-vm/Manifest b/dev-lang/io-vm/Manifest
index 1d4a5e7cc128..d525bf46bcd1 100644
--- a/dev-lang/io-vm/Manifest
+++ b/dev-lang/io-vm/Manifest
@@ -1,3 +1,15 @@
-MD5 69c05fc3e5cd64829872e6900988fb70 ChangeLog 312
-MD5 6db02d46f29828d8e2bb46f504e56636 io-vm-20030810.ebuild 803
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f0b066457371844752d9b861389ff1a7 ChangeLog 973
 MD5 0a61ea765e250d187a4b1e902ba17dbe files/digest-io-vm-20030810 68
+MD5 2edd8ac63713f1534c0d590c5ea6c90e files/digest-io-vm-20030923 68
+MD5 59c8856a5c52a6657da247e9c17e9668 io-vm-20030810.ebuild 854
+MD5 98d2106bd0376903b5d1cb7acb4fbcad io-vm-20030923.ebuild 1014
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXbKVj5H05b2HAEkRAgzbAJ98pPY2/gk0zgNRYmI2HdtdC6fH/wCgi+BR
+7ElE5FS7jzUSlB2/9RnayrM=
+=Fmyr
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/io-vm/io-vm-20030810.ebuild b/dev-lang/io-vm/io-vm-20030810.ebuild
index dc3fae6ece66..5ef342d1cf9c 100644
--- a/dev-lang/io-vm/io-vm-20030810.ebuild
+++ b/dev-lang/io-vm/io-vm-20030810.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/io-vm/io-vm-20030810.ebuild,v 1.1 2003/08/16 01:19:09 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/io-vm/io-vm-20030810.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 MY_P=IoVM-2003-08-10
 
@@ -15,20 +15,20 @@ DEPEND=""
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-    make configure || die
-    emake || die
+	make configure || die
+	emake || die
 }
 
 src_install() {
-    # copy the relevant portions by hand
-    dobin IoVM/io
-    dodoc IoVM/_docs/ReleaseHistory.txt
-    dohtml -r IoVM/_docs/*
-    # support for embedding
-    dodir /usr/include/Io/base
-    insinto /usr/include/Io
-    doins IoVM/_include/*
-    insinto /usr/include/Io/base
-    doins IoVM/_include/base/*
-    dolib IoVM/_libs/libIoVM.a
+	# copy the relevant portions by hand
+	dobin IoVM/io
+	dodoc IoVM/_docs/ReleaseHistory.txt
+	dohtml -r IoVM/_docs/*
+	# support for embedding
+	dodir /usr/include/Io/base
+	insinto /usr/include/Io
+	doins IoVM/_include/*
+	insinto /usr/include/Io/base
+	doins IoVM/_include/base/*
+	dolib IoVM/_libs/libIoVM.a
 }
diff --git a/dev-lang/io-vm/io-vm-20030923.ebuild b/dev-lang/io-vm/io-vm-20030923.ebuild
index 3389ebefabae..e4bbe205882a 100644
--- a/dev-lang/io-vm/io-vm-20030923.ebuild
+++ b/dev-lang/io-vm/io-vm-20030923.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/io-vm/io-vm-20030923.ebuild,v 1.1 2003/09/29 22:20:02 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/io-vm/io-vm-20030923.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
+
+inherit portability
 
 MY_P=IoVM-${PV:0:4}-${PV:4:2}-${PV:6:2}
 DESCRIPTION="Io is small prototype-based programming language."
@@ -8,14 +10,15 @@ HOMEPAGE="http://www.iolanguage.com/"
 SRC_URI="http://io.urbanape.com/release/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ppc-macos"
+IUSE=""
 DEPEND=""
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i IoVM/Makefile -e 's/\(^LIBS := .*\)/\1 -ldl/'
+	sed -i IoVM/Makefile -e "s/\(^LIBS := .*\)/\1 $(dlopen_lib)/"
 }
 
 src_compile() {
diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index e8d3fb6b4c82..4d50de6a436f 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.1 2005/04/01 19:02:58 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> lazarus-0.9.10.ebuild:
+  Marked ~amd64.
+
+*lazarus-0.9.10 (06 Oct 2005)
+
+  06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  +lazarus-0.9.10.ebuild:
+  Revbump for fpc 2.0.0, added ~ppc, solves bugs #103903, #102889, #99480, #90078
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
 
 *lazarus-0.9.6 (02 Apr 2005)
 
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 52e401d0b6bb..de2826a970c3 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,2 +1,16 @@
-MD5 5338c15c0f11a1269f872acccef2d7aa lazarus-0.9.6.ebuild 2053
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1c04bb10c898c4ffe122a906676d77e2 ChangeLog 805
+MD5 abbae63cd6c109adfb2535d9b12c5625 files/digest-lazarus-0.9.10 69
 MD5 2c5da358e9346c528a1a6b76f1eff1d1 files/digest-lazarus-0.9.6 63
+MD5 fc57df90a221b9308b7eea6f122297d9 lazarus-0.9.10.ebuild 2147
+MD5 b0b439a5fc011901ddc50c3226495066 lazarus-0.9.6.ebuild 2138
+MD5 8773813255798a06aad7b06e083a1a55 metadata.xml 281
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfFhA2G5bA0cA/ScRAr3CAKDBvk7hXE2R/0Je1qMcb6y6FhJvWwCfZgaF
+1bDVOAdNdoKD7yO8DCe0zY4=
+=+HHN
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/lazarus/lazarus-0.9.10.ebuild b/dev-lang/lazarus/lazarus-0.9.10.ebuild
index 9b6eca9bd988..d3b20e22ca1a 100644
--- a/dev-lang/lazarus/lazarus-0.9.10.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.10.ebuild,v 1.1 2005/10/06 17:30:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.10.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 inherit eutils
 
 SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-linking-exception"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi."
 HOMEPAGE="http://www.lazarus.freepascal.org/"
 IUSE=""
diff --git a/dev-lang/lazarus/lazarus-0.9.6.ebuild b/dev-lang/lazarus/lazarus-0.9.6.ebuild
index 3ee2deb94889..2abafccec852 100644
--- a/dev-lang/lazarus/lazarus-0.9.6.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.6.ebuild,v 1.1 2005/04/01 19:02:58 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.6.ebuild,v 1.1.1.1 2005/11/30 09:58:46 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index 1b61a0f66367..d1da8bb036c8 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>lang-misc</herd>
-<maintainer>
-	<email>chriswhite@gentoo.org</email>
-	<name>Chris White</name>
-</maintainer>
 <longdescription lang="en">
 A Borland Delphi lookalike for linux.  Uses the free pascal compiler.
 </longdescription>
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index ef284ae99cf0..ab6992fb48e6 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,9 +1,146 @@
 # ChangeLog for dev-lang/lua
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.1 2002/04/25 01:57:00 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
-*lua-4.0 (23 Apr 2002)
+  19 Aug 2005; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003-r2.ebuild,
+  lua-5.0.2.ebuild, lua-5.0.2-r1.ebuild:
+  Don't install /etc/magic. Bug # 102970.
 
+  28 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org> lua-5.0.2-r1.ebuild:
+  Ported patch from 5.0.2 version to this version. Only affects ppc-macos
+  environment.
+
+  22 Apr 2005; Herbie Hopkins <herbs@gentoo.org> lua-5.0.2.ebuild,
+  lua-5.0.2-r1.ebuild:
+  Fixed multilib strict issue, bug #88120
+
+  21 Apr 2005; Aron Griffis <agriffis@gentoo.org> lua-5.0.2.ebuild,
+  lua-5.0.2-r1.ebuild:
+  Add ia64 keywords
+
+  22 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> lua-5.0.2.ebuild:
+  Fix to use more of the options used on x86
+
+  07 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> lua-5.0.2.ebuild:
+  Stable ppc-macos.
+
+  15 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> lua-5.0.2.ebuild:
+  Fixed find statement to be arch independent.
+
+  05 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  +files/lua-ppc-macos-Makefile.patch, lua-5.0.2.ebuild:
+  Unstable ppc-macos
+  Fix for Bug #65591
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> lua-5.0.2.ebuild:
+  Stable on hppa.
+
+*lua-5.0.2-r1 (05 Aug 2004)
+
+  05 Aug 2004; <twp@gentoo.org> +files/lua-5.0.2-gentoo.patch,
+  +lua-5.0.2-r1.ebuild:
+  Hopefully fixed linking problems. Bugs 49309 & 59487.
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> lua-5.0.2.ebuild:
+  stable on ppc64, bug #55680
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> lua-4.0.1.ebuild,
+  lua-4.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> lua-5.0.2.ebuild:
+  Marked stable on amd64.
+
+  15 May 2004; Bryan Østergaard <kloeri@gentoo.org> lua-5.0.2.ebuild:
+  Stable on alpha.
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> lua-5.0.ebuild:
+  Marking stable on hppa
+
+  29 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> lua-5.0.2.ebuild:
+  stable on sparc
+
+  26 Mar 2004; Tom Payne <twp@gentoo.org> lua-5.0.2.ebuild :
+  Marked stable on x86. Bug # 45739.
+
+  26 Mar 2004; Tom Payne <twp@gentoo.org> lua-4.0.ebuild, lua-4.0.1.ebuild, lua-5.0.ebuild :
+  Added IUSE.
+
+*lua-5.0.2 (16 Mar 2004)
+
+  16 Mar 2004; Tom Payne <twp@gentoo.org> lua-5.0.2.ebuild :
+  Version bump.
+
+  15 Mar 2004; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003-r1.ebuild, lua-5.0.1_beta20031003.ebuild, lua-5.0_beta.ebuild :
+  Removed old versions. Lua 4.0*: inherit eutils, use epatch.
+
+  05 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> lua-5.0.ebuild:
+  stable on sparc
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org>
+  lua-5.0.1_beta20031003-r2.ebuild:
+  Apply existing pic patch, makes it build on amd64. Should close #35675.
+
+  26 Jan 2004; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003-r2.ebuild :
+  New tarball location. Bug # 39211.
+
+  03 Jan 2004; Jon Portnoy <avenj@gentoo.org> lua-5.0.1_beta20031003-r1.ebuild :
+  AMD64 keywords. Copyright date fixes to make repoman happy.
+
+*lua-5.0.1_beta20031003-r2 (08 Jan 2003)
+
+  08 Jan 2003; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003.ebuild-r2 :
+  Added compiler and interpreter variables to lua.pc.
+
+  21 Dec 2003; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003-r1.ebuild, metadata.xml :
+  Install all READMEs. Use dl and readline. Install various bits from etc/.
+  Add pkg-config script. Added metadata.xml.
+
+  20 Dec 2003; Guy Martin <gmsoft@gentoo.org> lua-5.0.1_beta20031003.ebuild,
+  files/lua-5.0.1-pic.patch :
+  Added a pic patch to use -fPIC flag correctly. This fix hppa compilation.
+
+*lua-5.0.1_beta20031003 (21 Nov 2003)
+
+  21 Nov 2003; Tom Payne <twp@gentoo.org> lua-5.0.1_beta20031003.ebuild :
+  Version bump using patches from http://lua-users.org/lists/lua-l/2003-10/msg00039.html.
+  Marked ~x86.
+
+  05 Sep 2003; Michael Sterrett <msterret@gentoo.org> lua-5.0.ebuild:
+  use sed -i; add error messages
+
+*lua-5.0 (14 Apr 2003)
+
+  14 Apr 2003; Tom Payne <twp@gentoo.org> lua-5.0.ebuild :
+
+  Version bump. Added ~arch keywords.
+
+*lua-5.0_beta (09 Apr 2003)
+
+  09 Apr 2003; Tom Payne <twp@gentoo.org> lua-5.0_beta.ebuild :
+
+  Version bump. Install docs. Tidied ebuild.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*lua-4.0.1 (07 Feb 2003)
+
+  07 Feb 2003; Ryan Phillips <rphillips@gentoo.org> lua-4.0.1.ebuild :
+  new version
+ 
+*lua-4.0 (09 June 2002)
+  
+  04 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> lua-4.0.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  09 June 2002; Ryan Phillips <rphillips@gentoo.org> lua-4.0.ebuild :
+
+  Fixed ebuild since package has changed.
+  
   23 Apr 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index e69de29bb2d1..97b600ec0a27 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -0,0 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 18e00590a88feafbd330e55642cd4b23 ChangeLog 5212
+MD5 7bb76903226a11484013e9657e217025 files/digest-lua-4.0 55
+MD5 652889fa621a25d6dc41ce0eb76bd5c2 files/digest-lua-4.0.1 61
+MD5 766235af7b9cb542daa81331dd026bab files/digest-lua-5.0 59
+MD5 f38ae8bf37049562a9b36c30d90eea78 files/digest-lua-5.0.1_beta20031003-r2 61
+MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2 61
+MD5 7ada6b04da7ea1d6e5128accf7a3c355 files/digest-lua-5.0.2-r1 61
+MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
+MD5 48a12e850720480ed45115452657c493 files/lua-5.0.1-pic.patch 1306
+MD5 f3cf4211cea7a402f31def33b218561e files/lua-5.0.2-gentoo.patch 524
+MD5 74b0268bdadf862659a5a088cf5f424f files/lua-5.0.2-pic.patch 1243
+MD5 157b7a36290e2e020146ed958b570f51 files/lua-ppc-macos-Makefile.patch 5873
+MD5 9495bd1aa03bc8a99e5d0dba5d7285e7 lua-4.0.1.ebuild 776
+MD5 46f8ba718cf6c2f210a03e8999c9178f lua-4.0.ebuild 763
+MD5 1af7a1b2790ca70a77d1c27efb2dfc2d lua-5.0.1_beta20031003-r2.ebuild 2246
+MD5 b97ded73064eeba714d145226aa889f9 lua-5.0.2-r1.ebuild 2364
+MD5 9f2e65ab3be990383fc8bbf1ad0f2a8a lua-5.0.2.ebuild 2890
+MD5 c14409a08c938747f51f94bed9ffc6ac lua-5.0.ebuild 1027
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVDr/gIKl8Uu19MoRAnw6AJ9/IVgqXI7pPdXSI/i5G9FS13KNyQCdGnl9
+aaC8zBTXjEbKhBnxlW9kqhc=
+=6vlr
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/digest-lua-5.0 b/dev-lang/lua/files/digest-lua-5.0
index 2decd0fa0ebb..82cdd87e81e4 100644
--- a/dev-lang/lua/files/digest-lua-5.0
+++ b/dev-lang/lua/files/digest-lua-5.0
@@ -1,3 +1 @@
-MD5 6365486c1e78a5fc73e34a3bda3feef7 /files/lua-4.0-config.patch 840
-MD5 61c6ea89c8b5df57bc489c7fd82b1093 /lua-5.0.ebuild 968
 MD5 6f14803fad389fb1cb15d17edfeddd91 lua-5.0.tar.gz 187287
diff --git a/dev-lang/lua/files/digest-lua-5.0.2 b/dev-lang/lua/files/digest-lua-5.0.2
index 78afe9bc10d4..519f9921e608 100644
--- a/dev-lang/lua/files/digest-lua-5.0.2
+++ b/dev-lang/lua/files/digest-lua-5.0.2
@@ -1 +1 @@
-MD5 e515b9a12d129eaa52f88b9686e0b6a1 lua-5.0.2.tar.gz 190038
+MD5 dea74646b7e5c621fef7174df83c34b1 lua-5.0.2.tar.gz 190442
diff --git a/dev-lang/lua/lua-4.0.1.ebuild b/dev-lang/lua/lua-4.0.1.ebuild
index 46a79493f9ba..3f6267adda24 100644
--- a/dev-lang/lua/lua-4.0.1.ebuild
+++ b/dev-lang/lua/lua-4.0.1.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-4.0.1.ebuild,v 1.1 2003/02/07 21:59:51 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-4.0.1.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
+
+inherit eutils
 
 S=${WORKDIR}/lua-${PV}
 DESCRIPTION="A powerful light-weight programming language designed for extending applications."
 SRC_URI="http://www.lua.org/ftp/lua-${PV}.tar.gz"
 HOMEPAGE="http://www.lua.org/"
-
+IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="x86 ppc ~sparc"
 LICENSE="lua"
-
+DEPEND="virtual/libc"
 
 src_compile() {
-	patch < ${FILESDIR}/lua-4.0-config.patch
+	epatch ${FILESDIR}/lua-4.0-config.patch
 
 	emake || die
 	make so || die
diff --git a/dev-lang/lua/lua-4.0.ebuild b/dev-lang/lua/lua-4.0.ebuild
index 4a330465761e..fdb8136873e9 100644
--- a/dev-lang/lua/lua-4.0.ebuild
+++ b/dev-lang/lua/lua-4.0.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Larry Cow <larrycow@free.fr>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-4.0.ebuild,v 1.1 2002/04/25 01:57:00 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-4.0.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
-P="lua"
-S=${WORKDIR}/${P}
+inherit eutils
+
+S=${WORKDIR}/lua
 DESCRIPTION="A powerful light-weight programming language designed for extending applications."
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
+SRC_URI="http://www.lua.org/ftp/${PN}.tar.gz"
 HOMEPAGE="http://www.lua.org/"
-
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
+IUSE=""
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+LICENSE="lua"
+DEPEND="virtual/libc"
 
 src_compile() {
-	patch < ${FILESDIR}/lua-4.0-config.patch
+	epatch ${FILESDIR}/lua-4.0-config.patch
 
 	emake || die
 	make so || die
@@ -21,9 +23,9 @@ src_compile() {
 
 src_install () {
 	make \
-			INSTALL_BIN=${D}/usr/bin  \
-			INSTALL_MAN=${D}/usr/share/man/man1 \
-			INSTALL_INC=${D}/usr/include \
-			INSTALL_LIB=${D}/usr/lib \
-			install || die
+		INSTALL_BIN=${D}/usr/bin  \
+		INSTALL_MAN=${D}/usr/share/man/man1 \
+		INSTALL_INC=${D}/usr/include \
+		INSTALL_LIB=${D}/usr/lib \
+		install || die
 }
diff --git a/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild b/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild
index cf37cfc6f973..9caec3680fa3 100644
--- a/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild
+++ b/dev-lang/lua/lua-5.0.1_beta20031003-r2.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/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild,v 1.1 2004/01/26 14:02:46 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.1_beta20031003-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
 SRC_URI="http://www.lua.org/ftp/lua-5.0.1.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~arm -hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+KEYWORDS="~alpha -hppa ~mips ppc ~sparc ~x86 ~amd64"
 IUSE="readline"
+
 DEPEND=">=sys-apps/sed-4
 	sys-apps/findutils"
+
 S=${WORKDIR}/lua-5.0.1
 
 src_unpack() {
-
 	unpack ${A}
 
 	#FIXME: hppa arch needs to update the patch -- I can't test (twp)
-	#epatch ${FILESDIR}/lua-5.0.1-pic.patch
+	#patch works on amd64 - aliz 2004-02-06
+	epatch ${FILESDIR}/lua-5.0.1-pic.patch
 
 	cd ${S}
 
@@ -34,7 +39,7 @@ src_unpack() {
 	sed -i doc/readme.html \
 		-e 's:\(/README\)\("\):\1.gz\2:g'
 
-	if [ `use readline` ]; then
+	if use readline ; then
 		sed -i config \
 			-e "s:^#\(USERCONF=-DLUA_USERCONFIG='\"\$(LUA)/etc/saconfig.c\"' -DUSE_READLINE\):\1:" \
 			-e 's:^#\(EXTRA_LIBS= -lm -ldl -lreadline\) # \(-lhistory -lcurses -lncurses\):\1 \2:'
@@ -54,7 +59,6 @@ Version: ${PV/_*/}
 Cflags: -I\${includedir}
 Libs: -L\${libdir} -llua -llualib -ldl -lm
 EOF
-
 }
 
 src_compile() {
@@ -64,7 +68,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make DESTDIR=${D} install soinstall || die "make install soinstall failed"
 
 	dodoc COPYRIGHT HISTORY UPDATE
@@ -76,11 +79,8 @@ src_install() {
 
 	insinto /usr/share/lua
 	doins etc/compat.lua
-	insinto /etc
-	newins etc/lua.magic magic
 	insinto /usr/share/pixmaps
 	doins etc/lua.xpm
 	insinto /usr/lib/pkgconfig
 	doins etc/lua.pc
-
 }
diff --git a/dev-lang/lua/lua-5.0.2-r1.ebuild b/dev-lang/lua/lua-5.0.2-r1.ebuild
index 043362a15807..38d352633c0f 100644
--- a/dev-lang/lua/lua-5.0.2-r1.ebuild
+++ b/dev-lang/lua/lua-5.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2-r1.ebuild,v 1.1 2004/08/05 20:50:20 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha -hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc-macos ~s390 ~sparc ~x86"
 IUSE="readline"
 
 DEPEND=">=sys-apps/sed-4
@@ -20,18 +20,22 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/lua-${PV}-gentoo.patch
+	use ppc-macos && epatch ${FILESDIR}/lua-ppc-macos-Makefile.patch
 
 	cd ${S}
 
 	sed -i config \
 		-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
 		-e 's:^#\(DLLIB= -ldl\):\1:' \
-		-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
 		-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
 		-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS} -fPIC -DPIC:" \
 		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
+		-e "s:^\(INSTALL_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \
 		-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
 
+	# The Darwin linker does not have the -E option.
+	use ppc-macos || sed -i -e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' config
+
 	sed -i doc/readme.html \
 		-e 's:\(/README\)\("\):\1.gz\2:g'
 
@@ -45,7 +49,7 @@ src_unpack() {
 prefix=/usr
 exec_prefix=\${prefix}
 includedir=\${prefix}/include
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/$(get_libdir)
 interpreter=\${exec_prefix}/bin/lua
 compiler=\${exec_prefix}/bin/luac
 
@@ -62,7 +66,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install soinstall || die
+	if use ppc-macos; then
+		# OSX does not have so files.
+		make DESTDIR=${D} install dylibinstall || die
+	else
+		make DESTDIR=${D} install soinstall || die
+	fi
 
 	dodoc HISTORY UPDATE
 	dohtml doc/*.html doc/*.gif
@@ -73,10 +82,8 @@ src_install() {
 
 	insinto /usr/share/lua
 	doins etc/compat.lua
-	insinto /etc
-	newins etc/lua.magic magic
 	insinto /usr/share/pixmaps
 	doins etc/lua.xpm
-	insinto /usr/lib/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
 }
diff --git a/dev-lang/lua/lua-5.0.2.ebuild b/dev-lang/lua/lua-5.0.2.ebuild
index 900831543787..f0f4e2cc1ac8 100644
--- a/dev-lang/lua/lua-5.0.2.ebuild
+++ b/dev-lang/lua/lua-5.0.2.ebuild
@@ -1,38 +1,53 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.1 2004/03/16 19:37:25 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.2.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
 SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha -hppa ~mips ~ppc ~sparc ~x86 ~amd64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE="readline"
+
 DEPEND=">=sys-apps/sed-4
 	sys-apps/findutils"
 
 src_unpack() {
-
 	unpack ${A}
 
 	epatch ${FILESDIR}/lua-${PV}-pic.patch
+	use ppc-macos && epatch ${FILESDIR}/lua-ppc-macos-Makefile.patch
 
 	cd ${S}
 
-	sed -i config \
-		-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
-		-e 's:^#\(DLLIB= -ldl\):\1:' \
-		-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
-		-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
-		-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
-		-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
-		-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
+	if ! use ppc-macos; then
+		sed -i config \
+			-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
+			-e 's:^#\(DLLIB= -ldl\):\1:' \
+			-e 's:^#\(MYLDFLAGS= -Wl,-E\):\1:' \
+			-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
+			-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
+			-e 's:^\(INSTALL_ROOT= \)/usr/local:\1$(DESTDIR)/usr:' \
+			-e "s:^\(INSTALL_LIB= \$(INSTALL_ROOT)/\)lib:\1$(get_libdir):" \
+			-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
+	else
+		sed -i config \
+			-e 's:^#\(LOADLIB= -DUSE_DLOPEN=1\):\1:' \
+			-e 's:^#\(DLLIB= -ldl\):\1:' \
+			-e 's:^#\(POPEN= -DUSE_POPEN=1\)$:\1:' \
+			-e "s:^\(MYCFLAGS= \)-O2:\1${CFLAGS}:" \
+			-e 's:^\(INSTALL_ROOT= \)/usr/local:\1/usr:' \
+			-e 's:^\(INSTALL_MAN= $(INSTALL_ROOT)\)/man/man1:\1/share/man/man1:'
+	fi
 
 	sed -i doc/readme.html \
 		-e 's:\(/README\)\("\):\1.gz\2:g'
 
-	if [ `use readline` ]; then
+	if use readline ; then
 		sed -i config \
 			-e "s:^#\(USERCONF=-DLUA_USERCONFIG='\"\$(LUA)/etc/saconfig.c\"' -DUSE_READLINE\):\1:" \
 			-e 's:^#\(EXTRA_LIBS= -lm -ldl -lreadline\) # \(-lhistory -lcurses -lncurses\):\1 \2:'
@@ -42,7 +57,7 @@ src_unpack() {
 prefix=/usr
 exec_prefix=\${prefix}
 includedir=\${prefix}/include
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/$(get_libdir)
 interpreter=\${exec_prefix}/bin/lua
 compiler=\${exec_prefix}/bin/luac
 
@@ -52,33 +67,39 @@ Version: ${PV}
 Cflags: -I\${includedir}
 Libs: -L\${libdir} -llua -llualib -ldl -lm
 EOF
-
 }
 
 src_compile() {
 	export PICFLAGS=-fPIC
 	emake || die "emake failed"
-	emake so || die "emake so failed"
+	if use ppc-macos; then
+		# OSX does not have so files.
+		emake dylib dylibbin || die "emake dylib failed"
+	else
+		emake so || die "emake so failed"
+	fi
 }
 
 src_install() {
+	if use ppc-macos; then
+		# OSX does not have so files.
+		make DESTDIR=${D} install dylibinstall || die "make install	dylibinstall failed"
+	else
+		make DESTDIR=${D} install soinstall || die "make install soinstall failed"
+	fi
 
-	make DESTDIR=${D} install soinstall || die "make install soinstall failed"
-
-	dodoc COPYRIGHT HISTORY UPDATE
+	dodoc HISTORY UPDATE
 	dohtml doc/*.html doc/*.gif
-	for i in `find . -name README -printf "%h\n"`; do
+
+	for i in `find . -name README -exec dirname '{}' \;`; do
 		docinto ${i#.}
 		dodoc ${i}/README
 	done
 
 	insinto /usr/share/lua
 	doins etc/compat.lua
-	insinto /etc
-	newins etc/lua.magic magic
 	insinto /usr/share/pixmaps
 	doins etc/lua.xpm
-	insinto /usr/lib/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins etc/lua.pc
-
 }
diff --git a/dev-lang/lua/lua-5.0.ebuild b/dev-lang/lua/lua-5.0.ebuild
index be3a39b11be4..02a77088a17b 100644
--- a/dev-lang/lua/lua-5.0.ebuild
+++ b/dev-lang/lua/lua-5.0.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.ebuild,v 1.1 2003/04/14 10:37:46 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.0.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
 SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 LICENSE="MIT"
+IUSE=""
 SLOT="0"
-KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
-DEPEND="virtual/glibc"
+KEYWORDS="~alpha hppa ~mips ppc sparc x86"
+DEPEND=">=sys-apps/sed-4"
 
 src_compile() {
-	cp config config.orig
-	sed -e 's:^#POPEN= -DUSE_POPEN$:POPEN= -DUSE_POPEN:' \
+	sed -i \
+		-e 's:^#POPEN= -DUSE_POPEN$:POPEN= -DUSE_POPEN:' \
 		-e "s:^MYCFLAGS= -O2:MYCFLAGS= ${CFLAGS}:" \
 		-e 's:INSTALL_ROOT= /usr/local:INSTALL_ROOT= $(DESTDIR)/usr:' \
 		-e 's:INSTALL_MAN= $(INSTALL_ROOT)/man/man1:INSTALL_MAN= $(INSTALL_ROOT)/share/man/man1:' \
-		config.orig > config
-	emake || die
-	emake so || die
+		config || die "sed config failed"
+	emake || die "emake failed"
+	emake so || die "emake so failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install soinstall || die
+	make DESTDIR=${D} install soinstall || die "make install soinstall failed"
 	dodoc COPYRIGHT HISTORY README
 	dohtml doc/*.html doc/*.gif
 }
diff --git a/dev-lang/maude/ChangeLog b/dev-lang/maude/ChangeLog
index f79993eccbfb..b1e600a03253 100644
--- a/dev-lang/maude/ChangeLog
+++ b/dev-lang/maude/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for dev-lang/maude
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.1 2004/05/27 10:10:55 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
+
+  17 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> maude-2.1.1-r2.ebuild:
+  Changed DEPEND and added pkg_setup gcc version check because of bug #77856
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> maude-2.1.1-r2.ebuild:
+  Dependency update: dev-libs/buddy -> sci-libs/buddy.
+
+*maude-2.1.1-r2 (11 Oct 2004)
+
+  11 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/2.1.1-gcc3.4.patch, +maude-2.1.1-r2.ebuild, -maude-2.1.ebuild:
+  Much better patch provided by Steven Eker. Thanks!
+
+*maude-2.1.1-r1 (04 Oct 2004)
+
+  04 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +maude-2.1.1-r1.ebuild,
+  -maude-2.1.ebuild:
+  Patched for gcc 3.4, but still masked - current gcc does not yet have
+  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17259
+  fixed. Should work with gcc 3.4.3.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> maude-2.1.1.ebuild:
+  Added to ~ppc.
+
+*maude-2.1.1 (11 Aug 2004)
+
+  11 Aug 2004; Olivier Fisette <ribosome@gentoo.org> maude-2.1.1.ebuild:
+  Version bump; revised ebuild, added primer examples and regression test.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> maude-2.1.ebuild:
+  virtual/glibc -> virtual/libc
 
 *maude-2.1 (27 May 2004)
 
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 5e7133678cbc..c3197f156848 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,5 +1,6 @@
-MD5 d41d8cd98f00b204e9800998ecf8427e ChangeLog 0
+MD5 e3f8bc84fd018eef06f4909411eaddcb maude-2.1.1-r2.ebuild 1676
+MD5 fc2533105167523a434779d5011b641f ChangeLog 1604
 MD5 40e5ec90608b2221625c50399a8f1f5a metadata.xml 612
-MD5 b0ea4d9f9254df5cb939849a43719dd1 maude-2.1.ebuild 1395
 MD5 ef113f0269722dd261f4d017bdda4127 files/23maude 27
-MD5 694819c2b6d60c1350e72b9ee725bff8 files/digest-maude-2.1 311
+MD5 5fdcf01ac8efe5c12f7fb581494b2b5f files/digest-maude-2.1.1-r2 138
+MD5 fd79afe5e64ae842aa9be90a1b056d25 files/2.1.1-gcc3.4.patch 7809
diff --git a/dev-lang/maude/maude-2.1.1-r2.ebuild b/dev-lang/maude/maude-2.1.1-r2.ebuild
index 1113f80f452f..1196c099da38 100644
--- a/dev-lang/maude/maude-2.1.1-r2.ebuild
+++ b/dev-lang/maude/maude-2.1.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.1.1-r2.ebuild,v 1.1 2004/10/11 06:44:25 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.1.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
-inherit eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Maude - A high-level specification language"
 HOMEPAGE="http://maude.cs.uiuc.edu/"
@@ -16,14 +16,24 @@ KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
 RDEPEND="virtual/libc
-	dev-libs/buddy
+	sci-libs/buddy
 	dev-libs/libtecla
-	>=dev-libs/gmp-4.1.3
-	>=sys-devel/gcc-3.4.3"
+	>=dev-libs/gmp-4.1.3"
 
 DEPEND="${RDEPEND}
 	sys-devel/bison
-	sys-devel/flex"
+	sys-devel/flex
+	|| ( >=sys-devel/gcc-3.4.3
+		=sys-devel/gcc-3.3* )"
+
+pkg_setup() {
+	if [ "$(gcc-version)" = "3.4" ]; then
+		if [ "$(gcc-micro-version)" -lt 3 ]; then
+			eerror "Need gcc 3.3.x or >= 3.4.3"
+			die "Wrong gcc version"
+		fi
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-lang/metadata.xml b/dev-lang/metadata.xml
index daed959bc0dd..e13a294ae0d1 100644
--- a/dev-lang/metadata.xml
+++ b/dev-lang/metadata.xml
@@ -5,5 +5,28 @@
 		The dev-lang category contains various programming language
 		implementations and related tools.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-lang enthält verschiedene Programmiersprachen
+		und die damit verbundenen Werkzeuge.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-lang contiene varias implementaciones de lenguajes de
+		programación y sus respectivas herramientas.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-langカテゴリーには様々なプログラミング言語の実行環境とそれに関連した
+		ツールが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-lang categorie bevat implementaties van verschillende programmeertalen
+		en gerelateerde hulpmiddelen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-lang chứa các phiên bản cài đặt các ngôn ngữ
+		lập trình khác nhau và các công cụ liên quan.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-lang contiene varie implementazioni di linguaggi di programmazione e utilità correlate.
+	</longdescription>
 </catmetadata>
 
diff --git a/dev-lang/mlton-bin/ChangeLog b/dev-lang/mlton-bin/ChangeLog
index b20a1b5b535c..7ad3e7670603 100644
--- a/dev-lang/mlton-bin/ChangeLog
+++ b/dev-lang/mlton-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mlton-bin
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton-bin/ChangeLog,v 1.1 2004/06/10 08:31:34 mattam Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mlton-bin-20040227.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> mlton-bin-20040227.ebuild:
+  Add -* to keywords, there is only one version of the binary, for x86.
 
 *mlton-bin-20040227 (10 Jun 2004)
 
diff --git a/dev-lang/mlton-bin/Manifest b/dev-lang/mlton-bin/Manifest
index 6c54c21c5f14..683033bcd0cf 100644
--- a/dev-lang/mlton-bin/Manifest
+++ b/dev-lang/mlton-bin/Manifest
@@ -1,2 +1,4 @@
-MD5 08e30980967a639a8abae384514caa18 mlton-bin-20040227.ebuild 703
+MD5 014d2e4cf154c04d02edc4ebf6dba027 ChangeLog 661
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 9bad2cbde7216e4a5b30aed1572c7f44 mlton-bin-20040227.ebuild 812
 MD5 042898d5524570a51e4f01615ab5259b files/digest-mlton-bin-20040227 77
diff --git a/dev-lang/mlton-bin/mlton-bin-20040227.ebuild b/dev-lang/mlton-bin/mlton-bin-20040227.ebuild
index 0a4c2d03ab1b..f24a04d83fa3 100644
--- a/dev-lang/mlton-bin/mlton-bin-20040227.ebuild
+++ b/dev-lang/mlton-bin/mlton-bin-20040227.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton-bin/mlton-bin-20040227.ebuild,v 1.1 2004/06/10 08:31:34 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton-bin/mlton-bin-20040227.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit eutils
 
@@ -10,11 +10,11 @@ HOMEPAGE="http://www.mlton.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="-* ~x86"
 
 IUSE="doc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 dev-libs/gmp"
 
 src_install() {
@@ -36,4 +36,4 @@ src_install() {
 		dohtml user-guide/*
 		dodoc *.ps.gz
 	fi
-}
\ No newline at end of file
+}
diff --git a/dev-lang/mlton/ChangeLog b/dev-lang/mlton/ChangeLog
index 47409155754b..131905760da2 100644
--- a/dev-lang/mlton/ChangeLog
+++ b/dev-lang/mlton/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mlton
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.1 2004/06/10 08:39:32 mattam Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mlton-20040227.ebuild:
+  virtual/glibc -> virtual/libc
 
 *mlton-20040227 (10 Jun 2004)
 
diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index d6b48dee56c4..58dc989c4a8a 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -1,2 +1,5 @@
-MD5 96463b654d1608c19880b2873f4e905f mlton-20040227.ebuild 752
+MD5 0c919e73672fc1ce46328e455c0309c1 ChangeLog 559
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 e80002e10b9f2f5ca686602e2fd1d179 mlton-20040227.ebuild 783
 MD5 fc40fd217231ed1183406f8f0bb9f8c2 files/digest-mlton-20040227 70
+MD5 08a12942c5d18a494e393d86ad43ae8d files/mlton-20040227-obsolete-flags.patch 1089
diff --git a/dev-lang/mlton/mlton-20040227.ebuild b/dev-lang/mlton/mlton-20040227.ebuild
index b8e47ae8bb4d..ebc9dec48a1b 100644
--- a/dev-lang/mlton/mlton-20040227.ebuild
+++ b/dev-lang/mlton/mlton-20040227.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20040227.ebuild,v 1.1 2004/06/10 08:39:32 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20040227.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86"
 
 IUSE="doc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 dev-libs/gmp
 dev-lang/mlton-bin"
 
@@ -32,4 +32,4 @@ src_install() {
 	else
 		cd doc && dodoc changelog license/*
 	fi
-}
\ No newline at end of file
+}
diff --git a/dev-lang/mmix/ChangeLog b/dev-lang/mmix/ChangeLog
index 6fe18d2703a5..189ef9f7e371 100644
--- a/dev-lang/mmix/ChangeLog
+++ b/dev-lang/mmix/ChangeLog
@@ -1,7 +1,18 @@
 # ChangeLog for dev-lang/mmix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/ChangeLog,v 1.1 2002/05/04 00:53:07 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/ChangeLog,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
+  04 May 2005; David Holm <dholm@gentoo.org> mmix-20020216.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mmix-20020216.ebuild:
+  virtual/glibc -> virtual/libc
+
+  18 Dec 2003; Chuck Short <zul@gentoo.org> mmix-20020216.ebuild:
+  Added dependcy, need ghostscript to read the manual. Closes #35559.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *mmix-20020216 (04 May 2002)
 
   04 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> mmix-20020216.ebuild files/digest-mmix-20020216 :
diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index e69de29bb2d1..040ef18eee42 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -0,0 +1,3 @@
+MD5 cb6c67a71f79cb5272ce75e1217f8e3c ChangeLog 1514
+MD5 d72279a0a1db17cb7ce71300bbdf05c1 mmix-20020216.ebuild 666
+MD5 35f532a61642aabafdb0c0e764b5a4d6 files/digest-mmix-20020216 56
diff --git a/dev-lang/mmix/mmix-20020216.ebuild b/dev-lang/mmix/mmix-20020216.ebuild
index 13260b9acbe3..b7d1d7b367d5 100644
--- a/dev-lang/mmix/mmix-20020216.ebuild
+++ b/dev-lang/mmix/mmix-20020216.ebuild
@@ -1,16 +1,20 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Hanno Boeck <hanno@gmx.de>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20020216.ebuild,v 1.1 2002/05/04 00:53:07 karltk Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mmix/mmix-20020216.ebuild,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator"
 SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/mmix.tar.gz"
 HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
 
-DEPEND="virtual/glibc
-	>=dev-util/cweb-3.63"
-RDEPEND="$DEPEND"
+DEPEND="virtual/libc
+	>=dev-util/cweb-3.63
+	virtual/ghostscript"
+
+SLOT="0"
+LICENSE="mmix"
+KEYWORDS="x86 sparc ~ppc"
+IUSE=""
 
 src_compile() {
 	make basic CFLAGS="${CFLAGS}" || die
@@ -18,6 +22,5 @@ src_compile() {
 
 src_install () {
 	dobin mmix mmixal
-	doman mmix.1
-	dodoc README
+	dodoc README mmix.1
 }
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 214e95576f90..08fb5b2463f9 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,8 +1,552 @@
 # ChangeLog for dev-lang/mono
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.1 2002/07/24 18:53:40 sunflare Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
-*mono-0.12 (24 Jul 2002)
+  14 Nov 2005; Herbie Hopkins <herbs@gentoo.org> mono-1.1.10.ebuild:
+  Update multilib fixes
+
+*mono-1.1.10 (14 Nov 2005)
+
+  14 Nov 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.10.ebuild:
+  Bump.
+
+  18 Oct 2005; Herbie Hopkins <herbs@gentoo.org> mono-1.1.9.2.ebuild:
+  Remove amd64 replace-flags, this issue seems to be fixed in 1.1.9*.
+
+  15 Oct 2005; Peter Johanson <latexer@gentoo.org> -mono-1.0.6.ebuild,
+  mono-1.1.8.3.ebuild:
+  Mark stable on x86, and remove the old 1.0.6 version.
+
+*mono-1.1.9.2 (15 Oct 2005)
+
+  15 Oct 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.9.2.ebuild:
+  Bumpity bump.
+
+  28 Sep 2005; Peter Johanson <latexer@gentoo.org> -mono-1.1.7-r1.ebuild,
+  -mono-1.1.8.1.ebuild, -mono-1.1.8.2.ebuild, mono-1.1.8.3.ebuild,
+  -mono-1.1.9.ebuild, mono-1.1.9.1.ebuild:
+  Add missing sys-devel/bc dep from bug #107519. Remove some older 1.1.x ebuilds.
+
+  24 Sep 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.9.1-io-layer-fix.diff, mono-1.1.9.1.ebuild:
+  Add fix for bug #106971, and remove some unneeded '|| die' text.
+
+*mono-1.1.9.1 (22 Sep 2005)
+
+  22 Sep 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.9.1.ebuild:
+  Bump. Minor bugfix release.
+
+  17 Sep 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.8.3.ebuild,
+  mono-1.1.9.ebuild:
+  Fix replace-flags usage.
+
+  16 Sep 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.8.3.ebuild:
+  Add flag fix for amd64. See bug #96719.
+
+*mono-1.1.9 (16 Sep 2005)
+
+  16 Sep 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.9.ebuild:
+  Bump to new release.
+
+*mono-1.1.8.3 (04 Aug 2005)
+
+  04 Aug 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.8.3-array-getvalue.diff, +files/mono-1.1.8.3-icall.diff,
+  -mono-1.1.6.ebuild, -mono-1.1.6-r1.ebuild, -mono-1.1.7.ebuild,
+  +mono-1.1.8.3.ebuild:
+  Bump to new release, including fix for bug #100515. Remove some older 1.1.x
+  versions.
+
+*mono-1.1.8.2 (06 Jul 2005)
+
+  06 Jul 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.8.2.ebuild:
+  Bump.
+
+*mono-1.1.8.1 (21 Jun 2005)
+
+  21 Jun 2005; Peter Johanson <latexer@gentoo.org> -mono-1.1.8.ebuild,
+  +mono-1.1.8.1.ebuild:
+  Bump with some key fixes to the 1.1.8 release, and remove the duff 1.1.8
+  release.
+
+*mono-1.1.8 (17 Jun 2005)
+
+  17 Jun 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.8.ebuild:
+  Bump.
+
+  03 Jun 2005; Peter Johanson <latexer@gentoo.org> -mono-1.1.4.ebuild,
+  -mono-1.1.5-r1.ebuild:
+  Remove some older versions.
+
+  03 Jun 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.7-ppc-tls.diff, mono-1.1.7-r1.ebuild:
+  Add patch to fix PPC issues. See bug #93765.
+
+*mono-1.1.7-r1 (26 May 2005)
+
+  26 May 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.7-r1.ebuild:
+  Revision bump with multilib fixes from Herbs.
+
+  18 May 2005; Peter Johanson <latexer@gentoo.org> :
+  Fix the digest, hopefully for real this time.
+
+  17 May 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.7.ebuild:
+  Fix SRC_URI. See bug #92959.
+
+  17 May 2005; David Holm <dholm@gentoo.org> mono-1.1.4.ebuild,
+  mono-1.1.5-r1.ebuild, mono-1.1.6.ebuild, mono-1.1.6-r1.ebuild,
+  mono-1.1.7.ebuild:
+  Masked Mono 1.1.x on ppc since none of them work right now
+
+  13 May 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r5.ebuild,
+  mono-1.0.6.ebuild, mono-1.1.4.ebuild, mono-1.1.5-r1.ebuild,
+  mono-1.1.6.ebuild, mono-1.1.6-r1.ebuild, mono-1.1.7.ebuild:
+  have_NPTL is going the way of the dodo.
+
+  06 May 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.7.ebuild:
+  Force tls=__thread on amd64. See bug #83770.
+
+*mono-1.1.7 (05 May 2005)
+
+  05 May 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.7.ebuild:
+  Bump.
+
+  29 Apr 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.4.ebuild,
+  mono-1.1.5-r1.ebuild, mono-1.1.6.ebuild, mono-1.1.6-r1.ebuild:
+  Make the libgdiplus dep optional, using the X use flag, as libgdiplus pulls
+  that in.
+
+*mono-1.1.6-r1 (14 Apr 2005)
+
+  14 Apr 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.6-r42300.diff, +mono-1.1.6-r1.ebuild:
+  Add a fix for amd64 as exposed by muine. See bug #88041.
+
+  08 Apr 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.4.ebuild,
+  mono-1.1.5-r1.ebuild, mono-1.1.6.ebuild:
+  Add an RDEPEND on libgdiplus, so installs of mono have a working
+  System.Drawing (and SWF correspondingly). See bug #86733. Thanks to Scott
+  Paul Robertson <spr5@email.byu.edu> for pointing it out.
+
+  07 Apr 2005; Peter Johanson <latexer@gentoo.org> -mono-1.0.4.ebuild,
+  -mono-1.0.4-r1.ebuild:
+  Remove the 1.0.4* mono ebuilds.
+
+*mono-1.1.6 (31 Mar 2005)
+
+  31 Mar 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.4.ebuild,
+  mono-1.1.5-r1.ebuild, -mono-1.1.5.ebuild, +mono-1.1.6.ebuild:
+  Bump, remove the older sigaltstack 1.1.5 ebuild, and clean up a few comments
+  that had been left in accidentally.
+
+*mono-1.1.5-r1 (30 Mar 2005)
+
+  30 Mar 2005; Peter Johanson <latexer@gentoo.org> +mono-1.1.5-r1.ebuild:
+  Revision bump to disable sigaltstack. It's broken horribly, and definitely
+  doesn't warrant a local USE flag.
+
+  27 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.5-icu-linking.diff, mono-1.1.5.ebuild:
+  Fix for linking against ICU when USE=icu. See bug #86723.
+
+*mono-1.1.5 (25 Mar 2005)
+
+  25 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.5-pathfix.diff, +files/mono-1.1.5-r42108.diff,
+  +files/mono-1.1.5-r42122.diff, +mono-1.1.5.ebuild:
+  Bump, includes a few important fixes from SVN since the release, and the
+  pathfix stuff from the 1.0.x mono ebuilds.
+
+  21 Mar 2005; David Holm <dholm@gentoo.org> mono-1.0.5-r5.ebuild:
+  Stable on ppc.
+
+  14 Mar 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.4.ebuild:
+  Mark a 1.0.4 mono stable too.
+
+  14 Mar 2005; Peter Johanson <latexer@gentoo.org> -files/mono-1.0-segv.diff,
+  -mono-0.28.ebuild, -mono-1.0.2-r1.ebuild, -mono-1.0.2.ebuild,
+  -mono-1.0.5-r2.ebuild, -mono-1.0.5-r3.ebuild, -mono-1.0.5-r4.ebuild,
+  mono-1.0.5-r5.ebuild:
+  Mark stable on x86, and remove a *bunch* of old cruft.
+
+*mono-1.0.5-r4 (10 Mar 2005)
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> +metadata.xml,
+  +files/dotnet.conf, +files/dotnet.init, +files/mcs-1.0.5-pathfix.diff,
+  +files/mono-1.0-segv.diff, +mono-0.28.ebuild, +mono-1.0.2-r1.ebuild,
+  +mono-1.0.2.ebuild, +mono-1.0.4-r1.ebuild, +mono-1.0.4.ebuild,
+  +mono-1.0.5-r2.ebuild, +mono-1.0.5-r3.ebuild, +mono-1.0.5-r4.ebuild,
+  +mono-1.0.5-r5.ebuild, +mono-1.0.6.ebuild, +mono-1.1.4.ebuild:
+  Moved from dev-dotnet to dev-lang.
+
+*mono-1.0.5-r5 (07 Mar 2005)
+
+  07 Mar 2005; Peter Johanson <latexer@gentoo.org> +mono-1.0.5-r5.ebuild:
+  Revision bump to remove gmcs script when installing mono-1.0.5. We don't
+  install the 2.0 profile stuff, including gmcs, on mono-1.0.x.
+
+  22 Feb 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.4.ebuild:
+  Change pnet blocker to allow people to install a new enough pnet along side
+  mono-1.1.4
+
+*mono-1.0.5-r4 (21 Feb 2005)
+
+  21 Feb 2005; Peter Johanson <latexer@gentoo.org> -mono-1.0.1-r1.ebuild,
+  -mono-1.0.1-r2.ebuild, -mono-1.0.1.ebuild, -mono-1.0.5-r1.ebuild,
+  +mono-1.0.5-r4.ebuild, -mono-1.0.5.ebuild, +mono-1.1.4.ebuild:
+  Add 1.0.5-r4, which now works for NPTL glibc using only gcc-3.3.5. This is
+  hopefully the new target for stabalization. Also add in new mono-1.1.4, which
+  will remain p.masked but in portage for amd64 folks. Removed some older
+  ebuilds as well.
+
+  19 Feb 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.6.ebuild:
+  Remove the gmcs wrapper script, as on mono-1.0.x, we don't install gmcs
+
+*mono-1.0.6 (18 Feb 2005)
+
+  18 Feb 2005; Peter Johanson <latexer@gentoo.org> +mono-1.0.6.ebuild:
+  Bump. NPTL problem seems no longer to rely on gcc-3.4 to work. See bug #63734
+  for the long, painful details.
+
+  18 Jan 2005; Rainer Groesslinger <scandium@gentoo.org> mono-0.28.ebuild,
+  mono-1.0.1-r1.ebuild, mono-1.0.1-r2.ebuild, mono-1.0.1.ebuild,
+  mono-1.0.2-r1.ebuild, mono-1.0.2.ebuild, mono-1.0.4-r1.ebuild,
+  mono-1.0.4.ebuild, mono-1.0.5-r1.ebuild, mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild, mono-1.0.5.ebuild:
+  only block older versions of dev-dotnet/pnet (bug #39369)
+
+  04 Jan 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild:
+  Fixes for installations on systems without mono already installed. See bug
+  #75560
+
+  02 Jan 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild:
+  Add PLATFORM=linux fix to one more spot.
+
+  23 Dec 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild:
+  Make sure PLATFORM=linux, since this is borking on some architectures somehow.
+  See bug #75272.
+
+  21 Dec 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild:
+  Remove the amd64 keywords from these, as they now require the JIT to build,
+  and amd64 has no working JIT in 1.0.x
+
+  20 Dec 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild:
+  Fix for upgrades from 0.28 era mono versions. Thanks to dma`
+
+  20 Dec 2004; Peter Johanson <latexer@gentoo.org>
+  +files/mcs-1.0.5-pathfix.diff:
+  Add a missing patch. Oops.
+
+*mono-1.0.5-r3 (20 Dec 2004)
+
+  20 Dec 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.5-r2.ebuild,
+  +mono-1.0.5-r3.ebuild:
+  Revision bump pthreads and nptl mono versions that now build mcs and class
+  libs as well. Includes fix for bug #72770/66528. Thanks to foser
+  <foser@gentoo.org> for the corlib fix.
+
+*mono-1.0.5 (13 Dec 2004)
+
+  13 Dec 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.5-r1.ebuild,
+  +mono-1.0.5.ebuild:
+  Bump.
+
+  03 Nov 2004; Peter Johanson <latexer@gentoo.org> -mono-0.30.1.ebuild,
+  -mono-0.30.ebuild, -mono-0.31.ebuild, -mono-0.91.ebuild, -mono-0.95.ebuild,
+  -mono-0.96.ebuild, -mono-0.97.ebuild, -mono-1.0.ebuild:
+  Long needed house cleaning.
+
+*mono-1.0.4 (03 Nov 2004)
+
+  03 Nov 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.4-r1.ebuild,
+  +mono-1.0.4.ebuild:
+  Bump.
+
+  29 Oct 2004; Peter Johanson <latexer@gentoo.org> mono-0.28.ebuild, mono-0.30.1.ebuild,
+  mono-0.30.ebuild, mono-0.31.ebuild, mono-0.91.ebuild, mono-0.95.ebuild,
+  mono-0.96.ebuild, mono-0.97.ebuild, mono-1.0.1-r1.ebuild,
+  mono-1.0.1-r2.ebuild, mono-1.0.1.ebuild, mono-1.0.2-r1.ebuild,
+  mono-1.0.2.ebuild, mono-1.0.ebuild:
+  Change the masked mono to include a fix for NPTL systems available for
+  gcc-3.4. Please test. Also fixed the LICENSE syntax.
+
+  23 Sep 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.2.ebuild:
+  Fix a small typo.
+
+*mono-1.0.2 (22 Sep 2004)
+
+  22 Sep 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.2-r1.ebuild,
+  +mono-1.0.2.ebuild:
+  Bump. Includes both a non-NPTL enabled and NPTL version. NPTL version masked
+  pending a resolution to issues in GC.
+
+  18 Aug 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.1-r1.ebuild:
+  Explicitly setting the threading implementation. Was sometimes choosing
+  __thread over pthread. Thanks to JohanH in #muine on freenode.
+
+  18 Aug 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.1-r1.ebuild:
+  Better check for requested NPTL support in the NPTL-unsupported 1.0.1-r1
+  release.
+
+*mono-1.0.1-r1 (17 Aug 2004)
+
+  17 Aug 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.1-r1.ebuild,
+  +mono-1.0.1-r2.ebuild:
+  Two new versions. One removes all NPTL support, in hopes of being marked
+  stable soon. -r2 keeps the support, and is package.masked.
+
+*mono-1.0.1 (05 Aug 2004)
+
+  05 Aug 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.1.ebuild:
+  Bump. New bugfix release. Only minimal changes.
+
+  10 Jul 2004; Peter Johanson <latexer@gentoo.org> +files/mono-1.0-segv.diff,
+  mono-1.0.ebuild:
+  Fix for amd64. See bug #55722
+
+*mono-1.0 (30 Jun 2004)
+
+  30 Jun 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.ebuild:
+  1.0. Nuff said.
+
+  29 Jun 2004; Peter Johanson <latexer@gentoo.org> mono-0.97.ebuild:
+  Fix for installation for first time installs. See bug #55229 and #55393.
+
+  28 Jun 2004; Peter Johanson <latexer@gentoo.org> mono-0.97.ebuild:
+  Build fix. See bug #55393.
+
+  27 Jun 2004; Peter Johanson <latexer@gentoo.org> :
+  Fix the digest.
+
+*mono-0.97 (27 Jun 2004)
+
+  27 Jun 2004; Peter Johanson <latexer@gentoo.org> +mono-0.97.ebuild:
+  Release candidate goodness.
+
+*mono-0.96 (16 Jun 2004)
+
+  16 Jun 2004; Peter Johanson, <latexer@gentoo.org> mono-0.96.ebuild:
+  Beta3 loves you.
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> mono-0.31.ebuild,
+  mono-0.91.ebuild, mono-0.95.ebuild:
+  Fix use invocation
+
+  02 Jun 2004; David Holm <dholm@gentoo.org> mono-0.91.ebuild,
+  mono-0.95.ebuild:
+  Closed bug #51171.
+
+  02 Jun 2004; David Holm <dholm@gentoo.org> mono-0.95.ebuild:
+  Added to ~ppc.
+
+*mono-0.95 (02 Jun 2004)
+
+  02 Jun 2004; Peter Johanson <latexer@gentoo.org> mono-0.95.ebuild:
+  Beta2. You know you love it.
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> mono-0.91.ebuild:
+  ~amd64 keyword added
+
+  05 May 2004; David Holm <dholm@gentoo.org> mono-0.91.ebuild:
+  Added to ~ppc.
+
+*mono-0.91 (05 May 2004)
+
+  05 May 2004; Peter Johanson <latexer@gentoo.org> mono-0.91.ebuild:
+  Beta1 baby! Now with fun-filled GAC!
+
+  29 Mar 2004; Peter Johanson <latexer@gentoo.org> mono-0.31.ebuild:
+  Added nptl support behind a nptl USE flag and using have_NPTL from eutils.
+  Blame tberman if things break, he said he'd take the bugs.
+
+  20 Mar 2004; Todd Berman <tberman@gentoo.org> mono-0.31.ebuild:
+  adding --with-nptl=no
+
+*mono-0.31 (19 Mar 2004)
+
+  19 Mar 2004; Todd Berman <tberman@gentoo.org> mono-0.31.ebuild:
+  version bump
+
+*mono-0.30.1 (14 Feb 2004)
+
+  14 Feb 2004; Todd Berman <tberman@gentoo.org> mono-0.30.1.ebuild:
+  version bump
+
+*mono-0.30 (13 Feb 2004)
+
+  13 Feb 2004; Todd Berman <tberman@gentoo.org> mono-0.26-r1.ebuild,
+  mono-0.30.ebuild:
+  Adding 0.30, removing 0.26
+
+*mono-0.28 (04 Oct 2003)
+
+  04 Oct 2003; Rainer Groesslinger <scandium@gentoo.org> mono-0.28.ebuild:
+  new version
+
+*mono-0.26-r1 (29 Sep 2003)
+
+  29 Sep 2003; Rainer Groesslinger <scandium@gentoo.org> mono-0.26-r1.ebuild:
+  fix for building mcs
+  provided by pcgod@gmx.net (bug #26839)
+
+  26 Aug 2003; Rainer Groesslinger <scandium@gentoo.org> mono-0.23-r1.ebuild,
+  mono-0.24-r1.ebuild, mono-0.25-r1.ebuild, mono-0.25.ebuild,
+  mono-0.26.ebuild:
+  Add a block for dev-dotnet/pnet because both are using
+  /usr/bin/ilasm for converting IL assembly source files into an IL binary
+
+*mono-0.26 (26 Aug 2003)
+
+  26 Aug 2003; Rainer Groesslinger <scandium@gentoo.org> mono-0.26.ebuild:
+  new version, minor fixes because of the new build system
+  compilation of mcs is disabled for now (see bug #26839)
+
+*mono-0.25 (24 Jul 2003)
+
+  24 Jul 2003; Todd Berman <tberman@gentoo.org> metadata.xml,
+  mono-0.23-r1.ebuild, mono-0.24-r1.ebuild, mono-0.25-r1.ebuild,
+  mono-0.25.ebuild, files/dotnet.conf, files/dotnet.init:
+  Moving to dev-dotnet
+
+  20 Jul 2003; Todd Berman <tberman@gentoo.org> mono-0.23-r1.ebuild,
+  mono-0.24-r1.ebuild, mono-0.25-r1.ebuild, mono-0.25.ebuild:
+  Fixing licenses for mono, added GPL-2 and X11
+
+  20 Jul 2003; Todd Berman <tberman@gentoo.org> metadata.xml, mono-0.25-r1.ebuild:
+  Fixed up depend issues, thanks liquidx :)
+
+  16 Jul 2003; Todd Berman <tberman@gentoo.org> mono-0.25-r1.ebuild:
+  Changing to blocking libxml2-2.5.8, portage version with this fully working is
+  masked, but it will hopefully be stable soon, before 1.4 for sure.
+
+  16 Jul 2003; Todd Berman <tberman@gentoo.org> mono-0.25-r1.ebuild:
+  libxml2-2.5.8 breaks xslt on mono, and until ! blocker deps work, masking it
+  like this.
+
+*mono-0.25-r1 (13 Jul 2003)
+
+  13 Jul 2003; Todd Berman <tberman@gentoo.org> mono-0.25-r1.ebuild:
+  Changed gc to included (modified boehm), its required by the debugger (next
+  piece to enter portage).
+
+*mono-0.25 (27 Jun 2003)
+
+  27 Jun 2003; foser <foser@gentoo.org> mono-0.25.ebuild :
+  New version
+
+*mono-0.24-r1 (12 May 2003)
+
+  12 May 2003; Rainer Groesslinger <scandium@gentoo.org> mono-0.23-r1.ebuild,
+  mono-0.24-r1.ebuild, files/dotnet.conf, files/dotnet.init:
+  init script provided by
+  Per Wigren <wigren@home.se> in bug #19617
+  with some enhancements added
+
+*mono-0.24 (08 May 2003)
+
+  08 May 2003; foser <foser@gentoo.org> mono-0.24.ebuild :
+  New version, use new compiler for mcs compilation and path fixes (#17614)
+
+*mono-0.23-r1 (12 May 2003)
+ 
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*mono-0.23 (08 Mar 2003)
+
+  12 Mar 2003; foser <foser@gentoo.org> mono-0.23.ebuild :
+  Install icons as requested/done by mathias.hasselmann@gmx.de
+
+  08 Mar 2003; foser <foser@gentoo.org> mono-0.23.ebuild :
+  New version
+
+*mono-0.22 (06 Mar 2003)
+
+  06 Mar 2003; foser <foser@gentoo.org> mono-0.22.ebuild :
+  New version
+
+*mono-0.21 (28 Feb 2003)
+
+  28 Feb 2003; foser <foser@gentoo.org> mono-0.21.ebuild :
+  New version
+
+*mono-0.20-r1 (27 Feb 2003)
+
+  28 Feb 2003; foser <foser@gentoo.org> mono-0.20-r1.ebuild :
+  Removed redundant patch, there was another way to do this duh :/
+
+  27 Feb 2003; foser <foser@gentoo.org> mono-0.20-r1.ebuild :
+  Compiles mcs from scratch now
+  Initial work done by Artur Brodowski <bzdurqa@wp.pl> in #16316
+  Hacked on a lot by me to get it right
+  Now also uses mono eclass
+
+*mono-0.20 (24 Feb 2003)
+
+  24 Feb 2003; foser <foser@gentoo.org> mono-0.20.ebuild :
+  New version
+
+*mono-0.19 (22 Jan 2003)
+
+  22 Jan 2003; Brandon Low <lostlogic@gentoo.org> mono-0.19.ebuild :
+  New version
+
+*mono-0.18 (13 jan 2003)
+
+  13 Jan 2003; foser <foser@gentoo.org> mono-0.18.ebuild :
+  New version
+
+*mono-0.17 (10 Dec 2002)
+
+  10 Dec 2002; foser <foser@gentoo.org> mono-0.17.ebuild :
+  New version
+
+*mono-0.16 (24 Oct 2002)
+
+  24 Oct 2002; foser <foser@gentoo.org> mono-0.16.ebuild :
+
+  New version, now depends on boehm-gc
+
+*mono-0.13 (29 Jul 2002)
+
+  29 Jul 2002; Kevyn Shortell <trance@gentoo.org> mono-0.13.ebuild, ChangeLog:
+  Added >=glib-2.x as a dependency, closing bug #5708.  Many thanks to Nathan
+  Sharfi <nisharfi@csupomona.edu> for testing ebuild on glib-1.3 machine to
+  find the bug =).
+
+*mono-0.13 (28 Jul 2002)
+
+  28 Jul 2002; Phil Bordelon <sunflare@gentoo.org> mono-0.13.ebuild, ChangeLog:
+  Added pkgconfig as a dependency, closing bug #5665.  Thanks to Nathan
+  Sharfi <nisharfi@csupomona.edu> for pointing this out.
+
+  27 Jul 2002: Kevyn Shortell <trance@gentoo.org> mono-0.13.ebuild, ChangLog:
+  updated to mono-0.13.ebuild. The ebuild was submitted by Luis Mayoral <satriani@okulto.net>.
+  Tested on PPC and X86, failed PPC. repo'd and submitted.
+
+*mono-0.12 (28 Jul 2002)
+
+  28 Jul 2002; Phil Bordelon <sunflare@gentoo.org> mono-0.12.ebuild, ChangeLog:
+  Added pkgconfig as a dependency, closing bug #5665.  Thanks to Nathan
+  Sharfi <nisharfi@csupomona.edu> for pointing this out.
+
+  24 Jul 2002: Brandon Low <lostlogic@gentoo.org> mono-0.12.ebuild, ChangeLog:
+  Doesn't like parallel make, and .keep a dir that it might need (othewise why did 
+  it create it?)
+
+  23 Jul 2002; Phil Bordelon <sunflare@gentoo.org> ChangeLog: Unmasking the ebuild.
+  PLEASE NOTE that the build has been known to bomb on at least one machine, although
+  it worked on all of the rest of them that we tested it on.  This is very much
+  work-in-progress software, so please take that into account before you start to
+  post bugs.
+
+  23 Jul 2002; Phil Bordelon <sunflare@gentoo.org> mono-0.12.ebuild: dodoc should
+  grab 'ChangeLog,' not 'Changelog.'  Fixed.
 
   23 Jul 2002; Phil Bordelon <sunflare@gentoo.org> mono-0.12.ebuild, ChangeLog:
   Original release.  The ebuild was submitted by Luis Mayoral <satriani@okulto.net>.
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 92788df0ec24..adc95e8cf777 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,13 +1,34 @@
-MD5 a45d9becec014c9afb13339c1b274cf5 ChangeLog 3826
-MD5 42858a42fb250bd1cb0fd5bcb559b5d4 mono-0.24.ebuild 1527
-MD5 1a57789148dd366489d821961fd0a910 mono-0.23-r1.ebuild 1881
-MD5 d59b43450b7dd325daa6980b494373db mono-0.20.ebuild 827
-MD5 54e6f2e7f5fe77642563b46d8189a672 mono-0.24-r1.ebuild 1883
-MD5 d1f00208919ea4ac6e44b060fa7ebde3 mono-0.23.ebuild 1524
-MD5 0649de7e8ec73c0c5dc85fe677fe4948 files/dotnet.conf 350
-MD5 69fcf888ecb5ec9c5498caa075565ab6 files/digest-mono-0.24 123
-MD5 c8db2904965d6ed0f1e5545c4516304d files/dotnet.init 1052
-MD5 a7c99f496d98a6085edae8a0bf1dd410 files/digest-mono-0.20 62
-MD5 69fcf888ecb5ec9c5498caa075565ab6 files/digest-mono-0.24-r1 123
-MD5 152002c84c4dd3770f370368bf6bb469 files/digest-mono-0.23-r1 123
-MD5 152002c84c4dd3770f370368bf6bb469 files/digest-mono-0.23 123
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ae5b031ae02b5e8d725b130e2c24f4ba ChangeLog 19647
+MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r5 127
+MD5 2a5c0159da180abfb3dcac3e38641a79 files/digest-mono-1.1.10 65
+MD5 e57f70fb8569f040ed1b4669c3e07652 files/digest-mono-1.1.8.3 66
+MD5 c15043c4c7276f0e4f9edac5d2da1a27 files/digest-mono-1.1.9.1 66
+MD5 2fd6267a26c5f5a6432f93b7a1105d8e files/digest-mono-1.1.9.2 66
+MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
+MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
+MD5 48284ee0228c56980a839fb245258db7 files/mcs-1.0.5-pathfix.diff 628
+MD5 046e84a24a93a7c5c1b6a6c4e8cf3fed files/mono-1.1.5-icu-linking.diff 468
+MD5 d7752110175a6157ea42e6528c791fbb files/mono-1.1.5-pathfix.diff 648
+MD5 ca0f98ff16ba20d2ff9af83580ad0db8 files/mono-1.1.5-r42108.diff 496
+MD5 08f6767a7160565ad6796eee60e412cb files/mono-1.1.5-r42122.diff 1037
+MD5 b891d116e888db40b523dfa97fad8018 files/mono-1.1.6-r42300.diff 1572
+MD5 85422af6a9f91917a9c9c3b8cceb5c33 files/mono-1.1.7-ppc-tls.diff 412
+MD5 2acaae80bdfac5c08af32cfd24b36c43 files/mono-1.1.8.3-array-getvalue.diff 1327
+MD5 f82809daef4d783797094233672feb3f files/mono-1.1.8.3-icall.diff 433
+MD5 25426f960f7fc04c8932375f20885eda files/mono-1.1.9.1-io-layer-fix.diff 5552
+MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
+MD5 10c58186e6ce0ab643d16c883f2071ff mono-1.0.5-r5.ebuild 3718
+MD5 7c228ddae84f1b83e790aeba4587f970 mono-1.1.10.ebuild 2355
+MD5 5415fa75de6e201ae1a0e12c17498709 mono-1.1.8.3.ebuild 2501
+MD5 9e335202b997822eafad0c2f80137f66 mono-1.1.9.1.ebuild 2285
+MD5 8a27590ee5780db41e7f4124b7de58d0 mono-1.1.9.2.ebuild 2000
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeK8G2G5bA0cA/ScRAix5AKCn0iSOqWRNNYucDg8k+xMZKqWR4QCghZRY
+uivaqxx998MtcyCbJUVs7X0=
+=rsLl
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/dotnet.conf b/dev-lang/mono/files/dotnet.conf
index 865174a626e4..b9089aea30bb 100644
--- a/dev-lang/mono/files/dotnet.conf
+++ b/dev-lang/mono/files/dotnet.conf
@@ -1,3 +1,7 @@
+# Copyright 1999-2003 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/files/dotnet.conf,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
+
 # configuration file for dotnet
 
 # Define what to register with .NET IL binaries so you can avoid
@@ -5,7 +9,7 @@
 # NOTE: In order to get this working you need to "chmod +x" your program
 
 # Valid options are:
-# "mono" - use the mono JIT compiler 'mono'
-# "ilrun" - use the DotGNU Portable .NET interpreter 'ilrun'
+# "mono" - use the mono runtime engine 'mono'
+# "ilrun" - use the DotGNU Portable .NET runtime engine 'ilrun'
 
 CLR=""
diff --git a/dev-lang/mono/files/dotnet.init b/dev-lang/mono/files/dotnet.init
index a99b63623654..42b61c6c9903 100644
--- a/dev-lang/mono/files/dotnet.init
+++ b/dev-lang/mono/files/dotnet.init
@@ -1,8 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/files/dotnet.init,v 1.1 2003/05/12 16:32:20 scandium Exp $
-
+# Copyright 1999-2003 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/files/dotnet.init,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
 start() {
 	ebegin "Registering .NET IL binaries with ${CLR}"
diff --git a/dev-lang/mono/mono-1.0.5-r5.ebuild b/dev-lang/mono/mono-1.0.5-r5.ebuild
index c5d76bfd01bf..df334326744a 100644
--- a/dev-lang/mono/mono-1.0.5-r5.ebuild
+++ b/dev-lang/mono/mono-1.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/dev-lang/mono/mono-1.0.5-r5.ebuild,v 1.1 2005/03/11 03:14:01 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.5-r5.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE="nptl"
 
 DEPEND="virtual/libc
@@ -68,18 +68,11 @@ src_compile() {
 	strip-flags
 
 	local myconf="--with-sigaltstack=yes"
-	if use nptl && have_NPTL
+	if use nptl
 	then
 		myconf="${myconf} --with-tls=__thread"
 		sed -i "s: -fexceptions::" ${S}/libgc/configure.host
 	else
-		if have_NPTL
-		then
-			ewarn "NPTL glibc detected, but nptl USE flag is not set."
-			ewarn "This may cause some problems for mono as it will be"
-			ewarn "compiled with normal pthread support."
-		fi
-
 		myconf="${myconf} --with-tls=pthread"
 	fi
 
diff --git a/dev-lang/mono/mono-1.1.10.ebuild b/dev-lang/mono/mono-1.1.10.ebuild
index f8e344b92ac2..ff1d7722d6c2 100644
--- a/dev-lang/mono/mono-1.1.10.ebuild
+++ b/dev-lang/mono/mono-1.1.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.10.ebuild,v 1.1 2005/11/14 05:06:11 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.10.ebuild,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
-inherit eutils mono flag-o-matic
+inherit eutils mono flag-o-matic multilib
 
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
@@ -36,10 +36,15 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff
 
 	# Install all our .dlls under $(libdir), not $(prefix)/lib
-	sed -i -e 's:$(prefix)/lib:$(libdir):' \
-		-e 's:$(exec_prefix)/lib:$(libdir):' \
-		-e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		${S}/{scripts,mono/metadata}/Makefile.am ${S}/configure.in || die
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e 's:$(prefix)/lib:$(libdir):' \
+			-e 's:$(exec_prefix)/lib:$(libdir):' \
+			-e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
+			${S}/{scripts,mono/metadata,mono/os/unix}/Makefile.am \
+			${S}/configure.in || die "sed failed"
+		sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+			${S}/{scripts,}/*.pc.in || die "sed failed"
+	fi
 
 	libtoolize --copy --force || die "libtoolize failed"
 	aclocal || die "aclocal failed"
diff --git a/dev-lang/mono/mono-1.1.8.3.ebuild b/dev-lang/mono/mono-1.1.8.3.ebuild
index 291b483c0f8e..79f4470a8392 100644
--- a/dev-lang/mono/mono-1.1.8.3.ebuild
+++ b/dev-lang/mono/mono-1.1.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/dev-lang/mono/mono-1.1.8.3.ebuild,v 1.1 2005/08/04 18:31:13 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.8.3.ebuild,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -10,11 +10,12 @@ SRC_URI="http://www.go-mono.com/sources/mono-${PV:0:3}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="nptl icu X"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
+	sys-devel/bc
 	!<dev-dotnet/pnet-0.6.12
 	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
 	icu? ( >=dev-libs/icu-2.6.2 )
@@ -63,6 +64,11 @@ src_unpack() {
 
 src_compile() {
 	strip-flags
+	if use amd64
+	then
+		replace-flags -O2 -O1
+	fi
+
 	local myconf="--with-preview=yes"
 
 	# Force __thread on amd64. See bug #83770
diff --git a/dev-lang/mono/mono-1.1.9.1.ebuild b/dev-lang/mono/mono-1.1.9.1.ebuild
index 1b210d96ffab..c86961514ae0 100644
--- a/dev-lang/mono/mono-1.1.9.1.ebuild
+++ b/dev-lang/mono/mono-1.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/dev-lang/mono/mono-1.1.9.1.ebuild,v 1.1 2005/09/22 22:37:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.9.1.ebuild,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -15,6 +15,7 @@ IUSE="nptl icu X"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
+	sys-devel/bc
 	!<dev-dotnet/pnet-0.6.12
 	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
 	icu? ( >=dev-libs/icu-2.6.2 )
@@ -33,10 +34,13 @@ src_unpack() {
 	cd ${S}
 
 	# Fix munging of Unix paths
-	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff || die
+	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff
 
 	# Fix for linking to ICU
-	epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff || die
+	epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff
+
+	# Fix for bug #106971
+	epatch ${FILESDIR}/${P}-io-layer-fix.diff
 
 	# Install all our .dlls under $(libdir), not $(prefix)/lib
 	sed -i -e 's:$(prefix)/lib:$(libdir):' \
diff --git a/dev-lang/mono/mono-1.1.9.2.ebuild b/dev-lang/mono/mono-1.1.9.2.ebuild
index 7d03f301df7b..8e3043769acd 100644
--- a/dev-lang/mono/mono-1.1.9.2.ebuild
+++ b/dev-lang/mono/mono-1.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/dev-lang/mono/mono-1.1.9.2.ebuild,v 1.1 2005/10/15 21:53:18 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.9.2.ebuild,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -49,11 +49,6 @@ src_unpack() {
 
 src_compile() {
 	strip-flags
-	# Replace O2 flag on amd64. See bug #96719
-	if use amd64
-	then
-		replace-flags -O2 -O1
-	fi
 
 	local myconf="--with-preview=yes"
 
diff --git a/dev-lang/mosml/ChangeLog b/dev-lang/mosml/ChangeLog
index 3cb0b7d138dc..2c155984c83b 100644
--- a/dev-lang/mosml/ChangeLog
+++ b/dev-lang/mosml/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/mosml
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.1 2003/11/13 21:31:40 plasmaroo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mosml-2.01.ebuild:
+  Stable on ppc.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> mosml-2.01.ebuild:
+  added ~amd64 to KEYWORDS. fixes #Bug 71083
+
+  22 Jun 2004; David Holm <dholm@gentoo.org> mosml-2.01.ebuild:
+  Added to ~ppc.
+
+*mosml-2.01 (18 Feb 2004)
+
+  18 Feb 2004; <plasmaroo@gentoo.org> mosml-2.01.ebuild:
+  Version bump; closes bug #41560.
 
 *mosml-2.00 (13 Nov 2003)
 
diff --git a/dev-lang/mosml/Manifest b/dev-lang/mosml/Manifest
index f2de4b35beb8..39412091c2d5 100644
--- a/dev-lang/mosml/Manifest
+++ b/dev-lang/mosml/Manifest
@@ -1,4 +1,4 @@
-MD5 6e93ac9f6edb85b86bc28899efc33964 ChangeLog 423
 MD5 a5c50833bcc05f696a75e5dc8bb9eb4d metadata.xml 225
-MD5 65d2b8b403e670f55ccf9f4bca1a2f43 mosml-2.00.ebuild 1022
-MD5 24b9506ef99535afddca03ed36859920 files/digest-mosml-2.00 61
+MD5 f09af48fc8e5c6aa260a2b428dded40f ChangeLog 821
+MD5 ffaf136254cb1007ecbcdb9d2bebe380 mosml-2.01.ebuild 1089
+MD5 2064226e85924cc665211f79661a204e files/digest-mosml-2.01 62
diff --git a/dev-lang/mosml/mosml-2.01.ebuild b/dev-lang/mosml/mosml-2.01.ebuild
index 40a4d63aad51..e3b84fc5eb6a 100644
--- a/dev-lang/mosml/mosml-2.01.ebuild
+++ b/dev-lang/mosml/mosml-2.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01.ebuild,v 1.1 2004/02/18 14:46:29 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01.ebuild,v 1.1.1.1 2005/11/30 09:58:05 chriswhite Exp $
 
 S="${WORKDIR}/${PN}/src"
 DESCRIPTION="Moscow ML - a lightweight implementation of Standard ML (SML)"
@@ -8,13 +8,12 @@ SRC_URI="http://www.dina.kvl.dk/~sestoft/mosml/mos201src.tar.gz"
 HOMEPAGE="http://www.dina.dk/~sestoft/mosml.html"
 LICENSE="GPL-2"
 DEPEND=""
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
 SLOT="0"
 
 src_compile() {
-
 	emake MOSMLHOME=/opt/mosml world || die
-
 }
 
 src_install () {
diff --git a/dev-lang/nasm/ChangeLog b/dev-lang/nasm/ChangeLog
index 318c01413974..790a6b0b9c0c 100644
--- a/dev-lang/nasm/ChangeLog
+++ b/dev-lang/nasm/ChangeLog
@@ -1,11 +1,150 @@
 # ChangeLog for dev-lang/nasm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/ChangeLog,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
+
+*nasm-0.98.39-r1 (17 May 2005)
+
+  17 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +nasm-0.98.39-r1.ebuild:
+  rev bump to force out security fix
+
+  17 May 2005; Michael Sterrett <mr_bones_@gentoo.org> nasm-0.98.39.ebuild:
+  security fix for bug #92991
+
+  17 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/0.98.38-overflow.patch, -nasm-0.98.38-r1.ebuild:
+  clean older version
+
+  11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> nasm-0.98.39.ebuild:
+  Stable on amd64.
+
+  09 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  nasm-0.98.38-r1.ebuild, nasm-0.98.39.ebuild:
+  tidy; sed in src_unpack, not src_compile
+
+  11 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org> nasm-0.98.39.ebuild:
+  stable for x86
+
+  20 Feb 2005; Martin Schlemmer <azarah@gentoo.org> nasm-0.98.39.ebuild:
+  Remove -std=c99 from CFLAGS set by configure if we build with gcc-2.95.3.
+
+*nasm-0.98.39 (01 Feb 2005)
+
+  01 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +nasm-0.98.39.ebuild:
+  version bump
+
+  16 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> nasm-0.98.38-r1.ebuild:
+  fix parallel make
+
+*nasm-0.98.38-r1 (16 Dec 2004)
+
+  16 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.98.38-overflow.patch, -files/nasm-0.98.36-remove-doc-target.diff,
+  -nasm-0.98.36.ebuild, +nasm-0.98.38-r1.ebuild, -nasm-0.98.38.ebuild:
+  add patch from bug #74477 to address overflow; clean older version; tidy
+
+  05 Jun 2004; Aron Griffis <agriffis@gentoo.org> nasm-0.98.38.ebuild:
+  Use make rules instead of applying a useless patch.
+
+  11 May 2004; Travis Tilley <lv@gentoo.org> nasm-0.98.38.ebuild:
+  added ~amd64 keyword
+
+  15 Apr 2004; <coxj@gentoo.org> nasm-0.98.36.ebuild:
+  Fix typo
+
+  30 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> nasm-0.98.38.ebuild:
+  inherit eutils for epatch
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> nasm-0.98.36.ebuild,
+  nasm-0.98.38.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  11 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> nasm-0.98.38.ebuild:
+  mark stable
+
+  06 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  add metadata.xml
+
+*nasm-0.98.38 (13 Sep 2003)
+
+  13 Sep 2003; Martin Holzer <mholzer@gentoo.org> nasm-0.98.38.ebuild:
+  Version bumped.
+
+*nasm-0.98.37 (30 Aug 2003)
+
+  30 Aug 2003; Hanno Boeck <hanno@gentoo.org> nasm-0.98.37.ebuild:
+  Version bump.
+
+*nasm-0.98.36 (24 Mar 2003)
+
+  25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+  Fixing improper dependencies. build? in this case.
+
+  24 Mar 2003; Aron Griffis <agriffis@gentoo.org> nasm-0.98.35.ebuild,
+  nasm-0.98.36.ebuild:
+  Update to recent version. Thanks to Michael Sterrett for the heads-up in bug
+  #16266
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nasm-0.98.35 (25 Mar 2003)
+ 
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*nasm-0.98.34 (08 Sep 2002)
+
+  25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+  Fixing improper dependencies. build? in this case.
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nasm-0.98.34.ebuild :
+  Add -alpha to KEYWORDS
+  
+  08 Sep 2002; Doug Goldstein <cardoe@gentoo.org> nasm-0.98.34.ebuild, nasm-0.98.34-remove-doc-target.diff :
+  Updated to new version and creates new patches
+
+*nasm-0.98.31-r1 (18 May 2002)
+
+  25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+  Fixing improper dependencies. build? in this case.
+
+  05 Sep 2002; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+  cleaned out old ebuilds, and tagged the remaining ones x86 only.
+
+  18 May 2002; Dan Armak <danarmak@gentoo.org> changelog :
+  Only create ps, pdf etc. docs if USE doc is enabled. Closes bug #2824.
+
+*nasm-0.98.31 (17 May 2002)
+
+  25 Mar 2003; Nicholas Jones <carpaski@gentoo.org> .ebuild:
+  Fixing improper dependencies. build? in this case.
+
+  20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Updated HOMEPAGE variable
+
+  16 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Updated to new web page and added -ppc to keywords.  Note
+  to sparc guys, you may wanna rethink your keywords ;)
+
+  17 May 2002; Dan Armak <danarmak@gentoo.org> changelog :
+  New upstream version, has some minute fixes. Close #2784.
+
+*nasm-0.98.30 (06 May 2002)
+
+  06 May 2002; Kain <kain@kain.org> nasm-0.98.30.ebuild :
+  New NASM releases are being made off SourceForge.  0.98.30 fixes a number of
+  compatibility bugs in 0.98 and also has various enhancements.
+
+*nasm-0.98-r4 (21 Mar 2002)
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> nasm-0.98-r4.ebuild :
+  HTML documentation will no longer be gzipped because it is being handled by
+  dohtml instead of dodoc.  Thanks to stefan@mdy.univie.ac.at for pointing it
+  out.
 
 *nasm-0.98-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/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index e69de29bb2d1..fd7db75bdade 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -0,0 +1,4 @@
+MD5 8524fffd916a234a0fa40149506746ee metadata.xml 738
+MD5 25059d6a70ecffe93252996d18650d45 ChangeLog 5360
+MD5 4676a1aea158920e6467df103de5fe3a nasm-0.98.39-r1.ebuild 1492
+MD5 98c253856c4823fdfe9095d900744ff6 files/digest-nasm-0.98.39-r1 65
diff --git a/dev-lang/nasm/nasm-0.98.39-r1.ebuild b/dev-lang/nasm/nasm-0.98.39-r1.ebuild
index 01984e239a62..25b1484781e2 100644
--- a/dev-lang/nasm/nasm-0.98.39-r1.ebuild
+++ b/dev-lang/nasm/nasm-0.98.39-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.39-r1.ebuild,v 1.1 2005/05/17 22:56:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.39-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/dev-lang/nemerle/ChangeLog b/dev-lang/nemerle/ChangeLog
index 0d4c935eb9b4..f4d480666baa 100644
--- a/dev-lang/nemerle/ChangeLog
+++ b/dev-lang/nemerle/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for dev-dotnet/nemerle
+# ChangeLog for dev-lang/nemerle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/ChangeLog,v 1.1 2005/03/11 02:36:03 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/ChangeLog,v 1.1.1.1 2005/11/30 09:58:23 chriswhite Exp $
+
+  24 May 2005; Peter Johanson <latexer@gentoo.org> nemerle-0.3.1.ebuild:
+  Ugh. Never meant to bump straight to stable.
+
+*nemerle-0.3.1 (08 May 2005)
+
+  08 May 2005; Peter Johanson <latexer@gentoo.org>
+  +files/nemerle-0.3.1-pathfix.diff, +nemerle-0.3.1.ebuild:
+  Bump.
+
+  14 Mar 2005; Peter Johanson <latexer@gentoo.org> nemerle-0.2.1-r1.ebuild,
+  nemerle-0.2.1-r2.ebuild:
+  Mark stable on x86.
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> nemerle-0.2.1-r1.ebuild,
+  nemerle-0.2.1-r2.ebuild:
+  mono moved from dev-dotnet -> dev-lang
 
 *nemerle-0.2.1-r2 (10 Mar 2005)
 
diff --git a/dev-lang/nemerle/Manifest b/dev-lang/nemerle/Manifest
index 977a0e844214..770db6fb5855 100644
--- a/dev-lang/nemerle/Manifest
+++ b/dev-lang/nemerle/Manifest
@@ -1,7 +1,10 @@
-MD5 2e4a7524d9e7129070eae7bf6ad5da27 nemerle-0.2.1-r2.ebuild 1052
-MD5 2d8911a60dbb70bcaba5bfbf65d7cf70 nemerle-0.2.1-r1.ebuild 883
-MD5 f44bcc07d5fa267e573ec2c267f15de6 ChangeLog 1103
+MD5 2178106d55a3e6cd17d24ad1ac4166d5 nemerle-0.2.1-r2.ebuild 1047
+MD5 0d0f825c69296c9e98211cd10a99bc59 nemerle-0.2.1-r1.ebuild 875
+MD5 820bd8a459e0cbd1909082b391dca9a3 ChangeLog 1868
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+MD5 f217fac4175d8634e31a09e6410268b2 nemerle-0.3.1.ebuild 1077
 MD5 4274209a3c36a732036a5d15656c1e57 files/digest-nemerle-0.2.1-r1 66
 MD5 4274209a3c36a732036a5d15656c1e57 files/digest-nemerle-0.2.1-r2 66
 MD5 4ec77da51ae7d4412fcdb9f276f45b94 files/nemerle-0.2.1-ncc-fix.diff 1172
+MD5 12f223324344814f284c251821698eb8 files/nemerle-0.3.1-pathfix.diff 2998
+MD5 395bbc1e4e963c6ba4aaec8846fb7f00 files/digest-nemerle-0.3.1 67
diff --git a/dev-lang/nemerle/nemerle-0.2.1-r1.ebuild b/dev-lang/nemerle/nemerle-0.2.1-r1.ebuild
index 430110a70e1b..50b04290f888 100644
--- a/dev-lang/nemerle/nemerle-0.2.1-r1.ebuild
+++ b/dev-lang/nemerle/nemerle-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/nemerle-0.2.1-r1.ebuild,v 1.1 2005/03/11 02:36:03 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/nemerle-0.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 inherit mono eutils
 
@@ -10,9 +10,9 @@ SRC_URI="http://www.nemerle.org/download/${P}.tar.gz"
 
 LICENSE="nemerle"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-DEPEND=">=dev-dotnet/mono-1.0
+DEPEND=">=dev-lang/mono-1.0
 		>=dev-lang/python-2.3
 		>=dev-libs/libxml2-2.6.4"
 
diff --git a/dev-lang/nemerle/nemerle-0.2.1-r2.ebuild b/dev-lang/nemerle/nemerle-0.2.1-r2.ebuild
index 3629b8abd677..0631452e1ebb 100644
--- a/dev-lang/nemerle/nemerle-0.2.1-r2.ebuild
+++ b/dev-lang/nemerle/nemerle-0.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/nemerle-0.2.1-r2.ebuild,v 1.1 2005/03/11 02:36:03 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/nemerle-0.2.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 inherit mono eutils
 
@@ -10,9 +10,9 @@ SRC_URI="http://www.nemerle.org/download/${P}.tar.gz"
 
 LICENSE="nemerle"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-DEPEND=">=dev-dotnet/mono-1.0
+DEPEND=">=dev-lang/mono-1.0
 		>=dev-lang/python-2.3
 		>=dev-libs/libxml2-2.6.4"
 
diff --git a/dev-lang/nemerle/nemerle-0.3.1.ebuild b/dev-lang/nemerle/nemerle-0.3.1.ebuild
index 8f0ff03970f8..91b5aa40269d 100644
--- a/dev-lang/nemerle/nemerle-0.3.1.ebuild
+++ b/dev-lang/nemerle/nemerle-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/nemerle-0.3.1.ebuild,v 1.1 2005/05/08 03:37:33 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nemerle/nemerle-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 inherit mono eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.nemerle.org/download/${P}.tar.bz2"
 
 LICENSE="nemerle"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 DEPEND=">=dev-lang/mono-1.0
 		>=dev-lang/python-2.3
diff --git a/dev-lang/nhc98/ChangeLog b/dev-lang/nhc98/ChangeLog
index 3fac1785d100..36a2bd95cc9d 100644
--- a/dev-lang/nhc98/ChangeLog
+++ b/dev-lang/nhc98/ChangeLog
@@ -1,8 +1,41 @@
 # ChangeLog for dev-lang/nhc98
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/ChangeLog,v 1.1 2002/06/09 07:38:07 george Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/ChangeLog,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
-*nhc98-1.12.ebuild (08 Jun 2002)
+  11 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> nhc98-1.12.ebuild,
+  nhc98-1.16-r1.ebuild, nhc98-1.16.ebuild:
+  fix readline dep
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> nhc98-1.16-r1.ebuild,
+  nhc98-1.16.ebuild:
+  virtual/glibc -> virtual/libc
+
+  12 Jun 2003; <msterret@gentoo.org> nhc98-1.12.ebuild:
+  fix Header
+
+*nhc98-1.16-r1 (24 Apr 2003)
+
+  24 Apr 2003; Andres Loeh <kosmikus@gentoo.org> nhc98-1.16-r1.ebuild:
+  Removed hmake from the nhc98 ebuild; hmake is now a separate package
+  (dev-haskell/hmake)
+
+*nhc98-1.16 (09 Apr 2003)
+
+  16 Apr 2003; Andres Loeh <kosmikus@gentoo.org> nhc98-1.16.ebuild:
+  Cleaned up the ebuild, moving hmake configuration to postinst, see #18857
+
+  09 Apr 2003; George Shapovalov <george@gentoo.org> all :
+  update and fix, see #18857,
+  thanks to  Andres Loeh <andres@cs.uu.nl> for ebuild
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nhc98-1.12 (08 Jun 2002)
+  
+  09 Jun 2002; George Shapovalov <george@gentoo.org> files/hmakerc, nhc98-1.12.ebuild :
+
+  updated ebuild to install aproperiate config file
+  (configure that ships with package produces weird setup)
 
   08 Jun 2002; George Shapovalov <george@gentoo.org> all :
   
diff --git a/dev-lang/nhc98/Manifest b/dev-lang/nhc98/Manifest
index e69de29bb2d1..8256d9e26dea 100644
--- a/dev-lang/nhc98/Manifest
+++ b/dev-lang/nhc98/Manifest
@@ -0,0 +1,8 @@
+MD5 88218df222af0c7e44e50e551d7a49a4 nhc98-1.16-r1.ebuild 1702
+MD5 5dba1b9719311c1dfa6aefa44aae34c5 nhc98-1.16.ebuild 1831
+MD5 cbe140dc5ebd9ed3f41081a498f4d70d ChangeLog 1904
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 410a15e8992a631b9d59a2f6cb69ead5 files/digest-nhc98-1.16 127
+MD5 410a15e8992a631b9d59a2f6cb69ead5 files/digest-nhc98-1.16-r1 127
+MD5 2f41dd93a084141f569f8b1dc5c87eee files/hmakerc 335
+MD5 deae8fae985674b5a477ee8da85160e6 files/nhc98-1.12-getenv.patch 515
diff --git a/dev-lang/nhc98/files/hmakerc b/dev-lang/nhc98/files/hmakerc
index 25ea5b5b4c76..1f59158ca589 100644
--- a/dev-lang/nhc98/files/hmakerc
+++ b/dev-lang/nhc98/files/hmakerc
@@ -1,17 +1,8 @@
 HmakeConfig
-  { defaultCompiler = "/usr/bin/nhc98"
+  { defaultCompiler = "nhc98"
   , knownCompilers =
     [ CompilerConfig
       { compilerStyle = nhc98
-      , compilerPath = "/usr/bin/nhc98"
-      , compilerVersion = "v1.12"
-      , includePaths = ["/usr/include/nhc98"]
-      , cppSymbols = ["__NHC__"]
-      , extraCompilerFlags = []
-      , isHaskell98 = True
-      }
-    , CompilerConfig
-      { compilerStyle = nhc98
       , compilerPath = "nhc98"
       , compilerVersion = "v1.12"
       , includePaths = ["/usr/include/nhc98"]
diff --git a/dev-lang/nhc98/nhc98-1.16-r1.ebuild b/dev-lang/nhc98/nhc98-1.16-r1.ebuild
index 58dd4d54f593..f494a7d0f3fc 100644
--- a/dev-lang/nhc98/nhc98-1.16-r1.ebuild
+++ b/dev-lang/nhc98/nhc98-1.16-r1.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.16-r1.ebuild,v 1.1 2003/04/24 16:04:21 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
-IUSE="readline"
-
-TARBALL="nhc98src-${PV}.tar.gz"
+inherit eutils
 
 DESCRIPTION="Haskell 98 compiler"
-SRC_URI="ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/${TARBALL}
-	ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/patch-1.16-typesyn"
 HOMEPAGE="http://www.cs.york.ac.uk/fp/nhc98/"
+SRC_URI="ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/nhc98src-${PV}.tar.gz
+	ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/patch-1.16-typesyn"
 
-SLOT="0"
 LICENSE="nhc98"
-KEYWORDS="~x86 ~sparc "
+SLOT="0"
+KEYWORDS="x86 ~sparc"
+IUSE="readline"
 
-DEPEND="virtual/glibc
-	readline? ( >=readline-4.1 )"
+DEPEND="virtual/libc
+	readline? ( >=sys-libs/readline-4.1 )"
 
 src_unpack() {
-	# unpack the source
-	unpack "${TARBALL}"
+	unpack nhc98src-${PV}.tar.gz
 	# type synoym patch
 	cd ${S}
 	epatch ${DISTDIR}/patch-1.16-typesyn
-#	cd ${P}
-#	patch -p0 < ${FILESDIR}/patch-1.16-typesyn
 }
 
 src_compile() {
-
 	./configure --buildwith=gcc \
 		--prefix=/usr --installdir=/usr \
 		-man -docs \
@@ -39,7 +34,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	# The install location is taken care of by the
 	# configure script.
 	make DESTDIR=${D} install || die
@@ -60,10 +55,10 @@ src_install () {
 	rm ${D}/usr/bin/hmake*
 	rm ${D}/usr/bin/{harch,hi}
 	rm -rf ${D}/usr/lib/hmake
-        rm ${D}/usr/share/man/man1/hmake*
+	rm ${D}/usr/share/man/man1/hmake*
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# info about new package structure
 	einfo "NOTICE: hmake is no longer a part of this package,"
 	einfo "but separately available as dev-haskell/hmake."
diff --git a/dev-lang/nhc98/nhc98-1.16.ebuild b/dev-lang/nhc98/nhc98-1.16.ebuild
index ce39ef3c59cd..9faea4669068 100644
--- a/dev-lang/nhc98/nhc98-1.16.ebuild
+++ b/dev-lang/nhc98/nhc98-1.16.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.16.ebuild,v 1.1 2003/04/10 08:59:59 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nhc98/nhc98-1.16.ebuild,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
-IUSE="readline"
-
-TARBALL="nhc98src-${PV}.tar.gz"
+inherit eutils
 
 DESCRIPTION="Haskell 98 compiler"
-SRC_URI="ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/${TARBALL}
-	ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/patch-1.16-typesyn"
 HOMEPAGE="http://www.cs.york.ac.uk/fp/nhc98/"
+SRC_URI="ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/nhc98src-${PV}.tar.gz
+	ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/patch-1.16-typesyn"
 
-SLOT="0"
 LICENSE="nhc98"
-KEYWORDS="~x86 ~sparc "
+SLOT="0"
+KEYWORDS="x86 ~sparc"
+IUSE="readline"
 
-DEPEND="virtual/glibc
-	readline? ( >=readline-4.1 )"
+DEPEND="virtual/libc
+	readline? ( >=sys-libs/readline-4.1 )"
 
 src_unpack() {
-	# unpack the source
-	unpack "${TARBALL}"
+	unpack nhc98src-${PV}.tar.gz
 	# type synoym patch
 	cd ${S}
 	epatch ${DISTDIR}/patch-1.16-typesyn
-#	cd ${P}
-#	patch -p0 < ${FILESDIR}/patch-1.16-typesyn
 }
 
 src_compile() {
-
 	./configure --buildwith=gcc \
 		--prefix=/usr --installdir=/usr \
 		-man -docs \
@@ -39,30 +34,11 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	# The install location is taken care of by the
 	# configure script.
 	make DESTDIR=${D} install || die
 
-	#nhc's build system does not update hmakerc when using DESTDIR;
-	#therefore, we do it manually here
-
-	einfo "Adjusting... hmakerc"
-	cd ${S}
-	MACHINE=`script/harch`
-        ${D}/usr/bin/hmake-config \
-		${D}/usr/lib/hmake/${MACHINE}/hmakerc add /usr/bin/nhc98
-	${D}/usr/bin/hmake-config \
-		${D}/usr/lib/hmake/${MACHINE}/hmakerc add nhc98 ||\
-          	einfo "(This error message is harmless)"
-	${D}/usr/bin/hmake-config \
-		${D}/usr/lib/hmake/${MACHINE}/hmakerc \
-			default /usr/bin/nhc98
-	# remove temporary build version of nhc98 from config
-        ${D}/usr/bin/hmake-config \
-		${D}/usr/lib/hmake/${MACHINE}/hmakerc \
-			delete ${S}/script/nhc98
-
 	#install docs and man pages manually
 	dodoc README INSTALL COPYRIGHT
 	doman man/*
@@ -72,3 +48,23 @@ src_install () {
 	docinto html/bugs
 	dodoc bugs/README
 }
+
+pkg_postinst() {
+	#nhc's build system does not update hmakerc when using DESTDIR;
+	#therefore, we do it manually here
+
+	einfo "Adjusting... hmakerc"
+	MACHINE=`/usr/bin/harch`
+	/usr/bin/hmake-config \
+		/usr/lib/hmake/${MACHINE}/hmakerc add /usr/bin/nhc98
+	/usr/bin/hmake-config \
+		/usr/lib/hmake/${MACHINE}/hmakerc add nhc98 ||\
+		einfo "(This error message is harmless)"
+	/usr/bin/hmake-config \
+		/usr/lib/hmake/${MACHINE}/hmakerc \
+			default /usr/bin/nhc98
+	# remove temporary build version of nhc98 from config
+	/usr/bin/hmake-config \
+		/usr/lib/hmake/${MACHINE}/hmakerc \
+			delete ${S}/script/nhc98
+}
diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog
index 1bc39608fa8e..fad3e7505ed2 100644
--- a/dev-lang/nqc/ChangeLog
+++ b/dev-lang/nqc/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for dev-lang/nqc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.1 2003/06/21 07:03:06 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
-*nqc-2.5.1.ebuild (20 Jun 2003)
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> nqc-2.5.1.ebuild:
+  Stable on ppc.
+
+  22 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> nqc-2.5.1.ebuild:
+  Fix einfo, bug #70854
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> nqc-2.5.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Jan 2004; Luca Barbato <lu_zero@gentoo.org> nqc-2.5.1.ebuild:
+  Marked ~ppc
+
+*nqc-2.5.1 (20 Jun 2003)
 
   20 Jun 2003; George Shapovalov <george@gentoo.org> Manifest, nqc-2.5.1.ebuild, files/{digest-nqc-2.5.1} :
   initial release (#12343)
diff --git a/dev-lang/nqc/Manifest b/dev-lang/nqc/Manifest
index a12719aca7a8..f0ea84a6a080 100644
--- a/dev-lang/nqc/Manifest
+++ b/dev-lang/nqc/Manifest
@@ -1,2 +1,3 @@
-MD5 4d7ad84ce4640b639be6f17570cebaeb nqc-2.5.1.ebuild 1198
+MD5 1c5fe050f9988c8e7a0088f4937fe618 nqc-2.5.1.ebuild 1114
+MD5 b3ab5cc4f137e90d75a91799ac702496 ChangeLog 844
 MD5 ec2eb2fa60d922ccddc0e768135303c4 files/digest-nqc-2.5.1 59
diff --git a/dev-lang/nqc/nqc-2.5.1.ebuild b/dev-lang/nqc/nqc-2.5.1.ebuild
index 1aee418faa76..e99c87844b91 100644
--- a/dev-lang/nqc/nqc-2.5.1.ebuild
+++ b/dev-lang/nqc/nqc-2.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2002 Alexander Holler
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-2.5.1.ebuild,v 1.1 2003/06/21 07:03:06 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-2.5.1.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 My_PV="`echo $PV|cut -d. -f1,2`.r`echo $PV|cut -d. -f3`"
 My_P="${PN}-${My_PV}"
@@ -11,10 +11,10 @@ HOMEPAGE="http://www.baumfamily.org/nqc/"
 
 SLOT="0"
 LICENSE="MPL-1.0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	${#NQC_SERIAL} && NQC_SERIAL="/dev/ttyS0"
@@ -29,9 +29,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "***************************************************************"
-	einfo "* To change the default serial name for nqc (/dev/ttyS0)set   *"
-	einfo "* the environment variable NQC_SERIAL and reemerge nqc, e.g.: *"
-	einfo "*  NQC_SERIAL='/dev/ttyS1' emerge nqc                         *"
-	einfo "***************************************************************"
+	einfo "To change the default serial name for nqc (/dev/ttyS0) set"
+	einfo "the environment variable NQC_SERIAL and reemerge nqc, e.g.:"
+	einfo " NQC_SERIAL='/dev/ttyS1' emerge nqc"
 }
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index c6ff2e85df20..55c8a48af1ad 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,9 +1,296 @@
 # ChangeLog for dev-lang/ocaml
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.1 2002/02/07 21:30:10 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org> ocaml-3.08.4.ebuild:
+  Stable on hppa.
+
+*ocaml-3.09.0 (10 Nov 2005)
+
+  10 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.09.0.ebuild:
+  Version bump, marked -* as it breaks some packages in gentoo which i'm trying
+  to get up-to-date , but the ebuild can be useful as it is for experienced
+  people.
+
+  09 Nov 2005; Jason Wever <weeve@gentoo.org> ocaml-3.08.4.ebuild:
+  Marked stable on SPARC wrt bug #106837.
+
+  16 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> ocaml-3.08.3.ebuild:
+  Stable on hppa.
+
+  27 Sep 2005; Jason Wever <weeve@gentoo.org> ocaml-3.08.3.ebuild:
+  Stable on SPARC.
+
+*ocaml-3.08.4 (21 Sep 2005)
+
+  21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild,
+  +ocaml-3.08.4.ebuild, -ocaml-3.08.ebuild:
+  Add latest version, remove unused one. Version .3 is stable on x86 and 
+  amd64.
+	
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.3.ebuild:
+  Mark 3.08.3 stable on ia64
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.3.ebuild:
+  Mark 3.08.3 stable on alpha
+
+  26 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild:
+  Added gcc4 patch, thanks to Peter Hjalmarsson <xake@telia.com> (fixes bug
+  #97186).
+
+  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> ocaml-3.08.3.ebuild:
+  Multilib fixes.
+
+  11 May 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> ocaml-3.08.1.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.1.ebuild:
+  stable on ia64
+
+*ocaml-3.08 (19 Mar 2005)
+*ocaml-3.07-r1 (19 Mar 2005)
+
+  19 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ocaml-3.07-hppa.patch, +ocaml-3.07-r1.ebuild, +ocaml-3.08.ebuild:
+  resurrect versions to fix dep breakage
+
+  18 Mar 2005; Matthieu Sozeau <mattam@gentoo.org>
+  -files/ocaml-3.07-hppa.patch, files/ocaml-rebuild.sh, -ocaml-3.07-r1.ebuild,
+  -ocaml-3.08.2.ebuild, -ocaml-3.08.ebuild, +ocaml-3.08.3.ebuild:
+  Adding latest version. It's a bugfix release, hence i keeped the ~ flags. I
+  cleaned up the dir, keeping the most stable versions. I reworked the rebuild
+  script a little, it should not miss any package now. I tested the last version
+  of ocaml and the script with all ocaml packages on x86 and ppc.
+
+  07 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.1.ebuild:
+  Stable on ppc.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> ocaml-3.08.1.ebuild:
+  Stable on hppa.
+
+  02 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> ocaml-3.08.1.ebuild:
+  Stable ppc-macos
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> ocaml-3.08.1.ebuild:
+  Stable on alpha.
+
+  07 Dec 2004; Jason Wever <weeve@gentoo.org> ocaml-3.08.1.ebuild:
+  Stable on sparc.
+
+*ocaml-3.08.2 (29 Nov 2004)
+
+  29 Nov 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.1.ebuild,
+  +ocaml-3.08.2.ebuild:
+  Move 3.08.1 to x86 and add 3.08.2 release.
+
+  20 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild,
+  ocaml-3.08.1.ebuild, ocaml-3.08.ebuild:
+  Changed strip-flags to replace-flags, as advised by Carsten Tschense in bug
+  #65327.
+
+  12 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild,
+  ocaml-3.08.1.ebuild, ocaml-3.08.ebuild:
+  Add strip-flags to remove -O3 and other unsupported ones etc..
+
+  22 Aug 2004; Travis Tilley <lv@gentoo.org> ocaml-3.08.ebuild:
+  stable on amd64
+
+*ocaml-3.08.1 (19 Aug 2004)
+
+  19 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.08.1.ebuild:
+  Version bump.
+
+  18 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild,
+  ocaml-3.08.ebuild:
+  Add handling of CFLAGS, use with care!
+
+  16 Aug 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.08.ebuild:
+  Yay, my port to hppa-linux is in the mainstream ! Marking stable !
+
+  13 Aug 2004; Jason Wever <weeve@gentoo.org> ocaml-3.07-r1.ebuild:
+  Stable on sparc.
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild:
+  Move 3.07 to stable on ppc.
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.06-r2.ebuild,
+  ocaml-3.07-r1.ebuild, ocaml-3.08.ebuild:
+  Add support for ocamldoc and latex via a new use flag.
+
+*ocaml-3.08 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.08.ebuild:
+  Version bump.
+
+  21 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> files/ocaml-rebuild.sh,
+  ocaml-3.07-r1.ebuild:
+  Yet a little more robustness in the rebuild script.
+
+  21 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> files/ocaml-rebuild.sh:
+  Fixed bug in the rebuild script. see #56597.
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> ocaml-3.07-r1.ebuild:
+  adding back ~amd64 keyword
+
+  06 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> -ocaml-3.06-r1.ebuild,
+  ocaml-3.06-r2.ebuild, -ocaml-3.06.ebuild, -ocaml-3.07.ebuild,
+  -ocaml-3.07_beta2.ebuild:
+  remove old, no longer needed versions.
+
+  06 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> +files/ocaml-rebuild.sh,
+  ocaml-3.07-r1.ebuild:
+  Move to stable on x86, adding a rebuilding script.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ocaml-3.06-r1.ebuild,
+  ocaml-3.06-r2.ebuild, ocaml-3.06.ebuild, ocaml-3.07-r1.ebuild,
+  ocaml-3.07.ebuild, ocaml-3.07_beta2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild
+  change keyword from macos to ~macos (because of ranlib work)
+  
+  26 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild
+  add ranlib bit to ebuild and rekeyword macos (i tested it with unison) (thanks 
+  Philippe Bouamriou for bug #57917 ))
+
+  25 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild
+  ~macos keyword (unison fails and cites ocaml problems)
+
+  25 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild
+  add macos keyword
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> ocaml-3.07-r1.ebuild,
+  ocaml-3.07.ebuild, ocaml-3.07_beta2.ebuild:
+  Marked ocaml -amd64. Produces bad object code that causes segfaults under
+  certain conditions. This happens only on amd64.
+
+  15 May 2004; Bryan Østergaard <kloeri@gentoo.org> ocaml-3.07-r1.ebuild:
+  Stable on alpha.
+
+  11 May 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.07-r1.ebuild:
+  Marked stable on hppa.
+
+  08 May 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.07-r1.ebuild:
+  Added support for native hppa compiler. Marked ~hppa.
+
+  22 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild:
+  Fix unpacking of patch file (bug #48485).
+
+  19 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild:
+  Add fix for bug #46703
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> ocaml-3.07-r1.ebuild,
+  ocaml-3.07.ebuild:
+  added missing ~amd64 keyword
+
+  27 Feb 2004; Seemant Kulleen <seemant@gentoo.org> ocaml-3.06-r1.ebuild,
+  ocaml-3.06-r2.ebuild, ocaml-3.06.ebuild, ocaml-3.07-r1.ebuild,
+  ocaml-3.07.ebuild, ocaml-3.07_beta2.ebuild:
+  move the filter-flags statement into src_compile
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> ocaml-3.07-r1.ebuild:
+  add ~ia64
+
+  03 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.06-r2.ebuild:
+  Mark stable/tested on ppc.
+
+*ocaml-3.07-r1 (17 Oct 2003)
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> ocaml-3.07-r1.ebuild:
+  Adding patch. Closes #31265.
+
+  06 Oct 2003; Jason Wever <weeve@gentoo.org> ocaml-3.07.ebuild:
+  Fixed up sparc specific parts as the patch is no longer needed in the new rev,
+  but the -host arg is.
+
+*ocaml-3.07 (06 Oct 2003)
+
+  06 Oct 2003; George Shapovalov <george@gentoo.org> ocaml-3.07.ebuild :
+  3.07 is out, this outdates the beta that was fixing #28025
+
+  02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ocaml-3.06-r2.ebuild,
+  ocaml-3.07_beta2.ebuild:
+  3.06-r2 is stable; 3.07_beta2 is testing on alpha
+
+*ocaml-3.07_beta2 (11 Sep 2003)
+
+ 11 Sep 2003; George Shapovalov <george@gentoo.org> ocaml-3.07_beta2.ebuild :
+ added new beta as it seems to fix some rare problem in #28025
+
+*ocaml-3.06-r2 (09 Sep 2003)
+
+  09 Sep 2003; George Shapovalov <george@gentoo.org> ocaml-3.06-r2.ebuild, metadata.xml :
+  ocaml was using uotdated "head -1" construct throughout. Changed this to "head -n 1",
+  see #27835 for details. Also added metadata.xml
+
+  06 Sep 2003; Jason Wever <weeve@gentoo.org> ocaml-3.06-r1.ebuild,
+  ocaml-3.06.ebuild, files/ocaml-3.06-sparc-configure.patch:
+  Added patch and myconf fix to fix bug #23767.
+
+*ocaml-3.06-r1 (01 May 2003)
+
+  01 May 2003; George Shapovalov <george@gentoo.org> ocaml-3.06-r1.ebuild :
+  updated the ebuild to incorporate the fix for tk-8.4 necessary for lablgl.
+  Thanks to Rick Harris <rickharris@mightylegends.zapto.org> for the note and the patch.
+
+*ocaml-3.06 (28 Jan 2003)
+
+  11 Apr 2003; Joshua Brindle <method@gentoo.org> ocaml-3.04-r1.ebuild,
+  ocaml-3.06.ebuild:
+  added filter-flags -fstack-protector
+
+  28 Jan 2003; Jon Nall <nall@gentoo.org> ocaml-3.06 :
+  who made this build? i didn't. i just added ~ppc to it.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ocaml-3.05 (07 Aug 2002)
+
+  06 Aug 2002; George Shapovalov <george@gentoo.org> ocaml-3.04-r2.ebuild, files/digest-ocaml-3.05 :
+
+  new version
+  removed ppc patch as it was supposed to be unnecessary
+  ebuild is masked now, please test, especially ppc people.
+  tk dependency is optional, should build now without tcltk or X
+
+  related ebuild submissions:
+  Bardur Arantsson <bardur-gta@odense.kollegienet.dk>, bug#5786
+  ?Larry Cow <larrycow@free.fr>, bug# 5799
+
+*ocaml-3.04-r2 (01 Aug 2002)
+
+  02 Aug 2002; George Shapovalov <george@gentoo.org> ocaml-3.04-r2.ebuild :
+
+  tk dependence is reported (by Tim Hobbs <rectrix@rectrix.cx>) to be optional,
+  made it depend on tcltk use flag.
+  Created and masked new revision to give this some testing without interuption 
+  to the working package.
+  Core devs (cvs access people): please do not unmask it on server! Instead please 
+  let me know that it tested Ok. I will do necessary modifications to the -r1 
+  and delete -r2. This way we will not force everybody to rebuild perfectly 
+  working package.
+
+*ocaml-3.04-r1 (24 Jun 2002)
+
+  24 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ocaml-3.04-r1.ebuild files/digest-ocaml-3.04-r1:
+
+  ocaml library paths are now properly added to /etc/ld.so.conf.
+
+  Removed ocaml-3.04.ebuild files/digest-ocaml-3.04
 
 *ocaml-3.04 ( 7 Feb 2002 )
 
+  7 June 2002; David Chamberlain <daybird@gentoo.org> Changelog 
+  ocaml-3.04.ebuild files/ocaml-3.04-ppc.diff:
+
+  Added patch from cvs so that ocaml will build on ppc.  Closes out bug #2984
+
   7 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog ocaml-3.04.ebuild files/digest-ocaml-3.04 :
   
   Objective Caml is a fast modern type-inferring functional programming 
@@ -12,4 +299,3 @@
   This builds a runtime environment and native compiler for ocaml.
  
   Submitted by Sean Mitchell.
-
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 7d5c153f6e9d..2b43682c2e6d 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,9 +1,19 @@
-MD5 44738768a9de3beed1e8944054a23578 ChangeLog 2683
-MD5 828cbf42cae99b11c6b6fdd1ce69175c ocaml-3.04-r1.ebuild 1429
-MD5 d570fb6230e480252908dedd8b5a8faf ocaml-3.06-r1.ebuild 1239
-MD5 71516833e12927d7935f31937866dbdb ocaml-3.06.ebuild 1176
-MD5 16e3ae70d2c90d821a9419e685105a44 files/digest-ocaml-3.04-r1 200
-MD5 30ac0d14e37ff0be57927d84e4e7e1c6 files/digest-ocaml-3.06 197
-MD5 e8120e097a0f40c921bcf811cb355d46 files/ocaml-3.04-ppc.diff.tgz 2967
-MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r1 63
+MD5 bd217f872b8c2eb0239540519cb42cbc ChangeLog 11181
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 d3e28c5c99b056007b6b5b0781a4e542 ocaml-3.06-r2.ebuild 1660
+MD5 ef7cc12a4ff8aeec9ddb58ff65f7e3c0 ocaml-3.07-r1.ebuild 2910
+MD5 e3554fd0d2b4cbd09694d68ca3edb0d8 ocaml-3.08.1.ebuild 2149
+MD5 cfcf2e84fee42ef8460d98c45a4b947f ocaml-3.08.3.ebuild 2292
+MD5 b2f71c18310d84ec7f3faa4b27fed380 ocaml-3.09.0.ebuild 2499
+MD5 f24879c74931b507a1a9a9e0c2fc8ef4 ocaml-3.08.4.ebuild 2504
+MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63
+MD5 c42de320103c2d3eb1aa4002e2e0716b files/digest-ocaml-3.07-r1 130
+MD5 b15b12e756d7eb95981891617e694a7a files/digest-ocaml-3.08.4 66
+MD5 3854a7d6aaedc7d5fde7239776cec5cf files/digest-ocaml-3.08.1 66
+MD5 d80f37fe859bc2ea8f71e13f02578275 files/digest-ocaml-3.08.3 66
+MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660
 MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
+MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730
+MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710
+MD5 3148840e70f4bb5263bdf7cd6c97e6d9 files/ocaml-rebuild.sh 1215
+MD5 366188bde75be172b0126d0d8cd76896 files/digest-ocaml-3.09.0 66
diff --git a/dev-lang/ocaml/files/ocaml-rebuild.sh b/dev-lang/ocaml/files/ocaml-rebuild.sh
index bb01c31c46cb..26b5630f60c8 100644
--- a/dev-lang/ocaml/files/ocaml-rebuild.sh
+++ b/dev-lang/ocaml/files/ocaml-rebuild.sh
@@ -1,45 +1,54 @@
 #!/bin/sh
-# run like this: ocaml-rebuild.sh [emerge_options]
+# run like this: ocaml-rebuild.sh [-h | -f] [emerge_options]
 
 emerge=/usr/bin/emerge
-qpkg=/usr/bin/qpkg
 
-if [ ! -x $qpkg ]
+if [ "$1" = "-h" ]
 then
-	echo "You need to emerge gentoolkit for this script to work"
+	echo "usage: ocaml-rebuild.sh [-h | -f(orce)] [emerge_options]"
+	echo "With -f, 	the packages will first be unmerged and then emerged"
+	echo "with the given options to ensuree correct dependancy analysis."
+	echo "Otherwise emerge is run with the --pretend flag and the given"
+	echo "options."
+	echo "It is recommended to keep the list of rebuilt packages printed"
+	echo "in pretend mode in case something go wrong"
 	exit 1
 fi
 
-deps=`$qpkg -nc -n -q -I dev-lang/ocaml-3.06 | grep -v -e "\(DEPEND.*\)\|\(dev-lang.*\)" | sort | uniq`
-toclean=""
-
-for dep in $deps
-  do
-	dirs=`find /var/db/pkg/ -name ${dep}`
-	
-	for dir in $dirs
-	  do
-	  if [ -d $dir ]
-	  then
-		  ocamldep=`grep dev-lang/ocaml $dir/DEPEND > /dev/null`
-		  if [[ $ocamldep -eq 0 ]]
-		  then
-			  SLOT=`cat $dir/SLOT`
-			  if [[ "$SLOT" = "" || "$SLOT" = "0" ]]
-				  then
-				  category=`cat $dir/CATEGORY`
-				  toclean="=$category/$dep $toclean"
-			  fi
-		  fi
-	  fi
-	done	
+if [ "$1" = "-f" ]
+then
+	pretend=0
+	shift
+else
+	pretend=1
+fi
+
+depends=`find /var/db/pkg -name DEPEND -exec grep -l 'dev-lang/ocaml\\|dev-ml/findlib' {} \;`
+
+for dep in $depends
+do 
+  dir=`dirname $dep`
+  pkg=`basename $dir`
+  category=`cat $dir/CATEGORY`
+
+  toclean="=$category/$pkg $toclean"
+  tocleanstr="\"$category/$pkg\" $tocleanstr"
+  tobuild=">=$category/$pkg $tobuild"
+  tobuildstr="\">=$category/$pkg\" $tobuildstr"
 done
 
+echo Cleaning $tocleanstr
+echo Building $tobuildstr
+
 if [ "$toclean" != "" ]
 then
-	cmd="$emerge $@ $toclean"
-	#echo "Debug:" $cmd
-	$cmd
+	if [ $pretend -eq 1 ]
+	then
+		$emerge --pretend $@ $tobuild
+	else
+		$emerge unmerge $toclean
+		$emerge $@ $tobuild
+	fi
 else
 	echo "Nothing to update"
 fi
diff --git a/dev-lang/ocaml/ocaml-3.06-r2.ebuild b/dev-lang/ocaml/ocaml-3.06-r2.ebuild
index c604655c428d..1b59556d93db 100644
--- a/dev-lang/ocaml/ocaml-3.06-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.06-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r2.ebuild,v 1.1 2003/09/09 17:56:01 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 inherit flag-o-matic eutils
-filter-flags "-fstack-protector"
 
 DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
 HOMEPAGE="http://www.ocaml.org/"
@@ -11,10 +10,10 @@ SRC_URI="http://caml.inria.fr/distrib/${P}/${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
-IUSE="tcltk"
+KEYWORDS="x86 sparc ppc alpha"
+IUSE="tcltk latex"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tk-3.3.3 )"
 
 src_unpack() {
@@ -24,6 +23,8 @@ src_unpack() {
 }
 
 src_compile() {
+	filter-flags "-fstack-protector"
+
 	local myconf
 	use tcltk || myconf="-no-tk"
 
@@ -61,3 +62,9 @@ src_install() {
 	# documentation
 	dodoc Changes INSTALL LICENSE README Upgrading
 }
+
+pkg_postinst() {
+	if use latex; then
+		echo "TEXINPUTS=/usr/lib/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc
+	fi
+}
\ No newline at end of file
diff --git a/dev-lang/ocaml/ocaml-3.07-r1.ebuild b/dev-lang/ocaml/ocaml-3.07-r1.ebuild
index ba021cf23ddd..a92236db02cc 100644
--- a/dev-lang/ocaml/ocaml-3.07-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.07-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07-r1.ebuild,v 1.1 2003/10/16 19:24:18 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 inherit flag-o-matic eutils
-filter-flags "-fstack-protector"
 
 DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
 HOMEPAGE="http://www.ocaml.org/"
@@ -13,20 +12,31 @@ SRC_URI="http://caml.inria.fr/distrib/${P}/${P}.tar.gz
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
-IUSE="tcltk"
+KEYWORDS="x86 sparc ppc alpha ~ia64 ~amd64 hppa ~ppc-macos"
+IUSE="tcltk latex"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tk-3.3.3 )"
 
+pkg_setup() {
+	ewarn
+	ewarn "Building ocaml with unsafe CFLAGS can have unexpected results"
+	ewarn "Please retry building with safer CFLAGS before reporting bugs"
+	ewarn
+}
+
 src_unpack() {
-	unpack ${A}
+	unpack ${P}.tar.gz
 	cd ${S}
+	use hppa && epatch ${FILESDIR}/${P}-hppa.patch
 	epatch ${DISTDIR}/${P}-patch2.diffs
 	grep -rle "head -1" . | xargs sed -i "s:head -1:head -n 1:g"
 }
 
 src_compile() {
+	filter-flags "-fstack-protector"
+	replace-flags "-O?" -O2
+
 	local myconf
 	use tcltk || myconf="-no-tk"
 
@@ -35,12 +45,18 @@ src_compile() {
 		myconf="${myconf} -host sparc-unknown-linux-gnu"
 	fi
 
+	# Fix for bug #46703
+	export LC_ALL=C
+
 	./configure -prefix /usr \
 		-bindir /usr/bin \
 		-libdir /usr/lib/ocaml \
 		-mandir /usr/share/man \
 		--with-pthread ${myconf} || die
 
+	sed -i -e "s/\(BYTECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile
+	sed -i -e "s/\(NATIVECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile
+
 	make world || die
 	make opt || die
 	make opt.opt || die
@@ -58,3 +74,35 @@ src_install() {
 	# documentation
 	dodoc Changes INSTALL LICENSE README Upgrading
 }
+
+pkg_postinst() {
+	ranlib /usr/lib/ocaml/libasmrunp.a
+	ranlib /usr/lib/ocaml/libbigarray.a
+	ranlib /usr/lib/ocaml/libcamlrun.a
+	ranlib /usr/lib/ocaml/libgraphics.a
+	ranlib /usr/lib/ocaml/libmldbm.a
+	ranlib /usr/lib/ocaml/libnums.a
+	ranlib /usr/lib/ocaml/libstr.a
+	ranlib /usr/lib/ocaml/libthreads.a
+	ranlib /usr/lib/ocaml/libthreadsnat.a
+	ranlib /usr/lib/ocaml/libunix.a
+	ranlib /usr/lib/ocaml/libstr.a
+	ranlib /usr/lib/ocaml/str.a
+	ranlib /usr/lib/ocaml/unix.a
+	ranlib /usr/lib/ocaml/stdlib.a
+	ranlib /usr/lib/ocaml/libasmrun.a
+
+
+	if use latex; then
+		echo "TEXINPUTS=/usr/lib/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc
+	fi
+
+	echo
+	einfo "OCaml is not binary compatible from version to version,"
+	einfo "so you (may) need to rebuild all packages depending on it that"
+	einfo "are actually installed on your system."
+	einfo "To do so, you can run: "
+	einfo "sh ${FILESDIR}/ocaml-rebuild.sh [-h | emerge options]"
+	einfo "Which will call emerge on all old packages with the given options"
+	echo
+}
diff --git a/dev-lang/ocaml/ocaml-3.08.1.ebuild b/dev-lang/ocaml/ocaml-3.08.1.ebuild
index 2f638dcf598f..7ad454cc2a12 100644
--- a/dev-lang/ocaml/ocaml-3.08.1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.1.ebuild,v 1.1 2004/08/19 14:47:29 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.1.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.tar.bz2"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~macos"
+KEYWORDS="x86 sparc ppc alpha ia64 amd64 hppa ppc-macos"
 IUSE="tcltk latex"
 
 DEPEND="virtual/libc
@@ -26,6 +26,7 @@ pkg_setup() {
 
 src_compile() {
 	filter-flags "-fstack-protector"
+	replace-flags "-O?" -O2
 
 	local myconf
 	use tcltk || myconf="-no-tk"
diff --git a/dev-lang/ocaml/ocaml-3.08.3.ebuild b/dev-lang/ocaml/ocaml-3.08.3.ebuild
index 16535e4b14b4..c9e93e15e040 100644
--- a/dev-lang/ocaml/ocaml-3.08.3.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.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/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.1 2005/03/18 17:36:55 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils multilib
 
 DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
 HOMEPAGE="http://www.ocaml.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.tar.bz2"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~ppc-macos"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc-macos sparc x86"
 IUSE="tcltk latex"
 
 DEPEND="virtual/libc
@@ -24,6 +24,14 @@ pkg_setup() {
 	ewarn
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#GCC4 patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_compile() {
 	filter-flags "-fstack-protector"
 	replace-flags "-O?" -O2
@@ -41,7 +49,7 @@ src_compile() {
 
 	./configure -prefix /usr \
 		-bindir /usr/bin \
-		-libdir /usr/lib/ocaml \
+		-libdir /usr/$(get_libdir)/ocaml \
 		-mandir /usr/share/man \
 		--with-pthread ${myconf} || die
 
@@ -55,12 +63,12 @@ src_compile() {
 
 src_install() {
 	make BINDIR=${D}/usr/bin \
-		LIBDIR=${D}/usr/lib/ocaml \
+		LIBDIR=${D}/usr/$(get_libdir)/ocaml \
 		MANDIR=${D}/usr/share/man \
 		install || die
 
 	# silly, silly makefiles
-	dosed "s:${D}::g" /usr/lib/ocaml/ld.conf
+	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
 
 	# documentation
 	dodoc Changes INSTALL LICENSE README Upgrading
@@ -68,7 +76,7 @@ src_install() {
 
 pkg_postinst() {
 	if use latex; then
-		echo "TEXINPUTS=/usr/lib/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc
+		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc
 	fi
 
 	echo
diff --git a/dev-lang/ocaml/ocaml-3.08.4.ebuild b/dev-lang/ocaml/ocaml-3.08.4.ebuild
index e5af01e9be92..21d6deee0716 100644
--- a/dev-lang/ocaml/ocaml-3.08.4.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.1 2005/09/21 21:54:25 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.tar.bz2"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc-macos -s390 sparc ~x86"
 IUSE="tcltk latex"
 
 DEPEND="virtual/libc
diff --git a/dev-lang/ocaml/ocaml-3.09.0.ebuild b/dev-lang/ocaml/ocaml-3.09.0.ebuild
index 11560550e698..587b547c45dc 100644
--- a/dev-lang/ocaml/ocaml-3.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.0.ebuild,v 1.1 2005/11/10 22:40:19 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.0.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 inherit flag-o-matic eutils multilib
 
diff --git a/dev-lang/open-cobol/ChangeLog b/dev-lang/open-cobol/ChangeLog
index 8de511d91c2f..e9a612761a51 100644
--- a/dev-lang/open-cobol/ChangeLog
+++ b/dev-lang/open-cobol/ChangeLog
@@ -1,8 +1,22 @@
 # ChangeLog for dev-lang/open-cobol
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/open-cobol/ChangeLog,v 1.1 2003/06/19 22:21:24 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/open-cobol/ChangeLog,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
-*open-cobol-0.23.ebuild (19 Jun 2003)
+*open-cobol-0.30 (03 Jan 2005)
+
+  03 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +open-cobol-0.30.ebuild:
+  Version bumped.
+
+  15 Jun 2004; David Holm <dholm@gentoo.org> open-cobol-0.23.ebuild:
+  Added to ~ppc.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> open-cobol-0.23.ebuild:
+  Add die following econf for bug 48950
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> open-cobol-0.23.ebuild:
+  Don't assign default to S; header fix
+
+*open-cobol-0.23 (19 Jun 2003)
 
   19 Jun 2003; George Shapovalov <george@gentoo.org> Manifest, open-cobol-0.23.ebuild, files/{digest-open-cobol-0.23} :
   initial release (#21481)
diff --git a/dev-lang/open-cobol/Manifest b/dev-lang/open-cobol/Manifest
index 62766dae4081..f6c2cc7ea0f1 100644
--- a/dev-lang/open-cobol/Manifest
+++ b/dev-lang/open-cobol/Manifest
@@ -1,2 +1,6 @@
-MD5 80d26c26974acb49b67dc570dbe0671d open-cobol-0.23.ebuild 668
+MD5 e66a230fb7ca5b711c0375120b5aa489 open-cobol-0.23.ebuild 772
+MD5 2a9bb62793fe6d9542a7059ed4c2aea4 open-cobol-0.30.ebuild 882
+MD5 0354ee63c5226fa090b537c124cfc636 ChangeLog 923
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 2bb3def2d8c57d8d5cf9884e185c4fa2 files/digest-open-cobol-0.23 67
+MD5 626b5d897dbf08215118561c55a5d374 files/digest-open-cobol-0.30 67
diff --git a/dev-lang/open-cobol/open-cobol-0.23.ebuild b/dev-lang/open-cobol/open-cobol-0.23.ebuild
index 6c2e51db0030..6eb59f8fa24c 100644
--- a/dev-lang/open-cobol/open-cobol-0.23.ebuild
+++ b/dev-lang/open-cobol/open-cobol-0.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/dev-lang/open-cobol/open-cobol-0.23.ebuild,v 1.1 2003/06/19 22:21:24 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/open-cobol/open-cobol-0.23.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 DESCRIPTION="an open-source COBOL compiler"
 HOMEPAGE="http://www.open-cobol.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/open-cobol/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="nls readline ncurses"
 
 DEPEND="sys-devel/libtool
@@ -17,13 +17,11 @@ DEPEND="sys-devel/libtool
 	readline? ( sys-libs/readline )
 	ncurses? ( >=sys-libs/ncurses-5.2 )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 
 	econf \
 		$(use_enable nls) \
-		$(use_with readline)
+		$(use_with readline) || die "econf failed"
 	emake
 }
 
diff --git a/dev-lang/open-cobol/open-cobol-0.30.ebuild b/dev-lang/open-cobol/open-cobol-0.30.ebuild
index e6bb39164d3c..518e4cf6249b 100644
--- a/dev-lang/open-cobol/open-cobol-0.30.ebuild
+++ b/dev-lang/open-cobol/open-cobol-0.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/open-cobol/open-cobol-0.30.ebuild,v 1.1 2005/01/03 07:08:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/open-cobol/open-cobol-0.30.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 DESCRIPTION="an open-source COBOL compiler"
 HOMEPAGE="http://www.open-cobol.org/"
diff --git a/dev-lang/palmos-sdk/ChangeLog b/dev-lang/palmos-sdk/ChangeLog
index efcde119a8ea..9511cf2a3813 100644
--- a/dev-lang/palmos-sdk/ChangeLog
+++ b/dev-lang/palmos-sdk/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for dev-lang/palmos-sdk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/ChangeLog,v 1.1 2003/12/25 19:19:25 plasmaroo Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/ChangeLog,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> palmos-sdk-3.5.ebuild,
+  palmos-sdk-4.0.ebuild, palmos-sdk-5.0-r3.ebuild:
+  Overhauled these ebuilds to use RESTRICT=fetch so that digests can be
+  generated properly
 
 *palmos-sdk-5.0-r3 (25 Dec 2003)
+*palmos-sdk-3.5 (25 Dec 2003)
+*palmos-sdk-4.0 (25 Dec 2003)
 
   25 Dec 2003; <plasmaroo@gentoo.org> palmos-sdk-3.5.ebuild,
   palmos-sdk-4.0.ebuild, palmos-sdk-5.0-r3.ebuild:
diff --git a/dev-lang/palmos-sdk/Manifest b/dev-lang/palmos-sdk/Manifest
index c01f5df5cbc3..51d148897588 100644
--- a/dev-lang/palmos-sdk/Manifest
+++ b/dev-lang/palmos-sdk/Manifest
@@ -1,8 +1,8 @@
-MD5 e1d3795ee2131fbc87f6de81d24e525c ChangeLog 458
+MD5 71d4990b62948caa85311dcf21de3699 palmos-sdk-3.5.ebuild 1214
+MD5 a7915ddf8f5095fc162c9aac02374221 palmos-sdk-5.0-r3.ebuild 1404
+MD5 3ca759f4b34cc6a13c7255e2f747b7b7 palmos-sdk-4.0.ebuild 1554
+MD5 c499b3826c7c154991ff042f3db6128a ChangeLog 726
 MD5 8b0f876da8fa70f6ebcbaf281e5720d6 metadata.xml 224
-MD5 c2c6f0c373cd87a046df6d6eedc20cf8 palmos-sdk-4.0.ebuild 1798
-MD5 290b4fa6ee8e82c5fcd05ec385724cba palmos-sdk-3.5.ebuild 1664
-MD5 7f6961225ac65ae3c189106a1e70fe3a palmos-sdk-5.0-r3.ebuild 1723
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-palmos-sdk-5.0-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-palmos-sdk-4.0 0
-MD5 7ae70463e1a00f092dc628949d2a91ab files/digest-palmos-sdk-3.5 121
+MD5 049be22eaab9d00e53069d6f9dd4ab4a files/digest-palmos-sdk-3.5 250
+MD5 d41b4ef294deebb3f9551cf7f474a403 files/digest-palmos-sdk-4.0 246
+MD5 80c7fa4e6439b882ca7185f7d3048210 files/digest-palmos-sdk-5.0-r3 151
diff --git a/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5 b/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5
index 03e09f6552f3..fb42a32b09ec 100644
--- a/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5
+++ b/dev-lang/palmos-sdk/files/digest-palmos-sdk-3.5
@@ -1,2 +1,4 @@
 MD5 6a515f9435f78689f1637438962b1585 sdk35.tar.gz 284047
-MD5 29b002c4b4733d18ba0061c302886b44 sdk35-update1.tar.gz 14043
+MD5 9ab5edf2de54cc735e0204b8e154d1b8 sdk35-update1.tar.gz 8399
+MD5 f3ec5b40bce9d958368299a3bbbf3aa3 sdk35-docs.tar.gz 7509001
+MD5 2cf2e75900cd1d6a3729ef1a0986d6a1 sdk35-examples.tar.gz 1160217
diff --git a/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0 b/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0
index e69de29bb2d1..4fcfcf2bff79 100644
--- a/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0
+++ b/dev-lang/palmos-sdk/files/digest-palmos-sdk-4.0
@@ -0,0 +1,4 @@
+MD5 366b17f99471ec1d3cee43f7beb14948 sdk40.tar.gz 406547
+MD5 cc74b0476d4105b23330df042bd9d915 sdk40upd1.tar.gz 357300
+MD5 7d505fa83f439eb52a4c0c50198ed793 sdk40-docs.zip 13476347
+MD5 52733267275ce5581a27b9ecaae87b8d sdk40-examples.tar.gz 1101393
diff --git a/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3 b/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3
index e69de29bb2d1..d58cfebbef72 100644
--- a/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3
+++ b/dev-lang/palmos-sdk/files/digest-palmos-sdk-5.0-r3
@@ -0,0 +1,2 @@
+MD5 56647bd079f9c23b4df491c165caf7ca palmos-sdk-5.0r3-1.tar.gz 467607
+MD5 78dba4d5d775fea6a443f28d0d23b203 PalmOS_5_SDK_68K_R3_no-install.zip 19703650
diff --git a/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild b/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild
index 38bb6927d2f4..5938ebc820e0 100644
--- a/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild
+++ b/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild,v 1.1 2003/12/25 19:19:25 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
 DESCRIPTION="The static libraries and header files needed for developing PalmOS applications."
 HOMEPAGE="http://www.palmos.com/"
@@ -9,63 +9,37 @@ LICENSE="Palm-SDK"
 SLOT="3.5"
 KEYWORDS="~x86"
 DEPEND="dev-lang/prc-tools"
-
-A1="sdk35.tar.gz"
-A2="sdk35-update1.tar.gz"
-AD1="sdk35-docs.tar.gz"
-AD2="sdk35-examples.tar.gz"
-A="${A1} ${A2}"
-
-IUSE=""
-BASE="/opt/palmdev/sdk-${SLOT}"
-RESTRICT="nostrip"
+SRC_URI="sdk35.tar.gz sdk35-update1.tar.gz
+	doc? ( sdk35-docs.tar.gz sdk35-examples.tar.gz )"
+IUSE="doc"
+RESTRICT="nostrip fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-
-	if ! ( [ -f ${DISTDIR}/${A1} ] && [ -f ${DISTDIR}/${A2} ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk35.cgi"; \
-		eerror "and download ${A1} and ${A2} and place them"; \
-		eerror "in ${DISTDIR} and emerge this package again."
-		die
-	fi
-
-	if ( ( [ ! -f ${DISTDIR}/${AD1} ] || [ ! -f ${DISTDIR}/${AD2} ] ) && [ `use doc` ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk35.cgi"
-		eerror "and download ${AD1} and ${AD2} and place them in"
-		eerror "${DISTDIR} and emerge this package again or disable the \`doc'"
-		eerror "USE flag."
-		die
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	if [ `use doc` ]; then
-		unpack ${AD1}
-		unpack ${AD2}
-	fi
+pkg_nofetch() {
+	typeset a
 
+	einfo "Please download the following files from"
+	einfo "http://www.palmos.com/cgi-bin/sdk35.cgi"
+	einfo "and put them in ${DISTDIR}, then emerge this package again."
+	for a in ${A}; do
+		einfo "  ${a}"
+	done
 }
 
 src_install() {
+	typeset base=/opt/palmdev/sdk-${SLOT}
 
-	dodir ${BASE}
-	mv Palm\ OS\ 3.5\ Support/GCC\ Libraries ${D}/${BASE}/lib
-	mv Palm\ OS\ 3.5\ Support/Incs ${D}/${BASE}/include
+	dodir ${base} || die
+	mv Palm\ OS\ 3.5\ Support/GCC\ Libraries ${D}/${base}/lib || die
+	mv Palm\ OS\ 3.5\ Support/Incs ${D}/${base}/include || die
 
-	if [ `use doc` ]; then
-		mv docs ${D}/${BASE}/Documentation
-		mv Examples ${D}/${BASE}/Documentation
+	if use doc; then
+		mv docs ${D}/${base}/Documentation || die
+		mv Examples ${D}/${base}/Documentation || die
 	fi
 
 }
 
-pkg_postinst()
-{
-	palmdev-prep || eerror "Could not run \`palmdev-prep'!"
+pkg_postinst() {
+	palmdev-prep || eerror "Error running palmdev-prep :-("
 }
diff --git a/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild b/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild
index 52bd36e0c41d..8745d19d5654 100644
--- a/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild
+++ b/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild,v 1.1 2003/12/25 19:19:25 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-4.0.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
 inherit rpm
 
@@ -11,64 +11,50 @@ LICENSE="Palm-SDK"
 SLOT="4.0"
 KEYWORDS="~x86"
 DEPEND="dev-lang/prc-tools"
-
-A1="sdk40.tar.gz"
-A2="sdk40upd1.tar.gz"
-AD1="sdk40-docs.zip"
-AD2="sdk40-examples.tar.gz"
-A="${A1} ${A2}"
-
-IUSE=""
-BASE="/opt/palmdev/sdk-${SLOT}"
-RESTRICT="nostrip"
+# Note: There is an sdk40-docs.tar.gz but it's actually a zip file, so
+# might as well just get the zip file.
+SRC_URI="sdk40.tar.gz sdk40upd1.tar.gz
+	doc? ( sdk40-docs.zip sdk40-examples.tar.gz )"
+IUSE="doc"
+RESTRICT="nostrip fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-
-	if ! ( [ -f ${DISTDIR}/${A1} ] && [ -f ${DISTDIR}/${A2} ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk40.cgi"; \
-		eerror "and download ${A1} and ${A2} and place them"; \
-		eerror "in ${DISTDIR} and emerge this package again."
-		die
-	fi
-
-	if ( ( [ ! -f ${DISTDIR}/${AD1} ] || [ ! -f ${DISTDIR}/${AD2} ] ) && [ `use doc` ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk40.cgi"
-		eerror "and download ${AD1} and ${AD2} and place them in"
-		eerror "${DISTDIR} and emerge this package again or disable the \`doc'"
-		eerror "USE flag."
-		die
-	fi
+pkg_nofetch() {
+	typeset a
 
+	einfo "Please download the following files from"
+	einfo "http://www.palmos.com/cgi-bin/sdk40.cgi"
+	einfo "and put them in ${DISTDIR}, then emerge this package again."
+	for a in ${A}; do
+		einfo "  ${a}"
+	done
 }
 
 src_unpack() {
-
 	unpack ${A}
 	rpm_unpack *.rpm
-	rm *.rpm
-
-	if [ `use doc` ]; then
-		unpack ${AD1}
-		unpack ${AD2}
-	fi
-
 }
 
 src_install() {
+	typeset base=/opt/palmdev/sdk-${SLOT}
+
+	# Copy the updates over top of the existing files
+	cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/PalmOS-Support/* \
+		opt/palmdev/sdk-4 || die
+	if use doc; then
+		cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/Documentation/* \
+			Documentation || die
+	fi
 
-	dodir ${BASE}
-	cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/PalmOS-Support/* opt/palmdev/sdk-4
-	cp -Rf PalmOS-4.0-SDK-Update-1/PalmOS-Unix/Documentation/* opt/palmdev/sdk-4
-	cp -PRf opt/palmdev/sdk-4/* ${D}/opt/palmdev/sdk-${SLOT}
-	mv Documentation ${D}/opt/palmdev/sdk-${SLOT}
-	mv Examples ${D}/opt/palmdev/sdk-${SLOT}/Documentation
-
+	# Now install
+	dodir ${base%/*} || die
+	mv opt/palmdev/sdk-4 ${D}${base} || die
+	if use doc; then
+		mv Documentation ${D}${base} || die
+		mv Examples ${D}${base}/Documentation || die
+	fi
 }
 
-pkg_postinst()
-{
-	palmdev-prep || eerror "Could not run \`palmdev-prep'!"
+pkg_postinst() {
+	palmdev-prep || eerror "Error running palmdev-prep :-("
 }
diff --git a/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild b/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild
index 5ef53a530850..690690062725 100644
--- a/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild
+++ b/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild,v 1.1 2003/12/25 19:19:25 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/palmos-sdk/palmos-sdk-5.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
 DESCRIPTION="The static libraries and header files needed for developing PalmOS applications."
 HOMEPAGE="http://www.palmos.com/"
@@ -9,61 +9,38 @@ LICENSE="Palm-SDK"
 SLOT="5.0R3"
 KEYWORDS="~x86"
 DEPEND="dev-lang/prc-tools"
-
-A="palmos-sdk-5.0r3-1.tar.gz"
-AD="PalmOS_5_SDK_68K_R3_no-install.zip"
-
-IUSE=""
-BASE="/opt/palmdev/sdk-${SLOT}"
-RESTRICT="nostrip"
+SRC_URI="palmos-sdk-5.0r3-1.tar.gz PalmOS_5_SDK_68K_R3_no-install.zip"
+IUSE="doc"
+RESTRICT="nostrip fetch"
 S=${WORKDIR}
 
-pkg_setup() {
-
-	if [ ! -f ${DISTDIR}/${A} ]; then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk50.cgi"
-		eerror "and download ${A} and place it in ${DISTDIR}"
-		eerror "and emerge this package again."
-		die
-	fi
-
-	if ( [ ! -f ${DISTDIR}/${AD} ] && [ `use doc` ] ); then
-		echo
-		eerror "Please go to http://www.palmos.com/cgi-bin/sdk50.cgi"
-		eerror "and download ${AD} and place it in"
-		eerror "${DISTDIR} and emerge this package again or disable the \`doc'"
-		eerror "USE flag."
-		die
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	if [ `use doc` ]; then
-		unpack ${AD}
-	fi
+pkg_nofetch() {
+	typeset a
 
+	einfo "Please download the following files from"
+	einfo "http://www.palmos.com/cgi-bin/sdk50.cgi"
+	einfo "and put them in ${DISTDIR}, then emerge this package again."
+	for a in ${A}; do
+		einfo "  ${a}"
+	done
 }
 
 src_install() {
-
-	dodir ${BASE}
-	rm -rf sdk-5r3/CodeWarrior\ Support
-	if [ `use doc` ]; then
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/CodeWarrior\ Support/\(Project\ Stationery\)/
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/CodeWarrior\ Support/Plugins/
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/Palm\ OS\ Support/
-		rm -rf PalmOS_5_SDK_68K_R3_no-install/Palm\ Tools/
-		cp -Rf PalmOS_5_SDK_68K_R3_no-install/* sdk-5r3/
+	typeset base=/opt/palmdev/sdk-${SLOT}
+
+	rm -rf sdk-5r3/CodeWarrior\ Support || die
+	if use doc; then
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/CodeWarrior Support/(Project Stationery)" || die
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/CodeWarrior Support/Plugins" || die
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/Palm OS Support" || die
+		rm -rf "PalmOS_5_SDK_68K_R3_no-install/Palm Tools" || die
+		cp -Rf PalmOS_5_SDK_68K_R3_no-install/* sdk-5r3 || die
 	fi
-	cp -PRf sdk-5r3/* ${D}/opt/palmdev/sdk-${SLOT}
 
+	dodir ${base%/*} || die
+	mv sdk-5r3 ${D}${base} || die
 }
 
-pkg_postinst()
-{
-	palmdev-prep || eerror "Could not run \`palmdev-prep'!"
+pkg_postinst() {
+	palmdev-prep || eerror "Error running palmdev-prep :-("
 }
diff --git a/dev-lang/parrot/ChangeLog b/dev-lang/parrot/ChangeLog
index 078db4094ffd..c343ef2f4a27 100644
--- a/dev-lang/parrot/ChangeLog
+++ b/dev-lang/parrot/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for dev-lang/parrot
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.1 2004/12/20 14:48:38 mcummings Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/ChangeLog,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
+
+  02 Oct 2005; Fabian Groffen <grobian@gentoo.org> parrot-0.2.3.ebuild:
+  Marking ~ppc-macos (side effect of bug #107641)
+
+  15 Aug 2005; Michael Cummings <mcummings@gentoo.org> files/root.in.patch,
+  parrot-0.2.3.ebuild:
+  Fix to header of root.in.patch
+
+*parrot-0.2.3 (15 Aug 2005)
+
+  15 Aug 2005; Michael Cummings <mcummings@gentoo.org>
+  files/mod_parrot.patch, +files/parrot-config.patch, +files/root.in.patch,
+  -parrot-0.1.1.ebuild, -parrot-0.1.2.ebuild, -parrot-0.2.1.ebuild,
+  +parrot-0.2.3.ebuild:
+  Version bump, bug 101858, thanks Adrian
+
+*parrot-0.2.1 (01 Jul 2005)
+
+  01 Jul 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/mod_parrot.patch, +parrot-0.2.1.ebuild:
+  Bug 92192 - Adrian continues to provide great parrot/pugs ebuilds :)
+
+  04 May 2005; David Holm <dholm@gentoo.org> parrot-0.1.2.ebuild:
+  Added to ~ppc.
+
+*parrot-0.1.2 (21 Apr 2005)
+
+  21 Apr 2005; Michael Cummings <mcummings@gentoo.org> +parrot-0.1.2.ebuild:
+  Bug 82444, ebuild courtesy Adrian Lambeck <adrian@basicsedv.de>
+
+  27 Dec 2004; Michael Cummings <mcummings@gentoo.org> parrot-0.1.1.ebuild:
+  An "I'm amazed it even worked" typo in the SRC_URI - S instead of P
+
+  21 Dec 2004; Michael Cummings <mcummings@gentoo.org> parrot-0.1.1.ebuild:
+  Keyword for sparc (works great)
 
 *parrot-0.1.1 (20 Dec 2004)
 
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 44f773d3f6ba..66097e811fd8 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,2 +1,7 @@
-MD5 a0ce69eeb54fc8bc98bb1fa19a146074 parrot-0.1.1.ebuild 1035
-MD5 75fbd20b4daec7e1b315a172ad60c64f files/digest-parrot-0.1.1 65
+MD5 2046bc464a3e1e418cb5afc3285fa982 parrot-0.2.3.ebuild 2079
+MD5 367bedfe7c4912e5b47f98679e1f586c ChangeLog 1747
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 173cae8d616eb7a79b78c15e34920888 files/parrot-config.patch 569
+MD5 1ac50a47aab4a14fbd9f47f929ee33c8 files/mod_parrot.patch 293
+MD5 b3c3aa33bd9cf54b6eafa26e89063113 files/root.in.patch 987
+MD5 6fefa983d0557ec5599f54babc66d7df files/digest-parrot-0.2.3 65
diff --git a/dev-lang/parrot/files/mod_parrot.patch b/dev-lang/parrot/files/mod_parrot.patch
index df2197e8d9ab..4056a7f4a7b7 100644
--- a/dev-lang/parrot/files/mod_parrot.patch
+++ b/dev-lang/parrot/files/mod_parrot.patch
@@ -1,14 +1,22 @@
---- src/call_list.txt	2005-05-08 10:46:37.000000000 +0200
-+++ call_list.in.txt	2005-05-10 22:19:26.000000000 +0200
-@@ -281,6 +281,11 @@
+--- src/call_list.txt	2005-07-12 15:08:57.000000000 +0200
++++ src/call_list.txt.new	2005-08-06 13:26:32.000000000 +0200
+@@ -285,6 +285,19 @@
  i	tp
  v	tiiiptt
  i	Pip
 +p   J
++t   J
 +t   Jp
++p   Jp
 +t   Jpt
 +i   Jp
++i   Jpi
 +i   JPip
++v   ptt
++v   pit
++i   Jpii
++i   ip
++
  
  # PyBuiltins
  P	JOPP
diff --git a/dev-lang/parrot/files/root.in.patch b/dev-lang/parrot/files/root.in.patch
index b93a020afe7b..8356f05a2f4c 100644
--- a/dev-lang/parrot/files/root.in.patch
+++ b/dev-lang/parrot/files/root.in.patch
@@ -1,12 +1,5 @@
 --- ../parrot-0.2.3/config/gen/makefiles/root.in	2005-07-29 12:07:33.000000000 +0200
 +++ config/gen/makefiles/root.in	2005-08-07 17:40:26.000000000 +0200
-@@ -1,5 +1,5 @@
- # Copyright: 2001-2005 The Perl Foundation.  All Rights Reserved.
--# $Id: root.in.patch,v 1.1 2005/08/15 06:30:56 mcummings Exp $
-+# $Id: root.in.patch,v 1.1 2005/08/15 06:30:56 mcummings Exp $
- 
- ###############################################################################
- # NOTES:
 @@ -656,10 +656,8 @@
  runtime/parrot/include/config.fpmc : myconfig config_lib.pasm $(MINIPARROT)
  	@echo Invoking Parrot to generate runtime/parrot/include/config.fpmc --cross your fingers
diff --git a/dev-lang/parrot/parrot-0.2.3.ebuild b/dev-lang/parrot/parrot-0.2.3.ebuild
index aef74abc73aa..bea967f5adf0 100644
--- a/dev-lang/parrot/parrot-0.2.3.ebuild
+++ b/dev-lang/parrot/parrot-0.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-0.2.3.ebuild,v 1.1 2005/08/15 06:30:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:58:12 chriswhite Exp $
 
 inherit base eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://cpan/authors/id/L/LT/LTOETSCH/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="test"
 
 DEPEND="dev-lang/perl
@@ -25,10 +25,10 @@ src_unpack ()   {
 	unpack ${A}
 	cd ${S}
 	#see https://rt.perl.org/rt3/Ticket/Display.html?id=36818
-	epatch ${FILESDIR}/mod_parrot.patch
+	cd ${S}; epatch ${FILESDIR}/mod_parrot.patch
 	#see https://rt.perl.org/rt3/Ticket/Display.html?id=36812
-	epatch ${FILESDIR}/root.in.patch
-	epatch ${FILESDIR}/parrot-config.patch
+	cd ${S}; epatch ${FILESDIR}/root.in.patch
+	cd ${S}; epatch ${FILESDIR}/parrot-config.patch
 }
 
 src_compile()	{
diff --git a/dev-lang/pasm/ChangeLog b/dev-lang/pasm/ChangeLog
index 62e3ec46a25a..e9841a1164f0 100644
--- a/dev-lang/pasm/ChangeLog
+++ b/dev-lang/pasm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/pasm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pasm/ChangeLog,v 1.1 2004/02/28 15:37:38 dholm Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pasm/ChangeLog,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
+
+*pasm-1.7 (25 Apr 2004)
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> pasm-1.6c.ebuild,
+  pasm-1.7.ebuild:
+  Version bump.
 
 *pasm-1.6c (28 Feb 2004)
 
diff --git a/dev-lang/pasm/Manifest b/dev-lang/pasm/Manifest
index 92351a0cda1c..0f72d8074c80 100644
--- a/dev-lang/pasm/Manifest
+++ b/dev-lang/pasm/Manifest
@@ -1,5 +1,5 @@
-MD5 dcb52a6a3d6ee6581f3f080cf3e5aaf8 pasm-1.6c.ebuild 579
+MD5 0915656841de870fdd5daaa3bbb34ed0 pasm-1.7.ebuild 741
+MD5 ac8aee4dfd8ef09b8c1952534324bf80 ChangeLog 462
 MD5 e050f2f350eaa384342f37dfa459df6b metadata.xml 657
-MD5 32ad97f74a42b4d3d13169b5d621da2f ChangeLog 259
-MD5 6fa5986827c4c0b83925c4177abbde2b files/pasm-1.6c-ppc.patch 901
-MD5 2e9757ce0482d8efbd257c0b6044e4ef files/digest-pasm-1.6c 55
+MD5 2e9757ce0482d8efbd257c0b6044e4ef files/digest-pasm-1.7 55
+MD5 6fa5986827c4c0b83925c4177abbde2b files/pasm-1.7-ppc.patch 901
diff --git a/dev-lang/pasm/pasm-1.7.ebuild b/dev-lang/pasm/pasm-1.7.ebuild
index 361b66330dc7..d5e575c3434a 100644
--- a/dev-lang/pasm/pasm-1.7.ebuild
+++ b/dev-lang/pasm/pasm-1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pasm/pasm-1.7.ebuild,v 1.1 2004/04/24 22:09:46 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pasm/pasm-1.7.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 1bc0a2d5aff6..a7b77b70c94f 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,9 +1,752 @@
-# ChangeLog for sys-devel/perl
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.1 2003/03/11 21:11:45 seemant Exp $
+# ChangeLog for dev-lang/perl
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.1.1.1 2005/11/30 09:58:21 chriswhite Exp $
+
+  14 Nov 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r5.ebuild,
+  perl-5.8.6-r6.ebuild, perl-5.8.7.ebuild, perl-5.8.7-r1.ebuild:
+  NetBSD for osname per thunder
+
+  12 Nov 2005; Chris White <chriswhite@gentoo.org> perl-5.8.6-r6.ebuild:
+  Backported some get_libdir functionality from 5.8.7 to 5.8.6-r6 to resolve
+  bug #112243. This is mainly a multi-lib support fix it seems.
+
+  02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.7-r1.ebuild:
+  Stable on ia64, bug 106678.
+
+  29 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> perl-5.8.6-r6.ebuild:
+  Stable on mips for bug #106678.
+
+  23 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.7-r1.ebuild:
+  Stable on alpha, bug 106678.
+
+  21 Sep 2005; Seemant Kulleen <seemant@gentoo.org> perl-5.8.6-r6.ebuild:
+  stable on amd64 wrt bug #106678
+
+  21 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> perl-5.8.7-r1.ebuild:
+  Stable on sparc wrt #106678
+
+  20 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> perl-5.8.6-r6.ebuild:
+  Marking stable on x86 for bug #106678.
+
+  20 Sep 2005; Rene Nussbaumer <killerfox@gentoo.org> perl-5.8.6-r6.ebuild:
+  Stable on hppa. bug #106678
+
+  20 Sep 2005; Markus Rothe <corsair@gentoo.org> perl-5.8.7-r1.ebuild:
+  Stable on ppc64 (bug #106678)
+
+  20 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> perl-5.8.6-r6.ebuild:
+  Stable on ppc.
+
+*perl-5.8.7-r1 (20 Sep 2005)
+*perl-5.8.6-r6 (20 Sep 2005)
+
+  20 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/perl-5.8.7-MakeMaker-RUNPATH.patch, +perl-5.8.6-r6.ebuild,
+  +perl-5.8.7-r1.ebuild:
+  We do not want the build root in the linked perl module's RUNPATH, so
+  strip paths containing PORTAGE_TMPDIR if its set.  This is for the
+  MakeMaker module, bug #105054.
+
+  05 Sep 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.7.ebuild:
+  More multilib fixes thanks to Christophe Saout, bug 104509.
+
+  04 Sep 2005; Elfyn McBratney <beu@gentoo.org>
+  files/perl-5.8.7-regexp-nossp.patch:
+  Fix patch to cflags.SH (don't assume /bin/sh is bash).
+
+  04 Sep 2005; Elfyn McBratney <beu@gentoo.org> perl-5.8.6-r5.ebuild,
+  perl-5.8.7.ebuild:
+  Drop DEPEND on sys-apps/groff.
+
+  01 Sep 2005; Joseph Jezak <josejx@gentoo.org> perl-5.8.6-r5.ebuild,
+  perl-5.8.7.ebuild:
+  Filtered -mpowerpc-gpopt on ppc to fix bug #97645.
+
+  14 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.7.ebuild:
+  The rest of the patch for bug 58931
+
+  14 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r5.ebuild,
+  perl-5.8.7.ebuild:
+  Bug #97894 - added note regarding minimal means minimal
+
+  12 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.7.ebuild:
+  Further bug #58931 - mistake on my part for the LIBPERL= syntax
+
+  12 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.7.ebuild:
+  getlibdir changes for 5.8.7, bug #58931
+
+  08 Aug 2005; Thierry Carrez <koon@gentoo.org> perl-5.8.6-r5.ebuild,
+  perl-5.8.7.ebuild:
+  Reverting vapier's features_noman change on the groff dependency, which
+  results in bug 101088.
+
+  28 Jul 2005; Michael Cummings <mcummings@gentoo.org>
+  files/perl-reorder-INC.patch, -perl-5.8.5-r5.ebuild, -perl-5.8.6-r4.ebuild:
+  Update to reorder patch, tested with 5.8.6 and 5.8.7, resolves bug 95770
+
+  28 Jul 2005; Michael Cummings <mcummings@gentoo.org> -perl-5.8.5-r5.ebuild,
+  -perl-5.8.6-r4.ebuild:
+  Cleaning up now that we have keywords up to date
+
+  28 Jul 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on amd64.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on ppc64
+
+  06 Jul 2005; <plasmaroo@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on IA64.
+
+  06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on arm, m68k, s390, and sh.
+
+  05 Jul 2005; Hardave Riar <hardave@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on mips.
+
+  03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on ppc.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on alpha.
+
+  02 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> perl-5.8.6-r5.ebuild:
+  Stable on hppa.
+
+*perl-5.8.6-r5 (30 Jun 2005)
+
+  30 Jun 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r4.ebuild,
+  +perl-5.8.6-r5.ebuild:
+  Sorry folks, there was a typo in libperl-5.8.6s ebuild that made this
+  necessary.
+
+*perl-5.8.7 (29 Jun 2005)
+
+  29 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  -files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patc
+  h, -files/perl-5.8.2-perldoc-emptydirs.patch,
+  -files/perl-5.8.2-picdl.patch, -files/perl-5.8.2-prelink-lpthread.patch,
+  -files/perl-5.8.2-reorder-INC.patch, -files/perl-5.8.2-uclibc.patch,
+  -files/perl-5.8.4-noksh.patch, -files/perl-5.8.4-nonblock.patch,
+  -files/perl-5.8.4-perldoc-emptydirs.patch, -files/perl-5.8.4-picdl.patch,
+  -files/perl-5.8.4-prelink-lpthread.patch,
+  -files/perl-5.8.4-reorder-INC.patch, -files/perl-5.8.5-noksh.patch,
+  -files/perl-5.8.5-nonblock.patch,
+  -files/perl-5.8.5-perldoc-emptydirs.patch, -files/perl-5.8.5-picdl.patch,
+  -files/perl-5.8.5-prelink-lpthread.patch,
+  -files/perl-5.8.5-reorder-INC.patch, -files/perl-5.8.6-noksh.patch,
+  -files/perl-5.8.6-perldoc-emptydirs.patch, -files/perl-5.8.6-picdl.patch,
+  -files/perl-5.8.6-prelink-lpthread.patch,
+  -files/perl-5.8.6-reorder-INC.patch,
+  +files/perl-5.8.7-CAN-2005-0448-rmtree.patch,
+  +files/perl-5.8.7-tempfiles.patch, -files/libperl_rebuilder,
+  +files/perl-h2ph-ansi-header.patch, +files/perl-noksh.patch,
+  +files/perl-nonblock.patch, +files/perl-perldoc-emptydirs.patch,
+  +files/perl-picdl.patch, +files/perl-prelink-lpthread.patch,
+  +files/perl-reorder-INC.patch, +files/perl-tempfiles.patch,
+  +files/perl-uclibc.patch, -files/stat.t, -perl-5.8.2-r4.ebuild,
+  -perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild,
+  +perl-5.8.7.ebuild:
+  Perl 5.8.6 unmasking, perl 5.8.7 addition
+
+  05 Jun 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner:
+  Bug 90502 - don't leave behind empty log files if nothing has been done
+
+  30 May 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner,
+  perl-5.8.2-r4.ebuild, perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild,
+  perl-5.8.6-r4.ebuild:
+  Updated perl-cleaner to remove the emptied dirs after a .ph purge
+
+  29 May 2005; <solar@gentoo.org> perl-5.8.2-r4.ebuild, perl-5.8.4-r4.ebuild,
+  perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  - update perl to use libc expanded variable elibc_uclibc vs uclibc so USE=-*
+  works
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r4.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.5-r5.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.4-r4.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r4.ebuild:
+  dev-perl/Test-Simple => perl-core/Test-Simple migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.5-r5.ebuild:
+  dev-perl/Test-Simple => perl-core/Test-Simple migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.4-r4.ebuild:
+  dev-perl/Test-Simple => perl-core/Test-Simple migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild:
+  dev-perl/Test-Simple => perl-core/Test-Simple migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r4.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.5-r5.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.4-r4.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  23 May 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.6-r4.ebuild:
+  More get_libdir-ization, fixes compilation on amd64's no-lib32 profile.
+
+  16 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  Last toolchain-funcs fix
+
+  15 May 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  Changed to toolchain-funcs
+
+  20 Mar 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  bug 81947 - replaced filesdir with generic cat/pkg
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  files/CAN-2005-0448-rmtree.patch, perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  Patch is in the right place and works on any arch. Yay.
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r4.ebuild,
+  perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
+  The last rmtree patch contains a line that checks <archname>/Errno.pm in
+  your existing perl install. If your kernel changes between perl installs, it
+  dies horribly. Need to find a cleaner solution first. For everyone that just
+  bumped their perls, I am terribly sorry that this wasn't realized earlier.
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org> -perl-5.8.2-r2.ebuild,
+  -perl-5.8.2-r3.ebuild, -perl-5.8.4-r2.ebuild, -perl-5.8.4-r3.ebuild,
+  -perl-5.8.5-r3.ebuild, -perl-5.8.5-r4.ebuild, -perl-5.8.6-r2.ebuild,
+  -perl-5.8.6-r3.ebuild:
+  Cleaning out old ebuilds - no keyword changes :)
+
+*perl-5.8.6-r4 (11 Mar 2005)
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/CAN-2005-0448-rmtree.patch, perl-5.8.2-r2.ebuild,
+  perl-5.8.2-r3.ebuild, +perl-5.8.2-r4.ebuild, perl-5.8.4-r2.ebuild,
+  perl-5.8.4-r3.ebuild, +perl-5.8.4-r4.ebuild, perl-5.8.5-r3.ebuild,
+  perl-5.8.5-r4.ebuild, +perl-5.8.5-r5.ebuild, perl-5.8.6-r2.ebuild,
+  perl-5.8.6-r3.ebuild, +perl-5.8.6-r4.ebuild:
+  Version bump to finalize patch
+
+  11 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/CAN-2005-0448-rmtree.patch, perl-5.8.2-r2.ebuild,
+  perl-5.8.2-r3.ebuild, perl-5.8.4-r2.ebuild, perl-5.8.4-r3.ebuild,
+  perl-5.8.5-r3.ebuild, perl-5.8.5-r4.ebuild, perl-5.8.6-r2.ebuild,
+  perl-5.8.6-r3.ebuild:
+  Changed file_path_rmtree to CAN-2005-0448-rmtree.patch per bug 79685
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  perl-5.8.6-r3.ebuild:
+  More multilib fixes.
+
+*perl-5.8.5-r4 (11 Feb 2005)
+
+  11 Feb 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r2.ebuild,
+  +perl-5.8.2-r3.ebuild, perl-5.8.4-r2.ebuild, +perl-5.8.4-r3.ebuild,
+  perl-5.8.5-r3.ebuild, +perl-5.8.5-r4.ebuild, perl-5.8.6-r2.ebuild,
+  +perl-5.8.6-r3.ebuild:
+  Bug 80460 - CAN-2005-015{5,6} - perlsuid patch. Bug 62321, 65317 - Removal of
+  old .ph files after an upgrade. Bug 72977 - modifications to allow for perl
+  5.8.0 and multithreaded perls to use the perl-inc patch. In addition, modified
+  the perl-cleaner message to display only if @INC included more than the
+  current install's perl (ie, only if this was an upgrade that left files
+  behind).
+
+  05 Feb 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/CAN-2005-0156-suid.patch, perl-5.8.2-r2.ebuild,
+  perl-5.8.4-r2.ebuild, perl-5.8.5-r3.ebuild, perl-5.8.6-r2.ebuild:
+  Bug 80460, perlsuid vulnerability
+
+  05 Feb 2005; Michael Cummings <mcummings@gentoo.org>
+  -perl-5.8.2-r1.ebuild, -perl-5.8.4-r1.ebuild, -perl-5.8.5-r1.ebuild,
+  -perl-5.8.5-r2.ebuild, -perl-5.8.5.ebuild, -perl-5.8.6-r1.ebuild,
+  -perl-5.8.6.ebuild:
+  Cleaning up old, unused ebuilds
+
+  31 Jan 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner:
+  swtaylor came up with a quicker way to generate the module list, plus a more
+  secure call for making the tmp files
+
+  27 Jan 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner:
+  Code cleanup thanks to Mr.B. *MAJOR* typo in the filename for the prelist of
+  ebuilds to re-emerge resulted in no ebuilds getting re-emerged...
+
+  26 Jan 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner:
+  tmpdir fix - thanks Mr. B.
+
+*perl-5.8.4-r2 (26 Jan 2005)
+
+  26 Jan 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/file_path_rmtree.patch, files/libperl_rebuilder, files/perl-cleaner,
+  +perl-5.8.2-r2.ebuild, +perl-5.8.4-r2.ebuild, +perl-5.8.5-r3.ebuild,
+  +perl-5.8.6-r2.ebuild:
+  Bump for bug 75696 involving temporary file perms in File::Path. Includes
+  fixes for h2ph conversion, bug 75955 Includes change over to perl-cleaner from
+  libperl_rebuilder, bugs 60447, 62301, 62669, 66688, 73932, 71287
+
+  16 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  perl-5.8.5-r2.ebuild, perl-5.8.6-r1.ebuild, perl-5.8.6.ebuild:
+  multilib fixes for amd64's 2005.0.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Dec 2004; Hardave Riar <hardave@gentoo.org> perl-5.8.5-r2.ebuild:
+  Stable on mips, bug #66360
+
+  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> perl-5.8.5-r2.ebuild:
+  Stable on sparc wrt #66360
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.5-r2.ebuild:
+  Stable on alpha, bug 66360.
+
+  05 Dec 2004; Markus Rothe <corsair@gentoo.org> perl-5.8.5-r2.ebuild:
+  Stable on ppc64; bug #66360
+
+*perl-5.8.5-r2 (04 Dec 2004)
+
+  04 Dec 2004; Robert Coie <rac@gentoo.org>
+  +files/perl-5.8.5-tempfiles.patch, +files/perl-5.8.6-tempfiles.patch,
+  -perl-5.8.4.ebuild, +perl-5.8.5-r2.ebuild, +perl-5.8.6-r1.ebuild:
+  Add the few relevant bits from bug 66360, keyword 5.8.5-r2 x86, amd64 and ppc
+
+  01 Dec 2004; Robert Coie <rac@gentoo.org> perl-5.8.6.ebuild:
+  back makemaker block to 6.17
+
+*perl-5.8.6 (30 Nov 2004)
+
+  30 Nov 2004; Robert Coie <rac@gentoo.org> +files/perl-5.8.6-noksh.patch,
+  +files/perl-5.8.6-perldoc-emptydirs.patch, +files/perl-5.8.6-picdl.patch,
+  +files/perl-5.8.6-prelink-lpthread.patch,
+  +files/perl-5.8.6-reorder-INC.patch, +perl-5.8.6.ebuild:
+  New upstream
+
+  13 Nov 2004; Robert Coie <rac@gentoo.org> perl-5.8.5-r1.ebuild:
+  Go ahead and use the myarch that exists
+
+*perl-5.8.5-r1 (12 Nov 2004)
+
+  12 Nov 2004; Robert Coie <rac@gentoo.org> -perl-5.8.3.ebuild,
+  +perl-5.8.5-r1.ebuild:
+  Allow the maketest FEATURE to determine whether tests are run. Guide
+  Configure to attempt to pick up old 5.8.2 and 5.8.4 directories in @INC
+
+  25 Oct 2004; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Cleaner h2ph, should reduce build time but leave us with something still
+  usable.
+
+  06 Oct 2004; Guy Martin <gmsoft@gentoo.org> perl-5.8.4-r1.ebuild:
+  Stable on hppa.
+
+  28 Sep 2004; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Added back perlsuid/sperl based on local use flag. Bug 64823. Users should
+  read http://perldoc.com/perl5.8.4/INSTALL.html#suidperl before enabling.
+
+  27 Sep 2004; Mike Frysinger <vapier@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Add libperl to RDEPEND (since pkg_setup will die otherwise) and make sure
+  pkg_setup() respects $ROOT.
+
+  27 Sep 2004; Michael Cummings <mcummings@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Added perl debugging support, bug 60775
+
+  24 Sep 2004; Robert Coie <rac@gentoo.org> perl-5.8.4-r1.ebuild,
+  perl-5.8.5.ebuild:
+  Make gdbm patch conditional on having 1.8.3, because libgdbm_compat isn't
+  there otherwise, should not affect people who have already built. Made 5.8.5
+  depend on 1.8.3 instead. Again, should not affect installed people.
+
+  22 Sep 2004; Robert Coie <rac@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  USE threads -> ithreads
+
+  21 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> perl-5.8.4-r1.ebuild:
+  Marked stable on amd64.
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> perl-5.8.4-r1.ebuild:
+  Stable on sparc to finally solve #36478
+
+  08 Sep 2004; Robert Coie <rac@gentoo.org> perl-5.8.4-r1.ebuild:
+  keyword x86 and arm for uclibc folks
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  31 Aug 2004; Guy Martin <gmsoft@gentoo.org> perl-5.8.4.ebuild,
+  perl-5.8.5.ebuild:
+  Removed useless -fPIC for hppa.
+
+  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> perl-5.8.4-r1.ebuild:
+  Marked stable on mips.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> perl-5.8.4-r1.ebuild:
+  stable on alpha
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.4.ebuild:
+  Stable on alpha.
+
+  07 Aug 2004; Robert Coie <rac@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4-r1.ebuild, perl-5.8.4.ebuild:
+  convert SHORT_PV and MY_P to bash
+
+*perl-5.8.5 (06 Aug 2004)
+
+  06 Aug 2004; Robert Coie <rac@gentoo.org> +files/perl-5.8.5-noksh.patch,
+  +files/perl-5.8.5-nonblock.patch, +files/perl-5.8.5-perldoc-emptydirs.patch,
+  +files/perl-5.8.5-picdl.patch, +files/perl-5.8.5-prelink-lpthread.patch,
+  +files/perl-5.8.5-reorder-INC.patch, +perl-5.8.5.ebuild:
+  5.8.5
+
+  02 Aug 2004; Robert Coie <rac@gentoo.org> +files/perl-5.8.4-nonblock.patch,
+  perl-5.8.4-r1.ebuild:
+  add nonblock.patch, primarily for sparc64
+
+  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> perl-5.8.4.ebuild:
+  Stable on hppa.
+
+*perl-5.8.4-r1 (29 Jul 2004)
+
+  29 Jul 2004; Robert Coie <rac@gentoo.org> +perl-5.8.4-r1.ebuild:
+  Move make test to src_test, but still call it if the maketest
+  FEATURE is not enabled.  If maketest ever becomes a default, this
+  can be reconsidered.  The NDBM-GDBM patch in bug 52660 is in here,
+  and gdbm is allowed to provide ndbm, as it works for me with either
+  1.8.0-r5 (so2) or 1.8.3 (so3).  So to get ndbm, one must either
+  USE=berkdb and have db1 installed, or USE=gdbm in which case gdbm
+  will come in.  The man page fixes from bug 58620 are in.
+  src_configure has been split out of src_compile in preparation for
+  making compiles more easily resumable.  An issue genone brought up
+  where hardlinks aren't making it through portage's staging image has
+  been addressed by making /usr/bin/perl a symlink to perl5.8.4
+  instead of a hardlink.  The same issue was faced with suidperl,
+  which has been removed completely to preemptively avoid security
+  issues.  sperl${PV} is gone too, in favor of the perl recommendation
+  to use sudo instead of having setuid perl executables.  I hope this
+  will help security, but it can be restored if there is enough
+  demand.
+	
+  23 Jul 2004; Robert Coie <rac@gentoo.org> perl-5.8.4.ebuild:
+  keywording x86 and sparc
+
+  02 Jul 2004; <solar@gentoo.org> perl-5.8.4.ebuild:
+  don't call perl to install manfiles when FEATURES=noman is set. testing of the
+  perl can be disable now with restrictions
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4.ebuild:
+  kill sparc64 use flag
+
+  25 Jun 2004; <solar@gentoo.org> perl-5.8.4.ebuild:
+  uclibc update
+
+  24 Jun 2004; <solar@gentoo.org> perl-5.8.4.ebuild:
+  added uclibc update for 5.8.4
+
+  15 Jun 2004; <solar@gentoo.org> perl-5.8.2-r1.ebuild,
+  files/perl-5.8.2-uclibc.patch:
+  basic initial uclibc support needed for bootstrapping
+
+  09 Jun 2004; Robert Coie <rac@gentoo.org> +files/perl-5.8.4-noksh.patch,
+  perl-5.8.4.ebuild:
+  Add noksh.patch, bug 42665
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4.ebuild:
+  Fix use invocation
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> perl-5.8.4.ebuild:
+  stable on amd64
+
+  31 May 2004; Robert Coie <rac@gentoo.org> perl-5.8.2-r1.ebuild,
+  perl-5.8.3.ebuild, perl-5.8.4.ebuild:
+  Update makemaker blocks to <6.17, not worth making everybody recompile
+
+  10 May 2004; Michael McCabe <randy@gentoo.org> perl-5.8.4.ebuild:
+  Stable on s390
+
+  08 May 2004; Robert Coie <rac@gentoo.org> perl-5.8.4.ebuild,
+  files/perl-5.8.4-prelink-lpthread.patch:
+  Add back the -lpthread patch, frozen-bubble segfaults otherwise
+
+*perl-5.8.4 (03 May 2004)
+
+  03 May 2004; Robert Coie <rac@gentoo.org> perl-5.8.4.ebuild,
+  files/5.6.1-builtin-fixup.diff, files/5.6.1-op-test-fix.diff,
+  files/perl-5.8.4-perldoc-emptydirs.patch, files/perl-5.8.4-picdl.patch,
+  files/perl-5.8.4-reorder-INC.patch:
+  Add 5.8.4
+
+  28 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Clean up `use` syntax and remove ${CC} usage.
+
+  27 Feb 2004; Michael Cummings <mcummings@gentoo.org> perl-5.6.1-r10.ebuild,
+  perl-5.6.1-r11.ebuild, perl-5.6.1-r12.ebuild:
+  5.6.1 is no longer a requirement/needed in the tree
+
+  21 Feb 2004; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r11.ebuild,
+  perl-5.8.0-r12.ebuild, perl-5.8.0-r9.ebuild, perl-5.8.2.ebuild,
+  files/libperl-5.8.0-create-libperl-soname.patch,
+  files/perl-5.8.0-perldoc-emptydirs.patch,
+  files/perl-5.8.0-prelink-lpthread.patch, files/perl-5.8.0-reorder-INC.patch,
+  files/perl-5.8.0-sockatmark-should-__THROW.patch:
+  Massive clean up. With 5.8.2 now marked stable on all platforms, we are
+    removing the older 5.8.0 ebuilds, which are no longer available upstream
+    anymore. I also cleaned out the files dir of any patches that were being
+    specifically used by 5.8.0 and not the other versions.
+
+  19 Feb 2004; Aron Griffis <agriffis@gentoo.org> perl-5.8.2-r1.ebuild:
+  stable on alpha and ia64
+
+  18 Feb 2004; Joshua Kinard <kumba@gentoo.org> perl-5.8.2-r1.ebuild:
+  Marking stable on mips
+
+  09 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> perl-5.8.2-r1.ebuild:
+  set ppc in keywords
+
+  06 Feb 2004; <gustavoz@gentoo.org> perl-5.8.2-r1.ebuild:
+  stable on sparc
+
+  03 Feb 2004; <gustavoz@gentoo.org> perl-5.8.2-r1.ebuild:
+  stable on hppa
+
+  01 Feb 2004; <rac@gentoo.org> perl-5.8.2-r1.ebuild:
+  mark x86
+
+*perl-5.8.3 (17 Jan 2004)
+
+  17 Jan 2004; <rac@gentoo.org> perl-5.8.1-r1.ebuild, perl-5.8.1-r2.ebuild,
+  perl-5.8.3.ebuild, files/perl-5.8.1-perldoc-emptydirs.patch,
+  files/perl-5.8.1-prelink-lpthread.patch, files/perl-5.8.1-reorder-INC.patch,
+  files/perl-5.8.1_rc1-reorder-INC.patch,
+  files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch,
+  files/perl-5.8.1_rc2-reorder-INC.patch,
+  files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch,
+  files/perl-5.8.3-perldoc-emptydirs.patch, files/perl-5.8.3-picdl.patch,
+  files/perl-5.8.3-prelink-lpthread.patch, files/perl-5.8.3-reorder-INC.patch:
+  Upstream bump, housecleaning
+
+  06 Jan 2004; Luca Barbato <lu_zero@gentoo.org> perl-5.8.0-r12.ebuild:
+  Marked ~arm to let me commit ppc related changes (it is as wierd as it sound)
+
+*perl-5.8.2-r1 (29 Nov 2003)
+
+  29 Nov 2003; <rac@gentoo.org> perl-5.8.2-r1.ebuild,
+  files/perl-5.8.2-picdl.patch:
+  Make CCCDLFLAGS apply to static archives like DynaLoader.a as well, even
+  though we are not building a shared libperl here, because we do have a shared
+  library elsewhere. Should make it so that arches like amd64 and hppa no longer
+  have to add -fPIC to all cflags blindly.
+
+  26 Nov 2003; <rac@gentoo.org> perl-5.8.2.ebuild:
+  Make perl depend on exact same libperl version, so that upgrading perl will
+  bring libperl along. Solves problems where new modules go into directories in
+  @INC too new for libperl to know about
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> perl-5.8.2.ebuild:
+  mark stable on amd64
+
+*perl-5.8.2 (08 Nov 2003)
+
+  08 Nov 2003; <rac@gentoo.org> perl-5.8.2.ebuild,
+  files/perl-5.8.2-perldoc-emptydirs.patch,
+  files/perl-5.8.2-prelink-lpthread.patch, files/perl-5.8.2-reorder-INC.patch:
+  new upstream version
+
+  22 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild,
+  files/perl-5.8.1-perldoc-emptydirs.patch:
+  Forward-port the perldoc emptydirs patch
+
+  20 Oct 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.1-r1.ebuild,
+  perl-5.8.1-r2.ebuild:
+  Changed how h2ph grabs its list of files; relying on h2ph to efficiently
+  recurse was resulting a looping condition when there is a symlink in
+  /usr/include/* (libxml was the sample case - thanks DarkSpecter!). Using find
+  isolates the list to only .h files.
+
+  14 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild:
+  Allow building even when db-1 is not present, but let ndbm_file use it if it's
+  there
+
+*perl-5.8.1-r2 (02 Oct 2003)
+
+  02 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild, perl-5.8.1.ebuild,
+  perl-5.8.1_rc1.ebuild, perl-5.8.1_rc2.ebuild, perl-5.8.1_rc3.ebuild,
+  perl-5.8.1_rc4.ebuild, files/perl-5.8.1-prelink-lpthread.patch:
+  Clean house, readd pthread prelink patch to avoid reported sdl segfaulting.
+  Thanks to lisa for the report.
+
+*perl-5.8.1-r1 (29 Sep 2003)
+
+  29 Sep 2003; <rac@gentoo.org> perl-5.8.1-r1.ebuild:
+  Change destdir handling in a couple of places
+
+*perl-5.8.1 (27 Sep 2003)
+
+  27 Sep 2003; <rac@gentoo.org> perl-5.8.1.ebuild,
+  files/perl-5.8.1-reorder-INC.patch:
+  New upstream revision
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> perl-5.8.0-r12.ebuild :
+  ia64 keywords.
+
+  22 Aug 2003; Michael Cummings <mcummings@gentoo.org> perl-5.6.1-r10.ebuild,
+  perl-5.6.1-r11.ebuild, perl-5.6.1-r12.ebuild, perl-5.8.0-r10.ebuild,
+  perl-5.8.0-r11.ebuild, perl-5.8.0-r12.ebuild, perl-5.8.0-r9.ebuild,
+  perl-5.8.1_rc1.ebuild, perl-5.8.1_rc2.ebuild, perl-5.8.1_rc3.ebuild:
+  Corrected h2ph behaviour to now run -r -l -- recursively :)
+  Also fixes bug 14461
+
+*perl-5.8.1_rc3 (30 Jul 2003)
+
+  30 Jul 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.1_rc3.ebuild:
+  Latest release candidate for 5.8.1
+
+  25 Jul 2003; <rac@gentoo.org> perl-5.8.1_rc1.ebuild, perl-5.8.1_rc2.ebuild:
+  Forward-port alpha and hppa fixes from 5.8.0-r9
+
+  25 Jul 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild:
+  Remove ~arch protection on all but hppa
+
+*perl-5.8.1_rc2 (23 Jul 2003)
+
+  23 Jul 2003; <rac@gentoo.org> perl-5.8.1_rc2.ebuild,
+  files/perl-5.8.1_rc2-reorder-INC.patch,
+  files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch:
+  Add 5.8.1-rc2
+
+  18 Jul 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild, perl-5.8.1_rc1.ebuild:
+  Add blocker on Test-Simple versions that overwrite the core
+
+  18 Jul 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild, perl-5.8.1_rc1.ebuild:
+  Portage depends to >=2.0.48-r4.  This is important for blocking depends
+
+  16 Jul 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild, perl-5.8.1_rc1.ebuild:
+  Add portage depend on version that fixes bug 23546, so the blocking depends
+  will be guaranteed to work even if people are upgrading
+
+  15 Jul 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild, perl-5.8.1_rc1.ebuild:
+  Fiddle with the module block depends a bit, largely to ensure that File-Spec
+  0.84 doesn't fall through the cracks
+
+*perl-5.8.1_rc1 (10 Jul 2003)
+
+  10 Jul 2003; <rac@gentoo.org> perl-5.8.1_rc1.ebuild,
+  files/perl-5.8.1_rc1-reorder-INC.patch,
+  files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch:
+  Add 5.8.1_rc1.  Experimental.
+
+  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> perl-5.8.0-r11.ebuild:
+  set stable on sparc
+
+  26 Jun 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild, perl-5.8.0-r11.ebuild,
+  perl-5.8.0-r12.ebuild:
+  Add -Dd_u32align on mips to work around a gcc 3.3 kernel compiling bug
+
+  26 Jun 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild:
+  Add block depends on ExtUtils-MakeMaker and File-Spec, because we need to get
+  those uninstalled before they steal our files again
+
+*perl-5.8.0-r12 (25 Jun 2003)
+
+  25 Jul 2003; Guy Martin <gmsoft@gentoo.org> perl-5.8.0-r12.ebuild :
+  Marked stable on hppa.
+
+  25 Jun 2003; <rac@gentoo.org> perl-5.8.0-r12.ebuild,
+  files/perl-5.8.0-reorder-INC.patch:
+  Reorder @INC so that site modules can override vendor modules, which can in
+  turn override core modules.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> perl-5.8.0-r10.ebuild:
+  Mark stable on alpha
+
+  10 Jun 2003; <rac@gentoo.org> perl-5.6.1-r12.ebuild:
+  Mark stable on x86
+
+  06 Jun 2003; <rac@gentoo.org> perl-5.6.1-r12.ebuild:
+  Add sed-4 dependency to use sed -i
+
+  04 Jun 2003; <rac@gentoo.org> perl-5.8.0-r11.ebuild:
+  Relax db DEPEND as well as RDEPEND.  Thanks to mcummings for the catch.
+
+*perl-5.8.0-r11 (03 Jun 2003)
+
+  03 Jun 2003; <rac@gentoo.org> perl-5.8.0-r11.ebuild:
+  Clean out libperl bits from ebuild. Grab newer version of Safe.pm from CPAN
+  for security reasons, DB_File for db 4.1 compatibility.
+
+*perl-5.6.1-r12 (02 Jun 2003)
+
+  02 Jun 2003; <rac@gentoo.org> perl-5.6.1-r12.ebuild:
+  Replace PDEPEND strategy for ExtUtils::MakeMaker and Safe.pm with the approach
+  of injecting newer versions directly into the core
+
+*perl-5.6.1-r11 (31 May 2003)
+
+  31 May 2003; Alastair Tse <liquidx@gentoo.org> perl-5.6.1-r10.ebuild,
+  perl-5.6.1-r11.ebuild, files/5.6.1-builtin-fixup.diff,
+  files/5.6.1-op-test-fix.diff, files/stat.t:
+  Putting perl-5.6.1 back in because it breaks the default-1.0 profile.
+
+  30 May 2003; <rac@gentoo.org> perl-5.6.1-r10.ebuild, perl-5.6.1-r11.ebuild,
+  perl-5.8.0-r10.ebuild, files/5.6.1-builtin-fixup.diff,
+  files/5.6.1-op-test-fix.diff:
+  Marking stable on mips, thanks to dragon and kumba for verification and
+  mcummings for coordination.  Also cleaning 5.6.1 ebuilds, as all marked
+  arches now have a stable 5.8 version
+
+  27 May 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild, perl-5.8.0-r9.ebuild:
+  Add threads to IUSE, thanks to liquidx for the catch
+
+  20 May 2003; Tavis Ormandy <taviso@gentoo.org> perl-5.8.0-r10.ebuild:
+  removing gcc hardcodes.
+
+  18 May 2003; Tavis Ormandy <taviso@gentoo.org> perl-5.8.0-r9.ebuild:
+  removing hardcoded compiler.
+
+*perl-5.8.0-r10 (30 Mar 2003)
+
+  23 Apr 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild:
+  Only build extra HTML documentation if USE="doc" is set - thanks to
+  msterret@gentoo.org - bug #16401
+
+  07 Apr 2003; Martin Holzer <mholzer@gentoo.org> perl-5.6.1-r10.ebuild,
+  perl-5.6.1-r11.ebuild, perl-5.8.0-r10.ebuild, perl-5.8.0-r9.ebuild:
+  Changes portage version depend. Closes #13339.
+
+  30 Mar 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild:
+  marking stable again on x86 and ppc - previous sparc keyword commit undid this
+  and broke things
+
+  30 Mar 2003; Rodney Rees <manson@gentoo.org> perl-5.8.0-r10.ebuild,
+  marked stable for sparc
 
 *perl-5.8.0-r10 (11 Mar 2003)
 
+  27 Mar 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild:
+  Marking stable for x86 and ppc, no problems reported from ~arch testers
+
   11 Mar 2003; Seemant Kulleen <seemant@gentoo.org> perl-5.6.1-r10.ebuild,
   perl-5.6.1-r11.ebuild, perl-5.8.0-r10.ebuild, perl-5.8.0-r9.ebuild,
   files/5.6.1-builtin-fixup.diff, files/5.6.1-op-test-fix.diff,
@@ -29,6 +772,12 @@
 
 *perl-5.6.1-r11 (14 Feb 2003)
 
+  24 Mar 2003; <rac@gentoo.org> perl-5.6.1-r10.ebuild, perl-5.6.1-r11.ebuild:
+  Remove spurious '$' from head of SRC_URI
+
+  16 Mar 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to KEYWORDS
+
   14 Feb 2003; Mark Guertin <gerk@gentoo.org> perl-5.6.1-r11.ebuild :
   Set to ppc stable
 
@@ -74,7 +823,7 @@
   15 Jan 2003; J Robert Ray <jrray@gentoo.org> libperl_rebuilder : Fixed
   unfortunate typo.
 
-* perl-5.8.0-r8 (06 Jan 2003)
+*perl-5.8.0-r8 (06 Jan 2003)
 
   12 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r8,
   libperl_rebuilder:
@@ -134,7 +883,7 @@
 
   Note for remerging perl modules added. Unmasked for x86.
     
-* perl-5.8.0-r7 (22 Dec 2002)
+*perl-5.8.0-r7 (22 Dec 2002)
 
   22 Dec 2002; Michael Cummings <mcummings@gentoo.org>
   perl-5.8.0-r7.ebuild:
@@ -161,7 +910,7 @@
 
   new ebuild confirmed by arch devs - Gerk did ppc, Alron did sparc
 
-* perl-5.6.1-r10 (19 Dec 2002)
+*perl-5.6.1-r10 (19 Dec 2002)
 
   07 Feb 2003; Guy Martin <gmsoft@gentoo.org> perl-5.6.1-r9.ebuild perl-5.6.1-r10.ebuild :
   Added hppa to keywords.
@@ -179,7 +928,7 @@
 
   Same name, different ebuild. This is for the safe.pm fix.
 
-* perl-5.8.0-r6 (17 Dec 2002)
+*perl-5.8.0-r6 (17 Dec 2002)
 
   17 Dec 2002; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r6.ebuild :
   -arch this bad boy, it reb0rk what I unb0rk last night, stick with -r5
@@ -194,7 +943,7 @@
   $[arch]-linux - this is correct behaviour!! Installation with
   threading is *not* supported by all apps that dep perl.
 
-* perl-5.8.0-r5 (17 Dec 2002)
+*perl-5.8.0-r5 (17 Dec 2002)
 
   17 Dec 2002; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r5.ebuild:
 
@@ -202,7 +951,7 @@
   now.  Fix messages to only display if needed.  You will need to remerge
   all your perl modules after you install this with threads.
 
-* perl-5.8.0-r4 (15 Dec 2002)
+*perl-5.8.0-r4 (15 Dec 2002)
 
   15 Dec 2002; Michael Cummings <mcummings@gentoo.org>
   perl-5.8.0-r4.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 60273ffa2c0a..db4592c6472c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,18 +1,40 @@
-MD5 69e325b58dcb29a4268b28f664808300 perl-5.8.0-r10.ebuild 13772
-MD5 9d35bc77720f2e300adffba40e07b2b6 perl-5.8.0-r9.ebuild 13382
-MD5 4de48ad30fcdde726e932b9792180392 perl-5.6.1-r11.ebuild 6301
-MD5 b60257fc55f824946dce35852268b9fd ChangeLog 14313
-MD5 c1eec734338e6ffc036a7eef6794ce15 perl-5.6.1-r10.ebuild 6844
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
-MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
-MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
-MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
-MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
-MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
-MD5 9810be5a789a6d0bde088fef8fb261a4 files/digest-perl-5.8.0-r10 861
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
-MD5 5aa1a011eddb5b13299b63948230db33 files/stat.t 8884
-MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
-MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
-MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 abe33cecda2df129c06492e4d6e6acb4 ChangeLog 44163
+MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
+MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r6 64
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r1 64
+MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
+MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
+MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
+MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
+MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
+MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
+MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
+MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
+MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
+MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250
+MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476
+MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141
+MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
+MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 e377e6ec5a77f51ef1da80ae0600c08c perl-5.8.6-r5.ebuild 17675
+MD5 71c976f23db314752dab5af982dca654 perl-5.8.6-r6.ebuild 18053
+MD5 3abc228b743a2fc63223edc90daeff7c perl-5.8.7-r1.ebuild 19533
+MD5 3a9ecfb3b8b741ea324c7c05e88c5a65 perl-5.8.7.ebuild 19301
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDeQQXtG5z4I8BtQoRAqULAJ9vp2xJlbuvClHC+WpiwVCvFSa3EwCeLSBL
+Db5+egTnaJYwUXDxsi5ppnw=
+=myNw
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
index 3f06f6118f56..602a4ad57bcd 100644
--- a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
+++ b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
@@ -1,5 +1,5 @@
---- perl-5.8.4.orig/lib/File/Path.pm
-+++ perl-5.8.4/lib/File/Path.pm
+--- Path.pm.old
++++ Path.pm
 @@ -72,27 +72,17 @@
  
  =item *
diff --git a/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch b/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch
index f06e9ec93b31..d0357cd50629 100644
--- a/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch
+++ b/dev-lang/perl/files/perl-5.8.7-regexp-nossp.patch
@@ -4,8 +4,8 @@
  esac
  
      : Can we perhaps use $ansi2knr here
-+    [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
-+    [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
++    [ "x$file" = xregcomp ] && export ccflags="${ccflags} -fno-stack-protector"
++    [ "x$file" = xregexec ] && export ccflags="${ccflags} -fno-stack-protector"
      echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
      eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
  
diff --git a/dev-lang/perl/files/perl-cleaner b/dev-lang/perl/files/perl-cleaner
index 1b29ac82ffc5..abdc4783872c 100755
--- a/dev-lang/perl/files/perl-cleaner
+++ b/dev-lang/perl/files/perl-cleaner
@@ -1,80 +1,92 @@
 #!/bin/bash
 
+
+# sort of a changelog if you want to call it that...
+
+# version 1.2 - swtaylor gave some good pointers on making the tmp files, as well as reminding me of grep's -f functionality :)
+# version 1.1 - Mr. Bones gave a lot of good input on cleaning up the script
+# Version 1 - stuff
+
 # First and foremost - make sure we have a perl to work with...
-PERL=`which perl`
+PERL=$(which perl)
 if [ "${PERL}x" == "x" ]; then
    echo "NO PERL INSTALLED!! (at least not in your path)"
    exit
 fi
-eval `perl '-V:version'`
+eval $(perl '-V:version')
 PERL_VERSION=${version}
 
+TMPDIR=${TMPDIR:-/tmp}
 
-TMPDIR="/tmp"
-PKGDIR="/var/db/pkg"
-DATESTAMP=`date +"%Y%m%d%H%M%S"`
-LOG="${TMPDIR}/perl-cleaner.log.$DATESTAMP"
+PKGDIR=$(/usr/bin/portageq vdb_path)
+DATESTAMP=$(date +"%Y%m%d%H%M%S")
+LOG=$(mktemp ${TMPDIR}/perl-cleaner.log.$DATESTAMP.XXXXXXXXXX)
+PAGER=${PAGER:-more}
+
+# Set up our temporary files
+MODULES_LIST=$(mktemp ${TMPDIR}/modules.list.XXXXXXXXXX)
+EBUILDS_PREINSTALL=$(mktemp ${TMPDIR}/ebuilds.preinstall.XXXXXXXXXX)
+EBUILDS_ORDERED=$(mktemp ${TMPDIR}/ebuilds.ordered.XXXXXXXXXX)
+EBUILDS_REINSTALL=$(mktemp ${TMPDIR}/ebuilds.reinstall.XXXXXXXXXX)
 
 ASK=""
 
 if [ ! -z $2 ]; then
-   ASK=Y
+   ASK="--ask"
 fi
 
-# Set up our temporary files
 
-function cleanrun() {
-for FILE in modules.list ebuilds.preinstall ebuilds.ordered ebuilds.reinstall ; do
-
-if [ -f $TMPDIR/$FILE ]; then
-   cp /dev/null $TMPDIR/$FILE
-else
-   touch $TMPDIR/$FILE
-fi
-
-done
-}
 
 function postclean {
-for FILE in modules.list ebuilds.preinstall ebuilds.ordered ebuilds.reinstall; do
+   for FILE in ${MODULES_LIST} ${EBUILDS_PREINSTALL} ${EBUILDS_ORDERED} ${EBUILDS_REINSTALL}; do
 
-if [ -f $TMPDIR/$FILE ]; then
-   rm -f $TMPDIR/$FILE
-fi
+      if [ -f $FILE ]; then
+         rm -f $FILE
+      fi
 
-done
+   done
 
-echo ""
-echo "For a complete log, please read ${TMPDIR}/perl-cleaner.log.DATESTAMP"
-echo ""
+   if [ -s $LOG ]; then
+     echo
+     echo "For a complete log, please read $LOG"
+     echo
+   else
+      if [ -f $LOG ]; then
+	rm -f $LOG
+      fi
+   fi
 }
 
 # This is to clean out the old .ph files generated in our last perl install
 function ph_clean() {
-echo "`date` : Beginning a clean up of .ph files"
-echo "`date` : Beginning a clean up of .ph files">>$LOG
-
-INC=`perl -e 'foreach $line (@INC) { next if $line eq "."; next if $line =~ m/'${PERL_VERSION}'/; print "$line\n" }'`
-
-echo "Locating ph files for removal"
-for DIR in $INC; do
-   if [ -d $DIR ]; then
-      for file in `find $DIR -name "*.ph" -type f`; do
-         if [ ! `echo "$file"|grep $PERL_VERSION` ]; then
-         echo "`date` : Removing old ph file: $file"
-         echo "`date` : Removing old ph file: $file">>$LOG
-         rm $file
-         fi
-      done
-   fi
-done
+   echo "$(date) : Beginning a clean up of .ph files" | tee -a $LOG
+
+   INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PERL_VERSION}'/; print "$line\n" }')
+
+   echo "Locating ph files for removal"
+   for DIR in $INC; do
+      if [ -d $DIR ]; then
+         for file in $(find $DIR -name "*.ph" -type f); do
+            if [ ! $(echo "$file"|grep $PERL_VERSION) ]; then
+               echo "$(date) : Removing old ph file: $file" | tee -a $LOG
+               rm $file
+            fi
+         done
+      fi
+   done
+   for DIR in $INC; do
+	 for empty in $(find $DIR -type d); do
+		# Silently remove those dirs that we just emptied
+	 	rmdir $empty  >/dev/null 2>&1
+   	 done
+   done
 }
 
 # Generate ph files; this is useful if we've upgraded packages with headers so that perl knows the new info
 function ph_update() {
-   echo "`date` : Updating ph files"
-   echo "`date` : Updating ph files">>$LOG
-   cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* >>$LOG
+   echo "$(date) : Updating ph files" | tee -a $LOG
+   cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* | tee -a $LOG
+   cd /usr/include/linux; h2ph * | tee -a $LOG
 }
 
 # Build a list of modules installed under older perls - only valid if the module was an ebuild :)
@@ -82,17 +94,19 @@ function module_list() {
 # Reset INC - INC is dynamically generated, and if we removed any ph 
 # files - and they were the only thing left in a dir - then there's 
 # no sense in revisiting that dir
-echo "`date` : Building list of modules for reinstall"
-echo "`date` : Building list of modules for reinstall">>$LOG
-INC=`perl -e 'foreach $line (@INC) { next if $line eq "."; next if $line =~ m/'${PERL_VERSION}'/; print "$line\n" }'`
-echo "Locating modules for reinstall"
-for DIR in $INC; do
-   if [ -d $DIR ]; then
-      for file in `find $DIR -iname "*.pm" -type f|grep -v "${PERL_VERSION}"`; do
-         grep -l $file $PKGDIR/*/*/CONTENTS >>$TMPDIR/modules.list
-      done
-   fi
-done
+   echo "$(date) : Building list of modules for reinstall" | tee -a $LOG
+   INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PERL_VERSION}'/; print "$line\n" }')
+   MODFIND=$(mktemp ${TMPDIR}/modules.found.XXXXXXXXXX)
+   echo "Locating modules for reinstall"
+   for DIR in $INC; do
+      if [ -d $DIR ]; then
+         for file in $(find $DIR -iname "*.pm" -type f|grep -v "${PERL_VERSION}"); do
+	    echo "$file" >>$MODFIND
+         done
+      fi
+   done
+   grep -f $MODFIND -l $PKGDIR/*/*/CONTENTS >${MODULES_LIST}
+   rm $MODFIND
 }
 
 # The meat of it - rebuilding the ebuilds
@@ -102,103 +116,88 @@ done
 
 function ebuild_rebuild() {
 
-echo "`date` : Rebuilding modules: Building list of ebuilds"
-echo "`date` : Rebuilding modules: Building list of ebuilds">>$LOG
-if [ -s $TMPDIR/modules.list ]; then
-   for line in `cat $TMPDIR/modules.list|sort -u`; do
-      echo "$line"|sed -e 's|.*pkg/||' | sed -e 's|/CONTENTS||'|grep -v "dev-lang/perl" >>$TMPDIR/ebuilds.preinstall
-   done
-fi
+   echo "$(date) : Rebuilding modules: Building list of ebuilds" | tee -a $LOG
+   if [ -s ${MODULES_LIST} ]; then
+      for line in $(sort -u ${MODULES_LIST}); do
+         echo "$line"|sed -e 's|.*pkg/||' -e 's|/CONTENTS||'|grep -v "dev-lang/perl" >>${EBUILDS_PREINSTALL}
+      done
+   fi
 
 
 # If they asked for interactive, let them see what will be reinstalled
-if [ -s $TMPDIR/ebuild.preinstall ]; then
-  
-  if [ ! -z $ASK ]; then
-     echo "Press Enter to see the list of ebuilds we'll be avaluating"
-     read key
-     if [ ! -z $PAGER ]; then
-        $PAGER $TMPDIR/ebuilds.preinstall
-     else
-        more $TMPDIR/ebuilds.preinstall
-     fi
-     printf "Continue? (Y/N) "
-     read ANSWER
-     if [ `echo "${ANSWER}" | egrep -e "^n|N" ` ]; then
-        echo "`date` : USER ABORTED REBUILD">>$LOG
-        exit
-     fi
-  fi
+   if [ -s ${EBUILDS_PREINSTALL} ]; then
   
-  for EBUILD in `cat $TMPDIR/ebuilds.preinstall`; do
-  if emerge --oneshot -p "=$EBUILD"|egrep -q ".*ebuilds.*satisfy"; then
-     if emerge --oneshot -p ">=$EBUILD"|egrep -q ".*ebuilds.*satisfy"; then
-        echo "`date` : There are no unmasked ebuilds to satisfy $EBUILD. Skipping"
-        echo "`date` : There are no unmasked ebuilds to satisfy $EBUILD. Skipping">>$LOG
-        sleep 2
-     else
-        if [ ! -z $ASK ]; then
-        printf "${EBUILD} isn't available, but a new version is. Install? (Y/N) "
+     if [ ! -z $ASK ]; then
+        echo "Press Enter to see the list of ebuilds we'll be avaluating"
+        read key
+        $PAGER ${EBUILDS_PREINSTALL}
+        printf "Continue? (Y/N) "
         read ANSWER
-           if [ `echo "${ANSWER}" | egrep -e "^y|Y" ` ]; then
-              echo ">=$EBUILD" >> $TMPDIR/ebuilds.ordered
-	      echo "`date` : User chose to install >=${EBUILD}">>$LOG
-           fi
-        else
-           echo ">=$EBUILD" >>$TMPDIR/ebuilds.ordered
+        if [ $(echo "${ANSWER}" | egrep -e "^n|N" ) ]; then
+           echo "$(date) : USER ABORTED REBUILD">>$LOG
+           exit
         fi
      fi
-  else
-     echo "=$EBUILD">>$TMPDIR/ebuilds.ordered
-
-  fi
-  done
-
- if [ -s $TMPDIR/ebuilds.ordered ]; then
-  if [ ! -z $ASK ]; then
-     echo "Press Enter to see the final list of ebuilds to install"
-     read key
-     if [ ! -z $PAGER ]; then
-        $PAGER $TMPDIR/ebuilds.ordered
+  
+     for EBUILD in $(cat ${EBUILDS_PREINSTALL} ); do
+        if emerge --oneshot -p "=$EBUILD"|egrep -q ".*ebuilds.*satisfy"; then
+           if emerge --oneshot -p ">=$EBUILD"|egrep -q ".*ebuilds.*satisfy"; then
+              echo "$(date) : There are no unmasked ebuilds to satisfy $EBUILD. Skipping" | tee -a $LOG
+              sleep 2
+           else
+              if [ ! -z $ASK ]; then
+                 printf "${EBUILD} isn't available, but a new version is. Install? (Y/N) "
+                 read ANSWER
+                 if [ $(echo "${ANSWER}" | egrep -e "^y|Y" ) ]; then
+                    echo ">=$EBUILD" >> ${EBUILDS_ORDERED}
+	            echo "$(date) : User chose to install >=${EBUILD}">>$LOG
+                 fi
+              else
+                 echo ">=$EBUILD" >>${EBUILDS_ORDERED}
+              fi
+           fi
      else
-        more $TMPDIR/ebuilds.ordered
+        echo "=$EBUILD">>${EBUILDS_ORDERED}
      fi
-     printf "Continue? (Y/N) "
-     read ANSWER
-     if [ `echo "${ANSWER}" | egrep -e "^n|N" ` ]; then
-        echo "`date` : USER ABORTED REBUILD">>$LOG
-        exit
+     done
+
+    if [ -s ${EBUILDS_ORDERED} ]; then
+     if [ ! -z $ASK ]; then
+        echo "Press Enter to see the final list of ebuilds to install"
+        read key
+        $PAGER ${EBUILDS_ORDERED}
+        printf "Continue? (Y/N) "
+        read ANSWER
+        if [ $(echo "${ANSWER}" | egrep -e "^n|N" ) ]; then
+           echo "$(date) : USER ABORTED REBUILD">>$LOG
+           exit
+        fi
      fi
-  fi
 
 # Cut down to one line so portage can handle ordering these appropriately
-  emerge -p --oneshot `cat $TMPDIR/ebuilds.ordered` | grep ebuild | sed 's:\([^ ]\+\):=\1:g' | sed 's:.*\] \([^ ]*\) .*:\1:'>>$TMPDIR/ebuilds.reinstall
+     emerge -p --oneshot $(cat ${EBUILDS_ORDERED} ) | grep ebuild | sed -e 's:\([^ ]\+\):=\1:g' -e 's:.*\] \([^ ]*\) .*:\1:'>>${EBUILDS_REINSTALL}
 
-  echo "Reinstalling ebuilds"
-  echo "`date` : Ebuilds to reinstall: ">>$LOG
-  cat $TMPDIR/ebuilds.reinstall>>$LOG
-  echo "" >>$LOG
+     echo "Reinstalling ebuilds"
+     echo "$(date) : Ebuilds to reinstall: ">>$LOG
+     cat ${EBUILDS_REINSTALL}>>$LOG
+     echo >>$LOG
 
 # Now that we have them in the right order, emerge them one at a time
 # This is to avoid problems if one doesn't emerge correctly
 
-  for EBUILD in `cat $TMPDIR/ebuilds.reinstall`; do
-    if [ ! -z $ASK ]; then
-     emerge --oneshot --ask "$EBUILD"
+     for EBUILD in $(cat ${EBUILDS_REINSTALL}); do
+        emerge --oneshot ${ASK} "$EBUILD"
+     done
     else
-     emerge --oneshot "$EBUILD"
+	   echo
+	   echo "Nothing to reinstall!"
+	   echo
     fi
-  done
- else
-	echo ""
-	echo "Nothing to reinstall!"
-	echo ""
- fi
-else
-	echo ""
-	echo "Nothing to reinstall!"
-	echo ""
-fi
+   else
+	   echo
+	   echo "Nothing to reinstall!"
+	   echo
+   fi
 
 }
 
@@ -207,43 +206,36 @@ fi
 # after our last install of libperl, which should cut out the false positives.
 
 function libperl_list() {
-echo "`date` : Locating ebuilds linked against libperl"
-echo "`date` : Locating ebuilds linked against libperl">>$LOG
-for i in $(find $(egrep -v ^# /etc/ld.so.conf) -type f -name '*.so*' ! -newer /usr/lib/libperl.so ) \
-      $(find $(echo $PATH | sed 's/:/ /g') -type f -perm +0111 ! -newer /usr/lib/libperl.so ) ;
-do
-  echo "Checking ${i}" #MPC
-  if [ -f ${i} ]; then
-     ldd ${i} 2>&1 | grep "libperl" - >/dev/null && grep -l $i $PKGDIR/*/*/CONTENTS>>$TMPDIR/modules.list;
-  fi
-done 
+   echo "$(date) : Locating ebuilds linked against libperl" | tee -a $LOG
+   for i in $(find $(egrep -v ^# /etc/ld.so.conf) -type f -name '*.so*' ! -newer /usr/lib/libperl.so ) \
+         $(find $(echo $PATH | sed 's/:/ /g') -type f -perm +0111 ! -newer /usr/lib/libperl.so ) ;
+   do
+     if [ -f ${i} ]; then
+        ldd ${i} 2>&1 | grep "libperl" - >/dev/null && grep -l $i $PKGDIR/*/*/CONTENTS>>${MODULES_LIST};
+     fi
+   done 
 
 }
 
 # Assuming a successful module run, look to see whats left over
 function leftovers() {
-echo "`date` : Finding left over modules"
-echo "`date` : Finding left over modules">>$LOG
-
-echo "`date` : The following files remain. These were either installed by hand"
-echo "`date` : or edited. This script cannot deal with them."
-echo ""
-
-echo "`date` : The following files remain. These were either installed by hand">>$LOG
-echo "`date` : or edited. This script cannot deal with them.">>$LOG
-echo "">>$LOG
-
-INC=`perl -e 'foreach $line (@INC) { next if $line eq "."; next if $line =~ m/'${PERL_VERSION}'/; print "$line\n" }'`
-for DIR in $INC; do
-   if [ -d $DIR ]; then
-      for file in `find $DIR -type f |grep -v  "${PERL_VERSION}" ` ; do
-         echo "`date` : ${file}">>$LOG
-      done
-   fi
-done
+   echo "$(date) : Finding left over modules" | tee -a $LOG
+
+   echo "$(date) : The following files remain. These were either installed by hand" | tee -a $LOG
+   echo "$(date) : or edited. This script cannot deal with them." | tee -a $LOG
+   echo | tee -a $LOG
+
+
+   INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PERL_VERSION}'/; print "$line\n" }')
+   for DIR in $INC; do
+      if [ -d $DIR ]; then
+         for file in $(find $DIR -type f |grep -v  "${PERL_VERSION}" ) ; do
+            echo "$(date) : ${file}" | tee -a $LOG
+         done
+      fi
+   done
 }
 
-cleanrun
 
 case "$1" in
    leftovers)
diff --git a/dev-lang/perl/files/perl-reorder-INC.patch b/dev-lang/perl/files/perl-reorder-INC.patch
index c934b4135a13..cc314d97d314 100644
--- a/dev-lang/perl/files/perl-reorder-INC.patch
+++ b/dev-lang/perl/files/perl-reorder-INC.patch
@@ -1,6 +1,6 @@
---- perl.c.orig	2003-07-10 22:09:00.000000000 -0700
-+++ perl.c	2003-07-10 22:30:21.000000000 -0700
-@@ -3932,9 +3932,9 @@
+--- perl.c.orig	2005-07-26 13:04:54.000000000 -0400
++++ perl.c	2005-07-26 13:05:05.000000000 -0400
+@@ -4397,9 +4397,9 @@ S_init_perllib(pTHX)
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
  #endif
  
@@ -13,7 +13,7 @@
  #ifdef MACOS_TRADITIONAL
      {
  	Stat_t tmpstatbuf;
-@@ -3961,8 +3961,6 @@
+@@ -4426,8 +4426,6 @@ S_init_perllib(pTHX)
  #endif
  #if defined(WIN32)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
@@ -22,7 +22,7 @@
  #endif
  
  #ifdef SITEARCH_EXP
-@@ -4006,6 +4004,60 @@
+@@ -4471,6 +4469,15 @@ S_init_perllib(pTHX)
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
  #endif
  
@@ -34,51 +34,6 @@
 +
 +    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
 +
-+#ifdef PERL_INC_VERSION_LIST
-+{
-+  struct stat s;
-+
-+  /* add small buffer in case old versions are longer than the current version */
-+  char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
-+  char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
-+  char const *vers[] = { PERL_INC_VERSION_LIST };
-+  char const **p;
-+
-+  char *arch_vers = strrchr(sitearch, '/');
-+  char *lib_vers = strrchr(sitelib, '/');
-+
-+  if (arch_vers && isdigit(*++arch_vers))
-+    *arch_vers = 0;
-+  else
-+    arch_vers = 0;
-+
-+  if (lib_vers && isdigit(*++lib_vers))
-+    *lib_vers = 0;
-+  else
-+    lib_vers = 0;
-+
-+  /* there is some duplication here as incpush does something similar
-+     internally, but required as sitearch is not a subdirectory of
-+     sitelib */
-+
-+  for (p = vers; *p; p++)
-+    {
-+      if (arch_vers)
-+	{
-+	  strcpy(arch_vers, *p);
-+	  if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitearch, FALSE, FALSE, TRUE);
-+	}
-+
-+      if (lib_vers)
-+	{
-+	  strcpy(lib_vers, *p);
-+	  if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitelib, FALSE, FALSE, TRUE);
-+	}
-+    }
-+}
-+#endif
 +
  #ifdef PERL_OTHERLIBDIRS
      incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
diff --git a/dev-lang/perl/perl-5.8.6-r5.ebuild b/dev-lang/perl/perl-5.8.6-r5.ebuild
index 3d85de74eff1..23515a0e878e 100644
--- a/dev-lang/perl/perl-5.8.6-r5.ebuild
+++ b/dev-lang/perl/perl-5.8.6-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/dev-lang/perl/perl-5.8.6-r5.ebuild,v 1.1 2005/06/30 15:09:11 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r5.ebuild,v 1.1.1.1 2005/11/30 09:58:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -17,12 +17,11 @@ LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 
 LICENSE="Artistic 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 ppc64 s390 sh sparc x86"
 IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
 PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
+DEPEND="berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )
 	>=sys-devel/libperl-${PV}-r1
 	!<perl-core/ExtUtils-MakeMaker-6.17
@@ -40,18 +39,20 @@ pkg_setup() {
 	# in USE if it could break things ...
 	if use ithreads
 	then
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
 		ewarn "interpreter-level threading enabled."
 		ewarn "Threading is not supported by all applications "
 		ewarn "that compile against perl. You use threading at "
 		ewarn "your own discretion. "
-		epause 10
-	else
-		einfo "PLEASE NOTE: If you want to compile perl-5.8 with"
-		einfo "interpreter-level threading enabled , you must "
-		einfo "restart this emerge with USE=ithreads"
-		einfo "Interpreter-level threading is not supported by "
-		einfo "all applications that compile against perl."
+		epause 5
+	fi
+
+	if use minimal
+	then
+		ewarn "You have the minimal USE flag set. The resulting"
+		ewarn "perl is stripped of most of its module functionality"
+		ewarn "and is intended for minmal use case where you need"
+		ewarn "just the perl interpreter, no extras."
 	fi
 
 	if [ ! -f "${ROOT}/usr/$(get_libdir)/${LIBPERL}" ]
@@ -139,12 +140,16 @@ src_configure() {
 	use elibc_uclibc || replace-flags "-Os" "-O2"
 	# This flag makes compiling crash in interesting ways
 	filter-flags -malign-double
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
 
 	export LC_ALL="C"
 	local myconf=""
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
 		osname="freebsd"
+	elif [[ ${KERNEL} == "NetBSD" ]]; then
+		osname="netbsd"
 	else
 		# Default setting
 		osname="linux"
diff --git a/dev-lang/perl/perl-5.8.6-r6.ebuild b/dev-lang/perl/perl-5.8.6-r6.ebuild
index b7bea457d72e..3251e159f303 100644
--- a/dev-lang/perl/perl-5.8.6-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.6-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/dev-lang/perl/perl-5.8.6-r6.ebuild,v 1.1 2005/09/20 09:19:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r6.ebuild,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -17,7 +17,7 @@ LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k mips ppc ~ppc64 s390 sh ~sparc x86"
 IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
 PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5"
 
@@ -153,6 +153,8 @@ src_configure() {
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
 		osname="freebsd"
+	elif [[ ${KERNEL} == "NetBSD" ]]; then
+		osname="netbsd"
 	else
 		# Default setting
 		osname="linux"
@@ -227,6 +229,12 @@ src_configure() {
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
 
+	if [[ $(get_libdir) != "lib" ]] ; then
+		myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) \
+		/usr/$(get_libdir)'"
+	fi
+
+
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcccdlflags='-fPIC' \
diff --git a/dev-lang/perl/perl-5.8.7-r1.ebuild b/dev-lang/perl/perl-5.8.7-r1.ebuild
index 0f9fddab5b61..bf104b1456b5 100644
--- a/dev-lang/perl/perl-5.8.7-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7-r1.ebuild,v 1.1 2005/09/20 09:19:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:20 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -17,7 +17,7 @@ LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc-macos ppc64 ~s390 ~sh sparc ~x86"
 IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
 PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
 
@@ -147,6 +147,8 @@ src_configure() {
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
 		osname="freebsd"
+	elif [[ ${KERNEL} == "NetBSD" ]]; then
+		osname="netbsd"
 	elif [[ ${USERLAND} == "Darwin" ]]; then
 		osname="darwin"
 	else
diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild
index 4dae564689bd..8f2258742962 100644
--- a/dev-lang/perl/perl-5.8.7.ebuild
+++ b/dev-lang/perl/perl-5.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.1 2005/06/29 22:14:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.1.1.1 2005/11/30 09:58:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -13,16 +13,15 @@ DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 S="${WORKDIR}/${MY_P}"
 SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
 IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
 PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
 
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
+DEPEND="berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )
 	>=sys-devel/libperl-${PV}
 	!<perl-core/ExtUtils-MakeMaker-6.17
@@ -40,18 +39,20 @@ pkg_setup() {
 	# in USE if it could break things ...
 	if use ithreads
 	then
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
+		ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
 		ewarn "interpreter-level threading enabled."
 		ewarn "Threading is not supported by all applications "
 		ewarn "that compile against perl. You use threading at "
 		ewarn "your own discretion. "
-		epause 10
-	else
-		einfo "PLEASE NOTE: If you want to compile perl-5.8 with"
-		einfo "interpreter-level threading enabled , you must "
-		einfo "restart this emerge with USE=ithreads"
-		einfo "Interpreter-level threading is not supported by "
-		einfo "all applications that compile against perl."
+		epause 5
+	fi
+
+	if use minimal
+	then
+		ewarn "You have the minimal USE flag set. The resulting"
+		ewarn "perl is stripped of most of its module functionality"
+		ewarn "and is intended for minmal use case where you need"
+		ewarn "just the perl interpreter, no extras."
 	fi
 
 	if [ ! -f "${ROOT}/usr/$(get_libdir)/${LIBPERL}" ]
@@ -115,7 +116,12 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-tempfiles.patch
 
-
+	# Starting and hopefully ending with 5.8.7 we observe stack 
+	# corruption with the regexp handling in perls DynaLoader code 
+	# with ssp enabled. This become fatal during compile time so we 
+	# temporally disable ssp on two regexp files till upstream has a 
+	# chance to work it out. Bug #97452
+	use userland_Darwin || epatch "${FILESDIR}"/${P}-regexp-nossp.patch
 }
 
 src_configure() {
@@ -128,12 +134,18 @@ src_configure() {
 	use elibc_uclibc || replace-flags "-Os" "-O2"
 	# This flag makes compiling crash in interesting ways
 	filter-flags -malign-double
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
 
 	export LC_ALL="C"
 	local myconf=""
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
 		osname="freebsd"
+	elif [[ ${KERNEL} == "NetBSD" ]]; then
+		osname="netbsd"
+	elif [[ ${USERLAND} == "Darwin" ]]; then
+		osname="darwin"
 	else
 		# Default setting
 		osname="linux"
@@ -208,6 +220,11 @@ src_configure() {
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
 
+	if [[ $(get_libdir) != "lib" ]] ; then
+		myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) \
+		/usr/$(get_libdir)'"
+	fi
+
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcccdlflags='-fPIC' \
@@ -257,8 +274,8 @@ src_install() {
 	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
 	dodir ${coredir}
 	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
 
 	# Fix for "stupid" modules and programs
 	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
@@ -386,6 +403,31 @@ src_remove_extra_files()
 	${prV}/DirHandle.pm
 	${prV}/Exporter/Heavy.pm
 	${prV}/Exporter.pm
+	${prV}/ExtUtils/Command.pm
+	${prV}/ExtUtils/Constant.pm
+	${prV}/ExtUtils/Embed.pm
+	${prV}/ExtUtils/Installed.pm
+	${prV}/ExtUtils/Install.pm
+	${prV}/ExtUtils/Liblist.pm
+	${prV}/ExtUtils/MakeMaker.pm
+	${prV}/ExtUtils/Manifest.pm
+	${prV}/ExtUtils/Mkbootstrap.pm
+	${prV}/ExtUtils/Mksymlists.pm
+	${prV}/ExtUtils/MM_Any.pm
+	${prV}/ExtUtils/MM_MacOS.pm
+	${prV}/ExtUtils/MM.pm
+	${prV}/ExtUtils/MM_Unix.pm
+	${prV}/ExtUtils/MY.pm
+	${prV}/ExtUtils/Packlist.pm
+	${prV}/ExtUtils/testlib.pm
+	${prV}/ExtUtils/Miniperl.pm
+	${prV}/ExtUtils/Command/MM.pm
+	${prV}/ExtUtils/Constant/Base.pm
+	${prV}/ExtUtils/Constant/Utils.pm
+	${prV}/ExtUtils/Constant/XS.pm
+	${prV}/ExtUtils/Liblist/Kid.pm
+	${prV}/ExtUtils/MakeMaker/bytes.pm
+	${prV}/ExtUtils/MakeMaker/vmsish.pm
 	${prV}/fields.pm
 	${prV}/File/Basename.pm
 	${prV}/File/Compare.pm
@@ -399,32 +441,32 @@ src_remove_extra_files()
 	${prV}/filetest.pm
 	${prVA}/attrs.pm
 	${prVA}/auto/attrs
-	${prVA}/auto/Cwd/Cwd.so
-	${prVA}/auto/Data/Dumper/Dumper.so
+	${prVA}/auto/Cwd/Cwd.$(get_libname)
+	${prVA}/auto/Data/Dumper/Dumper.$(get_libname)
 	${prVA}/auto/DynaLoader/dl_findfile.al
-	${prVA}/auto/Fcntl/Fcntl.so
-	${prVA}/auto/File/Glob/Glob.so
-	${prVA}/auto/IO/IO.so
+	${prVA}/auto/Fcntl/Fcntl.$(get_libname)
+	${prVA}/auto/File/Glob/Glob.$(get_libname)
+	${prVA}/auto/IO/IO.$(get_libname)
 	${prVA}/auto/POSIX/autosplit.ix
 	${prVA}/auto/POSIX/fstat.al
 	${prVA}/auto/POSIX/load_imports.al
 	${prVA}/auto/POSIX/POSIX.bs
-	${prVA}/auto/POSIX/POSIX.so
+	${prVA}/auto/POSIX/POSIX.$(get_libname)
 	${prVA}/auto/POSIX/stat.al
 	${prVA}/auto/POSIX/tmpfile.al
-	${prVA}/auto/re/re.so
-	${prVA}/auto/Socket/Socket.so
+	${prVA}/auto/re/re.$(get_libname)
+	${prVA}/auto/Socket/Socket.$(get_libname)
 	${prVA}/auto/Storable/autosplit.ix
 	${prVA}/auto/Storable/_retrieve.al
 	${prVA}/auto/Storable/retrieve.al
-	${prVA}/auto/Storable/Storable.so
+	${prVA}/auto/Storable/Storable.$(get_libname)
 	${prVA}/auto/Storable/_store.al
 	${prVA}/auto/Storable/store.al
 	${prVA}/B/Deparse.pm
 	${prVA}/B.pm
 	${prVA}/Config.pm
 	${prVA}/Config_heavy.pl
-	${prVA}/CORE/libperl.so
+	${prVA}/CORE/libperl$(get_libname)
 	${prVA}/Cwd.pm
 	${prVA}/Data/Dumper.pm
 	${prVA}/DynaLoader.pm
@@ -499,6 +541,15 @@ src_remove_extra_files()
 	${prV}/warnings.pm
 	${prV}/warnings/register.pm"
 
+	# Catch the headers in CORE
+	if use minimal ; then
+		for header in `find ${D}${prVA} -name "*.h"|sed -e "s:${D}::g"`; do
+			#header=`echo $head|sed -e "s:${D}::g"`
+			MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
+			$header"
+		done
+	fi
+
 	if use perlsuid ; then
 		MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
 		${bindir}/suidperl
@@ -508,6 +559,8 @@ src_remove_extra_files()
 	pushd ${D} > /dev/null
 	# Remove cruft
 	einfo "Removing files that are not in the minimal install"
+	echo "${MINIMAL_PERL_INSTALL}"
+	sleep 120
 	for f in $(find . -type f); do
 		has ${f} ${MINIMAL_PERL_INSTALL} || rm -f ${f}
 	done
@@ -518,12 +571,12 @@ src_remove_extra_files()
 
 pkg_postinst() {
 	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
+	if [ -f "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ]
 	then
-		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
+		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
 	fi
 
-	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl.so | sed -e 's:^.*/::'`"
+	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`"
 
 	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
 	# point to the version of perl we are running, else builing something
@@ -531,12 +584,12 @@ pkg_postinst() {
 	if [ "${perllib}" != "${LIBPERL}" ]
 	then
 		# Delete stale symlinks
-		rm -f ${ROOT}usr/$(get_libdir)/libperl.so
-		rm -f ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
+		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
+		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
 		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
+		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl$(get_libname).${PERLSLOT}
 		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
+		ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
 	fi
 
 	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }')
@@ -570,7 +623,7 @@ pkg_postinst() {
 	# Tried doing this via  -z, but $INC is too big...
 	if [ "${INC}x" != "x" ]; then
 		cleaner_msg
-		epause 10
+		epause 5
 	fi
 }
 
@@ -580,7 +633,7 @@ cleaner_msg() {
 	eerror "assist with this transition. This script is capable"
 	eerror "of cleaning out old .ph files, rebuilding modules for "
 	eerror "your new version of perl, as well as re-emerging"
-	eerror "applications that compiled against your old libperl.so"
+	eerror "applications that compiled against your old libperl$(get_libname)"
 	eerror
 	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
 	eerror "Part of the rebuilding of applications compiled against "
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 0414397e4194..bfdb428722c2 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,13 +1,231 @@
 # ChangeLog for dev-lang/php
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
-
-*php-4.1.1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> php-4.4.1-r2.ebuild,
+  php-5.0.5-r4.ebuild:
+  Added ~ppc64 keywords; bug #102649
+
+  10 Nov 2005; Jason Wever <weeve@gentoo.org> php-4.4.1-r2.ebuild:
+  Added ~sparc keyword as all arches but ~x86 were dropped from the 4.4.1
+  ebuilds.
+
+*php-5.0.5-r4 (04 Nov 2005)
+*php-5.0.4-r4 (04 Nov 2005)
+*php-4.4.1-r2 (04 Nov 2005)
+*php-4.4.0-r4 (04 Nov 2005)
+*php-4.3.11-r4 (04 Nov 2005)
+
+  04 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  files/4.3.11/php4.3.11-session_save_path-segf.patch,
+  files/5.0.4/php5.0.4-session_save_path-segf.patch,
+  files/4.4.0/php4.4.0-session_save_path-segf.patch,
+  files/5.0.5/php5.0.5-session_save_path-segf.patch, -php-4.3.11-r3.ebuild,
+  +php-4.3.11-r4.ebuild, -php-4.4.0-r3.ebuild, +php-4.4.0-r4.ebuild,
+  -php-4.4.1-r1.ebuild, +php-4.4.1-r2.ebuild, -php-5.0.4-r3.ebuild,
+  +php-5.0.4-r4.ebuild, -php-5.0.5-r3.ebuild, +php-5.0.5-r4.ebuild:
+  Revbump to fix a bug in the Apache2 SAPI and a bug with key() and current().
+
+  04 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  files/4.3.11/php4.3.11-globals_overwrite.patch,
+  files/4.4.0/php4.4.0-globals_overwrite.patch,
+  +files/4.4.1/php4.4.1-current_key_by_reference.patch,
+  files/5.0.4/php5.0.4-globals_overwrite.patch,
+  files/5.0.5/php5.0.5-globals_overwrite.patch, php-4.4.1-r1.ebuild:
+  Fix for http://bugs.php.net/bug.php?id=35067.
+
+*php-4.4.1-r1 (03 Nov 2005)
+
+  03 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  +files/4.4.1/php4.4.1-mod_rewrite-crash.patch, -php-4.4.1.ebuild,
+  +php-4.4.1-r1.ebuild:
+  Update Hardened-PHP to latest version for PHP 4.4.1 and 5.0.5, fix bug in
+  the Apache2 SAPI of PHP 4.4.1 (mentioned in bug #111032).
+
+*php-5.0.5-r3 (02 Nov 2005)
+*php-5.0.4-r3 (02 Nov 2005)
+*php-4.4.1 (02 Nov 2005)
+*php-4.4.0-r3 (02 Nov 2005)
+*php-4.3.11-r3 (02 Nov 2005)
+
+  02 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  +files/4.3.11/php4.3.11-curl_safemode.patch,
+  +files/4.3.11/php4.3.11-globals_overwrite.patch,
+  +files/4.3.11/php4.3.11-phpinfo_xss.patch,
+  +files/4.4.0/php4.4.0-curl_safemode.patch,
+  +files/4.4.0/php4.4.0-globals_overwrite.patch,
+  +files/4.4.0/php4.4.0-phpinfo_xss.patch,
+  +files/5.0.4/php5.0.4-curl_safemode.patch,
+  +files/5.0.4/php5.0.4-globals_overwrite.patch,
+  +files/5.0.4/php5.0.4-phpinfo_xss.patch,
+  +files/5.0.5/php5.0.5-curl_safemode.patch,
+  +files/5.0.5/php5.0.5-globals_overwrite.patch, -php-4.3.11-r2.ebuild,
+  +php-4.3.11-r3.ebuild, -php-4.4.0-r2.ebuild, +php-4.4.0-r3.ebuild,
+  +php-4.4.1.ebuild, -php-5.0.4-r2.ebuild, +php-5.0.4-r3.ebuild,
+  -php-5.0.5-r2.ebuild, +php-5.0.5-r3.ebuild:
+  Security-update: fix bugs #111032, #111015, #111011 and bug #111014. Also
+  add PHP 4.4.1 to the tree, wich fixes those vulnerabilities.
+
+*php-5.0.5-r2 (31 Oct 2005)
+*php-5.0.4-r2 (31 Oct 2005)
+*php-4.4.0-r2 (31 Oct 2005)
+*php-4.3.11-r2 (31 Oct 2005)
+
+  31 Oct 2005; Luca Longinotti <chtekk@gentoo.org>
+  -files/4.4.0/php4.3.11-pcre-security.patch,
+  +files/4.4.0/php4.4.0-fopen_wrappers.patch,
+  +files/4.4.0/php4.4.0-gd_safe_mode.patch,
+  files/4.4.0/php4.4.0-pcre-security.patch,
+  +files/4.4.0/php4.4.0-pspell-ext-segf.patch,
+  +files/4.4.0/php4.4.0-session_save_path-segf.patch,
+  -files/4.4.0/apache-1.3/70_mod_php.conf,
+  -files/4.4.0/apache-2.0/70_mod_php.conf,
+  +files/4-any/php4-fastbuild.patch, +files/4-any/php4-imap-symlink.diff,
+  +files/4-any/php4-iodbc-config.diff,
+  +files/5.0-any/php5-imap-symlink.diff,
+  +files/4-any/php4-libtool-1.5.patch,
+  +files/4-any/php4-uClibc-have_dn_skipname.patch,
+  +files/4-any/php4-with-iodbc.diff, +files/5.0-any/php5-iodbc-config.diff,
+  +files/4-any/apache-1.3/70_mod_php.conf,
+  +files/5.0-any/php5-libtool-1.5.patch,
+  +files/4-any/apache-2.0/70_mod_php.conf,
+  +files/4.3.11/php4.3.11-fopen_wrappers.patch,
+  +files/4.3.11/php4.3.11-gd_safe_mode.patch,
+  +files/4.3.11/php4.3.11-pcre-security.patch,
+  +files/4.3.11/php4.3.11-pspell-ext-segf.patch,
+  +files/4.3.11/php4.3.11-session_save_path-segf.patch,
+  -files/4.4.0/fastbuild.patch, -files/4.4.0/php4-imap-symlink.diff,
+  -files/4.4.0/php4-iodbc-config.diff, -files/4.4.0/php4-libtool-1.5.patch,
+  -files/4.4.0/php4-with-iodbc.diff, +files/5.0-any/php5-prefork.patch,
+  +files/5.0-any/php5-soap_persistence_session.diff,
+  +files/5.0-any/php5-with-iodbc.diff,
+  +files/5.0-any/apache-1.3/70_mod_php5.conf,
+  +files/5.0-any/apache-2.0/70_mod_php5.conf,
+  -files/5.0.0/php5-imap-symlink.diff, -files/5.0.0/php5-iodbc-config.diff,
+  -files/5.0.0/php5-libtool-1.5.patch,
+  -files/5.0.0/php5.0.4-pcre-security.patch,
+  -files/5.0.0/php5.0.4-xmlrcp-ccode.diff,
+  -files/5.0.0/php5.0.5-obj-serialize.patch,
+  +files/5.0.4/php5.0.4-fopen_wrappers.patch,
+  +files/5.0.4/php5.0.4-gd_safe_mode.patch,
+  +files/5.0.4/php5.0.4-pcre-security.patch,
+  +files/5.0.4/php5.0.4-pspell-ext-segf.patch,
+  +files/5.0.4/php5.0.4-session_save_path-segf.patch,
+  +files/5.0.4/php5.0.4-xmlrcp-ccode.diff,
+  +files/5.0.5/php5.0.5-fopen_wrappers.patch,
+  +files/5.0.5/php5.0.5-gd_safe_mode.patch,
+  +files/5.0.5/php5.0.5-obj-serialize.patch,
+  +files/5.0.5/php5.0.5-pspell-ext-segf.patch,
+  +files/5.0.5/php5.0.5-session_save_path-segf.patch,
+  +files/5.1-any/php5-fastbuild.patch,
+  +files/5.1-any/php5-imap-symlink.diff,
+  +files/5.1-any/php5-iodbc-config.diff, +files/5.1-any/php5-prefork.patch,
+  +files/5.1-any/php5-soap_persistence_session.diff,
+  +files/5.1-any/php5-with-iodbc.diff,
+  +files/5.1-any/apache-1.3/70_mod_php5.conf,
+  +files/5.1-any/apache-2.0/70_mod_php5.conf,
+  -files/5.1.0/php5-imap-symlink.diff, -files/5.1.0/php5-iodbc-config.diff,
+  -files/5.1.0/php5-prefork.patch, -files/5.1.0/php5-with-iodbc.diff,
+  -files/5.1.0/php5_soap_persistence_session.diff,
+  -files/5.1.0/apache-1.3/70_mod_php5.conf,
+  -files/5.1.0/apache-2.0/70_mod_php5.conf, -php-4.3.11-r1.ebuild,
+  +php-4.3.11-r2.ebuild, -php-4.4.0-r1.ebuild, +php-4.4.0-r2.ebuild,
+  -php-5.0.4-r1.ebuild, +php-5.0.4-r2.ebuild, -php-5.0.5-r1.ebuild,
+  +php-5.0.5-r2.ebuild:
+  New-style PHP update: fix quotation of some vars, change URI of a mirror,
+  change ordering of patches in the files/ directory, add 'mnogosearch' USE
+  flag, add 'oci8-instant-client' USE flag, add 'pic' USE flag, add 'cjk' USE
+  flag, delete 'png' and 'jpeg' USE flags now directly controlled by 'gd' USE
+  flag, change PHP extensions enabling/disabling system, fix a bug with
+  Apache1 + fastbuild, fix elibtoolize call (bug #106176) and fix bugs #99312,
+  #109669, #102943, #107602, #99225, #108834.
+
+  24 Sep 2005; Jason Wever <weeve@gentoo.org> php-5.0.5-r1.ebuild:
+  Added ~sparc keyword.
+
+*php-5.0.5-r1 (18 Sep 2005)
+*php-5.0.4-r1 (18 Sep 2005)
+*php-4.4.0-r1 (18 Sep 2005)
+*php-4.3.11-r1 (18 Sep 2005)
+
+  18 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/4.4.0/php4-libtool-1.5.patch, +files/5.0.0/php5-libtool-1.5.patch,
+  +files/4.4.0/php4.3.11-pcre-security.patch,
+  +files/4.4.0/php4.4.0-pcre-security.patch,
+  +files/5.0.0/php5.0.4-pcre-security.patch,
+  +files/5.0.0/php5.0.4-xmlrcp-ccode.diff,
+  +files/5.0.0/php5.0.5-obj-serialize.patch, files/4.4.0/fastbuild.patch,
+  -files/5.0.0/php5-hphp-acinclude.patch,
+  -files/4.4.0/php4-hphp-acinclude.patch, -php-4.3.11.ebuild,
+  +php-4.3.11-r1.ebuild, -php-4.4.0.ebuild, +php-4.4.0-r1.ebuild,
+  -php-5.0.4.ebuild, +php-5.0.4-r1.ebuild, -php-5.0.5.ebuild,
+  +php-5.0.5-r1.ebuild:
+  Fix security issue in bundled PCRE lib for PHP 4.3.11, 4.4.0 and 5.0.4, bug #102373.
+  Fix object serialization bug in PHP 5.0.5, bug #105374.
+  Fix Hardened-PHP support for all PHP releases.
+  Various compilation fixes for all PHP releases.
+  Various dependency fixes for all PHP releases.
+  Deleted 'dbm' USE flag from all PHP ebuilds, it's not supported upstream.
+  Changed 'java' USE flag to 'java-internal' USE flag for PHP4.
+
+  17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-5.0.4.ebuild:
+  Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug
+  102649.
+
+  17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-4.4.0.ebuild:
+  Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug
+  102649.
+
+  17 Sep 2005; Brian Harring <ferringb@gentoo.org> php-4.4.0.ebuild, 
+  php-5.0.4.ebuild:
+  Backed out ~amd64 keywording.  bad deps.
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org> php-4.4.0.ebuild,
+  php-5.0.4.ebuild:
+  added to ~amd64
+
+  14 Sep 2005; Joseph Jezak <josejx@gentoo.org> php-5.0.4.ebuild:
+  Marked ~ppc for bug #105673.
+
+  14 Sep 2005; Joseph Jezak <josejx@gentoo.org> php-4.4.0.ebuild,
+  php-5.0.5.ebuild:
+  Marked ~ppc for bug #105673.
+
+*php-4.3.11 (11 Sep 2005)
+
+  11 Sep 2005; Benedikt Boehm <hollow@gentoo.org> +php-4.3.11.ebuild:
+  add 4.3.11, b/c 4.4.0 breaks compatibility
+  remove some archs, get your deps tested!
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> php-4.4.0.ebuild,
+  php-5.0.4.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
+
+*php-4.4.0 (08 Sep 2005)
+
+  08 Sep 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/4.4.0/php4-hphp-acinclude.patch,
+  +files/5.0.0/php5-hphp-acinclude.patch, php-4.4.0.ebuild, php-5.0.4.ebuild,
+  php-5.0.5.ebuild:
+  Hardened-PHP fix from the overlay
+  Slight change to symlink creation behaviour
+
+  07 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> php-5.0.4.ebuild,
+  php-5.0.5.ebuild:
+  Added to ~amd64.
+
+*php-5.0.5 (06 Sep 2005)
+
+  06 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org> +php-5.0.5.ebuild:
+  Version bump.
+
+  04 Sep 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/5.1.0/php5-imap-symlink.diff, +files/5.1.0/php5-iodbc-config.diff,
+  +files/5.1.0/php5-prefork.patch, +files/5.1.0/php5-with-iodbc.diff,
+  +files/5.1.0/php5_soap_persistence_session.diff:
+  Added missing patch files for PHP 5.0 from the overlay
+
+  05 Sep 2005; <stuart@gentoo.org> ChangeLog:
+  Initial version; replaces older dev-php/* packages
+
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 03810b584878..8fb172ef7caa 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,16 +1,70 @@
-MD5 e2e6843a3a4b0a92d1da6344e947036e php-4.4.0.ebuild 7450
+MD5 5958d5164c4a83cb376229cb14625afd ChangeLog 9979
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 d04d34d0bfadd5fcdb99994b30045184 ChangeLog 213
-MD5 dca81da54de52aa9298d97c548333a57 php-5.0.4.ebuild 4381
-MD5 5bdec1212806fa8f4ccc046325e4ea52 files/digest-php-4.4.0 143
-MD5 11e54e6a5fade48c67bab392af4e33c7 files/digest-php-5.0.4 143
-MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0.0/php5-iodbc-config.diff 511
-MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0.0/php5-imap-symlink.diff 620
-MD5 22ed61ab0175cd83985a90e5d2b3b8b2 files/4.4.0/php4-iodbc-config.diff 511
-MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/4.4.0/php4-with-iodbc.diff 443
-MD5 6d2047e069da7178fc841c4c7c890aa8 files/4.4.0/php4-imap-symlink.diff 620
-MD5 030fb5433c0418ee3034d5b502d32548 files/4.4.0/fastbuild.patch 9004
-MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1.0/apache-1.3/70_mod_php5.conf 524
-MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.1.0/apache-2.0/70_mod_php5.conf 525
-MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0/apache-1.3/70_mod_php.conf 484
-MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0/apache-2.0/70_mod_php.conf 485
+MD5 d91f03d735ce3315ac924254366a50eb php-4.4.0-r4.ebuild 9248
+MD5 fe281704cc5eb201db34b54dbe93fdb3 php-5.0.4-r4.ebuild 6306
+MD5 5a76562566a83af1d2b55b694332e76b php-5.0.5-r4.ebuild 5675
+MD5 43085c36a004de6fb6fb04a1bd8ac703 php-4.3.11-r4.ebuild 9253
+MD5 786fee54e428d0cd2548f2969fa858fb php-4.4.1-r2.ebuild 8030
+MD5 96fdb35fc6f5b775c569db88d89200d7 files/digest-php-5.0.5-r4 143
+MD5 c9e2d252f3ae26871c06d35ebfe6fb1e files/digest-php-4.4.0-r4 221
+MD5 5f8f18e68edb61b60cfa21a4ff65170b files/digest-php-4.3.11-r4 223
+MD5 c273cf40d79922fb1d77d7bd352d1bb9 files/digest-php-4.4.1-r2 143
+MD5 71facfede997494a03e635bc07a14a2f files/digest-php-5.0.4-r4 220
+MD5 0429f8334ba4bab659a2e41ce5debc80 files/4.4.0/php4.4.0-curl_safemode.patch 1937
+MD5 cb36a386184ed6a887f62d2205f57173 files/4.4.0/php4.4.0-fopen_wrappers.patch 1481
+MD5 a540c54ba22dc16b157edcf1ecb6258f files/4.4.0/php4.4.0-gd_safe_mode.patch 883
+MD5 57644300fb52ad610fa52ae8ba6b522b files/4.4.0/php4.4.0-phpinfo_xss.patch 1284
+MD5 5f1f48c87cafe0949e73ef064c99e5ed files/4.4.0/php4.4.0-pcre-security.patch 1741
+MD5 7c45198e6118d82c680e9ed56e7d1df0 files/4.4.0/php4.4.0-globals_overwrite.patch 9731
+MD5 48d9c939434e9b01d0696410d59c503c files/4.4.0/php4.4.0-pspell-ext-segf.patch 8482
+MD5 3d3986815e0e06adce512b36959e6f26 files/4.4.0/php4.4.0-session_save_path-segf.patch 4155
+MD5 f0acca9c6387b8ca139d2849665bd16f files/4-any/php4-fastbuild.patch 9012
+MD5 6d2047e069da7178fc841c4c7c890aa8 files/4-any/php4-imap-symlink.diff 620
+MD5 22ed61ab0175cd83985a90e5d2b3b8b2 files/4-any/php4-iodbc-config.diff 511
+MD5 a7036ee38aa3b37256c0a6fe2afdbbe2 files/4-any/php4-libtool-1.5.patch 613
+MD5 d3a9c21b313d418005ad021cc194d0aa files/4-any/php4-uClibc-have_dn_skipname.patch 968
+MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/4-any/php4-with-iodbc.diff 443
+MD5 e2dde7269b4d3315f2030622f016478c files/4.4.1/php4.4.1-current_key_by_reference.patch 864
+MD5 7a68ebae340c5eb9fdb97fa8e2e3870f files/4.4.1/php4.4.1-mod_rewrite-crash.patch 940
+MD5 09637e8f6f861b1f3698ec0390ec6b57 files/4.3.11/php4.3.11-curl_safemode.patch 5129
+MD5 cb36a386184ed6a887f62d2205f57173 files/4.3.11/php4.3.11-fopen_wrappers.patch 1481
+MD5 4db8e0b66cde22dd4e4d9f51e59f6098 files/4.3.11/php4.3.11-gd_safe_mode.patch 1573
+MD5 89d12226b1726b681df274be79043411 files/4.3.11/php4.3.11-globals_overwrite.patch 18011
+MD5 3f80d0c6c58fd4ea02b7efdf69265721 files/4.3.11/php4.3.11-pcre-security.patch 1667
+MD5 43b4113d1fb159955b0d5ed307cac143 files/4.3.11/php4.3.11-phpinfo_xss.patch 2518
+MD5 48d9c939434e9b01d0696410d59c503c files/4.3.11/php4.3.11-pspell-ext-segf.patch 8482
+MD5 2646498369dc5c64c318ee6da2f9487a files/4.3.11/php4.3.11-session_save_path-segf.patch 4961
+MD5 7d198bde60f94cc8cea5ad9479901e21 files/5.0-any/php5-imap-symlink.diff 620
+MD5 110af7b300bcbbfb821fbb58f7923d8b files/5.0-any/php5-iodbc-config.diff 511
+MD5 7530065b6851a15b1c9d8b0ee5fb0a98 files/5.0-any/php5-libtool-1.5.patch 613
+MD5 058042718bc876bf27ab902673919ca9 files/5.0-any/php5-prefork.patch 850
+MD5 273799e60d5a41a1e6f5ac53781a152f files/5.0-any/php5-soap_persistence_session.diff 1976
+MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.0-any/php5-with-iodbc.diff 443
+MD5 9a0a0587350d748d5fbbb3d34da7d488 files/5.0.4/php5.0.4-curl_safemode.patch 5262
+MD5 2eddbf70a0b940789a0e68f029beb2b3 files/5.0.4/php5.0.4-fopen_wrappers.patch 1554
+MD5 89b001b449fdd567ffba6aaf2a3e804f files/5.0.4/php5.0.4-gd_safe_mode.patch 1216
+MD5 c5e906110383e3e5157ead566c2f5797 files/5.0.4/php5.0.4-globals_overwrite.patch 32308
+MD5 03a57319b93ee44a2fe159a0fb67592e files/5.0.4/php5.0.4-pcre-security.patch 1659
+MD5 2c557f6641927cbf40e25abf71e46a1b files/5.0.4/php5.0.4-phpinfo_xss.patch 2476
+MD5 ab931f65aefab4da99c6353b2c503d70 files/5.0.4/php5.0.4-pspell-ext-segf.patch 9422
+MD5 ff34a187af5e68cd7dad49086ed8f61d files/5.0.4/php5.0.4-session_save_path-segf.patch 5150
+MD5 e157161249ad2b217dc532f5289ba74b files/5.0.4/php5.0.4-xmlrcp-ccode.diff 750
+MD5 3a3e34b20c95ab90b8a9ceeb787462bd files/5.0.5/php5.0.5-curl_safemode.patch 2061
+MD5 9e31c5edb0ded1d57ed90859d3ef168c files/5.0.5/php5.0.5-fopen_wrappers.patch 942
+MD5 8f52c6df24afb096109118582c1bf3eb files/5.0.5/php5.0.5-gd_safe_mode.patch 875
+MD5 54462370e3ddc7b0a1f46509ad43120c files/5.0.5/php5.0.5-globals_overwrite.patch 6287
+MD5 b95f630e058c1b0f9cc47e186ef182cf files/5.0.5/php5.0.5-obj-serialize.patch 1364
+MD5 ab931f65aefab4da99c6353b2c503d70 files/5.0.5/php5.0.5-pspell-ext-segf.patch 9422
+MD5 ac8d4fef43dc890da990cf901009c70d files/5.0.5/php5.0.5-session_save_path-segf.patch 4113
+MD5 8392d102bb64d0e136d7b74302f51752 files/5.1-any/php5-fastbuild.patch 9580
+MD5 2aca8867fada1d3345859f201ce7e428 files/5.1-any/php5-imap-symlink.diff 652
+MD5 63c7937867dd8cc04b5089c3678ef359 files/5.1-any/php5-iodbc-config.diff 519
+MD5 058042718bc876bf27ab902673919ca9 files/5.1-any/php5-prefork.patch 850
+MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1-any/php5-soap_persistence_session.diff 1976
+MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1-any/php5-with-iodbc.diff 443
+MD5 389638f1d46b6c41cd4d87b471572f4b files/4-any/apache-1.3/70_mod_php.conf 484
+MD5 ee36e31632adb08b7abf70f78b5b2125 files/4-any/apache-2.0/70_mod_php.conf 485
+MD5 96ed6efe383833dbb880fef3b6c562bb files/5.0-any/apache-1.3/70_mod_php5.conf 524
+MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.0-any/apache-2.0/70_mod_php5.conf 525
+MD5 96ed6efe383833dbb880fef3b6c562bb files/5.1-any/apache-1.3/70_mod_php5.conf 524
+MD5 21bc6cc85150b5a5385f213d45efbe67 files/5.1-any/apache-2.0/70_mod_php5.conf 525
diff --git a/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch b/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch
index 3a86dfbb59b3..e19a720661a6 100644
--- a/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch
+++ b/dev-lang/php/files/4-any/php4-uClibc-have_dn_skipname.patch
@@ -1,3 +1,6 @@
+Backport from php-5 which will only use the dn_skipname function if the host 
+system supports it (uClibc for example does not).
+
 --- ext/standard/dns.c
 +++ ext/standard/dns.c
 @@ -275,6 +275,7 @@ PHP_FUNCTION(checkdnsrr)
diff --git a/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch b/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch
index d3eb55c5ee3e..fea8c7a1ec50 100644
--- a/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch
+++ b/dev-lang/php/files/4.3.11/php4.3.11-globals_overwrite.patch
@@ -249,17 +249,6 @@
  
  #if HAVE_ARPA_INET_H
  # include <arpa/inet.h>
-@@ -813,8 +802,8 @@
- 	PHP_FE(prev,					first_arg_force_ref)
- 	PHP_FE(next,					first_arg_force_ref)
- 	PHP_FE(reset,					first_arg_force_ref)
--	PHP_FE(current,					first_arg_force_ref)
--	PHP_FE(key,						first_arg_force_ref)
-+	PHP_FE(current,					NULL)
-+	PHP_FE(key,					NULL)
- 	PHP_FE(min,																NULL)
- 	PHP_FE(max,																NULL)
- 	PHP_FE(in_array,														NULL)
 @@ -944,6 +933,13 @@
  static void php_putenv_destructor(putenv_entry *pe)
  {
diff --git a/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch b/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch
index 3836776b14b4..65886a2488e6 100644
--- a/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch
+++ b/dev-lang/php/files/4.3.11/php4.3.11-session_save_path-segf.patch
@@ -138,7 +138,7 @@
 +		if (!parent_req) {
 +			parent_req = ctx->r;
 +		}
-+		if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++		if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +			if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +				zend_bailout();
 +			}
diff --git a/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch b/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch
index 3aefaee16295..3b13cd71966c 100644
--- a/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch
+++ b/dev-lang/php/files/4.4.0/php4.4.0-globals_overwrite.patch
@@ -192,17 +192,6 @@
  
  #if HAVE_ARPA_INET_H
  # include <arpa/inet.h>
-@@ -813,8 +802,8 @@
- 	PHP_FE(prev,					first_arg_force_ref)
- 	PHP_FE(next,					first_arg_force_ref)
- 	PHP_FE(reset,					first_arg_force_ref)
--	PHP_FE(current,					first_arg_force_ref)
--	PHP_FE(key,						first_arg_force_ref)
-+	PHP_FE(current,					NULL)
-+	PHP_FE(key,					NULL)
- 	PHP_FE(min,																NULL)
- 	PHP_FE(max,																NULL)
- 	PHP_FE(in_array,														NULL)
 @@ -3038,11 +3027,25 @@
  	prefix = va_arg(args, char *);
  	prefix_len = va_arg(args, uint);
diff --git a/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch b/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch
index cf257def502a..978c582a6a79 100644
--- a/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch
+++ b/dev-lang/php/files/4.4.0/php4.4.0-pcre-security.patch
@@ -1,23 +1,5 @@
---- configure.in	2005-09-17 17:44:30.000000000 +0200
-+++ configure.in	2005-09-17 17:45:01.000000000 +0200
-@@ -41,7 +41,7 @@
- MAJOR_VERSION=4
- MINOR_VERSION=4
- RELEASE_VERSION=0
--EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
- VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
- 
- dnl Define where extension directories are located in the configure context
 --- ext/pcre/config.m4	2005/05/31 12:22:27	1.29.2.7
 +++ ext/pcre/config.m4	2005/08/09 17:41:56	1.29.2.7.2.1
-@@ -1,5 +1,5 @@
- dnl
--dnl $Id: config.m4,v 1.29.2.7 2005/05/31 12:22:27 sniper Exp $
-+dnl $Id: config.m4,v 1.29.2.7.2.1 2005/08/09 17:41:56 andrei Exp $
- dnl
-
- dnl By default we'll compile and link against the bundled PCRE library
 @@ -13,7 +13,7 @@ PHP_ARG_WITH(pcre-regex,for PCRE support
 
  if test "$PHP_PCRE_REGEX" != "no"; then
diff --git a/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch b/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch
index 8f936ae5ec39..2c712b0da2d6 100644
--- a/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch
+++ b/dev-lang/php/files/4.4.0/php4.4.0-session_save_path-segf.patch
@@ -111,7 +111,7 @@
 +		if (!parent_req) {
 +			parent_req = ctx->r;
 +		}
-+		if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++		if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +			if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +				zend_bailout();
 +			}
diff --git a/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch b/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch
index 02a9a83eff0c..426273bb7575 100644
--- a/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch
+++ b/dev-lang/php/files/5.0.4/php5.0.4-globals_overwrite.patch
@@ -553,17 +553,6 @@
  
  	PHP_FE(ini_get,															NULL)
  	PHP_FE(ini_get_all,														NULL)
-@@ -743,8 +743,8 @@
- 	PHP_FE(prev,					first_arg_force_ref)
- 	PHP_FE(next,					first_arg_force_ref)
- 	PHP_FE(reset,					first_arg_force_ref)
--	PHP_FE(current,					first_arg_force_ref)
--	PHP_FE(key,						first_arg_force_ref)
-+	PHP_FE(current,					NULL)
-+	PHP_FE(key,					NULL)
- 	PHP_FE(min,																NULL)
- 	PHP_FE(max,																NULL)
- 	PHP_FE(in_array,														NULL)
 @@ -930,7 +930,6 @@
  	BG(user_tick_functions) = NULL;
  	BG(user_filter_map) = NULL;
diff --git a/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch b/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch
index f984d73b0d64..15c4a870c8ec 100644
--- a/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch
+++ b/dev-lang/php/files/5.0.4/php5.0.4-session_save_path-segf.patch
@@ -148,7 +148,7 @@
 +		if (!parent_req) {
 +			parent_req = ctx->r;
 +		}
-+		if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++		if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +			if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +				zend_bailout();
 +			}
diff --git a/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch b/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch
index cdae541d5eef..20cedc94c588 100644
--- a/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch
+++ b/dev-lang/php/files/5.0.5/php5.0.5-globals_overwrite.patch
@@ -92,17 +92,6 @@
  
  #include "php.h"
  #include "php_streams.h"
-@@ -742,8 +743,8 @@
- 	PHP_FE(prev,					first_arg_force_ref)
- 	PHP_FE(next,					first_arg_force_ref)
- 	PHP_FE(reset,					first_arg_force_ref)
--	PHP_FE(current,					first_arg_force_ref)
--	PHP_FE(key,						first_arg_force_ref)
-+	PHP_FE(current,					NULL)
-+	PHP_FE(key,					NULL)
- 	PHP_FE(min,																NULL)
- 	PHP_FE(max,																NULL)
- 	PHP_FE(in_array,														NULL)
 @@ -3076,11 +3077,25 @@
  	prefix = va_arg(args, char *);
  	prefix_len = va_arg(args, uint);
diff --git a/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch b/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch
index aee032ff5603..8e0a45f56251 100644
--- a/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch
+++ b/dev-lang/php/files/5.0.5/php5.0.5-session_save_path-segf.patch
@@ -112,7 +112,7 @@
 +		if (!parent_req) {
 +			parent_req = ctx->r;
 +		}
-+		if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
++		if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
 +			if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
 +				zend_bailout();
 +			}
diff --git a/dev-lang/php/php-4.3.11-r4.ebuild b/dev-lang/php/php-4.3.11-r4.ebuild
index 582a683da162..8ef8bb67fbbb 100644
--- a/dev-lang/php/php-4.3.11-r4.ebuild
+++ b/dev-lang/php/php-4.3.11-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r4.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~arm ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~arm ~ia64 ~s390 ~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
diff --git a/dev-lang/php/php-4.4.0-r4.ebuild b/dev-lang/php/php-4.4.0-r4.ebuild
index e722c10b6086..1c522932f801 100644
--- a/dev-lang/php/php-4.4.0-r4.ebuild
+++ b/dev-lang/php/php-4.4.0-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.0-r4.ebuild,v 1.1.1.1 2005/11/30 09:58:25 chriswhite Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
diff --git a/dev-lang/php/php-4.4.1-r2.ebuild b/dev-lang/php/php-4.4.1-r2.ebuild
index f78062f0d8d3..6624fa1f486c 100644
--- a/dev-lang/php/php-4.4.1-r2.ebuild
+++ b/dev-lang/php/php-4.4.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r2.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:25 chriswhite Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~arm ~ia64 ~ppc64 ~s390 ~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
diff --git a/dev-lang/php/php-5.0.4-r4.ebuild b/dev-lang/php/php-5.0.4-r4.ebuild
index 561af6fd6454..d626747df08f 100644
--- a/dev-lang/php/php-5.0.4-r4.ebuild
+++ b/dev-lang/php/php-5.0.4-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.4-r4.ebuild,v 1.1.1.1 2005/11/30 09:58:25 chriswhite Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
diff --git a/dev-lang/php/php-5.0.5-r4.ebuild b/dev-lang/php/php-5.0.5-r4.ebuild
index 9da79263c44d..9aab32fd9242 100644
--- a/dev-lang/php/php-5.0.5-r4.ebuild
+++ b/dev-lang/php/php-5.0.5-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r4.ebuild,v 1.1 2005/11/04 12:45:21 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r4.ebuild,v 1.1.1.1 2005/11/30 09:58:25 chriswhite Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 # NOTE: Portage doesn't support setting PROVIDE based on the USE flags
 #		that have been enabled, so we have to PROVIDE everything for now
diff --git a/dev-lang/pike/ChangeLog b/dev-lang/pike/ChangeLog
index d2c42e9deaa8..6e28b48d83b6 100644
--- a/dev-lang/pike/ChangeLog
+++ b/dev-lang/pike/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for dev-lang/pike
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.1 2003/08/30 21:49:31 scandium Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/ChangeLog,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
+
+  22 Apr 2005; Simon Stelling <blubb@gentoo.org> pike-7.6.24.ebuild:
+  stable on amd64
+
+*pike-7.6.24 (29 Sep 2004)
+
+  29 Sep 2004; Rainer Groesslinger <scandium@gentoo.org> +pike-7.6.24.ebuild:
+  new version, ebuild rewritten with some USE flag changes etc.
+
+  16 Aug 2004; Tom Martin <slarti@gentoo.org> pike-7.6.6.ebuild:
+  Marked ~amd64; resolves bug 57621.
+
+  31 Jul 2004; Rainer Groesslinger <scandium@gentoo.org> pike-7.6.6.ebuild:
+  stable on x86 and ppc
+
+*pike-7.6.6 (20 Jun 2004)
+
+  20 Jun 2004; Rainer Groesslinger <scandium@gentoo.org> pike-7.6.6.ebuild:
+  new version, some minor fixes/changes
+
+  27 Mar 2004; Rainer Groesslinger <scandium@gentoo.org> pike-7.4.44.ebuild:
+  marked stable on x86 and ppc
+
+*pike-7.4.44 (05 Mar 2004)
+
+  05 Mar 2004; Rainer Groesslinger <scandium@gentoo.org> pike-7.4.44.ebuild:
+  new version
+  gtk+ support enabled again, no need to filter -fomit-frame-pointer anymore
+
+*pike-7.4.28-r2 (22 Dec 2003)
+
+  22 Dec 2003; Rainer Groesslinger <scandium@gentoo.org>
+  pike-7.4.28-r2.ebuild:
+  fix module decode problems (bug #32973)
+
+  01 Dec 2003; Rainer Groesslinger <scandium@gentoo.org> pike-7.4.20.ebuild,
+  pike-7.4.28-r1.ebuild, pike-7.4.28.ebuild:
+  fixed head/tail syntax, see bug #32973
+
+  08 Nov 2003; Rainer Groesslinger <scandium@gentoo.org>
+  pike-7.4.28-r1.ebuild:
+  disabled Gtk+ support, it just caused too many problems
+
+*pike-7.4.28-r1 (27 Oct 2003)
+
+  27 Oct 2003; Rainer Groesslinger <scandium@gentoo.org>
+  pike-7.4.28-r1.ebuild:
+  new revision with many use flag and configure additions
+  thanks to Fredrik Mellstrom <traal@etek.chalmers.se> for providing
+  the patches which were added with some minor changes
+
+*pike-7.4.28 (20 Sep 2003)
+
+  20 Sep 2003; Rainer Groesslinger <scandium@gentoo.org> pike-7.4.28.ebuild:
+  new version
 
 *pike-7.4.20 (30 Aug 2003)
 
diff --git a/dev-lang/pike/Manifest b/dev-lang/pike/Manifest
index e69de29bb2d1..d701b8e28cf7 100644
--- a/dev-lang/pike/Manifest
+++ b/dev-lang/pike/Manifest
@@ -0,0 +1,8 @@
+MD5 abf1c0232f034421861b24452c55ef50 ChangeLog 2189
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 95fb94dc92150b25742577fea7739841 pike-7.4.44.ebuild 3106
+MD5 4f14bd2f176a16c1766dea09ebe41d67 pike-7.6.24.ebuild 2105
+MD5 e14578a411eb60b4203ee5aa245f3b5c pike-7.6.6.ebuild 2980
+MD5 21491ad9114fad5fb2856b4c836ac000 files/digest-pike-7.4.44 65
+MD5 24797deb43287becc1e22d716d43921e files/digest-pike-7.6.24 66
+MD5 f481d65b2c48dd5213c96abb5d591923 files/digest-pike-7.6.6 64
diff --git a/dev-lang/pike/metadata.xml b/dev-lang/pike/metadata.xml
index b15afdb30c24..20ce219711a2 100644
--- a/dev-lang/pike/metadata.xml
+++ b/dev-lang/pike/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>scandium@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/pike/pike-7.4.44.ebuild b/dev-lang/pike/pike-7.4.44.ebuild
index e76e453d3b73..183bf007e457 100644
--- a/dev-lang/pike/pike-7.4.44.ebuild
+++ b/dev-lang/pike/pike-7.4.44.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc., Emil Skoldberg, Fredrik Mellstrom (see ChangeLog)
+# Copyright 1999-2004 Gentoo Foundation, Emil Skoldberg, Fredrik Mellstrom (see ChangeLog)
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.4.44.ebuild,v 1.1 2004/03/05 18:34:37 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.4.44.ebuild,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
 inherit fixheadtails
 
@@ -9,11 +9,11 @@ IUSE="debug doc gdbm gif gtk java jpeg mysql oci8 odbc opengl pdflib postgres sc
 S="${WORKDIR}/Pike-v${PV}"
 HOMEPAGE="http://pike.ida.liu.se/"
 DESCRIPTION="Pike programming language and runtime"
-SRC_URI="ftp://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
+SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="dev-libs/gmp
 	zlib?	( sys-libs/zlib )
@@ -30,10 +30,7 @@ DEPEND="dev-libs/gmp
 	opengl?	( virtual/opengl
 		virtual/glut )
 	sdl?	( media-libs/libsdl )
-	gtk?	( =x11-libs/gtk+-1.2* )
-	sys-devel/gcc
-	sys-devel/make
-	sys-apps/sed"
+	gtk?	( =x11-libs/gtk+-1.2* )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-lang/pike/pike-7.6.24.ebuild b/dev-lang/pike/pike-7.6.24.ebuild
index 749116d83d60..83189d0812f8 100644
--- a/dev-lang/pike/pike-7.6.24.ebuild
+++ b/dev-lang/pike/pike-7.6.24.ebuild
@@ -1,24 +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/dev-lang/pike/pike-7.6.24.ebuild,v 1.1 2004/09/29 17:25:09 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.24.ebuild,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 
-IUSE="crypt debug doc fftw gdbm gif gtk gtk2 jpeg kerberos opengl pdflib scanner svg tiff truetype zlib"
+IUSE="crypt debug doc fftw gdbm gif gtk jpeg kerberos opengl pdflib scanner svg tiff truetype zlib"
 
 S="${WORKDIR}/Pike-v${PV}"
 HOMEPAGE="http://pike.ida.liu.se/"
 DESCRIPTION="Pike programming language and runtime"
-SRC_URI="ftp://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
+SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 
 DEPEND="crypt?	( dev-libs/nettle )
-	fftw?	( dev-libs/fftw )
+	fftw?	( sci-libs/fftw )
 	gdbm?	( sys-libs/gdbm )
 	gif?	( media-libs/giflib )
 	gtk?	( =x11-libs/gtk+-1.2* )
-	gtk2?	( >=x11-libs/gtk+-2.2 )
 	jpeg?	( media-libs/jpeg )
 	kerberos? ( virtual/krb5 )
 	opengl? ( virtual/opengl
@@ -40,7 +39,6 @@ src_compile() {
 			`use_with gdbm` \
 			`use_with gif` \
 			`use_with gtk GTK` \
-			`use_with gtk2 GTK2` \
 			`use_with jpeg jpeglib` \
 			`use_with kerberos krb5` \
 			`use_with opengl GL` \
diff --git a/dev-lang/pike/pike-7.6.6.ebuild b/dev-lang/pike/pike-7.6.6.ebuild
index 7e2054183177..2b224d4eb95e 100644
--- a/dev-lang/pike/pike-7.6.6.ebuild
+++ b/dev-lang/pike/pike-7.6.6.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.6.ebuild,v 1.1 2004/06/20 17:50:22 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pike/pike-7.6.6.ebuild,v 1.1.1.1 2005/11/30 09:58:38 chriswhite Exp $
 # Contributions by Emil Skoldberg, Fredrik Mellstrom (see ChangeLog)
 
 inherit fixheadtails
 
-IUSE="debug doc fftw gdbm gif gtk java jpeg mysql oci8 odbc opengl pdflib postgres scanner sdl tiff truetype zlib"
+IUSE="crypt debug doc fftw gdbm gif gtk java jpeg mysql oci8 odbc opengl pdflib postgres scanner sdl tiff truetype zlib"
 
 S="${WORKDIR}/Pike-v${PV}"
 HOMEPAGE="http://pike.ida.liu.se/"
 DESCRIPTION="Pike programming language and runtime"
-SRC_URI="ftp://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
+SRC_URI="http://pike.ida.liu.se/pub/pike/all/${PV}/Pike-v${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64"
 
 DEPEND="zlib?	( sys-libs/zlib )
 	pdflib? ( media-libs/pdflib )
@@ -31,11 +31,9 @@ DEPEND="zlib?	( sys-libs/zlib )
 		virtual/glut )
 	sdl?	( media-libs/libsdl )
 	gtk?	( =x11-libs/gtk+-1.2* )
-	fftw?	( dev-libs/fftw )
-	dev-libs/gmp
-	sys-devel/gcc
-	sys-devel/make
-	sys-apps/sed"
+	fftw?	( sci-libs/fftw )
+	crypt?	( dev-libs/nettle )
+	dev-libs/gmp"
 
 src_unpack() {
 	unpack ${A}
@@ -68,9 +66,9 @@ src_compile() {
 	use opengl	|| myconf="${myconf} --without-GL --without-GLUT"
 	use gtk		|| myconf="${myconf} --without-GTK"
 	use fftw	|| myconf="${myconf} --without-fftw"
+	use crypt	|| myconf="${myconf} --without-nettle"
 
-	# Using --without-nettle until the Nettle library is available in portage
-	emake CONFIGUREARGS="${myconf} --prefix=/usr --disable-make_conf --without-nettle" || die
+	emake CONFIGUREARGS="${myconf} --prefix=/usr --disable-make_conf" || die
 
 	if use doc; then
 		PATH="${S}/bin:${PATH}" make doc || die
@@ -83,12 +81,9 @@ src_install() {
 
 	if use doc; then
 		make INSTALLARGS="--traditional" buildroot="${D}" install || die
-	else
-		make INSTALLARGS="--traditional" buildroot="${D}" install_nodoc || die
-	fi
-
-	if use doc; then
 		einfo "Installing 60MB of docs, this could take some time ..."
 		dohtml -r ${S}/refdoc/traditional_manual ${S}/refdoc/modref
+	else
+		make INSTALLARGS="--traditional" buildroot="${D}" install_nodoc || die
 	fi
 }
diff --git a/dev-lang/pm3/ChangeLog b/dev-lang/pm3/ChangeLog
index 3ca30e6280e5..a64d30236284 100644
--- a/dev-lang/pm3/ChangeLog
+++ b/dev-lang/pm3/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for dev-lang/pm3
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pm3/ChangeLog,v 1.1 2002/12/17 00:10:04 vapier Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pm3/ChangeLog,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
+
+*pm3-1.1.15-r1 (15 Apr 2003)
+
+  15 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patch for errno issue (#16267) to fix #17744.
 
 *pm3-1.1.15 (16 Dec 2002)
 
+  10 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added gcc3 flag filters #15196 and trimmed down fluff.
+
   16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me with patch coming from Debian.
   Thanks deb for your work :)
diff --git a/dev-lang/pm3/Manifest b/dev-lang/pm3/Manifest
index e69de29bb2d1..c39f2328cb17 100644
--- a/dev-lang/pm3/Manifest
+++ b/dev-lang/pm3/Manifest
@@ -0,0 +1,7 @@
+MD5 85d5b38b40983f7158e4c609d7f9efd8 ChangeLog 628
+MD5 d6524b62eeb21c5fbc9afb8658a98ae5 pm3-1.1.15-r1.ebuild 1221
+MD5 b3d203c1ff19c1fca260623e9c1e672c metadata.xml 912
+MD5 398f75561de7468fe1f1d826120c7c74 files/1.1.15-errno.patch 7826
+MD5 2b5c7230df3f61ca4623eb820f92dd99 files/PACKAGES 3068
+MD5 5ef0330d3e20259de71344ca051263e6 files/digest-pm3-1.1.15-r1 145
+MD5 5d3301a568cf787a99ef2a31080ec88d files/pm3-1.1.15.patch 34055
diff --git a/dev-lang/pm3/files/digest-pm3-1.1.15-r1 b/dev-lang/pm3/files/digest-pm3-1.1.15-r1
index 9ff413bcbefd..36d160eaa16b 100644
--- a/dev-lang/pm3/files/digest-pm3-1.1.15-r1
+++ b/dev-lang/pm3/files/digest-pm3-1.1.15-r1
@@ -1,3 +1,2 @@
 MD5 f574c1a3b6966e250adfbcc4ae692ffb pm3-1.1.15-LINUXLIBC6-boot.tgz 1926070
 MD5 4d683e6156c24777cd571bd3e037c922 pm3-src-1.1.15.tar.bz2 18684711
-MD5 78ae95be0cf2893863f90677721a1376 pm3_1.1.15-1.diff.gz 10959
diff --git a/dev-lang/pm3/files/pm3-1.1.15.patch b/dev-lang/pm3/files/pm3-1.1.15.patch
index 357828d89516..f128810659f7 100644
--- a/dev-lang/pm3/files/pm3-1.1.15.patch
+++ b/dev-lang/pm3/files/pm3-1.1.15.patch
@@ -101,40 +101,6 @@
  
  if defined(UseOblets)
    include_dir("oblet")
---- pm3-1.1.15.orig/src/PACKAGES
-+++ pm3-1.1.15/src/PACKAGES
-@@ -147,8 +147,8 @@
- PkgInfo("coverage","language/modula3/m3tools","","coverage",tProg,"T",3,[],
-     ["ALL"],["POSIX"],"A line-based coverage analyzer/profiler")
- 
--PkgInfo("m3gdb","language/modula3/m3tools","","m3gdb",tProg,"T",3,[],["ALL"],
--    ["M3GDB"],"Modula-3 aware debugger based on gdb")
-+%PkgInfo("m3gdb","language/modula3/m3tools","","m3gdb",tProg,"T",3,[],["ALL"],
-+%    ["M3GDB"],"Modula-3 aware debugger based on gdb")
- 
- PkgInfo("pp","language/modula3/m3tools","","pp",tProg,"T",3,[],["ALL"],
-     ["POSIX"],"Modula-3 pretty-printer")
-@@ -460,14 +460,14 @@
- PkgInfo("webvbt","network/www","","webvbt",tLib,"T",3,[],["ALL"],[],
-     "A library for displaying HTML pages inside a VBT")
- 
--PkgInfo("webscape","network/www","","webscape",tProg,"T",3,[],["ALL"],[],
--    "A web browser with support for interactive content")
-+%PkgInfo("webscape","network/www","","webscape",tProg,"T",3,[],["ALL"],[],
-+%    "A web browser with support for interactive content")
- 
--PkgInfo("deckscape","network/www","","deckscape",tProg,"T",3,[],["ALL"],[],
--    "A web browser that uses a new metaphor: decks of web pages")
-+%PkgInfo("deckscape","network/www","","deckscape",tProg,"T",3,[],["ALL"],[],
-+%    "A web browser that uses a new metaphor: decks of web pages")
- 
--PkgInfo("webcard","network/www","","webcard",tProg,"T",3,[],["ALL"],
--    ["POSIX","ST_SPARE"],"An integrated mail/news/web client")
-+%PkgInfo("webcard","network/www","","webcard",tProg,"T",3,[],["ALL"],
-+%    ["POSIX","ST_SPARE"],"An integrated mail/news/web client")
- 
- PkgInfo("ocr","graphics/lecternpkg","","ocr",tLib,"T",3,[],["ALL"],[],
-     "Interface to optical character recognition library (DECstation only)")
 --- pm3-1.1.15.orig/debian/libpm3-static.dirs
 +++ pm3-1.1.15/debian/libpm3-static.dirs
 @@ -0,0 +1 @@
diff --git a/dev-lang/pm3/metadata.xml b/dev-lang/pm3/metadata.xml
index e8053ed82365..6b3b6473bd23 100644
--- a/dev-lang/pm3/metadata.xml
+++ b/dev-lang/pm3/metadata.xml
@@ -10,7 +10,7 @@
 designed and implemented at the Systems Research Center of Digital Equipment 
 Corporation, and later extended and improved by a large number of individuals and 
 organizations. In recent years, the most complete and actively worked-on 
-distribution of Modula-3 was maintained at the Ecole Polytechnique de Montr�al by 
+distribution of Modula-3 was maintained at the Ecole Polytechnique de Montreal by 
 Michel Dagenais. In March 2002 Michel Dagenais has announced that the WWW and CVS 
 services for PM3 will be terminated in August 2002. Till that time, releases of 
 and information concerning PM3 can still be found at m3.polymtl.ca/m3/. The PM3 
diff --git a/dev-lang/pm3/pm3-1.1.15-r1.ebuild b/dev-lang/pm3/pm3-1.1.15-r1.ebuild
index 58c128d245ed..f4510c19a378 100644
--- a/dev-lang/pm3/pm3-1.1.15-r1.ebuild
+++ b/dev-lang/pm3/pm3-1.1.15-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pm3/pm3-1.1.15-r1.ebuild,v 1.1 2003/04/15 13:27:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pm3/pm3-1.1.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:07 chriswhite Exp $
 
-inherit gcc eutils flag-o-matic
+inherit toolchain-funcs eutils flag-o-matic
 
 M3_TARGET="LINUXLIBC6"
 MY_P="${PN}-src-${PV}"
@@ -13,10 +13,12 @@ SRC_URI="ftp://www.elegosoft.com/pub/pm3/${P}-${M3_TARGET}-boot.tgz
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND="dev-util/byacc"
 RDEPEND=""
+PROVIDE="virtual/m3"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-lang/prc-tools/ChangeLog b/dev-lang/prc-tools/ChangeLog
index cff5ab7968e5..5a0575fa6291 100644
--- a/dev-lang/prc-tools/ChangeLog
+++ b/dev-lang/prc-tools/ChangeLog
@@ -1,10 +1,32 @@
-# ChangeLog for dev-cpp/prc-tools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/ChangeLog,v 1.1 2003/09/04 18:05:20 plasmaroo Exp $
+# ChangeLog for dev-lang/prc-tools
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
+
+  28 Jan 2005; <plasmaroo@gentoo.org> prc-tools-2.3-r1.ebuild:
+  Add texinfo-4.8 $DEPEND; 4.7 fails when generating the documentation.
+
+  27 Jan 2005; <plasmaroo@gentoo.org> prc-tools-2.3-r1.ebuild:
+  Bump texi2html $DEPEND to 1.70; bug #79719.
+
+*prc-tools-2.3-r1 (04 Jan 2005)
+
+  04 Jan 2005; <plasmaroo@gentoo.org> +prc-tools-2.3-r1.ebuild,
+  files/prc-tools-2.3-compilefix.patch:
+  Adding multi-section debugging support; bug #72378. Fixing a Makefile so all
+  the HTML docs are also installed correctly.
+
+  05 Nov 2003; <plasmaroo@gentoo.org> prc-tools-2.3.ebuild:
+  Added fix for the compile error when not upgrading because of broken 
+  includes in prc-tools.
+
+*prc-tools-2.3 (29 Oct 2003)
+
+  29 Oct 2003; <plasmaroo@gentoo.org> prc-tools-2.3.ebuild,
+  files/prc-tools-2.3-compilefix.patch:
+  Version bump.
 
 *prc-tools-2.2 (31 Aug 2003)
 
   31 Aug 2003; <plasmaroo@gentoo.org> prc-tools-2.2.ebuild,
   files/prc-tools-2.2-compilefix.patch:
-  Initial Import
-
+  Initial Import.
diff --git a/dev-lang/prc-tools/Manifest b/dev-lang/prc-tools/Manifest
index 7ed181fdd24e..724985717e44 100644
--- a/dev-lang/prc-tools/Manifest
+++ b/dev-lang/prc-tools/Manifest
@@ -1,4 +1,8 @@
-MD5 4a23529292615a360028ad097f442726 ChangeLog 367
-MD5 af0724dee1caa187acbe966a3d0e139d prc-tools-2.2.ebuild 3094
-MD5 4c73bc92caa33aa26b5c07c25bea44a3 files/digest-prc-tools-2.2 330
+MD5 58289c364aad3fe52cc557e5cfc64b80 ChangeLog 1174
+MD5 8bca40f794a8641f32e3b6607069e363 prc-tools-2.3-r1.ebuild 3535
+MD5 a5c50833bcc05f696a75e5dc8bb9eb4d metadata.xml 225
+MD5 5fdc4c03698ce46609cf3e6ef57ea52a prc-tools-2.3.ebuild 3354
+MD5 caff630bb5a63f4cd8b4165d5016eca1 files/digest-prc-tools-2.3-r1 393
 MD5 fcc20c7b30e20c7bc95f2accdfe8f569 files/prc-tools-2.2-compilefix.patch 6620
+MD5 a7ab0a38eef025abb11ecefaa270c68b files/digest-prc-tools-2.3 323
+MD5 a706541b6a4c3a143841be0110df0313 files/prc-tools-2.3-compilefix.patch 9707
diff --git a/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch b/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch
index ef22d41d3ff6..dbfe81d0283b 100644
--- a/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch
+++ b/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch
@@ -290,3 +290,39 @@
  
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
+@@ -61,8 +61,33 @@
+ 	$(INSTALL_DATA) index.texi.html $(DESTDIR)$(htmldir)/index.html
+ 	-rm -rf $(DESTDIR)$(htmldir)/texi
+ 	$(INSTALL) -d $(DESTDIR)$(htmldir)/texi
+-	for f in `ls *.html | grep -v '^index'`; do \
+-	  $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	cd prc-tools; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	done
++	cd gcc; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	done
++	cd cpp; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	done
++	cd gdb; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	done
++	cd as; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	done
++	cd ld; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
++	done
++	cd binutils; \
++	for f in `ls *.html`; do \
++		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/texi/$$f; \
+ 	done
+ 
+ .PHONY: all info man html install install-info install-man install-html clean
diff --git a/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild b/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild
index 17f6deb4544e..5b714cd321bf 100644
--- a/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild
+++ b/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild,v 1.1 2005/01/04 17:47:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -24,7 +24,8 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND=">=app-text/texi2html-1.64-r1"
+DEPEND=">=app-text/texi2html-1.70
+	>=sys-apps/texinfo-4.8"
 RDEPEND=""
 
 src_unpack() {
@@ -42,7 +43,7 @@ src_unpack() {
 	echo -n " "; epatch ${P}/${GCC_V_ARM}.palmos.diff || die
 	echo -n " "; epatch ${P}/${GCC_V_M68K}.palmos.diff || die
 	echo -n " "; epatch ${P}/${GDB_V}.palmos.diff || die
-	echo -n " "; EPATCH_OPTS="-l" epatch ${P}/../MsectGdb2.3-1.diff || die	
+	echo -n " "; EPATCH_OPTS="-l" epatch ${P}/../MsectGdb2.3-1.diff || die
 	echo -n " "; epatch ${FILESDIR}/${P}-compilefix.patch || die
 
 		# This last patch disables dummy headers being copied.
diff --git a/dev-lang/prc-tools/prc-tools-2.3.ebuild b/dev-lang/prc-tools/prc-tools-2.3.ebuild
index 51c7aace5c3b..06e29d9a3ce1 100644
--- a/dev-lang/prc-tools/prc-tools-2.3.ebuild
+++ b/dev-lang/prc-tools/prc-tools-2.3.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc. and Tim Yamin [plasmaroo@gentoo.org]
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/prc-tools-2.3.ebuild,v 1.1 2003/10/29 17:38:35 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/prc-tools-2.3.ebuild,v 1.1.1.1 2005/11/30 09:58:10 chriswhite Exp $
 
-DESCRIPTION="GNU-Based Palm C++ Development Suite"
+inherit flag-o-matic eutils
 
 BIN_V="binutils-2.14"
 GDB_V="gdb-5.3"
 GCC_V_ARM="gcc-3.3.1"
 GCC_V_M68K="gcc-2.95.3"
 
+DESCRIPTION="GNU-Based Palm C++ Development Suite"
+HOMEPAGE="http://prc-tools.sourceforge.net"
 SRC_URI="mirror://sourceforge/prc-tools/${P}.tar.gz
 	ftp://sources.redhat.com/pub/binutils/releases/${BIN_V}.tar.bz2
 	ftp://sources.redhat.com/pub/gdb/releases/${GDB_V}.tar.bz2
@@ -16,18 +18,15 @@ SRC_URI="mirror://sourceforge/prc-tools/${P}.tar.gz
 	ftp://gcc.gnu.org/pub/gcc/releases/${GCC_V_M68K}/${GCC_V_M68K}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 
-HOMEPAGE="http://prc-tools.sourceforge.net"
-DEPEND=">=app-text/texi2html-1.64"
-
-S=${WORKDIR}/${P}
-
-src_unpack () {
+IUSE=""
+DEPEND=">=app-text/texi2html-1.64-r1"
+RDEPEND=""
 
-	cd ${WORKDIR}
-	unpack ${A} || die
+src_unpack() {
+	unpack ${A}
 
 	cd ${P}
 	ln -s ../${BIN_V} binutils
@@ -52,13 +51,12 @@ src_unpack () {
 
 	# Fix ${GCC_V_ARM} include problem
 	cp ${GCC_V_ARM}/gcc/fixinc/tests/base/unistd.h ${GCC_V_ARM}/gcc
-
+	sed -i -e 's:#include <stdio.h>::' -e 's:#include <sys/types.h>::' -e 's:#include <errno.h>::' -e 's:#include <stdlib.h>::' ${GCC_V_ARM}/gcc/tsystem.h || die
 }
 
-src_config () {
-
+src_config() {
 	echo ">>> Rebuilding configuration scripts"
-	cd binutils; autoconf || die "Failed to reconfigure binutils"; cd ..
+	cd binutils; WANT_AUTOCONF=2.1 autoconf || die "Failed to reconfigure binutils"; cd ..
 
 	cd ..
 	mkdir build
@@ -84,26 +82,19 @@ src_config () {
 
 	# palmdev-prefix also has to be real; otherwise 'palmdev-prep'
 	# defaults to virtual ${D}/..
-
 }
 
-src_compile () {
-
+src_compile() {
 	src_config
 	make || die
-
 }
 
-src_install () {
-
-	cd ..
-	cd build
+src_install() {
+	cd ../build
 	einstall || die
-
 }
 
-pkg_postinst () {
-
+pkg_postinst() {
 	echo
 	einfo "PRC-Tools is now compiled and installed!"
 	einfo "<HTML docs are installed in /opt/palmdev>"
@@ -117,5 +108,4 @@ pkg_postinst () {
 	echo  "   ->> Decompress this to /opt/palmdev and then run"
 	echo  "       'palmdev-prep /opt/palmdev'"
 	echo
-
 }
diff --git a/dev-lang/prothon/ChangeLog b/dev-lang/prothon/ChangeLog
index 7322cec5946f..cfa2b8c82036 100644
--- a/dev-lang/prothon/ChangeLog
+++ b/dev-lang/prothon/ChangeLog
@@ -1,10 +1,35 @@
 # ChangeLog for dev-lang/prothon
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prothon/ChangeLog,v 1.1 2004/04/02 09:53:56 kloeri Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prothon/ChangeLog,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*prothon-0.1.2_p711 (12 Jul 2004)
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -prothon-0.0.3_p282.ebuild, -prothon-0.0.4_p328.ebuild,
+  +prothon-0.1.2_p711.ebuild:
+  Bump version, remove old ebuilds.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  prothon-0.0.3_p282.ebuild, prothon-0.0.4_p328.ebuild,
+  prothon-0.1.0_p532.ebuild:
+  virtual/glibc -> virtual/libc
+
+*prothon-0.0.4_p328 (16 Apr 2004)
+
+  16 Apr 2004; Jason Wever <weeve@gentoo.org> prothon-0.0.4_p328.ebuild:
+  Added ~sparc keyword.
+
+*prothon-0.0.3_p282 (12 Apr 2004)
+
+  12 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> prothon-0.0.3_p282.ebuild:
+  Version bump.
 
 *prothon-0.0.2_p190 (02 Apr 2004)
 
-  02 Apr 2004; Bryan �stergaard <kloeri@gentoo.org> metadata.xml,
+  02 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> metadata.xml,
   prothon-0.0.2_p190.ebuild:
   Initial import, ebuild by Lukasz Strzygowski <lucass@gentoo.pl>.
 
diff --git a/dev-lang/prothon/Manifest b/dev-lang/prothon/Manifest
index 72dfc980d7aa..ff12f597c93c 100644
--- a/dev-lang/prothon/Manifest
+++ b/dev-lang/prothon/Manifest
@@ -1,2 +1,6 @@
-MD5 db7a814d4dc923ccd0fe4429f63a3176 prothon-0.0.2_p190.ebuild 607
-MD5 53318b104731bf4bb7b7f3938302d0b3 files/digest-prothon-0.0.2_p190 70
+MD5 b4f946149f87a266464a930b5c7836f1 prothon-0.1.0_p532.ebuild 794
+MD5 9e5d63dc6bf11e489842bd343de09e80 prothon-0.1.2_p711.ebuild 749
+MD5 9d539b7117239fa79b24fcda741e3ce4 ChangeLog 1163
+MD5 a89a9203ca221ae8b783d1393343f6ee metadata.xml 217
+MD5 dd8e0f1d897db68c4f2b487872ed79d5 files/digest-prothon-0.1.0_p532 70
+MD5 cc3037f2f766d7aa8f6f9ccab00d62ad files/digest-prothon-0.1.2_p711 70
diff --git a/dev-lang/prothon/prothon-0.1.0_p532.ebuild b/dev-lang/prothon/prothon-0.1.0_p532.ebuild
index 263cf5426763..abc3dfe78729 100644
--- a/dev-lang/prothon/prothon-0.1.0_p532.ebuild
+++ b/dev-lang/prothon/prothon-0.1.0_p532.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prothon/prothon-0.1.0_p532.ebuild,v 1.1 2004/05/24 20:57:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prothon/prothon-0.1.0_p532.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 MY_P=${P/_p/-b}
 DESCRIPTION="A classless prototype-based programming language with the sensibilities of Python."
@@ -10,7 +10,7 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/gcc
 	sys-devel/make
 	sys-devel/bison
diff --git a/dev-lang/prothon/prothon-0.1.2_p711.ebuild b/dev-lang/prothon/prothon-0.1.2_p711.ebuild
index 0190a9d660f8..1b09ccd41b81 100644
--- a/dev-lang/prothon/prothon-0.1.2_p711.ebuild
+++ b/dev-lang/prothon/prothon-0.1.2_p711.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prothon/prothon-0.1.2_p711.ebuild,v 1.1 2004/07/12 00:01:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prothon/prothon-0.1.2_p711.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 MY_P=${P/_p/-b}
 DESCRIPTION="A classless prototype-based programming language with the sensibilities of Python."
diff --git a/dev-lang/pugs/ChangeLog b/dev-lang/pugs/ChangeLog
index 7ef7a676c801..2f66c35bc555 100644
--- a/dev-lang/pugs/ChangeLog
+++ b/dev-lang/pugs/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for dev-lang/pugs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/ChangeLog,v 1.1 2005/03/14 14:43:20 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/ChangeLog,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
+
+*pugs-6.2.9 (15 Aug 2005)
+
+  15 Aug 2005; Michael Cummings <mcummings@gentoo.org> -pugs-6.0.11.ebuild,
+  -pugs-6.2.3.ebuild, +pugs-6.2.9.ebuild:
+  Version bump, bug 93988, thanks Adrian
+
+*pugs-6.2.3 (18 May 2005)
+
+  18 May 2005; Michael Cummings <mcummings@gentoo.org> +pugs-6.2.3.ebuild:
+  Bug 92957; version bump
+
+  11 May 2005; Michael Cummings <mcummings@gentoo.org> pugs-6.0.11.ebuild:
+  Changing dep on ghc to virtual - thanks kosmikus :)
+
+  04 May 2005; David Holm <dholm@gentoo.org> pugs-6.0.11.ebuild:
+  Added to ~ppc.
+
+  17 Mar 2005; Michael Cummings <mcummings@gentoo.org> pugs-6.0.11.ebuild:
+  Better handling of the either/or dep
 
 *pugs-6.0.11 (14 Mar 2005)
 
diff --git a/dev-lang/pugs/Manifest b/dev-lang/pugs/Manifest
index 898fc6a3c419..f184e630b8dd 100644
--- a/dev-lang/pugs/Manifest
+++ b/dev-lang/pugs/Manifest
@@ -1,3 +1,14 @@
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 e71ce86e5b02aea04296dd4e42a79389 pugs-6.0.11.ebuild 971
-MD5 9b22fae8c9c831a52de40862635a0763 files/digest-pugs-6.0.11 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 facc27a1e6ed9a872f2076b612725a2a ChangeLog 1239
+MD5 e195d07dd8c771cb3816ab6cece1510e metadata.xml 464
+MD5 2786eef5c97a1981c9c5cfb61f4b94e4 pugs-6.2.9.ebuild 1019
+MD5 a6449849fecfd8db5e4e089e1565a706 files/digest-pugs-6.2.9 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDAE+PtG5z4I8BtQoRAiQZAJ4haDA6ZCeVgbmyZFE0EqdCq/vKGQCdFDr/
+ye8/FLXfRrRtOTGUne1dzZg=
+=8yTZ
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/pugs/pugs-6.2.9.ebuild b/dev-lang/pugs/pugs-6.2.9.ebuild
index 088c128ae4c0..2549853f9959 100644
--- a/dev-lang/pugs/pugs-6.2.9.ebuild
+++ b/dev-lang/pugs/pugs-6.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/pugs-6.2.9.ebuild,v 1.1 2005/08/15 08:17:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/pugs-6.2.9.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index c3c17f024d19..2eef3872f5f9 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,763 @@
 # ChangeLog for dev-lang/python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.1.1.1 2005/11/30 09:58:40 chriswhite Exp $
+
+  17 Nov 2005; Guy Martin <gmsoft@gentoo.org> python-2.4-r3.ebuild,
+  python-2.4.1.ebuild, python-2.4.1-r1.ebuild, python-2.4.2.ebuild:
+  Readded critical fix for HPPA.
+
+  21 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> python-2.4.2.ebuild:
+  Stable on mips.
+
+  15 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> python-2.4.2.ebuild:
+  Stable on sh.
+
+  15 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> python-2.4.2.ebuild:
+  Stable on hppa, ppc.
+
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> python-2.4.2.ebuild:
+  Stable on sparc
+
+  14 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.2.ebuild:
+  Stable on alpha.
+
+  13 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-2.4.2.ebuild:
+  Marked Stable on amd64.
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> python-2.4.2.ebuild:
+  Mark 2.4.2 stable on ia64
+
+  13 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.2.ebuild:
+  Marked x86 stable per Mr_Bones_ - memory leak in posix.access()
+
+  10 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-2.4.1-r1.ebuild:
+  Stable on sparc
+
+  10 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-2.4.1-r1.ebuild:
+  Marked Stable on amd64.
+
+  10 Oct 2005; Markus Rothe <corsair@gentoo.org> python-2.4.1-r1.ebuild:
+  Stable on ppc64
+
+  09 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-2.4.1-r1.ebuild:
+  Stable on hppa, ppc.
+
+  08 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.1-r1.ebuild:
+  Stable python-2.4 on alpha, ia64 and x86.
+
+  01 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild,
+  python-2.4.1-r1.ebuild, python-2.4.2.ebuild:
+  Disable additional test, fixing bug 82469, 94859, 96366 and 96488.
+
+*python-2.4.2 (28 Sep 2005)
+
+  28 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/python-2.4.2-readline.patch, +python-2.4.2.ebuild:
+  Bump version to 2.4.2.
+
+  14 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> python-2.3.5-r2.ebuild:
+  2.3.5-r2 stable on mips for security bug #104009.
+
+  11 Sep 2005; Simon Stelling <blubb@gentoo.org> python-2.3.5-r2.ebuild:
+  stable on amd64 wrt bug 104009
+
+  10 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-2.3.5-r2.ebuild:
+  Stable on ppc and hppa.
+
+  10 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> python-2.3.5-r2.ebuild:
+  Stable on sh.
+
+  09 Sep 2005; Josh Grebe <squash@gentoo.org> python-2.3.5-r2.ebuild:
+  Sparc stable bump for bug #104009
+
+  09 Sep 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5-r2.ebuild:
+  Stable on ppc64
+
+  08 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild:
+  Stable on x86, alpha and ia64 - bug 104009.
+
+*python-2.3.5-r2 (08 Sep 2005)
+
+  08 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/python-2.3-pcre.patch, +python-2.3.5-r2.ebuild:
+  Version bump to fix pcre security vulnerability, bug 104009.
+
+  16 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.4-r1.ebuild,
+  python-2.3.5.ebuild:
+  Add fix for bug 88777 to arch versions.
+
+  15 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r1.ebuild,
+  python-2.4.1-r1.ebuild:
+  Fix bug 88777 in ~arch versions.
+
+  11 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/python-2.4.1-bindir-libdir.patch,
+  +files/python-2.4.1-crosscompile.patch, python-2.4.1-r1.ebuild:
+  Add support for cross-compiling.  Grabbed patches from uClibc/OpenEmbedded.
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/python-2.4.1-st_flags.patch, python-2.4.1-r1.ebuild:
+  Update st_flags patch, bug 94637.
+
+  03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild:
+  Stable on alpha.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5.ebuild:
+  Stable on ppc64
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> python-2.4.1-r1.ebuild:
+  added ~ppc64
+
+*python-2.4.1-r1 (16 Jun 2005)
+*python-2.3.5-r1 (16 Jun 2005)
+
+  16 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/python-2.3.5-st_flags.patch, +python-2.3.5-r1.ebuild,
+  +python-2.4.1-r1.ebuild:
+  Add st_flags patch, requested in bug 94637.
+
+  09 Jun 2005; Herbie Hopkins <herbs@gentoo.org>
+  files/python-2.4.1-libdir.patch, python-2.4.1.ebuild:
+  Fix libdir patch to work with amd64s no-symlink profile, removed
+  append-flags -fPIC as this seems to no longer be necessary.
+
+  29 May 2005; <solar@gentoo.org> python-2.3.4-r1.ebuild, python-2.3.5.ebuild,
+  python-2.4-r3.ebuild, python-2.4.1.ebuild:
+  echangelog - update package to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+  29 May 2005; Alastair Tse <liquidx@gentoo.org>
+  files/python-2.4.1-libdir.patch:
+  remove zlib from libpython dependency (#90545)
+
+  28 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild,
+  python-2.2.3-r6.ebuild, python-2.3.4-r1.ebuild, python-2.3.5.ebuild,
+  python-2.4-r3.ebuild, python-2.4.1.ebuild:
+  Add missing inherit versionator.
+
+  21 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild:
+  Fix PROVIDE according to bug 93028.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> python-2.3.5.ebuild:
+  Stable on amd64.
+
+  07 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild,
+  python-2.4.1.ebuild:
+  Fix FEATURES=test using slightly modified patch by Rob Cakebread, bug 67970.
+
+  01 May 2005; Stephen Bennett <spb@gentoo.org> python-2.3.4-r1.ebuild,
+  python-2.3.5.ebuild, python-2.4.1.ebuild:
+  Added compile fix for when $LIBC is set.
+
+  30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> python-2.3.5.ebuild:
+  Stable on ppc.
+
+  28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.5.ebuild:
+  Stable on sparc
+
+*python-2.4.1 (27 Apr 2005)
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/python-2.4.1-db4.patch, +files/python-2.4.1-libdir.patch,
+  +files/python-2.4.1-readline.patch, files/python-2.4-readline.patch,
+  -python-2.3.3-r2.ebuild, python-2.3.5.ebuild, -python-2.4-r1.ebuild,
+  -python-2.4-r2.ebuild, +python-2.4.1.ebuild:
+  version bump for 2.4.1, clean up readling, db4 and libdir patch for 2.4.1.
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild,
+  python-2.4-r3.ebuild:
+  reverting changes to deps and adding note about why they are arranged in
+  that way (to remind myself never to touch them again :)
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/python-2.3-readline.patch, +files/python-2.4-readline.patch,
+  python-2.3.5.ebuild, python-2.4-r3.ebuild:
+  fixing readline support to not require termcap (#79013). fixed DEPEND
+  and RDEPEND order (python-fchksum isn't a DEPEND only)
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> python-2.3.4-r1.ebuild:
+  Stable on ppc64
+
+*python-2.4-r3 (19 Mar 2005)
+
+  19 Mar 2005; Rob Cakebread <pythonhead@gentoo.org>
+  files/python-2.4-libdir.patch, +python-2.4-r3.ebuild:
+  Removed multiple dirs in sys path. bug# 83109
+
+  15 Mar 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild:
+  more multilib fixes (#76791)
+
+  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild,
+  python-2.4-r1.ebuild:
+  Fix conditional c++ support for remaining versions.
+
+  27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r2.ebuild,
+  python-2.3.4-r1.ebuild, python-2.4-r2.ebuild:
+  Disable c++ conditionally.
+
+*python-2.3.5 (17 Feb 2005)
+
+  17 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> +python-2.3.5.ebuild:
+  Version bump.
+
+  09 Feb 2005; Luca Barbato <lu_zero@gentoo.org> python-2.3.4-r1.ebuild:
+  Marked ppc
+
+*python-2.4-r2 (07 Feb 2005)
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/python-2.4-libdir.patch, files/python-updater, +python-2.4-r2.ebuild:
+  Multilib releated cleanup.
+
+*python-2.2.3-r6 (06 Feb 2005)
+
+  06 Feb 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/python-2.2.3-xmlrpc.patch, +files/python-2.3-xmlrpc.patch,
+  +files/python-2.4-xmlrpc.patch, -python-2.2.3-r5.ebuild,
+  +python-2.2.3-r6.ebuild, -python-2.3.3-r1.ebuild, +python-2.3.3-r2.ebuild,
+  -python-2.3.3.ebuild, +python-2.3.4-r1.ebuild, -python-2.3.4.ebuild,
+  +python-2.4-r1.ebuild, -python-2.4.ebuild:
+  Patches and version bumps for security bug# 80592 Python bug# PSF-2005-001 xmlrpc
+  vulnerability. Removed obsolete versions.
+
+  06 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.ebuild:
+  Fix broken Manifest.
+
+  05 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.ebuild:
+  Only apply lib64 patch on CONF_LIBDIR == lib64
+
+  04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/python-2.4-lib64.patch, python-2.4.ebuild:
+  Added lib64 patch
+
+*python-2.4 (04 Jan 2005)
+
+  04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/python-2.4-add_portage_search_path.patch,
+  +files/python-2.4-db4.2.patch,
+  +files/python-2.4-disable_modules_and_ssl.patch,
+  +files/python-2.4-gentoo_py_dontcompile.patch,
+  +files/python-2.4-mimetypes_apache.patch, files/python-updater,
+  +python-2.4.ebuild:
+  Version bump. bug# 68775
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Nov 2004; Joshua Kinard <kumba@gentoo.org> python-2.3.4.ebuild:
+  Marked stable on mips.
+
+  29 Oct 2004; Alastair Tse <liquidx@gentoo.org> files/python-updater:
+  improvements with tmp log creation with python-updater (#68843)
+
+  19 Oct 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.4.ebuild:
+  Stable on hppa.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> python-2.3.4.ebuild:
+  Stable on amd64.
+
+  19 Oct 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.4.ebuild:
+  fix problem with tk-inter and USE flags handing (grumble)
+
+  18 Oct 2004; Mike Frysinger <vapier@gentoo.org> python-2.3.3-r1.ebuild,
+  python-2.3.4.ebuild:
+  Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python
+  based upon USE flags.
+
+  17 Oct 2004; Jason Wever <weeve@gentoo.org> python-2.3.4.ebuild:
+  Stable on sparc.
+
+  24 Sep 2004; Alastair Tse <liquidx@gentoo.org> -python-2.2.2.ebuild,
+  python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild,
+  -python-2.3.4_rc1.ebuild:
+  adding workaround for -fstack-protector-all (#50309)
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> python-2.3.3-r1.ebuild,
+  python-2.3.3.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  31 Aug 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.4.ebuild:
+  Removed useless -fPIC for hppa.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> python-2.3.4.ebuild:
+  stable on alpha
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> +files/python-2.3.4-lib64.patch,
+  python-2.3.3-r1.ebuild, python-2.3.4.ebuild:
+  added logic for installing to /usr/lib64, triggered by the CONF_LIBDIR
+  variable. proper CONF_LIBDIR support will require portage 2.0.51_pre18, soon
+  to be released.
+
+  20 Jul 2004; Lars Weiler <pylon@gentoo.org> python-2.1.3-r1.ebuild:
+  Made python-2.1 stable on ppc as there are still some ebuilds which require
+  this version.
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r1.ebuild:
+  Stable on alpha.
+
+  03 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> python-2.3.4.ebuild:
+  x86-obsd minor fix
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  python-2.1.3-r1.ebuild, python-2.2.2.ebuild, python-2.2.3-r5.ebuild,
+  python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild,
+  python-2.3.4_rc1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.2.ebuild,
+  python-2.2.3-r5.ebuild, python-2.3.3-r1.ebuild, python-2.3.3.ebuild,
+  python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
+  QA - fix use invocation and a bug in the 2.3.4 ebuilds: 
+  [ -z "use X" -o -z "use tcltk" ] doesn't do what you meant it to do
+
+  20 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.3-r1.ebuild:
+  Sparc happy stable
+
+  15 Jun 2004; <solar@gentoo.org> python-2.3.3-r1.ebuild:
+  USE= cleanups and added uclibc
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> python-2.3.3-r1.ebuild:
+  stable on ppc64, bug #53575
+
+  06 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild,
+  python-2.3.3-r1.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
+  Fix use invocation
+
+*python-2.3.4 (04 Jun 2004)
+
+  04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +python-2.3.4.ebuild:
+  Bump version.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> python-2.3.3-r1.ebuild:
+  stable on amd64
+
+  30 May 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3-r1.ebuild:
+  Marked stable on hppa.
+
+  22 May 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3-r1.ebuild,
+  python-2.3.3.ebuild, python-2.3.4_rc1.ebuild:
+  Fix os.utime() on hppa. utimes it not supported but unfortunately reported as
+  working.
+
+*python-2.3.4_rc1 (15 May 2004)
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> python-2.3.3-r1.ebuild,
+  python-2.3.4_rc1.ebuild:
+  Marking 2.3.3 stable on mips (someone yanked the ~mips keyword at some
+  point...), and 2.3.4 unstable.
+
+  27 Apr 2004; Michael McCabe <randy@gentoo.org> python-2.3.3-r1.ebuild:
+  Marked stable on s390
+
+*python-2.3.3-r1 (12 Apr 2004)
+
+  12 Apr 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3-r1.ebuild,
+  files/python-2.3-add_portage_search_path_take_2.patch:
+  add workaround for python-2.2 to python-2.3 upgrade possibly breaking older
+  portage versions. make /usr/lib/portage/pym appear before
+  /usr/lib/python*/site-packages in sys.path (not really critical, but better be
+  safe than sorry). also removed c++ support to reduce gcc/glibc upgrade pain
+
+  11 Mar 2004; Alastair Tse <liquidx@gentoo.org> python-2.2.1-r5.ebuild:
+  removing 2.2.1 from tree for security reasons (#44230)
+
+  09 Mar 2004; <agriffis@gentoo.org> python-2.3.3.ebuild:
+  stable on alpha and ia64
+
+  05 Mar 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  added X useflag for greater tcltk seperation. now needs both X and tcltk USE
+  flags to enable tkinter support
+
+  03 Mar 2004; David Holm <dholm@gentoo.org> python-2.1.3-r1.ebuild:
+  Added to ~ppc.
+
+  27 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  completely removed pkg_setup(), added note at the top of the ebuild where you
+  can't miss it.
+
+  27 Feb 2004; Jason Stubbs <jstubbs@gentoo.org> python-2.3.3.ebuild:
+  Removing portage version check again as it's preventing new installations.
+  Bug #43036
+
+  25 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> python-2.3.3.ebuild:
+  Reinstating portage version check as people keep upgrading python without
+  upgrading portage.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-2.1.3-r1.ebuild:
+  Fix duplicate KEYWORDS settings and mark stable on alpha and ia64 for the sake
+  of dev-python/PyXML-py21
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-2.1.3-r1.ebuild:
+  add ~alpha for the sake of dev-python/Imaging-py21
+
+  10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> python-2.3.3.ebuild:
+  set ppc in keywords
+
+  10 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild,
+  files/python-2.3-db4.2.patch:
+  add fix to make python-2.3.3 db-4.2 (gentoo flavour) aware
+
+  06 Feb 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild:
+  Stable on sparc
+
+  03 Feb 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3.ebuild :
+  Marked stable on hppa.
+
+  02 Feb 2004; Alastair Tse <liquidx@gentoo.org> files/depreorder.py:
+  update python-updater thanks to a well spotted mistake by Chris Bainbridge
+  <chrb@dcs.ed.ac.uk> (#40198)
+
+  27 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  disabling pkg_setup again after testing with stage2
+
+  26 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  re-instating pkg_setup() warning/abort message. added apache mime.types to
+  mime type search list. modified to use tar.bz2 (saves 1MB of downloads)
+
+  24 Jan 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3.ebuild:
+  Added ~hppa to KEYWORDS.
+
+  24 Jan 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild:
+  keyworded ~sparc
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  add missing doc IUSE (#39232)
+
+  22 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild,
+  files/depreorder.py:
+  updated python-updater for portage-2.0.50, installed python-updater in
+  /usr/sbin for convienence
+
+  19 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild,
+  python-2.3.3.ebuild:
+  disable portage check because stable portage already is compatible with
+  python-2.3
+
+  18 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild:
+  make ROOT var more robust during postinst()
+
+  12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> python-2.2.3-r5.ebuild:
+  Marked ppc
+
+  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild:
+  Stable on ia64 to enable fix for bug 36954; portage-2.0.49-r20 depends on
+  this revision.
+
+  03 Jan 2004; Jason Wever <weeve@gentoo.org> python-2.2.3-r5.ebuild:
+  Marked stable on sparc as portage-2.0.49-r20 really depends on this version of
+  python rather than what the portage ebuild says. Fixes bug #36954 on sparc.
+
+*python-2.3.3 (03 Jan 2004)
+
+  03 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild,
+  python-2.3.3.ebuild, files/python-2.3.2-disable_modules_and_ssl.patch:
+  version bump to 2.3.3, re-add python disable_modules_and_ssl patch and changed
+  ebuild to build 'socket' module under USE=build
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> python-2.2.3-r5.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> python-2.3.2-r2.ebuild,
+  files/python-2.3.2-disable_modules_and_ssl.patch:
+  Removed python-2.3.2-disable_modules_and_ssl.patch as
+  it broke python and caused 'ImportError: No module named _socket'.
+  More info: http://article.gmane.org/gmane.linux.gentoo.devel/14621
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.3-r5.ebuild:
+  Marked stable on hppa.
+
+  13 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild:
+  clarified warning to prevent more bug reports
+
+  13 Dec 2003; Luca Barbato <lu_zero@gentoo.org> python-2.3.2-r2.ebuild:
+  Marked ~ppc
+
+  08 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild,
+  python-2.3.2-r2.ebuild:
+  fix python .pyc .pyo cleaning code
+
+  03 Dec 2003; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild:
+  Stable on alpha
+
+  27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild:
+  Make -fPIC compilation available for all platforms and not just amd64.
+
+  25 Nov 2003; Brad House <brad_mssw@gentoo.org> python-2.2.3-r5.ebuild:
+  mark stable on amd64
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild:
+  add pkg_setup() to 2.3 as a temporary measure to stop people messing up their
+  own system. Also added a ucs2 local useflag just in case someone complains
+  loudly and knows what they're doing
+
+*python-2.3.2-r2 (22 Nov 2003)
+
+  22 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild,
+  files/python-updater:
+  ucs4 is now default. if you previously had python-2.3 merged, you'll need to
+  update your packages again. (sorry, that is the price for running p.mask'ed
+  versions). to update your python packages if you had python-2.3 installed, 
+  run :
+  
+  /usr/portage/dev-lang/python/files/python-updater -o 2.3
+  
+  if you are upgrading from python-2.2, then you will need to run:
+  
+  /usr/portage/dev-lang/python/files/python-updater
+  
+  python-updater script also modified to have more robust command-line
+  parsing. hopefully this will be the last revision till we can go ~x86.
+
+  13 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild:
+  fix python-config install for python-2.3
+
+  12 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild,
+  python-2.2.3-r2.ebuild, python-2.2.3-r3.ebuild, python-2.2.3-r4.ebuild,
+  python-2.3.2-r1.ebuild, python-2.3.2.ebuild, files/python-updater:
+  cleanup and add warning on python-updated or PORTDIR is not set
+
+  12 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild :
+  Add a patch that adds CFLAGSFORSHARED variable to some extra modules defined in the Makefile.
+  This variable could hold -fPIC so that the compiled libraries will work on amd64 (and maybe others)
+  without using append-flags -fPIC.
+
+  03 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild,
+  python-2.3.2-r1.ebuild:
+  added ncurses and ssl to IUSE
+
+  03 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild:
+  export environment in src_install()
+
+  01 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild,
+  python-2.3.2-r1.ebuild, files/python-2.2.3-disable_modules_and_ssl.patch,
+  files/python-2.3.2-disable_modules_and_ssl.patch:
+  reordered deps to allow minimal python build for USE='build'. makes python
+  respect useflags explicitly even if the dependency exists. added support to
+  disable SSL. tweaked python_mod_optimize.
+
+*python-2.2.3-r5 (27 Oct 2003)
+
+  27 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild,
+  files/python-2.2.3-db4.patch:
+  rev bump. fixes to idle.py and bsddb with db-4.1 for 2.2.3
+
+  26 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> python-2.2.3-r4.ebuild:
+  Fixed symlink to idle.py
+
+*python-2.2.3-r4 (22 Oct 2003)
+
+  22 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r4.ebuild,
+  files/python-2.2.3-gentoo_py_dontcompile.patch:
+  Fixed PYTHON_DONTCOMPILE patch for 2.2.3 thanks to TGL
+  <degrenier@easyconnect.fr> (#31730)
+
+*python-2.2.3-r3 (17 Oct 2003)
+
+  17 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r3.ebuild,
+  files/python-2.2.3-db4.patch,
+  files/python-2.2.3-gentoo_py_dontcompile.patch, files/python-updater:
+  Add support for db-4.1, fixes for ewarn hanging for python-updater
+
+  14 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r3.ebuild:
+  new 2.2.3 version that adds PYTHON_DONTCOMPILE support
+
+  10 Oct 2003; Alastair Tse <liquidx@gentoo.org> files/python-updater:
+  fix typo in python-updater
+
+  09 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild,
+  files/depreorder.py, files/python-2.2.3-gentoo_py_dontcompile.patch,
+  files/python-updater:
+  improved byte-compiling, fixed out-of-order python-updater and added
+  sys-apps/portage to exclusions
+
+  09 Oct 2003; <tuxus@gentoo.org> python-2.2.3-r1.ebuild:
+  stable on mips 
+
+*python-2.3.2-r1 (08 Oct 2003)
+
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild,
+  files/python-2.3-gentoo_py_dontcompile.patch:
+  add patch to stop automatic generation of .pyc and .pyo by setting
+  PYTHON_DONTCOMPILE in your environment. also moved to use the new python
+  eclass to automatically optimize and cleanup compiled modules.
+
+*python-2.3.2 (07 Oct 2003)
+
+  07 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r2.ebuild,
+  python-2.3.2.ebuild, files/python-2.2.3-db4.patch,
+  files/python-2.3-add_portage_search_path.patch, files/python-config-2.3,
+  files/python-updater:
+  it has been a long time coming, but finally there's a 2.3.x release in portage
+  along with a python-2.2.3 update that should fix some niggling issues and also
+  uses the new alternative class. 2.3.2 is still masked and should stay that way
+  until we can confirm the rebuilding script works.
+
+  03 Oct 2003; Alexander Gabert <pappy@gentoo.org> python-2.2.3-r1.ebuild:
+  filter-flags because of segfaulting with fstackprotector in CFLAGS
+
+  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> python-2.2.3-r1.ebuild:
+  set ppc in keywords
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> python-2.2.3-r1.ebuild :
+  ia64 keywords.
+
+  16 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r1.ebuild,
+  python-2.2.3.ebuild:
+  marked 2.2.3 stable for x86
+
+  13 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r1.ebuild:
+  add doc useflag to install python documentation. (#24318)
+
+*python-2.2.3-r1 (03 Jul 2003)
+
+  23 Jul 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.3-r1.ebuild :
+  Marked stable on hppa.
+
+  03 Jul 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml,
+  python-2.2.3-r1.ebuild:
+  added db4 support and enabled threads (pthread) support
+
+*python-2.2.3 (02 Jun 2003)
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> python-2.2.3.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> python-2.2.3.ebuild:
+  set stable on sparc
+
+  02 Jun 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild,
+  python-2.2.3.ebuild, files/python-config-2.2:
+  version bump to new bugfix release. fixed python-config location for unstable
+  versions
+
+*python-2.2.2-r1 (08 May 2003)
+
+  08 May 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild,
+  files/python-2.2.2-tk-8.4.x.patch:
+  backported patch to fix tk-8.4.x problems (#20318)
+
+  23 Feb 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.2.ebuild :
+  Added -fPIC to CFLAGS on hppa. It's needed by apps linking to some python libs.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> python-2.2.2.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.2.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  29 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Added missing python-config for 2.2.2.
+
+*python-2.2.2 (20 Oct 2002)
+
+  07 Jan 2003; Jan Seidel <tuxus@gentoo.org> python-2.2.2.ebuild :
+  Added mips to keywords
+
+  20 Oct 2002; Jon Nelson <jnelson@gentoo.org> :
+  2.2.2 is released
+  
+*python-2.2.1-r5 (03 Oct 2002)
+
+  15 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Fix the sed on /usr/lib/python<ver>/config/Makefile to change
+  OPT to 'OPT = -DNDEBUG', and not 'OPT = -NDEBUG' which caused
+  gcc warnings.
+
+  03 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*python-2.2.1-r4 (7 Sep 2002)
+  7 Sep 2002; Nicholas Jones <carpaski@gentoo.org> python-2.2.1-r4.ebuild
+  Fix for bug #7641 -- Fixes the OPT flags in Makefile so that gcc
+  isn't confused by conflicting build types of i386 and user set.
+
+*python-2.2.1-r3 (2 Sep 2002)
+  2 Sep 2002; Jon Nelson <jnelson@gentoo.org> python-2.2.1-r3.ebuild
+  Filter -malign-double from flags
+
+*python-2.1.3-r1 (2 Jul 2002)
+ 
+  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3-r1.ebuild
+  Added missing KEYWORDS
+
+  2 Jul 2002; Jon Nelson <jnelson@gentoo.org> python-2.1.3-r1.ebuild:
+  Fix Makefile.pre.in install (the one we want is located in Misc)
+
+*python-2.1.3 (1 Jul 2002)
+
+  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3.ebuild
+  Added missing KEYWORDS
+
+  1 Jul 2002; Jon Nelson <jnelson@gentoo.org>: python-2.1.3.ebuild
+  This is a python 2.1.3 ebuild that does *not* conflict with
+  python 2.2.*
+  Note that 99.9% of the people out there won't use it anyway,
+  because 2.2 will always be selected as most recent. ;-)
+
+*python-2.2.1-r2 (1 Jul 2002)
+
+  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r2.ebuild
+  Added missing KEYWORDS
+
+  30 Jun 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r2.ebuild
+  Add "-lm" to the python-config script. Closes bug #4217.
+  2.2.1-r2 has a 100% identical ebuild file to 2.2.1-r1, just the
+  python-config file has changed.
+
+*python-2.2.1-r1 (29 May 2002)
+ 
+  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r1.ebuild 
+  Added missing KEYWORDS
+
+  29 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r1.ebuild
+  Add expat to build depends (except during bootstrap), use econf
+  and emake, and don't mess with Modules/Setup.local because modules
+  are build as shared on Linux as default.
+
+*python-2.2.1 (2 May 2002)
+
+  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1.ebuild
+  Added missing KEYWORDS
+
+  2 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1.ebuild
+  Update to 2.2.1, and completely re-vamp build procedure
+  This should solve several build issues.
+
+*python-2.2-r7 (29 Apr 2002)
+
+  29 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: New rev to fix bug #2199;
+  python-config should now work properly.
+
+*python-2.2-r6 (24 Apr 2002)
+
+  24 Apr 2002; Jon Nelson <jnelson@gentoo.org> python-2.2-r6.ebuild : Make
+  python build with shared modules.  Depends on python-fchksum, as fchksum *no
+  longer built in*
+	
+*python-2.2-r5 (8 Apr 2002)
+
+  8 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> python-2.2-r5.ebuild :
+	
+  Added include flag for compilation of tcltk with python to compile
+  correctly.
+
+  --------
+	
+  06 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : the 2.2-r4 ebuild now
+  disables C++ support if we are creating a new build image (since we have no
+  C++ in that case).
+  
+  30 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : changed PROVIDE from
+  virtual/python-2.2 to virtual/python.  No rev bump.
 
 *python-2.2-r4 (1 Feb 2002)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c0f08dd460d3..038a1e521199 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,13 +1,63 @@
-MD5 77b3c329bc0bdf4ae8180eaa76a56542 ChangeLog 4827
-MD5 067b51e93b48ce7877df67399883c842 python-2.1.3-r1.ebuild 2345
-MD5 34b9eed0a2276490dbe1bf42e01b4b5d python-2.2.2-r1.ebuild 3122
-MD5 4acba90247dbf1f810e372bbb8f11cb9 python-2.2.1-r5.ebuild 2919
-MD5 81969a1011c98f45f1996ca956156d77 python-2.2.2.ebuild 3027
-MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2-r1 62
+MD5 477546b705b41d6af33ed2ae003ee9d1 ChangeLog 29312
+MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
+MD5 2632d539cd0ab18b40f9510118ed3099 python-2.1.3-r1.ebuild 2299
+MD5 5857a314767fd0ae2243590999fe78b2 python-2.2.3-r6.ebuild 4491
+MD5 21151b5cbaac120cb271bdac9bc95eb8 python-2.3.4-r1.ebuild 7259
+MD5 4928085fdd7860dd8104011c9955a7f2 python-2.3.5.ebuild 7799
+MD5 83d5f6cfce039d87c651dbad4224912a python-2.4.1.ebuild 8344
+MD5 3dc06bf8e04bd9880be6ee4402234e8b python-2.3.5-r1.ebuild 7924
+MD5 eb681c731b011f69718d04351d341741 python-2.4-r3.ebuild 7355
+MD5 ee21268fe5f633029a2575a6e0808d75 python-2.4.1-r1.ebuild 9144
+MD5 d49abed8e570e34660b16fae1f8efe82 python-2.3.5-r2.ebuild 8039
+MD5 e6d21095acf7e4d64688d0e370ef9c46 python-2.4.2.ebuild 9141
+MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
-MD5 aa73c4258e3be099345a929ad6e01665 files/digest-python-2.2.1-r5 62
-MD5 8f455a90c3fcabda33ce44fe9c030534 files/python-2.2.2-tk-8.4.x.patch 3148
-MD5 b7a6b00d8dede1534e7a5180a14542b1 files/digest-python-2.2.2 62
+MD5 f11f5d528c570ef739ea10806cebfa9f files/digest-python-2.2.3-r6 62
+MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1 66
+MD5 c2e3a6ed5d700a7976f5b763cd935599 files/digest-python-2.3.4-r1 66
+MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5 66
+MD5 eaa33949f072a9787c453c37c1236108 files/python-2.4.1-db4.patch 1414
 MD5 5f2361b3e770981b737a9ad3d2863931 files/python-2.2.1-r5-gentoo.diff 4152
+MD5 11aa066154fe2e0a4c306124c7e5dd4a files/python-2.2.2-tk-8.4.x.patch 2997
+MD5 96d4207fb41391c70d5f02e1785c9527 files/python-2.2.3-db4.patch 1220
+MD5 7480e63a1ff3aff7eaf8718424add7f8 files/python-2.2.3-disable_modules_and_ssl.patch 1212
+MD5 9fe31aedbbc7e8ea1847ed6dd70bf15b files/python-2.2.3-fPIC.patch 767
+MD5 07398060a831f18193315973df204cbf files/python-2.2.3-gentoo_py_dontcompile.patch 732
+MD5 55af7ba61954f03e09bcafbce1227c61 files/python-2.2.3-xmlrpc.patch 3659
+MD5 46588eb4b2cfdd8277153e8e6f728eca files/python-2.3-add_portage_search_path.patch 607
+MD5 4b9922f74b1076d82d1fdb653fa5769a files/python-2.3-add_portage_search_path_take_2.patch 614
+MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.3-db4.2.patch 1015
+MD5 7808762bbf53647c7cd597be4044e9f7 files/python-2.3-gentoo_py_dontcompile.patch 478
+MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.3-mimetypes_apache.patch 454
+MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.3-xmlrpc.patch 4228
+MD5 2b953054102d344834597bc73b209e12 files/python-2.3.2-disable_modules_and_ssl.patch 1285
+MD5 a387f41bfc6767b90a51daaa0c0aac45 files/python-2.3.4-lib64.patch 11779
+MD5 5bee9fa15d4effc7423e76d2f7f47655 files/python-2.4-add_portage_search_path.patch 556
+MD5 7a12ce3bbe0961cf1533fcf838e17fa9 files/python-2.4-db4.2.patch 1015
+MD5 2b953054102d344834597bc73b209e12 files/python-2.4-disable_modules_and_ssl.patch 1285
+MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/python-2.4-gentoo_py_dontcompile.patch 477
+MD5 7ed8f8f52ed392ef28dd320b130e3c6b files/python-2.4-lib64.patch 9941
+MD5 3c77f8f9d55bbedacd9476a428088250 files/python-2.4-libdir.patch 8358
+MD5 ec16631b538a7481f0537191d5f23b27 files/python-2.4-mimetypes_apache.patch 454
+MD5 e8c8ffd37f007b6ee62180d31b2100fe files/python-2.4-xmlrpc.patch 4228
+MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.1 178
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2.2 178
+MD5 201acd1cfd5124f25c58a8db3f78a502 files/python-config-2.3 178
+MD5 d74e7f0fd47f00e8b3fe7ca36b7eb629 files/python-config-2.4 179
+MD5 1cf4c21ad3b0aafc571b05b9a9e54594 files/python-updater 8761
+MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64
+MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596
+MD5 6eab04aaa6abe2b795e4e5f4983bea38 files/python-2.4-readline.patch 9099
+MD5 5fdb512b55d4ed9b13a5a3af00a5ba40 files/python-2.4.1-libdir.patch 7875
+MD5 47e9455f3e16c3369c9e57388ba3d643 files/python-2.4.1-readline.patch 8984
+MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5-r1 66
+MD5 1e4084c2a8ee240668d02e703e7c171f files/digest-python-2.4.1-r1 66
+MD5 b8e2b591eb203df14010db589089a522 files/python-2.3.5-st_flags.patch 1452
+MD5 5af982af8ad4befbf15567ae399cf2b9 files/python-2.4.1-st_flags.patch 5649
+MD5 9bb508a4b15481e4722c1317b9fb02a3 files/python-2.4.1-bindir-libdir.patch 405
+MD5 ec1400ca4877399cae56ccefb72a200f files/python-2.4.1-crosscompile.patch 4126
+MD5 849ff6337b70ef28009c90021dfae0da files/digest-python-2.3.5-r2 66
+MD5 47ee57ffc9b69af4ff828a3a1ae26afd files/python-2.3-pcre.patch 4278
+MD5 678a7e4660de986e8e22808d18f93686 files/digest-python-2.4.2 66
+MD5 36b36bac050785b8e393dc72f8e51d2f files/python-2.4.2-readline.patch 8628
diff --git a/dev-lang/python/files/depreorder.py b/dev-lang/python/files/depreorder.py
index 2350da2e3b00..2305eb08aacd 100644
--- a/dev-lang/python/files/depreorder.py
+++ b/dev-lang/python/files/depreorder.py
@@ -18,18 +18,25 @@ DEP_DEPLIST = 1
 DEP_SLOT = 2
 dep_cache = {}
 
+    
 # very simply, we extract the dependencies for each package
 for pkg in pkgs_to_reorder:
     try:
-	deps, slot = varapi.aux_get(pkg, ["DEPEND", "SLOT"])
+        deps, slot = varapi.aux_get(pkg, ["DEPEND", "SLOT"])
     except ValueError:
-	sys.stderr.write("Error getting dependency information off " + pkg + "\n")
-	continue
-    realdeps = portage.dep_check(deps, fakedbapi)
+        sys.stderr.write("Error getting dependency information off " + pkg + "\n")
+        continue
+    try:
+        realdeps = portage.dep_check(deps, fakedbapi)
+    except TypeError:
+        # we're probably running >=portage-2.0.50
+        pkgsettings = portage.config(clone=portage.settings)        
+        realdeps = portage.dep_check(deps, fakedbapi, pkgsettings)
+
     vardeps = []
     # match() finds the versions of all those that are installed
     for dep in realdeps[1]:
-	vardeps = vardeps + varapi.match(dep)
+        vardeps = vardeps + varapi.match(dep)
     dep_cache[pkg] = ( 0, vardeps, slot )
 
 # then we just naively append to a sorted list of deps using this rule.
@@ -40,8 +47,9 @@ for pkg in pkgs_to_reorder:
 for pkg, depinfo in dep_cache.items():
     dep_to_add = []
     for dep in depinfo[DEP_DEPLIST]:
-	if dep in pkgs_to_reorder:
-	    dep_to_add.append(dep)
+        if dep in pkgs_to_reorder:
+            dep_to_add.append(dep)
+            
     pkgs_ordered += dep_to_add + [pkg]
     
 # now, because the packages may have nested or multple dependencies, we
@@ -50,8 +58,8 @@ for pkg, depinfo in dep_cache.items():
 # comes before the package that depends on it.
 pkgs_final_order = []
 for pkg in pkgs_ordered:
-	if pkg not in pkgs_final_order:
-	    pkgs_final_order += [pkg]
+    if pkg not in pkgs_final_order:
+        pkgs_final_order += [pkg]
 	    
 print string.join(pkgs_final_order, "\n")
 #print portage.dep_expand("=dev-python/sip-3.8", portage.portdb)
diff --git a/dev-lang/python/files/python-2.2.1-r5-gentoo.diff b/dev-lang/python/files/python-2.2.1-r5-gentoo.diff
index 13d74f626918..7dd90f72f209 100644
--- a/dev-lang/python/files/python-2.2.1-r5-gentoo.diff
+++ b/dev-lang/python/files/python-2.2.1-r5-gentoo.diff
@@ -84,15 +84,6 @@ retrieving revision 1.73.4.7
 diff -u -r1.73.4.4 -r1.73.4.7
 --- python/python/dist/src/setup.py	2002/03/26 13:43:04	1.73.4.4
 +++ python/python/dist/src/setup.py	2002/08/08 19:52:42	1.73.4.7
-@@ -1,7 +1,7 @@
- # Autodetecting setup.py script for building the Python extensions
- #
- 
--__version__ = "$Revision: 1.1 $"
-+__version__ = "$Revision: 1.1 $"
- 
- import sys, os, getopt
- from distutils import sysconfig
 @@ -273,8 +273,6 @@
          exts.append( Extension('pwd', ['pwdmodule.c']) )
          # grp(3)
diff --git a/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch b/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch
index 498100bc476e..0dc581cb630b 100644
--- a/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch
+++ b/dev-lang/python/files/python-2.2.2-tk-8.4.x.patch
@@ -5,15 +5,6 @@ retrieving revision 1.160.10.3
 diff -u -r1.160.10.2 -r1.160.10.3
 --- python/python/dist/src/Lib/lib-tk/Tkinter.py	2002/08/23 15:27:52	1.160.10.2
 +++ python/python/dist/src/Lib/lib-tk/Tkinter.py	2003/03/29 09:48:12	1.160.10.3
-@@ -27,7 +27,7 @@
- tk.mainloop()
- """
- 
--__version__ = "$Revision: 1.1 $"
-+__version__ = "$Revision: 1.1 $"
- 
- import sys
- if sys.platform == "win32":
 @@ -1024,38 +1024,54 @@
          """Internal function."""
          if len(args) != len(self._subst_format): return args
diff --git a/dev-lang/python/files/python-2.2.3-db4.patch b/dev-lang/python/files/python-2.2.3-db4.patch
index 76180c95a745..2405f8e0fd0c 100644
--- a/dev-lang/python/files/python-2.2.3-db4.patch
+++ b/dev-lang/python/files/python-2.2.3-db4.patch
@@ -1,13 +1,15 @@
 --- Python-2.2.3/setup.py	2003-05-22 18:36:54.000000000 +0100
 +++ Python-2.2.3.new/setup.py	2003-07-03 19:42:29.000000000 +0100
-@@ -429,8 +429,10 @@
+@@ -429,8 +429,12 @@
          # Berkeley DB 3.x.)
  
          dblib = []
 -        if self.compiler.find_library_file(lib_dirs, 'db-3.2'):
 -            dblib = ['db-3.2']
-+        if self.compiler.find_library_file(lib_dirs, 'db-4'):
-+            dblib = ['db-4']
++        if self.compiler.find_library_file(lib_dirs, 'db-4.1'):
++            dblib = ['db-4.1']
++        elif self.compiler.find_library_file(lib_dirs, 'db-4.0'):
++            dblib = ['db-4.0']
 +        elif self.compiler.find_library_file(lib_dirs, 'db-3.2'):
 +            dblib = ['db-3.2']	    
          elif self.compiler.find_library_file(lib_dirs, 'db-3.1'):
@@ -18,7 +20,7 @@
  
          db185_incs = find_file('db_185.h', inc_dirs,
 -                               ['/usr/include/db3', '/usr/include/db2'])
-+                               ['/usr/include/db4','/usr/include/db3', '/usr/include/db2'])
++                               ['/usr/include/db4.1','/usr/include/db4','/usr/include/db3', '/usr/include/db2'])
          db_inc = find_file('db.h', inc_dirs, ['/usr/include/db1'])
          if db185_incs is not None:
              exts.append( Extension('bsddb', ['bsddbmodule.c'],
diff --git a/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch b/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch
index 021f5226b70c..24d22e60659e 100644
--- a/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch
+++ b/dev-lang/python/files/python-2.2.3-gentoo_py_dontcompile.patch
@@ -1,23 +1,27 @@
---- Python-2.2.3/Python/import.c	2003-03-23 14:32:56.000000000 +0000
-+++ /tmp/import.c	2003-10-09 09:45:51.000000000 +0100
+--- Python-2.2.3/Python/import.c	2003-03-23 15:32:56.000000000 +0100
++++ Python-2.2.3/Python/import.c	2003-10-21 20:15:42.000000000 +0200
 @@ -719,6 +719,7 @@
  write_compiled_module(PyCodeObject *co, char *cpathname, long mtime)
  {
  	FILE *fp;
-+   char *py_dontcompile;
++	char *py_dontcompile;
  
  	if (CANT_WRITE(co->co_argcount) ||
  	    CANT_WRITE(co->co_nlocals) ||
-@@ -731,8 +732,10 @@
+@@ -731,8 +732,14 @@
  				cpathname);
  		return;
  	}
 -
 -	fp = open_exclusive(cpathname);
-+   if ((py_dontcompile = getenv("PYTHON_DONTCOMPILE")) != NULL)
-+     fp = open_exclusive(cpathname);
-+   else
-+     fp = NULL;
++	if ((py_dontcompile = getenv("PYTHON_DONTCOMPILE")) == NULL)
++		fp = open_exclusive(cpathname);
++	else {
++		if (Py_VerboseFlag)
++			PySys_WriteStderr(
++				"# PYTHON_DONTCOMPILE is set: won't create %s\n", cpathname);
++		return;
++	}
  	if (fp == NULL) {
  		if (Py_VerboseFlag)
  			PySys_WriteStderr(
diff --git a/dev-lang/python/files/python-2.4-lib64.patch b/dev-lang/python/files/python-2.4-lib64.patch
index c2b37feb4946..c3e2c4ffcca9 100644
--- a/dev-lang/python/files/python-2.4-lib64.patch
+++ b/dev-lang/python/files/python-2.4-lib64.patch
@@ -1,6 +1,6 @@
-diff -Nru Python-2.3.4.old/Lib/distutils/command/install.py Python-2.3.4/Lib/distutils/command/install.py
---- Python-2.3.4.old/Lib/distutils/command/install.py	2004-08-14 21:38:57.318696000 -0400
-+++ Python-2.3.4/Lib/distutils/command/install.py	2004-08-14 21:39:41.285012104 -0400
+diff -Nru Python-2.4.old/Lib/distutils/command/install.py Lib/distutils/command/install.py
+--- Python-2.4.old/Lib/distutils/command/install.py	2004-08-14 21:38:57.318696000 -0400
++++ Lib/distutils/command/install.py	2004-08-14 21:39:41.285012104 -0400
 @@ -39,14 +39,14 @@
  INSTALL_SCHEMES = {
      'unix_prefix': {
@@ -18,9 +18,9 @@ diff -Nru Python-2.3.4.old/Lib/distutils/command/install.py Python-2.3.4/Lib/dis
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -Nru Python-2.3.4.old/Lib/distutils/sysconfig.py Python-2.3.4/Lib/distutils/sysconfig.py
---- Python-2.3.4.old/Lib/distutils/sysconfig.py	2004-08-14 21:38:57.367688552 -0400
-+++ Python-2.3.4/Lib/distutils/sysconfig.py	2004-08-14 21:39:41.300009824 -0400
+diff -Nru Python-2.4.old/Lib/distutils/sysconfig.py Lib/distutils/sysconfig.py
+--- Python-2.4.old/Lib/distutils/sysconfig.py	2004-08-14 21:38:57.367688552 -0400
++++ Lib/distutils/sysconfig.py	2004-08-14 21:39:41.300009824 -0400
 @@ -99,8 +99,12 @@
          prefix = plat_specific and EXEC_PREFIX or PREFIX
  
@@ -35,46 +35,27 @@ diff -Nru Python-2.3.4.old/Lib/distutils/sysconfig.py Python-2.3.4/Lib/distutils
          if standard_lib:
              return libpython
          else:
-diff -Nru Python-2.3.4.old/Lib/site.py Python-2.3.4/Lib/site.py
---- Python-2.3.4.old/Lib/site.py	2004-08-14 21:38:57.565658456 -0400
-+++ Python-2.3.4/Lib/site.py	2004-08-14 21:39:41.318007088 -0400
-@@ -166,9 +166,14 @@
-             sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
-         elif os.sep == '/':
-             sitedirs = [os.path.join(prefix,
-+                                     "lib64",
-+                                     "python" + sys.version[:3],
-+                                     "site-packages"),
-+                        os.path.join(prefix,
-                                      "lib",
-                                      "python" + sys.version[:3],
-                                      "site-packages"),
-+                        os.path.join(prefix, "lib64", "site-python"),
-                         os.path.join(prefix, "lib", "site-python")]
-         else:
-             sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
-diff -Nru Python-2.3.4.old/Lib/test/test_re.py Python-2.3.4/Lib/test/test_re.py
---- Python-2.3.4.old/Lib/test/test_re.py	2004-08-14 21:38:56.631800424 -0400
-+++ Python-2.3.4/Lib/test/test_re.py	2004-08-14 21:39:34.240083096 -0400
-@@ -497,6 +497,15 @@
-         self.assert_(re.compile('bug_926075') is not
-                      re.compile(eval("u'bug_926075'")))
- 
-+    def test_bug_931848(self):
-+        try:
-+            unicode
-+        except NameError:
-+            pass
-+        pattern = eval('u"[\u002E\u3002\uFF0E\uFF61]"')
-+        self.assertEqual(re.compile(pattern).split("a.b.c"),
-+                         ['a','b','c'])
-+
- def run_re_tests():
-     from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR
-     if verbose:
-diff -Nru Python-2.3.4.old/Makefile.pre.in Python-2.3.4/Makefile.pre.in
---- Python-2.3.4.old/Makefile.pre.in	2004-08-14 21:39:00.506211424 -0400
-+++ Python-2.3.4/Makefile.pre.in	2004-08-14 21:39:41.341003592 -0400
+diff -Nru Lib/site.py.old Lib/site.py
+--- Lib/site.py.old     2005-01-05 10:50:32.642936080 -0800
++++ Lib/site.py 2005-01-05 10:54:44.698617792 -0800
+@@ -179,9 +179,14 @@
+                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+             elif os.sep == '/':
+                 sitedirs = [os.path.join(prefix,
++                                         "lib64",
++                                         "python" + sys.version[:3],
++                                         "site-packages"),
++                            os.path.join(prefix,
+                                          "lib",
+                                          "python" + sys.version[:3],
+                                          "site-packages"),
++                                                       os.path.join(prefix, "lib64", "site-python"),
+                             os.path.join(prefix, "lib", "site-python")]
+                 sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
+             else:
+diff -Nru Python-2.4.old/Makefile.pre.in Makefile.pre.in
+--- Python-2.4.old/Makefile.pre.in	2004-08-14 21:39:00.506211424 -0400
++++ Makefile.pre.in	2004-08-14 21:39:41.341003592 -0400
 @@ -79,11 +79,11 @@
  
  # Expanded directories
@@ -89,19 +70,19 @@ diff -Nru Python-2.3.4.old/Makefile.pre.in Python-2.3.4/Makefile.pre.in
  
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-diff -Nru Python-2.3.4.old/Modules/Setup.dist Python-2.3.4/Modules/Setup.dist
---- Python-2.3.4.old/Modules/Setup.dist	2004-08-14 21:39:00.761172664 -0400
-+++ Python-2.3.4/Modules/Setup.dist	2004-08-14 21:42:09.073544832 -0400
-@@ -343,7 +343,7 @@
+diff -Nru Python-2.4.old/Modules/getpath.c Modules/getpath.c
+--- Modules/Setup.dist.old	2005-01-05 11:59:12.421634520 -0800
++++ Modules/Setup.dist	2005-01-05 12:00:58.292539696 -0800
+@@ -325,7 +325,7 @@
  # *** Uncomment and edit to reflect your Tcl/Tk versions:
  #	-ltk8.2 -ltcl8.2 \
  # *** Uncomment and edit to reflect where your X11 libraries are:
 -#	-L/usr/X11R6/lib \
-+	-L/usr/X11R6/lib64 \
++ 	-L/usr/X11R6/lib64 \
  # *** Or uncomment this for Solaris:
  #	-L/usr/openwin/lib \
  # *** Uncomment these for TOGL extension only:
-@@ -417,7 +417,7 @@
+@@ -396,7 +396,7 @@
  #DB=/usr/local/BerkeleyDB.4.0
  #DBLIBVER=4.0
  #DBINC=$(DB)/include
@@ -110,18 +91,17 @@ diff -Nru Python-2.3.4.old/Modules/Setup.dist Python-2.3.4/Modules/Setup.dist
  #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
  
  # Historical Berkeley DB 1.85
-@@ -463,7 +463,7 @@
+@@ -442,7 +442,7 @@
  # Andrew Kuchling's zlib module.
  # This require zlib 1.1.3 (or later).
- # See http://www.cdrom.com/pub/infozip/zlib/
+ # See http://www.gzip.org/zlib/
 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
  
  # Interface to the Expat XML parser
  #
-diff -Nru Python-2.3.4.old/Modules/getpath.c Python-2.3.4/Modules/getpath.c
---- Python-2.3.4.old/Modules/getpath.c	2004-08-14 21:39:00.750174336 -0400
-+++ Python-2.3.4/Modules/getpath.c	2004-08-14 21:39:41.319006936 -0400
+--- Python-2.4.old/Modules/getpath.c	2004-08-14 21:39:00.750174336 -0400
++++ Modules/getpath.c	2004-08-14 21:39:41.319006936 -0400
 @@ -112,8 +112,8 @@
  #endif
  
@@ -159,29 +139,20 @@ diff -Nru Python-2.3.4.old/Modules/getpath.c Python-2.3.4/Modules/getpath.c
 +        joinpath(exec_prefix, "lib64/lib-dynload");
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
- 
-diff -Nru Python-2.3.4.old/setup.py Python-2.3.4/setup.py
---- Python-2.3.4.old/setup.py	2004-08-14 21:39:00.575200936 -0400
-+++ Python-2.3.4/setup.py	2004-08-14 21:39:41.340003744 -0400
-@@ -241,7 +241,7 @@
- 
+
+diff -Nru setup.py.old setup.py
+--- setup.py.old	2005-01-05 12:05:34.809502728 -0800
++++ setup.py	2005-01-05 12:14:29.522214040 -0800
+@@ -247,7 +247,7 @@
      def detect_modules(self):
+         global disable_ssl
          # Ensure that /usr/local is always used
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
          add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  
-         # fink installs lots of goodies in /sw/... - make sure we
-@@ -264,7 +264,7 @@
-         # lib_dirs and inc_dirs are used to search for files;
-         # if a file is found in one of those directories, it can
-         # be assumed that no additional -I,-L directives are needed.
--        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
-+        lib_dirs = self.compiler.library_dirs + ['/lib64', '/usr/lib64']
-         inc_dirs = self.compiler.include_dirs + ['/usr/include']
-         exts = []
- 
-@@ -413,11 +413,11 @@
+         # Add paths to popular package managers on OS X/darwin
+@@ -437,11 +437,11 @@
              elif self.compiler.find_library_file(lib_dirs, 'curses'):
                  readline_libs.append('curses')
              elif self.compiler.find_library_file(lib_dirs +
@@ -194,8 +165,8 @@ diff -Nru Python-2.3.4.old/setup.py Python-2.3.4/setup.py
 +                                   library_dirs=['/usr/lib64/termcap'],
                                     libraries=readline_libs) )
          if platform not in ['mac']:
-                 # crypt module.
-@@ -446,8 +446,8 @@
+             # crypt module.
+@@ -470,8 +470,8 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -206,7 +177,7 @@ diff -Nru Python-2.3.4.old/setup.py Python-2.3.4/setup.py
                                       ] )
  
          if (ssl_incs is not None and
-@@ -481,12 +481,12 @@
+@@ -502,23 +502,23 @@
          # order you wish to search - e.g., search for db4 before db3
          db_try_this = {
              'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
@@ -220,35 +191,28 @@ diff -Nru Python-2.3.4.old/setup.py Python-2.3.4/setup.py
 +                                '/usr/local/lib64',
                                  '/opt/sfw',
 -                                '/sw/lib',
-+                                '/sw/lib64',
++                                '/sw/libi64',
                                  ),
-                     'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
-                                 '/usr/local/include/db42',
-@@ -499,12 +499,12 @@
+                     'incdirs': ('/usr/include/db4.2',
+                                 '/usr/include/db4.1',
                                  '/usr/include/db4',
                                  )},
-             'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
+             'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
 -                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
 -                                '/usr/local/BerkeleyDB.3.2/lib',
--                                '/usr/local/BerkeleyDB.3.1/lib',
 -                                '/usr/local/lib',
 -                                '/opt/sfw/lib',
 -                                '/sw/lib',
 +                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64',
 +                                '/usr/local/BerkeleyDB.3.2/lib64',
-+                                '/usr/local/BerkeleyDB.3.1/lib64',
 +                                '/usr/local/lib64',
 +                                '/opt/sfw/lib64',
 +                                '/sw/lib64',
                                  ),
                      'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
                                  '/usr/local/BerkeleyDB.3.2/include',
-@@ -986,14 +986,14 @@
-             added_lib_dirs.append('/usr/openwin/lib')
-         elif os.path.exists('/usr/X11R6/include'):
-             include_dirs.append('/usr/X11R6/include')
--            added_lib_dirs.append('/usr/X11R6/lib')
-+            added_lib_dirs.append('/usr/X11R6/lib64')
+@@ -1000,11 +1000,11 @@
+             added_lib_dirs.append('/usr/X11R6/lib')
          elif os.path.exists('/usr/X11R5/include'):
              include_dirs.append('/usr/X11R5/include')
 -            added_lib_dirs.append('/usr/X11R5/lib')
diff --git a/dev-lang/python/files/python-2.4-libdir.patch b/dev-lang/python/files/python-2.4-libdir.patch
index 61ca31f58a53..d60605c4416d 100644
--- a/dev-lang/python/files/python-2.4-libdir.patch
+++ b/dev-lang/python/files/python-2.4-libdir.patch
@@ -35,10 +35,9 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/
          if standard_lib:
              return libpython
          else:
-diff -Naurp Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py
---- Python-2.4.orig/Lib/site.py	2004-07-19 19:28:28.000000000 -0700
-+++ Python-2.4/Lib/site.py	2005-02-07 12:17:13.000000000 -0800
-@@ -179,9 +179,14 @@ def addsitepackages(known_paths):
+--- ./Lib/site.py	2005-03-17 09:55:19.295156312 -0800
++++ ./orgLib/site.py	2005-03-17 09:59:42.009217704 -0800
+@@ -179,10 +179,20 @@
                  sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
              elif os.sep == '/':
                  sitedirs = [os.path.join(prefix,
@@ -49,8 +48,14 @@ diff -Naurp Python-2.4.orig/Lib/site.py Python-2.4/Lib/site.py
                                           "lib",
                                           "python" + sys.version[:3],
                                           "site-packages"),
-+                                                       os.path.join(prefix, "lib64", "site-python"),
++                            os.path.join(prefix, "lib64", "site-python"),
                              os.path.join(prefix, "lib", "site-python")]
++                tmp_sitedirs = []
++                for sdir in sitedirs:
++                    if sdir not in tmp_sitedirs:
++                        tmp_sitedirs.append(sdir)
++                sitedirs = tmp_sitedirs 
+                 sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
              else:
                  sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
 diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
diff --git a/dev-lang/python/files/python-2.4-readline.patch b/dev-lang/python/files/python-2.4-readline.patch
index 3dbeb8e02727..7469b577979c 100644
--- a/dev-lang/python/files/python-2.4-readline.patch
+++ b/dev-lang/python/files/python-2.4-readline.patch
@@ -1,19 +1,3 @@
-Common subdirectories: Python-2.4/Demo and Python-2.4.new/Demo
-Common subdirectories: Python-2.4/Doc and Python-2.4.new/Doc
-Common subdirectories: Python-2.4/Grammar and Python-2.4.new/Grammar
-Common subdirectories: Python-2.4/Include and Python-2.4.new/Include
-Common subdirectories: Python-2.4/Lib and Python-2.4.new/Lib
-Common subdirectories: Python-2.4/Mac and Python-2.4.new/Mac
-Common subdirectories: Python-2.4/Misc and Python-2.4.new/Misc
-Common subdirectories: Python-2.4/Modules and Python-2.4.new/Modules
-Common subdirectories: Python-2.4/Objects and Python-2.4.new/Objects
-Common subdirectories: Python-2.4/PC and Python-2.4.new/PC
-Common subdirectories: Python-2.4/PCbuild and Python-2.4.new/PCbuild
-Common subdirectories: Python-2.4/Parser and Python-2.4.new/Parser
-Common subdirectories: Python-2.4/Python and Python-2.4.new/Python
-Common subdirectories: Python-2.4/RISCOS and Python-2.4.new/RISCOS
-Common subdirectories: Python-2.4/Tools and Python-2.4.new/Tools
-Only in Python-2.4.new: autom4te.cache
 diff -up Python-2.4/configure Python-2.4.new/configure
 --- Python-2.4/configure	2004-11-07 01:24:12.000000000 +0000
 +++ Python-2.4.new/configure	2005-04-20 17:35:32.380494843 +0100
diff --git a/dev-lang/python/files/python-2.4.1-libdir.patch b/dev-lang/python/files/python-2.4.1-libdir.patch
index 4a11d1e8514b..b9d6b50395d5 100644
--- a/dev-lang/python/files/python-2.4.1-libdir.patch
+++ b/dev-lang/python/files/python-2.4.1-libdir.patch
@@ -1,6 +1,5 @@
-diff -Naurp Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py
---- Python-2.4.orig/Lib/distutils/command/install.py	2004-11-10 14:23:15.000000000 -0800
-+++ Python-2.4/Lib/distutils/command/install.py	2005-02-07 12:13:14.000000000 -0800
+--- Python-2.4.1/Lib/distutils/command/install.py
++++ Python-2.4.1/Lib/distutils/command/install.py
 @@ -39,14 +39,14 @@ else:
  INSTALL_SCHEMES = {
      'unix_prefix': {
@@ -18,9 +17,8 @@ diff -Naurp Python-2.4.orig/Lib/distutils/command/install.py Python-2.4/Lib/dist
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py
---- Python-2.4.orig/Lib/distutils/sysconfig.py	2004-10-13 08:54:16.000000000 -0700
-+++ Python-2.4/Lib/distutils/sysconfig.py	2005-02-07 12:16:17.000000000 -0800
+--- Python-2.4.1/Lib/distutils/sysconfig.py
++++ Python-2.4.1/Lib/distutils/sysconfig.py
 @@ -99,8 +99,12 @@ def get_python_lib(plat_specific=0, stan
          prefix = plat_specific and EXEC_PREFIX or PREFIX
  
@@ -35,9 +33,9 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/
          if standard_lib:
              return libpython
          else:
---- ./Lib/site.py	2005-03-17 09:55:19.295156312 -0800
-+++ ./orgLib/site.py	2005-03-17 09:59:42.009217704 -0800
-@@ -179,10 +179,20 @@
+--- Python-2.4.1/Lib/site.py
++++ Python-2.4.1/Lib/site.py
+@@ -179,10 +179,20 @@ def addsitepackages(known_paths):
                  sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
              elif os.sep == '/':
                  sitedirs = [os.path.join(prefix,
@@ -58,9 +56,8 @@ diff -Naurp Python-2.4.orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/
                  sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs
              else:
                  sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
-diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
---- Python-2.4.orig/Makefile.pre.in	2004-09-26 10:26:55.000000000 -0700
-+++ Python-2.4/Makefile.pre.in	2005-02-07 12:18:39.000000000 -0800
+--- Python-2.4.1/Makefile.pre.in
++++ Python-2.4.1/Makefile.pre.in
 @@ -79,7 +79,7 @@ exec_prefix=	@exec_prefix@
  
  # Expanded directories
@@ -70,10 +67,9 @@ diff -Naurp Python-2.4.orig/Makefile.pre.in Python-2.4/Makefile.pre.in
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
-diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
---- Python-2.4.orig/Modules/Setup.dist	2004-08-31 06:50:12.000000000 -0700
-+++ Python-2.4/Modules/Setup.dist	2005-02-07 12:19:48.000000000 -0800
-@@ -325,7 +325,7 @@ GLHACK=-Dclear=__GLclear
+--- Python-2.4.1/Modules/Setup.dist
++++ Python-2.4.1/Modules/Setup.dist
+@@ -329,7 +329,7 @@ GLHACK=-Dclear=__GLclear
  # *** Uncomment and edit to reflect your Tcl/Tk versions:
  #	-ltk8.2 -ltcl8.2 \
  # *** Uncomment and edit to reflect where your X11 libraries are:
@@ -82,7 +78,7 @@ diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
  # *** Or uncomment this for Solaris:
  #	-L/usr/openwin/lib \
  # *** Uncomment these for TOGL extension only:
-@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear
+@@ -400,7 +400,7 @@ GLHACK=-Dclear=__GLclear
  #DB=/usr/local/BerkeleyDB.4.0
  #DBLIBVER=4.0
  #DBINC=$(DB)/include
@@ -91,18 +87,17 @@ diff -Naurp Python-2.4.orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
  #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
  
  # Historical Berkeley DB 1.85
-@@ -442,7 +442,7 @@ GLHACK=-Dclear=__GLclear
+@@ -446,7 +446,7 @@ GLHACK=-Dclear=__GLclear
  # Andrew Kuchling's zlib module.
  # This require zlib 1.1.3 (or later).
  # See http://www.gzip.org/zlib/
 -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
++#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
  
  # Interface to the Expat XML parser
  #
-diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
---- Python-2.4.orig/Modules/getpath.c	2004-08-07 18:00:47.000000000 -0700
-+++ Python-2.4/Modules/getpath.c	2005-02-07 12:22:15.137580048 -0800
+--- Python-2.4.1/Modules/getpath.c
++++ Python-2.4.1/Modules/getpath.c
 @@ -113,7 +113,7 @@
  
  #ifndef PYTHONPATH
@@ -112,7 +107,42 @@ diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
  #endif
  
  #ifndef LANDMARK
-@@ -525,7 +525,7 @@ calculate_path(void)
+@@ -125,6 +125,7 @@ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+ static char lib_python[] = "lib/python" VERSION;
++static char lib_exec_python[] = "@@GENTOO_LIBDIR@@/python" VERSION;
+ 
+ static void
+ reduce(char *dir)
+@@ -321,7 +322,7 @@ search_for_exec_prefix(char *argv0_path,
+             strncpy(exec_prefix, delim+1, MAXPATHLEN);
+         else
+             strncpy(exec_prefix, home, MAXPATHLEN);
+-        joinpath(exec_prefix, lib_python);
++        joinpath(exec_prefix, lib_exec_python);
+         joinpath(exec_prefix, "lib-dynload");
+         return 1;
+     }
+@@ -338,7 +339,7 @@ search_for_exec_prefix(char *argv0_path,
+     copy_absolute(exec_prefix, argv0_path);
+     do {
+         n = strlen(exec_prefix);
+-        joinpath(exec_prefix, lib_python);
++        joinpath(exec_prefix, lib_exec_python);
+         joinpath(exec_prefix, "lib-dynload");
+         if (isdir(exec_prefix))
+             return 1;
+@@ -348,7 +349,7 @@ search_for_exec_prefix(char *argv0_path,
+ 
+     /* Look at configure's EXEC_PREFIX */
+     strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
+-    joinpath(exec_prefix, lib_python);
++    joinpath(exec_prefix, lib_exec_python);
+     joinpath(exec_prefix, "lib-dynload");
+     if (isdir(exec_prefix))
+         return 1;
+@@ -525,7 +526,7 @@ calculate_path(void)
              fprintf(stderr,
                  "Could not find platform dependent libraries <exec_prefix>\n");
          strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
@@ -121,17 +151,8 @@ diff -Naurp Python-2.4.orig/Modules/getpath.c Python-2.4/Modules/getpath.c
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
-diff -Naurp Python-2.4.orig/setup.py Python-2.4/setup.py
---- Python-2.4.orig/setup.py	2005-02-07 12:11:30.000000000 -0800
-+++ Python-2.4/setup.py	2005-02-07 12:25:21.746978894 -0800
-@@ -248,6 +248,7 @@ class PyBuildExt(build_ext):
-         global disable_ssl
-         # Ensure that /usr/local is always used
-         add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/@@GENTOO_LIBDIR@@')
-         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- 
-         # Add paths to popular package managers on OS X/darwin
+--- Python-2.4.1/setup.py
++++ Python-2.4.1/setup.py
 @@ -274,7 +275,7 @@ class PyBuildExt(build_ext):
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
@@ -155,7 +176,7 @@ diff -Naurp Python-2.4.orig/setup.py Python-2.4/setup.py
                                     libraries=readline_libs) )
          if platform not in ['mac']:
              # crypt module.
-@@ -996,7 +997,7 @@ class PyBuildExt(build_ext):
+@@ -1015,7 +1016,7 @@ class PyBuildExt(build_ext):
              added_lib_dirs.append('/usr/openwin/lib')
          elif os.path.exists('/usr/X11R6/include'):
              include_dirs.append('/usr/X11R6/include')
diff --git a/dev-lang/python/files/python-config-2.2 b/dev-lang/python/files/python-config-2.2
index 253285032259..056b27125ae9 100644
--- a/dev-lang/python/files/python-config-2.2
+++ b/dev-lang/python/files/python-config-2.2
@@ -1,3 +1,3 @@
 #!/usr/bin/python
 import distutils.sysconfig, string
-print "-lpython2.2",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
+print "-lpython2.2 -lm -L/usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
diff --git a/dev-lang/python/files/python-config-2.2.1 b/dev-lang/python/files/python-config-2.2.1
index 2bcfdae49fb8..056b27125ae9 100644
--- a/dev-lang/python/files/python-config-2.2.1
+++ b/dev-lang/python/files/python-config-2.2.1
@@ -1,3 +1,3 @@
 #!/usr/bin/python
 import distutils.sysconfig, string
-print "-lpython2.2 -L /usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
+print "-lpython2.2 -lm -L/usr/lib/python2.2/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS")))
diff --git a/dev-lang/python/files/python-updater b/dev-lang/python/files/python-updater
index 95662876e54f..ca6ef7d4364e 100644
--- a/dev-lang/python/files/python-updater
+++ b/dev-lang/python/files/python-updater
@@ -21,13 +21,11 @@
 # PKGS_MASKED     = list of packages that are installed, but masked.
 #
 
-OLD_PY_VER=2.2
 NEW_PY_VER=$(python -V 2>&1 | sed 's:Python ::' | cut -d. -f1-2)
-OLD_MODULES_DIR=/usr/lib/python${OLD_PY_VER}
 
-PKGS_EXCEPTIONS="dev-lang/python"
+PKGS_EXCEPTIONS="dev-lang/python sys-apps/portage"
 PKGS_MANUAL="app-office/gnumeric app-office/dia x11-libs/vte"
-LOGFILE="/tmp/python-updater.log"
+LOGFILE="/var/log/python-updater.log"
 
 # portage variables
 PKG_DBDIR=/var/db/pkg
@@ -37,12 +35,31 @@ PORTDIR_OVERLAYS=`portageq portdir_overlay`
 PRETEND=0
 PKGS_TO_REMERGE=""
 PKGS_COUNT_REMERGE=0
+PORTAGE_PYTHON="/usr/bin/python"
 
 # load the gentoo-style info macros, but hack to get around
 # it thinking this is an rc script
 EBUILD="1" 
 source /sbin/functions.sh
 
+
+
+for old in 2.4 2.3 2.2 2.1; do
+	if [ "${old}" != "${NEW_PY_VER}" ]; then
+		if [ -e /usr/bin/python${old} ] ; then
+			OLD_PY_VER=${old}
+			break;
+		fi
+	fi
+done
+
+
+if [ -z "${OLD_PY_VER}" ] ; then
+    eerror "Can't determine any previous Python version(s)."
+    exit 1
+fi
+
+
 # misc helper functions
 eloginfo() {
 	einfo $*
@@ -60,34 +77,88 @@ elogecho() {
 elogerr() {
 	eerror $*
 	DATESTRING=`date +"%Y/%m/%d %H:%M:%S"`
-	echo "${DATESTRING} ! ${*}" >> ${LOGFILE}	
+	echo "${DATESTRING} ! ${*}" >> ${LOGFILE} 
 }
 
 elog() {
 	DATESTRING=`date +"%Y/%m/%d %H:%M:%S"`
-	echo "${DATESTRING} - ${*}" >> ${LOGFILE}	
+	echo "${DATESTRING} - ${*}" >> ${LOGFILE}
+}
+
+
+usage() {
+	echo "usage: python-updater [-h|-p|-o X.X|-n X.X]"
+	echo " -h      help"
+	echo " -p      pretend (don't do anything)"
+	echo " -o X.X  set old python version to upgrade from [default: ${OLD_PY_VER}]"
+	echo " -n X.X  set new python version to upgrade to [default: ${NEW_PY_VER}]"
 }
 
+#
+# Sanity check
+#
+
+if [ -z "${PORTDIR}" ]; then
+	eerror "Unable to proceed. Can not find PORTDIR. Make sure the command:"
+	eerror " "
+	eerror "  portageq portdir"
+	eerror " "
+	eerror "returns a value. If it doesn't, make sure you have updated to"
+	eerror "latest portage version."
+	eerror " "
+	eerror "Report bugs to http://bugs.gentoo.org/"
+	exit 1
+fi	
+
+if [ ! -f ${LOGFILE} ]; then
+	if ! touch ${LOGFILE} 2>&1 > /dev/null; then
+		ewarn "Logging disabled due to permissions"
+		LOGFILE=/dev/null
+	fi
+elif [ ! -w ${LOGFILE} -o ! -L ${LOGFILE} ]; then
+	ewarn "Logging disabled due to permissions"
+	LOGFILE=/dev/null
+fi
+
 # 
 #
 # Command Line Parsing
 #
 #
-
-if [ -n "$1" ]; then
+while [ -n "$1" ]; do
 	case "$1" in
-		-h) 
-			echo "usage: python-updater [-h|-p]"
-			echo " -h    help"
-			echo " -p    pretend (don't do anything)"
+		-h)
+			usage
+			exit 0
 			;;
 		-p)
 			PRETEND=1
 			;;
+		-o)
+			shift
+			OLD_PY_VER="$1"
+			;;
+		-n)
+			shift
+			NEW_PY_VER="$1"
+			;;
 		*)
+			usage
+			echo "unrecognised option: $1"
 			;;
 	esac
-fi	
+	shift
+done
+
+#
+# Test where portage is, in python2.2 or somewhere else?
+#
+for py in /usr/bin/python /usr/bin/python${OLD_PY_VER} /usr/bin/python${NEW_PY_VER}; do
+	if ${py} -c "import portage"; then
+		PORTAGE_PYTHON=${py}
+		break;
+	fi
+done
 
 #
 #
@@ -95,9 +166,11 @@ fi
 # /usr/lib/python${OLD_PY_VER}
 #
 #
+OLD_MODULES_DIRS="/usr/lib/python${OLD_PY_VER} /usr/lib32/python${OLD_PY_VER} /usr/lib64/python${OLD_PY_VER}"
+OLD_INCLUDE_DIR=/usr/include/python${OLD_PY_VER}
 
 eloginfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :"
-eloginfo "Searching for packages with files in ${OLD_MODULES_DIR} .."
+eloginfo "Searching for packages with files in ${OLD_MODULES_DIRS} .."
 
 # iterate thru all the installed package's contents
 for content in `find ${PKG_DBDIR} -name CONTENTS`; do
@@ -117,10 +190,14 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do
        continue;
     fi
 
-    if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then
-       PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}"
-	   elogecho "Adding to list: ${CATPKGVER}"
-    fi
+    for OLD_MODULES_DIR in ${OLD_MODULES_DIRS}; do
+        if fgrep "${OLD_MODULES_DIR}" ${content} > /dev/null; then
+            PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}"
+	    elogecho "Adding to list: ${CATPKGVER}"
+	elif fgrep "${OLD_INCLUDE_DIR}" ${content} > /dev/null; then
+            PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}"
+        fi
+    done
 done    
 
 # now we have to do each emerge seperately because if an installed version
@@ -150,19 +227,14 @@ for pkg in ${PKGS_TO_REMERGE}; do
 done      
 
 #
-# Check the actual order which these should be merged (probably doesn't work)
+# Use my super dumb package reordering algorithm that works most of the time
 #
 
 eloginfo "Re-ordering packages to merge .."
 
-PKGS_OK_SORTED_CMD="emerge -p " 
-for pkg in $PKGS_OK; do
-	PKGS_OK_SORTED_CMD="${PKGS_OK_SORTED_CMD} =$pkg"
-done
-PKGS_OK_SORTED_CMD="${PKGS_OK_SORTED_CMD}"
+PKGS_OK_SORTED="$(${PORTAGE_PYTHON} ${PORTDIR}/dev-lang/python/files/depreorder.py ${PKGS_OK} | xargs)"
 
 eloginfo "Preparing to merge these packages in this order:"
-PKGS_OK_SORTED="`${PKGS_OK_SORTED_CMD}  | grep ebuild | sed 's:\[ebuild.*\] ::'`"
 for pkg in $PKGS_OK_SORTED; do
 	elogecho "$pkg"
 done
@@ -173,7 +245,7 @@ done
 COUNT=1
 PKGS_FAILED=""
 if [ "${PRETEND}" != "1" ]; then
-	for pkg in ${PKGS_OK}; do
+	for pkg in ${PKGS_OK_SORTED}; do
 		eloginfo "Starting to merge ($COUNT/$PKGS_COUNT_REMERGE) $pkg .."
 		if ! emerge --oneshot --nodeps =$pkg; then
 			PKGS_FAILED="${PKGS_FAILED} $pkg"
@@ -192,39 +264,42 @@ OUTPUT_PKGS_FAILED=""
 for pkg in ${PKGS_FAILED}; do OUTPUT_PKGS_FAILED="${OUTPUT_PKGS_FAILED} \=$pkg"; done
 
 if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
+   echo
    ewarn "************************************************************"
    ewarn "* Packages that still need to be manually emerged :        *"
    ewarn "************************************************************"
    if [ -n "${OUTPUT_PKGS_MASKED}" ]; then
+      echo
       ewarn " Masked Packages:"
 	  ewarn " ----------------"
       ewarn " Unmask the following packages (at your own risk) and  "
       ewarn " emerge them using this command after removing the '-p'"
       ewarn " parameter."
-      ewarn ""
+      echo
       ewarn " emerge -p ${OUTPUT_PKGS_MASKED}"
-      ewarn ""
+      echo
    fi
    if [ -n "${OUTPUT_PKGS_MISSING}" ]; then
+      echo
       ewarn " Missing Packages:"
 	  ewarn " -----------------"
       ewarn " These packages need to be updated because their versions do"
       ewarn " not exist in portage anymore."
-      ewarn ""
+      echo
       for x in ${OUTPUT_PKGS_MISSING}; do 
          echo "   ${x}"
       done
-      ewarn ""
    fi
    if [ -n "${OUTPUT_PKGS_FAILED}" ]; then
+      echo
       ewarn " Failed Packaged:"
 	  ewarn " ----------------"
       ewarn " These packages have failed and need to be re-emerged again."
 	  ewarn " Alternatively, try re-running this script again to see if it"
 	  ewarn " can be fixed."
-      ewarn ""
+      echo
       ewarn " emerge -p ${OUTPUT_PKGS_FAILED}"
-      ewarn ""
+      echo
    fi
    
    elog "Python update completed with errors."
@@ -244,3 +319,4 @@ if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
 else
    eloginfo "Python update completed successfully."
 fi
+
diff --git a/dev-lang/python/python-2.1.3-r1.ebuild b/dev-lang/python/python-2.1.3-r1.ebuild
index 90029d837612..ca8593b1bf4c 100644
--- a/dev-lang/python/python-2.1.3-r1.ebuild
+++ b/dev-lang/python/python-2.1.3-r1.ebuild
@@ -1,28 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.1 2002/07/03 03:24:19 jnelson Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:40 chriswhite Exp $
 
-PYVER_MAJOR="`echo ${PV} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV} | cut -d '.' -f 2`"
+inherit versionator
+
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 S=${WORKDIR}/Python-${PV}
+
 DESCRIPTION="A really great language"
+HOMEPAGE="http://www.python.org"
 SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz"
 
-HOMEPAGE="http://www.python.org"
 LICENSE="PSF-2.1.1"
+SLOT="2.1"
+KEYWORDS="x86 sparc alpha ia64 ppc"
+IUSE="readline tcltk berkdb"
 
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
+DEPEND=">=sys-libs/zlib-1.1.3
 	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
 	berkdb? ( >=sys-libs/db-3 )
 	tcltk? ( >=dev-lang/tk-8.0 )"
-RDEPEND="$DEPEND"
 
 # The dev-python/python-fchksum RDEPEND is needed to that this python provides
 # the functionality expected from previous pythons.
 
-PROVIDE="virtual/python-2.1"
-SLOT="2.1"
+PROVIDE="virtual/python"
 
 src_compile() {
 	export OPT="$CFLAGS"
@@ -31,10 +35,10 @@ src_compile() {
 	t=${S}/Makefile.pre.in
 	cp $t $t.orig || die
 	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' $t.orig > $t
-        
+
 	local myopts
 	#if we are creating a new build image, we remove the dependency on g++
-	
+
 	econf --with-fpectl \
 		--with-threads \
 		--infodir='${prefix}'/share/info \
@@ -63,7 +67,7 @@ src_install() {
 	# If USE tcltk lets install idle
 	# Need to script the python version in the path
 	if use tcltk; then
-		mkdir "${D}/usr/lib/python${PYVER}/tools"
+		dodir /usr/lib/python${PYVER}/tools
 		mv "${S}/Tools/idle" "${D}/usr/lib/python${PYVER}/tools/"
 		dosym /usr/lib/python${PYVER}/tools/idle/idle.py /usr/bin/idle-${PV}.py
 	fi
diff --git a/dev-lang/python/python-2.2.3-r6.ebuild b/dev-lang/python/python-2.2.3-r6.ebuild
index 5352533d4833..4e6ce287b754 100644
--- a/dev-lang/python/python-2.2.3-r6.ebuild
+++ b/dev-lang/python/python-2.2.3-r6.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/dev-lang/python/python-2.2.3-r6.ebuild,v 1.1 2005/02/07 04:28:20 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2.3-r6.ebuild,v 1.1.1.1 2005/11/30 09:58:39 chriswhite Exp $
 
-inherit flag-o-matic eutils python
+inherit flag-o-matic eutils python versionator
 
-IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tcltk"
-
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
 S="${WORKDIR}/Python-${PV}"
 DESCRIPTION="A really great language"
+HOMEPAGE="http://www.python.org"
 SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tgz"
 
-HOMEPAGE="http://www.python.org"
 LICENSE="PSF-2.2"
+SLOT="2.2"
 KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64 ppc64"
+IUSE="berkdb bootstrap build doc gdbm ncurses readline ssl tcltk nocxx"
 
-DEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.3
+DEPEND=">=sys-libs/zlib-1.1.3
 	!build? ( 	tcltk? ( >=dev-lang/tk-8.0 )
 				ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
 				berkdb? ( >=sys-libs/db-3 )
@@ -36,8 +35,6 @@ RDEPEND="${DEPEND} dev-python/python-fchksum"
 
 PROVIDE="virtual/python"
 
-SLOT="2.2"
-
 src_unpack() {
 	unpack ${A}
 	#Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05)
@@ -85,7 +82,7 @@ src_compile() {
 
 	local myopts
 	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap
+	if use build && ! use bootstrap || use nocxx
 	then
 		myopts="--with-cxx=no"
 	fi
diff --git a/dev-lang/python/python-2.3.4-r1.ebuild b/dev-lang/python/python-2.3.4-r1.ebuild
index c9938f663854..5b74f263290b 100644
--- a/dev-lang/python/python-2.3.4-r1.ebuild
+++ b/dev-lang/python/python-2.3.4-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/dev-lang/python/python-2.3.4-r1.ebuild,v 1.1 2005/02/07 04:28:20 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:41 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage 
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-inherit eutils flag-o-matic python
+inherit eutils flag-o-matic python versionator
 
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
 S="${WORKDIR}/Python-${PV}"
@@ -20,11 +20,10 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ~ppc s390 sh sparc x86"
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86 ppc64"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
-DEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.3
+DEPEND=">=sys-libs/zlib-1.1.3
 	!build? (
 		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
 		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
@@ -35,7 +34,9 @@ DEPEND="virtual/libc
 		dev-libs/expat
 	)"
 
-RDEPEND="${DEPEND} dev-python/python-fchksum"
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+
+PDEPEND="${DEPEND} dev-python/python-fchksum"
 
 # The dev-python/python-fchksum RDEPEND is needed to that this python provides
 # the functionality expected from previous pythons.
@@ -103,7 +104,7 @@ src_compile() {
 
 	local myconf
 	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap; then
+	if use build && ! use bootstrap || use nocxx ; then
 		myconf="--with-cxx=no"
 	fi
 
@@ -122,7 +123,7 @@ src_compile() {
 		--infodir='${prefix}'/share/info \
 		--mandir='${prefix}'/share/man \
 		--with-threads \
-		--with-cxx=no \
+		--with-libc='' \
 		${myconf} || die
 	emake || die "Parallel make failed"
 }
@@ -163,7 +164,7 @@ src_install() {
 	if use build ; then
 		rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test}
 	else
-		use uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test}
+		use elibc_uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test}
 		use berkdb || rm -rf ${D}/usr/lib/python2.3/bsddb
 		( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python2.3/lib-tk
 	fi
diff --git a/dev-lang/python/python-2.3.5-r1.ebuild b/dev-lang/python/python-2.3.5-r1.ebuild
index 783cec9c3cd4..d505291c4ffa 100644
--- a/dev-lang/python/python-2.3.5-r1.ebuild
+++ b/dev-lang/python/python-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/dev-lang/python/python-2.3.5-r1.ebuild,v 1.1 2005/06/16 21:19:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:39 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -41,7 +41,9 @@ DEPEND=">=sys-libs/zlib-1.1.3
 #       it to compile python. We just need to ensure that when we install
 #       python, we definitely have fchksum support. - liquidx
 
-RDEPEND="${DEPEND} dev-python/python-fchksum"
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+
+PDEPEND="${DEPEND} dev-python/python-fchksum"
 
 
 PROVIDE="virtual/python"
diff --git a/dev-lang/python/python-2.3.5-r2.ebuild b/dev-lang/python/python-2.3.5-r2.ebuild
index cf8a7b3e5339..0cf5e14eb29d 100644
--- a/dev-lang/python/python-2.3.5-r2.ebuild
+++ b/dev-lang/python/python-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/dev-lang/python/python-2.3.5-r2.ebuild,v 1.1 2005/09/08 21:31:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:40 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -20,7 +20,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-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="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
 DEPEND=">=sys-libs/zlib-1.1.3
@@ -220,7 +220,7 @@ src_test() {
 
 	#skip all tests that fail during emerge but pass without emerge:
 	#(See bug# 67970)
-	local skip_tests="subprocess tcl urllib urllib2"
+	local skip_tests="global mimetools mmap strptime subprocess tcl time urllib urllib2 zipimport"
 
 	for test in ${skip_tests} ; do
 		mv ${S}/Lib/test/test_${test}.py ${T}
diff --git a/dev-lang/python/python-2.3.5.ebuild b/dev-lang/python/python-2.3.5.ebuild
index fed0b2f015da..0960f3dd5309 100644
--- a/dev-lang/python/python-2.3.5.ebuild
+++ b/dev-lang/python/python-2.3.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/dev-lang/python/python-2.3.5.ebuild,v 1.1 2005/02/17 18:19:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.1.1.1 2005/11/30 09:58:41 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-inherit eutils flag-o-matic python
+inherit eutils flag-o-matic python versionator
 
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
 S="${WORKDIR}/Python-${PV}"
@@ -20,11 +20,10 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_*}/Python-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
-DEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.3
+DEPEND=">=sys-libs/zlib-1.1.3
 	!build? (
 		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
 		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
@@ -35,16 +34,27 @@ DEPEND="virtual/libc
 		dev-libs/expat
 	)"
 
-RDEPEND="${DEPEND} dev-python/python-fchksum"
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
+#       provides the functionality expected from previous pythons.
+
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
+
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+
+PDEPEND="${DEPEND} dev-python/python-fchksum"
 
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
 
 PROVIDE="virtual/python"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# fix readline detection problems due to missing termcap (#79013)
+	epatch ${FILESDIR}/${PN}-2.3-readline.patch
+
 	sed -ie 's/OpenBSD\/3.\[01234/OpenBSD\/3.\[012345/' configure || die "OpenBSD sed failed"
 	# adds /usr/lib/portage/pym to sys.path - liquidx (08 Oct 03)
 	# prepends /usr/lib/portage/pym to sys.path - liquidx (12 Apr 04)
@@ -55,8 +65,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.3.2-disable_modules_and_ssl.patch
 	epatch ${FILESDIR}/${PN}-2.3-mimetypes_apache.patch
 	epatch ${FILESDIR}/${PN}-2.3-db4.2.patch
+
 	# installs to lib64
-	[ "${CONF_LIBDIR}" == "lib64" ] && epatch ${FILESDIR}/python-2.3.4-lib64.patch
+	[ "$(get_libdir)" == "lib64" ] && epatch ${FILESDIR}/python-2.3.4-lib64.patch
 	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
 	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
 }
@@ -100,7 +111,7 @@ src_compile() {
 
 	local myconf
 	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap; then
+	if use build && ! use bootstrap || use nocxx ; then
 		myconf="--with-cxx=no"
 	fi
 
@@ -119,38 +130,11 @@ src_compile() {
 		--infodir='${prefix}'/share/info \
 		--mandir='${prefix}'/share/man \
 		--with-threads \
-		--with-cxx=no \
+		--with-libc='' \
 		${myconf} || die
 	emake || die "Parallel make failed"
 }
 
-src_test() {
-	local skip_tests="import sax"
-	#Move known bad tests out of the way while we run good ones
-	for test in ${skip_tests} ; do
-		mv ${S}/Lib/test/test_${test}.py ${T}
-	done
-
-	make test || die "make test failed"
-
-	#Move bad tests back so they get emerged
-	for test in ${skip_tests} ; do
-		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
-	done
-
-	einfo "Portage skipped the following tests which aren't able to run from emerge:"
-	for test in ${skip_tests} ; do
-		einfo "test_${test}.py"
-	done
-	einfo "These tests normally pass when not run from emerge."
-	einfo "If you'd like to run them, you may:"
-	einfo "cd /usr/lib/python${PYVER}/test"
-	einfo "and run the tests separately."
-	einfo "See bug# 67970"
-	ebeep 2
-}
-
-
 src_install() {
 	dodir /usr
 	src_configure
@@ -165,50 +149,38 @@ src_install() {
 
 	# seems like the build do not install Makefile.pre.in anymore
 	# it probably shouldn't - use DistUtils, people!
-	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
-		insinto /usr/lib64/python${PYVER}/config
-	else
-		insinto /usr/lib/python${PYVER}/config
-	fi
+	insinto /usr/$(get_libdir)/python${PYVER}/config
 	doins ${S}/Makefile.pre.in
 
 	# While we're working on the config stuff... Let's fix the OPT var
 	# so that it doesn't have any opts listed in it. Prevents the problem
 	# with compiling things with conflicting opts later.
-	if [ "${CONF_LIBDIR}" == "lib64" ] ;then
-		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib64/python${PYVER}/config/Makefile
-	else
-		dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/lib/python${PYVER}/config/Makefile
-	fi
+	dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' /usr/$(get_libdir)/python${PYVER}/config/Makefile
 
 	# install python-updater in /usr/sbin
 	dosbin ${FILESDIR}/python-updater
 
 	if use build ; then
-		rm -rf ${D}/usr/lib/python2.3/{test,encodings,email,lib-tk,bsddb/test}
+		rm -rf ${D}/usr/$(get_libdir)/python2.3/{test,encodings,email,lib-tk,bsddb/test}
 	else
-		use uclibc && rm -rf ${D}/usr/lib/python2.3/{test,bsddb/test}
-		use berkdb || rm -rf ${D}/usr/lib/python2.3/bsddb
-		( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python2.3/lib-tk
+		use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python2.3/{test,bsddb/test}
+		use berkdb || rm -rf ${D}/usr/$(get_libdir)/python2.3/bsddb
+		( use !X || use !tcltk ) && rm -rf ${D}/usr/$(get_libdir)/python2.3/lib-tk
 	fi
 }
 
 pkg_postrm() {
 	python_makesym
-	python_mod_cleanup /usr/lib/python2.3
-	[ "${CONF_LIBDIR}" == "lib64" ] && python_mod_cleanup /usr/lib64/python2.3
+	python_mod_cleanup /usr/$(get_libdir)/python2.3
 }
 
 pkg_postinst() {
 	local myroot
 	myroot=$(echo $ROOT | sed 's:/$::')
 
-
 	python_makesym
 	python_mod_optimize
-	python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER}
-	[ "${CONF_LIBDIR}" == "lib64" ] && \
-		python_mod_optimize -x site-packages -x test ${myroot}/usr/lib64/python${PYVER}
+	python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER}
 
 	# workaround possible python-upgrade-breaks-portage situation
 	if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then
@@ -235,3 +207,32 @@ pkg_postinst() {
 	ewarn
 	ebeep 5
 }
+
+src_test() {
+	# PYTHON_DONTCOMPILE=1 breaks test_import
+	unset PYTHON_DONTCOMPILE
+
+	#skip all tests that fail during emerge but pass without emerge:
+	#(See bug# 67970)
+	local skip_tests="subprocess tcl urllib urllib2"
+
+	for test in ${skip_tests} ; do
+		mv ${S}/Lib/test/test_${test}.py ${T}
+	done
+
+	make test || die "make test failed"
+
+	for test in ${skip_tests} ; do
+		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
+	done
+
+	einfo "Portage skipped the following tests which aren't able to run from emerge:"
+	for test in ${skip_tests} ; do
+		einfo "test_${test}.py"
+	done
+
+	einfo "If you'd like to run them, you may:"
+	einfo "cd /usr/lib/python${PYVER}/test"
+	einfo "and run the tests separately."
+}
+
diff --git a/dev-lang/python/python-2.4-r3.ebuild b/dev-lang/python/python-2.4-r3.ebuild
index be1a9539cc6f..9b82bec46714 100644
--- a/dev-lang/python/python-2.4-r3.ebuild
+++ b/dev-lang/python/python-2.4-r3.ebuild
@@ -1,31 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.1 2005/03/19 17:51:20 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.1.1.1 2005/11/30 09:58:40 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-inherit eutils flag-o-matic python multilib
+inherit eutils flag-o-matic python multilib versionator
 
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="A really great language"
+HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.python.org"
 
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
 LICENSE="PSF-2.2"
 SLOT="2.4"
-
 KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
-DEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.3
+DEPEND=">=sys-libs/zlib-1.1.3
 	!build? (
 		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
 		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
@@ -36,16 +34,24 @@ DEPEND="virtual/libc
 		dev-libs/expat
 	)"
 
-RDEPEND="${DEPEND} dev-python/python-fchksum"
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
+#       provides the functionality expected from previous pythons.
+
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
 
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
+RDEPEND="${DEPEND} 	dev-python/python-fchksum"
 
 PROVIDE="virtual/python"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# unnecessary termcap dep in readline (#79013)
+	epatch ${FILESDIR}/${PN}-2.4-readline.patch
+
 	#Fixes security vulnerability in XML-RPC server - pythonhead (06 Feb 05)
 	#http://www.python.org/security/PSF-2005-001/
 	epatch ${FILESDIR}/${PN}-2.4-xmlrpc.patch
@@ -68,6 +74,11 @@ src_unpack() {
 		Modules/Setup.dist \
 		Modules/getpath.c \
 		setup.py
+
+	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
+	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
+
 }
 
 src_configure() {
@@ -109,7 +120,7 @@ src_compile() {
 
 	local myconf
 	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap; then
+	if use build && ! use bootstrap || use nocxx ; then
 		myconf="--with-cxx=no"
 	fi
 
@@ -161,7 +172,7 @@ src_install() {
 	if use build ; then
 		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
 	else
-		use uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
+		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
 		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
 		( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python${PYVER}/lib-tk
 	fi
diff --git a/dev-lang/python/python-2.4.1-r1.ebuild b/dev-lang/python/python-2.4.1-r1.ebuild
index 3f88e2e866bc..fd0a61cc68fd 100644
--- a/dev-lang/python/python-2.4.1-r1.ebuild
+++ b/dev-lang/python/python-2.4.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.1 2005/06/16 21:19:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:40 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-inherit eutils flag-o-matic python multilib versionator
+inherit eutils flag-o-matic python multilib versionator toolchain-funcs
 
 # we need this so that we don't depends on python.eclass
 PYVER_MAJOR=$(get_major_version)
@@ -22,7 +22,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
 DEPEND=">=sys-libs/zlib-1.1.3
@@ -44,7 +44,9 @@ DEPEND=">=sys-libs/zlib-1.1.3
 #       it to compile python. We just need to ensure that when we install
 #       python, we definitely have fchksum support. - liquidx
 
-RDEPEND="${DEPEND} 	dev-python/python-fchksum"
+# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri
+
+PDEPEND="${DEPEND} 	dev-python/python-fchksum"
 
 PROVIDE="virtual/python"
 
@@ -74,10 +76,20 @@ src_unpack() {
 		Makefile.pre.in \
 		Modules/Setup.dist \
 		Modules/getpath.c \
-		setup.py
+		setup.py || die
 
 	# add support for struct stat st_flags attribute (bug 94637)
-	epatch ${FILESDIR}/python-2.3.5-st_flags.patch
+	epatch ${FILESDIR}/python-2.4.1-st_flags.patch
+
+	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
+	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
+
+
+	if tc-is-cross-compiler ; then
+		epatch "${FILESDIR}"/python-2.4.1-bindir-libdir.patch
+		epatch "${FILESDIR}"/python-2.4.1-crosscompile.patch
+	fi
 }
 
 src_configure() {
@@ -133,7 +145,22 @@ src_compile() {
 
 	src_configure
 
-	econf --with-fpectl \
+	if tc-is-cross-compiler ; then
+		OPT="-O1" LDFLAGS="" \
+		./configure --with-cxx=no || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
+			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
+			Makefile.pre.in || die
+	fi
+
+	tc-export CXX
+	econf \
+		--with-fpectl \
 		--enable-shared \
 		`use_enable ipv6` \
 		--infodir='${prefix}'/share/info \
@@ -236,7 +263,7 @@ src_test() {
 
 	#skip all tests that fail during emerge but pass without emerge:
 	#(See bug# 67970)
-	local skip_tests="subprocess tcl urllib urllib2"
+	local skip_tests="distutils global mimetools minidom mmap strptime subprocess tcl time urllib urllib2"
 
 	for test in ${skip_tests} ; do
 		mv ${S}/Lib/test/test_${test}.py ${T}
diff --git a/dev-lang/python/python-2.4.1.ebuild b/dev-lang/python/python-2.4.1.ebuild
index 0545ff557b0b..43c7edaf983f 100644
--- a/dev-lang/python/python-2.4.1.ebuild
+++ b/dev-lang/python/python-2.4.1.ebuild
@@ -1,33 +1,31 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.1 2005/04/27 12:18:26 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:40 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
 #   in dev-lang/python. It _WILL_ stop people installing from
 #   Gentoo 1.4 images.
 
-inherit eutils flag-o-matic python multilib
+inherit eutils flag-o-matic python multilib versionator
 
 # we need this so that we don't depends on python.eclass
-PYVER_MAJOR="`echo ${PV%_*} | cut -d '.' -f 1`"
-PYVER_MINOR="`echo ${PV%_*} | cut -d '.' -f 2`"
+PYVER_MAJOR=$(get_major_version)
+PYVER_MINOR=$(get_version_component_range 2)
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Python is an interpreted, interactive, object-orientated programming language."
+HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.python.org"
 
-IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X uclibc"
 LICENSE="PSF-2.2"
 SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sparc ~x86"
+IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips"
-
-DEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.3
+DEPEND=">=sys-libs/zlib-1.1.3
 	!dev-python/cjkcodecs
 	!build? (
 		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
@@ -77,6 +75,12 @@ src_unpack() {
 		Modules/Setup.dist \
 		Modules/getpath.c \
 		setup.py
+
+
+	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
+	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
+
 }
 
 src_configure() {
@@ -105,8 +109,9 @@ src_configure() {
 src_compile() {
 	filter-flags -malign-double
 
+	# Seems to no longer be necessary
+	#[ "${ARCH}" = "amd64" ] && append-flags -fPIC
 	[ "${ARCH}" = "alpha" ] && append-flags -fPIC
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
 
 	# http://bugs.gentoo.org/show_bug.cgi?id=50309
 	if is-flag -O3; then
@@ -118,7 +123,7 @@ src_compile() {
 
 	local myconf
 	#if we are creating a new build image, we remove the dependency on g++
-	if use build && ! use bootstrap; then
+	if use build && ! use bootstrap || use nocxx ; then
 		myconf="--with-cxx=no"
 	fi
 
@@ -137,6 +142,7 @@ src_compile() {
 		--infodir='${prefix}'/share/info \
 		--mandir='${prefix}'/share/man \
 		--with-threads \
+		--with-libc='' \
 		${myconf} || die
 	emake || die "Parallel make failed"
 }
@@ -150,6 +156,9 @@ src_install() {
 	exeinto /usr/bin
 	newexe ${FILESDIR}/python-config-${PYVER} python-config
 
+	# Use correct libdir in python-config
+	dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config
+
 	# The stuff below this line extends from 2.1, and should be deprecated
 	# in 2.3, or possibly can wait till 2.4
 
@@ -170,7 +179,7 @@ src_install() {
 	if use build ; then
 		rm -rf ${D}/usr/lib/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
 	else
-		use uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
+		use elibc_uclibc && rm -rf ${D}/usr/lib/python${PYVER}/{test,bsddb/test}
 		use berkdb || rm -rf ${D}/usr/lib/python${PYVER}/bsddb
 		( use !X || use !tcltk ) && rm -rf ${D}/usr/lib/python${PYVER}/lib-tk
 	fi
@@ -224,3 +233,30 @@ pkg_postinst() {
 	ebeep 5
 }
 
+src_test() {
+	# PYTHON_DONTCOMPILE=1 breaks test_import
+	unset PYTHON_DONTCOMPILE
+
+	#skip all tests that fail during emerge but pass without emerge:
+	#(See bug# 67970)
+	local skip_tests="subprocess tcl urllib urllib2"
+
+	for test in ${skip_tests} ; do
+		mv ${S}/Lib/test/test_${test}.py ${T}
+	done
+
+	make test || die "make test failed"
+
+	for test in ${skip_tests} ; do
+		mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py
+	done
+
+	einfo "Portage skipped the following tests which aren't able to run from emerge:"
+	for test in ${skip_tests} ; do
+		einfo "test_${test}.py"
+	done
+
+	einfo "If you'd like to run them, you may:"
+	einfo "cd /usr/lib/python${PYVER}/test"
+	einfo "and run the tests separately."
+}
diff --git a/dev-lang/python/python-2.4.2.ebuild b/dev-lang/python/python-2.4.2.ebuild
index 5a1e4b665871..e7f7b3e76235 100644
--- a/dev-lang/python/python-2.4.2.ebuild
+++ b/dev-lang/python/python-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.1 2005/09/28 18:13:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.1.1.1 2005/11/30 09:58:39 chriswhite Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -22,7 +22,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc64 s390 sh sparc x86"
 IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X nocxx"
 
 DEPEND=">=sys-libs/zlib-1.1.3
@@ -54,7 +54,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	echo "her er vi.. $(pwd)"
 	# unnecessary termcap dep in readline (#79013)
 	epatch ${FILESDIR}/${PN}-2.4.2-readline.patch
 	# db4.2 support
@@ -82,6 +81,11 @@ src_unpack() {
 	# add support for struct stat st_flags attribute (bug 94637)
 	epatch ${FILESDIR}/python-2.4.1-st_flags.patch
 
+	# fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04)
+	# PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!!
+	[ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure
+
+
 	if tc-is-cross-compiler ; then
 		epatch "${FILESDIR}"/python-2.4.1-bindir-libdir.patch
 		epatch "${FILESDIR}"/python-2.4.1-crosscompile.patch
@@ -259,7 +263,7 @@ src_test() {
 
 	#skip all tests that fail during emerge but pass without emerge:
 	#(See bug# 67970)
-	local skip_tests="subprocess tcl urllib urllib2"
+	local skip_tests="distutils global mimetools minidom mmap strptime subprocess tcl time urllib urllib2"
 
 	for test in ${skip_tests} ; do
 		mv ${S}/Lib/test/test_${test}.py ${T}
diff --git a/dev-lang/regina-rexx/ChangeLog b/dev-lang/regina-rexx/ChangeLog
index a3bb2591e295..c32d3b806bc6 100644
--- a/dev-lang/regina-rexx/ChangeLog
+++ b/dev-lang/regina-rexx/ChangeLog
@@ -1,8 +1,41 @@
 # ChangeLog for dev-lang/regina-rexx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/ChangeLog,v 1.1 2002/07/20 03:49:46 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/ChangeLog,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
-*regina-rexx-3.0.1.ebuild (19 Jul 2002)
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org> regina-rexx-3.0.1.ebuild,
+  regina-rexx-3.3.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.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  regina-rexx-3.0.1.ebuild:
+  Stable on ppc.
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> regina-rexx-3.3.ebuild:
+  added ~amd64 to KEYWORDS, fixes #73948
+
+  16 Oct 2004; Guy Martin <gmsoft@gentoo.org> regina-rexx-3.3.ebuild:
+  Stable on hppa.
+
+*regina-rexx-3.3 (17 May 2004)
+
+  17 May 2004; David Holm <dholm@gentoo.org> +metadata.xml,
+  +regina-rexx-3.3.ebuild:
+  Version bumped, and added to ~ppc.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> regina-rexx-3.0.1.ebuild:
+  Add die following econf for bug 48950
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*regina-rexx-3.0.1 (19 Jul 2002)
+
+  07 Nov 2002; Seemant Kulleen <seemant@gentoo.org> regina-rexx-3.0.1.ebuild :
+
+  Added app-arch/unzip to DEPEND to close bug #10382 by:
+  gaffesevens@cswebmail.com (Geoff Stevens).  Also changed syntax to use
+  econf and einstall.
 
   19 Jul 2002; George Shapovalov <george@gentoo.org> regina-rexx-3.0.1.ebuild, files/rxstack, files/digest-regina-rexx-3.0.1 :
 
diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest
index e69de29bb2d1..1a21d39f8ca8 100644
--- a/dev-lang/regina-rexx/Manifest
+++ b/dev-lang/regina-rexx/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b6ce70c6ac66c1be3e905d1aa2a1284e ChangeLog 2075
+MD5 1e53d13fa625b7085dfbc3ef9b5ba7ee files/digest-regina-rexx-3.0.1 58
+MD5 eeb7676fd15d5fc464e4f48c291e2794 files/digest-regina-rexx-3.3 67
+MD5 1cb49b9917c92cca9f39fa7c980d7b1b files/rxstack 254
+MD5 9008f790dff65eb6ef2a1c1684fa8368 metadata.xml 448
+MD5 361dfa6c49735b7869d55636cdb7a709 regina-rexx-3.0.1.ebuild 1114
+MD5 4eef33414d339d12c1faf0a58fafc38a regina-rexx-3.3.ebuild 1140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Y5iI1lqEGTUzyQRAv/5AJ9j7YU/alCGhJjfBpj+bEWNyy3G3gCg3F72
+vmpaEPG2T9cfY/ldu2JGcco=
+=i6JP
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/regina-rexx/regina-rexx-3.0.1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.0.1.ebuild
index 45ecdd0d7c9d..cbdf6da1867d 100644
--- a/dev-lang/regina-rexx/regina-rexx-3.0.1.ebuild
+++ b/dev-lang/regina-rexx/regina-rexx-3.0.1.ebuild
@@ -1,31 +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/dev-lang/regina-rexx/regina-rexx-3.0.1.ebuild,v 1.1 2002/07/20 03:49:46 george Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/regina-rexx-3.0.1.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
-S="${WORKDIR}"
+S=${WORKDIR}
 HOMEPAGE="http://regina-rexx.sourceforge.net"
 DESCRIPTION="Portable Rexx interpreter"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/regina-rexx/regina301.zip"
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND}"
-LICENSE="LGPL-2.1"
+SRC_URI="mirror://sourceforge/regina-rexx/regina301.zip"
+
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="LGPL-2.1"
+KEYWORDS="x86 sparc ppc"
+IUSE=""
+
+DEPEND="app-arch/unzip"
 
 src_compile() {
 	autoconf || die "autoconf problem"
-	./configure --prefix=/usr --mandir=/usr/share/man || die "configure problem"
+	econf || die "econf failed"
 	mv Makefile Makefile~
 	sed <Makefile~ >Makefile \
 		-e 's|-$(INSTALL) -m 755 -c ./rxstack.init.d $(STARTUPDIR)/rxstack||' \
 		-e "s|/usr/share/regina|${D}/usr/share/regina|"
-	emake || die "make problem"
+	emake -j1 || die "make problem"
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		datadir=${D}/usr/share/regina install || die "install problem"
+	einstall datadir=${D}/usr/share/regina || die
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/rc_rxstack rxstack
@@ -36,8 +36,8 @@ src_install() {
 
 pkg_postinst() {
 	einfo "You may want to run"
-	einfo ""
+	einfo
 	einfo "\trc-update add rxstack default"
-	einfo ""
+	einfo
 	einfo "to enable Rexx queues (optional)."
 }
diff --git a/dev-lang/regina-rexx/regina-rexx-3.3.ebuild b/dev-lang/regina-rexx/regina-rexx-3.3.ebuild
index d25e5b0a8e1d..b01917698436 100644
--- a/dev-lang/regina-rexx/regina-rexx-3.3.ebuild
+++ b/dev-lang/regina-rexx/regina-rexx-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/dev-lang/regina-rexx/regina-rexx-3.3.ebuild,v 1.1 2004/05/17 17:23:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/regina-rexx/regina-rexx-3.3.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
 S="${WORKDIR}/Regina-${PV}"
 HOMEPAGE="http://regina-rexx.sourceforge.net"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/regina-rexx/Regina-REXX-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ~ppc hppa ~amd64"
 IUSE=""
 
 DEPEND=""
@@ -21,7 +21,7 @@ src_compile() {
 	sed <Makefile~ >Makefile \
 		-e 's|-$(INSTALL) -m 755 -c ./rxstack.init.d $(STARTUPDIR)/rxstack||' \
 		-e "s|/usr/share/regina|${D}/usr/share/regina|"
-	emake || make || die "make problem"
+	emake -j1 || die "make problem"
 }
 
 src_install() {
@@ -36,8 +36,8 @@ src_install() {
 
 pkg_postinst() {
 	einfo "You may want to run"
-	einfo ""
+	einfo
 	einfo "\trc-update add rxstack default"
-	einfo ""
+	einfo
 	einfo "to enable Rexx queues (optional)."
 }
diff --git a/dev-lang/ruby-cvs/ChangeLog b/dev-lang/ruby-cvs/ChangeLog
index b9e334b45d52..adf67950a35e 100644
--- a/dev-lang/ruby-cvs/ChangeLog
+++ b/dev-lang/ruby-cvs/ChangeLog
@@ -1,9 +1,92 @@
 # ChangeLog for dev-lang/ruby-cvs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ChangeLog,v 1.1 2003/04/15 09:40:19 twp Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ChangeLog,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
+
+  05 Oct 2005; Caleb Tennis <caleb@gentoo.org> -ruby-cvs-1.8.2-r1.ebuild:
+  Remove 1.8 cvs as it's stable ruby now
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> ruby-cvs-1.8.2-r1.ebuild,
+  ruby-cvs-1.9.0-r2.ebuild:
+  net-misc/dante -> net-proxy/dante
+
+  06 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.2-r1.ebuild,
+  ruby-cvs-1.9.0-r2.ebuild:
+  Added threads local USE flag.
+
+  01 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +files/ruby-rdoc-gentoo.diff,
+  ruby-cvs-1.8.2-r1.ebuild, ruby-cvs-1.9.0-r2.ebuild:
+  Fixed build failure when installing ruby +doc for the first time.
+  Thanks to Phil Pennock <gentoo@spodhuis.demon.nl>, closing bug #62369.
+
+*ruby-cvs-1.9.0-r2 (31 Aug 2004)
+*ruby-cvs-1.8.2-r1 (31 Aug 2004)
+
+  31 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +ruby-cvs-1.8.2-r1.ebuild,
+  -ruby-cvs-1.8.2.ebuild, -ruby-cvs-1.9.0-r1.ebuild, +ruby-cvs-1.9.0-r2.ebuild:
+  Added doc USE flag. Notice users to upgrade due to CGI::Session security issue.
+
+*ruby-cvs-1.8.2 (01 Jul 2004)
+
+  01 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-cvs-1.8.1-r1.ebuild,
+  +ruby-cvs-1.8.2.ebuild:
+  ruby_1_8 branch was bumped up to 1.8.2
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
+  ruby-cvs-1.9.0-r1.ebuild:
+  Fix use invocation
+
+  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
+  ruby-cvs-1.8.1.ebuild, ruby-cvs-1.9.0-r1.ebuild, ruby-cvs-1.9.0.ebuild:
+  Provides virtual/ruby instead of dev-lang/ruby-${PV}, see bug #46968
+
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
+  ruby-cvs-1.9.0-r1.ebuild:
+  Fixed typo in updating ruby's symlinks. Removed ~mips and ~arm
+  KEYWORD because of broken DEPEND.
+
+*ruby-cvs-1.8.1-r1 (30 Jan 2004)
+
+  30 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
+  ruby-cvs-1.9.0-r1.ebuild:
+  Added dev-ruby/ruby-config to DEPEND to modify /usr/bin/ruby symlink in
+  pkg_post*
+
+*ruby-cvs-1.9.0 (25 Jan 2004)
+
+  25 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.0-r3.ebuild,
+  ruby-cvs-1.8.0-r4.ebuild, ruby-cvs-1.8.1.ebuild, ruby-cvs-1.9.0.ebuild:
+  Split ruby_1_8 branch and CVS HEAD. Closing bug #39204
+
+*ruby-cvs-1.8.0-r4 (09 Aug 2003)
+
+  09 Aug 2003; Tom Payne <twp@gentoo.org> ruby-cvs-1.8.0-r4.ebuild :
+  Added gperf to DEPEND. Bug # 25762.
+
+*ruby-cvs-1.8.0-r3 (22 Jul 2003)
+
+  22 Jul 2003; Tom Payne <twp@gentoo.org> ruby-cvs-1.8.0-r3.ebuild :
+  Added dev-ruby/ruby-syck to PROVIDES.
+
+*ruby-cvs-1.8.0-r2 (17 Jun 2003)
+ 
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*ruby-cvs-1.8.0-r1 (16 Apr 2003)
+ 
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  17 Jun 2003; Tom Payne <twp@gentoo.org> ruby-cvs-1.8.0-r1.ebuild :
+  Added PROVIDES dev-ruby/optparse and dev-ruby/rexml.
+
+  11 May 2003; Tom Payne <twp@gentoo.org> ruby-cvs-1.8.0-r1.ebuild :
+  Strip -fomit-frame-pointer using flag-o-matic. Bug # 8290.
+
+  16 Apr 2003; Tom Payne <twp@gentoo.org> ruby-cvs-1.8.0-r1.ebuild :
+  Fixed src_install.
 
 *ruby-cvs-1.8.0 (15 Apr 2003)
 
   15 Apr 2003; Tom Payne <twp@gentoo.org> ruby-cvs-1.8.0.ebuild :
-
   Initial commit. Bug # 18757.
diff --git a/dev-lang/ruby-cvs/Manifest b/dev-lang/ruby-cvs/Manifest
index e69de29bb2d1..2d3f8261a28c 100644
--- a/dev-lang/ruby-cvs/Manifest
+++ b/dev-lang/ruby-cvs/Manifest
@@ -0,0 +1,5 @@
+MD5 0d431d8e2b36e5e750eb7c3af438fda9 ChangeLog 3366
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ruby-cvs-1.9.0-r2 0
+MD5 999d392f0a17f7643659081973e99def files/ruby-rdoc-gentoo.diff 432
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 3c3a7c05c5098a3e455a2a7d97caf235 ruby-cvs-1.9.0-r2.ebuild 2538
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r2.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r2.ebuild
index e67e4f3bfed6..1f42a04da6b3 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r2.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r2.ebuild,v 1.1 2004/08/30 18:19:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:45 chriswhite Exp $
 
-IUSE="socks5 tcltk doc"
+IUSE="socks5 tcltk doc threads"
 
 inherit flag-o-matic cvs
 
@@ -19,7 +19,7 @@ DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	dev-util/gperf
-	socks5? ( >=net-misc/dante-1.1.13 )
+	socks5? ( >=net-proxy/dante-1.1.13 )
 	tcltk?  ( dev-lang/tk )
 	sys-apps/findutils
 	>=dev-ruby/ruby-config-0.3.1"
@@ -31,6 +31,8 @@ ECVS_SERVER="cvs.ruby-lang.org:/src"
 ECVS_MODULE="ruby"
 ECVS_AUTH="pserver"
 ECVS_PASS="anonymous"
+ECVS_UP_OPTS="-dP -rHEAD"
+ECVS_CO_OPTS="-rHEAD"
 
 S=${WORKDIR}/${ECVS_MODULE}
 
@@ -59,15 +61,21 @@ src_compile() {
 	autoconf || die "autoconf failed"
 
 	econf --program-suffix=${SLOT/./} --enable-shared \
-		`use_enable socks5 socks` \
-		`use_enable doc install-doc` \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
 		|| die "econf failed"
-	emake || emake || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	#export RUBY=${D}/usr/bin/ruby19
-	export LD_LIBRARY_PATH=${D}/usr/lib RUBYLIB=${D}/usr/lib/ruby/${SLOT}
+	LD_LIBRARY_PATH=${D}/usr/lib
+	RUBYLIB=${D}/usr/lib/ruby/${SLOT}
+	for d in $(find ${S}/ext -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
 	make DESTDIR=${D} install || die "make install failed"
 
 	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 59499236a020..3026e112213f 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,13 +1,670 @@
 # ChangeLog for dev-lang/ruby
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
-
-*ruby-1.6.6 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
+
+*ruby-1.8.4_pre1 (01 Nov 2005)
+
+  01 Nov 2005; Caleb Tennis <caleb@gentoo.org> +ruby-1.8.4_pre1.ebuild:
+  Pre-release version bump
+
+  29 Oct 2005; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.3.ebuild:
+  Added cjk USE flag back. This closes bug #106293.
+
+  08 Oct 2005; Fabian Groffen <grobian@gentoo.org> ruby-1.8.2.ebuild:
+  Dropping ppc-macos keyword to ~ppc-macos for bug #106996
+
+  07 Oct 2005; Caleb Tennis <caleb@gentoo.org> -ruby-1.6.8-r12.ebuild:
+  Hope I got the 1.6 deps cleared out now
+
+  05 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ruby-1.6.8-20040728-20041024.diff,
+  +files/ruby-1.6.8-fix-x86_64.patch, +ruby-1.6.8-r12.ebuild:
+  resurrect ruby-1.6 until the deps are cleaned out first
+
+  05 Oct 2005; Caleb Tennis <caleb@gentoo.org>
+  -files/ruby-1.6.8-20040728-20041024.diff,
+  -files/ruby-1.6.8-fix-x86_64.patch, -ruby-1.6.8-r12.ebuild:
+  Removing ruby 1.6
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on sh.
+
+  02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on ia64, bug 106996.
+
+  02 Oct 2005; Hardave Riar <hardave@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on mips, bug #106996.
+
+  30 Sep 2005; Simon Stelling <blubb@gentoo.org> ruby-1.8.3.ebuild:
+  stable on amd64 wrt bug 106996
+
+  29 Sep 2005; Jose Luis Rivero <yoswink@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on alpha wrt security bug #106996
+
+  28 Sep 2005; Markus Rothe <corsair@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on ppc64
+
+  28 Sep 2005; Andrej Kacian <ticho@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on x86, bug #106996.
+
+  27 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on ppc.
+
+  27 Sep 2005; Ferris McCormick <fmccor@gentoo.org> ruby-1.8.3.ebuild:
+  Add sparc keyword (Security Bug #106996); concerns expressed in the bug's
+  comments are cured by upgrading rubygems, activesupport.
+
+  27 Sep 2005; Rene Nussbaumer <killerfox@gentoo.org> ruby-1.8.3.ebuild:
+  Stable on hppa. bug #106996
+
+  23 Sep 2005; Sven Wegener <swegener@gentoo.org> ruby-1.8.3.ebuild:
+  ${D}${ROOT} is bad. dosym doesn't use the cwd for symlinking, so we don't need
+  to cd here.
+
+  23 Sep 2005; Caleb Tennis <caleb@gentoo.org> ruby-1.8.3.ebuild:
+  Use relative link over absolute one
+
+  23 Sep 2005; Caleb Tennis <caleb@gentoo.org> ruby-1.8.2-r2.ebuild,
+  ruby-1.8.3.ebuild:
+  Add a blocker against dev-ruby/rdoc, as its now provided in ruby itself
+
+*ruby-1.8.3 (23 Sep 2005)
+
+  23 Sep 2005; Caleb Tennis <caleb@gentoo.org> -ruby-1.8.3_pre1.ebuild,
+  -ruby-1.8.3_pre2.ebuild, +ruby-1.8.3.ebuild:
+  Verison bump
+
+*ruby-1.8.3_pre2 (17 Sep 2005)
+
+  17 Sep 2005; Caleb Tennis <caleb@gentoo.org> +ruby-1.8.3_pre2.ebuild:
+  Version bump
+
+  23 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> ruby-1.8.2-r2.ebuild:
+  Stable on sh.
+
+*ruby-1.8.2-r2 (09 Jul 2005)
+
+  09 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff, +ruby-1.8.2-r2.ebuild:
+  Bump with patch for GLSA Bug #96784
+
+  03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Stable on alpha.
+
+  01 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> ruby-1.8.2-r1.ebuild,
+  ruby-1.8.3_pre1.ebuild:
+  Disabled previous patch due to a strange breakage wrt to rubygems.
+
+  26 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> ruby-1.8.2-r1.ebuild,
+  ruby-1.8.3_pre1.ebuild:
+  Fixed multlib-strict BUG #89985.
+
+  28 May 2005; Aron Griffis <agriffis@gentoo.org> ruby-1.8.3_pre1.ebuild:
+  Change ia64 to ~ia64, looks like a bump was done without running ekeyword
+  ~all ruby-1.8.3_pre1.ebuild
+
+*ruby-1.8.3_pre1 (21 May 2005)
+
+  21 May 2005; Mamoru KOMACHI <usata@gentoo.org> +files/re.c.182.patch,
+  -ruby-1.6.8-r11.ebuild, +ruby-1.8.3_pre1.ebuild:
+  Added preview release.
+
+  19 May 2005; Guy Martin <gmsoft@gentoo.org> ruby-1.6.8-r12.ebuild:
+  Stable on hppa.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Stable on ppc64
+
+  07 May 2005; Aron Griffis <agriffis@gentoo.org> ruby-1.8.2-r1.ebuild:
+  stable on ia64
+
+  01 May 2005; Guy Martin <gmsoft@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Stable on hppa.
+
+  24 Apr 2005; Tom Martin <slarti@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Stable on amd64.
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> ruby-1.8.2.ebuild,
+  ruby-1.8.2-r1.ebuild:
+  net-misc/dante -> net-proxy/dante
+
+  20 Apr 2005; Herbie Hopkins <herbs@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Fix my sed statement... bug #89736.
+
+  19 Apr 2005; Herbie Hopkins <herbs@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Correct a hard-coded lib path in the configure script to close bug #76111
+  (for real this time)
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Stable on ppc.
+
+  18 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Stable on sparc
+
+  17 Apr 2005; Tom Martin <slarti@gentoo.org> ruby-1.8.2-r1.ebuild:
+  Add multilib handling. Resolves bug 76111. All the dev-ruby packages
+  should install on multilibbed systems now.
+
+  14 Apr 2005; Caleb Tennis <caleb@gentoo.org>
+  -files/ruby-1.8.0-CGI::Session.patch, -ruby-1.8.0-r7.ebuild,
+  -ruby-1.8.1-r7.ebuild, -ruby-1.8.2_pre3.ebuild, -ruby-1.8.2_pre4.ebuild:
+  Remove older versions
+
+  14 Apr 2005; Caleb Tennis <caleb@gentoo.org> ruby-1.8.2-r1.ebuild:
+  marking x86 stable
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> ruby-1.8.2.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> ruby-1.8.2.ebuild:
+  stable on amd64
+
+*ruby-1.8.2-r1 (23 Mar 2005)
+
+  23 Mar 2005; Caleb Tennis <caleb@gentoo.org> +files/ruby-1.8.2-soap.diff,
+  +files/ruby-1.8.2-unittest.diff, +ruby-1.8.2-r1.ebuild:
+  Rev bump adding two bug fix patches (Bugs #83127 and #85905)
+
+  18 Mar 2005; Aron Griffis <agriffis@gentoo.org> ruby-1.8.2.ebuild:
+  Stable on ia64
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> ruby-1.8.2.ebuild:
+  Marked stable on mips.
+
+  21 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> ruby-1.8.2.ebuild:
+  Stable on sparc
+
+  21 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.2.ebuild:
+  Stable on alpha, ppc, ppc-macos and x86.
+
+*ruby-1.8.2 (02 Jan 2005)
+
+  02 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> +ruby-1.8.2.ebuild:
+  Version bumped.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*ruby-1.8.2_pre4 (22 Dec 2004)
+
+  22 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.8.2_pre2.ebuild,
+  +ruby-1.8.2_pre4.ebuild:
+  Version bumped.
+
+  15 Nov 2004; Hardave Riar <hardave@gentoo.org> ruby-1.6.8-r12.ebuild:
+  Stable on mips, bug #69985.
+
+  12 Nov 2004; Joshua Kinard <kumba@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  Marked stable on mips.
+
+  13 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/ruby-rdoc-gentoo.diff, ruby-1.8.2_pre2.ebuild,
+  ruby-1.8.2_pre3.ebuild:
+  Fixed ri installation; bug #62003.
+
+  11 Nov 2004; Olivier Crete <tester@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  Stable on x86, bug 69985
+
+  11 Nov 2004; Ferris McCormick <fmccor@gentoo.org> ruby-1.6.8-r12.ebuild:
+  Stable for sparc wrt Bug 69985.  Builds, installs, and runs tests.
+
+  10 Nov 2004; Kito <kito@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  stable on ppc-macos re: bug 69985
+
+  10 Nov 2004; Markus Rothe <corsair@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  Stable on ppc64; bug #69985
+
+  10 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  Stable on alpha, bug 69985.
+
+  10 Nov 2004; <SeJo@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  stable on ppc gsla: 69985
+
+  09 Nov 2004; Simon Stelling <blubb@gentoo.org> ruby-1.6.8-r12.ebuild,
+  ruby-1.8.2_pre3.ebuild:
+  stable on amd64. bug #69985
+
+  09 Nov 2004; Ferris McCormick <fmccor@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  Stable for sparc wrt security Bug 69985. My tests and applications work as
+  expected.
+
+  10 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/oniguruma-2.3.1-fix-ppc.patch, +files/oniguruma-2.3.1-gentoo.patch,
+  ruby-1.6.8-r11.ebuild, ruby-1.6.8-r12.ebuild, ruby-1.8.0-r7.ebuild,
+  ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild, ruby-1.8.2_pre3.ebuild:
+  Apply oniguruma fix patch on all arches.
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.8.2_pre3.ebuild:
+  On ia64 we need to build without optimization #48824.  Add ~ia64
+
+*ruby-1.8.2_pre3 (09 Nov 2004)
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> +ruby-1.8.2_pre3.ebuild:
+  Version bumped.
+
+*ruby-1.6.8-r12 (05 Nov 2004)
+
+  05 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ruby-1.6.8-20040728-20041024.diff, +ruby-1.6.8-r12.ebuild:
+  Added a patch to fix CGI issue; bug #69985.
+
+  27 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.2_pre2.ebuild:
+  Fixed bug #68901.
+
+  20 Oct 2004; <agriffis@gentoo.org> files/ruby-rdoc-gentoo.diff:
+  Fix rdoc patch to build all documentation instead of just part of it. This is
+  actually an upstream bug...
+
+  19 Oct 2004; Guy Martin <gmsoft@gentoo.org> ruby-1.6.8-r11.ebuild:
+  Stable on hppa.
+
+  17 Oct 2004; Hardave Riar <hardave@gentoo.org> ruby-1.6.8-r11.ebuild:
+  Stable on mips, bug #60525.
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/oniguruma-2.3.1-fix-ppc.patch, ruby-1.6.8-r11.ebuild,
+  ruby-1.8.0-r7.ebuild, ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild:
+  Fixed compilation failure on ppc with cjk USE flag.
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> ruby-1.8.2_pre2.ebuild:
+  stable on ppc64, bug #60525
+
+  06 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.6.8-r6.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Added threads local USE flag (if you compile tk with threads, you will
+  also need to compile ruby with threads). This will close bug #65858.
+
+  03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.8.1-r3.ebuild,
+  -ruby-1.8.1-r6.ebuild, -ruby-1.8.0-r6.ebuild, ruby-1.6.8-r11.ebuild,
+  ruby-1.8.1-r7.ebuild, ruby-1.8.2_pre2.ebuild:
+  Removed old ebuilds. Updated oniguruma patch.
+
+  21 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> ruby-1.8.2_pre2.ebuild:
+  Marked stable on amd64.
+
+  01 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +files/ruby-rdoc-gentoo.diff,
+  ruby-1.8.2_pre2.ebuild:
+  Fixed build failure when installing ruby +doc for the first time.
+  Thanks to Phil Pennock <gentoo@spodhuis.demon.nl>, closing bug #62369.
+
+  31 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> -ruby-1.6.8-r10.ebuild,
+  ruby-1.6.8-r11.ebuild, ruby-1.8.2_pre2.ebuild:
+  Added doc IUSE flag to 1.8.2_pre2. Thanks to Charles Comstock
+  <dgtized@gmail.com>, closing bug #62003. Disabled maketest for 
+  1.6.8-r11 if cjk is set. Removed old ebuild.
+
+  25 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> ruby-1.6.8-r11.ebuild:
+  Marked stable on amd64.
+
+  22 Aug 2004; Joshua Kinard <kumba@gentoo.org> ruby-1.8.1-r7.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Marked stable on mips.
+
+  21 Aug 2004; Jason Wever <weeve@gentoo.org> ruby-1.6.8-r11.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Stable on sparc wrt security bug #60525.
+
+  20 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> ruby-1.6.8-r11.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Stable on alpha, bug 60525.
+
+  20 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r11.ebuild,
+  ruby-1.8.0-r7.ebuild, ruby-1.8.2_pre2.ebuild:
+  Stable on x86 for the fix of CGI::Session's insecure permission issue.
+  See bug #60525.
+
+*ruby-1.8.0-r7 (19 Aug 2004)
+
+  19 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/ruby-1.8.0-CGI::Session.patch, +ruby-1.8.0-r7.ebuild,
+  ruby-1.8.2_pre2.ebuild:
+  Applied a patch to set safer permission when using CGI::Session and
+  PStore. See bug #60525.
+
+*ruby-1.6.8-r11 (19 Aug 2004)
+
+  19 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +ruby-1.6.8-r11.ebuild,
+  -ruby-1.8.2_pre1.ebuild:
+  New snapshot and oniguruma patch. Removed previous prerelease ebuild.
+
+  08 Aug 2004; Tom Gall <tgall@gentoo.org> ruby-1.8.1-r7.ebuild:
+  stable on ppc64, bug #57676
+
+*ruby-1.8.2_pre2 (01 Aug 2004)
+
+  01 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +ruby-1.8.2_pre2.ebuild:
+  Version bumped.
+
+  21 Jul 2004; Ferris McCormick <fmccor@gentoo.org> ruby-1.8.1-r7.ebuild:
+  Marked stable for sparc.
+
+  20 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.2_pre1.ebuild:
+  Added to ~macos.
+
+*ruby-1.8.2_pre1 (17 Jul 2004)
+
+  17 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.0-r6.ebuild,
+  ruby-1.8.1-r3.ebuild, ruby-1.8.1-r6.ebuild, ruby-1.8.1-r7.ebuild,
+  +ruby-1.8.2_pre1.ebuild:
+  Version bumped. Block dev-lang/ruby-cvs-1.8
+
+  19 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1-r7.ebuild:
+  Fixed non-existent S
+
+*ruby-1.8.1-r7 (19 Jun 2004)
+
+  19 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r10.ebuild,
+  ruby-1.8.1-r2.ebuild, ruby-1.8.1-r7.ebuild:
+  Updated CVS snapshot
+
+  09 Jun 2004; Guy Martin <gmsoft@gentoo.org> ruby-1.8.1-r6.ebuild:
+  Marked stable on hppa.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.6.8-r10.ebuild,
+  ruby-1.6.8-r6.ebuild, ruby-1.8.0-r6.ebuild, ruby-1.8.1-r2.ebuild,
+  ruby-1.8.1-r3.ebuild:
+  Fix use invocation
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> ruby-1.8.1-r6.ebuild:
+  stable on amd64
+
+  19 May 2004; Ferris McCormick <fmccor@gentoo.org> ruby-1.8.1-r6.ebuild:
+  Marked stable for sparc, and changed line 33 from "<tab-char>-only" to just a
+  blank line (to keep repoman happy).
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r10.ebuild,
+  ruby-1.6.8-r9.ebuild, ruby-1.8.0-r6.ebuild, ruby-1.8.1-r2.ebuild,
+  ruby-1.8.1-r3.ebuild, ruby-1.8.1-r5.ebuild, ruby-1.8.1-r6.ebuild,
+  files/oniguruma-20040202.diff:
+  Added autoconf dependancy, closing bug #51301. Marked 1.6.8-r10 and
+  1.8.1-r6 stable on x86, alpha and ppc.
+
+*ruby-1.8.1-r6 (01 May 2004)
+*ruby-1.6.8-r10 (01 May 2004)
+
+  01 May 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r10.ebuild,
+  ruby-1.6.8-r8.ebuild, ruby-1.8.1-r4.ebuild, ruby-1.8.1-r6.ebuild:
+  Updated Oniguruma patch, removed old ebuilds.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.6.8-r6.ebuild,
+  ruby-1.6.8-r8.ebuild, ruby-1.6.8-r9.ebuild:
+  Add die following econf for bug 48950
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0-r6.ebuild,
+  ruby-1.8.1-r2.ebuild, ruby-1.8.1-r3.ebuild, ruby-1.8.1-r4.ebuild,
+  ruby-1.8.1-r5.ebuild:
+  Add die following econf for bug 48950
+
+*ruby-1.8.1-r5 (24 Apr 2004)
+
+  24 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1-r5.ebuild:
+  Redo of the last patch (rexml update)
+
+  23 Apr 2004; Aron Griffis <agriffis@gentoo.org> ruby-1.8.1-r2.ebuild,
+  ruby-1.8.1-r3.ebuild, ruby-1.8.1-r4.ebuild:
+  Mark -ia64 until bug 48824 is resolved
+
+*ruby-1.6.8-r9 (24 Apr 2004)
+*ruby-1.8.1-r4 (24 Apr 2004)
+
+  24 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r6.ebuild,
+  ruby-1.6.8-r8.ebuild, ruby-1.6.8-r9.ebuild, ruby-1.8.0-r6.ebuild,
+  ruby-1.8.1-r2.ebuild, ruby-1.8.1-r3.ebuild, ruby-1.8.1-r4.ebuild:
+  Updated snapshot and oniguruma patch. Closing bug #48426. Fixed ROOT.
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org> ruby-1.8.1-r3.ebuild:
+  stable on amd64
+
+  18 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r7.ebuild,
+  ruby-1.8.0-r5.ebuild, ruby-1.8.0-r6.ebuild, ruby-1.8.1-r3.ebuild:
+  Marked stable to fix rdoc (see bug #48127). Removed old ebuilds.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> ruby-1.8.1-r3.ebuild:
+  added missing ~amd64 keyword
+
+*ruby-1.6.8-r8 (12 Apr 2004)
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r8.ebuild:
+  Updated to the latest CVS snapshot
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.6.8-r6.ebuild, ruby-1.8.0-r1.ebuild, ruby-1.8.0-r5.ebuild,
+  ruby-1.8.1-r2.ebuild, files/ruby-config:
+  Marked 1.6.8-r6, 1.8.0-r5 and 1.8.1-r2 stable on all arches. Removed old
+  versions.
+
+*ruby-1.6.8-r7 (10 Apr 2004)
+*ruby-1.8.0-r6 (10 Apr 2004)
+*ruby-1.8.1-r3 (10 Apr 2004)
+
+  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.6.8-r6.ebuild, ruby-1.6.8-r7.ebuild, ruby-1.8.0-r1.ebuild,
+  ruby-1.8.0-r5.ebuild, ruby-1.8.0-r6.ebuild, ruby-1.8.1-r1.ebuild,
+  ruby-1.8.1-r2.ebuild, ruby-1.8.1-r3.ebuild:
+  Updated oniguruma patch (UTF-16 support). Added PROVIDE="virtual/ruby",
+  see bug #46968
+
+  07 Apr 2004; Brian Jackson <iggy@gentoo.org> ruby-1.8.1-r2.ebuild:
+  added s390 keyword
+
+  30 Mar 2004; Joshua Kinard <kumba@gentoo.org> ruby-1.6.8-r6.ebuild:
+  Marking stable on mips to remove a repoman dep.
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.8.0-r1.ebuild, ruby-1.8.0-r5.ebuild:
+  Marked stable on mips.
+
+  09 Mar 2004; <agriffis@gentoo.org> ruby-1.8.0-r5.ebuild:
+  stable on alpha and ia64
+
+  29 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> ruby-1.8.0-r5.ebuild:
+  Stable on sparc
+
+  29 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r6.ebuild,
+  ruby-1.8.0-r5.ebuild:
+  Marked stable on x86 and alpha
+
+*ruby-1.8.1-r2 (07 Feb 2004)
+
+  07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1-r2.ebuild,
+  ruby-1.8.1.ebuild, files/oniguruma-20040202.diff:
+  Added CVS snapshot
+
+*ruby-1.6.8-r6 (30 Jan 2004)
+*ruby-1.8.0-r5 (30 Jan 2004)
+*ruby-1.8.1-r1 (30 Jan 2004)
+
+  30 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r6.ebuild,
+  ruby-1.8.0-r5.ebuild, ruby-1.8.1-r1.ebuild:
+  Moved ruby-config script out to dev-ruby/ruby-config. Removed ruby16
+  IUSE flag and let ruby-config take care of dead symlinks.
+
+*ruby-1.8.1 (25 Dec 2003)
+
+  25 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r4.ebuild,
+  ruby-1.6.8-r5.ebuild, ruby-1.8.0-r3.ebuild, ruby-1.8.0-r4.ebuild,
+  ruby-1.8.1.ebuild, ruby-1.8.1_pre3.ebuild, ruby-1.8.1_pre4.ebuild:
+  Version bumped, upstream source and Oniguruma patch
+
+*ruby-1.8.1_pre4 (22 Dec 2003)
+
+  22 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1_pre4.ebuild:
+  Version bumped
+
+*ruby-1.6.8-r4 (11 Dec 2003)
+
+  11 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.6.8-r4.ebuild, ruby-1.8.0-r1.ebuild, ruby-1.8.0-r2.ebuild,
+  ruby-1.8.0-r3.ebuild, ruby-1.8.1_pre2-r1.ebuild,
+  files/ruby-1.6.8-oniguruma-gentoo.diff:
+  Added cjk IUSE flag. Changed ruby18 local USE flag to ruby16.
+  (You need to set ruby16 USE flag manually to have /usr/bin/ruby
+  as a symlink to /usr/bin/ruby16, otherwise ruby18 is used.)
+
+*ruby-1.8.1_pre3 (06 Dec 2003)
+
+  06 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r1.ebuild,
+  ruby-1.6.8-r2.ebuild, ruby-1.6.8-r3.ebuild, ruby-1.6.8.ebuild,
+  ruby-1.8.0-r2.ebuild, ruby-1.8.0.ebuild, ruby-1.8.1_pre2-r1.ebuild,
+  ruby-1.8.1_pre2.ebuild, ruby-1.8.1_pre3.ebuild, files/ruby-config:
+  Version bumeped. Removed old ebuilds.
+
+  23 Nov 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.6.8-r1.ebuild,
+  ruby-1.6.8-r2.ebuild:
+  Mark versions which don't build on ia64 as -ia64
+
+*ruby-1.8.1_pre2-r1 (15 Nov 2003)
+*ruby-1.6.8-r3 (15 Nov 2003)
+
+  15 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r3.ebuild,
+  ruby-1.8.0-r2.ebuild, ruby-1.8.1_pre2-r1.ebuild, files/ruby-config:
+  Added ruby-config. Fixed erb symlink path in ruby-1.8.0-r1.ebuild
+  and ruby-1.8.1_pre2.ebuild.
+
+  12 Nov 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0-r1.ebuild:
+  Mark this version stable on all arches since we've had almost-complete
+  coverage and want them to move forward at the same time. Additional motivation
+  is that 1.6.8 won't build on ia64 (see bug 33305)
+
+  03 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.0-r1.ebuild,
+  ruby-1.8.1_pre2.ebuild:
+  Make GC_MALLOC_LIMIT configurable. Added ruby18 IUSE flag. Fixed a
+  typo in pkg_postrm. NOTE: If you see 'N' when you run `emerge -uUp
+  world` please unmerge <=ruby-1.6.8-r1 or <=ruby-1.8.0, and then
+  emerge =ruby-1.6.8-r2 and/or >=ruby-1.8.0-r1. See also bug #32526.
+
+*ruby-1.8.1_pre2 (01 Nov 2003)
+
+  01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.1_pre2.ebuild:
+  New upstream preview release.
+
+*ruby-1.8.0-r1 (12 Oct 2003)
+
+  01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r2.ebuild,
+  ruby-1.8.0-r1.ebuild:
+  Added warning beeps
+
+  12 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> ruby-1.6.8-r2.ebuild,
+  ruby-1.8.0-r1.ebuild:
+  Added SLOT support and ruby18 local IUSE flag to ruby-1.6.8-r2.
+
+  16 Aug 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0.ebuild :
+  Added all ~ARCHs to KEYWORDS. Bug # 26570.
+
+  10 Aug 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0.ebuild:
+  Make vim message in pkg_postinst more clear
+
+  09 Aug 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0_pre*.ebuild :
+  Removed old versions.
+
+*ruby-1.8.0 (05 Aug 2003)
+
+  05 Aug 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0.ebuild:
+  Update to final 1.8.0 release
+
+*ruby-1.8.0_pre2-r3 (31 Jul 2003)
+
+  31 Jul 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.6.8-r1.ebuild,
+  ruby-1.6.8.ebuild, ruby-1.8.0_pre2-r1.ebuild, ruby-1.8.0_pre2-r2.ebuild,
+  ruby-1.8.0_pre2-r3.ebuild, ruby-1.8.0_pre2.ebuild, ruby-1.8.0_pre3.ebuild,
+  ruby-1.8.0_pre4.ebuild, ruby-1.8.0_pre5.ebuild, ruby-1.8.0_pre6.ebuild:
+  Version bump and switch to ruby mirrors.  This is due to Matz's comment on
+  ruby-talk that his company's server was becoming overloaded with the number
+  of downloads.
+
+  29 Jul 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0_pre5.ebuild:
+  Add a warning about possibly needing to remerge vim
+
+*ruby-1.8.0_pre5 (29 Jul 2003)
+
+  29 Jul 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0_pre5.ebuild:
+  Version bump
+
+*ruby-1.8.0_pre4 (26 Jul 2003)
+
+  26 Jul 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0_pre4.ebuild :
+  Version bump.
+
+  18 Jul 2003; root <root@gentoo.org> ruby-1.6.8-r1.ebuild,
+  files/ruby-1.6.8-fix-x86_64.patch:
+  Added x86_64 patch from redhat, marked stable
+
+  14 Jul 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0_pre3.ebuild:
+  Fix compilation on newer alpha platforms
+
+*ruby-1.8.0_pre3 (09 Jul 2003)
+
+  09 Jul 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0_pre3.ebuild :
+  Version bump. Bug # 24089.
+
+  28 May 2003; Rainer Groesslinger <scandium@gentoo.org> ruby-1.8.0_pre2-r2.ebuild:
+  Build shared library typo fix. See bug #21723
+
+  28 May 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0_pre2-r2.ebuild ruby-1.6.8-r1.ebuild :
+  Build shared library. Bug # 21723.
+
+*ruby-1.8.0_pre2-r1 (26 May 2003)
+
+  26 May 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.8.0_pre2-r1.ebuild,
+  files/ruby-1.8.0_pre2-socks.patch:
+  Fix bug 21719 with a local patch. Pay attention to socks5 and tcltk USE flags.
+  Add ~alpha to KEYWORDS
+
+  14 May 2003; Luca Barbato <lu_zero@gentoo.org> ruby-1.6.8.ebuild :
+  Added ppc to keywords.
+
+*ruby-1.8.0_pre2 (10 Apr 2003)
+
+  11 May 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0_pre2.ebuild :
+  Strip -fomit-frame-pointer using flag-o-matic. Bug # 8290.
+
+  10 Apr 2003; Tom Payne <twp@gentoo.org> ruby-1.8.0_pre2.ebuild :
+  Version bump.
+
+*ruby-1.6.8 (26 Dec 2002)
+
+  11 May 2003; Tom Payne <twp@gentoo.org> ruby-1.6.8.ebuild :
+  Strip -fomit-frame-pointer using flag-o-matic. Bug # 8290.
+
+  16 Mar 2003; Guy Martin <gmsoft@gentoo.org> ruby-1.6.8.ebuild :
+  Added hppa to keywords.
+
+  30 Jan 2003; Jack Morgan <jmorgan@gentoo.org> ruby-1.6.8.ebuild :
+  Added sparc keywords as per bug #14430 (Thanks to Ferris McCormick)
+
+  22 Jan 2003; Will Woods <wwoods@gentoo.org> ruby-1.6.8.ebuild :
+  changed ~alpha to alpha
+
+  07 Jan 2003; Aron Griffis <agriffis@gentoo.org> ruby-1.6.8.ebuild :
+  Add ~alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  30 Dec 2002; Ryan Phillips <rphillips@gentoo.org> ruby-1.6.8.ebuild 
+  Remove fomit-frame-pointer from CFLAGS. It causes crashes on the compile. Fixes #12930
+
+  26 Dec 2002; Ryan Phillips <rphillips@gentoo.org> ruby-1.6.8.ebuild :
+  version bump
+
+*ruby-1.6.7 (4 Mar 2002)
+
+  11 May 2003; Tom Payne <twp@gentoo.org> ruby-1.6.7.ebuild :
+  Removed.
+
+  14 Aug 2002; Mark Guertin <gerk@gentoo.org> ruby-1.6.7.ebuild :
+  Added ppc to keywords
+
+	4 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> all:
+
+	Ruby is the interpreted scripting language for quick and easy
+	object-oriented programming. It has many features to process text files
+	and to do system management tasks (as in Perl). It is simple,
+	straight-forward, extensible, and portable.
+
+	Moved from dev-lang/ruby to dev-ruby/ruby.
+
+	Ebuild submitted by Tuurlijk <gentoo@tuurlijk.eu.org>
+
+	07 Jul 2002; Aron Griffis <agriffis@gentoo.org> ruby-1.6.7.ebuild:
+
+	Updated with LICENSE, KEYWORDS, SLOT.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d34b6e2f534f..d186c83e5d87 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,7 +1,18 @@
-MD5 50136e25f45ce291b1366e3f2799d634 ChangeLog 1736
-MD5 40c12769d61373419a71791c2f5e2ede ruby-1.6.7.ebuild 759
-MD5 02f985745482d318ef1286554c5b213a ruby-1.6.8.ebuild 744
-MD5 1ec0567aa9872f21e85564c27d8f043f ruby-1.8.0_pre2.ebuild 815
-MD5 b4fce5c2bad7530c4d941d78c0ce4fc6 files/digest-ruby-1.6.7 62
-MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8 63
-MD5 2da205db4c1f8df1e100067e6c188543 files/digest-ruby-1.8.0_pre2 137
+MD5 fe40b786fd5449b10052aed40b9ac7b4 ChangeLog 24257
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2 125
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r1 125
+MD5 c0305f496353b27f98c0c42e4005cb8a files/digest-ruby-1.8.2-r2 125
+MD5 e496eaf8c6af0debd1c74f8e66746a0c files/digest-ruby-1.8.3 125
+MD5 e48dec62560b103e0bf3edb73cea62fa files/digest-ruby-1.8.4_pre1 134
+MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
+MD5 d4b55b8964955655827a50afba707a69 files/re.c.182.patch 2472
+MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
+MD5 2026b6d80f876e54e87b8fe906d469ca files/ruby-1.8.2-unittest.diff 822
+MD5 d1fd7f979894cfe7da89ec38992788eb files/ruby-1.8.2-xmlrpc-ipimethods-fix.diff 441
+MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
+MD5 3c1c7073b75a7c7dc6e6fc48de2ebe64 ruby-1.8.2-r2.ebuild 3828
+MD5 e847e0e7a41e6a1492eb66edab66a10d ruby-1.8.2.ebuild 3449
+MD5 c9adcdf56af525e9be7d3c44bf9f8cda ruby-1.8.3.ebuild 3616
+MD5 af75cb3d428e8152b4273458f3d6d2dd ruby-1.8.4_pre1.ebuild 3632
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.3 b/dev-lang/ruby/files/digest-ruby-1.8.3
index dcca42a6318f..b0e17045f250 100644
--- a/dev-lang/ruby/files/digest-ruby-1.8.3
+++ b/dev-lang/ruby/files/digest-ruby-1.8.3
@@ -1,2 +1,2 @@
 MD5 63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz 4227276
-MD5 271d3d39201b3a049fa5bbed417c3f0a onigd2_4_2.tar.gz 203684
+MD5 40cb52605c7292373d8dfd11015cb687 onigd2_5_0.tar.gz 210448
diff --git a/dev-lang/ruby/files/ruby-rdoc-gentoo.diff b/dev-lang/ruby/files/ruby-rdoc-gentoo.diff
index 578eef9d11b7..7554050672f9 100644
--- a/dev-lang/ruby/files/ruby-rdoc-gentoo.diff
+++ b/dev-lang/ruby/files/ruby-rdoc-gentoo.diff
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2004-08-31 23:07:04.000000000 +0900
-+++ Makefile.in	2004-08-31 23:07:04.000000000 +0900
+--- Makefile.in.orig	2004-07-07 15:54:37.000000000 +0900
++++ Makefile.in	2004-11-13 00:53:52.000000000 +0900
 @@ -151,7 +151,7 @@
  
  install-doc:
  		@echo Generating RDoc documentation
 -		$(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir)
-+		$(DESTDIR)$(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir)
++		$(DESTDIR)$(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir) `find lib -name \*.rb`
  
  clean-ext:
  		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) clean 2> /dev/null || true
diff --git a/dev-lang/ruby/ruby-1.8.2-r1.ebuild b/dev-lang/ruby/ruby-1.8.2-r1.ebuild
index 86543e474abf..74dd4c79e5a0 100644
--- a/dev-lang/ruby/ruby-1.8.2-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2-r1.ebuild,v 1.1 2005/03/23 12:23:13 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
 
 ONIGURUMA="onigd2_4_0"
 
@@ -14,14 +14,14 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 LICENSE="Ruby"
 SLOT="1.8"
 # please keep sorted
-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="socks5 tcltk cjk doc threads"
 
 RDEPEND="virtual/libc
 	>=sys-libs/gdbm-1.8.0
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	socks5? ( >=net-misc/dante-1.1.13 )
+	socks5? ( >=net-proxy/dante-1.1.13 )
 	tcltk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3
 	!=dev-lang/ruby-cvs-1.8*"
@@ -51,6 +51,10 @@ src_unpack() {
 	epatch ${FILESDIR}/ruby-rdoc-gentoo.diff
 	epatch ${FILESDIR}/ruby-1.8.2-soap.diff
 	epatch ${FILESDIR}/ruby-1.8.2-unittest.diff
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
 }
 
 src_compile() {
@@ -84,8 +88,8 @@ src_compile() {
 }
 
 src_install() {
-	LD_LIBRARY_PATH=${D}/usr/lib
-	RUBYLIB="${S}:${D}/usr/lib/ruby/${SLOT}"
+	LD_LIBRARY_PATH=${D}/usr/$(get_libdir)
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
 	for d in $(find ${S}/ext -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
@@ -97,8 +101,8 @@ src_install() {
 		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
 		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
 	else
-		dosym /usr/lib/libruby${SLOT/./}.so.${PV%_*} /usr/lib/libruby.so.${PV%.*}
-		dosym /usr/lib/libruby${SLOT/./}.so.${PV%_*} /usr/lib/libruby.so.${PV%_*}
+		dosym /usr/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym /usr/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
 	fi
 
 	dodoc COPYING* ChangeLog MANIFEST README* ToDo
diff --git a/dev-lang/ruby/ruby-1.8.2-r2.ebuild b/dev-lang/ruby/ruby-1.8.2-r2.ebuild
index 29f62a72fabf..6fc6b937a166 100644
--- a/dev-lang/ruby/ruby-1.8.2-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.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/dev-lang/ruby/ruby-1.8.2-r2.ebuild,v 1.1 2005/07/09 16:38:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:18 chriswhite Exp $
 
 ONIGURUMA="onigd2_4_0"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 LICENSE="Ruby"
 SLOT="1.8"
 # please keep sorted
-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 sh sparc x86"
 IUSE="socks5 tcltk cjk doc threads"
 
 RDEPEND="virtual/libc
@@ -24,7 +24,8 @@ RDEPEND="virtual/libc
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tcltk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3
-	!=dev-lang/ruby-cvs-1.8*"
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc"
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
 	${RDEPEND}"
diff --git a/dev-lang/ruby/ruby-1.8.2.ebuild b/dev-lang/ruby/ruby-1.8.2.ebuild
index bdc52bb2cb4b..0031cd5db4b3 100644
--- a/dev-lang/ruby/ruby-1.8.2.ebuild
+++ b/dev-lang/ruby/ruby-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/dev-lang/ruby/ruby-1.8.2.ebuild,v 1.1 2005/01/01 15:47:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2.ebuild,v 1.1.1.1 2005/11/30 09:58:18 chriswhite Exp $
 
 ONIGURUMA="onigd2_4_0"
 
@@ -14,14 +14,14 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 LICENSE="Ruby"
 SLOT="1.8"
 # please keep sorted
-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="socks5 tcltk cjk doc threads"
 
 RDEPEND="virtual/libc
 	>=sys-libs/gdbm-1.8.0
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	socks5? ( >=net-misc/dante-1.1.13 )
+	socks5? ( >=net-proxy/dante-1.1.13 )
 	tcltk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3
 	!=dev-lang/ruby-cvs-1.8*"
diff --git a/dev-lang/ruby/ruby-1.8.3.ebuild b/dev-lang/ruby/ruby-1.8.3.ebuild
index fa2d9ff7b31d..dc4acb6c7eaa 100644
--- a/dev-lang/ruby/ruby-1.8.3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.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/dev-lang/ruby/ruby-1.8.3.ebuild,v 1.1 2005/09/23 01:04:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.3.ebuild,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
 
-ONIGURUMA="onigd2_4_2"
+ONIGURUMA="onigd2_5_0"
 
 inherit flag-o-matic alternatives eutils gnuconfig
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://ruby/${PV%.*}/${P/_pre/-preview}.tar.gz
 LICENSE="Ruby"
 SLOT="1.8"
 # please keep sorted
-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 sh sparc x86"
 IUSE="socks5 tcltk cjk doc threads"
 
 RDEPEND="virtual/libc
@@ -24,7 +24,9 @@ RDEPEND="virtual/libc
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tcltk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3
-	!=dev-lang/ruby-cvs-1.8*"
+	!=dev-lang/ruby-cvs-1.8*
+	!dev-ruby/rdoc"
+
 DEPEND="sys-devel/autoconf
 	sys-apps/findutils
 	${RDEPEND}"
@@ -35,15 +37,15 @@ S=${WORKDIR}/${P%_*}
 src_unpack() {
 	unpack ${A}
 
-#	if use cjk ; then
-#		einfo "Applying ${ONIGURUMA}"
-#		pushd ${WORKDIR}/oniguruma
-#		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
-#		cp ${FILESDIR}/re.c.182.patch .
-#		econf --with-rubydir=${S} || die "econf failed"
-#		make ${SLOT/./}
-#		popd
-#	fi
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+		epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
+		cp ${FILESDIR}/re.c.183.patch .
+		econf --with-rubydir=${S} || die "econf failed"
+		make ${SLOT/./}
+		popd
+	fi
 
 	# Enable build on alpha EV67 (but run gnuconfig_update everywhere)
 	gnuconfig_update || die "gnuconfig_update failed"
@@ -98,8 +100,8 @@ src_install() {
 		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib
 		dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib
 	else
-		dosym /usr/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
-		dosym /usr/$(get_libdir)/libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*}
+		dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*}
 	fi
 
 	dodoc COPYING* ChangeLog MANIFEST README* ToDo
diff --git a/dev-lang/ruby/ruby-1.8.4_pre1.ebuild b/dev-lang/ruby/ruby-1.8.4_pre1.ebuild
index 320a0eedcf6c..e29a6ece4a7a 100644
--- a/dev-lang/ruby/ruby-1.8.4_pre1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.4_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/dev-lang/ruby/ruby-1.8.4_pre1.ebuild,v 1.1 2005/11/01 14:33:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.4_pre1.ebuild,v 1.1.1.1 2005/11/30 09:58:18 chriswhite Exp $
 
 ONIGURUMA="onigd2_5_0"
 
diff --git a/dev-lang/sather/ChangeLog b/dev-lang/sather/ChangeLog
index efa90a5915d6..21dede3f8431 100644
--- a/dev-lang/sather/ChangeLog
+++ b/dev-lang/sather/ChangeLog
@@ -1,10 +1,24 @@
 # ChangeLog for dev-lang/sather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/ChangeLog,v 1.1 2002/03/19 14:48:58 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/ChangeLog,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> sather-1.3.ebuild:
+  Don't use cp -a.
+
+  26 Apr 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  sather-1.3.ebuild:
+  Fixed bug #48780 - Bad URLS (thanks Adam Chodorowski). Bug #48313 still makes
+  it non-compilable. Almost looks as if this is unmaintained.
+
+  13 Jun 2003; George Shapovalov <george@gentoo.org> sather-1.3.ebuild, files/sather-1.3_gentoo.patch.gz :
+  applied fix from #21775 (most likely gcc-3 related borkage)
+  Thanks to Matze Braun <matze@braunis.de> for the report and fix
+  cleaned up (made ebuild use ${Px} constructs where necessary, added IUSE...)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *sather-1.3 (19 Mar 2002)
 
-  19 Mar 2002; G.Bevin <gbevin@gentoo.org> sather-1.3.ebuild
-  files/sather-1.3:
+  19 Mar 2002; G.Bevin <gbevin@gentoo.org> sather-1.3.ebuild, files/sather-1.3:
   
   Initial package for the sather language.
diff --git a/dev-lang/sather/Manifest b/dev-lang/sather/Manifest
index e69de29bb2d1..1a7ec27a1d7a 100644
--- a/dev-lang/sather/Manifest
+++ b/dev-lang/sather/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d7f305390a52a5c676815a47cf0e0297 ChangeLog 1078
+MD5 2c5d8d89130101a588f1430b1d1d342c sather-1.3.ebuild 2541
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 100d037660f42cb87c051e16f7e6cf08 files/sather-1.3_gentoo.patch.gz 1916
+MD5 c33438632e63237679e1118825efbda3 files/digest-sather-1.3 498
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC2QBj5H05b2HAEkRAkiUAJ0WnSPpwYROOZoDm3vhl0zZ8+S+CgCfZDdR
+BcBkCv6JEy/XKDRYn1SiYwA=
+=7KEK
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/sather/files/digest-sather-1.3 b/dev-lang/sather/files/digest-sather-1.3
index c45a20bf4c2a..e8b644997d66 100644
--- a/dev-lang/sather/files/digest-sather-1.3
+++ b/dev-lang/sather/files/digest-sather-1.3
@@ -1,7 +1,7 @@
-MD5 62316a76982d356b62a474b41bda4f9f Descript.ps.gz 405546
 MD5 38070dd26b17a283851d061817c9ab83 Sather-1.3.tar.gz 8444295
+MD5 6bafe799e7f556166935d3d0a2f1ea82 sather-tutorial-000328.ps.gz 257895
+MD5 7d6406c0ef5e41c8e8093459b8b5615f sather-tutorial-000328.html.tar.gz 255712
 MD5 a1ac828600d76e1a6ae7752906af19a7 sather-specification-000328.html.tar.gz 65633
 MD5 5cb2db3a756376e21f37b0471b74ee81 sather-specification-000328.ps.gz 107425
-MD5 7d6406c0ef5e41c8e8093459b8b5615f sather-tutorial-000328.html.tar.gz 255712
-MD5 6bafe799e7f556166935d3d0a2f1ea82 sather-tutorial-000328.ps.gz 257895
 MD5 ff8fcc87a3d7d8b4ec725885124e6e9a satish-thatte.ps.gz 30137
+MD5 62316a76982d356b62a474b41bda4f9f Descript.ps.gz 405546
diff --git a/dev-lang/sather/sather-1.3.ebuild b/dev-lang/sather/sather-1.3.ebuild
index 57f6d92cb504..05c10ce7f686 100644
--- a/dev-lang/sather/sather-1.3.ebuild
+++ b/dev-lang/sather/sather-1.3.ebuild
@@ -1,69 +1,79 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Geert Bevin <gbevin@uwyn.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/sather-1.3.ebuild,v 1.1 2002/03/19 14:48:58 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sather/sather-1.3.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
-S="${WORKDIR}/Sather-1.3"
-DESCRIPTION="Sather is an object oriented language designed to be simple, efficient, safe, flexible and non-proprietary."
-SRC_URI="http://www.cs.waikato.ac.nz/sather/release/downloads/Sather-1.3.tar.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-tutorial-000328.ps.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-tutorial-000328.html.tar.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-specification-000328.html.tar.gz
-	ftp://ftp.gnu.org/gnu/sather/Doc/sather-specification-000328.ps.gz
-	http://www.icsi.berkeley.edu/~sather/Publications/satish-thatte.ps.gz
-	http://www.icsi.berkeley.edu/~sather/Documentation/LanguageDescription/Descript.ps.gz"
-HOMEPAGE="http://www.cs.waikato.ac.nz/sather/ http://www.icsi.berkeley.edu/~sather/"
+inherit eutils
+
+MY_P="Sather-${PV}"
+DESCRIPTION="object oriented language designed to be simple, efficient, safe, flexible and non-proprietary"
+HOMEPAGE="http://www.icsi.berkeley.edu/~sather/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-tutorial-000328.ps.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-tutorial-000328.html.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-specification-000328.html.tar.gz
+	ftp://ftp.gnu.org/gnu/${PN}/Doc/${PN}-specification-000328.ps.gz
+	http://www.icsi.berkeley.edu/~${PN}/Publications/satish-thatte.ps.gz
+	http://www.icsi.berkeley.edu/~${PN}/Documentation/LanguageDescription/Descript.ps.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 sparc"
+IUSE=""
 
 DEPEND=">=sys-devel/gcc-2.95.3-r5
-		>=dev-libs/boehm-gc-6.0"
+	>=dev-libs/boehm-gc-6.0"
 RDEPEND=">=sys-devel/gcc-2.95.3-r5"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
-	unpack Sather-1.3.tar.gz
-	
+	unpack ${MY_P}.tar.gz
+
+	epatch ${FILESDIR}/${P}_gentoo.patch.gz
+
 	mkdir doc
 	cd doc
-	unpack sather-tutorial-000328.html.tar.gz
-	unpack sather-specification-000328.html.tar.gz
-	cp ${DISTDIR}/sather-tutorial-000328.ps.gz .
-	cp ${DISTDIR}/sather-specification-000328.ps.gz .
+	unpack ${PN}-tutorial-000328.html.tar.gz
+	unpack ${PN}-specification-000328.html.tar.gz
+	cp ${DISTDIR}/${PN}-tutorial-000328.ps.gz .
+	cp ${DISTDIR}/${PN}-specification-000328.ps.gz .
 	cp ${DISTDIR}/satish-thatte.ps.gz .
 	cp ${DISTDIR}/Descript.ps.gz .
 }
 
 src_compile() {
-
 	export SATHER_HOME="$S"
 	export LOCALE="en_NZ"
 	export SATHER_ENV="$SATHER_HOME/resources/$LOCALE/bin/LIBCHARS-posix"
 	export SATHER_RESOURCES="$SATHER_HOME/resources/$LOCALE"
 	export PATH="$PATH:$SATHER_HOME/bin"
-	
+
 	./configure linux || die
 	make || die
-
 }
 
-src_install () {
-
+src_install() {
 	dodir /usr
-	cp -a ${WORKDIR}/Sather-1.3 ${D}/usr/sather
-	rm -rf ${D}/usr/sather/bin/sacomp.code
-	rm -rf ${D}/usr/sather/bin/sacomp-boot.code
-	rm -rf ${D}/usr/sather/system
-	
+	cp -pPR ${WORKDIR}/${MY_P} ${D}/usr/sather
+	rm -rf ${D}/usr/${PN}/bin/sacomp.code
+	rm -rf ${D}/usr/${PN}/bin/sacomp-boot.code
+	rm -rf ${D}/usr/${PN}/sacomp
+	rm -rf ${D}/usr/${PN}/sacomp-boot
+	rm -rf ${D}/usr/${PN}/system
+	dodir /usr/${PN}/system
+	cp ${WORKDIR}/${PN}-1.3/system/CONFIG ${D}/usr/${PN}/system
+	cp ${WORKDIR}/${PN}-1.3/system/FORBID ${D}/usr/${PN}/system
+
 	cd ${WORKDIR}
-	dodoc doc/sather-specification-000328.ps.gz doc/sather-tutorial-000328.ps.gz doc/satish-thatte.ps.gz doc/Descript.ps.gz
-	cp -a doc/specification.html ${D}/usr/share/doc/${P}
-	cp -a doc/tutorial.html ${D}/usr/share/doc/${P}
-	
+	dodoc doc/${PN}-specification-000328.ps.gz doc/${PN}-tutorial-000328.ps.gz doc/satish-thatte.ps.gz doc/Descript.ps.gz
+	cp -pPR doc/specification.html ${D}/usr/share/doc/${P}
+	cp -pPR doc/tutorial.html ${D}/usr/share/doc/${P}
+
 	dodir /etc/env.d
 cat >> ${D}/etc/env.d/05sather <<EOF
-	export SATHER_HOME="/usr/sather"
-	export LOCALE="en_NZ"
-	export SATHER_ENV="/usr/sather/resources/en_NZ/bin/LIBCHARS-posix"
-	export SATHER_RESOURCES="/usr/sather/resources/en_NZ"
-	export PATH="/usr/sather/bin"
+SATHER_HOME="/usr/sather"
+SATHER_ENV="/usr/sather/resources/en_NZ/bin/LIBCHARS-posix"
+SATHER_RESOURCES="/usr/sather/resources/en_NZ"
+PATH="/usr/sather/bin"
 EOF
-
 }
diff --git a/dev-lang/smalltalkx/ChangeLog b/dev-lang/smalltalkx/ChangeLog
index 27dc34879ef5..6968c6229d77 100644
--- a/dev-lang/smalltalkx/ChangeLog
+++ b/dev-lang/smalltalkx/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-lang/smalltalkx
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smalltalkx/ChangeLog,v 1.1 2002/11/02 23:49:49 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smalltalkx/ChangeLog,v 1.1.1.1 2005/11/30 09:58:18 chriswhite Exp $
+
+*smalltalkx-5.2.6 (24 Aug 2005)
+
+  24 Aug 2005; Luis F. Araujo <araujo@gentoo.org> +metadata.xml,
+  +smalltalkx-5.2.6.ebuild:
+  Updated SmallTalkX version.
+
+  03 Jun 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  smalltalkx-4.1.4.ebuild:
+  mark -ppc due to use of x86 binaries
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  smalltalkx-4.1.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  07 Jun 2003; Seemant Kulleen <seemant@gentoo.org> smalltalkx-4.1.4.ebuild:
+  fixed environment variables, and the dosed statement. Now smalltalk *actually
+  runsls -al-al Closes bug #11690 by katerina <kllba@operamail.com>
 
 *smalltalkx-4.1.4 (03 Nov 2002)
 
diff --git a/dev-lang/smalltalkx/Manifest b/dev-lang/smalltalkx/Manifest
index e69de29bb2d1..27b09979176d 100644
--- a/dev-lang/smalltalkx/Manifest
+++ b/dev-lang/smalltalkx/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5223d3f980c88ca9dc2b348fcad82cc2 ChangeLog 1057
+MD5 6cd5c058014d6562ad79aff6b0903906 smalltalkx-5.2.6.ebuild 1450
+MD5 d21fe3dc29a72d5789b782c91df9c9c9 metadata.xml 783
+MD5 a42c120be5e046d61d471545ca7152c8 files/digest-smalltalkx-5.2.6 147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLDL0BQBy/eDH5uERAosWAKCSeHzpiZJWn37/mKY+Rc/q4wVA3gCeOLLc
+DUG3ScUEXNGUR89aCRICOmM=
+=cU20
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/smalltalkx/smalltalkx-5.2.6.ebuild b/dev-lang/smalltalkx/smalltalkx-5.2.6.ebuild
index e1c32881692b..2de0f0aed694 100644
--- a/dev-lang/smalltalkx/smalltalkx-5.2.6.ebuild
+++ b/dev-lang/smalltalkx/smalltalkx-5.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smalltalkx/smalltalkx-5.2.6.ebuild,v 1.1 2005/08/24 11:44:14 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smalltalkx/smalltalkx-5.2.6.ebuild,v 1.1.1.1 2005/11/30 09:58:18 chriswhite Exp $
 
 DESCRIPTION="The non-commercial version of a complete implementation of the Smalltalk programming language and development environment"
 HOMEPAGE="http://www.exept.de/exept/english/Smalltalk/frame_uebersicht.html"
diff --git a/dev-lang/smarteiffel/ChangeLog b/dev-lang/smarteiffel/ChangeLog
index fc17427ab0aa..46e2e8934972 100644
--- a/dev-lang/smarteiffel/ChangeLog
+++ b/dev-lang/smarteiffel/ChangeLog
@@ -1,8 +1,58 @@
 # ChangeLog for dev-lang/smarteiffel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/ChangeLog,v 1.1 2002/11/22 08:46:34 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/ChangeLog,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
-*smarteiffel-1.00beta5 (16 Nov 2002)
+  04 May 2005; David Holm <dholm@gentoo.org> smarteiffel-2.0_rc2.ebuild:
+  Added to ~ppc.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  smarteiffel-1.0.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> smarteiffel-2.0_rc2.ebuild:
+  Added ~sparc keyword.
+
+  07 Oct 2004; George Shapovalov <george@gentoo.org> smarteiffel-2.0_rc2.ebuild, files/digest-smarteiffel-2.0_rc2, metadata.xml :
+  new version (#64545)
+  added ~amd64 to KEYWORDS
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  smarteiffel-1.0.ebuild, smarteiffel-1.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> smarteiffel-1.0.ebuild,
+  smarteiffel-1.1.ebuild:
+  Fix use invocation
+
+  15 May 2004; Bryan Østergaard <kloeri@gentoo.org> smarteiffel-1.1.ebuild:
+  Stable on alpha.
+
+*smarteiffel-1.1 (16 Oct 2003)
+
+  16 Oct 2003; George Shapovalov <george@gentoo.org> smarteiffel-1.1.ebuild :
+  new version
+  this one has rewamped install "script", required quite some tweaking. 
+  Testing extremely welcome!
+
+  10 Jun 2003; <msterret@gentoo.org> smarteiffel-1.0.ebuild:
+  Took tcc out of IUSE since it was commented out in the ebuild.
+
+*smarteiffel-1.0_beta5 (16 Nov 2002)
+*smarteiffel-1.0 (09 Dec 2002)
+
+  09 Dec 2002; George Shapovalov <george@gentoo.org> smarteiffel-1.0.ebuild, files/digest-smarteiffel-1.0 :
+
+  smarteiffel-1.0 released, version update. Changes to ebuild (by Per Wigren <wigren@home.se>):
+  * Support for TinyCC as default compiler using "tcc"-useflag.   - problematic at the moment, commented uot (George)
+  * Added a SE_DIR environment-variable so all extra-packages can depend on it.
+  * Changed SE_DIR to /usr/lib/SmartEiffel, because that is the default dir if the
+  SmartEiffel-variable is not set, and a few 3rd-party-packages expect it.
+  * Don't rename compile to se-compile anymore! This breaks ALL 3rd-party-packages!
+  * SmartEiffel is now distributed with versionnumbered filenames so there's no
+  need to rename+mirror anymore! ;)
 
   22 Nov 2002; George Shapovalov <george@gentoo.org> smarteiffel-1.0_beta5.ebuild, files/digest-smarteiffel-1.0_beta5 :
   cleaned up and committed to portage.
diff --git a/dev-lang/smarteiffel/Manifest b/dev-lang/smarteiffel/Manifest
index e69de29bb2d1..6553bdf787a0 100644
--- a/dev-lang/smarteiffel/Manifest
+++ b/dev-lang/smarteiffel/Manifest
@@ -0,0 +1,10 @@
+MD5 a7426ad157cb8ac5683151b423d89ab7 ChangeLog 3110
+MD5 d69310e04c23327b2e72ce63d0279c0f smarteiffel-1.0.ebuild 2130
+MD5 d027ccde2ebc313d41a91a699044733c smarteiffel-1.0_beta5.ebuild 2229
+MD5 3c93ded265cf997556d78f95f834c429 smarteiffel-1.1.ebuild 2373
+MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
+MD5 c46453c3f2401d5d60dd3f345a644f04 smarteiffel-2.0_rc2.ebuild 2725
+MD5 ac711f98b4db909cc9a1f5caac836200 files/digest-smarteiffel-1.0 56
+MD5 5eb607a2acf270cd997783730d6280f4 files/digest-smarteiffel-1.0_beta5 74
+MD5 8e77136ea7437bc6665796429795e5a3 files/digest-smarteiffel-1.1 56
+MD5 36e9f5dae78d0038a62ec283d005f07d files/digest-smarteiffel-2.0_rc2 64
diff --git a/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5 b/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5
index 9329e6456bea..623eee4be6eb 100644
--- a/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5
+++ b/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5
@@ -1 +1 @@
-MD5 c8b6d51223d9a34fc363ed98d90e178e se.tar.bz2 955516
+MD5 c8b6d51223d9a34fc363ed98d90e178e smarteiffel-1.0_beta5.tar.bz2 955516
diff --git a/dev-lang/smarteiffel/smarteiffel-1.0.ebuild b/dev-lang/smarteiffel/smarteiffel-1.0.ebuild
index d9b9dbe3fe35..59e4f2b1f9c7 100644
--- a/dev-lang/smarteiffel/smarteiffel-1.0.ebuild
+++ b/dev-lang/smarteiffel/smarteiffel-1.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-1.0.ebuild,v 1.1 2002/12/10 08:45:55 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-1.0.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
-IUSE="doc tcc"
+IUSE="doc"
+#IUSE="doc tcc"
 
 DESCRIPTION="GNU Eiffel compiler"
 HOMEPAGE="http://smarteiffel.loria.fr/"
@@ -11,10 +12,10 @@ SRC_URI="ftp://ftp.loria.fr/pub/loria/SmartEiffel/se-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~sparc64"
+KEYWORDS="x86 ppc ~alpha ~sparc"
 
 #DEPEND="tcc? ( >=dev-lang/tcc-0.9.14 )"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S="${WORKDIR}/SmartEiffel"
 # Destination directory to hold most of the SmartEiffel distribution.
@@ -65,7 +66,7 @@ src_install () {
 	done
 
 	# Install documentation.
-	if [ -n `use doc` ]; then
+	if use doc; then
 		einfo "Installing documentation"
 		dodir /usr/share/doc/${PF}
 		cp -a ${S}/{man,misc,tutorial,READ_ME} ${D}/usr/share/doc/${PF} || die
diff --git a/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild b/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild
index 39c28f785926..f543587c64eb 100644
--- a/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild
+++ b/dev-lang/smarteiffel/smarteiffel-1.0_beta5.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/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild,v 1.1 2002/11/22 08:46:34 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 IUSE=""
 
@@ -10,11 +10,11 @@ HOMEPAGE="http://smarteiffel.loria.fr/"
 #the source as distributed by authors has no versioning in its name,
 #this will break things when new version comes out.
 #just point SRC_URI to ibiblio mirror instead (with mangled name of source uploaded)
-SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="sys-devel/gcc"
 
diff --git a/dev-lang/smarteiffel/smarteiffel-1.1.ebuild b/dev-lang/smarteiffel/smarteiffel-1.1.ebuild
index e5754113a7ad..a8b18352b35a 100644
--- a/dev-lang/smarteiffel/smarteiffel-1.1.ebuild
+++ b/dev-lang/smarteiffel/smarteiffel-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-1.1.ebuild,v 1.1 2003/10/17 03:18:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-1.1.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 #IUSE="doc"
 IUSE="doc tcc"
@@ -12,10 +12,10 @@ SRC_URI="ftp://ftp.loria.fr/pub/loria/SmartEiffel/se-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc alpha ~sparc"
 
 DEPEND="tcc? ( >=dev-lang/tcc-0.9.14 )"
-#DEPEND="virtual/glibc"
+#DEPEND="virtual/libc"
 
 S="${WORKDIR}/SmartEiffel"
 # Destination directory to hold most of the SmartEiffel distribution.
@@ -71,7 +71,7 @@ src_install () {
 	done
 
 	# Install documentation.
-	if [ -n `use doc` ]; then
+	if use doc; then
 		einfo "Installing documentation"
 		dodir /usr/share/doc/${PF}
 		cp -a ${S}/{man,misc,tutorial,READ_ME} ${D}/usr/share/doc/${PF} || die
diff --git a/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild b/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild
index 4c116db17ebf..80623882f11e 100644
--- a/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild
+++ b/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild,v 1.1 2004/10/07 22:01:31 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild,v 1.1.1.1 2005/11/30 09:58:24 chriswhite Exp $
 
 IUSE="doc tcc"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.loria.fr/pub/loria/SmartEiffel/se.latest/se-${MY_PV//_/-}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
 
 DEPEND="tcc? ( >=dev-lang/tcc-0.9.14 )"
 
diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog
index a07da6dca9d1..0489b714ec28 100644
--- a/dev-lang/smlnj/ChangeLog
+++ b/dev-lang/smlnj/ChangeLog
@@ -1,8 +1,55 @@
-# ChangeLog for dev-ml/smlnj
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.1 2003/04/03 10:38:52 george Exp $
+# ChangeLog for dev-lang/smlnj
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
-*smlnj-110.42.ebuild (03 Apr 2003)
+  06 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.0.7.ebuild,
+  smlnj-110.45.ebuild:
+  Fix SRC_URI (bug #62054).
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.45.ebuild:
+  Fix for bug #60965, install.sh needs C locale to complete.
+
+  07 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.0.7.ebuild,
+  smlnj-110.45.ebuild:
+  Use export, otherwise build fails on 'clean' (not update) installs.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> smlnj-110.0.7.ebuild,
+  smlnj-110.45.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild,
+  smlnj-110.43.ebuild, files/smlnj-110.43-gcc33-quirk-fix.patch:
+  Remove non-functionnal 110.4{2,3} ebuilds, add latest working version 110.45
+  and latest stable version 110.0.7. Also change SRC_URI's to gentoo mirrors to
+  fix Manifest/digest bugs. Thanks to Bernd Knochenhauer <bk@zerg.homelinux.net>
+  for help in the testing of these ebuilds. It should fix bugs #43045, #43018, 
+  #30207.
+
+  10 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild,
+  smlnj-110.43.ebuild, files/smlnj-110.43-gcc33-quirk-fix.patch:
+  change src_postinst to pkg_postinst
+
+  08 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild:
+  Fix bug #48509.
+
+  24 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild,
+  smlnj-110.43.ebuild:
+  Fix copyright header.
+
+  24 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.43.ebuild:
+  Add postinst instructions (fix bug#48509).
+
+*smlnj-110.43 (30 Sep 2003)
+
+  03 Oct 2003; Joshua Kinard <kumba@gentoo.org> smlnj-110.43.ebuild:
+  Added a patch to removes -ansi flags from the x86-linux Makefiles as they
+  interfere with gcc.  Closes Bug #30207.
+
+  30 Sep 2003; George Shapovalov <george@gentoo.org> smlnj-110.43.ebuild :
+  new version,
+  marked 110.42 stable
+
+*smlnj-110.42 (03 Apr 2003)
 
   03 Apr 2003; George Shapovalov <george@gentoo.org> smlnj-110.42.ebuild, files/digest-smlnj-110.42 :
   initial release (#9989)
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index e69de29bb2d1..2e713bd40f86 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -0,0 +1,8 @@
+MD5 e148c5177dcf9fc64879eb30c6d460dd smlnj-110.0.7.ebuild 2453
+MD5 2ada93c1e47180f8459a77fe483664ea smlnj-110.45.ebuild 2350
+MD5 e9c296f154172d9b20d2cf59386e9af1 ChangeLog 2387
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 052c6ec903df4598663eaaecb76a75cc files/digest-smlnj-110.0.7 857
+MD5 1bbb6b968c7f7ba50fdd9abcac22343b files/smlnj-110.0.7-bindir.patch 364
+MD5 ad71c8d20ca50e85ceb5d44d0c7a4ea6 files/smlnj-110.0.7-gcc33-quirk-fix.patch 451
+MD5 30591f243ab3c505e7a5c9d8b2ea5606 files/digest-smlnj-110.45 763
diff --git a/dev-lang/smlnj/smlnj-110.0.7.ebuild b/dev-lang/smlnj/smlnj-110.0.7.ebuild
index 43b405d9f4fe..c8e38df430ee 100644
--- a/dev-lang/smlnj/smlnj-110.0.7.ebuild
+++ b/dev-lang/smlnj/smlnj-110.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.0.7.ebuild,v 1.1 2004/06/10 11:15:38 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.0.7.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 inherit eutils
 
@@ -8,18 +8,18 @@ IUSE=""
 
 DESCRIPTION="Standard ML of New Jersey compiler and libraries"
 
-SRC_URI="mirror://${P}-bin.x86-unix.tar.Z
-mirror://${P}-config.tar.Z
-mirror://${P}-runtime.tar.Z
-mirror://${P}-ml-lex.tar.Z
-mirror://${P}-ml-yacc.tar.Z
-mirror://${P}-ml-burg.tar.Z
-mirror://${P}-sml-nj.tar.Z
-mirror://${P}-smlnj-c.tar.Z
-mirror://${P}-smlnj-lib.tar.Z
-mirror://${P}-cml.tar.Z
-mirror://${P}-cm.tar.Z
-mirror://${P}-eXene.tar.Z"
+SRC_URI="mirror://gentoo/${P}-bin.x86-unix.tar.Z
+mirror://gentoo/${P}-config.tar.Z
+mirror://gentoo/${P}-runtime.tar.Z
+mirror://gentoo/${P}-ml-lex.tar.Z
+mirror://gentoo/${P}-ml-yacc.tar.Z
+mirror://gentoo/${P}-ml-burg.tar.Z
+mirror://gentoo/${P}-sml-nj.tar.Z
+mirror://gentoo/${P}-smlnj-c.tar.Z
+mirror://gentoo/${P}-smlnj-lib.tar.Z
+mirror://gentoo/${P}-cml.tar.Z
+mirror://gentoo/${P}-cm.tar.Z
+mirror://gentoo/${P}-eXene.tar.Z"
 
 HOMEPAGE="http://www.smlnj.org/"
 
@@ -27,7 +27,7 @@ LICENSE="BSD"
 KEYWORDS="-* x86"
 
 SLOT="0"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SMLNJ_DEST="/usr/lib/smlnj"
 SMLNJ_TARGETS="./config/targets"
@@ -63,7 +63,7 @@ src_unpack() {
 }
 
 src_compile() {
-	SMLNJ_HOME=${WORKDIR}
+	export SMLNJ_HOME=${WORKDIR}
 	cd ${WORKDIR}
 
 	./config/install.sh || die
@@ -93,4 +93,4 @@ pkg_postinst() {
 	einfo
 	einfo "You need to run env-update to get a working installation"
 	einfo
-}
\ No newline at end of file
+}
diff --git a/dev-lang/smlnj/smlnj-110.45.ebuild b/dev-lang/smlnj/smlnj-110.45.ebuild
index 144e56b82712..45becca0a8d0 100644
--- a/dev-lang/smlnj/smlnj-110.45.ebuild
+++ b/dev-lang/smlnj/smlnj-110.45.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.45.ebuild,v 1.1 2004/06/10 11:15:38 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.45.ebuild,v 1.1.1.1 2005/11/30 09:58:31 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Standard ML of New Jersey compiler and libraries"
 HOMEPAGE="http://www.smlnj.org"
 
-SRC_URI="x86? ( mirror://${P}-boot.x86-unix.tgz )
-ppc? ( mirror://${P}-boot.ppc-unix.tgz )
-mirror://${P}-config.tgz
-mirror://${P}-MLRISC.tgz
-mirror://${P}-runtime.tgz
-mirror://${P}-ml-lex.tgz
-mirror://${P}-ml-yacc.tgz
-mirror://${P}-ml-burg.tgz
-mirror://${P}-smlnj-lib.tgz
-mirror://${P}-cml.tgz
-mirror://${P}-eXene.tgz"
+SRC_URI="x86? ( mirror://gentoo/${P}-boot.x86-unix.tgz )
+ppc? ( mirror://gentoo/${P}-boot.ppc-unix.tgz )
+mirror://gentoo/${P}-config.tgz
+mirror://gentoo/${P}-MLRISC.tgz
+mirror://gentoo/${P}-runtime.tgz
+mirror://gentoo/${P}-ml-lex.tgz
+mirror://gentoo/${P}-ml-yacc.tgz
+mirror://gentoo/${P}-ml-burg.tgz
+mirror://gentoo/${P}-smlnj-lib.tgz
+mirror://gentoo/${P}-cml.tgz
+mirror://gentoo/${P}-eXene.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SMLNJ_DEST="/usr/lib/smlnj"
 SMLNJ_TARGETS="./config/targets"
@@ -49,14 +49,13 @@ src_unpack() {
 }
 
 src_compile() {
-	SMLNJ_HOME=${WORKDIR}
-
+	export SMLNJ_HOME=${WORKDIR}
 	cd ${WORKDIR}
 
 	echo "request ml-burg" >> $SMLNJ_TARGETS
 	echo "request eXene" >> $SMLNJ_TARGETS
 
-	./config/install.sh || die
+	LC_ALL=C ./config/install.sh || die
 }
 
 src_install() {
diff --git a/dev-lang/snobol/ChangeLog b/dev-lang/snobol/ChangeLog
index 51d98d9aa87d..c5b5dff34cd1 100644
--- a/dev-lang/snobol/ChangeLog
+++ b/dev-lang/snobol/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-lang/snobol
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/ChangeLog,v 1.1 2003/12/22 09:17:30 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/ChangeLog,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
+
+*snobol-1.0 (19 Jul 2004)
+
+  19 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  snobol-1.0.ebuild:
+  add metadata.xml, new version.
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> snobol-0.99.4.ebuild,
+  snobol-0.99.44.ebuild:
+  Don't assign default to S; header fix
+
+*snobol-0.99.44 (22 Dec 2003)
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> snobol-0.99.44.ebuild:
+  add in the beta version, which is recommended upstream
 
 *snobol-0.99.4 (22 Dec 2003)
 
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index 99f14c72e63c..73f6fd7174bb 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -1,386 +1,8 @@
-MD5 05fea97acef89ca797e757e30c445b79 snobol-0.99.4.ebuild 1457
+MD5 8cc6f6d050678dfb8b85d537f830bbc2 snobol-1.0.ebuild 1498
+MD5 480d0c1dde54d56e407dc3b49f9d6f4f snobol-0.99.44.ebuild 1433
+MD5 b92f8b532b19634e997e49f6fbeb8353 snobol-0.99.4.ebuild 1222
+MD5 98f8780ecc0cb05f83ca7b0a4c7a0d39 ChangeLog 900
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 3ec06c6673caf4c21bcacdd0453a337b files/digest-snobol-0.99.44 67
 MD5 fc15c8513d6f9fe07d1b57df53333938 files/digest-snobol-0.99.4 65
-MD5 da5582358dec0a704c2b871656a2118d snobol-0.99.4/snolib.a 20612
-MD5 8fb49bf4047635f3cd61477a671197b2 snobol-0.99.4/intspc.o 1076
-MD5 cba1b47efd2a6bd8a0631d153b9cb376 snobol-0.99.4/data.c2 2106
-MD5 b181748b7b8f02784a1d59aeb5442cd0 snobol-0.99.4/data.h2 1318
-MD5 3b51e6da05dd25e2c26f6c18b280a419 snobol-0.99.4/TODO 1670
-MD5 8fc9183b900f38fc4e065add1fa949d7 snobol-0.99.4/cc-M 782
-MD5 b01de17aa74f7a2ff068a1de0606a2e7 snobol-0.99.4/io.o 13248
-MD5 8b8dc8fec647a2332f87e552bb0687c0 snobol-0.99.4/sunmodel 9902
-MD5 0ef0a13fad89eb27d59823ed7a6ee49b snobol-0.99.4/expops.o 1080
-MD5 cb1b50c8913ab1970aa3dc0b9cfa72b2 snobol-0.99.4/History 42392
-MD5 dd7fa898509e7e8db58fc2ab04a08430 snobol-0.99.4/Makefile 1006
-MD5 45014ef3b36e0b5f9c469bff80ea81ba snobol-0.99.4/rename.o 944
-MD5 b048a63ad77240ea8790d78cee85041b snobol-0.99.4/mstime.o 868
-MD5 d99caececde96002e402ea6e177e60a9 snobol-0.99.4/bal.o 810
-MD5 07c70339ab833c3cad7dc0a3a1523649 snobol-0.99.4/cos.o 800
-MD5 18da02ded6dc43b6d967a2192a638d58 snobol-0.99.4/equ.h 1528
-MD5 483cd490ef8b6f7c2297572105125af9 snobol-0.99.4/exp.o 800
-MD5 eca21af97a7d775eef7f194460391e91 snobol-0.99.4/log.o 800
-MD5 c32f62ae9205f4633653d65bb31aefda snobol-0.99.4/pat.o 1211
-MD5 50f4b08a2d797c9d6fb064e22a38b931 snobol-0.99.4/pml.h 1631
-MD5 988f13effe81dd985cb49a292bc0af1b snobol-0.99.4/pml.o 2400
-MD5 b132e6312cc88e0cddd188ffbb5e40d2 snobol-0.99.4/procs 1994
-MD5 6b0d2b9aaba41f69cea0eac77d445154 snobol-0.99.4/res.h 47348
-MD5 43e23b7e3a900d3493f493a9906349cf snobol-0.99.4/sin.o 800
-MD5 6969715d60bccb94dd4b7de19dbdb92a snobol-0.99.4/tan.o 800
-MD5 0c217380ce70d94d45feaef50031a617 snobol-0.99.4/str.o 1788
-MD5 997389ca80030e16bdd902c65c0186de snobol-0.99.4/syn.c 44506
-MD5 c80998f2f715e70851e324c8be20a616 snobol-0.99.4/syn.h 866
-MD5 7be12c10bb31aedb4612a86655bb5b8c snobol-0.99.4/syn.o 14284
-MD5 1cbe73388f5d0efec14b539708388411 snobol-0.99.4/sys.o 1124
-MD5 101b04af0cd0ea95b3ffa030d56b219d snobol-0.99.4/top.o 771
-MD5 7bf6a8e0b8f49552e25a690f77f12874 snobol-0.99.4/tty.o 1764
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/.depend 0
-MD5 e1f387c5be8f839d949d8770a33064e7 snobol-0.99.4/README 4271
-MD5 d3a2976fa6567bdd68849235c8c56ffb snobol-0.99.4/retstring.o 1384
-MD5 062ba878908705cab1f21060e0e0e8f4 snobol-0.99.4/TESTED 29
-MD5 1ebc9763ec115676daf0c2fc961d9d7c snobol-0.99.4/syntax.tbl 5447
-MD5 bc37a9392a669cc86edb3e6cd0ac408f snobol-0.99.4/config.m4 1476
-MD5 5377704c02fd2f250039f42da4c50a22 snobol-0.99.4/configure 142
-MD5 fe0e8dd9d09ce87f2b632d94b87fbbb4 snobol-0.99.4/timing.out 3307
-MD5 1cdac5ff9abcb923831480fc91653d2a snobol-0.99.4/timing.sno 5306
-MD5 d2a89c8cbce09756456de63922729127 snobol-0.99.4/getstring.o 860
-MD5 3aa282c254178fdf85f34bb8bccac0bd snobol-0.99.4/replace.o 906
-MD5 bde6a5fb5bc748cdb7b96f3ac1b570b3 snobol-0.99.4/autoconf 10221
-MD5 c1d0ed349423204eb875b6ba064c5f5b snobol-0.99.4/v311.sil 304016
-MD5 6f8eb13de7cbf74904fd203158725f00 snobol-0.99.4/endex.o 908
-MD5 cbd1a0695b0ba0d82c5d008c64fd1c36 snobol-0.99.4/charset.c 1764
-MD5 dfb8270bbbe37d748e12583fa4872722 snobol-0.99.4/mdata.h 91
-MD5 9cbd0daed6659cfc23325ccc9a8351bb snobol-0.99.4/test.out 1444
-MD5 647b33e36496b4f8e92ca7bbdcc5e90b snobol-0.99.4/config.guess 20430
-MD5 fde94c7471f72ccd82afb0298cfcce27 snobol-0.99.4/genc.sno 39502
-MD5 ee11e3a68900ed82ee63be4591bc7096 snobol-0.99.4/convert.o 1308
-MD5 2d58341c68b66a53d77ef91af224c104 snobol-0.99.4/chop.o 789
-MD5 2504a80360829aac540dea3d675cfd7c snobol-0.99.4/mlink.h 91
-MD5 cba1b47efd2a6bd8a0631d153b9cb376 snobol-0.99.4/data.c 2106
-MD5 b181748b7b8f02784a1d59aeb5442cd0 snobol-0.99.4/data.h 1318
-MD5 09264ffdb77ad9c5b7c6086c6e0c5896 snobol-0.99.4/data.o 2580
-MD5 6fb6f05ea3f48dbe3c42503524906622 snobol-0.99.4/date.o 1400
-MD5 300ad2b770ef324ce81428b2e6b6fe6a snobol-0.99.4/dump.o 664
-MD5 18da02ded6dc43b6d967a2192a638d58 snobol-0.99.4/equ.h2 1528
-MD5 2e84242efa2df87b1cb8f75245b57bdd snobol-0.99.4/file.o 904
-MD5 55da9790f1b5ba52709d1534272c5689 snobol-0.99.4/exit.o 928
-MD5 01b0aa577eb5d8ef116c879677eb5495 snobol-0.99.4/fork.o 804
-MD5 fd53c2fb37e58fad920f37dbe973e6d3 snobol-0.99.4/execute.o 1032
-MD5 35f3ca674422825956e254e0816aceaa snobol-0.99.4/hash.o 825
-MD5 380404b227d4be30ea78642c8532206d snobol-0.99.4/isnobol4.c 214858
-MD5 14c0df355c16031ff1ab1e966591de4f snobol-0.99.4/isnobol4.o 399172
-MD5 0d06c1f46f50619365e669f99f94e87c snobol-0.99.4/bsplitu.c 866
-MD5 84bcbd29b81b3e93d5c3c23eed5bd671 snobol-0.99.4/host.o 2052
-MD5 f4d6dcf74467427fc2de1b61fd100303 snobol-0.99.4/lexcmp.o 793
-MD5 8d000e55da4a97bbaa5a73d7e7d700f6 snobol-0.99.4/inet.o 2004
-MD5 86320c95b0b855e57bfa80533e1cb57a snobol-0.99.4/init.o 6520
-MD5 c3a7419cb6c287f8a095f078d5c4e460 snobol-0.99.4/main.c 257
-MD5 71723f1b85d3fc649c1a4e616d413367 snobol-0.99.4/main.o 928
-MD5 dfb8bfa053685f7fe22a1980f3c0146a snobol-0.99.4/load.o 2044
-MD5 3508ffac4ce47c0506f0a3a4a0528ad3 snobol-0.99.4/globals 894
-MD5 758652f1b67c81cc026d5dc56caaf36c snobol-0.99.4/delete.o 892
-MD5 c4a0ce099fd8cf8c9f38e6355d6d3acb snobol-0.99.4/pair.o 886
-MD5 6930223d81b92ed7910bc867ed3fecc1 snobol-0.99.4/proc.h 2965
-MD5 33fd15f8fb9af65e7b2f69733a3e2d18 snobol-0.99.4/findunit.o 820
-MD5 f5246c36df132a37879c9ea389778476 snobol-0.99.4/Makefile2.m4 14344
-MD5 6b0d2b9aaba41f69cea0eac77d445154 snobol-0.99.4/res.h2 47348
-MD5 a454979cdc23ce805c985ff291291301 snobol-0.99.4/inline.sno 172
-MD5 e5f738415ea0260dd63bb623cea8e47c snobol-0.99.4/term.o 888
-MD5 342ef8f2d80cbe04e7fe1a1016cea550 snobol-0.99.4/sqrt.o 840
-MD5 b0524e7ec29141bc11394080d4779a79 snobol-0.99.4/timing 2216
-MD5 c80998f2f715e70851e324c8be20a616 snobol-0.99.4/syn.h2 866
-MD5 1304fd93c5af64e1aa5f3c23ae696f9b snobol-0.99.4/tree.o 1081
-MD5 4b16bfac46fa499ebb12027df3e7a27f snobol-0.99.4/xsnobol4 298040
-MD5 313d0e1a877823980e5e2112f8d54643 snobol-0.99.4/Makefile2 28875
-MD5 642a8dd349074a73c846c198c41b3822 snobol-0.99.4/sprintf.o 1056
-MD5 43103fec0c27fe2569fe1220aac52741 snobol-0.99.4/parms.h 789
-MD5 15804ce1b6e61b2d47efd8e3232b31ca snobol-0.99.4/INSTALL 5025
-MD5 e852cdd0d0c3975dd9a06df8246fe39c snobol-0.99.4/dynamic.o 832
-MD5 41189d3dd510e04e9740c0c81a713de8 snobol-0.99.4/TODO.soon 6898
-MD5 4429ebce8ee397499b9e3b603d999ea8 snobol-0.99.4/CHANGES 4412
-MD5 bda32e4fc409853d9c009155b61f5063 snobol-0.99.4/gensyn.sno 5731
-MD5 73ece3ad96678c005a9ddad0020c616c snobol-0.99.4/local-config 47
-MD5 857017c92950a66c115141caa1b1e738 snobol-0.99.4/version.c 2297
-MD5 40a6d5136b1c049e488f91a9af57ddf7 snobol-0.99.4/version.o 1360
-MD5 6ada06c21ce4e9ea708380b6db56b0eb snobol-0.99.4/snobol4.c 214840
-MD5 a2f74b3d6b3e1cd074f9dc86eb581fca snobol-0.99.4/gendata.sno 6108
-MD5 0c194b27c195235bb60a12a07a3e2c9f snobol-0.99.4/stream.o 1500
-MD5 596a2db7b420597b1fca9ec292e6f2c3 snobol-0.99.4/realst.o 1156
-MD5 93b377f03bd134232d583e49b38867c9 snobol-0.99.4/data_init.h2 64871
-MD5 cbb8edc6cfdcbdda36b2a4a21aa70590 snobol-0.99.4/ordvst.o 1296
-MD5 6930223d81b92ed7910bc867ed3fecc1 snobol-0.99.4/proc.h2 2965
-MD5 c7a6c40953f474d6761c03e50a5e627e snobol-0.99.4/environ.o 691
-MD5 b7607bace5fb01bdf5bb413f9ea9ed99 snobol-0.99.4/data_init.c 681
-MD5 93b377f03bd134232d583e49b38867c9 snobol-0.99.4/data_init.h 64871
-MD5 5c73ce8964f0bbbe82faaf8877ceb7e9 snobol-0.99.4/data_init.o 48572
-MD5 29c52036681d4659acf5243c60cbaa56 snobol-0.99.4/doc/snobol4.ps 40674
-MD5 b9becc6582948f6ed2a83341ed2b7992 snobol-0.99.4/doc/porting.doc 20262
-MD5 f8c94bb539100f1e973ecdfb631c819d snobol-0.99.4/doc/Makefile 952
-MD5 2f7bc371a990776bd9d60b189a0e290e snobol-0.99.4/doc/porting.html 15264
-MD5 b75c8036c3126f60a2da49b589a1fdc9 snobol-0.99.4/doc/snobol4.html 30144
-MD5 b32c5476a9407e13e21af84337dddf63 snobol-0.99.4/doc/porting.ms 13944
-MD5 abec4f0f309713430c6849ab802a7eba snobol-0.99.4/doc/ports.doc 9820
-MD5 7d1f5cc15744976a4d6616cac45f60ab snobol-0.99.4/doc/design.doc 3039
-MD5 b5f7abaea1103c69e7a4805157e04eef snobol-0.99.4/doc/get-os 81
-MD5 cbcefa18b8d96e6dfb503a2c57f34339 snobol-0.99.4/doc/load.doc 9226
-MD5 084072d7d2a56ef8ff5267760d676bb7 snobol-0.99.4/doc/goals.doc 1358
-MD5 9a00c245f7fe93262ecd53883eac1292 snobol-0.99.4/doc/load.doc.bak 8485
-MD5 ac3cc76bab386aed812fa76816621d3b snobol-0.99.4/doc/test.html 19776
-MD5 03b58dfc0d903eb09922c8b7cea384f2 snobol-0.99.4/doc/snobol4.0 31583
-MD5 9341edd1e8c95460a50b00d5745584c5 snobol-0.99.4/doc/snobol4.1 21315
-MD5 2ccb74485a046e6f371845b93edb6291 snobol-0.99.4/lib/ALLC 74
-MD5 41f6c0e24c06b1aae4cf07fd19b33850 snobol-0.99.4/lib/intspc.c 552
-MD5 91a9c487cb69639032baf0e782e0bca7 snobol-0.99.4/lib/io.c 27510
-MD5 33a4acb96f6d03539b950189d122f0ab snobol-0.99.4/lib/bal.c 678
-MD5 682fac48d8d06245bf1d08d08e9035f6 snobol-0.99.4/lib/pat.c 2049
-MD5 2c2ec4af172f530b8b34b03741e8d71b snobol-0.99.4/lib/pml.c 1860
-MD5 12b5610f9138285d11f4ec30c4311048 snobol-0.99.4/lib/str.c 2459
-MD5 81c14a61263137d54efc941c2e204fa1 snobol-0.99.4/lib/top.c 744
-MD5 4ede0ea97344a1f1e9cdff4a0eab9b95 snobol-0.99.4/lib/README 191
-MD5 ab45ea971320bcd44b68a6ed0631e588 snobol-0.99.4/lib/replace.c 946
-MD5 21866b7e5e8ec41b811981cdc146f4b1 snobol-0.99.4/lib/endex.c 735
-MD5 ac70fac01daa94a1d36fd6e2c26612a7 snobol-0.99.4/lib/date.c 1831
-MD5 cfa0ef6bfea73b783e415afb113837a0 snobol-0.99.4/lib/dump.c 3775
-MD5 576e94f33c37a6021cf310defa31e29f snobol-0.99.4/lib/hash.c 2252
-MD5 7cea818c836a6c4a097e2b7539a6884f snobol-0.99.4/lib/lexcmp.c 372
-MD5 9e44eea44fa7fe5019bb38dda1f258ab snobol-0.99.4/lib/init.c 8243
-MD5 c2c3eab67cd1383592d9f137e2822719 snobol-0.99.4/lib/pair.c 1252
-MD5 bb9b716746ee1412cc2fdc513de8207d snobol-0.99.4/lib/tree.c 1081
-MD5 5ad5499b2808b720e9f35784e1f8bf62 snobol-0.99.4/lib/stream.c 3872
-MD5 8b7046be147f3b47c4c1ab0472794709 snobol-0.99.4/lib/realst.c 788
-MD5 37be1fe026b1a386c4bae19f3e6f088c snobol-0.99.4/lib/ordvst.c 6600
-MD5 aa2e90176cc93c8e33a967295c4133ea snobol-0.99.4/bugs/io 938
-MD5 6a26fa77ce20d995b7f8234aff9b2463 snobol-0.99.4/test/fun1.ref 84
-MD5 b4bbcdffd57654ba8eefdf9091b1f5d0 snobol-0.99.4/test/fun1.sno 189
-MD5 5dae4437e34a39879c0a90449000b1c2 snobol-0.99.4/test/fun2.ref 14
-MD5 914b29e35f58288560cef7833fdc4a72 snobol-0.99.4/test/fun2.sno 238
-MD5 bcb722909701dcb94ed9294eb7f4a6c6 snobol-0.99.4/test/update.ref 96
-MD5 ec963c3f596449350480766010ff6fa0 snobol-0.99.4/test/update.sno 869
-MD5 ebcadc16cfa54129bd02c824f5de5707 snobol-0.99.4/test/fact.ref 89
-MD5 541a25f4309a9fff2eed21b04fdea000 snobol-0.99.4/test/fact.sno 291
-MD5 9817cc2cf8c85fd5235225de8b3bf9a5 snobol-0.99.4/test/repl.ref 70
-MD5 9dec48a3818fbba159199692ab2db603 snobol-0.99.4/test/repl.sno 203
-MD5 bf072e9119077b4e76437a93986787ef snobol-0.99.4/test/match2.ref 2
-MD5 4f9a5a55dde1bd3f6d17ba4056b4cf1e snobol-0.99.4/test/match2.sno 34
-MD5 8ddd8be4b179a529afa5f2ffae4b9858 snobol-0.99.4/test/match3.ref 13
-MD5 3e805c902c99f0129c024e5819746f3a snobol-0.99.4/test/match3.sno 53
-MD5 0b837727586030696702986973d37f77 snobol-0.99.4/test/a.ref 358
-MD5 23f9990838ceeec96bc71faef3a7e59a snobol-0.99.4/test/a.sno 22
-MD5 3d9e9302163d7142fe7616311514e299 snobol-0.99.4/test/match4.ref 13
-MD5 dd9dd7736706d63aa08043fbd2ece259 snobol-0.99.4/test/match4.sno 63
-MD5 4952591a3c8bcc8e2028ec469b450eb3 snobol-0.99.4/test/trim0.ref 355
-MD5 0a8a52c25790a4169d916fd88214121e snobol-0.99.4/test/trim0.sno 553
-MD5 de1e57c3ddb2dd7817e04c4eabdac8ca snobol-0.99.4/test/trim1.ref 101
-MD5 e9a78ed955e46bf2d4500e373c1fffb3 snobol-0.99.4/test/trim1.sno 552
-MD5 bcf62620077cb73afd655cebd4f16589 snobol-0.99.4/test/longrec.ref 1025
-MD5 c29e767403fa282d72349dffd61b878b snobol-0.99.4/test/longrec.sno 2085
-MD5 a1b4f3dd82a4e6320405e56c55e3104b snobol-0.99.4/test/space.ref 5
-MD5 56c7dcacc72bd0e567c60f354773470b snobol-0.99.4/test/space.sno 67
-MD5 dd596c134491580baad390c5f8a1b428 snobol-0.99.4/test/trace1.ref 148
-MD5 5203ae854c4b679df044dfa009ca3819 snobol-0.99.4/test/trace1.sno 109
-MD5 e7a08ce9d42436bb96dec7b6c305a1c8 snobol-0.99.4/test/len.ref 41
-MD5 5ab64dbbc5a4521bb5a302f82281e976 snobol-0.99.4/test/len.sno 211
-MD5 415e6bf0b11020d66fba9d54dae2c619 snobol-0.99.4/test/trace2.ref 74
-MD5 fab5b125c12da634922d0f93f0696fbb snobol-0.99.4/test/trace2.sno 117
-MD5 cfab6446186efd3e01baca5d7c94f4a6 snobol-0.99.4/test/float.ref 30
-MD5 67bc3895da5213e26333b87b580a667c snobol-0.99.4/test/float.sno 108
-MD5 c94a7c45dcf58f850816d5931d5e42e1 snobol-0.99.4/test/spit.ref 628
-MD5 50b47fd62bec38411d869a7c1cb5391d snobol-0.99.4/test/spit.sno 1361
-MD5 aa1fd6a0f7b485ddcb4b2b066acab6ed snobol-0.99.4/test/lgt.ref 6
-MD5 b8280bd88aff71fc97729c9d6dca8470 snobol-0.99.4/test/lgt.sno 237
-MD5 73ffe215ba9600dbf52b28a35c9f3d8e snobol-0.99.4/test/words.ref 8
-MD5 c918b18abc460da53675c714eb73449f snobol-0.99.4/test/words.sno 813
-MD5 f9c46e9340f614d590a28cbea229284e snobol-0.99.4/test/uneval.ref 6
-MD5 71795d2138889b6a3913785999e81b1a snobol-0.99.4/test/uneval.sno 74
-MD5 310a4d75b93c1ca7fb76645856f42c1c snobol-0.99.4/test/char.ref 10
-MD5 28b71ee6e03a026005f24a0b6c858e65 snobol-0.99.4/test/char.sno 98
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/end.ref 0
-MD5 2d2977d1c96f487abe4a1e202dd03b4e snobol-0.99.4/test/end.sno 4
-MD5 4393c59be82cb7150c3700a0cba6754e snobol-0.99.4/test/tab.ref 3888
-MD5 7e941120466845e3371119066e661119 snobol-0.99.4/test/tab.sno 2147
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/punch.ref 0
-MD5 ad0b1901e32ced8c8a64c5b8be3e8abb snobol-0.99.4/test/punch.sno 28
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/noexec.ref 0
-MD5 26e87f90022f650ab42dacc54896d190 snobol-0.99.4/test/noexec.sno 33
-MD5 54360370cfe8823985a7273dfd87f691 snobol-0.99.4/test/test.bin 20
-MD5 ee43b1d27c7873733c4957bfe1985444 snobol-0.99.4/test/tests.in 1229
-MD5 427a152b27d738bed87e740609176ebf snobol-0.99.4/test/conv2.ref 3
-MD5 398075aac915b61e92afc76d31638c9c snobol-0.99.4/test/conv2.sno 75
-MD5 2b4f0cab582cfe88582bc9e5d09c048b snobol-0.99.4/test/err.ref 39
-MD5 ed953a5afebaaa3473c191ee3e6a2aa8 snobol-0.99.4/test/err.sno 140
-MD5 bf072e9119077b4e76437a93986787ef snobol-0.99.4/test/match.ref 2
-MD5 c99ddcd44cb461d150b3cb6c5a4221f1 snobol-0.99.4/test/match.sno 34
-MD5 44173e225bf27f180420fcdd0bdc6048 snobol-0.99.4/test/test.dates 5907
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/matchloop.ref 0
-MD5 d58e5ab45a892fb3ad46ea1482c2cb3c snobol-0.99.4/test/matchloop.sno 81
-MD5 6f5902ac237024bdd0c176cb93063dc4 snobol-0.99.4/test/str.ref 12
-MD5 d27cd540912d8b614f95e9beb5045470 snobol-0.99.4/test/str.sno 35
-MD5 c0710d6b4f15dfa88f600b0e6b624077 snobol-0.99.4/test/contin.ref 6
-MD5 44d9c9b58c6acdfc06918828aa01901a snobol-0.99.4/test/contin.sno 73
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/collect.ref 0
-MD5 8bcdd9f5a61803c95c7054ab1c0c8ed0 snobol-0.99.4/test/collect.sno 15
-MD5 1e949d853979a20307f98335664400b1 snobol-0.99.4/test/test.reg.sh 279
-MD5 97fed77a69ebd3ba6a019d9b19b8d590 snobol-0.99.4/test/case1.ref 39
-MD5 1ab0519fce6ff88402c11175a17a54b0 snobol-0.99.4/test/case1.sno 663
-MD5 dd96c8eb193c82291332fd96b037ad15 snobol-0.99.4/test/case2.ref 5
-MD5 039f18f4e1a08bb19bca6801fc4d3ee6 snobol-0.99.4/test/case2.sno 279
-MD5 3f00d9323950bb171db61c878d5b1e42 snobol-0.99.4/test/openi.ref 63
-MD5 3f00d9323950bb171db61c878d5b1e42 snobol-0.99.4/test/openi.sno 63
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/openo.ref 0
-MD5 132b5e3eb3eeea7f359859e5363122f0 snobol-0.99.4/test/openo.sno 65
-MD5 0f723ae7f9bf07744445e93ac5595156 snobol-0.99.4/test/openo.tst 12
-MD5 2ed71440e2135b2da8fb31e8371fabab snobol-0.99.4/test/8bit.ref 21
-MD5 f72ab95f2772a3bc47bc14809b78bc67 snobol-0.99.4/test/8bit.sno 314
-MD5 7cee37b37e239ad94d07db1794bac6d5 snobol-0.99.4/test/reverse.ref 52
-MD5 0d58893a0ba37abaf98e847932bece25 snobol-0.99.4/test/reverse.sno 106
-MD5 d632eba71107bf7bc3ec423eab256d78 snobol-0.99.4/test/100func.ref 292
-MD5 835531e99c9993fbdb2d6128887e2445 snobol-0.99.4/test/100func.sno 3151
-MD5 dcaf24aba805c6599051ca429db25a53 snobol-0.99.4/test/roman.ref 4780
-MD5 904e46d370bf9eefef09e42335a095ae snobol-0.99.4/test/roman.sno 921
-MD5 a02e38df167817c56b1b2503527cd339 snobol-0.99.4/test/run.sh 857
-MD5 22abc3409fe3adb2088097d006c148d0 snobol-0.99.4/test/line2.sno 83
-MD5 562975b48aae9510d1384789d54f2ebe snobol-0.99.4/test/local.ref 26
-MD5 be69afd2cc0441a3d4f9a8d534167fdc snobol-0.99.4/test/local.sno 239
-MD5 506ec90f2f4df639a68ab319ef77a3f2 snobol-0.99.4/test/lexcmp.ref 117
-MD5 7401576f95e7ae06224422025c11436f snobol-0.99.4/test/lexcmp.sno 325
-MD5 6e4f7ba5f9f7fc4c733a2247f2d11e07 snobol-0.99.4/test/rewind1.ref 24
-MD5 c1765739c464da2b898b85d2569d37e3 snobol-0.99.4/test/rewind1.sno 89
-MD5 0b32c676c92f7b2aa7675e2a50023cad snobol-0.99.4/test/bal.ref 216
-MD5 abebd1527dc1d5b9f1dda7e8a9913746 snobol-0.99.4/test/bal.sno 343
-MD5 06fb70f584048ba26e3b50cc723e2b42 snobol-0.99.4/test/pad.ref 27
-MD5 13e7fdd50a62dd8e266094c72befe502 snobol-0.99.4/test/pad.sno 87
-MD5 73ffe215ba9600dbf52b28a35c9f3d8e snobol-0.99.4/test/words1.ref 8
-MD5 ffbe5a16b4076d7d9403b4a5a293a7d9 snobol-0.99.4/test/words1.sno 741
-MD5 c1c1701eee122679dc14e4e38a86b357 snobol-0.99.4/test/any.ref 60
-MD5 f70706f8d731b53b0c69864d517ea1f1 snobol-0.99.4/test/any.sno 108
-MD5 71c23ec4725e8a74a3e2b17a5b94db92 snobol-0.99.4/test/comment.ref 91
-MD5 6ef15300c09492ca839bf7605dd1306a snobol-0.99.4/test/comment.sno 484
-MD5 bc8bc23b05a8cf3599a56795f10a63d3 snobol-0.99.4/test/ftrace.ref 525
-MD5 a18c22047747fc4132912320e1f5ead4 snobol-0.99.4/test/ftrace.sno 202
-MD5 00b946a0409f621892b2013ecb359e22 snobol-0.99.4/test/ops.ref 114
-MD5 9b4286166741d0a1efcfd1b0ca3354b9 snobol-0.99.4/test/ops.sno 542
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/space2.ref 0
-MD5 88a09f29912182fd7c7d8220c3f53820 snobol-0.99.4/test/space2.sno 78
-MD5 4338fe2713f8f3f2e1ca8f5f75087ae9 snobol-0.99.4/test/alt1.ref 23
-MD5 e021bd947fb4b4b75df51ffbb5154e82 snobol-0.99.4/test/alt1.sno 617
-MD5 45d71664d6f245fa8d99842d235f6803 snobol-0.99.4/test/alt2.ref 14
-MD5 f6a89896e87c1ce59110fdace4eade4a snobol-0.99.4/test/alt2.sno 136
-MD5 ca154fdb988d9119e4bc1eb9d0f7a974 snobol-0.99.4/test/test.trace.sh 306
-MD5 e59ff97941044f85df5297e1c302d260 snobol-0.99.4/test/cat.ref 12
-MD5 a2aa143b6be2880c6b41ccf51179c308 snobol-0.99.4/test/cat.sno 35
-MD5 d41d8cd98f00b204e9800998ecf8427e snobol-0.99.4/test/loop.ref 0
-MD5 b59f7e9ddd60941be01108f5d8c200a1 snobol-0.99.4/test/loop.sno 91
-MD5 68adfe16c45a6ada1094af6e1f38e0db snobol-0.99.4/test/alph.ref 321
-MD5 848404462737743ec44af9c08edad5ae snobol-0.99.4/test/alph.sno 147
-MD5 0f723ae7f9bf07744445e93ac5595156 snobol-0.99.4/test/openo2.ref 12
-MD5 1423b88d0b701c420163d42f272d003d snobol-0.99.4/test/openo2.sno 63
-MD5 01405835dd7ee001ccfc8752e5cee6b9 snobol-0.99.4/test/longline.ref 5
-MD5 e3a3d761b376b31c51eb2dd1475d887c snobol-0.99.4/test/longline.sno 1072
-MD5 7ce04c24d21aceb2adb4d111faa4db0a snobol-0.99.4/test/substr.ref 976
-MD5 a713bc4ca93a521097683a493be62a49 snobol-0.99.4/test/substr.sno 173
-MD5 9dd01e8482594b0404b4c839e455ee94 snobol-0.99.4/test/convert.ref 20
-MD5 80b04e8611fd89c4623c1ea829083740 snobol-0.99.4/test/convert.sno 228
-MD5 6f5902ac237024bdd0c176cb93063dc4 snobol-0.99.4/test/hello.ref 12
-MD5 106b5e09209ebb04f43d99c238cfb03e snobol-0.99.4/test/hello.sno 28
-MD5 cdb22973649bc8bb322a144796b42163 snobol-0.99.4/test/ind.ref 24
-MD5 7018612112a96cd3ed23d94641818cb7 snobol-0.99.4/test/ind.sno 124
-MD5 6ae160be4b172408d2f5a1599cc685b3 snobol-0.99.4/test/uneval2.ref 37
-MD5 604eee0190f4a62db0418a5ba1997f7e snobol-0.99.4/test/uneval2.sno 184
-MD5 e49e9d12ebd96ba1c5b6f9ecc8bff538 snobol-0.99.4/test/clean.sh 36
-MD5 69ccdf429114c239bbb778d61d334772 snobol-0.99.4/test/breakx.ref 76
-MD5 821bcccf6ddfbc6e6b3f077ee88474ff snobol-0.99.4/test/breakx.sno 132
-MD5 d77d7976c5cdb36d372562ea43f17136 snobol-0.99.4/test/dump.ref 376
-MD5 a35f01668a5b1ff47d96d60405e4514f snobol-0.99.4/test/dump.sno 41
-MD5 ae600a7f4c5422be5f55d2d81911b3a7 snobol-0.99.4/test/pow.ref 251
-MD5 64d485972f43574162e76055b4e9da2f snobol-0.99.4/test/pow.sno 649
-MD5 10ae26699438a5ae2593e1889c7fe66e snobol-0.99.4/test/ref.dates 2305
-MD5 afd708de0b45d827323fca2f699dd544 snobol-0.99.4/test/line.ref 123
-MD5 dda306e644f47954753dcf82a8bc3318 snobol-0.99.4/test/line.sno 211
-MD5 af239d8382dd45a549edfbe6eca36819 snobol-0.99.4/config/hpux-68k.m4 254
-MD5 922404c5dd21e68e978442b469bca2f7 snobol-0.99.4/config/sony_news.m4 55
-MD5 a5eba7851edb507d65e5d908d676f924 snobol-0.99.4/config/sunos4.m4 105
-MD5 ad600a61151abad0bbfb4afa214dab7c snobol-0.99.4/config/bsd43.m4 348
-MD5 b48b12c751e1588a344cca382c415aa2 snobol-0.99.4/config/bsd44.m4 120
-MD5 218e6155ea219b5ec063c4f705308789 snobol-0.99.4/config/aix-rs6000.m4 223
-MD5 aca3512be3c3c679266f611de5c7617f snobol-0.99.4/config/posix.m4 192
-MD5 182cef45eb2c91eb3c92cafa9c44aa6d snobol-0.99.4/config/skel.inc 336
-MD5 edd46b70cad89bcaa15a97d72a0d2732 snobol-0.99.4/config/hpux-pa.m4 256
-MD5 db8e722b085d87b78aa7276a7f7107fb snobol-0.99.4/config/gcc.m4 122
-MD5 dfa94214ea3137e3b4adc49aa08cf333 snobol-0.99.4/config/NOTES.sun 206
-MD5 7cf2cce2937287b967ff783213432ae4 snobol-0.99.4/config/nextstep3.m4 369
-MD5 b1711c0b19c347e5041a643ada718d04 snobol-0.99.4/config/netbsd-alpha.m4 135
-MD5 118875f8fa08981201f148474c3766ca snobol-0.99.4/config/osf1-alpha.m4 108
-MD5 b67de8b647a0e0cb625c566dda1962f4 snobol-0.99.4/config/generic.m4 242
-MD5 e1300dd22739949b0ab6a401b8025bed snobol-0.99.4/config/ansi.m4 257
-MD5 15b2e0a52c4c9d661ec1a0be59f4e0e1 snobol-0.99.4/config/hpux.m4 320
-MD5 ad9f32e19db53d2c44cf416723e59f49 snobol-0.99.4/config/osf1.m4 306
-MD5 340611cf129c61389d9d6baac2aec174 snobol-0.99.4/config/alpha.m4 266
-MD5 9b51878e5ffa4e3866dd2c7de64f93d8 snobol-0.99.4/config/ultrix-mips.m4 168
-MD5 c78c01ced03407ce71cc15905f40ea13 snobol-0.99.4/config/irix64.m4 255
-MD5 881afbd9a16f4034adcc7982263ed41c snobol-0.99.4/snolib/bq.sno 433
-MD5 a6f9408ecbbb63552a50be2de0c471af snobol-0.99.4/include/h.h 608
-MD5 2ebdf5978b75fd40caa3e7c812c43155 snobol-0.99.4/include/macros.h 4416
-MD5 3d501501ebef0bcabbd19ff3d1d6682d snobol-0.99.4/include/load.h 1288
-MD5 df034fbc5fa56bac859362d7b6d6366b snobol-0.99.4/include/syntab.h 482
-MD5 1e8e21e0e8c1d87214b4d8873a4905b6 snobol-0.99.4/include/path.h 365
-MD5 9fa1c4fe36e66e7c184685eac4a3b4c1 snobol-0.99.4/include/units.h 257
-MD5 7bf25025943094a406a6edfdec8f93a5 snobol-0.99.4/include/snotypes.h 2628
-MD5 beacf9627df66de5b6fc24ad2365d1a3 snobol-0.99.4/include/libret.h 271
-MD5 e0da79010d3df187ded64fc362e6d72b snobol-0.99.4/lib/bsd/mstime.c 460
-MD5 df1e9fed59bb65497e2b31dadcaaa0b4 snobol-0.99.4/lib/bsd/tty.c 3140
-MD5 9d1775cc1c459832d5cbb8d83360cec4 snobol-0.99.4/lib/bsd/inet.c 2800
-MD5 a78839ac1dbe704e54bcd6780217abf8 snobol-0.99.4/lib/bsd/load.c 6206
-MD5 347bb8719e6b89d24a7172cbdf6736f2 snobol-0.99.4/lib/bsd/dynamic.c 401
-MD5 59e477f65fdaf84b2a63add55da2d1ea snobol-0.99.4/lib/vms/mstime.c 370
-MD5 572e57ffed822f238d1d95158b76727b snobol-0.99.4/lib/vms/term.c 242
-MD5 94542dcda58d8e34209a420f5e2c9b65 snobol-0.99.4/lib/vms/getredirect.c 3320
-MD5 95a103ef40baf4b6b9edfa1cf2c79dfb snobol-0.99.4/lib/ansi/mstime.c 661
-MD5 5d65b86534eb7fbcf6ed119375295635 snobol-0.99.4/lib/ansi/convert.c 1668
-MD5 3f12f46e17a8d8a6cdf93e72c5df5b4c snobol-0.99.4/lib/hpux/load.c 4352
-MD5 b33dfe5378be37ef7df722b1e95bdf39 snobol-0.99.4/lib/auxil/bzero.c 1130
-MD5 2421d3ea0c008c6e1613104ccde1ee91 snobol-0.99.4/lib/auxil/getopt.c 2470
-MD5 b7414736861ef5fb634920cb55c53e10 snobol-0.99.4/lib/auxil/bcopy.c 4289
-MD5 47c96b7c70794242e776c107817db00b snobol-0.99.4/lib/dummy/expops.c 347
-MD5 7c8488efc0ecbcf988e83797d07406a0 snobol-0.99.4/lib/dummy/mstime.c 114
-MD5 18db5d0b954cb1bc49a53a1f3426fd7a snobol-0.99.4/lib/dummy/tty.c 468
-MD5 7feb8f54abacd78c19746fda08c42ebc snobol-0.99.4/lib/dummy/getenv.c 182
-MD5 0b8a61ce978ae2396961b4120ee5e220 snobol-0.99.4/lib/dummy/execute.c 96
-MD5 14319d43829a96518a5b23ad49b3e530 snobol-0.99.4/lib/dummy/inet.c 330
-MD5 48ea799eae9ed7d9818e5c1d67544803 snobol-0.99.4/lib/dummy/load.c 1166
-MD5 0d8e596e7d7c6e24d390fb6c538dd160 snobol-0.99.4/lib/dummy/system.c 159
-MD5 c2326df0150b6eda710bc248278af6a9 snobol-0.99.4/lib/dummy/isnan.c 102
-MD5 11dad35db45f7590919ccf0dd7497473 snobol-0.99.4/lib/posix/mstime.c 489
-MD5 e23edae346b9e145e344ff165c01d46d snobol-0.99.4/lib/posix/sys.c 538
-MD5 6cecdd2e3de3b80ecabaf79b2f4f5a89 snobol-0.99.4/lib/posix/tty.c 3610
-MD5 d66f5f2b0dbcd7e3958e93474ece73f2 snobol-0.99.4/lib/posix/term.c 266
-MD5 80b38f4330013df350ed79b3cb246c16 snobol-0.99.4/lib/generic/expops.c 1040
-MD5 fddadb2c8b758a172b21fe410fca963a snobol-0.99.4/lib/generic/mstime.c 503
-MD5 92c74568e235f42c09fa8bd4b78f26f4 snobol-0.99.4/lib/generic/sys.c 1120
-MD5 e1f584327ba33149461983f9be74431d snobol-0.99.4/lib/generic/convert.c 2609
-MD5 c8f75f9c79b006af752f40930f1b28bc snobol-0.99.4/lib/generic/execute.c 374
-MD5 fb4b1ce5b76df23e68b77576ee70acab snobol-0.99.4/lib/generic/term.c 275
-MD5 b2c9c53fcf8557cd1e16045c0eec4e96 snobol-0.99.4/lib/generic/dynamic.c 212
-MD5 4c069d51a1be065405b68da38b135398 snobol-0.99.4/lib/snolib/rename.c 590
-MD5 c5b5a8f5fd1640936284f7c669465c51 snobol-0.99.4/lib/snolib/cos.c 306
-MD5 0509c91a463f9de1ac3dbd390f1fb4ad snobol-0.99.4/lib/snolib/exp.c 293
-MD5 18dd95ae73ce01dd362122e28cd7e2cb snobol-0.99.4/lib/snolib/log.c 292
-MD5 4c129a0a0b335ba5685a939b6fc8c201 snobol-0.99.4/lib/snolib/sin.c 304
-MD5 dbcefa464f33b2fb2b8c9bd9f46b3f12 snobol-0.99.4/lib/snolib/tan.c 307
-MD5 8897ef65e3796f6e94dfbefe3ea0d237 snobol-0.99.4/lib/snolib/retstring.c 977
-MD5 74442e8c066062c9d8865a25c26cf669 snobol-0.99.4/lib/snolib/getstring.c 599
-MD5 b3946d22f52492879334bd3b867ee7e6 snobol-0.99.4/lib/snolib/chop.c 587
-MD5 e07a4156e7560b6b7089941b8a6644d3 snobol-0.99.4/lib/snolib/getenv.c 712
-MD5 3984453c1db393393310032a127676e6 snobol-0.99.4/lib/snolib/file.c 669
-MD5 8ab303b3ffba6e9203bac060719d88ce snobol-0.99.4/lib/snolib/exit.c 703
-MD5 55dc55134f884b9ee1649c342965e6ca snobol-0.99.4/lib/snolib/fork.c 353
-MD5 4a7da9c9f19e86917af29c8fda4861c5 snobol-0.99.4/lib/snolib/host.c 2128
-MD5 1773361ee01af9ca3e7fbb298712c2f1 snobol-0.99.4/lib/snolib/delete.c 438
-MD5 e8c547dff95e3db333c70a9caee81db4 snobol-0.99.4/lib/snolib/findunit.c 318
-MD5 deeef3a6ebab99ae961980065572b0fc snobol-0.99.4/lib/snolib/system.c 371
-MD5 82d2c1b74321bf124b8a521d6ba957eb snobol-0.99.4/lib/snolib/sqrt.c 339
-MD5 fb36fc7dd5721321e3808a1838bb223f snobol-0.99.4/lib/snolib/sprintf.c 919
-MD5 24a8e4919d07a11951c42f1c19f31b4c snobol-0.99.4/lib/snolib/environ.c 76
-MD5 de49d71703c83b6e53d51fbdf521d0b1 snobol-0.99.4/lib/unix98/load.c 4797
-MD5 2db65158c491815c86b1c3ff9bce6363 snobol-0.99.4/lib/borland/mstime.c 750
-MD5 22984ef0b0ed499d9bb1d9a306a5b302 snobol-0.99.4/config/vms/descrip.mms 3363
-MD5 19d584d080b153b302953aa66314e7de snobol-0.99.4/config/vms/build.com 1861
-MD5 8aa733dd9c7512ef91e2ddcbfadc914f snobol-0.99.4/config/borland/README 355
-MD5 ec88beb7c44938fe804e53baf82bb292 snobol-0.99.4/config/borland/build.bat 4899
+MD5 aa08c384f72a30ea3fc6c70042a2efc4 files/digest-snobol-1.0 63
diff --git a/dev-lang/snobol/snobol-0.99.4.ebuild b/dev-lang/snobol/snobol-0.99.4.ebuild
index 9caddd3b2e44..de15c1572ff8 100644
--- a/dev-lang/snobol/snobol-0.99.4.ebuild
+++ b/dev-lang/snobol/snobol-0.99.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/snobol-0.99.4.ebuild,v 1.1 2003/12/22 09:17:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/snobol-0.99.4.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
 HOMEPAGE="http://www.snobol4.org/csnobol4/"
@@ -12,7 +12,6 @@ IUSE=""
 DEPEND="sys-devel/gcc
 		sys-devel/m4"
 RDEPEND=""
-S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-lang/snobol/snobol-0.99.44.ebuild b/dev-lang/snobol/snobol-0.99.44.ebuild
index 1ab17d820fef..957a2e1d5c85 100644
--- a/dev-lang/snobol/snobol-0.99.44.ebuild
+++ b/dev-lang/snobol/snobol-0.99.44.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/snobol-0.99.44.ebuild,v 1.1 2003/12/22 23:29:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/snobol-0.99.44.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
 HOMEPAGE="http://www.snobol4.org/csnobol4/"
diff --git a/dev-lang/snobol/snobol-1.0.ebuild b/dev-lang/snobol/snobol-1.0.ebuild
index c0cac113227a..e2e16bbc16e4 100644
--- a/dev-lang/snobol/snobol-1.0.ebuild
+++ b/dev-lang/snobol/snobol-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/snobol-1.0.ebuild,v 1.1 2004/07/20 05:50:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/snobol/snobol-1.0.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
 HOMEPAGE="http://www.snobol4.org/csnobol4/"
diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index fb6fc1b4e1e7..9f82706cea4c 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for dev-lang/spidermonkey
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.1 2003/02/24 01:59:06 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
+
+  17 Aug 2005; Josh Grebe <squash@gentoo.org> spidermonkey-1.5_rc5.ebuild:
+  GOod on sparc, bug #89510
+
+  01 Aug 2005; Joseph Jezak <josejx@gentoo.org>
+  spidermonkey-1.5_rc6-r1.ebuild:
+  Marked ppc stable.
+
+  31 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  spidermonkey-1.5_rc6-r1.ebuild:
+  Stable on ppc64 (bug #100841)
+
+  30 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  spidermonkey-1.5_rc6-r1.ebuild:
+  Stable on amd64 (dependency of gxine).
+
+  18 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  spidermonkey-1.5_rc6-r1.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #89510
+
+  19 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/spidermonkey-1.5_rc6-va_copy-fix.patch,
+  spidermonkey-1.5_rc6-r1.ebuild:
+  Added patch from bug 81473. It fixes va_copy vs. VA_COPY.
+
+*spidermonkey-1.5_rc6-r1 (04 Sep 2004)
+
+  04 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +spidermonkey-1.5_rc6-r1.ebuild:
+  spidermonkey-1.5_rc6.ebuild doesn't install all the headers needed by
+  sablotron to build with JavaScript support. Also moved headers to
+  /usr/include/js.
+
+*spidermonkey-1.5_rc6 (04 Sep 2004)
+
+  04 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +spidermonkey-1.5_rc6.ebuild:
+  Version bumped. Install headers, too. See bug #24502.
 
 *spidermonkey-1.5_rc5 (23 Feb 2003)
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index e69de29bb2d1..d3d4c856e4de 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -0,0 +1,8 @@
+MD5 fcf506eeef4c52d110c89ccf778faa6b ChangeLog 1604
+MD5 92316cef417fab365401f2ce9d8f7394 spidermonkey-1.5_rc5.ebuild 802
+MD5 15f3923dfe0861bb637f0070debeb4e7 spidermonkey-1.5_rc6-r1.ebuild 1302
+MD5 b0a39d97a54b44ecd77f8b5671cd7fdd spidermonkey-1.5_rc6.ebuild 1147
+MD5 e7bfb72073e1ade3470d60ba93042804 files/digest-spidermonkey-1.5_rc5 63
+MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6 64
+MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6-r1 64
+MD5 432f897c13753f70b1dea5c066c10ac1 files/spidermonkey-1.5_rc6-va_copy-fix.patch 1129
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild
index 2131629667b2..d7fb4894cdbc 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild,v 1.1 2003/02/24 01:59:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc5.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
 MY_PV="${PV/_/-}"
 DESCRIPTION="Stand-alone JavaScript C library"
@@ -9,7 +9,8 @@ SRC_URI="ftp://ftp.mozilla.org/pub/js/js-${MY_PV}.tar.gz"
 
 LICENSE="NPL-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="sparc x86"
+IUSE=""
 
 DEPEND=""
 
@@ -23,9 +24,9 @@ src_install() {
 	dodoc ../README
 	dohtml README.html
 	cd Linux_All_OPT.OBJ
-	dolib.a libjs.a
-	dolib.so libjs.so
-	dobin js jscpucfg
+	dolib.a libjs.a || die "libjs.a failed"
+	dolib.so libjs.so || die "libjs.so failed"
+	dobin js jscpucfg || die "dobin failed"
 	insinto /usr/include
 	doins jsautocfg.h
 }
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild
index 855cb0cbc451..fd3705d9c4d9 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc6-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/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.1 2004/09/03 21:31:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
+
+inherit eutils
 
 MY_PV="${PV/_/-}a"
 DESCRIPTION="Stand-alone JavaScript C library"
@@ -9,13 +11,20 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/js-${MY_PV}.tar.gz"
 
 LICENSE="NPL-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
 
 S=${WORKDIR}/js/src/
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-${PV}-va_copy-fix.patch || die 'Patching failed.'
+}
+
 src_compile() {
 	cat >>Makefile.ref<<'EOF'
 
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild
index 64f1506a4c7b..245c5ed8a7fd 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild,v 1.1 2004/09/03 20:51:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
 MY_PV="${PV/_/-}a"
 DESCRIPTION="Stand-alone JavaScript C library"
diff --git a/dev-lang/squeak-basicimage/ChangeLog b/dev-lang/squeak-basicimage/ChangeLog
index 43babe133442..8f6979dbb4e1 100644
--- a/dev-lang/squeak-basicimage/ChangeLog
+++ b/dev-lang/squeak-basicimage/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for dev-lang/squeak-basicimage
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-basicimage/ChangeLog,v 1.1 2004/04/28 16:20:03 jhhudso Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-basicimage/ChangeLog,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
-*squeak-basicimage-3.6_p5429 (28 Apr 2004)
+  12 May 2004; Jared Hudson <jhhudso@gentoo.org>
+  squeak-basicimage-3.6.5429.ebuild:
+  Fixed fetch bug
+
+*squeak-basicimage-3.6.5429 (28 Apr 2004)
 
   28 Apr 2004; Jared Hudson <jhhudso@gentoo.org>
   +squeak-basicimage-3.6_p5429.ebuild:
diff --git a/dev-lang/squeak-basicimage/Manifest b/dev-lang/squeak-basicimage/Manifest
index fb37b2d992c4..0a9999e9c889 100644
--- a/dev-lang/squeak-basicimage/Manifest
+++ b/dev-lang/squeak-basicimage/Manifest
@@ -1,2 +1,4 @@
-MD5 b9bd055fb555bf5fa282330b4cf21938 squeak-basicimage-3.6_p5429.ebuild 1020
-MD5 75da034c67d502c24067388c1be2a526 files/digest-squeak-basicimage-3.6_p5429 135
+MD5 50eb59d5cf209b41044286a3f4523923 squeak-basicimage-3.6.5429.ebuild 1114
+MD5 c411bc694c0f93dc28f3615bec4ad5d3 ChangeLog 482
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 75da034c67d502c24067388c1be2a526 files/digest-squeak-basicimage-3.6.5429 135
diff --git a/dev-lang/squeak-basicimage/metadata.xml b/dev-lang/squeak-basicimage/metadata.xml
index c5d67a611520..20ce219711a2 100644
--- a/dev-lang/squeak-basicimage/metadata.xml
+++ b/dev-lang/squeak-basicimage/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>jhhudso@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/squeak-basicimage/squeak-basicimage-3.6.5429.ebuild b/dev-lang/squeak-basicimage/squeak-basicimage-3.6.5429.ebuild
index 418c6b0f0bd8..f2141e630028 100644
--- a/dev-lang/squeak-basicimage/squeak-basicimage-3.6.5429.ebuild
+++ b/dev-lang/squeak-basicimage/squeak-basicimage-3.6.5429.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-basicimage/squeak-basicimage-3.6.5429.ebuild,v 1.1 2004/04/28 17:09:36 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-basicimage/squeak-basicimage-3.6.5429.ebuild,v 1.1.1.1 2005/11/30 09:58:14 chriswhite Exp $
 
 MY_P="Squeak3.6-5429"
 DESCRIPTION="Squeak basic image file"
 HOMEPAGE="http://www.squeak.org/"
-SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/${MY_P}-basic.zip
-	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/SqueakV3.sources.gz"
+SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/${MY_P}-basic.zip
+	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/SqueakV3.sources.gz"
 
 LICENSE="Apple"
-SLOT="${PV/_*}"
+SLOT="3.6"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 PROVIDE="virtual/squeak-image"
@@ -36,5 +36,5 @@ src_install() {
 	dosym /usr/lib/squeak/${MY_P}-basic.image.gz \
 		/usr/lib/squeak/squeak.image.gz
 
-	einfo "Squeak ${PV/_p/-} image/changes now installed"
+	einfo "Squeak ${PV} image/changes now installed"
 }
diff --git a/dev-lang/squeak-fullimage/ChangeLog b/dev-lang/squeak-fullimage/ChangeLog
index a3759720fff8..430744c254db 100644
--- a/dev-lang/squeak-fullimage/ChangeLog
+++ b/dev-lang/squeak-fullimage/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for dev-lang/squeak-fullimage
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/ChangeLog,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/ChangeLog,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
-*squeak-fullimage-3.6_p5429 (15 Apr 2004)
+  12 May 2004; Jared Hudson <jhhudso@gentoo.org>
+  squeak-fullimage-3.6.5429.ebuild:
+  Fixed error that kept squeak-fullimage-3.6.5429 from fetching all files.
+  Thanks to David Holm <dholm@gentoo.org> under bug #50548 for telling me.
+
+*squeak-fullimage-3.6.5429 (15 Apr 2004)
 
   15 Apr 2004; Jared Hudson <jhhudso@gentoo.org> : Version bump. I also have
   renamed squeak-vm to squeak-fullimage.
diff --git a/dev-lang/squeak-fullimage/Manifest b/dev-lang/squeak-fullimage/Manifest
index 9cac78ab5f2f..3b0574bccd81 100644
--- a/dev-lang/squeak-fullimage/Manifest
+++ b/dev-lang/squeak-fullimage/Manifest
@@ -1,11 +1,12 @@
-MD5 f0d812c911990566a0e88cd3b9c34e49 squeak-fullimage-3.5.5180.ebuild 1071
-MD5 6ae3b5dcdb3a4fbe48bd86f50c8dd742 ChangeLog 1047
-MD5 b790430ec914dc37e069884849247705 squeak-fullimage-3.4.5170.ebuild 869
-MD5 106d93d4a34cbfae518129d9e21b4705 squeak-fullimage-3.6.5424.ebuild 1111
-MD5 1fcb577229fde4b99585089a9f1f79eb squeak-fullimage-3.6_p5429.ebuild 990
-MD5 c5b091a8eeeb2389d428d4ec17353792 squeak-fullimage-3.2.4956.ebuild 859
-MD5 c47ea324aaf69084cd07c9a19d3e133f files/digest-squeak-fullimage-3.4.5170 129
-MD5 2046414939363ef56525dd2aa0163e3a files/digest-squeak-fullimage-3.6_p5429 134
+MD5 07849faadff329d78dbb9b0406e79aa1 squeak-fullimage-3.2.4956.ebuild 1004
+MD5 726a58ac8085c99468906ad238cd6bbf squeak-fullimage-3.6.5429.ebuild 1104
+MD5 2ef5028ed63b41e0d15cbcb6cd3b6ac8 squeak-fullimage-3.6.5424.ebuild 1250
+MD5 b79b3bbb2affab640d2e98f75bbdaf62 squeak-fullimage-3.5.5180.ebuild 1210
+MD5 0b78351046e9f0090e76507690d1a1f3 squeak-fullimage-3.4.5170.ebuild 1014
+MD5 4535507c6b9741f477236ce191912079 ChangeLog 1439
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 d01d765b41f8c065ec9a19a7c7278e76 files/digest-squeak-fullimage-3.2.4956 129
+MD5 c47ea324aaf69084cd07c9a19d3e133f files/digest-squeak-fullimage-3.4.5170 129
 MD5 9fe48b0176607ba4e789a8ef1f78075e files/digest-squeak-fullimage-3.5.5180 129
 MD5 277c5b13b803bc7b53c2303166389f6a files/digest-squeak-fullimage-3.6.5424 134
+MD5 2046414939363ef56525dd2aa0163e3a files/digest-squeak-fullimage-3.6.5429 134
diff --git a/dev-lang/squeak-fullimage/metadata.xml b/dev-lang/squeak-fullimage/metadata.xml
index c5d67a611520..20ce219711a2 100644
--- a/dev-lang/squeak-fullimage/metadata.xml
+++ b/dev-lang/squeak-fullimage/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>jhhudso@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild
index 378bfde9e9de..fd25829e2b2e 100644
--- a/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.2.4956.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 DESCRIPTION="Highly-portable Smalltalk-80 implementation VM image"
 HOMEPAGE="http://www.squeak.org/"
diff --git a/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild
index b9add2e7a01c..daaa9dface94 100644
--- a/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.4.5170.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 DESCRIPTION="Highly-portable Smalltalk-80 implementation VM image"
 HOMEPAGE="http://www.squeak.org/"
diff --git a/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild
index 39dbc2f82f4a..8e56d4194d71 100644
--- a/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.5.5180.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 MAJOR=3
 MINOR=5
@@ -23,7 +23,7 @@ SLOT="${MM}"
 
 KEYWORDS="~x86"
 
-IUSE="mozilla"
+IUSE=""
 
 PROVIDE="virtual/squeak-image"
 
diff --git a/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild
index bc56dbf89cfd..48d37357493d 100644
--- a/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5424.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 MAJOR=3
 MINOR=6
@@ -23,7 +23,7 @@ SLOT="${MM}"
 
 KEYWORDS="~x86 ~ppc"
 
-IUSE="mozilla"
+IUSE=""
 
 PROVIDE="virtual/squeak-image"
 
diff --git a/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5429.ebuild b/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5429.ebuild
index 1728980357a9..a39d9ad434ed 100644
--- a/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5429.ebuild
+++ b/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5429.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5429.ebuild,v 1.1 2004/04/28 17:04:36 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak-fullimage/squeak-fullimage-3.6.5429.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
 MY_P="Squeak3.6-5429"
 DESCRIPTION="Squeak full image file"
 HOMEPAGE="http://www.squeak.org/"
-SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/${MY_P}-full.zip
-	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${PV/_*}/SqueakV3.sources.gz"
+SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/${MY_P}-full.zip
+	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/SqueakV3.sources.gz"
 
 LICENSE="Apple"
-SLOT="${PV/_*}"
+SLOT="3.6"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 PROVIDE="virtual/squeak-image"
@@ -36,5 +36,5 @@ src_install() {
 	dosym /usr/lib/squeak/${MY_P}-full.image.gz \
 		/usr/lib/squeak/squeak.image.gz
 
-	einfo "Squeak ${PV/_p/-} image/changes now installed"
+	einfo "Squeak ${PV} image/changes now installed"
 }
diff --git a/dev-lang/squeak/ChangeLog b/dev-lang/squeak/ChangeLog
index c91b63702aac..7c425b3ba3fd 100644
--- a/dev-lang/squeak/ChangeLog
+++ b/dev-lang/squeak/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for dev-lang/squeak
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/ChangeLog,v 1.1 2002/12/30 01:56:14 jhhudso Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/ChangeLog,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> squeak-3.2.5.ebuild,
+  squeak-3.4.1-r1.ebuild, squeak-3.4.1-r2.ebuild, squeak-3.4.1.ebuild,
+  squeak-3.6_p3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> squeak-3.2.5.ebuild,
+  squeak-3.4.1-r1.ebuild, squeak-3.4.1-r2.ebuild, squeak-3.4.1.ebuild,
+  squeak-3.6_p3.ebuild:
+  Fix use invocation
+
+*squeak-3.6_p3 (09 May 2004)
+
+  09 May 2004; David Holm <dholm@gentoo.org> squeak-3.6_p3.ebuild:
+  Added to ~ppc.
+
+  01 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> squeak-3.4.1-r1.ebuild,
+  squeak-3.4.1-r2.ebuild:
+  flag-o-matic functions into src_compile
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; squeak-3.2.5.ebuild,
+  squeak-3.4.1-r1.ebuild, squeak-3.4.1-r2.ebuild, squeak-3.4.1.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> squeak-3.4.1-r2.ebuild:
+  Added to ~ppc.
+
+*squeak-3.4.1-r2 (03 Dec 2003)
+
+  03 Dec 2003; Jared Hudson <jhhudso@gentoo.org> : Added -fforce-addr to the
+  list of gcc flags being filtered. Credit goes to dhx <xyx@gmx.at> via bug
+  #20498 for telling us.
+
+  04 Jan 2004; Jared Hudson <jhhudso@gentoo.org> : Fixed ebuild so Makefile's
+  use of tail -1 became tail -n 1. Credit goes to Zachary P. Landau 
+  <kapheine@hypa.net> under bug #35698
+	
+*squeak-3.4.1-r1 (11 Oct 2003)
+
+  30 Oct 2003; Joshua Kinard <kumba@gentoo.org> squeak-3.4.1-r1.ebuild,
+  files/squeak-3.4.1-gcc33-string-fix.patch:
+  Added patch to fix gcc-3.3.x multi-line string issues
+  Closes Bug #32122
+
+  11 Oct 2003; Michael Imhof <tantive@gentoo.org> :
+  Version bumped. Closes #27408.
+  Added fixes to filter optimizations.
+
+*squeak-3.4.1 (21 May 2003)
+
+  21 May 2003; Michael Imhof <tantive@gentoo.org> :
+  Version bump.  Ebuild submitted by Christopher Verges 
+  <squirrel@headnut.org>.
 
 *squeak-3.2.5 (29 Dec 2002)
 
diff --git a/dev-lang/squeak/Manifest b/dev-lang/squeak/Manifest
index e69de29bb2d1..c6890303ca50 100644
--- a/dev-lang/squeak/Manifest
+++ b/dev-lang/squeak/Manifest
@@ -0,0 +1,13 @@
+MD5 fb57fcde44357bb4419fe1f935e60db0 squeak-3.2.5.ebuild 2883
+MD5 ae2ed21696810355735fa19e142a8728 squeak-3.6_p3.ebuild 2289
+MD5 089c45d3dac7d6205be11ce05c159b2a squeak-3.4.1.ebuild 2967
+MD5 2a6a1bed5b4c6febe9ad64acf71ed652 squeak-3.4.1-r1.ebuild 3310
+MD5 628d3dac9297f90b3325815bec25ecdc ChangeLog 2230
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 ececbbb7977edaa44dd1d5479b6c6327 squeak-3.4.1-r2.ebuild 3578
+MD5 66b6405c56a2abd2413db79bfc04f71a files/digest-squeak-3.6_p3 137
+MD5 4b2bf4f92065c5e86350d0cbaefe5fb8 files/squeak-3.4.1-gcc33-string-fix.patch 16184
+MD5 95975b038cad92087afe83055e6b2137 files/digest-squeak-3.2.5 69
+MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1 69
+MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1-r1 69
+MD5 e15651f69bf3b5c02f40bcffceefb53c files/digest-squeak-3.4.1-r2 69
diff --git a/dev-lang/squeak/metadata.xml b/dev-lang/squeak/metadata.xml
index c5d67a611520..20ce219711a2 100644
--- a/dev-lang/squeak/metadata.xml
+++ b/dev-lang/squeak/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>jhhudso@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/squeak/squeak-3.2.5.ebuild b/dev-lang/squeak/squeak-3.2.5.ebuild
index 2296609c76f3..bcde33e4a026 100644
--- a/dev-lang/squeak/squeak-3.2.5.ebuild
+++ b/dev-lang/squeak/squeak-3.2.5.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/dev-lang/squeak/squeak-3.2.5.ebuild,v 1.1 2002/12/30 01:56:14 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.2.5.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
 
 DESCRIPTION="Highly-portable Smalltalk-80 implementation"
 HOMEPAGE="http://www.squeak.org/"
@@ -11,21 +11,21 @@ KEYWORDS="~x86"
 IUSE="X oss mmx mozilla"
 # a ffi flag would be nice
 
-DEPEND="virtual/glibc
-	X? ( x11-base/xfree )"
-RDEPEND="=dev-lang/squeak-vm-3.2*
-         virtual/glibc
-	 X? ( x11-base/xfree )"
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+RDEPEND="=virtual/squeak-image-3.2*
+	virtual/libc
+	 X? ( virtual/x11 )"
 
 S="${WORKDIR}/Squeak-3.2-5"
 
-src_compile() {	      
-        local myconf=""
-	
+src_compile() {
+	local myconf=""
+
 	use X || myconf="--without-x"
 	use oss && myconf="${myconf} --with-audio=oss"
 	use mmx && myconf="${myconf} --enable-mpg-mmx"
-	
+
 	cd ${S}
 	mkdir build
 	cd build
@@ -47,9 +47,9 @@ src_compile() {
 	emake || die
 }
 
-src_install() {	      
-	cd ${S}/build	
-		
+src_install() {
+	cd ${S}/build
+
 	make DESTDIR=${D} ROOT=${D} install || die
 
 	exeinto /usr/bin
@@ -58,9 +58,9 @@ src_install() {
 	### the rest is all for the plugin
 
 	cd nps
-		
+
 	# plugin sample, must be served to work, file:// doesnt work.
-	
+
 	insinto /usr/share/doc/squeak-3.2.5
 	doins test/plugintest.html
 	doins test/plugintest.sts
@@ -69,35 +69,35 @@ src_install() {
 
 	SQ_DIR=/usr/lib/squeak
 	VM_VERSION=3.2-5
-	NPSQUEAK_SO=${SQ_DIR}/${VM_VERSION}/npsqueak.so	
+	NPSQUEAK_SO=${SQ_DIR}/${VM_VERSION}/npsqueak.so
 	sed "s|@SQ_DIR@|${SQ_DIR}|;s|@VM_VERSION@|${VM_VERSION}|;s|@NPSQUEAK_SO@|${NPSQUEAK_SO}|" \
 		npsqueakrun.in > npsqueakrun.in.2
 	sed "s|@SQ_DIR@|${SQ_DIR}|;s|@VM_VERSION@|${VM_VERSION}|;s|@NPSQUEAK_SO@|${NPSQUEAK_SO}|" \
 		npsqueakregister.in > npsqueakregister
 	sed 's|^ensurefile|ensurefile "${HOME}/.npsqueak/SqueakPlugin.changes" "${SQ_DIR}/npsqueak.changes"\nensurefile|' npsqueakrun.in.2 > npsqueakrun
 
-        exeinto /usr/lib/squeak	
-	doexe npsqueakregister	
+	exeinto /usr/lib/squeak
+	doexe npsqueakregister
 	exeinto /usr/lib/squeak/3.2-5
 	doexe npsqueakrun
 
 
 	# install in browsers  (no opera use flags?)
 
-	dodir /opt/netscape/plugins	
-	dosym /usr/lib/squeak/3.2-5/npsqueak.so /opt/netscape/plugins	
-	
-	if [ "`use mozilla`" ] ; then
+	dodir /opt/netscape/plugins
+	dosym /usr/lib/squeak/3.2-5/npsqueak.so /opt/netscape/plugins
+
+	if use mozilla ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npsqueak.so \
 		/usr/lib/mozilla/plugins/npsqueak.so
 	fi
-	
+
 	# maybe we should install the image here..
-	
+
 	# dosym /usr/lib/squeak/SqueakV3.sources /usr/lib/squeak/3.2-5/SqueakV3.sources
 	# doins npsqueak.image
-	# doins npsqueak.changes       
+	# doins npsqueak.changes
 }
 
 pkg_postinst() {
diff --git a/dev-lang/squeak/squeak-3.4.1-r1.ebuild b/dev-lang/squeak/squeak-3.4.1-r1.ebuild
index 9ed818248ae1..9f07f6d6ce95 100644
--- a/dev-lang/squeak/squeak-3.4.1-r1.ebuild
+++ b/dev-lang/squeak/squeak-3.4.1-r1.ebuild
@@ -1,11 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r1.ebuild,v 1.1 2003/10/11 09:32:56 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
-strip-flags
-filter-mfpmath sse
-filter-flags "-fPIC" "-maltivec" "-mabi=altivec" "-fstack-protector" "-pipe" "-g" "-mtune" "-march" "-mcpu" "-O" "-O1" "-O2" "-Os" "-O3" "-freorder-blocks" "-fprefetch-loop-array"
 
 #Simply change these numbers for different versions
 MV=3.4
@@ -21,14 +18,21 @@ KEYWORDS="~x86"
 IUSE="X oss mmx mozilla"
 # a ffi flag would be nice
 
-DEPEND="virtual/glibc
-	X? ( x11-base/xfree )"
-RDEPEND="dev-lang/squeak-vm
-		virtual/glibc
-		X? ( x11-base/xfree )"
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+RDEPEND="virtual/squeak-image
+		virtual/libc
+		X? ( virtual/x11 )"
 
 S="${WORKDIR}/Squeak-${NV}"
 
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc33-string-fix.patch
+}
+
 src_compile() {
 	local myconf=""
 
@@ -36,6 +40,9 @@ src_compile() {
 	use oss && myconf="${myconf} --with-audio=oss"
 	use mmx && myconf="${myconf} --enable-mpg-mmx"
 
+	strip-flags
+	filter-mfpmath sse
+	filter-flags "-fPIC" "-maltivec" "-mabi=altivec" "-fstack-protector" "-pipe" "-g" "-mtune" "-march" "-mcpu" "-O" "-O1" "-O2" "-Os" "-O3" "-freorder-blocks" "-fprefetch-loop-array"
 	cd ${S}
 	mkdir build
 	cd build
@@ -97,7 +104,7 @@ src_install() {
 	dodir /opt/netscape/plugins
 	dosym /usr/lib/squeak/${NV}/npsqueak.so /opt/netscape/plugins
 
-	if [ "`use mozilla`" ] ; then
+	if use mozilla ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npsqueak.so \
 		/usr/lib/mozilla/plugins/npsqueak.so
diff --git a/dev-lang/squeak/squeak-3.4.1-r2.ebuild b/dev-lang/squeak/squeak-3.4.1-r2.ebuild
index 9f9acd5a35b6..60b0453269fc 100644
--- a/dev-lang/squeak/squeak-3.4.1-r2.ebuild
+++ b/dev-lang/squeak/squeak-3.4.1-r2.ebuild
@@ -1,11 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r2.ebuild,v 1.1 2003/12/03 16:55:39 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
-strip-flags
-filter-mfpmath sse
-filter-flags "-fPIC" "-maltivec" "-mabi=altivec" "-fstack-protector" "-pipe" "-g" "-mtune" "-march" "-mcpu" "-O" "-O1" "-O2" "-Os" "-O3" "-freorder-blocks" "-fprefetch-loop-array" "-fforce-addr"
 
 #Simply change these numbers for different versions
 MV=3.4
@@ -17,15 +14,15 @@ HOMEPAGE="http://www.squeak.org/"
 SRC_URI="ftp://st.cs.uiuc.edu/Smalltalk/Squeak/${MV}/unix-linux/Squeak-${NV}.src.tar.gz"
 LICENSE="Apple"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="X oss mmx mozilla"
 # a ffi flag would be nice
 
-DEPEND="virtual/glibc
-	X? ( x11-base/xfree )"
-RDEPEND="dev-lang/squeak-vm
-		virtual/glibc
-		X? ( x11-base/xfree )"
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+RDEPEND="virtual/squeak-image
+		virtual/libc
+		X? ( virtual/x11 )"
 
 S="${WORKDIR}/Squeak-${NV}"
 
@@ -43,7 +40,20 @@ src_compile() {
 	use oss && myconf="${myconf} --with-audio=oss"
 	use mmx && myconf="${myconf} --enable-mpg-mmx"
 
+	strip-flags
+	filter-mfpmath sse
+	filter-flags "-fPIC" "-maltivec" "-mabi=altivec" "-fstack-protector" "-pipe" "-g" "-mtune" "-march" "-mcpu" "-O" "-O1" "-O2" "-Os" "-O3" "-freorder-blocks" "-fprefetch-loop-array" "-fforce-addr"
+
+	# fix tail problems
+	cd ${S}/platforms/unix/config
+	mv mkconfig.in mkconfig.in.$$
+	cat mkconfig.in.$$|sed 's/tail -1/tail -n 1/g' > mkconfig.in
+	mv verstamp verstamp.$$
+	cat verstamp.$$|sed 's/tail -1/tail -n 1/g' > verstamp
+	chmod +x verstamp
+
 	cd ${S}
+
 	mkdir build
 	cd build
 	../platforms/unix/config/configure \
@@ -104,7 +114,7 @@ src_install() {
 	dodir /opt/netscape/plugins
 	dosym /usr/lib/squeak/${NV}/npsqueak.so /opt/netscape/plugins
 
-	if [ "`use mozilla`" ] ; then
+	if use mozilla ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npsqueak.so \
 		/usr/lib/mozilla/plugins/npsqueak.so
diff --git a/dev-lang/squeak/squeak-3.4.1.ebuild b/dev-lang/squeak/squeak-3.4.1.ebuild
index 6349264c3afe..6ce8482d4279 100644
--- a/dev-lang/squeak/squeak-3.4.1.ebuild
+++ b/dev-lang/squeak/squeak-3.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1.ebuild,v 1.1 2003/05/21 11:53:43 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.4.1.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
 
 #Simply change these numbers for different versions
 MV=3.4
@@ -16,21 +16,21 @@ KEYWORDS="~x86"
 IUSE="X oss mmx mozilla"
 # a ffi flag would be nice
 
-DEPEND="virtual/glibc
-	X? ( x11-base/xfree )"
-RDEPEND="dev-lang/squeak-vm
-		virtual/glibc
-		X? ( x11-base/xfree )"
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+RDEPEND="virtual/squeak-image
+		virtual/libc
+		X? ( virtual/x11 )"
 
 S="${WORKDIR}/Squeak-${NV}"
 
-src_compile() {	      
+src_compile() {
 	local myconf=""
-	
+
 	use X || myconf="--without-x"
 	use oss && myconf="${myconf} --with-audio=oss"
 	use mmx && myconf="${myconf} --enable-mpg-mmx"
-	
+
 	cd ${S}
 	mkdir build
 	cd build
@@ -52,9 +52,9 @@ src_compile() {
 	emake || die
 }
 
-src_install() {	      
-	cd ${S}/build	
-		
+src_install() {
+	cd ${S}/build
+
 	make DESTDIR=${D} ROOT=${D} install || die
 
 	exeinto /usr/bin
@@ -63,9 +63,9 @@ src_install() {
 	### the rest is all for the plugin
 
 	cd nps
-		
+
 	# plugin sample, must be served to work, file:// doesnt work.
-	
+
 	insinto /usr/share/doc/squeak-${FV}
 	doins test/plugintest.html
 	doins test/plugintest.sts
@@ -74,35 +74,35 @@ src_install() {
 
 	SQ_DIR=/usr/lib/squeak
 	VM_VERSION=${NV}
-	NPSQUEAK_SO=${SQ_DIR}/${VM_VERSION}/npsqueak.so	
+	NPSQUEAK_SO=${SQ_DIR}/${VM_VERSION}/npsqueak.so
 	sed "s|@SQ_DIR@|${SQ_DIR}|;s|@VM_VERSION@|${VM_VERSION}|;s|@NPSQUEAK_SO@|${NPSQUEAK_SO}|" \
 		npsqueakrun.in > npsqueakrun.in.2
 	sed "s|@SQ_DIR@|${SQ_DIR}|;s|@VM_VERSION@|${VM_VERSION}|;s|@NPSQUEAK_SO@|${NPSQUEAK_SO}|" \
 		npsqueakregister.in > npsqueakregister
 	sed 's|^ensurefile|ensurefile "${HOME}/.npsqueak/SqueakPlugin.changes" "${SQ_DIR}/npsqueak.changes"\nensurefile|' npsqueakrun.in.2 > npsqueakrun
 
-	exeinto /usr/lib/squeak	
-	doexe npsqueakregister	
+	exeinto /usr/lib/squeak
+	doexe npsqueakregister
 	exeinto /usr/lib/squeak/${NV}
 	doexe npsqueakrun
 
 
 	# install in browsers  (no opera use flags?)
 
-	dodir /opt/netscape/plugins	
-	dosym /usr/lib/squeak/${NV}/npsqueak.so /opt/netscape/plugins	
-	
-	if [ "`use mozilla`" ] ; then
+	dodir /opt/netscape/plugins
+	dosym /usr/lib/squeak/${NV}/npsqueak.so /opt/netscape/plugins
+
+	if use mozilla ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npsqueak.so \
 		/usr/lib/mozilla/plugins/npsqueak.so
 	fi
-	
+
 	# maybe we should install the image here..
-	
+
 	# dosym /usr/lib/squeak/SqueakV3.sources /usr/lib/squeak/${NV}/SqueakV3.sources
 	# doins npsqueak.image
-	# doins npsqueak.changes       
+	# doins npsqueak.changes
 }
 
 pkg_postinst() {
diff --git a/dev-lang/squeak/squeak-3.6_p3.ebuild b/dev-lang/squeak/squeak-3.6_p3.ebuild
index 096ca1d36ba2..f71c57636eba 100644
--- a/dev-lang/squeak/squeak-3.6_p3.ebuild
+++ b/dev-lang/squeak/squeak-3.6_p3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.6_p3.ebuild,v 1.1 2004/04/28 16:19:19 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squeak/squeak-3.6_p3.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
 
 inherit nsplugins libtool flag-o-matic eutils
 
@@ -11,11 +11,11 @@ SRC_URI="http://www-sor.inria.fr/~piumarta/squeak/unix/release/Squeak-${MY_PV}.s
 	mozilla? ( http://squeakland.org/installers/SqueakPlugin.image.zip )"
 LICENSE="Apple"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="X nas mmx mozilla"
 # a ffi flag would be nice
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	nas? ( media-libs/nas )
 	X? ( virtual/x11 )"
 RDEPEND="${DEPEND}
@@ -64,7 +64,7 @@ src_install() {
 	dosym /usr/lib/squeak/inisqueak /usr/bin/inisqueak
 
 	### the rest is all for the plugin
-	if [ "`use mozilla`" ] ; then
+	if use mozilla ; then
 		inst_plugin /usr/lib/squeak/${MY_PV}/npsqueak.so
 
 		dodoc nps/README.npsqueak
diff --git a/dev-lang/sr/ChangeLog b/dev-lang/sr/ChangeLog
index 204fb4bfb188..272d5202ba34 100644
--- a/dev-lang/sr/ChangeLog
+++ b/dev-lang/sr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/sr
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/ChangeLog,v 1.1 2002/11/08 23:05:18 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/ChangeLog,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
+
+*sr-2.3.3 (16 Jul 2005)
+
+  16 Jul 2005; Maurice van der Pot <griffon26@gentoo.org> +sr-2.3.3.ebuild:
+  Added new version of sr ebuild provided by George. Modified slightly to 
+  prevent file collisions and enable running tests. Closing bug #38987 
+  reported by Kirill Vasiliev <redled@ornet.ru>
 
 *sr-2.3.2 (01 Nov 2002)
 
diff --git a/dev-lang/sr/Manifest b/dev-lang/sr/Manifest
index e69de29bb2d1..07770e81b42d 100644
--- a/dev-lang/sr/Manifest
+++ b/dev-lang/sr/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fad23da7ab1d7ee32ed53b941f31ea81 sr-2.3.2.ebuild 1129
+MD5 58a5455761fe858b8e8eededf9d97340 sr-2.3.3.ebuild 1675
+MD5 861a303229498f864627a6db4a5a983d ChangeLog 1235
+MD5 7face8ebac9539e3d999ebde838a4f9b metadata.xml 163
+MD5 10601d63476513e991a59a35bdaf0cf8 files/digest-sr-2.3.2 54
+MD5 2b63d8801b5cc5d60efaf7c29a3644cd files/sr-2.3.2.patch 1770
+MD5 71683d7920fb0b5cfa764a24c8be3340 files/digest-sr-2.3.3 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2P+VMGnpIbeahxwRAqx2AJ93/7/n+D9yOJNqy+WlJtWszdsOhgCgrWkz
+il6PCUAJhR3avp5Z0aRr2qI=
+=/jSA
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/sr/sr-2.3.2.ebuild b/dev-lang/sr/sr-2.3.2.ebuild
index bf27eea5c761..b02377adaefc 100644
--- a/dev-lang/sr/sr-2.3.2.ebuild
+++ b/dev-lang/sr/sr-2.3.2.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/sr-2.3.2.ebuild,v 1.1 2002/11/08 23:05:18 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/sr-2.3.2.ebuild,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
 
-IUSE=""
+inherit eutils
 
-DESCRIPTION="SR (Synchronizing Resources) is a language for writing concurrent programs."
+DESCRIPTION="SR (Synchronizing Resources) is a language for writing concurrent programs"
 HOMEPAGE="http://www.cs.arizona.edu/sr"
-
 SRC_URI="ftp://ftp.cs.arizona.edu/sr/sr.tar.Z"
 
-S=${WORKDIR}
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND="virtual/ssh"
 
-DEPEND="net-misc/openssh"
+S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/sr-2.3.2.patch
+	epatch ${FILESDIR}/${P}.patch
 }
 
 src_compile() {
@@ -52,23 +52,7 @@ src_install() {
 	doins preproc/*2sr.h
 	doins sr-mode.el
 
-	# man pages
-	insinto /usr
-	doman man/sr.1
-	doman man/srl.1
-	doman man/srm.1
-	doman man/srprof.1
-	doman man/srtex.1
-	doman man/srlatex.1
-	doman man/srgrind.1
-	doman man/ccr2sr.1
-	doman man/m2sr.1
-	doman man/csp2sr.1
-	doman man/sranimator.3
-	doman man/srgetopt.3
-	doman man/srwin.3
-	doman man/srmap.5
-	doman man/srtrace.5
+	doman man/*.[135]
 }
 
 pkg_postinst() {
diff --git a/dev-lang/sr/sr-2.3.3.ebuild b/dev-lang/sr/sr-2.3.3.ebuild
index 3151ddfd3dc9..23b8ac627041 100644
--- a/dev-lang/sr/sr-2.3.3.ebuild
+++ b/dev-lang/sr/sr-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/sr-2.3.3.ebuild,v 1.1 2005/07/16 12:37:18 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/sr/sr-2.3.3.ebuild,v 1.1.1.1 2005/11/30 09:58:19 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-lang/srf/ChangeLog b/dev-lang/srf/ChangeLog
index 82eaf8e03ef8..e56c2ef55fca 100644
--- a/dev-lang/srf/ChangeLog
+++ b/dev-lang/srf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/srf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/srf/ChangeLog,v 1.1 2005/09/17 13:36:32 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/srf/ChangeLog,v 1.1.1.1 2005/11/30 09:58:30 chriswhite Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org> srf-1.0.ebuild:
+  Marked ~ppc-macos (bug #111581)
 
 *srf-1.0 (17 Sep 2005)
 
diff --git a/dev-lang/srf/Manifest b/dev-lang/srf/Manifest
index 585d9826067a..6c20c95bde20 100644
--- a/dev-lang/srf/Manifest
+++ b/dev-lang/srf/Manifest
@@ -1,3 +1,4 @@
-MD5 2fbc10b920a5afbe62fe8754d14925b7 srf-1.0.ebuild 556
+MD5 7ba2eee4489fe8d64ac7b4c7af82dd89 srf-1.0.ebuild 657
+MD5 3bd5e745340efd79feb07d1dc0c29f1d ChangeLog 485
 MD5 baf02779016b02c0290eb3fa40fcc019 metadata.xml 501
 MD5 29461754782b3543e072a80453a0db59 files/digest-srf-1.0 59
diff --git a/dev-lang/srf/srf-1.0.ebuild b/dev-lang/srf/srf-1.0.ebuild
index 9f9bcc41d074..d448ffe7e5d6 100644
--- a/dev-lang/srf/srf-1.0.ebuild
+++ b/dev-lang/srf/srf-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/srf/srf-1.0.ebuild,v 1.1 2005/09/17 13:36:32 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/srf/srf-1.0.ebuild,v 1.1.1.1 2005/11/30 09:58:30 chriswhite Exp $
 
 DESCRIPTION="The Simple Recursive Functions programming language"
 HOMEPAGE="http://www.users.qwest.net/~eballen1/srf.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.users.qwest.net/~eballen1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc-macos ~x86"
 IUSE=""
 
 DEPEND="sys-devel/flex
diff --git a/dev-lang/stratego/ChangeLog b/dev-lang/stratego/ChangeLog
index a1fca3d2d78f..c114ea5f6e3d 100644
--- a/dev-lang/stratego/ChangeLog
+++ b/dev-lang/stratego/ChangeLog
@@ -1,9 +1,96 @@
 # ChangeLog for dev-lang/stratego
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/stratego/ChangeLog,v 1.1 2002/04/12 13:56:04 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/stratego/ChangeLog,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
+
+  04 Nov 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  -stratego-0.8.ebuild, -stratego-0.8.1.ebuild, -stratego-0.9.4.ebuild,
+  -stratego-0.11.ebuild, -stratego-0.12.ebuild, -stratego-0.13.ebuild,
+  stratego-0.14.ebuild, stratego-0.16.ebuild:
+  -m Removed old versions.
+
+*stratego-0.16 (04 Nov 2005)
+
+  04 Nov 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +stratego-0.16.ebuild:
+  New upstream version.
+
+  04 May 2005; David Holm <dholm@gentoo.org> stratego-0.13.ebuild:
+  Added to ~ppc.
+
+*stratego-0.13 (15 Jan 2005)
+
+  15 Jan 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +stratego-0.13.ebuild:
+  New upstream release
+
+*stratego-0.12 (06 Jan 2005)
+
+  06 Jan 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +stratego-0.12.ebuild:
+  New upstream release. Looooong overdue inclusion. My bad.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> stratego-0.8.1.ebuild:
+  Stable on sparc.
+
+  18 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.11.ebuild:
+  Marked stable on x86.
+
+  20 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.11.ebuild:
+  Added proper LDPATH.
+	
+*stratego-0.11 (18 Jul 2004)
+
+  18 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.11.ebuild:
+  New upstream version.
+
+  15 May 2004; Bryan Østergaard <kloeri@gentoo.org> stratego-0.8.1.ebuild,
+  stratego-0.9.4.ebuild:
+  Alpha keywording.
+
+*stratego-0.9.4 (19 Mar 2004)
+
+  19 Mar 2004; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.9.4.ebuild:
+  New upstream version.
+  
+  16 Feb 2004; Aron Griffis <agriffis@gentoo.org> stratego-0.8.1.ebuild:
+  add ~ia64
+
+  13 Jan 2003; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.8.1.ebuild:
+  Unmasked.
+
+  09 Jan 2003; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.8.1.ebuild:
+  Added a fix by styx to make it compile properly.
+
+  09 Jan 2003; Karl Trygve Kalleberg <karltk@gentoo.org> : masked 0.8 for
+  testing again. It has a minor bug in its build system that needs to fixed.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*stratego-0.8.1 (20 Oct 2002)
+
+  20 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.8.1.ebuild files/digest-stratego-0.8.1 :
+  New upstream version.
+
+  02 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.8.1.ebuild :
+  Fixed sandbox violation. 
+
+*stratego-0.8 (20 Oct 2002)
+
+  02 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.8.ebuild :
+  Fixed sandbox violation. 
+
+  20 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.8.ebuild files/digest-stratego-0.8 :
+  New upstream version.
 
 *stratego-0.7 (11 Apr 2002)
 
+  02 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.7.ebuild files/digest-stratego-0.7 :
+  This version violates the sandbox and is superceded by 0.8, so I'm removing 
+  it.
+
   11 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> stratego-0.7.ebuild files/digest-stratego-0.7:
 
   Stratego is a modular language for the specification of fully automatic 
diff --git a/dev-lang/stratego/Manifest b/dev-lang/stratego/Manifest
index e69de29bb2d1..8ffca681aa72 100644
--- a/dev-lang/stratego/Manifest
+++ b/dev-lang/stratego/Manifest
@@ -0,0 +1,7 @@
+MD5 9e258b5b0a3dc1fa458c0a06dd9c1b4c stratego-0.14.ebuild 785
+MD5 4d9354972965ba2ba6b7da8b9d503d86 stratego-0.16.ebuild 789
+MD5 56d9ce84dc81d924c5f77d0823914351 ChangeLog 4234
+MD5 d1eead34572f0e1a480253e2b4c012d8 metadata.xml 626
+MD5 ed327964e34364a46904d5c454d4ae83 files/digest-stratego-0.14 68
+MD5 258356864a2be6a6aa47b25a8e7691a6 files/digest-stratego-0.16 68
+MD5 a83727bed12bf38ee250f0116df38adf files/42stratego 21
diff --git a/dev-lang/stratego/stratego-0.14.ebuild b/dev-lang/stratego/stratego-0.14.ebuild
index fbce0053517e..f02ca7840d6d 100644
--- a/dev-lang/stratego/stratego-0.14.ebuild
+++ b/dev-lang/stratego/stratego-0.14.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/dev-lang/stratego/stratego-0.14.ebuild,v 1.1 2005/05/11 00:36:05 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/stratego/stratego-0.14.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Stratego term-rewriting language"
 HOMEPAGE="http://www.stratego-language.org/"
 SRC_URI="ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-${PV}/strategoxt-${PV}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
+KEYWORDS="x86 ~ppc"
 DEPEND=">=dev-libs/aterm-2.3.1
 	>=dev-libs/sdf2-bundle-2.3"
 S=${WORKDIR}/strategoxt-${PV}
+IUSE=""
 
 src_compile() {
 	filter-flags -fomit-frame-pointer
diff --git a/dev-lang/stratego/stratego-0.16.ebuild b/dev-lang/stratego/stratego-0.16.ebuild
index 42d770ca6d38..38af10a34c7b 100644
--- a/dev-lang/stratego/stratego-0.16.ebuild
+++ b/dev-lang/stratego/stratego-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/stratego/stratego-0.16.ebuild,v 1.1 2005/11/04 13:50:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/stratego/stratego-0.16.ebuild,v 1.1.1.1 2005/11/30 09:58:13 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -11,10 +11,10 @@ SRC_URI="ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-${PV
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-
 DEPEND=">=dev-libs/aterm-2.4.2
 	>=dev-libs/sdf2-bundle-2.3.3"
 S=${WORKDIR}/strategoxt-${PV}
+IUSE=""
 
 src_compile() {
 	filter-flags -fomit-frame-pointer
diff --git a/dev-lang/swi-prolog-lite/ChangeLog b/dev-lang/swi-prolog-lite/ChangeLog
index 457f3a5e3964..7c4ede97507d 100644
--- a/dev-lang/swi-prolog-lite/ChangeLog
+++ b/dev-lang/swi-prolog-lite/ChangeLog
@@ -1,7 +1,79 @@
-# ChangeLog for dev-lang/swi-prolog-lite-5.0.10
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/ChangeLog,v 1.1 2002/11/02 01:09:38 vapier Exp $
+# ChangeLog for dev-lang/swi-prolog-lite
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/ChangeLog,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
+*swi-prolog-lite-5.5.36 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/swi-prolog-lite-5.5.30-runtime-build.patch,
+  +swi-prolog-lite-5.5.36.ebuild:
+  Version bump with more package support.
+
+  08 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  swi-prolog-lite-5.4.7.ebuild:
+  Added to ~ppc.
+
+  25 Sep 2005; Jason Wever <weeve@gentoo.org> swi-prolog-lite-5.4.7.ebuild:
+  Added ~sparc keyword.
+
+*swi-prolog-lite-5.4.7 (17 Sep 2005)
+
+  17 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/swi-prolog-lite-5.4.7-install.patch, +swi-prolog-lite-5.4.7.ebuild:
+  Version bump #69018 by Gavrila.
+
+*swi-prolog-lite-5.3.14 (01 Dec 2004)
+
+  16 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/swi-prolog-lite-5.2.11-parallel-build.patch,
+  +files/swi-prolog-lite-5.3.14-parallel-build.patch, files/destdir.patch,
+  swi-prolog-lite-5.2.11.ebuild, swi-prolog-lite-5.3.14.ebuild:
+  Clean up ebuilds to not suck anymore.
+
+  01 Apr 2005; Joseph Jezak <josejx@gentoo.org>
+  swi-prolog-lite-5.0.10.ebuild, swi-prolog-lite-5.2.11.ebuild:
+  Marked 5.0.10 ppc and marked 5.2.11 ~ppc for bug #87186.
+
+  19 Feb 2005; Jason Wever <weeve@gentoo.org> swi-prolog-lite-5.2.11.ebuild:
+  Added ~sparc keyword as it was dropped along the way.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  swi-prolog-lite-5.0.10.ebuild, swi-prolog-lite-5.1.13.ebuild:
+  virtual/glibc -> virtual/libc
+
+  15 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  swi-prolog-lite-5.0.10.ebuild, swi-prolog-lite-5.2.11.ebuild:
+  Alpha keywording.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  swi-prolog-lite-5.0.10.ebuild, swi-prolog-lite-5.1.13.ebuild,
+  swi-prolog-lite-5.2.11.ebuild, swi-prolog-lite-5.2.8.ebuild:
+  Add die following econf for bug 48950
+
+*swi-prolog-lite-5.2.11 (09 Jan 2003)
+
+  09 Jan 2003; George Shapovalov <george@gentoo.org> swi-prolog-lite-5.2.11.ebuild :
+  new version (#30305)
+	
+*swi-prolog-lite-5.2.8 (09 Jan 2003)
+
+  09 Jan 2003; George Shapovalov <george@gentoo.org> swi-prolog-lite-5.2.8.ebuild, metadata.xml :
+  new version (#30305)
+  destdir patch no longer necessary. Thanks to Alfredo Matos <alf_matos@netcabo.pt> for update
+  added metadata
+
+*swi-prolog-lite-5.1.13 (23 May 2003)
+
+  23 May 2003; Paul de Vrieze <pauldv@gentoo.org>
+  swi-prolog-lite-5.0.10.ebuild, swi-prolog-lite-5.1.13.ebuild:
+  Marked the 5.0 version stable, and added 5.1.13 which is a beta version that
+  supports multithreading.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *swi-prolog-lite-5.0.10 (01 Nov 2002)
 
   01 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
diff --git a/dev-lang/swi-prolog-lite/Manifest b/dev-lang/swi-prolog-lite/Manifest
index 577d9b58d005..3d5bf0eb1c11 100644
--- a/dev-lang/swi-prolog-lite/Manifest
+++ b/dev-lang/swi-prolog-lite/Manifest
@@ -1,6 +1,29 @@
-MD5 727ef6b0d888045e5dd05de611f42561 ChangeLog 452
-MD5 c565e7641a91a79d924ffbb4c7a91d45 swi-prolog-lite-5.0.10.ebuild 1241
-MD5 7193218d0192a3b2d375f684b4f24447 swi-prolog-lite-5.1.13.ebuild 1253
-MD5 a162047529de9300ae67de9aa8f509be files/destdir.patch 502
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f4f73d6769a90e0ac1360792343d9ae3 ChangeLog 2986
+MD5 8eed8feaa65a3ab28f60e67e609ed512 files/destdir.patch 488
 MD5 ac0b2bc6ebbb0b4d807dc2e7f88c0edf files/digest-swi-prolog-lite-5.0.10 67
 MD5 640ff31e82704bfbbd79ac576d005850 files/digest-swi-prolog-lite-5.1.13 62
+MD5 77eba3e801d4ef6f690fc09986ab029c files/digest-swi-prolog-lite-5.2.11 62
+MD5 cb98bd8233429346b32b20d397d03388 files/digest-swi-prolog-lite-5.3.14 62
+MD5 f9e07fa00dc29d2f246d1f8842fb4888 files/digest-swi-prolog-lite-5.4.7 61
+MD5 f6014c9fcd960e3b2b4bd13810856448 files/digest-swi-prolog-lite-5.5.36 62
+MD5 e26e7dd2a9ab9cadfc1e456bff5cfb35 files/swi-prolog-lite-5.2.11-parallel-build.patch 293
+MD5 fe36bbaacaf2c0a147d92541ba584670 files/swi-prolog-lite-5.3.14-parallel-build.patch 1534
+MD5 9b6190002d49e2d3ddefa40541c2ca85 files/swi-prolog-lite-5.4.7-install.patch 408
+MD5 5b26039ee25ba0666cd711bf838962d8 files/swi-prolog-lite-5.5.30-runtime-build.patch 309
+MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
+MD5 279806ebf5d32d9c17d55d4ab837991e swi-prolog-lite-5.0.10.ebuild 1250
+MD5 5532502b84186d942b9e511ac418da60 swi-prolog-lite-5.1.13.ebuild 1243
+MD5 7d72dd5171c98a306021fbf58e52fb43 swi-prolog-lite-5.2.11.ebuild 1157
+MD5 e5130b48bc4c49b2a6c9fb96947892a7 swi-prolog-lite-5.3.14.ebuild 1153
+MD5 9604df1e2eb962f22c4e1a82e56dc79f swi-prolog-lite-5.4.7.ebuild 1212
+MD5 c921a671f4714713711faa654bcd90c9 swi-prolog-lite-5.5.36.ebuild 1748
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYZqsgIKl8Uu19MoRAqncAJ9XM2Kutds+kIpCQgDofzF87v6OogCaAv3g
+yrxE+pAQKmK0y2xp798IsHw=
+=CVlU
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/swi-prolog-lite/files/destdir.patch b/dev-lang/swi-prolog-lite/files/destdir.patch
index 45806c796e70..05399cebc842 100644
--- a/dev-lang/swi-prolog-lite/files/destdir.patch
+++ b/dev-lang/swi-prolog-lite/files/destdir.patch
@@ -1,5 +1,7 @@
---- src/Makefile.in	2002-11-01 19:27:25.000000000 -0500
-+++ src/Makefile.in.old	2002-11-01 19:26:49.000000000 -0500
+Add support for installing with `make install DESTDIR=/blah`
+
+--- src/Makefile.in
++++ src/Makefile.in
 @@ -37,7 +37,8 @@
  
  PL=@PL@@RT@
diff --git a/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch
index 0660362a57df..c697d060ea75 100644
--- a/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch
+++ b/dev-lang/swi-prolog-lite/files/swi-prolog-lite-5.3.14-parallel-build.patch
@@ -11,6 +11,15 @@ Fix make dependencies so `make -j` works
  		$(LDEXE) $(LDFLAGS) -o $(PL) $(PLOBJ) -L../lib/$(ARCH) -lpl $(LNLIBS)
  
  $(STARTUPPATH):	$(PLINIT) $(PLSRC) $(PL)
+@@ -177,7 +177,7 @@
+ 		$(AR) r $@ $(OBJ) $(RCOBJ) $(XOBJ)
+ 		$(RANLIB) $@
+ 
+-$(RUNTIMEDIR)/$(SHAREDV):	$(RUNTIMEDIR) $(OBJ) $(RCOBJ) $(XOBJ)
++$(RUNTIMEDIR)/$(SHAREDV):	dirs $(OBJ) $(RCOBJ) $(XOBJ)
+ 		$(CC) -shared $(COFLAGS) -o $@ $(SONAMEOPT) \
+ 			$(OBJ) $(RCOBJ) $(XOBJ) $(LIBS)
+ 
 @@ -188,7 +188,7 @@
  rc-lib:
  		@(cd rc && $(MAKE) COFLAGS="$(COFLAGS)")
@@ -33,3 +42,12 @@ Fix make dependencies so `make -j` works
  pl-wam.o:	pl-alloc.c pl-index.c pl-fli.c
  
  $(srcdir)/pl-funct.ih:	$(srcdir)/ATOMS
+@@ -262,7 +258,7 @@
+ frame.o:
+ 		ar x `$(CC) -print-libgcc-file-name` $@
+ 
+-plld:		$(srcdir)/plld.c
++plld:		$(srcdir)/plld.c parms.h
+ 		$(CC) -I. -I$(srcdir) $(CFLAGS) -o $@ $(srcdir)/plld.c
+ 
+ tags:		$(srcdir)/TAGS
diff --git a/dev-lang/swi-prolog-lite/metadata.xml b/dev-lang/swi-prolog-lite/metadata.xml
index 418bf9c2fd92..1990bb86aace 100644
--- a/dev-lang/swi-prolog-lite/metadata.xml
+++ b/dev-lang/swi-prolog-lite/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>prolog</herd>
-<maintainer>
-	<email>plasmaroo@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.0.10.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.0.10.ebuild
index 2890a955f096..b361c4866818 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.0.10.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.0.10.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.0.10.ebuild,v 1.1 2002/11/02 01:09:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.0.10.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
-DESCRIPTION="free, small, and standard compliant a Prolog compiler"
+DESCRIPTION="free, small, and standards compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-lite-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+KEYWORDS="x86 ppc ~sparc alpha"
 IUSE="readline static"
 
 DEPEND="readline? ( sys-libs/readline )
 	sys-libs/ncurses
-	virtual/glibc
+	virtual/libc
 	sys-apps/gawk
 	sys-apps/sed
 	sys-devel/binutils"
@@ -29,7 +29,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-readline"
 	use static && myconf="${myconf} --disable-shared"
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	make || die "make failed"	# emake doesnt work
 }
 
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.1.13.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.1.13.ebuild
index 2bf072b14389..375db5e381af 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.1.13.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.1.13.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/dev-lang/swi-prolog-lite/swi-prolog-lite-5.1.13.ebuild,v 1.1 2003/05/23 09:26:57 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.1.13.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
-DESCRIPTION="free, small, and standard compliant a Prolog compiler"
+DESCRIPTION="free, small, and standards compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/BETA/pl-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="readline static"
 
 DEPEND="readline? ( sys-libs/readline )
 	sys-libs/ncurses
-	virtual/glibc
+	virtual/libc
 	sys-apps/gawk
 	sys-apps/sed
 	sys-devel/binutils"
@@ -29,7 +29,7 @@ src_compile() {
 		|| myconf="${myconf} --disable-readline"
 	use static && myconf="${myconf} --disable-shared"
 
-	econf ${myconf} --enable-mt
+	econf ${myconf} --enable-mt || die "econf failed"
 	make || die "make failed"	# emake doesnt work
 }
 
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
index bee6d7563be9..62da604a4715 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild
@@ -1,40 +1,45 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild,v 1.1 2004/01/10 06:26:15 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.2.11.ebuild,v 1.1.1.1 2005/11/30 09:58:37 chriswhite Exp $
 
-IUSE="readline static"
+inherit eutils
 
-S="${WORKDIR}/pl-${PV}"
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
 SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="readline static threads"
 
 DEPEND="sys-libs/ncurses
-	sys-apps/gawk
-	sys-apps/sed
-	sys-devel/binutils
 	readline? ( sys-libs/readline )"
 
-src_compile() {
-	cd ${S}/src
-	#S="${S}/src"
-
-	local myconf
-	use readline || myconf="${myconf} --disable-readline"
-	use static && myconf="${myconf} --disable-shared"
+S=${WORKDIR}/pl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/src
+	epatch "${FILESDIR}"/destdir.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	sed -i \
+		-e '/COFLAGS=/s:=.*:=$CFLAGS:' \
+		-e '/LDFLAGS=/s:-O3::' \
+		configure || die
+}
 
-	econf ${myconf} --enable-mt
-	MAKEOPTS="-j1" emake || die "make failed"
+src_compile() {
+	cd src
+	econf \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		$(use_enable threads mt) \
+		|| die "econf failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	cd ${S}/src
-	einstall
-
-	cd ${S}
+	make -C src DESTDIR="${D}" install || die
 	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README VERSION
 }
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild
index cd4c0b657578..66ccf65671d4 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild
@@ -1,40 +1,45 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild,v 1.1 2004/07/13 05:06:14 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.3.14.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
-IUSE="readline static"
+inherit eutils
 
-S="${WORKDIR}/pl-${PV}"
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/BETA/pl-5.3.14.tar.gz"
+SRC_URI="http://www.swi.psy.uva.nl/cgi-bin/nph-download/SWI-Prolog/BETA/pl-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="macos"
+KEYWORDS="~amd64 ppc-macos ~x86"
+IUSE="readline static threads"
 
 DEPEND="sys-libs/ncurses
-	sys-apps/gawk
-	sys-apps/sed
-	virtual/libc
 	readline? ( sys-libs/readline )"
 
-src_compile() {
-	cd ${S}/src
-	#S="${S}/src"
-
-	local myconf
-	use readline || myconf="${myconf} --disable-readline"
-	use static && myconf="${myconf} --disable-shared"
+S=${WORKDIR}/pl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/src
+	epatch "${FILESDIR}"/destdir.patch
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+	sed -i \
+		-e '/COFLAGS=/s:=.*:=$CFLAGS:' \
+		-e '/LDFLAGS=/s:-O3::' \
+		configure || die
+}
 
-	econf ${myconf} --enable-mt || die "econf failed"
-	MAKEOPTS="-j1" emake || die "make failed"
+src_compile() {
+	cd src
+	econf \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		$(use_enable threads mt) \
+		|| die "econf failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	cd ${S}/src
-	einstall
-
-	cd ${S}
+	make -C src DESTDIR="${D}" install || die
 	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README VERSION
 }
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.4.7.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.4.7.ebuild
index e3382580e884..887cb67c42db 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.4.7.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.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/dev-lang/swi-prolog-lite/swi-prolog-lite-5.4.7.ebuild,v 1.1 2005/09/17 03:58:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.4.7.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc-macos ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="readline static threads"
 
 DEPEND="sys-libs/ncurses
diff --git a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.36.ebuild b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.36.ebuild
index b89658e684c2..215092d5000d 100644
--- a/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.36.ebuild
+++ b/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.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/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.36.ebuild,v 1.1 2005/10/28 03:27:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog-lite/swi-prolog-lite-5.5.36.ebuild,v 1.1.1.1 2005/11/30 09:58:36 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-lang/swig/ChangeLog b/dev-lang/swig/ChangeLog
index 572ab77fbd1a..aeb0d8ba5f5d 100644
--- a/dev-lang/swig/ChangeLog
+++ b/dev-lang/swig/ChangeLog
@@ -1,13 +1,201 @@
 # ChangeLog for dev-lang/swig
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/ChangeLog,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
+
+  22 Oct 2005; Mike Frysinger <vapier@gentoo.org> swig-1.3.25.ebuild,
+  swig-1.3.27.ebuild:
+  No longer need to change the java find since the code has been tweaked
+  already to handle multiple results.
+
+*swig-1.3.27 (18 Oct 2005)
+
+  18 Oct 2005; Mike Frysinger <vapier@gentoo.org> +swig-1.3.27.ebuild:
+  Version bump.
+
+  18 Sep 2005; Chris White <chriswhite@gentoo.org> ChangeLog:
+  Re-doing this with proper gpg signing :|
+
+  18 Sep 2005; Chris White <chriswhite@gentoo.org> swig-1.3.21.ebuild:
+  Added doc USE flag for html developer docs.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*swig-1.3.25 (11 Sep 2005)
+
+  11 Sep 2005; Chris White <chriswhite@gentoo.org> +metadata.xml,
+  swig-1.3.24.ebuild, +swig-1.3.25.ebuild:
+  dev-php/php -> virtual/php. Fixes bug #102364. Taking over as maintainer.
+  Did a version bump to fix bug #104762. Tested with some of the tutorials at
+  the swig site.
+
+  10 Aug 2005; Kito <kito@gentoo.org> swig-1.3.24.ebuild:
+  ~ppc-macos keyword.
+
+  23 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> swig-1.3.21.ebuild:
+  Stable on sh.
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org> -swig-1.3.22.ebuild:
+  version bump
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild,
+  swig-1.3.22.ebuild:
+  disable features=maketest, bug #75650
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild,
+  swig-1.3.22.ebuild:
+  fix USE
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild,
+  swig-1.3.22.ebuild:
+  split tcltk useflag in tcl and tk, bug #68042;#17808
+
+  29 Sep 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.22.ebuild:
+  fix compile bug, bug #65670
+
+*swig-1.3.22 (25 Sep 2004)
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +swig-1.3.22.ebuild:
+  version bump
+
+  18 Aug 2004; <pauldv@gentoo.org> swig-1.3.21.ebuild:
+  Fix bug #60626, thanks to the people who commented there and provided 
+  the fix.
+
+  16 Aug 2004; Mike Frysinger <vapier@gentoo.org> swig-1.3.21.ebuild:
+  Clean up and make sure CFLAGS arent killed #59509.
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> swig-1.3.21.ebuild:
+  Typo in DESCRIPTION: Simplied -> Simplified. Bug 59717.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> swig-1.3.21.ebuild:
+  stable on ppc64 bug #55529
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> swig-1.3.21.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jun 2004; Mike Frysinger <vapier@gentoo.org> swig-1.3.21.ebuild:
+  Add optional php support for #47513 by Diego Pettenò.
+
+  23 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> swig-1.3.21.ebuild:
+  Stable on hppa
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> swig-1.3.21.ebuild:
+  Marked stable on mips.
+
+  15 May 2004; Bryan Østergaard <kloeri@gentoo.org> swig-1.3.21.ebuild:
+  Stable on alpha.
+
+  13 May 2004; Michael McCabe <randy@gentoo.org> swig-1.3.21.ebuild:
+  Added s390 keywords
+
+  28 Apr 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild:
+  use emake
+
+  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> swig-1.3.10-r2.ebuild,
+  swig-1.3.16.ebuild, swig-1.3.19.ebuild, swig-1.3.20.ebuild,
+  swig-1.3.21.ebuild:
+  virtual/ruby fix
+
+  11 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> swig-1.3.21.ebuild:
+  Stable on sparc
+
+  09 Apr 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild:
+  stable on x86
+
+  24 Feb 2004; <agriffis@gentoo.org> swig-1.3.19.ebuild, swig-1.3.21.ebuild:
+  add ia64 keywords
+
+  22 Feb 2004; David Holm <dholm@gentoo.org> swig-1.3.19.ebuild:
+  Added 1.3.19 to ~ppc, it is required for subversion-0.37.0.
+
+  22 Feb 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild:
+  fix compile if plt is installed
+
+  21 Feb 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild:
+  fix compilation if no tcl is installed
+
+  21 Feb 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild:
+  fix compile if mzscheme is installed
+
+*swig-1.3.21 (20 Feb 2004)
+
+  20 Feb 2004; Heinrich Wendel <lanius@gentoo.org> swig-1.3.21.ebuild:
+  version bump; install runtime lib's
+
+  11 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> swig-1.3.20.ebuild:
+  set ~ppc in keywords
+
+  20 Jan 2004; <gustavoz@gentoo.org> swig-1.3.19.ebuild:
+  stable on sparc
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> swig-1.3.19.ebuild:
+  Move to mips stable (~mips -> mips)
+
+*swig-1.3.20 (26 Dec 2003)
+
+  26 Dec 2003; Heinrich Wendel <lanius@gentoo.org> swig-1.3.20.ebuild:
+  bump
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> swig-1.3.19.ebuild:
+  Marked stable on hppa.
+
+  23 Nov 2003; Heinrich Wendel <lanius@gentoo.org> swig-1.3.10-r1.ebuild,
+  swig-1.3.15.ebuild:
+  cleanups
+
+  23 Nov 2003; Heinrich Wendel <lanius@gentoo.org> swig-1.3.19.ebuild:
+  stable on x86
+
+  04 Nov 2003; Brad House <brad_mssw@gentoo.org> swig-1.3.19.ebuild:
+  mark as stable on amd64
+
+  08 Oct 2003; <tuxus@gentoo.org> swig-1.3.16.ebuild:
+  Stable on mips
+
+  26 Sep 2003; Aron Griffis <agriffis@gentoo.org> swig-1.3.19.ebuild:
+  Stable on alpha
+
+  17 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> swig-1.3.16.ebuild:
+  Mark stable so that subversion can be marked stable
+
+*swig-1.3.19 (29 Jul 2003)
+
+  29 Jul 2003; Tom Payne <twp@gentoo.org> swig-1.3.19.ebuild :
+  Version bump. Added remaining KEYWORDS.
+
+  14 Jul 2003; Aron Griffis <agriffis@gentoo.org> swig-1.3.16.ebuild:
+  Add ~alpha to KEYWORDS
+
+*swig-1.3.16 (05 Nov 2002)
+
+  31 Jan 2003; Martin Holzer <mholzer@gentoo.org> swig-1.3.16.ebuild :
+  Change SRC_URI to use mirror://sourceforge.
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> swig-1.3.16.ebuild files/digest-swig-1.3.16:
+  Version bump.
+
+*swig-1.3.15 (18 Oct 2002)
+
+  31 Jan 2003; Martin Holzer <mholzer@gentoo.org> swig-1.3.15.ebuild :
+  Change SRC_URI to use mirror://sourceforge.
+
+  18 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> swig-1.3.15.ebuild files/digest-swig-1.3.15 :
+  New upstream version. Fixes #8457.
+
+*swig-1.3.10-r2 (1 Feb 2002)
+
+  31 Jan 2003; Martin Holzer <mholzer@gentoo.org> swig-1.3.10-r2.ebuild :
+  Change SRC_URI to use mirror://sourceforge.
+
+  21 Feb 2002; M.Schlemmer <azarah@gentoo.org> swig-1.3.10-r2.ebuild :
+  Fix a unterminating loop with ruby in USE and ruby-1.6.6 installed.
 
 *swig-1.3.10-r1 (1 Feb 2002)
 
+  31 Jan 2003; Martin Holzer <mholzer@gentoo.org> swig-1.3.10-r1.ebuild :
+  Change SRC_URI to use mirror://sourceforge.
+
   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/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index e69de29bb2d1..97d687948405 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b2b34389f6f45306511f262788842462 ChangeLog 6608
+MD5 612242e40ef11cd73ec029e52f6a6e0d files/digest-swig-1.3.21 64
+MD5 23c0a3cf6bf490d36300b9ad06baf451 files/digest-swig-1.3.24 64
+MD5 a870c3f4793155f09d7633605321df30 files/digest-swig-1.3.25 64
+MD5 011d2439bc52a3cc1e8c61a29068f52e files/digest-swig-1.3.27 64
+MD5 c642968e8d7284836603f2f63216bcb4 metadata.xml 768
+MD5 ee73f98bd5bd9c43b8ef87a8d380ed46 swig-1.3.21.ebuild 1922
+MD5 e27ffef811e03d0bffed935db35d13e9 swig-1.3.24.ebuild 1840
+MD5 240f7082d8efecdc1a4b91b3935d16b0 swig-1.3.25.ebuild 1664
+MD5 0faf06b52d38eff619ce18eb81b26654 swig-1.3.27.ebuild 1684
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWqYsgIKl8Uu19MoRAj+FAJ9GI6XGhC6mNqG+0s88DThhdIIv/gCeJPhm
+hgA3FDHQ5q7/e4HeSDKpOv4=
+=rx5b
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/swig/swig-1.3.21.ebuild b/dev-lang/swig/swig-1.3.21.ebuild
index 4e09fb9cbf2b..061792bc90fa 100644
--- a/dev-lang/swig/swig-1.3.21.ebuild
+++ b/dev-lang/swig/swig-1.3.21.ebuild
@@ -1,59 +1,74 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.21.ebuild,v 1.1 2004/02/20 13:47:03 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.21.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
-IUSE="java guile python tcltk ruby perl"
+inherit flag-o-matic mono #48511
 
-S=${WORKDIR}/SWIG-${PV}
-DESCRIPTION="Simplied Wrapper and Interface Generator"
+DESCRIPTION="Simplified Wrapper and Interface Generator"
+HOMEPAGE="http://www.swig.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.swig.org"
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 sh ppc64"
+IUSE="doc java guile python tcltk ruby perl php X"
+
+DEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.0 )
 	java? ( virtual/jdk )
-	ruby? ( >=dev-lang/ruby-1.6.1 )
+	ruby? ( virtual/ruby )
 	guile? ( >=dev-util/guile-1.4 )
-	tcltk? ( >=dev-lang/tk-8.3 )
-	perl? ( >=dev-lang/perl-5.6.1 )"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~alpha ~hppa ~sparc ~x86 ~amd64 ~ppc ~mips"
+	tcltk? (
+		dev-lang/tcl
+		X? ( dev-lang/tk )
+	)
+	perl? ( >=dev-lang/perl-5.6.1 )
+	php? ( >=dev-php/php-4.0.0 )"
+
+S=${WORKDIR}/SWIG-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:$(M4_INSTALL_DIR):$(DESTDIR)$(M4_INSTALL_DIR):g' Makefile.in
+}
 
 src_compile() {
-	local myc
-
-	use python && myc="$myc --with-py" \
-		   || myc="$myc --without-py"
-	use java && myc="$myc --with-java=$JAVA_HOME --with-javaincl=${JAVA_HOME}/include" \
-		 || myc="$myc --without-java"
-	use ruby && myc="$myc --with-ruby=/usr/bin/ruby" \
-		 || myc="$myc --without-ruby"
-	use guile && myc="$myc --with-guile" \
-		  || myc="$myc --without-guile"
-	use tcltk && myc="$myc --with-tcl" \
-		  || myc="$myc --without-tcl"
-	use perl && myc="$myc --with-perl" \
-		 || myc="$myc --without-perl"
-
-	unset CXXFLAGS
-	unset CFLAGS
-
-	use ruby && local rubyver="`ruby --version | cut -d '.' -f 1,2`"
-	use ruby && RUBY="/usr/lib/ruby/${rubyver/ruby /}/"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$myc || die "./configure failed"
-
-	make || die
-	make runtime || die
+	strip-flags
+
+	local myconf
+	if use ruby ; then
+		local rubyver="`ruby --version | cut -d '.' -f 1,2`"
+		export RUBY="/usr/lib/ruby/${rubyver/ruby /}/"
+	fi
+
+	econf \
+		`use_with python py` \
+		`use_with java java "${JAVA_HOME}"` \
+		`use_with java javaincl "${JAVA_HOME}/include"` \
+		`use_with ruby ruby /usr/bin/ruby` \
+		`use_with guile` \
+		`use_with tcltk tcl` \
+		`use_with perl perl5 /usr/bin/perl` \
+		`use_with php php4` \
+		|| die
+
+	# fix the broken configure script
+	use tcltk || sed -i -e "s:am__append_1 =:#am__append_1 =:" Runtime/Makefile
+
+	`has_version dev-lisp/plt` && PLT=/usr/share/plt/collects
+	`has_version dev-lisp/mzscheme` && PLT=/usr/share/mzscheme/collects
+
+	emake || die
+	emake runtime PLTCOLLECTS=$PLT || die
+}
+
+src_install() {
+	make install install-runtime DESTDIR=${D} || die
+	dodoc ANNOUNCE CHANGES FUTURE NEW README TODO
+	use doc && dohtml -r Doc/{Devel,Manual}
 }
 
-src_install () {
-	make prefix=${D}/usr install || die
-	make prefix=${D}/usr install-runtime || die
+src_test() {
+	einfo "FEATURES=\"maketest\" has been disabled for dev-lang/swig"
 }
diff --git a/dev-lang/swig/swig-1.3.24.ebuild b/dev-lang/swig/swig-1.3.24.ebuild
index 719a5dcfb4b0..bd8f873b245e 100644
--- a/dev-lang/swig/swig-1.3.24.ebuild
+++ b/dev-lang/swig/swig-1.3.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/dev-lang/swig/swig-1.3.24.ebuild,v 1.1 2005/02/19 20:35:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.24.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit flag-o-matic mono #48511
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 IUSE="java guile python tcltk ruby perl php X"
 
 DEPEND="virtual/libc
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 		X? ( dev-lang/tk )
 	)
 	perl? ( >=dev-lang/perl-5.6.1 )
-	php? ( >=dev-php/php-4.0.0 )"
+	php? ( virtual/php )"
 
 S=${WORKDIR}/SWIG-${PV}
 
@@ -68,5 +68,5 @@ src_install() {
 }
 
 src_test() {
-	einfo "FEATURES=\"maketest\" has been disabled for dev-util/cvs"
+	einfo "FEATURES=\"maketest\" has been disabled for dev-lang/swig"
 }
diff --git a/dev-lang/swig/swig-1.3.25.ebuild b/dev-lang/swig/swig-1.3.25.ebuild
index 2bd3c33e542c..2a26c2de825c 100644
--- a/dev-lang/swig/swig-1.3.25.ebuild
+++ b/dev-lang/swig/swig-1.3.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.25.ebuild,v 1.1 2005/09/11 10:24:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.25.ebuild,v 1.1.1.1 2005/11/30 09:58:34 chriswhite Exp $
 
 inherit flag-o-matic mono eutils #48511
 
@@ -25,12 +25,6 @@ DEPEND="virtual/libc
 		X? ( dev-lang/tk )
 	)"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:-name jni_md.h -print:-xtype f -name jni_md.h -print:g' configure
-}
-
 src_compile() {
 	strip-flags
 
@@ -46,7 +40,7 @@ src_compile() {
 		$(use_with java javaincl "${JAVA_HOME}/include") \
 		$(use_with perl perl5 /usr/bin/perl) \
 		$(use_with php php4) \
-		$(use_with python py) \
+		$(use_with python python python) \
 		$(use_with ruby ruby /usr/bin/ruby) \
 		$(use_with tcltk tcl) \
 		|| die
diff --git a/dev-lang/swig/swig-1.3.27.ebuild b/dev-lang/swig/swig-1.3.27.ebuild
index 500ab50ac736..5e96c66e3198 100644
--- a/dev-lang/swig/swig-1.3.27.ebuild
+++ b/dev-lang/swig/swig-1.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/dev-lang/swig/swig-1.3.27.ebuild,v 1.1 2005/10/18 04:04:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.27.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit flag-o-matic mono eutils #48511
 
@@ -29,14 +29,6 @@ DEPEND="lua? ( dev-lang/lua )
 		X? ( dev-lang/tk )
 	)"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:-name jni_md.h -print:-xtype f -name jni_md.h -print:g' \
-		configure || die
-}
-
 src_compile() {
 	strip-flags
 
@@ -49,7 +41,7 @@ src_compile() {
 	econf \
 		$(use_with X x) \
 		$(use_with tcltk tcl) \
-		$(use_with python) \
+		$(use_with python python python) \
 		$(use_with perl perl5 /usr/bin/perl) \
 		$(use_with java java "${JAVA_HOME}") \
 		$(use_with java javaincl "${JAVA_HOME}/include") \
diff --git a/dev-lang/tcc/ChangeLog b/dev-lang/tcc/ChangeLog
index bfa365e9d46b..754d011be614 100644
--- a/dev-lang/tcc/ChangeLog
+++ b/dev-lang/tcc/ChangeLog
@@ -1,8 +1,71 @@
 # ChangeLog for dev-lang/tcc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.1 2002/07/20 04:17:27 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
-*tcc-0.9.7.ebuild (19 Jul 2002)
+  02 Jun 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> tcc-0.9.19.ebuild,
+  tcc-0.9.20.ebuild, tcc-0.9.22.ebuild:
+  keywording all versions -* [~]x86 (was previously marked -sparc and -amd64,
+  no arches other than x86 are supported at this time)
+
+*tcc-0.9.22 (11 Nov 2004)
+
+  11 Nov 2004; <spider@gentoo.org> +tcc-0.9.22.ebuild:
+  Updated ebuild, thanks to Olaf Freyer and Thomas Eckert
+
+  07 Oct 2004; George Shapovalov <george@gentoo.org> tcc-0.9.{19,20}.ebuild  :
+  marked all versions -amd64. tcc apparently does not know about this arch (configure borks)
+  even though theoretically it might be able to digest it
+  Changed herd in metadata to lang-misc, no-herd is against the policy!!!
+  correspondingly I do not need to be noted as a separate maintainer, I am on that herd.
+
+  27 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/tcc-0.9.20-gcc34.patch, -tcc-0.9.14.ebuild, -tcc-0.9.16.ebuild,
+  tcc-0.9.20.ebuild, -tcc-0.9.7.ebuild, -tcc-0.9.8.ebuild:
+  Fixed gcc-3.4 compile issues, Bug #65346. Ebuild clean up.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> tcc-0.9.14.ebuild,
+  tcc-0.9.16.ebuild, tcc-0.9.19.ebuild, tcc-0.9.20.ebuild, tcc-0.9.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  05 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> tcc-0.9.14.ebuild,
+  tcc-0.9.16.ebuild, tcc-0.9.19.ebuild, tcc-0.9.20.ebuild, tcc-0.9.7.ebuild,
+  tcc-0.9.8.ebuild:
+  marking all -sparc, who marked them sparc / ~sparc ?!?
+
+*tcc-0.9.20 (14 Oct 2003)
+
+  14 Oct 2003; <spider@gentoo.org> :
+  Update version to fix linking error with array not found
+
+  09 Jun 2003; George Shapovalov <george@gentoo.org> tcc-0.9.19.ebuild :
+  changed LICENSE to LGPL-2.1 from GPL-2, seems to have changed recently.
+  Thanks to Brian Olsen <bnolsen@attbi.com> for notification
+
+*tcc-0.9.19 (05 May 2003)
+
+  05 May 2003; George Shapovalov <george@gentoo.org> tcc-0.9.19.ebuild, files/digest-tcc-0.9.19 :
+  new version (#21363)
+  now uses autoconf-based install (albet there were some problems, see the bug for details)
+  thanks to Thomas Eckert <eckert.thomas@gmx.net> for update
+
+*tcc-0.9.16 (06 Jan 2003)
+
+  06 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump
+
+*tcc-0.9.14 (10 Dec 2002)
+  
+  10 Dec 2002; George Shapovalov <george@gentoo.org> tcc-0.9.14.ebuild, files/digest-tcc-0.9.14 :
+  new version. 
+  Now tcc compiles more packages (e.g. smarteiffel).
+  Thanks to Per Wigren <wigren@home.se> for an update
+
+*tcc-0.9.8 (13 Feb 2003)
+ 
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*tcc-0.9.7 (19 Jul 2002)
 
   19 Jul 2002; George Shapovalov <george@gentoo.org> tcc-0.9.7.ebuild :
 
diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index e69de29bb2d1..d40026e66381 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bf5fd7682dfe9747af2fdf7af2dedcc7 tcc-0.9.19.ebuild 1161
+MD5 3a6369455c29465e6c21898a9e157416 tcc-0.9.20.ebuild 1259
+MD5 b7e1fbf86d87042515759a804fd7bed3 ChangeLog 3175
+MD5 fe021b0a69a2ef1e49712995066e84af tcc-0.9.22.ebuild 1231
+MD5 35cfb4925871295b467051c44fb24cc7 metadata.xml 329
+MD5 c69cb4d253c0594ac5714ddaffc65511 files/digest-tcc-0.9.19 62
+MD5 d2230252f3e3cd1d63e2b08a02260473 files/digest-tcc-0.9.20 62
+MD5 931e2a2a3184dcc20df3be0bd4ce9382 files/digest-tcc-0.9.22 62
+MD5 5029153e4761d98be0cda03a73e57e80 files/tcc-0.9.20-gcc34.patch 2901
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1tebBXaUFmZvwyMRAsPNAJ4za047deixwPnkTuKSchsLsNmp1wCgyL1q
+RL8z02c15CAdQ0IN81+251U=
+=0SrU
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tcc/metadata.xml b/dev-lang/tcc/metadata.xml
index 65ffeaed8a53..81df47d24c11 100644
--- a/dev-lang/tcc/metadata.xml
+++ b/dev-lang/tcc/metadata.xml
@@ -1,12 +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>george@gentoo.org</email>
-  <description> He's the one in the ChangeLog, giving this to him </description>
-</maintainer>
-
+<herd>lang-misc</herd>
 <maintainer>
   <email>spider@gentoo.org</email>
   <name>Spider</name>
diff --git a/dev-lang/tcc/tcc-0.9.19.ebuild b/dev-lang/tcc/tcc-0.9.19.ebuild
index d105935ac770..961914630af4 100644
--- a/dev-lang/tcc/tcc-0.9.19.ebuild
+++ b/dev-lang/tcc/tcc-0.9.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.19.ebuild,v 1.1 2003/06/06 05:34:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.19.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
 IUSE=""
 
@@ -8,11 +8,11 @@ DESCRIPTION="A very small C compiler for ix86"
 HOMEPAGE="http://www.tinycc.org/"
 SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="-* x86"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf || die "configure failed"
@@ -38,7 +38,7 @@ src_install() {
 		libdir=${D}/usr/lib/ \
 		includedir=${D}/usr/include/ \
 		mandir=${D}/usr/share/man/ install || die
-	dodoc Changelog README TODO
+	dodoc Changelog README TODO VERSION COPYING
 	dohtml tcc-doc.html
 	mkdir ${D}/usr/share/doc/${PF}/examples
 	cp ex*.c ${D}/usr/share/doc/${PF}/examples/
diff --git a/dev-lang/tcc/tcc-0.9.20.ebuild b/dev-lang/tcc/tcc-0.9.20.ebuild
index b3976bc2fabd..6b331eb9f177 100644
--- a/dev-lang/tcc/tcc-0.9.20.ebuild
+++ b/dev-lang/tcc/tcc-0.9.20.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.20.ebuild,v 1.1 2003/10/14 19:42:23 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.20.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -10,9 +12,16 @@ SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="-* ~x86"
+
+DEPEND="virtual/libc"
 
-DEPEND="virtual/glibc"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
 
 src_compile() {
 	econf || die "configure failed"
diff --git a/dev-lang/tcc/tcc-0.9.22.ebuild b/dev-lang/tcc/tcc-0.9.22.ebuild
index 541dd4f85fd3..e32c8fd3c5a5 100644
--- a/dev-lang/tcc/tcc-0.9.22.ebuild
+++ b/dev-lang/tcc/tcc-0.9.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.22.ebuild,v 1.1 2004/11/10 23:51:01 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.22.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="A very small C compiler for ix86"
@@ -9,7 +9,7 @@ SRC_URI="http://fabrice.bellard.free.fr/tcc/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 -sparc -amd64"
+KEYWORDS="-* ~x86"
 
 DEPEND="virtual/libc"
 
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 54e119911bc5..a57998e9a7c9 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,227 @@
 # ChangeLog for dev-lang/tcl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> tcl-8.4.9.ebuild:
+  Stable on alpha.
+
+  02 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> tcl-8.4.11.ebuild:
+  Added PDEPEND. Bug 97357.
+
+*tcl-8.4.11 (02 Jul 2005)
+
+  02 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tcl-8.4.11-multilib.patch, +tcl-8.4.11.ebuild:
+  Version bumped.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> tcl-8.4.9.ebuild:
+  Stable on ppc64
+
+  03 Jun 2005; Mike Frysinger <vapier@gentoo.org> tcl-8.4.9.ebuild:
+  Touchup ROOT / libdir usage to get rid of all the // gremlins.
+
+  27 May 2005; Joseph Jezak <josejx@gentoo.org> tcl-8.4.9.ebuild:
+  Marked ppc stable.
+
+  09 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> tcl-8.4.9.ebuild:
+  Stable on sparc
+
+  08 May 2005; Marcus D. Hanwell <cryos@gentoo.org> tcl-8.4.9.ebuild:
+  Stable on amd64.
+
+  07 May 2005; Aron Griffis <agriffis@gentoo.org> tcl-8.4.9.ebuild:
+  stable on ia64
+
+  07 May 2005; MATSUU Takuto <matsuu@gentoo.org> tcl-8.4.9.ebuild:
+  Stable on x86.
+
+  21 Mar 2005; Lars Weiler <pylon@gentoo.org> tcl-8.4.6-r1.ebuild,
+  tcl-8.4.9.ebuild:
+  Downgrading tcl for ppc.
+
+  19 Mar 2005; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+  Changing to proper herd
+
+*tcl-8.4.9 (19 Mar 2005)
+
+  19 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +tcl-8.4.9.ebuild:
+  Version bumped, #83816
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/tcl-8.4.6-multilib.patch, tcl-8.4.6-r1.ebuild:
+  Made tcl multilib friendly.
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> tcl-8.4.6-r1.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Stable on alpha.
+
+  21 Sep 2004; Doug Goldstein <cardoe@gentoo.org> tcl-8.4.6-r1.ebuild:
+  readding arches I removed accidently
+
+*tcl-8.4.6-r1 (21 Sep 2004)
+
+  21 Sep 2004; Doug Goldstein <cardoe@gentoo.org> +tcl-8.4.6-r1.ebuild:
+  fixed tclConfig.sh when using custom $PORTAGE_TMPDIR... also fixed potential
+  cross compiling issues
+
+  14 Sep 2004; Guy Martin <gmsoft@gentoo.org> tcl-8.4.6.ebuild:
+  Stable on hppa.
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> tcl-8.3.4.ebuild,
+  tcl-8.4.6.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  24 Aug 2004; Chris Aniszczyk <zx@gentoo.org> tcl-8.4.6.ebuild:
+  Stable on x86
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> tcl-8.4.6.ebuild:
+  stable on alpha and ia64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> tcl-8.3.4.ebuild,
+  tcl-8.4.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  15 Jun 2004; Ferris McCormick <fmccor@gentoo.org> tcl-8.4.6.ebuild:
+  Marked stable for sparc.
+
+  31 May 2004; Tom Gall <tgall@genoo.orgr>  tcl-8.4.6.ebuild:
+  stable on ppc64
+
+  25 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tcl-8.3.4.ebuild,
+  tcl-8.4.6.ebuild:
+  don't depend on use echo
+
+  25 Apr 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  tcl-8.4.6.ebuild:
+  Removed gentoolkit thanks to Brian Jackson <iggy@gentoo.org> in bug #43626
+
+  20 Apr 2004; Ian Leitch <port001@gentoo.org> tcl-8.4.6.ebuild:
+  Marking stable on amd64 and s390
+
+  20 Apr 2004; Ian Leitch <port001@gentoo.org> tcl-8.4.6.ebuild:
+  Marking stable on mips
+
+  20 Apr 2004; Ian Leitch <port001@gentoo.org> tcl-8.3.4.ebuild,
+  tcl-8.4.6.ebuild:
+  Enable threads with local USE flag 'threads'. #2024
+
+  20 Apr 2004; Ian Leitch <port001@gentoo.org> -tcl-8.3.3-r1.ebuild,
+  -tcl-8.3.3-r3.ebuild, -tcl-8.4.3.ebuild, -tcl-8.4.4.ebuild,
+  -tcl-8.4.5.ebuild:
+  Removed stable ebuilds
+
+*tcl-8.4.6 (04 Mar 2004)
+
+  04 Mar 2004; Martin Holzer <mholzer@gentoo.org> tcl-8.4.6.ebuild:
+  Version bumped.
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> tcl-8.4.5.ebuild:
+  added s390 to keywords
+
+  04 Jan 2004; <tuxus@gentoo.org> tcl-8.4.3.ebuild:
+  Added mips to KEYWORDS
+
+  03 Jan 2004; Aron Griffis <agriffis@gentoo.org> tcl-8.4.5.ebuild:
+  Add ~alpha
+
+  03 Jan 2004; Brian Jackson <iggy@gentoo.org> tcl-8.3.3-r1.ebuild,
+  tcl-8.3.3-r3.ebuild, tcl-8.3.4.ebuild, tcl-8.4.3.ebuild, tcl-8.4.4.ebuild,
+  tcl-8.4.5.ebuild:
+  adding ~ia64 keywords, it's installed on the releng ia64 box, so I assume it's
+  safe, needed for bitkeeper
+
+  19 Dec 2003; David Holm <dholm@gentoo.org> tcl-8.4.5.ebuild:
+  Added to ~ppc.
+
+*tcl-8.4.5 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> tcl-8.4.5.ebuild:
+  Version bumped.
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> tcl-8.4.3.ebuild,
+  tcl-8.4.4.ebuild:
+  changing to sf
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> tcl-8.4.4.ebuild:
+  add ~amd64 flag
+
+*tcl-8.4.4 (22 Oct 2003)
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> tcl-8.4.4.ebuild:
+  Version bumped. Closes #28633.
+
+*tcl-8.4.3 (30 Jun 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> tcl-8.4.3.ebuild:
+  Added ~sparc & ~mips to KEYWORDS
+
+  30 Jun 2003; Daniel Ahlberg <aliz@gento.org> tcl-8.4.3.ebuild :
+  Version bump.
+
+*tcl-8.4.2-r1 (19 May 2003)
+
+  19 May 2003; Stanislav Brabec <utx@gentoo.org> tcl-8.4.2-r1.ebuild:
+  Fixed man-pages installation (worked around bug in mkLinks script - unset
+  variable S for installation).
+
+*tcl-8.4.2 (17 Apr 2003)
+
+  09 May 2003; Stanislav Brabec <utx@gentoo.org> tcl-8.4.2.ebuild:
+  Added upgrade recompilation warning (bug #19939) and dependency on
+  revdep-rebuild.
+
+  17 Apr 2003; Stanislav Brabec <utx@gentoo.org> tcl-8.4.2.ebuild:
+  Updated to version 8.4.2 (bug #18483).
+
+*tcl-8.3.4 (18 Dec 2002)
+
+  20 Mar 2003; Zach Welch <zwelch@gentoo.org> tcl-8.3.4.ebuild:
+  add arm keyword
+
+  08 Mar 2003; Guy Martin <gmsoft@gentoo.org> tcl-8.8.4.ebuild :
+  Added hppa to keywords.
+
+  18 Dec 2002; Stefan Jones <cretin@gentoo.org> :
+  New revision.
+
+*tcl-8.3.3-r3 (25 Jun 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
+  
+  02 Aug 2002; mark Guertin <gerk@gentoo.org> tcl-8.8.3-r3.ebuild :
+
+  Added ppc to keywords
+
+  25 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tcl-8.3.3-r3.ebuild files/digest-tcl-8.3.3-r3:
+
+  Some programs had trouble compiling against tcl due to erroneous quoting of 
+  a compile-time env var. Fixed.
+
+  Removed tcl-8.3.3-r2.ebuild files/digest-tcl-8.3.3-r2
+
+*tcl-8.3.3-r2 (31 May 2002)
+
+  31 May 2002; Preston A. Elder <prez@gentoo.org> tcl-8.3.3-r2.ebuild files/digest-tcl-8.3.3-r2:
+
+  Fixed the soft links created in the install process.
+
+*tcl-8.3.3-r1 (24 Apr 2002)
+
+  02 Aug 2002; mark Guertin <gerk@gentoo.org> tcl-8.3.3-r1.ebuild :
+
+  Added ppc to keywords
+
+  24 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tcl-8.3.3-r1.ebuild files/digest-tcl-8.3.3-r1:
+
+  Threading is now disabled as it breaks some packages, most notably lavaps.
+
+  Removed tcl-8.3.3.ebuild files/digest-tcl-8.3.3
 
 *tcl-8.3.3 (1 Feb 2002)
 
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index ebaa05b51664..cfb0fee89c41 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,11 +1,24 @@
-MD5 1c8dfb613b8b84814275d10f7f09ec00 tcl-8.3.3-r1.ebuild 2075
-MD5 59930a521e899c966c8c75ca739dd370 tcl-8.3.3-r3.ebuild 2178
-MD5 eff073a2329a82ec0ce900c647dd0591 tcl-8.3.4.ebuild 2183
-MD5 f8b69c088a2ee413ff1b7e22e9865256 ChangeLog 2242
-MD5 0d146e25616ec18d4bd1326042c8a1dd tcl-8.4.2.ebuild 2653
-MD5 a6a97594f46090cf812ea7bfcac2a258 tcl-8.4.2-r1.ebuild 2656
-MD5 ee8221e881e685cb7836325e4021881e files/digest-tcl-8.3.3-r1 61
-MD5 ee8221e881e685cb7836325e4021881e files/digest-tcl-8.3.3-r3 61
-MD5 d7d05b473cf799a637baaa9f321b070f files/digest-tcl-8.3.4 121
-MD5 f608ebc717b6f106b101e76b49c89df2 files/digest-tcl-8.4.2-r1 65
-MD5 f608ebc717b6f106b101e76b49c89df2 files/digest-tcl-8.4.2 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
+MD5 211feab113da2798b9be2e5f040cb10a ChangeLog 7381
+MD5 69d01ea195cf8047c70a0d4d9e5521dd tcl-8.4.11.ebuild 3246
+MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
+MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
+MD5 eec3607c728a5f0125ea427870897539 tcl-8.4.9.ebuild 3262
+MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
+MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
+MD5 23a4b408a4ea393df1da149ed8cb4d4c files/tcl-8.4.11-multilib.patch 1808
+MD5 9c5852717da8c531e22dda3dd4ade696 files/digest-tcl-8.4.9 65
+MD5 3750ae675c54bcfb446406014a177605 files/digest-tcl-8.4.11 66
+MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
+MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
+MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8UBZKf2g/qXtneoRAs24AJ4zZJFW+p3hT8RNMJzOslJdZcL9SgCfVz17
+f9o8dMtO9Jr/lL3Pa7W5BB8=
+=NCiS
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/metadata.xml b/dev-lang/tcl/metadata.xml
index d8b96be3c5cd..49d2ef532cf7 100644
--- a/dev-lang/tcl/metadata.xml
+++ b/dev-lang/tcl/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>
+	<herd>tcltk</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>tcltk@gentoo.org</email>
+		<description>TCL/TK Herd.</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/tcl/tcl-8.3.4.ebuild b/dev-lang/tcl/tcl-8.3.4.ebuild
index b169a45ea626..677fb1dfb7fc 100644
--- a/dev-lang/tcl/tcl-8.3.4.ebuild
+++ b/dev-lang/tcl/tcl-8.3.4.ebuild
@@ -1,35 +1,58 @@
-# 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/dev-lang/tcl/tcl-8.3.4.ebuild,v 1.1 2002/12/18 12:17:44 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.3.4.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
+inherit eutils
+
+IUSE="threads"
 
 S=${WORKDIR}/${PN}${PV}
 SRC_URI="ftp://ftp.scriptics.com/pub/tcl/tcl8_3/${PN}${PV}.tar.gz"
 
-
 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
 
 DESCRIPTION="Tool Command Language"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 
 # hyper-optimizations untested...
 #
 
+pkg_setup() {
+
+	if use threads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+		epause 5
+	fi
+}
+
 src_compile() {
 
+	local local_config_use=""
+
+	if use threads
+	then
+		local_config_use="--enable-threads"
+	fi
+
 	cd ${S}/unix
 	./configure --host=${CHOST} \
 				--prefix=/usr \
 				--mandir=/usr/share/man \
+				${local_config_use} \
 				|| die
-	# threading is not recommended as it breaks some packages 
-	#			--enable-threads \
-				
+
 	emake CFLAGS="${CFLAGS}" || die
 
 }
@@ -39,10 +62,10 @@ src_install() {
 	#short version number
 	local v1
 	v1=${PV%.*}
-	
+
 	cd ${S}/unix
 	make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
-	
+
 	# fix the tclConfig.sh to eliminate refs to the build directory
 	sed -e "s,^TCL_BUILD_LIB_SPEC='-L${S}/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
 		-e "s,^TCL_SRC_DIR='${S}',TCL_SRC_DIR='/usr/lib/tcl${v1}/include'," \
@@ -51,7 +74,7 @@ src_install() {
 		-e "s,^TCL_LIB_FILE='libtcl8.3..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.3\$\{TCL_DBGX\}.so\"," \
 		${D}/usr/lib/tclConfig.sh > ${D}/usr/lib/tclConfig.sh.new
 	mv ${D}/usr/lib/tclConfig.sh.new ${D}/usr/lib/tclConfig.sh
-	
+
 	# install private headers
 	dodir /usr/lib/tcl${v1}/include/unix
 	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tcl${v1}/include/unix
@@ -59,14 +82,14 @@ src_install() {
 	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tcl${v1}/include/generic
 	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tcl.h
 	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclPlatDecls.h	
+	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclPlatDecls.h
 
 	# install symlink for libraries
 	dosym /usr/lib/libtcl${v1}.so /usr/lib/libtcl.so
 	dosym /usr/lib/libtclstub${v1}.a /usr/lib/libtclstub.a
-	
+
 	ln -sf tclsh${v1} ${D}/usr/bin/tclsh
-	
+
 	cd ${S}
 	dodoc README changes license.terms
 
diff --git a/dev-lang/tcl/tcl-8.4.11.ebuild b/dev-lang/tcl/tcl-8.4.11.ebuild
index 7c67d20ccd2b..fc36ef004746 100644
--- a/dev-lang/tcl/tcl-8.4.11.ebuild
+++ b/dev-lang/tcl/tcl-8.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/dev-lang/tcl/tcl-8.4.11.ebuild,v 1.1 2005/07/02 14:14:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.11.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
 inherit eutils
 
@@ -14,6 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="threads"
 
 DEPEND=""
+PDEPEND="threads? ( dev-tcltk/thread )"
 
 S=${WORKDIR}/${PN}${PV}
 
diff --git a/dev-lang/tcl/tcl-8.4.6-r1.ebuild b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
index 318845744bad..798c56859df5 100644
--- a/dev-lang/tcl/tcl-8.4.6-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6-r1.ebuild,v 1.1 2004/09/21 15:24:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="threads"
 
 DEPEND="virtual/libc"
@@ -31,6 +31,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-multilib.patch
+}
+
 src_compile() {
 	local local_config_use=""
 
@@ -40,13 +46,7 @@ src_compile() {
 	fi
 
 	cd ${S}/unix
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${local_config_use} \
-		|| die
-
+	econf ${local_config_use} || die
 	emake CFLAGS="${CFLAGS}" || die
 }
 
@@ -59,26 +59,28 @@ src_install() {
 	S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
 
 	# fix the tclConfig.sh to eliminate refs to the build directory
-	sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/lib," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/lib/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/lib," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/lib," \
+	sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/$(get_libdir)/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/$(get_libdir)," \
 		-e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
-		${D}/usr/lib/tclConfig.sh > ${D}/usr/lib/tclConfig.sh.new
-	mv ${D}/usr/lib/tclConfig.sh.new ${D}/usr/lib/tclConfig.sh
+		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
+		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
+		${D}/usr/$(get_libdir)/tclConfig.sh > ${D}/usr/$(get_libdir)/tclConfig.sh.new
+	mv ${D}/usr/$(get_libdir)/tclConfig.sh.new ${D}/usr/$(get_libdir)/tclConfig.sh
 
 	# install private headers
-	dodir /usr/lib/tcl${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tcl${v1}/include/unix
-	dodir /usr/lib/tcl${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tcl${v1}/include/generic
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tcl.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclPlatDecls.h
+	dodir /usr/$(get_libdir)/tcl${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/unix
+	dodir /usr/$(get_libdir)/tcl${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/generic
+	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tcl.h
+	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclDecls.h
+	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclPlatDecls.h
 
 	# install symlink for libraries
-	dosym /usr/lib/libtcl${v1}.so /usr/lib/libtcl.so
-	dosym /usr/lib/libtclstub${v1}.a /usr/lib/libtclstub.a
+	dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
+	dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
 
 	ln -sf tclsh${v1} ${D}/usr/bin/tclsh
 
diff --git a/dev-lang/tcl/tcl-8.4.6.ebuild b/dev-lang/tcl/tcl-8.4.6.ebuild
index 6958c65c047d..0d0be1796b74 100644
--- a/dev-lang/tcl/tcl-8.4.6.ebuild
+++ b/dev-lang/tcl/tcl-8.4.6.ebuild
@@ -1,31 +1,51 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6.ebuild,v 1.1 2004/03/04 18:17:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
 SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ppc64 ~ia64 ~s390"
-RESTRICT="nomirror"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="threads"
 
-DEPEND="virtual/glibc
-	>=app-portage/gentoolkit-0.1.22"
-RDEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}${PV}
 
+pkg_setup() {
+	if use threads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+		epause 5
+	fi
+}
+
 src_compile() {
+	local local_config_use=""
+
+	if use threads
+	then
+		local_config_use="--enable-threads"
+	fi
+
 	cd ${S}/unix
-	./configure --host=${CHOST} \
-				--prefix=/usr \
-				--mandir=/usr/share/man \
-				|| die
-	# threading is not recommended as it breaks some packages
-	#			--enable-threads \
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		${local_config_use} \
+		|| die
 
 	emake CFLAGS="${CFLAGS}" || die
 }
@@ -70,7 +90,8 @@ pkg_postinst() {
 	ewarn
 	ewarn "If you're upgrading from tcl-8.3, you must recompile the other"
 	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild."
+	ewarn "completes.  To perform this action, please run revdep-rebuild"
+	ewarn "in package app-portage/gentoolkit."
 	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
 	ewarn "upgrade them before this recompilation, too,"
 	ewarn
diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild
index 95cb7c9bd16a..8bfdc2d1ef28 100644
--- a/dev-lang/tcl/tcl-8.4.9.ebuild
+++ b/dev-lang/tcl/tcl-8.4.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/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.1 2005/03/19 05:51:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.1.1.1 2005/11/30 09:58:17 chriswhite Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
@@ -10,16 +10,15 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
 
 LICENSE="BSD"
 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="threads"
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 S=${WORKDIR}/${PN}${PV}
 
 pkg_setup() {
-	if use threads
-	then
+	if use threads ; then
 		ewarn ""
 		ewarn "PLEASE NOTE: You are compiling ${P} with"
 		ewarn "threading enabled."
@@ -33,19 +32,18 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-8.4.6-multilib.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-8.4.6-multilib.patch
 }
 
 src_compile() {
 	local local_config_use=""
 
-	if use threads
-	then
+	if use threads ; then
 		local_config_use="--enable-threads"
 	fi
 
-	cd ${S}/unix
+	cd "${S}"/unix
 	econf ${local_config_use} || die
 	emake CFLAGS="${CFLAGS}" || die
 }
@@ -59,28 +57,30 @@ src_install() {
 	S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
 
 	# fix the tclConfig.sh to eliminate refs to the build directory
-	sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/$(get_libdir)/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/$(get_libdir)," \
+	[[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \
+		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \
+		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
-		${D}/usr/$(get_libdir)/tclConfig.sh > ${D}/usr/$(get_libdir)/tclConfig.sh.new
-	mv ${D}/usr/$(get_libdir)/tclConfig.sh.new ${D}/usr/$(get_libdir)/tclConfig.sh
+		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
+		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
+		${D}/usr/${mylibdir}/tclConfig.sh
 
 	# install private headers
-	dodir /usr/$(get_libdir)/tcl${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/unix
-	dodir /usr/$(get_libdir)/tcl${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/generic
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tcl.h
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclPlatDecls.h
+	dodir /usr/${mylibdir}/tcl${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/unix
+	dodir /usr/${mylibdir}/tcl${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/generic
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
 
 	# install symlink for libraries
-	dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
-	dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
+	dosym /usr/${mylibdir}/libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+	dosym /usr/${mylibdir}/libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
 
 	ln -sf tclsh${v1} ${D}/usr/bin/tclsh
 
@@ -97,5 +97,4 @@ pkg_postinst() {
 	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
 	ewarn "upgrade them before this recompilation, too,"
 	ewarn
-	ewarn ${S}
 }
diff --git a/dev-lang/tinycobol/ChangeLog b/dev-lang/tinycobol/ChangeLog
index f812cd7d4194..cbf8599e9b07 100644
--- a/dev-lang/tinycobol/ChangeLog
+++ b/dev-lang/tinycobol/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for dev-lang/tinycobol
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/ChangeLog,v 1.1 2003/05/12 11:59:06 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/ChangeLog,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> tinycobol-0.61.ebuild:
+  Stable on ppc.
+
+  15 Jun 2004; David Holm <dholm@gentoo.org> tinycobol-0.61.ebuild:
+  Added to ~ppc.
+
+  24 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> tinycobol-0.61.ebuild:
+  Adding IUSE
+
+  12 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> tinycobol-0.61.ebuild:
+  libhtcobol.so symlink was not installed correctly and nobody noticed. Does
+  anyone use this at all?
+
+*tinycobol-0.61 (25 Sep 2003)
+
+  25 Sep 2003; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  tinycobol-0.61.ebuild, files/tinycobol-0.61.patch:
+  Version bump (bug #29515).
+
+  08 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> tinycobol-0.60.ebuild:
+  Removing manual setting of db3, no idea why it was in. This closes bug 23576.
+
+  27 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> tinycobol-0.60.ebuild:
+  Corrected dependencies according to bug 23576
+
+  12 Jun 2003; <msterret@gentoo.org> tinycobol-0.60.ebuild:
+  fix Header
 
 *tinycobol-0.60 (12 May 2003)
 
diff --git a/dev-lang/tinycobol/Manifest b/dev-lang/tinycobol/Manifest
index 3f562f4b398f..14e29d9b6d8e 100644
--- a/dev-lang/tinycobol/Manifest
+++ b/dev-lang/tinycobol/Manifest
@@ -1,2 +1,5 @@
-MD5 cfd10de89123c23a9ec15ad40e4ddf71 tinycobol-0.60.ebuild 734
-MD5 4ce63470b4ec63b73b6a964afe43077c files/digest-tinycobol-0.60 66
+MD5 af544a323a954ca51a7b2a1b4fbbd5ce tinycobol-0.61.ebuild 901
+MD5 7512583151d773bb5eb84d11ed736fd5 metadata.xml 306
+MD5 df65fb0ccf254cd30f7229b9fe8b3e63 ChangeLog 1382
+MD5 f36f8eba3cc014c181ff74e98b99ef41 files/tinycobol-0.61.patch 1441
+MD5 4e034fd5e6c7b76b5b70b7f1096e443e files/digest-tinycobol-0.61 66
diff --git a/dev-lang/tinycobol/tinycobol-0.61.ebuild b/dev-lang/tinycobol/tinycobol-0.61.ebuild
index 1c319e8a8cd8..f6f006bc67ba 100644
--- a/dev-lang/tinycobol/tinycobol-0.61.ebuild
+++ b/dev-lang/tinycobol/tinycobol-0.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.61.ebuild,v 1.1 2003/09/25 07:01:15 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tinycobol/tinycobol-0.61.ebuild,v 1.1.1.1 2005/11/30 09:58:06 chriswhite Exp $
 
 inherit eutils
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/tiny-cobol/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+IUSE=""
+KEYWORDS="x86 ppc"
 
-DEPEND="virtual/glibc
-	>=dev-libs/glib-2.0
+DEPEND=">=dev-libs/glib-2.0
 	sys-libs/db"
 
 src_unpack() {
@@ -32,6 +32,10 @@ src_install() {
 	dodir /usr/man/man1
 	dodir /usr/lib
 	dodir /usr/share/htcobol
-	einstall
+	make prefix="${D}/usr" install
 	dodoc AUTHORS ChangeLog README STATUS
+	cd ${D}/usr/lib
+	rm libhtcobol.so libhtcobol.so.0
+	ln -s libhtcobol.so.0.* libhtcobol.so.0
+	ln -s libhtcobol.so.0 libhtcobol.so
 }
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 1b6b25cde3c5..53de13a898a9 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,234 @@
 # ChangeLog for dev-lang/tk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> tk-8.4.9.ebuild:
+  Stable on alpha.
+
+*tk-8.4.11 (02 Jul 2005)
+
+  02 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tk-8.4.11-multilib.patch, +tk-8.4.11.ebuild:
+  Version bumped.
+  Added multilib patch.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> tk-8.4.9.ebuild:
+  Stable on ppc64
+
+  03 Jun 2005; Mike Frysinger <vapier@gentoo.org> tk-8.4.9.ebuild:
+  Touchup libdir usage to get rid of all the // gremlins.
+
+  27 May 2005; Joseph Jezak <josejx@gentoo.org> tk-8.4.9.ebuild:
+  Marked ppc stable.
+
+  09 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> tk-8.4.9.ebuild:
+  Stable on sparc
+
+  08 May 2005; Marcus D. Hanwell <cryos@gentoo.org> tk-8.4.9.ebuild:
+  Stable on amd64.
+
+  07 May 2005; Aron Griffis <agriffis@gentoo.org> tk-8.4.9.ebuild:
+  stable on ia64
+
+  07 May 2005; MATSUU Takuto <matsuu@gentoo.org> tk-8.4.9.ebuild:
+  Stable on x86.
+
+*tk-8.4.9 (19 Mar 2005)
+
+  19 Mar 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/remove-control-v-8.4.9.diff, +files/tk-8.4.9-man.patch,
+  +tk-8.4.9.ebuild:
+  Version bumped, #83816
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> tk-8.4.6-r1.ebuild:
+  Multilib fixes.
+
+  10 Nov 2004; Joseph Jezak <josejx@gentoo.org> tk-8.4.6-r1.ebuild:
+  Marked ppc stable.
+
+  06 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> tk-8.4.6-r1.ebuild:
+  Stable on alpha.
+
+  21 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> tk-8.4.6-r1.ebuild:
+  Marked stable on amd64.
+
+  14 Sep 2004; Guy Martin <gmsoft@gentoo.org> tk-8.4.6-r1.ebuild:
+  Stable on hppa.
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> tk-8.4.6-r1.ebuild:
+  Keyworded sparc
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> tk-8.3.4-r1.ebuild,
+  tk-8.4.6-r1.ebuild, tk-8.4.6.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  30 Aug 2004; Tom Gall <tgall@gentoo.org> tk-8.4.6-r1.ebuild:
+  stable on ppc64, bug #61745
+
+  25 Aug 2004; Doug Goldstein <cardoe@gentoo.org> tk-8.4.6-r1.ebuild:
+  Stable on x86
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> tk-8.4.6.ebuild:
+  stable on alpha and ia64
+
+*tk-8.4.6-r1 (07 Aug 2004)
+
+  07 Aug 2004; Doug Goldstein <cardoe@gentoo.org> tk-8.4.6-r1.ebuild
+  +files/tk-wm-maxsize.patch, +tk-8.4.6-r1.ebuild:
+  Fixed bug #56229. KDE 3.2 missing maximize button with tk apps.
+  http://bugs.kde.org/show_bug.cgi?id=67577
+  http://sourceforge.net/tracker/index.php?func=detail&aid=915350&group_id=12997
+  &atid=112997
+
+  15 Jun 2004; Ferris McCormick <fmccor@gentoo.org> tk-8.4.6.ebuild:
+  Marked stable for sparc.
+
+  04 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> tk-8.4.6.ebuild:
+  ppc64 needs a stable virtual/x11 first.  Removed keyword
+
+  31 May 2004; Tom Gall <tgall@gentoo.org> tk-8.4.6.ebuild:
+  stable on ppc64
+
+  02 May 2004; <tuxus@gentoo.org> tk-8.4.6.ebuild:
+  Stable on mips
+
+  25 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> tk-8.3.4-r1.ebuild,
+  tk-8.4.6.ebuild:
+  don't depend on use echo
+
+  24 Apr 2004; Ian Leitch <port001@gentoo.org> tk-8.3.4-r1.ebuild,
+  tk-8.4.6.ebuild:
+  Enable threads with local USE flag 'threads'. #2024
+
+  20 Apr 2004; Ian Leitch <port001@gentoo.org> tk-8.4.6.ebuild:
+  Marked stable on amd64
+
+  20 Apr 2004; Ian Leitch <port001@gentoo.org> -tk-8.3.3-r2.ebuild,
+  -tk-8.3.3-r3.ebuild, -tk-8.3.3.ebuild, -tk-8.3.4.ebuild, -tk-8.4.3.ebuild,
+  -tk-8.4.4.ebuild, -tk-8.4.5.ebuild:
+  Removed stale ebuilds
+
+  31 Mar 2004; Tom Gall <tgall@gentoo.org> tk-8.4.5.ebuild,  tk-8.4.6.ebuild:
+  remove ppc64 for now, we're not ready
+
+*tk-8.4.6 (04 Mar 2004)
+
+  04 Mar 2004; Martin Holzer <mholzer@gentoo.org> tk-8.4.6.ebuild:
+  Verison bumped.
+
+  04 Jan 2004; <tuxus@gentoo.org> tk-8.4.3.ebuild:
+  Added mips to KEYWORDS
+
+  03 Jan 2004; Aron Griffis <agriffis@gentoo.org> tk-8.4.5.ebuild:
+  Add ~alpha
+
+  03 Jan 2004; Brian Jackson <iggy@gentoo.org> tk-8.3.4-r1.ebuild:
+  repoman still complaining, 8.3.4 to ia64 to match tcl
+
+  03 Jan 2004; Brian Jackson <iggy@gentoo.org> tk-8.3.3-r2.ebuild,
+  tk-8.3.3-r3.ebuild, tk-8.3.3.ebuild, tk-8.3.4-r1.ebuild, tk-8.3.4.ebuild,
+  tk-8.4.3.ebuild, tk-8.4.4.ebuild, tk-8.4.5.ebuild:
+  adding ~ia64 keywords, it's installed on the releng ia64 box, so I assume it's
+  safe, needed for bitkeeper
+
+  19 Dec 2003; David Holm <dholm@gentoo.org> tk-8.4.5.ebuild:
+  Added to ~ppc.
+
+*tk-8.4.5 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> tk-8.4.5.ebuild:
+  Version bumped.
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> tk-8.4.3.ebuild,
+  tk-8.4.4.ebuild:
+  changing to sf
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> tk-8.4.4.ebuild:
+  mark stable on amd64
+
+*tk-8.4.4 (22 Oct 2003)
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> tk-8.4.4.ebuild:
+  Version bumped.
+
+*tk-8.4.3 (30 Jun 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> tk-8.4.3.ebuild:
+  Added ~sparc & ~mips to KEYWORDS
+
+  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> tk-8.4.3.ebuild :
+  Version bump.
+
+*tk-8.4.2-r1 (19 May 2003)
+
+  19 May 2003; Stanislav Brabec <utx@gentoo.org> tk-8.4.2-r1.ebuild:
+  Fixed man-pages installation (worked around bug in mkLinks script - unset
+  variable S for installation).
+
+*tk-8.4.2 (17 Apr 2003)
+
+  17 Apr 2003; Stanislav Brabec <utx@gentoo.org> tk-8.4.2.ebuild,
+  files/remove-control-v-8.4.diff:
+  Updated to version 8.4.2 (bug #18483) and updated Control-V remove patch.
+
+*tk-8.3.4-r1 (28 Mar 2003)
+
+  28 Mar 2003; Seemant Kulleen <seemant@gentoo.org> tk-8.3.4-r1.ebuild:
+  fixed sed expression, hopefully closes bug #18300 by Marc 'huz' REYNES
+  <marc.reynes@tuxfamily.org>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*tk-8.3.4 (18 Dec 2002)
+
+  20 Mar 2003; Zach Welch <zwelch@gentoo.org> tk-8.3.4.ebuild:
+  add arm keyword
+
+  08 Mar 2003; Guy Martin <gmsoft@gentoo.org> tk-8.3.4.ebuild :
+  Added hppa to keywords.
+
+  18 Dec 2002; Stefan Jones <cretin@gentoo.org>
+  New revision.
+
+*tk-8.3.3-r3 (11 Nov 2002)
+
+  20 Mar 2003; Zach Welch <zwelch@gentoo.org> tk-8.3.3-r3.ebuild:
+  add arm keyword
+
+  11 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org>
+  tk-8.3.3-r3.ebuild files/digest-tk-8.3.3-r3:
+  Some legacy code for default handling of the Control-V keypress is now
+  patched away. Fixes #10154.
+
+*tk-8.3.3-r2 (25 Sep 2002)
+
+  25 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org>
+  tk-8.3.3-r2.ebuild files/digest-tk-8.3.3-r2:
+  -r1 placed header files in the wrong place, applied patch from
+  Scott Lampert <scott@lampert.org> to fix it. Fixes #8054.
+
+  Removed tk-8.3.3-r1.ebuild files/digest-tk-8.3.3-r1
+
+*tk-8.3.3-r1 (13 Jul 2002)
+
+  02 Aug 2002; mark Guertin <gerk@gentoo.org> tk-8.3.3-r1.ebuild :
+  Added ppc to keywords
+
+  13 Jul 2002; Seemant Kulleen <seemant@gentoo.org> tk-8.3.3-r1.ebuild
+  files/digest-tk-8.3.3-r1 :
+
+  Symlink for the .so was not being created.  Thanks to
+  j_r_fonseca@yahoo.co.uk (Jose' Fonseca) in bug #4946 for the catch and
+  fix.
+
+
+  25 Apr 2002; Seemant Kulleen <seemant@gentoo.org> tk-8.3.3.ebuild :
+
+  Fixed bug #2112 from arndtc@theeggbeater.dyndns.org (Chris Arndt) to reflect
+  that the required tcl version may have a revision number on its ebuild
 
 *tk-8.3.3 (1 Feb 2002)
 
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index c925a1884da6..a7ab9a56bf05 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,17 +1,28 @@
-MD5 68f873eddbac11cc2944b389a1e56484 tk-8.3.4.ebuild 2182
-MD5 a30e2af10f9e38546f1bb0f134817084 tk-8.3.3-r2.ebuild 2081
-MD5 809325e2d5003b4960d4b83493673737 tk-8.3.4-r1.ebuild 1991
-MD5 dd76111b932c04955d0487c07b2f8220 tk-8.3.3.ebuild 2026
-MD5 411419fc4d00094f72d9eb8a08b31d6a tk-8.3.3-r3.ebuild 2180
-MD5 301d6518e19a7d6014412505edfb4889 ChangeLog 2626
-MD5 6bad624304d942ece054c88ad9ba5a62 tk-8.4.2.ebuild 1980
-MD5 2f04d70a41eae346aab53a3408c8f7b0 tk-8.4.2-r1.ebuild 1983
-MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3-r2 60
-MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3-r3 60
-MD5 0321d3bb5b70142a415de40ae2d5e3d4 files/digest-tk-8.3.4-r1 192
-MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3 60
-MD5 36c75264a0b45c6be330ddf87572bd14 files/digest-tk-8.3.4 189
-MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39767bde48bcec1ea389e07176f54e9e ChangeLog 7829
+MD5 670ac1b343b68583bd99f4adc39765eb tk-8.3.4-r1.ebuild 2413
+MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
+MD5 db71c8f05e16f05d110bca08388e542a tk-8.4.11.ebuild 2835
+MD5 88b3e75e61209e3c05cec16879d02f1a tk-8.4.9.ebuild 2848
+MD5 ecb6bd0ebe1e4441cccf70144b2e6104 tk-8.4.6-r1.ebuild 2762
+MD5 bccf47b736485ce7e8a457e6ce9a1a81 tk-8.4.6.ebuild 2385
+MD5 3003fb2cb4a185ec54b8c94ec0606313 files/remove-control-v-8.4.9.diff 522
+MD5 7442ab63dabe7e4d5bdde18a28c118e2 files/tk-8.4.11-multilib.patch 896
+MD5 76d0b4599f29136b31e902d15566e8c8 files/digest-tk-8.4.9 64
 MD5 e662e61449ea86b439ceb41463762cdc files/remove-control-v-8.4.diff 449
-MD5 a65c7aa6c260fbb5974e34fa22fb5f68 files/digest-tk-8.4.2 64
-MD5 a65c7aa6c260fbb5974e34fa22fb5f68 files/digest-tk-8.4.2-r1 64
+MD5 f340f38756a0efb0539b53d64511f6a9 files/digest-tk-8.4.11 65
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
+MD5 f4d1359d10fdb4a572e9da8f9896c603 files/tk-8.4.9-man.patch 800
+MD5 60b4e7758ce769df141b81b19c338f34 files/digest-tk-8.3.4-r1 60
+MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
+MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8UCWKf2g/qXtneoRAjUBAJ9Sne5DjZUAkldxARdo/DhedM1dRwCcD0l2
+cAEIqfCWPADocnD5XUHIIiw=
+=xLhY
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/files/digest-tk-8.3.4-r1 b/dev-lang/tk/files/digest-tk-8.3.4-r1
index 6167cc36f783..e1e0a072d7cb 100644
--- a/dev-lang/tk/files/digest-tk-8.3.4-r1
+++ b/dev-lang/tk/files/digest-tk-8.3.4-r1
@@ -1,3 +1 @@
-MD5 3e8db8239fe4e68f5107a7a1d4f2f85b /files/remove-control-v.diff 400
-MD5 59cc221c18b9a3de55f8aaa53a5f405b /tk-8.3.4-r1.ebuild 1986
 MD5 02311d8f90734c4f5eaa62e9b36fe535 tk8.3.4.tar.gz 2589635
diff --git a/dev-lang/tk/tk-8.3.4-r1.ebuild b/dev-lang/tk/tk-8.3.4-r1.ebuild
index 3790e0854bb2..b87cb1c7ee4c 100644
--- a/dev-lang/tk/tk-8.3.4-r1.ebuild
+++ b/dev-lang/tk/tk-8.3.4-r1.ebuild
@@ -1,21 +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/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.1 2003/03/28 23:48:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
+
+inherit eutils
+
+IUSE="threads"
 
-S=${WORKDIR}/${PN}${PV}
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/tcl8_3/${PN}${PV}.tar.gz"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
 DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
+SRC_URI="ftp://ftp.scriptics.com/pub/tcl/tcl8_3/${PN}${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha hppa"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-apps/portage-2.0.47-r10
 	virtual/x11
 	=dev-lang/tcl-${PV}*"
 
+S=${WORKDIR}/${PN}${PV}
+
+pkg_setup() {
+
+	if use threads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+		epause 5
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/library
@@ -26,10 +46,18 @@ src_unpack() {
 #
 src_compile() {
 	cd ${S}/unix
+
+	local local_config_use=""
+
+	if use threads
+	then
+		local_config_use="--enable-threads"
+	fi
+
 	econf \
 		--with-tcl=/usr/lib \
-		--enable-threads || die
-					
+		${local_config_use} || die
+
 	emake CFLAGS="${CFLAGS}" || die
 }
 
@@ -37,10 +65,10 @@ src_install() {
 	#short version number
 	local v1
 	v1=${PV%.*}
-	
+
 	cd ${S}/unix
 	make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
-	
+
 	# fix the tkConfig.sh to eliminate refs to the build directory
 	sed -i \
 		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
@@ -48,7 +76,7 @@ src_install() {
 		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
 		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \
 		${D}/usr/lib/tkConfig.sh
-	
+
 	# install private headers
 	dodir /usr/lib/tk${v1}/include/unix
 	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix
@@ -56,15 +84,15 @@ src_install() {
 	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic
 	rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h
 	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h	
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h
 
 	# install symlink for libraries
 	#dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a
 	dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so
 	dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a
-	
+
 	ln -sf wish${v1} ${D}/usr/bin/wish
-	
+
 	cd ${S}
 	dodoc README changes license.terms
 }
diff --git a/dev-lang/tk/tk-8.4.11.ebuild b/dev-lang/tk/tk-8.4.11.ebuild
index ee021ee9dd78..154174332399 100644
--- a/dev-lang/tk/tk-8.4.11.ebuild
+++ b/dev-lang/tk/tk-8.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/dev-lang/tk/tk-8.4.11.ebuild,v 1.1 2005/07/02 14:41:39 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.11.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild
index addec4842518..bcfb0cb67327 100644
--- a/dev-lang/tk/tk-8.4.6-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.1 2004/08/07 06:59:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="threads"
 
 DEPEND=">=sys-apps/sed-4.0.5
@@ -30,7 +30,7 @@ pkg_setup() {
 		ewarn "that compile against tcl. You use threading at"
 		ewarn "your own discretion."
 		ewarn ""
-		sleep 5
+		epause 5
 	fi
 }
 
@@ -54,7 +54,7 @@ src_compile() {
 	fi
 
 	econf \
-		--with-tcl=/usr/lib \
+		--with-tcl=/usr/$(get_libdir) \
 		${local_config_use} || die
 
 	emake CFLAGS="${CFLAGS}" || die
@@ -70,25 +70,27 @@ src_install() {
 
 	# fix the tkConfig.sh to eliminate refs to the build directory
 	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/lib/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
+		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \
+		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
+		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
 		${D}/usr/lib/tkConfig.sh
 
 	# install private headers
-	dodir /usr/lib/tk${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix
-	dodir /usr/lib/tk${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h
-	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h
+	dodir /usr/$(get_libdir)/tk${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix
+	dodir /usr/$(get_libdir)/tk${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic
+	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h
+	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h
+	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h
 
 	# install symlink for libraries
-	#dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a
-	dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so
-	dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a
+	#dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a
+	dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so
+	dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a
 
 	ln -sf wish${v1} ${D}/usr/bin/wish
 
diff --git a/dev-lang/tk/tk-8.4.6.ebuild b/dev-lang/tk/tk-8.4.6.ebuild
index ea644cd80038..a2794445edf4 100644
--- a/dev-lang/tk/tk-8.4.6.ebuild
+++ b/dev-lang/tk/tk-8.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6.ebuild,v 1.1 2004/03/04 19:21:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ppc64 ~ia64"
-RESTRICT="nomirror"
+KEYWORDS="~x86 ~ppc sparc mips alpha arm ~hppa amd64 ia64"
+IUSE="threads"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-apps/portage-2.0.47-r10
@@ -20,6 +20,20 @@ DEPEND=">=sys-apps/sed-4.0.5
 
 S=${WORKDIR}/${PN}${PV}
 
+pkg_setup() {
+	if use threads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		ewarn ""
+		epause 5
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/library
@@ -28,9 +42,18 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}/unix
+
+	local local_config_use=""
+
+	if use threads
+	then
+		local_config_use="--enable-threads"
+	fi
+
 	econf \
 		--with-tcl=/usr/lib \
-		--enable-threads || die
+		${local_config_use} || die
+
 	emake CFLAGS="${CFLAGS}" || die
 }
 
diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild
index 9d2357dbb1c6..2cf243e7785e 100644
--- a/dev-lang/tk/tk-8.4.9.ebuild
+++ b/dev-lang/tk/tk-8.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.1 2005/03/19 05:53:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit eutils
 
@@ -10,19 +10,18 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc64 ~sparc ~hppa ~amd64 ~ppc ~mips ~alpha ~arm ~ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="threads"
 
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-apps/portage-2.0.47-r10
-	virtual/x11
+RDEPEND="virtual/x11
 	=dev-lang/tcl-${PV}*"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.47-r10"
 
 S=${WORKDIR}/${PN}${PV}
 
 pkg_setup() {
-	if use threads
-	then
+	if use threads ; then
 		ewarn ""
 		ewarn "PLEASE NOTE: You are compiling ${P} with"
 		ewarn "threading enabled."
@@ -44,15 +43,15 @@ src_unpack() {
 src_compile() {
 	cd ${S}/unix
 
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	local local_config_use=""
 
-	if use threads
-	then
+	if use threads ; then
 		local_config_use="--enable-threads"
 	fi
 
 	econf \
-		--with-tcl=/usr/$(get_libdir) \
+		--with-tcl=/usr/${mylibdir} \
 		${local_config_use} || die
 
 	emake CFLAGS="${CFLAGS}" || die
@@ -68,28 +67,29 @@ src_install() {
 	make INSTALL_ROOT=${D} install || die
 
 	# fix the tkConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
 	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
+		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
+		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
 		${D}/usr/lib/tkConfig.sh
 
 	# install private headers
-	dodir /usr/$(get_libdir)/tk${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix
-	dodir /usr/$(get_libdir)/tk${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic
-	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h
-	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h
-	rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h
+	dodir /usr/${mylibdir}/tk${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tk${v1}/include/unix
+	dodir /usr/${mylibdir}/tk${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tk${v1}/include/generic
+	rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tk.h
+	rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
+	rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
 
 	# install symlink for libraries
-	#dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a
-	dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so
-	dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a
+	#dosym /usr/${mylibdir}/libtk${v1}.a /usr/${mylibdir}/libtk.a
+	dosym /usr/${mylibdir}/libtk${v1}.so /usr/${mylibdir}/libtk.so
+	dosym /usr/${mylibdir}/libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
 	ln -sf wish${v1} ${D}/usr/bin/wish
 
diff --git a/dev-lang/tolua/ChangeLog b/dev-lang/tolua/ChangeLog
index c00ed752c521..0c386f3f6620 100644
--- a/dev-lang/tolua/ChangeLog
+++ b/dev-lang/tolua/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/tolua
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tolua/ChangeLog,v 1.1 2003/08/28 12:48:44 msterret Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tolua/ChangeLog,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
+
+*tolua-5.0-r1 (31 Oct 2005)
+
+  31 Oct 2005; Tom Payne <twp@gentoo.org> +tolua-5.0-r1.ebuild:
+  Use portability eclass to conditionally link to dl. Bug # 106446.
+
+  18 May 2005; Tom Payne <twp@gentoo.org> tolua-5.0.ebuild:
+  Use toolchain-funcs eclass. Bug # 92745.
+
+  18 Apr 2004; Jason Wever <weeve@gentoo.org> tolua-5.0.ebuild:
+  Added ~sparc keyword.
+
+  12 Apr 2004; <twp@gentoo.org> tolua-5.0.ebuild:
+  Bug # 39205. Added IUSE.
 
 *tolua-5.0 (28 Aug 2003)
 
diff --git a/dev-lang/tolua/Manifest b/dev-lang/tolua/Manifest
index cd1bf794b659..01b9845a2c68 100644
--- a/dev-lang/tolua/Manifest
+++ b/dev-lang/tolua/Manifest
@@ -1,2 +1,6 @@
-MD5 a3aee130692d08727ab4760a620c5b4f tolua-5.0.ebuild 887
+MD5 6d342f7efe3fe705cf5ee00a3fc7c6ca ChangeLog 748
 MD5 8e839d58ded054bfa49ba75a9e769951 files/digest-tolua-5.0 60
+MD5 8e839d58ded054bfa49ba75a9e769951 files/digest-tolua-5.0-r1 60
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 bb4e0d3830e5426762496f20c39cebfe tolua-5.0-r1.ebuild 1032
+MD5 9ab5079ce4a53d7a16104c257b36ec38 tolua-5.0.ebuild 1007
diff --git a/dev-lang/tolua/tolua-5.0-r1.ebuild b/dev-lang/tolua/tolua-5.0-r1.ebuild
index ea397f3b596d..98f739f28bb4 100644
--- a/dev-lang/tolua/tolua-5.0-r1.ebuild
+++ b/dev-lang/tolua/tolua-5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tolua/tolua-5.0-r1.ebuild,v 1.1 2005/10/31 18:13:08 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tolua/tolua-5.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
 
 inherit toolchain-funcs portability
 
diff --git a/dev-lang/tolua/tolua-5.0.ebuild b/dev-lang/tolua/tolua-5.0.ebuild
index 5ec8a3624ae9..c1ff45f93fe3 100644
--- a/dev-lang/tolua/tolua-5.0.ebuild
+++ b/dev-lang/tolua/tolua-5.0.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tolua/tolua-5.0.ebuild,v 1.1 2003/08/28 12:48:44 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tolua/tolua-5.0.ebuild,v 1.1.1.1 2005/11/30 09:58:47 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="a tool that simplifies the integration of C/C++ code with Lua"
 HOMEPAGE="http://www.tecgraf.puc-rio.br/~celes/tolua/"
 SRC_URI="ftp://ftp.tecgraf.puc-rio.br/pub/users/celes/tolua/${P}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="x86 ~sparc"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
 
@@ -17,8 +20,9 @@ src_unpack() {
 	cd ${S}
 
 	sed -i \
-		-e "/^CC=/ s/=.*/=${CC}/" \
+		-e "/^CC=/ s/=.*/=$(tc-getCC)/" \
 		-e "/^LUA=/ s:=.*:=/usr:" \
+		-e 's/^\(LIB=.*\)/\1 -ldl/' \
 		-e "s:-O2:${CFLAGS}:" config || \
 			die "sed config failed"
 	sed -i \
@@ -31,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin bin/tolua
+	dobin bin/tolua || die
 	dolib.a lib/libtolua.a
 	insinto /usr/include
 	doins include/tolua.h
diff --git a/dev-lang/toluapp/ChangeLog b/dev-lang/toluapp/ChangeLog
index 4b36be7ae172..c51cafb03dca 100644
--- a/dev-lang/toluapp/ChangeLog
+++ b/dev-lang/toluapp/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for dev-lang/toluapp
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/ChangeLog,v 1.1 2004/05/09 14:11:07 twp Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/ChangeLog,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
+
+*toluapp-1.0.5_p1 (13 May 2005)
+
+  13 May 2005; Tom Payne <twp@gentoo.org> +toluapp-1.0.5_p1.ebuild:
+  Version bump. Bug # 91573.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> toluapp-1.0.2.ebuild:
+  Stable on ppc.
+
+  26 Oct 2004; Tom Payne <twp@gentoo.org> toluapp-1.0.2.ebuild:
+  Use $\(tc-getCC\) from toolchain-funcs.eclass. Bug #68998.
+
+  29 Aug 2004; <twp@gentoo.org> toluapp-1.0.2.ebuild:
+  Stable on x86.
+
+  10 May 2004; David Holm <dholm@gentoo.org> toluapp-1.0.2.ebuild:
+  Added to ~ppc.
 
 *toluapp-1.0.2 (09 May 2004)
 
diff --git a/dev-lang/toluapp/Manifest b/dev-lang/toluapp/Manifest
index f91a4149a05d..a385c9142630 100644
--- a/dev-lang/toluapp/Manifest
+++ b/dev-lang/toluapp/Manifest
@@ -1,4 +1,7 @@
-MD5 26197dc243176cd4d71f009a8ca399a2 toluapp-1.0.2.ebuild 736
+MD5 65799ff3651495efade8e09a6b87124d toluapp-1.0.2.ebuild 907
+MD5 721bc05b7eedda2073a6135f77c86992 toluapp-1.0.5_p1.ebuild 967
+MD5 8a43ee7592b09b0c8c276e69f5ad620a ChangeLog 915
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 d4325b8449d8f996c02c2d81fcb432b4 files/toluapp-1.0.2-gentoo.patch 829
+MD5 4cb3f65cc3c1f8a093d8eee63fb79475 files/digest-toluapp-1.0.5_p1 67
 MD5 0b99ea2ba429f9efe5ba48e52899a77a files/digest-toluapp-1.0.2 66
diff --git a/dev-lang/toluapp/toluapp-1.0.2.ebuild b/dev-lang/toluapp/toluapp-1.0.2.ebuild
index 96274699c799..02df8ebda457 100644
--- a/dev-lang/toluapp/toluapp-1.0.2.ebuild
+++ b/dev-lang/toluapp/toluapp-1.0.2.ebuild
@@ -1,15 +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/dev-lang/toluapp/toluapp-1.0.2.ebuild,v 1.1 2004/05/09 14:11:07 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/toluapp-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_PN=${PN/toluapp/tolua++}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="A tool to integrate C/C++ code with Lua."
 HOMEPAGE="http://www.codenix.com/~tolua/"
 SRC_URI="http://www.codenix.com/~tolua/${MY_P}.tar.bz2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
@@ -26,7 +26,7 @@ src_unpack() {
 }
 
 src_compile() {
-	scons CC="${CC}" CCFLAGS="${CFLAGS}" LINK="${CC}" all
+	scons CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LINK="$(tc-getCC)" all
 }
 
 src_install() {
diff --git a/dev-lang/toluapp/toluapp-1.0.5_p1.ebuild b/dev-lang/toluapp/toluapp-1.0.5_p1.ebuild
index d59b7dd2dfcc..1124f56808e6 100644
--- a/dev-lang/toluapp/toluapp-1.0.5_p1.ebuild
+++ b/dev-lang/toluapp/toluapp-1.0.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/dev-lang/toluapp/toluapp-1.0.5_p1.ebuild,v 1.1 2005/05/13 18:31:53 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/toluapp-1.0.5_p1.ebuild,v 1.1.1.1 2005/11/30 09:58:35 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/dev-lang/ucblogo/ChangeLog b/dev-lang/ucblogo/ChangeLog
index 00edf10f1deb..e4f8305f2d76 100644
--- a/dev-lang/ucblogo/ChangeLog
+++ b/dev-lang/ucblogo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ucblogo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.1 2005/09/22 03:02:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
+
+  20 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ucblogo-5.5-dont-require-tetex.patch, ucblogo-5.5.ebuild:
+  Dont abort if tetex isnt installed #113023 by James Cave.
 
 *ucblogo-5.5 (21 Sep 2005)
 
diff --git a/dev-lang/ucblogo/Manifest b/dev-lang/ucblogo/Manifest
index ef867d6263b1..1d40d278705c 100644
--- a/dev-lang/ucblogo/Manifest
+++ b/dev-lang/ucblogo/Manifest
@@ -1,2 +1,16 @@
-MD5 208d5d07341ee2f60b96b2b4ef686a6a ucblogo-5.5.ebuild 427
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c166d2cc6eb2a46459f069af2ccb7a6 ChangeLog 506
 MD5 bf4574962bbaffaa1d55eeab946e5fce files/digest-ucblogo-5.5 64
+MD5 4206f64a6e59008d3d15352039ef05db files/ucblogo-5.5-destdir.patch 1976
+MD5 f0a697d2a89114bf5fe60ce1cec7ac39 files/ucblogo-5.5-dont-require-tetex.patch 1228
+MD5 3da75893534e1513564394c430d3773e files/ucblogo-5.5-fhs.patch 661
+MD5 a9468383c7b6ac280a8862888e290553 ucblogo-5.5.ebuild 858
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgBtHgIKl8Uu19MoRAtj2AJ9/weyLkU1T1mMHK/jj3w8hpVACfwCdEAcZ
+SMoOehPeONtfhF5cuj22Bxs=
+=/iAb
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ucblogo/files/ucblogo-5.5-destdir.patch b/dev-lang/ucblogo/files/ucblogo-5.5-destdir.patch
index 8f0f25efd217..36c4c63d7d04 100644
--- a/dev-lang/ucblogo/files/ucblogo-5.5-destdir.patch
+++ b/dev-lang/ucblogo/files/ucblogo-5.5-destdir.patch
@@ -21,8 +21,8 @@
  #	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
  
  logo-mode: 
---- docs/makefile.orig	2005-09-21 22:18:56.000000000 -0400
-+++ docs/makefile	2005-09-21 22:19:20.000000000 -0400
+--- docs/makefile
++++ docs/makefile
 @@ -30,10 +30,10 @@
  	-rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
  
diff --git a/dev-lang/ucblogo/files/ucblogo-5.5-fhs.patch b/dev-lang/ucblogo/files/ucblogo-5.5-fhs.patch
index 6cf6c32e0420..86485550b9f0 100644
--- a/dev-lang/ucblogo/files/ucblogo-5.5-fhs.patch
+++ b/dev-lang/ucblogo/files/ucblogo-5.5-fhs.patch
@@ -1,5 +1,5 @@
---- makefile.in.orig	2005-09-21 22:20:28.000000000 -0400
-+++ makefile.in	2005-09-21 22:20:39.000000000 -0400
+--- makefile.in
++++ makefile.in
 @@ -3,6 +3,7 @@
  LDFLAGS	= @LDFLAGS@
  LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
@@ -8,8 +8,8 @@
  BINDIR        = $(prefix)/bin
  LIBLOC        = $(prefix)/lib/logo
  MAKE = @MAKE@
---- docs/makefile.orig	2005-09-21 22:40:04.000000000 -0400
-+++ docs/makefile	2005-09-21 22:41:55.000000000 -0400
+--- docs/makefile
++++ docs/makefile
 @@ -1,6 +1,14 @@
  BUILDIR	      = `pwd`
 +ifdef infodir
diff --git a/dev-lang/ucblogo/ucblogo-5.5.ebuild b/dev-lang/ucblogo/ucblogo-5.5.ebuild
index 9088d73e1cd1..b3950da32d14 100644
--- a/dev-lang/ucblogo/ucblogo-5.5.ebuild
+++ b/dev-lang/ucblogo/ucblogo-5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5.ebuild,v 1.1 2005/09/22 03:02:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5.ebuild,v 1.1.1.1 2005/11/30 09:58:33 chriswhite Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-destdir.patch
 	epatch "${FILESDIR}"/${P}-fhs.patch
+	epatch "${FILESDIR}"/${P}-dont-require-tetex.patch
 	use emacs || echo 'all install:' > emacs/makefile
 }
 
diff --git a/dev-lang/wml/ChangeLog b/dev-lang/wml/ChangeLog
index 5d9adb225c8a..a6e16d23abfa 100644
--- a/dev-lang/wml/ChangeLog
+++ b/dev-lang/wml/ChangeLog
@@ -1,11 +1,62 @@
 # ChangeLog for dev-lang/wml
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.1 2002/07/18 01:29:57 george Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/ChangeLog,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
-*wml-2.0.8.ebuild  (17 July 2002)
+  12 Sep 2005; Jason Wever <weeve@gentoo.org> wml-2.0.9-r1.ebuild:
+  Stable on SPARC wrt security bug #105138.
 
-  17 July 2002; George Shapovalov <george@gentoo.org> wml-2.0.8.ebuild, digest-wml-2.0.8 :
+  11 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> wml-2.0.9-r1.ebuild:
+  Stable on ppc.
 
-  initial release
-  ebuild submitted by Bardur Arantsson <bardur@imada.sdu.dk>
+*wml-2.0.9-r1 (10 Sep 2005)
+
+  10 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/wml-2.0.9-autotools-update.patch, +wml-2.0.9-r1.ebuild:
+  Use system libpcre instead of bundled one #105138.
+
+  04 May 2005; Herbie Hopkins <herbs@gentoo.org> wml-2.0.9.ebuild:
+  Fixed bug #90401
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> wml-2.0.9.ebuild:
+  Stable on ppc.
+
+  07 Feb 2005; Simon Stelling <blubb@gentoo.org> wml-2.0.9.ebuild:
+  added ~amd64
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> wml-2.0.9.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> wml-2.0.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Jun 2004; Daniel Black <dragonheart@gentoo.org> wml-2.0.9.ebuild:
+  QA fix - IUSE
+
+  20 Apr 2004; Daniel Black <dragonheart@gentoo.org> wml-2.0.9.ebuild:
+  QA - removed runtime dependance on autoconf and added number other dependancies
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> wml-2.0.9.ebuild:
+  adding s390 keywords
+
+*wml-2.0.9 (11 Nov 2002)
+
+  13 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix the subscripts properly (patch and run autotools).
+
+  12 Dec 2002; George Shapovalov <george@gentoo.org> wml-2.0.9.ebuild :
+  fixed misconfiguration
+  one of the subidr' configure scripts did not like --host option supplied by econf,
+  See #12028, thanks to Bardur Arantsson <bardur-gta@odense.kollegienet.dk> for report and suggestion
+
+  11 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org> wml-2.0.9.ebuild files/digest-wml-2.0.9 : 
+  New upstream version.
+
+*wml-2.0.8.ebuild  (17 Jul 2002)
+
+  07 Sep 2002; Seemant Kulleen <seemant@gentoo.org> wml-2.0.8.ebuild :
+  Changed dependency to add sys-devel/ in front of it.  Closes bug #7608 by
+  joakim.elofsson@home.se (Joakim Elofsson)
+
+  17 Jul 2002; George Shapovalov <george@gentoo.org> wml-2.0.8.ebuild, digest-wml-2.0.8 :
+  Initial release. Ebuild submitted by Bardur Arantsson <bardur@imada.sdu.dk>
 
diff --git a/dev-lang/wml/Manifest b/dev-lang/wml/Manifest
index e69de29bb2d1..52608f7d2e3a 100644
--- a/dev-lang/wml/Manifest
+++ b/dev-lang/wml/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 f1c20eb9484d1d245122691d9d790ad7 wml-2.0.9-r1.ebuild 1115
+MD5 68d3173aab21e04ddc33145dbf24de70 wml-2.0.9.ebuild 1189
+MD5 d8ecef5564126370235f0a109c012881 ChangeLog 2323
+MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9 62
+MD5 ea584f051a470445242165526961b55d files/digest-wml-2.0.9-r1 62
+MD5 63a4be7e9b23a8dad09660e70f9e11ac files/wml-2.0.9-autotools-update.patch 2720
+MD5 aefa456b69c01c50eca3fe8b497c1f59 files/2.0.9-fix-configure.in.patch 1411
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK9MXgIKl8Uu19MoRAkydAJ9sOpyF2TcuISu4hJJYMYZ9ZaNkiwCdHqqI
+5Mu7FMP3VwZ88rGbLIY9DUg=
+=cpQK
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/wml/files/2.0.9-fix-configure.in.patch b/dev-lang/wml/files/2.0.9-fix-configure.in.patch
index 924edaee9dfa..c861446a402e 100644
--- a/dev-lang/wml/files/2.0.9-fix-configure.in.patch
+++ b/dev-lang/wml/files/2.0.9-fix-configure.in.patch
@@ -6,7 +6,7 @@
  
 +AC_INIT(README)
  AC_PREREQ(2.10)dnl
- AC_REVISION($Revision: 1.1 $)
+ AC_REVISION($Revision: 1.1.1.1 $)
  SHTOOL="./etc/shtool"
 @@ -11,7 +12,6 @@
  echo "${T_MD}Configuring for iSelect `./etc/shtool version -l c -d long iselect_version.c`${T_ME}"
diff --git a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
index bbb0956dfbef..3ae58ddf1442 100644
--- a/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
+++ b/dev-lang/wml/files/wml-2.0.9-autotools-update.patch
@@ -58,7 +58,7 @@ Use system libpcre and make iselect not blow up
  
 +AC_INIT(README)
  AC_PREREQ(2.10)dnl
- AC_REVISION($Revision: 1.1 $)
+ AC_REVISION($Revision: 1.1.1.1 $)
  SHTOOL="./etc/shtool"
 @@ -11,7 +12,6 @@
  echo "${T_MD}Configuring for iSelect `./etc/shtool version -l c -d long iselect_version.c`${T_ME}"
diff --git a/dev-lang/wml/wml-2.0.9-r1.ebuild b/dev-lang/wml/wml-2.0.9-r1.ebuild
index 939b9ff9ee68..7d93422c1a3e 100644
--- a/dev-lang/wml/wml-2.0.9-r1.ebuild
+++ b/dev-lang/wml/wml-2.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/dev-lang/wml/wml-2.0.9-r1.ebuild,v 1.1 2005/09/10 06:51:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
 
 inherit fixheadtails eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ppc s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/libpcre
diff --git a/dev-lang/wml/wml-2.0.9.ebuild b/dev-lang/wml/wml-2.0.9.ebuild
index d2b238c0d943..1f504daf4079 100644
--- a/dev-lang/wml/wml-2.0.9.ebuild
+++ b/dev-lang/wml/wml-2.0.9.ebuild
@@ -1,26 +1,51 @@
-# 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/dev-lang/wml/wml-2.0.9.ebuild,v 1.1 2002/11/11 16:21:08 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9.ebuild,v 1.1.1.1 2005/11/30 09:58:15 chriswhite Exp $
+
+inherit fixheadtails eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Website META Language"
-SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
 HOMEPAGE="http://www.engelschall.com/sw/wml/"
-DEPEND=">=sys-devel/perl-5.6.1-r3"
+SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~sparc64"
 SLOT="0"
+KEYWORDS="x86 sparc s390 ppc ~amd64"
+IUSE=""
+DEPEND="dev-lang/perl
+	>=sys-devel/autoconf-2.58
+	sys-apps/gawk
+	sys-apps/grep
+	sys-devel/bison
+	sys-devel/gcc
+	virtual/libc
+	sys-devel/gettext"
+
+RDEPEND="virtual/libc
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	ht_fix_all
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-fix-configure.in.patch
+	export WANT_AUTOCONF='2.5'
+	for d in `find ${S} -name configure -mindepth 2 -printf '%h '` ; do
+		cd ${d}
+		autoconf || die "autoconf in ${d}"
+	done
+}
 
 src_compile() {
-	# 2002-11-11: karltk@gentoo.org
-	# It barfs if CFLAGS is set. Dunno why.
-	# It'll default to -O2, which is probably safest.
-	unset CFLAGS
-	econf || die "./configure failed"
-	emake || die
+	if has_version '<sys-devel/autoconf-2.58' ; then
+		unset CC
+		unset CFLAGS
+	fi
+	econf --libdir=/usr/lib/wml || die "./configure failed"
+	emake || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	einstall || die
 	dodoc ANNOUNCE BUGREPORT C* INSTALL MANIFEST README* SUPPORT VERSION*
 }
diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index 127ce34ee8a3..95a214c94664 100644
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/yasm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.1 2004/02/09 08:02:58 augustus Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
+
+  26 May 2005; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Herd name is 'amd64' not 'amd64@gentoo.org'
+
+*yasm-0.4.0 (27 Mar 2005)
+
+  27 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> +metadata.xml,
+  +yasm-0.4.0.ebuild:
+  Taking over maintainership. Added metadata.xml. Version bump to yasm-0.4.0.
+
+  01 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> yasm-0.3.0.ebuild:
+  fix depend; tidy
 
 *yasm-0.3.0 (09 Feb 2004)
 
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index eb180baabd9d..632049e44621 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -1,2 +1,16 @@
-MD5 99fe8062319542f42508d90859e84a1d yasm-0.3.0.ebuild 523
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3716bab7055e285687b5998ff73129d8 yasm-0.3.0.ebuild 589
+MD5 2eb11df7eceae2e8667d032c7eb1f6f4 ChangeLog 822
+MD5 0075a0521cc6d639918c3ae2c4e2124e metadata.xml 223
+MD5 1553fa58d39fa6be96c856ec95287c5b yasm-0.4.0.ebuild 589
 MD5 46e99d02032cfc2cc7e1b8b19ff82baa files/digest-yasm-0.3.0 63
+MD5 8398914ad2f594691d2386a599637eea files/digest-yasm-0.4.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFClit7I1lqEGTUzyQRAp5xAKCWA9RMb/X079HbzZDL6b03hwFy1QCgwVCx
+LPS10t7wmw07ol4xhGCpc7o=
+=1LH3
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/yasm/metadata.xml b/dev-lang/yasm/metadata.xml
index 71b8a2583cb1..303b0c0a6a48 100644
--- a/dev-lang/yasm/metadata.xml
+++ b/dev-lang/yasm/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>amd64@gentoo.org</herd>
+<herd>amd64</herd>
 <maintainer>
   <email>kugelfang@gentoo.org</email>
 </maintainer>
diff --git a/dev-lang/yasm/yasm-0.3.0.ebuild b/dev-lang/yasm/yasm-0.3.0.ebuild
index 2d0daa87de7a..f8c48e1a1074 100644
--- a/dev-lang/yasm/yasm-0.3.0.ebuild
+++ b/dev-lang/yasm/yasm-0.3.0.ebuild
@@ -1,20 +1,19 @@
-# Copyright 2003-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-0.3.0.ebuild,v 1.1 2004/02/09 08:02:58 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
 DESCRIPTION="assembler that supports amd64"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="-* ~x86 ~amd64"
 IUSE=""
 
 DEPEND="sys-devel/gcc"
-RDEPEND="${DEPEND}"
 
 src_install() {
-    make DESTDIR=${D} install || die
-
-    dodoc AUTHORS COPYING INSTALL Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS COPYING INSTALL Artistic.txt BSD.txt
 }
diff --git a/dev-lang/yasm/yasm-0.4.0.ebuild b/dev-lang/yasm/yasm-0.4.0.ebuild
index c7fffcd0791b..b9991fe38a70 100644
--- a/dev-lang/yasm/yasm-0.4.0.ebuild
+++ b/dev-lang/yasm/yasm-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/dev-lang/yasm/yasm-0.4.0.ebuild,v 1.1 2005/03/27 15:34:30 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:58:09 chriswhite Exp $
 
 DESCRIPTION="assembler that supports amd64"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
diff --git a/dev-ml/camlidl/ChangeLog b/dev-ml/camlidl/ChangeLog
index 3414077932ed..06c7e97b2d13 100644
--- a/dev-ml/camlidl/ChangeLog
+++ b/dev-ml/camlidl/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/camlidl
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlidl/ChangeLog,v 1.1 2004/09/25 20:15:43 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlidl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 *camlidl-1.05 (25 Sep 2004)
 
diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index 9910ef9e86cd..6fd1ff1241c8 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -1,2 +1,4 @@
-MD5 afa037151596cd4d059cde5b9a374cda camlidl-1.05.ebuild 710
+MD5 597e2ff49de6d794fec89d4c06c4813f camlidl-1.05.ebuild 1099
+MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
+MD5 0479f1539ac6f16facd8d1a9bae695d0 ChangeLog 456
 MD5 67257771cc4ea539389ae0252ddc1b30 files/digest-camlidl-1.05 64
diff --git a/dev-ml/camlidl/camlidl-1.05.ebuild b/dev-ml/camlidl/camlidl-1.05.ebuild
index e51f30a73c2c..43e9a11e7ecf 100644
--- a/dev-ml/camlidl/camlidl-1.05.ebuild
+++ b/dev-ml/camlidl/camlidl-1.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/dev-ml/camlidl/camlidl-1.05.ebuild,v 1.1 2004/09/25 20:15:43 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlidl/camlidl-1.05.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'Caml"
 HOMEPAGE="http://caml.inria.fr/camlidl/"
diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 7b820cb0e2b4..bdbcc3034ea3 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-ml/camlimages
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.1 2003/06/20 06:33:44 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
+
+  17 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> camlimages-2.20.ebuild:
+  Fix parallel builds bug
+
+*camlimages-2.20 (06 Feb 2005)
+
+  06 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> +files/META,
+  camlimages-2.11-r1.ebuild, -camlimages-2.11.ebuild, +camlimages-2.20.ebuild:
+  Removed old version, make 2.11 stable on ppc and add latest version 2.20 with
+  new install scheme.
+
+  12 May 2004; David Holm <dholm@gentoo.org> camlimages-2.11-r1.ebuild:
+  Added to ~ppc.
+
+*camlimages-2.11-r1 (10 May 2004)
+
+  10 May 2004; Matthieu Sozeau <mattam@gentoo.org> camlimages-2.11-r1.ebuild,
+  metadata.xml:
+  Fix bug #50625, add metadata.xml.
 
 *camlimages-2.11 (10 Jun 2003)
 
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index cc83e5649d0f..105e863c30a3 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,3 +1,7 @@
-MD5 b88c60a12802b17d1a5ed5d74760d58a camlimages-2.11.ebuild 722
-MD5 20bec2c87c63a4197ebbbfb071ce45a0 ChangeLog 248
-MD5 ad8d61cb88da56d93a4b998c5138cc85 files/digest-camlimages-2.11 65
+MD5 24b7ab6f068e75831d76cd65728decce camlimages-2.11-r1.ebuild 699
+MD5 8fe9ba93067e74a5da7e4a24d39ac7ec camlimages-2.20.ebuild 1019
+MD5 62a41274dce8266e4e06ffe9369b9d13 ChangeLog 1199
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 3b291b0ee677d79a08ea9d119ddd6413 files/META 143
+MD5 ad8d61cb88da56d93a4b998c5138cc85 files/digest-camlimages-2.11-r1 65
+MD5 02832829aecdd1efd15157c0916e778a files/digest-camlimages-2.20 64
diff --git a/dev-ml/camlimages/camlimages-2.11-r1.ebuild b/dev-ml/camlimages/camlimages-2.11-r1.ebuild
index b3e5abf61900..e30cc7057554 100644
--- a/dev-ml/camlimages/camlimages-2.11-r1.ebuild
+++ b/dev-ml/camlimages/camlimages-2.11-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/dev-ml/camlimages/camlimages-2.11-r1.ebuild,v 1.1 2004/05/10 21:18:35 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
+
+inherit findlib
 
 IUSE=""
 
@@ -10,11 +12,10 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=dev-lang/ocaml-3.06"
 
-
 src_compile() {
 	econf || die
 	emake || die
@@ -22,14 +23,10 @@ src_compile() {
 }
 
 src_install() {
+	findlib_src_preinst
+
 	make CAMLDIR=${D}/usr/lib/ocaml/ \
 		LIBDIR=${D}/usr/lib/ocaml/camlimages \
 		DESTDIR=${D} \
-		OCAML_LDCONF=dummy \
 		install || die
 }
-
-pkg_postinst() {
-	ldconf="/usr/lib/ocaml/ld.conf"
-	echo /usr/lib/ocaml/camlimages >> $ldconf
-}
diff --git a/dev-ml/camlimages/camlimages-2.20.ebuild b/dev-ml/camlimages/camlimages-2.20.ebuild
index 2fdd9b6099a3..6a4767a4051a 100644
--- a/dev-ml/camlimages/camlimages-2.20.ebuild
+++ b/dev-ml/camlimages/camlimages-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/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.1 2005/02/06 15:28:50 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 inherit findlib
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P/20/2}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~x86 ~ppc"
 
 DEPEND=">=dev-lang/ocaml-3.06"
 
@@ -21,8 +21,8 @@ MY_S="${WORKDIR}/${P/20/2}"
 src_compile() {
 	cd ${MY_S}
 	econf || die
-	emake || die
-	emake opt || die
+	emake -j1 || die
+	emake -j1 opt || die
 }
 
 src_test() {
diff --git a/dev-ml/camlzip/ChangeLog b/dev-ml/camlzip/ChangeLog
index 644f905da063..07e53c4c9772 100644
--- a/dev-ml/camlzip/ChangeLog
+++ b/dev-ml/camlzip/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-ml/camlzip
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.1 2004/08/18 12:01:52 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
+
+  26 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> camlzip-1.01-r1.ebuild,
+  -camlzip-1.01.ebuild:
+  Move to stable (not depended on), remove old version.
+
+*camlzip-1.01-r1 (25 Aug 2004)
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> files/META,
+  +files/camlzip-1.01-Makefile-findlib.patch, +camlzip-1.01-r1.ebuild:
+  Move to findlib eclass, ebuild cleanup.
 
 *camlzip-1.01 (18 Aug 2004)
 
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index b34e6e39c893..1b8bc31b0f26 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,5 +1,6 @@
-MD5 95aca67a6eff656758ed011c4d307144 camlzip-1.01.ebuild 1999
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 6081ec5dbb7302216940749b0f1cb7d9 ChangeLog 399
-MD5 144d02af76045780262191bff2b44b62 files/META 104
-MD5 247ab601d786744715f10b4952872f98 files/digest-camlzip-1.01 63
+MD5 12a1ae3665af780d7890768f9b395670 ChangeLog 850
+MD5 b58db0616b6259c2d7e6a0c74767b258 camlzip-1.01-r1.ebuild 877
+MD5 357f403e3152810089ea2f7bb86bf77d files/META 107
+MD5 34f19ca145eb89c455a8767467331619 files/camlzip-1.01-Makefile-findlib.patch 801
+MD5 247ab601d786744715f10b4952872f98 files/digest-camlzip-1.01-r1 63
diff --git a/dev-ml/camlzip/camlzip-1.01-r1.ebuild b/dev-ml/camlzip/camlzip-1.01-r1.ebuild
index 9b8930ff974a..559e983731d3 100644
--- a/dev-ml/camlzip/camlzip-1.01-r1.ebuild
+++ b/dev-ml/camlzip/camlzip-1.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.01-r1.ebuild,v 1.1 2004/08/25 12:44:43 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.01-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit findlib eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz"
 
 SLOT="1"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=dev-lang/ocaml-3.04 \
 		>=sys-libs/zlib-1.1.3"
@@ -25,8 +25,8 @@ src_unpack() {
 }
 
 src_compile() {
-	make all || die "Failed at compilation step !!!"
-	make allopt || die "Failed at ML compilation step !!!"
+	emake all || die "Failed at compilation step !!!"
+	emake allopt || die "Failed at ML compilation step !!!"
 }
 
 src_install() {
diff --git a/dev-ml/camlzip/files/META b/dev-ml/camlzip/files/META
index c852fa144a55..988a4fc1185d 100644
--- a/dev-ml/camlzip/files/META
+++ b/dev-ml/camlzip/files/META
@@ -1,4 +1,4 @@
-version="1.01"
+version="VERSION"
 requires="unix"
 linkopts="-cclib -lz"
 archive(byte)="zip.cma"
diff --git a/dev-ml/camomile/ChangeLog b/dev-ml/camomile/ChangeLog
index 6927f5ecaa13..d8f39f68f246 100644
--- a/dev-ml/camomile/ChangeLog
+++ b/dev-ml/camomile/ChangeLog
@@ -1,6 +1,24 @@
-# ChangeLog for dev-ml/ulex
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.1 2004/08/08 08:51:41 mattam Exp $
+# ChangeLog for dev-ml/camomile
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+*camomile-0.6.0 (10 Sep 2004)
+
+  10 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> +camomile-0.5.3-r1.ebuild,
+  -camomile-0.5.3.ebuild, +camomile-0.6.0.ebuild:
+  Fix bug #63560 issues, add new version released yesterday.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> camomile-0.5.3.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  22 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> camomile-0.5.3.ebuild:
+  Adapt to findlib eclass, move to stable.
+
+  09 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> camomile-0.5.3.ebuild:
+  header fix; tidy
 
 *camomile-0.5.3 (08 Aug 2004)
 
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 4da42ed7ad28..071371d0f39a 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -1,2 +1,16 @@
-MD5 8ba77402941a5ebf2e10c29f41fd8e4e camomile-0.5.3.ebuild 699
-MD5 f5acf743fc3456d4b1d4840defd8baa8 files/digest-camomile-0.5.3 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 9f2d261cea38678f5014e105de7dbe58 ChangeLog 1025
+MD5 d3cd739853da3922c95d5d37d9a05c92 camomile-0.5.3-r1.ebuild 601
+MD5 58133a9de964829ac8159130519e3a7a camomile-0.6.0.ebuild 600
+MD5 f5acf743fc3456d4b1d4840defd8baa8 files/digest-camomile-0.5.3-r1 68
+MD5 53dddfaddc81e0967f62e690e492c257 files/digest-camomile-0.6.0 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBW1IGI1lqEGTUzyQRApOnAKDBwxqCNNC5qq8lm8Jk6g61xsXtCACgoUnZ
+SkAB3i31aSOpELBnPTKL6U4=
+=HGlM
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/camomile/camomile-0.5.3-r1.ebuild b/dev-ml/camomile/camomile-0.5.3-r1.ebuild
index e32fd33b6742..0206473aed5d 100644
--- a/dev-ml/camomile/camomile-0.5.3-r1.ebuild
+++ b/dev-ml/camomile/camomile-0.5.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/dev-ml/camomile/camomile-0.5.3-r1.ebuild,v 1.1 2004/09/10 18:02:38 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.5.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/camomile/camomile-0.6.0.ebuild b/dev-ml/camomile/camomile-0.6.0.ebuild
index e8899a48c842..52141aa5ed64 100644
--- a/dev-ml/camomile/camomile-0.6.0.ebuild
+++ b/dev-ml/camomile/camomile-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.6.0.ebuild,v 1.1 2004/09/10 18:02:39 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.6.0.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/equeue/ChangeLog b/dev-ml/equeue/ChangeLog
index 34743dca90a9..ece260f53709 100644
--- a/dev-ml/equeue/ChangeLog
+++ b/dev-ml/equeue/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/equeue
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/equeue/ChangeLog,v 1.1 2004/08/21 20:02:15 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/equeue/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> equeue-2.0.1.ebuild:
+  Mark stable on amd64, fixes bug #65080
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> equeue-2.0.1.ebuild:
+  Added to ~ppc.
 
 *equeue-2.0.1 (21 Aug 2004)
 
diff --git a/dev-ml/equeue/Manifest b/dev-ml/equeue/Manifest
index 04c06f52e964..8616d37495cf 100644
--- a/dev-ml/equeue/Manifest
+++ b/dev-ml/equeue/Manifest
@@ -1,2 +1,5 @@
-MD5 2e0f153c897016f63187d7e4cd879e41 equeue-2.0.1.ebuild 745
+MD5 e91a0144bba279943a28be8a5b00512e equeue-2.0.1.ebuild 966
+MD5 42a44115f8474b51d783560fe6278b6d ChangeLog 692
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 bb85d3c6c3ef8b6804b2634b3aaa2472 files/equeue-2.0.1-bufsize.patch 383
 MD5 f62e8eb44a5cf6aa1efbd0e3ef7771cc files/digest-equeue-2.0.1 64
diff --git a/dev-ml/equeue/equeue-2.0.1.ebuild b/dev-ml/equeue/equeue-2.0.1.ebuild
index 8f07d28918bd..d822b97eef6e 100644
--- a/dev-ml/equeue/equeue-2.0.1.ebuild
+++ b/dev-ml/equeue/equeue-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/dev-ml/equeue/equeue-2.0.1.ebuild,v 1.1 2004/08/21 20:02:15 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/equeue/equeue-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit eutils findlib
 
@@ -10,7 +10,7 @@ LICENSE="as-is"
 DEPEND=">=dev-lang/ocaml-3.07"
 SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64"
 IUSE="doc"
 
 src_unpack() {
diff --git a/dev-ml/extlib/ChangeLog b/dev-ml/extlib/ChangeLog
index c02b7c29703a..40ca8ab1470e 100644
--- a/dev-ml/extlib/ChangeLog
+++ b/dev-ml/extlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ml/extlib
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.1 2004/08/21 19:05:24 mattam Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+  21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> :
+  Version bump (fixes #87864).
+
+*extlib-1.3 (06 Feb 2005)
+
+  06 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> -extlib-1.2.ebuild,
+  +extlib-1.4.ebuild:
+  Version bump.
 
 *extlib-1.2 (21 Aug 2004)
 
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 2dfb06900994..4b648cf54d05 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,3 +1,4 @@
+MD5 173cf5e775c1744c4fd54f2854f11ece extlib-1.4.ebuild 704
+MD5 cc52e4e33c19d17107d313d9fb3e4f76 ChangeLog 800
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 9dca0785d6fef24d5fe0f9d4a508154b extlib-1.2.ebuild 602
-MD5 96670a25615fa0a849102804021fee8e files/digest-extlib-1.2 58
+MD5 1505b24456af0782c27412ac31667415 files/digest-extlib-1.4 58
diff --git a/dev-ml/extlib/extlib-1.4.ebuild b/dev-ml/extlib/extlib-1.4.ebuild
index e5c32466b7d8..f2e22f2a176b 100644
--- a/dev-ml/extlib/extlib-1.4.ebuild
+++ b/dev-ml/extlib/extlib-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.4.ebuild,v 1.1 2005/09/21 17:02:34 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.4.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 143d52e1ce89..230e89b10ea7 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,10 +1,48 @@
 # ChangeLog for dev-ml/findlib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.1 2002/12/15 23:56:41 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
-*findlib-0.8.ebuild (15 ��� 2002)
+  21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> findlib-1.0.4-r1.ebuild:
+  Stable on ppc-macos.
 
-  15 Dec 2002; George Shapovalov <george@gentoo.org> ChangeLog, findlib-0.8.ebuild, files/digest-findlib-0.8 :
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> findlib-1.0.4-r1.ebuild:
+  Mark stable on amd64
+
+*findlib-1.0.4-r1 (21 Aug 2004)
+
+  21 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -findlib-0.8.ebuild,
+  +findlib-1.0.4-r1.ebuild, -findlib-1.0.4.ebuild:
+  New revision for introduction of the findlib eclass (just checks that stublibs
+  is in ld.conf). Remove old versions.
+
+  09 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> findlib-1.0.4.ebuild:
+  header fix; tidy
+
+*findlib-1.0.4 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> +findlib-1.0.4.ebuild:
+  Version bump, fix bug #51254. Thanks to Bardur Arantsson <gentoo@scientician.net>
+  for the update.
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> findlib-0.8.ebuild:
+  Marked -amd64 as dependencies aren't fulfilled anymore.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> findlib-0.8.ebuild:
+  Adding amd64 keyword. Closing #44197.
+
+  23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> findlib-0.8.ebuild:
+  Mark stable on ppc (long time i use it but forgot to mark it).
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> findlib-0.8.ebuild:
+  Added to ~ppc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> findlib-0.8.ebuild:
+  Added ~sparc keyword to fix dev-ml/ocaml-make's broken deps.
+
+*findlib-0.8 (15 Dec 2002)
+
+  15 Dec 2002; George Shapovalov <george@gentoo.org> ChangeLog, 
+  findlib-0.8.ebuild, files/digest-findlib-0.8 :
   initial release
   OCaml tool to find/use non-standard packages.
   ebuild submitted by Matthieu Sozeau <mattam@netcourrier.com>
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index e69de29bb2d1..d3701de0c927 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -0,0 +1,4 @@
+MD5 4ee6a88025721221b66680cd98330e41 findlib-1.0.4-r1.ebuild 1676
+MD5 b0b51960db2b3426870c444b2d5f68a5 ChangeLog 1844
+MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
+MD5 0f67e24c7ecc9bad9281ccdf7e20f49f files/digest-findlib-1.0.4-r1 65
diff --git a/dev-ml/findlib/findlib-1.0.4-r1.ebuild b/dev-ml/findlib/findlib-1.0.4-r1.ebuild
index ad4d401ec308..f3a44ba8dfaa 100644
--- a/dev-ml/findlib/findlib-1.0.4-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.0.4-r1.ebuild,v 1.1 2004/08/21 17:45:22 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 IUSE="tcltk"
 
@@ -11,11 +11,12 @@ SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
 LICENSE="MIT X11"
 
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~amd64"
+KEYWORDS="x86 ppc ppc-macos sparc amd64"
 
 DEPEND=">=dev-lang/ocaml-3.07"
 
 ocamlfind_destdir="/usr/lib/ocaml/site-packages"
+stublibs=${ocamlfind_destdir}/stublibs
 
 pkg_setup()
 {
@@ -46,19 +47,21 @@ src_install() {
 
 	make prefix=${D} install || die
 
+	dodir ${stublibs}
+
 	cd ${S}/doc
 	dodoc QUICKSTART README
 	dohtml html/*
 }
 
 check_stublibs() {
-	local stublibs=${ocamlfind_destdir}/stublibs
 	local ocaml_stdlib=`ocamlc -where`
 	local ldconf=${ocaml_stdlib}/ld.conf
 
 	if [ ! -e ${ldconf} ]
 	then
 		echo ${ocaml_stdlib} > ${ldconf}
+		echo ${ocaml_stdlib}/stublibs >> ${ldconf}
 	fi
 
 	if [ -z `grep -e ${stublibs} ${ldconf}` ]
diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index b3904ef558f8..1ba65be6ee5e 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,130 @@
 # ChangeLog for dev-ml/lablgl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.1 2002/06/29 04:39:55 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+  21 Jul 2005; Herbie Hopkins <herbs@gentoo.org> lablgl-1.00.ebuild:
+  get_libdir-ized
+
+  19 Jun 2005; David Holm <dholm@gentoo.org> lablgl-1.00.ebuild:
+  Updated to use virtual/glut, bug #92613
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> lablgl-1.00.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> lablgl-1.00.ebuild:
+  stable on ia64
+
+  14 Feb 2005; Karol Wojtaszek <sekretarz@gentoo.org> lablgl-1.00.ebuild:
+  Added eerror when ocaml doesn't support tcltk, but user have enabled 
+  tcltk use flag, bug #44057
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org>
+  -files/LablGL-0.97-Makefile-destdir.patch,
+  -files/LablGL-0.97-Makefile.config,
+  -files/LablGL-0.98-Makefile-destdir.patch,
+  -files/LablGL-0.98-Makefile.config:
+  Remove old, unused files.
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -lablgl-0.97.ebuild,
+  -lablgl-0.98.ebuild, -lablgl-0.99-r1.ebuild, -lablgl-0.99.ebuild,
+  lablgl-1.00.ebuild:
+  Stable on ppc, remove old versions.
+
+  22 Aug 2004; Travis Tilley <lv@gentoo.org> lablgl-1.00.ebuild:
+  stable on amd64
+
+  15 Aug 2004; Jason Wever <weeve@gentoo.org> lablgl-1.00.ebuild:
+  Stable on sparc.
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-1.00.ebuild:
+  Move to stable on x86.
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> lablgl-1.00.ebuild:
+  adding back ~amd64 keyword
+
+  02 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-1.00.ebuild:
+  Fix building rules when glut is not set and tcltk is.
+
+  29 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-1.00.ebuild:
+  Fix makefile, when glut flag is not set, there's no need to link with glut.
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lablgl-1.00.ebuild:
+  Stable on alpha.
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> lablgl-1.00.ebuild:
+  Marked -amd64 as dependencies aren't fulfilled anymore.
+
+  11 May 2004; Guy Martin <gmsoft@gentoo.org> :
+  Marked stable on hppa.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> lablgl-1.00.ebuild:
+  added ~amd64 keyword
+
+  24 Mar 2004; Jason Wever <weeve@gentoo.org> lablgl-0.99-r1.ebuild:
+  Stable on sparc.
+
+  22 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-0.99-r1.ebuild:
+  Put 0.99-r1 into stable for x86 and ppc
+
+  18 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-0.97.ebuild,
+  lablgl-0.98.ebuild, lablgl-0.99.ebuild:
+  Remove opengl?, it is not an optional dependancy.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> lablgl-1.00.ebuild:
+  add ~alpha and ~ia64
+
+*lablgl-1.00 (06 Feb 2004)
+
+  06 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-1.00.ebuild,
+  files/lablgl-1.00-Makefile.config:
+  Version bump, added local glut use flag and optional documentation (examples).
+
+*lablgl-0.99-r1 (03 Feb 2004)
+
+  03 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-0.99-r1.ebuild,
+  metadata.xml:
+  Reworked ebuild so as to have tcltk as an optional dependancy.
+  Added metadata.xml for ml herd.
+	
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> lablgl-0.98.ebuild:
+  Marked stable on sparc to fix broken net-misc/unison dependencies.
+
+  24 Nov 2003; Jason Wever <weeve@gentoo.org> lablgl-0.98.ebuild,
+  lablgl-0.99.ebuild:
+  Added ~sparc keyword.
+
+*lablgl-0.99 (08 Jul 2003)
+
+  08 Jul 2003; Martin Holzer <mholzer@gentoo.org> lablgl-0.99.ebuild:
+  Version bumped. Closes #24701.
+
+*lablgl-0.98 (03 Sep 2002)
+
+  28 Jan 2003; Jon Nall <nall@gentoo.org> lablgl-0.98.ebuild :
+  added ~ppc
+
+  24 Oct 2002; George Shapovalov <george@gentoo.org> lablgl-0.98.ebuild :
+
+  made labltk and ocaml check-up logic more smart. Now should work fine in every situation.
+  Thanks to Jeffrey Palmer <jeffrey.palmer.acm.org> for the tip on checking labltk existance.
+
+  24 Oct 2002; George Shapovalov <george@gentoo.org> lablgl-0.98.ebuild :
+
+  lablgl requires ocaml compiled with tk support. Ocaml has tk as an optional dependency.
+  Added some code to pkg_setup to detect if the tcltk USE var is set and abort if not with the message
+  asking user to emerge ocaml with tk support.
+  See bug #8126 for details. Thanks to Sami Nieminen <sami.nieminen@iki.fi> for report and 
+  Jeffrey Palmer <jeffrey.palmer.acm.org>  for dependency tracing and diagnostics.
+
+  The above hack is goinmg to only catch 95% of situations. The real fix involves modifications to portage
+  to make it correctly process optional dependencies of dependencies. See bug #2272 for details.
+
+  03 Sep 2002; G Shapovalov <george@gentoo.org> lablgl-0.98.ebuild, files/{LablGL-0.98-Makefile-destdir.patch,LablGL-0.98-Makefile.config,digest-lablgl-0.98} :
+
+  updated to 0.98. This fixes some build failures with ocaml-3.06.
 
 *lablgl-0.97.ebuild (28 Jun 2002)
 
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index e69de29bb2d1..71014acbe052 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6737b39083cad1797a41d89d69390df1 lablgl-1.00.ebuild 2248
+MD5 f617c8a234c094526507e68a66dab8a7 ChangeLog 5287
+MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
+MD5 fe2f6d4854f565091bda3022e0a62b31 files/lablgl-1.00-Makefile.config 371
+MD5 e3979d1e494a41fb22b8dbd98f82978d files/digest-lablgl-1.00 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC38Jb2G5bA0cA/ScRAnJCAJ9ldOHupz/ngLlghg2wbpQEF46lQQCbBu62
+FjqP+d4/nP/Fd0QWeL3LyEI=
+=5AjT
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgl/files/digest-lablgl-1.00 b/dev-ml/lablgl/files/digest-lablgl-1.00
index 53050da79c2f..8f6fd1e05400 100644
--- a/dev-ml/lablgl/files/digest-lablgl-1.00
+++ b/dev-ml/lablgl/files/digest-lablgl-1.00
@@ -1,3 +1 @@
 MD5 92bcfe3121650c43e5bc4c018778405b lablgl-1.00.tar.gz 390570
-MD5 ee11755055492e0a9e60cb51fae657bf LablGL-0.99-Makefile-destdir.patch 1450
-MD5 7b95aa62137ce4a457a8603803892bcd LablGL-0.99-Makefile.config 1422
diff --git a/dev-ml/lablgl/lablgl-1.00.ebuild b/dev-ml/lablgl/lablgl-1.00.ebuild
index bf74eeb3c6f3..34b6d4c090ee 100644
--- a/dev-ml/lablgl/lablgl-1.00.ebuild
+++ b/dev-ml/lablgl/lablgl-1.00.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.00.ebuild,v 1.1 2004/02/06 03:33:08 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.00.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+inherit multilib eutils
 
 IUSE="tcltk glut doc"
 
@@ -9,28 +11,31 @@ HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
 LICENSE="as-is"
 
 DEPEND=">=dev-lang/ocaml-3.05
-virtual/opengl
-glut ? ( media-libs/glut )
-tcltk? ( >=dev-lang/tcl-8.3*
-	>=dev-lang/tk-8.3* )"
+	virtual/opengl
+	glut? ( virtual/glut )
+	tcltk? (
+		>=dev-lang/tcl-8.3
+		>=dev-lang/tk-8.3
+	)"
 
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc alpha ia64 amd64 hppa"
 
 pkg_setup()
 {
 	if ( use tcltk )
 	then
 		#lablgl requires ocaml compiled with tk support while ocaml has it as an optional dependency
-		if ( ! which labltk )
+		if ( ! built_with_use dev-lang/ocaml tcltk )
 		then
-			eerror "It seems you don't have ocaml compiled with tk support"
+			eerror "You don't have ocaml compiled with tk support"
 			eerror ""
 			eerror "lablgl requires ocaml be built with tk support."
 			eerror ""
-			eerror "Please make sure that ocaml is installed with tk support."
-			false;
+			eerror "Please recompile ocaml with tcltk useflag enabled."
+			sleep 5;
+			die "Ocaml is missing tk support";
 		fi
 	fi
 }
@@ -39,23 +44,31 @@ src_compile() {
 	# make configuration file
 	cp ${FILESDIR}/${P}-Makefile.config ${S}/Makefile.config || die
 
-	use tcltk && make && make opt
+	if ! (use glut); then
+		sed -i "s/-lglut//" Makefile.config
+	fi
 
-	use glut && make glut glutopt
+	if use tcltk; then
+		make togl toglopt
+	fi
 
-	make lib libopt || die
+	if use glut; then
+		make glut glutopt
+	else
+		make lib libopt
+	fi
 }
 
 src_install () {
-	# Makefile do not use mkdir so the library is not installed 
+	# Makefile do not use mkdir so the library is not installed
 	# but copied as a 'stublibs' file.
-	dodir /usr/lib/ocaml/stublibs
+	dodir /usr/$(get_libdir)/ocaml/stublibs
 
 	# Same for lablglut's toplevel
 	dodir /usr/bin
 
 	BINDIR=${D}/usr/bin
-	BASE=${D}/usr/lib/ocaml
+	BASE=${D}/usr/$(get_libdir)/ocaml
 	make BINDIR=${BINDIR} INSTALLDIR=${BASE}/lablGL DLLDIR=${BASE}/stublibs install || die
 
 	dodoc README CHANGES COPYRIGHT
@@ -79,4 +92,4 @@ src_install () {
 		cp -R examples ${D}/${DIR}/examples.glut
 	    fi
 	fi
-}
\ No newline at end of file
+}
diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index 31049e30b3a6..c85c69d57604 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,8 +1,145 @@
 # ChangeLog for dev-ml/lablgtk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.1 2002/06/29 05:14:35 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
-*lablgtk-1.2.3.ebuild (28 Jun 2002)
+*lablgtk-2.6.0 (14 Nov 2005)
+
+  14 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> +lablgtk-2.6.0.ebuild:
+  Version bump.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> lablgtk-2.4.0.ebuild:
+  Mark 2.4.0 stable on alpha
+
+  08 Sep 2005; Karol Wojtaszek <sekretarz@gentoo.org> lablgtk-2.4.0.ebuild:
+  Fixed configure problem on amd64 caused by wrong PKG_CONFIG_PATH variable,
+  bug #100912
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> lablgtk-2.4.0.ebuild:
+  Stable on sparc
+
+  25 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> lablgtk-2.4.0.ebuild:
+  Use new gnomecanvas USE flag (fixes bug #87426).
+
+  25 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> lablgtk-2.4.0.ebuild:
+  Added use_with code for optional features so that users get all control over
+  what is installed (fixes bugs #87426 and #100164). Also added needed `aclocal`
+  call after unpack and before reconfigure.
+
+  24 Jul 2005; Herbie Hopkins <herbs@gentoo.org> lablgtk-1.2.7.ebuild:
+  Fix multilib-strict issue, bug 99800. Marked stable on amd64.
+
+  23 Jul 2005; <sekretarz@gentoo.org> +files/lablgtk-2.4.0-gcc34.patch,
+  lablgtk-2.4.0.ebuild:
+  Fixed problems with gcc-3.4, bug #94816
+
+  13 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.7.ebuild,
+  lablgtk-2.4.0.ebuild:
+  Versions 1.2.7 and 2.4.0 stable on x86 and ppc
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> lablgtk-2.2.0.ebuild,
+  lablgtk-2.4.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  06 Apr 2005; Matthieu Sozeau <mattam@gentoo.org> lablgtk-2.2.0.ebuild,
+  lablgtk-2.4.0.ebuild:
+  Use autodetection instead of adding --without-* flags. Fixes bug #87246.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> lablgtk-2.4.0.ebuild:
+  stable on ia64
+
+  14 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> lablgtk-2.2.0.ebuild,
+  lablgtk-2.4.0.ebuild:
+  Remove invalid dependancy on gdk-pixbuf (fixes bug #84965).
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.5.ebuild,
+  lablgtk-1.2.6.ebuild:
+  Compiles perfectly fine with ocaml-3.08
+
+  13 Aug 2004; Jason Wever <weeve@gentoo.org> lablgtk-2.4.0.ebuild:
+  Added ~sparc keyword.
+
+*lablgtk-2.4.0 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.5.ebuild,
+  lablgtk-1.2.6.ebuild, lablgtk-2.2.0.ebuild, +lablgtk-2.4.0.ebuild:
+  Prepare for ocaml-3.08 bump, add latest version for gtk+2.
+
+*lablgtk-1.2.7 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -lablgtk-1.2.3.ebuild,
+  +lablgtk-1.2.7.ebuild:
+  Remove old versions, add lablgtk-1.2.7.
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> lablgtk-1.2.6.ebuild:
+  added back ~amd64 keyword
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lablgtk-1.2.6.ebuild:
+  Stable on alpha.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> lablgtk-1.2.3.ebuild:
+  Fix use invocation
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> lablgtk-1.2.3.ebuild,
+  lablgtk-1.2.5.ebuild, lablgtk-1.2.6.ebuild, lablgtk-2.2.0.ebuild:
+  Marked -amd64 as dependencies aren't fulfilled anymore.
+
+  11 May 2004; Guy Martin <gmsoft@gentoo.org> :
+  Marked stable on hppa.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> lablgtk-1.2.3.ebuild,
+  lablgtk-1.2.5.ebuild, lablgtk-1.2.6.ebuild, lablgtk-2.2.0.ebuild:
+  added ~amd64 keyword
+
+  22 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.5.ebuild:
+  Put 1.2.5 into stable on ppc.
+
+  20 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.6.ebuild:
+  Update lablgl dependency (fix bug #45109).
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> lablgtk-1.2.5.ebuild,
+  lablgtk-1.2.6.ebuild, lablgtk-2.2.0.ebuild:
+  add ~alpha and ~ia64
+
+*lablgtk-1.2.6 (03 Feb 2004)
+
+  03 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.6.ebuild,
+  lablgtk-2.2.0.ebuild:
+  1.2.6 version bump, all arches ~ keyworded. Fix depend in 2.2.0 to allow
+  >gtk-2.2 versions to be linked with lablgl (bug #31854).
+
+  22 Jan 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.3.ebuild:
+  Forgot to say i added ~ppc keywords to 1.2.3 and 2.2.0.
+
+*lablgtk-2.2.0 (22 Jan 2004)
+
+  22 Jan 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.3.ebuild,
+  lablgtk-2.2.0.ebuild, metadata.xml:
+  New version for gtk+2, incompatible with lablgtk 1 but the two can coexist
+    peacefully. Also added metadata file.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> lablgtk-1.2.5.ebuild:
+  Marked stable on sparc to fix broken net-misc/unison dependencies.
+
+  24 Nov 2003; Jason Wever <weeve@gentoo.org> lablgtk-1.2.3.ebuild,
+  lablgtk-1.2.5.ebuild:
+  Added ~sparc keyword.
+
+*lablgtk-1.2.5 (25 Oct 2002)
+
+  15 Mar 2003; Alastair Tse <liquidx@gentoo.org> lablgtk-1.2.5.ebuild:
+  gdk-pixbuf added to deps. thanks to ska-fan. resolves #17531.
+
+  28 Jan 2003; Jon Nall <nall@gentoo.org> lablgtk-1.2.5.ebuild :
+  added ~ppc
+
+  25 Oct 2002; foser <foser@gentoo.org> lablgtk-1.2.5.ebuild :
+  
+  New version. Ebuild by Jeffrey Palmer <jeffrey.palmer@acm.org> (bug #9609)
+
+*lablgtk-1.2.3 (28 Jun 2002)
 
   28 Jun 2002; G Shapovalov <george@gentoo.org> all :
 
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index e69de29bb2d1..f26f6f84f485 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -0,0 +1,15 @@
+MD5 25aced94a16c8355422ee20a2abc9364 lablgtk-1.2.6.ebuild 1250
+MD5 65e6110f9b7d61d7e54542238d97f874 lablgtk-2.4.0.ebuild 1979
+MD5 d6423eb2ebf301a6d918a8259a0099bc lablgtk-1.2.5.ebuild 1243
+MD5 cb29e2aa99376f503da1ba740e2119eb lablgtk-2.6.0.ebuild 1945
+MD5 f4b6fed96ff9eb04b6a27d77005cfb55 lablgtk-2.2.0.ebuild 1388
+MD5 ae420f0d0669b40bb09a0ed9b5c53b21 ChangeLog 5461
+MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
+MD5 fade34f7b933c0016abeb2e71cb774b4 lablgtk-1.2.7.ebuild 1306
+MD5 581f9b34fc71deb0d4970288ac26d18e files/lablgtk-2.4.0-gcc34.patch 563
+MD5 58e497f72394c82abd2991deb196cb5d files/digest-lablgtk-1.2.5 65
+MD5 7942d753e9ae00567c6a9f7de0242d53 files/digest-lablgtk-1.2.6 65
+MD5 a31a4824fac7faf0a0df2d8b8705b67f files/digest-lablgtk-1.2.7 65
+MD5 b5ae3dc8963ec992c47b24ec7b529377 files/digest-lablgtk-2.2.0 65
+MD5 7cbae54b1d8a667973bd4d3689f25605 files/digest-lablgtk-2.4.0 65
+MD5 3742965f7b5abc9cc04644f9ce631853 files/digest-lablgtk-2.6.0 65
diff --git a/dev-ml/lablgtk/lablgtk-1.2.5.ebuild b/dev-ml/lablgtk/lablgtk-1.2.5.ebuild
index 1e60d12f12cb..bae20eb8de83 100644
--- a/dev-ml/lablgtk/lablgtk-1.2.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-1.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.5.ebuild,v 1.1 2002/10/26 00:09:00 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.5.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 IUSE="gnome opengl"
 
@@ -9,16 +9,18 @@ HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
 LICENSE="LGPL-2.1 as-is"
 
 DEPEND="=x11-libs/gtk+-1.2*
-	>=dev-lang/ocaml-3.06
-	gnome? ( >=gnome-base/libglade-0.17-r6
-		 >=gnome-base/gnome-libs-1.4.1.7 )
-	opengl? ( >=dev-ml/lablgl-0.98 
-		=x11-libs/gtkglarea-1.2* )"
+		>=dev-lang/ocaml-3.06
+		gnome? ( =gnome-base/libglade-0.17*
+			>=gnome-base/gnome-libs-1.4.1.7
+			media-libs/gdk-pixbuf )
+		opengl? ( >=dev-ml/lablgl-0.98
+			=x11-libs/gtkglarea-1.2* )"
+
+RDEPEND=${DEPEND}
 
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-${PV}.tar.gz"
-S=${WORKDIR}/${P}
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc ~alpha ~ia64 -amd64"
 
 Name="LablGTK"
 
@@ -39,4 +41,3 @@ src_install () {
 	dosed /usr/bin/lablgtk
 	dodoc CHANGES COPYING README
 }
-
diff --git a/dev-ml/lablgtk/lablgtk-1.2.6.ebuild b/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
index 4b3b6b570836..45e4f3725a7e 100644
--- a/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
+++ b/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.6.ebuild,v 1.1 2004/02/03 01:27:08 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.6.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 IUSE="gnome opengl"
 
@@ -13,15 +13,14 @@ DEPEND="=x11-libs/gtk+-1.2*
 		gnome? ( =gnome-base/libglade-0.17*
 			>=gnome-base/gnome-libs-1.4.1.7
 			media-libs/gdk-pixbuf )
-		opengl? ( >=dev-ml/lablgl-0.98
+		opengl? ( >=dev-ml/lablgl-1.00
 			=x11-libs/gtkglarea-1.2* )"
 
 RDEPEND=${DEPEND}
 
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-${PV}.tar.gz"
-S=${WORKDIR}/${P}
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc alpha ~ia64 ~amd64 hppa"
 
 Name="LablGTK"
 
@@ -42,4 +41,3 @@ src_install () {
 	dosed /usr/bin/lablgtk
 	dodoc CHANGES COPYING README
 }
-
diff --git a/dev-ml/lablgtk/lablgtk-1.2.7.ebuild b/dev-ml/lablgtk/lablgtk-1.2.7.ebuild
index 7a80e3d6f199..d9920fedd6e2 100644
--- a/dev-ml/lablgtk/lablgtk-1.2.7.ebuild
+++ b/dev-ml/lablgtk/lablgtk-1.2.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/dev-ml/lablgtk/lablgtk-1.2.7.ebuild,v 1.1 2004/08/08 06:30:28 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.7.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+inherit multilib
 
 IUSE="gnome opengl"
 
@@ -20,13 +22,13 @@ RDEPEND=${DEPEND}
 
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-${PV}.tar.gz"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~hppa"
+KEYWORDS="x86 ppc ~sparc ~alpha ~ia64 amd64 ~hppa"
 
 Name="LablGTK"
 
 src_compile() {
 
-	local myconf="USE_DOTOPT=1 BINDIR=${D}/usr/bin INSTALLDIR=${D}/usr/lib/ocaml/lablgtk DLLDIR=${D}/usr/lib/ocaml/stublibs"
+	local myconf="USE_DOTOPT=1 BINDIR=${D}/usr/bin INSTALLDIR=${D}/usr/$(get_libdir)/ocaml/lablgtk DLLDIR=${D}/usr/$(get_libdir)/ocaml/stublibs"
 
 	use gnome && myconf="$myconf USE_GNOME=1 USE_GLADE=1"
 	use opengl && myconf="$myconf USE_GL=1"
@@ -36,7 +38,7 @@ src_compile() {
 }
 
 src_install () {
-	dodir /usr/bin /usr/lib/ocaml/lablgtk /usr/lib/ocaml/stublibs
+	dodir /usr/bin /usr/$(get_libdir)/ocaml/lablgtk /usr/$(get_libdir)/ocaml/stublibs
 	make install || die
 	dosed /usr/bin/lablgtk
 	dodoc CHANGES COPYING README
diff --git a/dev-ml/lablgtk/lablgtk-2.2.0.ebuild b/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
index 9820882a08ad..17b16a4ddc82 100644
--- a/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
@@ -1,35 +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/dev-ml/lablgtk/lablgtk-2.2.0.ebuild,v 1.1 2004/01/22 22:27:38 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
-IUSE="gnome opengl debug glade svg"
+IUSE="debug doc glade gnome opengl svg"
 
 DESCRIPTION="Objective CAML interface for Gtk+2"
 HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
 LICENSE="LGPL-2.1 as-is"
 
-DEPEND="=x11-libs/gtk+-2.2*
-	>=dev-lang/ocaml-3.07
-	svg? ( >=gnome-base/librsvg-2.2* )
+DEPEND=">=x11-libs/gtk+-2.2
+	=dev-lang/ocaml-3.07*
+	svg? ( >=gnome-base/librsvg-2.2 )
 	glade? ( >=gnome-base/libglade-2.0.1 )
 	gnome? ( >=gnome-base/libgnomecanvas-2.2
 		>=gnome-base/gnome-panel-2.4.0
-		>=gnome-base/libgnomeui-2.4.0
-		media-libs/gdk-pixbuf )
+		>=gnome-base/libgnomeui-2.4.0 )
 	opengl? ( >=dev-ml/lablgl-0.98
-		>=x11-libs/gtkglarea-1.9* )"
+		>=x11-libs/gtkglarea-1.9 )"
 
 SLOT="2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="-amd64 ~x86 ~ppc ~alpha ~ia64"
 
 src_compile() {
-	use gnome || myconf="$myconf
-				--without-gnomecanvas --without-gnomeui
-				--without-panel"
-	use opengl || myconf="$myconf --without-gl"
-	use svg || myconf="$myconf --without-rsvg"
-	use glade || myconf="$myconf --without-glade"
 	use debug && myconf="$myconf --enable-debug"
 
 	econf $myconf || die "configure failed"
diff --git a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
index 3f91a41c4927..fee5b3daf42b 100644
--- a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
@@ -1,37 +1,62 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.4.0.ebuild,v 1.1 2004/08/08 07:46:48 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
-IUSE="debug doc glade gnome opengl svg"
+inherit eutils
+
+IUSE="debug doc glade gnome gnomecanvas opengl svg"
 
 DESCRIPTION="Objective CAML interface for Gtk+2"
 HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
 SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
 LICENSE="LGPL-2.1 as-is"
 
-DEPEND=">=x11-libs/gtk+-2.4*
+DEPEND=">=x11-libs/gtk+-2.4
 	>=dev-lang/ocaml-3.07
-	svg? ( >=gnome-base/librsvg-2.2* )
+	svg? ( >=gnome-base/librsvg-2.2 )
 	glade? ( >=gnome-base/libglade-2.0.1 )
-	gnome? ( >=gnome-base/libgnomecanvas-2.2
-		>=gnome-base/gnome-panel-2.4.0
-		>=gnome-base/libgnomeui-2.4.0
-		media-libs/gdk-pixbuf )
+	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
+	gnome? ( >=gnome-base/gnome-panel-2.4.0
+		>=gnome-base/libgnomeui-2.4.0 )
 	opengl? ( >=dev-ml/lablgl-0.98
-		>=x11-libs/gtkglarea-1.9* )"
+		>=x11-libs/gtkglarea-1.9 )"
 
 SLOT="2"
-KEYWORDS="-amd64 ~x86 ~ppc ~alpha ~ia64"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	aclocal
+	autoreconf
+}
 
 src_compile() {
-	use gnome || myconf="$myconf
-				--without-gnomecanvas --without-gnomeui
-				--without-panel"
-	use opengl || myconf="$myconf --without-gl"
-	use svg || myconf="$myconf --without-rsvg"
-	use glade || myconf="$myconf --without-glade"
+	local myconf
+
 	use debug && myconf="$myconf --enable-debug"
 
+	myconf="$myconf $(use_with svg rsvg)"
+
+	myconf="$myconf $(use_with glade)"
+
+	# libgnomeui already depends on libgnomecanvas
+	if use gnomecanvas || use gnome
+	then
+		myconf="$myconf --with-gnomecanvas"
+	else
+		myconf="$myconf --without-gnomecanvas"
+	fi
+
+	myconf="$myconf $(use_with gnome gnomeui)"
+	myconf="$myconf $(use_with gnome panel)"
+
+	myconf="$myconf $(use_with opengl gl)"
+
+	export PKG_CONFIG_PATH=/$(get_libdir)/pkgconfig
+
 	econf $myconf || die "configure failed"
 	make all opt || die "make failed"
 }
diff --git a/dev-ml/lablgtk/lablgtk-2.6.0.ebuild b/dev-ml/lablgtk/lablgtk-2.6.0.ebuild
index ff49608caf74..c2ed15d22eb6 100644
--- a/dev-ml/lablgtk/lablgtk-2.6.0.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.6.0.ebuild,v 1.1 2005/11/13 23:50:26 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.6.0.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 2193d772e351..764992cdaa94 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/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>ml</herd>
+  <herd>ml</herd>
+  <maintainer>
+    <email>mattam@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-ml/metadata.xml b/dev-ml/metadata.xml
index 68729a54a15b..96192687951b 100644
--- a/dev-ml/metadata.xml
+++ b/dev-ml/metadata.xml
@@ -5,5 +5,28 @@
 		The dev-ml category contains libraries and utilities relevant to the
 		ML programming language.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-ml enthält Bibliotheken und Werkzeuge für die 
+		Programmiersprache ML.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-ml contiene librerías y utilidades referentes al
+		lenguaje de programación ML.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-ml カテゴリーにはMLプログラミング言語に関連したライブラリーと
+		ユーティリティが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-ml categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+		van de programmeertaal ML.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-ml chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình ML.
+	</longdescription>
+	<longdescription lang="it">
+		La categoría dev-ml contiene librerie ed utilità per il linguaggio di programmazione ML.
+	</longdescription>
 </catmetadata>
 
diff --git a/dev-ml/netclient/ChangeLog b/dev-ml/netclient/ChangeLog
index 93ee6884c805..6cb08a0812c6 100644
--- a/dev-ml/netclient/ChangeLog
+++ b/dev-ml/netclient/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-ml/netclient
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/netclient/ChangeLog,v 1.1 2005/03/08 23:39:57 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/netclient/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+*netclient-0.90.4 (27 Mar 2005)
+
+  27 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> netclient-0.3.1.ebuild,
+  +netclient-0.90.4.ebuild:
+  Added experimental version, thanks to Thomas de Grenier de Latour
+  <degrenier@easyconnect.fr> for submission. Changed 0.3.1 version to stable.
+
+  09 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> netclient-0.3.1.ebuild:
+  fix keywords; tidy
 
 *netclient-0.3.1 (09 Mar 2005)
 
diff --git a/dev-ml/netclient/Manifest b/dev-ml/netclient/Manifest
index 1187e57b29a9..1c46b7ce1381 100644
--- a/dev-ml/netclient/Manifest
+++ b/dev-ml/netclient/Manifest
@@ -1,2 +1,6 @@
-MD5 67d561a3d7376277e9e7215af12fb716 netclient-0.3.1.ebuild 571
+MD5 a2a5d30fb8952cb72652c397550578a7 netclient-0.3.1.ebuild 665
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 5fa50bafb4ad5d2e242c8780ad00ba44 ChangeLog 726
+MD5 a200a0b38071c1fdacbf3dcb2b471e1a netclient-0.90.4.ebuild 890
 MD5 a436957bc085608468e90516daf2f6c6 files/digest-netclient-0.3.1 66
+MD5 2d132890230196f048cc570017ec7750 files/digest-netclient-0.90.4 67
diff --git a/dev-ml/netclient/netclient-0.3.1.ebuild b/dev-ml/netclient/netclient-0.3.1.ebuild
index e92496648384..592429f9f21c 100644
--- a/dev-ml/netclient/netclient-0.3.1.ebuild
+++ b/dev-ml/netclient/netclient-0.3.1.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/dev-ml/netclient/netclient-0.3.1.ebuild,v 1.1 2005/03/08 23:39:57 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/netclient/netclient-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
 DESCRIPTION="A wannabe univeral network client"
 HOMEPAGE="http://www.ocaml-programming.de/packages/"
-LICENSE="MIT X11"
 SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
 
+LICENSE="MIT X11"
+SLOT="0"
+KEYWORDS="ppc x86"
 IUSE=""
-DEPEND=">=dev-ml/ocamlnet-0.98
-dev-ml/xstr"
 
-SLOT="0"
+DEPEND=">=dev-ml/ocamlnet-0.98
+	dev-ml/xstr"
 RDEPEND=""
-KEYWORDS="x86 ppc"
+
 S="${WORKDIR}/${PN}-0.3"
 
-src_compile()
-{
-	make all opt || die
+src_compile() {
+	make all opt || die "make failed"
 }
 
-src_install()
-{
+src_install() {
 	findlib_src_install
 	dodoc LICENSE README RELEASE
 }
diff --git a/dev-ml/netclient/netclient-0.90.4.ebuild b/dev-ml/netclient/netclient-0.90.4.ebuild
index 72cb4775b541..900d9eca9bdf 100644
--- a/dev-ml/netclient/netclient-0.90.4.ebuild
+++ b/dev-ml/netclient/netclient-0.90.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/netclient/netclient-0.90.4.ebuild,v 1.1 2005/03/27 15:18:54 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/netclient/netclient-0.90.4.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/ocaml-make/ChangeLog b/dev-ml/ocaml-make/ChangeLog
index c8e955272ba8..9b3790f013f7 100644
--- a/dev-ml/ocaml-make/ChangeLog
+++ b/dev-ml/ocaml-make/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for dev-ml/ocaml-make
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-make/ChangeLog,v 1.1 2003/06/20 01:09:11 george Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-make/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
-*ocaml-make-5.04.0.ebuild (19 Jun 2003)
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> ocaml-make-5.04.0.ebuild:
+  added ~amd64 keyword
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ocaml-make-5.04.0.ebuild:
+  ppc needs deps first; don't assign default to S; header fix
+
+*ocaml-make-5.04.0 (19 Jun 2003)
 
   19 Jun 2003; George Shapovalov <george@gentoo.org> Manifest, ocaml-make-5.04.0.ebuild, files/{digest-ocaml-make-5.04.0} :
   initial release (#22279)
diff --git a/dev-ml/ocaml-make/Manifest b/dev-ml/ocaml-make/Manifest
index c949edecc62e..b07871dccac6 100644
--- a/dev-ml/ocaml-make/Manifest
+++ b/dev-ml/ocaml-make/Manifest
@@ -1,2 +1,14 @@
-MD5 395a11f882ff211528f7fc610cd4cb6a ocaml-make-5.04.0.ebuild 714
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 71902c79f2c38092322c37f7a5e022b4 ChangeLog 748
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 07b0546a37c9f9876e3a6d96f39ce18e ocaml-make-5.04.0.ebuild 790
 MD5 54d2d16a1fee2369b565dc8dc673ebc3 files/digest-ocaml-make-5.04.0 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBW1HkI1lqEGTUzyQRAr+qAJ42OjQ+e48cuSu/fO5yOGKgODUA0ACbBWFP
+SMbhYAWbvBDmFQ9Giqipq3k=
+=K6G+
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/ocaml-make/ocaml-make-5.04.0.ebuild b/dev-ml/ocaml-make/ocaml-make-5.04.0.ebuild
index 38862fbf96de..4f2bce6a94e9 100644
--- a/dev-ml/ocaml-make/ocaml-make-5.04.0.ebuild
+++ b/dev-ml/ocaml-make/ocaml-make-5.04.0.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/dev-ml/ocaml-make/ocaml-make-5.04.0.ebuild,v 1.1 2003/06/20 01:09:11 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-make/ocaml-make-5.04.0.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 DESCRIPTION="Generic O'Caml Makefile for GNU Make"
 HOMEPAGE="http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html"
@@ -10,9 +10,8 @@ DEPEND=">=dev-lang/ocaml-3.06-r1
 	>=dev-ml/findlib-0.8"
 SRC_URI="http://www.oefai.at/~markus/ocaml_sources/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ~amd64"
 IUSE=""
-S=${WORKDIR}/${P}
 
 src_compile() {
 	# Nothing to do
diff --git a/dev-ml/ocaml-mysql/ChangeLog b/dev-ml/ocaml-mysql/ChangeLog
index 0fd779ace74f..8ed318c0c920 100644
--- a/dev-ml/ocaml-mysql/ChangeLog
+++ b/dev-ml/ocaml-mysql/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-ml/ocaml-mysql
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.1 2005/02/06 16:20:11 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
+
+  17 Aug 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/ocaml-mysql-1.0.3-shtool-r1.patch, ocaml-mysql-1.0.3-r1.ebuild:
+  fix Bug #101349, recreated the patch to apply to the correct file
+
+*ocaml-mysql-1.0.3-r1 (02 Jun 2005)
+
+  02 Jun 2005; Matthieu Sozeau <mattam@gentoo.org>
+  +files/ocaml-mysql-1.0.3-shtool.patch, +ocaml-mysql-1.0.3-r1.ebuild:
+  Fixes security bug in shtool (see bug #93784).
 
 *ocaml-mysql-1.0.3 (06 Feb 2005)
 
diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest
index 2402ede43848..122cb1e862a1 100644
--- a/dev-ml/ocaml-mysql/Manifest
+++ b/dev-ml/ocaml-mysql/Manifest
@@ -1,2 +1,9 @@
-MD5 c94e4ddd9faa65c0e3c63b3e5c1993b0 ocaml-mysql-1.0.3.ebuild 816
+MD5 ccb14ef33dd24b7e69dcab6afea1a4e2 ocaml-mysql-1.0.3-r1.ebuild 898
+MD5 53f858c3c552a4aaaab3c9a82ab1031b ocaml-mysql-1.0.3.ebuild 849
+MD5 4622e8046668fccf3a67f5c35c9a1ef1 ChangeLog 865
+MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
+MD5 d136e53521c22eb8b9f2987dfd19163d files/ocaml-mysql-1.0.3-shtool.patch 744
+MD5 17d44e73eabd032735c409db133e8f19 files/ocaml-mysql-1.0.3-shtool-r1.patch 608
+MD5 000615b1a5a0999a580efdd6dadad829 files/ocaml-mysql-1.0.3-head.patch 1635
 MD5 d6862e23b576fefef089e739a132cd16 files/digest-ocaml-mysql-1.0.3 69
+MD5 d6862e23b576fefef089e739a132cd16 files/digest-ocaml-mysql-1.0.3-r1 69
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild
index d665deaff73a..00e71835a83b 100644
--- a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild,v 1.1 2005/06/02 15:11:54 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit findlib eutils
 
@@ -22,7 +22,7 @@ KEYWORDS="x86 ppc"
 src_compile()
 {
 	epatch ${FILESDIR}/${P}-head.patch
-	epatch ${FILESDIR}/${P}-shtool.patch
+	epatch ${FILESDIR}/${P}-shtool-r1.patch
 	econf || die "configure failed"
 	make all || die "make failed"
 	make opt
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3.ebuild
index 983d73703e61..68062e2495de 100644
--- a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3.ebuild
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3.ebuild,v 1.1 2005/02/06 16:20:11 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/ocamldsort/ChangeLog b/dev-ml/ocamldsort/ChangeLog
index fa1ab7abddec..022675fa5e69 100644
--- a/dev-ml/ocamldsort/ChangeLog
+++ b/dev-ml/ocamldsort/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/ocamldsort
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ChangeLog,v 1.1 2004/10/05 07:54:53 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
   04 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> +ocamldsort-0.14.2
   +metadata.xml:
diff --git a/dev-ml/ocamldsort/Manifest b/dev-ml/ocamldsort/Manifest
index 567b4eaff433..fcd8e9aa3656 100644
--- a/dev-ml/ocamldsort/Manifest
+++ b/dev-ml/ocamldsort/Manifest
@@ -1,2 +1,4 @@
-MD5 145bbe2ed4e7bea1908ed62d02fed069 ocamldsort-0.14.2.ebuild 529
+MD5 a3ef3e6d6988420848f778b768ba0d6f ocamldsort-0.14.2.ebuild 625
+MD5 1cb2f9d1e5b352630d969dc90e6bfe35 ChangeLog 352
+MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 MD5 8066f7e2bb642d8707a294dfe67e029a files/digest-ocamldsort-0.14.2 68
diff --git a/dev-ml/ocamldsort/ocamldsort-0.14.2.ebuild b/dev-ml/ocamldsort/ocamldsort-0.14.2.ebuild
index c3f2191fcede..ee5c75f815a7 100644
--- a/dev-ml/ocamldsort/ocamldsort-0.14.2.ebuild
+++ b/dev-ml/ocamldsort/ocamldsort-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ocamldsort-0.14.2.ebuild,v 1.1 2004/10/05 07:54:53 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldsort/ocamldsort-0.14.2.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 DESCRIPTION="A dependency sorter for OCaml source files"
 HOMEPAGE="http://dimitri.mutu.net/ocaml.html"
diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index 8855eebfcd9e..e69822a87aa6 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/ocamlgraph
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ChangeLog,v 1.1 2005/09/21 19:10:34 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 *ocamlgraph-0.81 (21 Sep 2005)
 
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index ee364e9f4cfc..c8920088627f 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,3 +1,4 @@
-MD5 ea874778623ba1ac66b88da310b026a0 ocamlgraph-0.81.ebuild 774
+MD5 10875cfbb8eea74738164aaecc334fb0 ocamlgraph-0.81.ebuild 751
+MD5 15068105fd0be752d235594197020a00 ChangeLog 435
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 MD5 ba513d22f4e8a7de7b3ab289a6a668fc files/digest-ocamlgraph-0.81 66
diff --git a/dev-ml/ocamlgraph/ocamlgraph-0.81.ebuild b/dev-ml/ocamlgraph/ocamlgraph-0.81.ebuild
index 6b8783a0ae62..4993c4a386bb 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-0.81.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-0.81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ocamlgraph-0.81.ebuild,v 1.1 2005/09/21 19:10:34 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ocamlgraph-0.81.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 0eab950fd210..03a4584a6f61 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,8 +1,43 @@
 # ChangeLog for dev-ml/ocamlnet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.1 2003/02/23 22:02:52 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
-*ocamlnet-0.95.ebuild (23 Feb 2003)
+  27 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> -ocamlnet-0.97.1.ebuild,
+  ocamlnet-0.98.ebuild:
+  Remove old version, latest is stable on ppc.
+
+  14 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.98.ebuild:
+  Add ~amd64.
+
+  09 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.98.ebuild:
+  Add compatibility cgi module so netclient can be compiled.
+
+  09 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.98.ebuild:
+  Fix data files installation, add pop library.
+
+  18 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> ocamlnet-0.98.ebuild:
+  fix repoman issues; tidy
+
+*ocamlnet-0.98 (18 Feb 2005)
+
+  18 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> +ocamlnet-0.98.ebuild:
+  Version bump.
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.97.1.ebuild:
+  Stable move (fixes bug #65131 for amd64)
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.97.1.ebuild:
+  NET_DB_DIR fix.
+
+*ocamlnet-0.97.1 (19 Aug 2004)
+
+  19 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.97.1.ebuild:
+  Version bump, use findlib eclass.
+
+  23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> ocamlnet-0.95.ebuild:
+  Added ~ppc keyword.
+
+*ocamlnet-0.95 (23 Feb 2003)
 
   23 Feb 2003; George Shapovalov <george@gentoo.org> ChangeLog, ocamlnet-0.95.ebuild, files/digest-ocamlnet-0.95 :
   initial release (#15901)
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index e69de29bb2d1..56e582ab20ab 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -0,0 +1,6 @@
+MD5 e1082499b9488781330d61c89011b93c ChangeLog 1680
+MD5 e03f9a8a89002763dcd26416f218a62a ocamlnet-0.95.ebuild 831
+MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
+MD5 e297e724044525a6ad49502b82edfead ocamlnet-0.98.ebuild 820
+MD5 b3137a19a01b130d78ec709fd500acfc files/digest-ocamlnet-0.95 65
+MD5 425492e930c801900aa5493bbe7647c4 files/digest-ocamlnet-0.98 65
diff --git a/dev-ml/ocamlnet/ocamlnet-0.95.ebuild b/dev-ml/ocamlnet/ocamlnet-0.95.ebuild
index abc22f5e31b6..821ff0a3e78f 100644
--- a/dev-ml/ocamlnet/ocamlnet-0.95.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-0.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/dev-ml/ocamlnet/ocamlnet-0.95.ebuild,v 1.1 2003/02/23 22:02:52 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-0.95.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 DESCRIPTION="Modules for O'Caml application-level Internet protocols"
 HOMEPAGE="http://ocamlnet.sourceforge.net"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 DEPEND=">=dev-ml/pcre-ocaml-4.31.0
 	>=dev-ml/findlib-0.8"
diff --git a/dev-ml/ocamlnet/ocamlnet-0.98.ebuild b/dev-ml/ocamlnet/ocamlnet-0.98.ebuild
index 1d24415ac58e..09dafb791e9a 100644
--- a/dev-ml/ocamlnet/ocamlnet-0.98.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-0.98.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2005 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-0.98.ebuild,v 1.1 2005/02/17 23:30:15 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-0.98.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
 DESCRIPTION="Modules for O'Caml application-level Internet protocols"
 HOMEPAGE="http://ocamlnet.sourceforge.net"
 SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
-LICENSE="as-is"
 
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+
 DEPEND=">=dev-ml/pcre-ocaml-4.31.0"
 
 S="${WORKDIR}/${P}/src"
 
+DATADIR=/usr/share/${PN}
+
 src_compile() {
-	./configure || die
-	make all opt || die
+	./configure -enable-compatcgi -with-pop -datadir ${DATADIR}  || die "configure failed"
+	make all opt || die "make failed"
 }
 
-src_install() {	
-	findlib_src_install NET_DB_DIR=${D}${OCAML_SITELIB}/netstring
+src_install() {
+	findlib_src_install NET_DB_DIR="${D}${DATADIR}"
 
-	cd ${WORKDIR}/${P}
+	cd "${WORKDIR}/${P}"
 	dodoc README
 	dohtml doc/intro/html/*
 }
diff --git a/dev-ml/ocamlsdl/ChangeLog b/dev-ml/ocamlsdl/ChangeLog
index 1c544b8db9f1..3bf795f87c31 100644
--- a/dev-ml/ocamlsdl/ChangeLog
+++ b/dev-ml/ocamlsdl/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for dev-ml/ocamlsdl
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.1 2004/02/12 00:00:30 mattam Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+  09 Nov 2005; Jason Wever <weeve@gentoo.org> ocamlsdl-0.7.2.ebuild:
+  Getting ~sparc back on the latest and greatest.
+
+*ocamlsdl-0.7.2 (18 Mar 2005)
+
+  18 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> -ocamlsdl-0.6.3.ebuild,
+  +ocamlsdl-0.7.2.ebuild:
+  Version bump, remove older one.
+
+  15 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> ocamlsdl-0.7.1.ebuild:
+  Stable on sparc
+
+  19 Feb 2005; Jason Wever <weeve@gentoo.org> ocamlsdl-0.7.1.ebuild:
+  Added ~sparc keyword as it was dropped :(
+
+  17 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> ocamlsdl-0.7.1.ebuild:
+  Stable on x86, ppc. Did not add new use flags to control sdl-mixer,sdl-image
+  but could.
+
+*ocamlsdl-0.7.1 (25 Aug 2004)
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocamlsdl-0.6.3.ebuild,
+  +ocamlsdl-0.7.1.ebuild:
+  Version bump, add use flags including doc and use findlib eclass and move
+  older version to stable.
+
+  15 Aug 2004; Jason Wever <weeve@gentoo.org> ocamlsdl-0.6.3.ebuild:
+  Added ~sparc keyword.
 
 *ocamlsdl-0.6.3 (12 Feb 2004)
 
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index f3308dc4f55e..9e6e5c6f8c49 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,2 +1,6 @@
-MD5 c271cdd1729549684abb2ac75283c560 ocamlsdl-0.6.3.ebuild 1119
-MD5 21cf2a31ec5ac945f54f9c9df0ff5603 files/digest-ocamlsdl-0.6.3 67
+MD5 3805a928529f5a85270a8fa815306bfd ChangeLog 1397
+MD5 dc12fdb347282470f8819d9ef5db7fcf files/digest-ocamlsdl-0.7.1 66
+MD5 377a8ee5b8eaa8477e7750741d3d3c3b files/digest-ocamlsdl-0.7.2 66
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 982d0909f2774907a3fdac66390ffd44 ocamlsdl-0.7.1.ebuild 1341
+MD5 acaa3bac2dd8c4ab32a93256c3cfdab0 ocamlsdl-0.7.2.ebuild 1341
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.7.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.7.1.ebuild
index 3fe68f7ccf08..41f83386908b 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.7.1.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.7.1.ebuild,v 1.1 2004/08/25 21:05:32 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
@@ -11,14 +11,14 @@ SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc opengl truetype noimage nomixer"
+KEYWORDS="x86 ppc sparc"
+IUSE="doc opengl truetype" #noimage nomixer
 
 DEPEND=">=dev-lang/ocaml-3.04
 >=media-libs/libsdl-1.2
 opengl? ( >=dev-ml/lablgl-0.98 )
-!nomixer? ( >=media-libs/sdl-mixer-1.2 )
-!noimage? ( >=media-libs/sdl-image-1.2 )
+>=media-libs/sdl-mixer-1.2
+>=media-libs/sdl-image-1.2
 truetype? ( >=media-libs/sdl-ttf-2.0 )"
 
 src_compile() {
@@ -36,13 +36,13 @@ src_compile() {
 		fi
 	fi
 
-	use noimage && myconf="${myconf} --without-sdl-image"
-	use nomixer && myconf="${myconf} --without-sdl-mixer"
+	#use noimage && myconf="${myconf} --without-sdl-image"
+	#use nomixer && myconf="${myconf} --without-sdl-mixer"
 
 	econf $myconf \
 		`use_enable truetype sdl-ttf` \
 		|| die
-	make all || die
+	emake all || die
 }
 
 src_install() {
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild
index 7cab15b4850a..69023f8a95cc 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild,v 1.1 2005/03/18 16:47:50 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE="doc opengl truetype" #noimage nomixer
 
 DEPEND=">=dev-lang/ocaml-3.04
diff --git a/dev-ml/ocamlweb/ChangeLog b/dev-ml/ocamlweb/ChangeLog
index bf995ca9d2eb..6aa0d0c8ea5f 100644
--- a/dev-ml/ocamlweb/ChangeLog
+++ b/dev-ml/ocamlweb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ml/ocamlweb
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlweb/ChangeLog,v 1.1 2004/02/05 14:42:26 mattam Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlweb/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
+
+*ocamlweb-1.36 (07 Feb 2005)
+
+  07 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> ocamlweb-1.34.ebuild,
+  +ocamlweb-1.36.ebuild:
+  Add latest version, compatible with ocaml-3.08.
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocamlweb-1.34.ebuild:
+  Mark stable.
 
 *ocamlweb-1.34 (05 Feb 2004)
 
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index f42b1cd5f3e8..8e7220ed3ef7 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,2 +1,6 @@
-MD5 b6cc784d7919b5b6aefbdd958ebb17c8 ocamlweb-1.34.ebuild 646
+MD5 abab534f9e42fd7ef941666c4e3b186c ocamlweb-1.36.ebuild 841
+MD5 4e214beb327a58222167cad9c2afe5e8 ChangeLog 692
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 35b81c7197b7b8c0722dc27515fba829 ocamlweb-1.34.ebuild 862
 MD5 bf8b3a252ad256f2da01fcecfdd539a8 files/digest-ocamlweb-1.34 65
+MD5 ed8db4426817616e0df787787c360712 files/digest-ocamlweb-1.36 65
diff --git a/dev-ml/ocamlweb/ocamlweb-1.34.ebuild b/dev-ml/ocamlweb/ocamlweb-1.34.ebuild
index f14566b7be60..1927915ce65c 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.34.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlweb/ocamlweb-1.34.ebuild,v 1.1 2004/02/05 14:42:26 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlweb/ocamlweb-1.34.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 DESCRIPTION="O'Caml literate programming tool"
 HOMEPAGE="http://www.lri.fr/~filliatr/ocamlweb/"
@@ -10,9 +10,10 @@ IUSE=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=dev-lang/ocaml-3.06
+<dev-lang/ocaml-3.08
 virtual/tetex"
 
 src_compile() {
diff --git a/dev-ml/ocamlweb/ocamlweb-1.36.ebuild b/dev-ml/ocamlweb/ocamlweb-1.36.ebuild
index aa8b22af8837..64c0e3309437 100644
--- a/dev-ml/ocamlweb/ocamlweb-1.36.ebuild
+++ b/dev-ml/ocamlweb/ocamlweb-1.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlweb/ocamlweb-1.36.ebuild,v 1.1 2005/02/07 12:19:03 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlweb/ocamlweb-1.36.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 DESCRIPTION="O'Caml literate programming tool"
 HOMEPAGE="http://www.lri.fr/~filliatr/ocamlweb/"
diff --git a/dev-ml/ocurl/ChangeLog b/dev-ml/ocurl/ChangeLog
index 25ee9742722d..9414b0f28d73 100644
--- a/dev-ml/ocurl/ChangeLog
+++ b/dev-ml/ocurl/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/ocurl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocurl/ChangeLog,v 1.1 2005/03/08 23:49:23 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocurl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 *ocurl-0.1.6 (09 Mar 2005)
 
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index 851bcbdf3363..ae5b44305d37 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,4 +1,15 @@
-MD5 060cf5a184892f3f3188ad1597d989a9 ocurl-0.1.6.ebuild 582
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 78f3fff0a5f16fe4dd4bf4045bd9fc7b ocurl-0.1.6.ebuild 703
+MD5 cb824a445971aab48e85c11ee2c28e50 ChangeLog 358
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 MD5 b3ad04549e513bda899ad2c0b85bd1c1 files/digest-ocurl-0.1.6 59
 MD5 e5efa2a77ab5e531258715d1254fb7f5 files/0.1.6-curl-helper.patch 750
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCLoT6I1lqEGTUzyQRAjV5AJ9/rBjZkkylvY+mOHu90UhnYWgL7wCghFIO
+ODyjiNIiNELvDtW2vYyA+l8=
+=Gz/H
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/ocurl/ocurl-0.1.6.ebuild b/dev-ml/ocurl/ocurl-0.1.6.ebuild
index 6f8d57c0d4e3..3e0ed271bf82 100644
--- a/dev-ml/ocurl/ocurl-0.1.6.ebuild
+++ b/dev-ml/ocurl/ocurl-0.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/dev-ml/ocurl/ocurl-0.1.6.ebuild,v 1.1 2005/03/08 23:49:23 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocurl/ocurl-0.1.6.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit eutils findlib
 
diff --git a/dev-ml/ounit/ChangeLog b/dev-ml/ounit/ChangeLog
index 4e6953f8e8db..bceb36195f17 100644
--- a/dev-ml/ounit/ChangeLog
+++ b/dev-ml/ounit/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-ml/ounit
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ChangeLog,v 1.1 2004/08/18 12:17:33 mattam Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+*ounit-1.0.1 (06 Feb 2005)
+
+  06 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> ounit-1.0.0.ebuild,
+  +ounit-1.0.1.ebuild:
+  Fix bug #78319, adds newer version.
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> ounit-1.0.0.ebuild:
+  Mark stable on amd64, closes bug #65082
+
+  26 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ounit-1.0.0.ebuild:
+  Stable move.
+
+  21 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ounit-1.0.0.ebuild:
+  Adapt to findlib eclass.
 
 *ounit-1.0.0 (18 Aug 2004)
 
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index edefc170447f..c61501952be7 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -1,3 +1,6 @@
+MD5 d5a08b6e20f8bc00783fface85cdbae1 ounit-1.0.1.ebuild 654
+MD5 1b542847431b02670b2ae974c66c0d57 ounit-1.0.0.ebuild 651
+MD5 e3654db7b6a3c7df8f4fc7c9eb5eb7af ChangeLog 905
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 50906f4125e6fcdf1cb7892846c07433 ounit-1.0.0.ebuild 772
 MD5 02270b9f85472c60819e083e602cb39a files/digest-ounit-1.0.0 61
+MD5 316e681577ced4a2a103c329994975c6 files/digest-ounit-1.0.1 61
diff --git a/dev-ml/ounit/ounit-1.0.0.ebuild b/dev-ml/ounit/ounit-1.0.0.ebuild
index d29a36ca5e12..0368a0e99d79 100644
--- a/dev-ml/ounit/ounit-1.0.0.ebuild
+++ b/dev-ml/ounit/ounit-1.0.0.ebuild
@@ -1,28 +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/dev-ml/ounit/ounit-1.0.0.ebuild,v 1.1 2004/08/18 12:17:33 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
+
+inherit findlib
 
 DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://home.wanadoo.nl/maas/ocaml/"
-SRC_URI="http://home.wanadoo.nl/maas/ocaml/${P}.tar.gz"
+HOMEPAGE="http://www.xs4all.nl/~mmzeeman/ocaml/"
+SRC_URI="http://www.xs4all.nl/~mmzeeman/ocaml/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-DEPEND="dev-lang/ocaml
-        dev-ml/findlib"
+KEYWORDS="x86 ppc amd64"
+DEPEND="dev-lang/ocaml"
+IUSE=""
 
 src_compile() {
 	emake all allopt || die "emake failed"
 }
 
 src_install() {
-	# which directory does the lib go into?
-	destdir=`ocamlfind printconf destdir`
-	# install
-	mkdir -p ${D}${destdir} || die
-	make \
-		OCAMLFIND_DESTDIR=${D}${destdir} \
-		OCAMLFIND_LDCONF=dummy install || die
+	findlib_src_install
+
 	# typo
 	mv LICENCE LICENSE
 	# install documentation
diff --git a/dev-ml/ounit/ounit-1.0.1.ebuild b/dev-ml/ounit/ounit-1.0.1.ebuild
index 3e0ec8999769..bfaa0ae88a20 100644
--- a/dev-ml/ounit/ounit-1.0.1.ebuild
+++ b/dev-ml/ounit/ounit-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.0.1.ebuild,v 1.1 2005/02/06 15:53:36 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/pcre-ocaml/ChangeLog b/dev-ml/pcre-ocaml/ChangeLog
index 634d256d8130..1dadc6c8bd13 100644
--- a/dev-ml/pcre-ocaml/ChangeLog
+++ b/dev-ml/pcre-ocaml/ChangeLog
@@ -1,8 +1,47 @@
 # ChangeLog for dev-ml/pcre-ocaml
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/ChangeLog,v 1.1 2002/06/29 05:34:05 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
-*pcre-ocaml-4.26.3.ebuild (28 Jun 2002)
+  30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pcre-ocaml-5.08.1.ebuild:
+  Stable on ppc.
+
+  27 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> pcre-ocaml-4.33.0.ebuild:
+  Add stable ppc keyword for old version.
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> -pcre-ocaml-5.03.3.ebuild,
+  pcre-ocaml-5.08.1.ebuild:
+  Stable move (fixes bug #65087 for amd64), remove old version.
+
+*pcre-ocaml-5.08.1 (21 Aug 2004)
+
+  21 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -pcre-ocaml-4.26.3.ebuild,
+  pcre-ocaml-5.03.3.ebuild, +pcre-ocaml-5.08.1.ebuild:
+  Version bump, use findlib eclass, remove old, unused version.
+
+  23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> pcre-ocaml-5.03.3.ebuild,
+  metadata.xml:
+  Added ppc keyword and moved x86 to stable. Added metadata.xml.
+
+  13 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  pcre-ocaml-4.26.3.ebuild, pcre-ocaml-4.33.0.ebuild,
+  pcre-ocaml-5.03.3.ebuild:
+  Don't assign default to S; header fix
+
+*pcre-ocaml-5.03.3 (19 Jun 2003)
+
+  19 Jun 2003; George Shapovalov <george@gentoo.org> pcre-ocaml-5.03.3 :
+  new version (#22278), mirrored source on this one as well.
+
+*pcre-ocaml-4.33.0 (23 Feb 2003)
+
+  23 Feb 2003; George Shapovalov <george@gentoo.org> pcre-ocaml-4.33.0.ebuild :
+  
+  new version (#12318)
+  as author has a habit of removing old versions from his homepage, this one is mirrored
+  ebuild submitted by Bardur Arantsson <bardur-gta@odense.kollegienet.dk>
+
+*pcre-ocaml-4.26.3 (28 Jun 2002)
 
   28 Jun 2002; G Shapovalov <george@gentoo.org> all :
 
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index e69de29bb2d1..253734a713ff 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -0,0 +1,6 @@
+MD5 0409df50d28c013badd14d0351a93e84 pcre-ocaml-4.33.0.ebuild 883
+MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
+MD5 fdcdf0c620d446b637e50c911b04c0d6 ChangeLog 1824
+MD5 0e89eec2c441baf76ceebfd4f4ebb47b pcre-ocaml-5.08.1.ebuild 684
+MD5 470fb9405cf453447cc8d6d579bec3c6 files/digest-pcre-ocaml-4.33.0 69
+MD5 a42aeedb3caa89bccd455a569ef8604a files/digest-pcre-ocaml-5.08.1 69
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-4.33.0.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-4.33.0.ebuild
index 6d4dbfa78277..a02d29371f9b 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-4.33.0.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-4.33.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-4.33.0.ebuild,v 1.1 2003/02/23 21:26:25 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-4.33.0.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
 HOMEPAGE="http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html"
@@ -11,10 +11,9 @@ DEPEND=">=dev-lang/ocaml-3.04-r1
 	>=dev-ml/findlib-0.8"
 
 SRC_URI="http://www.oefai.at/~markus/ocaml_sources/${P}.tar.bz2"
-S=${WORKDIR}/${P}
 
 SLOT="3"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 src_compile() {
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild
index 17838c055f80..89277d0597fd 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild,v 1.1 2004/08/21 20:56:24 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit findlib
 
@@ -13,7 +13,7 @@ DEPEND=">=dev-lang/ocaml-3.07
 	>=dev-libs/libpcre-4.5"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 
 src_compile() {
 	make all || die
diff --git a/dev-ml/pomap/ChangeLog b/dev-ml/pomap/ChangeLog
index 8e406f954ea0..53fa1b55af4d 100644
--- a/dev-ml/pomap/ChangeLog
+++ b/dev-ml/pomap/ChangeLog
@@ -1,8 +1,29 @@
 # ChangeLog for dev-ml/pomap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/ChangeLog,v 1.1 2003/04/24 08:19:27 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
-*pomap-2.9.1.ebuild (24 Apr 2003)
+  22 Apr 2005; Simon Stelling <blubb@gentoo.org> pomap-2.9.4.ebuild:
+  stable on amd64
+
+  25 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> pomap-2.9.4.ebuild:
+  Fix bug #65089 (unsupported parallel builds) and add ~amd64 as suggested.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> pomap-2.9.4.ebuild:
+  Added to ~ppc.
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -pomap-2.9.1.ebuild,
+  pomap-2.9.4.ebuild:
+  Remove old version, move to stable.
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> pomap-2.9.4.ebuild:
+  Use findlib eclass.
+
+*pomap-2.9.4 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> +pomap-2.9.4.ebuild:
+  Version bump, fixes bug #56910.
+
+*pomap-2.9.1 (24 Apr 2003)
 
   24 Apr 2003; George Shapovalov <george@gentoo.org> pomap-2.9.1.ebuild, files/{digest-pomap-2.9.1} :
   initial release (#17520)
diff --git a/dev-ml/pomap/Manifest b/dev-ml/pomap/Manifest
index e69de29bb2d1..0879200b85e0 100644
--- a/dev-ml/pomap/Manifest
+++ b/dev-ml/pomap/Manifest
@@ -0,0 +1,4 @@
+MD5 f5d191b21c3b898f4d8803859c9e1ced ChangeLog 1148
+MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
+MD5 5156bff66b680d428036151f9320b912 pomap-2.9.4.ebuild 720
+MD5 a42b972a131cab66fd85e3dc56619657 files/digest-pomap-2.9.4 63
diff --git a/dev-ml/pomap/pomap-2.9.4.ebuild b/dev-ml/pomap/pomap-2.9.4.ebuild
index 319dbb1ca4eb..1dda701a1e05 100644
--- a/dev-ml/pomap/pomap-2.9.4.ebuild
+++ b/dev-ml/pomap/pomap-2.9.4.ebuild
@@ -1,30 +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/dev-ml/pomap/pomap-2.9.4.ebuild,v 1.1 2004/08/08 09:28:17 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-2.9.4.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
+
+inherit findlib
 
 DESCRIPTION="Partially Ordered Map ADT for O'Caml"
 HOMEPAGE="http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html"
 LICENSE="LGPL-2.1"
-DEPEND=">=dev-lang/ocaml-3.06
-	>=dev-ml/findlib-0.8"
+DEPEND=">=dev-lang/ocaml-3.06"
 SRC_URI="http://www.oefai.at/~markus/ocaml_sources/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64"
 IUSE=""
 
 src_compile() {
-	emake all || die
+	emake -j1 all || die
 }
 
 src_install () {
-	# which directory does the lib go into?
-	destdir=`ocamlfind printconf destdir`
-
-	# install
-	mkdir -p ${D}${destdir} || die
-	make OCAMLFIND_DESTDIR=${D}${destdir} \
-		OCAMLFIND_LDCONF=dummy install || die
+	findlib_src_install
 
 	# install documentation
 	dodoc LICENSE README VERSION Changes
diff --git a/dev-ml/postgresql-ocaml/ChangeLog b/dev-ml/postgresql-ocaml/ChangeLog
index 97a6919795e2..e63cf1bf74d7 100644
--- a/dev-ml/postgresql-ocaml/ChangeLog
+++ b/dev-ml/postgresql-ocaml/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/postgresql-ocaml
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/ChangeLog,v 1.1 2005/09/21 20:15:06 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 *postgresql-ocaml-1.4.6 (21 Sep 2005)
 
diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest
index 9d409a770532..74150ebdacbd 100644
--- a/dev-ml/postgresql-ocaml/Manifest
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -1,8 +1,4 @@
-MD5 bc1ba817d980fe1171e4ea1e7f9bb889 postgresql-ocaml-1.3.3.ebuild 813
-MD5 2b5ea54f5a30e3f018866f6077c28b3c postgresql-ocaml-1.4.6.ebuild 753
+MD5 8e1b4435b519334eadddf3f115234e42 postgresql-ocaml-1.4.6.ebuild 854
+MD5 313a3bc207873baac4c7d39ddcc770bf ChangeLog 392
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
-MD5 2b9cf1806a7e163a933c2b2cc712038f postgresql-ocaml-1.3.0.ebuild 1037
-MD5 e941b4c5752e6ff31f6746c74d77907a files/digest-postgresql-ocaml-1.3.0 73
-MD5 c7ef3a487438ecdb067898527076ab25 files/digest-postgresql-ocaml-1.3.3 74
 MD5 c7ef3a487438ecdb067898527076ab25 files/digest-postgresql-ocaml-1.4.6 74
-MD5 d69017d2d9c8a7c6a4b67d2cc74010a0 files/postgresql-ocaml-1.3.0-failwith.patch 488
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-1.4.6.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-1.4.6.ebuild
index 58ac3f1feec4..391417078630 100644
--- a/dev-ml/postgresql-ocaml/postgresql-ocaml-1.4.6.ebuild
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-1.4.6.ebuild,v 1.1 2005/09/21 20:15:06 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-1.4.6.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/pxp/ChangeLog b/dev-ml/pxp/ChangeLog
index 9b09f61e8274..cb46603c5cf2 100644
--- a/dev-ml/pxp/ChangeLog
+++ b/dev-ml/pxp/ChangeLog
@@ -1,8 +1,39 @@
 # ChangeLog for dev-ml/pxp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/ChangeLog,v 1.1 2003/03/10 04:53:15 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
-*pxp-1.1.5.ebuild (09 Mar 2003)
+*pxp-1.1.95 (10 Nov 2005)
+
+  10 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> +pxp-1.1.96.ebuild:
+  Version bump, compatible with ocaml 3.09.
+
+*pxp-1.1.95 (09 Mar 2005)
+
+  09 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> -pxp-1.1.94.2.ebuild,
+  +pxp-1.1.95.ebuild:
+  Really latest dev. version.
+
+*pxp-1.1.94.2 (09 Mar 2005)
+
+  09 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> +pxp-1.1.94.2.ebuild:
+  Latest dev version.
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> pxp-1.1.6.ebuild:
+  Mark stable on amd64, fixes bug #65902
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> pxp-1.1.6.ebuild:
+  Added to ~ppc.
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -pxp-1.1.5.ebuild,
+  pxp-1.1.6.ebuild:
+  Move to findlib eclass, add doc USE flag.
+
+*pxp-1.1.6 (18 Aug 2004)
+
+  18 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> pxp-1.1.6.ebuild:
+  Version bump
+
+*pxp-1.1.5 (09 Mar 2003)
 
   09 Mar 2003; George Shapovalov <george@gentoo.org> ChangeLog, pxp-1.1.5.ebuild, files/digest-pxp-1.1.5 :
   initial release (#15903)
diff --git a/dev-ml/pxp/Manifest b/dev-ml/pxp/Manifest
index e69de29bb2d1..3a33f3d2cad9 100644
--- a/dev-ml/pxp/Manifest
+++ b/dev-ml/pxp/Manifest
@@ -0,0 +1,8 @@
+MD5 33487038574cd2aad6a393386a475cfc pxp-1.1.6.ebuild 969
+MD5 83d63c4eeb5da290b2da7e5f6faef66e pxp-1.1.96.ebuild 978
+MD5 81a1aa6a61f1901ee44d682b0951bc8c pxp-1.1.95.ebuild 978
+MD5 be30435d31ed6a72574c61b467847e51 ChangeLog 1339
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 80a9e9164ea33afa62da74738d4415cd files/digest-pxp-1.1.95 62
+MD5 bd7eb8f270559fe43a40c6ffffce5a31 files/digest-pxp-1.1.96 62
+MD5 cc510152563ebbd7b5b9f13f5bbbf3aa files/digest-pxp-1.1.6 61
diff --git a/dev-ml/pxp/pxp-1.1.6.ebuild b/dev-ml/pxp/pxp-1.1.6.ebuild
index 153e2292e00e..e80188414970 100644
--- a/dev-ml/pxp/pxp-1.1.6.ebuild
+++ b/dev-ml/pxp/pxp-1.1.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.6.ebuild,v 1.1 2004/08/18 20:27:01 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.6.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
+
+inherit findlib
 
 DESCRIPTION="validating XML parser library for O'Caml"
 HOMEPAGE="http://www.ocaml-programming.de/packages/documentation/pxp/index_dev.html"
@@ -8,12 +10,12 @@ SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
-IUSE=""
+KEYWORDS="x86 ~ppc amd64"
+IUSE="doc"
 
-DEPEND=">=dev-ml/pcre-ocaml-4.31
-	>=dev-ml/ocamlnet-0.94
-	>=dev-ml/findlib-0.8"
+DEPEND="dev-lang/ocaml
+>=dev-ml/pcre-ocaml-4.31
+>=dev-ml/ocamlnet-0.94"
 
 src_compile() {
 	#the included configure does not support many standard switches and is quite picky
@@ -22,7 +24,15 @@ src_compile() {
 }
 
 src_install() {
-	local destdir=`ocamlfind printconf destdir`
-	dodir ${destdir}
-	make OCAMLFIND_DESTDIR=${D}${destdir} install || die
+	findlib_src_install
+
+	cd doc
+	dodoc ABOUT-FINDLIB DEV EXTENSIONS README RELEASE-NOTES SPEC design.txt
+
+	if use doc; then
+		dodoc manual/ps/pxp.ps
+		dohtml manual/html/*
+		insinto /usr/share/doc/${PF}/html/pic
+		doins manual/html/pic/*
+	fi
 }
diff --git a/dev-ml/pxp/pxp-1.1.95.ebuild b/dev-ml/pxp/pxp-1.1.95.ebuild
index 93e48f5554f8..184b4a09ace7 100644
--- a/dev-ml/pxp/pxp-1.1.95.ebuild
+++ b/dev-ml/pxp/pxp-1.1.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.95.ebuild,v 1.1 2005/03/09 00:22:40 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.95.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/pxp/pxp-1.1.96.ebuild b/dev-ml/pxp/pxp-1.1.96.ebuild
index 81d7eb9103a4..c199f736140f 100644
--- a/dev-ml/pxp/pxp-1.1.96.ebuild
+++ b/dev-ml/pxp/pxp-1.1.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.96.ebuild,v 1.1 2005/11/10 22:53:15 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pxp/pxp-1.1.96.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/res/ChangeLog b/dev-ml/res/ChangeLog
index cf978f00a6e8..0bd6d9ae7415 100644
--- a/dev-ml/res/ChangeLog
+++ b/dev-ml/res/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/res
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/ChangeLog,v 1.1 2004/08/21 19:27:30 mattam Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
+
+  17 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> res-2.1.1.ebuild:
+  Add -j1, doesn't support parallel builds.
+
+  30 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> res-2.1.1.ebuild:
+  Mark stable on amd64, fixes bug #65091
 
 *res-2.1.1 (21 Aug 2004)
 
diff --git a/dev-ml/res/Manifest b/dev-ml/res/Manifest
index 92641b921d1d..7b107cecd6e5 100644
--- a/dev-ml/res/Manifest
+++ b/dev-ml/res/Manifest
@@ -1,2 +1,4 @@
-MD5 c25dc542726a4a80122f61e991f1e54d res-2.1.1.ebuild 855
+MD5 071652ee7fc48f6dac03bd9c4e1bb9a6 res-2.1.1.ebuild 755
+MD5 21536a1f7df884986e630274ad69e87d ChangeLog 693
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 194f6ec16d8cbbd6478229695c0825c5 files/digest-res-2.1.1 61
diff --git a/dev-ml/res/res-2.1.1.ebuild b/dev-ml/res/res-2.1.1.ebuild
index 99b95ce7e8b5..1b69923bf081 100644
--- a/dev-ml/res/res-2.1.1.ebuild
+++ b/dev-ml/res/res-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-2.1.1.ebuild,v 1.1 2004/08/21 19:27:30 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-2.1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 inherit findlib
 
@@ -11,11 +11,11 @@ LICENSE="LGPL-2.1"
 
 DEPEND=">=dev-lang/ocaml-3.07"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 IUSE="doc"
 
 src_compile() {
-	make all || die
+	emake -j1 all || die
 
 	if use doc; then
 		cd lib && make htdoc
diff --git a/dev-ml/rpc/ChangeLog b/dev-ml/rpc/ChangeLog
index 9207910501cc..1bd1737b705d 100644
--- a/dev-ml/rpc/ChangeLog
+++ b/dev-ml/rpc/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/rpc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/rpc/ChangeLog,v 1.1 2005/03/27 15:30:56 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/rpc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 *rpc-0.4.1 (27 Mar 2005)
 
diff --git a/dev-ml/rpc/Manifest b/dev-ml/rpc/Manifest
index a69c1bc819ab..6dbc46a9d682 100644
--- a/dev-ml/rpc/Manifest
+++ b/dev-ml/rpc/Manifest
@@ -1,3 +1,5 @@
-MD5 5c5107341296cc1f1c0a0f83ce1e647d rpc-0.4.1.ebuild 1290
+MD5 c79db4e525104378a413d0d8cdca5fcf rpc-0.4.1.ebuild 1525
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 5bc0121dd71d10d78b6c8e1558ac8e59 ChangeLog 454
 MD5 6c96519c2eaa540cbf4a847d694aad06 files/digest-rpc-0.4.1 61
 MD5 5ac175b0a62d4fb3064745c41e1eff02 files/ocamlrpcgen.1 1021
diff --git a/dev-ml/rpc/rpc-0.4.1.ebuild b/dev-ml/rpc/rpc-0.4.1.ebuild
index f967434dec2b..63b90f26e835 100644
--- a/dev-ml/rpc/rpc-0.4.1.ebuild
+++ b/dev-ml/rpc/rpc-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/rpc/rpc-0.4.1.ebuild,v 1.1 2005/03/27 15:30:56 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/rpc/rpc-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:55:48 chriswhite Exp $
 
 inherit findlib
 
diff --git a/dev-ml/ulex/ChangeLog b/dev-ml/ulex/ChangeLog
index 6949da20fa86..b2553096b4bf 100644
--- a/dev-ml/ulex/ChangeLog
+++ b/dev-ml/ulex/ChangeLog
@@ -1,8 +1,38 @@
 # ChangeLog for dev-ml/ulex
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ChangeLog,v 1.1 2003/10/23 04:45:29 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ChangeLog,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
-*ulex-0.2.ebuild (22 Oct 2003)
+*ulex-0.8 (10 Nov 2005)
+
+  10 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> :
+  Version bump, compatible with latest ocaml.
+
+  17 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> ulex-0.5.ebuild:
+  Stable on x86, ppc.
+
+  25 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ulex-0.4.ebuild,
+  ulex-0.5.ebuild:
+  Use findlib eclass, move to stable.
+
+*ulex-0.5 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -ulex-0.2-r1.ebuild,
+  -ulex-0.2.ebuild, +ulex-0.4.ebuild, +ulex-0.5.ebuild:
+  New revisions for ocaml-3.07 and 3.08.
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -ulex-0.2-r1.ebuild,
+  -ulex-0.2.ebuild:
+  Prepare for ocaml-3.08.
+
+*ulex-0.2-r1 (10 May 2004)
+
+  10 May 2004; Matthieu Sozeau <mattam@gentoo.org> ulex-0.2-r1.ebuild:
+  Fix bug #50625.
+
+  23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> ulex-0.2.ebuild:
+  Mark stable on x86 and testing on ppc.
+
+*ulex-0.2 (22 Oct 2003)
 
   22 Oct 2003; George Shapovalov <george@gentoo.org> Manifest, ulex-0.2.ebuild, files/{digest-ulex-0.2,ulex-0.2-Makefile.patch} :
   initial release (#30391)
diff --git a/dev-ml/ulex/Manifest b/dev-ml/ulex/Manifest
index 7f23e326b4bf..ba7ea96be90b 100644
--- a/dev-ml/ulex/Manifest
+++ b/dev-ml/ulex/Manifest
@@ -1,3 +1,18 @@
-MD5 a91388e1484f96cab1e898b9ff3b5a10 ulex-0.2.ebuild 808
-MD5 1e27715144205a1f593c9a12864846e8 files/digest-ulex-0.2 59
-MD5 c94ec73c168a45ea628225ed73c75e54 files/ulex-0.2-Makefile.patch 1022
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 88ba2f0885605b2ad127870b7d3c6ad7 ChangeLog 1358
+MD5 8242016cc55c147692d4983648ba46d0 files/digest-ulex-0.4 59
+MD5 2a453505029c0759cfaba969ac497f19 files/digest-ulex-0.5 59
+MD5 f5f6b36ec5ae45963bb4277ae6145e63 files/digest-ulex-0.8 59
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 38163001bcf28a713f1f73bc5bfcc415 ulex-0.4.ebuild 592
+MD5 0c5d11bd8946487901daff3e7a060f26 ulex-0.5.ebuild 569
+MD5 f79dd1a0ca2454b94958e96a49a39ccf ulex-0.8.ebuild 569
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdEOhI1lqEGTUzyQRAnPtAJsFAMVi+Ug/e6sLKMBOvEzc86EckgCgtxRk
+qMV1YWMrRp+KfkVcKNTXgpQ=
+=Brvg
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/ulex/ulex-0.4.ebuild b/dev-ml/ulex/ulex-0.4.ebuild
index 35801681caba..7ee79c85dd94 100644
--- a/dev-ml/ulex/ulex-0.4.ebuild
+++ b/dev-ml/ulex/ulex-0.4.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.4.ebuild,v 1.1 2004/08/08 07:11:03 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.4.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
-inherit eutils
+inherit eutils findlib
 
-DESCRIPTION="a lexer generator for unicode"
+DESCRIPTION="A lexer generator for unicode"
 HOMEPAGE="http://www.cduce.org"
 SRC_URI="http://www.cduce.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-3.06
-!>=dev-lang/ocaml-3.08
-	>=dev-ml/findlib-0.8"
+!>=dev-lang/ocaml-3.08"
 
 src_compile() {
 	make all || die
@@ -23,9 +22,6 @@ src_compile() {
 }
 
 src_install() {
-	local destdir=`ocamlfind printconf destdir`
-	dodir ${destdir}
-	# dummy ld.conf, packages do not install C libraries
-	make OCAMLFIND_LDCONF=dummy OCAMLFIND_DESTDIR=${D}${destdir} install || die
+	findlib_src_install
 	dodoc README CHANGES
 }
diff --git a/dev-ml/ulex/ulex-0.5.ebuild b/dev-ml/ulex/ulex-0.5.ebuild
index 16158d521e68..c5b06687f01a 100644
--- a/dev-ml/ulex/ulex-0.5.ebuild
+++ b/dev-ml/ulex/ulex-0.5.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/dev-ml/ulex/ulex-0.5.ebuild,v 1.1 2004/08/08 07:11:03 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
-inherit eutils
+inherit eutils findlib
 
-DESCRIPTION="a lexer generator for unicode"
+DESCRIPTION="A lexer generator for unicode"
 HOMEPAGE="http://www.cduce.org"
 SRC_URI="http://www.cduce.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND=">=dev-lang/ocaml-3.08
-	>=dev-ml/findlib-0.8"
+DEPEND=">=dev-lang/ocaml-3.08"
 
 src_compile() {
 	make all || die
@@ -22,9 +21,6 @@ src_compile() {
 }
 
 src_install() {
-	local destdir=`ocamlfind printconf destdir`
-	dodir ${destdir}
-	# dummy ld.conf, packages do not install C libraries
-	make OCAMLFIND_LDCONF=dummy OCAMLFIND_DESTDIR=${D}${destdir} install || die
+	findlib_src_install
 	dodoc README CHANGES
 }
diff --git a/dev-ml/ulex/ulex-0.8.ebuild b/dev-ml/ulex/ulex-0.8.ebuild
index fa03055db58e..d16e03dccf99 100644
--- a/dev-ml/ulex/ulex-0.8.ebuild
+++ b/dev-ml/ulex/ulex-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.8.ebuild,v 1.1 2005/11/10 22:32:00 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:47 chriswhite Exp $
 
 inherit eutils findlib
 
diff --git a/dev-ml/xstr/ChangeLog b/dev-ml/xstr/ChangeLog
index ea8448e1cb24..944e3132aef0 100644
--- a/dev-ml/xstr/ChangeLog
+++ b/dev-ml/xstr/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ml/xstr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/xstr/ChangeLog,v 1.1 2005/03/08 23:21:03 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/xstr/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 *xstr-0.2.1 (09 Mar 2005)
 
diff --git a/dev-ml/xstr/Manifest b/dev-ml/xstr/Manifest
index a539643d5686..9779b6d6657f 100644
--- a/dev-ml/xstr/Manifest
+++ b/dev-ml/xstr/Manifest
@@ -1,2 +1,14 @@
-MD5 66e5f45fe9aa015328138ac4ccbb82f6 xstr-0.2.1.ebuild 576
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b3696e8e47a96f762a6c4a27c00058e xstr-0.2.1.ebuild 653
+MD5 b9d42d20b2ca51101dfcd11e5e8517ad ChangeLog 371
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 7ebc271b8ae47a869632df80e741321a files/digest-xstr-0.2.1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCO3vsI1lqEGTUzyQRAp6zAJ4/fS5Bdt5Y8qGkf911EbGpDBAoWQCaAhte
+mzkNh1/uElSSwr1RRiG1f5E=
+=Hdhg
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/xstr/xstr-0.2.1.ebuild b/dev-ml/xstr/xstr-0.2.1.ebuild
index 58b11df0259d..16256d0a4113 100644
--- a/dev-ml/xstr/xstr-0.2.1.ebuild
+++ b/dev-ml/xstr/xstr-0.2.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/dev-ml/xstr/xstr-0.2.1.ebuild,v 1.1 2005/03/08 23:21:03 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/xstr/xstr-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit findlib
 
diff --git a/eclass/64-bit.eclass b/eclass/64-bit.eclass
index 88a58f35e773..33abcd212396 100644
--- a/eclass/64-bit.eclass
+++ b/eclass/64-bit.eclass
@@ -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/eclass/64-bit.eclass,v 1.1 2003/12/10 23:51:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/64-bit.eclass,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
 
-# Recognize 64-bit arches... This is to help when adding -fPIC, for
-# example:
+# Recognize 64-bit arches...
+# Example:
+#      64-bit && epatch ${P}-64bit.patch
 #
-# 		64-bit && append-flags -fPIC
-# 
+
 64-bit() {
-	case "${ARCH}" in 
+	[[ ${PN} != "R" && ${PN} != "rxvt-unicode" ]] && die "DO NOT USE THIS ECLASS"
+
+	case "${ARCH}" in
 		alpha|*64) return 0 ;;
 		*)         return 1 ;;
 	esac
diff --git a/eclass/ELT-patches/fbsd-conf/1.4.0 b/eclass/ELT-patches/fbsd-conf/1.4.0
index 90c63475bcce..b986f8d8f519 100644
--- a/eclass/ELT-patches/fbsd-conf/1.4.0
+++ b/eclass/ELT-patches/fbsd-conf/1.4.0
@@ -1,117 +1,29 @@
-Index: libiconv-1.10/configure
+Index: expat-1.95.8/configure
 ===================================================================
---- libiconv-1.10.orig/configure
-+++ libiconv-1.10/configure
-@@ -8902,7 +8902,14 @@ kfreebsd*-gnu)
+--- expat-1.95.8.orig/configure
++++ expat-1.95.8/configure
+@@ -5479,7 +5479,13 @@ freebsd1*)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
-+  # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
 +  case $host_vendor in
 +    gentoo)
 +      version_type=linux ;;
 +    *)
 +      version_type=freebsd-$objformat ;;
 +  esac
-+
++  
    case $version_type in
      freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -8913,6 +8920,12 @@ freebsd*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+@@ -5490,6 +5496,12 @@ freebsd*)
+       library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
        need_version=yes
        ;;
 +    linux)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+      need_lib_prefix=no
-+      need_version=no
-+      ;;
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
-@@ -12620,7 +12633,14 @@ kfreebsd*-gnu)
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
-+  case $host_vendor in
-+    gentoo)
-+      version_type=linux ;;
-+    *)
-+      version_type=freebsd-$objformat ;;
-+  esac
-+
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -12631,6 +12651,12 @@ freebsd*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-       need_version=yes
-       ;;
-+    linux)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+      need_lib_prefix=no
-+      need_version=no
-+      ;;
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
-@@ -15784,7 +15810,14 @@ kfreebsd*-gnu)
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
-+  case $host_vendor in
-+    gentoo)
-+      version_type=linux ;;
-+    *)
-+      version_type=freebsd-$objformat ;;
-+  esac
-+
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -15795,6 +15828,12 @@ freebsd*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-       need_version=yes
-       ;;
-+    linux)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+      need_lib_prefix=no
-+      need_version=no
-+      ;;
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
-@@ -18150,7 +18189,14 @@ kfreebsd*-gnu)
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
-+  # Gentoo/FreeBSD uses linux-style versioning to be user-friendly.
-+  case $host_vendor in
-+    gentoo)
-+      version_type=linux ;;
-+    *)
-+      version_type=freebsd-$objformat ;;
-+  esac
-+
-   case $version_type in
-     freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -18161,6 +18207,12 @@ freebsd*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-       need_version=yes
-       ;;
-+    linux)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+      soname_spec='${libname}${release}${shared_ext}$major'
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}.so'
++      soname_spec='${libname}${release}.so$major'
 +      need_lib_prefix=no
 +      need_version=no
 +      ;;
diff --git a/eclass/ELT-patches/fix-relink/1.4.0 b/eclass/ELT-patches/fix-relink/1.4.0
index c8edade31e35..1b12c9b1a360 100644
--- a/eclass/ELT-patches/fix-relink/1.4.0
+++ b/eclass/ELT-patches/fix-relink/1.4.0
@@ -1,14 +1,14 @@
 --- ltmain.sh	2003-09-24 18:22:17.528129376 +0200
 +++ ltmain.sh	2003-09-24 18:23:17.101072912 +0200
 @@ -1582,6 +1582,8 @@
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
- 	    tmp_libs=
-+	    # PKGW 
-+	    dependency_libs=
- 	    for deplib in $dependency_libs; do
- 	      deplibs="$deplib $deplibs"
-               if test "X$duplicate_deps" = "Xyes" ; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  tmp_libs=
++	  # PKGW 
++	  dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    #echo "Adding $deplib to \$deplibs"
+ 	    deplibs="$deplib $deplibs"
 @@ -1699,6 +1701,8 @@
  	  fi
  
diff --git a/eclass/ELT-patches/portage/1.2.0 b/eclass/ELT-patches/portage/1.2.0
index 0d0102d8c73c..70b02619c601 100644
--- a/eclass/ELT-patches/portage/1.2.0
+++ b/eclass/ELT-patches/portage/1.2.0
@@ -1,13 +1,7 @@
 # Dummy patch, not needed by libtool-1.2
 
---- ltmain.sh	2005-09-02 21:42:18.000000000 +0200
-+++ ltmain.sh	2005-09-02 21:42:34.000000000 +0200
-@@ -29,7 +29,7 @@
- 
- # Constants.
- PROGRAM=ltmain.sh
+--- ltmain.sh
++++ ltmain.sh
+@@ -32,1 +32,1 @@
 -PACKAGE=libtool
 +PACKAGE=libtool
- VERSION=1.2
- 
- default_mode=
diff --git a/eclass/ELT-patches/portage/1.3.0c b/eclass/ELT-patches/portage/1.3.0c
index d2166f13a841..e862f835ad43 100644
--- a/eclass/ELT-patches/portage/1.3.0c
+++ b/eclass/ELT-patches/portage/1.3.0c
@@ -29,10 +29,10 @@
 +		  fi
 +		  # We do not want portage's build root ($S) present.
 +		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+		    mynewdependency_lib=""
 +		  # We do not want portage's install root ($D) present.
 +		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
 +		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
 +		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		  else
diff --git a/eclass/ELT-patches/portage/1.3.3 b/eclass/ELT-patches/portage/1.3.3
index 3809fb815e87..8dab92914e91 100644
--- a/eclass/ELT-patches/portage/1.3.3
+++ b/eclass/ELT-patches/portage/1.3.3
@@ -39,10 +39,10 @@
 +		  fi
 +		  # We do not want portage's build root ($S) present.
 +		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+		    mynewdependency_lib=""
 +		  # We do not want portage's install root ($D) present.
 +		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
 +		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
 +		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		  else
diff --git a/eclass/ELT-patches/portage/1.3.4 b/eclass/ELT-patches/portage/1.3.4
index 3809fb815e87..8dab92914e91 100644
--- a/eclass/ELT-patches/portage/1.3.4
+++ b/eclass/ELT-patches/portage/1.3.4
@@ -39,10 +39,10 @@
 +		  fi
 +		  # We do not want portage's build root ($S) present.
 +		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+		    mynewdependency_lib=""
 +		  # We do not want portage's install root ($D) present.
 +		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
 +		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
 +		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		  else
diff --git a/eclass/ELT-patches/portage/1.4.0 b/eclass/ELT-patches/portage/1.4.0
index a49f33329f93..6152dfd6fe4b 100644
--- a/eclass/ELT-patches/portage/1.4.0
+++ b/eclass/ELT-patches/portage/1.4.0
@@ -37,10 +37,10 @@ name should be bumped, but the patch content should stay fairly the same.
 +		  fi
 +		  # We do not want portage's build root ($S) present.
 +		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+		    mynewdependency_lib=""
 +		  # We do not want portage's install root ($D) present.
 +		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
 +		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
 +		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		  else
diff --git a/eclass/ELT-patches/portage/1.4.1 b/eclass/ELT-patches/portage/1.4.1
index d4592784c4bc..6152dfd6fe4b 100644
--- a/eclass/ELT-patches/portage/1.4.1
+++ b/eclass/ELT-patches/portage/1.4.1
@@ -1,6 +1,14 @@
+Note that if you update this patch, please update this one as well:
+
+  eclass/ELT-patches/portage/1.4.1
+
+The file name can stay 1.4.1, as it will still apply to all versions.  Only
+when a new version of libtool comes out that it do not apply to, then the
+name should be bumped, but the patch content should stay fairly the same.
+
 --- ltmain.sh	Wed Apr  3 01:19:37 2002
 +++ ltmain.sh	Sun May 26 19:50:52 2002
-@@ -3940,9 +3940,46 @@
+@@ -3940,9 +3940,50 @@
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit 1
  		fi
@@ -8,30 +16,33 @@
 +		# We do not want portage's install root ($D) present.  Check only for
 +		# this if the .la is being installed.
 +		if test "$installed" = yes && test "$D"; then
-+		  eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
++		  eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		else
 +		  mynewdependency_lib="$libdir/$name"
 +		fi
 +		# Do not add duplicates
 +		if test "$mynewdependency_lib"; then
-+		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++		  my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
++		  if test -z "$my_little_ninja_foo_1"; then
 +		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
 +		  fi
 +		fi
 +		;;
 +		  *)
 +		if test "$installed" = yes; then
-+   	  # Rather use S=WORKDIR if our version of portage supports it.
-+   	  # This is because some ebuild (gcc) do not use $S as buildroot.
++		  # Rather use S=WORKDIR if our version of portage supports it.
++		  # This is because some ebuild (gcc) do not use $S as buildroot.
 +		  if test "$PWORKDIR"; then
 +		    S="$PWORKDIR"
 +		  fi
 +		  # We do not want portage's build root ($S) present.
-+		  if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
-+		    mynewdependency_lib=""
++		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
 +		  # We do not want portage's install root ($D) present.
-+		  elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
-+		    eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
++		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
++		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
++		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		  else
 +		    mynewdependency_lib="$deplib"
 +		  fi
@@ -40,7 +51,8 @@
 +		fi
 +		# Do not add duplicates
 +		if test "$mynewdependency_lib"; then
-+		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
++		  my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
++		  if test -z "$my_little_ninja_foo_4"; then
 +			newdependency_libs="$newdependency_libs $mynewdependency_lib"
 +		  fi
 +		fi
@@ -55,7 +67,7 @@
  	  esac
 +	  # Do not add duplicates
 +	  if test "$installed" = yes && test "$D"; then
-+	    install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
++	    install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +	  fi
  	  $echo > $output "\
  # $outputname - a libtool library file
diff --git a/eclass/ELT-patches/portage/1.5.10 b/eclass/ELT-patches/portage/1.5.10
index f19e8ec2ee35..56a19c731a81 100644
--- a/eclass/ELT-patches/portage/1.5.10
+++ b/eclass/ELT-patches/portage/1.5.10
@@ -13,7 +13,7 @@ name should be bumped, but the patch content should stay fairly the same.
  		  exit 1
  		fi
 -		newdependency_libs="$newdependency_libs $libdir/$name"
-+		if [ "x$EGREP" = x ] ; then
++		if test "x$EGREP" = x ; then
 +			EGREP=egrep
 +		fi
 +		# We do not want portage's install root ($D) present.  Check only for
@@ -40,10 +40,10 @@ name should be bumped, but the patch content should stay fairly the same.
 +		  fi
 +		  # We do not want portage's build root ($S) present.
 +		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+		    mynewdependency_lib=""
 +		  # We do not want portage's install root ($D) present.
 +		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
++		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
++		    mynewdependency_lib=""
 +		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
 +		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 +		  else
diff --git a/eclass/ELT-patches/sed/1.4.3 b/eclass/ELT-patches/sed/1.4.3
index 20178a03de05..9c51ac2de0ff 100644
--- a/eclass/ELT-patches/sed/1.4.3
+++ b/eclass/ELT-patches/sed/1.4.3
@@ -1,11 +1,13 @@
 --- ltmain.sh	2003-02-13 14:54:24.000000000 +0100
 +++ ltmain.sh	2003-02-13 15:24:49.000000000 +0100
-@@ -48,6 +48,9 @@ EOF
+@@ -48,6 +48,11 @@ EOF
    exit 0
  fi
  
-+# define SED for historic ltconfig's generated by Libtool 1.3
++# define variables for historic ltconfig's generated by Libtool 1.3
 +test -z "$SED" && SED=sed
++test -z "$EGREP" && EGREP=egrep
++test -z "$LTCC" && LTCC=${CC-gcc}
 +
  # The name of this program.
  progname=`$echo "$0" | ${SED} 's%^.*/%%'`
diff --git a/eclass/ELT-patches/sed/1.5.6 b/eclass/ELT-patches/sed/1.5.6
index 0aa65c99fe96..5efd5310dcff 100644
--- a/eclass/ELT-patches/sed/1.5.6
+++ b/eclass/ELT-patches/sed/1.5.6
@@ -5,10 +5,10 @@
      SED=sed
  fi
 +# Same for EGREP, and just to be sure, do LTCC as well
-+if [ "x$EGREP" = x ] ; then
++if test "x$EGREP" = x ; then
 +    EGREP=egrep
 +fi
-+if [ "x$LTCC" = x ] ; then
++if test "x$LTCC" = x ; then
 +    LTCC=${CC-gcc}
 +fi
  
diff --git a/eclass/alternatives.eclass b/eclass/alternatives.eclass
index 2c7eecc3897f..12c7f8ad3b1d 100644
--- a/eclass/alternatives.eclass
+++ b/eclass/alternatives.eclass
@@ -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/eclass/alternatives.eclass,v 1.1 2003/10/07 17:21:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/alternatives.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
 
 # Author :     Alastair Tse <liquidx@gentoo.org> (03 Oct 2003)
 # Short Desc:  Creates symlink to the latest version of multiple slotted
@@ -12,18 +12,18 @@
 #  latest version. However, depending on the order the user has merged them,
 #  more often than not, the symlink maybe clobbered by the older versions.
 #
-#  This eclass provides a convenience function that needs to be given a 
+#  This eclass provides a convenience function that needs to be given a
 #  list of alternatives (descending order of recent-ness) and the symlink.
 #  It will choose the latest version if can find installed and create
-#  the desired symlink. 
+#  the desired symlink.
 #
-#  There are two ways to use this eclass. First is by declaring two variables 
-#  $SOURCE and $ALTERNATIVES where $SOURCE is the symlink to be created and 
+#  There are two ways to use this eclass. First is by declaring two variables
+#  $SOURCE and $ALTERNATIVES where $SOURCE is the symlink to be created and
 #  $ALTERNATIVES is a list of alternatives. Second way is the use the function
 #  alternatives_makesym() like the example below.
 #
 # Example:
-#  
+#
 #  pkg_postinst() {
 #      alternatives_makesym "/usr/bin/python" "/usr/bin/python2.3" "/usr/bin/python2.2"
 #  }
@@ -37,64 +37,82 @@
 #  pkg_postinst() {
 #     alternatives_auto_makesym "/usr/bin/python" "/usr/bin/python[0-9].[0-9]"
 #  }
-# 
+#
 #  This will use bash pathname expansion to fill a list of alternatives it can
 #  link to. It is probably more robust against version upgrades. You should
 #  consider using this unless you are want to do something special.
-# 
-ECLASS="alternatives"
-INHERITED="$INHERITED $ECLASS"
+#
 
 # automatic deduction based on a symlink and a regex mask
 alternatives_auto_makesym() {
-	local SOURCE REGEX ALT
-	local unsorted
-	SOURCE=$1
+	local SYMLINK REGEX ALT myregex
+	SYMLINK=$1
 	REGEX=$2
-
-	ALT="`ls -1 ${ROOT}${REGEX} | sort -r | xargs`"
-	if [ -n "${ALT}" ]; then
-		alternatives_makesym ${SOURCE} ${ALT}
+	if [ "${REGEX:0:1}" != "/" ]
+	then
+		#not an absolute path:
+		#inherit the root directory of our main link path for our regex search
+		myregex="${SYMLINK%/*}/${REGEX}"
 	else
-		eerror "regex ${REGEX} doesn't match any files."
-	fi		
+		myregex=${REGEX}
+	fi
+
+	# sort a space delimited string by converting it to a multiline list
+	# and then run sort -r over it.
+	# make sure we use ${ROOT} because otherwise stage-building will break
+	ALT="$(for i in $(echo ${ROOT}${myregex}); do echo ${i#${ROOT}}; done | sort -r)"
+	alternatives_makesym ${SYMLINK} ${ALT}
 }
 
 alternatives_makesym() {
 	local ALTERNATIVES=""
-	local SOURCE=""
-	
+	local SYMLINK=""
+	local alt pref
+
 	# usage: alternatives_makesym <resulting symlink> [alternative targets..]
-	SOURCE=$1
+	SYMLINK=$1
+	# this trick removes the trailing / from ${ROOT}
+	pref=$(echo ${ROOT} | sed 's:/$::')
 	shift
 	ALTERNATIVES=$@
 
 	# step through given alternatives from first to last
 	# and if one exists, link it and finish.
-	
+
 	for alt in ${ALTERNATIVES}; do
-		if [ -f "${ROOT}${alt}" ]; then
-			if [ -L "${ROOT}${SOURCE}" ]; then
-				rm -f ${ROOT}${SOURCE}
+		if [ -f "${pref}${alt}" ]; then
+			#are files in same directory?
+			if [ "${alt%/*}" = "${SYMLINK%/*}" ]
+			then
+				#yes; strip leading dirname from alt to create relative symlink
+				einfo "Linking ${alt} to ${pref}${SYMLINK} (relative)"
+				ln -sf ${alt##*/} ${pref}${SYMLINK}
+			else
+				#no; keep absolute path
+				einfo "Linking ${alt} to ${pref}${SYMLINK} (absolute)"
+				ln -sf ${pref}${alt} ${pref}${SYMLINK}
 			fi
-			einfo "Linking ${alt} to ${SOURCE}"
-			ln -s ${alt} ${ROOT}${SOURCE}
 			break
 		fi
 	done
-	
+
 	# report any errors
-	if [ ! -L ${ROOT}${SOURCE} ]; then
-		ewarn "Unable to establish ${SOURCE} symlink"
-	elif [ ! -f "`readlink ${ROOT}${SOURCE}`" -a ! -f "${ROOT}`readlink ${ROOT}${SOURE}`" ]; then
-		ewarn "${SOURCE} is a dead symlink."
-	fi		
-}		
+	if [ ! -L ${pref}${SYMLINK} ]; then
+		ewarn "Unable to establish ${pref}${SYMLINK} symlink"
+	else
+		# we need to check for either the target being in relative path form
+		# or absolute path form
+		if [ ! -f "`dirname ${pref}${SYMLINK}`/`readlink ${pref}${SYMLINK}`" -a \
+			 ! -f "`readlink ${pref}${SYMLINK}`" ]; then
+			ewarn "${pref}${SYMLINK} is a dead symlink."
+		fi
+	fi
+}
 
 alternatives_pkg_postinst() {
 	if [ -n "${ALTERNATIVES}" -a -n "${SOURCE}" ]; then
 		alternatives_makesym ${SOURCE} ${ALTERNATIVES}
-	fi		
+	fi
 }
 
 alternatives_pkg_postrm() {
@@ -104,4 +122,3 @@ alternatives_pkg_postrm() {
 }
 
 EXPORT_FUNCTIONS pkg_postinst pkg_postrm
-
diff --git a/eclass/aolserver.eclass b/eclass/aolserver.eclass
index 0676adef076b..f4e95505534a 100644
--- a/eclass/aolserver.eclass
+++ b/eclass/aolserver.eclass
@@ -1,32 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/aolserver.eclass,v 1.1 2005/01/05 13:37:56 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/aolserver.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
 
 # Authors:
 #	Ian Leitch <port001@gentoo.org>
 
-ECLASS=aolserver
-INHERITED="$INHERITED $ECLASS"
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst
 
-DEPEND="$DEPEND www-servers/aolserver"
-RDEPEND="$RDEPEND www-servers/aolserver"
+DEPEND="www-servers/aolserver"
+RDEPEND="${DEPEND}"
 
 NS_CONF="/usr/share/aolserver" # /include/ is implied by the Makefile
 NS_BASE="/usr/lib/aolserver"
 
-# For nsxml
-LIBXML2=/usr
-LIBXSLT=/usr
-
-IUSE=""
+SRC_URI="mirror://sourceforge/aolserver/${P}.tar.gz"
 HOMEPAGE="http://www.aolserver.com"
 LICENSE="MPL-1.1"
 SLOT="0"
 
 aolserver_src_compile() {
 
-	emake NSBUILD=1 INST=${NS_CONF} LIBXML2=${LIBXML2} LIBXSLT=${LIBXSLT} || die "emake failed"
+	emake NSBUILD=1 INST=${NS_CONF} AOLSERVER=${NS_CONF} ${MAKE_FLAGS} || die "emake failed"
 }
 
 aolserver_src_install() {
@@ -34,7 +28,23 @@ aolserver_src_install() {
 	find ${S} -type d -name CVS -prune | xargs rm -rf
 
 	into ${NS_BASE}
-	dobin ${S}/${PN}.so
+
+	if [[ -e "${S}/${PN}.so" ]] ; then
+		dobin ${S}/${PN}.so
+	fi
+
+	if [[ -e "${S}/lib${PN}.so" ]] ; then
+		dolib.so ${S}/lib${PN}.so
+	fi
+
+	for mod in ${TCL_MODS} ; do
+		insinto /usr/lib/aolserver/modules/tcl
+		doins ${mod}
+	done
+
+	for doc in ${DOCS} ; do
+		dodoc ${doc}
+	done
 }
 
 aolserver_pkg_postinst() {
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index c55d4c735bae..68f0dcbef21e 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -1,9 +1,7 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Michael Tindal <urilith@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.1 2004/11/21 01:51:58 urilith Exp $
-ECLASS=apache-module
-INHERITED="$INHERITED $ECLASS"
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
 
 inherit depend.apache
 
@@ -147,7 +145,7 @@ apache_doc_magic() {
 ## ${APXS1_ARGS}.  If a module requires a different build setup
 ## than this, use ${APXS1} in your own src_compile routine.
 ####
-apache1_src_compile () {
+apache1_src_compile() {
 	debug-print-function apache1_src_compile
 
 	CD_DIR=$(apache_cd_dir)
@@ -164,9 +162,9 @@ apache1_src_compile () {
 ## this function can also set the executable permission on files listed in EXECFILES.
 ## The configuration file name is listed in APACHE1_MOD_CONF without the .conf extensions,
 ## so if you configuration is 55_mod_foo.conf, APACHE1_MOD_CONF would be 55_mod_foo.
-## DOCFILES contains the list of files you want filed as documentation. The name of the 
+## DOCFILES contains the list of files you want filed as documentation. The name of the
 ## module can also be specified using the APACHE1_MOD_FILE or defaults to
-## .libs/${PN}.so. 
+## .libs/${PN}.so.
 ####
 apache1_src_install() {
 	debug-print-function apache1_src_install
@@ -177,19 +175,14 @@ apache1_src_install() {
 	MOD_FILE=$(apache_mod_file)
 
 	exeinto ${APACHE1_MODULESDIR}
-	doexe ${MOD_FILE} || die "internal ebuild error: \'${MOD_FILE}\' not found"
+	doexe ${MOD_FILE} || die "internal ebuild error: '${MOD_FILE}' not found"
 	[ -n "${APACHE1_EXECFILES}" ] && doexe ${APACHE1_EXECFILES}
 
 	if [ -n "${APACHE1_MOD_CONF}" ] ; then
 		insinto ${APACHE1_MODULES_CONFDIR}
-		doins ${FILESDIR}/${APACHE1_MOD_CONF}.conf || die "internal ebuild error: \'${APACHE2_MOD_CONF}.conf\' not found."
-
-		einfo
-		einfo "Configuration file installed as ${APACHE1_MODULES_CONFDIR}/${APACHE1_MOD_CONF}.conf"
-		einfo "You may want to edit it before turning the module on in /etc/conf.d/apache"
-		einfo
+		doins ${FILESDIR}/${APACHE1_MOD_CONF}.conf || die "internal ebuild error: '${FILESDIR}/${APACHE1_MOD_CONF}.conf' not found."
 	fi
-	
+
 	cd ${S}
 
 	if [ -n "${DOCFILES}" ] ; then
@@ -215,6 +208,13 @@ apache1_pkg_postinst() {
 		einfo "add '-D ${APACHE1_MOD_DEFINE}' to APACHE_OPTS."
 		einfo
 	fi
+	if [ -n "${APACHE1_MOD_CONF}" ] ; then
+		einfo
+		einfo "Configuration file installed as"
+		einfo "    ${APACHE1_MODULES_CONFDIR}/$(basename ${APACHE1_MOD_CONF}).conf"
+		einfo "You may want to edit it before turning the module on in /etc/conf.d/apache"
+		einfo
+	fi
 }
 
 ######
@@ -228,29 +228,30 @@ apache1_pkg_postinst() {
 ## we check what the MPM style used by Apache is, if it isnt prefork, we let the user
 ## know they need prefork, and then exit the build.
 ####
-apache2_pkg_setup () {
+apache2_pkg_setup() {
 	debug-print-function apache2_pkg_setup
 
-	if [ -n "${APACHE2_MT_UNSAFEE}" ]; then
-		if [ "x${APACHE2_MT_UNSAFE}" != "no" ]; then
-			APACHE2_MPM_STYLE=`/usr/sbin/apxs2 -q MPM_NAME`
-			if [ "x$APACHE2_MPM_STYLE" != "xprefork" ]; then
-				eerror "You currently have Apache configured to use the."
-				eerror "$APACHE2_MPM_STYLE MPM style.  The module you are"
-				eerror "trying to install is not currently thread-safe,"
-				eerror "and will not work under your current configuraiton."
-				echo
-				eerror "If you still want to use the module, please reinstall"
-				eerror "Apache with mpm-prefork set."
-
-				epause
-				ebeep
-				die Invalid Apache MPM style.
-			fi
+	if [ -n "${APACHE2_SAFE_MPMS}" ]; then
+
+		INSTALLED_MPM="$(${ROOT}/usr/sbin/apxs2 -q MPM_NAME)"
+
+		if hasq ${INSTALLED_MPM} ${APACHE2_SAFE_MPMS} ; then
+			INSTALLED_MPM_SAFE="yes"
+		fi
+
+		if [ -z "${INSTALLED_MPM_SAFE}" ] ; then
+			eerror "The module you are trying to install (${PN})"
+			eerror "will only work with one of the following MPMs:"
+			eerror "   ${APACHE2_SAFE_MPMS}"
+			eerror "You do not currently have any of these MPMs installed."
+			eerror "Please re-install apache with the correct mpm-* USE flag set."
+			die "No safe MPM installed."
 		fi
+
 	fi
+
 }
-				
+
 ####
 ## apache2_src_compile
 ##
@@ -258,7 +259,7 @@ apache2_pkg_setup () {
 ## ${APXS2_ARGS}.  If a module requires a different build setup
 ## than this, use ${APXS2} in your own src_compile routine.
 ####
-apache2_src_compile () {
+apache2_src_compile() {
 	debug-print-function apache2_src_compile
 
 	CD_DIR=$(apache_cd_dir)
@@ -286,21 +287,16 @@ apache2_src_install() {
 	MOD_FILE=$(apache_mod_file)
 
 	exeinto ${APACHE2_MODULESDIR}
-	doexe ${MOD_FILE} || die "internal ebuild error: \'${MOD_FILE}\' not found"
+	doexe ${MOD_FILE} || die "internal ebuild error: '${MOD_FILE}' not found"
 	[ -n "${APACHE2_EXECFILES}" ] && doexe ${APACHE2_EXECFILES}
 
 	if [ -n "${APACHE2_MOD_CONF}" ] ; then
 		insinto ${APACHE2_MODULES_CONFDIR}
-		doins ${FILESDIR}/${APACHE2_MOD_CONF}.conf || die "internal ebuild error: \'${APACHE2_MOD_CONF}.conf\' not found."
-
-		einfo
-		einfo "Configuration file installed as ${APACHE2_MODULES_CONFDIR}/${APACHE2_MOD_CONF}.conf"
-		einfo "You may want to edit it before turning the module on in /etc/conf.d/apache2"
-		einfo
+		doins ${FILESDIR}/${APACHE2_MOD_CONF}.conf || die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found."
 	fi
 
 	if [ -n "${APACHE2_VHOSTFILE}" ]; then
-		insinto ${APACHE2_MODULES_VHOSTDIR}
+		insinto ${APACHE2_VHOSTDIR}
 		doins ${FILESDIR}/${APACHE2_VHOSTFILE}.conf
 	fi
 
@@ -324,6 +320,33 @@ apache2_pkg_postinst() {
 		einfo "add '-D ${APACHE2_MOD_DEFINE}' to APACHE2_OPTS."
 		einfo
 	fi
+	if [ -n "${APACHE2_MOD_CONF}" ] ; then
+		einfo
+		einfo "Configuration file installed as"
+		einfo "    ${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf"
+		einfo "You may want to edit it before turning the module on in /etc/conf.d/apache2"
+		einfo
+	fi
+
+	if [ -n "${APACHE2_SAFE_MPMS}" ]; then
+
+		INSTALLED_MPM="$(${ROOT}/usr/sbin/apxs2 -q MPM_NAME)"
+
+		if ! hasq ${INSTALLED_MPM} ${APACHE2_SAFE_MPMS} ; then
+			INSTALLED_MPM_UNSAFE="${INSTALLED_MPM_UNSAFE} ${mpm}"
+		else
+			INSTALLED_MPM_SAFE="${INSTALLED_MPM_SAFE} ${mpm}"
+		fi
+
+		if [ -n "${INSTALLED_MPM_UNSAFE}" ] ; then
+			ewarn "You have one or more MPMs installed that will not work with"
+			ewarn "this module (${PN}). Please make sure that you only enable"
+			ewarn "this module if you are using one of the following MPMs:"
+			ewarn "     ${INSTALLED_MPM_SAFE}"
+		fi
+
+	fi
+
 }
 
 ######
diff --git a/eclass/aspell-dict.eclass b/eclass/aspell-dict.eclass
index e5dd3f6c8d45..14ebb8d38209 100644
--- a/eclass/aspell-dict.eclass
+++ b/eclass/aspell-dict.eclass
@@ -1,39 +1,52 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/aspell-dict.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
+#
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/aspell-dict.eclass,v 1.1 2002/08/15 08:23:01 seemant Exp $
-
+#
 # The aspell-dict eclass is designed to streamline the construction of
 # ebuilds for the new aspell dictionaries (from gnu.org) which support
-# aspell-0.50
+# aspell-0.50. Support for aspell-0.60 has been added by Sergey Ulanov.
 
-ECLASS=aspell-dict
-INHERITED="${INHERITED} ${ECLASS}"
 
 EXPORT_FUNCTIONS src_compile src_install
 
-MY_P=${PN}-${PV%.*.*}-${PV#*.*.}
+#MY_P=${PN}-${PV%.*}-${PV#*.*.}
+MY_P=${P%.*}-${PV##*.}
+MY_P=aspell${ASPOSTFIX}-${MY_P/aspell-/}
+SPELLANG=${PN/aspell-/}
 S=${WORKDIR}/${MY_P}
-DESCRIPTION="${ASPELL_LANG} dictionary for aspell"
-HOMEPAGE="http://www.gnu.org/projects/aspell/index.html"
-SRC_URI="http://savannah.gnu.org/download/aspell/dicts/${MY_P}.tar.bz2"
-
-DEPEND="=app-text/aspell-0.50*"
+DESCRIPTION="${ASPELL_LANG} language dictionary for aspell"
+HOMEPAGE="http://aspell.net"
+SRC_URI="ftp://ftp.gnu.org/gnu/aspell/dict/${SPELLANG}/${MY_P}.tar.bz2"
 
+IUSE=""
 SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86"
+
+if [ x${ASPOSTFIX} = x6 ] ; then
+	RDEPEND=">=app-text/aspell-0.60
+		sys-apps/which"
+	DEPEND="${RDEPEND}"
+	KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+else
+	RDEPEND=">=app-text/aspell-0.50
+		sys-apps/which"
+	DEPEND="${RDEPEND}"
+	KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
+fi
+
+PROVIDE="virtual/aspell-dict"
 
 aspell-dict_src_compile() {
+	echo `pwd`
 	./configure || die
 	emake || die
 }
 
 aspell-dict_src_install() {
+	make DESTDIR=${D} install || die
 
-	make \
-		DESTDIR=${D} \
-		install || die
-
-	dodoc Copyright README info
+	for doc in README info ; do
+		[ -s "$doc" ] && dodoc $doc
+	done
 }
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 18f11dca867c..acd35b508ab9 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,203 +1,206 @@
-# 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/eclass/autotools.eclass,v 1.1 2001/12/31 23:43:41 azarah Exp $
-# The autotools eclass enables building of the apps that needs the latest autconf/automake.
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 #
-# NOTES:
+# Author: Diego Pettenò <flameeyes@gentoo.org>
+# Enhancements: Martin Schlemmer <azarah@gentoo.org>
 #
-#    This eclass was made to bridge the incompadibility problem of autoconf-2.13,
-#    autoconf-2.5x and automake-1.4x, automake-1.5x.  Most packages needs
-#    autoconf-2.13 and automake-1.4x, but cannot work with the latest versions
-#    of these packages due to incompadibility, thus when we have a package that
-#    needs the latest versions of automake and autoconf, it begins to get a
-#    problem.
+# This eclass is for handling autotooled software packages that
+# needs to regenerate their build scripts.
 #
+# NB:  If you add anything, please comment it!
+
+inherit eutils gnuconfig
+
+#DEPEND="sys-devel/automake
+#	sys-devel/autoconf
+#	sys-devel/libtool"
 #
-# Commented Example:
-#
-#    The following is a commented template for how to use this eclass:
-#
-#    #<cut here>
-#    # Copyright 1999-2002 Gentoo Technologies, Inc.
-#    # Distributed under the terms of the GNU General Public License, v2 or later
-#    # Maintainer:  John Doe <john@foo.com>
-#    # $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.1 2001/12/31 23:43:41 azarah Exp $
-#
-#    # If you need to set the versions different from in here, it *must*
-#    # be done before inherit.eclass is sourced
-#    #ACONFVER=2.52f
-#    #AMAKEVER=1.5b
-#
-#    # Source inherit.eclass and inherit AutoTools
-#    . /usr/portage/eclass/inherit.eclass || die
-#    inherit autotools || die
-#
-#    # This is pretty standard.
-#    S=${WORKDIR}/${P}
-#    DESCRIPTION="My Application"
-#
-#    # Here you *NEED* to have $SRC_URI as a source url to include the automake
-#    # and autoconf source tarballs
-#    SRC_URI="${SRC_URI}
-#             http://download.foo.com/files/${P}.tar.gz"
-#
-#    HOMEPAGE="http://www.foo.com/"
-#
-#    # Here you *NEED* to have "$DEPEND" as an depend to include the dependancies
-#    # of automake and autoconf.
-#    DEPEND="${DEPEND}
-#            foo-libs/libfoo"
-#
-#    src_compile() {
-#
-#        # This will install automake and autoconf in a tempory directory and
-#        # setup the environment. Do not forget!!!!!!!
-#        install_autotools
-#
-#        # Now like normal
-#        ./configure --host=${CHOST} \
-#                    --prefix=/usr || die
-#        emake || die
-#    }
+# Ebuilds should rather depend on the proper version of the tool.
+
+# Variables:
 #
-#    src_install() {
+#   AT_M4DIR          - Additional director(y|ies) aclocal should search
+#   AT_GNUCONF_UPDATE - Should gnuconfig_update() be run (normally handled by
+#                       econf()) [yes|no]
+#   AM_OPTS           - Additional options to pass to automake during
+#                       eautoreconf call.
+
+# Functions:
 #
-#        # Still pretty standard to how you would normally do it
-#        make DESTDIR=${D} install || die
-#        dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-#    }
-#    #<cut here>
+#   eautoreconf()  - Should do a full autoreconf - normally what most people
+#                    will be interested in.  Also should handle additional
+#                    directories specified by AC_CONFIG_SUBDIRS.
+#   eaclocal()     - Runs aclocal.  Respects AT_M4DIR for additional directories
+#                    to search for macro's.
+#   _elibtoolize() - Runs libtoolize.  Note the '_' prefix .. to not collide
+#                    with elibtoolize() from libtool.eclass
+#   eautoconf      - Runs autoconf.
+#   eautoheader    - Runs autoheader.
+#   eautomake      - Runs automake
 #
 
+# XXX: M4DIR should be depreciated
+AT_M4DIR=${AT_M4DIR:-${M4DIR}}
+AT_GNUCONF_UPDATE="no"
 
-ECLASS=AutoTools
-
-#[ -z "$ACONFVER" ] && ACONFVER=2.52f
-#[ -z "$AMAKEVER" ] && AMAKEVER=1.5b
-[ -z "$ACONFVER" ] && die "!!! You need to set \$ACONFVER *before* inheriting the eclass !!!"
-[ -z "$AMAKEVER" ] && die "!!! You need to set \$AMAKEVER *before* inheriting the eclass !!!"
-
-DESCRIPTION="Based on the $ECLASS eclass"
-#ASRC_URI="ftp://ftp.gnu.org/gnu/autoconf/autoconf-${ACONFVER}.tar.bz2
-#	ftp://alpha.gnu.org/gnu/autoconf/autoconf-${ACONFVER}.tar.bz2
-#	ftp://ftp.gnu.org/gnu/automake/automake-${AMAKEVER}.tar.bz2
-#	ftp://alpha.gnu.org/gnu/automake/automake-${AMAKEVER}.tar.bz2"
-SRC_URI="ftp://ftp.gnu.org/gnu/autoconf/autoconf-${ACONFVER}.tar.bz2
-	ftp://alpha.gnu.org/gnu/autoconf/autoconf-${ACONFVER}.tar.bz2
-	ftp://ftp.gnu.org/gnu/automake/automake-${AMAKEVER}.tar.bz2
-	ftp://alpha.gnu.org/gnu/automake/automake-${AMAKEVER}.tar.bz2"
-	
-DEPEND="sys-devel/make
-	sys-devel/perl
-	>=sys-devel/m4-1.4o-r2"
-
-
-AUTO_S="${WORKDIR}"
-AUTO_D="${T}/autotools"
-
-fetch_autotools() {
-
-	local y
-	for y in ${ASRC_URI} 
-	do
-		if [ ! -e ${DISTDIR}/${y##*/} ]
-		then
-			echo ">>> Fetching ${y##*/}..."
-			echo
-			local x
-			local _SRC_URI
-			for x in ${GENTOO_MIRRORS}
-			do
-				_SRC_URI="${_SRC_URI} ${x}/distfiles/${y##*/}"
-			done
-			_SRC_URI="${_SRC_URI} `queryhost.sh "${SRC_URI}"`"
-			for x in ${_SRC_URI}
-			do
-				if [ ! -e ${DISTDIR}/${y##*/} ] 
-				then
-					if [ "${y##*/}" = "${x##*/}" ]
-					then
-						echo ">>> Trying site ${x}..."
-						eval "${FETCHCOMMAND}"
-					fi
-				fi
-			done
-			if [ ! -e ${DISTDIR}/${y##*/} ]
-			then
-				echo '!!!'" Couldn't download ${y##*/} needed by autotools.eclass.  Aborting."
-				exit 1
-			fi
-			echo
-		fi      
+
+# This function mimes the behavior of autoreconf, but uses the different
+# eauto* functions to run the tools. It doesn't accept parameters, but
+# the directory with include files can be specified with AT_M4DIR variable.
+#
+# Note: doesn't run autopoint right now, but runs gnuconfig_update.
+eautoreconf() {
+	local pwd=$(pwd) x
+
+	# Take care of subdirs
+	for x in $(autotools_get_subdirs); do
+		if [[ -d ${x} ]] ; then
+			cd "${x}"
+			eautoreconf
+			cd "${pwd}"
+		fi
 	done
-}
 
-unpack_autotools() {
+	eaclocal
+	_elibtoolize --copy --force
+	eautoconf
+	eautoheader
+	eautomake ${AM_OPTS}
 
-	cd ${AUTO_S}
+	# Normally run by econf()
+	[[ ${AT_GNUCONF_UPDATE} == "yes" ]] && gnuconfig_update
 
-	local x
-	for x in ${ASRC_URI}
-	do
-		unpack ${x##*/} || die "!!! Could not unpack ${x##*/} needed by autotools !!!"
-	done
+	return 0
+}
+
+# These functions runs the autotools using autotools_run_tool with the
+# specified parametes. The name of the tool run is the same of the function
+# without e prefix.
+# They also force installing the support files for safety.
+eaclocal() {
+	local aclocal_opts
+
+	# XXX: M4DIR should be depreciated
+	AT_M4DIR=${AT_M4DIR:-${M4DIR}}
+
+	if [[ -n ${AT_M4DIR} ]] ; then
+		for x in ${AT_M4DIR} ; do
+			case "${x}" in
+			"-I")
+				# We handle it below
+				;;
+			"-I"*)
+				# Invalid syntax, but maybe we should help out ...
+				ewarn "eaclocal: Proper syntax is (note the space after '-I'): aclocal -I <dir>"
+				aclocal_opts="${aclocal_opts} -I ${x}"
+				;;
+			*)
+				[[ ! -d ${x} ]] && ewarn "eaclocal: '${x}' does not exist"
+				aclocal_opts="${aclocal_opts} -I ${x}"
+				;;
+			esac
+		done
+	fi
+
+	[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
+		autotools_run_tool aclocal "$@" ${aclocal_opts}
 }
 
-install_autoconf() {
+_elibtoolize() {
+	local opts
 
-	cd ${AUTO_S}/autoconf-${ACONFVER} || die "!!! Failed to build autoconf !!!"
+	# Check if we should run libtoolize
+	[[ -n $(autotools_check_macro "AC_PROG_LIBTOOL") ]] || return 0
 
-	 ./configure --prefix=${AUTO_D} \
-	 	--infodir=${AUTO_D}/share/info \
-		--mandir=${AUTO_D}/share/man \
-		--target=${CHOST} || die "!!! Failed to configure autoconf !!!"
+	[[ -f Makefile.am ]] && opts="--automake"
 
-	emake || die "!!! Failed to build autoconf !!!"
+	[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize"
+	autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts}
 
-	make install || die "!!! Failed to install autoconf !!!"
+	# Need to rerun aclocal
+	eaclocal
 }
 
-install_automake() {
+eautoheader() {
+	# Check if we should run autoheader
+	[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
+	autotools_run_tool autoheader "$@"
+}
+
+eautoconf() {
+	if [[ ! -f configure.ac && ! -f configure.in ]] ; then
+		echo
+		eerror "No configure.{ac,in} present in '$(pwd | sed -e 's:.*/::')'!"
+		echo
+		die "No configure.{ac,in} present!"
+	fi
+
+	autotools_run_tool autoconf "$@"
+}
 
-	cd ${AUTO_S}/automake-${AMAKEVER} || die "!!! Failed to build automake !!!"
+eautomake() {
+	local extra_opts
 
-         ./configure --prefix=${AUTO_D} \
-                --infodir=${AUTO_D}/share/info \
-                --mandir=${AUTO_D}/share/man \
-                --target=${CHOST} || die "!!! Failed to configure automake !!!"
+	[[ -f Makefile.am ]] || return 0
 
-        emake || die "!!! Failed to build automake !!!"
+	[[ -f INSTALL && -f AUTHORS && -f ChangeLog ]] \
+		|| extra_opts="${extra_opts} --foreign"
 
-        make install || die "!!! Failed to install automake !!!"
+	# --force-missing seems not to be recognized by some flavours of automake
+	autotools_run_tool automake --add-missing --copy ${extra_opts} "$@"
 }
 
-install_autotools() {
 
-	if [ "${SRC_URI/autoconf/}" = "$SRC_URI" ] || [ "${SRC_URI/automake/}" = "$SRC_URI" ]
-	then
-		echo "!!! \$SRC_URI was not set properly !!!  It needs to include \${SRC_URI}"
-		exit 1
-	fi
 
-	if [ "${DEPEND/make/}" = "$DEPEND" ] || [ "${DEPEND/perl/}" = "$DEPEND" ] || \
-		[ "${DEPEND/m4/}" = "$DEPEND" ]
-	then
-		echo "!!! \$DEPEND was not set properly !!!  It needs to include \${DEPEND}"
-		exit 1
+# Internal function to run an autotools' tool
+autotools_run_tool() {
+	local STDERR_TARGET="${T}/$$.out"
+	local PATCH_TARGET="${T}/$$.patch"
+	local ris
+
+	echo "***** $1 *****" > ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}
+	echo >> ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}
+
+	ebegin "Running $1"
+	$@ >> ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/} 2>&1
+	ris=$?
+	eend ${ris}
+
+	if [[ ${ris} != 0 ]]; then
+		echo
+		eerror "Failed Running $1 !"
+		eerror
+		eerror "Include in your bugreport the contents of:"
+		eerror
+		eerror "  ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}"
+		echo
+		die "Failed Running $1 !"
 	fi
+}
+
+# Internal function to check for support
+autotools_check_macro() {
+	[[ -f configure.ac || -f configure.in ]] && \
+		autoconf --trace=$1 2>/dev/null
+	return 0
+}
+
+# Internal function to get additional subdirs to configure
+autotools_get_subdirs() {
+	local subdirs_scan_out
 
-	mkdir -p ${AUTO_S}
-	mkdir -p ${AUTO_D}/{bin,etc,lib,include,share} \
-		|| die "!!! Could not create needed directories for autotools !!!"
+	subdirs_scan_out=$(autotools_check_macro "AC_CONFIG_SUBDIRS")
+	[[ -n ${subdirs_scan_out} ]] || return 0
 
-#	fetch_autotools
-#	unpack_autotools
-	install_autoconf
-	install_automake
+	echo "${subdirs_scan_out}" | gawk \
+	'($0 !~ /^[[:space:]]*(#|dnl)/) {
+		if (match($0, "AC_CONFIG_SUBDIRS\\(\\[?([^\\])]*)", res)) {
+			split(res[1], DIRS, /[\])]/)
+			print DIRS[1]
+		}
+	}' | uniq
 
-	export PATH=${AUTO_D}/bin:${PATH}
-	cd ${S}
-	ln -sf ${AUTO_D}/share/automake/depcomp ${S}/depcomp
+	return 0
 }
 
diff --git a/eclass/base.eclass b/eclass/base.eclass
index 6a7e200276cb..94cee453f09e 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -1,72 +1,108 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
+#
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.1 2001/09/28 19:25:33 danarmak Exp $
+#
 # The base eclass defines some default functions and variables. Nearly everything
 # else inherits from here.
-. /usr/portage/inherit.eclass || die
-inherit virtual || die
-ECLASS=base
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Based on the $ECLASS eclass"
 
 base_src_unpack() {
-    
-    while [ "$1" ]; do
-    
+
+	debug-print-function $FUNCNAME $*
+	[ -z "$1" ] && base_src_unpack all
+
+	cd ${WORKDIR}
+
+	while [ "$1" ]; do
+
 	case $1 in
-	    unpack)
-		unpack ${A}
-		;;
-	    all)
-		base_src_unpack unpack
-		;;
-	esac
-    
-    shift
-    done
-    
+		unpack)
+			debug-print-section unpack
+			unpack ${A}
+			;;
+		patch)
+			debug-print-section patch
+			cd ${S}
+			epatch ${FILESDIR}/${P}-gentoo.diff
+			;;
+		autopatch)
+			debug-print-section autopatch
+			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
+			cd ${S}
+			for x in $PATCHES $PATCHES1; do
+				debug-print "$FUNCNAME: autopatch: patching from ${x}"
+				epatch ${x}
+			done
+			;;
+	        all)
+			debug-print-section all
+			base_src_unpack unpack autopatch
+			;;
+		esac
+
+	shift
+	done
+
 }
 
 base_src_compile() {
-    
-    while [ "$1" ]; do
-    
+
+	debug-print-function $FUNCNAME $*
+	[ -z "$1" ] && base_src_compile all
+
+	cd ${S}
+
+	while [ "$1" ]; do
+
 	case $1 in
-	    configure)
-		configure || die
+		configure)
+		debug-print-section configure
+		econf || die "died running econf, $FUNCNAME:configure"
 		;;
-	    make)
-		make || die
+		make)
+		debug-print-section make
+		emake || die "died running emake, $FUNCNAME:make"
 		;;
-	    all)
+		all)
+		debug-print-section all
 		base_src_compile configure make
 		;;
 	esac
-	
-    shift
-    done
-    
+
+	shift
+	done
+
 }
 
 base_src_install() {
 
-    while [ "$1" ]; do
-    
+	debug-print-function $FUNCNAME $*
+	[ -z "$1" ] && base_src_install all
+
+	cd ${S}
+
+	while [ "$1" ]; do
+
 	case $1 in
-	    make)
-		make DESTDIR=${D} install || die
-		;;
-	    all)
-		base_src_install make
-		;;
+		make)
+			debug-print-section make
+			make DESTDIR=${D} install || die "died running make install, $FUNCNAME:make"
+			;;
+		all)
+			debug-print-section all
+			base_src_install make
+			;;
 	esac
-	
-    shift
-    done
-    
-}
 
-EXPORT_FUNCTIONS
+	shift
+	done
+
+}
 
+EXPORT_FUNCTIONS src_unpack src_compile src_install
diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass
index 3b1ca99d04db..1621a6a60c3a 100644
--- a/eclass/bash-completion.eclass
+++ b/eclass/bash-completion.eclass
@@ -1,30 +1,64 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.1 2004/10/26 22:28:22 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.1.1.1 2005/11/30 09:59:22 chriswhite Exp $
 #
 # Simple eclass that provides an interface for installing
 # contributed (ie not included in bash-completion proper)
 # bash-completion scripts.
 #
 # Author: Aaron Walker <ka0ttic@gentoo.org>
-# 
+#
 # Please assign any bug reports to shell-tools@gentoo.org.
 
-ECLASS="bash-completion"
-INHERITED="${INHERITED} ${ECLASS}"
+EXPORT_FUNCTIONS pkg_postinst
+
+IUSE="bash-completion"
 
-IUSE="${IUSE} bash-completion"
-RDEPEND="bash-completion? ( app-shells/bash-completion )"
+# bash-completion-config is deprecated in favor of eselect,
+# however, eselect currently lacks stable keywords.
+RDEPEND="bash-completion?
+		( || (
+			app-admin/eselect
+			app-shells/bash-completion-config
+			)
+		)"
 
 # dobashcompletion <file> <new file>
 #	First arg, <file>, is required and is the location of the bash-completion
-# script to install.  Second arg, <new file>, is optional and specifies an
-# alternate filename to install as.
+# script to install.  If the variable BASH_COMPLETION_NAME is set in the
+# ebuild, dobashcompletion will install <file> as
+# /usr/share/bash-completion/$BASH_COMPLETION_NAME. If it is not set,
+# dobashcompletion will check if a second arg ($2) was passed, installing as
+# the specified name.  Failing both these checks, dobashcompletion will
+# install the file as /usr/share/bash-completion/${PN}.
 
 dobashcompletion() {
-	[ -z "$1" ] && die "usage: dobashcompletion <file> <new file>"
+	[[ -z "$1" ]] && die "usage: dobashcompletion <file> <new file>"
+	[[ -z "${BASH_COMPLETION_NAME}" ]] && BASH_COMPLETION_NAME="${2:-${PN}}"
+
 	if useq bash-completion ; then
 		insinto /usr/share/bash-completion
-		newins "$1" "${2:-${1##*/}}"
+		newins "$1" "${BASH_COMPLETION_NAME}" || die "Failed to install $1"
+	fi
+}
+
+bash-completion_pkg_postinst() {
+	if useq bash-completion ; then
+		echo
+		einfo "To enable command-line completion for ${PN}, run:"
+		einfo
+		if has_version app-admin/eselect ; then
+			einfo "  eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
+		else
+			einfo "  bash-completion-config --install ${BASH_COMPLETION_NAME:-${PN}}"
+			einfo
+			einfo "to install locally, or"
+			einfo
+			einfo "  bash-completion-config --global --install ${BASH_COMPLETION_NAME:-${PN}}"
+			einfo
+			einfo "to install system-wide."
+			einfo "Read bash-completion-config(1) for more information."
+		fi
+		echo
 	fi
 }
diff --git a/eclass/cannadic.eclass b/eclass/cannadic.eclass
index 4dec4d59d793..f49fc14aa0aa 100644
--- a/eclass/cannadic.eclass
+++ b/eclass/cannadic.eclass
@@ -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/eclass/cannadic.eclass,v 1.1 2003/09/11 06:22:21 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cannadic.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
 #
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
@@ -8,27 +8,17 @@
 # compatible dictionaries within the Portage system.
 #
 
-ECLASS=cannadic
-INHERITED="$INHERITED $ECLASS"
-EXPORT_FUNCTIONS cannadic-install dicsdir-install update-cannadic-dir \
-	src_install pkg_setup pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_install pkg_setup pkg_postinst pkg_postrm
 
-IUSE="${IUSE} canna"
+IUSE="canna"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://canna.sourceforge.jp/"		# you need to change this!
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="public-domain"
-# I added all keywords form /usr/portage/profiles/keyword.desc atm since
-# cannadic source is basically plain text and will run on any platform
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hpps ~arm ~amd64"
 SLOT="0"
 
-# I don't add Canna as a dependency because Anthy also uses cannadic
-DEPEND="${DEPEND}
-	canna? ( app-i18n/canna )"
-
 S="${WORKDIR}"
 
 DICSDIRFILE="$(echo ${FILESDIR}/*.dics.dir)"
@@ -37,12 +27,12 @@ DOCS="README*"
 
 # You don't need to modify these
 #local cannadir dicsdir
-cannadir="/var/lib/canna/dic/canna"
-dicsdir="/var/lib/canna/dic/dics.d"
+cannadir="${ROOT}/var/lib/canna/dic/canna"
+dicsdir="${ROOT}/var/lib/canna/dic/dics.d"
 
 #
 # pkg_setup() : sets up cannadic dir
-pkg_setup() {
+cannadic_pkg_setup() {
 
 	keepdir $cannadir
 	fowners bin:bin $cannadir
@@ -72,13 +62,13 @@ dicsdir-install() {
 # src_install() : installs all dictionaries under ${WORKDIR}
 #                 plus dics.dir and docs
 #
-src_install() {
+cannadic_src_install() {
 
 	for f in *.c[btl]d *.t ; do
 		cannadic-install $f
 	done 2>/dev/null
 
-	if [ -n "`use canna`" ] ; then
+	if use canna ; then
 		dicsdir-install || die
 	fi
 
@@ -121,21 +111,24 @@ update-cannadic-dir() {
 #
 # pkg_postinst() : updates dics.dir and print out notice after install
 #
-pkg_postinst() {
+cannadic_pkg_postinst() {
 
-	if [ -n "`use canna`" ] ; then
+	if use canna ; then
 		update-cannadic-dir
 		einfo
-		einfo "Please restart cannaserver to fit changes."
-		einfo "and modify your config file (~/.canna) to enable dictionary."
+		einfo "Please restart cannaserver to fit the changes."
+		einfo "You need to modify your config file (~/.canna) to enable dictionaries."
 
 		if [ -n "${CANNADICS}" ] ; then
 			einfo "e.g) add $(for d in ${CANNADICS}; do
-				echo -n \"$d\"\ 
+				echo -n "\"$d\" "
 				done)to section use-dictionary()."
 			einfo "For details, see documents under /usr/share/doc/${PF}"
 		fi
 
+		einfo "If you do not have ~/.canna, you can find sample files in /usr/share/canna."
+		ewarn "If you are upgrading from existing dictionary, you may need to recreate"
+		ewarn "user dictionary if you have one."
 		einfo
 	fi
 }
@@ -143,9 +136,9 @@ pkg_postinst() {
 #
 # pkg_postrm() : updates dics.dir and print out notice after uninstall
 #
-pkg_postrm() {
+cannadic_pkg_postrm() {
 
-	if [ -n "`use canna`" ] ; then
+	if use canna ; then
 		update-cannadic-dir
 		einfo
 		einfo "Please restart cannaserver to fit changes."
@@ -153,7 +146,7 @@ pkg_postrm() {
 
 		if [ -n "${CANNADICS}" ] ; then
 			einfo "e.g) delete $(for d in ${CANNADICS}; do
-				echo -n \"$d\"\  
+				echo -n "\"$d\" "
 				done)from section use-dictionary()."
 		fi
 
diff --git a/eclass/ccc.eclass b/eclass/ccc.eclass
index 5261c1974fbf..a33e6815dc26 100644
--- a/eclass/ccc.eclass
+++ b/eclass/ccc.eclass
@@ -1,37 +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/eclass/ccc.eclass,v 1.1 2003/05/26 15:33:35 taviso Exp $
-# 
+# $Header: /var/cvsroot/gentoo-x86/eclass/ccc.eclass,v 1.1.1.1 2005/11/30 09:59:20 chriswhite Exp $
+#
 # Authors:	Tavis Ormandy <taviso@gentoo.org>
 #			Aron Griffis <agriffis@gentoo.org>
 #
 # functions to make ebuilds more ccc friendly.
-# 
+#
+# 16/6/2003 - Added otsify()
+# 18/6/2003 - regex tweaks.
+# 22/7/2003 - newdepend
 
-ECLASS=ccc
-INHERITED="$INHERITED $ECLASS"
+inherit flag-o-matic
 
-DEPEND="${DEPEND}
-	sys-apps/findutils
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-devel/binutils
-	sys-apps/grep
-	sys-apps/diffutils"
 
 # define this to make this eclass noisy.
 #DEBUG_CCC_ECLASS=1
 
-
 #
 #### hide-restrict-arr ####
 # Scan for and replace __restrict_arr with a ccc
 # supported equivalent.
 #
 # you might see an error like this if you need this:
-# 	
-# 	cc: Error: regexec.c, line 209: In the definition of the function "regexec", 
-# 	the promoted type of pmatch is incompatible with the type of the corresponding 
+#
+# 	cc: Error: regexec.c, line 209: In the definition of the function "regexec",
+# 	the promoted type of pmatch is incompatible with the type of the corresponding
 # 	parameter in a prior declaration. (promotmatch)
 # 	    regmatch_t pmatch[];
 # 	    ---------------^
@@ -48,12 +42,12 @@ DEPEND="${DEPEND}
 # example:
 #
 # 	is-ccc && hide-restrict-arr
-# 	
+#
 #### is-cxx ####
 # Returns success if dec c++ compiler is being used.
 #
 #### replace-ccc-g ####
-# Try to replace -g with -g3 
+# Try to replace -g with -g3
 #
 #### ccc-elf-check </path/to/binary> ####
 # Return success if binary was compiled with ccc
@@ -68,16 +62,16 @@ DEPEND="${DEPEND}
 # 		is pretty safe, but the archive detection may not
 # 		be as reliable.
 #### create-so </usr/lib/library.a> <library.so> ####
-# Make the shared library (.so) specified from the archive (.a) 
-# specified. LDFLAGS will be honoured. if you need a different 
-# `soname` (DT_SONAME) from the shared lib filename, you will have 
+# Make the shared library (.so) specified from the archive (.a)
+# specified. LDFLAGS will be honoured. if you need a different
+# `soname` (DT_SONAME) from the shared lib filename, you will have
 # to do it manually ;)
 #
 # example:
 # 	is-ccc && \
 # 		create-so /usr/lib/libcoolstuff.a libcoolstuff.so.${PV}
 # 	dosym /usr/lib/libcoolstuff.so.${PV} /usr/lib/libcoolstuff.so
-#	
+#
 # NOTE: -lots will be used by default, this is ccc.eclass after all :)
 # NOTE: .${PV} is optional, of course.
 # NOTE: dolib.so will manage installation
@@ -89,27 +83,41 @@ DEPEND="${DEPEND}
 # mimic the flag-o-matic equivalents, look in there for
 # documentation.
 #
+#### otsify <archive> ####
+# Add the functions from libots to <archive>, this means
+# that if you use gcc to build an application that links with
+# <archive>, you wont need -lots.
+# Use this on libraries that you want maximum performance from,
+# but might not be using ccc when linking against it (eg zlib, openssl, etc)
+#
+# example:
+# 	is-ccc && otsify ${S}/libz.a
+#
 ####
 #
 
 ccc-fixup()
 {
-	# helper function to fixup files                                                              
-	# and show differences when debugging                                                         
+	# helper function to fixup files
+	# and show differences when debugging
 	#
 	# store the backup suffix.
-	local files="`line`" suffix=ccc-fixup-${$} 
-	sed --in-place=.${suffix} ${1} ${files} || return 1
-	[ ! "$DEBUG_CCC_ECLASS" ] && return 0	
+	local files list suffix=ccc-fixup-${$}
+
+	while read files
+	do
+		sed --in-place=.${suffix} ${1} ${files} || return 1
+		list="${list} ${files}"
+	done
 
+	[ ! "$DEBUG_CCC_ECLASS" ] && return 0
 	# if theres a backup, diff it.
-	for i in ${files}
+	for i in ${list}
 	do
-		einfo "Checking for changes to `basename ${i}`..."
+		einfo "Checking for changes to `basename ${i}` ..."
 		if [ -e "${i}.${suffix}" ]; then
-			einfo "Showing Diff..."
 			diff -u ${i}.${suffix} ${i}
-			sleep 2
+#			sleep 1
 		fi
 	done
 }
@@ -121,10 +129,10 @@ hide-restrict-arr()
 	#
 	# example:
 	#           regmatch_t __pmatch[__restrict_arr]
-	#           
+	#
 
 	find ${WORKDIR} -iname '*.h' | \
-		xargs | ccc-fixup 's/\(\[__restrict\)_arr\]/\1\]/g'
+		xargs | ccc-fixup 's#\(\[__restrict\)_arr\]#\1\]#g'
 }
 
 replace-cc-hardcode()
@@ -133,7 +141,7 @@ replace-cc-hardcode()
 	# Makefiles. Try and fix these.
 	#
 	find ${WORKDIR} -iname Makefile | \
-		xargs | ccc-fixup "s/^\(CC.*=\).*g*cc/\1${CC:-gcc}/g"
+		xargs | ccc-fixup "s#^\(CC.*=\).*g\?cc#\1${CC:-gcc}#g"
 }
 
 replace-cxx-hardcode()
@@ -141,19 +149,19 @@ replace-cxx-hardcode()
 	# lots of developers hardcode g++ into thier
 	# Makefiles. Try and fix these.
 	find ${WORKDIR} -iname Makefile | \
-		xargs | ccc-fixup "s/^\(CXX.*=\).*[gc]*++/\1${CXX:-g++}/g"
+		xargs | ccc-fixup "s#^\(CXX.*=\).*[gc]\{1\}++#\1${CXX:-g++}#g"
 }
 
 is-ccc()
 {
 	# return true if ccc is being used.
-	[ "${ARCH}:${CC}" == "alpha:ccc" ]
+	[ "${ARCH}:`basename ${CC:-gcc}`" == "alpha:ccc" ]
 }
 
 is-cxx()
 {
 	# return true if cxx is being used
-	[ "${ARCH}:${CXX}" == "alpha:cxx" ]
+	[ "${ARCH}:`basename ${CXX:-g++}`" == "alpha:cxx" ]
 }
 
 replace-ccc-g()
@@ -161,7 +169,9 @@ replace-ccc-g()
 	# -g will stop ccc/cxx performing optimisation
 	# replacing it with -g3 will let them co-exist.
 	find ${WORKDIR} -iname Makefile | \
-		xargs | ccc-fixup "s/\(^\CX*FLAGS=.*[\'\" \t]\)-g\([\'\" \t]\)/\1-g3\2/g"
+		xargs | ccc-fixup \
+		"s#\(^\CX\{,2\}FLAGS[[:space:]]*=.*[\'\"\x20\t]*\)-g\([\'\"\x20\t]\|$\)#\1-g3\2#g"
+	# FIXME: my eyes! it burns!
 }
 
 ccc-elf-check()
@@ -179,7 +189,7 @@ ccc-elf-check()
 		grep -E '^\ [0-9]{2,}\ .note\ ' | \
 			awk '{print $6,$3}' | \
 			line`
-		# check if that got anything. 
+		# check if that got anything.
 		[ ! "${elf_note_offset}" ] && return 1
 		# dump contents of section, and check for compaq signature.
 		hexdump -s 0x${elf_note_offset% *} -n $((0x${elf_note_offset#* })) -e '"%_p"' ${myBINARY} | \
@@ -207,7 +217,7 @@ create-so()
 		${LD:-ld} -shared -o ${T}/${2##*/} -soname `basename ${2/${so_version}}` \
 				-whole-archive ${1} -no-whole-archive -lots ${LDFLAGS}
 	fi
-	# hand installation over to dolib.so 
+	# hand installation over to dolib.so
 	dolib.so ${T}/${2##*/}
 }
 
@@ -216,15 +226,29 @@ append-ldflags()
 	LDFLAGS="${LDFLAGS} ${1}"
 }
 
-is-ldflags()
-{
+# flag-o-matic clone
+#
+#is-ldflags()
+#{
+#	for x in ${LDFLAGS}
+#	do
+#		if [ "${x}" = "${1}" ]; then
+#			echo true
+#			break
+#		fi
+#	done
+#}
+
+is-ldflags() {
+	local x
 	for x in ${LDFLAGS}
 	do
-		if [ "${x}" = "${1}" ]; then
-			echo true
-			break
+		if [ "${x}" == "${1}" ]; then
+			tty --quiet < /dev/stdout || echo "true"
+			return 0
 		fi
 	done
+	return 1
 }
 
 filter-ldflags()
@@ -234,3 +258,43 @@ filter-ldflags()
 		LDFLAGS="${LDFLAGS/${x}}"
 	done
 }
+
+otsify()
+{
+	[ "$DEBUG_CCC_ECLASS" ] && local ar_args="v"
+
+	# confirm argument exists, and is an archive (eg *.a)
+	# if it is, extract libots members into tempdir, then
+	# append them to argument, regenerate index and then return.
+
+	if [ "${1##*.}" == "a" ] && [ -f "${1}" ]; then
+		einfo "otsifying `basename ${1}` ..."
+
+		mkdir ${T}/ccc-otsify-${$}
+		cd ${T}/ccc-otsify-${$}
+
+		einfo "	extracting archive members from libots ..."
+		ar ${ar_args}x /usr/lib/libots.a || {
+			eerror "	unable to extract libots members."
+			return 1
+		}
+
+		einfo "	appending libots members to `basename ${1}` ..."
+		ar ${ar_args}q ${1} ${T}/ccc-otsify-${$}/*.o || {
+			eerror "	failed to append libots members to ${1}."
+			return 1
+		}
+
+		einfo  "	regenerating `basename ${1}` archive index ..."
+		ranlib ${1} || ewarn "	ranlib returned an error, probably not important."
+		einfo "otsification completed succesfully."
+		cd ${OLDPWD:-.}
+		return 0
+	else
+		ewarn "called otsify() with bad argument ..."
+		cd ${OLDPWD:-.}
+		return 1
+	fi
+}
+
+
diff --git a/eclass/check-kernel.eclass b/eclass/check-kernel.eclass
index f7b04a9585d9..b48ee96b9aa7 100644
--- a/eclass/check-kernel.eclass
+++ b/eclass/check-kernel.eclass
@@ -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/eclass/check-kernel.eclass,v 1.1 2003/08/02 20:48:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-kernel.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
 
 # Author: Martin Schlemmer <azarah@gentoo.org>
 # Eclass'd by: Seemant Kulleen <seemant@gentoo.org>
@@ -8,13 +8,8 @@
 # The check-kernel eclass is designed to detect the kernel sources and
 # report info on the versions
 
-ECLASS=check-kernel
-INHERITED="${INHERITED} ${ECLASS}"
 
-EXPORT_FUNCTIONS check_version_h get_KV_info \
-	is_2_4_kernel is_2_5_kernel is_2_6_kernel
-
-newdepend "sys-apps/gawk"
+DEPEND="sys-apps/gawk"
 
 check_version_h() {
 	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
@@ -23,13 +18,15 @@ check_version_h() {
 		eerror "to your current kernel sources, and that you did run:"
 		eerror
 		eerror "  # make dep"
+		eerror
+		eerror "(${ROOT}/usr/src/linux/include/linux/version.h does not exist)"
 		die "/usr/src/linux symlink not setup!"
 	fi
 }
 
 get_KV_info() {
 	check_version_h
-	
+
 	# Get the kernel version of sources in /usr/src/linux ...
 	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
 		"${ROOT}/usr/src/linux/include/linux/version.h")"
@@ -40,7 +37,7 @@ get_KV_info() {
 
 is_2_4_kernel() {
 	get_KV_info
-	
+
 	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ]
 	then
 		return 0
@@ -51,7 +48,7 @@ is_2_4_kernel() {
 
 is_2_5_kernel() {
 	get_KV_info
-	
+
 	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ]
 	then
 		return 0
@@ -70,3 +67,7 @@ is_2_6_kernel() {
 		return 1
 	fi
 }
+
+kernel_supports_modules() {
+	grep '^CONFIG_MODULES=y$' ${ROOT}/usr/src/linux/include/linux/autoconf.h >& /dev/null
+}
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 4c02f1dc65c1..8deac3d4b249 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -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/eclass/check-reqs.eclass,v 1.1 2004/11/19 20:57:31 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
 #
@@ -8,7 +8,7 @@
 # build requirements in terms of memory or disc space. It provides a function
 # which should usually be called during pkg_setup().
 #
-# From a user perspective, the variable BUILDREQS_ACTION can be set to:
+# From a user perspective, the variable CHECKREQS_ACTION can be set to:
 #    * "warn" (default), which will display a warning and wait for 15s
 #    * "error", which will make the ebuild error out
 #    * "ignore", which will not take any action
@@ -24,27 +24,27 @@
 #     # values in MBytes
 #
 #     # need this much memory (does *not* check swap)
-#     BUILDREQS_MEMORY="256"
+#     CHECKREQS_MEMORY="256"
 #
 #     # need this much temporary build space
-#     BUILDREQS_DISK_BUILD="2048"
+#     CHECKREQS_DISK_BUILD="2048"
 #
 #     # install will need this much space in /usr
-#     BUILDREQS_DISK_USR="1024"
+#     CHECKREQS_DISK_USR="1024"
 #
 #     # install will need this much space in /var
-#     BUILDREQS_DISK_VAR="1024"
+#     CHECKREQS_DISK_VAR="1024"
 #
 #     # go!
 #     check_reqs
 # }
 #
-# You should *not* override the user's BUILDREQS_ACTION setting, nor should you
+# You should *not* override the user's CHECKREQS_ACTION setting, nor should you
 # attempt to provide a value if it is unset. Note that the environment variables
 # are used rather than parameters for a few reasons:
 #   * easier to do if use blah ; then things
 #   * we might add in additional requirements things later
-# If you don't specify a value for, say, BUILDREQS_MEMORY, then the test is not
+# If you don't specify a value for, say, CHECKREQS_MEMORY, then the test is not
 # carried out.
 #
 # These checks should probably mostly work on non-Linux, and they should
@@ -52,36 +52,34 @@
 
 inherit eutils
 
-ECLASS=check-reqs
-INHERITED="$INHERITED $ECLASS"
 
 check_reqs() {
 	[ -n "$1" ] && die "Usage: check_reqs"
 
-	export BUILDREQS_NEED_SLEEP="" BUILDREQS_NEED_DIE=""
-	if [ "$BUILDREQS_ACTION" != "ignore" ] ; then
-		[ -n "$BUILDREQS_MEMORY" ] && check_build_memory
-		[ -n "$BUILDREQS_DISK_BUILD" ] && check_build_disk \
-			"${PORTAGE_TMPDIR}" "\${PORTAGE_TMPDIR}" "${BUILDREQS_DISK_BUILD}"
-		[ -n "$BUILDREQS_DISK_USR" ] && check_build_disk \
-			"${ROOT}/usr"  "\${ROOT}/usr" "${BUILDREQS_DISK_USR}"
-		[ -n "$BUILDREQS_DISK_VAR" ] && check_build_disk \
-			"${ROOT}/var"  "\${ROOT}/var" "${BUILDREQS_DISK_VAR}"
+	export CHECKREQS_NEED_SLEEP="" CHECKREQS_NEED_DIE=""
+	if [ "$CHECKREQS_ACTION" != "ignore" ] ; then
+		[ -n "$CHECKREQS_MEMORY" ] && check_build_memory
+		[ -n "$CHECKREQS_DISK_BUILD" ] && check_build_disk \
+			"${PORTAGE_TMPDIR}" "\${PORTAGE_TMPDIR}" "${CHECKREQS_DISK_BUILD}"
+		[ -n "$CHECKREQS_DISK_USR" ] && check_build_disk \
+			"${ROOT}/usr"  "\${ROOT}/usr" "${CHECKREQS_DISK_USR}"
+		[ -n "$CHECKREQS_DISK_VAR" ] && check_build_disk \
+			"${ROOT}/var"  "\${ROOT}/var" "${CHECKREQS_DISK_VAR}"
 	fi
 
-	if [ -n "${BUILDREQS_NEED_SLEEP}" ] ; then
+	if [ -n "${CHECKREQS_NEED_SLEEP}" ] ; then
 		echo
 		ewarn "Bad things may happen! You may abort the build by pressing ctrl+c in"
 		ewarn "the next 15 seconds."
 		ewarn " "
 		einfo "To make this kind of warning a fatal error, add a line to /etc/make.conf"
-		einfo "setting BUILDREQS_ACTION=\"error\". To skip build requirements checking,"
-		einfo "set BUILDREQS_ACTION=\"ignore\"."
+		einfo "setting CHECKREQS_ACTION=\"error\". To skip build requirements checking,"
+		einfo "set CHECKREQS_ACTION=\"ignore\"."
 		epause 15
 	fi
 
-	if [ -n "${BUILDREQS_NEED_DIE}" ] ; then
-		eerror "Bailing out as specified by BUILDREQS_ACTION"
+	if [ -n "${CHECKREQS_NEED_DIE}" ] ; then
+		eerror "Bailing out as specified by CHECKREQS_ACTION"
 		die "Build requirements not met"
 	fi
 }
@@ -89,7 +87,7 @@ check_reqs() {
 # internal use only!
 check_build_memory() {
 	[ -n "$1" ] && die "Usage: check_build_memory"
-	check_build_msg_begin "${BUILDREQS_MEMORY}" "MBytes" "RAM"
+	check_build_msg_begin "${CHECKREQS_MEMORY}" "MBytes" "RAM"
 	if [ -r /proc/meminfo ] ; then
 		actual_memory=$(sed -n -e '/MemTotal:/s/^[^:]*: *\([0-9]\+\) kB/\1/p' \
 			/proc/meminfo)
@@ -99,9 +97,9 @@ check_build_memory() {
 			actual_memory=$(echo $actual_memory | sed -e 's/^[^:=]*[:=]//' )
 	fi
 	if [ -n "${actual_memory}" ] ; then
-		if [ ${actual_memory} -lt $((1024 * ${BUILDREQS_MEMORY})) ] ; then
+		if [ ${actual_memory} -lt $((1024 * ${CHECKREQS_MEMORY})) ] ; then
 			eend 1
-			check_build_msg_ick "${BUILDREQS_MEMORY}" "MBytes" "RAM"
+			check_build_msg_ick "${CHECKREQS_MEMORY}" "MBytes" "RAM"
 		else
 			eend 0
 		fi
@@ -144,14 +142,14 @@ check_build_msg_skip() {
 
 # internal use only!
 check_build_msg_ick() {
-	if [ "${BUILDREQS_ACTION}" == "error" ] ; then
+	if [ "${CHECKREQS_ACTION}" == "error" ] ; then
 		eerror "Don't have at least ${1}${2} ${3}"
 		echo
-		export BUILDREQS_NEED_DIE="yes"
+		export CHECKREQS_NEED_DIE="yes"
 	else
 		ewarn "Don't have at least ${1}${2} ${3}"
 		echo
-		export BUILDREQS_NEED_SLEEP="yes"
+		export CHECKREQS_NEED_SLEEP="yes"
 	fi
 }
 
diff --git a/eclass/common-lisp-common-2.eclass b/eclass/common-lisp-common-2.eclass
index 9e208e2a70fa..8df596897a07 100644
--- a/eclass/common-lisp-common-2.eclass
+++ b/eclass/common-lisp-common-2.eclass
@@ -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/eclass/common-lisp-common-2.eclass,v 1.1 2005/02/10 09:08:28 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp-common-2.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
diff --git a/eclass/common-lisp-common.eclass b/eclass/common-lisp-common.eclass
index 2b8f0fa43a3d..19a9ce71da9d 100644
--- a/eclass/common-lisp-common.eclass
+++ b/eclass/common-lisp-common.eclass
@@ -1,20 +1,207 @@
-# 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/eclass/common-lisp-common.eclass,v 1.1 2003/10/14 03:07:44 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp-common.eclass,v 1.1.1.1 2005/11/30 09:59:22 chriswhite Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
-# Sundy code common to many Common Lisp related ebuilds.
+# Sundry code common to many Common Lisp related ebuilds.
+
+# Some handy constants
+
+inherit eutils
+
+CLFASLROOT=/usr/$(get_libdir)/common-lisp/
+CLSOURCEROOT=/usr/share/common-lisp/source/
+CLSYSTEMROOT=/usr/share/common-lisp/systems/
+
+# Many of our Common Lisp ebuilds are either inspired by, or actually
+# use packages and files from the Debian project's archives.
 
 do-debian-credits() {
 	docinto debian
 	for i in copyright README.Debian changelog; do
-		dodoc ${S}/debian/${i}
+		# be silent, since all files are not always present
+		dodoc ${S}/debian/${i} &>/dev/null || true
 	done
 	docinto .
 }
 
+# Most of the code below is from Debian's Common Lisp Controller
+# package
+
+register-common-lisp-implementation() {
+	PROGNAME=$(basename $0)
+	# first check if there is at least a compiler-name:
+	if [ -z "$1"  ] ; then
+		cat <<EOF
+usage: $PROGNAME compiler-name
+
+registers a Common Lisp compiler to the
+Common-Lisp-Controller system.
+EOF
+		exit 1
+	fi
+	IMPL=$1
+	FILE="/usr/$(get_libdir)/common-lisp/bin/$IMPL.sh"
+	if [ ! -f "$FILE" ] ; then
+		cat <<EOF
+$PROGNAME: I cannot find the script $FILE for the implementation $IMPL
+EOF
+		exit 2
+	fi
+	if [ ! -r "$FILE" ] ; then
+		cat <<EOF
+$PROGNAME: I cannot read the script $FILE for the implementation $IMPL
+EOF
+		exit 2
+	fi
+	# install CLC into the lisp
+	sh "$FILE" install-clc || (echo "Installation of CLC failed" >&2 ; exit 3)
+	mkdir /usr/$(get_libdir)/common-lisp/$IMPL &>/dev/null || true
+	chown cl-builder:cl-builder /usr/$(get_libdir)/common-lisp/$IMPL
+
+	# now recompile the stuff
+	for i  in /usr/share/common-lisp/systems/*.asd	; do
+		if [ -f $i -a -r $i ] ; then
+			i=${i%.asd}
+			package=${i##*/}
+			clc-autobuild-check $IMPL $package
+			if [ $? = 0 ]; then
+				echo recompiling package $package for implementation $IMPL
+				/usr/bin/clc-send-command --quiet recompile $package $IMPL
+			fi
+		fi
+	done
+	for i  in /usr/share/common-lisp/systems/*.system  ; do
+		if [ -f $i -a -r $i ] ; then
+			i=${i%.system}
+			package=${i##*/}
+			clc-autobuild-check $IMPL $package
+			if [ $? = 0 ]; then
+				echo recompiling package $package for implementation $IMPL
+				/usr/bin/clc-send-command --quiet recompile $package $IMPL
+			fi
+		fi
+	done
+	echo "$PROGNAME: Compiler $IMPL installed"
+}
+
+unregister-common-lisp-implementation() {
+	PROGNAME=$(basename $0)
+	if [ `id -u` != 0 ] ; then
+		echo $PROGNAME: you need to be root to run this program
+		exit 1
+	fi
+	if [ -z "$1" ] ; then
+		cat <<EOF
+usage: $PROGNAME compiler-name
+
+un-registers a Common Lisp compiler to the
+Common-Lisp-Controller system.
+EOF
+		exit 1
+	fi
+	IMPL=$1
+	IMPL_BIN="/usr/$(get_libdir)/common-lisp/bin/$IMPL.sh"
+	if [ ! -f "$IMPL_BIN" ] ; then
+		cat <<EOF
+$PROGNAME: No implementation of the name $IMPL is registered
+Cannot find the file $IMPL_BIN
+
+Maybe you already removed it?
+EOF
+		exit 0
+	fi
+	if [ ! -r "$IMPL_BIN" ] ; then
+		cat <<EOF
+$PROGNAME: No implementation of the name $IMPL is registered
+Cannot read the file $IMPL_BIN
+
+Maybe you already removed it?
+EOF
+		exit 0
+	fi
+	# Uninstall the CLC
+	sh $IMPL_BIN remove-clc || echo "De-installation of CLC failed" >&2
+	clc-autobuild-impl $IMPL inherit
+	# Just remove the damn subtree
+	(cd / ; rm -rf "/usr/$(get_libdir)/common-lisp/$IMPL/" ; true )
+	echo "$PROGNAME: Common Lisp implementation $IMPL uninstalled"
+}
+
+reregister-all-common-lisp-implementations() {
+	# Rebuilds all common lisp implementations
+	# Written by Kevin Rosenberg <kmr@debian.org>
+	# GPL-2 license
+	local clc_bin_dir=/usr/$(get_libdir)/common-lisp/bin
+	shopt -s nullglob
+	cd $clc_bin_dir
+	for impl_bin in *.sh; do
+		impl=$(echo $impl_bin | sed 's/\(.*\).sh/\1/')
+		unregister-common-lisp-implementation $impl
+		register-common-lisp-implementation $impl
+	done
+}
+
+# BIG FAT HACK: Since the Portage emerge step kills file timestamp
+# information, we need to compensate by ensuring all FASL files are
+# more recent than their source files.
+
+# The following `impl-*-timestamp-hack' functions SHOULD NOT be used
+# outside of this eclass.
+
+impl-save-timestamp-hack() {
+	local impl=$1
+	dodir /usr/share/${impl}
+	tar cpjf ${D}/usr/share/${impl}/portage-timestamp-compensate -C ${D}/usr/$(get_libdir)/${impl} .
+}
+
+impl-restore-timestamp-hack() {
+	local impl=$1
+	tar xjpfo /usr/share/${impl}/portage-timestamp-compensate -C /usr/$(get_libdir)/${impl}
+}
+
+impl-remove-timestamp-hack() {
+	local impl=$1
+	rm -rf /usr/$(get_libdir)/${impl} &>/dev/null || true
+}
+
+test-in() {
+	local symbol=$1
+	shift
+	for i in $@; do
+		if [ $i == ${symbol} ]; then
+			return 0			# true
+		fi
+	done
+	false
+}
+
+standard-impl-postinst() {
+	local impl=$1
+	rm -rf /usr/$(get_libdir)/common-lisp/${impl}/* &>/dev/null || true
+	chown cl-builder:cl-builder /usr/$(get_libdir)/common-lisp/${impl}
+	if test-in ${impl} cmucl sbcl; then
+		impl-restore-timestamp-hack ${impl}
+	fi
+	chown -R root:0 /usr/$(get_libdir)/${impl}
+	/usr/bin/clc-autobuild-impl ${impl} yes
+	register-common-lisp-implementation ${impl}
+}
+
+standard-impl-postrm() {
+	local impl=$1 impl_binary=$2
+	# Since we keep our own time stamps we must manually remove them
+	# here.
+	if [ ! -x ${impl_binary} ]; then
+		if test-in ${impl} cmucl sbcl; then
+			impl-remove-timestamp-hack ${impl}
+		fi
+		rm -rf /usr/$(get_libdir)/common-lisp/${impl}/*
+	fi
+}
+
 # Local Variables: ***
 # mode: shell-script ***
 # tab-width: 4 ***
-# End: ***
\ No newline at end of file
+# End: ***
diff --git a/eclass/common-lisp.eclass b/eclass/common-lisp.eclass
index a5c04d2e23b8..95bc7ae2f453 100644
--- a/eclass/common-lisp.eclass
+++ b/eclass/common-lisp.eclass
@@ -1,33 +1,78 @@
-# 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/eclass/common-lisp.eclass,v 1.1 2003/06/07 18:44:34 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
 # This eclass supports the common-lisp-controller installation of many
 # Common Lisp libraries
 
-ECLASS=common-lisp
-INHERITED="$INHERITED $ECLASS"
+inherit common-lisp-common
 
 CLPACKAGE=
 DEPEND="dev-lisp/common-lisp-controller"
 
-pkg_postinst() {
-	/usr/sbin/register-common-lisp-source $CLPACKAGE
+EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm
+
+common-lisp_pkg_postinst() {
+	if [ -z "${CLPACKAGE}" ]; then
+		die "CLPACKAGE was empty or undefined upon call to pkg_prerm"
+	else
+		for package in ${CLPACKAGE}; do
+			einfo "Registering Common Lisp source for ${package}"
+			register-common-lisp-source ${package}
+		done
+	fi
+}
+
+common-lisp_pkg_postrm() {
+	if [ -z "${CLPACKAGE}" ]; then
+		die "CLPACKAGE was empty or undefined upon call to pkg_prerm"
+	else
+		for package in ${CLPACKAGE}; do
+			if [ ! -d ${CLSOURCEROOT}/${package} ]; then
+				einfo "Unregistering Common Lisp source for ${package}"
+#				rm -rf ${CLFASLROOT}/*/${package}
+				unregister-common-lisp-source ${package}
+			fi
+		done
+	fi
 }
 
-pkg_prerm() {
-	/usr/sbin/unregister-common-lisp-source $CLPACKAGE
+#
+# In pkg_preinst, we remove the FASL files for the previous version of
+# the source.
+#
+common-lisp_pkg_preinst() {
+	if [ -z "${CLPACKAGE}" ]; then
+		die "CLPACKAGE was empty or undefined upon call to pkg_preinst"
+	else
+		for package in ${CLPACKAGE}; do
+			einfo "Removing FASL files for previous version of Common Lisp package ${package}"
+			rm -rf ${CLFASLROOT}/*/${package} || true
+		done
+	fi
 }
 
 common-lisp-install() {
-	insinto /usr/share/common-lisp/source/$CLPACKAGE
+	insinto ${CLSOURCEROOT}/${CLPACKAGE}
 	doins $@
 }
 
 common-lisp-system-symlink() {
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/$CLPACKAGE/$CLPACKAGE.asd \
-		/usr/share/common-lisp/systems/$CLPACKAGE.asd
+	dodir ${CLSYSTEMROOT}/`dirname ${CLPACKAGE}`
+	if [ $# -eq 0 ]; then
+		dosym ${CLSOURCEROOT}/${CLPACKAGE}/${CLPACKAGE}.asd \
+			${CLSYSTEMROOT}/${CLPACKAGE}.asd
+	else
+		for package in "$@" ; do
+			dosym ${CLSOURCEROOT}/$CLPACKAGE/${package}.asd \
+				${CLSYSTEMROOT}/${package}.asd
+		done
+	fi
 }
+
+# Local Variables: ***
+# mode: shell-script ***
+# tab-width: 4 ***
+# End: ***
diff --git a/eclass/commonbox.eclass b/eclass/commonbox.eclass
index 0fdcd5cb583b..a43858566a59 100644
--- a/eclass/commonbox.eclass
+++ b/eclass/commonbox.eclass
@@ -1,56 +1,80 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
+#
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.1 2002/07/14 21:39:03 seemant Exp $
-
+#
 # The commonbox eclass is designed to allow easier installation of the box
 # window managers such as blackbox and fluxbox and commonbox
 # The common utilities of those window managers get installed in the
 # commonbox-utils dependency, and default styles with the commonbox-styles
 # utility.  They all share the /usr/share/commonbox directory now.
 
-ECLASS=commonbox
-INHERITED="$INHERITED $ECLASS"
 
-EXPORT_FUNCTIONS commonify src_compile src_install
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst
+
+IUSE="nls kde gnome xinerama truetype"
 
-DEPEND="x11-misc/commonbox-utils
-	x11-misc/commonbox-styles"
+DEPEND="dev-util/pkgconfig
+	=sys-apps/sed-4*"
+
+RDEPEND="nls? ( sys-devel/gettext )
+	x11-misc/commonbox-utils
+	x11-themes/commonbox-styles"
 
-RDEPEND="nls? ( sys-devel/gettext )"
 PROVIDE="virtual/blackbox"
 
 myconf=""
+MYCONF=""
 mydoc=""
-MYBIN=""
+BOOTSTRAP=""
+FORCEXFT=""
+
+if [ -z "${MYBIN}" ]
+then
+	MYBIN="${PN}"
+fi
 
-commonbox_commonify() {
-	cd ${S}
+commonprep() {
 
-	cp Makefile Makefile.orig
-	sed -e "s:\(SUBDIRS = \).*:\1doc nls src:" \
-		Makefile.orig > Makefile
+	sed -i -e 's:data ::' ${S}/Makefile.am
 
-	cd ${S}/doc
+	sed -i -e 's:bsetbg::; s:bsetroot::' ${S}/util/Makefile.am
 
-	cp Makefile Makefile.orig
-	sed -e "s:bsetroot.1::" \
-		-e "s:bsetbg.1::" \
-		Makefile.orig > Makefile
+	sed -i -e 's:bsetroot.1::; s:bsetbg.1::' ${S}/doc/Makefile.am
 
-	cd ${S}/src
-	cp Makefile Makefile.orig
-	sed -e "s:\(DEFAULT_MENU = \).*:\1/usr/share/commonbox/menu:" \
-		-e "s:\(DEFAULT_STYLE = \).*:\1/usr/share/commonbox/styles/Clean:" \
-		-e "s:\(DEFAULT_INITFILE = \).*:\1/usr/share/commonbox/init:" \
-		Makefile.orig > Makefile
+	for i in `find ${S} -name 'Makefile.am'`
+	do
+		sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
+	done
 
-	cd ${S}
+	for i in `find ${S}/nls -name 'Makefile.am'`
+	do
+		sed -i -e "s:blackbox.cat:${MYBIN}.cat:g; s:${PN}.cat:${MYBIN}.cat:g" ${i}
+	done
+
+	for i in `find ${S}/src -name 'Makefile*'`
+	do
+		sed -i -e "s:/styles/Results:/styles/Fury-NG:" \
+		       -e "s:/styles/mbdtex:/styles/Fury-NG:" \
+		       -e "s:/styles/Clean:/styles/Fury-NG:" ${i}
+	done
 
 }
 
 commonbox_src_compile() {
 
+	commonprep
+
+	if [ -z "${BOOTSTRAP}" ]
+	then
+		aclocal
+		automake
+		autoconf
+	else
+		./bootstrap
+	fi
+
 	use nls \
 		&& myconf="${myconf} --enable-nls" \
 		|| myconf="${myconf} --disable-nls"
@@ -63,28 +87,86 @@ commonbox_src_compile() {
 		&& myconf="${myconf} --enable-gnome" \
 		|| myconf="${myconf} --disable-gnome"
 
-	econf \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-	
-	commonify || die
-	emake || die
+	use xinerama \
+		&& myconf="${myconf} --enable-xinerama" \
+		|| myconf="${myconf} --disable-xinerama"
+
+	use truetype \
+		&& myconf="${myconf} --enable-xft" \
+		|| myconf="${myconf} --disable-xft"
+
+	if [ -z "${MYCONF}" ]
+	then
+		econf \
+			--sysconfdir=/etc/X11/${MYBIN} \
+			--datadir=/usr/share/commonbox \
+			${myconf} || die
+	else
+		econf \
+			--sysconfdir=/etc/X11/${MYBIN} \
+			--datadir=/usr/share/commonbox \
+			${myconf} ${MYCONF} || die
+	fi
+
+	[ ! -z "${FORCEXFT}" ] && echo "#define XFT 1" >> ${S}/config.h
+
+	emake \
+		pkgdatadir=/usr/share/commonbox || die
+
 }
 
 
 commonbox_src_install() {
 
-	einstall || die
+	dodir /usr/share/commonbox/${PN}
 
-	dodoc README* AUTHORS TODO* ${mydoc}
+	make DESTDIR=${D} install || die
+
+	# move the ${PN} binary to ${MYBIN}
 
-	if [ -z "${MYBIN}" ]
+	if [ "${MYBIN}" != "${PN}" ]
 	then
-		MYBIN=${PN}
+		mv ${D}/usr/bin/${PN} ${D}/usr/bin/${MYBIN}
+
+		# same to manpage
+		rm ${D}/usr/share/man/man1/${PN}.1
+		mv doc/${PN}.1 doc/${MYBIN}.1
+		doman doc/${MYBIN}.1
 	fi
 
+	dodoc README* AUTHORS TODO* ${mydoc}
+
+	# move nls stuff
+	use nls && ( \
+		dodir /usr/share/commonbox/${MYBIN}
+		mv ${D}/usr/share/${PN}/nls ${D}/usr/share/commonbox/${MYBIN}
+	)
+
+	rmdir ${D}/usr/share/${MYBIN}
+
 	dodir /etc/X11/Sessions
 	echo "/usr/bin/${MYBIN}" > ${D}/etc/X11/Sessions/${MYBIN}
-	fperm +x /etc/X11/Sessions/${MYBIN}
+	fperms a+x /etc/X11/Sessions/${MYBIN}
+}
+
+commonbox_pkg_postinst() {
+	#notify user about the new share dir
+	if [ -d /usr/share/commonbox ]
+	then
+		einfo
+		einfo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		einfo "! ${MYBIN} no longer uses /usr/share/${MYBIN} as the  !"
+		einfo "! default share directory to contain styles and menus.      !"
+		einfo "! The default directory is now /usr/share/commonbox	 !"
+		einfo "! Please move any files in /usr/share/${MYBIN} that you  !"
+		einfo "! wish to keep (personal styles and your menu) into the     !"
+		einfo "! new directory and modify your menu files to point all     !"
+		einfo "! listed paths to the new directory.			       !"
+		einfo "! Also, be sure to update the paths in each user's	       !"
+		einfo "! config file found in their home directory.		       !"
+		einfo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+		einfo
+	fi
+
+	commonbox-menugen -kg
 }
diff --git a/eclass/confutils.eclass b/eclass/confutils.eclass
index 79ea47041340..dc02469774cf 100644
--- a/eclass/confutils.eclass
+++ b/eclass/confutils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.1 2004/06/27 16:05:26 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # eclass/confutils.eclass
 #		Utility functions to help with configuring a package
@@ -12,7 +12,16 @@
 #
 # ========================================================================
 
-IUSE="$IUSE shared"
+if [[ ${EBUILD_SUPPORTS_SHAREDEXT} == 1 ]]; then
+	IUSE="sharedext"
+fi
+
+# ========================================================================
+
+# list of USE flags that need deps that aren't yet in Portage
+# this list was originally added for PHP
+#
+# your eclass must define CONFUTILS_MISSING_DEPS if you need this
 
 # ========================================================================
 # confutils_init ()
@@ -21,7 +30,7 @@ IUSE="$IUSE shared"
 # this eclass first
 
 confutils_init () {
-	if useq shared ; then
+	if [[ ${EBUILD_SUPPORTS_SHAREDEXT} == 1 ]] && useq sharedext ; then
 		shared="=shared"
 	else
 		shared=
@@ -29,6 +38,53 @@ confutils_init () {
 }
 
 # ========================================================================
+# confutils_require_any ()
+#
+# Use this function to ensure one or more of the specified USE flags have
+# been enabled
+#
+# $1    - message to output everytime a flag is found
+# $2    - message to output everytime a flag is not found
+# $3 .. - flags to check
+#
+
+confutils_require_any() {
+	success_msg="$1"
+	shift
+	fail_msg="$1"
+	shift
+
+	required_flags="$@"
+	success=0
+
+	while [[ -n $1 ]]; do
+		if useq $1 ; then
+			einfo "$success_msg $1"
+			success=1
+		else
+			ewarn "$fail_msg $1"
+		fi
+		shift
+	done
+
+	# did we find what we are looking for?
+	if [[ $success == 1 ]]; then
+		return
+	fi
+
+	# if we get here, then none of the required USE flags are switched on
+
+	echo
+	eerror "You *must* enable one or more of the following USE flags:"
+	eerror "  $required_flags"
+	eerror
+	eerror "You can do this by enabling these flags in /etc/portage/package.use:"
+	eerror "    =$CATEGORY/$PN-$PVR $required_flags"
+	eerror
+	die "Missing USE flags"
+}
+
+# ========================================================================
 # confutils_use_conflict ()
 #
 # Use this function to automatically complain to the user if conflicting
@@ -63,7 +119,7 @@ confutils_use_conflict () {
 		eerror
 		eerror "You must disable these conflicting flags before you can emerge this package."
 		eerror "You can do this by disabling these flags in /etc/portage/package.use:"
-		eerror "    =$CATEGORY/$PN-$PVR: $my_remove"
+		eerror "    =$CATEGORY/$PN-$PVR $my_remove"
 		eerror
 		die "Conflicting USE flags"
 	fi
@@ -76,8 +132,7 @@ confutils_use_conflict () {
 # depends on another USE flag that hasn't been enabled
 #
 # $1	- flag that depends on other flags
-# $2	- error message to show
-# $3 .. - 
+# $2 .. - the flags that must be set for $1 to be valid
 
 confutils_use_depend_all () {
 	if ! useq $1 ; then
@@ -102,10 +157,10 @@ confutils_use_depend_all () {
 		eerror "  $my_missing"
 		eerror
 		eerror "You can do this by enabling these flags in /etc/portage/package.use:"
-		eerror "    =$CATEGORY/$PN-$PVR: $my_missing"
+		eerror "    =$CATEGORY/$PN-$PVR $my_missing"
 		eerror
 		eerror "You could disable this flag instead in /etc/portage/package.use:"
-		eerror "	=$CATEGORY/$PN-$PVR: -$my_flag"
+		eerror "	=$CATEGORY/$PN-$PVR -$my_flag"
 		echo
 
 		die "Need missing USE flags"
@@ -119,8 +174,7 @@ confutils_use_depend_all () {
 # depends on another USE flag that hasn't been enabled
 #
 # $1	- flag that depends on other flags
-# $2	- error message to show
-# $3 .. - 
+# $2 .. - flags that must be set for $1 to be valid
 
 confutils_use_depend_any () {
 	if ! useq $1 ; then
@@ -162,15 +216,19 @@ confutils_use_depend_any () {
 #
 # $1	- extension name
 # $2	- USE flag
+# $3	- optional message to einfo() to the user
 
 enable_extension_disable () {
 	if ! useq "$2" ; then
 		my_conf="${my_conf} --disable-$1"
+		[ -n "$3" ] && einfo "  Disabling $1"
+	else
+		[ -n "$3" ] && einfo "  Enabling $1"
 	fi
 }
 
 # ========================================================================
-# enable_extension_enable () 
+# enable_extension_enable ()
 #
 # This function is like use_enable(), except that it knows about
 # enabling modules as shared libraries, and it supports passing
@@ -180,14 +238,19 @@ enable_extension_disable () {
 # $2	- USE flag
 # $3	- 1 = support shared, 0 = never support shared
 # $4	- additional setting for configure
+# $5	- additional message to einfo out to the user
 
 enable_extension_enable () {
 	local my_shared
 
 	if [ "$3" == "1" ]; then
-		my_shared="$shared"
-		if [ "$4+" != "+" ]; then
-			my_shared="${my_shared},$4"
+		if [ "$shared+" != "+" ]; then
+			my_shared="${shared}"
+			if [ "$4+" != "+" ]; then
+				my_shared="${my_shared},$4"
+			fi
+		elif [ "$4+" != "+" ]; then
+		  my_shared="=$4"
 		fi
 	else
 		if [ "$4+" != "+" ]; then
@@ -197,12 +260,53 @@ enable_extension_enable () {
 
 	if useq $2 ; then
 		my_conf="${my_conf} --enable-$1$my_shared"
+		einfo "  Enabling $1"
 	else
 		my_conf="${my_conf} --disable-$1"
+		einfo "  Disabling $1"
 	fi
 }
 
 # ========================================================================
+# enable_extension_enableonly ()
+#
+# This function is like use_enable(), except that it knows about
+# enabling modules as shared libraries, and it supports passing
+# additional data with the switch
+#
+# $1	- extension name
+# $2	- USE flag
+# $3	- 1 = support shared, 0 = never support shared
+# $4	- additional setting for configure
+# $5	- additional message to einfo out to the user
+
+enable_extension_enableonly () {
+	local my_shared
+
+	if [ "$3" == "1" ]; then
+		if [ "$shared+" != "+" ]; then
+			my_shared="${shared}"
+			if [ "$4+" != "+" ]; then
+				my_shared="${my_shared},$4"
+			fi
+		elif [ "$4+" != "+" ]; then
+		  my_shared="=$4"
+		fi
+	else
+		if [ "$4+" != "+" ]; then
+			my_shared="=$4"
+		fi
+	fi
+
+	if useq $2 ; then
+		my_conf="${my_conf} --enable-$1$my_shared"
+		einfo "  Enabling $1"
+	else
+		# note: we deliberately do *not* use a --disable switch here
+		einfo "  Disabling $1"
+	fi
+}
+# ========================================================================
 # enable_extension_without ()
 #
 # Use this function to disable an extension that is enabled by default
@@ -211,10 +315,14 @@ enable_extension_enable () {
 #
 # $1	- extension name
 # $2	- USE flag
+# $3	- optional message to einfo() to the user
 
 enable_extension_without () {
 	if ! useq "$2" ; then
 		my_conf="${my_conf} --without-$1"
+		einfo "  Disabling $1"
+	else
+		einfo "  Enabling $1"
 	fi
 }
 
@@ -228,14 +336,19 @@ enable_extension_without () {
 # $2	- USE flag
 # $3	- 1 = support shared, 0 = never support shared
 # $4	- additional setting for configure
+# $5	- optional message to einfo() out to the user
 
 enable_extension_with () {
 	local my_shared
 
 	if [ "$3" == "1" ]; then
-		my_shared="$shared"
-		if [ "$4+" != "+" ]; then
-			my_shared="${my_shared},$4"
+		if [ "$shared+" != "+" ]; then
+			my_shared="${shared}"
+			if [ "$4+" != "+" ]; then
+				my_shared="${my_shared},$4"
+			fi
+		elif [ "$4+" != "+" ]; then
+		  my_shared="=$4"
 		fi
 	else
 		if [ "$4+" != "+" ]; then
@@ -245,7 +358,131 @@ enable_extension_with () {
 
 	if useq $2 ; then
 		my_conf="${my_conf} --with-$1$my_shared"
+		einfo "  Enabling $1"
 	else
 		my_conf="${my_conf} --without-$1"
+		einfo "  Disabling $1"
+	fi
+}
+
+# ========================================================================
+# enable_extension_withonly ()
+#
+# This function is a replacement for use_with.  It supports building
+# extensions as shared libraries,
+
+# $1	- extension name
+# $2	- USE flag
+# $3	- 1 = support shared, 0 = never support shared
+# $4	- additional setting for configure
+# $5	- optional message to einfo() out to the user
+
+enable_extension_withonly () {
+	local my_shared
+
+	if [ "$3" == "1" ]; then
+		if [ "$shared+" != "+" ]; then
+			my_shared="${shared}"
+			if [ "$4+" != "+" ]; then
+				my_shared="${my_shared},$4"
+			fi
+		elif [ "$4+" != "+" ]; then
+		  my_shared="=$4"
+		fi
+	else
+		if [ "$4+" != "+" ]; then
+			my_shared="=$4"
+		fi
+	fi
+
+	if useq $2 ; then
+		my_conf="${my_conf} --with-$1$my_shared"
+		einfo "  Enabling $1"
+	else
+		# note - we deliberately do *not* use --without here
+		einfo "  Disabling $1"
+	fi
+}
+
+# ========================================================================
+# confutils_warn_about_external_deps
+
+confutils_warn_about_missing_deps ()
+{
+	local x
+	local my_found=0
+
+	for x in $CONFUTILS_MISSING_DEPS ; do
+		if useq $x ; then
+			ewarn "USE flag $x enables support for software not in Portage"
+			my_found=1
+		fi
+	done
+
+	if [ "$my_found" = "1" ]; then
+		ewarn
+		ewarn "This ebuild will continue, but if you haven't already installed the"
+		ewarn "software required to satisfy the list above, this package will probably"
+		ewarn "fail to compile."
+		ewarn
+		sleep 5
+	fi
+}
+
+# ========================================================================
+# enable_extension_enable_built_with ()
+#
+# This function is like use_enable(), except that it knows about
+# enabling modules as shared libraries, and it supports passing
+# additional data with the switch
+#
+# $1    - pkg name
+# $2	- USE flag
+# $3	- extension name
+# $4	- additional setting for configure
+# $5	- alternative message
+
+enable_extension_enable_built_with () {
+	local msg=$3
+	[[ -n $5 ]] && msg="$5"
+
+	local param
+	[[ -n $4 ]] && msg="=$4"
+
+	if built_with_use $1 $2 ; then
+		my_conf="${my_conf} --enable-$3${param}"
+		einfo "  Enabling $msg"
+	else
+		my_conf="${my_conf} --disable-$3"
+		einfo "  Disabling $msg"
+	fi
+}
+
+# ========================================================================
+# enable_extension_with_built_with ()
+#
+# This function is like use_enable(), except that it knows about
+# enabling modules as shared libraries, and it supports passing
+# additional data with the switch
+#
+# $1    - pkg name
+# $2	- USE flag
+# $3	- extension name
+# $4	- additional setting for configure
+# $5	- alternative message
+
+enable_extension_with_built_with () {
+	local msg=$3
+	[[ -n $5 ]] && msg="$5"
+
+	local param
+	[[ -n $4 ]] && param="=$4"
+
+	if built_with_use $1 $2 ; then
+		my_conf="${my_conf} --with-$3${param}"
+		einfo "  Enabling $msg"
+	else
+		my_conf="${my_conf} --disable-$3"
+		einfo "  Disabling $msg"
 	fi
 }
diff --git a/eclass/cron.eclass b/eclass/cron.eclass
index db1792b5fc67..a944f2a4e33c 100644
--- a/eclass/cron.eclass
+++ b/eclass/cron.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cron.eclass,v 1.1 2005/01/15 12:37:53 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cron.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 
 # Original Author: Aaron Walker <ka0ttic@gentoo.org>
 #
@@ -16,20 +16,15 @@
 
 inherit eutils flag-o-matic
 
-ECLASS="cron"
-INHERITED="$INHERITED $ECLASS"
 EXPORT_FUNCTIONS pkg_postinst
 
 SLOT="0"
 
-DEPEND="${DEPEND}
-	virtual/libc
-	>=sys-apps/sed-4.0.5"
+DEPEND=">=sys-apps/sed-4.0.5"
 
-RDEPEND="${RDEPEND}
-	!virtual/cron
+RDEPEND="!virtual/cron
 	virtual/mta
-	>=sys-apps/cronbase-0.2.1-r3"
+	>=sys-process/cronbase-0.2.1-r3"
 
 PROVIDE="virtual/cron"
 
@@ -47,13 +42,13 @@ PROVIDE="virtual/cron"
 docrondir() {
 	# defaults
 	local perms="-m0750 -o root -g cron" dir="/var/spool/cron/crontabs"
-	
-	if [[ -n "$1" ]] ; then
+
+	if [[ -n $1 ]] ; then
 		case "$1" in
 			*/*)
-				dir="$1"
+				dir=$1
 				shift
-				[[ -n "$1" ]] && perms="$@"
+				[[ -n $1 ]] && perms="$@"
 				;;
 			*)
 				perms="$@"
@@ -78,17 +73,17 @@ docrondir() {
 #     docron crond -m 0110
 
 docron() {
-	local cron="cron" perms="-m 0750 -o root -g root"
+	local cron="cron" perms="-m 0750 -o root -g wheel"
 
-	if [[ -n "$1" ]] ; then
+	if [[ -n $1 ]] ; then
 		case "$1" in
 			-*)
 				perms="$@"
 				;;
 			 *)
-				cron="$1"
+				cron=$1
 				shift
-				[[ -n "$1" ]] && perms="$@"
+				[[ -n $1 ]] && perms="$@"
 				;;
 		esac
 	fi
@@ -110,15 +105,15 @@ docron() {
 docrontab() {
 	local crontab="crontab" perms="-m 4750 -o root -g cron"
 
-	if [[ -n "$1" ]] ; then
+	if [[ -n $1 ]] ; then
 		case "$1" in
 			-*)
 				perms="$@"
 				;;
 			 *)
-				crontab="$1"
+				crontab=$1
 				shift
-				[[ -n "$1" ]] && perms="$@"
+				[[ -n $1 ]] && perms="$@"
 				;;
 		esac
 	fi
@@ -137,26 +132,7 @@ docrontab() {
 	fi
 }
 
-# dopamd [ file ] [ new file ]
-#
-# Install pam auth config file in /etc/pam.d
-#
-# NOTE: this would make much more sense as a portage script (eg. doenvd)
-#
-#   The first argument, 'file' is required.  Install as 'new file', if
-#   specified.
-
-dopamd() {
-	local pamd="${1}" newpamd="${2:-${1}}"
-	[[ -z "${1}" ]] && die "dopamd requires at least one argument."
-	
-	insinto /etc/pam.d
-	# these are the default doins options, but be explicit just in case
-	insopts -m 0644 -o root -g root
-	newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
-}
-
-cron-pkg_postinst() {
+cron_pkg_postinst() {
 	echo
 	# vixie is the only daemon that has a true system crontab
 	if [[ "${PN}" != "vixie-cron" ]] ; then
@@ -166,7 +142,7 @@ cron-pkg_postinst() {
 		einfo "!!! That will replace root's current crontab !!!"
 		einfo
 	fi
-	
+
 	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
 	einfo "found online at:"
 	einfo "    http://www.gentoo.org/doc/en/cron-guide.xml"
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index e04e5c8ccc63..f73ea77d8b0a 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -1,152 +1,543 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.1 2002/07/17 20:25:16 danarmak Exp $
-# This eclass provides the generic cvs fetching functions.
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 
-ECLASS=cvs
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
 
-# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass
-# will take care of that. If you want to set the global KDE cvs ebuilds' settings,
-# see the comments in kde-source.eclass.
+# This eclass provides the generic cvs fetching functions.  To use
+# this from an ebuild, set the `ebuild-configurable settings' as
+# specified below in your ebuild before inheriting.  Then either leave
+# the default src_unpack or extend over cvs_src_unpack.  If you find
+# that you need to call the cvs_* functions directly, I'd be
+# interested to hear about it.
+
+# TODO:
+
+# Implement more auth types (gserver?, kserver?)
+
+# Support additional remote shells with `ext' authentication (does
+# anyone actually need to use it with anything other than SSH?)
+
+
+
+# Users shouldn't change these settings!  The ebuild/eclass inheriting
+# this eclass will take care of that.  If you want to set the global
+# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
 
 # --- begin ebuild-configurable settings
 
-# cvs command to run. you can set fex. "cvs -t" for extensive debug information
-# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard
-# the ~/.cvsrc config file and to use maximum compression.
+# ECVS_CVS_COMMAND -- CVS command to run
+#
+# You can set, for example, "cvs -t" for extensive debug information
+# on the cvs connection.  The default of "cvs -q -f -z4" means to be
+# quiet, to disregard the ~/.cvsrc config file and to use maximum
+# compression.
+
 [ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
 
-# Where the cvs modules are stored/accessed
-[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src"
 
-# Name of cvs server, set to "" to disable fetching
-# (i.e. to assume module is checked out already and don't update it).
-# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
-# parts of the full CVSROOT (which looks like
-# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
-# other settings
-[ -z "$ECVS_SERVER" ] && ECVS_SERVER=""
+# ECVS_UP_OPTS, ECVS_CO_OPTS -- CVS options given after the cvs
+# command (update or checkout).
+#
+# Don't remove -dP from update or things won't work.
+
+[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
+[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
+
+
+# ECVS_LOCAL -- If this is set, the CVS module will be fetched
+# non-recursively.  Refer to the information in the CVS man page
+# regarding the -l command option (not the -l global option).
+
+
+# ECVS_LOCALNAME -- local name of checkout directory
+#
+# This is useful if the module on the server is called something
+# common like 'driver' or is nested deep in a tree, and you don't like
+# useless empty directories.
+#
+# WARNING: Set this only from within ebuilds!  If set in your shell or
+# some such, things will break because the ebuild won't expect it and
+# have e.g. a wrong $S setting.
+
+
+# ECVS_TOP_DIR -- The directory under which CVS modules are checked
+# out.
 
-# Username to use
+[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
+
+# ECVS_SERVER -- CVS path
+#
+# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
+# Remove the other parts of the full CVSROOT, which might look like
+# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
+# using other settings also.
+#
+# Set this to "offline" to disable fetching (i.e. to assume the module
+# is already checked out in ECVS_TOP_DIR).
+
+[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
+
+
+# ECVS_MODULE -- the name of the CVS module to be fetched
+#
+# This must be set when cvs_src_unpack is called.  This can include
+# several directory levels, i.e. "foo/bar/baz"
+
+#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
+
+
+# ECVS_BRANCH -- the name of the branch/tag to use
+
+# The default is "HEAD".  The following default _will_ reset your
+# branch checkout to head if used.
+
+#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
+
+
+# ECVS_AUTH -- authentication method to use
+#
+# Possible values are "pserver" and "ext".  If `ext' authentication is
+# used, the remote shell to use can be specified in CVS_RSH (SSH is
+# used by default).  Currently, the only supported remote shell for
+# `ext' authentication is SSH.
+#
+# Armando Di Cianno <fafhrd@gentoo.org> 2004/09/27
+# - Added "no" as a server type, which uses no AUTH method, nor
+#    does it login
+#  e.g.
+#   "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
+#   ( from gnustep-apps/textedit )
+[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
+
+# ECVS_USER -- Username to use for authentication on the remote server
 [ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
 
-# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass)
+
+# ECVS_PASS -- Password to use for authentication on the remote server
 [ -z "$ECVS_PASS" ] && ECVS_PASS=""
 
-# Module to be fetched, must be set explicitly -
-# I don't like the former ="$NP" default setting
-[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
 
-# Subdirectory in module to be fetched, default is root "/" = whole module (NOT YET IMPLEMENTED)
-[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="/"
+# ECVS_SSH_HOST_KEY
+#
+# If SSH is used for `ext' authentication, use this variable to
+# specify the host key of the remote server.  The format of the value
+# should be the same format that is used for the SSH known hosts file.
+#
+# WARNING: If a SSH host key is not specified using this variable, the
+# remote host key will not be verified.
+
+
+# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the
+# -C option to cvs update)
+
+
+# ECVS_RUNAS
+#
+# Specifies an alternate (non-root) user to use to run cvs.  Currently
+# b0rked and wouldn't work with portage userpriv anyway without
+# special magic.
+
+# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
+
+
+# ECVS_SUBDIR -- deprecated, do not use
+[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
+
 
 # --- end ebuild-configurable settings ---
 
-debug-print "$ECLASS: init: ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
-ECVS_TOP_DIR=$ECVS_TOP_DIR
-ECVS_SERVER=$ECVS_SERVER
-ECVS_USER=$ECVS_USER
-ECVS_PASS=$ECVS_PASS
-ECS_MODULE=$ECVS_MODULE
-ECVS_MODULE_SUBDIR=$ECVS_MODULE_SUBDIR"
+# add cvs to deps
+# ssh is used for ext auth
+# sudo is used to run as a specified user
+DEPEND="dev-util/cvs"
+
+[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
+
+if [ "$ECVS_AUTH" == "ext" ]; then
+	#default to ssh
+	[ -z "$CVS_RSH" ] && export CVS_RSH="ssh"
+	if [ "$CVS_RSH" != "ssh" ]; then
+		die "Support for ext auth with clients other than ssh has not been implemented yet"
+	fi
+	DEPEND="${DEPEND} net-misc/openssh"
+fi
 
-# since we now longer have src_fetch as a redefinable ebuild function,
-# we are forced to call this function from cvs_src_unpack
+# called from cvs_src_unpack
 cvs_fetch() {
 
+	# Make these options local variables so that the global values are
+	# not affected by modifications in this function.
+
+	local ECVS_COMMAND="${ECVS_COMMAND}"
+	local ECVS_UP_OPTS="${ECVS_UP_OPTS}"
+	local ECVS_CO_OPTS="${ECVS_CO_OPTS}"
+
+	# Fix for sourceforge which doesnt want -z>3 anymore.
+
+	(echo $ECVS_SERVER | grep -q sourceforge) \
+		&& [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] \
+		&& ECVS_CVS_COMMAND="cvs -q -f -z3"
+
 	debug-print-function $FUNCNAME $*
 
-	# disable the sandbox for this dir
-	addread ${ECVS_TOP_DIR}
-	addwrite ${ECVS_TOP_DIR}
+	# Update variables that are modified by ebuild parameters, which
+	# should be effective every time cvs_fetch is called, and not just
+	# every time cvs.eclass is inherited
 
-	# prepare a cvspass file just for this session so that cvs thinks we're logged
-	# in at the cvs server. we don't want to mess with ~/.cvspass.
-	echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
-	export CVS_PASSFILE="${T}/cvspass"
+	# Handle parameter for local (non-recursive) fetching
+
+	if [ -n "$ECVS_LOCAL" ]; then
+		ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
+		ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
+	fi
+
+	# Handle ECVS_BRANCH option
+	#
+	# Because CVS auto-switches branches, we just have to pass the
+	# correct -rBRANCH option when updating.
+
+	if [ -n "$ECVS_BRANCH" ]; then
+		ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
+		ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
+	fi
 
-	cd $ECVS_TOP_DIR
+	# Handle ECVS_LOCALNAME, which specifies the local directory name
+	# to use.  Note that the -d command option is not equivalent to
+	# the global -d option.
 
-	if [ -z "$ECVS_SERVER" ]; then
-		# we're not required to fetch anything, the module already exists and shouldn't be updated
-	    if [ -d "$ECVS_MODULE" ]; then
-			debug-print "$FUNCNAME: offline mode, exiting"
-			return 0
-	    else
-			einfo "ERROR: Offline mode specified, but module not found. Aborting."
-			debug-print "$FUNCNAME: offline mode specified but module not found, exiting with error"
-			return 1
-	    fi
+	if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then
+		ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME"
 	fi
 
-	if [ -d "${ECVS_MODULE}" ]; then
-		#update existing module
 
-		cd ${ECVS_MODULE}
+	if [ -n "$ECVS_CLEAN" ]; then
+		ECVS_UP_OPTS="$ECVS_UP_OPTS -C"
+	fi
+
+
+	# It would be easiest to always be in "run-as mode", logic-wise,
+	# if sudo didn't ask for a password even when sudo'ing to `whoami`.
+
+	if [ -z "$ECVS_RUNAS" ]; then
+		run=""
+	else
+		run="sudo -u $ECVS_RUNAS"
+	fi
+
+	# Create the top dir if needed
 
-		# Switch servers if needed
-		# cvs keeps the server info in th CVS/Root file in every checked-out dir;
-		# we can fix those files to point to the new server
-		newserver=":pserver:anonymous@${ECVS_SERVER}"
-		oldserver="`cat CVS/Root`"
-		if [ "$newserver" != "$oldserver" ]; then
+	if [ ! -d "$ECVS_TOP_DIR" ]; then
 
-			einfo "Changing CVS server from $oldserver to $newserver:"
-			debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:"
+		# Note that the addwrite statements in this block are only
+		# there to allow creating ECVS_TOP_DIR; we allow writing
+		# inside it separately.
 
-			einfo "Searching for CVS dirs..."
-			cvsdirs="`find . -iname CVS -print`"
-			debug-print "$FUNCNAME: CVS dirs found:"
+		# This is because it's simpler than trying to find out the
+		# parent path of the directory, which would need to be the
+		# real path and not a symlink for things to work (so we can't
+		# just remove the last path element in the string)
+
+		debug-print "$FUNCNAME: checkout mode. creating cvs directory"
+		addwrite /foobar
+		addwrite /
+		$run mkdir -p "/$ECVS_TOP_DIR"
+		export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
+	fi
+
+	# In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
+	# otherwise addwrite() doesn't work.
+
+	cd -P "$ECVS_TOP_DIR" > /dev/null
+	ECVS_TOP_DIR="`/bin/pwd`"
+
+	# Disable the sandbox for this dir
+	addwrite "$ECVS_TOP_DIR"
+
+	# Chown the directory and all of its contents
+	if [ -n "$ECVS_RUNAS" ]; then
+		$run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
+	fi
+
+	# Determine the CVS command mode (checkout or update)
+	if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
+		mode=checkout
+	else
+		mode=update
+	fi
+
+
+	# Our server string (i.e. CVSROOT) without the password so it can
+	# be put in Root
+	if [ "$ECVS_AUTH" == "no" ]
+	then
+		local server="${ECVS_USER}@${ECVS_SERVER}"
+	else
+		local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
+	fi
+
+	# Switch servers automagically if needed
+	if [ "$mode" == "update" ]; then
+		cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
+		local oldserver="`$run cat CVS/Root`"
+		if [ "$server" != "$oldserver" ]; then
+
+			einfo "Changing the CVS server from $oldserver to $server:"
+			debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
+
+			einfo "Searching for CVS directories ..."
+			local cvsdirs="`$run find . -iname CVS -print`"
+			debug-print "$FUNCNAME: CVS directories found:"
 			debug-print "$cvsdirs"
 
-			einfo "Modifying CVS dirs..."
+			einfo "Modifying CVS directories ..."
 			for x in $cvsdirs; do
 				debug-print "In $x"
-				echo $newserver > $x/Root
+				$run echo "$server" > "$x/Root"
 			done
 
 		fi
+	fi
 
-		debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE"
-		einfo "Running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE..."
-		$ECVS_CVS_COMMAND update -dP || die "died running cvs update"
+	# Prepare a cvspass file just for this session, we don't want to
+	# mess with ~/.cvspass
+	touch "${T}/cvspass"
+	export CVS_PASSFILE="${T}/cvspass"
+	if [ -n "$ECVS_RUNAS" ]; then
+		chown "$ECVS_RUNAS" "${T}/cvspass"
+	fi
 
-	else 
-	# checkout module
+	# The server string with the password in it, for login
+	cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
 
-		export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
-		debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE with $CVSROOT..."
-		einfo "Running $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE with $CVSROOT..."
-		$ECVS_CVS_COMMAND checkout -P $ECVS_MODULE || die "died running cvs checkout"
+	# Ditto without the password, for checkout/update after login, so
+	# that the CVS/Root files don't contain the password in plaintext
+	if [ "$ECVS_AUTH" == "no" ]
+	then
+		cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
+	else
+		cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
+	fi
+
+	# Commands to run
+	cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
+	cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
+	cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
+
+	# Execute commands
+
+	cd "${ECVS_TOP_DIR}"
+	if [ "${ECVS_AUTH}" == "pserver" ]; then
+		einfo "Running $cmdlogin"
+		eval $cmdlogin || die "cvs login command failed"
+		if [ "${mode}" == "update" ]; then
+			einfo "Running $cmdupdate"
+			eval $cmdupdate || die "cvs update command failed"
+		elif [ "${mode}" == "checkout" ]; then
+			einfo "Running $cmdcheckout"
+			eval $cmdcheckout|| die "cvs checkout command failed"
+		fi
+	elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
+
+		# Hack to support SSH password authentication
+
+		# Backup environment variable values
+		local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
+
+		if [ "${SSH_ASKPASS+set}" == "set" ]; then
+			local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
+		else
+			unset CVS_ECLASS_ORIG_SSH_ASKPASS
+		fi
+
+		if [ "${DISPLAY+set}" == "set" ]; then
+			local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
+		else
+			unset CVS_ECLASS_ORIG_DISPLAY
+		fi
 
+		if [ "${CVS_RSH}" == "ssh" ]; then
+
+			# Force SSH to use SSH_ASKPASS by creating python wrapper
+
+			export CVS_RSH="${T}/cvs_sshwrapper"
+			cat > "${CVS_RSH}"<<EOF
+#!/usr/bin/python
+import fcntl
+import os
+import sys
+try:
+	fd = os.open('/dev/tty', 2)
+	TIOCNOTTY=0x5422
+	try:
+		fcntl.ioctl(fd, TIOCNOTTY)
+	except:
+		pass
+	os.close(fd)
+except:
+	pass
+newarglist = sys.argv[:]
+EOF
+
+			# disable X11 forwarding which causes .xauth access violations
+			# - 20041205 Armando Di Cianno <fafhrd@gentoo.org>
+			echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \
+				>> "${CVS_RSH}"
+			echo "newarglist.insert(1, '-oForwardX11=no')" \
+				>> "${CVS_RSH}"
+
+			# Handle SSH host key checking
+
+			local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
+			echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
+				>> "${CVS_RSH}"
+
+			if [ -z "${ECVS_SSH_HOST_KEY}" ]; then
+				ewarn "Warning: The SSH host key of the remote server will not be verified."
+				einfo "A temporary known hosts list will be used."
+				local CVS_ECLASS_STRICT_HOST_CHECKING="no"
+				touch "${CVS_ECLASS_KNOWN_HOSTS}"
+			else
+				local CVS_ECLASS_STRICT_HOST_CHECKING="yes"
+				echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}"
+			fi
+
+			echo -n "newarglist.insert(1, '-oStrictHostKeyChecking=" \
+				>> "${CVS_RSH}"
+			echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
+				>> "${CVS_RSH}"
+			echo "os.execv('/usr/bin/ssh', newarglist)" \
+				>> "${CVS_RSH}"
+
+			chmod a+x "${CVS_RSH}"
+
+			# Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
+			# if DISPLAY is not set)
+
+			[ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
+			export DISPLAY
+
+			# Create a dummy executable to echo $ECVS_PASS
+
+			export SSH_ASKPASS="${T}/cvs_sshechopass"
+			if [ "${ECVS_AUTH}" != "no" ]; then
+				echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
+					> "${SSH_ASKPASS}"
+			else
+				echo -en "#!/bin/bash\nreturn\n" \
+					> "${SSH_ASKPASS}"
+
+			fi
+			chmod a+x "${SSH_ASKPASS}"
+		fi
+
+		if [ "${mode}" == "update" ]; then
+			einfo "Running $cmdupdate"
+			eval $cmdupdate || die "cvs update command failed"
+		elif [ "${mode}" == "checkout" ]; then
+			einfo "Running $cmdcheckout"
+			eval $cmdcheckout|| die "cvs checkout command failed"
+		fi
+
+		# Restore environment variable values
+		export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
+		if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
+			export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
+		else
+			unset SSH_ASKPASS
+		fi
+
+		if [ "${CVS_ECLASS_ORIG_DISPLAY+set}" == "set" ]; then
+			export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
+		else
+			unset DISPLAY
+		fi
+	fi
+
+	# Restore ownership.  Not sure why this is needed, but someone
+	# added it in the orig ECVS_RUNAS stuff.
+	if [ -n "$ECVS_RUNAS" ]; then
+		chown `whoami` "${T}/cvspass"
 	fi
 
 }
 
+
 cvs_src_unpack() {
 
-    debug-print-function $FUNCNAME $*
-	cvs_fetch || die "died running cvs_fetch"
-
-    einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..."
-	debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..."
-	# the reason this lives here and not in kde-source_src_unpack
-	# is that in the future after copying the sources we might need to 
-	# delete them, so this has to be self-contained
-    cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR
-
-	# typically for kde cvs, the admin subdir lives in the kde-common module
-	# which is also needed
-	if [ ! -d "${WORKDIR}/${ECVS_MODULE}/admin" ]; then
-		ECVS_MODULE="kde-common" cvs_fetch
-	    einfo "Copying admin/ subdir from module kde-common, $ECVS_TOP_DIR..."
-		debug-print "Copying admin/ subdir from module kde-common, $ECVS_TOP_DIR..."
-    	cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR
-	fi
-	
+	debug-print-function $FUNCNAME $*
+
+	debug-print "$FUNCNAME: init:
+	ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
+	ECVS_UP_OPTS=$ECVS_UP_OPTS
+	ECVS_CO_OPTS=$ECVS_CO_OPTS
+	ECVS_TOP_DIR=$ECVS_TOP_DIR
+	ECVS_SERVER=$ECVS_SERVER
+	ECVS_USER=$ECVS_USER
+	ECVS_PASS=$ECVS_PASS
+	ECVS_MODULE=$ECVS_MODULE
+	ECVS_LOCAL=$ECVS_LOCAL
+	ECVS_RUNAS=$ECVS_RUNAS
+	ECVS_LOCALNAME=$ECVS_LOCALNAME"
+
+	[ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
+
+	local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
+
+	if [ -z "$ECVS_LOCALNAME" ]; then
+	    ECVS_LOCALNAME="$ECVS_MODULE"
+	fi
+
+	if [ "$ECVS_SERVER" == "offline" ]; then
+		# We're not required to fetch anything; the module already
+		# exists and shouldn't be updated.
+	 	if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
+			debug-print "$FUNCNAME: offline mode"
+		else
+			debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
+			die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
+		fi
+	elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
+		einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..."
+		cvs_fetch
+	else # ECVS_SERVER not set
+		die "ERROR: CVS server not specified, cannot continue."
+	fi
+
+	einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
+	debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
+
+	# This is probably redundant, but best to make sure.
+	mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
+
+	if [ -n "$ECVS_LOCAL" ]; then
+		cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
+	else
+		cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
+	fi
+
+	# If the directory is empty, remove it; empty directories cannot
+	# exist in cvs.  This happens when, for example, kde-source
+	# requests module/doc/subdir which doesn't exist.  Still create
+	# the empty directory in workdir though.
+	if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
+		debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME"
+		rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
+	fi
+
+	# Implement some of base_src_unpack's functionality; note however
+	# that base.eclass may not have been inherited!
+	if [ -n "$PATCHES" ]; then
+		debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
+		cd "$S"
+		epatch ${PATCHES}
+		# Make sure we don't try to apply patches more than once,
+		# since cvs_src_unpack is usually called several times from
+		# e.g. kde-source_src_unpack
+		export PATCHES=""
+	fi
+
+	einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
 }
 
 EXPORT_FUNCTIONS src_unpack
-
diff --git a/eclass/db.eclass b/eclass/db.eclass
index 7945f232fc97..fddb7e442383 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -1,21 +1,94 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.1.1.1 2005/11/30 09:59:17 chriswhite Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.1 2003/08/21 09:53:43 robbat2 Exp $
 
-ECLASS=db
-INHERITED="$INHERITED $ECLASS"
-EXPORT_FUNCTIONS db_fix_so
+IUSE="doc"
 
 db_fix_so () {
 	cd ${ROOT}/usr/lib
+
+	# first clean up old symlinks
+	find ${ROOT}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
+	find ${ROOT}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find ${ROOT}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
+
+	# now rebuild all the correct ones
 	for ext in so a; do
 		for name in libdb libdb_cxx libdb_tcl libdb_java; do
-			target=`find -type f -maxdepth 1 -name "${name}-*.${ext}" |sort -g |tail -n 1`
+			target=`find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -g |tail -n 1`
 			[ -n "${target}" ] && ln -sf ${target//.\//} ${name}.${ext}
 		done;
 	done;
 
+	# db[23] gets some extra-special stuff
+	if [ -f libdb1.so.2 ]; then
+		ln -sf libdb1.so.2 libdb.so.2
+		ln -sf libdb1.so.2 libdb1.so
+		ln -sf libdb1.so.2 libdb-1.so
+	fi
+	# what do we do if we ever get 3.3 ?
+	for i in libdb libdb_cxx libdb_tcl libdb_java; do
+		if [ -f $i-3.2.so ]; then
+			ln -sf $i-3.2.so $i-3.so
+			ln -sf $i-3.2.so $i.so.3
+		fi
+	done
+
+	# do the same for headers now
+	# but since there are only two of them, just overwrite them
 	cd ${ROOT}/usr/include
-	target=`find -type d -maxdepth 1 -name 'db*' | sort  -g |cut -d/ -f2- | tail -n1`
-	[ -n "${target}" ] && ln -sf ${target}/db.h .
-	[ -n "${target}" ] && ln -sf ${target}/db_185.h .
+	target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort  -g |cut -d/ -f2- | tail -n1`
+	if [ -n "${target}" ] && [ -e "${target}/db.h" ]; then
+		einfo "Creating db.h symlinks to ${target}"
+		ln -sf ${target}/db.h .
+		ln -sf ${target}/db_185.h .
+	elif [ ! -e "${target}/db.h" ]; then
+		if [ -n ${target} ]; then
+			ewarn "Could not find ${target}/db.h"
+		else
+			einfo "Apparently you just removed the last instance of $PN. Removing the symlinks"
+		fi
+		rm db.h db_185.h
+	fi
+}
+
+db_src_install_doc() {
+	# not everybody wants this wad of documentation as it is primarily API docs
+	if use doc; then
+		dodir /usr/share/doc/${PF}/html
+		mv ${D}/usr/docs/* ${D}/usr/share/doc/${PF}/html/
+		rm -rf ${D}/usr/docs
+	else
+		rm -rf ${D}/usr/docs
+	fi
+}
+
+db_src_install_usrbinslot() {
+	# slot all program names to avoid overwriting
+	for fname in ${D}/usr/bin/db_*
+	do
+		mv ${fname} ${fname//\/db_/\/db${SLOT}_}
+	done
+}
+
+db_src_install_headerslot() {
+	# install all headers in a slotted location
+	dodir /usr/include/db${SLOT}
+	mv ${D}/usr/include/*.h ${D}/usr/include/db${SLOT}/
+}
+
+db_src_install_usrlibcleanup() {
+	# Clean out the symlinks so that they will not be recorded in the
+	# contents (bug #60732)
+
+	if [ "${D}" = "" ]; then
+		die "Calling clean_links while \$D not defined"
+	fi
+
+	find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
+	find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
+	find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
+
+	rm -f ${D}/usr/include/db.h ${D}/usr/include/db_185.h
 }
diff --git a/eclass/db4-fix.eclass b/eclass/db4-fix.eclass
index 948541c2fd44..3f5524eb8bee 100644
--- a/eclass/db4-fix.eclass
+++ b/eclass/db4-fix.eclass
@@ -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/eclass/db4-fix.eclass,v 1.1 2003/05/24 14:38:06 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db4-fix.eclass,v 1.1.1.1 2005/11/30 09:59:21 chriswhite Exp $
 #
 # Author: Paul de Vrieze <pauldv@gentoo.org>
 #
@@ -9,10 +9,8 @@
 # the dodb4-fix script should be run from the directory where autoconf needs to
 # be run from
 
-ECLASS=db4-fix
-INHERITED="$INHERITED $ECLASS"
 
-newdepend "sys-apps/sed"
+DEPEND="sys-apps/sed"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
@@ -32,13 +30,15 @@ dodb4-fix () {
 			einfo "fixing $1 to work with db-4 by appending ${postfix}"
 			cp $1 ${1}.cpy
 			cat ${1}.cpy \
-				|sed -e "s;\( *AC_CHECK_LIB( *db4? *, db_[^ ,]*\);\1${postfix};" \
-				-e "s/\( *AC_CHECK_LIB([^,]*, db_create\)\( *,\)/\1${postfix}\2/" \
+				|sed -e "s;\( *AC_CHECK_LIB( *db-?4? *, db_[^ ,]*\);\1${postfix};" \
+				-e "s/\(-l\|[ \t]\)\(db3\)\([ \t]\)/\1db-3\3/g" \
 				>${1} || die "sed failed"
+#				-e "s/\( *AC_CHECK_LIB([^,]*, db_create\)\( *,\)/\1${postfix}\2/" \
+
 			autoconf
 		fi
 	else
 		einfo "db4 not found, so not applying db4 fixes"
 	fi
 
-}
\ No newline at end of file
+}
diff --git a/eclass/debug.eclass b/eclass/debug.eclass
index 54d929c071bf..8296b10bc4b2 100644
--- a/eclass/debug.eclass
+++ b/eclass/debug.eclass
@@ -1,44 +1,22 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/debug.eclass,v 1.1 2001/10/01 13:54:38 danarmak Exp $
-# This provides functions for verbose output for debugging
-
-# Note: we check whether these settings are set by "if [ "$FOO" ]; then".
-# Therefore set them to true/false only - not yes/no or whatever.
-
-# redirect output, unset to disable
-# use e.g. /dev/tty12 for quiet uotput out of harm's way.
-# todo: add support for loging into a file.
-DEBUG_OUTPUT="/dev/tty"
-
-# used internally for output
-# redirects output wherever's needed
-# in the future might use e* from /etc/init.d/functions.sh if i feel like it
-debug-print() {
-
-	[ -n "$DEBUG_OUTPUT" ] || return 0
-
-	while [ "$1" ]; do
-		echo "debug: $1" > $DEBUG_OUTPUT
-	shift
-	done
-
-}
-
-# std message functions
-
-debug-print-function() {
-	
-	str="now in function $1" 
-	shift
-	debug-print "$str" "parameters: $*"
-
-}
-
-debug-print-section() {
-	
-	debug-print "now in section $*"
-
-}
-
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/debug.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
+#
+# Author: Spider
+#
+# A general DEBUG eclass to ease inclusion of debugging information
+# and to remove "bad" flags from CFLAGS
+
+# Debug ECLASS
+IUSE="debug"
+
+if useq debug; then
+	# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
+	DEBUG="yes"
+	RESTRICT="${RESTRICT} nostrip"
+	# Remove omit-frame-pointer as some useless folks define that all over the place. they should be shot with a 16 gauge slingshot at least :)
+	# force debug information
+	export CFLAGS="${CFLAGS/-fomit-frame-pointer/} -g"
+	export CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer/} -g"
+	# einfo "CFLAGS and CXXFLAGS redefined"
+fi
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 462aa26ae7f7..947c08ed507d 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,81 +1,211 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.1 2004/07/16 10:48:22 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.1.1.1 2005/11/30 09:59:27 chriswhite Exp $
 
-ECLASS="depend.apache"
-INHERITED="$INHERITED $ECLASS"
-IUSE="apache apache2"
+inherit multilib
 
-# call this function to work out which version of the apache web server
-# your ebuild should be installing itself to use
+######
+## Apache Common Variables
+##
+## These are internal variables used by this, and other apache-related eclasses,
+## and thus should not need to be used by the ebuilds themselves (the ebuilds
+## should know what version of Apache they are building against).
+######
 
-detect_apache_useflags() {
-	USE_APACHE1=
+####
+## APACHE_VERSION
+##
+## Stores the version of apache we are going to be ebuilding.  This variable is
+## set by the need_apache{|1|2} functions.
+##
+## This needs to stay as '1' until apache2 is on by default -- although it
+## doesn't matter much as it's set by the need_apache functions.
+####
+APACHE_VERSION='1'
+
+####
+## APXS1, APXS2
+##
+## Paths to the apxs tools
+####
+APXS1="/usr/sbin/apxs"
+APXS2="/usr/sbin/apxs2"
+
+####
+## APACHECTL1, APACHECTL2
+##
+## Paths to the apachectl tools
+####
+APACHECTL1="/usr/sbin/apachectl"
+APACHECTL2="/usr/sbin/apache2ctl"
+
+####
+## APACHE1_BASEDIR, APACHE2_BASEDIR
+##
+## Paths to the server root directories
+####
+APACHE1_BASEDIR="/usr/$(get_libdir)/apache"
+APACHE2_BASEDIR="/usr/$(get_libdir)/apache2"
+
+####
+## APACHE1_CONFDIR, APACHE2_CONFDIR
+##
+## Paths to the configuration file directories (usually under
+## $APACHE?_BASEDIR/conf)
+####
+APACHE1_CONFDIR="/etc/apache"
+APACHE2_CONFDIR="/etc/apache2"
+
+####
+## APACHE1_MODULES_CONFDIR, APACHE2_MODULES_CONFDIR
+##
+## Paths where module configuration files are kept
+####
+APACHE1_MODULES_CONFDIR="${APACHE1_CONFDIR}/modules.d"
+APACHE2_MODULES_CONFDIR="${APACHE2_CONFDIR}/modules.d"
+
+####
+## APACHE1_VHOSTDIR, APACHE2_VHOSTDIR
+##
+## Paths where virtual host configuration files are kept
+####
+APACHE1_VHOSTDIR="${APACHE1_CONFDIR}/vhosts.d"
+APACHE2_VHOSTDIR="${APACHE2_CONFDIR}/vhosts.d"
+
+####
+## APACHE1_MODULESDIR, APACHE2_MODULESDIR
+##
+## Paths where we install modules
+####
+APACHE1_MODULESDIR="${APACHE1_BASEDIR}/modules"
+APACHE2_MODULESDIR="${APACHE2_BASEDIR}/modules"
+
+####
+## APACHE1_DEPEND, APACHE2_DEPEND
+##
+## Dependencies for apache 1.x and apache 2.x
+##  - apache2 must be at least version 2.0.54-r30, this is lowest version
+##    containing our new overall changes -- trapni (Jan 21 2005)
+##  - apache1 must be at least version 1.3.33-r10, but how to
+##    define the DEPEND here? (FIXME) -- trapni (Jan 21 2005)
+##     - currently not possible - bug #4315 -- vericgar (Jan 21 2005)
+####
+APACHE1_DEPEND="=net-www/apache-1*"
+APACHE2_DEPEND=">=net-www/apache-2.0.54-r30"
+
+####
+## APACHE_DEPEND
+##
+## Dependency magic based on useflags to use the right DEPEND
+####
+
+NEED_APACHE_DEPEND="apache2? ( ${APACHE2_DEPEND} ) !apache2? ( ${APACHE1_DEPEND} )"
+WANT_APACHE_DEPEND="apache2? ( ${APACHE2_DEPEND} ) !apache2? ( apache? ( ${APACHE1_DEPEND} ) )"
+
+####
+# uses_apache1()
+#
+# sets up all of the environment variables required by an apache1 module
+####
+
+uses_apache1() {
+	APACHE_VERSION='1'
+	APXS="$APXS1"
 	USE_APACHE2=
-	USE_APACHE_MULTIPLE=
+	APACHECTL="${APACHECTL1}"
+	APACHE_BASEDIR="${APACHE1_BASEDIR}"
+	APACHE_CONFDIR="${APACHE1_CONFDIR}"
+	APACHE_MODULES_CONFDIR="${APACHE1_MODULES_CONFDIR}"
+	APACHE_VHOSTSDIR="${APACHE1_VHOSTSDIR}"
+	APACHE_MODULESDIR="${APACHE1_MODULESDIR}"
+}
 
-	useq apache2 && USE_APACHE2=1
-	useq apache  && USE_APACHE1=1
+####
+# uses_apache2()
+#
+# sets up all of the environment variables required by an apache2 module
+####
 
-	[ -n "$USE_APACHE1" ] && [ -n "$USE_APACHE2" ] && USE_APACHE_MULTIPLE=1
+uses_apache2() {
+	APACHE_VERSION='2'
+	USE_APACHE2=2
+	APXS="$APXS2"
+	APACHECTL="${APACHECTL2}"
+	APACHE_BASEDIR="${APACHE2_BASEDIR}"
+	APACHE_CONFDIR="${APACHE2_CONFDIR}"
+	APACHE_MODULES_CONFDIR="${APACHE2_MODULES_CONFDIR}"
+	APACHE_VHOSTSDIR="${APACHE2_VHOSTSDIR}"
+	APACHE_MODULESDIR="${APACHE2_MODULESDIR}"
 }
 
-detect_apache_installed() {
-	HAS_APACHE1=
-	HAS_APACHE2=
-	HAS_APACHE_MULTIPLE=
-	HAS_APACHE_ANY=
+doesnt_use_apache() {
+	APACHE_VERSION='0'
+	USE_APACHE=
+}
 
-	has_version '=net-www/apache-1*' && HAS_APACHE1=1 && HAS_APACHE_ANY=1
-	has_version '=net-www/apache-2*' && HAS_APACHE2=1 && HAS_APACHE_ANY=1
+####
+## need_apache1
+##
+## An ebuild calls this to get the dependency information
+## for apache-1.x.  An ebuild should use this in order for
+## future changes to the build infrastructure to happen
+## seamlessly.  All an ebuild needs to do is include the
+## line need_apache1 somewhere.
+####
+need_apache1() {
+	debug-print-function need_apache1
 
-	[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" && HAVE_APACHE_MULTIPLE=1
+	DEPEND="${DEPEND} ${APACHE1_DEPEND}"
+	RDEPEND="${RDEPEND} ${APACHE1_DEPEND}"
+	APACHE_VERSION='1'
 }
 
-# call this function from your pkg_setup
+####
+## need_apache2
+##
+## An ebuild calls this to get the dependency information
+## for apache-2.x.  An ebuild should use this in order for
+## future changes to the build infrastructure to happen
+## seamlessly.  All an ebuild needs to do is include the
+## line need_apache1 somewhere.
+####
+need_apache2() {
+	debug-print-function need_apache2
 
-depend_apache() {
-	detect_apache_installed
-	detect_apache_useflags
+	DEPEND="${DEPEND} ${APACHE2_DEPEND}"
+	RDEPEND="${RDEPEND} ${APACHE2_DEPEND}"
+	APACHE_VERSION='2'
+}
 
-	# deal with the multiple cases first - much easier
-	if [ -n "$USE_APACHE_MULTIPLE" ]; then
-		echo
-		eerror "You have both the apache and apache2 USE flags set"
-		eerror
-		eerror "Please set only ONE of these USE flags, and try again"
-		echo
-		die "Multiple Apache USE flags set - you can only have one set at a time"
-	fi
+####
+## DO NOT CHANGE THIS FUNCTION UNLESS YOU UNDERSTAND THE CONSEQUENCES IT
+## WILL HAVE ON THE CACHE! There MUST be a apache2? () block in DEPEND for
+## things to work correct in the dependency calculation stage.
+####
+need_apache() {
+	debug-print-function need_apache
 
-	if [ -n "$USE_APACHE2" ] ; then
-		if  [ -z "$HAS_APACHE2" -a -n "$HAS_APACHE_ANY" ] ; then
-			echo
-			eerror "You have the 'apache2' USE flag set, but only have Apache v1 installed"
-			eerror "If you really meant to upgrade to Apache v2, please install Apache v2"
-			eerror "before installing $CATEGORY/${PN}-${PVR}"
-			echo
-			die "Automatic upgrade of Apache would be forced; avoiding"
-		else
-			einfo "Apache 2 support enabled"
-			DETECT_APACHE=2
-			return
-		fi
+	IUSE="${IUSE} apache2"
+	DEPEND="${DEPEND} ${NEED_APACHE_DEPEND}"
+	RDEPEND="${RDEPEND} ${NEED_APACHE_DEPEND}"
+	if useq apache2; then
+		uses_apache2
+	else
+		uses_apache1
 	fi
+}
 
-	if [ -n "$USE_APACHE1" ]; then
-		if [ -z "$HAS_APACHE1" -a -n "$HAS_APACHE_ANY" ]; then
-			echo
-			eerror "You have the 'apache' USE flag set, but only have a later version of"
-			eerror "Apache installed on your computer.  Please use the 'apache2' USE flag"
-			eerror "or downgrade to Apache v1 before installing $CATEGORY/${PN}-${PVR}"
-			echo
-			die "Avoiding installing older version of Apache"
-		else
-			einfo "Apache 1 support enabled"
-			DETECT_APACHE=1
-			return
-		fi
+want_apache() {
+	debug-print-function want_apache
+
+	IUSE="${IUSE} apache apache2"
+	DEPEND="${DEPEND} ${WANT_APACHE_DEPEND}"
+	RDEPEND="${DEPEND} ${WANT_APACHE_DEPEND}"
+	if useq apache2 ; then
+		uses_apache2
+	elif useq apache ; then
+		uses_apache1
+	else
+		doesnt_use_apache
 	fi
 }
-
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index ce1ba82ba2d0..55e4b19d55ab 100644
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.1.1.1 2005/11/30 09:59:31 chriswhite Exp $
 #
 # ========================================================================
 #
@@ -8,12 +8,18 @@
 #		functions to allow ebuilds to depend on php4 and/or php5
 #
 # Author:	Stuart Herbert
-#			(stuart@gentoo.org)
+#			<stuart@gentoo.org>
+#
+# Author:	Luca Longinotti
+#			<chtekk@gentoo.org>
+#
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
 # ========================================================================
 
 inherit eutils
 
+# PHP4-only depend functions
 need_php4_cli()
 {
 	DEPEND="${DEPEND} =virtual/php-4*"
@@ -54,6 +60,7 @@ uses_php4()
 	einfo
 }
 
+# PHP5-only depend functions
 need_php5_cli()
 {
 	DEPEND="${DEPEND} =virtual/php-5*"
@@ -94,6 +101,19 @@ uses_php5()
 	einfo
 }
 
+# general PHP depend functions
+need_php_cli()
+{
+	DEPEND="${DEPEND} virtual/php"
+	RDEPEND="${RDEPEND} virtual/php"
+}
+
+need_php_httpd()
+{
+	DEPEND="${DEPEND} virtual/httpd-php"
+	RDEPEND="${RDEPEND} virtual/httpd-php"
+}
+
 need_php()
 {
 	DEPEND="${DEPEND} dev-lang/php"
@@ -122,7 +142,8 @@ need_php_by_category()
 # returns if any one of the listed SAPIs has been installed
 # dies if none of the listed SAPIs has been installed
 
-require_php_sapi_from() {
+require_php_sapi_from()
+{
 	has_php
 
 	local has_sapi=0
@@ -161,7 +182,8 @@ require_php_sapi_from() {
 # returns if all of the listed USE flags are set
 # dies if any of the listed USE flags are not set
 
-require_php_with_use() {
+require_php_with_use()
+{
 	has_php
 
 	local missing_use=
@@ -189,23 +211,24 @@ require_php_with_use() {
 	die "Re-install ${PHP_PKG}"
 }
 
-# call this function from your src_compile & src_install methods
-# if you need to know where the PHP binaries are installed
+# call this function from your pkg_setup, src_compile & src_install methods
+# if you need to know where the PHP binaries are installed and their data
 
 has_php()
 {
 	# if PHP_PKG is set, then we have remembered our PHP settings
 	# from last time
+
 	if [[ -n ${PHP_PKG} ]]; then
 		return
 	fi
 
 	if [[ -z ${PHP_VERSION} ]]; then
 		# detect which PHP version installed
-		if has_version '=dev-lang/php-5*' ; then
-			PHP_VERSION=5
-		elif has_version '=dev-lang/php-4*' ; then
+		if has_version '=dev-lang/php-4*' ; then
 			PHP_VERSION=4
+		elif has_version '=dev-lang/php-5*' ; then
+			PHP_VERSION=5
 		else
 			die "Unable to find an installed dev-lang/php package"
 		fi
@@ -223,6 +246,8 @@ has_php()
 # these functions return 0 if the condition is satisfied, or 1 otherwise
 # ========================================================================
 
+# check if our PHP was compiled with ZTS (Zend Thread Safety)
+
 has_zts()
 {
 	has_php
@@ -234,12 +259,27 @@ has_zts()
 	return 1
 }
 
+# check if our PHP was built with Hardened-PHP active
+
+has_hardenedphp()
+{
+	has_php
+
+	if built_with_use =${PHP_PKG} hardenedphp ; then
+		return 0
+	fi
+
+	return 1
+}
+
 # ========================================================================
 # require_*() functions
 #
 # These functions die() if PHP was built without the required USE flag(s)
 # ========================================================================
 
+# require a PHP built with PDO support for PHP5
+
 require_pdo()
 {
 	has_php
@@ -248,7 +288,8 @@ require_pdo()
 
 	if [[ ${PHP_VERSION} == 4 ]] ; then
 		eerror
-		eerror "This package requires PDO. PDO is only available for PHP 5."
+		eerror "This package requires PDO."
+		eerror "PDO is only available for PHP 5."
 		eerror "Please install dev-lang/php-5*"
 		eerror
 		die "PHP 5 not installed"
@@ -266,13 +307,13 @@ require_pdo()
 		return
 	fi
 
-	# it suffices that pecl-pdo was installed to have PDO support
+	# ok, as last resort, it suffices that pecl-pdo was installed to have PDO support
 
 	if has_version dev-php5/pecl-pdo ; then
 		return
 	fi
 
-	# if we get here, then we have no PDO support :(
+	# if we get here, then we have no PDO support
 
 	eerror
 	eerror "No PDO extension for PHP found."
@@ -284,42 +325,82 @@ require_pdo()
 	eerror "the 'pdo' or the 'pdo-external' USE flags"
 	eerror "turned on."
 	eerror
-	die "No PDO extension found for PHP"
+	die "No PDO extension found for PHP 5"
 }
 
 # determines which installed PHP version has the CLI sapi
 # useful for PEAR eclass, or anything which needs to run PHP
-# scripts
+# scripts depending on the cli sapi
 
 require_php_cli()
 {
 	# if PHP_PKG is set, then we have remembered our PHP settings
 	# from last time
+
 	if [[ -n ${PHP_PKG} ]]; then
 		return
 	fi
 
 	# detect which PHP version installed
-	if has_version '=dev-lang/php-5*' ; then
+	if has_version '=dev-lang/php-4*' ; then
+		pkg="`best_version '=dev-lang/php-4*'`"
+		if built_with_use =${pkg} cli ; then
+			PHP_VERSION=4
+		fi
+	elif has_version '=dev-lang/php-5*' ; then
 		pkg="`best_version '=dev-lang/php-5*'`"
 		if built_with_use =${pkg} cli ; then
 			PHP_VERSION=5
 		fi
-	elif has_version '=dev-lang/php-4*' ; then
+	else
+		die "Unable to find an installed dev-lang/php package"
+	fi
+
+	if [[ -z ${PHP_VERSION} ]]; then
+		die "No PHP CLI installed"
+	fi
+
+	# if we get here, then PHP_VERSION tells us which version of PHP we
+	# want to use
+
+	uses_php${PHP_VERSION}
+}
+
+# determines which installed PHP version has the CGI sapi
+# useful for anything which needs to run PHP scripts
+# depending on the cgi sapi
+
+require_php_cgi()
+{
+	# if PHP_PKG is set, then we have remembered our PHP settings
+	# from last time
+
+	if [[ -n ${PHP_PKG} ]]; then
+		return
+	fi
+
+	# detect which PHP version installed
+	if has_version '=dev-lang/php-4*' ; then
 		pkg="`best_version '=dev-lang/php-4*'`"
-		if built_with_use =${pkg} cli ; then
+		if built_with_use =${pkg} cgi ; then
 			PHP_VERSION=4
 		fi
+	elif has_version '=dev-lang/php-5*' ; then
+		pkg="`best_version '=dev-lang/php-5*'`"
+		if built_with_use =${pkg} cgi ; then
+			PHP_VERSION=5
+		fi
 	else
 		die "Unable to find an installed dev-lang/php package"
 	fi
 
 	if [[ -z ${PHP_VERSION} ]]; then
-		die "No PHP CLI installed"
+		die "No PHP CGI installed"
 	fi
 
 	# if we get here, then PHP_VERSION tells us which version of PHP we
 	# want to use
+
 	uses_php${PHP_VERSION}
 }
 
@@ -329,19 +410,22 @@ require_sqlite()
 {
 	has_php
 
-	# has our PHP been built w/ sqlite?
+	# has our PHP been built with sqlite?
+
 	if built_with_use =${PHP_PKG} sqlite ; then
 		return
 	fi
 
-	# do we have pecl-sqlite installed for PHP4?
+	# do we have pecl-sqlite installed for PHP 4?
+
 	if [[ ${PHP_VERSION} == 4 ]] ; then
 		if has_version dev-php4/pecl-sqlite ; then
 			return
 		fi
 	fi
 
-	# if we get here, then we don't have any php/sqlite support installed
+	# if we get here, then we don't have any sqlite support for PHP installed
+
 	eerror
 	eerror "No sqlite extension for PHP found."
 	eerror "Please install an sqlite extension for PHP,"
@@ -350,3 +434,98 @@ require_sqlite()
 	eerror
 	die "No sqlite extension for PHP found"
 }
+
+# require a PHP built with GD support
+
+require_gd()
+{
+	has_php
+
+	# do we have the internal GD support installed?
+
+	if built_with_use =${PHP_PKG} gd ; then
+		return
+	fi
+
+	# ok, maybe GD was built using the external support?
+
+	if built_with_use =${PHP_PKG} gd-external ; then
+		return
+	fi
+
+	# if we get here, then we have no GD support
+
+	eerror
+	eerror "No GD support for PHP found."
+	eerror "Please install the GD support for PHP,"
+	eerror "you must install dev-lang/php with either"
+	eerror "the 'gd' or the 'gd-external' USE flags"
+	eerror "turned on."
+	eerror
+	die "No GD support found for PHP"
+}
+
+# ========================================================================
+# Misc functions
+#
+# These functions provide miscellaneous checks and functionality.
+# ========================================================================
+
+# executes some checks needed when installing a binary PHP extension
+
+php_binary_extension() {
+	has_php
+
+	# binary extensions do not support the change of PHP
+	# API version, so they can't be installed when USE flags
+	# are enabled wich change the PHP API version
+
+	if built_with_use =${PHP_PKG} hardenedphp ; then
+		eerror
+		eerror "You cannot install binary PHP extensions"
+		eerror "when the 'hardenedphp' USE flag is enabled!"
+		eerror "Please reemerge dev-lang/php with the"
+		eerror "'hardenedphp' USE flag turned off."
+		eerror
+		die "'hardenedphp' USE flag turned on"
+	fi
+
+	if built_with_use =${PHP_PKG} debug ; then
+		eerror
+		eerror "You cannot install binary PHP extensions"
+		eerror "when the 'debug' USE flag is enabled!"
+		eerror "Please reemerge dev-lang/php with the"
+		eerror "'debug' USE flag turned off."
+		eerror
+		die "'debug' USE flag turned on"
+	fi
+}
+
+# alternative to dodoc for use in our php eclasses and ebuilds
+# stored here because depend.php gets always sourced everywhere
+# in the PHP ebuilds and eclasses
+# it simply is dodoc with a changed path to the docs
+# no support for docinto is given!
+
+dodoc-php()
+{
+if [ $# -lt 1 ] ; then
+	echo "$0: at least one argument needed" 1>&2
+	exit 1
+fi
+
+phpdocdir="${D}/usr/share/doc/${CATEGORY}/${PF}/"
+
+if [ ! -d "${phpdocdir}" ] ; then
+	install -d "${phpdocdir}"
+fi
+
+for x in "$@" ; do
+	if [ -s "${x}" ] ; then
+		install -m0644 "${x}" "${phpdocdir}"
+		gzip -f -9 "${phpdocdir}/${x##*/}"
+	elif [ ! -e "${x}" ] ; then
+		echo "dodoc-php: ${x} does not exist" 1>&2
+	fi
+done
+}
diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
index c64f53aae919..ec7577497a86 100644
--- a/eclass/distutils.eclass
+++ b/eclass/distutils.eclass
@@ -1,25 +1,117 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.1.1.1 2005/11/30 09:59:34 chriswhite Exp $
+#
 # Author: Jon Nelson <jnelson@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.1 2002/08/02 00:46:54 jnelson Exp $
+# Current Maintainer: Alastair Tse <liquidx@gentoo.org>
+#
 # The distutils eclass is designed to allow easier installation of
-# distutils-based python modules, and their incorporation into 
+# distutils-based python modules and their incorporation into
 # the Gentoo Linux system.
+#
+# - Features:
+# distutils_src_compile()    - does python setup.py build
+# distutils_src_install()    - does python setup.py install and install docs
+# distutils_python_version() - sets PYVER/PYVER_MAJOR/PYVER_MINOR
+# distutils_python_tkinter() - checks for tkinter support in python
+#
+# - Variables:
+# PYTHON_SLOT_VERSION     - for Zope support
+# DOCS                    - additional DOCS
 
-ECLASS=distutils
-INHERITED="$INHERITED $ECLASS"
+inherit python eutils
 
-EXPORT_FUNCTIONS src_compile src_install
-
-newdepend ">=dev-lang/python"
+# This helps make it possible to add extensions to python slots.
+# Normally only a -py21- ebuild would set PYTHON_SLOT_VERSION.
+if [ "${PYTHON_SLOT_VERSION}" = 2.1 ] ; then
+	DEPEND="=dev-lang/python-2.1*"
+	python="python2.1"
+else
+	DEPEND="virtual/python"
+	python="python"
+fi
 
 distutils_src_compile() {
-	python setup.py build || die "compilation failed"
+	${python} setup.py build "$@" || die "compilation failed"
 }
 
 distutils_src_install() {
-	python setup.py install --root=${D} || die
-        dodoc CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS
-	dodoc CONTRIBUTORS LICENSE COPYING*
-	dodoc Change* MANIFEST* README* ${mydoc}
+	if has_version ">=dev-lang/python-2.3"; then
+		${python} setup.py install --root=${D} --no-compile "$@" || die
+	else
+		${python} setup.py install --root=${D} "$@" || die
+	fi
+
+	DDOCS="CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO"
+	DDOCS="${DDOCS} CONTRIBUTORS TODO"
+	DDOCS="${DDOCS} Change* MANIFEST* README*"
+
+	for doc in ${DDOCS}; do
+		[ -s "$doc" ] && dodoc $doc
+	done
+
+	[ -n "${DOCS}" ] && dodoc ${DOCS}
+
+	# deprecated! please use DOCS instead.
+	[ -n "${mydoc}" ] && dodoc ${mydoc}
+}
+
+# generic pyc/pyo cleanup script.
+
+distutils_pkg_postrm() {
+	PYTHON_MODNAME=${PYTHON_MODNAME:-${PN}}
+
+	if has_version ">=dev-lang/python-2.3"; then
+		ebegin "Performing Python Module Cleanup .."
+		if [ -n "${PYTHON_MODNAME}" ]; then
+			for pymod in ${PYTHON_MODNAME}; do
+				for moddir in "`ls -d --color=none -1 ${ROOT}usr/$(get_libdir)/python*/site-packages/${pymod} 2> /dev/null`"; do
+					python_mod_cleanup ${moddir}
+				done
+			done
+		else
+			python_mod_cleanup
+		fi
+		eend 0
+	fi
+}
+
+# this is a generic optimization, you should override it if your package
+# installs things in another directory
+
+distutils_pkg_postinst() {
+	PYTHON_MODNAME=${PYTHON_MODNAME:-${PN}}
+
+	if has_version ">=dev-lang/python-2.3"; then
+		python_version
+		for pymod in "${PYTHON_MODNAME}"; do
+			if [ -d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}" ]; then
+				python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}
+			fi
+		done
+	fi
+}
+
+# e.g. insinto ${ROOT}/usr/include/python${PYVER}
+
+distutils_python_version() {
+	local tmpstr="$(${python} -V 2>&1 )"
+	export PYVER_ALL="${tmpstr#Python }"
+
+	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
+	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
+	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
+	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 }
+
+# checks for if tkinter support is compiled into python
+distutils_python_tkinter() {
+	if ! python -c "import Tkinter" >/dev/null 2>&1; then
+		eerror "You need to recompile python with Tkinter support."
+		eerror "That means: USE='tcltk' emerge python"
+		echo
+		die "missing tkinter support with installed python"
+	fi
+}
+
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
diff --git a/eclass/ebook.eclass b/eclass/ebook.eclass
index 76992f6fbada..327b801e03c5 100644
--- a/eclass/ebook.eclass
+++ b/eclass/ebook.eclass
@@ -1,13 +1,21 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/ebook.eclass,v 1.1.1.1 2005/11/30 09:59:29 chriswhite Exp $
+#
 # Author Francisco Gimeno <kikov@fco-gimeno.com>
-# Manteiner Jos� Alberto Su�rez L�pez <bass@gentoo.org>
-# The ebook eclass defines some default functions and variables to 
-# install ebooks. 
-[ -n "$COMPAT" ] && inherit functions
-ECLASS=ebook
+# Mantainer José Alberto Suárez López <bass@gentoo.org>
+#
+# Latest changes thanks to Kris Verbeeck
+# The ebook eclass defines some default functions and variables to
+# install ebooks.
 
 HOMEPAGE="http://lidn.sourceforge.net"
+
+IUSE="kde"
+SLOT="0"
+LICENSE="OPL"
+KEYWORDS="x86 ppc amd64"
+
 # ebook eclass user guide:
 # -vars
 #
@@ -16,68 +24,82 @@ HOMEPAGE="http://lidn.sourceforge.net"
 #  EBOOKVERSION: the version of the book, i.e: 1.2
 #	      Required
 #  SRC: the main file to download. Default: ${EBOOKNAME}-${EBOOKVERSION}
-#  EBOOKDESTDIR: directory inside ${DEVHELPROOT}/books/${EBOOKDIR} where is 
-#          installed the book. By default: ${EBOOKNAME}-${EBOOKVERSION} 
+#  EBOOKDESTDIR: directory inside ${DEVHELPROOT}/books/${EBOOKDIR} where is
+#          installed the book. By default: ${EBOOKNAME}-${EBOOKVERSION}
 #          ( sometimes it is only ${EBOOKNAME} so you will need to modify it )
 #  EBOOKSRCDIR: directory where is the unpacked book in html
-#  BOOKDEVHELPFILE: book.devhelp is copied with the name  
+#  BOOKDEVHELPFILE: book.devhelp is copied with the name
 #          ${EBOOKNAME}-${EBOOKVERSION} by default.
-#  BOOKDESTDIR: directory to put into the ebook in html. By default: 
+#  BOOKDESTDIR: directory to put into the ebook in html. By default:
 #	   ${EBOOKNAME}-${EBOOKVERSION}.
 #  NOVERSION: if it's not empty, then, remove -${EBOOKVERSION} from all
 #          vars...
 #  DEVHELPROOT: usually usr/share/devhelp
+#  EBOOKFROMDIR: you can set the from dir, usually ${S}.
+
 if [ "${NOVERSION}" = "" ]; then
-    _src="${EBOOKNAME}-${EBOOKVERSION}"
+	_src="${EBOOKNAME}-${EBOOKVERSION}"
 else
-    _src="${EBOOKNAME}"
+	_src="${EBOOKNAME}"
+fi
+_ebookdestdir="${_src}"
+_ebooksrcdir="${_src}"
+_ebookdevhelpfile="${_src}"
+
+if [ "${EBOOKEXT}" = "" ]; then
+	ext="tar.gz"
+else
+	ext="${EBOOKEXT}"
 fi
-    _ebookdestdir="${_src}"
-    _ebooksrcdir="${_src}"
-    _ebookdevhelpfile="${_src}"    
 
 if [ "${SRC}" = "" ]; then
-    SRC="${_src}"
+	SRC="${_src}"
 fi
 if [ "${SRC_URI}" = "" ]; then
-    SRC_URI="http://lidn.sourceforge.net/books_download/${SRC}.tar.gz"
-fi    
-    
+	SRC_URI="http://lidn.sourceforge.net/books_download/${SRC}.${ext}"
+fi
+
 # Default directory to install de ebook devhelped book
 if [ "${DEVHELPROOT}" = "" ]; then
-    DEVHELPROOT="usr/share/devhelp"
+	DEVHELPROOT="usr/share/devhelp"
 fi
 if [ "${RDEPEND}" = "" ]; then
-    RDEPEND=">=dev-util/devhelp-0.3"
+	RDEPEND="kde? ( dev-util/kdevelop )
+	       !kde? ( >=dev-util/devhelp-0.6 )"
 fi
 if [ "${DESCRIPTION}" = "" ]; then
-    DESCRIPTION="${P} ebook based in $ECLASS eclass"
+	DESCRIPTION="${P} ebook based on $ECLASS eclass"
 fi
 if [ "${EBOOKDESTDIR}" = "" ]; then
-    EBOOKDESTDIR=${_ebookdestdir}
+	EBOOKDESTDIR=${_ebookdestdir}
 fi
 if [ "${EBOOKSRCDIR}" = "" ]; then
-    EBOOKSRCDIR=${_ebooksrcdir}
+	EBOOKSRCDIR=${_ebooksrcdir}
 fi
 if [ "${EBOOKDEVHELPFILE}" = "" ]; then
-    EBOOKDEVHELPFILE=${_ebookdevhelpfile}
+	EBOOKDEVHELPFILE=${_ebookdevhelpfile}".devhelp"
 fi
 
-S=${WORKDIR}/${EBOOKSRCDIR}
+S=${WORKDIR}
 ebook_src_unpack() {
 	debug-print-function $FUNCNAME $*
-	unpack ${SRC}.tar.gz
+	unpack ${SRC}.${ext}
 }
 
 ebook_src_install() {
 	debug-print-function $FUNCNAME $*
-	
-	dodir ${DEVHELPROOT}/specs
+
 	dodir ${DEVHELPROOT}/books
 	dodir ${DEVHELPROOT}/books/${EBOOKDESTDIR}
 	echo EBOOKSRCDIR= ${EBOOKSRCDIR}
-	cp ${S}/book.devhelp ${D}${DEVHELPROOT}/specs/${EBOOKDEVHELPFILE}
-	cp -R ${S}/book/* ${D}${DEVHELPROOT}/books/${EBOOKDESTDIR}
+
+	if [ "${EBOOKFROMDIR}" ]; then
+		cp ${S}/${EBOOKFROMDIR}/book.devhelp ${D}${DEVHELPROOT}/books/${EBOOKDESTDIR}/${EBOOKDEVHELPFILE}
+		cp -R ${S}/${EBOOKFROMDIR}/book/* ${D}${DEVHELPROOT}/books/${EBOOKDESTDIR}
+	else
+		cp ${S}/book.devhelp ${D}${DEVHELPROOT}/books/${EBOOKDESTDIR}/${EBOOKDEVHELPFILE}
+		cp -R ${S}/book/* ${D}${DEVHELPROOT}/books/${EBOOKDESTDIR}
+fi
 }
 
 EXPORT_FUNCTIONS src_unpack src_install
diff --git a/eclass/eclipse-ext.eclass b/eclass/eclipse-ext.eclass
index 638b54df9bc1..bedc3b5a903c 100644
--- a/eclass/eclipse-ext.eclass
+++ b/eclass/eclipse-ext.eclass
@@ -1,19 +1,54 @@
-# 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/eclass/eclipse-ext.eclass,v 1.1 2004/06/03 11:44:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eclipse-ext.eclass,v 1.1.1.1 2005/11/30 09:59:27 chriswhite Exp $
 
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 # Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
 
-inherit base
-ECLASS="eclipse-ext"
-INHERITED="${INHERITED} ${ECLASS}"
-IUSE="${IUSE}"
-SLOT="${SLOT}"
+inherit eutils
 
-eclipse_ext_type="source"
-eclipse_ext_slot="0"
-eclipse_ext_basedir="/usr/lib-eclipse-${eclipse_ext_slot}"
+# Must be listed in oldest->newest order!
+known_eclipse_slots="2 3 3.1"
+
+# These should not be reinitialized if previously set
+# (check allows require-slot in pkg_setup)
+
+[ -z "${eclipse_ext_type}" ] && \
+	eclipse_ext_type="source"
+
+[ -z "${eclipse_ext_slot}" ] && \
+	eclipse_ext_slot="0"
+
+[ -z "${eclipse_ext_basedir}" ] && \
+	eclipse_ext_basedir="/usr/$(get_libdir)/eclipse-extensions-${eclipse_ext_slot}/eclipse"
+
+[ -z "${eclipse_ext_platformdir}" ] && \
+	eclipse_ext_platformdir="/usr/$(get_libdir)/eclipse-${eclipse_ext_slot}"
+
+# ---------------------------------------------------------------------------
+# @private _find-optimum-slot
+#
+# Look for a given SLOT. If not found return the least highest SLOT
+# available.
+#
+# @param $1 - SLOT of Eclipse SDK that is most desired
+# @return 0 - all is well, non-zero otherwise
+# ---------------------------------------------------------------------------
+function _find-optimum-slot {
+	local found=false
+
+	for x in ${known_eclipse_slots} ; do
+		if [ "$1" == "$x" ] ; then
+			found=true
+		fi
+		if [ "${found}" == "true" ] && [ -d /usr/$(get_libdir)/eclipse-${x} ] ; then
+			echo $x
+			return 0
+		fi
+	done
+	echo ""
+	return 1
+}
 
 # ---------------------------------------------------------------------------
 # @public require-slot
@@ -26,15 +61,21 @@ eclipse_ext_basedir="/usr/lib-eclipse-${eclipse_ext_slot}"
 # @return 0 - all is well, non-zero otherwise
 # ---------------------------------------------------------------------------
 function eclipse-ext_require-slot {
-	# karltk: Should probably add support for a span of slots
-	local slot=$1
-	if [ ! -d /usr/lib/eclipse-${slot} ] ; then
-		eerror "Cannot find any installed Eclipse SDK for slot ${slot}"
+
+	local slot=$(_find-optimum-slot $1)
+
+	if [ -z "${slot}" ] ; then
+		eerror "Cannot find any Eclipse SDK supporting slot $1"
 		return 1
 	fi
 
+	if [ "${slot}" != "$1" ] ; then
+		ewarn "Slot $1 could not be satisfied, installing for ${slot} instead"
+	fi
+
 	eclipse_ext_slot=${slot}
-	eclipse_ext_basedir="/usr/lib-eclipse-${eclipse_ext_slot}"
+	eclipse_ext_basedir="/usr/$(get_libdir)/eclipse-extensions-${eclipse_ext_slot}/eclipse"
+	eclipse_ext_platformdir="/usr/$(get_libdir)/eclipse-${eclipse_ext_slot}"
 
 	return 0
 }
@@ -52,11 +93,13 @@ function eclipse-ext_require-slot {
 function eclipse-ext_create-ext-layout {
 	local type=$1
 	if [ "${type}" == "binary" ] ; then
-		eclipse_ext_basedir="/opt/eclipse-extensions-${eclipse_ext_slot}"
-		dodir ${eclipse_ext_basedir}/eclipse/{features,plugins}
-		touch ${D}/${eclipse_ext_basedir}/eclipse/.eclipseextension
+		eclipse_ext_basedir="/opt/eclipse-extensions-${eclipse_ext_slot}/eclipse"
+		dodir ${eclipse_ext_basedir}/{features,plugins}
+		touch ${D}/${eclipse_ext_basedir}/.eclipseextension
 	else
-		eclipse_ext_basedir="/usr/lib/eclipse-${eclipse_ext_slot}"
+		eclipse_ext_basedir="/usr/$(get_libdir)/eclipse-extensions-${eclipse_ext_slot}/eclipse"
+		dodir ${eclipse_ext_basedir}/{features,plugins}
+		touch ${D}/${eclipse_ext_basedir}/.eclipseextension
 	fi
 }
 
@@ -82,8 +125,10 @@ function eclipse-ext_install-features {
 	fi
 
 	for x in $* ; do
-		if [ -f $x/feature.xml ] ; then
-			cp -a $x ${D}/${eclipse_ext_basedir}/eclipse/features
+		if [ -d "$x" ] && [ -f $x/feature.xml ] ; then
+			cp -a $x ${D}/${eclipse_ext_basedir}/features
+		else
+			eerror "$x not a feature directory!"
 		fi
 	done
 }
@@ -110,9 +155,90 @@ function eclipse-ext_install-plugins {
 	fi
 
 	for x in $* ; do
-		if [ -f $x/plugin.xml ] ; then
-			cp -a $x ${D}/${eclipse_ext_basedir}/eclipse/plugins
+		if [ -d "$x" ] && ( [ -f "$x/plugin.xml" ] || [ -f "$x/fragment.xml" ] ) ; then
+			cp -a $x ${D}/${eclipse_ext_basedir}/plugins
+		else
+			eerror "$x not a plugin directory!"
 		fi
 	done
 }
 
+function eclipse-ext_pkg_postinst() {
+	einfo "For tips, tricks and general info on running Eclipse on Gentoo, go to:"
+	einfo "http://gentoo-wiki.com/Eclipse"
+}
+
+function pkg_postinst() {
+	eclipse-ext_pkg_postinst
+}
+
+# ---------------------------------------------------------------------------
+# @public get-classpath
+#
+# Tries to parse out a classpath string from a build.properties file. Is very
+# stupid: Assumes it's a one-liner on the form classpath = comma:separated:
+#
+# @param $1 - name of the file (typically build.properties)
+# @param $2 - name of the one-liner env var (default 'classpath')
+# @return - echo of space-separated classpath entries.
+# ---------------------------------------------------------------------------
+
+eclipse-ext_get-classpath() {
+
+	local file=$1
+	local envvar="classpath"
+
+	if [ "$1" == "build.properties" ] ; then
+		if [ ! -z "$2" ] ; then
+			envvar="$2"
+		fi
+	fi
+
+	echo "$(cat ${FILESDIR}/build.properties-${PV} | sed "s/.*=//" | tr ';' ' ')"
+}
+
+_path-dissecter() {
+	echo $1 | sed -r "s/.*\/([^/]+)_([0-9.]+)\/(.*)/\\${2}/"
+}
+
+_get-plugin-name() {
+	_path-dissecter $1 1
+}
+
+_get-plugin-version() {
+	_path-dissecter $1 2
+}
+
+_get-plugin-content() {
+	_path-dissecter $1 3
+}
+
+# ---------------------------------------------------------------------------
+# @public resolve-jars
+#
+# Takes a space-separated list of plugin_version/subdirs/file.jar entries and
+# tries to resolve the version for the plugin against the chosen eclipse version
+# (set by require-slot).
+#
+# Note: You must call require-slot prior to calling resolve-jars.
+#
+# @param $1 - string with space-separated plugin/jarfile
+# @return - echo of :-separated resolved files
+# ---------------------------------------------------------------------------
+eclipse-ext_resolve-jars() {
+
+	local resolved=""
+
+	for x in $1 ; do
+		local jarfile=$(_get-plugin-content $x)
+		local name="$(_get-plugin-name $x)"
+		local x=$(echo ${eclipse_ext_platformdir}/plugins/${name}_*/${jarfile})
+		if [ -f ${x} ] ; then
+			resolved="${resolved}:$x"
+		else
+			:
+			#echo "Warning: did not find ${name}"
+		fi
+	done
+	echo ${resolved}
+}
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index ed33d1b41988..9b51b18fb658 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,17 +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/eclass/elisp-common.eclass,v 1.1 2003/09/21 01:40:41 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 #
-# Author Matthew Kennedy <mkennedy@gentoo.org>
+# Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
+# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
 #
 # This is not an eclass, but it does provide emacs-related
 # installation utilities.
 
-ECLASS=elisp-common
-INHERITED="$INHERITED $ECLASS"
 
 SITELISP=/usr/share/emacs/site-lisp
 
+elisp-compile() {
+	/usr/bin/emacs --batch -f batch-byte-compile --no-site-file --no-init-file $*
+}
+
 elisp-install() {
 	local subdir=$1
 	dodir ${SITELISP}/${subdir}
@@ -21,32 +24,108 @@ elisp-install() {
 }
 
 elisp-site-file-install() {
-	local sitefile=$1
+	local sitefile=$1 my_pn=${2:-${PN}}
 	pushd ${S}
-	cp ${sitefile} .
-	D=${S}/ dosed "s:@SITELISP@:${SITELISP}/${PN}:g" $(basename ${sitefile})
+	cp ${sitefile} ${T}
+	sed -i "s:@SITELISP@:${SITELISP}/${my_pn}:g" ${T}/$(basename ${sitefile})
 	insinto ${SITELISP}
-	doins ${S}/$(basename ${sitefile})
+	doins ${T}/$(basename ${sitefile}) || die "failed to install site file"
 	popd
 }
 
 elisp-site-regen() {
-	einfo "Regenerating ${SITELISP}/site-start.el..."
+	einfo "Regenerating ${SITELISP}/site-gentoo.el ..."
 	einfo ""
-	cat <<EOF >${SITELISP}/site-start.el
+	cat <<EOF >${SITELISP}/site-gentoo.el
 ;;; DO NOT EDIT THIS FILE -- IT IS GENERATED AUTOMATICALLY BY PORTAGE
 ;;; -----------------------------------------------------------------
 
 EOF
-	ls ${SITELISP}/[0-9][0-9]* |sort -n |grep -vE '~$' | \
-	while read sf 
+	ls ${SITELISP}/[0-9][0-9]*-gentoo.el |sort -n | \
+	while read sf
 	do
-		einfo "  Adding $sf..."  
+		einfo "	 Adding $(basename $sf) ..."
 		# Great for debugging, too noisy and slow for users though
-# 		echo "(message \"Loading $sf...\")" >>${SITELISP}/site-start.el
-		cat $sf >>${SITELISP}/site-start.el
+#		echo "(message \"Loading $sf ...\")" >>${SITELISP}/site-start.el
+		cat $sf >>${SITELISP}/site-gentoo.el
 	done
-	einfo ""
+	while read line; do einfo "${line}"; done <<EOF
+
+All site initialization for Gentoo-installed packages is now added to
+/usr/share/emacs/site-lisp/site-gentoo.el; site-start.el is no longer
+managed by Gentoo. You are responsible for all maintenance of
+site-start.el if there is such a file.
+
+In order for this site initialization to be loaded for all users
+automatically, as was done previously, you can add a line like this:
+
+	(load "/usr/share/emacs/site-lisp/site-gentoo")
+
+to /usr/share/emacs/site-lisp/site-start.el.  Alternatively, that line
+can be added by individual users to their initialization files, or for
+greater flexibility, users can select which of the package-specific
+initialization files in /usr/share/emacs/site-lisp to load.
+EOF
+	echo
+}
+
+# The following Emacs Lisp compilation routine is taken from GNU
+# autotools.
+
+elisp-comp() {
+# Copyright 1995 Free Software Foundation, Inc.
+# François Pinard <pinard@iro.umontreal.ca>, 1995.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This script byte-compiles all `.el' files which are part of its
+# arguments, using GNU Emacs, and put the resulting `.elc' files into
+# the current directory, so disregarding the original directories used
+# in `.el' arguments.
+#
+# This script manages in such a way that all Emacs LISP files to
+# be compiled are made visible between themselves, in the event
+# they require or load-library one another.
+
+	if test $# = 0; then
+		echo 1>&2 "No files given to $0"
+		exit 1
+	else
+		if test -z "$EMACS" || test "$EMACS" = "t"; then
+		# Value of "t" means we are running in a shell under Emacs.
+		# Just assume Emacs is called "emacs".
+			EMACS=emacs
+		fi
+
+		tempdir=elc.$$
+		mkdir $tempdir
+		cp $* $tempdir
+		cd $tempdir
+
+		echo "(add-to-list 'load-path \"../\")" > script
+		$EMACS -batch -q --no-site-file --no-init-file -l script -f batch-byte-compile *.el
+		mv *.elc ..
+
+		cd ..
+		rm -fr $tempdir
+	fi
 }
 
 # Local Variables: ***
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 52b3eaa3c068..c79375e07556 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,48 +1,61 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author Matthew Kennedy <mkennedy@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.1 2002/10/29 04:40:18 mkennedy Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
+#
+# Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
+# Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
+#
 # This eclass sets the site-lisp directory for emacs-related packages.
 
-ECLASS=elisp
-INHERITED="$INHERITED $ECLASS"
+inherit elisp-common
+
+# SRC_URI should be set to wherever the primary app-emacs/ maintainer
+# keeps the local elisp mirror, since most app-emacs packages are
+# upstream as a single .el file.
+
+# Note: This is no longer necessary.
 
-SITELISP=/usr/share/emacs/site-lisp
+SRC_URI="http://cvs.gentoo.org/~mkennedy/app-emacs/${P}.el.bz2"
+if [ "${SIMPLE_ELISP}" = 't' ]; then
+	S="${WORKDIR}/"
+#else
+#   Use default value
+#	S="${WORKDIR}/${P}"
+fi
+
+DEPEND="virtual/emacs"
+IUSE=""
+
+elisp_src_unpack() {
+	unpack ${A}
+	if [ "${SIMPLE_ELISP}" = 't' ]
+		then
+		cd ${S} && mv ${P}.el ${PN}.el
+	fi
+}
 
-elisp-install() {
-	local subdir=$1
-	dodir ${SITELISP}/${subdir}
-	insinto ${SITELISP}/${subdir}
-	shift
-	doins $@
+elisp_src_compile() {
+	elisp-compile *.el || die
 }
 
-elisp-site-file-install() {
-	local sitefile=$1
-	pushd ${S}
-	cp ${sitefile} .
-	D=${S}/ dosed "s:@SITELISP@:${SITELISP}/${PN}:g" $(basename ${sitefile})
-	insinto ${SITELISP}
-	doins ${S}/$(basename ${sitefile})
-	popd
+elisp_src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install ${FILESDIR}/${SITEFILE}
 }
 
-elisp-site-regen() {
-	einfo "Regenerating ${SITELISP}/site-start.el..."
-	einfo ""
-	cat <<EOF >${SITELISP}/site-start.el
-;;; DO NOT EDIT THIS FILE -- IT IS GENERATED AUTOMATICALLY BY PORTAGE
-;;; -----------------------------------------------------------------
-
-EOF
-	ls ${SITELISP}/[0-9][0-9]* |sort -n | \
-	while read sf 
-	do
-		einfo "  Addding $sf..."  
-		# Great for debugging, too noisy and slow for users though
-# 		echo "(message \"Loading $sf...\")" >>${SITELISP}/site-start.el
-		cat $sf >>${SITELISP}/site-start.el
-	done
-	einfo ""
-}
\ No newline at end of file
+elisp_pkg_postinst() {
+	elisp-site-regen
+}
+
+elisp_pkg_postrm() {
+	elisp-site-regen
+}
+
+EXPORT_FUNCTIONS src_unpack src_compile src_install \
+	pkg_postinst pkg_postrm
+
+# Local Variables: ***
+# mode: shell-script ***
+# tab-width: 4 ***
+# indent-tabs-mode: t ***
+# End: ***
diff --git a/eclass/embassy-2.10.eclass b/eclass/embassy-2.10.eclass
index 50688e942c69..655458c888cc 100644
--- a/eclass/embassy-2.10.eclass
+++ b/eclass/embassy-2.10.eclass
@@ -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/eclass/embassy-2.10.eclass,v 1.1 2005/03/22 22:07:40 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.10.eclass,v 1.1.1.1 2005/11/30 09:59:35 chriswhite Exp $
 
 # Author Olivier Fisette <ribosome@gentoo.org>
 
@@ -10,10 +10,8 @@
 # necessary, add "(R|P)DEPEND"encies. Additionnaly, the inheriting ebuild's
 # name must begin by "embassy-".
 
-inherit eutils
+inherit eutils multilib
 
-ECLASS=embassy
-INHERITED="$INHERITED $ECLASS"
 
 # EMBOSS version needed for the EMBASSY packages
 EBOV="2.10.0"
@@ -32,7 +30,7 @@ SRC_URI="ftp://ftp.uk.embnet.org/pub/EMBOSS/EMBOSS-${EBOV}.tar.gz
 SLOT="0"
 IUSE="X png"
 
-DEPEND="=sci-biology/emboss-${EBOV}*
+DEPEND=">=sci-biology/emboss-${EBOV}
 	X? ( virtual/x11 )
 	png? ( sys-libs/zlib
 		media-libs/libpng
@@ -41,7 +39,7 @@ DEPEND="=sci-biology/emboss-${EBOV}*
 
 S=${WORKDIR}/EMBOSS-${EBOV}/embassy/${EF}
 
-embassy_src_unpack() {
+embassy-2.10_src_unpack() {
 	unpack ${A}
 	mkdir EMBOSS-${EBOV}/embassy
 	mv ${EF} EMBOSS-${EBOV}/embassy/
@@ -49,9 +47,13 @@ embassy_src_unpack() {
 	cp /usr/$(get_libdir)/libajax.la EMBOSS-${EBOV}/ajax/
 	cp /usr/$(get_libdir)/libajaxg.la EMBOSS-${EBOV}/ajax/
 	cp /usr/$(get_libdir)/libnucleus.la EMBOSS-${EBOV}/nucleus/
+	if [ -e ${FILESDIR}/${PF}.patch ]; then
+		cd ${S}
+		epatch ${FILESDIR}/${PF}.patch
+	fi
 }
 
-embassy_src_compile() {
+embassy-2.10_src_compile() {
 	local EXTRA_CONF
 	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
 	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"
@@ -70,7 +72,7 @@ embassy_src_compile() {
     without \"png\" support, compilation will fail when linking the binaries."
 }
 
-embassy_src_install() {
+embassy-2.10_src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/eclass/embassy-2.9.eclass b/eclass/embassy-2.9.eclass
index ef05663bdd75..b5d894fb5421 100644
--- a/eclass/embassy-2.9.eclass
+++ b/eclass/embassy-2.9.eclass
@@ -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/eclass/embassy-2.9.eclass,v 1.1 2005/03/22 22:07:40 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.9.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 
 # Author Olivier Fisette <ribosome@gentoo.org>
 
@@ -10,10 +10,7 @@
 # necessary, add "(R|P)DEPEND"encies. Additionnaly, the inheriting ebuild's
 # name must begin by "embassy-".
 
-inherit eutils
-
-ECLASS=embassy
-INHERITED="$INHERITED $ECLASS"
+inherit eutils multilib
 
 # EMBOSS version needed for the EMBASSY packages
 EBOV="2.9.0"
@@ -32,7 +29,8 @@ SRC_URI="ftp://ftp.uk.embnet.org/pub/EMBOSS/EMBOSS-${EBOV}.tar.gz
 SLOT="0"
 IUSE="X png"
 
-DEPEND="=sci-biology/emboss-${EBOV}*
+DEPEND="=sci-biology/emboss-${EBOV}
+	!=sci-biology/emboss-2.10*
 	X? ( virtual/x11 )
 	png? ( sys-libs/zlib
 		media-libs/libpng
@@ -41,7 +39,7 @@ DEPEND="=sci-biology/emboss-${EBOV}*
 
 S=${WORKDIR}/EMBOSS-${EBOV}/embassy/${EF}
 
-embassy_src_unpack() {
+embassy-2.9_src_unpack() {
 	unpack ${A}
 	mkdir EMBOSS-${EBOV}/embassy
 	mv ${EF} EMBOSS-${EBOV}/embassy/
@@ -51,7 +49,7 @@ embassy_src_unpack() {
 	cp /usr/$(get_libdir)/libnucleus.la EMBOSS-${EBOV}/nucleus/
 }
 
-embassy_src_compile() {
+embassy-2.9_src_compile() {
 	local EXTRA_CONF
 	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
 	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"
@@ -70,7 +68,7 @@ embassy_src_compile() {
     without \"png\" support, compilation will fail when linking the binaries."
 }
 
-embassy_src_install() {
+embassy-2.9_src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/eclass/embassy.eclass b/eclass/embassy.eclass
index 233df0a28dd7..84298ba98ada 100644
--- a/eclass/embassy.eclass
+++ b/eclass/embassy.eclass
@@ -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/eclass/embassy.eclass,v 1.1 2004/07/20 00:37:20 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/embassy.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 
 # Author Olivier Fisette <ribosome@gentoo.org>
 
@@ -8,13 +8,11 @@
 
 # The inheriting ebuild should provide a "DESCRIPTION", "KEYWORDS" and, if
 # necessary, add "(R|P)DEPEND"encies. Additionnaly, the inheriting ebuild's
-# name must begin by "embassy-".
+# name must begin by "embassy-". Also, before inheriting, the ebuild should
+# specify what version of EMBOSS is required by setting EBOV.
 
-ECLASS=embassy
-INHERITED="$INHERITED $ECLASS"
+inherit eutils multilib
 
-# EMBOSS version needed for the EMBASSY packages
-EBOV="2.9.0"
 # The EMBASSY package name, retrieved from the inheriting ebuild's name
 EN=${PN:8}
 # The full name and version of the EMBASSY package (excluding the Gentoo
@@ -23,46 +21,50 @@ EF="$(echo ${EN} | tr "[:lower:]" "[:upper:]")-${PV}"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://emboss.sourceforge.net/"
-LICENSE="GPL-2"
-SRC_URI="ftp://ftp.uk.embnet.org/pub/EMBOSS/EMBOSS-${EBOV}.tar.gz
-	ftp://ftp.uk.embnet.org/pub/EMBOSS/${EF}.tar.gz"
+LICENSE="LGPL-2 GPL-2"
+SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${EBOV}.tar.gz
+	ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz"
 
 SLOT="0"
-IUSE="X png icc"
+IUSE="X png"
 
-RDEPEND="=app-sci/emboss-${EBOV}*
+DEPEND="=sci-biology/emboss-${EBOV}*
+	!<sci-biology/emboss-${EBOV}
 	X? ( virtual/x11 )
 	png? ( sys-libs/zlib
 		media-libs/libpng
 		>=media-libs/gd-1.8
 	)"
 
-DEPEND="icc? ( dev-lang/icc )
-	${RDEPEND}"
-
 S=${WORKDIR}/EMBOSS-${EBOV}/embassy/${EF}
 
 embassy_src_unpack() {
 	unpack ${A}
 	mkdir EMBOSS-${EBOV}/embassy
 	mv ${EF} EMBOSS-${EBOV}/embassy/
-	cp /usr/lib/libplplot.la EMBOSS-${EBOV}/plplot/
-	cp /usr/lib/libajax.la EMBOSS-${EBOV}/ajax/
-	cp /usr/lib/libajaxg.la EMBOSS-${EBOV}/ajax/
-	cp /usr/lib/libnucleus.la EMBOSS-${EBOV}/nucleus/
+	cp /usr/$(get_libdir)/libplplot.la EMBOSS-${EBOV}/plplot/
+	cp /usr/$(get_libdir)/libajax.la EMBOSS-${EBOV}/ajax/
+	cp /usr/$(get_libdir)/libajaxg.la EMBOSS-${EBOV}/ajax/
+	cp /usr/$(get_libdir)/libnucleus.la EMBOSS-${EBOV}/nucleus/
+	if [ -e ${FILESDIR}/${PF}.patch ]; then
+		cd ${S}
+		epatch ${FILESDIR}/${PF}.patch
+	fi
 }
 
 embassy_src_compile() {
-	if use icc; then
-		CC=/opt/intel/compiler80/bin/icc
-		CXX=/opt/intel/compiler80/bin/icc
-	fi
 	local EXTRA_CONF
 	! use X && EXTRA_CONF="${EXTRA_CONF} --without-x"
 	! use png && EXTRA_CONF="${EXTRA_CONF} --without-pngdriver"
-	./configure ${EXTRA_CONF} || die
+	./configure --host=${CHOST} \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		${EXTRA_CONF} || die
 	emake || die "Before reporting this error as a bug, please make sure you compiled
-    EMBOSS and the EMBASSY packages with the same USE flags. Failure to
+    EMBOSS and the EMBASSY packages with the same \"USE\" flags. Failure to
     do so may prevent the compilation of some EMBASSY packages, or cause
     runtime problems with some EMBASSY programs. For example, if you
     compile EMBOSS with \"png\" support and then try to build DOMAINATRIX
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index e9cca6d2957d..ea1c381f4f44 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -1,25 +1,156 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.1 2003/06/29 06:14:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.1.1.1 2005/11/30 09:59:22 chriswhite Exp $
 #
 # Author: vapier@gentoo.org
 
-ECLASS=enlightenment
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
 
-DESCRIPTION="An DR17 production"
+# ECVS_STATE's:
+#	release      [default]
+#		KEYWORDS arch
+#		SRC_URI  $P.tar.gz
+#		S        $WORKDIR/$P
+#
+#	snap         $PV has .200##### datestamp or .### counter
+#		KEYWORDS ~arch
+#		SRC_URI  $P.tar.bz2
+#		S        $WORKDIR/$P
+#
+#	live         $PV has a 9999 marker
+#		KEYWORDS -*
+#		SRC_URI  `cvs up`
+#		S        $WORKDIR/$ECVS_MODULE
+#
+# Overrides:
+#	KEYWORDS    EKEY_STATE
+#	SRC_URI     EURI_STATE
+#	S           EURI_STATE
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
+
+ECVS_STATE="release"
+if [[ ${PV/9999} != ${PV} ]] ; then
+	if [[ -z ${ECVS_MODULE} ]] ; then
+		ECVS_MODULE=${PN}
+		if [[ ${CATEGORY/libs} != ${CATEGORY} ]] ; then
+			ECVS_MODULE="e17/libs/${PN}"
+		else
+			ECVS_MODULE="e17/apps/${PN}"
+		fi
+	fi
+	ECVS_SERVER=${ECVS_SERVER:-cvs.sourceforge.net:/cvsroot/enlightenment}
+	ECVS_STATE="live"
+	inherit cvs
+elif [[ ${PV/.200[3-9][0-1][0-9][0-3][0-9]/} != ${PV} ]] ; then
+	ECVS_STATE="snap"
+elif [[ ${PV%%.[0-9][0-9][0-9]} != ${PV} ]] ; then
+	ECVS_STATE="snap"
+	EURI_STATE="release"
+fi
+
+DESCRIPTION="A DR17 production"
 HOMEPAGE="http://www.enlightenment.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://wh0rd.de/gentoo/distfiles/${P}.tar.bz2"
+case ${EURI_STATE:-${ECVS_STATE}} in
+	release) SRC_URI="http://enlightenment.freedesktop.org/files/${P}.tar.gz mirror://sourceforge/enlightenment/${P}.tar.gz";;
+	snap)    SRC_URI="mirror://gentoo/${P}.tar.bz2";;
+	live)    SRC_URI="";;
+esac
 
-IUSE="nls"
+LICENSE="BSD"
+SLOT="0"
+case ${EKEY_STATE:-${ECVS_STATE}} in
+	release) KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86";;
+	snap)    KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86";;
+	live)    KEYWORDS="-*";;
+esac
+IUSE="nls doc"
 
-DEPEND="nls? ( sys-devel/gettext )"
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+case ${EURI_STATE:-${ECVS_STATE}} in
+	release) S=${WORKDIR}/${P};;
+	snap)    S=${WORKDIR}/${PN};;
+	live)    S=${WORKDIR}/${ECVS_MODULE};;
+esac
+
+enlightenment_warning_msg() {
+	if [[ ${ECVS_STATE} == "snap" ]] ; then
+		ewarn "Please do not contact the E team about bugs in Gentoo."
+		ewarn "Only contact vapier@gentoo.org via e-mail or bugzilla."
+		ewarn "Remember, this stuff is CVS only code so dont cry when"
+		ewarn "I break you :)."
+	elif [[ ${ECVS_STATE} == "live" ]] ; then
+		eerror "This is a LIVE CVS ebuild."
+		eerror "That means there are NO promises it will work."
+		eerror "If it fails to build, FIX THE CODE YOURSELF"
+		eerror "before reporting any issues."
+	fi
+}
+
+enlightenment_die() {
+	enlightenment_warning_msg
+	die "$@"$'\n'"!!! SEND BUG REPORTS TO vapier@gentoo.org NOT THE E TEAM"
+}
+
+enlightenment_pkg_setup() {
+	enlightenment_warning_msg
+}
 
 # the stupid gettextize script prevents non-interactive mode, so we hax it
 gettext_modify() {
 	use nls || return 0
-	cp `which gettextize` ${T} || die "could not copy gettextize"
-	cp ${T}/gettextize ${T}/gettextize.old
-	sed -e 's:read dummy < /dev/tty::' ${T}/gettextize.old > ${T}/gettextize
+	cp $(which gettextize) "${T}"/ || die "could not copy gettextize"
+	sed -i \
+		-e 's:read dummy < /dev/tty::' \
+		"${T}"/gettextize
+}
+
+enlightenment_src_unpack() {
+	if [[ ${ECVS_STATE} == "live" ]] ; then
+		cvs_src_unpack
+	else
+		unpack ${A}
+	fi
+	gettext_modify
+	[[ -s gendoc ]] && chmod a+rx gendoc
+}
+
+enlightenment_src_compile() {
+	if [[ ! -e configure ]] ; then
+		export WANT_AUTOMAKE=${EAUTOMAKE:-1.8}
+		env \
+			PATH="${T}:${PATH}" \
+			NOCONFIGURE=yes \
+			USER=blah \
+			./autogen.sh \
+			|| enlightenment_die "autogen failed"
+		# symlinked files will cause sandbox violation
+		for x in config.{guess,sub} ; do
+			[[ ! -L ${x} ]] && continue
+			rm -f ${x}
+			touch ${x}
+		done
+		if [[ ! -z ${EHACKLIBLTDL} ]] ; then
+			cd libltdl
+			autoconf || enlightenment_die "autogen in libltdl failed"
+			cd ..
+		fi
+	fi
+	epunt_cxx
+	econf ${MY_ECONF} || enlightenment_die "econf failed"
+	emake || enlightenment_die "emake failed"
+	use doc && [[ -x ./gendoc ]] && { ./gendoc || enlightenment_die "gendoc failed" ; }
+}
+
+enlightenment_src_install() {
+	make install DESTDIR="${D}" || enlightenment_die
+	find "${D}" -name CVS -type d -exec rm -rf '{}' \; 2>/dev/null
+	dodoc AUTHORS ChangeLog NEWS README TODO ${EDOCS}
+	use doc && [[ -d doc ]] && dohtml -r doc/*
+}
+
+enlightenment_pkg_postinst() {
+	enlightenment_warning_msg
 }
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 471bad69e135..f734ff5b16b8 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,19 +1,48 @@
-# 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/eclass/eutils.eclass,v 1.1.1.1 2005/11/30 09:59:15 chriswhite Exp $
+#
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.1 2002/10/26 09:16:03 azarah Exp $
+#
 # This eclass is for general purpose functions that most ebuilds
-# have to implement themselfs.
+# have to implement themselves.
 #
 # NB:  If you add anything, please comment it!
 
-ECLASS=eutils
-INHERITED="$INHERITED $ECLASS"
+inherit multilib portability
 
-newdepend sys-devel/patch
+DEPEND="!bootstrap? ( sys-devel/patch )"
+# sys-apps/shadow is needed for useradd, etc, bug #94745.
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
+# Wait for the supplied number of seconds. If no argument is supplied, defaults
+# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
+# outputting to a terminal, don't wait. For compatability purposes, the argument
+# must be an integer greater than zero.
+# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
+epause() {
+	if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then
+		sleep ${1:-5}
+	fi
+}
+
+# Beep the specified number of times (defaults to five). If our output
+# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
+# don't beep.
+# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
+ebeep() {
+	local n
+	if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then
+		for ((n=1 ; n <= ${1:-5} ; n++)) ; do
+			echo -ne "\a"
+			sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+			echo -ne "\a"
+			sleep 1
+		done
+	fi
+}
+
 # This function generate linker scripts in /usr/lib for dynamic
 # libs in /lib.  This is to fix linking problems when you have
 # the .so in /lib, and the .a in /usr/lib.  What happens is that
@@ -33,21 +62,1609 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 # <azarah@gentoo.org> (26 Oct 2002)
 #
 gen_usr_ldscript() {
-
+	local libdir="$(get_libdir)"
 	# Just make sure it exists
-	dodir /usr/lib
-	
-	cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT"
-/* GNU ld script
-   Because Gentoo have critical dynamic libraries
-   in /lib, and the static versions in /usr/lib, we
-   need to have a "fake" dynamic lib in /usr/lib,
-   otherwise we run into linking problems.
-   See bug #4411 on http://bugs.gentoo.org/ for
-   more info.  */
-GROUP ( /lib/libxxx )
-END_LDSCRIPT
-
-	dosed "s:libxxx:$1:" /usr/lib/$1
+	dodir /usr/${libdir}
+
+	for lib in "${@}" ; do
+		cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
+		/* GNU ld script
+		   Since Gentoo has critical dynamic libraries
+		   in /lib, and the static versions in /usr/lib,
+		   we need to have a "fake" dynamic lib in /usr/lib,
+		   otherwise we run into linking problems.
+
+		   See bug http://bugs.gentoo.org/4411 for more info.
+		 */
+		GROUP ( /${libdir}/${lib} )
+		END_LDSCRIPT
+		fperms a+x "/usr/${libdir}/${lib}"
+	done
 }
 
+# Simple function to draw a line consisting of '=' the same length as $*
+#  - only to be used by epatch()
+#
+# <azarah@gentoo.org> (11 Nov 2002)
+#
+draw_line() {
+	local i=0
+	local str_length=""
+
+	# Handle calls that do not have args, or wc not being installed ...
+	if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
+	then
+		echo "==============================================================="
+		return 0
+	fi
+
+	# Get the length of $*
+	str_length="$(echo -n "$*" | wc -m)"
+
+	while [ "$i" -lt "${str_length}" ]
+	do
+		echo -n "="
+
+		i=$((i + 1))
+	done
+
+	echo
+
+	return 0
+}
+
+# Default directory where patches are located
+EPATCH_SOURCE="${WORKDIR}/patch"
+# Default extension for patches
+EPATCH_SUFFIX="patch.bz2"
+# Default options for patch
+# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
+# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
+EPATCH_OPTS="-g0 --no-backup-if-mismatch"
+# List of patches not to apply.  Not this is only file names,
+# and not the full path ..
+EPATCH_EXCLUDE=""
+# Change the printed message for a single patch.
+EPATCH_SINGLE_MSG=""
+# Change the printed message for multiple patches.
+EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
+# Force applying bulk patches even if not following the style:
+#
+#   ??_${ARCH}_foo.${EPATCH_SUFFIX}
+#
+EPATCH_FORCE="no"
+
+# This function is for bulk patching, or in theory for just one
+# or two patches.
+#
+# It should work with .bz2, .gz, .zip and plain text patches.
+# Currently all patches should be the same format.
+#
+# You do not have to specify '-p' option to patch, as it will
+# try with -p0 to -p5 until it succeed, or fail at -p5.
+#
+# Above EPATCH_* variables can be used to control various defaults,
+# bug they should be left as is to ensure an ebuild can rely on
+# them for.
+#
+# Patches are applied in current directory.
+#
+# Bulk Patches should preferibly have the form of:
+#
+#   ??_${ARCH}_foo.${EPATCH_SUFFIX}
+#
+# For example:
+#
+#   01_all_misc-fix.patch.bz2
+#   02_sparc_another-fix.patch.bz2
+#
+# This ensures that there are a set order, and you can have ARCH
+# specific patches.
+#
+# If you however give an argument to epatch(), it will treat it as a
+# single patch that need to be applied if its a file.  If on the other
+# hand its a directory, it will set EPATCH_SOURCE to this.
+#
+# <azarah@gentoo.org> (10 Nov 2002)
+#
+epatch() {
+	_epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
+	local PIPE_CMD=""
+	local STDERR_TARGET="${T}/$$.out"
+	local PATCH_TARGET="${T}/$$.patch"
+	local PATCH_SUFFIX=""
+	local SINGLE_PATCH="no"
+	local x=""
+
+	unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
+
+	if [ "$#" -gt 1 ]
+	then
+		local m=""
+		for m in "$@" ; do
+			epatch "${m}"
+		done
+		return 0
+	fi
+
+	if [ -n "$1" -a -f "$1" ]
+	then
+		SINGLE_PATCH="yes"
+
+		local EPATCH_SOURCE="$1"
+		local EPATCH_SUFFIX="${1##*\.}"
+
+	elif [ -n "$1" -a -d "$1" ]
+	then
+		# Allow no extension if EPATCH_FORCE=yes ... used by vim for example ...
+		if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ]
+		then
+			local EPATCH_SOURCE="$1/*"
+		else
+			local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
+		fi
+	else
+		if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
+		then
+			if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
+			then
+				EPATCH_SOURCE="$1"
+			fi
+
+			echo
+			eerror "Cannot find \$EPATCH_SOURCE!  Value for \$EPATCH_SOURCE is:"
+			eerror
+			eerror "  ${EPATCH_SOURCE}"
+			eerror "  ( ${EPATCH_SOURCE##*/} )"
+			echo
+			die "Cannot find \$EPATCH_SOURCE!"
+		fi
+
+		local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
+	fi
+
+	case ${EPATCH_SUFFIX##*\.} in
+		bz2)
+			PIPE_CMD="bzip2 -dc"
+			PATCH_SUFFIX="bz2"
+			;;
+		gz|Z|z)
+			PIPE_CMD="gzip -dc"
+			PATCH_SUFFIX="gz"
+			;;
+		ZIP|zip)
+			PIPE_CMD="unzip -p"
+			PATCH_SUFFIX="zip"
+			;;
+		*)
+			PIPE_CMD="cat"
+			PATCH_SUFFIX="patch"
+			;;
+	esac
+
+	if [ "${SINGLE_PATCH}" = "no" ]
+	then
+		einfo "${EPATCH_MULTI_MSG}"
+	fi
+	for x in ${EPATCH_SOURCE}
+	do
+		# New ARCH dependant patch naming scheme ...
+		#
+		#   ???_arch_foo.patch
+		#
+		if [ -f ${x} ] && \
+		   ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
+		    [ "${EPATCH_FORCE}" = "yes" ])
+		then
+			local count=0
+			local popts="${EPATCH_OPTS}"
+			local patchname=${x##*/}
+
+			if [ -n "${EPATCH_EXCLUDE}" ]
+			then
+				if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
+				then
+					continue
+				fi
+			fi
+
+			if [ "${SINGLE_PATCH}" = "yes" ]
+			then
+				if [ -n "${EPATCH_SINGLE_MSG}" ]
+				then
+					einfo "${EPATCH_SINGLE_MSG}"
+				else
+					einfo "Applying ${patchname} ..."
+				fi
+			else
+				einfo "  ${patchname} ..."
+			fi
+
+			echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+			echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+
+			# Allow for prefix to differ ... im lazy, so shoot me :/
+			while [ "${count}" -lt 5 ]
+			do
+				# Generate some useful debug info ...
+				draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+				echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+
+				if [ "${PATCH_SUFFIX}" != "patch" ]
+				then
+					echo -n "PIPE_COMMAND:  " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+					echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+				else
+					PATCH_TARGET="${x}"
+				fi
+
+				echo -n "PATCH COMMAND:  " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+				echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+
+				echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+				draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+
+				if [ "${PATCH_SUFFIX}" != "patch" ]
+				then
+					if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
+					then
+						echo
+						eerror "Could not extract patch!"
+						#die "Could not extract patch!"
+						count=5
+						break
+					fi
+				fi
+
+				if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
+				then
+					draw_line "***** ${patchname} *****" >	${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+					echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+					echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+					echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+					draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+
+					cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
+					_epatch_assert
+
+					if [ "$?" -ne 0 ]
+					then
+						cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+						echo
+						eerror "A dry-run of patch command succeeded, but actually"
+						eerror "applying the patch failed!"
+						#die "Real world sux compared to the dreamworld!"
+						count=5
+					fi
+
+					rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
+
+					break
+				fi
+
+				count=$((count + 1))
+			done
+
+			if [ "${PATCH_SUFFIX}" != "patch" ]
+			then
+				rm -f ${PATCH_TARGET}
+			fi
+
+			if [ "${count}" -eq 5 ]
+			then
+				echo
+				eerror "Failed Patch: ${patchname} !"
+				eerror " ( ${PATCH_TARGET} )"
+				eerror
+				eerror "Include in your bugreport the contents of:"
+				eerror
+				eerror "  ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
+				echo
+				die "Failed Patch: ${patchname}!"
+			fi
+
+			rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
+
+			eend 0
+		fi
+	done
+	if [ "${SINGLE_PATCH}" = "no" ]
+	then
+		einfo "Done with patching"
+	fi
+}
+
+# Cheap replacement for when debianutils (and thus mktemp)
+# does not exist on the users system
+# vapier@gentoo.org
+#
+# Takes just 1 optional parameter (the directory to create tmpfile in)
+emktemp() {
+	local exe="touch"
+	[[ $1 == -d ]] && exe="mkdir" && shift
+	local topdir=$1
+
+	if [[ -z ${topdir} ]] ; then
+		[[ -z ${T} ]] \
+			&& topdir="/tmp" \
+			|| topdir=${T}
+	fi
+
+	if [[ -z $(type -p mktemp) ]] ; then
+		local tmp=/
+		while [[ -e ${tmp} ]] ; do
+			tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
+		done
+		${exe} "${tmp}" || ${exe} -p "${tmp}"
+		echo "${tmp}"
+	else
+		[[ ${exe} == "touch" ]] \
+			&& exe="-p" \
+			|| exe="-d"
+		mktemp ${exe} "${topdir}"
+	fi
+}
+
+# Small wrapper for getent (Linux), nidump (Mac OS X),
+# and pw (FreeBSD) used in enewuser()/enewgroup()
+# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
+# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
+#
+# egetent(database, key)
+egetent() {
+	case ${CHOST} in
+	*-darwin*)
+		case "$2" in
+		*[!0-9]*) # Non numeric
+			nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
+			;;
+		*)	# Numeric
+			nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
+			;;
+		esac
+		;;
+	*-freebsd*)
+		local opts action="user"
+		[[ $1 == "passwd" ]] || action="group"
+
+		# lookup by uid/gid
+		if [[ $2 == [[:digit:]]* ]] ; then
+			[[ ${action} == "user" ]] && opts="-u" || opts="-g"
+		fi
+
+		pw show ${action} ${opts} "$2" -q
+		;;
+	*-netbsd*|*-openbsd*)
+		grep "$2:\*:" /etc/$1
+		;;
+	*)
+		type -p nscd >& /dev/null && nscd -i "$1"
+		getent "$1" "$2"
+		;;
+	esac
+}
+
+# Simplify/standardize adding users to the system
+# vapier@gentoo.org
+#
+# enewuser(username, uid, shell, homedir, groups, extra options)
+#
+# Default values if you do not specify any:
+# username:	REQUIRED !
+# uid:		next available (see useradd(8))
+#		note: pass -1 to get default behavior
+# shell:	/bin/false
+# homedir:	/dev/null
+# groups:	none
+# extra:	comment of 'added by portage for ${PN}'
+enewuser() {
+	# get the username
+	local euser=$1; shift
+	if [[ -z ${euser} ]] ; then
+		eerror "No username specified !"
+		die "Cannot call enewuser without a username"
+	fi
+
+	# lets see if the username already exists
+	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
+		return 0
+	fi
+	einfo "Adding user '${euser}' to your system ..."
+
+	# options to pass to useradd
+	local opts=
+
+	# handle uid
+	local euid=$1; shift
+	if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
+		if [[ ${euid} -gt 0 ]] ; then
+			if [[ ! -z $(egetent passwd ${euid}) ]] ; then
+				euid="next"
+			fi
+		else
+			eerror "Userid given but is not greater than 0 !"
+			die "${euid} is not a valid UID"
+		fi
+	else
+		euid="next"
+	fi
+	if [[ ${euid} == "next" ]] ; then
+		for euid in $(seq 101 999) ; do
+			[[ -z $(egetent passwd ${euid}) ]] && break
+		done
+	fi
+	opts="${opts} -u ${euid}"
+	einfo " - Userid: ${euid}"
+
+	# handle shell
+	local eshell=$1; shift
+	if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
+		if [[ ! -e ${eshell} ]] ; then
+			eerror "A shell was specified but it does not exist !"
+			die "${eshell} does not exist"
+		fi
+	else
+		for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
+			[[ -x ${ROOT}${shell} ]] && break
+		done
+
+		if [[ ${shell} == "/dev/null" ]] ; then
+			eerror "Unable to identify the shell to use"
+			die "Unable to identify the shell to use"
+		fi
+
+		eshell=${shell}
+	fi
+	einfo " - Shell: ${eshell}"
+	opts="${opts} -s ${eshell}"
+
+	# handle homedir
+	local ehome=$1; shift
+	if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
+		ehome="/dev/null"
+	fi
+	einfo " - Home: ${ehome}"
+	opts="${opts} -d ${ehome}"
+
+	# handle groups
+	local egroups=$1; shift
+	if [[ ! -z ${egroups} ]] ; then
+		local oldifs=${IFS}
+		local defgroup="" exgroups=""
+
+		export IFS=","
+		for g in ${egroups} ; do
+			export IFS=${oldifs}
+			if [[ -z $(egetent group "${g}") ]] ; then
+				eerror "You must add group ${g} to the system first"
+				die "${g} is not a valid GID"
+			fi
+			if [[ -z ${defgroup} ]] ; then
+				defgroup=${g}
+			else
+				exgroups="${exgroups},${g}"
+			fi
+			export IFS=","
+		done
+		export IFS=${oldifs}
+
+		opts="${opts} -g ${defgroup}"
+		if [[ ! -z ${exgroups} ]] ; then
+			opts="${opts} -G ${exgroups:1}"
+		fi
+	else
+		egroups="(none)"
+	fi
+	einfo " - Groups: ${egroups}"
+
+	# handle extra and add the user
+	local oldsandbox=${SANDBOX_ON}
+	export SANDBOX_ON="0"
+	case ${CHOST} in
+	*-darwin*)
+		### Make the user
+		if [[ -z $@ ]] ; then
+			dscl . create /users/${euser} uid ${euid}
+			dscl . create /users/${euser} shell ${eshell}
+			dscl . create /users/${euser} home ${ehome}
+			dscl . create /users/${euser} realname "added by portage for ${PN}"
+			### Add the user to the groups specified
+			local oldifs=${IFS}
+			export IFS=","
+			for g in ${egroups} ; do
+				dscl . merge /groups/${g} users ${euser}
+			done
+			export IFS=${oldifs}
+		else
+			einfo "Extra options are not supported on Darwin yet"
+			einfo "Please report the ebuild along with the info below"
+			einfo "eextra: $@"
+			die "Required function missing"
+		fi
+		;;
+	*-freebsd*)
+		if [[ -z $@ ]] ; then
+			pw useradd ${euser} ${opts} \
+				-c "added by portage for ${PN}" \
+				die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			pw useradd ${euser} ${opts} \
+				"$@" || die "enewuser failed"
+		fi
+		;;
+
+	*-netbsd*)
+		if [[ -z $@ ]] ; then
+			useradd ${opts} ${euser} || die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			useradd ${opts} ${euser} "$@" || die "enewuser failed"
+		fi
+		;;
+
+	*-openbsd*)
+		if [[ -z $@ ]] ; then
+			useradd -u ${euid} -s ${eshell} \
+				-d ${ehome} -c "Added by portage for ${PN}" \
+				-g ${egroups} ${euser} || die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			useradd -u ${euid} -s ${eshell} \
+				-d ${ehome} -c "Added by portage for ${PN}" \
+				-g ${egroups} ${euser} "$@" || die "enewuser failed"
+		fi
+		;;
+
+	*)
+		if [[ -z $@ ]] ; then
+			useradd ${opts} ${euser} \
+				-c "added by portage for ${PN}" \
+				|| die "enewuser failed"
+		else
+			einfo " - Extra: $@"
+			useradd ${opts} ${euser} "$@" \
+				|| die "enewuser failed"
+		fi
+		;;
+	esac
+
+	if [[ ! -e ${ROOT}/${ehome} ]] ; then
+		einfo " - Creating ${ehome} in ${ROOT}"
+		mkdir -p "${ROOT}/${ehome}"
+		chown ${euser} "${ROOT}/${ehome}"
+		chmod 755 "${ROOT}/${ehome}"
+	fi
+
+	export SANDBOX_ON=${oldsandbox}
+}
+
+# Simplify/standardize adding groups to the system
+# vapier@gentoo.org
+#
+# enewgroup(group, gid)
+#
+# Default values if you do not specify any:
+# groupname:	REQUIRED !
+# gid:		next available (see groupadd(8))
+# extra:	none
+enewgroup() {
+	# get the group
+	local egroup="$1"; shift
+	if [ -z "${egroup}" ]
+	then
+		eerror "No group specified !"
+		die "Cannot call enewgroup without a group"
+	fi
+
+	# see if group already exists
+	if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
+	then
+		return 0
+	fi
+	einfo "Adding group '${egroup}' to your system ..."
+
+	# options to pass to useradd
+	local opts=
+
+	# handle gid
+	local egid="$1"; shift
+	if [ ! -z "${egid}" ]
+	then
+		if [ "${egid}" -gt 0 ]
+		then
+			if [ -z "`egetent group ${egid}`" ]
+			then
+				if [[ "${CHOST}" == *-darwin* ]]; then
+					opts="${opts} ${egid}"
+				else
+					opts="${opts} -g ${egid}"
+				fi
+			else
+				egid="next available; requested gid taken"
+			fi
+		else
+			eerror "Groupid given but is not greater than 0 !"
+			die "${egid} is not a valid GID"
+		fi
+	else
+		egid="next available"
+	fi
+	einfo " - Groupid: ${egid}"
+
+	# handle extra
+	local eextra="$@"
+	opts="${opts} ${eextra}"
+
+	# add the group
+	local oldsandbox="${SANDBOX_ON}"
+	export SANDBOX_ON="0"
+	case ${CHOST} in
+	*-darwin*)
+		if [ ! -z "${eextra}" ];
+		then
+			einfo "Extra options are not supported on Darwin/OS X yet"
+			einfo "Please report the ebuild along with the info below"
+			einfo "eextra: ${eextra}"
+			die "Required function missing"
+		fi
+
+		# If we need the next available
+		case ${egid} in
+		*[!0-9]*) # Non numeric
+			for egid in $(seq 101 999); do
+				[ -z "`egetent group ${egid}`" ] && break
+			done
+		esac
+		dscl . create /groups/${egroup} gid ${egid}
+		dscl . create /groups/${egroup} passwd '*'
+		;;
+
+	*-freebsd*)
+		case ${egid} in
+			*[!0-9]*) # Non numeric
+				for egid in $(seq 101 999); do
+					[ -z "`egetent group ${egid}`" ] && break
+				done
+		esac
+		pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
+		;;
+
+	*-netbsd*)
+		case ${egid} in
+		*[!0-9]*) # Non numeric
+			for egid in $(seq 101 999); do
+				[ -z "`egetent group ${egid}`" ] && break
+			done
+		esac
+		groupadd -g ${egid} ${egroup} || die "enewgroup failed"
+		;;
+
+	*)
+		groupadd ${opts} ${egroup} || die "enewgroup failed"
+		;;
+	esac
+	export SANDBOX_ON="${oldsandbox}"
+}
+
+# Simple script to replace 'dos2unix' binaries
+# vapier@gentoo.org
+#
+# edos2unix(file, <more files> ...)
+edos2unix() {
+	for f in "$@"
+	do
+		cp "${f}" ${T}/edos2unix
+		sed 's/\r$//' ${T}/edos2unix > "${f}"
+	done
+}
+
+
+##############################################################
+# START: Handle .desktop files and menu entries              #
+# maybe this should be separated into a new eclass some time #
+# lanius@gentoo.org                                          #
+##############################################################
+
+# Make a desktop file !
+# Great for making those icons in kde/gnome startmenu !
+# Amaze your friends !  Get the women !  Join today !
+#
+# make_desktop_entry(<binary>, [name], [icon], [type], [path])
+#
+# binary:	what binary does the app run with ?
+# name:		the name that will show up in the menu
+# icon:		give your little like a pretty little icon ...
+#			this can be relative (to /usr/share/pixmaps) or
+#			a full path to an icon
+# type:		what kind of application is this ?  for categories:
+#			http://www.freedesktop.org/Standards/desktop-entry-spec
+# path:		if your app needs to startup in a specific dir
+make_desktop_entry() {
+	[[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
+
+	local exec=${1}
+	local name=${2:-${PN}}
+	local icon=${3:-${PN}.png}
+	local type=${4}
+	local path=${5}
+
+	if [[ -z ${type} ]] ; then
+		local catmaj=${CATEGORY%%-*}
+		local catmin=${CATEGORY##*-}
+		case ${catmaj} in
+			app)
+				case ${catmin} in
+					admin)     type=System;;
+					cdr)       type=DiscBurning;;
+					dicts)     type=Dictionary;;
+					editors)   type=TextEditor;;
+					emacs)     type=TextEditor;;
+					emulation) type=Emulator;;
+					laptop)    type=HardwareSettings;;
+					office)    type=Office;;
+					vim)       type=TextEditor;;
+					xemacs)    type=TextEditor;;
+					*)         type=;;
+				esac
+				;;
+
+			dev)
+				type="Development"
+				;;
+
+			games)
+				case ${catmin} in
+					action)     type=ActionGame;;
+					arcade)     type=ArcadeGame;;
+					board)      type=BoardGame;;
+					kid)        type=KidsGame;;
+					emulation)  type=Emulator;;
+					puzzle)     type=LogicGame;;
+					rpg)        type=RolePlaying;;
+					roguelike)  type=RolePlaying;;
+					simulation) type=Simulation;;
+					sports)     type=SportsGame;;
+					strategy)   type=StrategyGame;;
+					*)          type=;;
+				esac
+				type="Game;${type}"
+				;;
+
+			mail)
+				type="Network;Email"
+				;;
+
+			media)
+				case ${catmin} in
+					gfx)   type=Graphics;;
+					radio) type=Tuner;;
+					sound) type=Audio;;
+					tv)    type=TV;;
+					video) type=Video;;
+					*)     type=;;
+				esac
+				type="AudioVideo;${type}"
+				;;
+
+			net)
+				case ${catmin} in
+					dialup) type=Dialup;;
+					ftp)    type=FileTransfer;;
+					im)     type=InstantMessaging;;
+					irc)    type=IRCClient;;
+					mail)   type=Email;;
+					news)   type=News;;
+					nntp)   type=News;;
+					p2p)    type=FileTransfer;;
+					*)      type=;;
+				esac
+				type="Network;${type}"
+				;;
+
+			sci)
+				case ${catmin} in
+					astro*) type=Astronomy;;
+					bio*)   type=Biology;;
+					calc*)  type=Calculator;;
+					chem*)  type=Chemistry;;
+					geo*)   type=Geology;;
+					math*)  type=Math;;
+					*)      type=;;
+				esac
+				type="Science;${type}"
+				;;
+
+			www)
+				case ${catmin} in
+					client) type=WebBrowser;;
+					*)      type=;;
+				esac
+				type="Network"
+				;;
+
+			*)
+				type=
+				;;
+		esac
+	fi
+	if [ "${SLOT}" == "0" ] ; then
+		local desktop_name="${PN}"
+	else
+		local desktop_name="${PN}-${SLOT}"
+	fi
+	local desktop=${T}/${exec%% *}-${desktop_name}.desktop
+
+echo "[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.2
+Name=${name}
+Type=Application
+Comment=${DESCRIPTION}
+Exec=${exec}
+Path=${path}
+Icon=${icon}
+Categories=Application;${type};" > "${desktop}"
+
+	(
+		# wrap the env here so that the 'insinto' call
+		# doesn't corrupt the env of the caller
+		insinto /usr/share/applications
+		doins "${desktop}"
+	)
+}
+
+# Make a GDM/KDM Session file
+#
+# make_desktop_entry(<title>, <command>)
+# title: File to execute to start the Window Manager
+# command: Name of the Window Manager
+
+make_session_desktop() {
+	[[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
+	[[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
+
+	local title=$1
+	local command=$2
+	local desktop=${T}/${wm}.desktop
+
+echo "[Desktop Entry]
+Encoding=UTF-8
+Name=${title}
+Comment=This session logs you into ${title}
+Exec=${command}
+TryExec=${command}
+Type=Application" > "${desktop}"
+
+	insinto /usr/share/xsessions
+	doins "${desktop}"
+}
+
+domenu() {
+	local i j
+	insinto /usr/share/applications
+	for i in "$@" ; do
+		if [[ -f ${i} ]] ; then
+			doins "${i}"
+		elif [[ -d ${i} ]] ; then
+			for j in "${i}"/*.desktop ; do
+				doins "${j}"
+			done
+		fi
+	done
+}
+newmenu() {
+	insinto /usr/share/applications
+	newins "$1" "$2"
+}
+
+doicon() {
+	local i j
+	insinto /usr/share/pixmaps
+	for i in "$@" ; do
+		if [[ -f ${i} ]] ; then
+			doins "${i}"
+		elif [[ -d ${i} ]] ; then
+			for j in "${i}"/*.png ; do
+				doins "${j}"
+			done
+		fi
+	done
+}
+newicon() {
+	insinto /usr/share/pixmaps
+	newins "$1" "$2"
+}
+
+##############################################################
+# END: Handle .desktop files and menu entries              #
+##############################################################
+
+
+# for internal use only (unpack_pdv and unpack_makeself)
+find_unpackable_file() {
+	local src=$1
+	if [[ -z ${src} ]] ; then
+		src=${DISTDIR}/${A}
+	else
+		if [[ -e ${DISTDIR}/${src} ]] ; then
+			src=${DISTDIR}/${src}
+		elif [[ -e ${PWD}/${src} ]] ; then
+			src=${PWD}/${src}
+		elif [[ -e ${src} ]] ; then
+			src=${src}
+		fi
+	fi
+	[[ ! -e ${src} ]] && return 1
+	echo "${src}"
+}
+
+# Unpack those pesky pdv generated files ...
+# They're self-unpacking programs with the binary package stuffed in
+# the middle of the archive.  Valve seems to use it a lot ... too bad
+# it seems to like to segfault a lot :(.  So lets take it apart ourselves.
+#
+# Usage: unpack_pdv [file to unpack] [size of off_t]
+# - you have to specify the off_t size ... i have no idea how to extract that
+#   information out of the binary executable myself.  basically you pass in
+#   the size of the off_t type (in bytes) on the machine that built the pdv
+#   archive.  one way to determine this is by running the following commands:
+#   strings <pdv archive> | grep lseek
+#   strace -elseek <pdv archive>
+#   basically look for the first lseek command (we do the strings/grep because
+#   sometimes the function call is _llseek or something) and steal the 2nd
+#   parameter.  here is an example:
+#   root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
+#   lseek
+#   root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
+#   lseek(3, -4, SEEK_END)                  = 2981250
+#   thus we would pass in the value of '4' as the second parameter.
+unpack_pdv() {
+	local src=$(find_unpackable_file $1)
+	local sizeoff_t=$2
+
+	[[ -z ${src} ]] && die "Could not locate source for '$1'"
+	[[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
+
+	local shrtsrc=$(basename "${src}")
+	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
+	local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
+	local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} |  hexdump -e \"%i\"`
+
+	# grab metadata for debug reasons
+	local metafile="$(emktemp)"
+	tail -c +$((${metaskip}+1)) ${src} > ${metafile}
+
+	# rip out the final file name from the metadata
+	local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
+	datafile="`basename ${datafile}`"
+
+	# now lets uncompress/untar the file if need be
+	local tmpfile="$(emktemp)"
+	tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
+
+	local iscompressed="`file -b ${tmpfile}`"
+	if [ "${iscompressed:0:8}" == "compress" ] ; then
+		iscompressed=1
+		mv ${tmpfile}{,.Z}
+		gunzip ${tmpfile}
+	else
+		iscompressed=0
+	fi
+	local istar="`file -b ${tmpfile}`"
+	if [ "${istar:0:9}" == "POSIX tar" ] ; then
+		istar=1
+	else
+		istar=0
+	fi
+
+	#for some reason gzip dies with this ... dd cant provide buffer fast enough ?
+	#dd if=${src} ibs=${metaskip} count=1 \
+	#	| dd ibs=${tailskip} skip=1 \
+	#	| gzip -dc \
+	#	> ${datafile}
+	if [ ${iscompressed} -eq 1 ] ; then
+		if [ ${istar} -eq 1 ] ; then
+			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
+				| head -c $((${metaskip}-${tailskip})) \
+				| tar -xzf -
+		else
+			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
+				| head -c $((${metaskip}-${tailskip})) \
+				| gzip -dc \
+				> ${datafile}
+		fi
+	else
+		if [ ${istar} -eq 1 ] ; then
+			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
+				| head -c $((${metaskip}-${tailskip})) \
+				| tar --no-same-owner -xf -
+		else
+			tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
+				| head -c $((${metaskip}-${tailskip})) \
+				> ${datafile}
+		fi
+	fi
+	true
+	#[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
+	#assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
+}
+
+# Unpack those pesky makeself generated files ...
+# They're shell scripts with the binary package tagged onto
+# the end of the archive.  Loki utilized the format as does
+# many other game companies.
+#
+# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
+# - If the file is not specified then unpack will utilize ${A}.
+# - If the offset is not specified then we will attempt to extract
+#   the proper offset from the script itself.
+unpack_makeself() {
+	local src_input=${1:-${A}}
+	local src=$(find_unpackable_file "${src_input}")
+	local skip=$2
+	local exe=$3
+
+	[[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
+
+	local shrtsrc=$(basename "${src}")
+	echo ">>> Unpacking ${shrtsrc} to ${PWD}"
+	if [[ -z ${skip} ]] ; then
+		local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
+		local skip=0
+		exe=tail
+		case ${ver} in
+			1.5.*)	# tested 1.5.{3,4,5} ... guessing 1.5.x series is same
+				skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
+				;;
+			2.0|2.0.1)
+				skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
+				;;
+			2.1.1)
+				skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
+				let skip="skip + 1"
+				;;
+			2.1.2)
+				skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
+				let skip="skip + 1"
+				;;
+			2.1.3)
+				skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
+				let skip="skip + 1"
+				;;
+			2.1.4|2.1.5)
+				skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
+				skip=$(head -n ${skip} "${src}" | wc -c)
+				exe="dd"
+				;;
+			*)
+				eerror "I'm sorry, but I was unable to support the Makeself file."
+				eerror "The version I detected was '${ver}'."
+				eerror "Please file a bug about the file ${shrtsrc} at"
+				eerror "http://bugs.gentoo.org/ so that support can be added."
+				die "makeself version '${ver}' not supported"
+				;;
+		esac
+		debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
+	fi
+	case ${exe} in
+		tail)	exe="tail -n +${skip} '${src}'";;
+		dd)		exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
+		*)		die "makeself cant handle exe '${exe}'"
+	esac
+
+	# lets grab the first few bytes of the file to figure out what kind of archive it is
+	local tmpfile="$(emktemp)"
+	eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
+	local filetype="$(file -b "${tmpfile}")"
+	case ${filetype} in
+		*tar\ archive)
+			eval ${exe} | tar --no-same-owner -xf -
+			;;
+		bzip2*)
+			eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
+			;;
+		gzip*)
+			eval ${exe} | tar --no-same-owner -xzf -
+			;;
+		compress*)
+			eval ${exe} | gunzip | tar --no-same-owner -xf -
+			;;
+		*)
+			eerror "Unknown filetype \"${filetype}\" ?"
+			false
+			;;
+	esac
+	assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
+}
+
+# Display a license for user to accept.
+#
+# Usage: check_license [license]
+# - If the file is not specified then ${LICENSE} is used.
+check_license() {
+	local lic=$1
+	if [ -z "${lic}" ] ; then
+		lic="${PORTDIR}/licenses/${LICENSE}"
+	else
+		if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
+			lic="${PORTDIR}/licenses/${lic}"
+		elif [ -e "${PWD}/${lic}" ] ; then
+			lic="${PWD}/${lic}"
+		elif [ -e "${lic}" ] ; then
+			lic="${lic}"
+		fi
+	fi
+	[ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
+	local l="`basename ${lic}`"
+
+	# here is where we check for the licenses the user already
+	# accepted ... if we don't find a match, we make the user accept
+	local shopts=$-
+	local alic
+	set -o noglob #so that bash doesn't expand "*"
+	for alic in ${ACCEPT_LICENSE} ; do
+		if [[ ${alic} == * || ${alic} == ${l} ]]; then
+			set +o noglob; set -${shopts} #reset old shell opts
+			return 0
+		fi
+	done
+	set +o noglob; set -$shopts #reset old shell opts
+
+	local licmsg="$(emktemp)"
+	cat << EOF > ${licmsg}
+**********************************************************
+The following license outlines the terms of use of this
+package.  You MUST accept this license for installation to
+continue.  When you are done viewing, hit 'q'.  If you
+CTRL+C out of this, the install will not run!
+**********************************************************
+
+EOF
+	cat ${lic} >> ${licmsg}
+	${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
+	einfon "Do you accept the terms of this license (${l})? [yes/no] "
+	read alic
+	case ${alic} in
+		yes|Yes|y|Y)
+			return 0
+			;;
+		*)
+			echo;echo;echo
+			eerror "You MUST accept the license to continue!  Exiting!"
+			die "Failed to accept license"
+			;;
+	esac
+}
+
+# Aquire cd(s) for those lovely cd-based emerges.  Yes, this violates
+# the whole 'non-interactive' policy, but damnit I want CD support !
+#
+# with these cdrom functions we handle all the user interaction and
+# standardize everything.  all you have to do is call cdrom_get_cds()
+# and when the function returns, you can assume that the cd has been
+# found at CDROM_ROOT.
+#
+# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
+# etc...  if you want to give the cds better names, then just export
+# the CDROM_NAME_X variables before calling cdrom_get_cds().
+#
+# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
+#
+# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
+# - this will attempt to locate a cd based upon a file that is on
+#   the cd ... the more files you give this function, the more cds
+#   the cdrom functions will handle
+cdrom_get_cds() {
+	# first we figure out how many cds we're dealing with by
+	# the # of files they gave us
+	local cdcnt=0
+	local f=
+	for f in "$@" ; do
+		((++cdcnt))
+		export CDROM_CHECK_${cdcnt}="$f"
+	done
+	export CDROM_TOTAL_CDS=${cdcnt}
+	export CDROM_CURRENT_CD=1
+
+	# now we see if the user gave use CD_ROOT ...
+	# if they did, let's just believe them that it's correct
+	if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
+		local var=
+		cdcnt=0
+		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+			((++cdcnt))
+			var="CD_ROOT_${cdcnt}"
+			[[ -z ${!var} ]] && var="CD_ROOT"
+			if [[ -z ${!var} ]] ; then
+				eerror "You must either use just the CD_ROOT"
+				eerror "or specify ALL the CD_ROOT_X variables."
+				eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
+				die "could not locate CD_ROOT_${cdcnt}"
+			fi
+		done
+		export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
+		einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
+		export CDROM_SET=-1
+		for f in ${CDROM_CHECK_1//:/ } ; do
+			((++CDROM_SET))
+			[[ -e ${CD_ROOT}/${f} ]] && break
+		done
+		export CDROM_MATCH=${f}
+		return
+	fi
+
+	# User didn't help us out so lets make sure they know they can
+	# simplify the whole process ...
+	if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
+		einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
+		echo
+		einfo "If you do not have the CD, but have the data files"
+		einfo "mounted somewhere on your filesystem, just export"
+		einfo "the variable CD_ROOT so that it points to the"
+		einfo "directory containing the files."
+		echo
+		einfo "For example:"
+		einfo "export CD_ROOT=/mnt/cdrom"
+		echo
+	else
+		einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
+		cdcnt=0
+		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+			((++cdcnt))
+			var="CDROM_NAME_${cdcnt}"
+			[[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
+		done
+		echo
+		einfo "If you do not have the CDs, but have the data files"
+		einfo "mounted somewhere on your filesystem, just export"
+		einfo "the following variables so they point to the right place:"
+		einfon ""
+		cdcnt=0
+		while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
+			((++cdcnt))
+			echo -n " CD_ROOT_${cdcnt}"
+		done
+		echo
+		einfo "Or, if you have all the files in the same place, or"
+		einfo "you only have one cdrom, you can export CD_ROOT"
+		einfo "and that place will be used as the same data source"
+		einfo "for all the CDs."
+		echo
+		einfo "For example:"
+		einfo "export CD_ROOT_1=/mnt/cdrom"
+		echo
+	fi
+
+	export CDROM_SET=""
+	export CDROM_CURRENT_CD=0
+	cdrom_load_next_cd
+}
+
+# this is only used when you need access to more than one cd.
+# when you have finished using the first cd, just call this function.
+# when it returns, CDROM_ROOT will be pointing to the second cd.
+# remember, you can only go forward in the cd chain, you can't go back.
+cdrom_load_next_cd() {
+	local var
+	((++CDROM_CURRENT_CD))
+
+	unset CDROM_ROOT
+	var=CD_ROOT_${CDROM_CURRENT_CD}
+	[[ -z ${!var} ]] && var="CD_ROOT"
+	if [[ -z ${!var} ]] ; then
+		var="CDROM_CHECK_${CDROM_CURRENT_CD}"
+		_cdrom_locate_file_on_cd ${!var}
+	else
+		export CDROM_ROOT=${!var}
+	fi
+
+	einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
+}
+
+# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
+# functions.  this should *never* be called from an ebuild.
+# all it does is try to locate a give file on a cd ... if the cd isn't
+# found, then a message asking for the user to insert the cdrom will be
+# displayed and we'll hang out here until:
+# (1) the file is found on a mounted cdrom
+# (2) the user hits CTRL+C
+_cdrom_locate_file_on_cd() {
+	local mline=""
+	local showedmsg=0
+
+	while [[ -z ${CDROM_ROOT} ]] ; do
+		local i=0
+		local -a cdset=(${*//:/ })
+		if [[ -n ${CDROM_SET} ]] ; then
+			cdset=(${cdset[${CDROM_SET}]})
+		fi
+
+		while [[ -n ${cdset[${i}]} ]] ; do
+			local dir=$(dirname ${cdset[${i}]})
+			local file=$(basename ${cdset[${i}]})
+
+			for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
+				[[ -d ${mline}/${dir} ]] || continue
+				if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
+					export CDROM_ROOT=${mline}
+					export CDROM_SET=${i}
+					export CDROM_MATCH=${cdset[${i}]}
+					return
+				fi
+			done
+
+			((++i))
+		done
+
+		echo
+		if [[ ${showedmsg} -eq 0 ]] ; then
+			if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
+				if [[ -z ${CDROM_NAME} ]] ; then
+					einfo "Please insert+mount the cdrom for ${PN} now !"
+				else
+					einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
+				fi
+			else
+				if [[ -z ${CDROM_NAME_1} ]] ; then
+					einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
+				else
+					local var="CDROM_NAME_${CDROM_CURRENT_CD}"
+					einfo "Please insert+mount the ${!var} cdrom now !"
+				fi
+			fi
+			showedmsg=1
+		fi
+		einfo "Press return to scan for the cd again"
+		einfo "or hit CTRL+C to abort the emerge."
+		echo
+		einfo "If you are having trouble with the detection"
+		einfo "of your CD, it is possible that you do not have"
+		einfo "Joliet support enabled in your kernel.  Please"
+		einfo "check that CONFIG_JOLIET is enabled in your kernel."
+		read
+	done
+}
+
+# Make sure that LINGUAS only contains languages that
+# a package can support
+#
+# usage: strip-linguas <allow LINGUAS>
+#        strip-linguas -i <directories of .po files>
+#        strip-linguas -u <directories of .po files>
+#
+# The first form allows you to specify a list of LINGUAS.
+# The -i builds a list of po files found in all the
+#   directories and uses the intersection of the lists.
+# The -u builds a list of po files found in all the
+#   directories and uses the union of the lists.
+strip-linguas() {
+	local ls newls
+	if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
+		local op=$1; shift
+		ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
+		local d f
+		for d in "$@" ; do
+			if [[ ${op} == "-u" ]] ; then
+				newls=${ls}
+			else
+				newls=""
+			fi
+			for f in $(find "$d" -name '*.po' -printf '%f ') ; do
+				if [[ ${op} == "-i" ]] ; then
+					[[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
+				else
+					[[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
+				fi
+			done
+			ls=${newls}
+		done
+		ls=${ls//.po}
+	else
+		ls=$@
+	fi
+
+	ls=" ${ls} "
+	newls=""
+	for f in ${LINGUAS} ; do
+		if [[ ${ls/ ${f} /} != ${ls} ]] ; then
+			newls="${newls} ${f}"
+		else
+			ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
+		fi
+	done
+	if [[ -z ${newls} ]] ; then
+		export LINGUAS=""
+	else
+		export LINGUAS=${newls:1}
+	fi
+}
+
+# moved from kernel.eclass since they are generally useful outside of
+# kernel.eclass -iggy (20041002)
+
+# the following functions are useful in kernel module ebuilds, etc.
+# for an example see ivtv or drbd ebuilds
+
+# set's ARCH to match what the kernel expects
+set_arch_to_kernel() {
+	i=10
+	while ((i--)) ; do
+		ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
+	done
+	export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
+	case ${ARCH} in
+		x86)    export ARCH="i386";;
+		amd64)  export ARCH="x86_64";;
+		hppa)   export ARCH="parisc";;
+		mips)   export ARCH="mips";;
+		sparc)  export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this.  linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
+		*)      export ARCH="${ARCH}";;
+	esac
+}
+
+# set's ARCH back to what portage expects
+set_arch_to_portage() {
+	i=10
+	while ((i--)) ; do
+		ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
+	done
+	export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
+}
+
+# Jeremy Huddleston <eradicator@gentoo.org>:
+# preserve_old_lib /path/to/libblah.so.0
+# preserve_old_lib_notify /path/to/libblah.so.0
+#
+# These functions are useful when a lib in your package changes --soname.  Such
+# an example might be from libogg.so.0 to libogg.so.1.  Removing libogg.so.0
+# would break packages that link against it.  Most people get around this
+# by using the portage SLOT mechanism, but that is not always a relevant
+# solution, so instead you can add the following to your ebuilds:
+#
+# src_install() {
+# ...
+# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
+# ...
+# }
+#
+# pkg_postinst() {
+# ...
+# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
+# ...
+# }
+
+preserve_old_lib() {
+	LIB=$1
+
+	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
+		SONAME=`basename ${LIB}`
+		DIRNAME=`dirname ${LIB}`
+
+		dodir ${DIRNAME}
+		cp ${ROOT}${LIB} ${D}${DIRNAME}
+		touch ${D}${LIB}
+	fi
+}
+
+preserve_old_lib_notify() {
+	LIB=$1
+
+	if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
+		SONAME=`basename ${LIB}`
+
+		ewarn "An old version of an installed library was detected on your system."
+		ewarn "In order to avoid breaking packages that link against it, this older version"
+		ewarn "is not being removed.  In order to make full use of this newer version,"
+		ewarn "you will need to execute the following command:"
+		ewarn "  revdep-rebuild --soname ${SONAME}"
+		ewarn
+		ewarn "After doing that, you can safely remove ${LIB}"
+		ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
+	fi
+}
+
+# Hack for people to figure out if a package was built with
+# certain USE flags
+#
+# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
+#    ex: built_with_use xchat gtk2
+#
+# Flags: -a   all USE flags should be utilized
+#        -o   at least one USE flag should be utilized
+# Note: the default flag is '-a'
+built_with_use() {
+	local opt=$1
+	[[ ${opt:0:1} = "-" ]] && shift || opt="-a"
+
+	local PKG=$(best_version $1)
+	shift
+
+	local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
+
+	# if the USE file doesnt exist, assume the $PKG is either
+	# injected or package.provided
+	[[ ! -e ${USEFILE} ]] && return 0
+
+	local USE_BUILT=$(<${USEFILE})
+	while [[ $# -gt 0 ]] ; do
+		if [[ ${opt} = "-o" ]] ; then
+			has $1 ${USE_BUILT} && return 0
+		else
+			has $1 ${USE_BUILT} || return 1
+		fi
+		shift
+	done
+	[[ ${opt} = "-a" ]]
+}
+
+# Many configure scripts wrongly bail when a C++ compiler
+# could not be detected. #73450
+epunt_cxx() {
+	local dir=$1
+	[[ -z ${dir} ]] && dir=${S}
+	ebegin "Removing useless C++ checks"
+	local f
+	for f in $(find ${dir} -name configure) ; do
+		patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
+	done
+	eend 0
+}
+
+# dopamd <file> [more files]
+#
+# Install pam auth config file in /etc/pam.d
+dopamd() {
+	[[ -z $1 ]] && die "dopamd requires at least one argument"
+
+	use pam || return 0
+
+	INSDESTTREE=/etc/pam.d \
+	doins "$@" || die "failed to install $@"
+}
+# newpamd <old name> <new name>
+#
+# Install pam file <old name> as <new name> in /etc/pam.d
+newpamd() {
+	[[ $# -ne 2 ]] && die "newpamd requires two arguements"
+
+	use pam || return 0
+
+	INSDESTTREE=/etc/pam.d \
+	newins "$1" "$2" || die "failed to install $1 as $2"
+}
+
+# make a wrapper script ...
+# NOTE: this was originally games_make_wrapper, but I noticed other places where
+# this could be used, so I have moved it here and made it not games-specific
+# -- wolf31o2
+# $1 == wrapper name
+# $2 == binary to run
+# $3 == directory to chdir before running binary
+# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
+# $5 == path for wrapper
+make_wrapper() {
+	local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
+	local tmpwrapper=$(emktemp)
+	# We don't want to quote ${bin} so that people can pass complex
+	# things as $bin ... "./someprog --args"
+	cat << EOF > "${tmpwrapper}"
+#!/bin/sh
+cd "${chdir:-.}"
+if [ -n "${libdir}" ] ; then
+	if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
+		export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
+	else
+		export LD_LIBRARY_PATH="${libdir}"
+	fi
+fi
+exec ${bin} "\$@"
+EOF
+	chmod go+rx "${tmpwrapper}"
+	if [[ -n ${path} ]] ; then
+		exeinto "${path}"
+		newexe "${tmpwrapper}" "${wrapper}"
+	else
+		newbin "${tmpwrapper}" "${wrapper}"
+	fi
+}
diff --git a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass
index 2f60c67de511..03ce98c968aa 100644
--- a/eclass/fdo-mime.eclass
+++ b/eclass/fdo-mime.eclass
@@ -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/eclass/fdo-mime.eclass,v 1.1 2004/09/14 12:10:22 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fdo-mime.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
 
 # Author:
 # foser <foser@gentoo.org>
@@ -8,8 +8,6 @@
 # utility eclass to update the desktop mime info as laid out in the freedesktop specs & implementations
 # <references here>
 
-ECLASS="fdo-mime"
-INHERITED="$INHERITED $ECLASS"
 
 # Updates the desktop database
 # Generates a list of mimetypes linked to applications that can handle them
@@ -18,7 +16,7 @@ fdo-mime_desktop_database_update() {
 
 	if [ -x ${ROOT}/usr/bin/update-desktop-database ]
 	then
-		einfo "Updating desktop mime database..."
+		einfo "Updating desktop mime database ..."
 		update-desktop-database -q /usr/share/applications
 	fi
 
@@ -31,7 +29,7 @@ fdo-mime_mime_database_update() {
 
 	if [ -x ${ROOT}/usr/bin/update-mime-database ]
 	then
-		einfo "Updating shared mime info database..."
+		einfo "Updating shared mime info database ..."
 		update-mime-database /usr/share/mime
 	fi
 
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index d5e990439bc5..d2c73ff12225 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -1,14 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.1 2004/08/21 18:09:03 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.1.1.1 2005/11/30 09:59:34 chriswhite Exp $
 #
 # Author : Matthieu Sozeau <mattam@gentoo.org>
 #
 # ocamlfind (a.k.a. findlib) eclass
-# 
+#
 
-ECLASS="findlib"
-INHERITED="$INHERITED $ECLASS"
 
 # From this findlib version there is proper stublibs support.
 DEPEND=">=dev-ml/findlib-1.0.4-r1"
@@ -31,16 +29,16 @@ findlib_src_preinst() {
 	# destdir is the ocaml sitelib
 	local destdir=`ocamlfind printconf destdir`
 
-	dodir ${destdir}	
+	dodir ${destdir} || die "dodir failed"
 	export OCAMLFIND_DESTDIR=${D}${destdir}
 
 	# stublibs style
-	dodir ${destdir}/stublibs
+	dodir ${destdir}/stublibs || die "dodir failed"
 	export OCAMLFIND_LDCONF=ignore
 }
 
 # Install with a properly setup findlib
 findlib_src_install() {
 	findlib_src_preinst
-	make DESTDIR=${D} "$@" install
+	make DESTDIR=${D} "$@" install || die "make failed"
 }
diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass
index d9518e45d0d5..ca2ce920b571 100644
--- a/eclass/fixheadtails.eclass
+++ b/eclass/fixheadtails.eclass
@@ -1,11 +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/eclass/fixheadtails.eclass,v 1.1 2003/09/17 21:15:18 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
 #
 # Author John Mylchreest <johnm@gentoo.org>
 
-ECLASS=fixheadtails
-INHERITED="$INHERITED $ECLASS"
+DEPEND=">=sys-apps/sed-4"
 
 # ht_fix_all
 # This fixes all files within the current directory.
@@ -15,32 +14,29 @@ INHERITED="$INHERITED $ECLASS"
 # This fixes the files passed by PARAM
 # to be used for specific files. ie: ht_fix_file "${FILESDIR}/mypatch.patch"
 
-ht_fix_all() {
-	local MATCHES
-
-	einfo "Replacing obsolete head/tail with posix compliant ones"
-	for MATCHES in $(grep -i -R -e "head -[ 0-9]" -e "tail [+-][ 0-9]" * | cut -f1 -d: | sort -u) ; do
-		cp -f ${MATCHES} ${MATCHES}.orig
-        	sed -e 's/head -\(.*\)/head -n \1/' -e 's/tail \([-+]\)\(.*\)/tail -n \1\2/' \
-			< ${MATCHES}.orig \
-        		> ${MATCHES}
-		rm ${MATCHES}.orig
-	done
+do_sed_fix() {
+	einfo " - fixed $1"
+	sed -i \
+		-e 's/head \+-\([0-9]\)/head -n \1/g' \
+		-e 's/tail \+\([-+][0-9]\+\)c/tail -c \1/g' \
+		-e 's/tail \+\([-+][0-9]\)/tail -n \1/g' ${1} || \
+			die "sed ${1} failed"
 }
 
 ht_fix_file() {
 	local i
 
-	einfo "Replacing obsolete head/tail with posix compliant ones"
+	einfo "Replacing obsolete head/tail with POSIX compliant ones"
 	for i in "${@}"
 	do
-		if [ -n "$(grep -i -e "head -[ 0-9]" -e "tail [+-][ 0-9]" ${i})" ] ; then
-			cp -f ${i} ${i}.orig
-			sed -e 's/head -\(.*\)/head -n \1/' -e 's/tail \([-+]\)\(.*\)/tail -n \1\2/' \
-				< ${i}.orig \
-				> ${i}
-			rm ${i}.orig
-		fi
+		do_sed_fix ${i}
 	done
-eend
+}
+
+ht_fix_all() {
+	local MATCHES
+	MATCHES="$(grep -l -i -R -e "head -[ 0-9]" -e "tail [+-][ 0-9]" * | sort -u)"
+	[[ -n ${MATCHES} ]] \
+		&& ht_fix_file ${MATCHES} \
+		|| einfo "No need for ht_fix_all anymore !"
 }
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 9814b87d4144..60a3a71f1345 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,22 +1,519 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# /space/gentoo/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass
-ECLASS=flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
 
-filter-flags () {
 
-	for x in $1; do
-		CFLAGS="${CFLAGS/$x}"
-		CXXFLAGS="${CXXFLAGS/$x}"
+# need access to emktemp()
+inherit eutils toolchain-funcs multilib
+
+#
+#### filter-flags <flags> ####
+# Remove particular flags from C[XX]FLAGS
+# Matches only complete flags
+#
+#### append-flags <flags> ####
+# Add extra flags to your current C[XX]FLAGS
+#
+#### replace-flags <orig.flag> <new.flag> ###
+# Replace a flag by another one
+#
+#### replace-cpu-flags <old.cpus> <new.cpu> ###
+# Replace march/mcpu flags that specify <old.cpus>
+# with flags that specify <new.cpu>
+#
+#### is-flag <flag> ####
+# Returns "true" if flag is set in C[XX]FLAGS
+# Matches only complete a flag
+#
+#### strip-flags ####
+# Strip C[XX]FLAGS of everything except known
+# good options.
+#
+#### strip-unsupported-flags ####
+# Strip C[XX]FLAGS of any flags not supported by
+# installed version of gcc
+#
+#### get-flag <flag> ####
+# Find and echo the value for a particular flag
+#
+#### replace-sparc64-flags ####
+# Sets mcpu to v8 and uses the original value
+# as mtune if none specified.
+#
+#### filter-mfpmath <math types> ####
+# Remove specified math types from the fpmath specification
+# If the user has -mfpmath=sse,386, running `filter-mfpmath sse`
+# will leave the user with -mfpmath=386
+#
+#### append-ldflags ####
+# Add extra flags to your current LDFLAGS
+#
+#### filter-ldflags <flags> ####
+# Remove particular flags from LDFLAGS
+# Matches only complete flags
+#
+#### fstack-flags ####
+# hooked function for hardened gcc that appends
+# -fno-stack-protector to {C,CXX,LD}FLAGS
+# when a package is filtering -fstack-protector, -fstack-protector-all
+# notice: modern automatic specs files will also suppress -fstack-protector-all
+# when only -fno-stack-protector is given
+#
+#### bindnow-flags ####
+# Returns the flags to enable "now" binding in the current selected linker.
+#
+################ DEPRECATED functions ################
+# The following are still present to avoid breaking existing
+# code more than necessary; however they are deprecated. Please
+# use gcc-specs-* from toolchain-funcs.eclass instead, if you
+# need to know which hardened techs are active in the compiler.
+# See bug #100974
+#
+#### has_hardened ####
+# Returns true if the compiler has 'Hardened' in its version string,
+# (note; switched-spec vanilla compilers satisfy this condition) or
+# the specs file name contains 'hardened'.
+#
+#### has_pie ####
+# Returns true if the compiler by default or with current CFLAGS
+# builds position-independent code.
+#
+#### has_pic ####
+# Returns true if the compiler by default or with current CFLAGS
+# builds position-independent code.
+#
+#### has_ssp_all ####
+# Returns true if the compiler by default or with current CFLAGS
+# generates stack smash protections for all functions
+#
+#### has_ssp ####
+# Returns true if the compiler by default or with current CFLAGS
+# generates stack smash protections for most vulnerable functions
+#
+
+# C[XX]FLAGS that we allow in strip-flags
+setup-allowed-flags() {
+	if [[ -z ${ALLOWED_FLAGS} ]] ; then
+		export ALLOWED_FLAGS="-pipe"
+		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -O -O0 -O1 -O2 -mcpu -march -mtune"
+		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fstack-protector -fstack-protector-all"
+		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fbounds-checking -fno-bounds-checking"
+		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-unit-at-a-time"
+		export ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3 -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3"
+	fi
+	# allow a bunch of flags that negate features / control ABI
+	ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-stack-protector -fno-stack-protector-all"
+	ALLOWED_FLAGS="${ALLOWED_FLAGS} -mregparm -mno-app-regs -mapp-regs \
+		-mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
+		-mips1 -mips2 -mips3 -mips4 -mips32 -mips64 -mips16 \
+		-msoft-float -mno-soft-float -mhard-float -mno-hard-float -mfpu \
+		-mieee -mieee-with-inexact \
+		-mtls-direct-seg-refs -mno-tls-direct-seg-refs \
+		-mflat -mno-flat -mno-faster-structs -mfaster-structs \
+		-m32 -m64 -mabi -mlittle-endian -mbig-endian -EL -EB -fPIC \
+		-mlive-g0 -mcmodel -mstack-bias -mno-stack-bias"
+
+	# C[XX]FLAGS that we are think is ok, but needs testing
+	# NOTE:  currently -Os have issues with gcc3 and K6* arch's
+	export UNSTABLE_FLAGS="-Os -O3 -freorder-blocks -fprefetch-loop-arrays"
+	return 0
+}
+
+filter-flags() {
+	local x f fset
+	declare -a new_CFLAGS new_CXXFLAGS
+
+	for x in "$@" ; do
+		case "${x}" in
+			-fPIC|-fpic|-fPIE|-fpie|-pie)
+				append-flags `test_flag -fno-pie`;;
+			-fstack-protector|-fstack-protector-all)
+				fstack-flags;;
+		esac
+	done
+
+	for fset in CFLAGS CXXFLAGS; do
+		# Looping over the flags instead of using a global
+		# substitution ensures that we're working with flag atoms.
+		# Otherwise globs like -O* have the potential to wipe out the
+		# list of flags.
+		for f in ${!fset}; do
+			for x in "$@"; do
+				# Note this should work with globs like -O*
+				[[ ${f} == ${x} ]] && continue 2
+			done
+			eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
+		done
+		eval export ${fset}=\${new_${fset}\[*]}
+	done
+
+	return 0
+}
+
+filter-lfs-flags() {
+	[[ -n $@ ]] && die "filter-lfs-flags takes no arguments"
+	filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+}
+
+append-lfs-flags() {
+	[[ -n $@ ]] && die "append-lfs-flags takes no arguments"
+	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+}
+
+append-flags() {
+	[[ -z $* ]] && return 0
+	export CFLAGS="${CFLAGS} $*"
+	export CXXFLAGS="${CXXFLAGS} $*"
+	[ -n "`is-flag -fno-stack-protector`" -o \
+		-n "`is-flag -fno-stack-protector-all`" ] && fstack-flags
+	return 0
+}
+
+replace-flags() {
+	[[ $# != 2 ]] \
+		&& echo && eerror "Usage: replace-flags <old flag> <new flag>" \
+		&& die "replace-flags takes 2 arguments, not $#"
+
+	local f fset
+	declare -a new_CFLAGS new_CXXFLAGS
+
+	for fset in CFLAGS CXXFLAGS; do
+		# Looping over the flags instead of using a global
+		# substitution ensures that we're working with flag atoms.
+		# Otherwise globs like -O* have the potential to wipe out the
+		# list of flags.
+		for f in ${!fset}; do
+			# Note this should work with globs like -O*
+			[[ ${f} == ${1} ]] && f=${2}
+			eval new_${fset}\[\${\#new_${fset}\[@]}]=\${f}
+		done
+		eval export ${fset}=\${new_${fset}\[*]}
+	done
+
+	return 0
+}
+
+replace-cpu-flags() {
+	local newcpu="$#" ; newcpu="${!newcpu}"
+	while [ $# -gt 1 ] ; do
+		# quote to make sure that no globbing is done (particularly on
+		# ${oldcpu} prior to calling replace-flags
+		replace-flags "-march=${1}" "-march=${newcpu}"
+		replace-flags "-mcpu=${1}" "-mcpu=${newcpu}"
+		replace-flags "-mtune=${1}" "-mtune=${newcpu}"
+		shift
 	done
+	return 0
+}
+
+is-flag() {
+	local x
 
+	for x in ${CFLAGS} ${CXXFLAGS} ; do
+		# Note this should work with globs like -mcpu=ultrasparc*
+		if [[ ${x} == ${1} ]]; then
+			echo true
+			return 0
+		fi
+	done
+	return 1
 }
 
-max-optim () {
+filter-mfpmath() {
+	local orig_mfpmath new_math prune_math
 
-	for x in $CFLAGS; do
-		echo $x
+	# save the original -mfpmath flag
+	orig_mfpmath="`get-flag -mfpmath`"
+	# get the value of the current -mfpmath flag
+	new_math=" `get-flag mfpmath | tr , ' '` "
+	# figure out which math values are to be removed
+	prune_math=""
+	for prune_math in "$@" ; do
+		new_math="${new_math/ ${prune_math} / }"
 	done
+	new_math="`echo ${new_math:1:${#new_math}-2} | tr ' ' ,`"
+
+	if [ -z "${new_math}" ] ; then
+		# if we're removing all user specified math values are
+		# slated for removal, then we just filter the flag
+		filter-flags ${orig_mfpmath}
+	else
+		# if we only want to filter some of the user specified
+		# math values, then we replace the current flag
+		replace-flags ${orig_mfpmath} -mfpmath=${new_math}
+	fi
+	return 0
+}
+
+strip-flags() {
+	local x y flag NEW_CFLAGS NEW_CXXFLAGS
+
+	setup-allowed-flags
+
+	local NEW_CFLAGS=""
+	local NEW_CXXFLAGS=""
+
+	# Allow unstable C[XX]FLAGS if we are using unstable profile ...
+	if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
+		ALLOWED_FLAGS="${ALLOWED_FLAGS} ${UNSTABLE_FLAGS}"
+	fi
+
+	set -f	# disable pathname expansion
+
+	for x in ${CFLAGS}; do
+		for y in ${ALLOWED_FLAGS}; do
+			flag=${x%%=*}
+			if [ "${flag%%${y}}" = "" ] ; then
+				NEW_CFLAGS="${NEW_CFLAGS} ${x}"
+				break
+			fi
+		done
+	done
+
+	for x in ${CXXFLAGS}; do
+		for y in ${ALLOWED_FLAGS}; do
+			flag=${x%%=*}
+			if [ "${flag%%${y}}" = "" ] ; then
+				NEW_CXXFLAGS="${NEW_CXXFLAGS} ${x}"
+				break
+			fi
+		done
+	done
+
+	# In case we filtered out all optimization flags fallback to -O2
+	if [ "${CFLAGS/-O}" != "${CFLAGS}" -a "${NEW_CFLAGS/-O}" = "${NEW_CFLAGS}" ]; then
+		NEW_CFLAGS="${NEW_CFLAGS} -O2"
+	fi
+	if [ "${CXXFLAGS/-O}" != "${CXXFLAGS}" -a "${NEW_CXXFLAGS/-O}" = "${NEW_CXXFLAGS}" ]; then
+		NEW_CXXFLAGS="${NEW_CXXFLAGS} -O2"
+	fi
+
+	set +f	# re-enable pathname expansion
+
+	export CFLAGS="${NEW_CFLAGS}"
+	export CXXFLAGS="${NEW_CXXFLAGS}"
+	return 0
+}
+
+test_flag() {
+	if $(tc-getCC) -S -xc "$@" -o "$(emktemp)" /dev/null &>/dev/null; then
+		printf "%s\n" "$*"
+		return 0
+	fi
+	return 1
+}
+
+test_version_info() {
+	if [[ $($(tc-getCC) --version 2>&1) == *$1* ]]; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+strip-unsupported-flags() {
+	local x NEW_CFLAGS NEW_CXXFLAGS
+
+	for x in ${CFLAGS} ; do
+		NEW_CFLAGS="${NEW_CFLAGS} $(test_flag ${x})"
+	done
+	for x in ${CXXFLAGS} ; do
+		NEW_CXXFLAGS="${NEW_CXXFLAGS} $(test_flag ${x})"
+	done
+
+	export CFLAGS=${NEW_CFLAGS}
+	export CXXFLAGS=${NEW_CXXFLAGS}
+}
+
+get-flag() {
+	local f findflag="$1"
+
+	# this code looks a little flaky but seems to work for
+	# everything we want ...
+	# for example, if CFLAGS="-march=i686":
+	# `get-flag -march` == "-march=i686"
+	# `get-flag march` == "i686"
+	for f in ${CFLAGS} ${CXXFLAGS} ; do
+		if [ "${f/${findflag}}" != "${f}" ] ; then
+			printf "%s\n" "${f/-${findflag}=}"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# DEPRECATED - use gcc-specs-relro or gcc-specs-now from toolchain-funcs
+has_hardened() {
+	test_version_info Hardened && return 0
+	# the specs file wont exist unless gcc has GCC_SPECS support
+	[ -f "${GCC_SPECS}" -a "${GCC_SPECS}" != "${GCC_SPECS/hardened/}" ] && \
+		return 0
+	return 1
+}
+
+# DEPRECATED - use gcc-specs-pie from toolchain-funcs
+# indicate whether PIC is set
+has_pic() {
+	[ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0
+	[ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0
+	[ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
+	return 1
+}
+
+# DEPRECATED - use gcc-specs-pie from toolchain-funcs
+# indicate whether PIE is set
+has_pie() {
+	[ "${CFLAGS/-fPIE}" != "${CFLAGS}" ] && return 0
+	[ "${CFLAGS/-fpie}" != "${CFLAGS}" ] && return 0
+	[ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIE__)" ] && return 0
+	# test PIC while waiting for specs to be updated to generate __PIE__
+	[ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __PIC__)" ] && return 0
+	return 1
+}
+
+# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
+# indicate whether code for SSP is being generated for all functions
+has_ssp_all() {
+	# note; this matches only -fstack-protector-all
+	[ "${CFLAGS/-fstack-protector-all}" != "${CFLAGS}" ] && return 0
+	[ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP_ALL__)" ] && return 0
+	gcc-specs-ssp && return 0
+	return 1
+}
+
+# DEPRECATED - use gcc-specs-ssp from toolchain-funcs
+# indicate whether code for SSP is being generated
+has_ssp() {
+	# note; this matches both -fstack-protector and -fstack-protector-all
+	[ "${CFLAGS/-fstack-protector}" != "${CFLAGS}" ] && return 0
+	[ "$(echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep __SSP__)" ] && return 0
+	gcc-specs-ssp && return 0
+	return 1
+}
+
+has_m64() {
+	# this doesnt test if the flag is accepted, it tests if the flag
+	# actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
+	# please dont replace this function with test_flag in some future
+	# clean-up!
+	local temp="$(emktemp)"
+	echo "int main() { return(0); }" > ${temp}.c
+	MY_CC=$(tc-getCC)
+	${MY_CC/ .*/} -m64 -o "$(emktemp)" ${temp}.c > /dev/null 2>&1
+	local ret=$?
+	rm -f ${temp}.c
+	[ "$ret" != "1" ] && return 0
+	return 1
+}
+
+has_m32() {
+	# this doesnt test if the flag is accepted, it tests if the flag
+	# actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
+	# please dont replace this function with test_flag in some future
+	# clean-up!
+
+	[ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
+
+	local temp=$(emktemp)
+	echo "int main() { return(0); }" > "${temp}".c
+	MY_CC=$(tc-getCC)
+	${MY_CC/ .*/} -m32 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
+	local ret=$?
+	rm -f "${temp}".c
+	[ "$ret" != "1" ] && return 0
+	return 1
+}
+
+replace-sparc64-flags() {
+	local SPARC64_CPUS="ultrasparc v9"
+
+	if [ "${CFLAGS/mtune}" != "${CFLAGS}" ]; then
+		for x in ${SPARC64_CPUS}; do
+			CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
+		done
+	else
+	 	for x in ${SPARC64_CPUS}; do
+			CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
+		done
+	fi
+
+	if [ "${CXXFLAGS/mtune}" != "${CXXFLAGS}" ]; then
+		for x in ${SPARC64_CPUS}; do
+			CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
+		done
+	else
+	 	for x in ${SPARC64_CPUS}; do
+			CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
+		done
+	fi
+
+	export CFLAGS CXXFLAGS
+}
+
+append-ldflags() {
+	export LDFLAGS="${LDFLAGS} $*"
+	return 0
+}
+
+filter-ldflags() {
+	local x
+
+	# we do this fancy spacing stuff so as to not filter
+	# out part of a flag ... we want flag atoms ! :D
+	LDFLAGS=" ${LDFLAGS} "
+	for x in "$@" ; do
+		LDFLAGS=${LDFLAGS// ${x} / }
+	done
+	[[ -z ${LDFLAGS// } ]] \
+		&& LDFLAGS="" \
+		|| LDFLAGS=${LDFLAGS:1:${#LDFLAGS}-2}
+	export LDFLAGS
+	return 0
+}
+
+fstack-flags() {
+	if gcc-specs-ssp; then
+		[ -z "`is-flag -fno-stack-protector`" ] &&
+			export CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
+	fi
+	return 0
+}
+
+# This is thanks to great work from Paul de Vrieze <gentoo-user@devrieze.net>,
+# bug #9016.  Also thanks to Jukka Salmi <salmi@gmx.net> (bug #13907) for more
+# fixes.
+#
+# Export CFLAGS and CXXFLAGS that are compadible with gcc-2.95.3
+gcc2-flags() {
+	if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
+		CFLAGS=${CFLAGS//-mtune=/-mcpu=}
+		CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
+	fi
+
+	replace-cpu-flags k6-{2,3} k6
+	replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
+
+	replace-cpu-flags pentium-mmx i586
+	replace-cpu-flags pentium{2,3,4} i686
+
+	replace-cpu-flags ev6{7,8} ev6
+
+	export CFLAGS CXXFLAGS
+}
 
+# Gets the flags needed for "NOW" binding
+bindnow-flags() {
+	case $($(tc-getLD) -v 2>&1 </dev/null) in
+	*GNU* | *'with BFD'*) # GNU ld
+		echo "-Wl,-z,now" ;;
+	*Apple*) # Darwin ld
+		echo "-bind_at_load" ;;
+	*)
+		# Some linkers just recognize -V instead of -v
+		case $($(tc-getLD) -V 2>&1 </dev/null) in
+			*Solaris*) # Solaris accept almost the same GNU options
+				echo "-Wl,-z,now" ;;
+		esac
+		;;
+	esac
 }
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 8c9ddbbce597..582f7ddc2d3f 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -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/eclass/font.eclass,v 1.1 2004/05/31 14:21:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
 
 # Author: foser <foser@gentoo.org>
 
@@ -8,8 +8,8 @@
 #
 # Eclass to make font installation more uniform
 
-ECLASS="font"
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
+
 
 #
 # Variable declarations
@@ -17,13 +17,44 @@ INHERITED="$INHERITED $ECLASS"
 
 FONT_SUFFIX=""	# Space delimited list of font suffixes to install
 
+FONT_S="${S}" # Dir containing the fonts
+
 DOCS="" # Docs to install
 
-IUSE="${IUSE} X"
+IUSE="X"
+
+DEPEND="X? ( virtual/x11 )
+	media-libs/fontconfig"
+
+#
+# Public functions
+#
+
+font_xfont_config() {
+
+	# create Xfont files
+	if use X ; then
+		einfo "Creating fonts.scale & fonts.dir ..."
+		mkfontscale "${D}/usr/share/fonts/${PN}"
+		mkfontdir \
+			-e /usr/share/fonts/encodings \
+			-e /usr/share/fonts/encodings/large \
+			"${D}/usr/share/fonts/${PN}"
+		if [ -e "${FONT_S}/fonts.alias" ] ; then
+			doins "${FONT_S}/fonts.alias"
+		fi
+	fi
+
+}
+
+font_xft_config() {
 
-DEPEND="${DEPEND} \
-		X? ( virtual/x11 ) \
-		media-libs/fontconfig"
+	# create fontconfig cache
+	einfo "Creating fontconfig cache ..."
+	# Mac OS X has fc-cache at /usr/X11R6/bin
+	HOME="/root" fc-cache -f "${D}/usr/share/fonts/${PN}"
+
+}
 
 #
 # Public inheritable functions
@@ -31,38 +62,34 @@ DEPEND="${DEPEND} \
 
 font_src_install() {
 
-	local suffix, doc
+	local suffix
+
+	cd "${FONT_S}"
 
-	insinto /usr/share/fonts/${PN}
+	insinto "/usr/share/fonts/${PN}"
 
 	for suffix in ${FONT_SUFFIX}; do
-		doins ${S}/*.${suffix}
+		doins *.${suffix}
 	done
 
 	rm -f fonts.{dir,scale} encodings.dir
 
-	# create Xfont files
-	if [ -n "`use X`" ] ;
-	then
-		einfo "Creating fonts.scale & fonts.dir..."
-		mkfontscale ${D}/usr/share/fonts/${PN}
-		mkfontdir \
-			-e /usr/share/fonts/encodings \
-			-e /usr/share/fonts/encodings/large \
-			-e /usr/X11R6/lib/X11/fonts/encodings ${D}/usr/share/fonts/${PN}
-		doins fonts.alias
-	fi
-
-	# create fontconfig cache
-	einfo "Creating fontconfig cache..."
-	HOME="/root" /usr/bin/fc-cache -f ${D}/usr/share/fonts/${PN}
+	font_xfont_config
+	font_xft_config
 
+	cd "${S}"
 	# try to install some common docs
 	DOCS="${DOCS} COPYRIGHT README NEWS"
-	for doc in ${DOCS}; do
-		dodoc ${doc}
-	done
+	dodoc ${DOCS}
+
+}
+
+font_pkg_setup() {
+
+	# make sure we get no colissions
+	# setup is not the nicest place, but preinst doesn't cut it
+	rm "/usr/share/fonts/${PN}/fonts.cache-1"
 
 }
 
-EXPORT_FUNCTIONS src_install
+EXPORT_FUNCTIONS src_install pkg_setup
diff --git a/eclass/fortran.eclass b/eclass/fortran.eclass
index 8c491e37ebe0..d123dcf7040b 100644
--- a/eclass/fortran.eclass
+++ b/eclass/fortran.eclass
@@ -1,21 +1,38 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran.eclass,v 1.1 2004/10/01 12:08:16 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran.eclass,v 1.1.1.1 2005/11/30 09:59:25 chriswhite Exp $
 #
 # Author: Danny van Dyk <kugelfang@gentoo.org>
 #
 
-ECLASS=fortran
-INHERITED="$INHERITED $ECLASS"
+inherit eutils autotools
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
+IUSE="debug"
+
+#DEPEND="virtual/fortran" # Let's aim for this...
+
+# Which Fortran Compiler has been selected ?
+export FORTRANC
+
+# These are the options to ./configure / econf that enable the usage
+# of a specific Fortran Compiler. If your package uses a different
+# option that the one listed here, overwrite it in your ebuild.
+g77_CONF="--with-f77"
+f2c_CONF="--with-f2c"
+
+# This function prints the necessary options for the currently selected
+# Fortran Compiler.
+fortran_conf() {
+	echo $(eval echo \${$(echo -n ${FORTRANC})_CONF})
+}
+
 # need_fortran(<profiles>):
 #  profiles = <profile> ... <profile>
-#  profile = [path/to/]<compiler>
 #
-#  compiler:
-#   * f77 - GCC Fortran 77
+#  profile:
+#   * g77 - GCC Fortran 77
 #   * f2c - Fortran 2 C Translator
 #   * ifc - Intel Fortran Compiler
 #
@@ -23,15 +40,16 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 # Checks also if F77 (the fortran compiler to use) is available
 # on the System.
 need_fortran() {
-	if [ -z "$@" ]; then
+	if [ -z "$*" ]; then
 		eerror "Call need_fortran with at least one argument !"
-	fi 
-	local AVAILABLE=""
+	fi
+	local AVAILABLE
+	local PROFILE
 	for PROFILE in $@; do
 		case ${PROFILE} in
-			f77)
+			g77)
 				if [ -x "$(which g77 2> /dev/null)" ]; then
-					AVAILABLE="${AVAILABLE} f77"
+					AVAILABLE="${AVAILABLE} g77"
 				fi
 				;;
 			f2c)
@@ -41,9 +59,9 @@ need_fortran() {
 				;;
 			ifc)
 				case ${ARCH} in
-					x86|ia64)
-						if [ -x "$(which if2 2> /dev/null)" ]; then
-							AVAILABLE="${FORTRAN} ifc"
+					x86|ia64|amd64)
+						if [ -x "$(which ifc 2> /dev/null)" ]; then
+							AVAILABLE="${AVAILABLE} ifc"
 						fi
 						;;
 					*)
@@ -52,14 +70,16 @@ need_fortran() {
 				;;
 		esac
 	done
+	AVAILABLE="${AVAILABLE/^[[:space:]]}"
+	use debug && echo ${AVAILABLE}
 	if [ -z "${AVAILABLE}" ]; then
 		eerror "None of the needed Fortran Compilers ($@) is installed."
 		eerror "To install one of these, choose one of the following steps:"
 		i=1
 		for PROFILE in $@; do
 			case ${PROFILE} in
-				f77)
-					eerror "[${i}] USE=\"f77\" emerge sys-devel/gcc"
+				g77)
+					eerror "[${i}] USE=\"fortran\" emerge sys-devel/gcc"
 					;;
 				f2c)
 					eerror "[${i}] emerge dev-lang/f2c"
@@ -78,43 +98,66 @@ need_fortran() {
 		die "Install a Fortran Compiler !"
 	else
 		einfo "You need one of these Fortran Compilers: $@"
-		einfo "Installed are:${AVAILABLE}"
-		if [ -n "${F77}" ]; then
-			MY_F77="$(basename ${F77})"
-			case ${MY_F77} in
-				g77)
-					TEST="${AVAILABLE:-f77}"
-					;;
-				ifc|f2c)
-					TEST="${AVAILABLE:-${MY_F77}}"
-			esac
-			if [ "${TEST}" == "${AVAILABLE}" ]; then
-				warn "F77 is set to ${F77}, which is not available \
-					on this System !"
-				F77=${AVAILABLE##\ *}
+		einfo "Installed are: ${AVAILABLE}"
+		if [ -n "${F77}" -o -n "${FC}" -o -n "${F2C}" ]; then
+			if [ -n "${F77}" ]; then
+				FC="${F77}"						# F77 overwrites FC
+			fi
+			if [ -n "${FC}" -a -n "${F2C}" ]; then
+				ewarn "Using ${FC} and f2c is impossible. Disabling F2C !"
+				F2C=""							# Disabling f2c
+				MY_FORTRAN="$(basename ${FC})"	# set MY_FORTRAN to filename of
+												# the Fortran Compiler
+			else
+				if [ -n "${F2C}" ]; then
+					MY_FORTRAN="$(basename ${F2C})"
+				else
+					MY_FORTRAN="$(basename ${F77})"
+				fi
 			fi
 		fi
+
+		# default to g77
+		use debug && echo "MY_FORTRAN: \"${MY_FORTRAN}\""
+		MY_FORTRAN=${MY_FORTRAN:=g77}
+		use debug && echo "MY_FORTRAN: \"${MY_FORTRAN}\""
+
+		if ! hasq ${MY_FORTRAN} ${AVAILABLE}; then
+			eerror "Current Fortran Compiler is set to ${MY_FORTRAN}, which is not usable with this package !"
+			die "Wrong Fortran Compiler !"
+		fi
+
+		case ${MY_FORTRAN} in
+			g77|ifc|f2c)
+				FORTRANC="${MY_FORTRAN}"
+		esac
 	fi
+	use debug && echo "FORTRANC: \"${FORTRANC}\""
 }
 
 # patch_fortran():
-#  Apply necessary patches for ${F77}
+#  Apply necessary patches for ${FORTRANC}
 patch_fortran() {
-	PATCHES=${FILESDIR}/${P}-$(basename ${F77})*
+	if [ -z "${FORTRANC}" ]; then
+		return
+	fi
+	local PATCHES=$(find ${FILESDIR} -name "${P}-${FORTRANC}-*")
+	einfo "Applying patches for selected FORTRAN compiler: ${FORTRANC}"
+	local PATCH
 	if [ -n "${PATCHES}" ]; then
 		for PATCH in ${PATCHES}; do
 			epatch ${PATCH}
 		done
+		eautoreconf
 	fi
 }
 
 # fortran_pkg_setup():
 #  Set FORTRAN to indicate the list of Fortran Compiler that
 #  can be used for the ebuild.
-#  If not set in ebuild, FORTRAN will default to:
-FORTRAN="f77"
+#  If not set in ebuild, FORTRAN will default to f77
 fortran_pkg_setup() {
-	need_fortran ${FORTRAN}
+	need_fortran ${FORTRAN:=g77}
 }
 
 # fortran_src_unpack():
diff --git a/eclass/fox.eclass b/eclass/fox.eclass
index 15313fd809be..b1d87a0fb421 100644
--- a/eclass/fox.eclass
+++ b/eclass/fox.eclass
@@ -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/eclass/fox.eclass,v 1.1 2005/05/07 19:16:27 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 
 # fox eclass
 #
-# This eclass allows building SLOT-able FOX Toolkit installations 
-# (x11-libs/fox: headers, libs, and docs), which are by design 
-# parallel-installable, while installing only one version of the utils 
+# This eclass allows building SLOT-able FOX Toolkit installations
+# (x11-libs/fox: headers, libs, and docs), which are by design
+# parallel-installable, while installing only one version of the utils
 # (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
 # x11-misc/pathfinder, and x11-misc/shutterbug).
 #
 # Version numbering follows the kernel-style odd-even minor version
-# designation.  Even-number minor versions are API stable, which patch 
-# releases aimed mostly at the library; apps generally won't need to be 
+# designation.  Even-number minor versions are API stable, which patch
+# releases aimed mostly at the library; apps generally won't need to be
 # bumped for a patch release.
 #
-# Odd-number versions are development branches with their own SLOT and 
-# are API unstable; changes are made to the apps, and likely need to be 
+# Odd-number versions are development branches with their own SLOT and
+# are API unstable; changes are made to the apps, and likely need to be
 # bumped together with the library.
 #
 # Here are sample [R]DEPENDs for the fox apps, based on the first versions
@@ -31,8 +31,6 @@
 
 inherit eutils libtool
 
-ECLASS="fox"
-INHERITED="$INHERITED $ECLASS"
 
 FOX_PV="${FOX_PV:-${PV}}"
 PVP=(${FOX_PV//[-\._]/ })
@@ -51,7 +49,7 @@ IUSE="debug doc profile"
 # from fox-1.0
 FOX_APPS="adie calculator pathfinder"
 # from fox-1.2+
-if [ "${FOXVER}" != "1.0" ] ; then 
+if [ "${FOXVER}" != "1.0" ] ; then
 	FOX_APPS="${FOX_APPS} shutterbug"
 	FOX_CHART="chart"
 fi
@@ -68,8 +66,7 @@ if [ "${PN}" != reswrap ] ; then
 	RESWRAP_DEP="dev-util/reswrap"
 fi
 
-DEPEND="${RDEPEND}
-	${DOXYGEN_DEP}
+DEPEND="${DOXYGEN_DEP}
 	${RESWRAP_DEP}
 	=sys-devel/automake-1.4*
 	>=sys-apps/sed-4"
@@ -129,7 +126,7 @@ fox_src_unpack() {
 fox_src_compile() {
 	local myconf
 	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release" 
+		|| myconf="${myconf} --enable-release"
 
 	econf \
 		${FOXCONF} \
@@ -198,7 +195,7 @@ fox_src_install () {
 }
 
 fox_pkg_postinst() {
-	if [ -z "${FOX_COMPONENT}" ] ; then 
+	if [ -z "${FOX_COMPONENT}" ] ; then
 		echo
 		einfo "Multiple versions of the FOX Toolkit library may now be installed"
 		einfo "in parallel SLOTs on the same system."
diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
index 0e9241a60b68..67f59e22c31c 100644
--- a/eclass/freedict.eclass
+++ b/eclass/freedict.eclass
@@ -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/eclass/freedict.eclass,v 1.1 2003/03/18 03:49:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freedict.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 
 # Author: Seemant Kulleen <seemant@gentoo.org>
 # This eclass exists to ease the installation of freedict translation
@@ -8,6 +8,8 @@
 # ebuilds are FORLANG and TOLANG for the source and target languages,
 # respectively.
 
+inherit eutils
+
 IUSE=""
 
 MY_P=${PN/freedict-/}
@@ -19,12 +21,14 @@ SRC_URI="http://freedict.sourceforge.net/download/linux/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64 ppc ~sparc ~alpha ~mips ~hppa"
 
 DEPEND="app-text/dictd"
 
-src_install() {
-	insinto /usr/lib/dict
+freedict_src_install() {
+	insinto /usr/$(get_libdir)/dict
 	doins ${MY_P}.dict.dz
 	doins ${MY_P}.index
 }
+
+EXPORT_FUNCTIONS src_install
diff --git a/eclass/games-etmod.eclass b/eclass/games-etmod.eclass
index 8bd40757dde4..e7a8399248bc 100644
--- a/eclass/games-etmod.eclass
+++ b/eclass/games-etmod.eclass
@@ -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/eclass/games-etmod.eclass,v 1.1 2004/12/10 01:47:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games-etmod.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 
 inherit games
 
-ECLASS=games-etmod
-INHERITED="$INHERITED $ECLASS"
 
 EXPORT_FUNCTIONS src_install pkg_postinst
 
 DESCRIPTION="Enemy Territory - ${MOD_DESC}"
 
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
+RESTRICT="strip"
 IUSE="opengl dedicated"
 
 DEPEND="app-arch/unzip"
@@ -45,26 +44,30 @@ games-etmod_src_install() {
 		mv ${S}/* ${D}/${mdir}/
 	fi
 
-	games-etmod_make_etded_exec
-	newgamesbin ${T}/et-${MOD_NAME}-ded.bin et-${MOD_BINS}-ded
-	games-etmod_make_enemy-territory_exec
-	newgamesbin ${T}/et-${MOD_NAME}.bin et-${MOD_BINS}
+	if use dedicated; then
+		games-etmod_make_etded_exec
+		newgamesbin ${T}/et-${MOD_NAME}-ded.bin et-${MOD_BINS}-ded
+	fi
+	if use opengl; then
+		games-etmod_make_enemy-territory_exec
+		newgamesbin ${T}/et-${MOD_NAME}.bin et-${MOD_BINS}
+	fi
 
-	games-etmod_make_init.d
-	exeinto /etc/init.d
-	newexe ${T}/et-${MOD_NAME}-ded.init.d et-${MOD_BINS}-ded
-	games-etmod_make_conf.d
-	insinto /etc/conf.d
-	newins ${T}/et-${MOD_NAME}-ded.conf.d et-${MOD_BINS}-ded
+	if use dedicated; then
+		games-etmod_make_init.d
+		newinitd ${T}/et-${MOD_NAME}-ded.init.d et-${MOD_BINS}-ded
+		games-etmod_make_conf.d
+		newconfd ${T}/et-${MOD_NAME}-ded.conf.d et-${MOD_BINS}-ded
 
-	dodir ${GAMES_SYSCONFDIR}/enemy-territory
+		dodir ${GAMES_SYSCONFDIR}/enemy-territory
 
-	dodir ${bdir}/etwolf-homedir
-	dosym ${bdir}/etwolf-homedir ${GAMES_PREFIX}/.wolfet
-	keepdir ${bdir}/etwolf-homedir
+		dodir ${bdir}/etwolf-homedir
+		dosym ${bdir}/etwolf-homedir ${GAMES_PREFIX}/.wolfet
+		keepdir ${bdir}/etwolf-homedir
+		chmod g+rw ${D}/${mdir} ${D}/${bdir}/etwolf-homedir
+		chmod -R g+rw ${D}/${GAMES_SYSCONFDIR}/enemy-territory
+	fi
 	prepgamesdirs
-	chmod g+rw ${D}/${mdir} ${D}/${bdir}/etwolf-homedir
-	chmod -R g+rw ${D}/${GAMES_SYSCONFDIR}/enemy-territory
 }
 
 games-etmod_pkg_postinst() {
@@ -74,10 +77,11 @@ games-etmod_pkg_postinst() {
 		cp ${samplecfg} ${realcfg}
 	fi
 
-	einfo "To play this mod:             enemy-territory-${MOD_BINS}"
-	einfo "To launch a dedicated server: et-${MOD_BINS}-ded"
-	use dedicated && \
-	einfo "To launch server at startup:  /etc/init.d/et-${MOD_NAME}-ded"
+	use opengl && einfo "To play this mod:             et-${MOD_BINS}"
+	if use dedicated; then
+		einfo "To launch a dedicated server: et-${MOD_BINS}-ded"
+		einfo "To launch server at startup:  /etc/init.d/et-${MOD_NAME}-ded"
+	fi
 
 	games_pkg_postinst
 }
@@ -143,6 +147,6 @@ cat << EOF > ${T}/et-${MOD_NAME}-ded.conf.d
 $(<${PORTDIR}/header.txt)
 
 # Any extra options you want to pass to the dedicated server
-${MOD_NAME}_OPTS="+set com_hunkmegs 64 +set com_zonemegs 32" 
+${MOD_NAME}_OPTS="+set com_hunkmegs 64 +set com_zonemegs 32"
 EOF
 }
diff --git a/eclass/games-q3mod.eclass b/eclass/games-q3mod.eclass
index 23910b137380..5e723dd3c814 100644
--- a/eclass/games-q3mod.eclass
+++ b/eclass/games-q3mod.eclass
@@ -1,23 +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/eclass/games-q3mod.eclass,v 1.1 2003/07/02 13:08:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games-q3mod.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 
 inherit games
 
-ECLASS=games-q3mod
-INHERITED="$INHERITED $ECLASS"
-
 EXPORT_FUNCTIONS src_install pkg_postinst
 
 DESCRIPTION="Quake III - ${MOD_DESC}"
 
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* x86 amd64"
 IUSE="opengl X dedicated"
 
 DEPEND="app-arch/unzip"
-RDEPEND="virtual/glibc
-	app-games/quake3
+RDEPEND="|| ( games-fps/quake3 games-fps/quake3-bin )
+	amd64? ( app-emulation/emul-linux-x86-baselibs
+		X? ( app-emulation/emul-linux-x86-xlibs ) )
 	dedicated? ( app-misc/screen )
 	opengl? ( virtual/opengl )
 	X? ( virtual/x11 )"
@@ -25,66 +23,82 @@ RDEPEND="virtual/glibc
 S=${WORKDIR}
 
 games-q3mod_src_install() {
-	[ -z "${MOD_NAME}" ] && die "what is the name of this q3mod ?"
+	[[ -z ${MOD_NAME} ]] && die "what is the name of this q3mod ?"
 
 	local bdir=${GAMES_PREFIX_OPT}/quake3
 	local mdir=${bdir}/${MOD_NAME}
 	MOD_BINS=${MOD_BINS:-${MOD_NAME}}
 
-	if [ -d ${MOD_NAME} ] ; then
-		dodir ${bdir}
-		mv ${MOD_NAME} ${D}/${bdir}/
+	if [[ -d ${MOD_NAME} ]] ; then
+		dodir "${bdir}"
+		mv ${MOD_NAME} "${D}/${bdir}/"
+	fi
+	if [[ -d baseq3 ]] ; then
+		dodir "${bdir}"
+		mv baseq3 "${D}/${bdir}/"
 	fi
-	if [ ! -z "`ls ${S}/* 2> /dev/null`" ] ; then
-		dodir ${mdir}
-		mv ${S}/* ${D}/${mdir}/
+	if [[ ! -z $(ls "${S}"/* 2> /dev/null) ]] ; then
+		dodir "${mdir}"
+		mv "${S}"/* "${D}/${mdir}/"
 	fi
 
-	games-q3mod_make_q3ded_exec
-	newgamesbin ${T}/q3ded-${MOD_NAME}.bin q3ded-${MOD_BINS}
+	if use dedicated; then
+		games-q3mod_make_q3ded_exec
+		newgamesbin "${T}"/q3${MOD_NAME}-ded.bin q3${MOD_BINS}-ded
+	fi
 	games-q3mod_make_quake3_exec
-	newgamesbin ${T}/quake3-${MOD_NAME}.bin quake3-${MOD_BINS}
+	newgamesbin "${T}"/quake3-${MOD_NAME}.bin quake3-${MOD_BINS}
 
-	games-q3mod_make_init.d
-	exeinto /etc/init.d
-	newexe ${T}/q3ded-${MOD_NAME}.init.d q3ded-${MOD_BINS}
-	games-q3mod_make_conf.d
-	insinto /etc/conf.d
-	newins ${T}/q3ded-${MOD_NAME}.conf.d q3ded-${MOD_BINS}
+	if use dedicated; then
+		games-q3mod_make_init.d
+		newinitd "${T}"/q3${MOD_NAME}-ded.init.d q3${MOD_BINS}-ded
+		games-q3mod_make_conf.d
+		newconfd "${T}"/q3${MOD_NAME}-ded.conf.d q3${MOD_BINS}-ded
+	fi
 
-	dodir ${GAMES_SYSCONFDIR}/quake3
+	dodir "${GAMES_SYSCONFDIR}"/quake3
 
+	dodir "${bdir}"/q3a-homedir
+	dosym "${bdir}"/q3a-homedir "${GAMES_PREFIX}"/.q3a
+	keepdir "${bdir}"/q3a-homedir
 	prepgamesdirs
-	chmod g+rw ${D}/${mdir}
-	chmod -R g+rw ${D}/${GAMES_SYSCONFDIR}/quake3
+	chmod g+rw "${D}/${mdir}" "${D}/${bdir}"/q3a-homedir
+	chmod -R g+rw "${D}/${GAMES_SYSCONFDIR}"/quake3
 }
 
 games-q3mod_pkg_postinst() {
 	local samplecfg=${FILESDIR}/server.cfg
 	local realcfg=${GAMES_PREFIX_OPT}/quake3/${MOD_NAME}/server.cfg
-	if [ -e ${samplecfg} ] && [ ! -e ${realcfg} ] ; then
-		cp ${samplecfg} ${realcfg}
+	if [[ -e ${samplecfg} ]] && [[ ! -e ${realcfg} ]] ; then
+		cp "${samplecfg}" "${realcfg}"
 	fi
-	return 0
+
+	einfo "To play this mod:             quake3-${MOD_BINS}"
+	use dedicated && \
+	einfo "To launch a dedicated server: q3${MOD_BINS}-ded" && \
+	einfo "To launch server at startup:  /etc/init.d/q3${MOD_NAME}-ded"
+
+	games_pkg_postinst
 }
 
 games-q3mod_make_q3ded_exec() {
-cat << EOF > ${T}/q3ded-${MOD_NAME}.bin
+cat << EOF > "${T}"/q3${MOD_NAME}-ded.bin
 #!/bin/sh
-exec q3ded +set fs_game ${MOD_NAME} +set dedicated 1 +exec server.cfg \${@}
+exec "${GAMES_BINDIR}"/q3ded +set fs_game ${MOD_NAME} +set dedicated 1 +exec server.cfg \${@}
 EOF
 }
 
 games-q3mod_make_quake3_exec() {
-cat << EOF > ${T}/quake3-${MOD_NAME}.bin
+cat << EOF > "${T}"/quake3-${MOD_NAME}.bin
 #!/bin/sh
-exec quake3 +set fs_game ${MOD_NAME} \${@}
+exec "${GAMES_BINDIR}"/quake3 +set fs_game ${MOD_NAME} \${@}
 EOF
 }
 
 games-q3mod_make_init.d() {
-cat << EOF > ${T}/q3ded-${MOD_NAME}.init.d
-$(<${PORTDIR}/header.txt)
+cat << EOF > "${T}"/q3${MOD_NAME}-ded.init.d
+#!/sbin/runscript
+$(<"${PORTDIR}"/header.txt)
 
 depend() {
 	need net
@@ -92,25 +106,40 @@ depend() {
 
 start() {
 	ebegin "Starting ${MOD_NAME} dedicated"
-	screen -A -m -d -S ${MOD_NAME} su - ${GAMES_USER_DED} -c ${GAMES_BINDIR}/q3ded-${MOD_NAME} \${${MOD_NAME}_OPTS}
+	screen -A -m -d -S q3${MOD_BINS}-ded su - ${GAMES_USER_DED} -c "${GAMES_BINDIR}/q3${MOD_BINS}-ded \${${MOD_NAME}_OPTS}"
 	eend \$?
 }
 
 stop() {
 	ebegin "Stopping ${MOD_NAME} dedicated"
-	kill \`screen -list | grep ${MOD_NAME} | awk -F . '{ print $1 }' | sed -e s/.//\`
-	eend \$?
+	local pid=\`screen -list | grep q3${MOD_BINS}-ded | awk -F . '{print \$1}' | sed -e s/.//\`
+	if [ -z "\${pid}" ] ; then
+		eend 1 "Lost screen session"
+	else
+		pid=\`pstree -p \${pid} | sed -e 's:^.*q3ded::'\`
+		pid=\${pid:1:\${#pid}-2}
+		if [ -z "\${pid}" ] ; then
+			eend 1 "Lost q3ded session"
+		else
+			kill \${pid}
+			eend \$? "Could not kill q3ded"
+		fi
+	fi
+}
+
+status() {
+	screen -list | grep q3${MOD_BINS}-ded
 }
 EOF
 }
 
 games-q3mod_make_conf.d() {
-	if [ -e ${FILESDIR}/${MOD_NAME}.conf.d ] ; then
-		cp ${FILESDIR}/${MOD_NAME}.conf.d ${T}/q3ded-${MOD_NAME}.conf.d
+	if [[ -e ${FILESDIR}/${MOD_NAME}.conf.d ]] ; then
+		cp "${FILESDIR}"/${MOD_NAME}.conf.d "${T}"/q3${MOD_NAME}-ded.conf.d
 		return 0
 	fi
-cat << EOF > ${T}/q3ded-${MOD_NAME}.conf.d
-$(<${PORTDIR}/header.txt)
+cat << EOF > "${T}"/q3${MOD_NAME}-ded.conf.d
+$(<"${PORTDIR}"/header.txt)
 
 # Any extra options you want to pass to the dedicated server
 ${MOD_NAME}_OPTS="+set vm_game 0 +set sv_pure 1 +set bot_enable 0 +set com_hunkmegs 24 +set net_port 27960"
diff --git a/eclass/games-ut2k4mod.eclass b/eclass/games-ut2k4mod.eclass
index b2b2e4bd3b9e..4c056b3de3a7 100644
--- a/eclass/games-ut2k4mod.eclass
+++ b/eclass/games-ut2k4mod.eclass
@@ -1,13 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games-ut2k4mod.eclass,v 1.1 2004/11/25 00:08:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games-ut2k4mod.eclass,v 1.1.1.1 2005/11/30 09:59:21 chriswhite Exp $
 
 inherit games
 
-ECLASS=games-ut2k4mod
-INHERITED="$INHERITED $ECLASS"
 
-EXPORT_FUNCTIONS pkg_fetch src_unpack src_install pkg_postinst
+EXPORT_FUNCTIONS pkg_nofetch src_unpack src_install pkg_postinst
 
 DESCRIPTION="UT2004 - ${MOD_DESC}"
 
@@ -26,32 +24,59 @@ S=${WORKDIR}
 dir=${GAMES_PREFIX_OPT}/ut2004
 Ddir=${D}/${dir}
 
-games-ut2k4mod_pkg_fetch() {
+check_dvd() {
+	# The following is a nasty mess to determine if we are installing from
+	# a DVD or from multiple CDs.  Anyone feel free to submit patches to this
+	# to bugs.gentoo.org as I know it is a very ugly hack.
+	USE_DVD=
+	USE_ECE_DVD=
+	if [ -n "${CD_ROOT}" ]
+	then
+		[ -d "${CD_ROOT}/CD1" ] && USE_DVD=1
+		[ -d "${CD_ROOT}/CD7" ] && USE_ECE_DVD=1
+	else
+		local mline=""
+		for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'`
+		do
+			[ -d "${mline}/CD1" ] && USE_DVD=1
+			[ -d "${mline}/CD7" ] && USE_ECE_DVD=1
+		done
+	fi
+}
+
+games-ut2k4mod_pkg_nofetch() {
 	einfo "Please download ${A} and put it into ${DISTDIR}"
 	einfo "http://liflg.org/?catid=6&gameid=17"
 }
 
 games-ut2k4mod_src_unpack() {
-	dodir ${dir}
-	unpack_makeself
+	[ -z "${MOD_TBZ2}" ] && die "what are we supposed to unpack ?"
+	[ -z "${MOD_NAME}" ] && die "what is the name of this ut2k4mod ?"
+
+	for makeself in ${A}
+	do
+		unpack_makeself ${makeself}
+	done
+
 	mkdir ${S}/unpack
-	if [ -e ${MOD_TBZ2}_${PV}-english.tar.bz2 ]
-	then
-		tar xjf ${MOD_TBZ2}_${PV}-english.tar.bz2 -C ${S}/unpack \
-			|| die "uncompressing tarball"
-	elif [ -e ${MOD_TBZ2}_${PV}.tar.bz2 ]
-	then
-		tar xjf ${MOD_TBZ2}_${PV}.tar.bz2 -C ${S}/unpack \
-			|| die "uncompressing tarball"
-	else
-		tar xjf ${MOD_TBZ2}.tar.bz2 -C ${S}/unpack \
-			|| die "uncompressing tarball"
-	fi
+	for tarball in ${MOD_TBZ2}
+	do
+		if [ -e "${tarball}_${PV}-english.tar.bz2" ]
+		then
+			tar xjf ${tarball}_${PV}-english.tar.bz2 -C ${S}/unpack \
+				|| die "uncompressing tarball"
+		elif [ -e "${tarball}_${PV}.tar.bz2" ]
+		then
+			tar xjf ${tarball}_${PV}.tar.bz2 -C ${S}/unpack \
+				|| die "uncompressing tarball"
+		else [ -e "${tarball}.tar.bz2" ]
+			tar xjf ${tarball}.tar.bz2 -C ${S}/unpack \
+				|| die "uncompressing tarball"
+		fi
+	done
 }
 
 games-ut2k4mod_src_install() {
-	[ -z "${MOD_NAME}" ] && die "what is the name of this ut2k4mod ?"
-
 	dodir ${dir}
 	cp -r ${S}/unpack/* ${Ddir}
 
@@ -59,24 +84,33 @@ games-ut2k4mod_src_install() {
 	then
 		dodoc README.${MOD_BINS} || die "dodoc failed"
 	else
-		dodoc README.${MOD_TBZ2} || die "dodoc failed"
+		for tbz2 in ${MOD_TBZ2}
+		do
+			if [ -e ${S}/README.${tbz2} ]
+			then
+				dodoc README.${tbz2} || die "dodoc failed"
+			fi
+		done
+	fi
+	if [ -n "${MOD_BINS}" ]
+	then
+		exeinto ${dir}
+		doexe bin/${MOD_BINS} || die "doexe failed"
+		games_make_wrapper ${MOD_BINS} ./${MOD_BINS} ${dir}
+		make_desktop_entry ${MOD_BINS} "UT2004 - ${MOD_NAME}" ${MOD_ICON}
 	fi
-	exeinto ${dir}
-	doexe bin/${MOD_BINS} || die "doexe failed"
-
-	games_make_wrapper ${MOD_BINS} ./${MOD_BINS} ${dir}
 
-	insinto /usr/share/pixmaps
-	[ -e ${MOD_ICON} ] && doins ${MOD_ICON}
+	[ -e ${MOD_ICON} ] && doicon ${MOD_ICON}
 
 	prepgamesdirs
-	make_desktop_entry ${MOD_BINS} "UT2004 - ${MOD_NAME}" ${MOD_ICON}
 }
 
 games-ut2k4mod_pkg_postinst() {
-
-	einfo "To play this mod run:"
-	einfo " ${MOD_BINS}"
+	if [ -n "${MOD_BINS}" ]
+	then
+		einfo "To play this mod run:"
+		einfo " ${MOD_BINS}"
+	fi
 
 	games_pkg_postinst
 }
diff --git a/eclass/games.eclass b/eclass/games.eclass
index 76d8dd30847d..2086f27df0a6 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -1,48 +1,231 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.1 2002/11/05 19:50:59 vapier Exp $
-
-# devlist: {bass,phoenix,vapier}@gentoo.org
-# This is the games ebuild for standardizing the install of games ...
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
+#
+# devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org
+#
+# This is the games eclass for standardizing the install of games ...
 # you better have a *good* reason why you're *not* using games.eclass
-# in an ebuild in app-games
+# in a games ebuild
+
+inherit eutils gnuconfig
+
 
-ECLASS=games
-INHERITED="$INHERITED $ECLASS"
+EXPORT_FUNCTIONS pkg_preinst pkg_postinst src_compile pkg_setup
 
-export GAMES_PREFIX="/usr/games"
-export GAMES_DATADIR="/usr/share/games/${PN}"
-export GAMES_SYSCONFDIR="/etc/games/${PN}"
-export GAMES_STATEDIR="/var/games"
-export GAMES_PREFIX_OPT="/opt/${PN}"
-export GAMES_GROUP="games"
+DESCRIPTION="Based on the ${ECLASS} eclass"
 
-egameconf() {
-	if [ -x ./configure ] ; then
+export GAMES_PREFIX=${GAMES_PREFIX:-/usr/games}
+export GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt}
+export GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games}
+export GAMES_DATADIR_BASE=${GAMES_DATADIR_BASE:-/usr/share} # some packages auto append 'games'
+export GAMES_SYSCONFDIR=${GAMES_SYSCONFDIR:-/etc/games}
+export GAMES_STATEDIR=${GAMES_STATEDIR:-/var/games}
+export GAMES_LOGDIR=${GAMES_LOGDIR:-/var/log/games}
+export GAMES_LIBDIR=${GAMES_LIBDIR:-/usr/games/lib}
+export GAMES_BINDIR=${GAMES_BINDIR:-/usr/games/bin}
+export GAMES_ENVD="90games"
+# if you want to use a different user/group than games.games,
+# just add these two variables to your environment (aka /etc/profile)
+export GAMES_USER=${GAMES_USER:-root}
+export GAMES_USER_DED=${GAMES_USER_DED:-games}
+export GAMES_GROUP=${GAMES_GROUP:-games}
+
+egamesconf() {
+	local myconf
+	if [[ -x ./configure ]] ; then
+		gnuconfig_update
+		[[ -n ${CTARGET} ]] && myconf="${myconf} --target=${CTARGET}"
+		echo \
+		./configure \
+			--prefix="${GAMES_PREFIX}" \
+			--build=${CBUILD:-${CHOST}} \
+			--host=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir="${GAMES_DATADIR}" \
+			--sysconfdir="${GAMES_SYSCONFDIR}" \
+			--localstatedir="${GAMES_STATEDIR}" \
+			${myconf} \
+			"$@" \
+			${EXTRA_ECONF}
 		./configure \
-			--prefix=${GAMES_PREFIX} \
+			--prefix="${GAMES_PREFIX}" \
+			--build=${CBUILD:-${CHOST}} \
 			--host=${CHOST} \
 			--mandir=/usr/share/man \
 			--infodir=/usr/share/info \
-			--datadir=${GAMES_DATADIR} \
-			--sysconfdir=${GAMES_SYSCONFDIR} \
-			--localstatedir=${GAMES_STATEDIR} \
-			"$@" || die "egamesconf failed"
+			--datadir="${GAMES_DATADIR}" \
+			--sysconfdir="${GAMES_SYSCONFDIR}" \
+			--localstatedir="${GAMES_STATEDIR}" \
+			${myconf} \
+			"$@" \
+			${EXTRA_ECONF} \
+			|| die "egamesconf failed"
 	else
 		die "no configure script found"
 	fi
 }
 
+egamesinstall() {
+	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
+		make \
+			prefix="${D}${GAMES_PREFIX}" \
+			mandir="${D}/usr/share/man" \
+			infodir="${D}/usr/share/info" \
+			datadir="${D}${GAMES_DATADIR}" \
+			sysconfdir="${D}${GAMES_SYSCONFDIR}" \
+			localstatedir="${D}${GAMES_STATEDIR}" \
+			"$@" install || die "einstall failed"
+	else
+		die "no Makefile found"
+	fi
+}
+
 gameswrapper() {
-	local olddtree=${DESTTREE}
-	into ${GAMES_PREFIX}
-	local cmd="do$1"; shift
-	${cmd} $@
-	into ${oldtree}
-}
-
-dogamebin() { gameswrapper bin $@; }
-dogamesbin() { gameswrapper sbin $@; }
-dogamelib() { gameswrapper lib $@; }
-dogamelib.a() { gameswrapper lib.a $@; }
-dogamelib.so() { gameswrapper lib.so $@; }
+	local oldtree=${DESTTREE}
+	into "${GAMES_PREFIX}"
+	local cmd=$1; shift
+	${cmd} "$@"
+	local ret=$?
+	into "${oldtree}"
+	return ${ret}
+}
+
+dogamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+dogamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+dogameslib() { gameswrapper ${FUNCNAME/games} "$@"; }
+dogameslib.a() { gameswrapper ${FUNCNAME/games} "$@"; }
+dogameslib.so() { gameswrapper ${FUNCNAME/games} "$@"; }
+newgamesbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+newgamessbin() { gameswrapper ${FUNCNAME/games} "$@"; }
+
+games_make_wrapper() { gameswrapper ${FUNCNAME/games_} "$@"; }
+
+gamesowners() { chown ${GAMES_USER}:${GAMES_GROUP} "$@"; }
+gamesperms() { chmod u+rw,g+r-w,o-rwx "$@"; }
+prepgamesdirs() {
+	local dir f
+	for dir in \
+		"${GAMES_PREFIX}" "${GAMES_PREFIX_OPT}" "${GAMES_DATADIR}" \
+		"${GAMES_SYSCONFDIR}" "${GAMES_STATEDIR}" "${GAMES_LIBDIR}" \
+		"${GAMES_BINDIR}" "$@"
+	do
+		[[ ! -d ${D}/${dir} ]] && continue
+		(
+			gamesowners -R "${D}/${dir}"
+			find "${D}/${dir}" -type d -print0 | xargs --null chmod 750
+			find "${D}/${dir}" -type f -print0 | xargs --null chmod o-rwx,g+r
+		) &>/dev/null
+		f=$(find "${D}/${dir}" -perm +4000 -a -uid 0 2>/dev/null)
+		if [[ -n ${f} ]] ; then
+			eerror "A game was detected that is setuid root!"
+			eerror "${f}"
+			die "refusing to merge a setuid root game"
+		fi
+	done
+	[[ -d ${D}/${GAMES_BINDIR} ]] || return 0
+	find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \;
+}
+
+gamesenv() {
+	cat << EOF > "${ROOT}"/etc/env.d/${GAMES_ENVD}
+LDPATH="${GAMES_LIBDIR}"
+PATH="${GAMES_BINDIR}"
+EOF
+}
+
+games_pkg_setup() {
+	[[ ${GAMES_CHECK_LICENSE} == "yes" ]] && check_license ${LICENSE}
+
+	enewgroup "${GAMES_GROUP}" 35
+	[[ ${GAMES_USER} != "root" ]] \
+		&& enewuser "${GAMES_USER}" 35 -1 /usr/games "${GAMES_GROUP}"
+	[[ ${GAMES_USER_DED} != "root" ]] \
+		&& enewuser "${GAMES_USER_DED}" 36 /bin/bash /usr/games "${GAMES_GROUP}"
+
+	# Make sure SDL was built in a certain way
+	if [[ -n ${GAMES_USE_SDL} ]] ; then
+		if built_with_use -o media-libs/libsdl ${GAMES_USE_SDL} ; then
+			eerror "You built libsdl with wrong USE flags."
+			eerror "Make sure you rebuild it like this:"
+			eerror "USE='-${GAMES_USE_SDL// / -}'"
+			die "your libsdl sucks"
+		fi
+	fi
+
+	# Dear portage team, we are so sorry.  Lots of love, games team.
+	# See Bug #61680
+	[[ ${USERLAND} != "GNU" ]] && return 0
+	[[ $(getent passwd "${GAMES_USER_DED}" | cut -f7 -d:) == "/bin/false" ]] \
+		&& usermod -s /bin/bash "${GAMES_USER_DED}"
+}
+
+games_src_compile() {
+	[[ -x ./configure ]] && { egamesconf || die "egamesconf failed"; }
+	[ -e [Mm]akefile ] && { emake || die "emake failed"; }
+}
+
+games_pkg_preinst() {
+	local f
+
+	for f in $(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P ' 2>/dev/null) ; do
+		if [[ -e ${ROOT}/${GAMES_STATEDIR}/${f} ]] ; then
+			cp -p \
+				"${ROOT}/${GAMES_STATEDIR}/${f}" \
+				"${D}/${GAMES_STATEDIR}/${f}" \
+				|| die "cp failed"
+			# make the date match the rest of the install
+			touch "${D}/${GAMES_STATEDIR}/${f}"
+		fi
+	done
+}
+
+# pkg_postinst function ... create env.d entry and warn about games group
+games_pkg_postinst() {
+	gamesenv
+	ewarn "Remember, in order to play games, you have to"
+	ewarn "be in the '${GAMES_GROUP}' group."
+	echo
+	case ${USERLAND} in
+		GNU)    einfo "Just run 'gpasswd -a <USER> ${GAMES_GROUP}'";;
+		DARWIN) einfo "Just run 'niutil -appendprop / /groups/games users <USER>'";;
+	esac
+	echo
+}
+
+# Unpack .uz(2) files for UT/UT2003/UT2004
+# $1: directory or file to unpack
+games_ut_unpack() {
+	local ut_unpack="$1"
+	local f=
+
+	if [[ -z ${ut_unpack} ]] ; then
+		die "You must provide an argument to games_ut_unpack"
+	fi
+	if [[ -f ${ut_unpack} ]] ; then
+		uz2unpack "${ut_unpack}" "${ut_unpack/.uz2/}" &>/dev/null \
+			|| die "uncompressing file ${ut_unpack}"
+	fi
+	if [[ -d ${ut_unpack} ]] ; then
+		for f in $(find "${ut_unpack}" -name '*.uz*' -printf '%f ') ; do
+			uz2unpack "${ut_unpack}/${f}" "${ut_unpack}/${f/.uz2}" &>/dev/null \
+				|| die "uncompressing file ${f}"
+			rm -f "${ut_unpack}/${f}" || die "deleting compressed file ${f}"
+		done
+	fi
+}
+
+# Unpacks .umod/.ut2mod/.ut4mod files for UT/UT2003/UT2004
+# Usage: games_umod_unpack $1
+games_umod_unpack() {
+	local umod=$1
+	mkdir -p "${Ddir}/System"
+	cp "${dir}"/System/{ucc-bin,{Manifest,Def{ault,User}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} ${Ddir}/System
+	export UT_DATA_PATH="${Ddir}/System"
+	cd "${UT_DATA_PATH}"
+	./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null \
+		|| die "uncompressing file ${umod}"
+	rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \
+		|| die "Removing temporary files"
+}
diff --git a/eclass/gcc.eclass b/eclass/gcc.eclass
index c3c1c8aade4e..4d2387969d94 100644
--- a/eclass/gcc.eclass
+++ b/eclass/gcc.eclass
@@ -1,79 +1,8 @@
-# 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/eclass/gcc.eclass,v 1.1 2002/09/09 21:14:07 azarah Exp $
-# This eclass contains (or should) functions to get common info about gcc
-ECLASS=gcc
-INHERITED="$INHERITED $ECLASS"
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gcc.eclass,v 1.1.1.1 2005/11/30 09:59:14 chriswhite Exp $
 
-newdepend sys-devel/gcc
-
-DESCRIPTION="Based on the ${ECLASS} eclass"
-
-
-gcc-version() {
-
-	local CC="gcc"
-	
-	if [ "$(eval echo \$\(${CC} -dumpversion\) | cut -f1 -d.)" -ne 3 ]
-	then
-		# We use the dual/multiple install of gcc-3.x if the user
-		# have 2.95.3 as base
-		if [ -x /usr/bin/gcc-3.2 ]
-		then
-			CC="gcc-3.2"
-		elif [ -x /usr/bin/gcc-3.1 ]
-		then
-			CC="gcc-3.1"
-		elif [ -x /usr/bin/gcc-3.0 ]
-		then
-			CC="gcc-3.0"
-		fi
-	fi
-	
-	echo "$(${CC} -dumpversion | cut -f1,2 -d.)"
-}
-
-gcc-fullversion() {
-
-	local CC="gcc"
-
-	if [ "$(eval echo \$\(${CC} -dumpversion\) | cut -f1 -d.)" -ne 3 ]
-	then
-		# We use the dual/multiple install of gcc-3.x if the user
-		# have 2.95.3 as base
-		if [ -x /usr/bin/gcc-3.2 ]
-		then
-			CC="gcc-3.2"
-		elif [ -x /usr/bin/gcc-3.1 ]
-		then
-			CC="gcc-3.1"
-		elif [ -x /usr/bin/gcc-3.0 ]
-		then
-			CC="gcc-3.0"
-		fi
-	fi
-
-	echo "`${CC} -dumpversion`"
-}
-
-gcc-libpath() {
-
-	local CC="gcc"
-
-	if [ "$(eval echo \$\(${CC} -dumpversion\) | cut -f1 -d.)" -ne 3 ]
-	then
-		# We use the dual/multiple install of gcc-3.x if the user
-		# have 2.95.3 as base
-		if [ -x /usr/bin/gcc-3.1 ]
-		then
-			CC="gcc-3.1"
-		elif [ -x /usr/bin/gcc-3.0 ]
-		then 
-			CC="gcc-3.0"
-		fi
-	fi
-
-	echo "/usr/lib/gcc-lib/$(${CC} -dumpmachine)/$(gcc-fullversion)"
-}
 
+# STOP USING THIS ECLASS
+# PLEASE TRANSITION TO TOOLCHAIN-FUNCS.ECLASS
+ewarn "Please upgrade your package (${PF}) to use toolchain-funcs.eclass"
diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass
index b3b74c078940..20fddcf05248 100644
--- a/eclass/gdesklets.eclass
+++ b/eclass/gdesklets.eclass
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.1 2005/04/19 03:16:52 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 #
 # Authors:	Joe Sapp <nixphoeni@gentoo.org>
 #		Mike Gardiner <obz@gentoo.org>
@@ -16,9 +16,8 @@
 # 	RDEPEND: *Optional* Set if the desklet requires a minimum version
 #		of gDesklets greater than 0.34 or other packages.
 
-inherit eutils
-ECLASS="gdesklets"
-INHERITED="$INHERITED $ECLASS"
+inherit eutils multilib
+
 
 MY_P="${DESKLET_NAME}-${PV}"
 S=${WORKDIR}/${DESKLET_NAME}
@@ -28,26 +27,32 @@ SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
 # Ebuild writer shouldn't need to touch these (except maybe $RDEPEND)
 SLOT="0"
 IUSE=""
-RDEPEND="${RDEPEND} >=gnome-extra/gdesklets-core-0.34.3"
+RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
 
 GDESKLETS_INST_DIR="/usr/$(get_libdir)/gdesklets"
 
 gdesklets_src_install() {
-	
+
 	debug-print-function $FUNCNAME $*
-	
+
 	has_version ">=gnome-extra/gdesklets-core-0.33.1" || \
 				GDESKLETS_INST_DIR="/usr/share/gdesklets"
-	
+
 	# This should be done by the gdesklets-core ebuild
-	# It makes the Displays or Controls directory in the 
+	# It makes the Displays or Controls directory in the
 	# global installation directory if it doesn't exist
 	[[ -d ${GDESKLETS_INST_DIR}/Displays ]] || \
 		dodir ${GDESKLETS_INST_DIR}/Displays
-	
+
 	# The displays only need to be readable
 	insopts -m0744
-	
+
+	# Check to see if DISPLAY is set for the
+	# gdesklets-control-getid script to run without
+	# error
+	[ -z "${DISPLAY}" ] && DISPLAY=""
+	export DISPLAY
+
 	# First, install the Sensor (if there is one)
 	if [[ -n "${SENSOR_NAME}" ]]; then
 		for SENS in ${SENSOR_NAME[@]}; do
@@ -55,125 +60,127 @@ gdesklets_src_install() {
 			/usr/bin/python "Install_${SENS}_Sensor.bin" \
 					--nomsg ${D}${GDESKLETS_INST_DIR}/Sensors || \
 					die "Couldn't Install Sensor"
-			
-			chown -R root:root ${D}${GDESKLETS_INST_DIR}/Sensors/${SENSOR_NAME}
+
+			chown -R root:0 ${D}${GDESKLETS_INST_DIR}/Sensors/${SENSOR_NAME}
 		done # for in ${SENSOR_NAME}
 	fi # if -n "${SENSOR_NAME}"
-	
+
 	# This finds the Displays
 	DISPLAY_FILES=(`find . -iname "*.display"`)
-	
+
 	GD_INSDIR=""
-	
+
 	# There is more than likely only one display per package
 	if [[ -n "${DISPLAY_FILES[@]}" ]]; then
 		# Base installation directory for displays
 		GD_INSDIR="${GDESKLETS_INST_DIR}/Displays/${DESKLET_NAME}"
-		
-		# This creates the subdirectory of ${DESKLET_NAME} 
+
+		# This creates the subdirectory of ${DESKLET_NAME}
 		# in the global Displays directory
 		[[ -d ${GD_INSDIR} ]] || \
 			dodir ${GD_INSDIR}
-		
-		insinto ${GD_INSDIR}
-		
-		# For each of the Display files, there may be 
+
+		# For each of the Display files, there may be
 		# scripts included inline which don't necessarily
 		# follow any naming scheme.
 		# So for each of them, determine what those scripts are
 		# and install them.
 		for DSP in ${DISPLAY_FILES[@]}; do
-			
+
 			einfo "Installing Display `basename ${DSP} .display`"
 			insinto ${GD_INSDIR}
 			doins ${DSP}
-			
-			SCRIPTS=$(grep "script uri" ${DSP} | \
-				sed -e 's:.*<script uri=": :g' -e 's:"/>.*: :g')
-			
+
+			SCRIPTS=$(grep "script .*uri" ${DSP} | \
+				sed -e 's:.*<script .*uri=": :g' -e 's:"/>.*: :g')
+
 			# For each one of the scripts, change to its
 			# base directory and change the install location
 			# so it gets installed at the proper place
 			# relative to the display.
 			for SCR in ${SCRIPTS[@]}; do
-				
+
 				cd `dirname ${DSP}`/`dirname ${SCR}`
-				
+
 				insinto ${GD_INSDIR}/`dirname ${SCR}`
 				doins `basename ${SCR}`
-				
+
 				cd ${S}/`dirname ${DSP}`
-				
+
 			done # for in ${SCRIPTS}
-			
+
 			# Install the graphics for this display.
 			# If there are multiple displays in this
 			# directory, this will be done more than
-			# once.  It's the only solution I can 
+			# once.  It's the only solution I can
 			# come up with for now...
 			GFX=(`find . \
 					-iname "*.png" -o -iname "*.svg" \
-					-o -iname "*.jpg" -o -iname "*.gif"`)
-			
+					-o -iname "*.jpg" -o -iname "*.gif" \
+					-o -iname "*.xcf"`)
+
 			for G in ${GFX[@]}; do
+
 				insinto ${GD_INSDIR}/`dirname ${G}`
 				doins ${G}
-			done
-			
+
+			done # for in ${GFX}
+
 			cd ${S}
-			
+
 		done # for in ${DISPLAY_FILES}
-	
+
 	fi
-	
+
 	# Make sure that it only finds Controls and not Sensors
 	# If it uses a Sensor, it shouldn't use a Control (since
 	# Sensors are deprecated).
-	if [[ -z "${SENSOR_NAME}" ]]; then 
-		
+	if [[ -z "${SENSOR_NAME}" ]]; then
+
 		# Base installation directory for Controls
 		GD_INSDIR="${GDESKLETS_INST_DIR}/Controls"
-		
+
 		CONTROL_INITS=$(find . -iname "__init__.py" | grep [Cc]ontrols)
-		
+
 		# There are possibly multiple Controls packaged with the display.
 		# For each __init__.py found, there must be a Control associated with it.
 		for CTRL in ${CONTROL_INITS[@]}; do
-			
+
 			cd `dirname ${CTRL}`
-			CTRL_NAME=$( ${GDESKLETS_INST_DIR}/gdesklets-control-getid `pwd` )
+			CTRL_NAME=$( PYTHON_DONTCOMPILE=1 ${GDESKLETS_INST_DIR}/gdesklets-control-getid `pwd` )
 			einfo "Installing Control ${CTRL_NAME}"
-			# This creates the subdirectory of ${CTRL_NAME} 
-           	# in the global Controls directory
+			# This creates the subdirectory of ${CTRL_NAME}
+			# in the global Controls directory
 			[[ -d ${GD_INSDIR}/${CTRL_NAME} ]] || \
 				dodir ${GD_INSDIR}/${CTRL_NAME}
-			
+
 			insinto ${GD_INSDIR}/${CTRL_NAME}
-			
+
 			doins -r *
-			
+
 			cd ${S}
-			
+
 		done # for in ${CONTROL_INITS}
-	
+
 	fi # if no Sensors
-	
+
 	# Install any remaining graphics and other files
 	# that are sitting in ${S}.
-	
+
 	GFX=$(find . -maxdepth 1 \
 		-iname "*.png" -o -iname "*.svg" \
-		-o -iname "*.jpg" -o -iname "*.gif")
-	
+		-o -iname "*.jpg" -o -iname "*.gif" \
+		-o -iname "*.xcf")
+
 	if [[ -n "${GFX}" ]]; then
 		# Install to the Displays directory of the Desklet
 		insinto ${GDESKLETS_INST_DIR}/Displays/${DESKLET_NAME}
 		doins ${GFX}
 	fi # if -n "${GFX}"
-	
+
 	# Install some docs if so requested
 	[[ -n "${DOCS}" ]] && dodoc ${DOCS}
-	
+
 }
 
 
diff --git a/eclass/gems.eclass b/eclass/gems.eclass
index 60e5de9fc61e..bd53f24e4ff3 100644
--- a/eclass/gems.eclass
+++ b/eclass/gems.eclass
@@ -1,26 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gems.eclass,v 1.1 2005/02/16 05:26:17 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gems.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
 #
 # Author: Rob Cakebread <pythonhead@gentoo.org>
 # Current Maintainer: Rob Cakebread <pythonhead@gentoo.org>
 #
 # The gems eclass is designed to allow easier installation of
-# gems-based ruby packagess and their incorporation into 
+# gems-based ruby packagess and their incorporation into
 # the Gentoo Linux system.
 #
 # - Features:
-# gems_location()     - Set ${GEMSDIR} with /usr/lib/ruby/gems/RUBY_MAJ_VER
+# gems_location()     - Set ${GEMSDIR} with gem install dir and ${GEM_SRC} with path to gem to install
 # gems_src_install()  - installs a gem into ${D}
-# gems_src_test()     - unpacks gem and runs rake if there is an appropriate test dir
+# gems_src_unpack()   - Does nothing.
+# gems_src_compile()  - Does nothing.
+#
+# NOTE:
+# See http://dev.gentoo.org/~pythonhead/ruby/gems.html for notes on using gems with portage
 
 
 inherit ruby eutils
 
-ECLASS=gems
-INHERITED="$INHERITED $ECLASS"
 
-DEPEND=">=dev-ruby/rubygems-0.8.4-r1"
+DEPEND=">=dev-ruby/rubygems-0.8.4-r1
+	!dev-ruby/rdoc"
 
 S=${WORKDIR}
 
@@ -29,20 +32,26 @@ gems_location() {
 	local sitelibdir
 	sitelibdir=`ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]'`
 	export GEMSDIR=${sitelibdir/site_ruby/gems}
-}
 
+}
 
 gems_src_unpack() {
 	true
 }
 
-
 gems_src_install() {
 	gems_location
+
+	if [ -z "${MY_P}" ]; then
+		GEM_SRC=${DISTDIR}/${P}
+	else
+		GEM_SRC=${DISTDIR}/${MY_P}
+	fi
+
 	dodir ${GEMSDIR}
-	gem install ${DISTDIR}/${P} -v ${PV} -l -i ${D}/${GEMSDIR} || die "gem install failed"
-	
-	if [ -d ${D}/${GEMSDIR}/bin ] ; then 
+	gem install ${GEM_SRC} -v ${PV} -l -i ${D}/${GEMSDIR} || die "gem install failed"
+
+	if [ -d ${D}/${GEMSDIR}/bin ] ; then
 		exeinto /usr/bin
 		for exe in ${D}/${GEMSDIR}/bin/* ; do
 			doexe ${exe}
@@ -54,20 +63,4 @@ gems_src_compile() {
 	true
 }
 
-gems_src_test() {
-	if has_version 'dev-ruby/rake' ; then
-		cd ${WORKDIR}
-		tar xf ${DISTDIR}/${P}.gem >/dev/null 2>&1
-		tar xzf data.tar.gz >/dev/null 2>&1
-		if [ -d ${WORKDIR}/test ] ; then
-			cd ${WORKDIR}/test
-			rake
-		fi
-	else
-		einfo "You need dev-ruby/rake emerged to run this test"
-	fi
-}
-
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install src_test
-
+EXPORT_FUNCTIONS src_unpack src_compile src_install
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index e40bdfbec594..b070e7a32872 100644
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -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/eclass/ghc-package.eclass,v 1.1 2004/11/03 15:06:41 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.1.1.1 2005/11/30 09:59:38 chriswhite Exp $
 #
 # Author: Andres Loeh <kosmikus@gentoo.org>
 #
 # This eclass helps with the Glasgow Haskell Compiler's package
 # configuration utility.
 
-ECLASS="ghc-package"
-INHERITED="$INHERITED $ECLASS"
+inherit versionator
 
-PATH="${PATH}:/opt/ghc/bin"
+# promote /opt/ghc/bin to a better position in the search path
+PATH="/usr/bin:/opt/ghc/bin:${PATH}"
 
 # for later configuration using environment variables/
 # returns the name of the ghc executable
@@ -25,24 +25,84 @@ ghc-getghcpkg() {
 
 # returns the name of the ghc-pkg binary (ghc-pkg
 # itself usually is a shell script, and we have to
-# bypass the script under certain circumstances)
+# bypass the script under certain circumstances);
+# for Cabal, we add an empty global package config file,
+# because for some reason the global package file
+# must be specified
 ghc-getghcpkgbin() {
-	echo $(ghc-libdir)/"ghc-pkg.bin"
+	if ghc-cabal; then
+		echo '[]' > "${T}/empty.conf"
+		echo "$(ghc-libdir)/ghc-pkg.bin" "--global-conf=${T}/empty.conf"
+	else
+		echo "$(ghc-libdir)/ghc-pkg.bin"
+	fi
 }
 
 # returns the version of ghc
+_GHC_VERSION_CACHE=""
 ghc-version() {
-	$(ghc-getghc) --version | sed 's:^.*version ::'
+	if [[ -z "${_GHC_VERSION_CACHE}" ]]; then
+		_GHC_VERSION_CACHE="$($(ghc-getghc) --version | sed 's:^.*version ::')"
+	fi
+	echo "${_GHC_VERSION_CACHE}"
+}
+
+# this function can be used to determine if ghc itself
+# uses the Cabal package format; it has nothing to do
+# with the Cabal libraries ... ghc uses the Cabal package
+# format since version 6.4
+ghc-cabal() {
+	version_is_at_least "6.4" "$(ghc-version)"
+}
+
+# return the best version of the Cabal library that is available
+ghc-bestcabalversion() {
+	local cabalpackage
+	local cabalversion
+	if ghc-cabal; then
+		# Try if ghc-pkg can determine the latest version.
+		# If not, use portage.
+		cabalpackage="$($(ghc-getghcpkg) latest Cabal 2> /dev/null)"
+		if [[ $? -eq 0 ]]; then
+			cabalversion="${cabalpackage#Cabal-}"
+		else
+			cabalpackage="$(best_version cabal)"
+			cabalversion="${cabalpackage#dev-haskell/cabal-}"
+			cabalversion="${cabalversion%-r*}"
+			cabalversion="${cabalversion%_pre*}"
+		fi
+		echo "Cabal-${cabalversion}"
+	else
+		# older ghc's don't support package versioning
+		echo Cabal
+	fi
+}
+
+# check if a standalone Cabal version is available for the
+# currently used ghc; takes minimal version of Cabal as
+# an optional argument
+ghc-sanecabal() {
+	local f
+	local version
+	if [[ -z "$1" ]]; then version="1.0.1"; else version="$1"; fi
+	for f in $(ghc-confdir)/cabal-*; do
+		[[ -f "${f}" ]] && version_is_at_least "${version}" "${f#*cabal-}" && return
+	done
+	return 1
 }
 
 # returns the library directory
+_GHC_LIBDIR_CACHE=""
 ghc-libdir() {
-	$(ghc-getghc) --print-libdir
+	if [[ -z "${_GHC_LIBDIR_CACHE}" ]]; then
+		_GHC_LIBDIR_CACHE="$($(ghc-getghc) --print-libdir)"
+	fi
+	echo "${_GHC_LIBDIR_CACHE}"
 }
 
 # returns the (Gentoo) library configuration directory
 ghc-confdir() {
-	echo $(ghc-libdir)/gentoo
+	echo "$(ghc-libdir)/gentoo"
 }
 
 # returns the name of the local (package-specific)
@@ -51,85 +111,161 @@ ghc-localpkgconf() {
 	echo "${PF}.conf"
 }
 
-# creates an empty local (package-specific) package
-# configuration file
+# make a ghci foo.o file from a libfoo.a file
+ghc-makeghcilib() {
+	local outfile
+	outfile="$(dirname $1)/$(basename $1 | sed 's:^lib\?\(.*\)\.a$:\1.o:')"
+	ld --relocatable --discard-all --output="${outfile}" --whole-archive "$1"
+}
+
+# tests if a ghc package exists
+ghc-package-exists() {
+	$(ghc-getghcpkg) -s "$1" > /dev/null 2>&1
+}
+
+# creates a local (package-specific) package
+# configuration file; the arguments should be
+# uninstalled package description files, each
+# containing a single package description; if
+# no arguments are given, the resulting file is
+# empty
 ghc-setup-pkg() {
-	echo '[]' > ${S}/$(ghc-localpkgconf)
+	local localpkgconf
+	localpkgconf="${S}/$(ghc-localpkgconf)"
+	echo '[]' > "${localpkgconf}"
+	for pkg in $*; do
+		$(ghc-getghcpkgbin) -f "${localpkgconf}" -u --force \
+			< "${pkg}" || die "failed to register ${pkg}"
+	done
+}
+
+# fixes the library and import directories path
+# of the package configuration file
+ghc-fixlibpath() {
+	sed -i "s|$1|$(ghc-libdir)|g" "${S}/$(ghc-localpkgconf)"
+	if [[ -n "$2" ]]; then
+		sed -i "s|$2|$(ghc-libdir)/imports|g" "${S}/$(ghc-localpkgconf)"
+	fi
 }
 
 # moves the local (package-specific) package configuration
 # file to its final destination
 ghc-install-pkg() {
-	mkdir -p ${D}/$(ghc-confdir)
-	cat ${S}/$(ghc-localpkgconf) | sed "s:${D}::" \
-		> ${D}/$(ghc-confdir)/$(ghc-localpkgconf)
+	mkdir -p "${D}/$(ghc-confdir)"
+	cat "${S}/$(ghc-localpkgconf)" | sed "s|${D}||g" \
+		> "${D}/$(ghc-confdir)/$(ghc-localpkgconf)"
 }
 
 # registers all packages in the local (package-specific)
 # package configuration file
 ghc-register-pkg() {
 	local localpkgconf
-	localpkgconf=$(ghc-confdir)/$1
-	for pkg in $(ghc-listpkg ${localpkgconf}); do
-		einfo "Registering ${pkg} ..."
-		$(ghc-getghcpkgbin) -f ${localpkgconf} -s ${pkg} \
-			| $(ghc-getghcpkg) -u --auto-ghci-libs --force
-	done
+	localpkgconf="$(ghc-confdir)/$1"
+	if [[ -f "${localpkgconf}" ]]; then
+		for pkg in $(ghc-listpkg "${localpkgconf}"); do
+			ebegin "Registering ${pkg} "
+			$(ghc-getghcpkgbin) -f "${localpkgconf}" -s "${pkg}" \
+				| $(ghc-getghcpkg) -u --force > /dev/null
+			eend $?
+		done
+	fi
 }
 
 # re-adds all available .conf files to the global
 # package conf file, to be used on a ghc reinstallation
 ghc-reregister() {
-	einfo "Re-adding packages ..."
-	ewarn "This may cause several warnings, but they should be harmless."
-	pushd $(ghc-confdir)
-	for conf in *.conf; do
-		einfo "Processing ${conf} ..."
-		ghc-register-pkg ${conf}
-	done
-	popd
+	einfo "Re-adding packages (may cause several harmless warnings) ..."
+	if [ -d "$(ghc-confdir)" ]; then
+		pushd "$(ghc-confdir)" > /dev/null
+		for conf in *.conf; do
+#			einfo "Processing ${conf} ..."
+			ghc-register-pkg "${conf}"
+		done
+		popd > /dev/null
+	fi
 }
 
-# unregisters ...
+# unregisters a package configuration file
+# protected are all packages that are still contained in
+# another package configuration file
 ghc-unregister-pkg() {
 	local localpkgconf
-	localpkgconf=$(ghc-confdir)/$1
-	for pkg in $(ghc-reverse "$(ghc-listpkg ${localpkgconf})"); do
-		einfo "Unregistering ${pkg} ..."
-		$(ghc-getghcpkg) -r ${pkg} --force
+	local i
+	local pkg
+	local protected
+	localpkgconf="$(ghc-confdir)/$1"
+
+	for i in $(ghc-confdir)/*.conf; do
+		[[ "${i}" != "${localpkgconf}" ]] && protected="${protected} $(ghc-listpkg ${i})"
 	done
+	# protected now contains the packages that cannot be unregistered yet
+
+	if [[ -f "${localpkgconf}" ]]; then
+		for pkg in $(ghc-reverse "$(ghc-listpkg ${localpkgconf})"); do
+			if $(ghc-elem "${pkg}" "${protected}"); then
+				einfo "Package ${pkg} is protected."
+			elif ! ghc-package-exists "${pkg}"; then
+				:
+				# einfo "Package ${pkg} is not installed for ghc-$(ghc-version)."
+			else
+				ebegin "Unregistering ${pkg} "
+				$(ghc-getghcpkg) -r "${pkg}" --force > /dev/null
+				eend $?
+			fi
+		done
+	fi
 }
 
 # help-function: reverse a list
 ghc-reverse() {
 	local result
+	local i
 	for i in $1; do
 		result="${i} ${result}"
 	done
-	echo ${result}
+	echo "${result}"
+}
+
+# help-function: element-check
+ghc-elem() {
+	local i
+	for i in $2; do
+		[[ "$1" == "${i}" ]] && return 0
+	done
+	return 1
 }
 
 # show the packages in a package configuration file
 ghc-listpkg() {
-	[ -f $1 ] && echo $($(ghc-getghcpkgbin) -l -f $1) \
-			| cut -f2 -d':' \
-			| sed 's:,: :g'
+	local ghcpkgcall
+	local i
+	for i in $*; do
+		if ghc-cabal; then
+			echo $($(ghc-getghcpkg) list -f "${i}") \
+				| sed \
+					-e "s|^.*${i}:\([^:]*\).*$|\1|" \
+					-e "s|/.*$||" \
+					-e "s|,| |g" -e "s|[()]||g"
+		else
+			echo $($(ghc-getghcpkgbin) -l -f "${i}") \
+				| cut -f2 -d':' \
+				| sed 's:,: :g'
+		fi
+	done
 }
 
 # exported function: registers the package-specific package
 # configuration file
 ghc-package_pkg_postinst() {
-	ghc-register-pkg $(ghc-localpkgconf)
+	ghc-register-pkg "$(ghc-localpkgconf)"
 }
 
-# exported function: unregisters the package-specific
-# package configuration file, under the condition that
-# after removal, no other instances of the package will
-# be left (necessary check because ghc packages are not
-# versioned)
+# exported function: unregisters the package-specific package
+# configuration file; a package contained therein is unregistered
+# only if it the same package is not also contained in another
+# package configuration file ...
 ghc-package_pkg_prerm() {
-	has_version "<${CATEGORY}/${PF}" || has_version ">${CATEGORY}/${PF}" \
-		|| ghc-unregister-pkg $(ghc-localpkgconf)
+	ghc-unregister-pkg "$(ghc-localpkgconf)"
 }
 
 EXPORT_FUNCTIONS pkg_postinst pkg_prerm
diff --git a/eclass/gnat.eclass b/eclass/gnat.eclass
index ef0bf94617a6..e829df478269 100644
--- a/eclass/gnat.eclass
+++ b/eclass/gnat.eclass
@@ -1,44 +1,51 @@
-# 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/eclass/gnat.eclass,v 1.1 2003/07/13 17:39:20 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 #
-# Author: David Holm <dholm@telia.com>
+# Author: David Holm <dholm@gentoo.org>
 #
 # This eclass contains some common settings for gnat based ada stuff
 # It also strips some flags to bring C[XX]FLAGS in cpmpliance with gcc-2.8.1
 
-ECLASS=gnat
 
 inherit flag-o-matic
 
-INHERITED="$INHERITED $ECLASS"
+EXPORT_FUNCTIONS pkg_setup
 
-newdepend dev-lang/gnat
+DEPEND="dev-lang/gnat"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
-#
-# Settings for gnat-3.15p:
-#
-
-ADAC=${ADAC:-gnatgcc}
-ADAMAKE=${ADAMAKE:-gnatmake}
-ADABIND=${ADABIND:-gnatbind}
-
-filter-flags "-mmmx -msse -mfpmath=sse -frename-registers \
-	-fprefetch-loop-arrays -falign-functions=4"
-
-ADACFLAGS=${ADACFLAGS:-${CFLAGS}}
-ADACFLAGS=${ADACFLAGS//pentium-mmx/i586}
-ADACFLAGS=${ADACFLAGS//pentium[234]/i686}
-ADACFLAGS=${ADACFLAGS//k6-[23]/k6}
-ADACFLAGS=${ADACFLAGS//athlon-tbird/i686}
-ADACFLAGS=${ADACFLAGS//athlon-4/i686}
-ADACFLAGS=${ADACFLAGS//athlon-[xm]p/i686}
-ADACFLAGS=${ADACFLAGS//athlon/i686}
-ADACFLAGS=${ADACFLAGS//-Os/-O2}
-
-ADAMAKEFLAGS=${ADAMAKEFLAGS:-"-cargs ${ADACFLAGS} -margs"}
-ADABINDFLAGS=${ADABINDFLAGS:-""}
-
-export ADAC ADACFLAGS ADAMAKE ADAMAKEFLAGS ADABIND ADABINDFLAGS
+gnat_filter_flags() {
+	# We should probably check which GNAT is installed and
+	# filter flags accordingly. This version is overly protective.
+
+	filter-mfpmath sse 387
+
+	filter-flags -mmmx -msse -mfpmath -frename-registers \
+		-fprefetch-loop-arrays -falign-functions=4 -falign-jumps=4 \
+		-falign-loops=4 -msse2 -frerun-loop-opt -maltivec -mabi=altivec \
+		-fsigned-char -fno-strict-aliasing -pipe
+}
+
+gnat_pkg_setup() {
+	export ADAC=${ADAC:-gnatgcc}
+	export ADAMAKE=${ADAMAKE:-gnatmake}
+	export ADABIND=${ADABIND:-gnatbind}
+
+	gnat_filter_flags
+
+	export ADACFLAGS=${ADACFLAGS:-${CFLAGS}}
+	export ADACFLAGS=${ADACFLAGS//pentium-mmx/i586}
+	export ADACFLAGS=${ADACFLAGS//pentium[234]/i686}
+	export ADACFLAGS=${ADACFLAGS//k6-[23]/k6}
+	export ADACFLAGS=${ADACFLAGS//athlon-tbird/i686}
+	export ADACFLAGS=${ADACFLAGS//athlon-4/i686}
+	export ADACFLAGS=${ADACFLAGS//athlon-[xm]p/i686}
+	export ADACFLAGS=${ADACFLAGS//athlon64/i686}
+	export ADACFLAGS=${ADACFLAGS//athlon/i686}
+	export ADACFLAGS=${ADACFLAGS//-Os/-O2}
+
+	export ADAMAKEFLAGS=${ADAMAKEFLAGS:-"-cargs ${ADACFLAGS} -margs"}
+	export ADABINDFLAGS=${ADABINDFLAGS:-""}
+}
diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index 4d35b855d13f..2ff4937ec917 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -1,16 +1,14 @@
-# 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/eclass/gnome.org.eclass,v 1.1 2002/09/23 16:08:41 spider Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome.org.eclass,v 1.1.1.1 2005/11/30 09:59:34 chriswhite Exp $
+#
 # Authors:
 # Spidler <spidler@gentoo.org>
 # with help of carparski.
-
+#
 # Gnome ECLASS. mainly SRC_URI settings
 
-ECLASS="gnome"
-INHERITED="$INHERITED $ECLASS"
-
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2"
 
+[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
+PVP=(${PV//[-\._]/ })
+SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.${GNOME_TARBALL_SUFFIX}"
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index cd0ae4278566..1bd5b262a87b 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,53 +1,208 @@
-# 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/eclass/gnome2.eclass,v 1.1 2002/06/01 02:55:47 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.1.1.1 2005/11/30 09:59:12 chriswhite Exp $
+#
+# Authors:
+# Bruce A. Locke <blocke@shivan.org>
+# Spidler <spider@gentoo.org>
+
+inherit libtool gnome.org debug fdo-mime
 
 # Gnome 2 ECLASS
-ECLASS="gnome2"
 
-# DEBUG for Beta
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
+# extra configure opts passed to econf
+[ -z "$G2CONF" ] && G2CONF=""
 
+# extra options passed to elibtoolize
+[ -z "$ELTCONF" ] && ELTCONF=""
 
-gnome2_src_compile() {
+# whether to run scrollkeeper for this package
+[ -z "$SCROLLKEEPER_UPDATE" ] && SCROLLKEEPER_UPDATE="1"
+
+# use make DESTDIR=${D} install rather than einstall
+[ -z "$USE_DESTDIR" ] && USE_DESTDIR=""
+
+
+IUSE="debug"
+
+
+DEPEND=">=sys-apps/sed-4"
+
+gnome2_src_configure() {
 
-	libtoolize --copy --force
+	# [ -n "${ELTCONF}" ] && elibtoolize ${ELTCONF}
+	elibtoolize ${ELTCONF}
 
-	econf "${1} --enable-debug=yes" || die "./configure failure"
+	use debug && G2CONF="${G2CONF} --enable-debug=yes"
+
+	# doc keyword for gtk-doc
+	G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+
+	econf "$@" ${G2CONF} || die "./configure failure"
+
+}
+
+gnome2_src_compile() {
+
+	gnome2_src_configure "$@"
 	emake || die "compile failure"
 
 }
 
 gnome2_src_install() {
 
-	einstall ${1}
+	# if this is not present, scrollkeeper-update may segfault and
+	# create bogus directories in /var/lib/
+	dodir /var/lib/scrollkeeper
+
+	# we must delay gconf schema installation due to sandbox
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+
+	if [ -z "${USE_DESTDIR}" -o "${USE_DESTDIR}" = "0" ]; then
+		einstall "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "$@" || die "einstall failed"
+	else
+		make DESTDIR=${D} \
+		   	"$@" install || die "make DESTDIR install failed"
+	fi
+
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 	# manual document installation
-	if [ -n "${DOC}" && use doc ]
+	[ -n "${DOCS}" ] && dodoc ${DOCS}
+
+	# do not keep /var/lib/scrollkeeper because:
+	# 1. scrollkeeper will get regenerated at pkg_postinst()
+	# 2. ${D}/var/lib/scrollkeeper contains only indexes for the current pkg
+	#    thus it makes no sense if pkg_postinst ISN'T run for some reason.
+
+	if [ -z "`find ${D} -name '*.omf'`" ]; then
+		export SCROLLKEEPER_UPDATE="0"
+	fi
+
+	# regenerate these in pkg_postinst()
+	rm -rf ${D}/var/lib/scrollkeeper
+	# make sure this one doesn't get in the portage db
+	rm -fr ${D}/usr/share/applications/mimeinfo.cache
+
+}
+
+
+gnome2_gconf_install() {
+
+	if [ -x ${ROOT}/usr/bin/gconftool-2 ]
 	then
-		for x in $DOC; do dodoc $x; done
+		unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+		export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
+		einfo "Installing GNOME 2 GConf schemas"
+		grep "obj /etc/gconf/schemas" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS | sed 's:obj \([^ ]*\) .*:\1:' | while read F; do
+			if [ -e "${F}" ]; then
+				# echo "DEBUG::gconf install  ${F}"
+				${ROOT}/usr/bin/gconftool-2  --makefile-install-rule ${F} 1>/dev/null
+			fi
+		done
 	fi
 
 }
 
-gnome2_pkg_postinst() {
+gnome2_gconf_uninstall() {
 
-	# manual schema installation
-	if [ -n "${SCHEMA}" ]
+	if [ -x ${ROOT}/usr/bin/gconftool-2 ]
 	then
-		for x in $SCHEMA
-		do
-			/usr/bin/gconftool-2  --makefile-install-rule \
-				/etc/gconf/schemas/${SCHEMA}
+		unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+		export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
+		einfo "Uninstalling GNOME 2 GConf schemas"
+		cat ${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS | grep "obj /etc/gconf/schemas" | sed 's:obj \([^ ]*\) .*:\1:' |while read F; do
+			# echo "DEBUG::gconf install  ${F}"
+			${ROOT}/usr/bin/gconftool-2  --makefile-uninstall-rule ${F} 1>/dev/null
 		done
 	fi
+
+}
+
+gnome2_icon_cache_update() {
+	local updater=`which gtk-update-icon-cache`
+	if ! grep -q "obj /usr/share/icons" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS \
+	|| [ ! -x "$updater" ]; then
+		# Nothing to update
+		return
+	fi
+
+	ebegin "Updating icons cache"
+
+	local retval=0
+	for dir in \
+	$(find ${ROOT}/usr/share/icons -maxdepth 1 -mindepth 1 -type d); do
+		if [ -f "${dir}/index.theme" ]; then
+			$updater -qf $dir || retval=$?
+		fi
+	done
+
+	eend $retval
 }
 
+gnome2_omf_fix() {
+
+	# workaround/patch against omf.make or omf-install/Makefile.in
+	# in order to remove redundant scrollkeeper-updates.
+	# - <liquidx@gentoo.org>
+
+	local omf_makefiles
 
+	omf_makefiles="$@"
 
+	[ -f ${S}/omf-install/Makefile.in ] \
+		&& omf_makefiles="${omf_makefiles} ${S}/omf-install/Makefile.in"
+
+	# FIXME: does this really work? because omf.make only gets included
+	#        when autoconf/automake is run. You should directly patch
+	#        the Makefile.in's
+
+	[ -f ${S}/omf.make ] \
+		&& omf_makefiles="${omf_makefiles} ${S}/omf.make"
+
+	ebegin "Fixing OMF Makefiles"
+	local retval=0
+	for omf in ${omf_makefiles}; do
+		sed -i -e 's:scrollkeeper-update:true:' ${omf} || retval=$?
+	done
+	eend $retval
+
+}
+
+gnome2_scrollkeeper_update() {
+
+	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ] && [ "${SCROLLKEEPER_UPDATE}" = "1" ]
+	then
+		einfo "Updating scrollkeeper database ..."
+		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
+	fi
+
+}
+
+gnome2_pkg_postinst() {
+
+	gnome2_gconf_install
+	gnome2_scrollkeeper_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+}
+
+#gnome2_pkg_prerm() {
+
+#	gnome2_gconf_uninstall
+
+#}
+
+gnome2_pkg_postrm() {
+
+	gnome2_scrollkeeper_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+}
 
+#EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_prerm  pkg_postrm
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index 4809e245993d..e24e92df1a03 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -1,39 +1,95 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
+#
 # Author: Will Woods <wwoods@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.1 2002/10/25 17:16:07 wwoods Exp $
-# This eclass updates config.guess and config.sub. This is useful if 
-# configure dies from misguessing your canonical system name (CHOST).
+#
+# This eclass is used to automatically update files that typically come with
+# automake to the newest version available on the system. The most common use
+# of this is to update config.guess and config.sub when configure dies from
+# misguessing your canonical system name (CHOST). It can also be used to update
+# other files that come with automake, e.g. depcomp, mkinstalldirs, etc.
+#
+# usage: gnuconfig_update [file1 file2 ...]
+# if called without arguments, config.guess and config.sub will be updated.
+# All files in the source tree ($S) with the given name(s) will be replaced
+# with the newest available versions chosen from the list of locations in
+# gnuconfig_findnewest(), below.
+#
+# gnuconfig_update should generally be called from src_unpack()
 
-ECLASS=gnuconfig
-INHERITED="$INHERITED $ECLASS"
 
-newdepend sys-devel/automake
+DEPEND="sys-devel/gnuconfig"
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
-# Copy the newest available config.{guess|sub} on the system over any old 
-# ones in the source dir
+# Wrapper function for gnuconfig_do_update. If no arguments are given, update
+# config.sub and config.guess (old default behavior), otherwise update the
+# named files.
 gnuconfig_update() {
-	local configsubs_dir="$(gnuconfig_findnewest)"
-	local sub
-	local f
+	local startdir	# declared here ... used in gnuconfig_do_update
+
+	if [[ $1 == /* ]] ; then
+		startdir=$1
+		shift
+	else
+		startdir=${S}
+	fi
+
+	if [[ $# -gt 0 ]] ; then
+		gnuconfig_do_update "$@"
+	else
+		gnuconfig_do_update config.sub config.guess
+	fi
+
+	return $?
+}
+
+# Copy the newest available version of specified files over any old ones in the
+# source dir. This function shouldn't be called directly - use gnuconfig_update
+#
+# Note that since bash using dynamic scoping, startdir is available here from
+# the gnuconfig_update function
+gnuconfig_do_update() {
+	local configsubs_dir target targetlist file
+
+	[[ $# -eq 0 ]] && die "do not call gnuconfig_do_update; use gnuconfig_update"
+
+	configsubs_dir=$(gnuconfig_findnewest)
 	einfo "Using GNU config files from ${configsubs_dir}"
-	for sub in config.sub config.guess ; do 
-		for f in `find ${S} -name "${sub}"`; do
-			einfo "Updating ${f/$S\//}"
-			cp -f ${configsubs_dir}/${sub} ${f}
-		done
+	for file in "$@" ; do
+		if [[ ! -r ${configsubs_dir}/${file} ]] ; then
+			eerror "Can't read ${configsubs_dir}/${file}, skipping.."
+			continue
+		fi
+		targetlist=$(find "${startdir}" -name "${file}")
+		if [[ -n ${targetlist} ]] ; then
+			for target in ${targetlist} ; do
+				[[ -L ${target} ]] && rm -f "${target}"
+				einfo "  Updating ${target/$startdir\//}"
+				cp -f "${configsubs_dir}/${file}" "${target}"
+				eend $?
+			done
+		else
+			ewarn "  No ${file} found in ${startdir}, skipping ..."
+		fi
 	done
+
+	return 0
 }
 
 # this searches the standard locations for the newest config.{sub|guess}, and
 # returns the directory where they can be found.
 gnuconfig_findnewest() {
-	local locations="/usr/share/automake-1.6/config.sub \
-                         /usr/share/automake-1.5/config.sub \
-                         /usr/share/automake-1.4/config.sub \
-                         /usr/share/libtool/config.sub"
-	grep -s '^timestamp' ${locations} | sort -n -t\' -k2 | tail -1 | sed 's,/config.sub:.*$,,'
+	local locations="
+		/usr/share/gnuconfig/config.sub
+		/usr/share/automake-1.9/config.sub
+		/usr/share/automake-1.8/config.sub
+		/usr/share/automake-1.7/config.sub
+		/usr/share/automake-1.6/config.sub
+		/usr/share/automake-1.5/config.sub
+		/usr/share/automake-1.4/config.sub
+		/usr/share/libtool/config.sub
+	"
+	grep -s '^timestamp' ${locations} | sort -n -t\' -k2 | tail -n 1 | sed 's,/config.sub:.*$,,'
 }
diff --git a/eclass/gnustep-funcs.eclass b/eclass/gnustep-funcs.eclass
index dee661546308..ea731b38728b 100644
--- a/eclass/gnustep-funcs.eclass
+++ b/eclass/gnustep-funcs.eclass
@@ -1,9 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-funcs.eclass,v 1.1 2004/11/12 03:46:33 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-funcs.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 
-ECLASS=gnustep-funcs
-INHERITED="$INHERITED $ECLASS"
+inherit toolchain-funcs eutils
+
+###########################################################################
+# IUSE="debug profile verbose"
+# - These USE variables are utilized here, but set in gnustep.eclass IUSE.
+# - Packages that inherit this gnustep-funcs.eclass file to gain information
+#    and access as to how GNUstep is deployed on the system can safely do so.
+# - Packages built on the GNUstep libraries should inherit gnustep.eclass
+#    directly (it inherits from this eclass as well)
+###########################################################################
 
 DESCRIPTION="EClass that centralizes access to GNUstep environment information."
 
@@ -65,7 +73,7 @@ egnustep_env() {
 	GNUSTEP_SYSTEM_ROOT="$(egnustep_prefix)/System"
 	if [ -f ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh ] ; then
 		. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep-reset.sh
-		if [ -f /etc/conf.d/gnustep.env ]; then 
+		if [ -f /etc/conf.d/gnustep.env ]; then
 			. /etc/conf.d/gnustep.env
 		else
 			GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
@@ -77,7 +85,7 @@ egnustep_env() {
 		__GS_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}
 		__GS_USER_ROOT=${GNUSTEP_USER_ROOT}
 		__GS_USER_ROOT_SUFFIX=$(dirname ${GNUSTEP_USER_ROOT#*$USER}/prune)/
-		
+
 		# "gs_prefix" is the prefix that GNUstep is installed into, e.g.
 		#  gs_prefix=/usr/GNUstep => GNUSTEP_SYSTEM_ROOT=${gs_prefix}/System
 		local gs_prefix=`egnustep_prefix`
@@ -158,6 +166,9 @@ egnustep_make() {
 		if use profile; then
 			gs_make_opts="${gs_make_opts} profile=yes"
 		fi
+		if use verbose; then
+			gs_make_opts="${gs_make_opts} messages=yes"
+		fi
 		eval emake ${__GS_MAKE_EVAL} ${gs_make_opts} all || die "package make failed"
 	else
 		die "no Makefile found"
@@ -179,7 +190,7 @@ egnustep_package_config_info() {
 	if [ -f ${FILESDIR}/config-${PN}.sh ]; then
 		einfo "Make sure to set happy defaults for this package by executing:"
 		einfo "  `egnustep_install_domain`/Tools/Gentoo/config-${PN}.sh"
-		einfo "as the user you will run the package as." 
+		einfo "as the user you will run the package as."
 	fi
 }
 
@@ -193,6 +204,9 @@ egnustep_install() {
 		if use profile; then
 			gs_make_opts="${gs_make_opts} profile=yes"
 		fi
+		if use verbose; then
+			gs_make_opts="${gs_make_opts} messages=yes"
+		fi
 		eval emake ${__GS_MAKE_EVAL} ${gs_make_opts} install || die "package install failed"
 	else
 		die "no Makefile found"
@@ -204,6 +218,7 @@ egnustep_install() {
 # Note: docs installed with this from a GNUMakefile,
 #  not just some files in a Documentation directory
 egnustep_doc() {
+	cd ${S}/Documentation
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
 		local gs_make_opts="${1}"
 		if use debug ; then
@@ -212,12 +227,110 @@ egnustep_doc() {
 		if use profile; then
 			gs_make_opts="${gs_make_opts} profile=yes"
 		fi
+		if use verbose; then
+			gs_make_opts="${gs_make_opts} messages=yes"
+		fi
 		eval emake ${__GS_MAKE_EVAL} ${gs_make_opts} all || die "doc make failed"
 		eval emake ${__GS_MAKE_EVAL} ${gs_make_opts} install || die "doc install failed"
-	else
-		die "no Makefile found"
+#XXX: I have no idea why this is called by ebuilds that don't have 'doc' in the
+#  USE flags, but user has 'doc' in global USE in make.conf
+#	else
+#		die "no Makefile found"
 	fi
+	cd ..
 	return 0
 }
+
 ###########################################################################
+# Tests
+# -----
+
+objc_available() {
+	export OBJC_TEST="${TMP}/objc_test.m"
+	cat > "${OBJC_TEST}" << EOF
+/**
+ * This example taken from the tutorial at:
+ * http://gnustep.made-it.com/GSPT/xml/Tutorial_en.html
+ <quote>
+ A GNUstep Programming Tutorial
+ Time is on our side...
+ Yen-Ju Chen
+ Dennis Leeuw
+
+ Copyright © 2003 Yen-Ju Chen, Dennis Leeuw
+
+ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ </quote>
+ */
+#include <objc/Object.h>
+@interface Greeter:Object
+{
+	/* This is left empty on purpose:
+	 * Normally instance variables would be declared here,
+	 * but these are not used in our example.
+	 */
+}
+- (void)greet;
+@end
+
+#include <stdio.h>
+@implementation Greeter
+- (void)greet
+{
+	printf("Hello, World!\n");
+}
+@end
 
+#include <stdlib.h>
+int main(void)
+{
+	id myGreeter;
+	myGreeter=[Greeter new];
+	[myGreeter greet];
+	[myGreeter free];
+	return EXIT_SUCCESS;
+}
+EOF
+
+	local available
+	available="yes"
+	eval $(tc-getCC) ${OBJC_TEST} -o ${OBJC_TEST}-out -lobjc || available="no"
+
+	echo ${available}
+}
+
+objc_not_available_info() {
+	einfo "gcc must be compiled with Objective-C support! See the objc USE flag."
+	einfo "NOTE: if you have to recompile gcc anyway, now may be the time to also add the 'gcj' use flag, so that libffi will also be compiled.  Any gcc-3 version with 'gcj' should work, however, if you are testing >=gcc-3.4.3-r1 'objc' USE flag on should also install libffi."
+}
+
+ffi_available() {
+	export FFI_TEST="${TMP}/ffi_test.m"
+	cat > "${FFI_TEST}" << EOF
+#include <ffi.h>
+
+int main(int argc, char *argv[])
+{
+	int n = argc;
+
+	return 0;
+}
+EOF
+
+	local available
+	available="yes"
+	# XXX
+	# Support dev-libs/libffi until it is deprecate
+	# (not that these -I and -L really matter
+	eval $(tc-getCC) ${FFI_TEST} -o ${FFI_TEST}-out -lffi || available="no"
+
+	echo ${available}
+}
+
+ffi_not_available_info() {
+	einfo "Your FFI libraries and headers seem to be installed incorrectly."
+	einfo "This is not as bad as it sounds -- not many projects use libffi at the moment, and gcc may have installed the headers in an inavailable place.  Especially check for 'ffi.h' in your /usr/lib/gcc/\"\$CHOST\"/\"gcc-version\"/include directory, and that any other ffi related files it #include's (e.g. 'ffitarget.h') are in that directory as well; this can be solved by moving the files, or with a symlink.  This is a quick fix, and newer ebuilds of gcc should install the files in the correct places, but for now, it could save you a recompilation of gcc."
+	einfo "If this still fails for you, consider not using the 'gcc-libffi' USE flag and letting dev-libs/libffi build as a dependency.  It is important that either 'gcj' is a USE flag for gcc, or 'gcj' or 'objc' for >=gcc-3.4.3-r1."
+}
+
+###########################################################################
diff --git a/eclass/gnustep-old.eclass b/eclass/gnustep-old.eclass
index b9982b7ed705..b003574e5ceb 100644
--- a/eclass/gnustep-old.eclass
+++ b/eclass/gnustep-old.eclass
@@ -1,14 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-old.eclass,v 1.1 2004/07/22 20:39:44 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-old.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 
-ECLASS=gnustep
-INHERITED="$INHERITED $ECLASS"
 
 DESCRIPTION="Based on the gnustep eclass."
 
-DEPEND="dev-util/gnustep-make
-	dev-util/gnustep-base
+DEPEND="gnustep-base/gnustep-make
+	gnustep-base/gnustep-base
 	sys-devel/gcc
 	virtual/libc"
 RDEPEND="virtual/libc"
@@ -27,11 +25,11 @@ getsourcedir() {
 
 need-gnustep-gui() {
 	if [ "$1" ] ; then
-		DEPEND="${DEPEND} >=dev-util/gnustep-gui-$1"
-		RDEPEND="${RDEPEND} >=dev-util/gnustep-back-$1"
+		DEPEND="${DEPEND} >=gnustep-base/gnustep-gui-$1"
+		RDEPEND="${RDEPEND} >=gnustep-base/gnustep-back-$1"
 	else
-		DEPEND="${DEPEND} dev-util/gnustep-gui"
-		RDEPEND="${RDEPEND} dev-util/gnustep-back"
+		DEPEND="${DEPEND} gnustep-base/gnustep-gui"
+		RDEPEND="${RDEPEND} gnustep-base/gnustep-back"
 	fi
 }
 
@@ -39,13 +37,10 @@ egnustepmake() {
 	getsourcedir
 
 	addwrite /root/GNUstep/Defaults/.GNUstepDefaults.lck
-	addpredict /root/GNUstep	
+	addpredict /root/GNUstep
 
 	cd ${S}
 
-	unset CFLAGS
-	unset CC
-
 	if [ -f /usr/GNUstep/System/Makefiles/GNUstep.sh ] ; then
 		. /usr/GNUstep/System/Makefiles/GNUstep.sh
 	else
@@ -78,7 +73,7 @@ egnustepmake() {
 			fi
 		fi
 	fi
-	
+
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
 		make \
 			HOME=$TMP/fakehome \
@@ -94,15 +89,15 @@ egnustepinstall() {
 	getsourcedir
 
 	addwrite /root/GNUstep/Defaults/.GNUstepDefaults.lck
-	addpredict /root/GNUstep	
+	addpredict /root/GNUstep
 
 	cd ${S}
-	
+
 	if [ -f /usr/GNUstep/System/Makefiles/GNUstep.sh ] ; then
-                source /usr/GNUstep/System/Makefiles/GNUstep.sh
-        else
-                die "gnustep-make not installed!"
-        fi
+		source /usr/GNUstep/System/Makefiles/GNUstep.sh
+	else
+		die "gnustep-make not installed!"
+	fi
 
 	mkdir -p $TMP/fakehome/GNUstep
 
@@ -111,7 +106,7 @@ egnustepinstall() {
 		# Should all the roots point at GNUSTEP_SYSTEM_ROOT to force
 		# install?
 		# GNUSTEP_USER_ROOT must be GNUSTEP_SYSTEM_ROOT, some malformed
-		# Makefiles install there. 
+		# Makefiles install there.
 		if [ "${PN}" = "gnustep-base" ] || [ "${PN}" = "gnustep-gui" ] || [ "${PN}" = "gnustep-back" ] ; then
 			# for some reason, they need less tending to...
 			make \
@@ -120,12 +115,12 @@ egnustepinstall() {
 				GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
 				INSTALL_ROOT_DIR=${D} \
 				install || die "einstall failed"
-		else 
+		else
 			make \
 				GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
 				HOME=$TMP/fakehome \
-        	        	GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-                		INSTALL_ROOT_DIR=${D} \
+				GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
+				INSTALL_ROOT_DIR=${D} \
 				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
 				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
 				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
@@ -133,16 +128,16 @@ egnustepinstall() {
 		 		install || die "einstall failed"
 		fi
 	else
-		die "no Makefile found" 
+		die "no Makefile found"
 	fi
 	return 0
 }
 
-gnustep_src_compile() {
+gnustep-old_src_compile() {
 	egnustepmake || die
 }
 
-gnustep_src_install() {
+gnustep-old_src_install() {
 	egnustepinstall || die
 }
 
diff --git a/eclass/gnustep.eclass b/eclass/gnustep.eclass
index 2121f8de2f7f..0a5997988a46 100644
--- a/eclass/gnustep.eclass
+++ b/eclass/gnustep.eclass
@@ -1,140 +1,125 @@
-ECLASS=gnustep
-INHERITED="$INHERITED $ECLASS"
-
-DESCRIPTION="Based on the gnustep eclass."
-
-newdepend /c
-newdepend dev-util/gnustep-make
-newdepend dev-util/gnustep-base
-
-getsourcedir() {
-	if [ ! -d "${S}" ] ; then
-		if [ -d "${WORKDIR}/${PN}" ] ; then
-			S="${WORKDIR}/${PN}"
-		elif [ -d "${WORKDIR}/${P}" ] ; then
-			S="${WORKDIR}/${P}"
-		else
-			die "Cannot find source directory!"
-		fi
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
+
+inherit gnustep-funcs eutils flag-o-matic
+
+DESCRIPTION="EClass designed to facilitate building GNUstep Apps, Frameworks, and Bundles on Gentoo."
+
+###########################################################################
+# IUSE variables across all GNUstep packages
+# ##### All GNUstep applications / libs get these
+# "debug"	- enable code for debugging; also nostrip
+# "profile"	- enable code for profiling; also nostrip
+# "verbose" - enable "normal / noisy" compiling from eclass
+# ##### Set the next USE flags ***per ebuild*** in IUSE, ***not here***
+# "doc" - set in ebuild that inherits to enable doc specific code in eclass
+IUSE="debug profile verbose"
+if use debug || use profile; then
+	RESTRICT="nostrip"
+fi
+###########################################################################
+
+###########################################################################
+# Internal variables
+#__GS_INSTALL_DOMAIN="GNUSTEP_SYSTEM_ROOT"
+#__GS_USER_ROOT_SUFFIX="/"
+#__GS_MAKE_EVAL=""
+#__GS_PREFIX="/usr/GNUstep"
+#__GS_SYSTEM_ROOT="/usr/GNUstep/System"
+#__GS_LOCAL_ROOT="/usr/GNUstep/Local"
+#__GS_NETWORK_ROOT="/usr/GNUstep/Network"
+#__GS_USER_ROOT="~/GNUstep"
+###########################################################################
+
+###########################################################################
+# Variables
+# ---------
+# ~ legend
+# (a) - append more data if needed
+# (n) - do not override without a good reason
+# (y) - override as appropriate per ebuild
+# Build general GNUstep ebuild depends here
+# - most .app should be set up this way:
+#   + (a) DEPEND="${GS_DEPEND} other/depend ..."
+#   + (a) RDEPEND="${GS_RDEPEND} other/rdepend ..."
+# - core libraries and other packages that need to
+#     specialize more can use:
+#   + (n) DOC_DEPEND - packages needed to build docs
+#   + (n) GNUSTEP_CORE_DEPEND - packages needed to build any gnustep package
+#   + (n) GNUSTEP_BASE_DEPEND - packages needed to build gnustep CLI only apps
+#   + (n) GNUSTEP_GUI_DEPEND - packages needed to build gnustep GUI apps
+#   + (n) DEBUG_DEPEND - packages needed to utilize .debug apps
+#   + (n) DOC_RDEPEND - packages needed to view docs
+###########################################################################
+DOC_DEPEND="doc? ( virtual/tetex
+	=dev-tex/latex2html-2002*
+	>=app-text/texi2html-1.64 )"
+GNUSTEP_CORE_DEPEND="virtual/libc
+	>=sys-devel/gcc-3.3.5
+	${DOC_DEPEND}"
+##########################################
+# Armando Di Cianno <fafhrd@gentoo.org>
+# 20050414 - Removing use of the next two entries from all dependent ebuilds;
+# they were doing bad things to dependencies
+GNUSTEP_BASE_DEPEND="${GNUSTEP_CORE_DEPEND}
+	gnustep-base/gnustep-make
+	gnustep-base/gnustep-base"
+GNUSTEP_GUI_DEPEND="${GNUSTEP_BASE_DEPEND}
+	gnustep-base/gnustep-gui"
+##########################################
+GS_DEPEND="gnustep-base/gnustep-env"
+DEBUG_DEPEND="debug? ( >=sys-devel/gdb-6.0 )"
+DOC_RDEPEND="doc? ( sys-apps/man
+	>=sys-apps/texinfo-4.6 )"
+GS_RDEPEND="${GS_DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+###########################################################################
+
+###########################################################################
+# Ebuild function overrides
+# -------------------------
+gnustep_pkg_setup() {
+	if test_version_info 3.3
+	then
+		#einfo "Using gcc 3.3*"
+		# gcc 3.3 doesn't support certain 3.4.1 options,
+		#  as well as having less specific -march options
+		replace-flags -march=pentium-m -march=pentium3
+		filter-flags -march=k8
+		filter-flags -march=athlon64
+		filter-flags -march=opteron
+
+		strip-unsupported-flags
+	elif test_version_info 3.4
+	then
+		# strict-aliasing is known to break obj-c stuff in gcc-3.4*
+		filter-flags -fstrict-aliasing
 	fi
-}
 
-need-gnustep-gui() {
-	if [ "$1" ] ; then
-		newdepend ">=dev-util/gnustep-gui-$1"
-		RDEPEND="${RDEPEND} >=dev-util/gnustep-back-$1"
-	else
-		newdepend "dev-util/gnustep-gui"
-		RDEPEND="${RDEPEND} dev-util/gnustep-back"
-	fi
+	# known to break ObjC (bug 86089)
+	filter-flags -fomit-frame-pointer
 }
 
-egnustepmake() {
-	getsourcedir
-
-	addwrite ~/GNUstep/Defaults/.GNUstepDefaults.lck
-	addpredict ~/GNUstep	
-
-	cd ${S}
-
-	if [ -f /usr/GNUstep/System/Makefiles/GNUstep.sh ] ; then
-		. /usr/GNUstep/System/Makefiles/GNUstep.sh
-	else
-		die "gnustep-make not installed!"
-	fi
-
-	mkdir -p $TMP/fakehome/GNUstep
-
-	if [ -x configure ] ; then
-		if [ -z "$*" ] ; then
-			econf \
-				HOME=$TMP/fakehome \
-				GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
-				|| die "configure failed"
-		else
-			econf \
-				HOME=$TMP/fakehome \
-				GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
-				$* || die "configure failed (options: $*)"
-		fi
-	fi
-
-	if [ ! "${GNUSTEPBACK_XFT}" -eq 2 ] ; then
-		if [ "${PN}" = "gnustep-back" ] ; then
-			if [ ! -f "/usr/X11R6/include/X11/Xft1/Xft.h" ]; then
-				sed "s,^#define HAVE_XFT.*,#undef HAVE_XFT,g" config.h > config.h.new
-				sed "s,^#define HAVE_UTF8.*,#undef HAVE_UTF8,g" config.h.new > config.h
-				sed "s,^WITH_XFT=.*,WITH_XFT=no," config.make > config.make.new
-				sed "s,-lXft,," config.make.new > config.make
-			fi
-		fi
-	fi
-	
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		make \
-			HOME=$TMP/fakehome \
-			GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
-			|| die "emake failed"
-	else
-		die "no Makefile found"
-	fi
-	return 0
+gnustep_src_compile() {
+	egnustep_env
+	egnustep_make || die
 }
 
-egnustepinstall() {
-	getsourcedir
-
-	addwrite ~/GNUstep/Defaults/.GNUstepDefaults.lck
-	addpredict ~/GNUstep	
-
-	cd ${S}
-	
-	if [ -f /usr/GNUstep/System/Makefiles/GNUstep.sh ] ; then
-                source /usr/GNUstep/System/Makefiles/GNUstep.sh
-        else
-                die "gnustep-make not installed!"
-        fi
-
-	mkdir -p $TMP/fakehome/GNUstep
-
-	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		# To be or not to be evil?
-		# Should all the roots point at GNUSTEP_SYSTEM_ROOT to force
-		# install?
-		# GNUSTEP_USER_ROOT must be GNUSTEP_SYSTEM_ROOT, some malformed
-		# Makefiles install there. 
-		if [ "${PN}" = "gnustep-base" ] || [ "${PN}" = "gnustep-gui" ] || [ "${PN}" = "gnustep-back" ] ; then
-			# for some reason, they need less tending to...
-			make \
-				GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
-				HOME=$TMP/fakehome \
-				GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-				INSTALL_ROOT_DIR=${D} \
-				install || die "einstall failed"
-		else 
-			make \
-				GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
-				HOME=$TMP/fakehome \
-        	        	GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-                		INSTALL_ROOT_DIR=${D} \
-				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
-				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-				GNUSTEP_USER_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-		 		install || die "einstall failed"
-		fi
-	else
-		die "no Makefile found" 
+gnustep_src_install() {
+	egnustep_env
+	egnustep_install || die
+	if use doc ; then
+		egnustep_env
+		egnustep_doc || die
 	fi
-	return 0
-}
-
-gnustep_src_compile() {
-	egnustepmake || die
+	egnustep_package_config
 }
 
-gnustep_src_install() {
-	egnustepinstall || die
+gnustep_pkg_postinst() {
+	egnustep_package_config_info
 }
+###########################################################################
 
-EXPORT_FUNCTIONS src_compile src_install
+EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst
diff --git a/eclass/gst-plugins.eclass b/eclass/gst-plugins.eclass
index 046e20fb3068..14b04f4a28fb 100644
--- a/eclass/gst-plugins.eclass
+++ b/eclass/gst-plugins.eclass
@@ -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/eclass/gst-plugins.eclass,v 1.1 2003/06/16 22:04:56 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.1.1.1 2005/11/30 09:59:31 chriswhite Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -9,42 +9,42 @@
 # eclass to make external gst-plugins emergable on a per-plugin basis
 # to solve the problem with gst-plugins generating far too much unneeded deps
 #
-# 3rd party applications using gstreamer now should depend on a set of plugins as 
-# defined in the source, in case of spider usage obtain recommended plugins to use from 
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer 
+# 3rd party applications using gstreamer now should depend on a set of plugins as
+# defined in the source, in case of spider usage obtain recommended plugins to use from
+# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
 # or the gstreamer team.
 
-ECLASS="gst-plugins"
-INHERITED="$INHERITED $ECLASS"
+inherit eutils libtool autotools
 
-inherit libtool
 
-# accept both $DEBUG and USE="debug"
-[ -n "$DEBUG" -o -n "`use debug`" ] && inherit debug
+###
+# variable declarations
+###
 
 # Create a major/minor combo for our SLOT and executables suffix
-
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+PVP=(${PV//[-\._]/ })
 PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
 
 MY_P=gst-plugins-${PV}
 
 # All relevant configure options for gst-plugins
+# need a better way to extract these
+# gstreamer 0.6
+my_gst_plugins="dxr3 oss qcam v4l v4l2 vcd vga cdrom xvideo a52dec aalib aalibtest alsa arts artstest artsc audiofile avifile cdparanoia dvdread dvdnav esd esdtest flac ffmpeg gnome_vfs gsm hermes http jack jpeg ladspa lame lcs libdv libfame libfametest libpng mad mikmod libmikmodtest mjpegtools mpeg2dec openquicktime raw1394 rtp sdl sdltest shout shout2 shout2test sidplay smoothwave snapshot swfdec tarkin vorbis vorbistest xmms libmmx atomic tests examples"
+# gstreamer 0.8
+my_gst_plugins="${my_gst_plugins} divx faad gdk_pixbuf ogg sndfile x pango speex xvid mpeg2enc mplex musicbrainz nas librfb libcaca ivorbis faac theora kio osx_audio osx_video sunaudio artsc dts libvisual dirac libmng opengl gst_v4l gst_v4l2 libmms musepack directfb polyp cairo spc wavpack cdio amrnb x264 raw1394"
 
-my_gst_plugins="dxr3 oss qcam v4l v4l2 vcd vga cdrom xvideo a52dec aalib aalibtest alsa arts artstest artsc audiofile avifile cdparanoia dvdread dvdnav esd esdtest flac ffmpeg gnome_vfs gsm hermes http jack jpeg ladspa lame lcs libdv libfame libfametest libpng mad mikmod libmikmodtest mjpegtools mpeg2dec openquicktime raw1394 rtp sdl sdltest shout shout2 shout2test sidplay smoothwave snapshot swfdec tarkin vorbis vorbistest xmms libmmx atomic tests examples" 
-
-#
 # Extract the plugin to build from the ebuild name
-#
-
-BUILD_GST_PLUGIN=${PN/gst-plugins-/}
+# May be set by an ebuild and contain more than one indentifier, space seperated
+# (only src_configure can handle mutiple plugins at this time)
+GST_PLUGINS_BUILD=${PN/gst-plugins-/}
 
-#
-# general common gst-plugins ebuild entries 
-#
+# Actual build dir, is the same as the configure switch name most of the time
+GST_PLUGINS_BUILD_DIR=${PN/gst-plugins-/}
 
-DESCRIPTION="${BUILD_GST_PLUGIN} plugin for gstreamer"
-HOMEPAGE="http://www.gstreamer.net/status/"
+# general common gst-plugins ebuild entries
+DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-plugins.html"
 LICENSE="GPL-2"
 
 SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
@@ -52,53 +52,127 @@ SLOT=${PV_MAJ_MIN}
 
 S=${WORKDIR}/${MY_P}
 
-newdepend "=${MY_P}*"
+RDEPEND="=media-libs/${MY_P}*"
 
-#
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+###
+# internal functions
+###
+
+gst-plugins_find_plugin_dir() {
+
+	if [ ! -d ${S}/ext/${GST_PLUGINS_BUILD_DIR} ]; then
+		if [ ! -d ${S}/sys/${GST_PLUGINS_BUILD_DIR} ]; then
+			ewarn "No such plugin directory"
+			die
+		fi
+		einfo "Building system plugin ..."
+		cd ${S}/sys/${GST_PLUGINS_BUILD_DIR}
+	else
+		einfo "Building external plugin ..."
+		cd ${S}/ext/${GST_PLUGINS_BUILD_DIR}
+	fi
+
+}
+
+###
 # public functions
-#
+###
 
 gst-plugins_src_configure() {
-	
-	elibtoolize ${ELTCONF}
 
-	#
 	# disable any external plugin besides the plugin we want
-	#
-
 	local plugin gst_conf
 
-	einfo "${BUILD_GST_PLUGIN}"
+	einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
+
+	for plugin in ${GST_PLUGINS_BUILD}; do
+		my_gst_plugins=${my_gst_plugins/${plugin}/}
+	done
 	for plugin in ${my_gst_plugins}; do
-		if [ ${plugin} = ${BUILD_GST_PLUGIN} ];
-		then
-			einfo "Building ${plugin} plugin(s)..."
-			gst_conf="${gst_conf} --enable-${plugin} "
-		else
-			gst_conf="${gst_conf} --disable-${plugin} "
-		fi
+		gst_conf="${gst_conf} --disable-${plugin} "
+	done
+	for plugin in ${GST_PLUGINS_BUILD}; do
+		gst_conf="${gst_conf} --enable-${plugin} "
 	done
 
+	cd ${S}
 	econf ${@} ${gst_conf} || die "./configure failure"
 
 }
 
-#
+gst-plugins_update_registry() {
+
+	einfo "Updating gstreamer plugins registry for gstreamer ${SLOT} ..."
+	gst-register-${SLOT}
+
+}
+
+gst-plugins_remove_unversioned_binaries() {
+
+	# remove the unversioned binaries gstreamer provide
+	# this is to prevent these binaries to be owned by several SLOTs
+
+	cd ${D}/usr/bin
+	for gst_bins in `ls *-${PV_MAJ_MIN}`
+	do
+		rm ${gst_bins/-${PV_MAJ_MIN}/}
+		einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
+	done
+
+}
+
+###
 # public inheritable functions
-#
+###
+
+gst-plugins_src_unpack() {
+
+	local makefiles
+
+	unpack ${A}
+
+	# apply patch to fix broken configure in 0.8.11
+	cd ${S}
+	if [ ${PV} == "0.8.11" ]; then
+		epatch ${FILESDIR}/../../../media-libs/gst-plugins/files/gst-plugins-0.8.11-conffix.patch
+		AT_M4DIR="-I m4 -I common/m4"
+		eautoreconf
+		elibtoolize
+	fi
+
+	# Link with the syswide installed interfaces if needed
+	gst-plugins_find_plugin_dir
+	sed -e "s:\$(top_builddir)/gst-libs/gst/libgstinterfaces:/usr/$(get_libdir)/libgstinterfaces:" \
+		-e "s:\${top_builddir}/gst-libs/gst/libgstinterfaces:/usr/$(get_libdir)/libgstinterfaces:" \
+		-i Makefile.in
+	cd ${S}
+
+	# Remove generation of any other Makefiles except the plugin's Makefile
+	if [ -d "${S}/sys/${GST_PLUGINS_BUILD_DIR}" ]; then
+		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
+	elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then
+		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
+	fi
+	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
+		-i ${S}/configure
+
+}
 
 gst-plugins_src_compile() {
 
 	gst-plugins_src_configure ${@}
 
-	cd ${S}/ext/${BUILD_GST_PLUGIN}
+	gst-plugins_find_plugin_dir
 	emake || die "compile failure"
 
 }
 
 gst-plugins_src_install() {
 
-	cd ${S}/ext/${BUILD_GST_PLUGIN}
+	gst-plugins_find_plugin_dir
 	einstall || die
 
 	dodoc README
@@ -107,17 +181,14 @@ gst-plugins_src_install() {
 
 gst-plugins_pkg_postinst() {
 
-	einfo "Updating gstreamer plugins registry..."
-	gst-register-${SLOT}
+	gst-plugins_update_registry
 
 }
 
 gst-plugins_pkg_postrm() {
 
-	einfo "Updating gstreamer plugins registry..."
-	gst-register-${SLOT}
+	gst-plugins_update_registry
 
 }
 
-
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
diff --git a/eclass/gtk-engines.eclass b/eclass/gtk-engines.eclass
index a68ab8e8d2ee..f30996fc443b 100644
--- a/eclass/gtk-engines.eclass
+++ b/eclass/gtk-engines.eclass
@@ -1,53 +1,80 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/eclass/gtk-engines.eclass,v 1.0 2002/04/20 09:55:11 danarmak Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 
-# The gtk-engines eclass is inheritd by all gtk-engines-* ebuilds.
+# IMPORTANT:
+# This eclass is deprecated and should not be used in new ebuilds.
 
-inherit base
+#
+# The gtk-engines eclass is inherited by all gtk-engines-* ebuilds.
+#
+# Please note that Gtk engines are special packages that mainly provide
+# common libraries for Gtk themes, and there is a special meta-package
+# that have what you're probably looking for: gtk-themes.
+#
+# If you want themes to make your GTK 2 apps look pretty, you can do
+# something like the following, and everything will be taken care of:
+#
+#   emerge gtk-themes
+#
+# If themes for GTK 1 programs is what you're looking for, then something
+# like this should help you:
+#
+#   emerge =gtk-themes-1*
 
-ECLASS=gtk-engines
+inherit eutils
 
-DESCRIPTION="Based on the ${ECLASS} eclass"
-HOMEPAGE=""
-LICENSE="GPL-2"
-KEYWORDS="x86"
 
-newdepend /c virtual/x11
+[ -n "$DEBUG" ] && einfo "Entering gtk-engines.eclass"
+
+[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the gtk-engines eclass"
+[ -z "$HOMEPAGE" ]    && HOMEPAGE="http://www.gnome.org/"
+[ -z "$LICENSE" ]     && LICENSE="GPL-2"
+
+KEYWORDS="x86 ppc alpha sparc hppa amd64"
+
+DEPEND="virtual/x11"
 
 case "${SLOT}" in
 	"1" )
-		newdepend '=x11-libs/gtk+-1.2*' ;;
+		DEPEND="${DEPEND} =x11-libs/gtk+-1.2*" ;;
 	"2" )
-		newdepend '>=x11-libs/gtk+-2' ;;
+		DEPEND="${DEPEND} >=x11-libs/gtk+-2" ;;
 	* )
-		newdepend x11-libs/gtk+ ;;
+		DEPEND="${DEPEND} x11-libs/gtk+" ;;
 esac
 
+[ -n "$DEBUG" ] && einfo "SLOT is ${SLOT}"
+
 MY_PN="${PN}"
 INSTALL_FONTS=0
 ENGINE=${PN/gtk-engines-/}
 
+[ -n "$DEBUG" ] && einfo "ENGINE is ${ENGINE}"
+
 case "${ENGINE}" in
 	"cleanice" )
 		[ "$SLOT" -eq "2" ] && MY_PN="gtk-engines-cleanice2" ;;
+
 	"crux" )
-		MY_PN="crux"
-		newdepend '>=gnome-base/libgnomeui-2.0.1' \
-			'>=gnome-base/libglade-2.0.0'
-		DEPEND="${DEPEND} sys-devel/libtool"
-		;;
+		MY_PN="crux" ;;
+
 	"eazel" )
-		MY_PN="eazel-engine"
-		newdepend media-libs/gdk-pixbuf
-		;;
-	"gtkstep" )
-		LICENSE="LGPL-2" ;;
+		MY_PN="eazel-engine" ;;
+
+	"flat" )
+		[ "$SLOT" -eq "2" ] && MY_PN="gtk-flat-theme-2.0" ;;
+
+	"geramik" )
+		MY_PN="3952-Geramik" ;;
+
+	"lighthouseblue" )
+		MY_PN="lighthouseblue" ;;
+
 	"metal" | "notif" | "pixbuf" | "pixmap" | "raleigh" | "redmond95" )
 		MY_PN="gtk-engines"
 		if [ "$SLOT" -eq "2" ]
 		then
-			newdepend media-libs/gdk-pixbuf
 			DEPEND="${DEPEND} >=dev-util/pkgconfig-0.12.0"
 
 			# Do _NOT_ strip symbols in the build! Need both lines for Portage
@@ -57,77 +84,99 @@ case "${ENGINE}" in
 			# force debug information
 			CFLAGS="${CFLAGS} -g"
 			CXXFLAGS="${CXXFLAGS} -g"
-			
+
 		else
-			newdepend '>=media-libs/imlib-1.8'
+			DEPEND="${DEPEND} >=media-libs/imlib-1.8"
 		fi
 		;;
+
+	"mist" )
+		MY_PN="GTK-mist-engine" ;;
+
 	"thinice" )
 		[ "$SLOT" -eq "2" ] && MY_PN="gtk-thinice-engine" ;;
+
 	"xenophilia" )
 		MY_PN="xenophilia"
 		INSTALL_FONTS=1
-		LICENSE="LGPL-2"
 		;;
+
 	"xfce" )
 		MY_PN="gtk-xfce-engine" ;;
 esac
 
 MY_P="${MY_PN}-${PV}"
 
+[ -n "$DEBUG" ] && einfo "MY_P is ${MY_P}"
+
 if [ "X${ENGINE}" = "Xthinice" ] && [ "$SLOT" -eq "2" ]
 then
 	SRC_URI="http://thinice.sourceforge.net/${MY_P}.tar.gz"
-	
+
+elif [ "X${ENGINE}" = "Xmist" ]
+then
+	SRC_URI="http://ftp.gnome.org/pub/GNOME/teams/art.gnome.org/themes/gtk2/${MY_P}.tar.gz"
+
+elif [ "X${ENGINE}" = "Xflat" ] && [ "$SLOT" -eq "2" ]
+then
+	SRC_URI="http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz"
+
+elif [ "X${ENGINE}" = "Xgeramik" ]
+then
+	SRC_URI="http://www.kde-look.org/content/files/${MY_P}.tar.gz"
+
 elif [ "X${ENGINE}" = "Xxfce" ]
 then
 	SRC_URI="mirror://sourceforge/xfce/${MY_P}.tar.gz"
-	
+
+elif [ "X${ENGINE}" = "Xlighthouseblue" ]
+then
+	SRC_URI="mirror://sourceforge/lighthouseblue/${MY_P}.tar.gz"
+
 elif [ "X${ENGINE}" = "Xcrux" ]
 then
-	SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_P}.tar.bz2"
-	
+	PVP=(${PV//[-\._]/ })
+	SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
 elif [ "X${MY_PN}" = "Xgtk-engines" ] && [ "$SLOT" -eq "2" ]
 then
-	SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_P}.tar.bz2"
+	PVP=(${PV//[-\._]/ })
+	SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
 else
-	SRC_PATH=`echo ${MY_PN} | awk '{print substr($0,1,1);}'`
-	SRC_PATH="${SRC_PATH}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+	SRC_PATH="${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
 	SRC_URI="http://ftp.debian.org/debian/pool/main/$SRC_PATH"
 fi
 
+[ -n "$DEBUG" ] && einfo "SRC_URI is ${SRC_URI}"
 
 gtk-engines_src_unpack() {
 	unpack ${A}
-	
-	# Let's try to figure out the right value for S
-	S="${WORKDIR}/`ls -t ${WORKDIR} | head -n 1`"
+
+	[ -f "${FILESDIR}/${P}-gentoo.diff" ] && \
+		patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+
+	MY_DIR=`ls -t ${WORKDIR} | head -n 1`
+
+	mv $MY_DIR $S
 }
 
 gtk-engines_src_compile() {
-	econf || die
-	
-	if [ "X${MY_PN}" = "Xgtk-engines" ]
-	then
-		cd ${ENGINE}
-	fi
-	
-	emake || die
+	econf || die "./configure failed"
+
+	[ "X${MY_PN}" = "Xgtk-engines" ] && cd ${ENGINE}
+
+	emake || die "Compilation failed"
 }
 
 gtk-engines_src_install() {
-	cd ${S}
-	
-	if [ "X${MY_PN}" = "Xgtk-engines" ]
-	then
-		cd ${ENGINE}
-	fi
+	[ "X${MY_PN}" = "Xgtk-engines" ] && cd ${ENGINE}
 
-	if [ "X${MY_PN}" = "Xxenophilia" ]
+	# Some corrections to misc files
+	if [ "X${ENGINE}" = "Xxenophilia" ]
 	then
-		dodir /usr/X11R6/lib/X11/fonts/misc
-		
+		dodir /usr/X11R6/$(get_libdir)/X11/fonts/misc
+
 		mv fonts/Makefile fonts/Makefile.orig
 		sed -e 's:/usr:${D}/usr:' \
 			-e 's:local:misc:' \
@@ -138,10 +187,50 @@ gtk-engines_src_install() {
 
 	einstall \
 		THEME_DIR=${D}/usr/share/themes \
-		ENGINE_DIR=${D}/usr/lib/gtk/themes/engines || die
-	
+		ENGINE_DIR=${D}/usr/$(get_libdir)/gtk/themes/engines \
+		|| die "Installation failed"
+
+	# Remove unwanted stuff, since some engines include GTK-1 and GTK-2
+	# support.
+	if [ "X${ENGINE}" = "Xmist" ]
+	then
+		if [ "$SLOT" -eq "2" ]
+		then
+			rm -rf ${D}/usr/$(get_libdir)/gtk ${D}/usr/share/themes/Mist/gtk
+		else
+			rm -rf ${D}/usr/$(get_libdir)/gtk-2.0 ${D}/usr/share/themes/Mist/gtk-2.0
+		fi
+
+		rm -rf ${D}/usr/share/themes/Mist/metacity-1
+
+	elif [ "X${ENGINE}" = "Xgeramik" ]
+	then
+		if [ "$SLOT" -eq "2" ]
+		then
+			mv ${D}/usr/share/themes/Geramik/gtk/*png \
+			   ${D}/usr/share/themes/Geramik/gtk-2.0
+			mv ${D}/usr/share/themes/Geramik/gtk-2.0/gtkrc-2.0 \
+			   ${D}/usr/share/themes/Geramik/gtk-2.0/gtkrc
+
+			rm -rf ${D}/usr/$(get_libdir)/gtk ${D}/usr/share/themes/Geramik/gtk
+		else
+			rm -rf ${D}/usr/$(get_libdir)/gtk-2.0 ${D}/usr/share/themes/Geramik/gtk-2.0
+		fi
+
+	elif [ "X${ENGINE}" = "Xlighthouseblue" ]
+	then
+		if [ "$SLOT" -eq "2" ]
+		then
+			rm -rf ${D}/usr/$(get_libdir)/gtk ${D}/usr/share/themes/LighthouseBlue/gtk
+		else
+			rm -rf \
+				${D}/usr/$(get_libdir)/gtk-2.0 \
+				${D}/usr/share/themes/LighthouseBlue/gtk-2.0
+		fi
+	fi
+
 	for doc in AUTHORS BUGS ChangeLog CONFIGURATION COPYING CUSTOMIZATION \
-		INSTALL NEWS README THANKS TODO
+		NEWS README THANKS TODO
 	do
 		[ -s $doc ] && dodoc $doc
 	done
@@ -151,7 +240,7 @@ gtk-engines_pkg_postinst() {
 	if [ "$INSTALL_FONTS" -ne 0 ]
 	then
 		echo ">>> Updating X fonts..."
-		mkfontdir /usr/X11R6/lib/X11/fonts/misc
+		mkfontdir /usr/X11R6/$(get_libdir)/X11/fonts/misc
 		xset fp rehash || fonts_notice
 	fi
 }
@@ -160,22 +249,16 @@ gtk-engines_pkg_postrm() {
 	if [ "$INSTALL_FONTS" -ne 0 ]
 	then
 		echo ">>> Updating X fonts..."
-		mkfontdir /usr/X11R6/lib/X11/fonts/misc
+		mkfontdir /usr/X11R6/$(get_libdir)/X11/fonts/misc
 		xset fp rehash || fonts_notice
 	fi
 }
 
 fonts_notice() {
-	einfo ""
-	einfo "*************************************************************"
-	einfo ""
 	einfo "We can't reset the font path at the moment. You might want"
 	einfo "to run the following command manually:"
 	einfo ""
 	einfo "  xset fp rehash"
-	einfo ""
-	einfo "*************************************************************"
-	einfo ""
 }
-										
+
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
diff --git a/eclass/gtk-engines2.eclass b/eclass/gtk-engines2.eclass
index 46f352d45928..1347905a5c01 100644
--- a/eclass/gtk-engines2.eclass
+++ b/eclass/gtk-engines2.eclass
@@ -1,7 +1,12 @@
-# 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/eclass/gtk-engines2.eclass,v 1.1 2003/06/18 23:40:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 
+# IMPORTANT:
+# This eclass is deprecated and should not be used in new ebuilds.
+
+# Author: Alastair Tse <liquidx@gentoo.org>
+#
 # This is a utility eclass for installing GTK+ Theme Engines. It detects
 # whether gtk+-1 and/or gtk+-2 is installed and sets up variables to help with
 # installing the engines into the right position.
@@ -15,11 +20,11 @@
 # *** NOTE *** If your engine has both GTK+1 and GTK+2 versions :
 #
 #  Set the following variables if they are in different directories:
-# 
+#
 #  GTK1_S  -- GTK+1 Source Directory
 #  GTK2_S  -- GTK+2 Source Directory
 #
-#  Also note you should not set DEPEND and let the eclass set the dependencies 
+#  Also note you should not set DEPEND and let the eclass set the dependencies
 #
 # Comments:
 #
@@ -31,16 +36,16 @@
 # in this case. We install the whole package of themes available, both
 # GTK+1 and GTK+2 if available. We assume that the user would want both
 # since the space savings are negligible.
-# 
+#
 # Note that this deals specifically with GTK ENGINES and not GTK THEMES. Some
 # engines have themes that accompany them, and they are thus installed. You
 # should not be using this eclass (it won't help anyway) if you are making
 # a pure GTK+ theme ebuild.
-# 
+#
 # - liquidx@gentoo.org (16 Jun 2003)
 
-ECLASS="gtk-engines2"
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
+
 
 DESCRIPTION="GTK+1/2 ${PN/gtk-engines-} Theme Engine"
 HOMEPAGE="http://art.gnome.org/ http://themes.freshmeat.net/"
@@ -49,14 +54,22 @@ HOMEPAGE="http://art.gnome.org/ http://themes.freshmeat.net/"
 
 if has_version "=x11-libs/gtk+-1.2*"; then
 	HAS_GTK1=1
-	GTK1_ENGINES_DIR=/usr/lib/gtk/themes/engines
-fi	
+	GTK1_ENGINES_DIR=/usr/$(get_libdir)/gtk/themes/engines
+fi
 
 if has_version ">=x11-libs/gtk+-2" || use gtk2; then
 	HAS_GTK2=1
-	GTK2_FULL_VER=$(pkg-config gtk+-2.0 --modversion)
-	GTK2_MAJOR_VER=${GTK2_FULL_VER%.*}.0
-	GTK2_ENGINES_DIR=/usr/lib/gtk-2.0/${GTK2_MAJOR_VER}/engines
+	GTK_VERSION=$(pkg-config --variable=gtk_binary_version gtk+-2.0)
+	GTK2_ENGINES_DIR=/usr/$(get_libdir)/gtk-2.0/${GTK_VERSION}/engines
+fi
+
+# --- define some deps for binary packages
+if [ -n "${HAS_GTK1}" -a ! -n "${HAS_GTK2}" ]; then
+	DEPEND="${DEPEND} =x11-libs/gtk+-1.2*"
+elif [ -n "${HAS_GTK1}" -a -n "${HAS_GTK2}" ]; then
+	DEPEND="${DEPEND} =x11-libs/gtk+-1.2* =x11-libs/gtk+-2*"
+elif [ ! -n "${HAS_GTK1}" -a -n "${HAS_GTK2}" ]; then
+	DEPEND="${DEPEND} >=x11-libs/gtk+-2"
 fi
 
 # --- if we don't have any gtk version, we depend on USE flags to tell us
@@ -64,17 +77,18 @@ fi
 # --- tell us what DEPEND it wants.
 
 if ! has_version "x11-libs/gtk+"; then
+	DEPEND="gtk2? ( >=x11-libs/gtk+-2 ) !gtk2? ( =x11-libs/gtk+-1.2* )"
 	use gtk2 \
-		&& newdepend ">=x11-libs/gtk+-2" \
-		|| newdepend "=x11-libs/gtk+-1.2*"
-fi		
+		&& HAS_GTK2=1 \
+		|| HAS_GTK1=1
+fi
 
 # --- if GTK1_S and GTK2_S is set, then we do both themes,
 # --- otherwise, just do the normal src_compile/install wrap.
 
 gtk-engines2_src_compile() {
-	
-	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then 
+
+	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then
 		if [ -n "${HAS_GTK2}" ]; then
 			cd ${GTK2_S}
 			econf || die "gtk2 configure failed"
@@ -92,11 +106,11 @@ gtk-engines2_src_compile() {
 	fi
 }
 
-DEFAULT_DOCS="COPYING README NEWS AUTHORS ChangeLog INSTALL"
+DEFAULT_DOCS="AUTHORS ChangeLog NEWS README"
 
 gtk-engines2_src_install() {
 
-	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then 
+	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then
 		if [ -n "${HAS_GTK2}" ]; then
 			cd ${GTK2_S}
 			make DESTDIR=${D} install || die "gtk2 install failed"
@@ -109,14 +123,13 @@ gtk-engines2_src_install() {
 			make DESTDIR=${D} install || die "gtk1 install failed"
 			for x in ${DEFAULT_DOCS} ${DOCS}; do
 				newdoc ${x} ${x}.gtk1
-			done		
+			done
 	    fi
 	else
 		cd ${S}
 		make DESTDIR=${D} ${@} install || die "install failed"
 		dodoc ${DEFAULT_DOCS} ${DOCS}
-   	fi		
+	fi
 }
 
 EXPORT_FUNCTIONS src_compile src_install
-
diff --git a/eclass/gtk-sharp-component.eclass b/eclass/gtk-sharp-component.eclass
index cbeea9e5e338..09eedcc22799 100644
--- a/eclass/gtk-sharp-component.eclass
+++ b/eclass/gtk-sharp-component.eclass
@@ -1,31 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-component.eclass,v 1.1 2004/11/19 03:00:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-component.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 
 # Author : Peter Johanson <latexer@gentoo.org>
 # Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
 
-inherit eutils mono
+inherit eutils mono multilib
 
-ECLASS="gtk-sharp-component"
-INHERITED="$INHERITED $ECLASS"
 
 LICENSE="LGPL-2"
 
 HOMEPAGE="http://gtk-sharp.sourceforge.net/"
 LICENSE="LGPL-2.1"
+RESTRICT="test"
 
-SRC_URI="mirror://sourceforge/gtk-sharp/${MY_P}.tar.gz
-		mirror://gentoo/${MY_P}-configurable.diff.gz"
+[ "${PV:0:1}" == "2" ] \
+	&& SOURCE_SERVER="http://www.go-mono.com/sources/gtk-sharp-2.0/"
 
-S=${WORKDIR}/${MY_P}
+[ "${PV}" == "1.0.10" ] \
+	&& SOURCE_SERVER="http://www.go-mono.com/sources/gtk-sharp/"
 
-# Make sure we're building with the same version.
-DEPEND="${DEPEND}
-	=dev-dotnet/${MY_P}*
-	sys-devel/automake
-	sys-devel/autoconf
-	>=sys-apps/sed-4"
+[ -z "${SOURCE_SERVER}" ] \
+	&& SOURCE_SERVER="mirror://sourceforge/gtk-sharp/"
 
 ###
 # variable declarations
@@ -56,52 +52,99 @@ GTK_SHARP_COMPONENT_BUILD_DEPS=""
 # Actual build dir, is the same as the configure switch name most of the time
 GTK_SHARP_COMPONENT_BUILD_DIR=${PN/-sharp/}
 
-DESCRIPTION="${GTK_SHARP_COMPONENT_BUILD} plugin for gstreamer"
+DESCRIPTION="${GTK_SHARP_COMPONENT_BUILD} component of gtk-sharp"
+SRC_URI="${SOURCE_SERVER}/${MY_P}.tar.gz
+		mirror://gentoo/${MY_P}-configurable.diff.gz"
+
+S=${WORKDIR}/${MY_P}
+
+# Make sure we're building with the same version.
+DEPEND="=dev-dotnet/${MY_P}*
+	sys-devel/automake
+	sys-devel/autoconf
+	>=sys-apps/sed-4"
+
 
 ###
 # public functions
 ###
 
-gtk-sharp-component_src_unpack() {
+gtk-sharp-component_fix_makefiles() {
 	GAPI_DIR="${ROOT}/usr/share/gapi${GTK_SHARP_COMPONENT_SLOT_DEC}"
 	GAPI_FIXUP="gapi${GTK_SHARP_COMPONENT_SLOT}-fixup"
 	GAPI_CODEGEN="gapi${GTK_SHARP_COMPONENT_SLOT}-codegen"
-	GTK_SHARP_LIB_DIR="${ROOT}/usr/lib/mono/gtk-sharp${GTK_SHARP_COMPONENT_SLOT_DEC}"
+	GTK_SHARP_LIB_DIR="${ROOT}/usr/$(get_libdir)/mono/gtk-sharp${GTK_SHARP_COMPONENT_SLOT_DEC}"
+
+	local makefiles="$(find ${S} -name Makefile.in)"
+	# Universal changes needed for all versions
+	sed -i -e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).xml;${GAPI_DIR}/\2.xml;g" \
+		-i -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \
+			${makefiles} || die "Failed to fix the gtk-sharp makefiles"
+
+	if [ "${PV:0:1}" == "2" ] ; then
+		sed -i -e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \
+			-e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \
+			-e "s:\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe:${GAPI_FIXUP}:" \
+			-e "s:\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe:${GAPI_CODEGEN}:" \
+			-e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \
+			${makefiles} || die "Failed to fix the gtk-sharp makefiles"
+	fi
+
+	# Changes specific to 1.9.3
+#	if [ "${PV:0:5}" == "1.9.3" ] || \
+#	   [ "${PV:0:5}" == "1.9.5" ] || \
+#	   [ "${PV:0:3}" == "2.3" ] || \
+#	   [ "${PV:0:3}" == "2.5" ] ; then
+#		sed -i -e "s:\$(API) \$(top_builddir)/parser/gapi-fixup.exe:\$(API):" \
+#			-e "s:\$(API) \$(top_builddir)/generator/gapi_codegen.exe:\$(API):" \
+#			${makefiles} || die "Failed to fix the gtk-sharp makefiles"
+#	fi
+
+	# Changes specific to *-sharp-1.0.x
+	if [ "${PV:0:3}" = "1.0" ] ; then
+		sed -i -e "s:\$(RUNTIME) \.\./parser/gapi-fixup.exe:${GAPI_FIXUP}:" \
+			-e "s:\$(RUNTIME) \.\./generator/gapi_codegen.exe:${GAPI_CODEGEN}:" \
+			-e "s: \.\./generator/gapi_codegen.exe::" \
+			${makefiles} || die "Failed to fix the gtk-sharp makefiles"
+	fi
+
+	# Changes only in 1.9.x
+#	if [ "${PV:0:1}" == "2" ]; then
+#		sed -i -e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*\(-[[:alpha:]]*\)*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \
+#			${makefiles} || die "Failed to fix the gtk-sharp makefiles"
+#	fi
+}
 
+gtk-sharp-component_src_unpack() {
 	unpack ${A}
-    cd ${S}
+	cd ${S}
 
 	# Make the components configurable
 	epatch ${WORKDIR}/${MY_P}-configurable.diff
-	aclocal || die
-	automake || die
-	autoconf || die
+	aclocal || die "aclocal failed"
+	# See bug #73563, comment #9
+	libtoolize --copy --force || die "libtoolize failed"
+	automake || die "automake failed"
+
+	# fixes support with pkgconfig-0.17, bug #92503
+	sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' configure.in
+
+	# Use correct libdir in pkgconfig files
+	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+		${S}/*/{,GConf}/*.pc.in || die
+
+	autoconf || die "autoconf failed"
 
 	# disable building of samples (#16015)
-    sed -i -e "s:sample::" ${S}/Makefile.in || die
+	sed -i -e "s:sample::" ${S}/Makefile.in || die
 
 	cd ${S}/${GTK_SHARP_COMPONENT_BUILD_DIR}
 
-	# Change references like "/r:../glib/glib-sharp.dll" ->
-	# "/r:${GTK_SHARP_LIB_DIR}/glib-sharp.dll" and references like
-	# "../glib/glib-sharp.xml" or "$(top_srcdir)/glib/glib-sharp.xml" ->
-	# "${GAPI_DIR}/glib-sharp.xml"
-	#
-	# We also make sure to call the installed gapi-fixup and gapi-codegen
-	# and not the ones that would be built locally
-	for makefile in $(find . -name Makefile.in)
-	do
-		sed -i -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \
-			-e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).xml;${GAPI_DIR}/\2.xml;g" \
-			-e "s:\$(RUNTIME) \.\./parser/gapi-fixup.exe:${GAPI_FIXUP}:" \
-			-e "s:\$(RUNTIME) \.\./generator/gapi_codegen.exe:${GAPI_CODEGEN}:" \
-			-e "s: \.\./generator/gapi_codegen.exe::" \
-			${makefile} || die "Failed to sed"
-	done
+	gtk-sharp-component_fix_makefiles
 }
 
 gtk-sharp-component_src_configure() {
-	
+
 	# disable any external plugin besides the plugin we want
 	local component deps gtk_sharp_conf
 
@@ -125,13 +168,24 @@ gtk-sharp-component_src_compile() {
 	gtk-sharp-component_src_configure ${@}
 
 	cd ${S}/${GTK_SHARP_COMPONENT_BUILD_DIR}
-	emake || die "compile failure"
+	LANG=C emake || die "compile failure"
 }
 
 gtk-sharp-component_src_install() {
 	cd ${GTK_SHARP_COMPONENT_BUILD_DIR}
-	make GACUTIL_FLAGS="/root ${D}/usr/lib /gacdir /usr/lib /package gtk-sharp${GTK_SHARP_COMPONENT_SLOT_DEC}" \
+	LANG=C make GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package gtk-sharp${GTK_SHARP_COMPONENT_SLOT_DEC}" \
 		DESTDIR=${D} install || die
 }
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install
+gtk-sharp-component_pkg_postinst() {
+	if [ "${PV:0:3}" == "2.6" ]; then
+		ewarn "gtk-sharp-2.6.x is completely, and utterly unsupported by upstream."
+		ewarn "If you experience any bugs related to using gtk-sharp-2.6.x, do"
+		ewarn "*not* submit them upstream, ask about them on IRC, or email any"
+		ewarn "mailinglists. If you think you have found a genuine bug or need help,"
+		ewarn "first down grade *all* *-sharp packages to the 2.4.x release and"
+		ewarn "test there."
+	fi
+}
+
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 0645913980c5..926e3acc1102 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.1 2005/09/13 12:53:34 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.1.1.1 2005/11/30 09:59:22 chriswhite Exp $
 #
 # Original authors: Andres Loeh <kosmikus@gentoo.org>
 #                   Duncan Coutts <dcoutts@gentoo.org>
diff --git a/eclass/horde.eclass b/eclass/horde.eclass
index 20de7398430e..1ebbb93ad19e 100644
--- a/eclass/horde.eclass
+++ b/eclass/horde.eclass
@@ -1,54 +1,145 @@
-# 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/eclass/horde.eclass,v 1.1 2004/01/27 00:51:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/horde.eclass,v 1.1.1.1 2005/11/30 09:59:34 chriswhite Exp $
 #
-# Author: vapier@gentoo.org
 # Help manage the horde project http://www.horde.org/
+#
+# Author: Mike Frysinger <vapier@gentoo.org>
+# CVS additions by Chris Aniszczyk <zx@mea-culpa.net>
+# SNAP additions by Jonathan Polansky <jpolansky@lsit.ucsb.edu>
+#
+# This eclass provides generic functions to make the writing of horde
+# ebuilds fairly trivial since there are many horde applications and
+# they all share the same basic install process.
+
+# EHORDE_SNAP
+# This variable tracks whether the user is using a snapshot version
+#
+# EHORDE_SNAP_BRANCH
+# You set this via the ebuild to whatever branch you wish to grab a
+# snapshot of.  Typically this is 'HEAD' or 'RELENG'.
+#
+# EHORDE_CVS
+# This variable tracks whether the user is using a cvs version
+
+inherit webapp eutils
+[[ ${PN} != ${PN/-cvs} ]] && inherit cvs
+
+IUSE="vhosts"
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst
 
-inherit webapp-apache
+[[ -z ${HORDE_PN} ]] && HORDE_PN="${PN/horde-}"
+[[ -z ${HORDE_MAJ} ]] && HORDE_MAJ=""
 
-ECLASS=horde
-INHERITED="$INHERITED $ECLASS"
+EHORDE_CVS="false"
+EHORDE_SNAP="false"
+if [[ ${PN} != ${PN/-cvs} ]] ; then
+	EHORDE_CVS="true"
+	HORDE_PN=${HORDE_PN/-cvs}
 
-EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst
+	ECVS_SERVER="anoncvs.horde.org:/repository"
+	ECVS_MODULE="${HORDE_PN}"
+	ECVS_TOP_DIR="${DISTDIR}/cvs-src/${PN}"
+	ECVS_USER="cvsread"
+	ECVS_PASS="horde"
 
-[ -z "${HORDE_PN}" ] && HORDE_PN="${PN/horde-}"
+	SRC_URI=""
+	S=${WORKDIR}/${HORDE_PN}
+
+elif [[ ${PN} != ${PN/-snap} ]] ; then
+	EHORDE_SNAP="true"
+	EHORDE_SNAP_BRANCH=${EHORDE_SNAP_BRANCH:-HEAD}
+	SNAP_PV=${PV:0:4}-${PV:4:2}-${PV:6:2}
+
+	HORDE_PN=${HORDE_PN/-snap}
+
+	SRC_URI="http://ftp.horde.org/pub/snaps/${SNAP_PV}/${HORDE_PN}-${EHORDE_SNAP_BRANCH}-${SNAP_PV}.tar.gz"
+	S=${WORKDIR}/${HORDE_PN}
+
+else
+	SRC_URI="http://ftp.horde.org/pub/${HORDE_PN}/${HORDE_PN}${HORDE_MAJ}-${PV/_/-}.tar.gz"
+	S=${WORKDIR}/${HORDE_PN}${HORDE_MAJ}-${PV/_/-}
+fi
 HOMEPAGE="http://www.horde.org/${HORDE_PN}"
-SRC_URI="http://ftp.horde.org/pub/${HORDE_PN}/tarballs/${HORDE_PN}-${PV}.tar.gz"
 
-LICENSE="GPL-2"
-SLOT="0"
+LICENSE="LGPL-2"
 
-S=${WORKDIR}/${HORDE_PN}-${PV}
+# INSTALL_DIR is used by webapp.eclass when USE=-vhosts
+INSTALL_DIR="/horde"
+[[ ${HORDE_PN} != "horde" ]] && INSTALL_DIR="${INSTALL_DIR}/${HORDE_PN}"
 
 horde_pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-pkg_setup "${NO_WEBSERVER}"
+	webapp_pkg_setup
+
+	if [[ ! -z ${HORDE_PHP_FEATURES} ]] ; then
+		local param
+		if [[ ${HORDE_PHP_FEATURES:0:2} = "-o" ]] ; then
+			param="-o"
+			HORDE_PHP_FEATURES=${HORDE_PHP_FEATURES:2}
+		fi
+		if ! built_with_use ${param} mod_php ${HORDE_PHP_FEATURES} && \
+		   ! built_with_use ${param} php ${HORDE_PHP_FEATURES} ; then
+			eerror "You MUST re-emerge php with at least one of"
+			eerror "the following options in your USE:"
+			eerror " ${HORDE_PHP_FEATURES}"
+			die "current php install cannot support ${HORDE_PN}"
+		fi
+	fi
+}
+
+horde_src_unpack() {
+	if [[ ${EHORDE_CVS} = "true" ]] ; then
+		cvs_src_unpack
+	else
+		unpack ${A}
+	fi
+	cd "${S}"
+	[[ -f test.php ]] && chmod 000 test.php
+	[[ -n ${EHORDE_PATCHES} ]] && epatch ${EHORDE_PATCHES}
 }
 
 horde_src_install() {
-	webapp-mkdirs
+	webapp_src_preinst
+
+	local destdir=${MY_HTDOCSDIR}
 
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/horde
-	[ "${HORDE_PN}" != "horde" ] && destdir=${destdir}/${HORDE_PN}
+	# Work-around when dealing with CVS sources
+	[[ ${EHORDE_CVS} = "true" ]] && cd ${HORDE_PN}
 
 	dodoc README docs/*
 	rm -rf COPYING LICENSE README docs
 
 	dodir ${destdir}
 	cp -r . ${D}/${destdir}/
-	cd ${D}/${destdir}
+	webapp_serverowned ${MY_HTDOCSDIR}
 
-	# protecting files
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} ${D}/${destdir}
-	find ${D}/${destdir} -type f -exec chmod 0640 '{}' \;
-	find ${D}/${destdir} -type d -exec chmod 0750 '{}' \;
+	webapp_src_install
 }
 
 horde_pkg_postinst() {
-	einfo "Please read /usr/share/doc/${PF}/INSTALL.gz"
-	einfo "Before this package will work you have to setup"
+	if [[ -e ${ROOT}/usr/share/doc/${PF}/INSTALL.gz ]] ; then
+		einfo "Please read /usr/share/doc/${PF}/INSTALL.gz"
+	fi
+	einfo "Before this package will work, you have to setup"
 	einfo "the configuration files.  Please review the"
 	einfo "config/ subdirectory of ${HORDE_PN} in the webroot."
+	if [[ ${HORDE_PN} != "horde" ]] ; then
+		ewarn
+		ewarn "Make sure ${HORDE_PN} is accounted for in horde's root"
+		ewarn "    config/registry.php"
+	fi
+	if [[ ${EHORDE_CVS} = "true" ]] ; then
+		ewarn
+		ewarn "Use these CVS versions at your own risk."
+		ewarn "They tend to break things when working with"
+		ewarn "the non CVS versions of horde."
+	fi
+	if use vhosts ; then
+		echo
+		ewarn "When installing horde into a vhost dir, you will"
+		ewarn "need to use the -d option so that it is installed"
+		ewarn "into the proper location."
+	fi
+	webapp_pkg_postinst
 }
diff --git a/eclass/iiimf.eclass b/eclass/iiimf.eclass
index 0ec5a3eaec10..1b6db5520002 100644
--- a/eclass/iiimf.eclass
+++ b/eclass/iiimf.eclass
@@ -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/eclass/iiimf.eclass,v 1.1 2003/09/13 23:53:37 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/iiimf.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 #
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
@@ -8,35 +8,40 @@
 # libraries, servers, clients and modules within the Portage system.
 #
 
-ECLASS=iiimf
-INHERITED="$INHERITED $ECLASS"
 EXPORT_FUNCTIONS src_compile src_install
 
-IMSDK_PV="r${PV/./_}"
-IMSDK_PN="im-sdk"
-IMSDK_P="${IMSDK_PN}.${IMSDK_PV}"
-IMSDK="${IMSDK_P//./-}"
+IMSDK_PV="r${PV//./_}"
+MY_PV="${IMSDK_PV/_pre/-svn}"
+MY_PV="${MY_PV/_p/-svn}"
+IMSDK_P="im-sdk-src-${MY_PV}"
+IMSDK="${IMSDK_P/-src/}"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://www.openi18n.org/subgroups/im/IIIMF/"
-SRC_URI="http://www.openi18n.org/download/docs/im-sdk/${IMSDK_P}.tar.bz2"
+SRC_URI="mirror://gentoo/${IMSDK_P}.tgz
+	http://dev.gentoo.org/~usata/distfiles/${IMSDK_P}.tgz"
 
-LICENSE="MIT X"
-KEYWORDS=""		# set this!
+LICENSE="MIT X11"
 SLOT="0"
-
+KEYWORDS="~x86"
 IUSE="debug"
 
-newdepend "virtual/glibc"
+DEPEND="virtual/libc"
 
 S="${WORKDIR}/${IMSDK}/${PN}"
 
 iiimf_src_compile() {
 
+	if [ "${PV:0:2}" -eq 12 ] ; then
+		libtoolize --copy --force
+		./autogen.sh
+	fi
+
 	econf --enable-optimize \
-		`use_enable debug` || die
+		--localstatedir=/var \
+		$(use_enable debug) || die
 	# emake doesn't work on some libraries
-	make || die
+	emake -j1 || die
 }
 
 iiimf_src_install() {
diff --git a/eclass/inherit.eclass b/eclass/inherit.eclass
index 5f323b8a40fd..91dd215fd6e9 100644
--- a/eclass/inherit.eclass
+++ b/eclass/inherit.eclass
@@ -1,15 +1,12 @@
-# $Header: /var/cvsroot/gentoo-x86/eclass/inherit.eclass,v 1.1 2001/09/28 19:25:33 danarmak Exp $
-# This eclass provides the inherit() function. In the future it will be placed in ebuild.sh, but for now drobbins 
-# doesn't want to make a new portage just for my testing, so every eclass/ebuild will source this file manually and
-# then inherit(). This way whn the tmie comes for this to move into stable ebuild.sh, we can just delete the source lines.
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/inherit.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
+#
+# Author Dan Armak <danarmak@gentoo.org>
 
-ECLASSDIR=${PORTDIR}/eclass
-
-inherit() {
-    
-    while [ "$1" ]; do
-	source ${ECLASSDIR}/${1}.eclass
-    shift
-    done
-
-}
\ No newline at end of file
+##########################################################################
+#
+# This is required to exitst as without it older installed packages using the older
+# inherit method cannot be uninstalled. However, it doesn't need to contain any code :-)
+#
+##########################################################################
diff --git a/eclass/jakarta-commons.eclass b/eclass/jakarta-commons.eclass
index 0e9cfd9decbf..c3036fc248a6 100644
--- a/eclass/jakarta-commons.eclass
+++ b/eclass/jakarta-commons.eclass
@@ -1,132 +1,5 @@
-# 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/eclass/jakarta-commons.eclass,v 1.1 2003/03/18 22:36:09 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/jakarta-commons.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 
-inherit base
-ECLASS=java-commons
-INHERITED="$INHERITED $ECLASS"
-IUSE="$IUSE"
-
-DESCRIPTION="Based on the $ECLASS eclass"
-HOMEPAGE="http://jakarta.apache.org/"
-
-# deps on the build tools
-DEPEND="$DEPEND
-        >=virtual/jdk-1.3
-        >=ant-1.4
-        log4j? ( >=dev-java/log4j-1.2 )
-        junit? ( >=dev-java/junit-3.7 )"
-
-RDEPEND="$RDEPEND >=virtual/jdk-1.3"
-SLOT="$SLOT"
-
-#java-commons_src_unpack() {
-#
-#	debug-print-function $FUNCNAME $*
-#	
-#	# call base_src_unpack, which implements most of the functionality and has sections,
-#	# unlike this function. The change from base_src_unpack to kde_src_unpack is thus
-#	# wholly transparent for ebuilds.
-#	base_src_unpack $*
-#	
-#	cd ${S}
-#	debug-print "$FUNCNAME: Unpacked to $PWD"
-#}
-
-java-commons_src_compile() {
-
-	debug-print-function $FUNCNAME $*
-	[ -z "$1" ] && java-commons_src_compile all
-    ant_targetlist=`fgrep "<target" build.xml | sed -e 's/.*name="\([^"]*\)".*/\1/g'`
-    debug-print "TargetList: $ant_targetlist"
-
-	cd ${S}
-	while [ "$1" ]; do
-		case $1 in
-			myconf)
-				debug-print-section myconf
-				use jikes && myconf="$myconf -Dbuild.compiler=jikes"
-				use log4j && echo "log4j.jar=`java-config --classpath=log4j`" >> build.properties
-				use junit && echo "junit.jar=`java-config --classpath=junit`" >> build.properties
-				debug-print "$FUNCNAME: myconf: set to ${myconf}"
-				;;
-            		maketest)
-				debug-print-section maketest
-                		if [ -n "`use junit`" ]; then
-                    			if [ -n $(echo "$target" | grep "test") ]; then
-                        			ANT_OPTS=${myconf} ant test || die "Building Testing Classes Failed"
-                    			else
-                        			ANT_OPTS=${myconf} ant || die "Building Testing Classes Failed"
-                    			fi
-                		fi
-                		;;
-			make)
-				debug-print-section make
-						for each in $ant_targetlist
-						do
-							if [ "${each}" == "jar" ] ; then
-								target=${each}
-							elif [ "${each}" == "dist-jar" ] ; then
-								target=${each}
-							fi
-						done
-                		ANT_OPTS=${myconf} ant ${target} || die "Compilation Failed"
-				;;
-			makedoc)
-				debug-print-section makedoc
-				ANT_OPTS="${myconf}"
-                		target=`echo "${ant_targetlist}" | grep "^javadoc$"`
-                		debug-print "Building ${target}"
-                		if [ -n "${target}" ]; then
-                    			ant "${target}" || die "Unable to create documents"
-                		else
-                  			target=`echo "${ant_targetlist}" | grep "^doc$"`
-                  			if [ -n "${target}" ]; then
-                    				ant "${target}" || die "Unable to create documents"
-                  			fi
-                		fi
-				;;
-			all)
-				debug-print-section all
-                # Problem in commons-logging
-				java-commons_src_compile myconf make makedoc
-				;;
-		esac
-
-	shift
-	done
-}
-
-java-commons_src_install() {
-
-	debug-print-function $FUNCNAME $*
-	[ -z "$1" ] && java-commons_src_install all
-
-	cd ${S}
-	while [ "$1" ]; do
-
-		case $1 in
-			dojar)
-				debug-print-section dojar
-				[ -f dist/*.jar ] && dojar dist/*.jar
-				[ -f target/*.jar ] && dojar target/*.jar
-				;;
-	    	dohtml)
-				debug-print-section dohtml
-				[ -f LICENSE.txt ] && dodoc LICENSE.txt
-				[ -f RELEASE-NOTES.txt ] && dodoc RELEASE-NOTES.txt
-				[ -n $(ls -1 *.html 2> /dev/null | wc -l ) ] && dohtml *.html
-				[ -n $(ls -1 dist/*.html 2> /dev/null | wc -l ) ] && dohtml dist/*.html
-				[ -n $(ls -1 dist/docs/* 2> /dev/null | wc -l ) ] && dohtml -r dist/docs/*
-				;;
-	    	all)
-				debug-print-section all
-				java-commons_src_install dojar dohtml
-				;;
-		esac
-
-	shift
-	done
-}
-
-EXPORT_FUNCTIONS src_compile src_install
+# This eclass has been removed
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass
index fe8977044e8d..6993f7f438d0 100644
--- a/eclass/java-pkg.eclass
+++ b/eclass/java-pkg.eclass
@@ -1,34 +1,128 @@
-# 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/eclass/java-pkg.eclass,v 1.1 2003/04/26 11:29:16 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 
-inherit base
-ECLASS=java-pkg
-INHERITED="${INHERITED} ${ECLASS}"
-IUSE="${IUSE}"
-SLOT="${SLOT}"
+pkglistpath="${T}/java-pkg-list"
 
-java-pkg_dojar()
+java-pkg_doclass()
 {
 	debug-print-function ${FUNCNAME} $*
-	[ -z "$1" ]
-	
+	java-pkg_dojar $*
+}
+
+java-pkg_do_init_()
+{
+	debug-print-function ${FUNCNAME} $*
+
 	if [ -z "${JARDESTTREE}" ] ; then
 		JARDESTTREE="lib"
+		SODESTTREE="lib"
 	fi
-	
+
+	# Set install paths
 	sharepath="${DESTTREE}/share"
-	shareroot="${sharepath}/${PN}"
-	jardest="${shareroot}/${JARDESTTREE}"
+	if [ "$SLOT" == "0" ] ; then
+		pkg_name="${PN}"
+	else
+		pkg_name="${PN}-${SLOT}"
+	fi
+
+	shareroot="${sharepath}/${pkg_name}"
+
+	if [ -z "${jardest}" ] ; then
+		jardest="${shareroot}/${JARDESTTREE}"
+	fi
+
+	if [ -z "${sodest}" ] ; then
+		sodest="/opt/${pkg_name}/${SODESTTREE}"
+	fi
+
 	package_env="${D}${shareroot}/package.env"
-	#dodir "${jardest}"
 
 	debug-print "JARDESTTREE=${JARDESTTREE}"
+	debug-print "SODESTTREE=${SODESTTREE}"
 	debug-print "sharepath=${sharepath}"
 	debug-print "shareroot=${shareroot}"
 	debug-print "jardest=${jardest}"
+	debug-print "sodest=${sodest}"
 	debug-print "package_env=${package_env}"
+}
 
+java-pkg_do_write_()
+{
+	# Create directory for package.env
+	if [ ! -d "${D}${shareroot}" ] ; then
+		install -d "${D}${shareroot}"
+	fi
+
+	# Create package.env
+	echo "DESCRIPTION=${DESCRIPTION}" > "${package_env}"
+	if [ -n "${cp_pkg}" ]; then
+		echo "CLASSPATH=${cp_prepend}:${cp_pkg}:${cp_append}" >> "${package_env}"
+	fi
+	if [ -n "${lp_pkg}" ]; then
+		echo "LIBRARY_PATH=${lp_prepend}:${lp_pkg}:${lp_append}" >> "${package_env}"
+	fi
+	if [ -f ${pkglistpath} ] ; then
+		pkgs=$(cat ${pkglistpath} | tr '\n' ':')
+		echo "DEPEND=${pkgs}" >> "${package_env}"
+	fi
+
+	# Strip unnecessary leading and trailing colons
+	sed -e "s/=:/=/" -e "s/:$//" -i "${package_env}"
+}
+
+java-pkg_do_getsrc_()
+{
+	# Check for symlink
+	if [ -L "${i}" ] ; then
+		cp "${i}" "${T}"
+		echo "${T}"/`/usr/bin/basename "${i}"`
+
+	# Check for directory
+	elif [ -d "${i}" ] ; then
+		echo "java-pkg: warning, skipping directory ${i}"
+		continue
+	else
+		echo "${i}"
+	fi
+}
+
+
+java-pkg_doso()
+{
+	debug-print-function ${FUNCNAME} $*
+	[ -z "$1" ]
+
+	java-pkg_do_init_
+
+	# Check for arguments
+	if [ -z "$*" ] ; then
+		die "at least one argument needed"
+	fi
+
+	# Make sure directory is created
+	if [ ! -d "${D}${sodest}" ] ; then
+		install -d "${D}${sodest}"
+	fi
+
+	for i in $* ; do
+		mysrc=$(java-pkg_do_getsrc_)
+
+		# Install files
+		install -m 0755 "${mysrc}" "${D}${sodest}" || die "${mysrc} not found"
+	done
+	lp_pkg="${sodest}"
+
+	java-pkg_do_write_
+}
+
+java-pkg_dojar()
+{
+	debug-print-function ${FUNCNAME} $*
+	[ -z "$1" ]
+
+	java-pkg_do_init_
 
 	if [ -n "${DEP_PREPEND}" ] ; then
 		for i in ${DEP_PREPEND}
@@ -46,7 +140,7 @@ java-pkg_dojar()
 				die "Error in DEP_PREPEND."
 			fi
 			debug-print "cp_prepend=${cp_prepend}"
-			
+
 		done
 	fi
 
@@ -71,16 +165,72 @@ java-pkg_dojar()
 
 	# Check for arguments
 	if [ -z "$*" ] ; then
-		echo "${0}: at least one argument needed"
-		exit 1
+		die "at least one argument needed"
 	fi
 
-	# Make sure direcotry is created
+	# Make sure directory is created
 	if [ ! -d "${D}${jardest}" ] ; then
 		install -d "${D}${jardest}"
 	fi
 
 	for i in $* ; do
+		mysrc=$(java-pkg_do_getsrc_)
+
+		# Install files
+		install -m 0644 "${mysrc}" "${D}${jardest}" || die "${mysrc} not found"
+
+		# Build CLASSPATH
+		if [ -z "${cp_pkg}" ] ; then
+			cp_pkg="${jardest}"/`/usr/bin/basename "${i}"`
+		else
+			cp_pkg="${cp_pkg}:${jardest}/"`/usr/bin/basename "${i}"`
+		fi
+	done
+
+	java-pkg_do_write_
+}
+
+java-pkg_newjar()
+{
+	if [ -z "${T}" ] || [ -z "${2}" ] ; then
+		die "java-pkg_newjar: Nothing defined to do"
+	fi
+
+	rm -rf "${T}/${2}"
+	cp "${1}" "${T}/${2}"
+	java-pkg_dojar "${T}/${2}"
+}
+
+java-pkg_dowar()
+{
+	debug-print-function ${FUNCNAME} $*
+	[ -z "$1" ]
+
+	# Check for arguments
+	if [ -z "$*" ] ; then
+		die "at least one argument needed"
+	fi
+
+	if [ -z "${WARDESTTREE}" ] ; then
+		WARDESTTREE="webapps"
+	fi
+
+	sharepath="${DESTTREE}/share"
+	shareroot="${sharepath}/${PN}"
+	wardest="${shareroot}/${WARDESTTREE}"
+
+	debug-print "WARDESTTREE=${WARDESTTREE}"
+	debug-print "sharepath=${sharepath}"
+	debug-print "shareroot=${shareroot}"
+	debug-print "wardest=${wardest}"
+
+	# Patch from Joerg Schaible <joerg.schaible@gmx.de>
+	# Make sure directory is created
+	if [ ! -d "${D}${wardest}" ] ; then
+		install -d "${D}${wardest}"
+	fi
+
+	for i in $* ; do
 		# Check for symlink
 		if [ -L "${i}" ] ; then
 			cp "${i}" "${T}"
@@ -88,24 +238,132 @@ java-pkg_dojar()
 
 		# Check for directory
 		elif [ -d "${i}" ] ; then
-			echo "dojar: warning, skipping directory ${i}"
+			echo "dowar: warning, skipping directory ${i}"
 			continue
 		else
 			mysrc="${i}"
 		fi
 
-		# Iinstall files
-		install -m 0644 "${mysrc}" "${D}${jardest}"
+		# Install files
+		install -m 0644 "${mysrc}" "${D}${wardest}"
+	done
+}
 
-		# Build CLASSPATH
-		if [ -z "${cp_pkg}" ] ; then
-			cp_pkg="${jardest}"/`/usr/bin/basename "${i}"`
-		else
-			cp_pkg="${cp_pkg}:${jardest}/"`/usr/bin/basename "${i}"`
+java-pkg_dozip()
+{
+	debug-print-function ${FUNCNAME} $*
+	java-pkg_dojar $*
+}
+
+_record-jar()
+{
+	echo "$(basename $2)@$1" >> ${pkglistpath}
+}
+
+java-pkg_jarfrom() {
+	java-pkg_jar-from "$@"
+}
+
+java-pkg_jar-from()
+{
+	debug-print-function ${FUNCNAME} $*
+
+	local pkg=$1
+	local jar=$2
+	local destjar=$3
+
+	if [ -z "${destjar}" ] ; then
+		destjar=${jar}
+	fi
+
+	for x in $(java-config --classpath=${pkg} | tr ':' ' '); do
+		if [ ! -f ${x} ] ; then
+			die "Installation problems with jars in ${pkg} - is it installed?"
+			return 1
+		fi
+		_record-jar ${pkg} ${x}
+		if [ -z "${jar}" ] ; then
+			[[ -f $(basename ${x}) ]]  && rm $(basename ${x})
+			ln -snf ${x} $(basename ${x})
+		elif [ "$(basename ${x})" == "${jar}" ] ; then
+			[[ -f ${destjar} ]]  && rm ${destjar}
+			ln -snf ${x} ${destjar}
+			return 0
 		fi
 	done
-	
-	# Create package.env
-	echo "DESCRIPTION=${DESCRIPTION}" > "${package_env}"
-	echo "CLASSPATH=${cp_prepend}:${cp_pkg}:${cp_append}" >> "${package_env}"
+	if [ -z "${jar}" ] ; then
+		return 0
+	else
+		die "failed too find ${jar}"
+	fi
+}
+
+java-pkg_getjar()
+{
+
+	debug-print-function ${FUNCNAME} $*
+
+	local pkg=$1
+	local jar=$2
+
+	for x in $(java-config --classpath=${pkg} | tr ':' ' '); do
+
+		if [ ! -f ${x} ] ; then
+			die "Installation problems with jars in ${pkg} - is it installed?"
+		fi
+
+		_record-jar ${pkg} ${x}
+
+		if [ "$(basename ${x})" == "${jar}" ] ; then
+			echo ${x}
+			return 0
+		fi
+	done
+	die "Could not find $2 in $1"
+}
+
+java-pkg_getjars()
+{
+	java-config --classpath=$1
+}
+
+
+java-pkg_dohtml()
+{
+	dohtml -f package-list $@
+}
+
+java-pkg_jarinto()
+{
+	jardest=$1
+}
+
+java-pkg_sointo()
+{
+	sodest=$1
+}
+
+java-pkg_dosrc() {
+	java-pkg_do_init_
+
+	[ $# -lt 1 ] && die "${FUNCNAME[0]}: at least one argument needed"
+
+	local target="${shareroot}/source/"
+
+	local files
+	local startdir=$(pwd)
+	for x in ${@}; do
+		cd $(dirname ${x})
+		zip -q -r ${T}/${PN}-src.zip $(basename ${x}) -i '*.java'
+		local res=$?
+		if [[ ${res} != 12 && ${res} != 0 ]]; then
+			die "zip failed"
+		fi
+
+		cd ${startdir}
+	done
+
+	dodir ${target}
+	install ${INSOPTIONS} "${T}/${PN}-src.zip" "${D}${target}" \
+		|| die "failed to install sources"
 }
diff --git a/eclass/java-utils.eclass b/eclass/java-utils.eclass
index 748966cf116e..51e7a4eb03d7 100644
--- a/eclass/java-utils.eclass
+++ b/eclass/java-utils.eclass
@@ -9,22 +9,21 @@
 
 inherit eutils
 
-ECLASS=java-utils
-INHERITED="$INHERITED $ECLASS"
 DESCRIPTION="Based on the $ECLASS eclass"
 
-DEPEND=">=java-config-1.2.7"
+DEPEND=">=dev-java/java-config-1.2.7"
 
 EXPORT_FUNCTIONS pkg_setup
 
 java-utils_pkg_setup() {
 	java-utils_ensure-jdk
+
+	java-utils_vm-version-sufficient
 }
 
 java-utils_setup-vm() {
-
 	local vendor=`java-utils_get-vm-vendor`
-	if [ ${vendor} = "sun-jdk" ] && java-utils_is-vm-version 1 5; then
+	if [[ ${vendor} = "sun-jdk" ]] && java-utils_is-vm-version-ge 1 5; then
 		addpredict "/dev/random"
 	elif [[ ${vendor} = "ibm-jdk-bin" ]]; then
 		addwrite "/proc/self/maps"
@@ -47,7 +46,7 @@ java-utils_is-vm-jdk() {
 		return 0
 	else
 		return 1
-	fi	
+	fi
 }
 
 java-utils_get-vm-vendor() {
@@ -56,10 +55,17 @@ java-utils_get-vm-vendor() {
 }
 
 java-utils_get-vm-version() {
-	local version=$(java-config -f | sed -r "s/^[a-zA-Z-]+//")
+	local version=$(java-config -f | sed -e "s/.*-\([0-9.]\+\).*/\1/")
 	echo ${version}
 }
 
+java-utils_vm-version-sufficient() {
+	local version=$(echo ${DEPEND} | sed -e 's:.*virtual/jdk-\?\([^$ ]*\).*:\1:' -e 's:\.: :g')
+	if [ "${version}" != "" ]; then
+		java-utils_ensure-vm-version-ge ${version}
+	fi
+}
+
 java-utils_ensure-vm-version-ge() {
 	if ! java-utils_is-vm-version-ge $@ ; then
 		eerror "This package requires a Java VM version >= $@"
@@ -69,18 +75,17 @@ java-utils_ensure-vm-version-ge() {
 }
 
 java-utils_is-vm-version-ge() {
-	local user_major=${1-0}
-	local user_minor=${2-0}
-	local user_patch=${3-0}
+	local user_major=${1:-0}
+	local user_minor=${2:-0}
+	local user_patch=${3:-0}
 	local user_version=${user_major}.${user_minor}.${user_patch}
-	
-	local vm_version=`java-utils_get-vm-version`
-
-	local ver_rx="([0-9]+)\.([0-9]+)\.([0-9]+)(.*)"
-	local vm_major=$(echo ${vm_version} | sed -r "s/${ver_rx}/\1/")
-	local vm_minor=$(echo ${vm_version} | sed -r "s/${ver_rx}/\2/")
-	local vm_patch=$(echo ${vm_version} | sed -r "s/${ver_rx}/\3/")
-	local vm_extra=$(echo ${vm_version} | sed -r "s/${ver_rx}/\4/")
+
+	local vm_version=$(java-utils_get-vm-version)
+
+	local vm_major=$(echo ${vm_version} | cut -d. -f1)
+	local vm_minor=$(echo ${vm_version} | cut -d. -f2)
+	local vm_patch=$(echo ${vm_version} | cut -d. -f3)
+	local vm_extra=$(echo ${vm_version} | cut -d. -f4)
 
 	if [ ${vm_major} -ge ${user_major} ] && [ ${vm_minor} -gt ${user_minor} ] ; then
 		echo "Detected a JDK >= ${user_version}"
diff --git a/eclass/java.eclass b/eclass/java.eclass
index 0a34dc1cb244..e3a29746858a 100644
--- a/eclass/java.eclass
+++ b/eclass/java.eclass
@@ -1,84 +1,102 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.1.1.1 2005/11/30 09:59:21 chriswhite Exp $
+#
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.1 2002/06/25 01:35:16 karltk Exp $
 
-ECLASS=java
+inherit eutils
+
 DESCRIPTION="Based on the $ECLASS eclass"
 
 VMHANDLE=${PN}-${PV}
 
-function sed2() {
-	unset filename 
-	unset arglist
-	local filename=""
-	local arglist
-	declare -a arglist
-	while test $# -gt 0 ; do
-		case $1 in
-			-e)
-				shift
-				arglist[${#arglist[@]}]="-e"
-				arglist[${#arglist[@]}]="$1"
-			;;
-			*)
-				if [ -e "$1" ] ; then 
-					filename=$1
-				fi
-			;;
-		esac
-		shift
-	done
+EXPORT_FUNCTIONS pkg_postinst pkg_prerm
 
-	if [ ! -z $filename ] ; then 
-		mv "${filename}" "${filename}.orig"
-		sed "${arglist[@]}" < ${filename}.orig > ${filename}
-		return 0
+java_pkg_postinst() {
+	local jdk=${PN#*-}
+	if [ ${jdk:0:3} == "jdk" ]; then
+		java_set_default_vm_
 	else
-		return 1
+		# Only install the JRE as the system default if there's no JDK
+		# installed. Installing a JRE over an existing JDK will result
+		# in major breakage, see #9289.
+		if [ ! -f "${JAVAC}" ]; then
+			 ewarn "Found no JDK, setting ${VMHANDLE} as default system VM"
+			java_set_default_vm_
 	fi
+	fi
+	java_mozilla_clean_
 }
 
-java_pkg_postinst() {
-	if [ -z `java-config --java 2> /dev/null` ] ; then 
-		einfo "No default VM found, setting ${VMHANDLE} as default"
-		java-config --set-system-vm=${VMHANDLE}
+java_pkg_prerm() {
+	if java-config -J | grep -q ${P} ; then
+		ewarn "It appears you are removing your default system VM!"
+		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
 	fi
 }
 
-pkg_postinst() {
-	java_pkg_postinst
+java_set_default_vm_() {
+		java-config --set-system-vm=${VMHANDLE}
+		/usr/sbin/env-update
+		source /etc/profile
+
+	echo
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "	/usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
 }
 
 system_arch() {
 	local sarch
-	sarch=`echo $ARCH | sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
+	sarch=`echo $ARCH | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/`
 	if [ -z "$sarch" ] ; then
-		sarch=`uname -m | sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
+		sarch=`uname -m | sed -e s/[i]*.86/i386/ -e s/x86_64/amd64/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/`
 	fi
 	echo $sarch
 }
 
 set_java_env() {
-        dodir /etc/env.d/java
-        sed \
-                -e "s/@P@/${P}/g" \
-                -e "s/@PN@/${PN}/g" \
-                -e "s/@PV@/${PV}/g" \
-                -e "s/@PF@/${PF}/g" \
-                < $1 \
-                > ${D}/etc/env.d/java/20`basename $1` || die
+	dodir /etc/env.d/java
+	platform=`system_arch`
+
+	sed \
+		-e "s/@P@/${P}/g" \
+		-e "s/@PN@/${PN}/g" \
+		-e "s/@PV@/${PV}/g" \
+		-e "s/@PF@/${PF}/g" \
+		-e "s/@PLATFORM@/${platform}/g" \
+		-e "/^ADDLDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
+		< $1 \
+		> ${D}/etc/env.d/java/20`basename $1` || die
 }
 
-install_mozilla_plugin() {
-	local bn
-	bn=`basename $1`
 
-        if [ "`use mozilla`" ] ; then
-                dodir /usr/lib/mozilla/plugins
-                dosym $1 /usr/lib/mozilla/plugins/${bn}
-	fi
+java_get_plugin_dir_() {
+	echo /usr/$(get_libdir)/nsbrowser/plugins
+}
 
+install_mozilla_plugin() {
+	if [ ! -f ${D}/$1 ] ; then
+		die "Cannot find mozilla plugin at ${D}/${1}"
+	fi
 
+	local plugin_dir=$(java_get_plugin_dir_)
+	dodir ${plugin_dir}
+	dosym ${1} ${plugin_dir}/javaplugin.so
 }
 
+java_mozilla_clean_() {
+	#Because previously some ebuilds installed symlinks outside of pkg_install
+	#and are left behind, which forces you to manualy remove them to select the
+	#jdk/jre you want to use for java
+	local plugin_dir=$(java_get_plugin_dir_)
+	for file in ${plugin_dir}/javaplugin_*; do
+		rm -f ${file}
+	done
+	for file in ${plugin_dir}/libjavaplugin*; do
+		rm -f ${file}
+	done
+}
diff --git a/eclass/kde-base.eclass b/eclass/kde-base.eclass
index 618c5cea0a41..adf1e1df11c5 100644
--- a/eclass/kde-base.eclass
+++ b/eclass/kde-base.eclass
@@ -1,67 +1,11 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
+#
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.1 2001/09/28 19:25:33 danarmak Exp $
-# This is the kde ebuild for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
-. /usr/portage/inherit.eclass || die
-inherit base c autoconf || die
-ECLASS=kde
-
-DESCRIPTION="Based on the $ECLASS eclass"
-HOMEPAGE="http://www.kde.org/"
-
-DEPEND="${DEPEND} ( kde-base/kdelibs-${PV} ) dev-util/objprelink >=x11-libs/qt-x11-2.3.0"
-#RDEPEND="${RDEPEND} kde-base/kdelibs-${PV} >=x11-libs/qt-x11-2.3.0"
-
-kde_src_compile() {
-    
-    while [ "$1" ]; do
-	
-	case $1 in
-	    myconf) 	
-		use qtmt 	&& myconf="$myconf --enable-mt"
-		use mitshm	&& myconf="$myconf --enable-mitshm"
-	        use objprelink	&& myconf="$myconf --enable-objprelink"
-		;;
-	    configure)
-                ./configure --host=${CHOST} --with-x \
-		    ${myconf} --with-xinerama || die
-		;;
-	    make)
-	        make || die
-		;;
-	    all)
-		kde_src_compile myconf configure make
-		;;
-	esac
-	
-    shift
-    done
-
-}
-
-kde_src_install() {
-    
-    while [ "$1" ]; do
-
-	case $1 in
-	    make)
-		make install DESTDIR=${D} || die
-		;;
-	    dodoc)
-		dodoc AUTHORS ChangeLog README*
-		;;
-	    all)
-		kde_src_install make dodoc
-		;;
-	esac
-	
-    shift
-    done
-  
-}
-
-
-EXPORT_FUNCTIONS
-
+#
+# This was the kde ebuild for std. kde-dependant apps which follow configure/make/make install
+# procedures and have std. configure options.
+# it is now deprecated; apps should inherit kde directly.
 
+inherit kde
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index e4d4bccd159f..9acef935ab77 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,14 +1,57 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
+#
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.1 2001/10/01 13:54:38 danarmak Exp $
-# This is the kde ebuild for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
-# It can't be used for e.g. kdevelop, koffice because of their separate versionnig schemes.
-inherit kde-base kde.org || die
-ECLASS=kde-dist
+#
+# This is the kde-dist eclass for >=2.2.1 kde base packages.  Don't use for kdelibs though :-)
+# Don't use it for e.g. kdevelop, koffice because of their separate versioning schemes.
+
+inherit kde
+
+# Upstream released 3.5.0_rc1 with tarballs labelled as just 3.5.0, so we have our own copies
+# on mirror://gentoo
+if [ "$PV" == "3.5.0_rc1" ]; then
+	SRC_URI="$SRC_URI mirror://gentoo/$P.tar.bz2"
+else 
+
+	# kde 3.1 prereleases have tarball versions of 3.0.6 ff
+	unset SRC_URI
+	case "${PV}" in
+		1*)			SRC_PATH="stable/3.0.2/src/${P}.tar.bz2";; # backward compatibility for unmerging ebuilds
+		2.2.2a)			SRC_PATH="Attic/2.2.2/src/${PN}-${PV/a/}.tar.bz2" ;;
+		2.2.2*)			SRC_PATH="Attic/2.2.2/src/${P}.tar.bz2" ;;
+		3.2.0)			SRC_PATH="stable/3.2/src/${P}.tar.bz2" ;;
+		3.3.0)			SRC_PATH="stable/3.3/src/${P}.tar.bz2" ;;
+		3.4.0)			SRC_PATH="stable/3.4/src/${P}.tar.bz2" ;;
+		3.5.0)			SRC_PATH="stable/3.5/src/${P}.tar.bz2" ;;
+		3.5_alpha1)		SRC_PATH="unstable/${PV/_/-}/src/${PN}-3.4.90.tar.bz2" ;;
+		3.5_beta1)		SRC_PATH="unstable/${PV/_/-}/src/${PN}-3.4.91.tar.bz2" ;;
+		3.5.0_beta2)		SRC_PATH="unstable/3.5-beta2/src/${PN}-3.4.92.tar.bz2" ;;
+		3*)			SRC_PATH="stable/${PV}/src/${P}.tar.bz2" ;;
+		5)			SRC_URI="" # cvs ebuilds, no SRC_URI needed
+					debug-print "${ECLASS}: cvs detected" ;;
+		*)			debug-print "${ECLASS}: Error: unrecognized version $PV, could not set SRC_URI" ;;
+	esac
+	[ -n "${SRC_PATH}" ] && SRC_URI="${SRC_URI} mirror://kde/${SRC_PATH}"
+fi
+debug-print "${ECLASS}: finished, SRC_URI=${SRC_URI}"
+
+need-kde ${PV}
+
+# 3.5 prereleases
+[ "${PV}" == "3.5_alpha1" ] && S=${WORKDIR}/${PN}-3.4.90
+[ "${PV}" == "3.5_beta1" ] && S=${WORKDIR}/${PN}-3.4.91
+[ "${PV}" == "3.5.0_beta2" ] && S=${WORKDIR}/${PN}-3.4.92
+[ "${PV}" == "3.5.0_rc1" ] && S=${WORKDIR}/${PN}-3.5.0
 
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+SLOT="${KDEMAJORVER}.${KDEMINORVER}"
 
-DEPEND="$DEPEND ( kde-base/kdelibs-${PV} )"
-RDEPEND="$RDEPEND ( kde-base/kdelibs-${PV} )"
+# add blockers on split packages derived from this one
+for x in $(get-child-packages ${CATEGORY}/${PN}); do
+	DEPEND="${DEPEND} !=${x}-${SLOT}*"
+	RDEPEND="${RDEPEND} !=${x}-${SLOT}*"
+done
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index dc804da7af6b..952574585277 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,9 +1,649 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.1.1.1 2005/11/30 09:59:35 chriswhite Exp $
+#
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.1 2002/03/27 23:52:40 danarmak Exp $
-# This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.)
-ECLASS=kde-functions
+#
+# This contains everything except things that modify ebuild variables
+# and functions (e.g. $P, src_compile() etc.)
+
+inherit qt3
+
+# map of the monolithic->split ebuild derivation; used to build deps describing
+# the relationships between them
+KDE_DERIVATION_MAP='
+kde-base/kdeaccessibility kde-base/kbstateapplet
+kde-base/kdeaccessibility kde-base/kdeaccessibility-iconthemes
+kde-base/kdeaccessibility kde-base/kmag
+kde-base/kdeaccessibility kde-base/kmousetool
+kde-base/kdeaccessibility kde-base/kmouth
+kde-base/kdeaccessibility kde-base/kttsd
+kde-base/kdeaccessibility kde-base/ksayit
+kde-base/kdeaddons kde-base/atlantikdesigner
+kde-base/kdeaddons kde-base/kaddressbook-plugins
+kde-base/kdeaddons kde-base/kate-plugins
+kde-base/kdeaddons kde-base/kdeaddons-docs-konq-plugins
+kde-base/kdeaddons kde-base/kdeaddons-kfile-plugins
+kde-base/kdeaddons kde-base/kicker-applets
+kde-base/kdeaddons kde-base/knewsticker-scripts
+kde-base/kdeaddons kde-base/konq-plugins
+kde-base/kdeaddons kde-base/konqueror-akregator
+kde-base/kdeaddons kde-base/konqueror-arkplugin
+kde-base/kdeaddons kde-base/konqueror-autorefresh
+kde-base/kdeaddons kde-base/konqueror-babelfish
+kde-base/kdeaddons kde-base/konqueror-crashes
+kde-base/kdeaddons kde-base/konqueror-dirfilter
+kde-base/kdeaddons kde-base/konqueror-domtreeviewer
+kde-base/kdeaddons kde-base/konqueror-fsview
+kde-base/kdeaddons kde-base/konqueror-imagerotation
+kde-base/kdeaddons kde-base/konqueror-khtmlsettingsplugin
+kde-base/kdeaddons kde-base/konqueror-kimgalleryplugin
+kde-base/kdeaddons kde-base/konqueror-kuick
+kde-base/kdeaddons kde-base/konqueror-minitools
+kde-base/kdeaddons kde-base/konqueror-rellinks
+kde-base/kdeaddons kde-base/konqueror-searchbar
+kde-base/kdeaddons kde-base/konqueror-sidebar
+kde-base/kdeaddons kde-base/konqueror-smbmounter
+kde-base/kdeaddons kde-base/konqueror-uachanger
+kde-base/kdeaddons kde-base/konqueror-validators
+kde-base/kdeaddons kde-base/konqueror-webarchiver
+kde-base/kdeaddons kde-base/ksig
+kde-base/kdeaddons kde-base/noatun-alarm
+kde-base/kdeaddons kde-base/noatun-alsaplayer
+kde-base/kdeaddons kde-base/noatun-blurscope
+kde-base/kdeaddons kde-base/noatun-charlatan
+kde-base/kdeaddons kde-base/noatun-dub
+kde-base/kdeaddons kde-base/noatun-ffrs
+kde-base/kdeaddons kde-base/noatun-luckytag
+kde-base/kdeaddons kde-base/noatun-lyrics
+kde-base/kdeaddons kde-base/noatun-nexscope
+kde-base/kdeaddons kde-base/noatun-noatunmadness
+kde-base/kdeaddons kde-base/noatun-oblique
+kde-base/kdeaddons kde-base/noatun-pitchablespeed
+kde-base/kdeaddons kde-base/noatun-plugins
+kde-base/kdeaddons kde-base/noatun-synaescope
+kde-base/kdeaddons kde-base/noatun-tippercanoe
+kde-base/kdeaddons kde-base/noatun-tyler
+kde-base/kdeaddons kde-base/noatun-wavecapture
+kde-base/kdeaddons kde-base/renamedlg-audio
+kde-base/kdeaddons kde-base/renamedlg-images
+kde-base/kdeaddons kde-base/vimpart
+kde-base/kdeadmin kde-base/kcmlinuz
+kde-base/kdeadmin kde-base/kcron
+kde-base/kdeadmin kde-base/kdat
+kde-base/kdeadmin kde-base/kdeadmin-kfile-plugins
+kde-base/kdeadmin kde-base/kpackage
+kde-base/kdeadmin kde-base/ksysv
+kde-base/kdeadmin kde-base/kuser
+kde-base/kdeadmin kde-base/lilo-config
+kde-base/kdeadmin kde-base/secpolicy
+kde-base/kdeartwork kde-base/kdeartwork-emoticons
+kde-base/kdeartwork kde-base/kdeartwork-icewm-themes
+kde-base/kdeartwork kde-base/kdeartwork-iconthemes
+kde-base/kdeartwork kde-base/kdeartwork-kscreensaver
+kde-base/kdeartwork kde-base/kdeartwork-kwin-styles
+kde-base/kdeartwork kde-base/kdeartwork-kworldclock
+kde-base/kdeartwork kde-base/kdeartwork-sounds
+kde-base/kdeartwork kde-base/kdeartwork-styles
+kde-base/kdeartwork kde-base/kdeartwork-wallpapers
+kde-base/kdebase kde-base/drkonqi
+kde-base/kdebase kde-base/kappfinder
+kde-base/kdebase kde-base/kate
+kde-base/kdebase kde-base/kcheckpass
+kde-base/kdebase kde-base/kcminit
+kde-base/kdebase kde-base/kcontrol
+kde-base/kdebase kde-base/kdcop
+kde-base/kdebase kde-base/kdebase-applnk
+kde-base/kdebase kde-base/kdebase-data
+kde-base/kdebase kde-base/kdebase-kioslaves
+kde-base/kdebase kde-base/kdebase-l10n
+kde-base/kdebase kde-base/kdebase-pics
+kde-base/kdebase kde-base/kdebase-startkde
+kde-base/kdebase kde-base/kdebugdialog
+kde-base/kdebase kde-base/kdepasswd
+kde-base/kdebase kde-base/kdeprint
+kde-base/kdebase kde-base/kdesktop
+kde-base/kdebase kde-base/kdesu
+kde-base/kdebase kde-base/kdialog
+kde-base/kdebase kde-base/kdm
+kde-base/kdebase kde-base/kfind
+kde-base/kdebase kde-base/khelpcenter
+kde-base/kdebase kde-base/khotkeys
+kde-base/kdebase kde-base/kicker
+kde-base/kdebase kde-base/klipper
+kde-base/kdebase kde-base/kmenuedit
+kde-base/kdebase kde-base/knetattach
+kde-base/kdebase kde-base/konqueror
+kde-base/kdebase kde-base/konsole
+kde-base/kdebase kde-base/kpager
+kde-base/kdebase kde-base/kpersonalizer
+kde-base/kdebase kde-base/kreadconfig
+kde-base/kdebase kde-base/kscreensaver
+kde-base/kdebase kde-base/ksmserver
+kde-base/kdebase kde-base/ksplashml
+kde-base/kdebase kde-base/kstart
+kde-base/kdebase kde-base/ksysguard
+kde-base/kdebase kde-base/ksystraycmd
+kde-base/kdebase kde-base/ktip
+kde-base/kdebase kde-base/kwin
+kde-base/kdebase kde-base/kxkb
+kde-base/kdebase kde-base/libkonq
+kde-base/kdebase kde-base/nsplugins
+kde-base/kdebindings kde-base/dcopc
+kde-base/kdebindings kde-base/dcopjava
+kde-base/kdebindings kde-base/dcopperl
+kde-base/kdebindings kde-base/dcoppython
+kde-base/kdebindings kde-base/kalyptus
+kde-base/kdebindings kde-base/kdejava
+kde-base/kdebindings kde-base/kjsembed
+kde-base/kdebindings kde-base/korundum
+kde-base/kdebindings kde-base/qtjava
+kde-base/kdebindings kde-base/qtruby
+kde-base/kdebindings kde-base/qtsharp
+kde-base/kdebindings kde-base/smoke
+kde-base/kdebindings kde-base/xparts
+kde-base/kdeedu kde-base/blinken
+kde-base/kdeedu kde-base/kalzium
+kde-base/kdeedu kde-base/kanagram
+kde-base/kdeedu kde-base/kbruch
+kde-base/kdeedu kde-base/kdeedu-applnk
+kde-base/kdeedu kde-base/keduca
+kde-base/kdeedu kde-base/kgeography
+kde-base/kdeedu kde-base/khangman
+kde-base/kdeedu kde-base/kig
+kde-base/kdeedu kde-base/kiten
+kde-base/kdeedu kde-base/klatin
+kde-base/kdeedu kde-base/klettres
+kde-base/kdeedu kde-base/kmathtool
+kde-base/kdeedu kde-base/kmessedwords
+kde-base/kdeedu kde-base/kmplot
+kde-base/kdeedu kde-base/kpercentage
+kde-base/kdeedu kde-base/kstars
+kde-base/kdeedu kde-base/ktouch
+kde-base/kdeedu kde-base/kturtle
+kde-base/kdeedu kde-base/kverbos
+kde-base/kdeedu kde-base/kvoctrain
+kde-base/kdeedu kde-base/kwordquiz
+kde-base/kdeedu kde-base/libkdeedu
+kde-base/kdegames kde-base/atlantik
+kde-base/kdegames kde-base/kasteroids
+kde-base/kdegames kde-base/katomic
+kde-base/kdegames kde-base/kbackgammon
+kde-base/kdegames kde-base/kbattleship
+kde-base/kdegames kde-base/kblackbox
+kde-base/kdegames kde-base/kbounce
+kde-base/kdegames kde-base/kenolaba
+kde-base/kdegames kde-base/kfouleggs
+kde-base/kdegames kde-base/kgoldrunner
+kde-base/kdegames kde-base/kjumpingcube
+kde-base/kdegames kde-base/klickety
+kde-base/kdegames kde-base/klines
+kde-base/kdegames kde-base/kmahjongg
+kde-base/kdegames kde-base/kmines
+kde-base/kdegames kde-base/kolf
+kde-base/kdegames kde-base/konquest
+kde-base/kdegames kde-base/kpat
+kde-base/kdegames kde-base/kpoker
+kde-base/kdegames kde-base/kreversi
+kde-base/kdegames kde-base/ksame
+kde-base/kdegames kde-base/kshisen
+kde-base/kdegames kde-base/ksirtet
+kde-base/kdegames kde-base/ksmiletris
+kde-base/kdegames kde-base/ksnake
+kde-base/kdegames kde-base/ksokoban
+kde-base/kdegames kde-base/kspaceduel
+kde-base/kdegames kde-base/ktron
+kde-base/kdegames kde-base/ktuberling
+kde-base/kdegames kde-base/kwin4
+kde-base/kdegames kde-base/libkdegames
+kde-base/kdegames kde-base/libksirtet
+kde-base/kdegames kde-base/lskat
+kde-base/kdegraphics kde-base/kamera
+kde-base/kdegraphics kde-base/kcoloredit
+kde-base/kdegraphics kde-base/kdegraphics-kfile-plugins
+kde-base/kdegraphics kde-base/kdvi
+kde-base/kdegraphics kde-base/kfax
+kde-base/kdegraphics kde-base/kgamma
+kde-base/kdegraphics kde-base/kghostview
+kde-base/kdegraphics kde-base/kiconedit
+kde-base/kdegraphics kde-base/kmrml
+kde-base/kdegraphics kde-base/kolourpaint
+kde-base/kdegraphics kde-base/kooka
+kde-base/kdegraphics kde-base/kpdf
+kde-base/kdegraphics kde-base/kpovmodeler
+kde-base/kdegraphics kde-base/kruler
+kde-base/kdegraphics kde-base/ksnapshot
+kde-base/kdegraphics kde-base/ksvgplugin
+kde-base/kdegraphics kde-base/ksvg
+kde-base/kdegraphics kde-base/kuickshow
+kde-base/kdegraphics kde-base/kview
+kde-base/kdegraphics kde-base/kviewshell
+kde-base/kdegraphics kde-base/libkscan
+kde-base/kdegraphics kde-base/libksvg
+kde-base/kdemultimedia kde-base/akode
+kde-base/kdemultimedia kde-base/artsplugin-akode
+kde-base/kdemultimedia kde-base/artsplugin-audiofile
+kde-base/kdemultimedia kde-base/artsplugin-mpeglib
+kde-base/kdemultimedia kde-base/artsplugin-mpg123
+kde-base/kdemultimedia kde-base/artsplugin-xine
+kde-base/kdemultimedia kde-base/juk
+kde-base/kdemultimedia kde-base/kaboodle
+kde-base/kdemultimedia kde-base/kaudiocreator
+kde-base/kdemultimedia kde-base/kdemultimedia-arts
+kde-base/kdemultimedia kde-base/kdemultimedia-kappfinder-data
+kde-base/kdemultimedia kde-base/kdemultimedia-kfile-plugins
+kde-base/kdemultimedia kde-base/kdemultimedia-kioslaves
+kde-base/kdemultimedia kde-base/kmid
+kde-base/kdemultimedia kde-base/kmix
+kde-base/kdemultimedia kde-base/krec
+kde-base/kdemultimedia kde-base/kscd
+kde-base/kdemultimedia kde-base/libkcddb
+kde-base/kdemultimedia kde-base/mpeglib
+kde-base/kdemultimedia kde-base/noatun
+kde-base/kdenetwork kde-base/dcoprss
+kde-base/kdenetwork kde-base/kdenetwork-filesharing
+kde-base/kdenetwork kde-base/kdenetwork-kfile-plugins
+kde-base/kdenetwork kde-base/kdict
+kde-base/kdenetwork kde-base/kdnssd
+kde-base/kdenetwork kde-base/kget
+kde-base/kdenetwork kde-base/knewsticker
+kde-base/kdenetwork kde-base/kopete
+kde-base/kdenetwork kde-base/kpf
+kde-base/kdenetwork kde-base/kppp
+kde-base/kdenetwork kde-base/krdc
+kde-base/kdenetwork kde-base/krfb
+kde-base/kdenetwork kde-base/ksirc
+kde-base/kdenetwork kde-base/ktalkd
+kde-base/kdenetwork kde-base/kwifimanager
+kde-base/kdenetwork kde-base/librss
+kde-base/kdenetwork kde-base/lisa
+kde-base/kdepim kde-base/akregator
+kde-base/kdepim kde-base/certmanager
+kde-base/kdepim kde-base/kaddressbook
+kde-base/kdepim kde-base/kalarm
+kde-base/kdepim kde-base/kandy
+kde-base/kdepim kde-base/karm
+kde-base/kdepim kde-base/kdepim-kioslaves
+kde-base/kdepim kde-base/kdepim-kresources
+kde-base/kdepim kde-base/kdepim-wizards
+kde-base/kdepim kde-base/kitchensync
+kde-base/kdepim kde-base/kmail
+kde-base/kdepim kde-base/kmailcvt
+kde-base/kdepim kde-base/kmobile
+kde-base/kdepim kde-base/knode
+kde-base/kdepim kde-base/knotes
+kde-base/kdepim kde-base/kode
+kde-base/kdepim kde-base/konsolekalendar
+kde-base/kdepim kde-base/kontact
+kde-base/kdepim kde-base/kontact-specialdates
+kde-base/kdepim kde-base/korganizer
+kde-base/kdepim kde-base/korn
+kde-base/kdepim kde-base/kpilot
+kde-base/kdepim kde-base/ksync
+kde-base/kdepim kde-base/ktnef
+kde-base/kdepim kde-base/libkcal
+kde-base/kdepim kde-base/libkdenetwork
+kde-base/kdepim kde-base/libkdepim
+kde-base/kdepim kde-base/libkholidays
+kde-base/kdepim kde-base/libkmime
+kde-base/kdepim kde-base/libkpgp
+kde-base/kdepim kde-base/libkpimexchange
+kde-base/kdepim kde-base/libkpimidentities
+kde-base/kdepim kde-base/libksieve
+kde-base/kdepim kde-base/mimelib
+kde-base/kdepim kde-base/networkstatus
+kde-base/kdesdk kde-base/cervisia
+kde-base/kdesdk kde-base/kapptemplate
+kde-base/kdesdk kde-base/kbabel
+kde-base/kdesdk kde-base/kbugbuster
+kde-base/kdesdk kde-base/kcachegrind
+kde-base/kdesdk kde-base/kdesdk-kfile-plugins
+kde-base/kdesdk kde-base/kdesdk-kioslaves
+kde-base/kdesdk kde-base/kdesdk-misc
+kde-base/kdesdk kde-base/kdesdk-scripts
+kde-base/kdesdk kde-base/kmtrace
+kde-base/kdesdk kde-base/kompare
+kde-base/kdesdk kde-base/kspy
+kde-base/kdesdk kde-base/kuiviewer
+kde-base/kdesdk kde-base/umbrello
+kde-base/kdetoys kde-base/amor
+kde-base/kdetoys kde-base/eyesapplet
+kde-base/kdetoys kde-base/fifteenapplet
+kde-base/kdetoys kde-base/kmoon
+kde-base/kdetoys kde-base/kodo
+kde-base/kdetoys kde-base/kteatime
+kde-base/kdetoys kde-base/ktux
+kde-base/kdetoys kde-base/kweather
+kde-base/kdetoys kde-base/kworldwatch
+kde-base/kdeutils kde-base/ark
+kde-base/kdeutils kde-base/kcalc
+kde-base/kdeutils kde-base/kcharselect
+kde-base/kdeutils kde-base/kdelirc
+kde-base/kdeutils kde-base/kdf
+kde-base/kdeutils kde-base/kedit
+kde-base/kdeutils kde-base/kfloppy
+kde-base/kdeutils kde-base/kgpg
+kde-base/kdeutils kde-base/khexedit
+kde-base/kdeutils kde-base/kjots
+kde-base/kdeutils kde-base/klaptopdaemon
+kde-base/kdeutils kde-base/kmilo
+kde-base/kdeutils kde-base/kregexpeditor
+kde-base/kdeutils kde-base/ksim
+kde-base/kdeutils kde-base/ktimer
+kde-base/kdeutils kde-base/kwalletmanager
+kde-base/kdeutils kde-base/superkaramba
+kde-base/kdewebdev kde-base/kfilereplace
+kde-base/kdewebdev kde-base/kimagemapeditor
+kde-base/kdewebdev kde-base/klinkstatus
+kde-base/kdewebdev kde-base/kommander
+kde-base/kdewebdev kde-base/kxsldbg
+kde-base/kdewebdev kde-base/quanta
+app-office/koffice app-office/karbon
+app-office/koffice app-office/kchart
+app-office/koffice app-office/kexi
+app-office/koffice app-office/kformula
+app-office/koffice app-office/kivio
+app-office/koffice app-office/koffice-data
+app-office/koffice app-office/koffice-libs
+app-office/koffice app-office/koffice-meta
+app-office/koffice app-office/koshell
+app-office/koffice app-office/kpresenter
+app-office/koffice app-office/krita
+app-office/koffice app-office/kspread
+app-office/koffice app-office/kugar
+app-office/koffice app-office/kword
+'
+
+# accepts 1 parameter, the name of a split ebuild; echoes the name of its mother package
+get-parent-package () {
+	local target=$1 parent child
+	echo "$KDE_DERIVATION_MAP" | while read parent child; do
+		if [ "$target" == "$child" ]; then
+			echo $parent
+			return 1
+		fi
+	done
+	[ "$?" == "0" ] && die "Package $target not found in KDE_DERIVATION_MAP, please report bug"
+}
+
+# accepts 1 parameter, the name of a monolithic package; echoes the names of all ebuilds derived from it
+get-child-packages () {
+	local target=$1 parent child
+	echo "$KDE_DERIVATION_MAP" | while read parent child; do
+		if [ "$target" == "$parent" ]; then
+			echo -n "$child "
+		fi
+	done
+}
+
+# convinience functions for requesting autotools versions
+need-automake() {
+
+	debug-print-function $FUNCNAME $*
+
+	unset WANT_AUTOMAKE
+
+	case $1 in
+		1.4)	export WANT_AUTOMAKE=1.4;;
+		1.5)	export WANT_AUTOMAKE=1.5;;
+		1.6)	export WANT_AUTOMAKE=1.6;;
+		1.7)	export WANT_AUTOMAKE='1.7';;
+		*)		echo "!!! $FUNCNAME: Error: unrecognized automake version $1 requested";;
+	esac
+
+}
+
+need-autoconf() {
+
+	debug-print-function $FUNCNAME $*
+
+	unset WANT_AUTOCONF
+	case $1 in
+		2.1)	export WANT_AUTOCONF=2.1;;
+		2.5)	export WANT_AUTOCONF=2.5;;
+		*)		echo "!!! $FUNCNAME: Error: unrecognized autoconf version $1 requested";;
+	esac
+
+}
+
+# Usage: deprange minver maxver package [...]
+# For minver, a -rN part is supported. For both minver and maxver, _alpha/beta/pre/rc suffixes
+# are supported, but not _p suffixes or teminating letters (eg 3.3.1a).
+# This function echoes a string of the form (for package="kde-base/kdelibs")
+# || ( =kde-base/kdelibs-3.3.1-r1 ~kde-base/kdelibs-3.3.2 ~kde-base/kdelibs-3.3.3 )
+# This dep means versions of package from maxver through minver will be acceptable.
+# Note that only the kde versioning scheme is supported - ie x.y, and we only iterate through y
+# (i.e. x can contain more . separators).
+deprange() {
+	echo -n "|| ( "
+	deprange-list $@
+	echo -n " )"
+}
+deprange-list() {
+	# Assign, parse params
+	local MINVER=$1; shift
+	local MAXVER=$1; shift
+	
+	# Workaround for 3.5.0_beta1 ebuilds being mistakenly versioned as 3.5_beta1
+	# Ugly kludge, but will disappear once 3.5 prerelease ebuilds are removed from portage
+	if [ "$MINVER" == "3.5_beta1" ]; then
+
+		MINVER="3.5.0_beta1"
+		FINALOPTIONVER="3.5_beta1"
+	fi
+	if [ "$MAXVER" == "3.5_beta1" ]; then
+		MAXVER="3.5.0_beta1"
+	fi
+	
+	# Get base version - the major X.Y components
+	local BASEVER=${MINVER%.*}
+	if [ "${MAXVER%.*}" != "$BASEVER" ]; then
+		die "deprange(): unsupported parameters $MINVER $MAXVER - BASEVER must be identical"
+	fi
+
+	# Get version suffixes
+	local MINSUFFIX MAXSUFFIX
+	if [ "$MINVER" != "${MINVER/_}" ]; then
+		MINSUFFIX=${MINVER##*_}
+		SUFFIXLESSMINVER=${MINVER%_*}
+	else
+		SUFFIXLESSMINVER=$MINVER
+	fi
+	if [ "$MAXVER" != "${MAXVER/_}" ]; then
+		MAXSUFFIX=${MAXVER##*_}
+		SUFFIXLESSMAXVER=${MAXVER%_*}
+	else
+		SUFFIXLESSMAXVER=$MAXVER
+	fi
+
+	# Separate out the optional lower bound revision number
+	if [ "$MINVER" != "${MINVER/-}" ]; then
+		local MINREV=${MINVER##*-}
+	fi
+
+	# Get minor version components (the 1 in 3.3.1)
+	local MINMINOR=${SUFFIXLESSMINVER##*.}
+	local MAXMINOR=${SUFFIXLESSMAXVER##*.}
+
+	# Iterate over packages
+	while [ -n "$1" ]; do
+		local PACKAGE=$1
+		shift
+
+		local NEWDEP=""
+
+		# If the two versions are identical, our job is simple
+		if [ "$MINVER" == "$MAXVER" ]; then
+			NEWDEP="~$PACKAGE-$MINVER"
+
+		# If the range bounds differ only by their suffixes
+		elif [ "$MINMINOR" == "$MAXMINOR" ]; then
+			NEWDEP="$(deprange-iterate-suffixes ~$PACKAGE-$BASEVER.$MINMINOR $MINSUFFIX $MAXSUFFIX)"
+
+			# Revision constraint on lower bound
+			if [ -n "$MINREV" ]; then
+				NEWDEP="$NEWDEP
+						$(deprange-iterate-numbers =$PACKAGE-$BASEVER.${MINMINOR}_$MINSUFFIX-r $MINREV 99)"
+			fi
+
+		# If the minor version numbers are different too
+		else
+
+			# Max version's allowed suffixes
+			if [ -n "$MAXSUFFIX" ]; then
+				NEWDEP="$(deprange-iterate-suffixes ~$PACKAGE-$BASEVER.$MAXMINOR alpha1 $MAXSUFFIX)"
+			fi
+
+			# regular versions in between
+			if [ -n "$MINREV" -a -z "$MINSUFFIX" ]; then
+				let MAXMINOR++
+			fi
+			NEWDEP="$NEWDEP
+					$(deprange-iterate-numbers ~${PACKAGE}-${BASEVER}. $MINMINOR $MAXMINOR)"
+
+			# Min version's allowed suffixes
+			if [ -n "$MINSUFFIX" ]; then
+				NEWDEP="$NEWDEP
+						$(deprange-iterate-suffixes ~$PACKAGE-$BASEVER.$MINMINOR $MINSUFFIX rc10)"
+			fi
+			if [ -n "$MINREV" ]; then
+				local BASE
+				if [ -n "$MINSUFFIX" ]; then
+					BASE="=$PACKAGE-$BASEVER.${MINMINOR}_${MINSUFFIX%-r*}-r"
+				else
+					BASE="=$PACKAGE-$BASEVER.${MINMINOR%-r*}-r"
+				fi
+				NEWDEP="$NEWDEP
+						$(deprange-iterate-numbers $BASE ${MINREV#r} 99)"
+			fi
+		fi
+		
+		# second part of kludge
+		if [ -n "$FINALOPTIONVER" ]; then
+			NEWDEP="$NEWDEP ~$PACKAGE-$FINALOPTIONVER"
+		fi
+		
+		# Output
+		echo -n $NEWDEP
+	done
+}
+
+# This internal function iterates over simple ranges where only a numerical suffix changes
+# Parameters: base name, lower bound, upper bound
+deprange-iterate-numbers() {
+	local package=$1 lower=$2 upper=$3 i newdep=""
+	for (( i=$upper ; $i >= $lower ; i-- )) ; do
+		newdep="$newdep ${package}${i}"
+	done
+	echo -n $newdep
+}
+
+# This internal function iterates over ranges with the same base version and different suffixes.
+# If the lower bound has a revision number, this function won't mention the lower bound in its output.
+# Parameters: base name, lower version suffix, upper version suffix
+# eg: deprange-iterate-suffixes ~kde-base/libkonq-3.4.0 alpha8 beta2
+deprange-iterate-suffixes() {
+	local NAME=$1 MINSUFFIX=$2 MAXSUFFIX=$3
+
+	# Separate out the optional lower bound revision number
+	if [ "$MINSUFFIX" != "${MINSUFFIX/-}" ]; then
+		local MINREV=${MINSUFFIX##*-}
+	fi
+	MINSUFFIX=${MINSUFFIX%-*}
+
+	# Separate out the version suffixes
+	local MINalpha MINbeta MINpre MINrc
+	if [ "$MINSUFFIX" != "${MINSUFFIX/alpha}" ]; then
+		MINalpha="${MINSUFFIX##alpha}"
+	elif [ "$MINSUFFIX" != "${MINSUFFIX/beta}" ]; then
+		MINbeta="${MINSUFFIX##beta}"
+	elif [ "$MINSUFFIX" != "${MINSUFFIX/pre}" ]; then
+		MINpre="${MINSUFFIX##pre}"
+	elif [ "$MINSUFFIX" != "${MINSUFFIX/rc}" ]; then
+		MINrc="${MINSUFFIX##rc}"
+	else
+		die "deprange(): version suffix $MINSUFFIX (probably _pN) not supported"
+	fi
+	local MAXalpha MAXbeta MAXpre MAXrc
+	if [ "$MAXSUFFIX" != "${MAXSUFFIX/alpha}" ]; then
+		MAXalpha="${MAXSUFFIX##alpha}"
+	elif [ "$MAXSUFFIX" != "${MAXSUFFIX/beta}" ]; then
+		MAXbeta="${MAXSUFFIX##beta}"
+	elif [ "$MAXSUFFIX" != "${MAXSUFFIX/pre}" ]; then
+		MAXpre="${MAXSUFFIX##pre}"
+	elif [ "$MAXSUFFIX" != "${MAXSUFFIX/rc}" ]; then
+		MAXrc="${MAXSUFFIX##rc}"
+	else
+		die "deprange(): version suffix $MAXSUFFIX (probably _pN) not supported"
+	fi
+
+	local started="" NEWDEP="" var
+
+	# Loop over version suffixes
+	for suffix in rc pre beta alpha; do
+		local upper="" lower=""
+
+		# If -n $started, we've encountered the upper bound in a previous iteration
+		# and so we use the maximum allowed upper bound for this prefix
+		if [ -n "$started" ]; then
+			upper=10
+
+		else
+
+			# Test for the upper bound in the current iteration
+			var=MAX$suffix
+			if [ -n "${!var}" ]; then
+				upper=${!var}
+				started=yes
+			fi
+		fi
+
+		# If the upper bound has been found
+		if [ -n "$upper" ]; then
+
+			# Test for the lower bound in the current iteration (of the loop over prefixes)
+			var=MIN$suffix
+			if [ -n "${!var}" ]; then
+				lower=${!var}
+
+				# If the lower bound has a revision number, don't touch that yet
+				if [ -n "$MINREV" ]; then
+					let lower++
+				fi
+
+			# If not found, we go down to the minimum allowed for this prefix
+			else
+				lower=1
+			fi
+
+			# Add allowed versions with this prefix
+			NEWDEP="$NEWDEP
+					$(deprange-iterate-numbers ${NAME}_${suffix} $lower $upper)"
+
+			# If we've encountered the lower bound on this iteration, don't consider additional prefixes
+			if [ -n "${!var}" ]; then
+				break
+			fi
+		fi
+	done
+	echo -n $NEWDEP
+}
+
+# Wrapper around deprange() used for deps between split ebuilds.
+# It adds the parent monolithic ebuild of the dep as an alternative dep.
+deprange-dual() {
+	local MIN=$1 MAX=$2 NEWDEP=""
+	shift; shift
+	for PACKAGE in $@; do
+		PARENT=$(get-parent-package $PACKAGE)
+		NEWDEP="$NEWDEP || ( $(deprange-list $MIN $MAX $PACKAGE)"
+		if [ "$PARENT" != "$(get-parent-package $CATEGORY/$PN)" ]; then
+			NEWDEP="$NEWDEP $(deprange-list $MIN $MAX $PARENT)"
+		fi
+		NEWDEP="$NEWDEP )"
+	done
+	echo -n $NEWDEP
+}
 
 # ---------------------------------------------------------------
 # kde/qt directory management etc. functions, was kde-dirs.ebuild
@@ -13,72 +653,180 @@ need-kde() {
 
 	debug-print-function $FUNCNAME $*
 	KDEVER="$1"
-	
-	#newdepend ">=kde-base/kdelibs-$KDEVER"
-	min-kde-ver $KDEVER
-	newdepend "=kde-base/kdelibs-${selected_version}*"
-	set-kdedir $KDEVER
 
-	qtver-from-kdever $KDEVER
-	need-qt $selected_version
+	# determine install locations
+	set-kdedir ${KDEVER}
 
+	# ask for autotools
+	case "${KDEVER}" in
+		3.1.[234])	# Newer 3.1.x versions are built with automake 1.7, and have errors when using 1.6
+			need-automake 1.7
+			need-autoconf 2.5
+			;;
+		3.1*)	# actually, newer 3.0.x stuff uses this too, but i want to make a clean switch
+			need-automake 1.6
+			need-autoconf 2.5
+			;;
+		3*)	# a generic call for need-kde 3 - automake 1.7 works most often
+			need-autoconf 2.5
+			need-automake 1.7
+			;;
+		5*)
+			need-autoconf 2.5
+			need-automake 1.7
+			;;
+	esac
+
+	if [ -n "${KDEBASE}" ]; then
+		# If we're a kde-base package, we need at least our own version of kdelibs.
+		# Also, split kde-base ebuilds are not updated with every KDE release, and so
+		# can require support of different versions of kdelibs.
+		# KM_DEPRANGE should contain 2nd and 3rd parameter to deprange:
+		# max and min KDE versions. E.g. KM_DEPRANGE="$PV $MAXKDEVER".
+		# Note: we only set RDEPEND if it is already set, otherwise
+		# we break packages relying on portage copying RDEPEND from DEPEND.
+		if [ -n "${KM_DEPRANGE}" ]; then
+			DEPEND="${DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)"
+			[ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)"
+		else
+			DEPEND="${DEPEND} ~kde-base/kdelibs-$PV"
+			[ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} ~kde-base/kdelibs-${PV}"
+		fi
+	else
+		# Things outside kde-base only need a minimum version
+		min-kde-ver ${KDEVER}
+		DEPEND="${DEPEND} >=kde-base/kdelibs-${selected_version}"
+		[ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} >=kde-base/kdelibs-${selected_version}"
+	fi
+
+	qtver-from-kdever ${KDEVER}
+	need-qt ${selected_version}
+
+	if [ -n "${KDEBASE}" ]; then
+		SLOT="$KDEMAJORVER.$KDEMINORVER"
+	else
+		SLOT="0"
+	fi
 }
 
 set-kdedir() {
 
 	debug-print-function $FUNCNAME $*
-	
-	# default settings for older make.globals versions which don't include the default KDE?DIR settings
-	[ -z "$KDE2DIR" ] && export KDE2DIR="/usr/kde/2"
-	[ -z "$KDE3DIR" ] && export KDE3DIR="/usr/kde/3"
-	# not defined at all by default
-	[ -z "$KDE2LIBSDIR" ] && export KDE2LIBSDIR="$KDE2DIR" 
-	[ -z "$KDE3LIBSDIR" ] && export KDE3LIBSDIR="$KDE3DIR" 
-	
-	# select 1st element in dot-separated string
-	IFSBACKUP=$IFS
-	IFS="."
-	KDEMAJORVER=""
+
+
+	# set install location:
+	# - 3rd party apps go into /usr, and have SLOT="0".
+	# - kde-base category ebuilds go into /usr/kde/$MAJORVER.$MINORVER,
+	# and have SLOT="$MAJORVER.$MINORVER".
+	# - kde-base category cvs ebuilds have major version 5 and go into
+	# /usr/kde/cvs; they have SLOT="cvs".
+	# - Backward-compatibility exceptions: all kde2 packages (kde-base or otherwise)
+	# go into /usr/kde/2. kde 3.0.x goes into /usr/kde/3 (and not 3.0).
+	# - kde-base category ebuilds always depend on their exact matching version of
+	# kdelibs and link against it. Other ebuilds link aginst the latest one found.
+	# - This function exports $PREFIX (location to install to) and $KDEDIR
+	# (location of kdelibs to link against) for all ebuilds.
+	#
+	# -- Overrides - deprecated but working for now: --
+	# - If $KDEPREFIX is defined (in the profile or env), it overrides everything
+	# and both base and 3rd party kde stuff goes in there.
+	# - If $KDELIBSDIR is defined, the kdelibs installed in that location will be
+	# used, even by kde-base packages.
+
+	# get version elements
+	IFSBACKUP="$IFS"
+	IFS=".-_"
 	for x in $1; do
-		[ -z "$KDEMAJORVER" ] && KDEMAJORVER=$x
+		if [ -z "$KDEMAJORVER" ]; then KDEMAJORVER=$x
+		else if [ -z "$KDEMINORVER" ]; then KDEMINORVER=$x
+		else if [ -z "$KDEREVISION" ]; then KDEREVISION=$x
+		fi; fi; fi
 	done
-	IFS=$IFSBACKUP
-	
-	case $KDEMAJORVER in
-	    2) export KDEDIR=${KDE2LIBSDIR};;
-	    3) export KDEDIR=${KDE3LIBSDIR};;
-	esac
-	
-	debug-print "$FUNCNAME: result: KDEDIR=$KDEDIR"
+	[ -z "$KDEMINORVER" ] && KDEMINORVER="0"
+	[ -z "$KDEREVISION" ] && KDEREVISION="0"
+	IFS="$IFSBACKUP"
+	debug-print "$FUNCNAME: version breakup: KDEMAJORVER=$KDEMAJORVER KDEMINORVER=$KDEMINORVER KDEREVISION=$KDEREVISION"
 
-}
+	# install prefix
+	if [ -n "$KDEPREFIX" ]; then
+		export PREFIX="$KDEPREFIX"
+	elif [ "$KDEMAJORVER" == "2" ]; then
+		export PREFIX="/usr/kde/2"
+	else
+		if [ -z "$KDEBASE" ]; then
+			export PREFIX="/usr"
+		else
+			case $KDEMAJORVER.$KDEMINORVER in
+				3.0) export PREFIX="/usr/kde/3";;
+				3.1) export PREFIX="/usr/kde/3.1";;
+				3.2) export PREFIX="/usr/kde/3.2";;
+				3.3) export PREFIX="/usr/kde/3.3";;
+				3.4) export PREFIX="/usr/kde/3.4";;
+				3.5) export PREFIX="/usr/kde/3.5";;
+				5.0) export PREFIX="/usr/kde/cvs";;
+				*) die "failed to set PREFIX";;
+			esac
+		fi
+	fi
 
-need-qt() {
+	# kdelibs location
+	if [ -n "$KDELIBSDIR" ]; then
+		export KDEDIR="$KDELIBSDIR"
+	elif [ "$KDEMAJORVER" == "2" ]; then
+		export KDEDIR="/usr/kde/2"
+	else
+		if [ -z "$KDEBASE" ]; then
+			# find the latest kdelibs installed
+			for x in /usr/kde/{cvs,3.5,3.4,3.3,3.2,3.1,3.0,3} $PREFIX $KDE3LIBSDIR $KDELIBSDIR $KDE3DIR $KDEDIR /usr/kde/*; do
+				if [ -f "${x}/include/kwin.h" ]; then
+					debug-print found
+					export KDEDIR="$x"
+					break
+				fi
+			done
+		else
+			# kde-base ebuilds must always use the exact version of kdelibs they came with
+			case $KDEMAJORVER.$KDEMINORVER in
+				3.0) export KDEDIR="/usr/kde/3";;
+				3.1) export KDEDIR="/usr/kde/3.1";;
+				3.2) export KDEDIR="/usr/kde/3.2";;
+				3.3) export KDEDIR="/usr/kde/3.3";;
+				3.4) export KDEDIR="/usr/kde/3.4";;
+				3.5) export KDEDIR="/usr/kde/3.5";;
+				5.0) export KDEDIR="/usr/kde/cvs";;
+				*) die "failed to set KDEDIR";;
+			esac
+		fi
+	fi
 
-	debug-print-function $FUNCNAME $*
-	QTVER="$1"
-	#newdepend ">=x11-libs/qt-$QTVER"
-	min-qt-ver $QTVER
-	newdepend "=x11-libs/qt-$selected_version*"
-	set-qtdir $QTVER
+	debug-print "$FUNCNAME: Will use the kdelibs installed in $KDEDIR, and install into $PREFIX."
 
 }
 
-set-qtdir() {
+need-qt() {
 
 	debug-print-function $FUNCNAME $*
+	QTVER="$1"
 
-	# select 1st element in dot-separated string
-	IFSBACKUP=$IFS
-	IFS="."
-	QTMAJORVER=""
-	for x in $1; do
-		[ -z "$QTMAJORVER" ] && QTMAJORVER=$x
-	done
-	IFS=$IFSBACKUP
+	QT=qt
 
-	export QTDIR="/usr/qt/$QTMAJORVER"
+	case ${QTVER} in
+	    2*)
+			DEPEND="${DEPEND} =x11-libs/${QT}-2.3*"
+			[ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} =x11-libs/${QT}-2.3*"
+			;;
+	    3*)
+			DEPEND="${DEPEND} $(qt_min_version ${QTVER})"
+			[ "${RDEPEND-unset}" != "unset" ] && RDEPEND="${RDEPEND} $(qt_min_version ${QTVER})"
+			;;
+	    *)	echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;;
+	esac
+
+}
 
+set-qtdir() {
+	DONOTHING=1
+	# Functionality not needed anymore
 }
 
 # returns minimal qt version needed for specified kde version
@@ -90,47 +838,89 @@ qtver-from-kdever() {
 
 	case $1 in
 		2*)	ver=2.3.1;;
-		3*)	ver=3.0.1;;
-		*)	echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;
+		3.1*)	ver=3.1;;
+		3.2*)	ver=3.2;;
+		3.3*)	ver=3.3;;
+		3.4*)	ver=3.3;;
+		3.5*)	ver=3.3;;
+		3*)	ver=3.0.5;;
+		5)	ver=3.3;; # cvs version
+		*)	echo "!!! error: $FUNCNAME called with invalid parameter: \"$1\", please report bug" && exit 1;;
 	esac
 
 	selected_version="$ver"
 
 }
 
-# compat
-need-kdelibs() {
-    echo "WARNING: need-kdelibs() called, where need-kde() is correct.
-If this happens at the unmerging of an old ebuild, disregard; otherwise report."
-    need-kde $*
-}
-
 min-kde-ver() {
 
 	debug-print-function $FUNCNAME $*
 
 	case $1 in
-	    2*)		selected_version="2.2.2";;
-	    3.0_beta1)	selected_version="3.0_beta1";;
-	    3.0_beta2)	selected_version="3.0_beta2";;
-	    3.0_rc1)	selected_version="3.0_rc1";;
-	    3.0_rc2)	selected_version="3.0_rc2";;
-	    3.0_rc3)	selected_version="3.0_rc3";;
-	    3*)		selected_version="3.0";;
-	    *)		echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;
+		2*)			selected_version="2.2.2";;
+		3.0*)			selected_version="3.0";;
+		3.1*)			selected_version="3.1";;
+		3.2*)			selected_version="3.2";;
+		3.3*)			selected_version="3.3";;
+		3.4*)			selected_version="3.4";;
+		3.5*)			selected_version="3.5";;
+		3*)			selected_version="3.0";;
+		5)			selected_version="5";;
+		*)			echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;
 	esac
-	
+
 }
 
-min-qt-ver() {
+# generic makefile sed for sandbox compatibility. for some reason when the kde makefiles (of many packages
+# and versions) try to chown root and chmod 4755 some binaries (after installing, target install-exec-local),
+# they do it to the files in $(bindir), not $(DESTDIR)/$(bindir). Most of these have been fixed in latest cvs
+# but a few remain here and there.
+# Pass a list of dirs to sed, Makefile.{am,in} in these dirs will be sed'ed.
+# This should be harmless if the makefile doesn't need fixing.
+kde_sandbox_patch() {
 
 	debug-print-function $FUNCNAME $*
 
-	case $1 in
-	    2*)	selected_version="2.3";;
-	    3*)	selected_version="3";;
-	    *)	echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;
-	esac
+	while [ -n "$1" ]; do
+	# can't use dosed, because it only works for things in ${D}, not ${S}
+	cd $1
+	for x in Makefile.am Makefile.in Makefile
+	do
+		if [ -f "$x" ]; then
+			echo Running sed on $x
+			cp $x ${x}.orig
+			sed -e 's: $(bindir): $(DESTDIR)/$(bindir):g' -e 's: $(kde_datadir): $(DESTDIR)/$(kde_datadir):g' -e 's: $(TIMID_DIR): $(DESTDIR)/$(TIMID_DIR):g' ${x}.orig > ${x}
+			rm ${x}.orig
+		fi
+	done
+	shift
+	done
+
+}
+
+# remove an optimization flag from a specific subdirectory's makefiles.
+# currently kdebase and koffice use it to compile certain subdirs without
+# -fomit-frame-pointer which breaks some things.
+# Parameters:
+# $1: subdirectory
+# $2: flag to remove
+kde_remove_flag() {
+
+	debug-print-function $FUNCNAME $*
+
+	cd ${S}/${1} || die
+	[ -n "$2" ] || die
+
+	cp Makefile Makefile.orig
+	sed -e "/CFLAGS/ s/${2}//g
+/CXXFLAGS/ s/${2}//g" Makefile.orig > Makefile
+
+	cd $OLDPWD
 
 }
 
+# is this a kde-base ebuid?
+if [ "${CATEGORY}" == "kde-base" ]; then
+	debug-print "${ECLASS}: KDEBASE ebuild recognized"
+	export KDEBASE="true"
+fi
diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index 5923d9263519..63fc3eb48dd7 100644
--- a/eclass/kde-i18n.eclass
+++ b/eclass/kde-i18n.eclass
@@ -1,55 +1 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.ogr>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.1 2001/09/29 12:35:38 danarmak Exp $
-. /usr/portage/eclass/inherit.eclass || die
-inherit autoconf base || die
-ECLASS=kde-i18n
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${PN}
-DESCRIPTION="KDE ${PV} - i18n: ${PN}"
-SRC_PATH="kde/stable/${PV}/src/${A}"
-SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
-	 ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
-	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
-
-HOMEPAGE="http://www.kde.org/"
-
-DEPEND=">=kde-base/kdelibs-${PV}"
-
-PROVIDE="virtual/kde-i18n-${PV}"
-
-kde-i18n_src_compile() {
-    
-	echo "in kde-i18n_src_compile, 1st parameter is $1"
-	[ $1="" ] && kde-i18n_src_compile all
-
-	while [ "$1" ]; do
-
-	case $1 in
-		configure)
-			echo "in kde-i18n_src_compile, action configure"
-			./configure --host=${CHOST} || die
-			;;
-		make)
-			echo "in kde-i18n_src_compile, action make"
-			make || die
-			;;
-		all)
-			echo "in kde-i18n_src_compile, action all"
-			kde-i18n_src_compile all
-			;;
-	esac
-
-	shift
-	done
-
-}
-
-kde-i18n_src_install() {
-	echo "in kde-i18n_src_compile, single function"
-	make install DESTDIR=${D} || die
-}
-
-
+# placeholder for dead eclass
\ No newline at end of file
diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index 85c3c4310809..12cb2c477326 100644
--- a/eclass/kde-meta.eclass
+++ b/eclass/kde-meta.eclass
@@ -1,74 +1,149 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.1 2004/11/06 16:34:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
-# Simone Gotti <simone.gotti@email.it>
+# Simone Gotti <motaboy@gentoo.org>
 #
 # This is the kde-meta eclass which supports broken-up kde-base packages.
 
-inherit kde
-ECLASS=kde-meta
-INHERITED="$INHERITED $ECLASS"
-IUSE="$IUSE usepackagedmakefiles"
+inherit kde multilib
+IUSE="kdexdeltas"
 
 # only broken-up ebuilds can use this eclass
 if [ -z "$KMNAME" ]; then
 	die "kde-meta.eclass inherited but KMNAME not defined - broken ebuild"
 fi
 
-myPN="$KMNAME"
-myP="$myPN-$PV"
-# is this a kde-base ebuild, vs eg koffice
-case "$myPN" in kde-i18n|arts|kdeaccessibility|kdeaddons|kdeadmin|kdeartwork|kdebase|kdebindings|kdeedu|kdegames|kdegraphics|kdelibs|kdemultimedia|kdenetwork|kdepim|kdesdk|kdetoys|kdeutils|kdewebdev|kdelibs-apidocs)
-	debug-print "$ECLASS: KDEBASE ebuild recognized"
-	export KDEBASE="true"
-	;;
+# Replace the $myPx mess - it was ugly as well as not general enough for 3.4.0-rc1
+# The following code should set TARBALLVER (the version in the tarball's name)
+# and TARBALLDIRVER (the version of the toplevel directory inside the tarball).
+case "$PV" in
+	3.4.0_alpha1)	TARBALLDIRVER="3.3.90"; TARBALLVER="3.3.90" ;;
+	3.4.0_beta1)	TARBALLDIRVER="3.3.91"; TARBALLVER="3.3.91" ;;
+	3.4.0_beta2)	TARBALLDIRVER="3.3.92"; TARBALLVER="3.3.92" ;;
+	3.4.0_rc1)		TARBALLDIRVER="3.4.0"; TARBALLVER="3.4.0-rc1" ;;
+	3.5_alpha1)		TARBALLDIRVER="3.4.90"; TARBALLVER="3.4.90" ;;
+	3.5_beta1)		TARBALLDIRVER="3.4.91"; TARBALLVER="3.4.91" ;;
+	3.5.0_beta2)		TARBALLDIRVER="3.4.92"; TARBALLVER="3.4.92" ;;
+	3.5.0_rc1)		TARBALLDIRVER="3.5.0"; TARBALLVER="3.5.0_rc1" ;;
+	*)				TARBALLDIRVER="$PV"; TARBALLVER="$PV" ;;
 esac
+if [ "${KMNAME}" = "koffice" ]; then
+	case "$PV" in
+		1.4.0_rc1)	TARBALLDIRVER="1.3.98"; TARBALLVER="1.3.98" ;;
+	esac
+fi
+
+TARBALL="$KMNAME-$TARBALLVER.tar.bz2"
 
 # BEGIN adapted from kde-dist.eclass, code for older versions removed for cleanness
 if [ "$KDEBASE" = "true" ]; then
-	# kde 3.1 prereleases have tarball versions of 3.0.6 ff
 	unset SRC_URI
-	case "$PV" in
-		3.3.0)		SRC_PATH="stable/3.3/src/${myP}.tar.bz2" ;;
-		3*)			SRC_PATH="stable/${myPV}/src/${myP}.tar.bz2" ;;
-		5)			SRC_URI="" # cvs ebuilds, no SRC_URI needed
-					debug-print "$ECLASS: cvs detected, SRC_URI left empty" ;;
-		*)			debug-print "$ECLASS: Error: unrecognized version ${myPV}, could not set SRC_URI" ;;
-	esac
-	[ -n "$SRC_PATH" ] && SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
-	debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
-	
+
 	need-kde $PV
-	
-	DESCRIPTION="KDE ${myPV} - "
+
+	DESCRIPTION="KDE ${PV} - "
 	HOMEPAGE="http://www.kde.org/"
 	LICENSE="GPL-2"
 	SLOT="$KDEMAJORVER.$KDEMINORVER"
-fi
-# END adapted from kde-dist.eclass
 
-# prepackaged makefiles for broken-up ebuilds. Ebuild can define KM_MAKEFILESREV to be >=1 to
-# use a newer tarball without increasing the ebuild revision.
-MAKEFILESTARBALL="$PN-$PVR-${KM_MAKEFILESREV:-0}-makefiles.tar.bz2"
-SRC_URI="$SRC_URI usepackagedmakefiles? ( mirror://gentoo/$MAKEFILESTARBALL )"
+	# Main tarball for normal downloading style
+	# Note that we set SRC_PATH, and add it to SRC_URI later on
+	case "$PV" in
+		3.5.0_*)	SRC_PATH="unstable/${PV/.0_/-}/src/$TARBALL" ;;
+		3.5_*)		SRC_PATH="unstable/${PV/_/-}/src/$TARBALL" ;;
+		3.4.0_*)	SRC_PATH="unstable/$TARBALLVER/src/$TARBALL" ;;
+		3.4.0)		SRC_PATH="stable/3.4/src/$TARBALL" ;;
+		3*)		SRC_PATH="stable/$TARBALLVER/src/$TARBALL" ;;
+		*)		die "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;;
+	esac
+
+	# Base tarball and xdeltas for patch downloading style
+	# Note that we use XDELTA_BASE, XDELTA_DELTA again in src_unpack()
+	# For future versions, add all applicable xdeltas (from x.y.0) in correct order to XDELTA_DELTA
+	# For versions that don't have deltas, it's more efficient to leave XDELTA_BASE
+	# unset, making src_unpack extract directly from the tarball in distfiles
+	# Does anyone really want to make this code generic based on $TARBALLVER above?
+	case "$PV" in
+		3.4.0_beta1)	XDELTA_BASE="mirror://kde/unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2"
+				XDELTA_DELTA="mirror://kde/unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta"
+				;;
+		3.4.0_beta2)	XDELTA_BASE="mirror://kde/unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2"
+				XDELTA_DELTA="mirror://kde/unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta mirror://kde/unstable/3.3.91/src/$KMNAME-3.3.91-3.3.92.tar.xdelta"
+				;;
+		3.4.0_rc1)	XDELTA_BASE="mirror://kde/unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2"
+				XDELTA_DELTA="mirror://kde/unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta mirror://kde/unstable/3.3.91/src/$KMNAME-3.3.91-3.3.92.tar.xdelta mirror://kde/unstable/3.4.0-rc1/src/$KMNAME-3.3.92-3.4.0-rc1.tar.xdelta"
+				;;
+		3.4.0)		;; 	# xdeltas break off at first stable version, since most people
+					# don't have prerelease tarballs handy
+		3.4.1)		XDELTA_BASE="mirror://kde/stable/3.4/src/$KMNAME-3.4.0.tar.bz2"
+				XDELTA_DELTA="mirror://kde/stable/3.4.1/src/$KMNAME-3.4.0-3.4.1.tar.xdelta"
+				;;
+		3.4.2)		XDELTA_BASE="mirror://kde/stable/3.4/src/$KMNAME-3.4.0.tar.bz2"
+				XDELTA_DELTA="mirror://kde/stable/3.4.1/src/$KMNAME-3.4.0-3.4.1.tar.xdelta mirror://kde/stable/3.4.2/src/$KMNAME-3.4.1-3.4.2.tar.xdelta"
+				;;
+		3.5.0_beta2)	XDELTA_BASE="mirror://kde/unstable/3.4.91/src/$KMNAME-3.4.91.tar.bz2"
+				XDELTA_DELTA="mirror://kde/unstable/3.4.92/src/$KMNAME-3.4.91-3.4.92.tar.xdelta"
+				;;
+		3.5.0_rc1)	XDELTA_BASE="mirror://kde/unstable/3.4.91/src/$KMNAME-3.4.91.tar.bz2"
+				XDELTA_DELTA="mirror://kde/unstable/3.4.92/src/$KMNAME-3.4.91-3.4.92.tar.xdelta mirror://gentoo/$KMNAME-3.4.92-3.5.0_rc1.tar.xdelta"
+				;;
+		3.5.0)		XDELTA_BASE="mirror://kde/stable/3.5.0/src/$KMNAME-3.5.0.tar.bz2"
+				XDELTA_DELTA=""
+				;;
+		*)		;;
+	esac
 
-# TODO FIX: Temporary place for code common to all ebuilds derived from any one metapackage.
+elif [ "$KMNAME" == "koffice" ]; then
+	SRC_PATH="mirror://kde/stable/koffice-$PV/src/koffice-$PV.tar.bz2"
+	XDELTA_BASE=""
+	XDELTA_DELTA=""
+	case $PV in
+		1.3.5)
+			SRC_PATH="mirror://kde/stable/koffice-$PV/src/koffice-$PV.tar.bz2"
+			XDELTA_BASE="mirror://kde/stable/koffice-1.3.4/src/koffice-1.3.4.tar.bz2"
+			XDELTA_DELTA="mirror://kde/stable/koffice-1.3.5/src/koffice-1.3.4-1.3.5.tar.xdelta"
+			;;
+		1.4.0_rc1)
+			SRC_PATH="mirror://kde/unstable/koffice-1.4-rc1/src/koffice-1.3.98.tar.bz2"
+			;;
+		1.4.0)
+			SRC_PATH="mirror://kde/stable/koffice-1.4/src/koffice-$PV.tar.bz2"
+			;;
+	esac
+fi
 
-# kdebase: all configure.in's talk about java. Need to investigate which ones 
-# actually need it.
-if [ "$KMNAME" == "kdebase" ]; then
-	IUSE="$IUSE java"
-	DEPEND="java? ( || ( virtual/jdk virtual/jre ) )"
+# Common xdelta code
+if [ -n "$XDELTA_BASE" ]; then # depends on $PV only, so is safe to modify SRC_URI inside it
+	SRC_URI="$SRC_URI kdexdeltas? ( $XDELTA_BASE "
+	for x in $XDELTA_DELTA; do
+		SRC_URI="$SRC_URI $x"
+	done
+	SRC_URI="$SRC_URI ) !kdexdeltas? ( $SRC_PATH )"
+else # xdelta don't available, for example with kde 3.4 alpha/beta/rc ebuilds.
+	SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
 fi
 
-# TODO FIX ends
+debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
+
+# Necessary dep for xdeltas. Hope like hell it doesn't worm its way into RDEPEND
+# through the sneaky eclass dep mangling portage does.
+DEPEND="$DEPEND kdexdeltas? ( dev-util/xdelta )"
+
+# END adapted from kde-dist.eclass
+
+# Add a blocking dep on the package we're derived from
+if [ "${KMNAME}" != "koffice" ]; then
+	DEPEND="${DEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${SLOT}*"
+	RDEPEND="${RDEPEND} !=$(get-parent-package ${CATEGORY}/${PN})-${SLOT}*"
+else
+	DEPEND="${DEPEND} !$(get-parent-package ${CATEGORY}/${PN})"
+	RDEPEND="${RDEPEND} !$(get-parent-package ${CATEGORY}/${PN})"
+fi
 
-# The following code adds support for broken-up kde-base-derived ebuilds, e.g. a separate
-# kmail ebuild that still uses the big kdepim tarball. KM is short for 'kde meta'.
 # Set the following variables in the ebuild. Only KMNAME must be set, the rest are optional.
-# A directory or file can be a path with any number of components (eg foo/bar/baz.h). 
+# A directory or file can be a path with any number of components (eg foo/bar/baz.h).
 # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY, KMCOPYLIB.
 #
 # KMNAME: name of the metapackage (eg kdebase, kdepim). Must be set before inheriting this eclass
@@ -82,7 +157,7 @@ fi
 # Makefiles are created automagically to compile/install the correct files. Observe these rules:
 # - Don't specify the same file in more than one of the three variables.
 # - When using KMEXTRA, remember to add the doc/foo dir for the extra dirs if one exists.
-# - KMEXTRACTONLY take effect over an entire directory tree, you can override it defining 
+# - KMEXTRACTONLY take effect over an entire directory tree, you can override it defining
 # KMEXTRA, KMCOMPILEONLY for every subdir that must have a different behavior.
 # eg. you have this tree:
 # foo/bar
@@ -95,7 +170,7 @@ fi
 #
 # IMPORTANT!!! you can't define a KMCOMPILEONLY SUBDIR if its parents are defined as KMEXTRA or KMMODULE. or it will be installed anywhere. To avoid this probably are needed some chenges to the generated Makefile.in.
 #
-# KMCOPYLIB: Contains an even number of $IFS (i.e. whitespace) -separated words. 
+# KMCOPYLIB: Contains an even number of $IFS (i.e. whitespace) -separated words.
 # Each two consecutive words, libname and dirname, are considered. symlinks are created under $S/$dirname
 # pointing to $PREFIX/lib/libname*.
 
@@ -132,7 +207,7 @@ function change_makefiles() {
 
 	cd $1
 	debug-print "We are in `pwd`"
-	
+
 	# check if the dir is defined as KMEXTRACTONLY or if it was defined is KMEXTRACTONLY in the parent dir, this is valid only if it's not also defined as KMMODULE, KMEXTRA or KMCOMPILEONLY. They will ovverride KMEXTRACTONLY, but only in the current dir.
 	isextractonly="false"
 	if ( ( hasq "$1" $KMEXTRACTONLYFULLPATH || [ $2 = "true" ] ) && \
@@ -140,19 +215,19 @@ function change_makefiles() {
 		isextractonly="true"
 	fi
 	debug-print "isextractonly = $isextractonly"
-	
+
 	dirlistfullpath=
 	for item in *; do
-		if [ -d $item ] && [ ! $item = "CVS" ] && [ ! "$S/$item" = "$S/admin" ]; then
+		if [ -d "$item" ] && [ "$item" != "CVS" ] && [ "$S/$item" != "$S/admin" ]; then
 			# add it to the dirlist, with the FULL path and an ending "/"
 			dirlistfullpath="$dirlistfullpath ${1}/${item}"
 		fi
 	done
 	debug-print "dirlist = $dirlistfullpath"
-	
+
 	for directory in $dirlistfullpath; do
-		
-		if ( hasq "$1" $KMEXTRACTONLYFULLPATH || [ $2 = "true" ] ); then 
+
+		if ( hasq "$1" $KMEXTRACTONLYFULLPATH || [ $2 = "true" ] ); then
 			change_makefiles $directory 'true'
 		else
 			change_makefiles $directory 'false'
@@ -160,12 +235,12 @@ function change_makefiles() {
 		# come back to our dir
 		cd $1
 	done
-	
+
 	cd $1
 	debug-print "Come back to `pwd`"
 	debug-print "dirlist = $dirlistfullpath"
 	if [ $isextractonly = "true" ] || [ ! -f Makefile.am ] ; then
-		# if this is a latest subdir 
+		# if this is a latest subdir
 		if [ -z "$dirlistfullpath" ]; then
 			debug-print "dirlist is empty => we are in the latest subdir"
 			echo 'all:' > Makefile.am
@@ -184,95 +259,123 @@ function change_makefiles() {
 	fi
 }
 
+function set_common_variables() {
+	# Overridable module (subdirectory) name, with default value
+	if [ "$KMNOMODULE" != "true" ] && [ -z "$KMMODULE" ]; then
+		KMMODULE=$PN
+	fi
+
+	# Unless disabled, docs are also extracted, compiled and installed
+	DOCS=""
+	if [ "$KMNOMODULE" != "true" ] && [ "$KMNODOCS" != "true" ]; then
+		DOCS="doc/$KMMODULE"
+	fi
+}
+
 # This has function sections now. Call unpack, apply any patches not in $PATCHES,
 # then call makefiles.
 function kde-meta_src_unpack() {
 	debug-print-function $FUNCNAME $*
 
+	set_common_variables
+
 	sections="$@"
 	[ -z "$sections" ] && sections="unpack makefiles"
 	for section in $sections; do
 	case $section in
 	unpack)
 
-		# Overridable module (subdirectory) name, with default value
-		if [ "$KMNOMODULE" != "true" ] && [ -z "$KMMODULE" ]; then
-			KMMODULE=$PN
+		# kdepim packages all seem to rely on libkdepim/kdepimmacros.h
+		# also, all kdepim Makefile.am's reference doc/api/Doxyfile.am
+		if [ "$KMNAME" == "kdepim" ]; then
+			KMEXTRACTONLY="$KMEXTRACTONLY libkdepim/kdepimmacros.h doc/api"
 		fi
-	
-		# Unless disabled, docs are also extracted, compiled and installed
-		DOCS=""
-		if [ "$KMNOMODULE" != "true" ] && [ "$KMNODOCS" != "true" ]; then
-			DOCS="doc/$KMMODULE"
-		fi
-		
-		# Extract everything necessary
-		# $KMTARPARAMS is for an ebuild to use; currently used by kturtle
-		cd $WORKDIR
+
+		# Create final list of stuff to extract
 		extractlist=""
-		for item in admin Makefile.am Makefile.am.in configure.in.in configure.in.bot acinclude.m4 aclocal.m4 \
-					AUTHORS COPYING INSTALL README NEWS ChangeLog \
+		for item in admin Makefile.am Makefile.am.in configure.in.in configure.in.mid configure.in.bot \
+					acinclude.m4 aclocal.m4 AUTHORS COPYING INSTALL README NEWS ChangeLog \
 					$KMMODULE $KMEXTRA $KMCOMPILEONLY $KMEXTRACTONLY $DOCS
 		do
-			extractlist="$extractlist $myP/$item"
+			extractlist="$extractlist $KMNAME-$TARBALLDIRVER/$item"
 		done
-		tar -xjpf $DISTDIR/${myP}.tar.bz2 $KMTARPARAMS $extractlist 
+
+		# xdeltas require us to uncompress to a tar file first.
+		# $KMTARPARAMS is also available for an ebuild to use; currently used by kturtle
+		if useq kdexdeltas && [ -n "$XDELTA_BASE" ]; then
+			echo ">>> Base archive + xdelta patch mode enabled."
+			echo ">>> Uncompressing base archive..."
+			cd $T
+			RAWTARBALL=${TARBALL//.bz2}
+			bunzip2 -dkc ${DISTDIR}/${XDELTA_BASE/*\//} > $RAWTARBALL
+			for delta in $XDELTA_DELTA; do
+				deltafile="${delta/*\//}"
+				echo ">>> Applying xdelta: $deltafile"
+				xdelta patch ${DISTDIR}/$deltafile $RAWTARBALL $RAWTARBALL.1
+				mv $RAWTARBALL.1 $RAWTARBALL
+			done
+			TARFILE=$T/$RAWTARBALL
+		else
+			TARFILE=$DISTDIR/$TARBALL
+			KMTARPARAMS="$KMTARPARAMS -j"
+		fi
+		cd $WORKDIR
+
+		echo ">>> Extracting from tarball..."
+		# Note that KMTARPARAMS is also used by an ebuild
+		tar -xpf $TARFILE $KMTARPARAMS $extractlist	2> /dev/null
+
+		# Avoid syncing if possible
+		# No idea what the above comment means...
+		if [ -n "$RAWTARBALL" ]; then
+			rm -f $T/$RAWTARBALL
+		fi
+
 		# Default $S is based on $P not $myP; rename the extracted dir to fit $S
-		mv $myP $P
-		
+		mv $KMNAME-$TARBALLDIRVER $P || die
+		S=$WORKDIR/$P
+
 		# Copy over KMCOPYLIB items
 		libname=""
 		for x in $KMCOPYLIB; do
 			if [ "$libname" == "" ]; then
-			libname=$x
+				libname=$x
 			else
-			dirname=$x
-			cd $S
-			mkdir -p ${dirname}
-			cd ${dirname}
-			ln -s ${PREFIX}/lib/${libname}* .
-			libname=""
+				dirname=$x
+				cd $S
+				mkdir -p ${dirname}
+				cd ${dirname}
+				if [ ! "$(find ${PREFIX}/$(get_libdir)/ -name "${libname}*")" == "" ]; then
+					echo "Symlinking library ${libname} under ${PREFIX}/$(get_libdir)/ in source dir"
+					ln -s ${PREFIX}/$(get_libdir)/${libname}* .
+				else
+					die "Can't find library ${libname} under ${PREFIX}/$(get_libdir)/"
+				fi
+				libname=""
 			fi
 		done
-	
+
 		# apply any patches
 		kde_src_unpack autopatch
-	
+
+		# kdebase: Remove the installation of the "startkde" script.
+		if [ "$KMNAME" == "kdebase" ]; then
+			sed -i -e s:"bin_SCRIPTS = startkde"::g ${S}/Makefile.am.in
+		fi
+
 		# for ebuilds with extended src_unpack
 		cd $S
-	
+
 	;;
 	makefiles)
 
-		# allow usage of precreated makefiles, and/or packaging of the makefiles we create.
-		if useq usepackagedmakefiles; then
-			echo ">>> Using pregenerated makefile templates"
-			cd $WORKDIR
-			tar -xjf $DISTDIR/$MAKEFILESTARBALL
-			cd $S
-			echo ">>> Creating configure script"
-			# If you can, clean this up
-			touch aclocal.m4
-			touch config.h.in
-			touch `find . -name Makefile.in -print`
-			make -f admin/Makefile.common configure || die "Failed to create configure script"
-		else
-			# Create Makefile.am files
-			create_fullpaths
-			change_makefiles $S "false"
-			if [ -n "$KM_PACKAGEMAKEFILES" ]; then
-				make -f admin/Makefile.common || die "Failed to create makefile templates"
-				cd $WORKDIR
-	# 			# skipped:  $P/configure.in.in* $P/acinclude.m4 $P/aclocal.m4 $P/configure 
-				/bin/tar -cjpf $T/$MAKEFILESTARBALL $P/stamp-h.in $P/configure.in $P/configure.files \
-					`find $P -name Makefile\*` $P/config.h.in $P/subdirs
-				echo ">>> Saved generated makefile templates in $T/$MAKEFILESTARBALL"
-			fi
-		fi
-	
+		# Create Makefile.am files
+		create_fullpaths
+		change_makefiles $S "false"
+
 		# for ebuilds with extended src_unpack
 		cd $S
-	
+
 	;;
 	esac
 	done
@@ -281,44 +384,26 @@ function kde-meta_src_unpack() {
 function kde-meta_src_compile() {
 	debug-print-function $FUNCNAME $*
 
-	# kdebase: all configure.in's talk about java. Need to investigate which ones 
-	# actually need it.
+	set_common_variables
+
 	if [ "$KMNAME" == "kdebase" ]; then
-		if use java ; then
-			if has_version virtual/jdk ; then
-				myconf="$myconf --with-java=$(java-config --jdk-home)"
-			else
-				myconf="$myconf --with-java=$(java-config --jre-home)"
-			fi
-		else
-			myconf="$myconf --without-java"
-		fi
+		# bug 82032: the configure check for java is unnecessary as well as broken
+		myconf="$myconf --without-java"
 	fi
-	
-	# confcache support. valid only for my (danarmak's) port of stuart's confcache to portage .51,
-	# not for stuart's orig version or ferringb's ebuild-daemon version.
-	# this could be replaced by just using econf, but i don't want to make that change in kde.eclass
-	# just yet. This way is more modular.
-	callsections="$*"
-	[ -z "$callsections" -o "$callsections" == "all" ] && callsections="myconf configure make"
-	for section in $callsections; do
-		debug-print "$FUNCNAME: now in section $section"
-		if [ "$section" == "configure" ]; then
-			# don't log makefile.common stuff in confcache
-			[ ! -f "Makefile.in" ] && make -f admin/Makefile.common
- 			confcache_start
-			myconf="$EXTRA_ECONF $myconf"
-		fi
-		kde_src_compile $section
-		if [ "$section" == "configure" ]; then
-			confcache_stop
-		fi
-	done
+
+	if [ "$KMNAME" == "kdegames" ]; then
+		# make sure games are not installed with setgid bit, as it is a security risk.
+		myconf="$myconf --disable-setgid"
+	fi
+
+	kde_src_compile $*
 }
 
 function kde-meta_src_install() {
 	debug-print-function $FUNCNAME $*
-	
+
+	set_common_variables
+
 	if [ "$1" == "" ]; then
 		kde-meta_src_install make dodoc
 	fi
@@ -326,7 +411,7 @@ function kde-meta_src_install() {
 		case $1 in
 		    make)
 				for dir in $KMMODULE $KMEXTRA $DOCS; do
-					if [ -d $S/$dir ]; then 
+					if [ -d $S/$dir ]; then
 						cd $S/$dir
 						make DESTDIR=${D} destdir=${D} install || die
 					fi
@@ -341,7 +426,7 @@ function kde-meta_src_install() {
 		esac
 		shift
 	done
-}	
+}
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index 0d1b09305d27..0ec1fe3df7c4 100644
--- a/eclass/kde-source.eclass
+++ b/eclass/kde-source.eclass
@@ -1,15 +1,14 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
+#
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.1 2002/07/17 20:25:16 danarmak Exp $
-
+#
 # This is for kde-base cvs ebuilds. Read comments about settings.
 # It uses $S and sets $SRC_URI, so inherit it as late as possible (certainly after any other eclasses).
 # See http://www.gentoo.org/~danarmak/kde-cvs.html !
 # All of the real functionality is in cvs.eclass; this just adds some trivial kde-specific items
 
-ECLASS=kde-source
-INHERITED="$INHERITED $ECLASS"
 
 # --- begin user-configurable settings ---
 
@@ -22,7 +21,7 @@ INHERITED="$INHERITED $ECLASS"
 
 # Under this directory the cvs modules are stored/accessed
 # Storing in tarballs in $DISTDIR to be implemented soon
-[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src/kde"
+[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="$DISTDIR/cvs-src/kde"
 
 # Set to name of cvs server. Set to "" to disable fetching (offline mode).
 # In offline mode, we presume that modules are already checked out at the specified
@@ -30,16 +29,29 @@ INHERITED="$INHERITED $ECLASS"
 # Format example: "anoncvs.kde.org:/home/kde" (without :pserver:anonymous@ part)
 # Mirror list is available at http://developer.kde.org/source/anoncvs.html
 [ -z "$ECVS_SERVER" ] && ECVS_SERVER="anoncvs.kde.org:/home/kde"
+[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
+
+# for apps living inside modules like kdenonbeta - see also beginning of our _src_unpack
+# KCVS_SUBDIR=...
 
-# default for kde-base ebuilds
-[ -z "$ECVS_MODULE" ] && ECVS_MODULE="$PN"
+# If a tag is specified as ECVS_BRANCH, it will be used for the kde-common module
+# as well. If that is wrong (fex when checking out kopete branch kopete_0_6_2_release),
+# use KCVS_BRANCH instead.
+
+# you can set this variable (in your ebuild, of course) to disable fetching of <module>/doc/*
+# under the KCVS_SUBDIR scheme. this is appropriate for kde-i18n stuff, but not for
+# eg kdeextragear, kdenonbeta etc.
+# KCVS_SUBDIR_NODOC=true
 
 # Other variables: see cvs.eclass
 
-# --- end user-configurable settings ---
+# we do this here and not in the very beginning because we need to keep
+# the configuration order intact: env. and profile settings override
+# kde-source.eclass defaults, which in turn override cvs.eclass defaults
+inherit cvs
+#... and reset $ECLASS. Ugly I know, hopefully I can prettify it someday
 
-# cvs modules don't have a version in their names
-S="$WORKDIR/$PN" 
+# --- end user-configurable settings ---
 
 DESCRIPTION="$DESCRIPTION (cvs) "
 
@@ -49,28 +61,80 @@ DESCRIPTION="$DESCRIPTION (cvs) "
 # inheriting kde_source.
 SRC_URI=""
 
+
+if [ -n "$KCVS_SUBDIR" -o -n "$KCVS_MODULE" ]; then
+	S="$WORKDIR/$KCVS_MODULE"
+else
+	# default for kde-base ebuilds
+	S="$WORKDIR/${ECVS_MODULE:-$PN}"
+fi
+
+
 kde-source_src_unpack() {
 
-    debug-print-function $FUNCNAME $*
+	debug-print-function $FUNCNAME $*
+
+	# decide what the main module is that we're fetching and call cvs_src_unpack
+	# the other things are fetched later
+	# (kde-common/admin, <module>/doc/*, <module>/<files>)
+	if [ -n "$KCVS_SUBDIR" ]; then
+	    ECVS_MODULE="$KCVS_MODULE/$KCVS_SUBDIR"
+	elif [ -n "$KCVS_MODULE" ]; then
+	    ECVS_MODULE="$KCVS_MODULE"
+	else
+	    # default for kde-base ebuilds
+	    ECVS_MODULE="$PN"
+	fi
 
-	# we do this here and not in the very beginning because we need to keep
-	# the configuration order intact: env. and profile settings override
-	# kde-source.eclass defaults, which in turn override cvs.eclass defaults
-	inherit cvs
-	
-	# this fetches cvs sources and copies them to $WORKDIR
 	cvs_src_unpack
-	
-	# make sure checked-out module is accessible at $S, in case
-	# the ebuild overrode our S=$WORKDIR/$PN setting
-	if [ "$S" != "$WORKDIR/$PN" ]; then
-		cd $WORKDIR
-		ln -sf $PN $S
+
+	# subdirs of kde modules get special treatment that is designed for
+	# subdirs which are separate selfcontained apps and only need
+	# automake/autoconf stuff etc. added to them.
+	# this fits for apps from kdenonbeta, kdeextragear modules etc.
+	# So, if we just fetched a module's subdir, fetch the top directory
+	# of the module (non-recursively) and make it build only the subdirectory
+	# we need.
+	# ECVS_LOCALNAME note: disabled when KCVS_SUBDIR is enabled because the logic
+	# of how it should work is unclear and I don't see any need for it here anyway
+	if [ -n "$KCVS_SUBDIR" ]; then
+
+		if [ -n "$KCVS_BRANCH" ]; then
+		    ECVS_BRANCH2="$ECVS_BRANCH"
+		    ECVS_BRANCH="$KCVS_BRANCH"
+		fi
+
+		ECVS_MODULE="$KCVS_MODULE" ECVS_LOCAL=yes cvs_src_unpack
+
+		# we need the <module>/doc/<name> directory too,
+		# and we need the top-level doc/ directory fetched locally
+		ECVS_MODULE="${KCVS_MODULE}/doc" ECVS_LOCAL=yes cvs_src_unpack
+
+		# but, if such a directory doesn't exist on the cvs server and we're
+		# in offline mode cvs.eclass will abort, so only call this if we're
+		# in online mode or the dir is already fetched
+		# also, the ebuild might have disabled this functionality explicitly
+		# (kde-i18n stuff does this for now)
+		if [ -z "$KCVS_SUBDIR_NODOC" ] && [ -d "$ECVS_TOP_DIR/$KCVS_MODULE/doc/$KCVS_SUBDIR" -o "$ECVS_SERVER" != "offline" ]; then
+			ECVS_MODULE="${KCVS_MODULE}/doc/${KCVS_SUBDIR}" cvs_src_unpack
+		fi
+
+		if [ -n "$KCVS_BRANCH" ]; then
+		    ECVS_BRANCH="$ECVS_BRANCH2"
+		fi
+
 	fi
-	
+
+	# typically for kde cvs apps, the admin subdir lives in the kde-common module
+	# which is also needed
+	if [ ! -d "$S/admin" ]; then
+		ECVS_MODULE="kde-common/admin" cvs_src_unpack
+		mv ${WORKDIR}/kde-common/admin $S/
+	fi
+
 	# make sure we give them a clean cvs checkout
 	cd ${S}
-	[ -f "Makefile" ] && make cvs-clean
+	[ -f "admin/cvs-clean.pl" ] && make -f admin/Makefile.common cvs-clean
 	[ -f "config.cache" ] && rm config.cache
 
 }
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 38d7caaaba4a..470451239db0 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,68 +1,280 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
+#
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.1 2001/09/28 19:25:33 danarmak Exp $
-# This is the kde ebuild for std. kde-dependant apps which follow configure/make/make install
-# procedures and have std. configure options. 
-. /usr/portage/inherit.eclass || die
-inherit c autoconf base || die
-ECLASS=kde
+#
+# Revisions Caleb Tennis <caleb@gentoo.org>
+# The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
 
+inherit base eutils kde-functions flag-o-matic
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://www.kde.org/"
+IUSE="debug arts xinerama kdeenablefinal"
 
-DEPEND="${DEPEND} kde-base/kdelibs dev-util/objprelink x11-libs/qt-x11"
-RDEPEND="${RDEPEND} kde-base/kdelibs x11-libs/qt-x11"
+DEPEND=">=sys-devel/automake-1.7.0
+	sys-devel/autoconf
+	sys-devel/make
+	dev-util/pkgconfig
+	dev-lang/perl
+	~kde-base/kde-env-3"
+
+RDEPEND="~kde-base/kde-env-3"
+
+# overridden in other places like kde-dist, kde-source and some individual ebuilds
+SLOT="0"
+
+kde_pkg_setup() {
+	if [ "${PN}" != "arts" ] && [ "${PN}" != "kdelibs" ] ; then
+		use arts && if ! built_with_use kde-base/kdelibs arts ; then
+			eerror "You are trying to compile ${CATEGORY}/${P} with the \"arts\" USE flag enabled."
+			eerror "However, $(best_version kde-base/kdelibs) was compiled with this flag disabled."
+			eerror
+			eerror "You must either disable this use flag, or recompile"
+			eerror "$(best_version kde-base/kdelibs) with this use flag enabled."
+			die
+		fi
+	fi
+
+	# Let filter visibility flags that will *really* hurt your KDE
+	filter-flags -fvisibility=hidden -fvisibility-inlines-hidden
+}
+
+kde_src_unpack() {
+	debug-print-function $FUNCNAME $*
+
+	# call base_src_unpack, which implements most of the functionality and has sections,
+	# unlike this function. The change from base_src_unpack to kde_src_unpack is thus
+	# wholly transparent for ebuilds.
+	base_src_unpack $*
+
+	# kde-specific stuff stars here
+
+	# fix the 'languageChange undeclared' bug group: touch all .ui files, so that the
+	# makefile regenerate any .cpp and .h files depending on them.
+	cd $S
+	debug-print "$FUNCNAME: Searching for .ui files in $PWD"
+	UIFILES="`find . -name '*.ui' -print`"
+	debug-print "$FUNCNAME: .ui files found:"
+	debug-print "$UIFILES"
+	# done in two stages, because touch doens't have a silent/force mode
+	if [ -n "$UIFILES" ]; then
+		debug-print "$FUNCNAME: touching .ui files..."
+		touch $UIFILES
+	fi
+}
 
 kde_src_compile() {
-    
-    while [ "$1" ]; do
-	
-	case $1 in
-	    myconf) 	
-		use qtmt 	&& myconf="$myconf --enable-mt"
-		use mitshm	&& myconf="$myconf --enable-mitshm"
-	        use objprelink	&& myconf="$myconf --enable-objprelink"
-		;;
-	    configure)
-                ./configure --host=${CHOST} --with-x \
-		    ${myconf} --with-xinerama || die
-		;;
-	    make)
-	        make || die
-		;;
-	    all)
-		kde_src_compile myconf configure make
-		;;
-	esac
-	
-    shift
-    done
+
+	debug-print-function $FUNCNAME $*
+	[ -z "$1" ] && kde_src_compile all
+
+	cd ${S}
+	export kde_widgetdir="$KDEDIR/$(get_libdir)/kde3/plugins/designer"
+
+	# fix the sandbox errors "can't writ to .kde or .qt" problems.
+	# this is a fake homedir that is writeable under the sandbox, so that the build process
+	# can do anything it wants with it.
+	REALHOME="$HOME"
+	mkdir -p $T/fakehome/.kde
+	mkdir -p $T/fakehome/.qt
+	export HOME="$T/fakehome"
+	addwrite "${QTDIR}/etc/settings"
+
+	# Fix bug 96177: if KDEROOTHOME is defined, the ebuild accesses the real homedir via it, and not our exported $HOME
+	unset KDEHOME
+	unset KDEROOTHOME
+
+	# things that should access the real homedir
+	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
+	[ -n "$UNSERMAKE" ] && addwrite "/usr/kde/unsermake"
+
+	while [ "$1" ]; do
+
+		case $1 in
+			myconf)
+				debug-print-section myconf
+				myconf="$myconf --with-x --enable-mitshm $(use_with xinerama) --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)"
+				# calculate dependencies separately from compiling, enables ccache to work on kde compiles
+				[ -z "$UNSERMAKE" ] && myconf="$myconf --disable-dependency-tracking"
+				if use debug ; then
+					myconf="$myconf --enable-debug=full --with-debug"
+				else
+					myconf="$myconf --disable-debug --without-debug"
+				fi
+				if useq kdeenablefinal && [ -n "$KDEBASE" ]; then
+					myconf="$myconf --enable-final"
+				else
+					myconf="$myconf --disable-final"
+				fi
+				[ -z "$KDEBASE" ] && myconf="$myconf $(use_with arts)"
+				[ -n "$KDEBASE" -a "$KDEMINORVER" -ge 3 ] && myconf="$myconf $(use_with arts)"
+				debug-print "$FUNCNAME: myconf: set to ${myconf}"
+				;;
+			configure)
+				debug-print-section configure
+				debug-print "$FUNCNAME::configure: myconf=$myconf"
+
+				# rebuild configure script, etc
+				# This can happen with e.g. a cvs snapshot
+				if [ ! -f "./configure" ] || [ -n "$UNSERMAKE" ]; then
+					for x in Makefile.cvs admin/Makefile.common; do
+						if [ -f "$x" ] && [ -z "$makefile" ]; then makefile="$x"; fi
+					done
+					if [ -f "$makefile" ]; then
+						debug-print "$FUNCNAME: configure: generating configure script, running make -f $makefile"
+						make -f $makefile
+					fi
+					[ -f "./configure" ] || die "no configure script found, generation unsuccessful"
+				fi
+
+				export PATH="${KDEDIR}/bin:${PATH}"
+
+				# configure doesn't need to know about the other KDEs installed.
+				# in fact, if it does, it sometimes tries to use the wrong dcopidl, etc.
+				# due to the messed up way configure searches for things
+				export KDEDIRS="${PREFIX}:${KDEDIR}"
+
+				cd $S
+
+				# Visiblity stuff is broken. Just disable it when it's present.
+				export kde_cv_prog_cxx_fvisibility_hidden=no
+
+				# If we're in a kde-base ebuild, set the prefixed directories to
+				# override the ones set by econf.
+				if [[ ${PREFIX} != "/usr" ]]; then
+					myconf="${myconf} --prefix=${PREFIX}
+						--mandir=${PREFIX}/share/man
+						--infodir=${PREFIX}/share/info
+						--datadir=${PREFIX}/share
+						--sysconfdir=${PREFIX}/etc"
+				fi
+
+				# Use libsuffix to keep KDE happy, the --libdir parameter get
+				# still honored.
+				if [[ $(get_libdir) != "lib" ]] ; then
+					myconf="${myconf} --enable-libsuffix=$(get_libdir | sed s/lib//)"
+				fi
+
+				econf \
+					${myconf} \
+					|| die "died running ./configure, $FUNCNAME:configure"
+
+				# Seems ./configure add -O2 by default but hppa don't want that but we need -ffunction-sections
+				if [[ "${ARCH}" = "hppa" ]]
+				then
+					einfo Fixating Makefiles
+					find ${S} -name Makefile | while read a; do sed -e s/-O2/-ffunction-sections/ -i "${a}" ; done
+				fi
+				;;
+			make)
+				export PATH="${KDEDIR}/bin:${PATH}"
+				debug-print-section make
+				emake || die "died running emake, $FUNCNAME:make"
+				;;
+			all)
+				debug-print-section all
+				kde_src_compile myconf configure make
+				;;
+		esac
+
+	shift
+	done
 
 }
 
 kde_src_install() {
-    
-    while [ "$1" ]; do
-
-	case $1 in
-	    make)
-		make install DESTDIR=${D} || die
-		;;
-	    dodoc)
-		dodoc AUTHORS ChangeLog README*
-		;;
-	    all)
-		kde_src_install make dodoc
-		;;
-	esac
-	
-    shift
-    done
-  
+
+	debug-print-function $FUNCNAME $*
+	[[ -z "$1" ]] && kde_src_install all
+
+	cd ${S}
+
+	while [[ "$1" ]]; do
+
+		case $1 in
+			make)
+				debug-print-section make
+				make install DESTDIR=${D} destdir=${D} || die "died running make install, $FUNCNAME:make"
+				;;
+	    	dodoc)
+				debug-print-section dodoc
+				for doc in AUTHORS ChangeLog* README* NEWS TODO; do
+					[ -s "$doc" ] && dodoc $doc
+				done
+				;;
+	    	all)
+				debug-print-section all
+				kde_src_install make dodoc
+				;;
+		esac
+
+	shift
+	done
+
 }
 
+# slot rebuild function, thanks to Carsten Lohrke in bug 98425.
+slot_rebuild() {
+	local VDB_PATH="$(portageq vdb_path)"
+	local KDE_PREFIX="$(kde-config --prefix)"
+	local REBUILD_LIST=""
+	local BROKEN_PKGS=""
+
+	echo
+	einfo "Scan for possible needed slot related rebuilds.\n"
+	echo
+	for i in ${*} ; do
+		local temp="$(ls -1d ${VDB_PATH}/${i}*)"
+		for j in ${temp} ; do
+			if ! [[ -f ${j}/CONTENTS ]] ; then
+				eerror "The package db entry for ${j/${VDB_PATH}\//} is broken."
+				BROKEN_PKGS="${BROKEN_PKGS} ${j/${VDB_PATH}\//}"
+				continue
+			fi
 
-EXPORT_FUNCTIONS
+			k="$(grep -o /.*/lib.*\.la ${j}/CONTENTS)"
+			m=""
+			for l in ${k} ; do [[ -e ${l} ]] && m="${m} ${l}"; done
+			l="$(echo ${k} ${m} | fmt -w 1 | sort | uniq -u)"
 
+			if [[ ${l} != "" ]] || [[ ${m} == "" ]] ; then
+				eerror "Installation of ${j/${VDB_PATH}\//} is broken."
+				BROKEN_PKGS="${BROKEN_PKGS} ${j/${VDB_PATH}\//}"
+			else
+				if [[ $(cat ${m}  | grep -co "${KDE_PREFIX}") = 0 ]] ; then
+					REBUILD_LIST="${REBUILD_LIST} =${j/${VDB_PATH}\//}"
+				fi
+			fi
+		done
+	done
+	echo
+	if [[ -n "${BROKEN_PKGS}" ]] ; then
+		eerror "Anomalies were found. Please do \"emerge ${BROKEN_PKGS}\"."
+		return 1
+	fi
+
+
+	if [[ -n "${REBUILD_LIST}" ]] ; then
+		local temp=""
+		cd ${VDB_PATH}
+		for i in ${REBUILD_LIST} ; do
+			i="$(echo ${i%-*} | cut -d= -f2)"
+			temp="${temp} $(find .  -iname "DEPEND" -exec grep -H ${i} '{}' \; | cut -f2-3 -d/ | grep -v ${CATEGORY}/${PN})"
+		done
+		temp="$(echo ${temp} | fmt -w 1 | sort -u)"
+		for i in ${temp} ; do
+			REBUILD_LIST="${REBUILD_LIST} =${i}"
+		done
+	fi
+
+	if [[ -n "${REBUILD_LIST}" ]] ; then
+		einfo "Please run \"emerge --oneshot ${REBUILD_LIST}\" before continuing.\n"
+	else
+		einfo "Done :), continuing...\n"
+		return 1
+	fi
+	echo
+}
 
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index d04c04cb4730..f9c60dc64531 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,5 +1,13 @@
-# kernel.eclass rewrite for a clean base regarding the 2.6 series of kernel
-# with back-compatibility for 2.4
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.1.1.1 2005/11/30 09:59:29 chriswhite Exp $
+
+# Description: kernel.eclass rewrite for a clean base regarding the 2.6
+#              series of kernel with back-compatibility for 2.4
+#
+# Maintainer: John Mylchreest <johnm@gentoo.org>
+#
+# Please direct your bugs to the current eclass maintainer :)
 
 # added functionality:
 # unipatch		- a flexible, singular method to extract, add and remove patches.
@@ -7,107 +15,411 @@
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
 #
-# K_NOSETEXTRAVERSION	- if this is set then EXTRAVERSION will not be automatically set within the kernel Makefile
-# K_NOUSENAME		- if this is set then EXTRAVERSION will not include the first part of ${PN} in EXTRAVERSION
-# UNIPATCH_LIST		- space delimetered list of patches to be applied to the kernel
-# UNIPATCH_DOCS		- space delimemeted list of docs to be installed to the doc dir
-
-ECLASS="kernel-2"
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst
+# K_USEPV				- When setting the EXTRAVERSION variable, it should
+#						  add PV to the end.
+#						  this is useful for thigns like wolk. IE:
+#						  EXTRAVERSION would be something like : -wolk-4.19-r1
+# K_NOSETEXTRAVERSION	- if this is set then EXTRAVERSION will not be
+#						  automatically set within the kernel Makefile
+# K_NOUSENAME			- if this is set then EXTRAVERSION will not include the
+#						  first part of ${PN} in EXTRAVERSION
+# K_PREPATCHED			- if the patchset is prepatched (ie: mm-sources,
+#						  ck-sources, ac-sources) it will use PR (ie: -r5) as
+#						  the patchset version for
+#						  and not use it as a true package revision
+# K_EXTRAEINFO			- this is a new-line seperated list of einfo displays in
+#						  postinst and can be used to carry additional postinst
+#						  messages
+# K_EXTRAEWARN			- same as K_EXTRAEINFO except ewarn's instead of einfo's
+# K_SYMLINK				- if this is set, then forcably create symlink anyway
+#
+# K_DEFCONFIG			- Allow specifying a different defconfig target.
+#						  If length zero, defaults to "defconfig".
+# K_WANT_GENPATCHES		- Apply genpatches to kernel source. Provide any
+# 						  combination of "base" and "extras"
+# K_GENPATCHES_VER		- The version of the genpatches tarball(s) to apply.
+#						  A value of "5" would apply genpatches-2.6.12-5 to
+#						  my-sources-2.6.12.ebuild
+
+# H_SUPPORTEDARCH		- this should be a space separated list of ARCH's which
+#						  can be supported by the headers ebuild
+
+# UNIPATCH_LIST			- space delimetered list of patches to be applied to the
+#						  kernel
+# UNIPATCH_EXCLUDE		- an addition var to support exlusion based completely
+#						  on "<passedstring>*" and not "<passedno#>_*"
+#						- this should _NOT_ be used from the ebuild as this is
+#						  reserved for end users passing excludes from the cli
+# UNIPATCH_DOCS			- space delimemeted list of docs to be installed to
+#						  the doc dir
+# UNIPATCH_STRICTORDER	- if this is set places patches into directories of
+#						  order, so they are applied in the order passed
+
+inherit toolchain-funcs versionator multilib
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install \
+	pkg_preinst pkg_postinst
+
+# Added by Daniel Ostrow <dostrow@gentoo.org>
+# This is an ugly hack to get around an issue with a 32-bit userland on ppc64.
+# I will remove it when I come up with something more reasonable.
+[[ ${PROFILE_ARCH} == 'ppc64' ]] && CHOST='powerpc64-unknown-linux-gnu'
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
 
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
-IUSE="${IUSE} build"
-SLOT="${KV}"
 
-# capture the sources type and set depends
-if [ "${ETYPE}" == "sources" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND="!build? ( sys-apps/sed
-		>=sys-devel/binutils-2.11.90.0.31 )"
-
-	RDEPEND="${DEPEND}
-		 !build? ( >=sys-libs/ncurses-5.2
-		dev-lang/perl
-		virtual/modutils
-		sys-devel/make )"
- 
-	PROVIDE="virtual/linux-sources virtual/alsa"
-
-elif [ "${ETYPE}" == "headers" ]
-then
-	PROVIDE="virtual/kernel virtual/os-headers"
-else
-	eerror "Unknown ETYPE=\"${ETYPE}\", must be either \"sources\" or \"headers\""
-	die
-fi
+# set LINUX_HOSTCFLAGS if not already set
+[[ -z ${LINUX_HOSTCFLAGS} ]] && \
+	LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
 
-# Grab kernel version from KV
-KV_MAJOR=$(echo ${KV} | cut -d. -f1)
-KV_MINOR=$(echo ${KV} | cut -d. -f2)
-KV_PATCH=$(echo ${KV} | cut -d. -f3)
-KV_PATCH=${KV_PATCH/[-_]*/}
+#Eclass functions only from here onwards ...
+#==============================================================
+handle_genpatches() {
+	local tarball
+	[[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return -1
+
+	for i in ${K_WANT_GENPATCHES} ; do
+		tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.bz2"
+		GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}"
+		UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}"
+	done
+}
 
-# set LINUX_HOSTCFLAGS if not already set
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
+detect_version() {
+	# this function will detect and set
+	# - OKV: Original Kernel Version (2.6.0/2.6.0-test11)
+	# - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1)
+	# - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1)
 
+	if [[ -n ${KV_FULL} ]]; then
+		# we will set this for backwards compatibility.
+		KV=${KV_FULL}
+
+		# we know KV_FULL so lets stop here. but not without resetting S
+		S=${WORKDIR}/linux-${KV_FULL}
+		return
+	fi
+
+	# CKV is used as a comparison kernel version, which is used when
+	# PV doesnt reflect the genuine kernel version.
+	# this gets set to the portage style versioning. ie:
+	#   CKV=2.6.11_rc4
+	CKV=${CKV:-${PV}}
+	OKV=${OKV:-${CKV}}
+	OKV=${OKV/_beta/-test}
+	OKV=${OKV/_rc/-rc}
+	OKV=${OKV/-r*}
+	OKV=${OKV/_p*}
+
+	KV_MAJOR=$(get_version_component_range 1 ${OKV})
+	KV_MINOR=$(get_version_component_range 2 ${OKV})
+	KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+	if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then
+		KV_EXTRA=$(get_version_component_range 4- ${OKV})
+		KV_EXTRA=${KV_EXTRA/[-_]*}
+	else
+		KV_PATCH=$(get_version_component_range 3- ${OKV})
+	fi
+	KV_PATCH=${KV_PATCH/[-_]*}
+
+	KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+
+	RELEASE=${CKV/${OKV}}
+	RELEASE=${RELEASE/_beta}
+	RELEASE=${RELEASE/_rc/-rc}
+	RELEASE=${RELEASE/_pre/-pre}
+	kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-bk}
+	RELEASETYPE=${RELEASE//[0-9]}
+
+	# Now we know that RELEASE is the -rc/-bk
+	# and RELEASETYPE is the same but with its numerics stripped
+	# we can work on better sorting EXTRAVERSION.
+	# first of all, we add the release
+	EXTRAVERSION="${RELEASE}"
+	[[ -n ${KV_EXTRA} ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}"
+
+	if [[ -n ${K_PREPATCHED} ]]; then
+		EXTRAVERSION="${EXTRAVERSION}-${PN/-*}${PR/r}"
+	elif [[ "${ETYPE}" = "sources" ]]; then
+		# For some sources we want to use the PV in the extra version
+		# This is because upstream releases with a completely different
+		# versioning scheme.
+		case ${PN/-*} in
+		     wolk) K_USEPV=1;;
+		  vserver) K_USEPV=1;;
+		esac
+
+		[[ -z ${K_NOUSENAME} ]] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*}"
+		[[ -n ${K_USEPV} ]]     && EXTRAVERSION="${EXTRAVERSION}-${PV//_/-}"
+		[[ -n ${PR//r0} ]]      && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+	fi
+
+	# The only messing around which should actually effect this is for KV_EXTRA
+	# since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else
+	# KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION
+	if [[ -n ${KV_EXTRA} ]]; then
+		OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${CKV}.bz2
+					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.tar.bz2"
+		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
+	fi
+
+	# We need to set this using OKV, but we need to set it before we do any
+	# messing around with OKV based on RELEASETYPE
+	KV_FULL=${OKV}${EXTRAVERSION}
+
+	# we will set this for backwards compatibility.
+	S=${WORKDIR}/linux-${KV_FULL}
+	KV=${KV_FULL}
+
+	# -rc-bk pulls can be achieved by specifying CKV
+	# for example:
+	#   CKV="2.6.11_rc3_pre2"
+	# will pull:
+	#   linux-2.6.10.tar.bz2 & patch-2.6.11-rc3.bz2 & patch-2.6.11-rc3-bk2.bz2
+
+	if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
+		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
+		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${CKV//_/-}.bz2
+					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
+	fi
+
+	if [[ ${RELEASETYPE} == -bk ]]; then
+		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${OKV}${RELEASE}.bz2
+					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
+	fi
+
+	if [[ ${RELEASETYPE} == -rc-bk ]]; then
+		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
+		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
+					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-bk*}.bz2
+					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-bk*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2"
+	fi
+
+	handle_genpatches
+}
+
+kernel_is() {
+	[[ -z ${OKV} ]] && detect_version
+	local operator test value x=0 y=0 z=0
+
+	case ${1} in
+	  lt) operator="-lt"; shift;;
+	  gt) operator="-gt"; shift;;
+	  le) operator="-le"; shift;;
+	  ge) operator="-ge"; shift;;
+	  eq) operator="-eq"; shift;;
+	   *) operator="-eq";;
+	esac
+
+	for x in ${@}; do
+		for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
+		value="${value}${x}"
+		z=$((${z} + 1))
+
+		case ${z} in
+		  1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done;
+			 test="${test}${KV_MAJOR}";;
+		  2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done;
+			 test="${test}${KV_MINOR}";;
+		  3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done;
+			 test="${test}${KV_PATCH}";;
+		  *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
+		esac
+	done
+
+	[ ${test} ${operator} ${value} ] && return 0 || return 1
+}
 
-#eclass functions only from here onwards.
-#==============================================================
 kernel_is_2_4() {
-	[ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 4 ] && return 0 || return 1
+	kernel_is 2 4
 }
 
 kernel_is_2_6() {
-	[ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 5 -o ${KV_MINOR} -eq 6 ] && return 0 || return 1
+	kernel_is 2 6 || kernel_is 2 5
 }
 
+# Capture the sources type and set DEPENDs
+if [[ ${ETYPE} == sources ]]; then
+	DEPEND="!build? ( sys-apps/sed
+					  >=sys-devel/binutils-2.11.90.0.31 )
+			doc? ( app-text/docbook-sgml-utils
+				   app-text/xmlto )"
+	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
+			           sys-devel/make )
+			 virtual/dev-manager"
+
+	PROVIDE="virtual/linux-sources"
+	kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa"
+
+	SLOT="${PVR}"
+	DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel"
+	IUSE="symlink build doc"
+elif [[ ${ETYPE} == headers ]]; then
+	DESCRIPTION="Linux system headers"
+	IUSE=""
+
+	if [[ ${CTARGET} = ${CHOST} ]]; then
+		DEPEND="!virtual/os-headers"
+		PROVIDE="virtual/os-headers"
+		SLOT="0"
+	else
+		SLOT="${CTARGET}"
+	fi
+else
+	eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
+	die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
+fi
+
+# Cross-compile support functions
+#==============================================================
+kernel_header_destdir() {
+	[[ ${CTARGET} == ${CHOST} ]] \
+		&& echo /usr/include \
+		|| echo /usr/${CTARGET}/include
+}
+
+cross_pre_c_headers() {
+	[[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1
+	[[ ${CHOST} == ${CTARGET} ]] && return 1
+	return 0
+}
+
+env_setup_xmakeopts() {
+	# Kernel ARCH != portage ARCH
+	export KARCH=$(tc-arch-kernel)
+
+	# When cross-compiling, we need to set the ARCH/CROSS_COMPILE
+	# variables properly or bad things happen !
+	xmakeopts="ARCH=${KARCH}"
+	if [[ ${CTARGET} != ${CHOST} ]] && ! cross_pre_c_headers ; then
+		xmakeopts="${xmakeopts} CROSS_COMPILE=${CTARGET}-"
+	elif type -p ${CHOST}-ar > /dev/null ; then
+		xmakeopts="${xmakeopts} CROSS_COMPILE=${CHOST}-"
+	fi
+	export xmakeopts
+}
 
 # Unpack functions
 #==============================================================
 unpack_2_4() {
-	cd ${S}
-	# this file is required for other things to build properly, 
+	env_setup_xmakeopts
+
+	cd "${S}"
+	# this file is required for other things to build properly,
 	# so we autogenerate it
-	make mrproper || die "make mrproper died"
-	make include/linux/version.h || die "make include/linux/version.h failed"
+	make -s mrproper ${xmakeopts} || die "make mrproper failed"
+	make -s symlinks ${xmakeopts} || die "make symlinks failed"
+	make -s include/linux/version.h ${xmakeopts} || die "make include/linux/version.h failed"
 	echo ">>> version.h compiled successfully."
 }
 
+unpack_2_6() {
+	env_setup_xmakeopts
+
+	cd "${S}"
+	# this file is required for other things to build properly, so we
+	# autogenerate it ... touch .config to keep version.h build from
+	# spitting out an annoying warning
+	make -s mrproper ${xmakeopts} || die "make mrproper failed"
+	touch .config
+	make -s include/linux/version.h ${xmakeopts} || die "make include/linux/version.h failed"
+	rm -f .config
+}
+
 universal_unpack() {
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+	if [[ "${OKV}" != "${KV_FULL}" ]]; then
+		mv linux-${OKV} linux-${KV_FULL} \
+			|| die "Unable to move source tree to ${KV_FULL}."
+	fi
+	cd "${S}"
+
 	# remove all backup files
 	find . -iname "*~" -exec rm {} \; 2> /dev/null
 
-	if [ -d "${S}/Documentation/DocBook" ]
-	then
-		cd ${S}/Documentation/DocBook
-		sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
-			&& mv Makefile.new Makefile
-		cd ${S}
-	fi
+	# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
+	use ppc && \
+		sed -ie 's|TOUT	:= .tmp_gas_check|TOUT	:= $(T).tmp_gas_check|' \
+		"${S}"/arch/ppc/Makefile
 }
 
 unpack_set_extraversion() {
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly and fix EXTRAVERSION
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed	-e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
-		Makefile.orig > Makefile
-	rm Makefile.orig
+	cd "${S}"
+	sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile
+	cd ${OLDPWD}
+}
+
+# Should be done after patches have been applied
+# Otherwise patches that modify the same area of Makefile will fail
+unpack_fix_install_path() {
+	cd "${S}"
+	sed	-i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile
+}
+
+unpack_fix_docbook() {
+	if [[ -d ${S}/Documentation/DocBook ]]; then
+		cd "${S}"/Documentation/DocBook
+		sed -ie "s:db2:docbook2:g" Makefile
+		cd ${OLDPWD}
+	fi
 }
 
 # Compile Functions
 #==============================================================
 compile_headers() {
-	local MY_ARCH
-	
-	MY_ARCH=${ARCH}
-	unset ${ARCH}
-	yes "" | make oldconfig
-	echo ">>> make oldconfig complete"
-	ARCH=${MY_ARCH}	
+	env_setup_xmakeopts
+
+	# Since KBUILD_OUTPUT shouldnt be used when compiling headers, lets unset it
+	# if it exists.
+	[[ -n ${KBUILD_OUTPUT} ]] && unset KBUILD_OUTPUT
+
+	# if we couldnt obtain HOSTCFLAGS from the Makefile,
+	# then set it to something sane
+	local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile)
+	HOSTCFLAGS=${HOSTCFLAGS:--Wall -Wstrict-prototypes -O2 -fomit-frame-pointer}
+
+	if kernel_is 2 4; then
+		yes "" | make oldconfig ${xmakeopts}
+		echo ">>> make oldconfig complete"
+		make dep ${xmakeopts}
+	elif kernel_is 2 6; then
+		# autoconf.h isnt generated unless it already exists. plus, we have
+		# no guarantee that any headers are installed on the system...
+		[[ -f ${ROOT}/usr/include/linux/autoconf.h ]] \
+			|| touch include/linux/autoconf.h
+
+		# if K_DEFCONFIG isn't set, force to "defconfig"
+		# needed by mips
+		if [[ -z ${K_DEFCONFIG} ]]; then
+			K_DEFCONFIG="defconfig"
+		fi
+
+		# if there arent any installed headers, then there also isnt an asm
+		# symlink in /usr/include/, and make defconfig will fail, so we have
+		# to force an include path with $S.
+		HOSTCFLAGS="${HOSTCFLAGS} -I${S}/include/"
+		ln -sf asm-${KARCH} "${S}"/include/asm
+		cross_pre_c_headers && return 0
+
+		make ${K_DEFCONFIG} HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "defconfig failed"
+		make prepare HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed"
+		make prepare-all HOSTCFLAGS="${HOSTCFLAGS}" ${xmakeopts} || die "prepare failed"
+	fi
+}
+
+compile_manpages() {
+	einfo "Making manpages ..."
+	env -u ARCH make mandocs
 }
 
 # install functions
@@ -117,71 +429,152 @@ install_universal() {
 	cd ${WORKDIR}
 	chown -R root:root *
 	chmod -R a+r-w+X,u+w *
+	cd ${OLDPWD}
 }
 
 install_headers() {
-	[ $(kernel_is_2_4) $? == 0 ] && unpack_2_4
+	local ddir=$(kernel_header_destdir)
+
+	cd "${S}"
+	dodir ${ddir}/linux
+	cp -ax "${S}"/include/linux/* ${D}/${ddir}/linux
+	rm -rf ${D}/${ddir}/linux/modules
+
+	# Handle multilib headers and crap
+	local multi_dirs="" multi_defs=""
+	case $(tc-arch-kernel) in
+		sparc64)
+			multi_dirs="sparc sparc64"
+			multi_defs="!__arch64__ __arch64__"
+			;;
+		x86_64)
+			multi_dirs="i386 x86_64"
+			multi_defs="__i386__ __x86_64__"
+			;;
+		ppc64)
+			multi_dirs="ppc ppc64"
+			multi_defs="!__powerpc64__ __powerpc64__"
+			;;
+		s390x)
+			multi_dirs="s390 s390x"
+			multi_defs="!__s390x__ __s390x__"
+			;;
+		arm)
+			dodir ${ddir}/asm
+			cp -ax "${S}"/include/asm/* "${D}"/${ddir}/asm
+			[[ ! -e ${D}/${ddir}/asm/arch ]] && ln -sf arch-ebsa285 "${D}"/${ddir}/asm/arch
+			[[ ! -e ${D}/${ddir}/asm/proc ]] && ln -sf proc-armv "${D}"/${ddir}/asm/proc
+			;;
+		*)
+			dodir ${ddir}/asm
+			cp -ax "${S}"/include/asm/* ${D}/${ddir}/asm
+			;;
+	esac
+	if [[ -n ${multi_dirs} ]] ; then
+		local d ml_inc=""
+		for d in ${multi_dirs} ; do
+			dodir ${ddir}/asm-${d}
+			cp -ax "${S}"/include/asm-${d}/* ${D}/${ddir}/asm-${d}/ || die "cp asm-${d} failed"
+
+			ml_inc="${ml_inc} ${multi_defs%% *}:${ddir}/asm-${d}"
+			multi_defs=${multi_defs#* }
+		done
+		create_ml_includes ${ddir}/asm ${ml_inc}
+	fi
+
+	if kernel_is 2 6; then
+		dodir ${ddir}/asm-generic
+		cp -ax "${S}"/include/asm-generic/* ${D}/${ddir}/asm-generic
+	fi
+
+	# clean up
+	find "${D}" -name '*.orig' -exec rm -f {} \;
 
-	cd ${S}
-	dodir /usr/include/linux
-	cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-	rm -rf ${D}/usr/include/linux/modules
-	dodir /usr/include/asm
-	cp -ax ${S}/include/asm/* ${D}/usr/include/asm
+	cd ${OLDPWD}
 }
 
 install_sources() {
-		local doc
-		local docs
-
-		cd ${S}
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		if [ -d "${WORKDIR}/${KV}/docs/" ]
-		then
-			for file in $(ls -1 ${WORKDIR}/${KV}/docs/)
-			do
-				echo "XX_${file}*" >> ${S}/patches.txt
-				cat ${WORKDIR}/${KV}/docs/${file} >> ${S}/patches.txt
-				echo "" >> ${S}/patches.txt
-			done
-		fi
-		
-		if [ ! -f ${S}/patches.txt ]
-		then
-			# patches.txt is empty so lets use our ChangeLog
-			[ -f ${FILESDIR}/../ChangeLog ] && echo "Please check the ebuild ChangeLog for more details." > ${S}/patches.txt
-		fi
-
-		for doc in ${UNIPATCH_DOCS}
-		do
-			[ -f ${doc} ] && docs="${docs} ${doc}"
+	local doc docs file
+
+	cd "${S}"
+	dodir /usr/src
+	echo ">>> Copying sources ..."
+
+	file="$(find ${WORKDIR} -iname "docs" -type d)"
+	if [[ -n ${file} ]]; then
+		for file in $(find ${file} -type f); do
+			echo "${file//*docs\/}" >> "${S}"/patches.txt
+			echo "===================================================" >> "${S}"/patches.txt
+			cat ${file} >> "${S}"/patches.txt
+			echo "===================================================" >> "${S}"/patches.txt
+			echo "" >> "${S}"/patches.txt
 		done
+	fi
 
-		if [ -f ${S}/patches.txt ]; then
-			docs="${docs} ${S}/patches.txt"
-		fi
-		dodoc ${docs}
-		mv ${WORKDIR}/linux* ${D}/usr/src
+	if [[ ! -f ${S}/patches.txt ]]; then
+		# patches.txt is empty so lets use our ChangeLog
+		[[ -f ${FILESDIR}/../ChangeLog ]] && \
+			echo "Please check the ebuild ChangeLog for more details." \
+			> "${S}"/patches.txt
+	fi
+
+	if use doc ; then
+		install_manpages
+
+		for doc in ${UNIPATCH_DOCS}; do	[[ -f ${doc} ]] && docs="${docs} ${doc}"; done
+		if [[ -f ${S}/patches.txt ]]; then docs="${docs} ${S}/patches.txt"; fi
+		[[ -n ${docs} ]] && dodoc ${docs}
+	fi
+
+	mv ${WORKDIR}/linux* ${D}/usr/src
+}
+
+install_manpages() {
+	kernel_is lt 2 5 && return
+
+	local myfiles="Documentation/DocBook/Makefile"
+	kernel_is lt 2 6 12 && myfiles="scripts/makeman ${myfiles}"
+
+	sed -ie "s#/usr/local/man#${D}/usr/share/man#g" ${myfiles}
+	ebegin "Installing manpages"
+	env -u ARCH make installmandocs
+	eend $?
+	sed -ie "s#${D}/usr/share/man#/usr/local/man#g" ${myfiles}
 }
 
 # pkg_preinst functions
 #==============================================================
 preinst_headers() {
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
+	local ddir=$(kernel_header_destdir)
+	[[ -L ${ddir}/linux ]] && rm ${ddir}/linux
+	[[ -L ${ddir}/asm ]] && rm ${ddir}/asm
 }
 
 # pkg_postinst functions
 #==============================================================
 postinst_sources() {
-	if [ ! -h ${ROOT}usr/src/linux ]
-	then
-		ln -sf ${ROOT}usr/src/linux-${KV} ${ROOT}usr/src/linux
+	local MAKELINK=0
+
+	# if we have USE=symlink, then force K_SYMLINK=1
+	use symlink && K_SYMLINK=1
+
+	# if we are to forcably symlink, delete it if it already exists first.
+	if [[ -n ${K_SYMLINK} ]]; then
+		[[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux
+		MAKELINK=1
+	fi
+
+	# if the link doesnt exist, lets create it
+	[[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1
+
+	if [[ ${MAKELINK} == 1 ]]; then
+		cd ${ROOT}usr/src
+		ln -sf linux-${KV_FULL} linux
+		cd ${OLDPWD}
 	fi
 
 	# Don't forget to make directory for sysfs
-	[ ! -d "${ROOT}/sys" -a $(kernel_is_2_6) $? == 0 ] && mkdir /sys
+	[[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys
 
 	echo
 	einfo "After installing a new kernel of any version, it is important"
@@ -191,32 +584,85 @@ postinst_sources() {
 	einfo "For example, this kernel will require:"
 	einfo "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
 	echo
+	einfo "If you are upgrading from a previous kernel, you may be interested"
+	einfo "in the following documents:"
+	einfo "  - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml"
+	kernel_is_2_6 && einfo "  - 2.4 to 2.6 migration guide: http://www.gentoo.org/doc/en/migration-to-2.6.xml"
+	if kernel_is ge 2 6 13; then
+		ewarn "As of 2.6.13 the support for devfs has been removed."
+		ewarn "You will be required to either manage a static /dev"
+		ewarn "or to ensure that udev is starting on boot."
+	fi
+	echo
+
+	# if K_EXTRAEINFO is set then lets display it now
+	if [[ -n ${K_EXTRAEINFO} ]]; then
+		echo ${K_EXTRAEINFO} | fmt |
+		while read -s ELINE; do	einfo "${ELINE}"; done
+	fi
+
+	# if K_EXTRAEWARN is set then lets display it now
+	if [[ -n ${K_EXTRAEWARN} ]]; then
+		echo ${K_EXTRAEWARN} | fmt |
+		while read -s ELINE; do ewarn "${ELINE}"; done
+	fi
+}
+
+postinst_headers() {
+	einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation"
+	einfo "of newer headers, it is advised that you re-merge glibc as follows:"
+	einfo "emerge glibc"
+	einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel"
+	einfo "headers."
+}
+
+# pkg_setup functions
+#==============================================================
+setup_headers() {
+	[[ -z ${H_SUPPORTEDARCH} ]] && H_SUPPORTEDARCH=${PN/-*/}
+	for i in ${H_SUPPORTEDARCH}; do
+		[[ $(tc-arch) == "${i}" ]] && H_ACCEPT_ARCH="yes"
+	done
+
+	if [[ ${H_ACCEPT_ARCH} != "yes" ]]; then
+		echo
+		eerror "This version of ${PN} does not support $(tc-arch)."
+		eerror "Please merge the appropriate sources, in most cases"
+		eerror "(but not all) this will be called $(tc-arch)-headers."
+		die "Package unsupported for $(tc-arch)"
+	fi
 }
 
 # unipatch
 #==============================================================
 unipatch() {
-	local i
-	local x
-	local extention
-	local PIPE_CMD
-	local UNIPATCH_EXCLUDE
-	local KPATCH_DIR
-	local PATCH_DEPTH
+	local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE
+	local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG
+
+	# set to a standard locale to ensure sorts are ordered properly.
+	myLC_ALL="${LC_ALL}"
+	myLANG="${LANG}"
+	LC_ALL="C"
+	LANG=""
 
 	[ -z "${KPATCH_DIR}" ] && KPATCH_DIR="${WORKDIR}/patches/"
 	[ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR}
 
+	# We're gonna need it when doing patches with a predefined patchlevel
+	shopt -s extglob
+
 	# This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers
 	# usage can be either via an env var or by params
-	[ -z "${UNIPATCH_LIST}" ] && UNIPATCH_LIST="${@}"
+	# although due to the nature we pass this within this eclass
+	# it shall be by param only.
+	# -z "${UNIPATCH_LIST}" ] && UNIPATCH_LIST="${@}"
+	UNIPATCH_LIST="${@}"
 
 	#unpack any passed tarballs
-	for i in ${UNIPATCH_LIST}
-	do
-		if [ -n "$(echo ${i} | grep -e ".tar" -e ".tbz" -e ".tgz")" ]
-		then
+	for i in ${UNIPATCH_LIST}; do
+		if [ -n "$(echo ${i} | grep -e "\.tar" -e "\.tbz" -e "\.tgz")" ]; then
 			extention=${i/*./}
+			extention=${extention/:*/}
 			case ${extention} in
 				tbz2) PIPE_CMD="tar -xvjf";;
 				 bz2) PIPE_CMD="tar -xvjf";;
@@ -226,192 +672,313 @@ unipatch() {
 				      die "Unrecognized tarball compression";;
 			esac
 
-			${PIPE_CMD} ${i} -C ${KPATCH_DIR} 1>/dev/null
-			if [ $? == 0 ]
-			then
+			if [ -n "${UNIPATCH_STRICTORDER}" ]; then
+				unset z
+				STRICT_COUNT=$((10#${STRICT_COUNT} + 1))
+				for((y=0; y<$((6 - ${#STRICT_COUNT})); y++));
+					do z="${z}0";
+				done
+				PATCH_ORDER="${z}${STRICT_COUNT}"
+
+				mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/
+				${PIPE_CMD} ${i/:*/} -C ${KPATCH_DIR}/${PATCH_ORDER}/ 1>/dev/null
+			else
+				${PIPE_CMD} ${i/:*/} -C ${KPATCH_DIR} 1>/dev/null
+			fi
+
+			if [ $? == 0 ]; then
 				einfo "${i/*\//} unpacked"
+				[ -n "$(echo ${i} | grep ':')" ] && echo ">>> Strict patch levels not currently supported for tarballed patchsets"
 			else
-				eerror "Failed to unpack ${i}"
+				eerror "Failed to unpack ${i/:*/}"
 				die "unable to unpack patch tarball"
 			fi
+		else
+			extention=${i/*./}
+			extention=${extention/:*/}
+			PIPE_CMD=""
+			case ${extention} in
+				    bz2) PIPE_CMD="bzip2 -dc";;
+				  patch) PIPE_CMD="cat";;
+				   diff) PIPE_CMD="cat";;
+				 gz|Z|z) PIPE_CMD="gzip -dc";;
+				ZIP|zip) PIPE_CMD="unzip -p";;
+				      *) UNIPATCH_DROP="${UNIPATCH_DROP} ${i/:*/}";;
+			esac
 
-			UNIPATCH_LIST="${UNIPATCH_LIST/${i}/}"
-		fi
-	done
+			PATCH_LEVEL=${i/*([^:])?(:)}
+			i=${i/:*/}
+			x=${i/*\//}
+			x=${x/\.${extention}/}
+
+			if [ -n "${PIPE_CMD}" ]; then
+				if [ ! -r "${i}" ]; then
+					echo
+					eerror "FATAL: unable to locate:"
+					eerror "${i}"
+					eerror "for read-only. The file either has incorrect permissions"
+					eerror "or does not exist."
+					die Unable to locate ${i}
+				fi
 
-	#so now everything is unpacked, lets work out whats to be dropped and whats to be included.
-	for i in ${UNIPATCH_LIST}
-	do
-		extention=${i/*./}
-		PIPE_CMD=""
-		case ${extention} in
-			    bz2) PIPE_CMD="bzip2 -dc";;
-			  patch) PIPE_CMD="cat";;
-			 gz|Z|z) PIPE_CMD="gzip -dc";;
-			ZIP|zip) PIPE_CMD="unzip -p";;
-			      *) UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} ${i}";;
-		esac
-		[ -n "${PIPE_CMD}" ] && ${PIPE_CMD} ${i} > ${KPATCH_DIR}/${i/*\//}.patch
+				if [ -n "${UNIPATCH_STRICTORDER}" ]; then
+					unset z
+					STRICT_COUNT=$((10#${STRICT_COUNT} + 1))
+					for((y=0; y<$((6 - ${#STRICT_COUNT})); y++));
+						do z="${z}0";
+					done
+					PATCH_ORDER="${z}${STRICT_COUNT}"
+
+					mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/
+					$(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL})
+				else
+					$(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL})
+				fi
+			fi
+		fi
 	done
 
 	#populate KPATCH_DIRS so we know where to look to remove the excludes
 	x=${KPATCH_DIR}
 	KPATCH_DIR=""
-	for i in $(find ${x} -type d)
-	do
+	for i in $(find ${x} -type d | sort -n); do
 		KPATCH_DIR="${KPATCH_DIR} ${i}"
 	done
 
 	#so now lets get rid of the patchno's we want to exclude
-	for i in ${UNIPATCH_EXCLUDE}
-	do
-		for x in ${KPATCH_DIR}
-		do
-			rm ${x}/${i}_* 2>/dev/null
-			if [ $? == 0 ]
-			then
-				einfo "Excluding Patch #${i}"
-				einfo "From: ${x/${WORKDIR}/}"
-			fi
-		done
+	UNIPATCH_DROP="${UNIPATCH_EXCLUDE} ${UNIPATCH_DROP}"
+	for i in ${UNIPATCH_DROP}; do
+		ebegin "Excluding Patch #${i}"
+		for x in ${KPATCH_DIR}; do rm -f ${x}/${i}* 2>/dev/null; done
+		eend $?
 	done
 
 	# and now, finally, we patch it :)
-	for x in ${KPATCH_DIR}
-	do
-		for i in $(find ${x} -maxdepth 1 -iname "*.patch" | sort -u)
-		do
-
-
-			PATCH_DEPTH=0
-			ebegin "Applying ${i/*\//}"
-			while [ ${PATCH_DEPTH} -lt 5 ]
-			do
-				if (patch -p${PATCH_DEPTH} --dry-run -f < ${i} >/dev/null)
-				then
-					$(patch -p${PATCH_DEPTH} -f < ${i} >/dev/null)
-					if [ "$?" -eq 0 ]
-					then
+	for x in ${KPATCH_DIR}; do
+		for i in $(find ${x} -maxdepth 1 -iname "*.patch*" -or -iname "*.diff*" | sort -n); do
+			STDERR_T="${T}/${i/*\//}"
+			STDERR_T="${STDERR_T/.patch*/.err}"
+
+			[ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/}
+			#[ -z ${i/*.diff*/} ]  && PATCH_DEPTH=${i/*.diff/}
+
+			if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi
+
+			ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH}+)"
+			while [ ${PATCH_DEPTH} -lt 5 ]; do
+				echo "Attempting Dry-run:" >> ${STDERR_T}
+				echo "cmd: patch -p${PATCH_DEPTH} --dry-run -f < ${i}" >> ${STDERR_T}
+				echo "=======================================================" >> ${STDERR_T}
+				if [ $(patch -p${PATCH_DEPTH} --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then
+					echo "Attempting patch:" > ${STDERR_T}
+					echo "cmd: patch -p${PATCH_DEPTH} -f < ${i}" >> ${STDERR_T}
+					echo "=======================================================" >> ${STDERR_T}
+					if [ $(patch -p${PATCH_DEPTH} -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then
 						eend 0
+						rm ${STDERR_T}
 						break
 					else
 						eend 1
 						eerror "Failed to apply patch ${i/*\//}"
+						eerror "Please attach ${STDERR_T} to any bug you may post."
 						die "Failed to apply ${i/*\//}"
 					fi
 				else
 					PATCH_DEPTH=$((${PATCH_DEPTH} + 1))
 				fi
 			done
-			if [ ${PATCH_DEPTH} -eq 5 ]
-			then
+			if [ ${PATCH_DEPTH} -eq 5 ]; then
 				eend 1
+				eerror "Please attach ${STDERR_T} to any bug you may post."
 				die "Unable to dry-run patch."
 			fi
+		done
+	done
 
+	# This is a quick, and kind of nasty hack to deal with UNIPATCH_DOCS which
+	# sit in KPATCH_DIR's. This is handled properly in the unipatch rewrite,
+	# which is why I'm not taking too much time over this.
+	local tmp
+	for i in ${UNIPATCH_DOCS}; do
+		tmp="${tmp} ${i//*\/}"
+		cp -f ${i} ${T}/
+	done
+	UNIPATCH_DOCS="${tmp}"
 
-		done
+	# clean up  KPATCH_DIR's - fixes bug #53610
+	for x in ${KPATCH_DIR}; do rm -Rf ${x}; done
+
+	LC_ALL="${myLC_ALL}"
+	LANG="${myLANG}"
+}
+
+# getfilevar accepts 2 vars as follows:
+# getfilevar <VARIABLE> <CONFIGFILE>
+# pulled from linux-info
+
+getfilevar() {
+	local workingdir basefname basedname xarch=$(tc-arch-kernel)
+
+	if [[ -z ${1} ]] && [[ ! -f ${2} ]]; then
+		echo -e "\n"
+		eerror "getfilevar requires 2 variables, with the second a valid file."
+		eerror "   getfilevar <VARIABLE> <CONFIGFILE>"
+	else
+		workingdir=${PWD}
+		basefname=$(basename ${2})
+		basedname=$(dirname ${2})
+		unset ARCH
+
+		cd ${basedname}
+		echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \
+			make ${BUILD_FIXES} -s -f - e 2>/dev/null
+		cd ${workingdir}
+
+		ARCH=${xarch}
+	fi
+}
+
+detect_arch() {
+	# This function sets ARCH_URI and ARCH_PATCH
+	# with the neccessary info for the arch sepecific compatibility
+	# patchsets.
+
+	local ALL_ARCH LOOP_ARCH COMPAT_URI i
+
+	# COMPAT_URI is the contents of ${ARCH}_URI
+	# ARCH_URI is the URI for all the ${ARCH}_URI patches
+	# ARCH_PATCH is ARCH_URI broken into files for UNIPATCH
+
+	ARCH_URI=""
+	ARCH_PATCH=""
+	ALL_ARCH="ALPHA AMD64 ARM HPPA IA64 M68K MIPS PPC PPC64 S390 SH SPARC X86"
+
+	for LOOP_ARCH in ${ALL_ARCH}; do
+		COMPAT_URI="${LOOP_ARCH}_URI"
+		COMPAT_URI="${!COMPAT_URI}"
+
+		[[ -n ${COMPAT_URI} ]] && \
+			ARCH_URI="${ARCH_URI} $(echo ${LOOP_ARCH} | tr '[:upper:]' '[:lower:]')? ( ${COMPAT_URI} )"
+
+		if [[ ${LOOP_ARCH} == "$(echo $(tc-arch-kernel) | tr '[:lower:]' '[:upper:]')" ]]; 	then
+			for i in ${COMPAT_URI}; do
+				ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}"
+			done
+		fi
 	done
 }
 
-# custom functions
+# sparc nastiness
 #==============================================================
-detect_version() {
-	# this function will detect and set
-	# - OKV: Original Kernel Version (2.6.0/2.6.0-test11)
-	# - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1)
-	# - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1)
-	
-	OKV=${PV/_beta/-test}
-	OKV=${OKV/_rc/-rc}
-	OKV=${OKV/_pre*/}
-	OKV=${OKV/-r*/}
-	
-	KV_MAJOR=$(echo ${OKV} | cut -d. -f1)
-	KV_MINOR=$(echo ${OKV} | cut -d. -f2)
-	KV_PATCH=$(echo ${OKV} | cut -d. -f3)
-	KV_PATCH=${KV_PATCH/[-_]*/}	
-	
-	KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-	
-	RELEASE=${PV/${OKV}/}
-	RELEASE=${RELEASE/_beta/}
-	RELEASE=${RELEASE/_rc/-rc}
-	RELEASE=${RELEASE/_pre/-bk}
-	RELEASETYPE=${RELEASE//[0-9]/}
-	
-	EXTRAVERSION="${RELEASE}"
-	[ -z "${K_NOUSENAME}" ] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*/}"
-	[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-	
-	KV=${OKV}${EXTRAVERSION}
-	
-	# -rcXX-bkXX pulls are *IMPOSSIBLE* to support within the portage naming convention
-	# these cannot be supported, but the code here can handle it up until this point
-	# and theoretically thereafter.
-	
-	if [ "${RELEASETYPE}" == "-rc" ]
-	then
-		OKV="${KV_MAJOR}.${KV_MINOR}.$([ $((${KV_PATCH} - 1)) -lt 0 ] && echo ${KV_PATCH} || echo $((${KV_PATCH} - 1)))"
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${PV//_/-}.bz2
-			    mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-		UNIPATCH_LIST="${DISTDIR}/patch-${PV//_/-}.bz2 ${UNIPATCH_LIST}"
-		KV=${PV/[-_]*/}${EXTRAVERSION}
-	fi
-	
-	if [ "${RELEASETYPE}" == "-bk" ]
-	then
-		OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
-			    mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-		UNIPATCH_LIST="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 ${UNIPATCH_LIST}"
-		KV=${PV/[-_]*/}${EXTRAVERSION}
-	fi
-	
-	if [ "${RELEASETYPE}" == "-rc-bk" ]
-	then
-		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))-${RELEASE/-bk*}"
-		EXTRAVERSION="$([ -n "${RELEASE}" ] && echo ${RELEASE/*-bk/-bk})$([ -n "${K_USENAME}" ] && echo -${PN/-*/})$([ ! "${PR}" == "r0" ] && echo -${PR})"
-		
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
-			    mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-		UNIPATCH_LIST="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 ${UNIPATCH_LIST}"
-		KV=${PV/[-_]*/}${EXTRAVERSION}
-	fi
+# This script generates the files in /usr/include/asm for sparc systems
+# during installation of sys-kernel/linux-headers.
+# Will no longer be needed when full 64 bit support is used on sparc64
+# systems.
+#
+# Shamefully ripped from Debian
+# ----------------------------------------------------------------------
+
+# Idea borrowed from RedHat's kernel package
+
+# This is gonna get replaced by something in multilib.eclass soon...
+# --eradicator
+generate_sparc_asm() {
+	local name
+
+	cd $1 || die
+	mkdir asm
+
+	for h in `( ls asm-sparc; ls asm-sparc64 ) | grep '\.h$' | sort -u`; do
+		name="$(echo $h | tr a-z. A-Z_)"
+		# common header
+		echo "/* All asm/ files are generated and point to the corresponding
+ * file in asm-sparc or asm-sparc64.
+ */
+
+#ifndef __SPARCSTUB__${name}__
+#define __SPARCSTUB__${name}__
+" > asm/${h}
+
+		# common for sparc and sparc64
+		if [ -f asm-sparc/$h -a -f asm-sparc64/$h ]; then
+			echo "#ifdef __arch64__
+#include <asm-sparc64/$h>
+#else
+#include <asm-sparc/$h>
+#endif
+" >> asm/${h}
+
+		# sparc only
+		elif [ -f asm-sparc/$h ]; then
+echo "#ifndef __arch64__
+#include <asm-sparc/$h>
+#endif
+" >> asm/${h}
+
+		# sparc64 only
+		else
+echo "#ifdef __arch64__
+#include <asm-sparc64/$h>
+#endif
+" >> asm/${h}
+		fi
+
+		# common footer
+		echo "#endif /* !__SPARCSTUB__${name}__ */" >> asm/${h}
+	done
+	return 0
 }
 
+headers___fix() {
+	# Voodoo to partially fix broken upstream headers.
+	# Issues with this function should go to plasmaroo.
+	sed -i \
+		-e "s/\([ "$'\t'"]\)\(u\|s\)\(8\|16\|32\|64\)\([ "$'\t'"]\)/\1__\2\3\4/g;" \
+		-e 's/ \(u\|s\)\(8\|16\|32\|64\)$/ __\1\2/g' \
+		-e 's/\([(, ]\)\(u\|s\)64\([, )]\)/\1__\264\3/g' \
+		-e "s/^\(u\|s\)\(8\|16\|32\|64\)\([ "$'\t'"]\)/__\1\2\3/g;" \
+		"$@"
+}
 
 # common functions
 #==============================================================
-src_unpack() {
-	[ -z "${OKV}" ] && OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+kernel-2_src_unpack() {
+	universal_unpack
 
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die "Unable to move source tree to ${KV}."
-	cd ${S}
+	[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \
+		unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
 
-	universal_unpack
-	[ -n "${UNIPATCH_LIST}" ] && unipatch ${UNIPATCH_LIST}
-	[ -z "${K_NOSETEXTRAVERSION}" ] && unpack_set_extraversion
+	[[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion
+	unpack_fix_docbook
+	unpack_fix_install_path
 
-	[ $(kernel_is_2_4) $? == 0 ] && unpack_2_4
+	kernel_is 2 4 && unpack_2_4
+	kernel_is 2 6 && unpack_2_6
 }
 
-src_compile() {
-	[ "${ETYPE}" == "headers" ] && compile_headers
+kernel-2_src_compile() {
+	cd "${S}"
+	[[ ${ETYPE} == headers ]] && compile_headers
+	[[ ${ETYPE} == sources ]] && \
+		use doc && compile_manpages
 }
 
-pkg_preinst() {
-	[ "${ETYPE}" == "headers" ] && preinst_headers
+kernel-2_pkg_preinst() {
+	[[ ${ETYPE} == headers ]] && preinst_headers
 }
 
-src_install() {
+kernel-2_src_install() {
 	install_universal
-	[ "${ETYPE}" == "headers" ] && install_headers
-	[ "${ETYPE}" == "sources" ] && install_sources
+	[[ ${ETYPE} == headers ]] && install_headers
+	[[ ${ETYPE} == sources ]] && install_sources
+}
+
+kernel-2_pkg_postinst() {
+	[[ ${ETYPE} == headers ]] && postinst_headers
+	[[ ${ETYPE} == sources ]] && postinst_sources
 }
 
-pkg_postinst() {
-	[ "${ETYPE}" == "sources" ] && postinst_sources
+kernel-2_pkg_setup() {
+	[[ ${ETYPE} == headers ]] && setup_headers
+	[[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..."
 }
diff --git a/eclass/kernel-mod.eclass b/eclass/kernel-mod.eclass
index 647ec0ca78c8..e80986215c47 100644
--- a/eclass/kernel-mod.eclass
+++ b/eclass/kernel-mod.eclass
@@ -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/eclass/kernel-mod.eclass,v 1.1 2003/08/26 13:32:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-mod.eclass,v 1.1.1.1 2005/11/30 09:59:21 chriswhite Exp $
 
 # This eclass provides help for compiling external kernel modules from
 # source.
@@ -8,14 +8,17 @@
 # This eclass differs from kmod.eclass because it doesn't require modules
 # to be added to the kernel source tree first.
 
-ECLASS=kernel-mod
-INHERITED="$INHERITED $ECLASS"
 S=${WORKDIR}/${P}
 DESCRIPTION="Based on the $ECLASS eclass"
 
-SRC_URI="unknown - please fix me!!"
+SRC_URI="${SRC_URI:-unknown - please fix me!!}"
 KERNEL_DIR="${KERNEL_DIR:-/usr/src/linux}"
 
+kernel-mod_getmakefilevar ()
+{
+	grep $1 $2 | head -n 1 | cut -d = -f 2- | awk '{ print $1 }'
+}
+
 kernel-mod_getversion ()
 {
 	# yes, this is horrible, but it is effective
@@ -26,25 +29,175 @@ kernel-mod_getversion ()
 	if [ -h ${KERNEL_DIR} ] ; then
 		einfo "${KERNEL_DIR} is a symbolic link"
 		einfo "Determining the real directory of the Linux kernel source code"
-		KV_DIR="`ls -ld ${KERNEL_DIR} | awk '{ print $11 }'`"
-	else
+		KV_DIR="`ls -ld --full-time ${KERNEL_DIR} | awk '{ print $11 }'`"
+	elif [ -d ${KERNEL_DIR} ] ; then
 		einfo "${KERNEL_DIR} is a real directory"
-		KV_DIR="`ls -ld ${KERNEL_DIR} | awk '{ print $9 }'`"
+		KV_DIR="`ls -ld --full-time ${KERNEL_DIR} | awk '{ print $9 }'`"
+	else
+		eerror "Directory '${KERNEL_DIR}' cannot be found"
+		die
 	fi
-	KV_DIR="`basename $KV_FULL_DIR`"
+	KV_DIR="`basename $KV_DIR`"
 
 	# now, we need to break that down into versions
 
-	KV_VERSION_FULL="`echo $KV_DIR | cut -f 2- -d -`"
-	einfo "Building for Linux ${KV_VERSION_FULL} found in ${KERNEL_DIR}"
+	KV_DIR_VERSION_FULL="`echo $KV_DIR | cut -f 2- -d -`"
+
+	KV_DIR_MAJOR="`echo $KV_DIR_VERSION_FULL | cut -f 1 -d .`"
+	KV_DIR_MINOR="`echo $KV_DIR_VERSION_FULL | cut -f 2 -d .`"
+	KV_DIR_PATCH="`echo $KV_DIR_VERSION_FULL | cut -f 3 -d . | cut -f 3 -d -`"
+	KV_DIR_TYPE="`echo $KV_DIR_VERSION_FULL | cut -f 2- -d -`"
+
+	# sanity check - do the settings in the kernel's makefile match
+	# the directory that the kernel src is stored in?
 
-	KV_MAJOR="`echo $KV_VERSION_FULL | cut -f 1 -d .`"
-	KV_MINOR="`echo $KV_VERSION_FULL | cut -f 2 -d .`"
-	KV_PATCH="`echo $KV_VERSION_FULL | cut -f 3 -d . | cut -f 3 -d -`"
-	KV_TYPE="`echo $KV_VERSION_FULL | cut -f 2- -d -`"
+	KV_MK_FILE="${KERNEL_DIR}/Makefile"
+	KV_MK_MAJOR="`kernel-mod_getmakefilevar VERSION $KV_MK_FILE`"
+	KV_MK_MINOR="`kernel-mod_getmakefilevar PATCHLEVEL $KV_MK_FILE`"
+	KV_MK_PATCH="`kernel-mod_getmakefilevar SUBLEVEL $KV_MK_FILE`"
+	KV_MK_TYPE="`kernel-mod_getmakefilevar EXTRAVERSION $KV_MK_FILE`"
+
+	KV_MK_VERSION_FULL="$KV_MK_MAJOR.$KV_MK_MINOR.$KV_MK_PATCH$KV_MK_TYPE"
+
+	if [ "$KV_MK_VERSION_FULL" != "$KV_DIR_VERSION_FULL" ]; then
+		ewarn
+		ewarn "The kernel Makefile says that this is a $KV_MK_VERSION_FULL kernel"
+		ewarn "but the source is in a directory for a $KV_DIR_VERSION_FULL kernel."
+		ewarn
+		ewarn "This goes against the recommended Gentoo naming convention."
+		ewarn "Please rename your source directory to 'linux-${KV_MK_VERSION_FULL}'"
+		ewarn
+	fi
 
 	# these variables can be used by ebuilds to determine whether they
 	# will work with the targetted kernel or not
+	#
+	# do not rely on any of the variables above being available
+
+	KV_VERSION_FULL="$KV_MK_VERSION_FULL"
+	KV_MAJOR="$KV_MK_MAJOR"
+	KV_MINOR="$KV_MK_MINOR"
+	KV_PATCH="$KV_MK_PATCH"
+	KV_TYPE="$KV_MK_TYPE"
+
+	einfo "Building for Linux ${KV_VERSION_FULL} found in ${KERNEL_DIR}"
+}
+
+kernel-mod_configoption_present ()
+{
+	[ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+
+	if egrep "^CONFIG_${1}=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		return 0
+	else
+		return -1
+	fi
+}
+
+kernel-mod_configoption_module ()
+{
+	[ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+
+	if egrep "^CONFIG_${1}=[m]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		return 0
+	else
+		return -1
+	fi
+}
+
+kernel-mod_configoption_builtin ()
+{
+	[ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+
+	if egrep "^CONFIG_${1}=[y]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		return 0
+	else
+		return -1
+	fi
+}
+
+kernel-mod_modules_supported ()
+{
+	kernel-mod_configoption_builtin "MODULES"
+}
+
+kernel-mod_check_modules_supported ()
+{
+	if ! kernel-mod_modules_supported
+	then
+		eerror "Your current kernel does not support loading external modules."
+		eerror "Please enable \"Loadable module support\" (CONFIG_MODULES) in your kernel config."
+		die "kernel does not support loading modules"
+	fi
+}
+
+kernel-mod_checkzlibinflate_configured ()
+{
+	einfo "Checking for status of CONFIG_ZLIB_INFLATE support in your kernel"
+
+	. ${KERNEL_DIR}/.config || die "kernel has not been configured yet"
+	[ "$CONFIG_ZLIB_INFLATE" != "y" ] && kernel-mod_badconfig_zlib
+	[ "$CONFIG_ZLIB_DEFLATE" != "y" ] && kernel-mod_badconfig_zlib
+
+	# bug #27882 - zlib routines are only linked into the kernel
+	# if something compiled into the kernel calls them
+	#
+	# plus, for the cloop module, it appears that there's no way
+	# to get cloop.o to include a static zlib if CONFIG_MODVERSIONS
+	# is on
+
+	# get the line numbers of the lines that default CONFIG_ZLIB_INFLATE
+	# to 'y'
+
+	local LINENO_START
+	local LINENO_END
+	local SYMBOLS
+	local x
+
+	LINENO_END="`grep -n 'CONFIG_ZLIB_INFLATE y' ${KERNEL_DIR}/lib/Config.in | cut -d : -f 1`"
+	LINENO_START="`head -n $LINENO_END ${KERNEL_DIR}/lib/Config.in | grep -n 'if \[' | tail -n 1 | cut -d : -f 1`"
+	(( LINENO_AMOUNT = $LINENO_END - $LINENO_START ))
+	(( LINENO_END = $LINENO_END - 1 ))
+
+	SYMBOLS="`head -n $LINENO_END ${KERNEL_DIR}/lib/Config.in | tail -n $LINENO_AMOUNT | sed -e 's/^.*\(CONFIG_[^\" ]*\).*/\1/g;'`"
+
+	# okay, now we have a list of symbols
+	# we need to check each one in turn, to see whether it is set or not
+
+	for x in $SYMBOLS ; do
+		if [ "${!x}" = "y" ]; then
+			# we have a winner!
+			einfo "${x} ensures zlib is linked into your kernel - excellent"
+			return 0
+		fi
+	done
+
+	# if we get to here, the kernel config needs changing
+	#
+	# I have made this an error, because otherwise this warning will
+	# scroll off the top of the screen and be lost
+
+	eerror
+	eerror "This kernel module requires ZLIB library support."
+	eerror "You have enabled zlib support in your kernel, but haven't enabled"
+	eerror "enabled any option that will ensure that zlib is linked into your"
+	eerror "kernel."
+	eerror
+	eerror "Please ensure that you enable at least one of these options:"
+	eerror
+
+	for x in $SYMBOLS ; do
+		eerror "  * $x"
+	done
+
+	eerror
+	eerror "Please remember to recompile and install your kernel, and reboot"
+	eerror "into your new kernel before attempting to load this kernel module."
+
+	die "Kernel doesn't include zlib support"
 }
 
 kernel-mod_src_compile ()
@@ -52,4 +205,37 @@ kernel-mod_src_compile ()
 	emake KERNEL_DIR=${KERNEL_DIR} || die
 }
 
+kernel-mod_is_2_4_kernel() {
+	kernel-mod_getversion
+
+	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 4 ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
+kernel-mod_is_2_5_kernel() {
+	kernel-mod_getversion
+
+	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 5 ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
+kernel-mod_is_2_6_kernel() {
+	kernel-mod_getversion
+
+	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 6 ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
 EXPORT_FUNCTIONS src_compile
diff --git a/eclass/kernel.eclass b/eclass/kernel.eclass
index 61f6b808cdaf..85cf78285f74 100644
--- a/eclass/kernel.eclass
+++ b/eclass/kernel.eclass
@@ -1,99 +1,183 @@
-# 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/eclass/kernel.eclass,v 1.1 2002/09/22 00:51:07 lostlogic Exp $
-ECLASS=kernel
-EXPORT_FUNCTIONS src_unpack
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
+#
 # This eclass contains the common functions to be used by all lostlogic
 # based kernel ebuilds
+# with error handling contributions by gerk, and small fixes by zwelch
+# small naming fix by kain
+# moved set_arch_to_ functions to eutils -iggy (20041002)
 
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="`echo ${P} | \
-	sed -e 's:^\(.*\)-sources-[0-9]\+\.[0-9]\+\.[0-9]\+.r*\([0-9]*\)\(.*$\):-\1-r\2\3:'`"
-KV=${OKV}${EXTRAVERSION}
-S=${WORKDIR}/linux-${KV}
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
-SLOT="0"
+IUSE="build"
 
-if [ $ETYPE = "sources" ]
+if [ "${ETYPE}" = "sources" ]
 then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND="!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )"
+	#kbd is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
+	DEPEND="!build? ( sys-apps/sed
+			>=sys-devel/binutils-2.11.90.0.31 )
+		app-admin/addpatches"
 	RDEPEND="${DEPEND}
 		 !build? ( >=sys-libs/ncurses-5.2
-			   sys-devel/perl
-			   >=sys-apps/modutils-2.4.2
-			   sys-devel/make )"
+			dev-lang/perl
+			virtual/modutils
+			sys-devel/make )"
+	PROVIDE="virtual/linux-sources"
+elif [[ ${CTARGET} == ${CHOST} ]]
+then
+	if [ "${ETYPE}" = "headers" ]
+	then
+		PROVIDE="virtual/os-headers"
+	else
+		eerror "Unknown ETYPE=\"${ETYPE}\"!"
+		die
+	fi
 fi
 
 [ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
 
+KV_MAJOR=$(echo ${KV} | cut -d. -f1)
+KV_MINOR=$(echo ${KV} | cut -d. -f2)
+KV_PATCH=$(echo ${KV} | cut -d. -f3)
+
+kernel_is_2_4() {
+	if [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 4 ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
+kernel_is_2_6() {
+	if [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -eq 5 -o ${KV_MINOR} -eq 6 ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
 kernel_exclude() {
-	for mask in ${KERNEL_EXCLUDE}; do
-		for patch in *${mask}*; do
-			echo "Excluding: ${patch}"
+	for mask in ${KERNEL_EXCLUDE}
+	do
+		for patch in *${mask}*
+		do
+			einfo "Excluding: ${patch}"
 			rm ${patch}
 		done
 	done
 }
 
-src_unpack() {
-
-	kernel_exclude
-
-	./addpatches . ${WORKDIR}/linux-${KV} || die "Addpatches failed, bad KERNEL_ExCLUDE?"
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0.0 *
-	chmod -R a+r-w+X,u+w *
+kernel_universal_unpack() {
+	find . -iname "*~" -exec rm {} \; 2> /dev/null
 
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
 	# also fix the EXTRAVERSION
 	cd ${S}
 	mv Makefile Makefile.orig
 	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
+		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
 		Makefile.orig >Makefile || die # test, remove me if Makefile ok
 	rm Makefile.orig
-	
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make distclean || die
 
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
+	if [ -d "${S}/Documentation/DocBook" ]
+	then
+		cd ${S}/Documentation/DocBook
+		sed -e "s:db2:docbook2:g" Makefile > Makefile.new \
+			&& mv Makefile.new Makefile
+		cd ${S}
+	fi
+
+	if kernel_is_2_4 || [ ${ETYPE} == "headers" ]
+	then
+		# this file is required for other things to build properly,
+		# so we autogenerate it
+		set_arch_to_kernel
+		make mrproper || die "make mrproper died"
+		make include/linux/version.h || die "make include/linux/version.h failed"
+		set_arch_to_portage
+		echo ">>> version.h compiled successfully."
+	fi
 }
 
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
+kernel_src_unpack() {
+	kernel_exclude
+
+	/usr/bin/addpatches . ${WORKDIR}/linux-${KV} || \
+		die "Addpatches failed, bad KERNEL_EXCLUDE?"
+
+	kernel_universal_unpack
+}
+
+kernel_src_compile() {
+	if [ ${ETYPE} == "headers" ]
 	then
-		yes "" | make oldconfig		
-		echo "Ignore any errors from the yes command above."
+		set_arch_to_kernel
+		yes "" | make oldconfig
+		set_arch_to_portage
+		echo ">>> make oldconfig complete"
 	fi
 }
 
-src_install() {
+kernel_src_install() {
+	#fix silly permissions in tarball
+	cd ${WORKDIR}
+	chown -R root:root *
+	chmod -R a+r-w+X,u+w *
+
+	# Cross-compiling support
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& LINUX_INCDIR=/usr/include \
+		|| LINUX_INCDIR=/usr/${CTARGET}/include
+	export LINUX_INCDIR
+
+	cd ${S}
 	if [ "$ETYPE" = "sources" ]
 	then
 		dodir /usr/src
 		echo ">>> Copying sources..."
-		cat ${WORKDIR}/${KV}/docs/* > patches.txt
-		dodoc patches.txt
+		if [ -d "${WORKDIR}/${KV}/docs/" ]
+		then
+			for file in $(ls -1 ${WORKDIR}/${KV}/docs/)
+			do
+				echo "XX_${file}*" >> patches.txt
+				cat ${WORKDIR}/${KV}/docs/${file} >> patches.txt
+			done
+		fi
+
+		if [ ! -f patches.txt ]
+		then
+			# patches.txt is empty so lets use our ChangeLog
+			[ -f ${FILESDIR}/../ChangeLog ] && echo "Please check out the changelog for this package to find out more" > patches.txt
+		fi
+
+		if [ -f patches.txt ]; then
+			dodoc patches.txt
+		fi
 		mv ${WORKDIR}/linux* ${D}/usr/src
 	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
+		# linux-headers
+		dodir ${LINUX_INCDIR}/linux
+		cp -ax ${S}/include/linux/* ${D}/${LINUX_INCDIR}/linux
+		rm -rf ${D}/${LINUX_INCDIR}/linux/modules
+		dodir ${LINUX_INCDIR}/asm
+		cp -ax ${S}/include/asm/* ${D}/${LINUX_INCDIR}/asm
 	fi
 }
 
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
+kernel_pkg_preinst() {
+	if [ "$ETYPE" = "headers" ]
 	then
 		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
 		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
@@ -101,11 +185,25 @@ pkg_preinst() {
 	fi
 }
 
-pkg_postinst() {
+kernel_pkg_postinst() {
 	[ "$ETYPE" = "headers" ] && return
 	if [ ! -e ${ROOT}usr/src/linux ]
 	then
 		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
+		if use ppc
+		then
+			ln -sf ${PF} ${ROOT}/usr/src/linux
+		else
+			ln -sf linux-${KV} ${ROOT}/usr/src/linux
+		fi
 	fi
+
+	echo
+	einfo "After installing a new kernel of any version, it is important"
+	einfo "that you have the appropriate /etc/modules.autoload.d/kernel-X.Y"
+	einfo "created (X.Y is the first 2 parts of your new kernel version)"
+	echo
+	einfo "For example, this kernel will require:"
+	einfo "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+	echo
 }
diff --git a/eclass/kmod.eclass b/eclass/kmod.eclass
index f092d2cd2c49..c5f6e160086e 100644
--- a/eclass/kmod.eclass
+++ b/eclass/kmod.eclass
@@ -1,108 +1,327 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kmod.eclass,v 1.1 2002/08/27 23:32:05 mjc Exp $
-# The base eclass defines some default functions and variables. Nearly everything
-# else inherits from here.
-ECLASS=kmod
-INHERITED="$INHERITED $ECLASS"
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/kmod.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
+
+# !!!!!!!!!!
+#
+# BEWARE: DO NOT USE. THIS ECLASS IS DEPRECATED, BROKEN, AND WILL EAT YOUR
+# CHILDREN. DO NOT USE. -latexer
+#
+# !!!!!!!!!!
+
+# This eclass provides help for compiling external kernel modules from
+# source.
+#
+# BEWARE: This eclass is superceding the old kmod.eclass. It does *not*
+# implement the same functionality as the old kmod.eclass!
+
+# DOCUMENTATION: Most documentation for this can be found at:
+# http://www.gentoo.org/doc/en/2.6-koutput.xml
+#
+# More documentation comments will follow in the header of this soon!
+
+# Variables you can use to change behavior
+#
+# KMOD_SOURCES - space seperated list of source to unpack in
+#					   src_unpack() if you don't want ${A} unpacked.
+#
+# KMOD_KOUTPUT_PATCH - Patch to apply in src_unpack() if a seperate output
+#							directory is detected.
+#
+
+inherit eutils
+
 S=${WORKDIR}/${P}
 DESCRIPTION="Based on the $ECLASS eclass"
 
-base_src_unpack() {
-
-	debug-print-function $FUNCNAME $*
-	[ -z "$1" ] && base_src_unpack all
-
-	cd ${WORKDIR}
-
-	while [ "$1" ]; do
-
-	case $1 in
-	    unpack)
-			debug-print-section unpack
-			# rather ugly fix - check for usage of kde-patch.eclass
-			[ -n "$PATCH" -a -n "$ORIGPV" -a -n "$DATE" -a -n "$OLDIFS" ] && \
-			    A="`echo $A | sed -e s:${PATCH}::g --`"
-			unpack ${A}
-			;;
-	    patch)
-			debug-print-section patch
-			cd ${S}
-			patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-			;;
-	    autopatch)
-			debug-print-section autopatch
-			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES"
-			cd ${S}
-			for x in $PATCHES; do
-			    debug-print "$FUNCNAME: autopatch: patching from ${x}"
-			    patch -p0 < ${x}
-			done
-			;;
-	    all)
-			debug-print-section all
-			base_src_unpack unpack autopatch
-			;;
-	    esac
-
-	shift
-	done
-    
+SRC_URI="${SRC_URI:-unknown - please fix me!!}"
+KERNEL_DIR="${KERNEL_DIR:-${ROOT}/usr/src/linux}"
+
+EXPORT_FUNCTIONS src_unpack src_compile pkg_postinst
+
+kmod_get_make_var ()
+{
+	grep "^${1}" ${2} | head -n 1 | grep -v ":=" | cut -d = -f 2- \
+		| awk '{ print $1 }'
 }
 
-base_src_compile() {
-
-    debug-print-function $FUNCNAME $*
-    [ -z "$1" ] && base_src_compile all
-
-    cd ${S}
-
-    while [ "$1" ]; do
-
-	case $1 in
-	    configure)
-		debug-print-section configure
-		econf || die "died running econf, $FUNCNAME:configure"
-		;;
-	    make)
-		debug-print-section make
-		emake || die "died running emake, $FUNCNAME:make"
-		;;
-	    all)
-		debug-print-section all
-		base_src_compile configure make
-		;;
-	esac
-	
-    shift
-    done
-    
+# getconfigvar() - Prints the value of a certain config varaible from the
+#				current kernel's config file. Will return "n" for an unset
+#				option
+
+kmod_get_config_var()
+{
+	local configopt="CONFIG_${1}"
+	local configresult
+
+	if [ -z ${KV_OUTPUT} ]; then
+		get_kernel_info
+	fi
+
+	configresult="`grep ^$configopt ${KV_OUTPUT}/.config | cut -d= -f 2-`"
+	if [ -z "${configresult}" ]; then
+		echo "n"
+	else
+		echo ${configresult} | awk '{ print $1 }'
+	fi
 }
 
-base_src_install() {
+# get_kernel_info is used to get our build environment. It initializes several
+# variables that can be used in ebuilds
+#
+# KV_MAJOR, KV_MINOR, KV_PATCH - the kernel major, minor, and pathlevel #'s
+# KV_TYPE - the type, as found from EXTRAVERSION.
+#
+# KV_VERSION_FULL - full string for the kernel version
+#
+# KV_OUTPUT - the output direcotry if used with a 2.6 kernel
+#
+# KV_OBJ - extension for kernel objects, "o" for 2.4 kernels and "ko" for 2.6
+#
+get_kernel_info()
+{
+	# yes, this is horrible, but it is effective
+	#
+	# KV_DIR contains the real directory name of the directory containing
+	# the Linux kernel that we are going to compile against
+
+	if [ -h ${KERNEL_DIR} ] ; then
+		einfo "`echo ${KERNEL_DIR} | tr -s /` is a symbolic link"
+		einfo "Determining the real directory of the Linux kernel source code"
+		KV_DIR="`readlink ${KERNEL_DIR}`"
+	elif [ -d ${KERNEL_DIR} ] ; then
+		einfo "`echo ${KERNEL_DIR} | tr -s /` is a real directory"
+		KV_DIR="`ls -d ${KERNEL_DIR}`"
+		# KV_DIR="`ls -ld --full-time ${KERNEL_DIR} | awk '{ print $9 }'`"
+	else
+		eerror "Directory '${KERNEL_DIR}' cannot be found"
+		die
+	fi
+	KV_DIR="`basename ${KV_DIR}`"
+
+	# now, we need to break that down into versions
+
+	KV_DIR_VERSION_FULL="`echo $KV_DIR | cut -f 2- -d -`"
+
+	KV_DIR_MAJOR="`echo ${KV_DIR_VERSION_FULL} | cut -f 1 -d .`"
+	KV_DIR_MINOR="`echo ${KV_DIR_VERSION_FULL} | cut -f 2 -d .`"
+	KV_DIR_PATCH="`echo ${KV_DIR_VERSION_FULL} | cut -f 3 -d . | cut -f 1 -d -`"
+	KV_DIR_TYPE="`echo ${KV_DIR_VERSION_FULL} | cut -f 2- -d -`"
+
+	# sanity check - do the settings in the kernel's makefile match
+	# the directory that the kernel src is stored in?
+
+	KV_MK_FILE="${KERNEL_DIR}/Makefile"
+	KV_MK_MAJOR="`kmod_get_make_var VERSION ${KV_MK_FILE}`"
+	KV_MK_MINOR="`kmod_get_make_var PATCHLEVEL ${KV_MK_FILE}`"
+	KV_MK_PATCH="`kmod_get_make_var SUBLEVEL ${KV_MK_FILE}`"
+	KV_MK_TYPE="`kmod_get_make_var EXTRAVERSION ${KV_MK_FILE}`"
+
+	KV_MK_VERSION_FULL="${KV_MK_MAJOR}.${KV_MK_MINOR}.${KV_MK_PATCH}${KV_MK_TYPE}"
+
+	KV_MK_OUTPUT="`kmod_get_make_var KBUILD_OUTPUT ${KV_MK_FILE}`"
+
+	# May need to deal with a dynamically set KBUILD_OUTPUT variable
+	if [ "${KV_MK_OUTPUT/VERSION/}" != "${KV_MK_OUTPUT}" ]; then
+		KV_MK_OUTPUT="${KV_MK_OUTPUT/\$(VERSION)/${KV_MK_MAJOR}}"
+		KV_MK_OUTPUT="${KV_MK_OUTPUT/\$(PATCHLEVEL)/${KV_MK_MINOR}}"
+		KV_MK_OUTPUT="${KV_MK_OUTPUT/\$(SUBLEVEL)/${KV_MK_PATCH}}"
+		KV_MK_OUTPUT="${KV_MK_OUTPUT/\$(EXTRAVERSION)/${KV_MK_TYPE}}"
+	fi
+
+	if [ "$KV_MK_VERSION_FULL" != "${KV_DIR_VERSION_FULL}" ]; then
+		ewarn
+		ewarn "The kernel Makefile says that this is a ${KV_MK_VERSION_FULL} kernel"
+		ewarn "but the source is in a directory for a ${KV_DIR_VERSION_FULL} kernel."
+		ewarn
+		ewarn "This goes against the recommended Gentoo naming convention."
+		ewarn "Please rename your source directory to 'linux-${KV_MK_VERSION_FULL}'"
+		ewarn
+	fi
+
+	# these variables can be used by ebuilds to determine whether they
+	# will work with the targetted kernel or not
+	#
+	# do not rely on any of the variables above being available
+
+	KV_VERSION_FULL="${KV_MK_VERSION_FULL}"
+	KV_MAJOR="${KV_MK_MAJOR}"
+	KV_MINOR="${KV_MK_MINOR}"
+	KV_PATCH="${KV_MK_PATCH}"
+	KV_TYPE="${KV_MK_TYPE}"
+
+	# if we found an output location, use that. otherwise use KERNEL_DIR.
+	if [ ! -z "${KV_MK_OUTPUT}" ]
+	then
+		KV_OUTPUT="${ROOT}/${KV_MK_OUTPUT}"
+	else
+		KV_OUTPUT="${KERNEL_DIR}"
+	fi
+
+	# KV_OBJ can be used when manually installing kernel modules
+	if [ "${KV_MINOR}" -gt "4" ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
 
-	debug-print-function $FUNCNAME $*
-	[ -z "$1" ] && base_src_install all
+	einfo "Building for Linux ${KV_VERSION_FULL} found in `echo ${KERNEL_DIR} | tr -s /`"
+
+	if is_kernel 2 5 || is_kernel 2 6
+	then
+		einfo "which outputs to `echo ${KV_OUTPUT} | tr -s /`"
+
+		# Warn them if they aren't using a different output directory
+		if [ "${KV_OUTPUT}" = "${ROOT}/usr/src/linux" ]; then
+			ewarn "By not using the kernel's ability to output to an alternative"
+			ewarn "directory, some external module builds may fail."
+			ewarn "See <insert link to user doc here>"
+		fi
+	fi
+}
+
+# kmod_make_linux_writeable() is used to allow portage to write to
+# /usr/src/linux. This is a BIG no-no, but the "easiest" way for
+# 2.6 module compilation. Since it's so horrible, we force users to accept
+# doing it via a variable controlled by /etc/env.d/20kernel and kernel-config
+
+kmod_make_linux_writable()
+{
+	# LINUX_PORTAGE_WRITABLE is set in /etc/env.d/20kernel to "yes"
+	# if someone really wants to do that
+	[ -x ${ROOT}/usr/bin/config-kernel ] && LINUX_PORTAGE_WRITABLE="$(${ROOT}/usr/bin/config-kernel --is-writable)"
+
+	if [ "${LINUX_PORTAGE_WRITABLE}" != "yes" ]
+	then
+		if [ "${FEATURES/sandbox/}" != "${FEATURES}" ]
+		then
+			eerror "Due to the 2.6 kernel build system, external module compilation"
+			eerror "with a normal setup requires write access to ${KERNEL_DIR}"
+			eerror "There are several ways to fix/prevent this."
+			eerror "Users can willingly let portage make this writable by doing"
+			eerror "# config-kernel --allow-writable yes"
+			eerror "However, this is considered a security risk!"
+			eerror ""
+			eerror "The prefered method is to enable Gentoo's new 'koutput' method"
+			eerror "for kernel modules. See the doc"
+			eerror "http://www.gentoo.org/doc/en/2.6-koutput-user.xml"
+			eerror "To enable this, you'll need to run"
+			eerror "# config-kernel --output-dir /var/tmp/kernel-output"
+			eerror "and then install a new kernel"
+			die "Incompatible kernel setup"
+		else
+			ewarn "Detected sandbox disabled for kernel module ebuild"
+		fi
+	fi
+
+	eerror "Making ${ROOT}/usr/src/linux-${KV} writable by portage!!!"
+	addwrite ${ROOT}/usr/src/linux-${KV}
+}
+
+
+# kmod_do_buildpatches performs the needed koutput patches as needed
+kmod_do_buildpatches()
+{
+	if [ -z ${KV_OUTPUT} ]; then
+		get_kernel_info
+	fi
 
 	cd ${S}
+	if is_koutput && [ -n "${KMOD_KOUTPUT_PATCH}" ]; then
+		EPATCH_SINGLE_MESSAGE="Patching to enable koutput compatibility" \
+			epatch ${KMOD_KOUTPUT_PATCH}
+	fi
+}
+
+kmod_src_unpack ()
+{
+	check_KV
+	kmod_universal_unpack
+}
+
+kmod_universal_unpack()
+{
+	get_kernel_info
+
+	# KMOD_SOURCES is used if you don't want to unpack just ${A}
+	# It can be set to "none" if you need to unpack things by hand
+	# (like the nvidia-kernel ebuild). If set to "none", you'll have
+	# to do any patching by hand as ${S} won't be around yet!
+	# You can just call kmod_do_buildpatches after unpacking ${S}
+	# if need be.
+	if [ -z "${KMOD_SOURCES}" ]
+	then
+		unpack ${A}
+	elif [ "${KMOD_SOURCES}" != "none" ]
+	then
+		unpack ${KMOD_SOURCES}
+	fi
+
+	if is_kernel 2 5 || is_kernel 2 6
+	then
+		# If we have sources we've unpacked, patch as needed
+		if [ "${KMOD_SOURCES}" != "none" ]; then
+			kmod_do_buildpatches
+		fi
+	fi
+}
+
+kmod_src_compile ()
+{
+	if is_kernel 2 5 || is_kernel 2 6
+	then
+		# If we're on 2.5/2.6 and not koutputing, we need to make
+		# /usr/src/linux writable to succeed
+		if ! is_koutput
+		then
+			kmod_make_linux_writable
+		fi
 
-	while [ "$1" ]; do
+		unset ARCH
+	fi
+	emake KERNEL_DIR=${KERNEL_DIR} || die
+}
+
+kmod_pkg_postinst()
+{
+	einfo "Checking kernel module dependancies"
+	test -r "${ROOT}/${KV_OUTPUT}/System.map" && \
+		depmod -ae -F "${ROOT}/${KV_OUTPUT}/System.map" -b "${ROOT}" -r ${KV}
+}
+
+# is_kernel() takes two arguments. They should be the major and minor number
+# of the kernel you'd like to check for. e.g.
+#
+# if is_kernel 2 6; then foo; fi
+#
+is_kernel() {
+	if [ -z "${KV_MAJOR}" ]
+	then
+		get_kernel_info
+	fi
+
+	if [ "${KV_MAJOR}" -eq "${1}" -a "${KV_MINOR}" -eq "${2}" ]
+	then
+		return 0
+	else
+		return 1
+	fi
+}
 
-	case $1 in
-	    make)
-			debug-print-section make
-			make DESTDIR=${D} install || die "died running make install, $FUNCNAME:make"
-			;;
-	    all)
-			debug-print-section all
-			base_src_install make
-			;;
-	esac
+# is_koutput() should be used to determing if we are using the koutput
+# method of compilation for 2.6 kernels
 
-	shift
-	done
+is_koutput() {
+	if [ -z ${KV_OUTPUT} ]
+	then
+		get_kernel_info
+	fi
 
+	if [ "${KV_OUTPUT}" != "${ROOT}/usr/src/linux" ]; then
+		return 0
+	else
+		return 1
+	fi
 }
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass
index b91ec857d197..541cb24125f9 100644
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -1,135 +1,186 @@
-# Author Matthew Turk <m-turk@nwu.edu>
-# An ebuild calling this class can cd to the appropriate
-# directory and call latex-package_src_doinstall all, or leave
-# the src_install function as-is if the system is single-directory.
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/latex-package.eclass,v 1.1.1.1 2005/11/30 09:59:35 chriswhite Exp $
+#
+# Author Matthew Turk <satai@gentoo.org>
+#
+# This eClass is designed to be easy to use and implement.  The vast majority of
+# LaTeX packages will only need to define SRC_URI (and sometimes S) for a
+# successful installation.  If fonts need to be installed, then the variable
+# SUPPLIER must also be defined.
+#
+# However, those packages that contain subdirectories must process each
+# subdirectory individually.  For example, a package that contains directories
+# DIR1 and DIR2 must call latex-package_src_compile() and
+# latex-package_src_install() in each directory, as shown here:
+#
+# src_compile() {
+#    cd ${S}
+#    cd DIR1
+#    latex-package_src_compile
+#    cd ..
+#    cd DIR2
+#    latex-package_src_compile
+# }
+#
+# src_install() {
+#    cd ${S}
+#    cd DIR1
+#    latex-package_src_install
+#    cd ..
+#    cd DIR2
+#    latex-package_src_install
+# }
+#
+# The eClass automatically takes care of rehashing TeX's cache (ls-lR) after
+# installation and after removal, as well as creating final documentation from
+# TeX files that come with the source.  Note that we break TeX layout standards
+# by placing documentation in /usr/share/doc/${PN}
+#
+# For examples of basic installations, check out dev-tex/aastex and
+# dev-tex/leaflet .
+#
+# NOTE: The CTAN "directory grab" function creates files with different MD5
+# signatures EVERY TIME.  For this reason, if you are grabbing from the CTAN,
+# you must either grab each file individually, or find a place to mirror an
+# archive of them.  (iBiblio)
 
-. /usr/portage/eclass/inherit.eclass || die
 inherit base
 
-newdepend ">=app-text/tetex-1.0.7"
-ECLASS=latex-package
+DEPEND="virtual/tetex
+	>=sys-apps/texinfo-4.2-r5"
 HOMEPAGE="http://www.tug.org/"
 SRC_URI="ftp://tug.ctan.org/macros/latex/"
 S=${WORKDIR}/${P}
 TEXMF="/usr/share/texmf"
 SUPPLIER="misc" # This refers to the font supplier; it should be overridden
 
+latex-package_has_tetex_3() {
+	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' ; then
+		true
+	else
+		false
+	fi
+}
+
 latex-package_src_doinstall() {
-    debug-print function $FUNCNAME $*
-    # This actually follows the directions for a "single-user" system
-    # at http://www.ctan.org/installationadvice/ modified for gentoo.
-    [ -z "$1" ] && latex-package_src_install all
- 
-    while [ "$1" ]; do
-        case $1 in
-            "sh")
-                for i in `find . -maxdepth 1 -name "*.${1}"`
-                do
-                    dobin $i
-                done
-                ;;
-            "sty" | "cls" | "fd")
-                for i in `find . -maxdepth 1 -name "*.${1}"`
-                do
-                    insinto ${TEXMF}/tex/latex/${PN}
-                    doins $i
-                done
-                ;;
-            "dvi" | "ps" | "pdf" | "tex")
-                for i in `find . -maxdepth 1 -name "*.${1}"`
-                do
-                    insinto ${TEXMF}/doc/latex/${PN}
-                    doins $i
-                done
-                ;;
-            "tfm" | "vf" | "afm" | "pfb")
-                for i in `find . -maxdepth 1 -name "*.${1}"`
-                do
-                    insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN}
-                    doins $i
-                done
-                ;;
-            "ttf")
-                for i in `find . -maxdepth 1 -name "*.ttf"`
-                do
-                    insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN}
-                    doins $i
-                done
-                ;;
-            "styles")
-                latex-package_src_doinstall sty cls fd
-                ;;
-            "doc")
-                latex-package_src_doinstall dvi ps pdf tex
-                ;;
-            "fonts")
-                latex-package_src_doinstall tfm vg afm pfb ttf
-                ;;
-            "bin")
-                latex-package_src_doinstall sh
-                ;;
-            "all")
-                latex-package_src_doinstall styles doc fonts bin
-                ;;
-        esac
-    shift
-    done
+	debug-print function $FUNCNAME $*
+	# This actually follows the directions for a "single-user" system
+	# at http://www.ctan.org/installationadvice/ modified for gentoo.
+	[ -z "$1" ] && latex-package_src_install all
+
+	while [ "$1" ]; do
+		case $1 in
+			"sh")
+				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
+				do
+					dobin $i || die "dobin $i failed"
+				done
+				;;
+			"sty" | "cls" | "fd" | "clo" | "def" | "cfg")
+				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
+				do
+					insinto ${TEXMF}/tex/latex/${PN}
+					doins $i || die "doins $i failed"
+				done
+				;;
+			"dvi" | "ps" | "pdf")
+				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
+				do
+					insinto /usr/share/doc/${P}
+					doins $i || "doins $i failed"
+					#dodoc -u $i
+				done
+				;;
+			"tex" | "dtx")
+				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
+				do
+					einfo "Making documentation: $i"
+					texi2dvi -q -c --language=latex $i &> /dev/null
+					done
+				;;
+			"tfm" | "vf" | "afm")
+				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
+				do
+					insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN}
+					doins $i || die "doins $i failed"
+				done
+				;;
+			"pfb")
+				for i in `find . -maxdepth 1 -type f -name "*.pfb"`
+				do
+					insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN}
+					doins $i || die "doins $i failed"
+				done
+				;;
+			"ttf")
+				for i in `find . -maxdepth 1 -type f -name "*.ttf"`
+				do
+					insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN}
+					doins $i || die "doins $i failed"
+				done
+				;;
+			"bst")
+				for i in `find . -maxdepth 1 -type f -name "*.bst"`
+				do
+					insinto ${TEXMF}/bibtex/bst/${PN}
+					doins $i || die "doins $i failed"
+				done
+				;;
+			"styles")
+				latex-package_src_doinstall sty cls fd clo def cfg bst
+				;;
+			"doc")
+				latex-package_src_doinstall tex dtx dvi ps pdf
+				;;
+			"fonts")
+				latex-package_src_doinstall tfm vf afm pfb ttf
+				;;
+			"bin")
+				latex-package_src_doinstall sh
+				;;
+			"all")
+				latex-package_src_doinstall styles fonts bin doc
+				;;
+		esac
+	shift
+	done
 }
 
 latex-package_src_compile() {
-    debug-print function $FUNCNAME $*
-    cd ${S}
-    for i in `find \`pwd\` -maxdepth 1 -name "*.ins"`
-    do
-        echo "Extracting from $i"
-        latex --interaction=batchmode $i > /dev/null
-    done
-    for i in `find \`pwd\` -maxdepth 1 -name "*.dtx"`
-    do
-        echo "Extracting from $i"
-        latex --interaction=batchmode $i > /dev/null
-    done
+	debug-print function $FUNCNAME $*
+	for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"`
+	do
+		einfo "Extracting from $i"
+		latex --interaction=batchmode $i &> /dev/null
+	done
 }
 
 latex-package_src_install() {
-    debug-print function $FUNCNAME $*
-    cd ${S}
-    latex-package_src_doinstall all
+	debug-print function $FUNCNAME $*
+	latex-package_src_doinstall all
+	if [ -n "${DOCS}" ] ; then
+		dodoc ${DOCS}
+	fi
 }
 
 latex-package_pkg_postinst() {
-    debug-print function $FUNCNAME $*
-    latex-package_rehash
-    if [ ! -e ${TEXMF}/doc/latex/${PN} ] ; then return ; fi
-    cd ${TEXMF}/doc/latex/${PN}
-    latex-package_make_documentation
+	debug-print function $FUNCNAME $*
+	latex-package_rehash
 }
 
 latex-package_pkg_postrm() {
-    debug-print function $FUNCNAME $*
-    # This may be a bit harsh, so perhaps it should be overridden.
-    latex-package_rehash
-    if [ ! -e ${TEXMF}/doc/latex/${PN} ] ; then return ; fi
-    echo "Removing stale documentation: ${TEXMF}/doc/latex/${PN}"
-    rm -rf ${TEXMF}/doc/latex/${PN}
+	debug-print function $FUNCNAME $*
+	latex-package_rehash
 }
 
 latex-package_rehash() {
-    debug-print function $FUNCNAME $*
-    texconfig rehash
-}
-
-latex-package_make_documentation() {
-    debug-print function $FUNCNAME $*
-    # This has to come after the installation of all our files.
-    # All errors will be discarded.
-    for i in `find \`pwd\` -maxdepth 1 -name "*.tex"`
-    do
-        # Note - we rerun twice to get references properly.
-        echo "Making Documentation: $i"
-        latex --interaction=batchmode $i > /dev/null
-    done
-    echo "Completed."
+	debug-print function $FUNCNAME $*
+	if latex-package_has_tetex_3 ; then
+		texmf-update
+	else
+		texconfig rehash
+	fi
 }
 
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm has_tetex_3
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 732907663645..aaba3fca4c40 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,61 +1,37 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
+#
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.1 2002/06/05 22:53:11 azarah Exp $
+#
 # This eclass patches ltmain.sh distributed with libtoolized packages with the
-# relink and portage patch
-ECLASS=libtool
-newdepend sys-devel/libtool
-
-DESCRIPTION="Based on the ${ECLASS} eclass"
+# relink and portage patch among others
 
 
-elibtoolize() {
+# 2004.09.25 rac
+# i have verified that at least one package can use this eclass and
+# build properly even without libtool installed yet, probably using
+# the files in the distribution.  eliminating this dependency fixes
+# bug 65209, which is a showstopper for people doing installs using
+# stageballs <3.  if anybody decides to revert this, please attempt
+# to find an alternate way of resolving that bug at the same time.
 
-	local x=""
-	local y=""
-	local dopatch="no"
+DESCRIPTION="Based on the ${ECLASS} eclass"
 
-	for x in $(find_ltmain)
-	do
-		cd ${x}
-		einfo "Working directory: ${x}..."
-		dopatch="yes"
-		
-		for y in test_patch relink_patch portage_patch
-		do
-			if ! eval ${y} --test $>${T}/libtool.foo
-			then
-				dopatch="no"
-				break
-			fi
-		done
+ELIBTOOL_VERSION="2.0.2"
 
-		for y in test_patch relink_patch portage_patch
-		do
-			if [ "${dopatch}" = "yes" ]
-			then
-				einfo "Applying libtool-${y/_patch/}.patch..."
-				eval ${y} $>${T}/libtool.foo
-			else
-				libtoolize --copy --force
-				break
-			fi
-		done
-	done
-}
+ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
+ELT_APPLIED_PATCHES=
+ELT_LTMAIN_SH=
 
 #
 # Returns all the directories containing ltmain.sh
 #
-find_ltmain() {
-	
-	local x=""
-	local dirlist=""
+ELT_find_ltmain_sh() {
+	local x=
+	local dirlist=
 
-	for x in $(find ${S} -name 'ltmain.sh')
-	do
+	for x in $(find "${S}" -name 'ltmain.sh') ; do
 		dirlist="${dirlist} ${x%/*}"
 	done
 
@@ -63,523 +39,402 @@ find_ltmain() {
 }
 
 #
-# Various patches we want to apply.
+# See if we can apply $2 on $1, and if so, do it
 #
-# Contains:  portage_patch
-#            relink_patch
-#            test_patch
+ELT_try_and_apply_patch() {
+	local ret=0
+	local file=$1
+	local patch=$2
+
+	# We only support patchlevel of 0 - why worry if its static patches?
+	if patch -p0 --dry-run "${file}" < "${patch}" &> "${T}/elibtool.log" ; then
+		einfo "  Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
+		patch -p0 "${file}" < "${patch}" &> "${T}/elibtool.log"
+		ret=$?
+		export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
+	else
+		ret=1
+	fi
+
+	return "${ret}"
+}
+
 #
-portage_patch() {
+# Get string version of ltmain.sh or ltconfig (passed as $1)
+#
+ELT_libtool_version() {
+	local ltmain_sh=$1
+	local version=
+
+	version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
+	                 echo "${VERSION}")
+	[[ -z ${version} ]] && version="0"
+
+	echo "${version}"
+}
+
+#
+# Run through the patches in $2 and see if any
+# apply to $1 ...
+#
+ELT_walk_patches() {
+	local x=
+	local y=
+	local ret=1
+	local file=$1
+	local patch_set=$2
+	local patch_dir=
+	local rem_int_dep=$3
+	local version=
+	local ltmain_sh=$1
+
+	[[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
+	version=$(ELT_libtool_version "${ltmain_sh}")
+
+	if [[ -n ${patch_set} ]] ; then
+		if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
+			patch_dir="${ELT_PATCH_DIR}/${patch_set}"
+		else
+			return "${ret}"
+		fi
+
+		if [[ ${version} == "0" ]] ; then
+			eerror "Could not get VERSION for ${file##*/}!"
+			die "Could not get VERSION for ${file##*/}!"
+		fi
+
+		# Go through the patches in reverse order (large to small)
+		for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do
+			if [[ -n ${x} && -f ${x} ]] ; then
+				local ltver=$(VER_to_int "${version}")
+				local ptver=$(VER_to_int "${x##*/}")
 
-	local opts=""
+				# If libtool version smaller than patch version, skip patch.
+				[[ ${ltver} -lt ${ptver} ]] && continue
+				# For --remove-internal-dep ...
+				if [[ -n ${rem_int_dep} ]] ; then
+					# For replace @REM_INT_DEP@ with what was passed
+					# to --remove-internal-dep
+					sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
+						"${T}/$$.rem_int_deps.patch"
 
-	if [ "${1}" = "--test" ]
-	then
-		opts="--force --dry-run"
+					x="${T}/$$.rem_int_deps.patch"
+				fi
+
+				if ELT_try_and_apply_patch "${file}" "${x}" ; then
+					ret=0
+					break
+				fi
+			fi
+		done
 	fi
 
-	patch ${opts} -p0 <<-"ENDPATCH"
-		--- ltmain.sh.orig	Wed Apr  3 01:19:37 2002
-		+++ ltmain.sh	Sun May 26 19:50:52 2002
-		@@ -3940,9 +3940,39 @@
-		 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		 		  exit 1
-		 		fi
-		-		newdependency_libs="$newdependency_libs $libdir/$name"
-		+		# We do not want portage's install root ($D) present.  Check only for
-		+		# this if the .la is being installed.
-		+		if test "$installed" = yes; then
-		+		  mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:${D}::g" -e 's://:/:g'`"
-		+		else
-		+		  mynewdependency_lib="$libdir/$name"
-		+		fi
-		+		# Do not add duplicates
-		+		if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`" 
-		+		then
-		+		  newdependency_libs="$newdependency_libs $mynewdependency_lib"
-		+		fi
-		+		;;
-		+	      *)
-		+	      	if test "$installed" = yes; then
-		+		  # We do not want portage's build root ($S} present.
-		+	          if test -n "`echo $deplib |grep -e "${S}"`"
-		+		  then
-		+	            newdependency_libs=""
-		+		  # We do not want portage's install root ($D) present.
-		+		  elif test -n "`echo $deplib |grep -e "${D}"`"
-		+		  then
-		+		    mynewdependency_lib="`echo "$deplib" |sed -e "s:${D}::g" -e 's://:/:g'`"
-		+		  fi
-		+		else
-		+		  mynewdependency_lib="$deplib"
-		+		fi
-		+		# Do not add duplicates
-		+		if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"
-		+		then
-		+			newdependency_libs="$newdependency_libs $mynewdependency_lib"
-		+		fi
-		 		;;
-		-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-		 	      esac
-		 	    done
-		 	    dependency_libs="$newdependency_libs"
-		@@ -3975,6 +4005,10 @@
-		 	  case $host,$output,$installed,$module,$dlname in
-		 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-		 	  esac
-		+	  # Do not add duplicates
-		+	  if test "$installed" = yes; then
-		+	    install_libdir="`echo "$install_libdir" |sed -e "s:${D}::g" -e 's://:/:g'`"
-		+	  fi
-		 	  $echo > $output "\
-		 # $outputname - a libtool library file
-		 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-	ENDPATCH
+	return "${ret}"
 }
 
-relink_patch() {
+elibtoolize() {
+	local x=
+	local y=
+	local do_portage="no"
+	local do_reversedeps="no"
+	local do_only_patches="no"
+	local do_uclibc="yes"
+	local deptoremove=
+	local my_dirlist=
+	local elt_patches="portage relink max_cmd_len sed test tmp"
+	local start_dir=${PWD}
 
-	local opts=""
-	local retval=0
+	my_dirlist=$(ELT_find_ltmain_sh)
 
-	if [ "${1}" = "--test" ]
-	then
-		opts="--force --dry-run"
-	fi
+	for x in "$@" ; do
+		case "${x}" in
+			"--portage")
+				# Only apply portage patch, and don't
+				# 'libtoolize --copy --force' if all patches fail.
+				do_portage="yes"
+				;;
+			"--reverse-deps")
+				# Apply the reverse-deps patch
+				# http://bugzilla.gnome.org/show_bug.cgi?id=75635
+				do_reversedeps="yes"
+				elt_patches="${elt_patches} fix-relink"
+				;;
+			"--patch-only")
+				# Do not run libtoolize if none of the patches apply ..
+				do_only_patches="yes"
+				;;
+			"^--remove-internal-dep="*)
+				# We will replace @REM_INT_DEP@ with what is needed
+				# in ELT_walk_patches() ...
+				deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
+
+				# Add the patch for this ...
+				[[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
+				;;
+			"--shallow")
+				# Only patch the ltmain.sh in ${S}
+				if [[ -f ${S}/ltmain.sh ]] ; then
+					my_dirlist=${S}
+				else
+					my_dirlist=
+				fi
+				;;
+			"--no-uclibc")
+				do_uclibc="no"
+				;;
+			*)
+				eerror "Invalid elibtoolize option: ${x}"
+				die "elibtoolize called with ${x} ??"
+		esac
+	done
+
+	[[ ${do_uclibc} == "yes" ]] && \
+		elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
+
+	[[ ${CHOST} == *"-freebsd"* ]] && \
+		elt_patches="${elt_patches} fbsd-conf"
+
+	if useq ppc-macos ; then
+		local opts
+		[[ -f Makefile.am ]] && opts="--automake"
+		glibtoolize --copy --force ${opts}
 
-	patch ${opts} -p0 <<-"ENDPATCH"
-		--- ltmain.sh	Sun Aug 12 18:08:05 2001
-		+++ ltmain-relinkable.sh	Tue Aug 28 18:55:13 2001
-		@@ -827,6 +827,7 @@
-		     linker_flags=
-		     dllsearchpath=
-		     lib_search_path=`pwd`
-		+    inst_prefix_dir=
-		 
-		     avoid_version=no
-		     dlfiles=
-		@@ -959,6 +960,11 @@
-		 	  prev=
-		 	  continue
-		 	  ;;
-		+        inst_prefix)
-		+	  inst_prefix_dir="$arg"
-		+	  prev=
-		+	  continue
-		+	  ;;
-		 	release)
-		 	  release="-$arg"
-		 	  prev=
-		@@ -1167,6 +1173,11 @@
-		 	continue
-		 	;;
-		 
-		+      -inst-prefix-dir)
-		+	prev=inst_prefix
-		+	continue
-		+	;;
-		+
-		       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-		       # so, if we see these flags be careful not to treat them like -L
-		       -L[A-Z][A-Z]*:*)
-		@@ -2231,7 +2242,16 @@
-		 	    if test "$hardcode_direct" = yes; then
-		 	      add="$libdir/$linklib"
-		 	    elif test "$hardcode_minus_L" = yes; then
-		-	      add_dir="-L$libdir"
-		+	      # Try looking first in the location we're being installed to.
-		+	      add_dir=
-		+	      if test -n "$inst_prefix_dir"; then
-		+		case "$libdir" in
-		+		[\\/]*)
-		+		  add_dir="-L$inst_prefix_dir$libdir"
-		+		  ;;
-		+		esac
-		+	      fi
-		+	      add_dir="$add_dir -L$libdir"
-		 	      add="-l$name"
-		 	    elif test "$hardcode_shlibpath_var" = yes; then
-		 	      case :$finalize_shlibpath: in
-		@@ -2241,7 +2261,16 @@
-		 	      add="-l$name"
-		 	    else
-		 	      # We cannot seem to hardcode it, guess we'll fake it.
-		-	      add_dir="-L$libdir"
-		+	      # Try looking first in the location we're being installed to.
-		+	      add_dir=
-		+	      if test -n "$inst_prefix_dir"; then
-		+		case "$libdir" in
-		+		[\\/]*)
-		+		  add_dir="-L$inst_prefix_dir$libdir"
-		+		  ;;
-		+		esac
-		+	      fi
-		+	      add_dir="$add_dir -L$libdir"
-		 	      add="-l$name"
-		 	    fi
-		 
-		@@ -4622,12 +4651,30 @@
-		 	dir="$dir$objdir"
-		 
-		 	if test -n "$relink_command"; then
-		+	  # Determine the prefix the user has applied to our future dir.
-		+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-		+
-		+	  # Don't allow the user to place us outside of our expected
-		+	  # location b/c this prevents finding dependent libraries that
-		+	  # are installed to the same prefix.
-		+	  if test "$inst_prefix_dir" = "$destdir"; then
-		+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-		+	    exit 1
-		+	  fi
-		+
-		+	  if test -n "$inst_prefix_dir"; then
-		+	    # Stick the inst_prefix_dir data into the link command.
-		+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-		+	  else
-		+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-		+	  fi
-		+
-		 	  $echo "$modename: warning: relinking \`$file'" 1>&2
-		 	  $show "$relink_command"
-		 	  if $run eval "$relink_command"; then :
-		 	  else
-		 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		-	    continue
-		+	    exit 1
-		 	  fi
-		 	fi
-		 
-		@@ -4782,7 +4829,11 @@
-		 	    if test "$finalize" = yes && test -z "$run"; then
-		 	      tmpdir="/tmp"
-		 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-		-	      tmpdir="$tmpdir/libtool-$$"
-		+              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
-		+              if test $? = 0 ; then :
-		+              else
-		+                tmpdir="$tmpdir/libtool-$$"
-		+              fi
-		 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-		 	      else
-		 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-	ENDPATCH
-
-	retval=$?
-
-	# This one dont apply clean to libtool-1.4.2a, so do it manually.
-	if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ]
-	then
-		cp ltmain.sh ltmain.sh.orig
-		sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \
-			ltmain.sh.orig > ltmain.sh
-		rm -f ltmain.sh.orig
+		elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
 	fi
 
-	return ${retval}
+	for x in ${my_dirlist} ; do
+		local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
+		export ELT_APPLIED_PATCHES=
+		export ELT_LTMAIN_SH="${x}/ltmain.sh"
+
+		[[ -f ${x}/.elibtoolized ]] && continue
+
+		cd ${x}
+		einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
+
+		for y in ${elt_patches} ; do
+			local ret=0
+
+			case "${y}" in
+				"rem-int-dep")
+					ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
+					ret=$?
+					;;
+				"fix-relink")
+					# Do not apply if we do not have the relink patch applied ...
+					if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
+						ELT_walk_patches "${x}/ltmain.sh" "${y}"
+						ret=$?
+					fi
+					;;
+				"max_cmd_len")
+					# Do not apply if $max_cmd_len is not used ...
+					if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
+						ELT_walk_patches "${x}/ltmain.sh" "${y}"
+						ret=$?
+					fi
+					;;
+				"uclibc-conf")
+					if [[ -e ${x}/configure && \
+					      -n $(grep 'Transform linux' "${x}/configure") ]] ; then
+						ELT_walk_patches "${x}/configure" "${y}"
+						ret=$?
+					# ltmain.sh and co might be in a subdirectory ...
+					elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
+					        -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
+						ELT_walk_patches "${x}/../configure" "${y}"
+						ret=$?
+					fi
+					;;
+				"uclibc-ltconf")
+					# Newer libtoolize clears ltconfig, as not used anymore
+					if [[ -s ${x}/ltconfig ]] ; then
+						ELT_walk_patches "${x}/ltconfig" "${y}"
+						ret=$?
+					fi
+					;;
+				"fbsd-conf")
+					if [[ -e ${x}/configure && \
+					      -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
+						ELT_walk_patches "${x}/configure" "${y}"
+						ret=$?
+					# ltmain.sh and co might be in a subdirectory ...
+					elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
+					        -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
+						ELT_walk_patches "${x}/../configure" "${y}"
+						ret=$?
+					fi
+					;;
+				"darwin-ltconf")
+					# Newer libtoolize clears ltconfig, as not used anymore
+					if [[ -s ${x}/ltconfig ]] ; then
+						ELT_walk_patches "${x}/ltconfig" "${y}"
+						ret=$?
+					fi
+					;;
+				*)
+					ELT_walk_patches "${x}/ltmain.sh" "${y}"
+					ret=$?
+					;;
+			esac
+
+			if [[ ${ret} -ne 0 ]] ; then
+				case ${y} in
+					"relink")
+						local version=$(ELT_libtool_version "${x}/ltmain.sh")
+						# Critical patch, but could be applied ...
+						# FIXME:  Still need a patch for ltmain.sh > 1.4.0
+						if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
+						      $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
+							ewarn "  Could not apply relink.patch!"
+						fi
+						;;
+					"portage")
+						# Critical patch - for this one we abort, as it can really
+						# cause breakage without it applied!
+						if [[ ${do_portage} == "yes" ]] ; then
+							# Stupid test to see if its already applied ...
+							if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
+								echo
+								eerror "Portage patch requested, but failed to apply!"
+								die "Portage patch requested, but failed to apply!"
+							fi
+						else
+							if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
+							#	ewarn "  Portage patch seems to be already applied."
+							#	ewarn "  Please verify that it is not needed."
+								:
+							else
+							    local version=$( \
+									eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
+									echo "${VERSION}")
+
+								echo
+								eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
+								die "Portage patch failed to apply!"
+							fi
+							# We do not want to run libtoolize ...
+							ELT_APPLIED_PATCHES="portage"
+						fi
+						;;
+					"uclibc-"*)
+						[[ ${CHOST} == *"-uclibc" ]] && \
+							ewarn "  uClibc patch set '${y}' failed to apply!"
+						;;
+					"fbsd-"*)
+						if [[ ${CHOST} == *"-freebsd"* ]] ; then
+							if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then
+								eerror "  FreeBSD patch set '${y}' failed to apply!"
+								die "FreeBSD patch set '${y}' failed to apply!"
+							fi
+						fi
+						;;
+					"darwin-"*)
+						useq ppc-macos && \
+							ewarn "  Darwin patch set '${y}' failed to apply!"
+						;;
+				esac
+			fi
+		done
+
+		if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
+			if [[ ${do_portage} == "no" && \
+				  ${do_reversedeps} == "no" && \
+				  ${do_only_patches} == "no" && \
+				  ${deptoremove} == "" ]]
+			then
+				ewarn "Cannot apply any patches, please file a bug about this"
+				break
+
+				# Sometimes ltmain.sh is in a subdirectory ...
+				if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
+					if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
+						cd "${x}"/../
+					fi
+				fi
+
+				if type -p libtoolize &> /dev/null ; then
+					ewarn "Cannot apply any patches, running libtoolize..."
+					libtoolize --copy --force
+				fi
+				cd "${x}"
+				break
+			fi
+		fi
+
+		[[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
+
+		touch "${x}/.elibtoolized"
+	done
+
+	cd "${start_dir}"
+}
+
+uclibctoolize() {
+	ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
+	elibtoolize
 }
 
-test_patch() {
+darwintoolize() {
+	ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
+	elibtoolize
+}
 
-	local opts=""
+# char *VER_major(string)
+#
+#    Return the Major (X of X.Y.Z) version
+#
+VER_major() {
+	[[ -z $1 ]] && return 1
 
-	if [ "${1}" = "--test" ]
-	then
-		opts="--force --dry-run"
-	fi
+	local VER=$@
+	echo "${VER%%[^[:digit:]]*}"
+}
 
-	patch ${opts} -p0 <<-"ENDPATCH"
-		--- ./ltmain.sh	Tue May 29 19:16:03 2001
-		+++ ./ltmain.sh	Tue May 29 21:26:50 2001
-		@@ -459,7 +459,7 @@
-		       pic_mode=default
-		       ;;
-		     esac
-		-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
-		+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-		       # non-PIC code in shared libraries is not supported
-		       pic_mode=default
-		     fi
-		@@ -1343,7 +1343,7 @@
-		 	;;
-		     esac
-		     for pass in $passes; do
-		-      if test $linkmode = prog; then
-		+      if test "$linkmode" = prog; then
-		 	# Determine which files to process
-		 	case $pass in
-		 	dlopen)
-		@@ -1360,11 +1360,11 @@
-		 	found=no
-		 	case $deplib in
-		 	-l*)
-		-	  if test $linkmode = oldlib && test $linkmode = obj; then
-		+	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
-		 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
-		 	    continue
-		 	  fi
-		-	  if test $pass = conv; then
-		+	  if test "$pass" = conv; then
-		 	    deplibs="$deplib $deplibs"
-		 	    continue
-		 	  fi
-		@@ -1384,7 +1384,7 @@
-		 	      finalize_deplibs="$deplib $finalize_deplibs"
-		 	    else
-		 	      deplibs="$deplib $deplibs"
-		-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-		+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		 	    fi
-		 	    continue
-		 	  fi
-		@@ -1393,16 +1393,16 @@
-		 	  case $linkmode in
-		 	  lib)
-		 	    deplibs="$deplib $deplibs"
-		-	    test $pass = conv && continue
-		+	    test "$pass" = conv && continue
-		 	    newdependency_libs="$deplib $newdependency_libs"
-		 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-		 	    ;;
-		 	  prog)
-		-	    if test $pass = conv; then
-		+	    if test "$pass" = conv; then
-		 	      deplibs="$deplib $deplibs"
-		 	      continue
-		 	    fi
-		-	    if test $pass = scan; then
-		+	    if test "$pass" = scan; then
-		 	      deplibs="$deplib $deplibs"
-		 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-		 	    else
-		@@ -1417,7 +1417,7 @@
-		 	  continue
-		 	  ;; # -L
-		 	-R*)
-		-	  if test $pass = link; then
-		+	  if test "$pass" = link; then
-		 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-		 	    # Make sure the xrpath contains only unique directories.
-		 	    case "$xrpath " in
-		@@ -1430,7 +1430,7 @@
-		 	  ;;
-		 	*.la) lib="$deplib" ;;
-		 	*.$libext)
-		-	  if test $pass = conv; then
-		+	  if test "$pass" = conv; then
-		 	    deplibs="$deplib $deplibs"
-		 	    continue
-		 	  fi
-		@@ -1451,7 +1451,7 @@
-		 	    continue
-		 	    ;;
-		 	  prog)
-		-	    if test $pass != link; then
-		+	    if test "$pass" != link; then
-		 	      deplibs="$deplib $deplibs"
-		 	    else
-		 	      compile_deplibs="$deplib $compile_deplibs"
-		@@ -1462,7 +1462,7 @@
-		 	  esac # linkmode
-		 	  ;; # *.$libext
-		 	*.lo | *.$objext)
-		-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-		+	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-		 	    # If there is no dlopen support or we're linking statically,
-		 	    # we need to preload.
-		 	    newdlprefiles="$newdlprefiles $deplib"
-		@@ -1512,13 +1512,13 @@
-		 
-		 	if test "$linkmode,$pass" = "lib,link" ||
-		 	   test "$linkmode,$pass" = "prog,scan" ||
-		-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
-		+	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
-		 	   # Add dl[pre]opened files of deplib
-		 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-		 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-		 	fi
-		 
-		-	if test $pass = conv; then
-		+	if test "$pass" = conv; then
-		 	  # Only check for convenience libraries
-		 	  deplibs="$lib $deplibs"
-		 	  if test -z "$libdir"; then
-		@@ -1537,7 +1537,7 @@
-		 	      esac
-		 	      tmp_libs="$tmp_libs $deplib"
-		 	    done
-		-	  elif test $linkmode != prog && test $linkmode != lib; then
-		+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-		 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-		 	    exit 1
-		 	  fi
-		@@ -1555,7 +1555,7 @@
-		 	fi
-		 
-		 	# This library was specified with -dlopen.
-		-	if test $pass = dlopen; then
-		+	if test "$pass" = dlopen; then
-		 	  if test -z "$libdir"; then
-		 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-		 	    exit 1
-		@@ -1604,7 +1604,7 @@
-		 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-		 
-		 	# This library was specified with -dlpreopen.
-		-	if test $pass = dlpreopen; then
-		+	if test "$pass" = dlpreopen; then
-		 	  if test -z "$libdir"; then
-		 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-		 	    exit 1
-		@@ -1623,7 +1623,7 @@
-		 
-		 	if test -z "$libdir"; then
-		 	  # Link the convenience library
-		-	  if test $linkmode = lib; then
-		+	  if test "$linkmode" = lib; then
-		 	    deplibs="$dir/$old_library $deplibs"
-		 	  elif test "$linkmode,$pass" = "prog,link"; then
-		 	    compile_deplibs="$dir/$old_library $compile_deplibs"
-		@@ -1634,7 +1634,7 @@
-		 	  continue
-		 	fi
-		 
-		-	if test $linkmode = prog && test $pass != link; then
-		+	if test "$linkmode" = prog && test "$pass" != link; then
-		 	  newlib_search_path="$newlib_search_path $ladir"
-		 	  deplibs="$lib $deplibs"
-		 
-		@@ -1671,7 +1671,7 @@
-		 	  # Link against this shared library
-		 
-		 	  if test "$linkmode,$pass" = "prog,link" ||
-		-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-		+	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
-		 	    # Hardcode the library path.
-		 	    # Skip directories that are in the system default run-time
-		 	    # search path.
-		@@ -1693,7 +1693,7 @@
-		 	      esac
-		 	      ;;
-		 	    esac
-		-	    if test $linkmode = prog; then
-		+	    if test "$linkmode" = prog; then
-		 	      # We need to hardcode the library path
-		 	      if test -n "$shlibpath_var"; then
-		 		# Make sure the rpath contains only unique directories.
-		@@ -1777,7 +1777,7 @@
-		 	    linklib=$newlib
-		 	  fi # test -n $old_archive_from_expsyms_cmds
-		 
-		-	  if test $linkmode = prog || test "$mode" != relink; then
-		+	  if test "$linkmode" = prog || test "$mode" != relink; then
-		 	    add_shlibpath=
-		 	    add_dir=
-		 	    add=
-		@@ -1826,7 +1826,7 @@
-		 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-		 	      esac
-		 	    fi
-		-	    if test $linkmode = prog; then
-		+	    if test "$linkmode" = prog; then
-		 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-		 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-		 	    else
-		@@ -1843,7 +1843,7 @@
-		 	    fi
-		 	  fi
-		 
-		-	  if test $linkmode = prog || test "$mode" = relink; then
-		+	  if test "$linkmode" = prog || test "$mode" = relink; then
-		 	    add_shlibpath=
-		 	    add_dir=
-		 	    add=
-		@@ -1865,7 +1865,7 @@
-		 	      add="-l$name"
-		 	    fi
-		 
-		-	    if test $linkmode = prog; then
-		+	    if test "$linkmode" = prog; then
-		 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-		 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-		 	    else
-		@@ -1873,7 +1873,7 @@
-		 	      test -n "$add" && deplibs="$add $deplibs"
-		 	    fi
-		 	  fi
-		-	elif test $linkmode = prog; then
-		+	elif test "$linkmode" = prog; then
-		 	  if test "$alldeplibs" = yes &&
-		 	     { test "$deplibs_check_method" = pass_all ||
-		 	       { test "$build_libtool_libs" = yes &&
-		@@ -1932,9 +1932,9 @@
-		 	  fi
-		 	fi # link shared/static library?
-		 
-		-	if test $linkmode = lib; then
-		+	if test "$linkmode" = lib; then
-		 	  if test -n "$dependency_libs" &&
-		-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-		+	     { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
-		 	       test $link_static = yes; }; then
-		 	    # Extract -R from dependency_libs
-		 	    temp_deplibs=
-		@@ -1964,7 +1964,7 @@
-		 	    tmp_libs="$tmp_libs $deplib"
-		 	  done
-		 
-		-	  if test $link_all_deplibs != no; then
-		+	  if test "$link_all_deplibs" != no; then
-		 	    # Add the search paths of all dependency libraries
-		 	    for deplib in $dependency_libs; do
-		 	      case $deplib in
-		@@ -2007,15 +2007,15 @@
-		 	  fi # link_all_deplibs != no
-		 	fi # linkmode = lib
-		       done # for deplib in $libs
-		-      if test $pass = dlpreopen; then
-		+      if test "$pass" = dlpreopen; then
-		 	# Link the dlpreopened libraries before other libraries
-		 	for deplib in $save_deplibs; do
-		 	  deplibs="$deplib $deplibs"
-		 	done
-		       fi
-		-      if test $pass != dlopen; then
-		-	test $pass != scan && dependency_libs="$newdependency_libs"
-		-	if test $pass != conv; then
-		+      if test "$pass" != dlopen; then
-		+	test "$pass" != scan && dependency_libs="$newdependency_libs"
-		+	if test "$pass" != conv; then
-		 	  # Make sure lib_search_path contains only unique directories.
-		 	  lib_search_path=
-		 	  for dir in $newlib_search_path; do
-		@@ -2073,7 +2073,7 @@
-		 	deplibs=
-		       fi
-		     done # for pass
-		-    if test $linkmode = prog; then
-		+    if test "$linkmode" = prog; then
-		       dlfiles="$newdlfiles"
-		       dlprefiles="$newdlprefiles"
-		     fi
-		@@ -2410,7 +2410,7 @@
-		 	    ;;
-		 	  *)
-		 	    # Add libc to deplibs on all other systems if necessary.
-		-	    if test $build_libtool_need_lc = "yes"; then
-		+	    if test "$build_libtool_need_lc" = "yes"; then
-		 	      deplibs="$deplibs -lc"
-		 	    fi
-		 	    ;;
-		@@ -2683,7 +2683,7 @@
-		 
-		       # Test again, we may have decided not to build it any more
-		       if test "$build_libtool_libs" = yes; then
-		-	if test $hardcode_into_libs = yes; then
-		+	if test "$hardcode_into_libs" = yes; then
-		 	  # Hardcode the library paths
-		 	  hardcode_libdirs=
-		 	  dep_rpath=
-	ENDPATCH
+# char *VER_minor(string)
+#
+#    Return the Minor (Y of X.Y.Z) version
+#
+VER_minor() {
+	[[ -z $1 ]] && return 1
+
+	local VER=$@
+	VER=${VER#*.}
+	echo "${VER%%[^[:digit:]]*}"
 }
 
+# char *VER_micro(string)
+#
+#    Return the Micro (Z of X.Y.Z) version.
+#
+VER_micro() {
+	[[ -z $1 ]] && return 1
+
+	local VER=$@
+	VER=${VER#*.*.}
+	echo "${VER%%[^[:digit:]]*}"
+}
+
+# int VER_to_int(string)
+#
+#    Convert a string type version (2.4.0) to an int (132096)
+#    for easy compairing or versions ...
+#
+VER_to_int() {
+	[[ -z $1 ]] && return 1
+
+	local VER_MAJOR=$(VER_major "$1")
+	local VER_MINOR=$(VER_minor "$1")
+	local VER_MICRO=$(VER_micro "$1")
+	local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
+
+	# We make version 1.0.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${VER_int} -ge 65536 ]] ; then
+		echo "${VER_int}"
+		return 0
+	fi
+
+	echo 1
+	return 1
+}
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 5d2beacaf5c1..fd8c94759231 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,19 +1,94 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.1 2004/11/24 16:36:38 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.1.1.1 2005/11/30 09:59:20 chriswhite Exp $
 #
-# This eclass provides functions for querying the installed kernel
-# source version, selected kernel options etc.
+# Description: This eclass is used as a central eclass for accessing kernel
+#			   related information for sources already installed.
+#			   It is vital for linux-mod to function correctly, and is split
+#			   out so that any ebuild behaviour "templates" are abstracted out
+#			   using additional eclasses.
 #
+# Maintainer: John Mylchreest <johnm@gentoo.org>
+# Copyright 2004 Gentoo Linux
+#
+# Please direct your bugs to the current eclass maintainer :)
+
+# A Couple of env vars are available to effect usage of this eclass
+# These are as follows:
+#
+# Env Var	Option		Description
+# KERNEL_DIR	<string>	The directory containing kernel the target kernel
+#				sources.
+# CONFIG_CHECK	<string>	a list of .config options to check for before
+#				proceeding with the install. ie: CONFIG_CHECK="MTRR"
+#				You can also check that an option doesn't exist by
+#				prepending it with an exclamation mark (!).
+#				ie: CONFIG_CHECK="!MTRR"
+# ERROR_CFG		<string>	The error message to display when the above check
+#				fails. <CFG> should reference the appropriate option
+#				as above. ie: ERROR_MTRR="MTRR exists in the .config
+#				but shouldn't!!"
+# KBUILD_OUTPUT	<string>	This is passed on commandline, or can be set from
+#				the kernel makefile. This contains the directory
+#				which is to be used as the kernel object directory.
+
+# There are also a couple of variables which are set by this, and shouldn't be
+# set by hand. These are as follows:
+#
+# Env Var		Option		Description
+# KV_FULL		<string>	The full kernel version. ie: 2.6.9-gentoo-johnm-r1
+# KV_MAJOR		<integer>	The kernel major version. ie: 2
+# KV_MINOR		<integer>	The kernel minor version. ie: 6
+# KV_PATCH		<integer>	The kernel patch version. ie: 9
+# KV_EXTRA		<string>	The kernel EXTRAVERSION. ie: -gentoo
+# KV_LOCAL		<string>	The kernel LOCALVERSION concatenation. ie: -johnm
+# KV_DIR		<string>	The kernel source directory, will be null if
+#					KERNEL_DIR is invalid.
+# KV_OUT_DIR		<string>	The kernel object directory. will be KV_DIR unless
+#					koutput is used. This should be used for referencing
+#					.config.
+
+# And to ensure all the weirdness with crosscompile
+inherit toolchain-funcs versionator
 
-ECLASS=linux-info
-INHERITED="$INHERITED $ECLASS"
+EXPORT_FUNCTIONS pkg_setup
 
 # Overwritable environment Var's
 # ---------------------------------------
-KERNEL_DIR="${KERNEL_DIR:-/usr/src/linux}"
+KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}"
 
 
+# Bug fixes
+# fix to bug #75034
+case ${ARCH} in
+	ppc)	BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
+	ppc64)	BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
+esac
+
+# These are legacy wrappers for toolchain-funcs.
+# I dont like them here, but oh well.
+set_arch_to_kernel() { export ARCH="$(tc-arch-kernel)"; }
+set_arch_to_portage() { export ARCH="$(tc-arch)"; }
+
+# qeinfo "Message"
+# -------------------
+# qeinfo is a quiet einfo call when EBUILD_PHASE
+# should not have visible output.
+qout() {
+	local outputmsg type
+	type=${1}
+	shift
+	outputmsg="${@}"
+	case "${EBUILD_PHASE}" in
+		depend)  unset outputmsg;;
+		clean)   unset outputmsg;;
+		preinst) unset outputmsg;;
+	esac
+	[ -n "${outputmsg}" ] && ${type} "${outputmsg}"
+}
+
+qeinfo() { qout einfo "${@}" ; }
+qeerror() { qout eerror "${@}" ; }
 
 # File Functions
 # ---------------------------------------
@@ -22,40 +97,54 @@ KERNEL_DIR="${KERNEL_DIR:-/usr/src/linux}"
 # getfilevar <VARIABLE> <CONFIGFILE>
 
 getfilevar() {
-local	ERROR
+local	ERROR workingdir basefname basedname myARCH="${ARCH}"
 	ERROR=0
-	
+
 	[ -z "${1}" ] && ERROR=1
-	[ -z "${2}" ] && ERROR=1
 	[ ! -f "${2}" ] && ERROR=1
 
 	if [ "${ERROR}" = 1 ]
 	then
+		echo -e "\n"
 		eerror "getfilevar requires 2 variables, with the second a valid file."
 		eerror "   getfilevar <VARIABLE> <CONFIGFILE>"
 	else
-		grep -e "^$1" $2 | sed 's: = :=:' | cut -d= -f2-
+		workingdir=${PWD}
+		basefname=$(basename ${2})
+		basedname=$(dirname ${2})
+		unset ARCH
+
+		cd ${basedname}
+		echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \
+			make ${BUILD_FIXES} -s -f - e 2>/dev/null
+		cd ${workingdir}
+
+		ARCH=${myARCH}
 	fi
 }
 
-getfilevar_isset() {
+linux_chkconfig_present() {
 local	RESULT
-	RESULT="$(getfilevar ${1} ${2})"
+	RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)"
 	[ "${RESULT}" = "m" -o "${RESULT}" = "y" ] && return 0 || return 1
 }
 
-getfilevar_ismodule() {
+linux_chkconfig_module() {
 local	RESULT
-	RESULT="$(getfilevar ${1} ${2})"
+	RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)"
 	[ "${RESULT}" = "m" ] && return 0 || return 1
 }
 
-getfilevar_isbuiltin() {
+linux_chkconfig_builtin() {
 local	RESULT
-	RESULT="$(getfilevar ${1} ${2})"
+	RESULT="$(getfilevar CONFIG_${1} ${KV_OUT_DIR}/.config)"
 	[ "${RESULT}" = "y" ] && return 0 || return 1
 }
 
+linux_chkconfig_string() {
+	getfilevar "CONFIG_${1}" "${KV_OUT_DIR}/.config"
+}
+
 # Versioning Functions
 # ---------------------------------------
 
@@ -73,54 +162,101 @@ local	RESULT
 kernel_is() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
-	local RESULT
-	RESULT=1
-	
-	if [ -n "${1}" ]
-	then
-		[ "${1}" = "${KV_MAJOR}" ] && RESULT=0
-	fi
-	
-	if [ -n "${2}" ]
-	then
-		RESULT=1
-		[ "${2}" = "${KV_MINOR}" ] && RESULT=0
-	fi
-	
-	if [ -n "${3}" ]
-	then
-		RESULT=1
-		[ "${3}" = "${KV_PATCH}" ] && RESULT=0
-	fi
-	return ${RESULT}
+	local operator test value x=0 y=0 z=0
+
+	case ${1} in
+	  lt) operator="-lt"; shift;;
+	  gt) operator="-gt"; shift;;
+	  le) operator="-le"; shift;;
+	  ge) operator="-ge"; shift;;
+	  eq) operator="-eq"; shift;;
+	   *) operator="-eq";;
+	esac
+
+	for x in ${@}; do
+		for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
+		value="${value}${x}"
+		z=$((${z} + 1))
+
+		case ${z} in
+		  1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done;
+		     test="${test}${KV_MAJOR}";;
+		  2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done;
+		     test="${test}${KV_MINOR}";;
+		  3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done;
+		     test="${test}${KV_PATCH}";;
+		  *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
+		esac
+	done
+
+	[ ${test} ${operator} ${value} ] && return 0 || return 1
+}
+
+get_localversion() {
+	local lv_list i x
+
+	# ignore files with ~ in it.
+	for i in $(ls ${1}/localversion* 2>/dev/null); do
+		[[ -n ${i//*~*} ]] && lv_list="${lv_list} ${i}"
+	done
+
+	for i in ${lv_list}; do
+		x="${x}$(<${i})"
+	done
+	x=${x/ /}
+	echo ${x}
 }
 
 get_version() {
+	local kbuild_output
+
 	# no need to execute this twice assuming KV_FULL is populated.
 	# we can force by unsetting KV_FULL
-	if [ -n "${KV_FULL}" ]
-	then
-		# Lets keep this quiet eh?
-		# einfo "\${KV_FULL} is already set. Not running get_version again"
-		return
-	fi
+	[ -n "${KV_FULL}" ] && return 0
 
 	# if we dont know KV_FULL, then we need too.
 	# make sure KV_DIR isnt set since we need to work it out via KERNEL_DIR
 	unset KV_DIR
 
 	# KV_DIR will contain the full path to the sources directory we should use
-	einfo "Determining the location of the kernel source code"
+	qeinfo "Determining the location of the kernel source code"
 	[ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})"
 	[ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}"
-	
+
 	if [ -z "${KV_DIR}" ]
 	then
-		eerror "Unable to find kernel sources at ${KERNEL_DIR}"
-		die
+		qeerror "Unable to find kernel sources at ${KERNEL_DIR}"
+		qeinfo "This package requires Linux sources."
+		if [ "${KERNEL_DIR}" == "/usr/src/linux" ] ; then
+			qeinfo "Please make sure that ${KERNEL_DIR} points at your running kernel, "
+			qeinfo "(or the kernel you wish to build against)."
+			qeinfo "Alternatively, set the KERNEL_DIR environment variable to the kernel sources location"
+		else
+			qeinfo "Please ensure that the KERNEL_DIR environment variable points at full Linux sources of the kernel you wish to compile against."
+		fi
+		return 1
+	fi
+
+	qeinfo "Found kernel source directory:"
+	qeinfo "    ${KV_DIR}"
+
+	if [ ! -s "${KV_DIR}/Makefile" ]
+	then
+		qeerror "Could not find a Makefile in the kernel source directory."
+		qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources"
+		return 1
 	fi
-	
+
+	# OK so now we know our sources directory, but they might be using
+	# KBUILD_OUTPUT, and we need this for .config and localversions-*
+	# so we better find it eh?
+	# do we pass KBUILD_OUTPUT on the CLI?
+	OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}"
+
+	# And if we didn't pass it, we can take a nosey in the Makefile
+	kbuild_output="$(getfilevar KBUILD_OUTPUT ${KV_DIR}/Makefile)"
+	OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}"
+
 	# And contrary to existing functions I feel we shouldn't trust the
 	# directory name to find version information as this seems insane.
 	# so we parse ${KV_DIR}/Makefile
@@ -128,26 +264,78 @@ get_version() {
 	KV_MINOR="$(getfilevar PATCHLEVEL ${KV_DIR}/Makefile)"
 	KV_PATCH="$(getfilevar SUBLEVEL ${KV_DIR}/Makefile)"
 	KV_EXTRA="$(getfilevar EXTRAVERSION ${KV_DIR}/Makefile)"
+
+	if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ]
+	then
+		qeerror "Could not detect kernel version."
+		qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources."
+		return 1
+	fi
+
 	# and in newer versions we can also pull LOCALVERSION if it is set.
-	KV_LOCAL="$(cat ${KV_DIR}/localversion* 2>/dev/null)$(getfilevar CONFIG_LOCALVERSION ${KV_DIR}/.config | sed 's:"::g')"
-	
+	# but before we do this, we need to find if we use a different object directory.
+	# This *WILL* break if the user is using localversions, but we assume it was
+	# caught before this if they are.
+	[ "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_EXTRA}" == "$(uname -r)" ] && \
+		OUTPUT_DIR="${OUTPUT_DIR:-/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.${KV_EXTRA}/build}"
+
+	[ -h "${OUTPUT_DIR}" ] && KV_OUT_DIR="$(readlink -f ${OUTPUT_DIR})"
+	[ -d "${OUTPUT_DIR}" ] && KV_OUT_DIR="${OUTPUT_DIR}"
+	if [ -n "${KV_OUT_DIR}" ];
+	then
+		qeinfo "Found kernel object directory:"
+		qeinfo "    ${KV_OUT_DIR}"
+
+		KV_LOCAL="$(get_localversion ${KV_OUT_DIR})"
+	fi
+	# and if we STILL haven't got it, then we better just set it to KV_DIR
+	KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
+
+	KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_OUT_DIR})"
+	KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)"
+	KV_LOCAL="${KV_LOCAL//\"/}"
+
 	# And we should set KV_FULL to the full expanded version
 	KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}"
-	
-	if [ -z "${KV_FULL}" ]
+
+	qeinfo "Found sources for kernel version:"
+	qeinfo "    ${KV_FULL}"
+
+	if [ ! -s "${KV_OUT_DIR}/.config" ]
 	then
-		eerror "We are unable to find a usable kernel source tree in ${KV_DIR}"
-		eerror "Please check a kernel source exists in this directory."
-		die
-	else
-		einfo "Found kernel source directory:"
-		einfo "    ${KV_DIR}"
-		einfo "with sources for kernel version:"
-		einfo "    ${KV_FULL}"
+		qeerror "Could not find a usable .config in the kernel source directory."
+		qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources."
+		qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that"
+		qeerror "it points to the necessary object directory so that it might find .config."
+		return 1
 	fi
+
+	return 0
 }
 
+get_running_version() {
+	KV_FULL=$(uname -r)
 
+	if [[ -f ${ROOT}/lib/modules/${KV_FULL}/source/Makefile ]]; then
+		KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/source)
+		unset KV_FULL
+		get_version
+		return $?
+	elif [[ -f ${ROOT}/lib/modules/${KV_FULL}/build/Makefile ]]; then
+		KERNEL_DIR=$(readlink -f ${ROOT}/lib/modules/${KV_FULL}/build)
+		unset KV_FULL
+		get_version
+		return $?
+	else
+		KV_MAJOR=$(get_version_component_range 1 ${KV_FULL})
+		KV_MINOR=$(get_version_component_range 2 ${KV_FULL})
+		KV_PATCH=$(get_version_component_range 3- ${KV_FULL})
+		KV_PATCH=${KV_PATCH//-*}
+		[[ -n ${KV_FULL#*-} ]] && [[ -n ${KV_FULL//${KV_FULL#*-}} ]] \
+			&& KV_EXTRA="-${KV_FULL#*-}"
+	fi
+	return 0
+}
 
 
 # ebuild check functions
@@ -156,16 +344,16 @@ get_version() {
 check_kernel_built() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
-	if [ ! -f "${KV_DIR}/System.map" ]
+
+	if [ ! -f "${KV_OUT_DIR}/include/linux/version.h" ]
 	then
-		eerror "These sources have not yet been compiled."
-		eerror "We cannot build against an uncompiled tree."
+		eerror "These sources have not yet been prepared."
+		eerror "We cannot build against an unprepared tree."
 		eerror "To resolve this, please type the following:"
 		eerror
 		eerror "# cd ${KV_DIR}"
 		eerror "# make oldconfig"
-		eerror "# make bzImage modules modules_install"
+		eerror "# make modules_prepare"
 		eerror
 		eerror "Then please try merging this module again."
 		die "Kernel sources need compiling first"
@@ -175,20 +363,96 @@ check_kernel_built() {
 check_modules_supported() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
-	getfilevar_isset CONFIG_MODULES ${KV_DIR}/.config
-	if [ "$?" != 0 ]
+
+	if ! linux_chkconfig_builtin "MODULES"
 	then
 		eerror "These sources do not support loading external modules."
 		eerror "to be able to use this module please enable \"Loadable modules support\""
 		eerror "in your kernel, recompile and then try merging this module again."
+		die "No support for external modules in ${KV_FULL} config"
+	fi
+}
+
+check_extra_config() {
+	local	config negate error local_error i n
+	local	temp_config die reworkmodulenames
+
+	# if we haven't determined the version yet, we need too.
+	get_version;
+
+	einfo "Checking for suitable kernel configuration options:"
+	for config in ${CONFIG_CHECK}
+	do
+		# if we specify any fatal, ensure we honor them
+		die=1
+		error=0
+		negate=0
+		reworkmodulenames=0
+
+		if [[ -z ${config//\!*} ]]; then
+			negate=1
+			config=${config:1}
+		fi
+		if [[ -z ${config/\@*} ]]; then
+			die=2
+			reworkmodulenames=1
+			config=${config:1}
+		fi
+		if [[ -z ${config/\~*} ]]; then
+			die=0
+			config=${config:1}
+		fi
+
+		if [[ ${negate} == 1 ]]; then
+			linux_chkconfig_present ${config} && error=2
+		elif [[ ${reworkmodulenames} == 1 ]]; then
+			temp_config="${config//*:}"
+			config="${config//:*}"
+			if linux_chkconfig_present ${config}; then
+				for i in ${MODULE_NAMES}; do
+					n="${i//${temp_config}}"
+					[[ -z ${n//(*} ]] && \
+						MODULE_IGNORE="${MODULE_IGNORE} ${temp_config}"
+				done
+				error=2
+			fi
+		else
+			linux_chkconfig_present ${config} || error=1
+		fi
+
+		if [[ ${die} == 0 ]]; then
+			ebegin "CONFIG_${config}"
+			eend ${error}
+		else
+			if [[ ${error} > 0 ]]; then
+				local_error="${config}_ERROR"
+				local_error="${!local_error}"
+				if [[ -z "${local_error}" ]]; then
+					[[ ${error} == 1 ]] \
+						&& local_error="is not set when it should be." \
+						|| local_error="should not be set. But it is."
+					local_error="CONFIG_${config}:\t ${local_error}"
+				fi
+				eerror "  ${local_error}"
+			fi
+		fi
+	done
+
+	if [[ ${error} > 0 ]]; then
+		eerror "Please check to make sure these options are set correctly."
+		eerror "Failure to do so may cause unexpected problems."
+		if [[ ${die} == 1 ]]; then
+			eerror "Once you have satisfied these options, please try merging"
+			eerror "this package again."
+			die "Incorrect kernel configuration options"
+		fi
 	fi
 }
 
 check_zlibinflate() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	# although I restructured this code - I really really really dont support it!
 
 	# bug #27882 - zlib routines are only linked into the kernel
@@ -197,33 +461,32 @@ check_zlibinflate() {
 	# plus, for the cloop module, it appears that there's no way
 	# to get cloop.o to include a static zlib if CONFIG_MODVERSIONS
 	# is on
-	
-local	INFLATE
-local	DEFLATE
+
+	local INFLATE
+	local DEFLATE
 
 	einfo "Determining the usability of ZLIB_INFLATE support in your kernel"
-	
+
 	ebegin "checking ZLIB_INFLATE"
 	getfilevar_isbuiltin CONFIG_ZLIB_INFLATE ${KV_DIR}/.config
 	eend $?
 	[ "$?" != 0 ] && die
-	
+
 	ebegin "checking ZLIB_DEFLATE"
 	getfilevar_isbuiltin CONFIG_ZLIB_DEFLATE ${KV_DIR}/.config
 	eend $?
 	[ "$?" != 0 ] && die
-	
-	
+
 	local LINENO_START
 	local LINENO_END
 	local SYMBOLS
 	local x
-	
+
 	LINENO_END="$(grep -n 'CONFIG_ZLIB_INFLATE y' ${KV_DIR}/lib/Config.in | cut -d : -f 1)"
 	LINENO_START="$(head -n $LINENO_END ${KV_DIR}/lib/Config.in | grep -n 'if \[' | tail -n 1 | cut -d : -f 1)"
 	(( LINENO_AMOUNT = $LINENO_END - $LINENO_START ))
 	(( LINENO_END = $LINENO_END - 1 ))
-	SYMBOLS="$(head -n $LINENO_END ${KERNEL_DIR}/lib/Config.in | tail -n $LINENO_AMOUNT | sed -e 's/^.*\(CONFIG_[^\" ]*\).*/\1/g;')"
+	SYMBOLS="$(head -n $LINENO_END ${KV_DIR}/lib/Config.in | tail -n $LINENO_AMOUNT | sed -e 's/^.*\(CONFIG_[^\" ]*\).*/\1/g;')"
 
 	# okay, now we have a list of symbols
 	# we need to check each one in turn, to see whether it is set or not
@@ -234,7 +497,7 @@ local	DEFLATE
 			return 0
 		fi
 	done
-	
+
 	eerror
 	eerror "This kernel module requires ZLIB library support."
 	eerror "You have enabled zlib support in your kernel, but haven't enabled"
@@ -254,3 +517,12 @@ local	DEFLATE
 
 	die "Kernel doesn't include zlib support"
 }
+
+################################
+# Default pkg_setup
+# Also used when inheriting linux-mod to force a get_version call
+
+linux-info_pkg_setup() {
+	get_version || die "Unable to calculate Linux Kernel version"
+	[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+}
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 86219a36d9c8..25ee23800002 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,45 +1,197 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.1 2004/11/24 16:36:38 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.1.1.1 2005/11/30 09:59:38 chriswhite Exp $
+
+# Description: This eclass is used to interface with linux-info in such a way
+#              to provide the functionality required and initial functions
+#			   required to install external modules against a kernel source
+#			   tree.
+#
+# Maintainer: John Mylchreest <johnm@gentoo.org>
+# Copyright 2004 Gentoo Linux
+#
+# Please direct your bugs to the current eclass maintainer :)
+
+# A Couple of env vars are available to effect usage of this eclass
+# These are as follows:
+#
+# Env Var		Option		Default		Description
+# KERNEL_DIR		<string>	/usr/src/linux	The directory containing kernel
+#							the target kernel sources.
+# ECONF_PARAMS		<string>			The parameters to pass to econf.
+#							If this is not set, then econf
+#							isn't run.
+# BUILD_PARAMS		<string>			The parameters to pass to emake.
+# BUILD_TARGETS		<string>	clean modules	The build targets to pass to
+#							make.
+# MODULE_NAMES		<string>			This is the modules which are
+#							to be built automatically using
+#							the default pkg_compile/install.
+#							They are explained properly
+#							below. It will only make
+#							BUILD_TARGETS once in any
+#							directory.
+
+# MODULE_NAMES - Detailed Overview
+#
+# The structure of each MODULE_NAMES entry is as follows:
+# modulename(libdir:srcdir:objdir)
+# for example:
+# MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
+#
+# what this would do is
+#  cd ${S}/pci
+#  make ${BUILD_PARAMS} ${BUILD_TARGETS}
+#  cd ${S}
+#  insinto /lib/modules/${KV_FULL}/pci
+#  doins module_pci.${KV_OBJ}
+#
+#  cd ${S}/usb
+#  make ${BUILD_PARAMS} ${BUILD_TARGETS}
+#  cd ${S}
+#  insinto /lib/modules/${KV_FULL}/usb
+#  doins module_usb.${KV_OBJ}
+#
+# if the srcdir isnt specified, it assumes ${S}
+# if the libdir isnt specified, it assumes misc.
+# if the objdir isnt specified, it assumes srcdir
+
+# There is also support for automatyed modules.d file generation.
+# This can be explicitly enabled by setting any of the following variables.
+#
+#
+# MODULESD_${modulename}_ENABLED		This enables the modules.d file
+#						generation even if we dont
+#						specify any additional info.
+# MODULESD_${modulename}_EXAMPLES		This is a bash array containing
+#						a list of examples which should
+#						be used. If you want us to try and
+#						take a guess. Set this to "guess"
+# MODULESD_${modulename}_ALIASES		This is a bash array containing
+#						a list of associated aliases.
+# MODULESD_${modulename}_ADDITIONS		This is a bash array containing
+#						A list of additional things to
+#						add to the bottom of the file.
+#						This can be absolutely anything.
+#						Each entry is a new line.
+# MODULES_${modulename}_DOCS			This is a string list which contains
+#						the full path to any associated
+#						documents for $modulename
 
-# This eclass provides functions for compiling external kernel modules
-# from source.
 
 inherit linux-info
-ECLASS=linux-mod
-INHERITED="$INHERITED $ECLASS"
-EXPORT_FUNCTIONS pkg_setup pkg_postinst src_compile
+EXPORT_FUNCTIONS pkg_setup pkg_postinst src_install src_compile pkg_postrm
 
+IUSE="" # don't put pcmcia here, rather in the ebuilds that actually support pcmcia
+SLOT="0"
 DESCRIPTION="Based on the $ECLASS eclass"
-SLOT=0
+RDEPEND="virtual/modutils
+		pcmcia? ( virtual/pcmcia )"
 DEPEND="virtual/linux-sources
-		sys-apps/sed"
+		sys-apps/sed
+		pcmcia? ( virtual/pcmcia )"
+
+# eclass utilities
+# ----------------------------------
 
+check_vermagic() {
+	local curr_gcc_ver=$(gcc -dumpversion)
+	local tmpfile old_chost old_gcc_ver result=0
 
+	tmpfile=`find ${KV_DIR}/ -iname "*.o.cmd" -exec grep usr/lib/gcc {} \; -quit`
+	tmpfile=${tmpfile//*usr/lib}
+	tmpfile=${tmpfile//\/include*}
+	old_chost=${tmpfile//*gcc\/}
+	old_chost=${old_chost//\/*}
+	old_gcc_ver=${tmpfile//*\/}
 
+	if [[ -z ${old_gcc_ver} || -z ${old_chost} ]]; then
+		ewarn ""
+		ewarn "Unable to detect what version of GCC was used to compile"
+		ewarn "the kernel. Build will continue, but you may experience problems."
+	elif [[ ${curr_gcc_ver} != ${old_gcc_ver} ]]; then
+		ewarn ""
+		ewarn "The version of GCC you are using (${curr_gcc_ver}) does"
+		ewarn "not match the version of GCC used to compile the"
+		ewarn "kernel (${old_gcc_ver})."
+		result=1
+	elif [[ ${CHOST} != ${old_chost} ]]; then
+		ewarn ""
+		ewarn "The current CHOST (${CHOST}) does not match the chost"
+		ewarn "used when compiling the kernel (${old_chost})."
+		result=1
+	fi
 
-# This eclass is designed to help ease the installation of external kernel
-# modules into the kernel tree.
+	if [[ ${result} -gt 0 ]]; then
+		ewarn ""
+		ewarn "Build will not continue, because you will experience problems."
+		ewarn "To fix this either change the version of GCC you wish to use"
+		ewarn "to match the kernel, or recompile the kernel first."
+		die "GCC Version Mismatch."
+	fi
+}
 
+unpack_pcmcia_sources() {
+	# So while the two eclasses exist side-by-side and also the ebuilds inherit
+	# both we need to check for PCMCIA_SOURCE_DIR, and if we find it, then we
+	# bail out and assume pcmcia.eclass is working on it.
+	[[ -n ${PCMCIA_SOURCE_DIR} ]] && return 1
 
-# eclass utilities
-# ----------------------------------
+	if [[ -f "${1}" ]]; then
+		PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/"
+
+		ebegin "Decompressing pcmcia-cs sources"
+		mkdir -p ${PCMCIA_SOURCE_DIR}
+		tar -xjf ${1} -C ${PCMCIA_SOURCE_DIR}
+		eend $?
+
+		if [[ -f ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version ]]; then
+			PCMCIA_VERSION=$(cat ${PCMCIA_SOURCE_DIR}/pcmcia-cs-version)
+			einfo "Found pcmcia-cs-${PCMCIA_VERSION}"
+		fi
+	fi
+}
+
+# Dummy function for compatibility.
+pcmcia_configure() { return 0; }
+
+pcmcia_src_unpack() {
+	local pcmcia_tbz="${ROOT}/usr/src/pcmcia-cs/pcmcia-cs-build-env.tbz2"
+
+	# if the kernel has pcmcia support built in, then we just ignore all this.
+	if linux_chkconfig_present PCMCIA; then
+		einfo "Kernel based PCMCIA support has been detected."
+	else
+		if kernel_is 2 4; then
+			unpack_pcmcia_sources ${pcmcia_tbz};
+		else
+			einfo "We have detected that you are running a 2.6 kernel"
+			einfo "but you are not using the built-in PCMCIA support."
+			einfo "We will assume you know what you are doing, but please"
+			einfo "consider using the built in PCMCIA support instead."
+			sleep 10
+
+			unpack_pcmcia_sources ${pcmcia_tbz};
+		fi
+	fi
+}
 
 use_m() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	# if the kernel version is greater than 2.6.6 then we should use
-	# M= instead of SUBDIR=
+	# M= instead of SUBDIRS=
 	[ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \
 		return 0 || return 1
 }
 
 convert_to_m() {
-	[ ! -f "${1}" ] && die "convert_to_m() requires a filename as an argument"
 	if use_m
 	then
-		ebegin "Converting ${1/${WORKDIR}\//} to use M= instead of SUBDIR="
+		[ ! -f "${1}" ] && \
+			die "convert_to_m() requires a filename as an argument"
+		ebegin "Converting ${1/${WORKDIR}\//} to use M= instead of SUBDIRS="
 		sed -i 's:SUBDIRS=:M=:g' ${1}
 		eend $?
 	fi
@@ -48,18 +200,65 @@ convert_to_m() {
 update_depmod() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	ebegin "Updating module dependencies for ${KV_FULL}"
-	if [ -r ${KV_DIR}/System.map ]
+	if [ -r ${KV_OUT_DIR}/System.map ]
 	then
-		depmod -ae -F ${KV_DIR}/System.map -b ${ROOT} -r ${KV_FULL}
+		depmod -ae -F ${KV_OUT_DIR}/System.map -b ${ROOT} -r ${KV_FULL}
+		eend $?
 	else
 		ewarn
-		ewarn "${KV_DIR}/System.map not found."
+		ewarn "${KV_OUT_DIR}/System.map not found."
 		ewarn "You must manually update the kernel module dependencies using depmod."
+		eend 1
 		ewarn
 	fi
-	eend $?
+}
+
+update_modules() {
+	if [ -x /sbin/modules-update ] && \
+		grep -v -e "^#" -e "^$" ${D}/etc/modules.d/* >/dev/null 2>&1; then
+		ebegin "Updating modules.conf"
+		/sbin/modules-update
+		eend $?
+	fi
+}
+
+move_old_moduledb() {
+	local OLDDIR=${ROOT}/usr/share/module-rebuild/
+	local NEWDIR=${ROOT}/var/lib/module-rebuild/
+
+	if [[ -f ${OLDDIR}/moduledb ]]; then
+		[[ ! -d ${NEWDIR} ]] && mkdir -p ${NEWDIR}
+		[[ ! -f ${NEWDIR}/moduledb ]] && \
+			mv ${OLDDIR}/moduledb ${NEWDIR}/moduledb
+		rm -f ${OLDDIR}/*
+		rmdir ${OLDDIR}
+	fi
+}
+
+update_moduledb() {
+	local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
+	move_old_moduledb
+
+	if [[ ! -f ${MODULEDB_DIR}/moduledb ]]; then
+		[[ ! -d ${MODULEDB_DIR} ]] && mkdir -p ${MODULEDB_DIR}
+		touch ${MODULEDB_DIR}/moduledb
+	fi
+	if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
+		einfo "Adding module to moduledb."
+		echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb
+	fi
+}
+
+remove_moduledb() {
+	local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
+	move_old_moduledb
+
+	if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
+		einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb."
+		sed -ie "/.*${CATEGORY}\/${P}.*/d" ${MODULEDB_DIR}/moduledb
+	fi
 }
 
 set_kvobj() {
@@ -69,86 +268,285 @@ set_kvobj() {
 	else
 		KV_OBJ="o"
 	fi
-	einfo "Using KV_OBJ=${KV_OBJ}"
+	# Do we really need to know this?
+	# Lets silence it.
+	# einfo "Using KV_OBJ=${KV_OBJ}"
 }
 
-display_postinst() {
-	# if we haven't determined the version yet, we need too.
-	get_version;
-	
-	local modulename moduledir sourcedir module_temp file i
-	
-	file=${ROOT}/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}
-	file=${file/\/\///}
-
-	einfo "If you would like to load this module automatically upon boot"
-	einfo "please type the following as root:"
-	for i in ${MODULE_NAMES}
+generate_modulesd() {
+	# This function will generate the neccessary modules.d file from the
+	# information contained in the modules exported parms
+
+	local 	currm_path currm currm_t t myIFS myVAR
+	local 	module_docs module_enabled module_aliases \
+			module_additions module_examples module_modinfo module_opts
+
+	for currm_path in ${@}
 	do
-		module_temp="$(echo ${i} | sed -e "s:.*(\(.*\)):\1:")"
-		modulename="${i/(*/}"
-		moduledir="${module_temp/:*/}"
-		moduledir="${moduledir:-misc}"
-		sourcedir="${module_temp/*:/}"
-		sourcedir="${sourcedir:-${S}}"
-		
-		einfo "    # echo \"${modulename}\" >> ${file}"
+		currm=${currm_path//*\/}
+		currm=$(echo ${currm} | tr '[:lower:]' '[:upper:]')
+		currm_t=${currm}
+		while [[ -z ${currm_t//*-*} ]]; do
+			currm_t=${currm_t/-/_}
+		done
+
+		module_docs="$(eval echo \${MODULESD_${currm_t}_DOCS})"
+		module_enabled="$(eval echo \${MODULESD_${currm_t}_ENABLED})"
+		module_aliases="$(eval echo \${#MODULESD_${currm_t}_ALIASES[*]})"
+		module_additions="$(eval echo \${#MODULESD_${currm_t}_ADDITIONS[*]})"
+		module_examples="$(eval echo \${#MODULESD_${currm_t}_EXAMPLES[*]})"
+
+		[[ ${module_aliases} -eq 0 ]] 	&& unset module_aliases
+		[[ ${module_additions} -eq 0 ]]	&& unset module_additions
+		[[ ${module_examples} -eq 0 ]] 	&& unset module_examples
+
+		# If we specify we dont want it, then lets exit, otherwise we assume
+		# that if its set, we do want it.
+		[[ ${module_enabled} == no ]] && return 0
+
+		# unset any unwanted variables.
+		for t in ${!module_*}
+		do
+			[[ -z ${!t} ]] && unset ${t}
+		done
+
+		[[ -z ${!module_*} ]] && return 0
+
+		# OK so now if we have got this far, then we know we want to continue
+		# and generate the modules.d file.
+		module_modinfo="$(modinfo -p ${currm_path}.${KV_OBJ})"
+		module_config="${T}/modulesd-${currm}"
+
+		ebegin "Preparing file for modules.d"
+		#-----------------------------------------------------------------------
+		echo "# modules.d configuration file for ${currm}" >> ${module_config}
+		#-----------------------------------------------------------------------
+		[[ -n ${module_docs} ]] && \
+			echo "# For more information please read:" >> ${module_config}
+		for t in ${module_docs}
+		do
+			echo "#    ${t//*\/}" >> ${module_config}
+		done
+		echo >> ${module_config}
+
+		#-----------------------------------------------------------------------
+		if [[ ${module_aliases} -gt 0 ]]
+		then
+			echo  "# Internal Aliases - Do not edit" >> ${module_config}
+			echo  "# ------------------------------" >> ${module_config}
+
+			for((t=0; t<${module_aliases}; t++))
+			do
+				echo "alias $(eval echo \${MODULESD_${currm}_ALIASES[$t]})" \
+					>> ${module_config}
+			done
+			echo '' >> ${module_config}
+		fi
+
+		#-----------------------------------------------------------------------
+		if [[ -n ${module_modinfo} ]]
+		then
+			echo >> ${module_config}
+			echo  "# Configurable module parameters" >> ${module_config}
+			echo  "# ------------------------------" >> ${module_config}
+			myIFS="${IFS}"
+			IFS="$(echo -en "\n\b")"
+
+			for t in ${module_modinfo}
+			do
+				myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")"
+				if [[ -n ${myVAR} ]]
+				then
+					module_opts="${module_opts} ${t%%:*}:${myVAR}"
+				fi
+				echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config}
+			done
+			IFS="${myIFS}"
+			echo '' >> ${module_config}
+		fi
+
+		#-----------------------------------------------------------------------
+		if [[ $(eval echo \${MODULESD_${currm}_ALIASES[0]}) == guess ]]
+		then
+			# So lets do some guesswork eh?
+			if [[ -n ${module_opts} ]]
+			then
+				echo "# For Example..." >> ${module_config}
+				echo "# --------------" >> ${module_config}
+				for t in ${module_opts}
+				do
+					echo "# options ${currm} ${t//:*}=${t//*:}" >> ${module_config}
+				done
+				echo '' >> ${module_config}
+			fi
+		elif [[ ${module_examples} -gt 0 ]]
+		then
+			echo "# For Example..." >> ${module_config}
+			echo "# --------------" >> ${module_config}
+			for((t=0; t<${module_examples}; t++))
+			do
+				echo "options $(eval echo \${MODULESD_${currm}_EXAMPLES[$t]})" \
+					>> ${module_config}
+			done
+			echo '' >> ${module_config}
+		fi
+
+		#-----------------------------------------------------------------------
+		if [[ ${module_additions} -gt 0 ]]
+		then
+			for((t=0; t<${module_additions}; t++))
+			do
+				echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \
+					>> ${module_config}
+			done
+			echo '' >> ${module_config}
+		fi
+
+		#-----------------------------------------------------------------------
+
+		# then we install it
+		insinto /etc/modules.d
+		newins ${module_config} ${currm_path//*\/}
+
+		# and install any documentation we might have.
+		[[ -n ${module_docs} ]] && dodoc ${module_docs}
 	done
-	echo
+	eend 0
+	return 0
+}
+
+find_module_params() {
+	local matched_offset=0 matched_opts=0 test="${@}" temp_var result
+	local i=0 y=0 z=0
+
+	for((i=0; i<=${#test}; i++))
+	do
+		case ${test:${i}:1} in
+			\()		matched_offset[0]=${i};;
+			\:)		matched_opts=$((${matched_opts} + 1));
+					matched_offset[${matched_opts}]="${i}";;
+			\))		matched_opts=$((${matched_opts} + 1));
+					matched_offset[${matched_opts}]="${i}";;
+		esac
+	done
+
+	for((i=0; i<=${matched_opts}; i++))
+	do
+		# i			= offset were working on
+		# y			= last offset
+		# z			= current offset - last offset
+		# temp_var	= temporary name
+		case ${i} in
+			0)	tempvar=${test:0:${matched_offset[0]}};;
+			*)	y=$((${matched_offset[$((${i} - 1))]} + 1))
+				z=$((${matched_offset[${i}]} - ${matched_offset[$((${i} - 1))]}));
+				z=$((${z} - 1))
+				tempvar=${test:${y}:${z}};;
+		esac
+
+		case ${i} in
+			0)	result="${result} modulename:${tempvar}";;
+			1)	result="${result} libdir:${tempvar}";;
+			2)	result="${result} srcdir:${tempvar}";;
+			3)	result="${result} objdir:${tempvar}";;
+		esac
+	done
+
+	echo ${result}
 }
 
 # default ebuild functions
 # --------------------------------
 
 linux-mod_pkg_setup() {
-	get_version;
-	check_kernel_built
+	linux-info_pkg_setup;
+	check_kernel_built;
 	check_modules_supported;
 	set_kvobj;
+	# Commented out with permission from johnm until a fixed version for arches
+	# who intentionally use different kernel and userland compilers can be
+	# introduced - Jason Wever <weeve@gentoo.org>, 23 Oct 2005
+	#check_vermagic;
 }
 
 linux-mod_src_compile() {
-	local modulename moduledir sourcedir module_temp xarch i
-	xarch="${ARCH}"
-	unset ARCH	
+	local modulename libdir srcdir objdir i n myARCH="${ARCH}"
+	ARCH="$(tc-arch-kernel)"
+
+	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
+
+	for i in ${MODULE_IGNORE}
+	do
+		MODULE_NAMES=${MODULE_NAMES//${i}(*}
+	done
 
 	for i in ${MODULE_NAMES}
 	do
-		module_temp="$(echo ${i} | sed -e "s:.*(\(.*\)):\1:")"
-		modulename="${i/(*/}"
-		moduledir="${module_temp/:*/}"
-		moduledir="${moduledir:-misc}"
-		sourcedir="${module_temp/*:/}"
-		sourcedir="${sourcedir:-${S}}"
-	
-		einfo "Preparing ${modulename} module"
-		cd ${sourcedir}
-		make clean
-		make ${BUILD_PARAMS} module
+		unset libdir srcdir objdir
+		for n in $(find_module_params ${i})
+		do
+			eval ${n/:*}=${n/*:/}
+		done
+		libdir=${libdir:-misc}
+		srcdir=${srcdir:-${S}}
+		objdir=${objdir:-${srcdir}}
+
+		if [ ! -f "${srcdir}/.built" ];
+		then
+			cd ${srcdir}
+			einfo "Preparing ${modulename} module"
+			if [[ -n ${ECONF_PARAMS} ]]
+			then
+				econf ${ECONF_PARAMS} || \
+				die "Unable to run econf ${ECONF_PARAMS}"
+			fi
+
+			emake ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS} \
+				|| die "Unable to make \
+				   ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}."
+			touch ${srcdir}/.built
+			cd ${OLDPWD}
+		fi
 	done
-	ARCH="${xarch}"
+
+	ARCH="${myARCH}"
 }
 
 linux-mod_src_install() {
-	local modulename moduledir sourcedir module_temp i
+	local modulename libdir srcdir objdir i n
 
-	for i in "${MODULE_NAMES}"
+	for i in ${MODULE_IGNORE}
 	do
-		module_temp="$(echo ${i} | sed -e "s:.*(\(.*\)):\1:")"
-		modulename="${i/(*/}"
-		moduledir="${module_temp/:*/}"
-		moduledir="${moduledir:-misc}"
-		sourcedir="${module_temp/*:/}"
-		sourcedir="${sourcedir:-${S}}"
+		MODULE_NAMES=${MODULE_NAMES//${i}(*}
+	done
+
+	for i in ${MODULE_NAMES}
+	do
+		unset libdir srcdir objdir
+		for n in $(find_module_params ${i})
+		do
+			eval ${n/:*}=${n/*:/}
+		done
+		libdir=${libdir:-misc}
+		srcdir=${srcdir:-${S}}
+		objdir=${objdir:-${srcdir}}
 
 		einfo "Installing ${modulename} module"
-		cd ${sourcedir}
-		insinto /lib/modules/${KV_FULL}/${moduledir}
+		cd ${objdir}
+		insinto ${ROOT}lib/modules/${KV_FULL}/${libdir}
 		doins ${modulename}.${KV_OBJ}
+		cd ${OLDPWD}
+
+		generate_modulesd ${objdir}/${modulename}
 	done
 }
 
 linux-mod_pkg_postinst() {
 	update_depmod;
-	display_postinst;
+	update_modules;
+	update_moduledb;
+}
+
+linux-mod_pkg_postrm() {
+	remove_moduledb;
 }
diff --git a/eclass/mailer.eclass b/eclass/mailer.eclass
index e9ffe7711ccf..419441be24e2 100644
--- a/eclass/mailer.eclass
+++ b/eclass/mailer.eclass
@@ -1,51 +1,79 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mailer.eclass,v 1.1 2005/04/25 13:19:25 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mailer.eclass,v 1.1.1.1 2005/11/30 09:59:15 chriswhite Exp $
 
 #
-# Original Author: Fernando J. Pereda <ferdy@gentoo.org>
+# Original Authors: Fernando J. Pereda <ferdy@gentoo.org>
+#					Tom Martin <slarti@gentoo.org>
+#
 # Purpose: eclass to intarface with net-mail/mailer-config, used to manage
-# multiple MTA's installed on a Gentoo system. 
+# multiple MTA's installed on a Gentoo system.
+#
+# Usage: call mailer_install_conf in src_install(), on the condition that
+# "mailwrapper" is in USE. If mailer_install_conf has no arguments,
+# ${FILESDIR}/mailer.conf will be installed to /etc/mail. If it is given a file
+# as argument, this will be used. Also, please note that there is no need to
+# IUSE="mailwrapper" or create RDEPENDS for mailwrapper as used to be the case.
+# As you can see below, these are now set by this eclass. This rule also holds
+# true for PROVIDE="virtual/mta".
+#
+##
+# Functions available for ebuilds:
 #
+#  mailer_get_current()  - Returns the current profile (i.e. postfix-2.2.3)
+#  mailer_install_conf() - Installs the profile file in ${1} or
+#							${FILESDIR}/mailer.conf if ${1} is not specified.
+#  mailer_set_profile()  - Sets the current profile to ${1} or to ${P} if ${1}
+#							is not specified.
+#  mailer_wipe_confs()   - Removes unused profiles (i.e. the profile exists but
+#  							the package is no longer available)
+##
 
-ECLASS="mailer"
-INHERITED="$INHERITED $ECLASS"
-IUSE="${IUSE} mailwrapper"
-RDEPEND="${RDEPEND}
-	mailwrapper? ( net-mail/mailer-config
-					>=net-mail/mailwrapper-0.2.1-r1 )"
+IUSE="mailwrapper"
+RDEPEND="mailwrapper? (
+		|| (
+			net-mail/mailer-config
+			app-admin/eselect
+		)
+		>=net-mail/mailwrapper-0.2.1-r1
+	)
+	!mailwrapper? (
+		!virtual/mta
+	)"
+PROVIDE="virtual/mta"
 
 EXPORT_FUNCTIONS pkg_postinst pkg_postrm
 
 # Gets current mailer profile
 mailer_get_current() {
-	echo $(mailer-config --get-current-profile)
+	mailer-config --get-current-profile
 	return $?
 }
 
-# Installs a new mailer.conf from FILESDIR 
+# Installs a new mailer.conf given as an argument, else it installs
+# ${FILESDIR}/mailer.conf
 mailer_install_conf() {
 	local newname
-	
+
 	if [[ ${PN} == "mailer-config" ]] ; then
 		newname="default"
 	else
-		newname=${P}
+		newname="${1:-${P}.mailer}"
 	fi
-	
+
 	# If the newfile does not exist or the version in the system
 	#  differs from the one in FILESDIR/ (update); install it
-	if [[ ! -f /etc/mail/${newname}.mailer ]] || \
-		! diff /etc/mail/${newname}.mailer "${FILESDIR}/mailer.conf" > /dev/null ; then
+	if [[ ! -f /etc/mail/${newname} ]] || \
+		! diff /etc/mail/${newname} "${FILESDIR}/mailer.conf" > /dev/null ; then
 		insinto /etc/mail/
-		newins "${FILESDIR}/mailer.conf" ${newname}.mailer
+		newins "${FILESDIR}/mailer.conf" ${newname}
 	fi
 }
 
 # Set current mailer profile
 mailer_set_profile() {
 	local newprofile=${1:-${P}}
-	
+
 	ebegin "Setting the current mailer profile to \"${newprofile}\""
 		mailer-config --set-profile ${newprofile} >/dev/null || die
 	eend $?
@@ -54,24 +82,33 @@ mailer_set_profile() {
 # Wipe unused configs
 mailer_wipe_confs() {
 	local x i
-	
-	ebegin "Wiping all non-used mailer profiles"
+
+	ebegin "Wiping all unused mailer profiles"
 		for x in /etc/mail/*.mailer ; do
 			i=${x##*/}
 			i=${i%.mailer}
 
 			[[ ${i} == ${P} ]] && continue
 			[[ ${i} == "default" ]] && continue
-
-			if ! has_version '=mail-mta/${i}*' ; then
-				rm ${x}
-			fi
+			has_version "~mail-mta/${i}" || rm ${x}
 		done
 	eend 0
 }
 
 mailer_pkg_postinst() {
-	use mailwrapper && mailer_set_profile
+	if use mailwrapper ; then
+		if [[ $(mailer_get_current) == default ]] ; then
+			mailer_set_profile
+		else
+			einfo " "
+			einfo "Use either net-mail/mailer-config or app-admin/eselect to change"
+			einfo "to this mailer profile:"
+			einfo " "
+			einfo "    mailer-config --set-profile ${P}"
+			einfo "    eselect mailer set ${P}"
+			einfo " "
+		fi
+	fi
 }
 
 mailer_pkg_postrm() {
@@ -79,6 +116,6 @@ mailer_pkg_postrm() {
 		mailer_wipe_confs
 
 		# We are removing the current profile, switch back to default
-		[[ $(mailer_get_current) == ${P} ]] &&	mailer_set_profile default
+		[[ $(mailer_get_current) == ${P} ]] && mailer_set_profile default
 	fi
 }
diff --git a/eclass/makeedit.eclass b/eclass/makeedit.eclass
index 0f8f9b658087..3962b5609f82 100644
--- a/eclass/makeedit.eclass
+++ b/eclass/makeedit.eclass
@@ -1,24 +1,28 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/makeedit.eclass,v 1.1 2002/07/24 23:57:00 spider Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/eclass/makeedit.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
+#
 # Author: Spider
-# makeedit eclass, will remove -Wreturn-type and -Wall from compiling, this will reduce the RAM requirements.
+#
+# To use this eclass, do 2 things:
+#   1. append-flags "$MAKEEDIT_FLAGS".  If you filter-flags, make sure to do
+#      the append-flags afterward, otherwise you'll lose them.
+#   2. after running configure or econf, call edit_makefiles to remove
+#      extraneous CFLAGS from your Makefiles.
+#
+# This combination should reduce the RAM requirements of your build, and maybe
+# even speed it up a bit.
 
-# Debug ECLASS
-ECLASS="makeedit"
 
-INHERITED="$INHERITED $ECLASS"
-export CFLAGS="${CFLAGS} -Wno-return-type"
-export CXXFLAGS="${CXXFLAGS} -Wno-return-type"
+MAKEEDIT_FLAGS="-Wno-return-type -w"
 
-edit_makefiles () {
-	find . -iname makefile |while read MAKEFILE
-		do einfo "parsing ${MAKEFILE}"
-		cp ${MAKEFILE}  ${MAKEFILE}.old
-		sed -e "s:-Wall:-Wall -Wno-return-type:g" \
-			-e "s:-Wreturn-type:-Wno-return-type:g" \
-			-e "s:-pedantic::g" ${MAKEFILE}.old > ${MAKEFILE}
-	done
-		
+edit_makefiles() {
+	# We already add "-Wno-return-type -w" to compiler flags, so
+	# no need to replace "-Wall" and "-Wreturn-type" with them.
+	einfo "Parsing Makefiles ..."
+	find . \( -iname makefile -o -name \*.mk -o -name GNUmakefile \) -print0 | \
+		xargs -0 sed -i \
+		-e 's:-Wall::g' \
+		-e 's:-Wreturn-type::g' \
+		-e 's:-pedantic::g'
 }
diff --git a/eclass/matrox.eclass b/eclass/matrox.eclass
index 0cc011859cb8..e68bb3d68a7e 100644
--- a/eclass/matrox.eclass
+++ b/eclass/matrox.eclass
@@ -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/eclass/matrox.eclass,v 1.1 2003/12/29 17:17:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/matrox.eclass,v 1.1.1.1 2005/11/30 09:59:25 chriswhite Exp $
 #
 # Author: Donnie Berkholz <spyderous@gentoo.org>
 #
 # This eclass is designed to reduce code duplication in the mtxdrivers* ebuilds.
 # The only addition to mtxdrivers-pro is OpenGL stuff.
 
-ECLASS="matrox"
-INHERITED="${INHERITED} ${ECLASS}"
+inherit eutils
+
 
 EXPORT_FUNCTIONS pkg_setup src_compile
 
@@ -18,53 +18,73 @@ LICENSE="Matrox"
 SLOT="${KV}"
 RESTRICT="fetch nostrip"
 
-newrdepend ">=x11-base/xfree-4.2.0
+RDEPEND="virtual/x11
 	virtual/linux-sources"
 
 matrox_pkg_setup() {
 	# Require correct /usr/src/linux
 	check_KV
 
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+
 	# Force XFree86 4.3.0, 4.2.1 or 4.2.0 to be installed unless FORCE_VERSION
 	# is set. Need FORCE_VERSION for 4.3.99/4.4.0 compatibility until Matrox
 	# comes up with drivers (spyderous)
-	local INSTALLED_X="`best_version x11-base/xfree`"
-	GENTOO_X_VERSION_REVISION="${INSTALLED_X/x11-base\/xfree-}"
-	GENTOO_X_VERSION="${GENTOO_X_VERSION_REVISION%-*}"
-	if [ "${GENTOO_X_VERSION}" != "4.3.0" ]
+	if has_version "x11-base/xfree"
 	then
-		if [ "${GENTOO_X_VERSION}" != "4.2.1" ]
+		local INSTALLED_X="`best_version x11-base/xfree`"
+		GENTOO_X_VERSION_REVISION="${INSTALLED_X/x11-base\/xfree-}"
+		GENTOO_X_VERSION="${GENTOO_X_VERSION_REVISION%-*}"
+		if [ "${GENTOO_X_VERSION}" != "4.3.0" ]
 		then
-			if [ "${GENTOO_X_VERSION}" != "4.2.0" ]
+			if [ "${GENTOO_X_VERSION}" != "4.2.1" ]
 			then
-				if [ -n "${FORCE_VERSION}" ]
+				if [ "${GENTOO_X_VERSION}" != "4.2.0" ]
 				then
-					GENTOO_X_VERSION="${FORCE_VERSION}"
-				else
-					die "These drivers require XFree86 4.3.0, 4.2.1 or 4.2.0. Do FORCE_VERSION=version-you-want emerge ${PN} (4.3.0, 4.2.1 or 4.2.0) to force installation."
+					if [ -n "${FORCE_VERSION}" ]
+					then
+						GENTOO_X_VERSION="${FORCE_VERSION}"
+					else
+						die "These drivers require XFree86 4.3.0, 4.2.1 or 4.2.0. Do FORCE_VERSION=version-you-want emerge ${PN} (4.3.0, 4.2.1 or 4.2.0) to force installation."
+					fi
 				fi
 			fi
 		fi
+	# xorg-x11 compatibility
+	elif has_version "x11-base/xorg-x11"
+	then
+		if [ "${FORCE_VERSION}" != "4.3.0" ]
+		then
+			die "Set FORCE_VERSION=4.3.0 to emerge this. Use at your own risk."
+		fi
+		GENTOO_X_VERSION="${FORCE_VERSION}"
 	fi
 }
 
 matrox_src_compile() {
+	# 2.6 builds use the ARCH variable
+	set_arch_to_kernel
 	export PARHELIUX="${PWD}/src"
 	cd ${S}/src/kernel/parhelia
 	ln -sf ../../../kernel/mtx_parhelia.o .
 	cd ..
 	# Can't use emake here
 	make clean
-	make
+	make || die "make failed"
+	set_arch_to_portage
 }
 
 matrox_base_src_install() {
 	# Kernel Module
-	dodir /lib/modules/${KV}/kernel/drivers/video; insinto /lib/modules/${KV}/kernel/drivers/video
+	dodir /$(get_libdir)/modules/${KV}/kernel/drivers/video; insinto /$(get_libdir)/modules/${KV}/kernel/drivers/video
 	doins src/kernel/mtx.o
 
 	# X Driver (2D)
-	dodir /usr/X11R6/lib/modules/drivers; insinto /usr/X11R6/lib/modules/drivers
+	dodir /usr/X11R6/$(get_libdir)/modules/drivers; insinto /usr/X11R6/$(get_libdir)/modules/drivers
 	doins xfree86/${GENTOO_X_VERSION}/mtx_drv.o
 }
 
diff --git a/eclass/mono.eclass b/eclass/mono.eclass
index b18e41185476..968e258c1e2a 100644
--- a/eclass/mono.eclass
+++ b/eclass/mono.eclass
@@ -1,13 +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/eclass/mono.eclass,v 1.1 2003/02/27 16:50:51 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
 #
 # Author : foser <foser@gentoo.org>
 #
 # mono eclass
 # right now only circumvents a sandbox violation by setting a mono env var
 
-ECLASS="mono"
-INHERITED="$INHERITED $ECLASS"
 
-export MONO_DISABLE_SHM=1
+# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the
+# shared dir to ${T} so that ${T}/.wapi can be used during the install process.
+export MONO_SHARED_DIR=${T}
diff --git a/eclass/motif.eclass b/eclass/motif.eclass
index cfef61f48193..f1ad081f5d11 100644
--- a/eclass/motif.eclass
+++ b/eclass/motif.eclass
@@ -1,24 +1,12 @@
-# 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/eclass/motif.eclass,v 1.1 2003/12/01 15:02:31 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/motif.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 #
 # Heinrich Wednel <lanius@gentoo.org>
 
-ECLASS=motif
-INHERITED="$INHERITED $ECLASS"
-DEPEND="${DEPEND} >=sys-apps/sed-4"
+inherit eutils
 
-# Fix all headers to version ${1}
-motif_fix_headers() {
-	VERSION=${1}
 
-	MATCHES="$(grep -l -i -R -e "#include <Xm" -e "#include <Mrm" -e "#include <uil" * | sort -u)"
-
-	for i in ${MATCHES}
-	do
-		sed -i -e "s:#include <Xm:#include <Xm/${VERSION}/Xm:g" \
-		  -e "s:#include <Mrm:#include <Mrm/${VERSION}/Mrm:g" \
-		  -e "s:#include <uil:#include <uil/${VERSION}/uil:g" \
-		  ${i}
-	done
-}
+LESSTIF_INC_DIR="/usr/X11R6/include/lesstif"
+LESSTIF_LIB_DIR="/usr/X11R6/$(get_libdir)/lesstif"
+LESSTIF_BIN_DIR="/usr/X11R6/bin/lesstif"
diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass
index e499ddd24057..d6d2f231f41e 100644
--- a/eclass/mount-boot.eclass
+++ b/eclass/mount-boot.eclass
@@ -1,54 +1,62 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.1 2002/09/20 18:38:22 woodchip Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.1.1.1 2005/11/30 09:59:20 chriswhite Exp $
+#
+# If the live system has a separate /boot partition configured, then this
+# function tries to ensure that it's mounted in rw mode, exiting with an
+# error if it cant. It does nothing if /boot isn't a separate partition.
 
-ECLASS=boot
-INHERITED="$INHERITED $ECLASS"
 
-boot_pkg_setup(){
+EXPORT_FUNCTIONS pkg_preinst
 
-[ "${ROOT}" != "/" ] && return 0
-
-	local fstabstate="$(cat /etc/fstab | awk '!/^#|^[[:blank:]]+#/ {print $2}' | egrep "/boot" )"
-	local procstate="$(cat /proc/mounts | awk '{print $2}' | egrep "/boot" )"
+mount-boot_mount_boot_partition(){
+	# note that /dev/BOOT is in the Gentoo default /etc/fstab file
+	local fstabstate="$(cat /etc/fstab | awk '!/^#|^[[:blank:]]+#|^\/dev\/BOOT/ {print $2}' | egrep "^/boot$" )"
+	local procstate="$(cat /proc/mounts | awk '{print $2}' | egrep "^/boot$" )"
+	local proc_ro="$(cat /proc/mounts | awk '{ print $2, $4 }' | sed -n '/\/boot/{ /[ ,]\?ro[ ,]\?/p }' )"
 
 	if [ -n "${fstabstate}" ] && [ -n "${procstate}" ]; then
-		if [ -n "`cat /proc/mounts | awk '{ print $2, $4 }' | sed -n '/\/boot/{ /[ ,]ro/p }'`" ]; then
-			einfo "Your boot partition, detected as being mounted as /boot, is read-only"
-			einfo "Remounting it in read-write mode"
-			sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
+		if [ -n "${proc_ro}" ]; then
+			einfo
+			einfo "Your boot partition, detected as being mounted as /boot, is read-only."
+			einfo "Remounting it in read-write mode ..."
+			einfo
 			mount -o remount,rw /boot &>/dev/null
 			if [ "$?" -ne 0 ]; then
-				eerror; eerror "Unable to remount in rw mode. Please do it manually" ; eerror
-				sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
-				die "Can't remount in rw mode. Please do it manually"
+				eerror
+				eerror "Unable to remount in rw mode. Please do it manually!"
+				eerror
+				die "Can't remount in rw mode. Please do it manually!"
 			fi
 		else
-			echo
+			einfo
 			einfo "Your boot partition was detected as being mounted as /boot."
 			einfo "Files will be installed there for ${PN} to function correctly."
-			sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
+			einfo
 		fi
 	elif [ -n "${fstabstate}" ] && [ -z "${procstate}" ]; then
-		mount /boot &>/dev/null
+		mount /boot -o rw &>/dev/null
 		if [ "$?" -eq 0 ]; then
-			echo
-			einfo "Your boot partition was not mounted as /boot, but portage was able to mount"
-			einfo "it without additional intervention."
+			einfo
+			einfo "Your boot partition was not mounted as /boot, but portage"
+			einfo "was able to mount it without additional intervention."
 			einfo "Files will be installed there for ${PN} to function correctly."
-			sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
+			einfo
 		else
-			echo
-			eerror "Your boot partition has to be mounted on /boot before the installation"
+			eerror
+			eerror "Cannot automatically mount your /boot partition."
+			eerror "Your boot partition has to be mounted rw before the installation"
 			eerror "can continue. ${PN} needs to install important files there."
-			sleep 1; echo -ne "\a"; sleep 1; echo -ne "\a"
-			die "Please mount your /boot partition."
+			eerror
+			die "Please mount your /boot partition manually!"
 		fi
 	else
-		echo
+		einfo
 		einfo "Assuming you do not have a separate /boot partition."
-		sleep 1; echo -ne "\a"; sleep 1; echo -e "\a";
+		einfo
 	fi
 }
 
-EXPORT_FUNCTIONS pkg_setup
+mount-boot_pkg_preinst(){
+	mount-boot_mount_boot_partition
+}
diff --git a/eclass/mozconfig-2.eclass b/eclass/mozconfig-2.eclass
index 319c9d6dfca7..3ff2b5d8bd7b 100644
--- a/eclass/mozconfig-2.eclass
+++ b/eclass/mozconfig-2.eclass
@@ -1,27 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-2.eclass,v 1.1 2005/11/07 03:04:48 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-2.eclass,v 1.1.1.1 2005/11/30 09:59:35 chriswhite Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
 inherit multilib flag-o-matic
 
-IUSE="debug gnome ipv6 moznoxft truetype xinerama xprint mozsvg"
+IUSE="debug gnome ipv6 xinerama xprint mozsvg"
 
 RDEPEND="virtual/x11
-	!moznoxft? ( virtual/xft )
-	>=media-libs/fontconfig-2.1
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/jpeg-6b
 	>=media-libs/libmng-1.0.0
 	>=media-libs/libpng-1.2.1
-	>=sys-apps/portage-2.0.36
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
 	>=www-client/mozilla-launcher-1.42
 	>=x11-libs/gtk+-2.8.6
-	>=dev-libs/glib-2.2.0
+	>=dev-libs/glib-2.8.2
 	>=x11-libs/pango-1.10.1
 	>=dev-libs/libIDL-0.8.0
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 
@@ -174,18 +171,16 @@ mozconfig_init() {
 		--enable-single-profile \
 		--disable-profilesharing \
 		--disable-profilelocking \
-		--enable-default-toolkit=gtk2
+		--enable-default-toolkit=gtk2 \
+		--enable-pango
 
 	mozconfig_use_enable ipv6
 	mozconfig_use_enable xinerama
 	mozconfig_use_enable xprint
 
-	if [[ ${MOZ_FREETYPE2} == "no" ]] ; then
-		mozconfig_annotate gentoo --disable-freetype2
-	else
-		mozconfig_use_enable truetype freetype2
-		mozconfig_use_enable truetype freetypetest
-	fi
+	# We use --enable-pango to do truetype fonts, and currently pango
+	# is required for it to build
+	mozconfig_annotate gentoo --disable-freetype2
 
 	if use debug; then
 		mozconfig_annotate +debug \
@@ -226,21 +221,6 @@ mozconfig_init() {
 	if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then
 		mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
 	fi
-
-	# Check if we should enable Xft support...
-	if use moznoxft; then
-		mozconfig_annotate "disabling xft2 by request (+moznoxft)" --disable-xft
-	else
-		if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
-			if [[ ${MOZ_PANGO} == "yes" ]]; then
-				mozconfig_annotate "-moznoxft" --enable-xft --enable-pango
-			else
-				mozconfig_annotate "-moznoxft" --enable-xft
-			fi
-		else
-			mozconfig_annotate "no pkg-config xft" --disable-xft
-		fi
-	fi
 }
 
 # Simulate the silly csh makemake script
diff --git a/eclass/mozconfig.eclass b/eclass/mozconfig.eclass
index a44bb7209ed8..8ed4767f2dee 100644
--- a/eclass/mozconfig.eclass
+++ b/eclass/mozconfig.eclass
@@ -1,20 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.1 2004/11/13 23:23:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.1.1.1 2005/11/30 09:59:16 chriswhite Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
-ECLASS=mozconfig
-INHERITED="$INHERITED $ECLASS"
+inherit multilib flag-o-matic
 
-IUSE="java gnome gtk2 ldap debug xinerama xprint moznoxft"
-case ${PN} in
-	mozilla)	IUSE="${IUSE} mozdevelop mozxmlterm mozsvg" ;;
-	*firefox)	IUSE="${IUSE} mozdevelop mozxmlterm" ;;
-esac
+IUSE="debug gnome ipv6 moznoxft truetype xinerama xprint"
 
 RDEPEND="virtual/x11
-	!moznoxft ( virtual/xft )
+	!moznoxft? ( virtual/xft )
 	>=media-libs/fontconfig-2.1
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/jpeg-6b
@@ -24,10 +19,10 @@ RDEPEND="virtual/x11
 	dev-libs/expat
 	app-arch/zip
 	app-arch/unzip
-	>=net-www/mozilla-launcher-1.22
+	>=www-client/mozilla-launcher-1.22
 	>=x11-libs/gtk+-2.2.0
 	>=dev-libs/glib-2.2.0
-	>=x11-libs/pango-1.2.1
+	>=x11-libs/pango-1.5.0
 	>=dev-libs/libIDL-0.8.0
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )"
 
@@ -42,7 +37,7 @@ export USE_PTHREADS=1
 
 mozconfig_init() {
 	declare enable_optimize pango_version myext x
-	declare MOZ=$([[ ${PN} == mozilla ]] && echo true || echo false)
+	declare MOZ=$([[ ${PN} == mozilla || ${PN} == gecko-sdk ]] && echo true || echo false)
 	declare FF=$([[ ${PN} == *firefox ]] && echo true || echo false)
 	declare TB=$([[ ${PN} == *thunderbird ]] && echo true || echo false)
 	declare SB=$([[ ${PN} == *sunbird ]] && echo true || echo false)
@@ -55,11 +50,11 @@ mozconfig_init() {
 	####################################
 
 	case ${PN} in
-		mozilla) 
+		mozilla|gecko-sdk)
 			# The other builds have an initial --enable-extensions in their
 			# .mozconfig.  The "default" set in configure applies to mozilla
 			# specifically.
-			: >.mozconfig || die "initial mozconfig creation failed" 
+			: >.mozconfig || die "initial mozconfig creation failed"
 			mozconfig_annotate "" --enable-extensions=default ;;
 		*firefox)
 			cp browser/config/mozconfig .mozconfig \
@@ -81,7 +76,9 @@ mozconfig_init() {
 	# Set optimization level based on CFLAGS
 	if is-flag -O0; then
 		mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
-	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
+	elif [[ ${ARCH} == hppa ]]; then
+		mozconfig_annotate "more than -O0 causes segfaults on hppa" --enable-optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == ppc64 ]]; then
 		mozconfig_annotate "more than -O1 causes segfaults on 64-bit (bug 33767)" \
 			--enable-optimize=-O1
 	elif is-flag -O1; then
@@ -100,13 +97,27 @@ mozconfig_init() {
 	# -O -O1 and -O2
 	strip-flags
 
+	# -fstack-protector is in ALLOWED_FLAGS but breaks moz #83511
+	#filter-flags -fstack-protector ; # commented out by solar
+
 	# Additional ARCH support
 	case "${ARCH}" in
-	alpha|amd64|ia64)
+	alpha)
+		# Historically we have needed to add -fPIC manually for 64-bit.
+		# Additionally, alpha should *always* build with -mieee for correct math
+		# operation
+		append-flags -fPIC -mieee
+		;;
+
+	amd64|ia64)
 		# Historically we have needed to add this manually for 64-bit
 		append-flags -fPIC
 		;;
 
+	ppc64)
+		append-flags -fPIC -mminimal-toc
+		;;
+
 	ppc)
 		# Fix to avoid gcc-3.3.x micompilation issues.
 		if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then
@@ -141,6 +152,18 @@ mozconfig_init() {
 		CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 	fi
 
+	# Go a little faster; use less RAM
+	append-flags "$MAKEEDIT_FLAGS"
+
+	# Define our plugin dirs for nsplugins-v2.patch
+	#
+	# This is the way we would *like* to do things.  However ./configure chokes
+	# on these definitions, so the real definitions happen in the ebuilds, just
+	# before emake.
+	#
+	#append-flags "-DGENTOO_NSPLUGINS_DIR=\\\"/usr/$(get_libdir)/nsplugins\\\""
+	#append-flags "-DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/$(get_libdir)/nsbrowser/plugins\\\""
+
 	####################################
 	#
 	# mozconfig setup
@@ -159,8 +182,21 @@ mozconfig_init() {
 	mozconfig_use_enable ipv6
 	mozconfig_use_enable xinerama
 	mozconfig_use_enable xprint
-	mozconfig_use_enable truetype freetype2
-	mozconfig_use_enable truetype freetypetest
+
+	if [[ ${MOZ_FREETYPE2} == "no" ]] ; then
+		# Newer mozilla/firefox builds should use xft and not freetype.
+		# Should be default for mozilla-1.7.12 and mozilla-firefox-1.0.7.
+		# Not sure if we should enable xft in this case, but might clash
+		# with USE=moznoxft ...
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c139
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=215219i
+		#mozconfig_use_enable truetype freetype2
+		#mozconfig_use_enable truetype freetypetest
+		mozconfig_annotate gentoo --disable-freetype2
+	else
+		mozconfig_use_enable truetype freetype2
+		mozconfig_use_enable truetype freetypetest
+	fi
 
 	if use debug; then
 		mozconfig_annotate +debug \
@@ -186,7 +222,7 @@ mozconfig_init() {
 	fi
 
 	# Here is a strange one...
-	if is-flag '-mcpu=ultrasparc*'; then
+	if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then
 		mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
 	fi
 
@@ -194,15 +230,11 @@ mozconfig_init() {
 	if use moznoxft; then
 		mozconfig_annotate "disabling xft2 by request (+moznoxft)" --disable-xft
 	else
-		# We need Xft2.0 locally installed
 		if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
-			# We also need pango-1.1, else Mozilla links to both
-			# Xft1.1 *and* Xft2.0, and segfault...
-			pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
-			if [[ ${pango_version//.} -gt 10 ]]; then
-				mozconfig_annotate "-moznoxft" --enable-xft
+			if [[ ${MOZ_PANGO} == "yes" ]]; then
+				mozconfig_annotate "-moznoxft" --enable-xft --enable-pango
 			else
-				mozconfig_annotate "bad pango version <1.1" --disable-xft
+				mozconfig_annotate "-moznoxft" --enable-xft
 			fi
 		else
 			mozconfig_annotate "no pkg-config xft" --disable-xft
@@ -230,7 +262,7 @@ makemake() {
 # mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
 # => ac_add_options --enable-js-ultrasparc # building on ultrasparc
 mozconfig_annotate() {
-	declare reason=${1} x ; shift
+	declare reason=$1 x ; shift
 	[[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!"
 	for x in ${*}; do
 		echo "ac_add_options ${x} # ${reason}" >>.mozconfig
@@ -244,7 +276,17 @@ mozconfig_annotate() {
 # => ac_add_options --enable-freetype2 # +truetype
 mozconfig_use_enable() {
 	declare flag=$(use_enable "$@")
-	mozconfig_annotate "$(useq ${1} && echo +${1} || echo -${1})" "${flag}"
+	mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}"
+}
+
+# mozconfig_use_with: add a line to .mozconfig based on a USE-flag
+#
+# Example:
+# mozconfig_use_with kerberos gss-api /usr/$(get_libdir)
+# => ac_add_options --with-gss-api=/usr/lib # +kerberos
+mozconfig_use_with() {
+	declare flag=$(use_with "$@")
+	mozconfig_annotate "$(useq $1 && echo +$1 || echo -$1)" "${flag}"
 }
 
 # mozconfig_use_extension: enable or disable an extension based on a USE-flag
@@ -253,13 +295,13 @@ mozconfig_use_enable() {
 # mozconfig_use_extension gnome gnomevfs
 # => ac_add_options --enable-extensions=gnomevfs
 mozconfig_use_extension() {
-	declare minus=$(useq ${1} || echo -)
-	mozconfig_annotate "${minus:-+}${1}" --enable-extensions=${minus}${2}
+	declare minus=$(useq $1 || echo -)
+	mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2}
 }
 
-# mozconfig_explain: display a table describing all configuration options paired
-# with reasons
-mozconfig_explain() {
+# mozconfig_final: display a table describing all configuration options paired
+# with reasons, then clean up extensions list
+mozconfig_final() {
 	declare ac opt hash reason
 	echo
 	echo "=========================================================="
@@ -271,4 +313,10 @@ mozconfig_explain() {
 	done
 	echo "=========================================================="
 	echo
+
+	# Resolve multiple --enable-extensions down to one
+	declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ ]*\).*/\1/p' \
+		.mozconfig | xargs)
+	sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
+	echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
 }
diff --git a/eclass/mozilla-launcher.eclass b/eclass/mozilla-launcher.eclass
index bcd54a177239..0fa58e36c09e 100644
--- a/eclass/mozilla-launcher.eclass
+++ b/eclass/mozilla-launcher.eclass
@@ -1,12 +1,37 @@
-# 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/eclass/mozilla-launcher.eclass,v 1.1 2004/05/28 02:32:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla-launcher.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 
-ECLASS=mozilla-launcher
-INHERITED="$INHERITED $ECLASS"
+inherit nsplugins multilib
 
+# update_mozilla_launcher_symlinks
+# --------------------------------
+# Create or remove the following symlinks in /usr/bin:
+#
+#    firefox -> firefox-bin
+#    thunderbird -> thunderbird-bin
+#    mozilla -> mozilla-bin
+#    sunbird -> sunbird-bin
+#
+# The symlinks are removed if they're found to be dangling.  They are
+# created according to the following rules:
+#
+# - If there's a -bin symlink in /usr/bin, and no corresponding
+#   non-bin symlink, then create one.
+#
+# - Can't do this in src_install otherwise it overwrites the one
+#   for the non-bin package.
+#
+# - Link to the -bin symlink so it's easier to detect when to
+#   remove the symlink.
+#
+# NOTE: This eclass does *not* manage the launcher stubs in /usr/bin except
+# when a -bin package is installed and the corresponding from-source
+# package is not installed.  The usual stubs are actually installed in
+# src_install so they are included in the package inventory.
+#
 update_mozilla_launcher_symlinks() {
-	local f browsers="mozilla firefox thunderbird"
+	local f browsers="mozilla firefox thunderbird sunbird"
 	cd ${ROOT}/usr/bin
 
 	# Remove launcher symlinks that no longer apply
@@ -18,21 +43,39 @@ update_mozilla_launcher_symlinks() {
 		fi
 	done
 
-	# Create symlinks
-	#
-	# - If there's a -bin symlink in /usr/bin, and no corresponding
-	#   non-bin symlink, then create one.
-	#
-	# - Can't do this in src_install otherwise it overwrites the one
-	#   for the non-bin package.
-	#
-	# - Link to the -bin symlink so it's easier to detect when to
-	#   remove the symlink.
+	# Create new symlinks
 
 	for f in ${browsers}; do
-		if [[ -L ${f}-bin && ! -e ${f} ]]; then
+		if [[ -e ${f}-bin && ! -e ${f} ]]; then
 			einfo "Adding link from ${f}-bin to ${f}"
 			ln -s ${f}-bin ${f}
 		fi
 	done
 }
+
+# install_mozilla_launcher_stub name libdir
+# -----------------------------------------
+# Install a stub called /usr/bin/$name that executes mozilla-launcher
+#
+# Note: $PLUGINS_DIR comes from nsplugins (specifically the deprecated section).
+#
+install_mozilla_launcher_stub() {
+	[[ -n $2 ]] || die "install_launcher_stub requires two arguments"
+	declare name=$1
+	declare libdir=$2
+
+	dodir /usr/bin
+	cat <<EOF >${D}/usr/bin/${name}
+#!/bin/sh
+#
+# Stub script to run mozilla-launcher.  We used to use a symlink here
+# but OOo brokenness makes it necessary to use a stub instead:
+# http://bugs.gentoo.org/show_bug.cgi?id=78890
+
+export MOZILLA_LAUNCHER=${name}
+export MOZILLA_LIBDIR=${libdir}
+export MOZ_PLUGIN_PATH=\${MOZ_PLUGIN_PATH:-/usr/$(get_libdir)/$PLUGINS_DIR}
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+	chmod 0755 ${D}/usr/bin/${name}
+}
diff --git a/eclass/mozilla.eclass b/eclass/mozilla.eclass
index f0c50fa907e5..23ea4e1f494d 100644
--- a/eclass/mozilla.eclass
+++ b/eclass/mozilla.eclass
@@ -1,16 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.1 2004/08/04 23:30:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.1.1.1 2005/11/30 09:59:20 chriswhite Exp $
+#
+# You probably don't want to change this eclass.  Newer ebuilds use
+# mozconfig.eclass instead.
 
-ECLASS=mozilla
-INHERITED="$INHERITED $ECLASS"
 
-IUSE="java gtk2 ldap debug xinerama xprint"
+IUSE="java gnome gtk2 ldap debug xinerama xprint"
 # Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozsvg moznoxft"
+IUSE="${IUSE} moznoxft"
+[[ ${PN} == mozilla || ${PN} == mozilla-firefox ]] && \
+	IUSE="${IUSE} mozdevelop mozxmlterm"
+[[ ${PN} == mozilla ]] && \
+	IUSE="${IUSE} mozsvg"
 
 RDEPEND="virtual/x11
-	!moznoxft ( virtual/xft )
+	!moznoxft? ( virtual/xft )
 	>=media-libs/fontconfig-2.1
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/jpeg-6b
@@ -24,18 +29,28 @@ RDEPEND="virtual/x11
 		>=x11-libs/gtk+-2.2.0
 		>=dev-libs/glib-2.2.0
 		>=x11-libs/pango-1.2.1
-		>=dev-libs/libIDL-0.8.0 )
+		>=dev-libs/libIDL-0.8.0
+		gnome? ( >=gnome-base/gnome-vfs-2.3.5 ) )
 	!gtk2? (
 		=x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2*
-		>=gnome-base/ORBit-0.5.10-r1 )
-	>=net-www/mozilla-launcher-1.15"
+		=gnome-base/orbit-0* )
+	>=www-client/mozilla-launcher-1.22"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+# Set by configure (plus USE_AUTOCONF=1), but useful for NSPR
+export MOZILLA_CLIENT=1
+export BUILD_OPT=1
+export NO_STATIC_LIB=1
+export USE_PTHREADS=1
+
 mozilla_conf() {
-	declare enable_optimize
+	declare enable_optimize pango_version myext x
+	declare MOZ=$([[ ${PN} == mozilla ]] && echo true || echo false)
+	declare FF=$([[ ${PN} == *firefox ]] && echo true || echo false)
+	declare TB=$([[ ${PN} == *thunderbird ]] && echo true || echo false)
 
 	####################################
 	#
@@ -45,16 +60,16 @@ mozilla_conf() {
 
 	# Set optimization level based on CFLAGS
 	if is-flag -O0; then
-		enable_optimize=-O0
-	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then
-		# Anything more than this causes segfaults on startup on 64-bit
-		# (bug 33767)
-		enable_optimize=-O1
-		append-flags -fPIC
+		mozilla_annotate "from CFLAGS" --enable-optimize=-O0
+	elif [[ ${ARCH} == hppa ]]; then
+		mozconfig_annotate "more than -O0 causes segfaults on hppa" --enable-optimize=-O0
+	elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == ppc64 ]]; then
+		mozilla_annotate "more than -O1 causes segfaults on 64-bit (bug 33767)" \
+			--enable-optimize=-O1
 	elif is-flag -O1; then
-		enable_optimize=-O1
+		mozilla_annotate "from CFLAGS" --enable-optimize=-O1
 	else
-		enable_optimize=-O2
+		mozilla_annotate "mozilla fallback" --enable-optimize=-O2
 	fi
 
 	# Now strip optimization from CFLAGS so it doesn't end up in the
@@ -67,17 +82,16 @@ mozilla_conf() {
 	# -O -O1 and -O2
 	strip-flags
 
-	# This was in mozilla and thunderbird but not firefox.  I'm dropping it
-	# because I don't see the point in forcing it on (04 Aug 2004 agriffis)
-	#append-flags -fforce-addr
-
 	# Additional ARCH support
 	case "${ARCH}" in
-	alpha)
-		# Mozilla won't link with X11 on alpha, for some crazy reason.
-		# set it to link explicitly here.
-		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
-			${S}/gfx/src/gtk/Makefile.in
+	alpha|amd64|ia64)
+		# Historically we have needed to add this manually for 64-bit
+		append-flags -fPIC
+		;;
+
+	ppc64)
+		append-flags -mminimal-toc
+		append-flags -fPIC
 		;;
 
 	ppc)
@@ -102,14 +116,17 @@ mozilla_conf() {
 				replace-flags -march=pentium4 -march=pentium3
 				filter-flags -msse2
 			fi
-			# Enable us to use flash, etc plugins compiled with gcc-2.95.3
-			myconf="${myconf} --enable-old-abi-compat-wrappers"
 		fi
 		;;
 	esac
 
-	# Needed to build without warnings on gcc-3
-	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		mozilla_annotate "building with >=gcc-3" --enable-old-abi-compat-wrappers
+
+		# Needed to build without warnings on gcc-3
+		CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+	fi
 
 	####################################
 	#
@@ -117,109 +134,223 @@ mozilla_conf() {
 	#
 	####################################
 
-	# myconf should be declared local by the caller (src_compile)
-	myconf="\
+	# myconf should be declared local by the caller (src_compile).
+	myconf="${myconf} \
+		--disable-activex \
+		--disable-activex-scripting \
+		--disable-installer \
 		--disable-pedantic \
 		--enable-crypto \
-		--enable-mathml \
-		--enable-optimize=${enable_optimize} \
-		--enable-xsl \
 		--enable-xterm-updates \
 		--with-pthreads \
 		--with-system-jpeg \
-		--with-system-mng \
 		--with-system-png \
 		--with-system-zlib \
+		--with-x \
 		--without-system-nspr \
-		$(use_enable ipv6) \
-		$(use_enable java java-supplement) \
-		$(use_enable ldap) \
-		$(use_enable xinerama) \
-		$(use_enable xprint)"
+		--enable-default-toolkit=gtk2 \
+		$(mozilla_use_enable ipv6) \
+		$(mozilla_use_enable xinerama) \
+		$(mozilla_use_enable xprint) \
+		$(mozilla_use_enable truetype freetype2) \
+		$(mozilla_use_enable truetype freetypetest)"
 
 	# NOTE: QT and XLIB toolkit seems very unstable, leave disabled until
 	#       tested ok -- azarah
 	if use gtk2; then
-		myconf="${myconf}
-			--enable-toolkit-gtk2 \
-			--enable-default-toolkit=gtk2 \
-			--disable-toolkit-qt \
-			--disable-toolkit-xlib \
-			--disable-toolkit-gtk"
+		mozilla_annotate +gtk2 --enable-default-toolkit=gtk2
+		myconf="${myconf} $(mozilla_use_enable gnome gnomevfs)"
 	else
-		myconf="${myconf}
-			--enable-toolkit-gtk \
-			--enable-default-toolkit=gtk \
-			--disable-toolkit-qt \
-			--disable-toolkit-xlib \
-			--disable-toolkit-gtk2"
+		mozilla_annotate -gtk2 --enable-default-toolkit=gtk
+		mozilla_annotate -gtk2 --disable-gnomevfs
 	fi
 
-	if ! use debug; then
-		myconf="${myconf} \
-			--disable-dtd-debug \
+	if use debug; then
+		mozilla_annotate +debug \
+			--enable-debug \
+			--enable-tests \
+			--disable-reorder \
+			--disable-strip \
+			--disable-strip-libs \
+			--enable-debugger-info-modules=ALL_MODULES
+	else
+		mozilla_annotate -debug \
 			--disable-debug \
 			--disable-tests \
 			--enable-reorder \
 			--enable-strip \
-			--enable-strip-libs"
+			--enable-strip-libs
 
 		# Currently --enable-elf-dynstr-gc only works for x86 and ppc,
 		# thanks to Jason Wever <weeve@gentoo.org> for the fix.
-		if use x86 || use ppc; then
-			myconf="${myconf} --enable-elf-dynstr-gc"
+		if use x86 || use ppc && [[ ${enable_optimize} != -O0 ]]; then
+			mozilla_annotate "${ARCH} optimized build" --enable-elf-dynstr-gc
 		fi
 	fi
 
-	# Check if we should enable Xft support ...
-	if ! use moznoxft; then
-		if use gtk2; then
-			local pango_version=""
-
-			# We need Xft2.0 localy installed
-			if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
-				pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
-
-				# We also need pango-1.1, else Mozilla links to both
-				# Xft1.1 *and* Xft2.0, and segfault...
-				if [[ ${pango_version//.} -gt 10 ]]; then
-					einfo "Building with Xft2.0 (Gtk+-2.0) support"
-					myconf="${myconf} --enable-xft --disable-freetype2"
-					touch ${WORKDIR}/.xft
-				else
-					ewarn "Building without Xft2.0 support (bad pango)"
-					myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
-				fi
+	# Here is a strange one...
+	if is-flag '-mcpu=ultrasparc*'; then
+		mozilla_annotate "building on ultrasparc" --enable-js-ultrasparc
+	fi
+
+	# Check if we should enable Xft support...
+	if use moznoxft; then
+		mozilla_annotate "disabling xft2 by request (+moznoxft)" --disable-xft
+	elif use gtk2; then
+		# We need Xft2.0 locally installed
+		if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then
+			# We also need pango-1.1, else Mozilla links to both
+			# Xft1.1 *and* Xft2.0, and segfault...
+			pango_version=$(pkg-config --modversion pango | cut -d. -f1,2)
+			if [[ ${pango_version//.} -gt 10 ]]; then
+				mozilla_annotate "gtk2 with xft2 (+gtk2 -moznoxft)" --enable-xft
 			else
-				ewarn "Building without Xft2.0 support (no pkg-config xft)"
-				myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+				mozilla_annotate "gtk2 without xft2 (bad pango version <1.1)" --disable-xft
 			fi
 		else
-			einfo "Building with Xft2.0 (Gtk+-1.0) support"
-			myconf="${myconf} --enable-xft --disable-freetype2"
-			touch ${WORKDIR}/.xft
+			mozilla_annotate "gtk2 without xft2 (no pkg-config xft)" --disable-xft
 		fi
 	else
-		einfo "Building without Xft2.0 support (moznoxft)"
-		myconf="${myconf} --disable-xft $(use_enable truetype freetype2)"
+		mozilla_annotate "gtk1 with xft2 (-gtk2 -moznoxft)" --enable-xft
+	fi
+
+	# Support some development/debugging stuff for web developers
+	if ( ${MOZ} || ${FF} ) && use mozdevelop; then
+		mozilla_annotate "+mozdevelop on ${PN}" \
+			--enable-jsd \
+			--enable-xpctools
+	else
+		mozilla_annotate "n/a on ${PN}" \
+			--disable-jsd \
+			--disable-xpctools
 	fi
 
-	# Re-enabled per bug 24522 (28 Apr 2004 agriffis)
-	if use mozsvg; then
-		export MOZ_INTERNAL_LIBART_LGPL=1
-		myconf="${myconf} --enable-svg --enable-svg-renderer-libart"
+	# Some browser-only flags
+	if ${MOZ} || ${FF}; then
+		# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+		# regardless of java setting.
+		myconf="${myconf} --enable-oji \
+			--enable-mathml"
 	else
-		myconf="${myconf} --disable-svg"
+		mozilla_annotate "n/a on ${PN}" --disable-oji
+	fi
+
+	# Some mailer-only flags
+	if ${TB}; then
+		# Set up extensions
+		if [[ ${PV} < 0.8 ]]; then
+			myext="pref,spellcheck,universalchardet,wallet"
+		else
+			myext="wallet,spellcheck,xmlextras,webservices"
+		fi
+
+		myconf="${myconf} --enable-single-profile \
+			--enable-necko-protocols=http,file,jar,viewsource,res,data \
+			--enable-image-decoders=default,-xbm \
+			$(mozilla_use_enable ldap) \
+			$(mozilla_use_enable ldap ldap-experimental) \
+			--enable-extensions=${myext}"
+
+		mozilla_annotate "n/a on ${PN}" \
+			--disable-calendar \
+			--disable-svg \
+			--disable-necko-disk-cache \
+			--disable-profilesharing \
+			--disable-plugins
 	fi
+
+	# Some firefox-only flags
+	if ${FF}; then
+		# Set up extensions
+		myext="cookie,inspector,negotiateauth,pref,transformiix,universalchardet,webservices,xmlextras,xml-rpc"
+		[[ ${PV} < 1.0 ]] && myext="${myext},typeaheadfind"
+		use mozdevelop && myext="${myext},venkman"
+		use gnome && use gtk2 && myext="${myext},gnomevfs"
+
+		myconf="${myconf} \
+			--enable-single-profile \
+			--enable-extensions=${myext}"
+
+		mozilla_annotate "n/a on ${PN}" \
+			--disable-mailnews \
+			--disable-composer \
+			--disable-ldap \
+			--disable-profilesharing
+	fi
+
+	# Some moz-only flags
+	if ${MOZ}; then
+		# Set up extensions
+		myext="default"
+		use mozdevelop && myext="${myext},venkman"
+		use gnome && myext="${myext},gnomevfs"
+		use moznoirc && myext="${myext},-irc"
+		use mozxmlterm && myext="${myext},xmlterm"
+
+		myconf="${myconf} \
+			$(mozilla_use_enable mozcalendar calendar) \
+			$(mozilla_use_enable ldap) \
+			$(mozilla_use_enable ldap ldap-experimental) \
+			--enable-extensions=${myext}"
+
+		if use moznomail && ! use mozcalendar; then
+			mozilla_annotate "+moznomail -mozcalendar" --disable-mailnews
+		fi
+		if use moznocompose && use moznomail; then
+			mozilla_annotate "+moznocompose +moznomail" --disable-composer
+		fi
+		# Re-enabled per bug 24522 (28 Apr 2004 agriffis)
+		if use mozsvg; then
+			export MOZ_INTERNAL_LIBART_LGPL=1
+			mozilla_annotate "+mozsvg on ${PN}" \
+				--enable-svg --enable-svg-renderer-libart
+		else
+			mozilla_annotate "-mozsvg" \
+				--disable-svg
+		fi
+	fi
+
+	# Report!
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	for x in $(echo ${myconf} | sed 's/ /\n/g' | sort); do
+		mozilla_explain "${x}"
+	done
+	echo "=========================================================="
+	echo
 }
 
 # Simulate the silly csh makemake script
 makemake() {
 	typeset m topdir
-
 	for m in $(find . -name Makefile.in); do
 		topdir=$(echo "$m" | sed -r 's:[^/]+:..:g')
 		sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \
 			< ${m} > ${m%.in} || die "sed ${m} failed"
 	done
 }
+
+#
+# The following functions are internal to mozilla.eclass
+#
+
+mozilla_use_enable() {
+	declare flag=$(use_enable "$@")
+	mozilla_annotate "$(useq ${1} && echo +${1} || echo -${1})" "${flag}"
+	echo "${flag}"
+}
+
+mozilla_annotate() {
+	declare reason=${1} x ; shift
+	[[ $# -gt 0 ]] || die "mozilla_annotate missing flags for ${reason}!"
+	mkdir -p ${T}/annotations
+	for x in ${*}; do
+		myconf="${myconf} ${x}"
+		echo "${reason}" > "${T}/annotations/${x%%=*}"
+	done
+}
+
+mozilla_explain() {
+	printf "    %-30s  %s\n" "${1}" "$(cat "${T}/annotations/${1%%=*}" 2>/dev/null)"
+}
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index aa065b22feff..56ae8d3404f1 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,17 +1,113 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.1 2005/01/12 00:21:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.1.1.1 2005/11/30 09:59:17 chriswhite Exp $
 #
 # Author: Jeremy Huddleston <eradicator@gentoo.org>
 #
 # This eclass is for all functions pertaining to handling multilib.
 # configurations.
 
-ECLASS=multilib
-INHERITED="$INHERITED $ECLASS"
-
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
+# has_multilib_profile:
+# Return true if the current profile is a multilib profile and lists more than
+# one abi in ${MULTILIB_ABIS}.  You might want to use this like
+# 'use multilib || has_multilib_profile' until all profiles utilizing the
+# 'multilib' use flag are removed from portage
+
+# is_final_abi:
+# Return true if ${ABI} is the final abi to be installed (and thus we are
+# on our last run through a src_* function.
+
+# number_abis:
+# echo the number of ABIs we will be installing for
+
+# get_install_abis:
+# Return a list of the ABIs we want to install for with
+# the last one in the list being the default.
+
+# get_all_abis:
+# Return a list of the ABIs supported by this profile.
+# the last one in the list being the default.
+
+# get_all_libdirs:
+# Returns a list of all the libdirs used by this profile.  This includes
+# those that might not be touched by the current ebuild and always includes
+# "lib".
+
+# get_libdir:
+# Returns the libdir for the selected ABI.  This is backwards compatible
+# and simply calls get_abi_LIBDIR() on newer profiles.  You should use this
+# to determine where to install shared objects (ex: /usr/$(get_libdir))
+
+# get_abi_var <VAR> [<ABI>]:
+# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
+#
+# get_abi_CFLAGS:
+# get_abi_CDEFINE:
+# get_abi_LIBDIR:
+# Aliases for 'get_abi_var CFLAGS', etc.
+
+# get_ml_incdir [<include dir> [<ABI>]]
+# include dir defaults to /usr/include
+# ABI defaults to ${ABI} or ${DEFAULT_ABI}
+#
+# If a multilib include dir is associated with the passed include dir, then
+# we return it, otherwise, we just echo back the include dir.  This is
+# neccessary when a built script greps header files rather than testing them
+# via #include (like perl) to figure out features.
+
+# prep_ml_includes:
+# Some includes (include/asm, glibc, etc) are ABI dependent.  In this case,
+# We can install them in different locations for each ABI and create a common
+# header which includes the right one based on CDEFINE_${ABI}.  If your
+# package installs ABI-specific headers, just add 'prep_ml_includes' to the
+# end of your src_install().  It takes a list of directories that include
+# files are installed in (default is /usr/include if none are passed).
+#
+# Example:
+# src_install() {
+#    ...
+#    prep_ml_includes /usr/qt/3/include
+# }
+
+# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
+# If you need more control than prep_ml_includes can offer (like linux-headers
+# for the asm-* dirs, then use create_ml_includes.  The firs argument is the
+# common dir.  The remaining args are of the form <symbol>:<dir> where
+# <symbol> is what is put in the #ifdef for choosing that dir.
+#
+# Ideas for this code came from debian's sparc-linux headers package.
+#
+# Example:
+# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
+# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
+
+# get_libname [version]
+# returns libname with proper suffix {.so,.dylib} and optionally supplied version
+# for ELF/MACH-O shared objects
+#
+# Example:
+# get_libname libfoo ${PV}
+# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
+
+### END DOCUMENTATION ###
+
+# Defaults:
+export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
+export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
+export CFLAGS_default
+export LDFLAGS_default
+export CHOST_default=${CHOST_default:-${CHOST}}
+export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
+export LIBDIR_default=${CONF_LIBDIR:-"lib"}
+export CDEFINE_default="__unix__"
+
+# has_multilib_profile()
+has_multilib_profile() {
+	[ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
+}
+
 # This function simply returns the desired lib directory. With portage
 # 2.0.51, we now have support for installing libraries to lib32/lib64
 # to accomidate the needs of multilib systems. It's no longer a good idea
@@ -26,32 +122,17 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 #   depend on a newer version of portage (not yet released) which uses these
 #   over CONF_LIBDIR in econf, dolib, etc...
 get_libdir() {
-	LIBDIR_TEST=$(type econf)
-	if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
+	local CONF_LIBDIR
+	if [ -n  "${CONF_LIBDIR_OVERRIDE}" ] ; then
 		# if there is an override, we want to use that... always.
-		CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
-	# We don't need to know the verison of portage. We only need to know
-	# if there is support for CONF_LIBDIR in econf and co.
-	# Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 
-	#elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
-	#	# and if there isnt an override, and we're using a version of
-	#	# portage without CONF_LIBDIR support, force the use of lib. dolib
-	#	# and friends from portage 2.0.50 wont be too happy otherwise.
-	#	CONF_LIBDIR="lib"
-	#fi
-	elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
-		CONF_LIBDIR="$(get_abi_LIBDIR)"
-	elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
-		# will be <portage-2.0.51_pre20
-		CONF_LIBDIR="lib"
-	fi
-	# and of course, default to lib if CONF_LIBDIR isnt set
-	echo ${CONF_LIBDIR:=lib}
-	unset LIBDIR_TEST
+		echo ${CONF_LIBDIR_OVERRIDE}
+	else
+		get_abi_LIBDIR
+	fi
 }
 
 get_multilibdir() {
-	if [ -n "$(get_abi_LIBDIR)" ]; then
+	if has_multilib_profile; then
 		eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach.  Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
 		exit 1
 	fi
@@ -70,12 +151,13 @@ get_multilibdir() {
 #
 # Travis Tilley <lv@gentoo.org> (31 Aug 2004)
 get_libdir_override() {
-	if [ -n "$(get_abi_LIBDIR)" ]; then
+	if has_multilib_profile; then
 		eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach.  Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
 		exit 1
 	fi
 	CONF_LIBDIR="$1"
 	CONF_LIBDIR_OVERRIDE="$1"
+	LIBDIR_default="$1"
 }
 
 # get_abi_var <VAR> [<ABI>]
@@ -93,7 +175,7 @@ get_libdir_override() {
 #
 # Jeremy Huddleston <eradicator@gentoo.org>
 get_abi_var() {
-	local flag=${1}
+	local flag=$1
 	local abi
 	if [ $# -gt 1 ]; then
 		abi=${2}
@@ -102,32 +184,469 @@ get_abi_var() {
 	elif [ -n "${DEFAULT_ABI}" ]; then
 		abi=${DEFAULT_ABI}
 	else
-		return 1
+		abi="default"
 	fi
 
 	local var="${flag}_${abi}"
 	echo ${!var}
 }
 
-get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
-get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
-get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
-get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
+get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
+get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
+get_abi_CHOST() { get_abi_var CHOST "$@"; }
+get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
+get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
+get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
+get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
+
+# Return a list of the ABIs we want to install for with
+# the last one in the list being the default.
+get_install_abis() {
+	local order=""
+
+	if [[ -z ${MULTILIB_ABIS} ]] ; then
+		echo "default"
+		return 0
+	fi
+
+	if hasq multilib-pkg-force ${RESTRICT} ||
+	   { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
+		for x in ${MULTILIB_ABIS} ; do
+			if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
+				hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
+			fi
+		done
+		hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
+
+		if [[ -n ${ABI_ALLOW} ]] ; then
+			local ordera=""
+			for x in ${order} ; do
+				if hasq ${x} ${ABI_ALLOW} ; then
+					ordera="${ordera} ${x}"
+				fi
+			done
+			order=${ordera}
+		fi
+	else
+		order=${DEFAULT_ABI}
+	fi
 
-# get_all_libdir()
-# Returns a list of all the libdirs used by this profile
+	if [[ -z ${order} ]] ; then
+		die "The ABI list is empty.  Are you using a proper multilib profile?  Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package."
+	fi
+
+	echo ${order}
+	return 0
+}
+
+# Return a list of the ABIs supported by this profile.
+# the last one in the list being the default.
+get_all_abis() {
+	local order=""
+
+	if [[ -z ${MULTILIB_ABIS} ]] ; then
+		echo "default"
+		return 0
+	fi
+
+	for x in ${MULTILIB_ABIS}; do
+		if [[ ${x} != ${DEFAULT_ABI} ]] ; then
+			order="${order:+${order} }${x}"
+		fi
+	done
+	order="${order:+${order} }${DEFAULT_ABI}"
+
+	echo ${order}
+	return 0
+}
+
+# get_all_libdirs()
+# Returns a list of all the libdirs used by this profile.  This includes
+# those that might not be touched by the current ebuild.
 get_all_libdirs() {
-	local libdirs
-	if [ -n "${MULTILIB_ABIS}" ]; then
+	local libdirs="lib"
+	local abi
+	local dir
+
+	if has_multilib_profile; then
 		for abi in ${MULTILIB_ABIS}; do
-			libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
+			[ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
 		done
-		libdirs="${libdirs:1}"
 	elif [ -n "${CONF_LIBDIR}" ]; then
-		libdirs="${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}"
-	else
-		libdirs="lib"
+		for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
+			[ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
+		done
 	fi
 
 	echo "${libdirs}"
 }
+
+# Return true if ${ABI} is the last ABI on our list (or if we're not
+# using the new multilib configuration.  This can be used to determine
+# if we're in the last (or only) run through src_{unpack,compile,install}
+is_final_abi() {
+	has_multilib_profile || return 0
+	local ALL_ABIS=$(get_install_abis)
+	local LAST_ABI=${ALL_ABIS/* /}
+	[[ ${LAST_ABI} == ${ABI} ]]
+}
+
+# echo the number of ABIs we will be installing for
+number_abis() {
+	get_install_abis | wc -w
+}
+
+# get_ml_incdir [<include dir> [<ABI>]]
+# include dir defaults to /usr/include
+# ABI defaults to ${ABI} or ${DEFAULT_ABI}
+get_ml_incdir() {
+	local dir=/usr/include
+
+	if [[ $# -gt 0 ]]; then
+		incdir=$1
+		shift
+	fi
+
+	if [[ -z "${MULTILIB_ABIS}" ]]; then
+		echo ${incdir}
+		return 0
+	fi
+
+	local abi=${ABI-${DEFAULT_ABI}}
+	if [[ $# -gt 0 ]]; then
+		abi=$1
+		shift
+	fi
+
+	if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
+		echo ${dir}/gentoo-multilib/${abi}
+	else
+		echo ${dir}
+	fi
+}
+
+# prep_ml_includes:
+#
+# Some includes (include/asm, glibc, etc) are ABI dependent.  In this case,
+# We can install them in different locations for each ABI and create a common
+# header which includes the right one based on CDEFINE_${ABI}.  If your
+# package installs ABI-specific headers, just add 'prep_ml_includes' to the
+# end of your src_install().  It takes a list of directories that include
+# files are installed in (default is /usr/include if none are passed).
+#
+# Example:
+# src_install() {
+#    ...
+#    prep_ml_includes /usr/qt/3/include
+# }
+
+prep_ml_includes() {
+	if [[ $(number_abis) -gt 1 ]] ; then
+		local dir
+		local dirs
+		local base
+
+		if [[ $# -eq 0 ]] ; then
+			dirs=/usr/include
+		else
+			dirs="$@"
+		fi
+
+		for dir in ${dirs} ; do
+			base=${T}/gentoo-multilib/${dir}/gentoo-multilib
+			mkdir -p "${base}"
+			[[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
+			mv "${D}/${dir}" "${base}/${ABI}"
+		done
+
+		if is_final_abi; then
+			base=${T}/gentoo-multilib
+			pushd "${base}"
+			find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
+			popd
+
+			# This 'set' stuff is required by mips profiles to properly pass
+			# CDEFINE's (which have spaces) to sub-functions
+			set --
+			for dir in ${dirs} ; do
+				set -- "$@" "${dir}"
+				local abi
+				for abi in $(get_install_abis); do
+					set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
+				done
+				create_ml_includes "$@"
+			done
+		fi
+	fi
+}
+
+# If you need more control than prep_ml_includes can offer (like linux-headers
+# for the asm-* dirs, then use create_ml_includes.  The firs argument is the
+# common dir.  The remaining args are of the form <symbol>:<dir> where
+# <symbol> is what is put in the #ifdef for choosing that dir.
+#
+# Ideas for this code came from debian's sparc-linux headers package.
+#
+# Example:
+# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
+# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
+create_ml_includes() {
+	local dest=$1
+	shift
+	local basedirs=$(create_ml_includes-listdirs "$@")
+
+	create_ml_includes-makedestdirs ${dest} ${basedirs}
+
+	local file
+	for file in $(create_ml_includes-allfiles ${basedirs}) ; do
+		#local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
+		(
+			echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
+
+			local dir
+			for dir in ${basedirs}; do
+				if [[ -f ${D}/${dir}/${file} ]] ; then
+					echo ""
+					local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
+					if [[ ${sym/=} != "${sym}" ]] ; then
+						echo "#if ${sym}"
+					elif [[ ${sym::1} == "!" ]] ; then
+						echo "#ifndef ${sym:1}"
+					else
+						echo "#ifdef ${sym}"
+					fi
+					echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
+					echo "#endif /* ${sym} */"
+				fi
+			done
+
+			#echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
+		) > "${D}/${dest}/${file}"
+	done
+}
+
+# Helper function for create_ml_includes
+create_ml_includes-absolute() {
+	local dst="$(create_ml_includes-tidy_path $1)"
+
+	dst=(${dst//\// })
+
+	local i
+	for ((i=0; i<${#dst[*]}; i++)); do
+		[ "${dst[i]}" == "include" ] && break
+	done
+
+	local strip_upto=$i
+
+	for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
+		echo -n ${dst[i]}/
+	done
+
+	echo -n ${dst[i]}
+}
+
+# Helper function for create_ml_includes
+create_ml_includes-tidy_path() {
+	local removed=$1
+
+	if [ -n "${removed}" ]; then
+		# Remove multiple slashes
+		while [ "${removed}" != "${removed/\/\//\/}" ]; do
+			removed=${removed/\/\//\/}
+		done
+
+		# Remove . directories
+		while [ "${removed}" != "${removed//\/.\//\/}" ]; do
+			removed=${removed//\/.\//\/}
+		done
+		[ "${removed##*/}" = "." ] && removed=${removed%/*}
+
+		# Removed .. directories
+		while [ "${removed}" != "${removed//\/..\/}" ]; do
+			local p1="${removed%%\/..\/*}"
+			local p2="${removed#*\/..\/}"
+
+			removed="${p1%\/*}/${p2}"
+		done
+
+		# Remove trailing ..
+		[ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
+
+		# Remove trailing /
+		[ "${removed##*/}" = "" ] && removed=${removed%/*}
+
+		echo ${removed}
+	fi
+}
+
+# Helper function for create_ml_includes
+create_ml_includes-listdirs() {
+	local dirs
+	local data
+	for data in "$@"; do
+		dirs="${dirs} ${data/*:/}"
+	done
+	echo ${dirs:1}
+}
+
+# Helper function for create_ml_includes
+create_ml_includes-makedestdirs() {
+	local dest=$1
+	shift
+	local basedirs=$@
+
+	dodir ${dest}
+
+	local basedir
+	for basedir in ${basedirs}; do
+		local dir
+		for dir in $(find ${D}/${basedir} -type d); do
+			dodir ${dest}/${dir/${D}\/${basedir}/}
+		done
+	done
+}
+
+# Helper function for create_ml_includes
+create_ml_includes-allfiles() {
+	local basedir file
+	for basedir in "$@" ; do
+		for file in $(find "${D}"/${basedir} -type f); do
+			echo ${file/${D}\/${basedir}\//}
+		done
+	done | sort | uniq
+}
+
+# Helper function for create_ml_includes
+create_ml_includes-sym_for_dir() {
+	local dir=$1
+	shift
+	local data
+	for data in "$@"; do
+		if [[ ${data} == *:${dir} ]] ; then
+			echo ${data/:*/}
+			return 0
+		fi
+	done
+	echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
+	# exit because we'll likely be called from a subshell
+	exit 1
+}
+
+get_libname() {
+	local libname
+	local ver=$1
+	case ${CHOST} in
+		*-darwin*) libname="dylib";;
+		*)         libname="so";;
+	esac
+
+	if [[ -z $@ ]] ; then
+		echo ".${libname}"
+	else
+		for ver in "$@" ; do
+			case ${CHOST} in
+				*-darwin*) echo ".${ver}.${libname}";;
+				*)         echo ".${libname}.${ver}";;
+			esac
+		done
+	fi
+}
+
+# This is for the toolchain to setup profile variables when pulling in
+# a crosscompiler (and thus they aren't set in the profile)
+multilib_env() {
+	local CTARGET=${1:-${CTARGET}}
+
+	case ${CTARGET} in
+		x86_64*)
+			export CFLAGS_x86=${CFLAGS_x86--m32}
+			export CHOST_x86=${CTARGET/x86_64/i686}
+			export CTARGET_x86=${CHOST_x86}
+			export CDEFINE_x86="__i386__"
+			export LIBDIR_x86="lib"
+
+			export CFLAGS_amd64=${CFLAGS_amd64--m64}
+			export CHOST_amd64=${CTARGET}
+			export CTARGET_amd64=${CTARGET_amd64}
+			export CDEFINE_amd64="__x86_64__"
+			export LIBDIR_amd64="lib64"
+
+			export MULTILIB_ABIS="amd64 x86"
+			export DEFAULT_ABI="amd64"
+		;;
+		mips64*)
+			export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+			export CHOST_o32=${CTARGET/mips64/mips}
+			export CTARGET_o32=${CHOST_o32}
+			export CDEFINE_o32="_MIPS_SIM == _ABIO32"
+			export LIBDIR_o32="lib"
+
+			export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+			export CHOST_n32=${CTARGET}
+			export CTARGET_n32=${CHOST_n32}
+			export CDEFINE_n32="_MIPS_SIM == _ABIN32"
+			export LIBDIR_n32="lib32"
+
+			export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+			export CHOST_n64=${CTARGET}
+			export CTARGET_n64=${CHOST_n64}
+			export CDEFINE_n64="_MIPS_SIM == _ABI64"
+			export LIBDIR_n64="lib64"
+
+			export MULTILIB_ABIS="n64 n32 o32"
+			export DEFAULT_ABI="n32"
+		;;
+		powerpc64*)
+			export CFLAGS_ppc=${CFLAGS_ppc--m32}
+			export CHOST_ppc=${CTARGET/powerpc64/powerpc}
+			export CTARGET_ppc=${CHOST_ppc}
+			export CDEFINE_ppc="!__powerpc64__"
+			export LIBDIR_ppc="lib"
+
+			export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+			export CHOST_ppc64=${CTARGET}
+			export CTARGET_ppc64=${CHOST_ppc64}
+			export CDEFINE_ppc64="__powerpc64__"
+			export LIBDIR_ppc64="lib64"
+
+			export MULTILIB_ABIS="ppc64 ppc"
+			export DEFAULT_ABI="ppc64"
+		;;
+		s390x*)
+			export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
+			export CHOST_s390=${CTARGET/s390x/s390}
+			export CTARGET_s390=${CHOST_s390}
+			export CDEFINE_s390="!__s390x__"
+			export LIBDIR_s390="lib"
+
+			export CFLAGS_s390x=${CFLAGS_s390x--m64}
+			export CHOST_s390x=${CTARGET}
+			export CTARGET_s390x=${CHOST_s390x}
+			export CDEFINE_s390x="__s390x__"
+			export LIBDIR_s390x="lib64"
+
+			export MULTILIB_ABIS="s390x s390"
+			export DEFAULT_ABI="s390x"
+		;;
+		sparc64*)
+			export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
+			export CHOST_sparc32=${CTARGET/sparc64/sparc}
+			export CTARGET_sparc32=${CHOST_sparc32}
+			export CDEFINE_sparc32="!__arch64__"
+			export LIBDIR_sparc32="lib"
+
+			export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+			export CHOST_sparc64=${CTARGET}
+			export CTARGET_sparc64=${CHOST_sparc64}
+			export CDEFINE_sparc64="__arch64__"
+			export LIBDIR_sparc64="lib64"
+
+			export MULTILIB_ABIS="sparc64 sparc32"
+			export DEFAULT_ABI="sparc64"
+		;;
+		*)
+			export MULTILIB_ABIS="default"
+			export DEFAULT_ABI="default"
+		;;
+	esac
+}
diff --git a/eclass/myth.eclass b/eclass/myth.eclass
index 57100d4bb2e8..3d65c1009129 100644
--- a/eclass/myth.eclass
+++ b/eclass/myth.eclass
@@ -1,36 +1,96 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/myth.eclass,v 1.1 2004/09/10 16:47:40 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/myth.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 #
 # Author: Daniel Ahlberg <aliz@gentoo.org>
 #
 
-ECLASS=myth
-INHERITED="${INHERITED} ${ECLASS}"
+#########################
+########################
+# DO NOT USE THIS FOR MYTHTV STUFF. Use mythtv-plugins.eclass
+#####################
+#####################
+
+inherit multilib versionator toolchain-funcs
+
+IUSE="nls debug"
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
+MYTHPLUGINS="mythbrowser mythdvd mythgallery mythgame mythmusic mythnews mythphone mythvideo mythweather mythweb"
+
+atleast_0.18() {
+	[[ $(get_version_component_range 1) > 0 || $(get_version_component_range 2) > 17 ]]
+}
+
+if atleast_0.18 && hasq ${PN} ${MYTHPLUGINS} ; then
+	S="${WORKDIR}/mythplugins-${PV}"
+fi
+
 myth_src_unpack() {
+	if atleast_0.18 && hasq ${PN} ${MYTHPLUGINS} ; then
+		pkg_pro="mythplugins.pro"
+	elif [ "${PN}" == "mythfrontend" ]; then
+		pkg_pro="mythtv.pro"
+	else
+		pkg_pro="${PN}.pro"
+	fi
+
 	unpack ${A} ; cd ${S}
 
-        if use debug ; then
+	sed -e "s:PREFIX = .*:PREFIX = /usr:" \
+		-e "s:QMAKE_CXXFLAGS_RELEASE = .*:QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}:" \
+		-e "s:QMAKE_CFLAGS_RELEASE = .*:QMAKE_CFLAGS_RELEASE = ${CFLAGS}:" \
+		-i 'settings.pro' || die "Initial setup failed"
+
+	if ! use nls ; then
+		sed -e "s:i18n::" \
+		    -i ${pkg_pro} || die "Disable i18n failed"
+	fi
+
+	if use debug ; then
 		FEATURES="${FEATURES} nostrip"
-                sed -e 's:#CONFIG += debug:CONFIG += debug:' \
-                        -e 's:CONFIG += release:#CONFIG += release:' \
-                        -i 'settings.pro' || die "enable debug failed"
+		sed -e 's:#CONFIG += debug:CONFIG += debug:' \
+			-e 's:CONFIG += release:#CONFIG += release:' \
+			-i 'settings.pro' || die "enable debug failed"
 	fi
 
 	setup_pro
+
+	find ${S} -name '*.pro' -exec sed -i \
+		-e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
+		-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
+		{} \;
 }
 
 myth_src_compile() {
-	qmake -o "Makefile" "${PN}.pro"
-	emake || die
+	export QMAKESPEC="linux-g++"
+
+	if atleast_0.18 ; then
+		if hasq ${PN} ${MYTHPLUGINS} ; then
+			for x in ${MYTHPLUGINS} ; do
+				if [[ ${PN} == ${x} ]] ; then
+					myconf="${myconf} --enable-${x}"
+				else
+					myconf="${myconf} --disable-${x}"
+				fi
+			done
+		fi
+
+		econf ${myconf}
+	fi
+
+	${QTDIR}/bin/qmake -o "Makefile" "${S}/${pkg_pro}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" "${@}" || die
 }
 
 myth_src_install() {
+	if atleast_0.18 && hasq ${PN} ${MYTHPLUGINS} ; then
+		cd ${S}/${PN}
+	fi
+
 	einstall INSTALL_ROOT="${D}"
-	for doc in "AUTHORS COPYING FAQ UPGRADING ChangeLog README"; do
+	for doc in AUTHORS COPYING FAQ UPGRADING ChangeLog README; do
 		test -e "${doc}" && dodoc ${doc}
 	done
 }
diff --git a/eclass/mythtv-plugins.eclass b/eclass/mythtv-plugins.eclass
index 2cd771e45049..fdedf842a2ab 100644
--- a/eclass/mythtv-plugins.eclass
+++ b/eclass/mythtv-plugins.eclass
@@ -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/eclass/mythtv-plugins.eclass,v 1.1 2005/05/20 02:39:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 #
 # Author: Doug Goldstein <cardoe@gentoo.org
 #
 
-ECLASS=mythtv-plugins
-INHERITED="${INHERITED} ${ECLASS} debug"
-IUSE="${IUSE} mmx"
+inherit multilib
+
+IUSE="debug mmx"
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 MYTHPLUGINS="mythbrowser mythdvd mythgallery mythgame mythmusic mythnews mythphone mythvideo mythweather mythweb"
@@ -19,30 +19,32 @@ DEPEND=">=sys-apps/sed-4"
 mythtv-plugins_src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	sed -e 's!PREFIX = /usr/local!PREFIX = /usr!' \
 	-i 'settings.pro' || die "fixing PREFIX to /usr failed"
-	
+
 	sed -e "s!QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer!QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}!" \
-	-i 'settings.pro' || die "ciarnam sucks"
-	#sed -e "/^QMAKE_CXXFLAGS_RELEASE/s!= .*!= ${CXXFLAGS}!" \
-	#-i 'settings.pro' || die "Fixing QMake's CXXFLAGS failed"
-	
+	-i 'settings.pro' || die "Fixing QMake's CXXFLAGS failed"
+
 	sed -e "s!QMAKE_CFLAGS_RELEASE = \$\${QMAKE_CXXFLAGS_RELEASE}!QMAKE_CFLAGS_RELEASE = ${CFLAGS}!" \
-	-i 'settings.pro' || die "ciaranm sucks"
-	#sed -e "/^QMAKE_CFLAGS_RELEASE/s!= .*!= ${CFLAGS}!"
-	#-i 'settings.pro' || die "Fixing Qmake's CFLAGS failed"
+	-i 'settings.pro' || die "Fixing Qmake's CFLAGS failed"
+
+	find ${S} -name '*.pro' -exec sed -i \
+		-e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
+		-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
+	{} \;
 }
 
 mythtv-plugins_src_compile() {
 	cd ${S}
-	
+
 	if use debug; then
 		sed -e 's!CONFIG += release!CONFIG += debug!' \
 		-i 'settings.pro' || die "switching to debug build failed"
 	fi
-	
-	if ( use x86 && ! use mmx ) || ! use amd64; then
+
+#	if ( use x86 && ! use mmx ) || ! use amd64 ; then
+	if ( ! use mmx ); then
 		sed -e 's!DEFINES += HAVE_MMX!DEFINES -= HAVE_MMX!' \
 		-i 'settings.pro' || die "disabling MMX failed"
 	fi
@@ -63,7 +65,7 @@ mythtv-plugins_src_compile() {
 
 	econf ${myconf} ${MTVCONF}
 
-	qmake -o "Makefile" mythplugins.pro || die "qmake failed to run"
+	${QTDIR}/bin/qmake -o "Makefile" mythplugins.pro || die "qmake failed to run"
 	emake || die "make failed to compile"
 }
 
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass
index 8bd233fe4a5d..9126987d8562 100644
--- a/eclass/nsplugins.eclass
+++ b/eclass/nsplugins.eclass
@@ -1,39 +1,47 @@
-# 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/eclass/nsplugins.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
+#
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.1 2002/11/20 15:09:29 azarah Exp $
+#
 # Just some re-usable functions for the netscape/moz plugins sharing
 
-ECLASS=nsplugins
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
 PLUGINS_DIR="nsbrowser/plugins"
 
 # This function move the plugin dir in src_install() to
-# ${D}/usr/lib/${PLUGIN_DIR}.  First argument should be
+# ${D}/usr/$(get_libdir)/${PLUGIN_DIR}.  First argument should be
 # the full path (without $D) to old plugin dir.
 src_mv_plugins() {
 
-	# Move plugins dir
-	dodir /usr/lib/${PLUGIN_DIR}
-	cp -a ${D}/$1/* ${D}/usr/lib/${PLUGIN_DIR}
+	# Move plugins dir.  We use keepdir so that it might not be unmerged
+	# by mistake ...
+	keepdir /usr/$(get_libdir)/${PLUGINS_DIR}
+	cp -a ${D}/$1/* ${D}/usr/$(get_libdir)/${PLUGINS_DIR}
 	rm -rf ${D}/$1
-	dosym ../${PLUGIN_DIR} $1
+	dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1
 }
 
-# This function move plugins in pkg_preinst() in old dir to 
-# ${ROOT}//usr/lib/${PLUGIN_DIR}.  First argument should be
-# the full path (without $D) to old plugin dir.
+# This function move plugins in pkg_preinst() in old dir to
+# ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}.  First argument should be
+# the full path (without $ROOT) to old plugin dir.
 pkg_mv_plugins() {
 
 	# Move old plugins dir
-	if [ -d ${ROOT}/usr/lib/mozilla/plugins ]
+	if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ]
 	then
-		mkdir -p ${ROOT}/usr/lib/${PLUGIN_DIR}
-		cp -a ${ROOT}/$1/* ${ROOT}/usr/lib/${PLUGIN_DIR}
+		mkdir -p ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
+		cp -a ${ROOT}/$1/* ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
 		rm -rf ${ROOT}/$1
 	fi
 }
 
+# This function installs a plugin with dosym to PLUGINS_DIR.
+# First argument should be the plugin file.
+inst_plugin() {
+	dodir /usr/$(get_libdir)/${PLUGINS_DIR}
+	dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}
+}
diff --git a/eclass/nxserver-1.3.2.eclass b/eclass/nxserver-1.3.2.eclass
index 3be40e4b79e1..6565dba9fbef 100644
--- a/eclass/nxserver-1.3.2.eclass
+++ b/eclass/nxserver-1.3.2.eclass
@@ -1,36 +1,37 @@
-# 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/eclass/nxserver-1.3.2.eclass,v 1.1.1.1 2005/11/30 09:59:29 chriswhite Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
 
-inherit rpm
+inherit rpm eutils
 
-ECLASS="nxserver"
-INHERITED="$INHERITED $ECLASS"
 
 HOMEPAGE="http://www.nomachine.com/"
 IUSE=""
 LICENSE="nomachine"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
+KEYWORDS="x86 -ppc -sparc -alpha -mips"
 RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
+DEPEND="$DEPEND
+	>=net-misc/nxclient-1.3.2"
+
 RDEPEND="$RDEPEND
-	     >=media-libs/jpeg-6b-r3
-         >=sys-libs/glibc-2.3.2-r1
-		 >=sys-libs/zlib-1.1.4-r1
-		 >=x11-base/xfree-4.3.0-r2
-		 >=net-misc/openssh-3.6.1_p2
-		 >=dev-lang/perl-5.8.0-r12"
+	>=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=net-misc/openssh-3.6.1_p2
+	>=dev-lang/perl-5.8.0-r12"
 
 DEPEND="$DEPEND
-        >=sys-apps/shadow-4.0.3-r6
-		>=net-misc/openssh-3.6.1_p2
-		>=net-misc/nxssh-1.3.2
-		>=net-misc/nxproxy-1.3.2"
+	>=sys-apps/shadow-4.0.3-r6
+	>=net-misc/openssh-3.6.1_p2
+	>=net-misc/nxssh-1.3.2
+	>=net-misc/nxproxy-1.3.2"
 
 S="${WORKDIR}"
 
@@ -101,10 +102,10 @@ nxserver_pkg_postinst() {
 
 	einfo "Adding user 'nx' for the NX server"
 	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/home/nx
-	
+
 	# we do this to move the home directory of older installs
 
-	einfo "Setting home directory of user 'nx' to /usr/NX/home"
+	einfo "Setting home directory of user 'nx' to /usr/NX/home/nx"
 	usermod -d /usr/NX/home/nx nx
 
 	einfo "Changing permissions for files under /usr/NX"
@@ -145,4 +146,7 @@ nxserver_pkg_postinst() {
 		ewarn "be found in /usr/NX/etc"
 		ewarn
 	fi
+
+	# regen the ld.so cache, because Portage sometimes doesn't
+	ldconfig -v > /dev/null
 }
diff --git a/eclass/nxserver-1.4.eclass b/eclass/nxserver-1.4.eclass
index bf14ce1138c9..89b3fcd9caeb 100644
--- a/eclass/nxserver-1.4.eclass
+++ b/eclass/nxserver-1.4.eclass
@@ -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/eclass/nxserver-1.4.eclass,v 1.1 2004/08/30 21:25:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -9,40 +9,38 @@
 
 inherit rpm eutils
 
-ECLASS="nxserver"
-INHERITED="$INHERITED $ECLASS"
 
 HOMEPAGE="http://www.nomachine.com/"
 IUSE=""
 LICENSE="nomachine"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips"
 RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
-DEPEND="$DEPEND
-		 >=net-misc/nxclient-1.3.2"
-
-RDEPEND="$RDEPEND
-	     >=media-libs/jpeg-6b-r3
-         >=sys-libs/glibc-2.3.2-r1
-		 >=sys-libs/zlib-1.1.4-r1
-		 virtual/x11
-		 >=net-misc/openssh-3.6.1_p2
-		 >=dev-lang/perl-5.8.0-r12"
-
-DEPEND="$DEPEND
-        >=sys-apps/shadow-4.0.3-r6
-		>=net-misc/openssh-3.6.1_p2
-		>=net-misc/nxssh-1.3.2
-		>=net-misc/nxproxy-1.3.2
-		net-misc/nx-x11"
+DEPEND=">=sys-apps/shadow-4.0.3-r6
+	>=net-misc/openssh-3.6.1_p2
+	=net-misc/nxssh-1.4*
+	=net-misc/nxproxy-1.4*
+	=net-misc/nxclient-1.4*
+	=net-misc/nx-x11-1.4*"
+
+RDEPEND=">=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=net-misc/openssh-3.6.1_p2
+	>=dev-lang/perl-5.8.0-r12"
 
 S="${WORKDIR}"
 
 DESCRIPTION="an X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
 
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst
+
+nxserver_pkg_setup() {
+	einfo "Adding user 'nx' for the NX server"
+	enewuser nx -1 /bin/false /usr/NX/home/nx
+}
 
 nxserver_src_compile() {
 	return;
@@ -60,11 +58,24 @@ nxserver_src_install() {
 		fi
 	done
 
+	# remove binaries installed by other packages
+	for x in nxagent nxdesktop nxpasswd nxviewer ; do
+		if [ -f usr/NX/bin/$x ]; then
+			rm -f usr/NX/bin/$x
+		fi
+	done
+
+	# remove libraries installed by other packages
+	for x in usr/NX/lib/*.so.* ; do
+		if [ -f $x ]; then
+			rm -f $x
+		fi
+	done
+
 	tar -cf - * | ( cd ${D} ; tar -xf - )
 
 	dodir /usr/NX/var
-	dodir /usr/NX/var/sessions
-	touch ${D}/usr/NX/var/sessions/NOT_EMPTY
+	keepdir /usr/NX/var/sessions
 
 	insinto /etc/env.d
 	doins ${FILESDIR}/1.3.0/50nxserver
@@ -91,9 +102,12 @@ nxserver_pkg_postinst() {
 
 	# end of upgrade support
 
-	einfo "Adding user 'nx' for the NX server"
-	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/home/nx
-	
+	# now that nxserver has been installed, we can change the shell
+	# of the nx user to be the correct one
+
+	echo "Setting nx's homedir to /usr/NX/bin/nxserver"
+	chsh -s /usr/NX/bin/nxserver nx
+
 	# we do this to move the home directory of older installs
 
 	einfo "Setting home directory of user 'nx' to /usr/NX/home/nx"
@@ -102,17 +116,19 @@ nxserver_pkg_postinst() {
 	einfo "Changing permissions for files under /usr/NX"
 	chown nx:root /usr/NX/etc/$l_szPasswd
 	chmod 0600 /usr/NX/etc/$l_szPasswd
-	chown -R nx:root /usr/NX/home/nx
-	chown -R nx:root /usr/NX/var
+	chown -R nx:root /usr/NX
+	chmod u+x /usr/NX/var/db/*
+	chmod 755 /usr/NX/etc
 
 	einfo "Generating SSH keys for the 'nx' user"
 	if [ ! -f /usr/NX/etc/users.id_dsa ]; then
 		ssh-keygen -q -t dsa -N '' -f /usr/NX/etc/users.id_dsa
 	fi
 	chown nx:root /usr/NX/etc/users.id_dsa
-	if [ -f /usr/NX/home/nx.ssh/server.id_dsa.pub.key ] ; then
-		cp -f /usr/NX/home/nx/.ssh/server.id_dsa.pub.key /usr/NX/home/nx/.ssh/authorized_keys2
-	fi
+
+	cp -f /usr/NX/home/nx/.ssh/server.id_dsa.pub.key /usr/NX/home/nx/.ssh/authorized_keys2
+	chown nx:root /usr/NX/home/nx/.ssh/authorized_keys2
+	chmod 0600 /usr/NX/home/nx/.ssh/authorized_keys2
 
 	if [ ! -f /usr/NX/var/broadcast.txt ]; then
 	    einfo "Creating NX user registration database"
@@ -130,6 +146,8 @@ nxserver_pkg_postinst() {
 		ewarn "If you don't have one already, you can get an evaluation"
 		ewarn "key, or purchase a full license, from www.nomachine.com"
 		ewarn
+		ewarn "The key.txt file must be chmod'd 0400 and must owned by"
+		ewarn "by the 'nx' user."
 	fi
 
 	if [ ! -f /usr/NX/etc/node.conf ] ; then
@@ -137,9 +155,8 @@ nxserver_pkg_postinst() {
 		ewarn "To complete the installation, you must create a file called"
 		ewarn "'/usr/NX/etc/node.conf'.  An example configuration file can"
 		ewarn "be found in /usr/NX/etc"
-		ewarn
 	fi
 
 	# regen the ld.so cache, because Portage sometimes doesn't
-	ldconfig -v > /dev/null
+	ldconfig -v > /dev/null 2>&1
 }
diff --git a/eclass/nxserver.eclass b/eclass/nxserver.eclass
index a96f354d30e9..4630b46a67ec 100644
--- a/eclass/nxserver.eclass
+++ b/eclass/nxserver.eclass
@@ -1,39 +1,35 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.1.1.1 2005/11/30 09:59:25 chriswhite Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
 
 inherit rpm
 
-ECLASS="nxserver"
-INHERITED="$INHERITED $ECLASS"
 
 HOMEPAGE="http://www.nomachine.com/"
 IUSE=""
 LICENSE="nomachine"
 SLOT="0"
-KEYWORDS="x86 -ppc-sparc -alpha -mips"
-RESTRICT="mirror fetch nostrip"
-
-MY_PV="${PV}-72"
+KEYWORDS="x86 -ppc -sparc -alpha -mips"
+RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
-RDEPEND="$RDEPEND
-	     >=media-libs/jpeg-6b-r3
-         >=sys-libs/glibc-2.3.2-r1
-		 >=sys-libs/zlib-1.1.4-r1
-		 >=x11-base/xfree-4.3.0-r2
-		 >=net-misc/openssh-3.6.1_p2
-		 >=dev-lang/perl-5.8.0-r12"
-
-DEPEND="$DEPEND
-        >=sys-apps/shadow-4.0.3-r6
-		>=net-misc/openssh-3.6.1_p2"
+RDEPEND=">=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=net-misc/openssh-3.6.1_p2
+	>=dev-lang/perl-5.8.0-r12"
+
+DEPEND=">=sys-apps/shadow-4.0.3-r6
+	>=net-misc/openssh-3.6.1_p2"
 
 S="${WORKDIR}"
 
+DESCRIPTION="an X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
+
 EXPORT_FUNCTIONS pkg_nofetch src_compile src_install pkg_postinst
 
 nxserver_pkg_nofetch () {
@@ -58,7 +54,15 @@ nxserver_src_compile() {
 nxserver_src_install() {
 	einfo "Installing"
 	find usr/NX/lib -type l -exec rm {} \;
-	mv usr/NX/etc/passwd.sample usr/NX/etc/passwd
+
+	# NX changed the name of the passwords sample file in 1.3.0
+
+	for x in passwd.sample passwords.sample ; do
+		if [ -f usr/NX/etc/$x ]; then
+			mv usr/NX/etc/$x usr/NX/etc/`basename $x .sample`
+		fi
+	done
+
 	tar -cf - * | ( cd ${D} ; tar -xf - )
 
 	dodir /usr/NX/var
@@ -66,23 +70,49 @@ nxserver_src_install() {
 	touch ${D}/usr/NX/var/sessions/NOT_EMPTY
 
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/50nxserver
-
-	fowners nx.root /usr/NX/etc/passwd
-	fperms 0600 /usr/NX/etc/passwd
-	fowners nx:root /usr/NX/nxhome
-	fowners nx:root /usr/NX/var/sessions
+	doins ${FILESDIR}/${PV}/50nxserver
 }
 
 nxserver_pkg_postinst() {
+
+	# this is support for users upgrading from NX 1.2.2 to 1.3.0
+
+	l_szPasswd=passwd
+
+	if [ -f /usr/NX/etc/passwd -a -f /usr/NX/etc/passwords ]; then
+		mv /usr/NX/etc/passwd /usr/NX/etc/passwords
+	fi
+	if [ -f /usr/NX/etc/passwords ]; then
+		l_szPasswd=passwords
+	fi
+
+	l_szHome=nxhome
+	if [ -d /usr/NX/home ]; then
+		l_szHome=home
+	fi
+
+	if [ -d /usr/NX/nxhome -a -d /usr/NX/home ]; then
+		einfo "Moving home directory of user 'nx' to /usr/NX/home"
+		usermod -d /usr/NX/home nx
+	fi
+
+	# end of upgrade support
+
 	einfo "Adding user 'nx' for the NX server"
-	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/nxhome
+	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/$l_szHome
+
+	einfo "Changing permissions for files under /usr/NX"
+	chown nx:root /usr/NX/etc/$l_szPasswd
+	chmod 0600 /usr/NX/etc/$l_szPasswd
+	chown -R nx:root /usr/NX/$l_szHome
+	chown -R nx:root /usr/NX/var
 
 	einfo "Generating SSH keys for the 'nx' user"
 	if [ ! -f /usr/NX/etc/users.id_dsa ]; then
-		ssh-keygen -q -t dsa -N '' -f /usr/NX/nxhome/.ssh/users.id_dsa
+		ssh-keygen -q -t dsa -N '' -f /usr/NX/etc/users.id_dsa
 	fi
-	cp -f /usr/NX/nxhome/.ssh/server.id_dsa.pub.key /usr/NX/nxhome/.ssh/authorized_keys2
+	chown nx:root /usr/NX/etc/users.id_dsa
+	cp -f /usr/NX/$l_szHome/.ssh/server.id_dsa.pub.key /usr/NX/$l_szHome/.ssh/authorized_keys2
 
 	if [ ! -f /usr/NX/var/broadcast.txt ]; then
 	    einfo "Creating NX user registration database"
diff --git a/eclass/pam.eclass b/eclass/pam.eclass
index 06ba26194d62..f92c1970896d 100644
--- a/eclass/pam.eclass
+++ b/eclass/pam.eclass
@@ -1,14 +1,12 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Diego Pettenò <flameeyes@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.1 2005/05/20 11:58:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.1.1.1 2005/11/30 09:59:31 chriswhite Exp $
 #
 # This eclass contains functions to install pamd configuration files and
 # pam modules.
 
 inherit multilib
-ECLASS="pam"
-INHERITED="$INHERITED $ECLASS"
 
 # dopamd <file> [more files]
 #
@@ -20,8 +18,10 @@ dopamd() {
 		return 0;
 	fi
 
-	insinto /etc/pam.d
+	INSDESTTREE=/etc/pam.d \
+	INSOPTIONS="-m 0644" \
 	doins "$@" || die "failed to install $@"
+	cleanpamd "$@"
 }
 
 # newpamd <old name> <new name>
@@ -34,8 +34,10 @@ newpamd() {
 		return 0;
 	fi
 
-	insinto /etc/pam.d
+	INSDESTTREE=/etc/pam.d \
+	INSOPTIONS="-m 0644" \
 	newins "$1" "$2" || die "failed to install $1 as $2"
+	cleanpamd $2
 }
 
 # dopamsecurity <section> <file> [more files]
@@ -48,9 +50,9 @@ dopamsecurity() {
 		return 0;
 	fi
 
-	insinto /etc/security/$1
-	shift
-	doins "$@" || die "failed to install $@"
+	INSDESTTREE=/etc/security/$1 \
+	INSOPTIONS="-m 0644" \
+	doins "${@:2}" || die "failed to install ${@:2}"
 }
 
 # newpamsecurity <section> <old name> <new name>
@@ -63,7 +65,8 @@ newpamsecurity() {
 		return 0;
 	fi
 
-	insinto /etc/security/$1
+	INSDESTTREE=/etc/security/$1 \
+	INSOPTIONS="-m 0644" \
 	newins "$2" "$3" || die "failed to install $2 as $3"
 }
 
@@ -71,10 +74,11 @@ newpamsecurity() {
 #
 # Returns the pam modules' directory for current implementation
 getpam_mod_dir() {
-	if has_version sys-libs/pam; then
+	if has_version sys-libs/pam || has_version sys-libs/openpam; then
 		PAM_MOD_DIR=/$(get_libdir)/security
-	elif has_version sys-libs/openpam; then
-		PAM_MOD_DIR=/usr/$(get_libdir)
+	elif use ppc-macos; then
+		# OSX looks there for pam modules
+		PAM_MOD_DIR=/usr/lib/pam
 	else
 		# Unable to find PAM implementation... defaulting
 		PAM_MOD_DIR=/$(get_libdir)/security
@@ -127,18 +131,36 @@ pamd_mimic_system() {
 	pamdfile=${D}/etc/pam.d/$1
 	echo -e "# File autogenerated by pamd_mimic_system in pam eclass\n\n" >> \
 		$pamdfile
-	
+
 	authlevels="auth account password session"
 
+	if has_version '<sys-libs/pam-0.78'; then
+		mimic="\trequired\t\tpam_stack.so service=system-auth"
+	else
+		mimic="\tinclude\t\tsystem-auth"
+	fi
+
 	shift
 
 	while [[ -n $1 ]]; do
 		hasq $1 ${authlevels} || die "unknown level type"
 
-		echo -e "$1\tinclude\t\tsystem-auth" >> ${pamdfile}
+		echo -e "$1${mimic}" >> ${pamdfile}
 
 		shift
 	done
+}
+
+# cleanpamd <pamd file>
+#
+# Cleans a pam.d file from modules that might not be present on the system
+# where it's going to be installed
+cleanpamd() {
+	while [[ -n $1 ]]; do
+		if ! has_version sys-libs/pam; then
+			sed -i -e '/pam_shells\|pam_console/s:^:#:' ${D}/etc/pam.d/$1
+		fi
 
-	return 1
+		shift
+	done
 }
diff --git a/eclass/pcmcia.eclass b/eclass/pcmcia.eclass
index 85fefa656147..7738a3c18b76 100644
--- a/eclass/pcmcia.eclass
+++ b/eclass/pcmcia.eclass
@@ -1,8 +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/eclass/pcmcia.eclass,v 1.1 2004/02/07 21:22:49 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 
-# pcmcia.eclass - This eclass facilities writing ebuilds for driver packages 
+# pcmcia.eclass - This eclass facilities writing ebuilds for driver packages
 # that may need to build against the pcmcia-cs drivers, depending on kernel
 # support, pcmcia-cs version installed, etc.
 
@@ -16,16 +16,15 @@
 # if this information is needed. These will be blank if kernel PCMCIA support
 # is detected.
 
-# Functions - pcmcia_src_unpack unpacks and patches as needed the pcmcia-cs 
+# Functions - pcmcia_src_unpack unpacks and patches as needed the pcmcia-cs
 # sources in ${WORKDIR}/${PCMCIA_SOURCE_DIR} and set the two variables.
 
 # pcmcia_configure will configure the pcmcia-cs sources if that is needed
 
-ECLASS="pcmcia"
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
 
 DESCRIPTION="eclass for drivers that may build against pcmcia-cs"
-IUSE="${IUSE} pcmcia"
+IUSE="pcmcia"
 
 # Be VERY careful when pumping the PCMCIA_BASE_VERSION. May require remaking some patches, etc
 # Ugly, but portage doesn't like more dynamics SRC_URIs.
@@ -44,15 +43,16 @@ SRC_URI="pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_BASE_VERSION}.tar.gz
 # kernel's, but it's here to remind me in case it does become an issue
 #ppc? ( http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_BASE_VERSION}-ppc-fix.diff.gz ) )
 
-newdepend "pcmcia?	( >=sys-apps/${PCMCIA_BASE_VERSION} )"
+DEPEND="pcmcia? ( >=sys-apps/${PCMCIA_BASE_VERSION} )"
 
-PCMCIA_SOURCE_DIR="${WORKDIR}/${PCMCIA_BASE_VERSION}"
+pcmcia_src_unpack() {
+	# So while the two eclasses exist side-by-side and also the ebuilds inherit
+	# both we need to check for PCMCIA_SOURCE_DIR, and if we find it, then we
+	# bail out and assume pcmcia.eclass is working on it.
+	[[ -n ${PCMCIA_SOURCE_DIR} ]] && return 1
 
-pcmcia_src_unpack()
-{
 	cd ${WORKDIR}
-
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia ; then
 		if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null
 		then
 			# Sadly, we still need to download these sources in SRC_URI
@@ -61,6 +61,8 @@ pcmcia_src_unpack()
 			PCMCIA_VERSION=""
 			PCMCIA_SOURCE_DIR=""
 		else
+			PCMCIA_SOURCE_DIR="${WORKDIR}/${PCMCIA_BASE_VERSION}"
+
 			# We unpack the base version, figure out what is installed, then
 			# patch up to that version. Ugly hack to avoid messy SRC_URIs
 			unpack ${PCMCIA_BASE_VERSION}.tar.gz
@@ -94,10 +96,10 @@ pcmcia_src_unpack()
 # Call this if you need the package configured for building to work
 pcmcia_configure()
 {
-	cd ${PCMCIA_SOURCE_DIR}
-	if [ -n "`use pcmcia`" ]; then
+	if use pcmcia ; then
 		if ! egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null
 		then
+			cd ${PCMCIA_SOURCE_DIR}
 			local myarch
 
 			# pcmcia-cs expects "i386" not "x86"
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index efb84d68cb6d..fcc7a88f9dd2 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,61 +1,285 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.1.1.1 2005/11/30 09:59:31 chriswhite Exp $
+#
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.1 2002/05/05 02:58:39 seemant Exp $
+# Maintained by the Perl herd <perl@gentoo.org>
+#
 # The perl-module eclass is designed to allow easier installation of perl
 # modules, and their incorporation into the Gentoo Linux system.
-ECLASS=base
-EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_prerm
 
-newdepend ">=sys-devel/perl-5"
-POD_DIR=/usr/share/perl/gentoo-pods
 
-base_src_compile() {
-	perl Makefile.PL ${myconf}
-	make || die
+EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst pkg_prerm pkg_postrm \
+	src_compile src_install src_test
+
+# 2005.04.28 mcummings
+# Mounting problems with src_test functions has forced me to make the
+# compilation of perl modules honor the FEATURES maketest flag rather than what
+# is generally necessary. I've left a block to make sure we still need to set
+# the SRC_TEST="do" flag on the suspicion that otherwise we will face 10 times
+# as many bug reports as we have lately.
+
+# 2004.05.10 rac
+# block on makemaker versions earlier than that in the 5.8.2 core. in
+# actuality, this should be handled in the perl ebuild, so every perl
+# ebuild should block versions of MakeMaker older than the one it
+# carries. in the meantime, since we have dumped support for MakeMaker
+# <6.11 and the associated broken DESTDIR handling, block here to save
+# people from sandbox trouble.
+#
+# 2004.05.25 rac
+# for the same reasons, make the perl dep >=5.8.2 to get everybody
+# with 5.8.0 and its 6.03 makemaker up to a version that can
+# understand DESTDIR
+#
+# 2004.10.01 mcummings
+# noticed a discrepancy in how we were sed fixing references to ${D}
+#
+# 2005.03.14 mcummings
+# Updated eclass to include a specific function for dealing with perlocal.pods -
+# this should avoid the conflicts we've been running into with the introduction
+# of file collision features by giving us a single exportable function to deal
+# with the pods. Modifications to the eclass provided by Yaakov S
+# <yselkowitz@hotmail.com> in bug 83622
+#
+# <later the same day>
+# The long awaited (by me) fix for automagically detecting and dealing
+# with module-build dependancies. I've chosen not to make it a default dep since
+# this adds overhead to people that might not otherwise need it, and instead
+# modified the eclass to detect the existence of a Build.PL and behave
+# accordingly. This will fix issues with g-cpan builds that needs module-build
+# support, as well as get rid of the (annoying) style=builder vars. I know of
+# only one module that needed to be hacked for this, Class-MethodMaker-2.05, but
+# that module has a bad Build.PL to begin with. Ebuilds should continue to
+# DEPEND on module-build<-version> as needed, but there should be no need for
+# the style directive any more (especially since it isn't in the eclass
+# anymore). Enjoy!
+#
+# 2005.07.18 mcummings
+# Fix for proper handling of $mydoc - thanks to stkn for noticing we were
+# bombing out there
+#
+# 2005.07.19 mcummings
+# Providing an override var for the use of Module::Build. While it is being
+# incorporated in more and more modules, not module authors have working
+# Build.PL's in place. The override is to allow for a fallback to the "classic"
+# Makfile.PL - example is Class::MethodMaker, which provides a Build.PL that is
+# severely broken.
+
+
+
+DEPEND=">=dev-lang/perl-5.8.2 !<perl-core/ExtUtils-MakeMaker-6.17"
+RDEPEND="${DEPEND}"
+SRC_PREP="no"
+SRC_TEST="skip"
+USE_BUILDER="yes"
+
+PERL_VERSION=""
+SITE_ARCH=""
+SITE_LIB=""
+VENDOR_LIB=""
+VENDOR_ARCH=""
+ARCH_LIB=""
+POD_DIR=""
+BUILDER_VER=""
+
+perl-module_src_prep() {
+
+	perlinfo
+
+	export PERL_MM_USE_DEFAULT=1
+
+
+	SRC_PREP="yes"
+	if [ -f ${S}/Build.PL ] && [ "${USE_BUILDER}" == "yes" ]; then
+		einfo "Using Module::Build"
+		if [ -z ${BUILDER_VER} ]; then
+			eerror
+			eerror "Please post a bug on http://bugs.gentoo.org assigned to"
+			eerror "perl@gentoo.org - ${P} was added without a dependancy"
+			eerror "on dev-perl/module-build"
+			eerror "${BUILDER_VER}"
+			eerror
+			die
+		else
+			perl ${S}/Build.PL installdirs=vendor destdir=${D}
+		fi
+	else
+		einfo "Using ExtUtils::MakeMaker"
+		perl Makefile.PL ${myconf} \
+		PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}
+	fi
 }
 
-base_src_install() {
-	
-	dodir ${POD_DIR}
-	
-	make \
-		PREFIX=${D}/usr \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLMAN2DIR=${D}/usr/share/man/man2 \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		INSTALLMAN4DIR=${D}/usr/share/man/man4 \
-		INSTALLMAN5DIR=${D}/usr/share/man/man5 \
-		INSTALLMAN6DIR=${D}/usr/share/man/man6 \
-		INSTALLMAN7DIR=${D}/usr/share/man/man7 \
-		INSTALLMAN8DIR=${D}/usr/share/man/man8 \
-		install || die
+perl-module_src_compile() {
 
-	eval `perl '-V:installarchlib'`
-	sed -e "s:${D}::g" \
-		${D}/${installarchlib}/perllocal.pod \
-			> ${D}/${POD_DIR}/${P}
-	
-	rm -f ${D}/${installarchlib}/perllocal.pod
+	perlinfo
+	[ "${SRC_PREP}" != "yes" ] && perl-module_src_prep
+	if [ -z ${BUILDER_VER} ]; then
+		make ${mymake} || die "compilation failed"
+	else
+		perl ${S}/Build build
+	fi
+
+}
+
+perl-module_src_test() {
+	if [ "${SRC_TEST}" == "do" ]; then
+		perlinfo
+		if [ -z ${BUILDER_VER} ]; then
+			make test || die "test failed"
+		else
+			perl ${S}/Build  test || die "test failed"
+		fi
+	fi
+}
+
+perl-module_src_install() {
+
+	perlinfo
+
+	test -z ${mytargets} && mytargets="install"
+
+	if [ -z ${BUILDER_VER} ]; then
+		make ${myinst} ${mytargets} || die
+	else
+		perl ${S}/Build install
+	fi
+
+	fixlocalpod
+
+	for FILE in `find ${D} -type f |grep -v '.so'`; do
+		STAT=`file $FILE| grep -i " text"`
+		if [ "${STAT}x" != "x" ]; then
+			sed -i -e "s:${D}:/:g" ${FILE}
+		fi
+	done
+
+	for doc in Change* MANIFEST* README* ${mydoc}; do
+		[ -s "$doc" ] && dodoc $doc
+	done
+}
 
-	dodoc ChangeLog MANIFEST NOTES README VERSIONS WARNING ToDo
+
+perl-module_pkg_setup() {
+
+	perlinfo
 }
 
 
-base_pkg_postinst() {
-	
-	base_doperlmod
+perl-module_pkg_preinst() {
 
+	perlinfo
 }
 
-base_pkg_postrm() {
-	
-	base_doperlpod
+perl-module_pkg_postinst() {
+
+	updatepod
 }
 
-base_doperlpod() {
-	
+perl-module_pkg_prerm() {
+
+	updatepod
+}
+
+perl-module_pkg_postrm() {
+
+	updatepod
+}
+
+perlinfo() {
+
+	local version
+	eval `perl '-V:version'`
+	PERL_VERSION=${version}
+
+	local installsitearch
+	eval `perl '-V:installsitearch'`
+	SITE_ARCH=${installsitearch}
+
+	local installsitelib
+	eval `perl '-V:installsitelib'`
+	SITE_LIB=${installsitelib}
+
+	local installarchlib
 	eval `perl '-V:installarchlib'`
-	cat ${POD_DIR}/mod-* >> ${installarchlib}/perllocal.pod
+	ARCH_LIB=${installarchlib}
+
+	local installvendorlib
+	eval `perl '-V:installvendorlib'`
+	VENDOR_LIB=${installvendorlib}
+
+	local installvendorarch
+	eval `perl '-V:installvendorarch'`
+	VENDOR_ARCH=${installvendorarch}
+
+	if [ "${USE_BUILDER}" == "yes" ]; then
+		if [ -f ${S}/Build.PL ]; then
+			if [ ${PN} == "module-build" ]; then
+				BUILDER_VER="1" # A bootstrapping if you will
+			else
+				BUILDER_VER=`perl -MModule::Build -e 'print "$Module::Build::VERSION;"' `
+			fi
+		fi
+	fi
+
+	if [ -f /usr/bin/perl ]
+	then
+		POD_DIR="/usr/share/perl/gentoo-pods/${version}"
+	fi
+}
+
+fixlocalpod() {
+	perlinfo
+	dodir ${POD_DIR}
+
+	if [ -f ${D}${ARCH_LIB}/perllocal.pod ];
+	then
+		touch ${D}/${POD_DIR}/${P}.pod
+		sed -e "s:${D}::g" \
+			${D}${ARCH_LIB}/perllocal.pod >> ${D}/${POD_DIR}/${P}.pod
+		touch ${D}/${POD_DIR}/${P}.pod.arch
+		cat ${D}/${POD_DIR}/${P}.pod >>${D}/${POD_DIR}/${P}.pod.arch
+		rm -f ${D}/${ARCH_LIB}/perllocal.pod
+	fi
+
+	if [ -f ${D}${SITE_LIB}/perllocal.pod ];
+	then
+		touch ${D}/${POD_DIR}/${P}.pod
+		sed -e "s:${D}::g" \
+			${D}${SITE_LIB}/perllocal.pod >> ${D}/${POD_DIR}/${P}.pod
+		touch ${D}/${POD_DIR}/${P}.pod.site
+		cat ${D}/${POD_DIR}/${P}.pod >>${D}/${POD_DIR}/${P}.pod.site
+		rm -f ${D}/${SITE_LIB}/perllocal.pod
+	fi
+
+	if [ -f ${D}${VENDOR_LIB}/perllocal.pod ];
+	then
+		touch ${D}/${POD_DIR}/${P}.pod
+		sed -e "s:${D}::g" \
+			${D}${VENDOR_LIB}/perllocal.pod >> ${D}/${POD_DIR}/${P}.pod
+		touch ${D}/${POD_DIR}/${P}.pod.vendor
+		cat ${D}/${POD_DIR}/${P}.pod >>${D}/${POD_DIR}/${P}.pod.vendor
+		rm -f ${D}/${VENDOR_LIB}/perllocal.pod
+	fi
+}
+
+updatepod() {
+	perlinfo
 
+	if [ -d "${POD_DIR}" ]
+	then
+		for FILE in `find ${POD_DIR} -type f -name "*.pod.arch"`; do
+		   cat ${FILE} >> ${ARCH_LIB}/perllocal.pod
+		   rm -f ${FILE}
+		done
+		for FILE in `find ${POD_DIR} -type f -name "*.pod.site"`; do
+		   cat ${FILE} >> ${SITE_LIB}/perllocal.pod
+		   rm -f ${FILE}
+		done
+		for FILE in `find ${POD_DIR} -type f -name "*.pod.vendor"`; do
+		   cat ${FILE} >> ${VENDOR_LIB}/perllocal.pod
+		   rm -f ${FILE}
+		done
+	fi
 }
diff --git a/eclass/perl-post.eclass b/eclass/perl-post.eclass
index e1a3871486c3..37fa6deda80c 100644
--- a/eclass/perl-post.eclass
+++ b/eclass/perl-post.eclass
@@ -1,43 +1,11 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-post.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
+#
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-post.eclass,v 1.1 2002/05/05 07:00:38 seemant Exp $
-# The perl-post eclass is designed to allow the ${installarchdir}/perllocal.pod
-# file to be updated cleanly after perl and/or perl-modules are installed
-# or removed.
-ECLASS=perl
-EXPORT_FUNCTIONS pkg_postinst pkg_postrm
+# Maintained by the Perl herd <perl@gentoo.org>
+#
+# The perl-module eclass is designed to allow easier installation of perl
+# modules, and their incorporation into the Gentoo Linux system.
 
-TMP_VERSION=`perl '-V:version'`
-POD_DIR="/usr/share/${version}/gentoo-pods"
-
-
-perl_pkg_postinst() {
-
-	eval `perl '-V:installarchlib'`
-	if [ -d "${POD_DIR}" ]
-	then
-		for i in `ls ${POD_DIR}`
-		do
-			if [ -f "${i}" ]
-			then
-				cat ${i} > ${installarchlib}/perllocal.pod
-			fi
-		done
-	fi
-}
-
-perl_pkg_postrm() {
-
-	eval `perl '-V:installarchlib'`
-	if [ -d "${POD_DIR}" ]
-	then
-		for i in ${POD_DIR}/*.pod
-		do
-			if [ -f "${i}" ] 
-			then
-				cat ${i} > ${installarchlib}/perllocal.pod
-			fi
-		done
-	fi
-}
+inherit perl-module
diff --git a/eclass/php-2.eclass b/eclass/php-2.eclass
index fc25a851dfb5..ae69b3b3729b 100644
--- a/eclass/php-2.eclass
+++ b/eclass/php-2.eclass
@@ -1,27 +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/eclass/php-2.eclass,v 1.1 2003/11/16 12:21:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
-# This EBUILD is totally masked presently. Use it at your own risk.  I know it
-# is severely broken, but I needed to get a copy into CVS to pass around and
-# repoman was complaining at me too much
-
-# TODO LIST
-# * Finish install cleanup
-# * USE flags
-#sys-libs/ncurses
-#--with-ncurses
+# This eclass is the old style of php, that was used before php-core was
+# introduced.
 
 inherit eutils flag-o-matic
 
-ECLASS=php
-INHERITED="$INHERITED $ECLASS"
-
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_preinst
 
-function runningunstable() { has ~${ARCH} ${ACCEPT_KEYWORDS} > /dev/null ; }
-
 [ -z "${MY_PN}" ] && MY_PN=php
 if [ -z "${MY_PV}" ]; then
 	MY_PV=${PV/_rc/RC}
@@ -53,10 +41,10 @@ IUSE="${IUSE} X crypt curl firebird flash freetds gd gd-external gdbm imap infor
 # we need db-1.* for ndbm
 # and then either of db3 or db4
 IUSE="${IUSE} berkdb"
-RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1.* 
-							  || ( >=sys-libs/db-4.0.14-r2 
+RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1.*
+							  || ( >=sys-libs/db-4.0.14-r2
 								   >=sys-libs/db-3.2.9-r9
-							     ) 
+							     )
 							)"
 
 # Everything is in this list is dynamically linked agaist or needed at runtime
@@ -66,21 +54,21 @@ RDEPEND="
    app-arch/bzip2
    X? ( virtual/x11 )
    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-   curl? ( >=net-ftp/curl-7.10.2 )
-   firebird? ( >=dev-db/firebird-1.0 )
+   curl? ( >=net-misc/curl-7.10.2 )
+   x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
    freetds? ( >=dev-db/freetds-0.53 )
-   gd-external? ( media-libs/libgd >=media-libs/jpeg-6b 
+   gd-external? ( media-libs/gd >=media-libs/jpeg-6b
                   >=media-libs/libpng-1.2.5 )
    gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 )
    gdbm? ( >=sys-libs/gdbm-1.8.0 )
-   java? ( =virtual/jdk-1.4* dev-java/java-config )
+   !alpha? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) )
    jpeg? ( >=media-libs/jpeg-6b )
    ldap? ( >=net-nds/openldap-1.2.11 )
    mysql? ( >=dev-db/mysql-3.23.26 )
    nls? ( sys-devel/gettext )
    odbc? ( >=dev-db/unixODBC-1.8.13 )
    pam? ( >=sys-libs/pam-0.75 )
-   pdflib? ( >=media-libs/pdflib-4.0.3 >=media-libs/jpeg-6b 
+   pdflib? ( >=media-libs/pdflib-4.0.3 >=media-libs/jpeg-6b
              >=media-libs/libpng-1.2.5 >=media-libs/tiff-3.5.5 )
    png? ( >=media-libs/libpng-1.2.5 )
    postgres? ( >=dev-db/postgresql-7.1 )
@@ -90,17 +78,17 @@ RDEPEND="
    ssl? ( >=dev-libs/openssl-0.9.5 )
    tiff? ( >=media-libs/tiff-3.5.5 )
    xml2? ( dev-libs/libxml2 >=dev-libs/libxslt-1.0.30 )
-   truetype? ( =media-libs/freetype-2* =media-libs/freetype-1* 
+   truetype? ( =media-libs/freetype-2* =media-libs/freetype-1*
                media-libs/t1lib )
    >=net-libs/libwww-5.3.2
    >=app-text/sablotron-0.97
    dev-libs/expat
-   sys-libs/zlib 
+   sys-libs/zlib
    virtual/mta"
 
 # libswf is ONLY available on x86
-RDEPEND="${RDEPEND} flash? ( 
-		x86? ( media-libs/libswf ) 
+RDEPEND="${RDEPEND} flash? (
+		x86? ( media-libs/libswf )
 		>=media-libs/ming-0.2a )"
 
 #The new XML extension in PHP5 requires libxml2-2.5.10
@@ -118,22 +106,12 @@ DEPEND="${DEPEND} !dev-libs/9libs"
 DEPEND="${DEPEND} !dev-libs/libiconv"
 
 #Waiting for somebody to want this:
-#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev ) 
+#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev )
 
 #export this here so we can use it
 myconf="${myconf}"
 
-# These are the standard targets that we want to for the install stage since we
-# can't do the full 'make install' You may need to add your own items here for
-# SAPIs etc.
 PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules install-programs"
-# provided by php-core:
-# install-pear install-build install-headers install-programs
-# for use by other ebuilds:
-# install-cli install-sapi install-modules install-programs
-#
-# all ebuilds should have install-programs, and then delete everything except
-# php-config.${PN}
 
 # These are quick fixups for older ebuilds that didn't have PHPSAPI defined.
 [ -z "${PHPSAPI}" ] && [ "${PN}" = "php" ] && PHPSAPI="cli"
@@ -151,363 +129,21 @@ fi
 PHPINIDIRECTORY="/etc/php/${PHPSAPI}-php${PHPMAJORVER}"
 PHPINIFILENAME="php.ini"
 
-php_check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-
-	# stuart@gentoo.org - 2003/05/18
-	# Kaffe JVM is not a drop-in replacement for the Sun JDK at this time
-
-	if echo $JDKHOME | grep kaffe > /dev/null 2>&1 ; then
-		eerror
-		eerror "PHP will not build using the Kaffe Java Virtual Machine."
-		eerror "Please change your JVM to either Blackdown or Sun's."
-		eerror 
-		eerror "To build PHP without Java support, please re-run this emerge"
-		eerror "and place the line:"
-		eerror "  USE='-java'"
-		eerror "in front of your emerge command; e.g."
-		eerror "  USE='-java' emerge mod_php"
-		eerror
-		eerror "or edit your USE flags in /etc/make.conf"
-		die
-	fi
-
-	JDKVER="$(java-config --java-version 2>&1 | head -n1 | cut -d\" -f2)"
-	einfo "JDK version: ${JDKVER}"
-	if [ -n "${JDKVER/1.4.*}" -o -z "${JDKVER}" ]; then
-		eerror "Please ensure that you have a JDK with a version of at least"
-		eerror "1.4 selected using java-config"
-		die
-	fi
-}
-
 php_src_unpack() {
-	use xml || \
-	( ewarn "You have the xml USE flag turned off. Previously this"
-	  ewarn "disabled XML support in PHP. However PEAR has a hard"
-	  ewarn "dependancy on it, so they are now enabled." )
-
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-
-	# Configure Patch for hard-wired uname -a
-	sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" -i configure
-	# ensure correct perms on configure
-	chmod 755 configure
-
-	# fix PEAR installer for our packaging
-	# we keep a backup of it as we need it at the end of the install
-	cp pear/PEAR/Registry.php pear/PEAR/Registry.old
-	sed -e "s:\$pear_install_dir\.:\'${D}/usr/lib/php/\' . :g" -i pear/PEAR/Registry.old 
+	die "This eclass must NOT be used."
 }
-
-
 php_src_compile() {
-	[ -x "/usr/sbin/sendmail" ] || die "You need a virtual/mta that provides /usr/sbin/sendmail!"
-
-	[ -f "/proc/self/stat" ] || die "You need /proc mounted for configure to complete correctly!"
-
-	use java && php_check_java_config
-
-	if use berkdb; then
-		einfo "Enabling NBDM"
-		myconf="${myconf} --with-ndbm=/usr"
-	 	#Hack to use db4
-	 	if has_version '=sys-libs/db-4*' && grep -q -- '--with-db4' configure; then
-	 		einfo "Enabling DB4"
-	 		myconf="${myconf} --with-db4=/usr"
-		elif has_version '=sys-libs/db-3*' && grep -q -- '--with-db3' configure; then
-	 		einfo "Enabling DB3"
-	 		myconf="${myconf} --with-db3=/usr"
-		else
-			einfo "Enabling DB2"
-			myconf="${myconf} --with-db2=/usr"
-	 	fi
-	else
-		einfo "Skipping DB2, DB3, DB4, NDBM support"
-		myconf="${myconf} --without-db3 --without-db4 --without-db2 --without-ndbm"
-	fi
-
-	use crypt && myconf="${myconf} --with-mcrypt=/usr --with-mhash=/usr"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
-	use flash && myconf="${myconf} --with-ming=/usr"
-	use flash && use x86 && myconf="${myconf} --with-swf=/usr"
-	use freetds && myconf="${myconf} --with-sybase=/usr"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	use informix && [ -n "${INFORMIXDIR}" ] && myconf="${myconf} --with-informix=${INFORMIXDIR}"
-	use java && myconf="${myconf} --with-java=${JAVA_HOME}"
-	use mcal && myconf="${myconf} --with-mcal=/usr"
-	use oci8 && [ -n "${ORACLE_HOME}" ] && myconf="${myconf} --with-oci8=${ORACLE_HOME}"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use postgres && myconf="${myconf} --with-pgsql=/usr" || myconf="${myconf} --without-pgsql"
-	use snmp && myconf="${myconf} --with-snmp=/usr --enable-ucd-snmp-hack"
-	use X && myconf="${myconf} --with-xpm-dir=/usr/X11R6" LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib"
-	
-	# This chunk is intended for png/tiff/jpg, as there are several things that need them, indepentandly!
-	REQUIREPNG=
-	REQUIREJPG=
-	REQUIRETIFF=
-	if use pdflib; then
-		myconf="${myconf} --with-pdflib=/usr" 
-		REQUIREPNG=1 REQUIREJPG=1 REQUIRETIFF=1
-	fi
-	if use gd-external; then
-		myconf="${myconf} --with-gd=/usr"
-		REQUIREPNG=1
-	elif use gd; then
-		myconf="${myconf} --with-gd"
-		myconf="${myconf} `use_enable truetype gd-native-ttf`" 
-		REQUIREPNG=1 REQUIREJPG=1
-	else
-		myconf="${myconf} --without-gd"
-	fi
-	use png && REQUIREPNG=1
-	use jpeg && REQUIREJPG=1
-	use tiff && REQUIRETIFF=1
-	if [ -n "${REQUIREPNG}" ]; then
-		myconf="${myconf} --with-png=/usr --with-png-dir=/usr" 
-	else
-		myconf="${myconf} --without-png"
-	fi
-	if [ -n "${REQUIREJPG}" ]; then
-		myconf="${myconf} --with-jpeg=/usr --with-jpeg-dir=/usr --enable-exif" 
-	else
-		myconf="${myconf} --without-jpeg" 
-	fi
-	if [ -n "${REQUIRETIFF}" ]; then
-		myconf="${myconf} --with-tiff=/usr --with-tiff-dir=/usr" 
-		LDFLAGS="${LDFLAGS} -ltiff"
-	else
-		myconf="${myconf} --without-tiff"
-	fi
-
-	if use mysql; then
-		# check for mysql4.1 and mysql4.1 support in this php
-		if [ -n "`mysql_config | grep '4.1'`" ] && grep -q -- '--with-mysqli' configure; then
-			myconf="${myconf} --with-mysqli=/usr"
-		else
-			myconf="${myconf} --with-mysql=/usr"
-			myconf="${myconf} --with-mysql-sock=`mysql_config --socket`"
-		fi
-	else
-		myconf="${myconf} --without-mysql"
-	fi
-
-	if use truetype; then
-		myconf="${myconf} --with-freetype-dir=/usr"
-		myconf="${myconf} --with-ttf=/usr"
-		myconf="${myconf} --with-t1lib=/usr"
-	else
-		myconf="${myconf} --without-ttf --without-t1lib"
-	fi
-
-	myconf="${myconf} `use_with nls gettext` `use_with qt qtdom /usr/qt/3`"
-	myconf="${myconf} `use_with spell pspell /usr` `use_with ssl openssl /usr`"
-	myconf="${myconf} `use_with imap imap /usr` `use_with ldap ldap /usr`"
-	myconf="${myconf} `use_with xml2 dom /usr` `use_with xml2 dom-xslt /usr`"
-	myconf="${myconf} `use_with xml2 dom-exslt /usr`"
-	myconf="${myconf} `use_with kerberos kerberos /usr` `use_with pam`"
-	myconf="${myconf} `use_enable memlimit memory-limit`"
-	myconf="${myconf} `use_enable ipv6`"
-	if use curl; then
-		myconf="${myconf} --with-curlwrappers --with-curl=/usr"
-	else
-		myconf="${myconf} --without-curl"
-	fi
-
-	#Waiting for somebody to want Cyrus support :-)
-	#myconf="${myconf} `use_with cyrus`"
-
-	# dbx AT LEAST one of mysql/odbc/postgres/oci8
-	use mysql || use odbc || use postgres || use oci8 \
-		&& myconf="${myconf} --enable-dbx" \
-		|| myconf="${myconf} --disable-dbx"
-
-	use imap && use ssl && \
-	if [ -n "`strings ${ROOT}/usr/lib/c-client.a 2>/dev/null | grep ssl_onceonlyinit`" ]; then
-		myconf="${myconf} --with-imap-ssl"
-		einfo "Building IMAP with SSL support."
-	else
-		ewarn "USE=\"imap ssl\" specified but IMAP is built WITHOUT ssl support."
-		ewarn "Skipping IMAP-SSL support."
-	fi
-
-	
-	# These were previously optional, but are now included directly as PEAR needs them.
-	# Zlib is needed for XML
-	myconf="${myconf} --with-zlib=/usr --with-zlib-dir=/usr"
-	LIBS="${LIBS} -lxmlparse -lxmltok"
-	myconf="${myconf} --with-sablot=/usr"
-	myconf="${myconf} --enable-xslt" 
-	myconf="${myconf} --with-xslt-sablot" 
-	myconf="${myconf} --with-xmlrpc"
-	myconf="${myconf} --enable-wddx"
-	myconf="${myconf} --with-xml"
-
-	#Some extensions need mbstring statically built
-	myconf="${myconf} --enable-mbstring=all --enable-mbregex"
-
-	# Somebody might want safe mode, but it causes some problems, so I disable it by default
-	#myconf="${myconf} --enable-safe-mode"
-
-	# These are some things that we don't really need use flags for, we just
-	# throw them in for functionality. Somebody could turn them off if their
-	# heart so desired
-	# DEPEND - app-arch/bzip2
-	myconf="${myconf} --with-bz2=/usr"
-	# DEPEND - sys-libs/cracklib
-	myconf="${myconf} --with-crack=/usr"
-	# DEPEND - nothing
-	myconf="${myconf} --with-cdb"
-	
-	# No DEPENDancies
-	mycony="${myconf} --enable-pcntl"
-	myconf="${myconf} --enable-bcmath"
-	myconf="${myconf} --enable-calendar"
-	myconf="${myconf} --enable-dbase"
-	myconf="${myconf} --enable-filepro"
-	myconf="${myconf} --enable-ftp"
-	myconf="${myconf} --with-mime-magic"
-	myconf="${myconf} --enable-sockets"
-	myconf="${myconf} --enable-sysvsem --enable-sysvshm --enable-sysvipc"
-	myconf="${myconf} --with-iconv"
-	myconf="${myconf} --enable-shmop"
-	myconf="${myconf} --enable-dio"
-	myconf="${myconf} --enable-yp"
-
-	# recode is NOT used as it conflicts with IMAP and YAZ
-	# iconv is better anyway
-
-	# Now actual base PHP settings
-	myconf="${myconf} \
-		--enable-inline-optimization \
-		--enable-track-vars \
-		--enable-trans-sid \
-		--enable-versioning \
-		--with-config-file-path=${PHPINIDIRECTORY}" 
-
-	#fixes bug #24373 
-	filter-flags "-D_FILE_OFFSET_BITS=64"
-	filter-flags "-D_FILE_OFFSET_BITS=32"
-	filter-flags "-D_LARGEFILE_SOURCE=1"
-	filter-flags "-D_LARGEFILE_SOURCE"
-	#fixes bug #14067
-	# changed order to run it in reverse for bug #32022 and #12021 
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
-
-	if [ -z "${PHP_SKIP_CONFIGURE}" ]; then
-	LIBS="${LIBS}" econf \
-		${myconf} || die "bad ./configure"
-	fi
-
-	if [ -z "${PHP_SKIP_MAKE}" ]; then
-		emake || die "compile problem"
-	fi
+	die "This eclass must NOT be used."
 }
-
 php_src_install() {
-	addwrite /usr/share/snmp/mibs/.index
-	dodir /usr/bin
-	dodir /usr/lib/php
-	dodir /usr/include/php
-
-	# parallel make breaks it
-	# so no emake here
-	make INSTALL_ROOT=${D} ${PHP_INSTALLTARGETS} || die
-
-	# install a php-config for EACH instance of php
-	# the php-core one is the default
-	mv ${D}/usr/bin/php-config ${D}/usr/bin/php-config.${PN}
-	# these files are provided solely by php-core
-	[ "${PN}" = "php-core" ] && dosym /usr/bin/php-config.${PN} /usr/bin/php-config
-	[ "${PN}" != "php-core" ] && rm ${D}/usr/bin/{phpize,phpextdist}
-
-	# get the extension dir
-	PHPEXTDIR="`${D}/usr/bin/php-config.${PN} --extension-dir`"
-	
-	for doc in LICENSE EXTENSIONS CREDITS INSTALL README.* TODO* NEWS; do
-		[ -s "$doc" ] && dodoc $doc
-	done
-
-	#install scripts
-	exeinto /usr/bin
-
-	# only php-core has the PEAR stuff
-	if [ "${PN}" = "php-core" ]; then
-		#revert Pear patch
-		rm ${D}/usr/lib/php/PEAR/Registry.php
-		#should this possibly result to the SAME original value it was ? (\$pear_install_dir)
-		cat ${S}/pear/PEAR/Registry.old | sed -e 's:${PORTAGE_TMPDIR}/${PF}::' > ${D}/usr/lib/php/PEAR/Registry.php
-	fi
-
-	# Support for Java extension
-	# 1. install php_java.jar file into ${EXT_DIR}
-	# 2. edit the php.ini file ready for installation
-	# - stuart@gentoo.org
-	local phpinisrc=php.ini-dist
-	if use java && [ "${PN}" != "php-core" ]; then
-		# we put these into /usr/lib so that they cannot conflict with
-		# other versions of PHP (e.g. PHP 4 & PHP 5)
-		insinto ${PHPEXTDIR}
-		einfo "Installing JAR for PHP"
-		doins ext/java/php_java.jar
-
-		einfo "Installing Java test page"
-		newins ext/java/except.php java-test.php
-
-		JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;'| sort | uniq `"
-		sed -e "s|;java.library .*$|java.library = ${JAVA_LIBRARY}|g" -i ${phpinisrc}
-		sed -e "s|;java.class.path .*$|java.class.path = ${PHPEXTDIR}/php_java.jar|g" -i ${phpinisrc}
-		sed -e "s|extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-		sed -e "s|;extension=php_java.dll.*$|extension = java.so|g" -i ${phpinisrc}
-		sed -e "s|;java.library.path .*$|java.library.path = ${PHPEXTDIR}|g" -i ${phpinisrc}
-		dosym ${PHPEXTDIR}/java.so ${PHPEXTDIR}/libphp_java.so
-	fi
-
-	if [ "${PN}" != "php-core" ]; then
-		#url_fopen
-		patch ${phpinisrc} <${DISTDIR}/php-4.3.2-fopen-url-secure.patch
-
-		#prevent bugs with php-ext eclasses
-		sed -e 's:extension_dir = "./"::' -i ${phpinisrc}
-
-		# A lot of ini file funkiness
-		insinto ${PHPINIDIRECTORY}
-		newins ${phpinisrc} ${PHPINIFILENAME}
-		dodir /etc/php4
-		[ "${PHPMAJORVER}" -eq 4 ] && dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/php4/${PHPINIFILENAME}
-	fi
+	die "This eclass must NOT be used."
 }
-
 php_pkg_preinst() {
-	einfo "Checking if we need to preserve a really old /etc/php4/php.ini file"
-	if [ -e /etc/php4/php.ini ] && [ ! -L /etc/php4/php.ini ]; then
-		ewarn "Old setup /etc/php4/php.ini file detected, moving to new location (${PHPINIDIRECTORY}/${PHPINIFILENAME})"
-		mkdir -p ${PHPINIDIRECTORY}
-		mv -f /etc/php4/php.ini ${PHPINIDIRECTORY}/${PHPINIFILENAME}
-	else
-		einfo "/etc/php4/php.ini doesn't exist or is a symlink, nothing wrong here"
-	fi
+	eerror "Warning it is NOT safe to use this version of PHP anymore"
+	eerror "You MUST upgrade to a newer version of PHP."
 }
 
 php_pkg_postinst() {
-	einfo "The INI file for this build is ${PHPINIDIRECTORY}/php.ini"
-}
-
-php_securityupgrade() {
-	if has_version "<${PF}"; then
-		ewarn "This is a security upgrade for PHP!"
-		ewarn "Please ensure that you apply any changes to the apache and PHP"
-		ewarn "configutation files!"
-	else
-		einfo "This is a security upgrade for PHP!"
-		einfo "However it is not critical for your machine"
-	fi
+	eerror "Warning it is NOT safe to use this version of PHP anymore"
+	eerror "You MUST upgrade to a newer version of PHP."
 }
diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass
index ddc67edc1972..b8b32c9ea06c 100644
--- a/eclass/php-common-r1.eclass
+++ b/eclass/php-common-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
 
 # ########################################################################
 #
@@ -63,21 +63,9 @@ php_check_imap() {
 # there is now the PHP-Java-Bridge that works under both PHP4 and PHP5.
 # ########################################################################
 
-php_uses_java() {
-	if ! useq java ; then
-		return 1
-	fi
-
-	if useq alpha || useq amd64 ; then
-		return 1
-	fi
-
-	return 0
-}
-
 php_check_java() {
-	if ! php_uses_java ; then
-		return
+	if ! useq java-internal ; then
+		return 1
 	fi
 
 	JDKHOME="`java-config --jdk-home`"
@@ -89,7 +77,6 @@ php_check_java() {
 
 	# stuart@gentoo.org - 2003/05/18
 	# Kaffe JVM is not a drop-in replacement for the Sun JDK at this time
-
 	if echo ${JDKHOME} | grep kaffe > /dev/null 2>&1 ; then
 		eerror
 		eerror "PHP will not build using the Kaffe Java Virtual Machine."
@@ -97,18 +84,17 @@ php_check_java() {
 		eerror
 		eerror "To build PHP without Java support, please re-run this emerge"
 		eerror "and place the line:"
-		eerror "  USE='-java'"
+		eerror "  USE='-java-internal'"
 		eerror "in front of your emerge command; e.g."
-		eerror "  USE='-java' emerge mod_php"
+		eerror "  USE='-java-internal' emerge =dev-lang/php-4*"
 		eerror
 		eerror "or edit your USE flags in /etc/make.conf"
 		die "Kaffe JVM not supported"
 	fi
 
-	JDKVER=$(java-config --java-version 2>&1 | awk '/^java version/ { print $3
-}' | xargs )
+	JDKVER=$(java-config --java-version 2>&1 | awk '/^java version/ { print $3 }' | xargs )
 	einfo "Active JDK version: ${JDKVER}"
-	case ${JDKVER} in
+	case "${JDKVER}" in
 		1.4.*) ;;
 		1.5.*) ewarn "Java 1.5 is NOT supported at this time, and might not work." ;;
 		*) eerror "A Java 1.4 JDK is required for Java support in PHP." ; die ;;
@@ -116,8 +102,8 @@ php_check_java() {
 }
 
 php_install_java() {
-	if ! php_uses_java ; then
-		return
+	if ! useq java-internal ; then
+		return 1
 	fi
 
 	# we put these into /usr/lib so that they cannot conflict with
@@ -129,18 +115,27 @@ php_install_java() {
 	einfo "Installing Java test page"
 	newins ext/java/except.php java-test.php
 
-	JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;'| sort | uniq `"
-	sed -e "s|;java.library .*$|java.library = ${JAVA_LIBRARY}|g" -i ${phpinisrc}
-	sed -e "s|;java.class.path .*$|java.class.path = ${PHPEXTDIR}/php_java.jar|g" -i ${phpinisrc}
-	sed -e "s|;java.library.path .*$|java.library.path = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	sed -e "s|;extension=php_java.dll.*$|extension = java.so|g" -i ${phpinisrc}
-
 	einfo "Installing Java extension for PHP"
 	doins modules/java.so
 
 	dosym ${PHPEXTDIR}/java.so ${PHPEXTDIR}/libphp_java.so
 }
 
+php_install_java_inifile() {
+	if ! useq java-internal ; then
+		return 1
+	fi
+
+	JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;'| sort | uniq `"
+
+	echo "extension = java.so" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
+	echo "java.library = ${JAVA_LIBRARY}" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
+	echo "java.class.path = ${PHPEXTDIR}/php_java.jar" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
+	echo "java.library.path = ${PHPEXTDIR}" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
+
+	dosym "${PHP_EXT_INI_DIR}/java.ini" "${PHP_EXT_INI_DIR_ACTIVE}/java.ini"
+}
+
 # ########################################################################
 # MTA SUPPORT
 # ########################################################################
diff --git a/eclass/php-ext-base-r1.eclass b/eclass/php-ext-base-r1.eclass
index fd2c80ab69cc..c1dfb1ecdca5 100644
--- a/eclass/php-ext-base-r1.eclass
+++ b/eclass/php-ext-base-r1.eclass
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-ext-base eclass provides a unified interface for adding standalone
+# The php-ext-base-r1 eclass provides a unified interface for adding standalone
 # PHP extensions ('modules') to the php.ini files on your system.
 #
-# Combined with php-ext-source, we have a standardised solution for supporting
-# PHP extensions
+# Combined with php-ext-source-r1, we have a standardised solution for supporting
+# PHP extensions.
 
 inherit depend.php
 
@@ -34,8 +35,12 @@ EXT_DIR="`${PHPCONFIG} --extension-dir 2>/dev/null`"
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
-		>=sys-devel/m4-1.4
-		>=sys-devel/libtool-1.4.3"
+		>=sys-devel/m4-1.4.3
+		>=sys-devel/libtool-1.5.18
+		>=sys-devel/automake-1.9.6
+		sys-devel/automake-wrapper
+		>=sys-devel/autoconf-2.59
+		sys-devel/autoconf-wrapper"
 
 php-ext-base-r1_buildinilist() {
 	# work out the list of .ini files to edit/add to
@@ -59,13 +64,19 @@ php-ext-base-r1_src_install() {
 	if [ "${PHP_EXT_INI}" = "yes" ] ; then
 		php-ext-base-r1_addextension "${PHP_EXT_NAME}.so"
 	fi
+	for inifile in ${PHPINIFILELIST} ; do
+		inidir=${inifile/${PHP_EXT_NAME}.ini/}
+		inidir=${inidir/ext/ext-active}
+		dodir "/${inidir}"
+		dosym "/${inifile}" "/${inifile/ext/ext-active}"
+	done
 	# add support for installing php files into a version dependant directory
 	PHP_EXT_SHARED_DIR="/usr/share/${PHP_SHARED_CAT}/${PHP_EXT_NAME}"
 }
 
 php-ext-base-r1_addextension() {
 	if [ "${PHP_EXT_ZENDEXT}" = "yes" ] ; then
-		if built_with_use =${PHP_PKG} apache2 threads ; then
+		if has_zts ; then
 			ext_type="zend_extension_ts"
 			ext_file="${EXT_DIR}/$1"
 		else
diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass
index df80b70e9a33..2fc7e39fd51c 100644
--- a/eclass/php-ext-base.eclass
+++ b/eclass/php-ext-base.eclass
@@ -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/eclass/php-ext-base.eclass,v 1.1 2003/07/24 15:15:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
+# Author: Stuart Herbert <stuart@gentoo.org>
 #
-# The php-ext eclass provides a unified interface for compiling and
-# installing standalone PHP extensions ('modules').
+# The php-ext-base eclass provides a unified interface for adding standalone
+# PHP extensions ('modules') to the php.ini files on your system.
+#
+# Combined with php-ext-source, we have a standardised solution for supporting
+# PHP extensions
 
-ECLASS=php-ext-base
-INHERITED="$INHERITED $ECLASS"
 
 EXPORT_FUNCTIONS src_install
 
@@ -26,66 +28,81 @@ EXPORT_FUNCTIONS src_install
 [ -z "$PHP_EXT_INI" ] && PHP_EXT_INI="yes"
 
 # find out where to install extensions
-EXT_DIR="`php-config --extension-dir`"
+EXT_DIR="`php-config --extension-dir 2>/dev/null`"
 
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
-		virtual/php
-		=sys-devel/m4-1.4
+		dev-php/php
+		>=sys-devel/m4-1.4
 		>=sys-devel/libtool-1.4.3"
 
+RDEPEND="${RDEPEND}
+		virtual/php"
+
 php-ext-base_buildinilist () {
 	# work out the list of .ini files to edit/add to
 
 	if [ -z "${PHPSAPILIST}" ]; then
-		PHPSAPILIST="apache1 apache2 cli"
+		PHPSAPILIST="apache1 apache2 cli cgi"
 	fi
-	
-	PHPINIFILELIST=""
+
+	PHPINIFILELIST=
 
 	for x in ${PHPSAPILIST} ; do
 		if [ -f /etc/php/${x}-php4/php.ini ]; then
 			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-php4/php.ini"
 		fi
+
+		if [ -f /etc/php/${x}-php5/php.ini ]; then
+			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-php5/php.ini"
+		fi
 	done
-	
-	if [[ ${PHPINIFILELIST} = "" ]]; then
-		msg="No PHP ini files found for this extension"
-		eerror ${msg}
-		die ${msg}
+
+	if [ "${PHPINIFILELIST}+" = "+" ] ; then
+		# backwards support for the old location
+
+		if [ -f /etc/php4/php.ini ] ; then
+			PHPINIFILELIST="etc/php4/php.ini"
+		else
+			msg="No PHP ini files found for this extension"
+			eerror ${msg}
+			die ${msg}
+		fi
 	fi
 
 #	einfo "php.ini files found in $PHPINIFILELIST"
 }
 
 php-ext-base_src_install() {
+	addpredict /usr/share/snmp/mibs/.index
+	php-ext-base_buildinilist
 	if [ "$PHP_EXT_INI" = "yes" ] ; then
-		php-ext-base_buildinilist
-		php-ext-base_addextension "${EXT_DIR}/${PHP_EXT_NAME}.so"
+		php-ext-base_addextension "${PHP_EXT_NAME}.so"
 	fi
 }
 
 php-ext-base_addextension () {
 	if [ "${PHP_EXT_ZENDEXT}" = "yes" ]; then
-		ext="zend_extension"
+		ext_type="zend_extension"
+		ext_file="${EXT_DIR}/$1"
 	else
-		ext="extension"
+		# we do *not* add the full path for the extension!
+		ext_type="extension"
+		ext_file="$1"
 	fi
 
-	php-ext-base_addtoinifiles "$ext" "$1" "Extension added"
+	php-ext-base_addtoinifiles "$ext_type" "$ext_file" "Extension added"
 }
-	
+
 php-ext-base_setting_is_present () {
-	grep "^$1=" $2 > /dev/null 2>&1
+	grep "^$1=$2" /$3 > /dev/null 2>&1
 }
 
 php-ext-base_inifileinimage () {
 	if [ ! -f $1 ]; then
 		mkdir -p `dirname $1`
 		cp /$1 $1
-		insinto /`dirname $1`
-		doins $1
 	fi
 }
 
@@ -96,7 +113,9 @@ php-ext-base_inifileinimage () {
 
 php-ext-base_addtoinifile () {
 	if [ "$1" != "extension" ] && [ "$1" != "zend_extension" ]; then
-		php-ext-base_setting_is_present $1 $3 && return
+		php-ext-base_setting_is_present $1 "" $3 && return
+	else
+		php-ext-base_setting_is_present "$1" "$2" "$3" && return
 	fi
 
 	php-ext-base_inifileinimage $3
@@ -106,8 +125,13 @@ php-ext-base_addtoinifile () {
 	if [ -z "$4" ]; then
 		einfo "Added '$1=$2' to /$3"
 	else
-		einfo "$4 to $3"
+		einfo "$4 to /$3"
 	fi
+
+	# yes, this is inefficient - but it works every time ;-)
+
+	insinto /`dirname $3`
+	doins $3
 }
 
 php-ext-base_addtoinifiles () {
@@ -115,5 +139,3 @@ php-ext-base_addtoinifiles () {
 		php-ext-base_addtoinifile $1 $2 $x "$3"
 	done
 }
-	
-
diff --git a/eclass/php-ext-pecl-r1.eclass b/eclass/php-ext-pecl-r1.eclass
index 371f47f938ca..08130e3ab699 100644
--- a/eclass/php-ext-pecl-r1.eclass
+++ b/eclass/php-ext-pecl-r1.eclass
@@ -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/eclass/php-ext-pecl-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# This eclass should be used by all dev-php/PECL-* ebuilds, as a uniform way of installing PECL extensions.
+# This eclass should be used by all dev-php[4,5]/pecl-* ebuilds, as a uniform way of installing PECL extensions.
 # For more information about PECL, see: http://pecl.php.net
 
 [ -z "${PHP_EXT_PECL_PKG}" ] && PHP_EXT_PECL_PKG=${PN/pecl-/}
@@ -30,7 +31,8 @@ fi
 
 SRC_URI="http://pecl.php.net/get/${FILENAME}"
 HOMEPAGE="http://pecl.php.net/${PECL_PKG}"
-S=${WORKDIR}/${PECL_PKG_V}
+
+S="${WORKDIR}/${PECL_PKG_V}"
 
 php-ext-pecl-r1_src_compile() {
 	has_php
@@ -42,5 +44,5 @@ php-ext-pecl-r1_src_install() {
 	php-ext-source-r1_src_install
 
 	# Those two are always present
-	dodoc ${WORKDIR}/package.xml CREDITS
+	dodoc-php "${WORKDIR}/package.xml" CREDITS
 }
diff --git a/eclass/php-ext-pecl.eclass b/eclass/php-ext-pecl.eclass
index 5a210381feb2..34ff10e14c38 100644
--- a/eclass/php-ext-pecl.eclass
+++ b/eclass/php-ext-pecl.eclass
@@ -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/eclass/php-ext-pecl.eclass,v 1.1 2003/10/13 19:59:20 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 #
 # This eclass should be used by all dev-php/PECL-* ebuilds, as a uniform way of installing PECL extensions.
 # For more information about PECL, see: http://pecl.php.net
 
-PECL_PKG=${PN/PECL-/}
+[ -z "$PHP_EXT_PECL_PKG" ] && PHP_EXT_PECL_PKG=${PN/PECL-/}
+PECL_PKG=$PHP_EXT_PECL_PKG
 PECL_PKG_V=$PECL_PKG-$PV
 
 [ -z "$PHP_EXT_NAME" ] && PHP_EXT_NAME=$PECL_PKG
 
 inherit php-ext-source
 
-ECLASS=php-ext-pecl
-INHERITED="$INHERITED $ECLASS"
 
 EXPORT_FUNCTIONS src_compile src_install
 
diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass
index 7a019174a9c4..0f64cce29597 100644
--- a/eclass/php-ext-source-r1.eclass
+++ b/eclass/php-ext-source-r1.eclass
@@ -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/eclass/php-ext-source-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.1.1.1 2005/11/30 09:59:25 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-ext-source eclass provides a unified interface for compiling and
-# installing standalone PHP extensions ('modules') from source code
+# The php-ext-source-r1 eclass provides a unified interface for compiling and
+# installing standalone PHP extensions ('modules') from source code.
 #
 # To use this eclass, you must add the following to your ebuild:
 #
@@ -25,16 +26,20 @@ EXPORT_FUNCTIONS src_compile src_install
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
-		>=sys-devel/m4-1.4
-		>=sys-devel/libtool-1.4.3"
+		>=sys-devel/m4-1.4.3
+		>=sys-devel/libtool-1.5.18
+		>=sys-devel/automake-1.9.6
+		sys-devel/automake-wrapper
+		>=sys-devel/autoconf-2.59
+		sys-devel/autoconf-wrapper"
 
 php-ext-source-r1_src_compile() {
 	# pull in the PHP settings
 	has_php
 	my_conf="${my_conf} --prefix=${PHPPREFIX} --with-php-config=${PHPCONFIG}"
 	addpredict /usr/share/snmp/mibs/.index
-	#phpize creates configure out of config.m4
-	export WANT_AUTOMAKE=1.6
+	# phpize creates configure out of config.m4
+	export WANT_AUTOMAKE=1.9 WANT_AUTOCONF=2.5
 	${PHPIZE}
 	./configure ${my_conf} || die "Unable to configure code to compile"
 	emake || die "Unable to make code"
diff --git a/eclass/php-ext-source.eclass b/eclass/php-ext-source.eclass
index 52fd1984a007..8c80f2a91471 100644
--- a/eclass/php-ext-source.eclass
+++ b/eclass/php-ext-source.eclass
@@ -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/eclass/php-ext-source.eclass,v 1.1 2003/07/24 15:15:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
 #
-# The php-ext eclass provides a unified interface for compiling and
-# installing standalone PHP extensions ('modules').
+# The php-ext-source eclass provides a unified interface for compiling and
+# installing standalone PHP extensions ('modules') from source code
+#
+# To use this eclass, you must add the following to your ebuild:
+#
+# inherit php-ext-source
 
 inherit php-ext-base
 
-ECLASS=php-ext-source
-INHERITED="$INHERITED $ECLASS"
 
 EXPORT_FUNCTIONS src_compile src_install
 
@@ -24,22 +26,25 @@ EXPORT_FUNCTIONS src_compile src_install
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
-		virtual/php
-		=sys-devel/m4-1.4
+		dev-php/php
+		>=sys-devel/m4-1.4
 		>=sys-devel/libtool-1.4.3"
 
-php-ext-base_src_compile() {
+RDEPEND="${RDEPEND}
+		virtual/php"
+
+php-ext-source_src_compile() {
+	addpredict /usr/share/snmp/mibs/.index
 	#phpize creates configure out of config.m4
 	phpize
 	econf $myconf
 	emake || die
 }
 
-php-ext-base_src_install() {
+php-ext-source_src_install() {
+	addpredict /usr/share/snmp/mibs/.index
 	chmod +x build/shtool
-	#this will usually be /usr/lib/php/extensions/no-debug-no-zts-20020409/ 
-	#but i prefer not taking this risk
-	EXT_DIR=`php-config --extension-dir`
 	insinto $EXT_DIR
 	doins modules/$PHP_EXT_NAME.so
+	php-ext-base_src_install
 }
diff --git a/eclass/php-ext.eclass b/eclass/php-ext.eclass
index 5eacd4168e27..8f1a105400b1 100644
--- a/eclass/php-ext.eclass
+++ b/eclass/php-ext.eclass
@@ -1,14 +1,12 @@
-# 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/eclass/php-ext.eclass,v 1.1 2003/05/15 18:45:26 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.1.1.1 2005/11/30 09:59:38 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 #
 # The php-ext eclass provides a unified interface for compiling and
 # installing standalone PHP extensions ('modules').
 
-ECLASS=php-ext
-INHERITED="$INHERITED $ECLASS"
 
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst
 
@@ -17,18 +15,50 @@ EXPORT_FUNCTIONS src_compile src_install pkg_postinst
 # The extension name, this must be set, otherwise we die.
 [ -z "$PHP_EXT_NAME" ] && die "No module name specified for the php-ext eclass."
 
-# Whether the extensions is a Zend Engine extension
+# Wether the extensions is a Zend Engine extension
 #(defaults to "no" and if you don't know what is it, you don't need it.)
 [ -z "$PHP_EXT_ZENDEXT" ] && PHP_EXT_ZENDEXT="no"
 
+# Wether or not to add a line in the php.ini for the extension
+# (defaults to "yes" and shouldn't be changed in most cases)
+[ -z "$PHP_EXT_INI" ] && PHP_EXT_INI="yes"
+
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND}
 		virtual/php
-		=sys-devel/m4-1.4
+		>=sys-devel/m4-1.4
 		>=sys-devel/libtool-1.4.3"
 
+RDEPEND="${RDEPEND}
+		 virtual/php"
+
+php-ext_buildinilist () {
+	# work out the list of .ini files to edit/add to
+
+	if [ -z "${PHPSAPILIST}" ]; then
+		PHPSAPILIST="apache1 apache2 cli"
+	fi
+
+	PHPINIFILELIST=""
+
+	for x in ${PHPSAPILIST} ; do
+		if [ -f /etc/php/${x}-php4/php.ini ]; then
+			PHPINIFILELIST="${PHPINIFILELIST} /etc/php/${x}-php4/php.ini"
+		fi
+	done
+
+	if [[ ${PHPINIFILELIST} = "" ]]; then
+		msg="No PHP ini files found for this extension"
+		eerror ${msg}
+		die ${msg}
+	fi
+
+#	einfo "php.ini files found in $PHPINIFILELIST"
+}
+
 php-ext_src_compile() {
+	addpredict /usr/share/snmp/mibs/.index
 	#phpize creates configure out of config.m4
 	phpize
 	econf $myconf
@@ -37,24 +67,60 @@ php-ext_src_compile() {
 
 php-ext_src_install() {
 	chmod +x build/shtool
-	#this will usually be /usr/lib/php/extensions/no-debug-no-zts-20020409/ 
+	#this will usually be /usr/lib/php/extensions/no-debug-no-zts-20020409/
 	#but i prefer not taking this risk
-	EXT_DIR=`php-config --extension-dir`
+	EXT_DIR="`php-config --extension-dir 2>/dev/null`"
 	insinto $EXT_DIR
 	doins modules/$PHP_EXT_NAME.so
 }
 
 php-ext_pkg_postinst() {
-	if [ `grep ${EXT_DIR}/${PHP_EXT_NAME}.so /etc/php4/php.ini` ] ; then
-		einfo "No changes made to php.ini"
+	if [ "$PHP_EXT_INI" = "yes" ] ; then
+		php-ext_buildinilist
+		php-ext_addextension "${EXT_DIR}/${PHP_EXT_NAME}.so"
+	fi
+}
+
+php-ext_extension_is_present () {
+	grep "^$1=$2" $3 > /dev/null 2>&1
+}
+
+php-ext_addextensiontoinifile () {
+	php-ext_extension_is_present $1 $2 $3 && return
+
+	einfo "Extension added to $3"
+	echo "$1=$2" >> $3
+}
+
+php-ext_addextension () {
+	if [ "${PHP_EXT_ZENDEXT}" = "yes" ]; then
+		ext="zend_extension"
 	else
-		if [ "$PHP_EXT_ZENDEXT" = "yes" ] ; then
-			echo zend_extension=${EXT_DIR}/${PHP_EXT_NAME}.so >> /etc/php4/php.ini
-		else
-			echo extension=${EXT_DIR}/${PHP_EXT_NAME}.so >> /etc/php4/php.ini
-		fi
-		
-		einfo "${PHP_EXT_NAME} has been added to php.ini"
-		einfo "Please check phpinfo() output to verify that ${PHP_EXT_NAME} is loaded."
+		ext="extension"
 	fi
+
+	for x in ${PHPINIFILELIST} ; do
+		php-ext_addextensiontoinifile "$ext" "$1" "$x"
+	done
+}
+
+php-ext_setting_is_present () {
+	grep "^$1=" $2 > /dev/null 2>&1
+}
+
+# $1 - setting name
+# $2 - setting value
+# $3 - file to add to
+
+php-ext_addtoinifile () {
+	php-ext_setting_is_present $1 $3 && return
+
+	einfo "Added '$1=$2' to $3"
+	echo "$1=$2" >> $3
+}
+
+php-ext_addtoinifiles () {
+	for x in ${PHPINIFILELIST} ; do
+		php-ext_addtoinifile $1 $2 $x
+	done
 }
diff --git a/eclass/php-lib-r1.eclass b/eclass/php-lib-r1.eclass
index 905a4eab120a..a90cdc5bd79a 100644
--- a/eclass/php-lib-r1.eclass
+++ b/eclass/php-lib-r1.eclass
@@ -1,14 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author: Stuart Herbert <stuart@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-lib eclass provides a unified interface for adding new
-# PHP libraries.  PHP libraries are PHP scripts designed for reuse inside
+# The php-lib-r1 eclass provides a unified interface for adding new
+# PHP libraries. PHP libraries are PHP scripts designed for reuse inside
 # other PHP scripts.
-#
-# This eclass doesn't do a lot (yet)
 
 inherit depend.php
 
@@ -23,18 +22,19 @@ EXPORT_FUNCTIONS src_install
 # ---end ebuild configurable settings
 
 DEPEND="${DEPEND} dev-lang/php"
+RDEPEND="${RDEPEND} ${DEPEND}"
 
 # you have to pass in a list of the PHP files to install
 #
 # $1 - directory in ${S} to insert from
 # $2 ... list of files to install
 
-php-lib_src_install() {
+php-lib-r1_src_install() {
 	has_php
 
 	# install to the correct phpX folder, if not specified
 	# fall back to /usr/share/php
-	if [ -z "${PHP_SHARED_CAT}" ] ; then
+	if [ -n "${PHP_SHARED_CAT}" ] ; then
 		PHP_LIB_DIR="/usr/share/${PHP_SHARED_CAT}/${PHP_LIB_NAME}"
 	else
 		PHP_LIB_DIR="/usr/share/php/${PHP_LIB_NAME}"
@@ -48,6 +48,6 @@ php-lib_src_install() {
 	for x in $@ ; do
 		SUBDIR="`dirname ${x}`"
 		insinto ${PHP_LIB_DIR}/${SUBDIR}
-		doins ${S_DIR}/${x}
+		doins "${S_DIR}/${x}"
 	done
 }
diff --git a/eclass/php-lib.eclass b/eclass/php-lib.eclass
index 15314450b576..d7bf1d024ec8 100644
--- a/eclass/php-lib.eclass
+++ b/eclass/php-lib.eclass
@@ -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/eclass/php-lib.eclass,v 1.1 2003/08/04 00:35:07 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib.eclass,v 1.1.1.1 2005/11/30 09:59:27 chriswhite Exp $
 #
 # Author: Stuart Herbert <stuart@gentoo.org>
 #
@@ -10,8 +10,6 @@
 #
 # This eclass doesn't do a lot (yet)
 
-ECLASS=php-lib
-INHERITED="$INHERITED $ECLASS"
 RESTRICT="${RESTRICT} nostrip"
 
 EXPORT_FUNCTIONS src_install
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 0f0c276f0e3b..bf52233db124 100644
--- a/eclass/php-pear-lib-r1.eclass
+++ b/eclass/php-pear-lib-r1.eclass
@@ -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/eclass/php-pear-lib-r1.eclass,v 1.1 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 #
 # Author: Luca Longinotti <chtekk@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
 # Based on Tal Peer's <coredumb@gentoo.org> work on php-pear.eclass.
 #
-# The php-pear-lib eclass provides means for easy installation of PEAR
+# The php-pear-lib-r1 eclass provides means for an easy installation of PEAR
 # based libraries, such as Creole, Jargon, Phing etc., while retaining
 # the functionality to put the libraries into version-dependant dirs.
 
@@ -14,9 +15,6 @@ inherit depend.php
 
 EXPORT_FUNCTIONS src_install
 
-# Set this is the the package name on PEAR is different than the one in
-# portage (generally shouldn't be the case).
-
 # We must depend on the base package as we need it to let
 # PEAR work, as well as PEAR itself.
 DEPEND="${DEPEND} dev-lang/php >=dev-php/PEAR-PEAR-1.3.6"
diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index d4b27c5131e1..3a8c8fa9a341 100644
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.eclass
@@ -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/eclass/php-pear-r1.eclass,v 1.1 2005/09/04 12:57:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-pear eclass provides means for easy installation of PEAR
+# The php-pear-r1 eclass provides means for an easy installation of PEAR
 # packages, see http://pear.php.net
 
 # Note that this eclass doesn't handle PEAR packages' dependencies on
@@ -18,7 +19,7 @@ EXPORT_FUNCTIONS src_install
 
 # We must depend on the base package as we need it to do
 # install tasks (it provides the pear binary).
-DEPEND="${DEPEND} dev-lang/php"
+DEPEND="${DEPEND} dev-lang/php >=dev-php/PEAR-PEAR-1.3.6"
 RDEPEND="${RDEPEND} ${DEPEND}"
 
 fix_PEAR_PV() {
@@ -35,14 +36,17 @@ PEAR_PN=${PHP_PEAR_PKG_NAME}-${PEAR_PV}
 
 [ -z "${SRC_URI}" ] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz"
 [ -z "${HOMEPAGE}" ] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}"
+
 S="${WORKDIR}/${PEAR_PN}"
 
-php-pear_src_install() {
-	# SNMP is nuts sometimes
+php-pear-r1_src_install() {
+	# SNMP support
 	addpredict /usr/share/snmp/mibs/.index
 	addpredict /var/lib/net-snmp/
 
-	cd ${S}
-	mv ${WORKDIR}/package.xml ${S}
-	pear install --nodeps --installroot=${D} ${S}/package.xml || die "Unable to install PEAR package"
+	cd "${S}"
+	mv "${WORKDIR}/package.xml" "${S}"
+	pear install --nodeps --installroot="${D}" "${S}/package.xml" || die "Unable to install PEAR package"
+	rm -rf "${D}/usr/share/php/.filemap" \
+	"${D}/usr/share/php/.lock"
 }
diff --git a/eclass/php-pear.eclass b/eclass/php-pear.eclass
index 5b337562054b..3d7ceee1389a 100644
--- a/eclass/php-pear.eclass
+++ b/eclass/php-pear.eclass
@@ -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/eclass/php-pear.eclass,v 1.1 2003/12/23 11:00:01 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear.eclass,v 1.1.1.1 2005/11/30 09:59:23 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 #
@@ -10,24 +10,38 @@
 # Note that this eclass doesn't handle PEAR packages' dependencies on
 # purpose, please use (R)DEPEND to define them.
 
-ECLASS=php-pear
-INHERITED="$INHERITED $ECLASS"
 EXPORT_FUNCTIONS src_install
 
 # Set this is the the package name on PEAR is different than the one in
 # portage (generally shouldn't be the case).
 [ -z "$PHP_PEAR_PKG_NAME" ] && PHP_PEAR_PKG_NAME=${PN/PEAR-/}
-PEAR_PN=${PHP_PEAR_PKG_NAME}-${PV}
 
-[ -z "$SRC_URI" ] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz"
-[ -z "$HOMEPAGE" ] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}"
-
-DEPEND="$DEPEND virtual/php"
+# We must depend on the virtual as well as the base package as we need it to do
+# install tasks (it provides the pear binary).
+DEPEND="$DEPEND virtual/php dev-php/php"
 RDEPEND="$RDEPEND $DEPEND"
 
+fix_PEAR_PV() {
+	tmp=$PV
+	tmp=${tmp/_/}
+	tmp=${tmp/rc/RC}
+	tmp=${tmp/beta/b}
+	PEAR_PV=$tmp
+}
+
+PEAR_PV=""
+fix_PEAR_PV
+PEAR_PN=${PHP_PEAR_PKG_NAME}-${PEAR_PV}
+
+[ -z "$SRC_URI" ] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz"
+[ -z "$HOMEPAGE" ] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}"
 S="${WORKDIR}/${PEAR_PN}"
 
 php-pear_src_install () {
+	# SNMP is nuts sometimes
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+
 	cd ${S}
 	mv ${WORKDIR}/package.xml ${S}
 	pear install --nodeps -R ${D} ${S}/package.xml || die
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 9d5897cfde3c..acc29958918d 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,12 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.1 2004/01/08 04:05:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.1.1.1 2005/11/30 09:59:22 chriswhite Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib libtool
 
-ECLASS=php-sapi
-INHERITED="$INHERITED $ECLASS"
+DESCRIPTION="PHP generic SAPI ebuild"
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_preinst
 
@@ -22,74 +21,105 @@ PHPMAJORVER=${MY_PV//\.*}
 [ -z "${MY_P}" ] && MY_P=${MY_PN}-${MY_PV}
 [ -z "${MY_PF}" ] && MY_PF=${MY_P}-${PR}
 [ -z "${HOMEPAGE}" ] && HOMEPAGE="http://www.php.net/"
-[ -z "${LICENSE}" ]	&& LICENSE="PHP"
-[ -z "${PROVIDE}" ]	&& PROVIDE="virtual/php-${PV}"
+[ -z "${LICENSE}" ]	&& LICENSE="PHP-3"
+[ -z "${PROVIDE}" ]	&& PROVIDE="virtual/php"
 # PHP.net does automatic mirroring from this URI
 [ -z "${SRC_URI_BASE}" ] && SRC_URI_BASE="http://www.php.net/distributions"
 if [ -z "${SRC_URI}" ]; then
 	SRC_URI="${SRC_URI_BASE}/${MY_P}.tar.bz2"
 fi
-# A patch for PHP for security
-SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch"
+# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
+# fed bad data from outside.
+if [ "${PHPSAPI}" != "cli" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch"
+fi
+
+# Patch for bug 50991, 49420
+# Make sure the correct include_path is used.
+SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.6-includepath.diff http://dev.gentoo.org/~robbat2/distfiles/php-4.3.6-includepath.diff"
+
+[ "${PV//4.3.6}" != "${PV}" ] && SRC_URI="${SRC_URI} http://www.apache.org/~jorton/php-4.3.6-pcrealloc.patch"
 
 # Where we work
 S=${WORKDIR}/${MY_P}
 
-IUSE="${IUSE} X crypt curl firebird flash freetds gd gd-external gdbm imap informix ipv6 java jpeg ldap mcal memlimit mysql nls oci8 odbc pam pdflib png postgres qt snmp spell ssl tiff truetype xml2 yaz"
+IUSE="X crypt curl firebird flash freetds gd gd-external gdbm imap informix ipv6 java jpeg ldap mcal memlimit mysql nls oci8 odbc pam png postgres snmp spell ssl tiff truetype xml2 yaz fdftk doc gmp kerberos hardenedphp mssql debug"
+
+# Hardened-PHP support
+#
+# I've done it like this, so that we can support different versions of
+# the patch for different versions of PHP
+
+case "$PV" in
+	4.3.11) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
+	4.4.0) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
+esac
+
+[ -n "$HARDENEDPHP_PATCH" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/$HARDENEDPHP_PATCH )"
 
 # berkdb stuff is complicated
 # we need db-1.* for ndbm
 # and then either of db3 or db4
 IUSE="${IUSE} berkdb"
-RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1.* 
-							  || ( >=sys-libs/db-4.0.14-r2 
+RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1*
+							  || ( >=sys-libs/db-4.0.14-r2
 								   >=sys-libs/db-3.2.9-r9
-							     ) 
+							     )
 							)"
 
 # Everything is in this list is dynamically linked agaist or needed at runtime
 # in some other way
-RDEPEND="
-   >=sys-libs/cracklib-2.7-r7
-   app-arch/bzip2
-   X? ( virtual/x11 )
-   crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-   curl? ( >=net-ftp/curl-7.10.2 )
-   firebird? ( >=dev-db/firebird-1.0 )
-   freetds? ( >=dev-db/freetds-0.53 )
-   gd-external? ( media-libs/libgd >=media-libs/jpeg-6b 
-                  >=media-libs/libpng-1.2.5 )
-   gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 )
-   gdbm? ( >=sys-libs/gdbm-1.8.0 )
-   java? ( =virtual/jdk-1.4* dev-java/java-config )
-   jpeg? ( >=media-libs/jpeg-6b )
-   ldap? ( >=net-nds/openldap-1.2.11 )
-   mysql? ( >=dev-db/mysql-3.23.26 )
-   nls? ( sys-devel/gettext )
-   odbc? ( >=dev-db/unixODBC-1.8.13 )
-   pam? ( >=sys-libs/pam-0.75 )
-   pdflib? ( >=media-libs/pdflib-4.0.3 >=media-libs/jpeg-6b 
-             >=media-libs/libpng-1.2.5 >=media-libs/tiff-3.5.5 )
-   png? ( >=media-libs/libpng-1.2.5 )
-   postgres? ( >=dev-db/postgresql-7.1 )
-   qt? ( >=x11-libs/qt-2.3.0 )
-   snmp? ( net-analyzer/net-snmp )
-   spell? ( app-text/aspell )
-   ssl? ( >=dev-libs/openssl-0.9.5 )
-   tiff? ( >=media-libs/tiff-3.5.5 )
-   xml2? ( dev-libs/libxml2 >=dev-libs/libxslt-1.0.30 )
-   truetype? ( =media-libs/freetype-2* =media-libs/freetype-1* 
-               media-libs/t1lib )
-   >=net-libs/libwww-5.3.2
-   >=app-text/sablotron-0.97
-   dev-libs/expat
-   sys-libs/zlib 
-   virtual/mta
-   yaz? ( dev-libs/yaz )"
+#
+# 2004/03/28 - stuart - added dependency on the php manual snapshot
+
+RDEPEND="${RDEPEND}
+	app-arch/bzip2
+	X? ( virtual/x11 )
+	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
+	curl? ( >=net-misc/curl-7.10.2 )
+	x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
+	freetds? ( >=dev-db/freetds-0.53 )
+	gd-external? ( media-libs/gd >=media-libs/jpeg-6b
+		>=media-libs/libpng-1.2.5 )
+	gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!alpha? ( !amd64? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) ) )
+	jpeg? ( >=media-libs/jpeg-6b )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	nls? ( sys-devel/gettext )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	pam? ( >=sys-libs/pam-0.75 )
+	png? ( >=media-libs/libpng-1.2.5 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	snmp? ( net-analyzer/net-snmp )
+	spell? ( app-text/aspell )
+	ssl? ( >=dev-libs/openssl-0.9.5 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( dev-libs/libxml2 >=dev-libs/libxslt-1.0.30 )
+	truetype? ( =media-libs/freetype-2* =media-libs/freetype-1*
+		media-libs/t1lib )
+	>=net-libs/libwww-5.3.2
+	>=app-text/sablotron-0.97
+	dev-libs/expat
+	sys-libs/zlib
+	virtual/mta
+	>=sys-apps/file-4.02
+	yaz? ( dev-libs/yaz )
+	doc? ( app-doc/php-docs )
+	gmp? ( dev-libs/gmp )
+	mssql? ( dev-db/freetds )
+	kerberos? ( virtual/krb5 )"
+
+# USE structure doesn't support ~x86
+#if hasq '~x86' $ACCEPT_KEYWORDS; then
+	# FDFTK only available for x86 type hardware
+	#RDEPEND="${RDEPEND} x86? ( fdftk? ( app-text/fdftk ) )"
+#fi
 
 # libswf is ONLY available on x86
-RDEPEND="${RDEPEND} flash? ( 
-		x86? ( media-libs/libswf ) 
+RDEPEND="${RDEPEND} flash? (
+		x86? ( media-libs/libswf )
 		>=media-libs/ming-0.2a )"
 
 #The new XML extension in PHP5 requires libxml2-2.5.10
@@ -109,18 +139,19 @@ fi
 # These are extra bits we need only at compile time
 DEPEND="${RDEPEND} ${DEPEND}
 	imap? ( virtual/imap-c-client )
-	mcal? ( dev-libs/libmcal )"
+	mcal? ( dev-libs/libmcal !=dev-libs/libmcal-0.7-r2 )"
 #9libs causes a configure error
 DEPEND="${DEPEND} !dev-libs/9libs"
 #dev-libs/libiconv causes a compile failure
 DEPEND="${DEPEND} !dev-libs/libiconv"
 
 #Waiting for somebody to want this:
-#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev ) 
+#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev )
 
 # this is because dev-php/php provides all of the PEAR stuff and some other
 # required odds and ends, and only as of this version number.
 PHP_PROVIDER_PKG="dev-php/php"
+PHP_PROVIDER_PKG_MINPVR="4.3.4-r2"
 php-sapi_is_providerbuild() {
 	if [ "${CATEGORY}/${PN}" == "${PHP_PROVIDER_PKG}" ]; then
 		return 0
@@ -128,7 +159,7 @@ php-sapi_is_providerbuild() {
 		return 1
 	fi
 }
-php-sapi_is_providerbuild || PDEPEND="${PDEPEND} >=${PHP_PROVIDER_PKG}-4.3.4-r2"
+php-sapi_is_providerbuild || PDEPEND="${PDEPEND} >=${PHP_PROVIDER_PKG}-${PHP_PROVIDER_PKG_MINPVR}"
 
 #export this here so we can use it
 myconf="${myconf}"
@@ -140,14 +171,14 @@ PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules install-programs"
 # provided by PHP Provider:
 # install-pear install-build install-headers install-programs
 # for use by other ebuilds:
-# install-cli install-sapi install-modules install-programs
+# install-sapi install-modules install-programs
 #
 # all ebuilds should have install-programs, and then delete everything except
 # php-config.${PN}
 
 # These are quick fixups for older ebuilds that didn't have PHPSAPI defined.
-[ -z "${PHPSAPI}" ] && [ "${PN}" = "php" ] && PHPSAPI="cli"
-if [ -z "${PHPSAPI}" ] && [ "${PN}" = "mod_php" ]; then
+[ -z "${PHPSAPI}" -a "${PN}" = "php" ] && PHPSAPI="cli"
+if [ -z "${PHPSAPI}" -a "${PN}" = "mod_php" ]; then
 	use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
 fi
 
@@ -157,7 +188,8 @@ if [ -z "${PHPSAPI}" ]; then
 	eerror "${msg}"
 	die "${msg}"
 fi
-# build the destination and php.ini details
+
+# build the destination and php.ini detail
 PHPINIDIRECTORY="/etc/php/${PHPSAPI}-php${PHPMAJORVER}"
 PHPINIFILENAME="php.ini"
 
@@ -176,7 +208,7 @@ php-sapi_check_java_config() {
 		eerror
 		eerror "PHP will not build using the Kaffe Java Virtual Machine."
 		eerror "Please change your JVM to either Blackdown or Sun's."
-		eerror 
+		eerror
 		eerror "To build PHP without Java support, please re-run this emerge"
 		eerror "and place the line:"
 		eerror "  USE='-java'"
@@ -187,20 +219,27 @@ php-sapi_check_java_config() {
 		die
 	fi
 
-	JDKVER="$(java-config --java-version 2>&1 | head -n1 | cut -d\" -f2)"
-	einfo "JDK version: ${JDKVER}"
-	if [ -n "${JDKVER/1.4.*}" -o -z "${JDKVER}" ]; then
-		eerror "Please ensure that you have a JDK with a version of at least"
-		eerror "1.4 selected using java-config"
-		die
-	fi
+	JDKVER=$(java-config --java-version 2>&1 | awk '/^java version/ { print $3 }' | xargs )
+	einfo "Active JDK version: ${JDKVER}"
+	case ${JDKVER} in
+		1.4.*) ;;
+		1.5.*) ewarn "Java 1.5 is NOT supported at this time, and might not work." ;;
+		*) eerror "A Java 1.4 JDK is required for Java support in PHP." ; die ;;
+	esac
 }
 
 php-sapi_src_unpack() {
-	use xml || \
-	( ewarn "You have the xml USE flag turned off. Previously this"
-	  ewarn "disabled XML support in PHP. However PEAR has a hard"
-	  ewarn "dependancy on it, so they are now enabled." )
+	php-sapi_warning_mssql_freetds
+	# this is obsolete
+	# use xml || \
+	# ( ewarn "You have the xml USE flag turned off. Previously this"
+	#   ewarn "disabled XML support in PHP. However PEAR has a hard"
+	#   ewarn "dependancy on it, so they are now enabled." )
+
+	if use fdftk; then
+		has_version app-text/fdftk || \
+		die "app-text/fdftk is required for FDF support! Portage isn't up to the DEPEND structure for it yet"
+	fi
 
 	unpack ${MY_P}.tar.bz2
 	cd ${S}
@@ -210,22 +249,45 @@ php-sapi_src_unpack() {
 	# ensure correct perms on configure
 	chmod 755 configure
 
+	uclibctoolize
 
 	# no longer needed and breaks pear - Tal, 20031223
-	
+
 	# fix PEAR installer for our packaging
 	# we keep a backup of it as we need it at the end of the install
 	#cp pear/PEAR/Registry.php pear/PEAR/Registry.old
 	#sed -e "s:\$pear_install_dir\.:\'${D}/usr/lib/php/\' . :g" -i pear/PEAR/Registry.php
+
+	sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure
+
+	# Bug 47498
+	[ "${PV//4.3.6}" != "${PV}" ] && EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/php-4.3.6-pcrealloc.patch
+
+	# Bug 46768
+	use kerberos && sed -i "s:-lgssapi_krb5:-lgssapi:" configure
+
+	use hardenedphp && [ -n "$HARDENEDPHP_PATCH" ] && epatch ${DISTDIR}/${HARDENEDPHP_PATCH}
 }
 
 
 php-sapi_src_compile() {
-	[ -x "/usr/sbin/sendmail" ] || die "You need a virtual/mta that provides /usr/sbin/sendmail!"
+	# cache this
+	libdir="$(get_libdir)"
+
+	# sanity checks
+	if [ ! -x "/usr/sbin/sendmail" ]; then
+		msg="You need a virtual/mta that provides /usr/sbin/sendmail!"
+		eerror "${msg}"
+		die "${msg}"
+	fi
 
-	[ -f "/proc/self/stat" ] || die "You need /proc mounted for configure to complete correctly!"
+	if [ ! -f "/proc/self/stat" ]; then
+		msg="You need /proc mounted for configure to complete correctly!"
+		eerror "${msg}"
+		die "${msg}"
+	fi
 
-	use java && php-sapi_check_java_config
+	use java && use !alpha && use !amd64 && php-sapi_check_java_config
 
 	if use berkdb; then
 		einfo "Enabling NBDM"
@@ -247,13 +309,16 @@ php-sapi_src_compile() {
 	fi
 
 	myconf="${myconf} `use_with crypt mcrypt /usr` `use_with crypt mhash /usr`"
-	myconf="${myconf} `use_with firebird interbase /opt/interbase`"
+	use x86 && myconf="${myconf} `use_with firebird interbase /opt/interbase`"
 	myconf="${myconf} `use_with flash ming /usr`"
 	use x86 && myconf="${myconf} `use_with flash swf /usr`"
 	myconf="${myconf} `use_with freetds sybase /usr`"
 	myconf="${myconf} `use_with gdbm gdbm /usr`"
-	myconf="${myconf} `use_with java java ${JAVA_HOME}`"
+	use x86 && myconf="${myconf} `use_with fdftk fdftk /opt/fdftk-6.0`"
+	use !alpha && myconf="${myconf} `use_with java java ${JAVA_HOME}`"
 	myconf="${myconf} `use_with mcal mcal /usr`"
+	# fix bug 55150, our mcal is PAM-enabled
+	use mcal && use pam && ! use imap && LDFLAGS="${LDFLAGS} -lpam"
 	[ -n "${INFORMIXDIR}" ] && myconf="${myconf} `use_with informix informix ${INFORMIXDIR}`"
 	[ -n "${ORACLE_HOME}" ] && myconf="${myconf} `use_with oci8 oci8 ${ORACLE_HOME}`"
 	myconf="${myconf} `use_with odbc unixODBC /usr`"
@@ -261,47 +326,45 @@ php-sapi_src_compile() {
 	myconf="${myconf} `use_with snmp snmp /usr`"
 	use snmp && myconf="${myconf} --enable-ucd-snmp-hack"
 	use X && myconf="${myconf} --with-xpm-dir=/usr/X11R6" LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib"
-	
+	myconf="${myconf} `use_with gmp`"
+	myconf="${myconf} `use_with mssql mssql /usr`"
+
+	myconf="${myconf} --without-crack --without-pdflib"
+
 	# This chunk is intended for png/tiff/jpg, as there are several things that need them, indepentandly!
 	REQUIREPNG=
 	REQUIREJPG=
 	REQUIRETIFF=
-	if use pdflib; then
-		myconf="${myconf} --with-pdflib=/usr" 
-		REQUIREPNG=1 REQUIREJPG=1 REQUIRETIFF=1
-	else
-		myconf="${myconf} --without-pdflib"
-	fi
-
 	if use gd-external; then
 		myconf="${myconf} --with-gd=/usr"
 		REQUIREPNG=1
-		if has_version '>=media-libs/libgd-2.0.17'; then
-			einfo "Fixing PHP for libgd function name changes"
+		if has_version '>=media-libs/gd-2.0.17'; then
+			einfo "Fixing PHP for gd function name changes"
 			sed -i 's:gdFreeFontCache:gdFontCacheShutdown:' ${S}/ext/gd/gd.c
 		fi
 	elif use gd; then
 		myconf="${myconf} --with-gd"
-		myconf="${myconf} `use_enable truetype gd-native-ttf`" 
 		REQUIREPNG=1 REQUIREJPG=1
 	else
 		myconf="${myconf} --without-gd"
 	fi
+	use gd-external || use gd && myconf="${myconf} `use_enable truetype gd-native-ttf`"
+
 	use png && REQUIREPNG=1
 	use jpeg && REQUIREJPG=1
 	use tiff && REQUIRETIFF=1
 	if [ -n "${REQUIREPNG}" ]; then
-		myconf="${myconf} --with-png=/usr --with-png-dir=/usr" 
+		myconf="${myconf} --with-png=/usr --with-png-dir=/usr"
 	else
 		myconf="${myconf} --without-png"
 	fi
 	if [ -n "${REQUIREJPG}" ]; then
-		myconf="${myconf} --with-jpeg=/usr --with-jpeg-dir=/usr --enable-exif" 
+		myconf="${myconf} --with-jpeg=/usr --with-jpeg-dir=/usr --enable-exif"
 	else
-		myconf="${myconf} --without-jpeg" 
+		myconf="${myconf} --without-jpeg"
 	fi
 	if [ -n "${REQUIRETIFF}" ]; then
-		myconf="${myconf} --with-tiff=/usr --with-tiff-dir=/usr" 
+		myconf="${myconf} --with-tiff=/usr --with-tiff-dir=/usr"
 		LDFLAGS="${LDFLAGS} -ltiff"
 	else
 		myconf="${myconf} --without-tiff"
@@ -327,15 +390,15 @@ php-sapi_src_compile() {
 		myconf="${myconf} --without-ttf --without-t1lib"
 	fi
 
-	myconf="${myconf} `use_with nls gettext` `use_with qt qtdom /usr/qt/3`"
+	myconf="${myconf} `use_with nls gettext`"
 	myconf="${myconf} `use_with spell pspell /usr` `use_with ssl openssl /usr`"
 	myconf="${myconf} `use_with imap imap /usr` `use_with ldap ldap /usr`"
 	myconf="${myconf} `use_with xml2 dom /usr` `use_with xml2 dom-xslt /usr`"
 	myconf="${myconf} `use_with xml2 dom-exslt /usr`"
-	myconf="${myconf} `use_with kerberos kerberos /usr` `use_with pam`"
+	myconf="${myconf} `use_with kerberos` `use_with pam`"
 	myconf="${myconf} `use_enable memlimit memory-limit`"
 	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_with yaz`"
+	myconf="${myconf} `use_with yaz` `use_enable debug`"
 	if use curl; then
 		myconf="${myconf} --with-curlwrappers --with-curl=/usr"
 	else
@@ -345,13 +408,13 @@ php-sapi_src_compile() {
 	#Waiting for somebody to want Cyrus support :-)
 	#myconf="${myconf} `use_with cyrus`"
 
-	# dbx AT LEAST one of mysql/odbc/postgres/oci8
-	use mysql || use odbc || use postgres || use oci8 \
+	# dbx AT LEAST one of mysql/odbc/postgres/oci8/mssql
+	use mysql || use odbc || use postgres || use oci8 || use mssql \
 		&& myconf="${myconf} --enable-dbx" \
 		|| myconf="${myconf} --disable-dbx"
 
 	use imap && use ssl && \
-	if [ -n "`strings ${ROOT}/usr/lib/c-client.a 2>/dev/null | grep ssl_onceonlyinit`" ]; then
+	if [ -n "`strings ${ROOT}/usr/${libdir}/c-client.a 2>/dev/null | grep ssl_onceonlyinit`" ]; then
 		myconf="${myconf} --with-imap-ssl"
 		einfo "Building IMAP with SSL support."
 	else
@@ -359,14 +422,14 @@ php-sapi_src_compile() {
 		ewarn "Skipping IMAP-SSL support."
 	fi
 
-	
+
 	# These were previously optional, but are now included directly as PEAR needs them.
 	# Zlib is needed for XML
 	myconf="${myconf} --with-zlib=/usr --with-zlib-dir=/usr"
 	LIBS="${LIBS} -lxmlparse -lxmltok"
 	myconf="${myconf} --with-sablot=/usr"
-	myconf="${myconf} --enable-xslt" 
-	myconf="${myconf} --with-xslt-sablot" 
+	myconf="${myconf} --enable-xslt"
+	myconf="${myconf} --with-xslt-sablot"
 	myconf="${myconf} --with-xmlrpc"
 	myconf="${myconf} --enable-wddx"
 	myconf="${myconf} --with-xml"
@@ -382,11 +445,9 @@ php-sapi_src_compile() {
 	# heart so desired
 	# DEPEND - app-arch/bzip2
 	myconf="${myconf} --with-bz2=/usr"
-	# DEPEND - sys-libs/cracklib
-	myconf="${myconf} --with-crack=/usr"
 	# DEPEND - nothing
 	myconf="${myconf} --with-cdb"
-	
+
 	# No DEPENDancies
 	myconf="${myconf} --enable-pcntl"
 	myconf="${myconf} --enable-bcmath"
@@ -394,9 +455,9 @@ php-sapi_src_compile() {
 	myconf="${myconf} --enable-dbase"
 	myconf="${myconf} --enable-filepro"
 	myconf="${myconf} --enable-ftp"
-	myconf="${myconf} --with-mime-magic"
+	myconf="${myconf} --with-mime-magic=/usr/share/misc/file/magic.mime"
 	myconf="${myconf} --enable-sockets"
-	myconf="${myconf} --enable-sysvsem --enable-sysvshm --enable-sysvipc"
+	myconf="${myconf} --enable-sysvsem --enable-sysvshm --enable-sysvmsg"
 	myconf="${myconf} --with-iconv"
 	myconf="${myconf} --enable-shmop"
 	myconf="${myconf} --enable-dio"
@@ -424,23 +485,47 @@ php-sapi_src_compile() {
 		--enable-inline-optimization \
 		--enable-track-vars \
 		--enable-trans-sid \
-		--enable-versioning \
-		--with-config-file-path=${PHPINIDIRECTORY}" 
+		--enable-versioning"
 
-	#fixes bug #24373 
+	einfo "Using INI file: ${PHPINIDIRECTORY}/${PHPINIFILENAME}"
+	myconf="${myconf} \
+		--with-config-file-path=${PHPINIDIRECTORY}"
+
+	myconf="${myconf} --libdir=/usr/${libdir}/php"
+
+	# only provide pear is we are a provider build, and if we do, put it in
+	# /usr/lib/php.
+	if php-sapi_is_providerbuild; then
+		myconf="${myconf} --with-pear=/usr/lib/php"
+	else
+		myconf="${myconf} --without-pear"
+	fi
+
+
+	# fix ELF-related problems
+	if has_pic ; then
+		myconf="${myconf} --with-pic"
+	fi
+
+	# filter the following from C[XX]FLAGS regardless, as apache won't be
+	# supporting LFS until 2.2 is released and in the tree.  Fixes bug #24373.
 	filter-flags "-D_FILE_OFFSET_BITS=64"
 	filter-flags "-D_FILE_OFFSET_BITS=32"
 	filter-flags "-D_LARGEFILE_SOURCE=1"
 	filter-flags "-D_LARGEFILE_SOURCE"
+
 	#fixes bug #14067
-	# changed order to run it in reverse for bug #32022 and #12021 
+	# changed order to run it in reverse for bug #32022 and #12021
 	replace-flags "-march=k6-3" "-march=i586"
 	replace-flags "-march=k6-2" "-march=i586"
 	replace-flags "-march=k6" "-march=i586"
 
+	# Bug 98694
+	addpredict /etc/krb5.conf
+
 	if [ -z "${PHP_SKIP_CONFIGURE}" ]; then
-	LIBS="${LIBS}" econf \
-		${myconf} || die "bad ./configure"
+		LDFLAGS="${LDFLAGS} -L/usr/${libdir}" LIBS="${LIBS}" econf \
+		${myconf} || die "bad ./configure, please include ${MY_P}/config.log in any bug reports."
 	fi
 
 	if [ -z "${PHP_SKIP_MAKE}" ]; then
@@ -449,25 +534,33 @@ php-sapi_src_compile() {
 }
 
 php-sapi_src_install() {
+	# cache this
+	libdir="$(get_libdir)"
+
 	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
 	dodir /usr/bin
-	dodir /usr/lib/php
+	dodir /usr/${libdir}/php
 	dodir /usr/include/php
 
 	# parallel make breaks it
 	# so no emake here
+	einfo "Running make INSTALL_ROOT=${D} ${PHP_INSTALLTARGETS}"
 	make INSTALL_ROOT=${D} ${PHP_INSTALLTARGETS} || die
 
 	# install a php-config for EACH instance of php
 	# the PHP provider $PHP_PROVIDER_PKG one is the default
 	mv ${D}/usr/bin/php-config ${D}/usr/bin/php-config.${PN}
 	# these files are provided solely by the PHP provider ebuild
-	php-sapi_is_providerbuild && dosym /usr/bin/php-config.${PN} /usr/bin/php-config
-	php-sapi_is_providerbuild || rm ${D}/usr/bin/{phpize,phpextdist}
+	if php-sapi_is_providerbuild ; then
+		dosym /usr/bin/php-config.${PN} /usr/bin/php-config
+	else
+		rm -rf ${D}/usr/bin/{phpize,phpextdist,php} ${D}/usr/${libdir}/php/build
+	fi
 
 	# get the extension dir
 	PHPEXTDIR="`${D}/usr/bin/php-config.${PN} --extension-dir`"
-	
+
 	for doc in LICENSE EXTENSIONS CREDITS INSTALL README.* TODO* NEWS; do
 		[ -s "$doc" ] && dodoc $doc
 	done
@@ -483,7 +576,7 @@ php-sapi_src_install() {
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
 
-	if use java; then
+	if use java && use !alpha; then
 		# we put these into /usr/lib so that they cannot conflict with
 		# other versions of PHP (e.g. PHP 4 & PHP 5)
 		insinto ${PHPEXTDIR}
@@ -501,12 +594,57 @@ php-sapi_src_install() {
 		dosym ${PHPEXTDIR}/java.so ${PHPEXTDIR}/libphp_java.so
 	fi
 
-	#url_fopen
-	patch ${phpinisrc} <${DISTDIR}/php-4.3.2-fopen-url-secure.patch
+	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
+	# fed bad data from outside.
+	if [ "${PHPSAPI}" != "cli" ]; then
+		einfo "Securing fopen wrappers"
+		patch ${phpinisrc} <${DISTDIR}/php-4.3.2-fopen-url-secure.patch
+	fi
+
+	# Patch for bug 50991, 49420
+	# Make sure the correct include_path is used.
+	einfo "Setting correct include_path"
+	patch ${phpinisrc} <${DISTDIR}/php-4.3.6-includepath.diff
 
 	# A lot of ini file funkiness
 	insinto ${PHPINIDIRECTORY}
 	newins ${phpinisrc} ${PHPINIFILENAME}
+
+	# 2004/03/28 - stuart@gentoo.org
+	#
+	# This is where we install header files that PHP itself doesn't install,
+	# but which PECL packages depend on
+	if php-sapi_is_providerbuild; then
+		for x in ext/gd/gdcache.h ext/gd/gdttf.h ext/gd/php_gd.h ext/gd/libgd/gd.h ext/gd/libgd/gd_io.h ext/gd/libgd/gdcache.h ext/gd/libgd/gdfontg.h ext/gd/libgd/gdfontl.h ext/gd/libgd/gdfontmb.h ext/gd/libgd/gdfonts.h ext/gd/libgd/gdfontt.h ext/gd/libgd/gdhelpers.h ext/gd/libgd/jisx0208.h ext/gd/libgd/wbmp.h ext/mbstring/libmbfl/mbfl/mbfilter.h ext/mbstring/libmbfl/mbfl/mbfl_defs.h ext/mbstring/libmbfl/mbfl/mbfl_consts.h ext/mbstring/libmbfl/mbfl/mbfl_allocators.h ext/mbstring/libmbfl/mbfl/mbfl_encoding.h ext/mbstring/libmbfl/mbfl/mbfl_language.h ext/mbstring/libmbfl/mbfl/mbfl_string.h ext/mbstring/libmbfl/mbfl/mbfl_convert.h ext/mbstring/libmbfl/mbfl/mbfl_ident.h ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h; do
+			my_headerdir="/usr/include/php/`dirname $x`"
+			#echo "$my_headerdir"
+			if [ ! -d "${D}$my_headerdir" ]; then
+				mkdir -p ${D}$my_headerdir
+			fi
+			cp $x ${D}/usr/include/php/$x
+		done
+	else
+		rm -rf ${D}/usr/include/php/
+	fi
+
+	if php-sapi_is_providerbuild; then
+		insinto /usr/${libdir}/php
+		doins ${S}/run-tests.php
+		fperms 644 /usr/${libdir}/php/run-tests.php
+		einfo "Fixing PEAR cache location"
+		local oldloc="${T}/pear/cache"
+		local old="s:${#oldloc}:\"${oldloc}\""
+		local newloc="/tmp/pear/cache"
+		local new="s:${#newloc}:\"${newloc}\""
+		sed "s|${old}|${new}|" -i ${D}/etc/pear.conf
+		keepdir /tmp/pear/cache
+	else
+		einfo "Removing duplicate PEAR conf file"
+		rm -f ${D}/etc/pear.conf 2>/dev/null
+	fi
+
+	# clean up documentation
+	php-sapi_is_providerbuild || rm -rf ${D}/usr/share/man/man1/php.1*
 }
 
 php-sapi_pkg_preinst() {
@@ -523,11 +661,23 @@ php-sapi_pkg_preinst() {
 
 php-sapi_pkg_postinst() {
 	einfo "The INI file for this build is ${PHPINIDIRECTORY}/php.ini"
+	php-sapi_warning_mssql_freetds
 	if has_version 'dev-php/php-core'; then
 		ewarn "The dev-php/php-core package is now obsolete. You should unmerge"
 		ewarn "it, and re-merge >=dev-php/php-4.3.4-r2 afterwards to ensure"
 		ewarn "your PHP installation is consistant."
 	fi
+	if has_version "<${PV}"; then
+		ewarn "The php, php-cgi, and mod_php ebuilds no longer supply the"
+		ewarn "crack and pdflib extensions. If you need these, please use"
+		ewarn "the corresponding PECL packages by emerging PECL-crack or"
+		ewarn "PECL-pdflib, respectively."
+	fi
+	ewarn "If you have additional third party PHP extensions (such as"
+	ewarn "dev-php/eaccelerator) you may need to recompile them now."
+	if use curl; then
+		ewarn "Please be aware that CURL can allow the bypass of open_basedir restrictions."
+	fi
 }
 
 php-sapi_securityupgrade() {
@@ -540,3 +690,10 @@ php-sapi_securityupgrade() {
 		einfo "However it is not critical for your machine"
 	fi
 }
+
+php-sapi_warning_mssql_freetds() {
+	ewarn "If you have both freetds and mssql in your USE flags, parts of PHP"
+	ewarn "may not behave correctly, or may give strange warnings. You have"
+	ewarn "been warned! It's recommended that you pick ONE of them. For sybase"
+	ewarn "support, chose 'freetds'. For mssql support choose 'mssql'."
+}
diff --git a/eclass/php.eclass b/eclass/php.eclass
index 313903fa636b..3399fe9549ac 100644
--- a/eclass/php.eclass
+++ b/eclass/php.eclass
@@ -1,229 +1,155 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.1.1.1 2005/11/30 09:59:27 chriswhite Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.1 2003/04/23 09:50:02 robbat2 Exp $
-ECLASS=php
-INHERITED="$INHERITED $ECLASS"
 
-import eutils flag-o-matic
-
-EXPORT_FUNCTIONS src_unpack src_compile src_install 
-
-MY_P=php-${PV}
+# This eclass is the old style of php, that was used before php-core was
+# introduced.
+
+inherit eutils flag-o-matic
+
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_preinst
+
+[ -z "${MY_PN}" ] && MY_PN=php
+if [ -z "${MY_PV}" ]; then
+	MY_PV=${PV/_rc/RC}
+	# maybe do stuff for beta/alpha/pre here too?
+fi
+
+# our major ver number
+PHPMAJORVER=${MY_PV//\.*}
+
+[ -z "${MY_P}" ] && MY_P=${MY_PN}-${MY_PV}
+[ -z "${MY_PF}" ] && MY_PF=${MY_P}-${PR}
+[ -z "${HOMEPAGE}" ] && HOMEPAGE="http://www.php.net/"
+[ -z "${LICENSE}" ]	&& LICENSE="PHP"
+[ -z "${PROVIDE}" ]	&& PROVIDE="virtual/php"
+# PHP.net does automatic mirroring from this URI
+[ -z "${SRC_URI_BASE}" ] && SRC_URI_BASE="http://www.php.net/distributions"
+if [ -z "${SRC_URI}" ]; then
+	SRC_URI="${SRC_URI_BASE}/${MY_P}.tar.bz2"
+fi
+# A patch for PHP for security
+SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch"
+[ "${MY_PV}" = "4.3.4" ] && SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.4-phpizeexecfix.patch"
+
+# Where we work
 S=${WORKDIR}/${MY_P}
-[ -z "$HOMEPAGE" ]	&& HOMEPAGE="http://www.php.net/"
-[ -z "$LICENSE" ]	&& LICENSE="PHP"
-[ -z "$SRC_URI" ] 	&& SRC_URI="http://us3.php.net/distributions/${MY_P}.tar.bz2"
-[ -z "$PROVIDE" ]	&& PROVIDE="virtual/php"
-
-IUSE="${IUSE} X berkdb cjk crypt curl firebird flash freetds gd gdbm imap jpeg ldap libwww mysql nls oci8 odbc pam pdflib png postgres qt snmp spell ssl tiff truetype xml xml2"
-#removed: java gmp
-#both cause breakage
-
-DEPEND="${DEPEND}
-    X? ( virtual/x11 )
-    berkdb? ( >=sys-libs/db-3 )
-    crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-    curl? ( >=net-ftp/curl-7.10.2 )
-    firebird? ( >=dev-db/firebird-1.0 )
-    flash? ( media-libs/libswf >=media-libs/ming-0.2a )
-    freetds? ( >=dev-db/freetds-0.53 )
-    gd? ( media-libs/libgd )
-    gdbm? ( >=sys-libs/gdbm-1.8.0 )
-    imap? ( >=net-mail/uw-imap-2001a-r1 )
-    jpeg? ( >=media-libs/jpeg-6b )
-    ldap? ( >=net-nds/openldap-1.2.11 )
-    libwww? ( >=net-libs/libwww-5.3.2 )
-    mysql? ( >=dev-db/mysql-3.23.26 )
-    nls? ( sys-devel/gettext )
-    odbc? ( >=dev-db/unixODBC-1.8.13 )
-    pam? ( >=sys-libs/pam-0.75 )
-    pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
-    png? ( >=media-libs/libpng-1.2.5 )
-    postgres? ( >=dev-db/postgresql-7.1 )
-    qt? ( x11-libs/qt )
-    snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
-    spell? ( app-text/aspell )
-    ssl? ( >=dev-libs/openssl-0.9.5 )
-    tiff? ( >=media-libs/tiff-3.5.5 )
-    truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
-    xml2? ( dev-libs/libxml2 )
-    xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.96 )
-	"
-
-
-RDEPEND="${RDEPEND}
-	xml? ( >=app-text/sablotron-0.95-r1 >=net-libs/libwww-5.3.2 )
-	qt? ( >=x11-libs/qt-2.3.0 )"
-
-
-#fixes bug #14067
-replace-flags "-march=k6*" "-march=i586"
 
-php_src_unpack() {
-    unpack ${MY_P}.tar.bz2
-    cd ${S}
-
-    # Configure Patch for wired uname -a
-    mv configure configure.old
-    cat configure.old | sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" > configure
-    chmod 755 configure
-
-    # fix PEAR installer
-    cp pear/PEAR/Registry.php pear/PEAR/Registry.old
-    sed "s:\$pear_install_dir\.:\'$D/usr/lib/php/\' . :g" pear/PEAR/Registry.old > pear/PEAR/Registry.php
-
-	#if [ "`use java`" ] ; then
-
-	#	cp configure configure.orig
-	#	cat configure.orig | \
-	#		sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf $LIBS"/' \
-	#		> configure
-
-	#	cp ext/gd/gd.c ext/gd/gd.c.orig
-	#	cat ext/gd/gd.c.orig | \
-	#		sed -e "s/typedef FILE gdIOCtx;//" \
-	#		> ext/gd/gd.c
-	#	if [ "$JAVAC" ];
-	#	then
-	#              cp ext/java/Makefile.in ext/java/Makefile.in.orig
-	#              cat ext/java/Makefile.in.orig | \
-	#                      sed -e "s/^\tjavac/\t\$(JAVAC)/" \
-	#                      > ext/java/Makefile.in
-	#	fi
-	#fi
-
-	# pear's world writable files is a php issue fixed in their cvs tree.
-	# http://bugs.php.net/bug.php?id=20978
-	# http://bugs.php.net/bug.php?id=20974
-	epatch ${FILESDIR}/pear_config.diff || die "epatch failed"
+IUSE="${IUSE} X crypt curl firebird flash freetds gd gd-external gdbm imap informix ipv6 java jpeg ldap mcal memlimit mysql nls oci8 odbc pam pdflib png postgres qt snmp spell ssl tiff truetype xml2"
+
+# berkdb stuff is complicated
+# we need db-1.* for ndbm
+# and then either of db3 or db4
+IUSE="${IUSE} berkdb"
+RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1.*
+							  || ( >=sys-libs/db-4.0.14-r2
+								   >=sys-libs/db-3.2.9-r9
+							     )
+							)"
+
+# Everything is in this list is dynamically linked agaist or needed at runtime
+# in some other way
+RDEPEND="
+   >=sys-libs/cracklib-2.7-r7
+   app-arch/bzip2
+   X? ( virtual/x11 )
+   crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
+   curl? ( >=net-misc/curl-7.10.2 )
+   x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
+   freetds? ( >=dev-db/freetds-0.53 )
+   gd-external? ( media-libs/gd >=media-libs/jpeg-6b
+                  >=media-libs/libpng-1.2.5 )
+   gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 )
+   gdbm? ( >=sys-libs/gdbm-1.8.0 )
+   !alpha? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) )
+   jpeg? ( >=media-libs/jpeg-6b )
+   ldap? ( >=net-nds/openldap-1.2.11 )
+   mysql? ( >=dev-db/mysql-3.23.26 )
+   nls? ( sys-devel/gettext )
+   odbc? ( >=dev-db/unixODBC-1.8.13 )
+   pam? ( >=sys-libs/pam-0.75 )
+   pdflib? ( >=media-libs/pdflib-4.0.3 >=media-libs/jpeg-6b
+             >=media-libs/libpng-1.2.5 >=media-libs/tiff-3.5.5 )
+   png? ( >=media-libs/libpng-1.2.5 )
+   postgres? ( >=dev-db/postgresql-7.1 )
+   qt? ( >=x11-libs/qt-2.3.0 )
+   snmp? ( net-analyzer/net-snmp )
+   spell? ( app-text/aspell )
+   ssl? ( >=dev-libs/openssl-0.9.5 )
+   tiff? ( >=media-libs/tiff-3.5.5 )
+   xml2? ( dev-libs/libxml2 >=dev-libs/libxslt-1.0.30 )
+   truetype? ( =media-libs/freetype-2* =media-libs/freetype-1*
+               media-libs/t1lib )
+   >=net-libs/libwww-5.3.2
+   >=app-text/sablotron-0.97
+   dev-libs/expat
+   sys-libs/zlib
+   virtual/mta
+   virtual/libc"
+# virtual/libc line added as a fix for an rsync issue regarding cache
+# regeneration. It's harmless, but it causes that particular issue to
+# disappear. (sys-apps -> app-arch move stuff)
+
+# libswf is ONLY available on x86
+RDEPEND="${RDEPEND} flash? (
+		x86? ( media-libs/libswf )
+		>=media-libs/ming-0.2a )"
+
+#The new XML extension in PHP5 requires libxml2-2.5.10
+if [ "${PHPMAJORVER}" -ge 5 ]; then
+	RDEPEND="${RDEPEND} >=dev-libs/libxml2-2.5.10"
+fi
+
+# These are extra bits we need only at compile time
+DEPEND="${RDEPEND} ${DEPEND}
+	imap? ( virtual/imap-c-client )
+	mcal? ( dev-libs/libmcal )"
+#9libs causes a configure error
+DEPEND="${DEPEND} !dev-libs/9libs"
+#dev-libs/libiconv causes a compile failure
+DEPEND="${DEPEND} !dev-libs/libiconv"
+
+#Waiting for somebody to want this:
+#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev )
+
+#export this here so we can use it
+myconf="${myconf}"
 
-}
+PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules install-pear install-build install-headers install-programs"
 
-myconf="${myconf}"
+# These are quick fixups for older ebuilds that didn't have PHPSAPI defined.
+[ -z "${PHPSAPI}" ] && [ "${PN}" = "php" ] && PHPSAPI="cli"
+if [ -z "${PHPSAPI}" ] && [ "${PN}" = "mod_php" ]; then
+	use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1"
+fi
 
-php_src_compile() {
-	use berkdb && myconf="${myconf} --with-db3=/usr"
-	#---
-	use cjk && myconf="${myconf} --enable-mbstring --enable-mbregex"
-	#use cjk && myconf="${myconf} --enable-mbstring"
-	#---
-	use curl && myconf="${myconf} --with-curl"
-	use crypt && myconf="${myconf} --enable-mcrypt=/usr --with-mhash"
-	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
-	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
-	use freetds && myconf="${myconf} --with-sybase=/usr"
-	use gd && myconf="${myconf} --with-gd=/usr"
-	use gdbm && myconf="${myconf} --with-gdbm=/usr"
-	#--- check out this weirdness
-	#use jpeg && myconf="${myconf} --with-jpeg-dir=/usr"
-	#use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib" || myconf="${myconf} --without-jpeg"
-	use jpeg && myconf="${myconf} --with-jpeg-dir=/usr" || myconf="${myconf} --without-jpeg"
-	#---
-	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
-	use ldap &&  myconf="${myconf} --with-ldap"
-	use mysql && myconf="${myconf} --with-mysql=/usr" || myconf="${myconf} --without-mysql"
-	use nls && myconf="${myconf} --with-gettext" || myconf="${myconf} --without-gettext"
-	use odbc && myconf="${myconf} --with-unixODBC=/usr"
-	use pam && myconf="${myconf} --with-pam"
-	use pdflib && myconf="${myconf} --with-pdflib=/usr"
-	#---
-	use png && myconf="${myconf} --with-png-dir=/usr"
-	use png || myconf="${myconf} --without-png"
-	#---
-	use postgres && myconf="${myconf} --with-pgsql=/usr"
-	use qt && myconf="${myconf} --with-qtdom" 
-	use snmp && myconf="${myconf} --with-snmp --enable-ucd-snmp-hack"
-	use spell && myconf="${myconf} --with-pspell"
-	use ssl && myconf="${myconf} --with-openssl"
-	use tiff && myconf="${myconf} --with-tiff-dir=/usr" || myconf="${myconf} --without-tiff"
-	use truetype && myconf="${myconf} --with-ttf --with-t1lib"
-	use xml2 && myconf="${myconf} --with-dom"
-	use zlib && myconf="${myconf} --with-zlib --with-zlib-dir=/usr/lib"
-
-	# optional support for oracle oci8
-	use oci8 && [ -n "$ORACLE_HOME" ] && myconf="${myconf} --with-oci8=${ORACLE_HOME}"
-
-	use imap && use ssl && \
-	if [ "`strings ${ROOT}/usr/lib/c-client.a \ | grep ssl_onceonlyinit`" ] ; then
-		echo "Compiling imap with SSL support"
-		myconf="${myconf} --with-imap --with-imap-ssl"
-	else
-		echo "Compiling imap without SSL support"
-		myconf="${myconf} --with-imap"
-	fi
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-	if [ "`use X`" ] ; then
-		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-	
-	if [ "`use xml`" ] ; then
-		export LIBS="-lxmlparse -lxmltok"
-		myconf="${myconf} --with-sablot=/usr"
-		myconf="${myconf} --enable-xslt" 
-		myconf="${myconf} --with-xslt-sablot" 
-		myconf="${myconf} --with-xmlrpc"
-	fi
-	
-	#use java && myconf="${myconf} --with-java=${JAVA_HOME}"
-
-	myconf="${myconf} \
-		--enable-bcmath \
-		--enable-calendar \
-		--enable-dbase \
-		--enable-ftp \
-		--enable-exif \
-		--enable-inline-optimization \
-		--enable-sockets \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--enable-track-vars \
-		--enable-trans-sid \
-		--enable-versioning \
-		--with-config-file-path=/etc/php4 \
-		--with-bz2 \
-	"
-	#this is some stuff that MIGHT be questionable in some ebuilds
-	myconf="${myconf} \
-		--enable-wddx \
-		--host=${CHOST} \
-		--prefix=/usr"
-	#dev-php/php: wddx pear
-	#dev-php/mod_php: prefix host
-
-	econf \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
+# Now enforce existance of PHPSAPI
+if [ -z "${PHPSAPI}" ]; then
+	msg="The PHP eclass needs a PHPSAPI setting!"
+	eerror "${msg}"
+	die "${msg}"
+fi
+# build the destination and php.ini details
+PHPINIDIRECTORY="/etc/php/${PHPSAPI}-php${PHPMAJORVER}"
+PHPINIFILENAME="php.ini"
 
+php_src_unpack() {
+	die "This eclass must NOT be used."
+}
+php_src_compile() {
+	die "This eclass must NOT be used."
+}
+php_src_install() {
+	die "This eclass must NOT be used."
 }
 
+php_pkg_preinst() {
+	eerror "Warning it is NOT safe to use this version of PHP anymore"
+	eerror "You MUST upgrade to a newer version of PHP."
+}
 
-php_src_install() {
-	addwrite /usr/share/snmp/mibs/.index
-	
-	# put make here
-
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-
-	#install scripts
-	exeinto /usr/bin
-	doexe ${S}/pear/scripts/phpize
-	doexe ${S}/pear/scripts/php-config
-	doexe ${S}/pear/scripts/phpextdist
-	doexe ${S}/ext/ext_skel
-	
-	# PHP module building stuff
-	mkdir ${D}/usr/lib/php/build
-	insinto /usr/lib/php/build
-	doins build/* pear/pear.m4 acinclude.m4 configure.in Makefile.global scan_makefile_in.awk
-
-    #revert Pear patch
-    rm ${D}/usr/lib/php/PEAR/Registry.php
-    mv ${S}/pear/PEAR/Registry.old ${D}/usr/lib/php/PEAR/Registry.php
-	
+php_pkg_postinst() {
+	eerror "Warning it is NOT safe to use this version of PHP anymore"
+	eerror "You MUST upgrade to a newer version of PHP."
 }
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index 139f130670cf..efb9e08af32f 100644
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.1.1.1 2005/11/30 09:59:30 chriswhite Exp $
 #
 # ########################################################################
 #
@@ -14,12 +14,12 @@
 # Author(s)		Stuart Herbert
 #				<stuart@gentoo.org>
 #
-#				CHTEKK
-#				<chtekk@longitekk.org>
+#				Luca Longinotti
+#				<chtekk@gentoo.org>
 #
 # ========================================================================
 
-CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct"
+CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase mnogosearch msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct"
 EBUILD_SUPPORTS_SHAREDEXT=1
 
 inherit flag-o-matic eutils confutils libtool php-common-r1
@@ -39,27 +39,33 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug doc empress empress-bcs esoob exif fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java java-external jpeg kerberos ldap libedit mcal mcve memlimit mhash ming msql mssql mysql ncurses nls oci8 odbc oracle7 overload ovrimos pcntl pcre pear pfpro png posix postgres readline recode sapdb sasl session sharedext sharedmem snmp sockets solid spell sqlite ssl sybase sybase-ct sysvipc threads tiff tokenizer truetype wddx xml xml2 xmlrpc xpm xsl yaz zip zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker dbx debug doc empress empress-bcs esoob exif fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-internal java-external kerberos ldap libedit mcal mcve memlimit mhash ming mnogosearch msql mssql mysql ncurses nls oci8 oci8-instant-client odbc oracle7 overload ovrimos pcntl pcre pear pfpro pic posix postgres readline recode sapdb sasl session sharedext sharedmem snmp sockets solid spell sqlite ssl sybase sybase-ct sysvipc threads tiff tokenizer truetype wddx xml xml2 xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="${DEPEND}
 	!dev-php/php
 	!dev-php/php-cgi
 	!dev-php/mod_php
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18
+	>=sys-devel/automake-1.9.6
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59
+	sys-devel/autoconf-wrapper
 	berkdb? ( =sys-libs/db-4* )
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( dev-db/cdb )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
 	curl? ( >=net-misc/curl-7.10.5 )
 	fdftk? ( app-text/fdftk )
-	firebird? ( dev-db/firebird  )
+	firebird? ( dev-db/firebird )
+	gd? ( >=media-libs/jpeg-6b media-libs/libpng )
 	gd-external? ( media-libs/gd )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( dev-libs/gmp )
 	imap? ( virtual/imap-c-client )
 	iodbc? ( dev-db/libiodbc )
-	!alpha? ( !amd64? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) ) )
-	jpeg? ( >=media-libs/jpeg-6b )
+	java-internal? ( =virtual/jdk-1.4* dev-java/java-config !dev-php4/php-java-bridge )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	libedit? ( dev-libs/libedit )
@@ -71,14 +77,15 @@ DEPEND="${DEPEND}
 	mysql? ( dev-db/mysql )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	png? ( media-libs/libpng )
 	postgres? ( >=dev-db/postgresql-7.1 )
 	readline? ( sys-libs/readline )
 	recode? ( app-text/recode )
+	sasl? ( dev-libs/cyrus-sasl )
 	sharedmem? ( dev-libs/mm )
 	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	spell? ( >=app-text/aspell-0.60 )
+	spell? ( >=app-text/aspell-0.50 )
 	ssl? ( >=dev-libs/openssl-0.9.7 )
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
@@ -86,7 +93,8 @@ DEPEND="${DEPEND}
 	wddx? ( dev-libs/expat )
 	xpm? ( virtual/x11 )
 	xml? ( dev-libs/expat )
-	xml2? ( dev-libs/libxml2 )
+	xml2? ( dev-libs/libxml2 xsl? ( dev-libs/libxslt ) )
+	xmlrpc? ( dev-libs/expat )
 	xsl? ( app-text/sablotron dev-libs/expat )
 	zlib? ( sys-libs/zlib )
 	virtual/mta"
@@ -126,7 +134,9 @@ PHP_INI_FILE="php.ini"
 # the patch for different versions of PHP
 
 case "${PV}" in
-	4.4.0) HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.1.patch.gz" ;;
+	4.3.11) HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.3.patch.gz" ;;
+	4.4.0) HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.3.patch.gz" ;;
+	4.4.1) HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.5.patch.gz" ;;
 esac
 
 [ -n "${HARDENEDPHP_PATCH}" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/${HARDENEDPHP_PATCH} )"
@@ -157,31 +167,26 @@ php4_4-sapi_check_awkward_uses() {
 	# A variety of extensions need DBA
 	confutils_use_depend_all "berkdb"	"dba"
 	confutils_use_depend_all "cdb"		"dba"
-	confutils_use_depend_all "dbm"		"dba"
 	confutils_use_depend_all "flatfile"	"dba"
 	confutils_use_depend_all "gdbm"		"dba"
 	confutils_use_depend_all "inifile"	"dba"
 
 	# DBX checks
-	confutils_use_depend_any "dbx" "frontbase" "mssql" "odbc" "postgres" "sybase-ct" "oci8"
+	confutils_use_depend_any "dbx" "frontbase" "mssql" "odbc" "postgres" "sybase-ct" "oci8" "oci8-instant-client"
 
 	# DOM XML support
 	confutils_use_depend_all "xml2"		"zlib"
 
 	# EXIF only gets built if we support a file format that uses it
-	confutils_use_depend_any "exif" "jpeg" "tiff"
+	confutils_use_depend_any "exif" "gd" "tiff"
 
 	# support for the GD graphics library
 	confutils_use_conflict "gd" "gd-external"
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	confutils_use_depend_any "jpeg" "gd" "gd-external"
-	confutils_use_depend_any "png"  "gd" "gd-external"
-	confutils_use_depend_any "tiff" "gd" "gd-external"
-	confutils_use_depend_any "xpm"  "gd" "gd-external"
-	confutils_use_depend_all "png"  "zlib"
-
-	# Hardened-PHP doesn't work well with Apache; needs further investigation
-	confutils_use_conflict "hardenedphp" "apache" "apache2"
+	confutils_use_depend_any "cjk"	"gd" "gd-external"
+	confutils_use_depend_all "tiff"	"gd"
+	confutils_use_depend_all "xpm"	"gd"
+	confutils_use_depend_all "gd"	"zlib"
 
 	# IMAP support
 	php_check_imap
@@ -190,13 +195,14 @@ php4_4-sapi_check_awkward_uses() {
 	php_check_java
 
 	# Java-external support
-	confutils_use_conflict "java-external" "java"
+	confutils_use_conflict "java-external" "java-internal"
 	confutils_use_depend_all "java-external" "session"
 
 	# Mail support
 	php_check_mta
 
 	# Oracle support
+	confutils_use_conflict "oci8" "oci8-instant-client"
 	php_check_oracle
 
 	# LDAP-sasl support
@@ -218,7 +224,7 @@ php4_4-sapi_check_awkward_uses() {
 	confutils_use_depend_all "solid"		"odbc"
 
 	# PEAR support
-	confutils_use_depend_all "pear"			"cli" "pcre" "xml"
+	confutils_use_depend_all "pear"			"cli" "pcre" "xml" "zlib"
 
 	# Readline and libedit do the same thing; you can't have both
 	confutils_use_conflict "readline" "libedit"
@@ -244,16 +250,17 @@ php4_4-sapi_pkg_setup() {
 }
 
 php4_4-sapi_src_unpack() {
-	if [ "${PHP_PACKAGE}" == 1 ]; then
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
 		unpack ${A}
 	fi
 
-	cd ${PHP_S}
+	cd "${S}"
 
 	# Patch PHP to show Gentoo as the server platform
-	sed -i "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" configure
+	sed -e "s/PHP_UNAME=\`uname -a | xargs\`/PHP_UNAME=\`uname -s -n -r -v | xargs\`/g" -i configure.in
+
 	# Patch for PostgreSQL support
-	sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure
+	use postgres &&	sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i ext/pgsql/config.m4
 
 	# stop php from activating the apache config, as we will do that ourselves
 	for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
@@ -261,46 +268,61 @@ php4_4-sapi_src_unpack() {
 		sed -i.orig -e 's,-i -A -n php,-i -n php,g' ${i}
 	done
 
-	# hardenedphp support
-	use hardenedphp && [ -n "${HARDENEDPHP_PATCH}" ] && epatch ${DISTDIR}/${HARDENEDPHP_PATCH}
-
 	# imap support
-	use imap && epatch ${FILESDIR}/4.4.0/php4-imap-symlink.diff
+	use imap && epatch "${FILESDIR}/4-any/php4-imap-symlink.diff"
 
 	# iodbc support
-	use iodbc && epatch ${FILESDIR}/4.4.0/php4-iodbc-config.diff
-	use iodbc && epatch ${FILESDIR}/4.4.0/php4-with-iodbc.diff
-
-	# fix configure scripts to recognize uClibc
-	uclibctoolize
+	use iodbc && epatch "${FILESDIR}/4-any/php4-iodbc-config.diff"
+	use iodbc && epatch "${FILESDIR}/4-any/php4-with-iodbc.diff"
 
-	# Just in case ;-)
-	chmod 755 configure
+	# hardenedphp support
+	if use hardenedphp ; then
+		if [ -n "${HARDENEDPHP_PATCH}" ] ; then
+			epatch "${DISTDIR}/${HARDENEDPHP_PATCH}"
+		else
+			ewarn "There is no Hardened-PHP available for this PHP release yet!"
+		fi
+	fi
 
 	# fastbuild support
-	use fastbuild && epatch ${FILESDIR}/4.4.0/fastbuild.patch
+	use fastbuild && epatch "${FILESDIR}/4-any/php4-fastbuild.patch"
+
+	# fix uClibc support, as it does not have the dn_skipname() function
+	epatch "${FILESDIR}/4-any/php4-uClibc-have_dn_skipname.patch"
+
+	# fix configure scripts to correctly support HardenedPHP
+	# and patch PHP to support libtool 1.5
+	epatch "${FILESDIR}/4-any/php4-libtool-1.5.patch"
+	einfo "Running aclocal"
+	WANT_AUTOMAKE=1.9 aclocal --force || die "Unable to run aclocal successfully"
+	einfo "Running libtoolize"
+	libtoolize --copy --force || die "Unable to run libtoolize successfully"
 
 	# rebuild configure to make sure it's up to date
 	einfo "Rebuilding configure script"
-	WANT_AUTOCONF=2.5 autoconf -W no-cross || die "Unable to regenerate configure script"
+	WANT_AUTOCONF=2.5 autoreconf --force -W no-cross || die "Unable to regenerate configure script"
+
+	# run elibtoolize
+	elibtoolize
 
-	# fix DBA support
-	sed -e 's!for LIB in dbm c gdbm!for LIB in dbm c gdbm gdbm_compat!' -i configure
+	# Just in case ;-)
+	chmod 755 configure
 }
 
 set_php_ini_dir() {
 	PHP_INI_DIR="/etc/php/${PHPSAPI}-php4"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 
 php4_4-sapi_src_compile() {
 	destdir=/usr/$(get_libdir)/php4
 	set_php_ini_dir
 
-	cd ${PHP_S}
+	cd "${S}"
 	confutils_init
 
-	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} --with-config-file-scan-dir=${PHP_EXT_INI_DIR} --without-pear"
+	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE} --without-pear"
 
 	#				extension		USE flag		shared support?
 	enable_extension_enable		"bcmath"		"bcmath"		1
@@ -323,7 +345,6 @@ php4_4-sapi_src_compile() {
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_disable	"ipv6"			"ipv6"			0
 	# ircg extension not supported on Gentoo at this time
-	enable_extension_with 		"jpeg-dir" 		"jpeg" 			0 "/usr"
 	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
 	enable_extension_enable		"mbstring"		"nls"			1
 	enable_extension_with		"mcal"			"mcal"			1 "/usr"
@@ -332,10 +353,12 @@ php4_4-sapi_src_compile() {
 	enable_extension_enable		"memory-limit"	"memlimit"		0
 	enable_extension_with		"mhash"			"mhash"			1
 	enable_extension_with		"ming"			"ming"			1
+	enable_extension_with		"mnogosearch"	"mnogosearch"	1
 	enable_extension_with		"msql"			"msql"			1
 	enable_extension_with		"mssql"			"mssql"			1
 	enable_extension_with		"ncurses"		"ncurses"		1
 	enable_extension_with		"oci8"			"oci8"			1
+	enable_extension_with		"oci8-instant-client"	"oci8-instant-client"	1
 	enable_extension_with		"oracle"		"oracle7"		1
 	enable_extension_with		"openssl"		"ssl"			1
 	enable_extension_with		"openssl-dir"	"ssl"			0 "/usr"
@@ -369,7 +392,6 @@ php4_4-sapi_src_compile() {
 	if useq dba ; then
 		enable_extension_with "cdb"			"cdb"		1
 		enable_extension_with "db4"			"berkdb"	1
-		enable_extension_with "dbm"			"dbm"		1
 		enable_extension_with "flatfile"	"flatfile"	1
 		enable_extension_with "gdbm"		"gdbm"		1
 		enable_extension_with "inifile"		"inifile"	1
@@ -384,15 +406,16 @@ php4_4-sapi_src_compile() {
 	if useq gd-external ; then
 		enable_extension_with	"freetype-dir"	"truetype"		0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"		0 "/usr"
-		enable_extension_enable	"gd-jis-conv"	"nls" 			0
+		enable_extension_enable	"gd-jis-conv"	"cjk" 			0
 		enable_extension_enable	"gd-native-ttf"	"truetype"		0
 		enable_extension_with 	"gd" 			"gd-external"	1 "/usr"
 	else
 		enable_extension_with	"freetype-dir"	"truetype"		0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"		0 "/usr"
-		enable_extension_enable	"gd-jis-conv"	"nls"			0
+		enable_extension_enable	"gd-jis-conv"	"cjk"			0
 		enable_extension_enable	"gd-native-ttf"	"truetype"		0
-		enable_extension_with 	"png-dir" 		"png" 			0 "/usr"
+		enable_extension_with	"jpeg-dir"		"gd"			0 "/usr"
+		enable_extension_with 	"png-dir" 		"gd" 			0 "/usr"
 		enable_extension_with 	"tiff-dir" 		"tiff" 			0 "/usr"
 		enable_extension_with 	"xpm-dir" 		"xpm" 			0 "/usr/X11R6"
 		# enable gd last, so configure can pick up the previous settings
@@ -400,8 +423,8 @@ php4_4-sapi_src_compile() {
 	fi
 
 	# Java support
-	if useq java ; then
-		enable_extension_with	"java"			"java"			0 "`java-config --jdk-home`"
+	if useq java-internal ; then
+		enable_extension_with	"java"			"java-internal"		0 "`java-config --jdk-home`"
 	fi
 
 	# IMAP support
@@ -471,7 +494,7 @@ php4_4-sapi_src_compile() {
 	fi
 
 	# fix ELF-related problems
-	if has_pic ; then
+	if useq pic ; then
 		einfo "Enabling PIC support"
 		my_conf="${my_conf} --with-pic"
 	fi
@@ -500,15 +523,15 @@ php4_4-sapi_src_compile() {
 php4_4-sapi_src_install() {
 	destdir=/usr/$(get_libdir)/php4
 
-	cd ${PHP_S}
+	cd "${S}"
 	addpredict /usr/share/snmp/mibs/.index
 
 	PHP_INSTALLTARGETS="install-build install-headers install-programs"
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
-	make INSTALL_ROOT=${D} ${PHP_INSTALLTARGETS} || die "install failed"
+	make INSTALL_ROOT="${D}" ${PHP_INSTALLTARGETS} || die "install failed"
 
 	# get the extension dir
-	PHPEXTDIR="`${D}/${destdir}/bin/php-config --extension-dir`"
+	PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
 
 	# don't forget the php.ini file
 	local phpinisrc=php.ini-dist
@@ -522,25 +545,24 @@ php4_4-sapi_src_install() {
 
 	# Set the include path to point to where we want to find PEAR packages
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path .*|include_path = ".:/usr/share/php:/usr/share/php4"|' -i ${phpinisrc}
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php4:/usr/share/php"|' -i ${phpinisrc}
 
-	# Java install needs to insert the correct lines into phpinisrc
+	# Java module and support needs to be installed
 	php_install_java
 
-	# Install any extensions built as shared objects
-	if useq sharedext; then
-		for x in `ls ${D}/${PHPEXTDIR}/*.so | sort | sed -e "s|.*java.*||g"`; do
-			echo "extension=`basename ${x}`" >> ${phpinisrc}
-		done;
-	fi
-
 	# create the directory where we'll put php4-only php scripts
 	keepdir /usr/share/php4
 }
 
 php4_4-sapi_install_ini() {
+	destdir=/usr/$(get_libdir)/php4
+
+	# get the extension dir
+	PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
+
 	# work out where we are installing the ini file
 	set_php_ini_dir
+
 	local phpinisrc=php.ini-dist
 
 	dodir ${PHP_INI_DIR}
@@ -548,14 +570,89 @@ php4_4-sapi_install_ini() {
 	newins ${phpinisrc} ${PHP_INI_FILE}
 
 	dodir ${PHP_EXT_INI_DIR}
+	dodir ${PHP_EXT_INI_DIR_ACTIVE}
+
+	# Java needs to insert the correct ini files
+	php_install_java_inifile
+
+	# Install any extensions built as shared objects
+	if useq sharedext ; then
+		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort | sed -e "s|.*java.*||g"` ; do
+			inifilename=${x/.so/.ini}
+			inifilename=`basename ${inifilename}`
+			echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
+			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
+		done
+	fi
 }
 
 php4_4-sapi_pkg_postinst() {
+	# Create the symlinks for php-cli
+	if useq cli ; then
+		if test -h "/usr/bin/php"; then
+			ewarn "/usr/bin/php is a symlink."
+			ewarn "The PHP packages will not update that symlink,"
+			ewarn "please check it and do so yourself if you need"
+			ewarn "to, using eselect."
+			ewarn "For example with the command:"
+			ewarn "eselect php set php4"
+			ewarn "to symlink to /usr/lib/php4/bin/php."
+			ewarn
+		else
+			eselect php set php4
+		fi
+	fi
+
+	# Create the symlinks for php-cgi
+	if useq cgi ; then
+		if test -h "/usr/bin/php-cgi"; then
+			ewarn "/usr/bin/php-cgi is a symlink."
+			ewarn "The PHP packages will not update that symlink,"
+			ewarn "please check it and do so yourself if you need"
+			ewarn "to, using eselect."
+			ewarn "For example with the command:"
+			ewarn "eselect php-cgi set php4"
+			ewarn "to symlink to /usr/lib/php4/bin/php-cgi."
+			ewarn
+		else
+			eselect php-cgi set php4
+		fi
+	fi
+
+	# Create the symlinks for php-devel
+	if test -h "/usr/bin/phpize" || test -h "/usr/bin/php-config" ; then
+		ewarn "/usr/bin/phpize and/or /usr/bin/php-config are symlinks."
+		ewarn "The PHP packages will not update these symlinks,"
+		ewarn "please check them and do so yourself if you need"
+		ewarn "to, using eselect."
+		ewarn "For example with the command:"
+		ewarn "eselect php-devel set php4"
+		ewarn "to symlink to /usr/lib/php4/bin/phpize and"
+		ewarn "/usr/lib/php4/bin/php-config."
+		ewarn
+	else
+		eselect php-devel set php4
+	fi
+
 	ewarn "If you have additional third party PHP extensions (such as"
 	ewarn "dev-php4/phpdbg) you may need to recompile them now."
+	ewarn "A new way of enabling/disabling PHP extensions was introduced"
+	ewarn "with the newer PHP packages releases, so please reemerge any"
+	ewarn "PHP extensions you have installed to automatically adapt to"
+	ewarn "the new configuration layout."
+	ewarn
 
 	if useq curl; then
 		ewarn "Please be aware that CURL can allow the bypass of open_basedir restrictions."
 		ewarn "This can be a security risk!"
+		ewarn
 	fi
+
+	ewarn "The 'pic' USE flag was added to newer releases of dev-lang/php."
+	ewarn "With PIC enabled, your PHP installation may become slower, but"
+	ewarn "PIC is required on Hardened-Gentoo platforms (where the USE flag"
+	ewarn "is enabled automatically). You may also need this on other"
+	ewarn "configurations where you disabled TEXTRELs, for example using"
+	ewarn "PaX in the kernel."
+	ewarn
 }
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index 3dd19dbae118..634842b99bb8 100644
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.eclass
@@ -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/eclass/php5-sapi-r1.eclass,v 1.1 2005/03/13 22:05:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.1.1.1 2005/11/30 09:59:25 chriswhite Exp $
 #
-# eclass/php5-sapi.eclass
+# eclass/php5-sapi-r1.eclass
 #               Eclass for building different php5 SAPI instances
 #
 #               Based on robbat2's work on the php4 sapi eclass
@@ -12,10 +12,8 @@
 #
 # ========================================================================
 
-inherit eutils confutils libtool 
+inherit eutils confutils libtool
 
-ECLASS=php5-sapi
-INHERITED="$INHERITED $ECLASS"
 
 # set MY_P in the ebuild
 
@@ -23,18 +21,19 @@ HOMEPAGE="http://www.php.net/"
 LICENSE="PHP-3"
 SRC_URI="http://www.php.net/distributions/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzlib calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro firebird ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="$DEPEND
 	!<=dev-php/php-4.99.99
 	berkdb? ( =sys-libs/db-4* )
-	bzlib? ( app-arch/bzip2 )
-	cpdflib? ( >=media-libs/clibpdf-2* )
+	bzip2? ( app-arch/bzip2 )
+	cpdflib? ( >=media-libs/clibpdf-2 )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.2 )
+	curl? ( >=net-misc/curl-7.10.5 )
 	fam? ( virtual/fam )
 	fdftk? ( app-text/fdftk )
+	firebird? ( dev-db/firebird  )
 	gd-external? ( media-libs/gd )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( dev-libs/gmp )
@@ -71,7 +70,7 @@ DEPEND="$DEPEND
 	wddx? ( dev-libs/expat )
 	xpm? ( virtual/x11 )
 	xsl? ( dev-libs/libxslt )
-	zlib? ( sys-libs/zlib ) "
+	zlib? ( sys-libs/zlib )"
 
 # this would be xml2?, but PEAR requires XML support
 # and we always want to build PEAR.
@@ -96,7 +95,7 @@ EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst
 # INTERNAL FUNCTIONS
 # ========================================================================
 
-php5-sapi_check_awkward_uses() {
+php5-sapi-r1_check_awkward_uses() {
 
 	# snmp support seems broken, haven't looked into a fix for it yet
 
@@ -132,7 +131,7 @@ php5-sapi_check_awkward_uses() {
 		eerror
 		eerror "We have not been able to add iodbc support to Gentoo yet, as we"
 		eerror "have experienced difficulties in reaching www.iodbc.org."
-		eerror 
+		eerror
 		eerror "For now, please use the 'odbc' USE flag instead."
 		eerror
 		die "iodbc support incomplete; gentoo bug"
@@ -191,6 +190,7 @@ php5-sapi_check_awkward_uses() {
 	confutils_use_depend_any "png"  "gd" "gd-external"
 	confutils_use_depend_any "tiff" "gd" "gd-external"
 	confutils_use_depend_any "xpm"  "gd" "gd-external"
+	confutils_use_depend_all "png"  "zlib"
 
 	if useq imap ; then
 		enable_extension_with 	"imap" 			"imap" 		1
@@ -214,7 +214,7 @@ php5-sapi_check_awkward_uses() {
 	fi
 
 	if useq odbc ; then
-		enable_extension_with		"unixODBC"		"odbc"			1
+		enable_extension_with		"unixODBC"		"odbc"			1 "/usr"
 
 		enable_extension_with		"adabas"		"adabas"		1
 		enable_extension_with		"birdstep"		"birdstep"		1
@@ -225,13 +225,13 @@ php5-sapi_check_awkward_uses() {
 		fi
 		enable_extension_with		"esoob"			"esoob"			1
 		enable_extension_with		"ibm-db2"		"db2"			1
-		enable_extension_with		"iodbc"			"iodbc"			1
+		enable_extension_with		"iodbc"			"iodbc"			1 "/usr"
 		enable_extension_with		"sapdb"			"sapdb"			1
 		enable_extension_with		"solid"			"solid"			1
 	fi
 
 	if useq mysql; then
-		enable_extension_with		"mysql"			"mysql"			1 
+		enable_extension_with		"mysql"			"mysql"			1
 		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
 	fi
 	if useq mysqli; then
@@ -273,7 +273,7 @@ php5-sapi_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -302,16 +302,16 @@ php5-sapi_check_awkward_uses() {
 # EXPORTED FUNCTIONS
 # ========================================================================
 
-php5-sapi_pkg_setup() {
+php5-sapi-r1_pkg_setup() {
 	# let's do all the USE flag testing before we do anything else
 	# this way saves a lot of time
 
-	php5-sapi_check_awkward_uses
+	php5-sapi-r1_check_awkward_uses
 }
 
-php5-sapi_src_unpack() {
+php5-sapi-r1_src_unpack() {
 	unpack ${A}
-	# Fix for HTTP auth bug, #59755 
+	# Fix for HTTP auth bug, #59755
 	[ "x${PV}" == "x5.0.0" ] && epatch ${FILESDIR}/php-5.0.0-httpauthfix.patch
 
 	cd ${S}
@@ -339,7 +339,7 @@ php5-sapi_src_unpack() {
 	epatch ${FILESDIR}/${P}-missing-arches.patch
 }
 
-php5-sapi_src_compile() {
+php5-sapi-r1_src_compile() {
 	confutils_init
 
 	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}"
@@ -347,7 +347,7 @@ php5-sapi_src_compile() {
 
 	#							extension		USE flag		shared support?
 	enable_extension_enable		"bcmath"		"bcmath"		1
-	enable_extension_with		"bz2"			"bzlib"			1
+	enable_extension_with		"bz2"			"bzip2"			1
 	enable_extension_enable		"calendar"		"calendar"		1
 	enable_extension_with		"cpdflib"		"cpdflib"		1 # depends on jpeg
 	enable_extension_disable	"ctype"			"ctype"			0
@@ -368,9 +368,9 @@ php5-sapi_src_compile() {
 	enable_extension_with		"iconv"			"iconv"			1
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_with		"ingres"		"ingres"		1
-	enable_extension_with		"interbase"		"interbase"		1
+	enable_extension_with		"interbase"		"firebird"		1
 	# ircg extension not supported on Gentoo at this time
-	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
+	enable_extension_with		"kerberos"		"kerberos"		0
 	enable_extension_disable	"libxml"		"xml2"			0
 	enable_extension_enable		"mbstring"		"nls"			1
 	enable_extension_with		"mcrypt"		"crypt"			1
@@ -416,7 +416,7 @@ php5-sapi_src_compile() {
 	enable_extension_with		"zlib"			"zlib"			1
 	enable_extension_enable		"debug"			"debug"			0
 
-	php5-sapi_check_awkward_uses
+	php5-sapi-r1_check_awkward_uses
 
 	# DBA support
 	enable_extension_enable		"dba"		"dba" 1
@@ -428,7 +428,14 @@ php5-sapi_src_compile() {
 	enable_extension_with		"libedit"		"libedit"		1
 
 	# optimization/setting stuff
-	myconf="${myconf} --enable-versioning"
+	my_conf="${my_conf} --enable-versioning"
+
+	if [ "${PHPSAPI}" != "cli" ]; then
+		my_conf="${my_conf} --disable-cli"
+	fi
+
+	# Bug 98694
+	addpredict /etc/krb5.conf
 
 	# all done
 
@@ -436,9 +443,9 @@ php5-sapi_src_compile() {
 	emake || die "make failed"
 }
 
-php5-sapi_src_install() {
+php5-sapi-r1_src_install() {
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
@@ -454,7 +461,7 @@ php5-sapi_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -463,10 +470,10 @@ php5-sapi_src_install() {
 	fi
 
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
+	sed -e 's|^;include_path .*|include_path = ".:/usr/share/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
@@ -490,7 +497,7 @@ php5-sapi_src_install() {
 	fi
 }
 
-php5-sapi_pkg_postinst() {
+php5-sapi-r1_pkg_postinst() {
 	ewarn "If you have additional third party PHP extensions (such as"
 	ewarn "dev-php/eaccelerator) you may need to recompile them now."
 
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index fba29046d081..7b998ea41a1f 100644
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.1 2005/03/27 17:23:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -12,10 +12,13 @@
 #
 # ========================================================================
 
-inherit eutils confutils libtool 
+# a list of the USE flags which PHP supports, but which we don't have
+# required packages in the tree
+
+CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix ingres mnogosearch msession msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct"
+
+inherit flag-o-matic eutils confutils libtool
 
-ECLASS=php5-sapi-r2
-INHERITED="$INHERITED $ECLASS"
 
 # set MY_PHP_P in the ebuild
 
@@ -29,19 +32,21 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	HOMEPAGE="http://www.php.net/"
 	LICENSE="PHP-3"
 	SRC_URI="http://www.php.net/distributions/${MY_PHP_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
+	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzlib calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt
+ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress
+empress-bcs esoob exif fam firebird frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hardenedphp hyperwave-api imap inifile iconv informix ingres interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mkconfig mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="$DEPEND
 	!<=dev-php/php-4.99.99
 	berkdb? ( =sys-libs/db-4* )
-	bzlib? ( app-arch/bzip2 )
-	cpdflib? ( >=media-libs/clibpdf-2* )
+	bzip2? ( app-arch/bzip2 )
+	cpdflib? ( >=media-libs/clibpdf-2 )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.2 )
+	curl? ( >=net-misc/curl-7.10.5 )
 	fam? ( virtual/fam )
 	fdftk? ( app-text/fdftk )
 	firebird? ( dev-db/firebird  )
@@ -49,6 +54,7 @@ DEPEND="$DEPEND
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( dev-libs/gmp )
 	imap? ( virtual/imap-c-client )
+	iodbc? ( dev-db/libiodbc )
 	jpeg? ( >=media-libs/jpeg-6b )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
@@ -58,7 +64,7 @@ DEPEND="$DEPEND
 	mime? ( sys-apps/file )
 	ming? ( media-libs/ming )
 	mssql? ( dev-db/freetds )
-	mysql? ( >=dev-db/mysql-3.23.26 )
+	mysql? ( dev-db/mysql )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
@@ -77,14 +83,14 @@ DEPEND="$DEPEND
 	sybase? ( dev-db/freetds )
 	tidy? ( app-text/htmltidy )
 	tiff? ( media-libs/tiff )
-	truetype? ( =media-libs/freetype-1* =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
+	truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
 	wddx? ( dev-libs/expat )
 	xpm? ( virtual/x11 )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib ) "
 
 # this would be xml2?, but PEAR requires XML support
-# and we always want to build PEAR.
+# this can become a USE flag when Gentoo bug #2272 has been resolved
 DEPEND="$DEPEND
 		dev-libs/libxml2"
 
@@ -99,6 +105,19 @@ PHP_INI_DIR="/etc/php/${PHPSAPI}-php5"
 PHP_INI_FILE="php.ini"
 
 # ========================================================================
+# Hardened-PHP Support
+# ========================================================================
+#
+# I've done it like this so that we can support different versions of
+# the patch for different versions of PHP
+
+case "$PV" in
+	5.0.4) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
+esac
+
+[ -n "$HARDENEDPHP_PATCH" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/$HARDENEDPHP_PATCH )"
+
+# ========================================================================
 
 EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst
 
@@ -108,6 +127,19 @@ EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst
 
 php5-sapi-r2_check_awkward_uses() {
 
+	# disabled hardenedphp after many reports of problems w/ apache
+	# need to look into this at some point
+
+	if useq hardenedphp ; then
+		eerror
+		eerror "hardenedphp is reported to break php for some users."
+		eerror "We've disabled this feature for now until it has been"
+		eerror "thoroughly investigated."
+		eerror
+		eerror "Please disable the hardenedphp USE flag"
+		die "hardenedphp support disabled"
+	fi
+
 	# snmp support seems broken, haven't looked into a fix for it yet
 
 	if useq snmp && [ "$PHP_PV" = "5.0.3" ] ; then
@@ -118,15 +150,15 @@ php5-sapi-r2_check_awkward_uses() {
 		die "snmp support doesn't compile"
 	fi
 
-	# mysqli support isn't possible yet
+	# mysqli support is disabled; see bug #53886
 
 	if useq mysqli ; then
 		eerror
 		eerror "We currently do not support the mysqli extension"
-		eerror "Support will be added once MySQL 4.1 has been added to Portage"
+		eerror "Support will be added once MySQL 4.1 is no longer package-masked"
 		eerror
 		die "mysqli not supported yet"
-	fi
+	 fi
 
 	# recode not available in 5.0.0; upstream bug
 	if useq recode && [ "$PHP_PV" == "5.0.0" ]; then
@@ -137,17 +169,6 @@ php5-sapi-r2_check_awkward_uses() {
 		die "recode broken, upstream bug"
 	fi
 
-	# iodbc not available; upstream web site down
-	if useq iodbc ; then
-		eerror
-		eerror "We have not been able to add iodbc support to Gentoo yet, as we"
-		eerror "have experienced difficulties in reaching www.iodbc.org."
-		eerror 
-		eerror "For now, please use the 'odbc' USE flag instead."
-		eerror
-		die "iodbc support incomplete; gentoo bug"
-	fi
-
 	# Sanity check for Oracle
 	if useq oci8 && [ -z "${ORACLE_HOME}" ]; then
 		eerror
@@ -181,13 +202,15 @@ php5-sapi-r2_check_awkward_uses() {
 
 	enable_extension_with 	"jpeg-dir" 		"jpeg" 		0 "/usr"
 	if useq gd-external ; then
-		enable_extension_with 	"gd" 			"gd-external" 1 "/usr"
+		enable_extension_with	"freetype-dir"	"truetype"	0 "/usr"
+		enable_extension_with	"t1lib"			"truetype"	0 "/usr"
+		enable_extension_enable	"gd-native-ttf"	"truetype" 	0
 		enable_extension_enable	"gd-jis-conf"	"nls" 		0
 		enable_extension_enable	"gd-native-ttf"	"truetype" 	0
+		enable_extension_with 	"gd" 			"gd-external" 1 "/usr"
 	else
 		enable_extension_with	"freetype-dir"	"truetype"	0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"	0 "/usr"
-		enable_extension_with	"ttf"			"truetype"	0 "/usr"
 		enable_extension_enable	"gd-jis-conf"	"nls"		0
 		enable_extension_enable	"gd-native-ttf"	"truetype"	0
 		enable_extension_with 	"png-dir" 		"png" 		0 "/usr"
@@ -201,6 +224,7 @@ php5-sapi-r2_check_awkward_uses() {
 	confutils_use_depend_any "png"  "gd" "gd-external"
 	confutils_use_depend_any "tiff" "gd" "gd-external"
 	confutils_use_depend_any "xpm"  "gd" "gd-external"
+	confutils_use_depend_all "png"  "zlib"
 
 	if useq imap ; then
 		enable_extension_with 	"imap" 			"imap" 		1
@@ -224,7 +248,7 @@ php5-sapi-r2_check_awkward_uses() {
 	fi
 
 	if useq odbc ; then
-		enable_extension_with		"unixODBC"		"odbc"			1
+		enable_extension_with		"unixODBC"		"odbc"			1 "/usr"
 
 		enable_extension_with		"adabas"		"adabas"		1
 		enable_extension_with		"birdstep"		"birdstep"		1
@@ -235,17 +259,17 @@ php5-sapi-r2_check_awkward_uses() {
 		fi
 		enable_extension_with		"esoob"			"esoob"			1
 		enable_extension_with		"ibm-db2"		"db2"			1
-		enable_extension_with		"iodbc"			"iodbc"			1
+		enable_extension_with		"iodbc"			"iodbc"			1 "/usr"
 		enable_extension_with		"sapdb"			"sapdb"			1
 		enable_extension_with		"solid"			"solid"			1
 	fi
 
 	if useq mysql; then
-		enable_extension_with		"mysql"			"mysql"			1 
+		enable_extension_with		"mysql"			"mysql"			1 "/usr/lib/mysql"
 		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
 	fi
 	if useq mysqli; then
-		enable_extension_with		"mysqli"		"mysqli"		1
+		enable_extension_with		"mysqli"		"mysqli"		1 "/usr/bin/mysql_config"
 	fi
 
 	# QDBM doesn't play nicely with GDBM _or_ DBM
@@ -283,7 +307,7 @@ php5-sapi-r2_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -339,14 +363,21 @@ php5-sapi-r2_src_unpack() {
 		sed -i.orig -e 's,-i -a -n php5,-i -n php5,g' $i
 	done
 
+	# hardenedphp support
+
+	use hardenedphp && [ -n "$HARDENEDPHP_PATCH" ] && epatch ${DISTDIR}/${HARDENEDPHP_PATCH}
+
+	# iodbc support
+	use iodbc && epatch ${FILESDIR}/with-iodbc.diff
+
 	# fix configure scripts to recognize uClibc
 	uclibctoolize
 
 	# Just in case ;-)
 	chmod 755 configure
 
-	[ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/php-5.0-stdint.diff
-	epatch ${FILESDIR}/${MY_PHP_P}-missing-arches.patch
+	# [ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/php-5.0-stdint.diff
+	# epatch ${FILESDIR}/${MY_PHP_P}-missing-arches.patch
 }
 
 php5-sapi-r2_src_compile() {
@@ -354,11 +385,15 @@ php5-sapi-r2_src_compile() {
 	confutils_init
 
 	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}"
-	my_conf="${my_conf} --without-pear"
+	if [ "$PHPSAPI" == "cli" ]; then
+		my_conf="${my_conf} --with-pear=/usr/share/php"
+	else
+		my_conf="${my_conf} --disable-cli --without-pear"
+	fi
 
 	#							extension		USE flag		shared support?
 	enable_extension_enable		"bcmath"		"bcmath"		1
-	enable_extension_with		"bz2"			"bzlib"			1
+	enable_extension_with		"bz2"			"bzip2"			1
 	enable_extension_enable		"calendar"		"calendar"		1
 	enable_extension_with		"cpdflib"		"cpdflib"		1 # depends on jpeg
 	enable_extension_disable	"ctype"			"ctype"			0
@@ -380,8 +415,10 @@ php5-sapi-r2_src_compile() {
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_with		"ingres"		"ingres"		1
 	enable_extension_with		"interbase"		"firebird"		1
+	# iodbc support added by Tim Haynes <gentoo@stirfried.vegetable.org.uk>
+	enable_extension_with 		"iodbc" 		"iodbc" 		0 "/usr"
 	# ircg extension not supported on Gentoo at this time
-	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
+	enable_extension_with		"kerberos"		"kerberos"		0
 	enable_extension_disable	"libxml"		"xml2"			0
 	enable_extension_enable		"mbstring"		"nls"			1
 	enable_extension_with		"mcrypt"		"crypt"			1
@@ -427,7 +464,7 @@ php5-sapi-r2_src_compile() {
 	enable_extension_with		"zlib"			"zlib"			1
 	enable_extension_enable		"debug"			"debug"			0
 
-	php5-sapi-r1_check_awkward_uses
+	php5-sapi-r2_check_awkward_uses
 
 	# DBA support
 	enable_extension_enable		"dba"		"dba" 1
@@ -438,8 +475,14 @@ php5-sapi-r2_src_compile() {
 	enable_extension_with		"readline"		"readline"		0
 	enable_extension_with		"libedit"		"libedit"		1
 
-	# optimization/setting stuff
-	myconf="${myconf} --enable-versioning"
+	# fix ELF-related problems
+	if has_pic ; then
+		einfo "Enabling PIC support"
+		my_conf="${my_conf} --with-pic"
+	fi
+
+	# Bug 98694
+	addpredict /etc/krb5.conf
 
 	# all done
 
@@ -450,15 +493,10 @@ php5-sapi-r2_src_compile() {
 php5-sapi-r2_src_install() {
 	cd ${PHP_S}
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
-	# annoyingly, we have to install the CLI by hand
-	if [ "$PHPSAPI" = "cli" ]; then
-		dobin sapi/cli/php
-	fi
-
 	# get the extension dir
 	PHPEXTDIR="`${D}/usr/bin/php-config --extension-dir`"
 
@@ -466,7 +504,7 @@ php5-sapi-r2_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -475,10 +513,10 @@ php5-sapi-r2_src_install() {
 	fi
 
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
+	sed -e 's|^;include_path .*|include_path = ".:/usr/share/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
@@ -487,19 +525,57 @@ php5-sapi-r2_src_install() {
 	insinto ${PHP_INI_DIR}
 	newins ${phpinisrc} ${PHP_INI_FILE}
 
-	# PEAR-Installer and phpconfig install the following, so we
-	# don't have to
+	# php-config install the following, so we don't have to
+	#
+	# if 'mkconfig' USE flag is set, we create the phpconfig
+	# source tarball ... this makes it easy for us to bump the
+	# phpconfig package whenever we bump php
+
+	if useq mkconfig ; then
+		CONFIG_NAME=phpconfig-$PV
+		CONFIG_DESTDIR=${T}/${CONFIG_NAME}
+
+		einfo "Building source tarball for ${CONFIG_NAME}"
+
+		mkdir -p ${CONFIG_DESTDIR}/usr/bin
+		cp ${D}/usr/bin/{phpextdist,phpize,php-config} ${CONFIG_DESTDIR}/usr/bin/
+
+		mkdir -p ${CONFIG_DESTDIR}/usr/lib/php
+		cp -r ${D}/usr/lib/php/build ${CONFIG_DESTDIR}/usr/lib/php
+
+		mkdir -p ${CONFIG_DESTDIR}/usr/include
+		cp -r ${D}/usr/include/php ${CONFIG_DESTDIR}/usr/include
+
+		cd ${T}
+		tar -cf - ${CONFIG_NAME} | bzip2 -9 > ${CONFIG_NAME}.tar.bz2
+		cd -
+
+		einfo "Done; tarball is ${T}/${CONFIG_NAME}.tar.bz2"
+	fi
+
+	# move all the PEAR stuff from /usr/lib/php to /usr/share/php
 
-	rm -rf ${D}/usr/bin/{php,phpextdist,phpize,php-config,pear}
 	rm -rf ${D}/usr/lib/php/build
-	rm -rf ${D}/usr/include/php
+	dodir /usr/share/php
 
-	# we let each SAPI install the man page
-	# this does mean that the packages are in conflict for now
+	for x in ${D}/usr/lib/php/* ; do
+		if [ "`basename $x`" != 'extensions' ]; then
+			mv $x ${D}/usr/share/php
+		fi
+	done
+
+	# only the cli SAPI is allowed to install PEAR
 
 	if [ "$PHPSAPI" != "cli" ]; then
-		rm -rf ${D}/usr/share/man/man1/php.1*
+		rm -f ${D}/usr/bin/pear
+		rm -f ${D}/usr/share/php
 	fi
+
+	rm -rf ${D}/usr/bin/{phpextdist,phpize,php-config}
+	rm -rf ${D}/usr/include/php
+
+	# we let each SAPI install the man page
+	# this does mean that the packages are in conflict for now
 }
 
 php5-sapi-r2_pkg_postinst() {
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index 8a3995424a54..858801cbf254 100644
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.1 2005/06/11 09:19:47 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.1.1.1 2005/11/30 09:59:21 chriswhite Exp $
 #
 # ########################################################################
 #
@@ -17,10 +17,10 @@
 #
 # ========================================================================
 
+CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix msession msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct"
+
 inherit flag-o-matic eutils confutils libtool
 
-ECLASS=php5-sapi-r2
-INHERITED="$INHERITED $ECLASS"
 
 # set MY_PHP_P in the ebuild
 
@@ -37,7 +37,9 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug empress empress-bcs esoob exif frontbase fdftk flatfile filepro ftp gd gd-external gdbm gmp hardenedphp hyperwave-api imap inifile iconv informix interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming msession msql mssql mysql mysqli ncurses nls oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl
+curlwrappers db2 dba dbase dbm dbmaker dbx debug empress empress-bcs esoob exif
+frontbase fdftk flatfile filepro firebird ftp gd gd-external gdbm gmp hardenedphp hyperwave-api imap inifile iconv informix interbase iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mkconfig msession msql mssql mysql mysqli ncurses nls oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="$DEPEND
@@ -62,7 +64,8 @@ DEPEND="$DEPEND
 	mime? ( sys-apps/file )
 	ming? ( media-libs/ming )
 	mssql? ( dev-db/freetds )
-	mysql? ( =dev-db/mysql-4.0* )
+	mysql? ( dev-db/mysql )
+	mysqli? ( >=dev-db/mysql-4.1 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
@@ -110,7 +113,7 @@ PHP_INI_FILE="php.ini"
 # the patch for different versions of PHP
 
 case "$PV" in
-	5.0.4) HARDENEDPHP_PATCH="hardened-php-$PV-0.2.7.patch.gz" ;;
+	5.0.4) HARDENEDPHP_PATCH="hardening-patch-$PV-0.3.2.patch.gz" ;;
 esac
 
 [ -n "$HARDENEDPHP_PATCH" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/$HARDENEDPHP_PATCH )"
@@ -123,7 +126,16 @@ EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst
 # INTERNAL FUNCTIONS
 # ========================================================================
 
-php5-sapi-r2_check_awkward_uses() {
+php5-sapi-r3_check_awkward_uses() {
+
+	# unfortunately, libedit support is broken atm
+
+	if useq libedit ; then
+		eerror
+		eerror "php-5.1-beta doesn't link successfully if you use libedit"
+		eerror "Please switch to using readline instead for now."
+		die "libedit support broken"
+	fi
 
 	# disabled hardenedphp after many reports of problems w/ apache
 	# need to look into this at some point
@@ -149,14 +161,14 @@ php5-sapi-r2_check_awkward_uses() {
 	fi
 
 	# mysqli support is disabled; see bug #53886
-
-	if useq mysqli ; then
-		eerror
-		eerror "We currently do not support the mysqli extension"
-		eerror "Support will be added once MySQL 4.1 is no longer package-masked"
-		eerror
-		die "mysqli not supported yet"
-	 fi
+	#
+	# if useq mysqli ; then
+	#	eerror
+	#	eerror "We currently do not support the mysqli extension"
+	#	eerror "Support will be added once MySQL 4.1 is no longer package-masked"
+	#	eerror
+	#	die "mysqli not supported yet"
+	# fi
 
 	# recode not available in 5.0.0; upstream bug
 	if useq recode && [ "$PHP_PV" == "5.0.0" ]; then
@@ -246,7 +258,7 @@ php5-sapi-r2_check_awkward_uses() {
 	fi
 
 	if useq odbc ; then
-		enable_extension_with		"unixODBC"		"odbc"			1
+		enable_extension_with		"unixODBC"		"odbc"			1 "/usr"
 
 		enable_extension_with		"adabas"		"adabas"		1
 		enable_extension_with		"birdstep"		"birdstep"		1
@@ -257,7 +269,7 @@ php5-sapi-r2_check_awkward_uses() {
 		fi
 		enable_extension_with		"esoob"			"esoob"			1
 		enable_extension_with		"ibm-db2"		"db2"			1
-		enable_extension_with		"iodbc"			"iodbc"			1
+		enable_extension_with		"iodbc"			"iodbc"			1 "/usr"
 		enable_extension_with		"sapdb"			"sapdb"			1
 		enable_extension_with		"solid"			"solid"			1
 	fi
@@ -266,9 +278,7 @@ php5-sapi-r2_check_awkward_uses() {
 		enable_extension_with		"mysql"			"mysql"			1 "/usr/lib/mysql"
 		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
 	fi
-	if useq mysqli; then
-		enable_extension_with		"mysqli"		"mysqli"		1 "/usr/bin/mysql_config"
-	fi
+	enable_extension_with		"mysqli"		"mysqli"		    1 "/usr/bin/mysql_config"
 
 	# QDBM doesn't play nicely with GDBM _or_ DBM
 	confutils_use_conflict "qdbm" "gdbm" "dbm"
@@ -305,7 +315,7 @@ php5-sapi-r2_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -334,14 +344,14 @@ php5-sapi-r2_check_awkward_uses() {
 # EXPORTED FUNCTIONS
 # ========================================================================
 
-php5-sapi-r2_pkg_setup() {
+php5-sapi-r3_pkg_setup() {
 	# let's do all the USE flag testing before we do anything else
 	# this way saves a lot of time
 
-	php5-sapi-r2_check_awkward_uses
+	php5-sapi-r3_check_awkward_uses
 }
 
-php5-sapi-r2_src_unpack() {
+php5-sapi-r3_src_unpack() {
 	if [ "${PHP_PACKAGE}" == 1 ]; then
 		unpack ${A}
 	fi
@@ -378,7 +388,7 @@ php5-sapi-r2_src_unpack() {
 	# epatch ${FILESDIR}/${MY_PHP_P}-missing-arches.patch
 }
 
-php5-sapi-r2_src_compile() {
+php5-sapi-r3_src_compile() {
 	cd ${PHP_S}
 	confutils_init
 
@@ -408,7 +418,7 @@ php5-sapi-r2_src_compile() {
 	# iodbc support added by Tim Haynes <gentoo@stirfried.vegetable.org.uk>
 	enable_extension_with 		"iodbc" 		"iodbc" 		0 "/usr"
 	# ircg extension not supported on Gentoo at this time
-	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
+	enable_extension_with		"kerberos"		"kerberos"		0
 	enable_extension_disable	"libxml"		"xml2"			0
 	enable_extension_enable		"mbstring"		"nls"			1
 	enable_extension_with		"mcrypt"		"crypt"			1
@@ -452,7 +462,7 @@ php5-sapi-r2_src_compile() {
 	enable_extension_with		"zlib"			"zlib"			1
 	enable_extension_enable		"debug"			"debug"			0
 
-	php5-sapi-r2_check_awkward_uses
+	php5-sapi-r3_check_awkward_uses
 
 	# DBA support
 	enable_extension_enable		"dba"		"dba" 1
@@ -463,25 +473,29 @@ php5-sapi-r2_src_compile() {
 	enable_extension_with		"readline"		"readline"		0
 	enable_extension_with		"libedit"		"libedit"		1
 
-	# optimization/setting stuff
-	my_conf="${my_conf} --enable-versioning"
-
 	# fix ELF-related problems
 	if has_pic ; then
 		einfo "Enabling PIC support"
 		my_conf="${my_conf} --with-pic"
 	fi
 
+	if [ "${PHPSAPI}" != "cli" ]; then
+		my_conf="${my_conf} --disable-cli"
+	fi
+
+	# Bug 98694
+	addpredict /etc/krb5.conf
+
 	# all done
 
 	econf ${my_conf} || die "configure failed"
 	emake || die "make failed"
 }
 
-php5-sapi-r2_src_install() {
+php5-sapi-r3_src_install() {
 	cd ${PHP_S}
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
@@ -492,7 +506,7 @@ php5-sapi-r2_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -501,10 +515,10 @@ php5-sapi-r2_src_install() {
 	fi
 
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
+	sed -e 's|^;include_path .*|include_path = ".:/usr/share/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
@@ -515,7 +529,35 @@ php5-sapi-r2_src_install() {
 
 	# PEAR-Installer and phpconfig install the following, so we
 	# don't have to
-	rm -rf ${D}/usr/bin/{phpextdist,phpize,php-config,pear}
+	#
+	# if 'mkconfig' USE flag is set, we create the phpconfig source
+	# tarball ... this makes it easy for us to bump the phpconfig
+	# package whenever we bump php
+
+	if useq mkconfig ; then
+		CONFIG_NAME=phpconfig-$PV
+		CONFIG_DESTDIR=${T}/${CONFIG_NAME}
+
+		einfo "Building source tarball for ${CONFIG_NAME}"
+
+		mkdir -p ${CONFIG_DESTDIR}/usr/bin
+		cp ${D}/usr/bin/{phpize,php-config} ${CONFIG_DESTDIR}/usr/bin/
+		cp scripts/dev/phpextdist ${CONFIG_DESTDIR}/usr/bin/
+
+		mkdir -p ${CONFIG_DESTDIR}/usr/lib/php
+		cp -r ${D}/usr/lib/php/build ${CONFIG_DESTDIR}/usr/lib/php
+
+		mkdir -p ${CONFIG_DESTDIR}/usr/include
+		cp -r ${D}/usr/include/php ${CONFIG_DESTDIR}/usr/include
+
+		cd ${T}
+		tar -cf - ${CONFIG_NAME} | bzip2 -9 > ${CONFIG_NAME}.tar.bz2
+		cd -
+
+		einfo "Done; tarball is ${T}/${CONFIG_NAME}.tar.bz"
+	fi
+
+	rm -rf ${D}/usr/bin/{phpize,php-config,pear}
 	rm -rf ${D}/usr/lib/php/build
 	rm -rf ${D}/usr/include/php
 
@@ -523,7 +565,7 @@ php5-sapi-r2_src_install() {
 	# this does mean that the packages are in conflict for now
 }
 
-php5-sapi-r2_pkg_postinst() {
+php5-sapi-r3_pkg_postinst() {
 	ewarn "If you have additional third party PHP extensions (such as"
 	ewarn "dev-php/eaccelerator) you may need to recompile them now."
 
diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass
index e67b8b14f6b1..8b3a028838be 100644
--- a/eclass/php5-sapi.eclass
+++ b/eclass/php5-sapi.eclass
@@ -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/eclass/php5-sapi.eclass,v 1.1 2004/06/27 18:30:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.1.1.1 2005/11/30 09:59:17 chriswhite Exp $
 #
 # eclass/php5-sapi.eclass
 #		Eclass for building different php5 SAPI instances
@@ -12,50 +12,351 @@
 #
 # ========================================================================
 
-inherit confutils
+inherit eutils confutils libtool
+
+
+# set MY_P in the ebuild
 
 HOMEPAGE="http://www.php.net/"
+LICENSE="PHP-3"
 SRC_URI="http://www.php.net/distributions/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
-IUSE="${IUSE} adabas bcmath birdstep bzlib calendar cpdflib crypt ctype curl curlwrappers db2 dbase dbmaker dbx dio esoob exif fam frontbase fdftk filepro ftp gmp hyperwave-api iconv informix ingres interbase iodbc libedit mcve mhash ming mnogosearch msession msql mssql mysql ncurses nls nis oci8 oracle7 ssl ovrimos pcre pfpro postgres posix readline recode sapdb session shared simplexml snmp soap sockets solid spell spl ssl sybase sybase-ct sysvipc tidy tokenizer truetype odbc wddx xsl xml2 xmlrpc zlib dba cdb berkdb flatfile gdbm inifile qdbm empress empress-bcs gd gd-external imap kerberos ssl ldap sasl pcntl mmap sqlite"
+IUSE="adabas bcmath berkdb birdstep bzip2 calendar cdb cpdflib crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker dbx debug dio empress empress-bcs esoob exif fam frontbase fdftk firebird flatfile filepro ftp gd gd-external gdbm gmp hyperwave-api imap inifile iconv informix ingres iodbc jpeg kerberos ldap libedit mcve memlimit mhash mime ming mnogosearch msession msql mssql mysql mysqli ncurses nls nis oci8 odbc oracle7 ovrimos pcntl pcre pfpro png postgres posix qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc tidy tiff tokenizer truetype wddx xsl xml2 xmlrpc xpm zlib"
+
+# these USE flags should have the correct dependencies
+DEPEND="$DEPEND
+	!<=dev-php/php-4.99.99
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cpdflib? ( >=media-libs/clibpdf-2 )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	fam? ( virtual/fam )
+	fdftk? ( app-text/fdftk )
+	firebird? ( dev-db/firebird )
+	gd-external? ( media-libs/gd )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp )
+	imap? ( virtual/imap-c-client )
+	jpeg? ( >=media-libs/jpeg-6b )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	libedit? ( dev-libs/libedit )
+	mcve? ( net-libs/libmonetra )
+	mhash? ( app-crypt/mhash )
+	mime? ( sys-apps/file )
+	ming? ( media-libs/ming )
+	mssql? ( dev-db/freetds )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	png? ( media-libs/libpng )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( dev-libs/libxml2 )
+	snmp? ( net-analyzer/net-snmp )
+	soap? ( dev-libs/libxml2 )
+	spell? ( app-text/aspell )
+	sqlite? ( =dev-db/sqlite-2* )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	tiff? ( media-libs/tiff )
+	truetype? ( =media-libs/freetype-1* =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
+	wddx? ( dev-libs/expat )
+	xpm? ( virtual/x11 )
+	xsl? ( dev-libs/libxslt )
+	zlib? ( sys-libs/zlib ) "
+
+# this would be xml2?, but PEAR requires XML support
+# and we always want to build PEAR.
 DEPEND="$DEPEND
-	readline? ( sys-libs/readline )"
+		dev-libs/libxml2"
 
 # ========================================================================
 
 PHP_BUILDTARGETS="${PHP_BUILDTARGETS} build-modules"
 PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install"
+PEAR_CACHE="/var/tmp/pear-cache"
+
+# ========================================================================
+
+# we make the CLI version of PHP responsible for a few things,
+# such as the files required by PEAR
+
+PHP_PROVIDER_PKG="dev-php/php"
+PHP_PROVIDER_PKG_MINPVR="5.0.0"
 
 # ========================================================================
 
-EXPORT_FUNCTIONS src_compile src_install
+PHP_INI_DIR="/etc/php/${PHPSAPI}-php5"
+PHP_INI_FILE="php.ini"
+
+# ========================================================================
+
+EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst
+
+# ========================================================================
+# INTERNAL FUNCTIONS
+# ========================================================================
+
+php5-sapi_check_awkward_uses() {
+
+	# recode not available in 5.0.0; upstream bug
+	if useq recode && [ "$PV" == "5.0.0" ]; then
+		eerror
+		eerror "Support for the 'recode' extension is currently broken UPSTREAM"
+		eerror "See http://bugs.php.net/bug.php?id=28700 for details"
+		eerror
+		die "recode broken, upstream bug"
+	fi
+
+	# iodbc not available; upstream web site down
+	if useq iodbc ; then
+		eerror
+		eerror "We have not been able to add iodbc support to Gentoo yet, as we"
+		eerror "have experienced difficulties in reaching www.iodbc.org."
+		eerror
+		eerror "For now, please use the 'odbc' USE flag instead."
+		eerror
+		die "iodbc support incomplete; gentoo bug"
+	fi
+
+	# Sanity check for Oracle
+	if useq oci8 && [ -z "${ORACLE_HOME}" ]; then
+		eerror
+		eerror "You must have the ORACLE_HOME variable in your environment!"
+		eerror
+		die "Oracle configuration incorrect; user error"
+	fi
+
+	if useq oci8 || useq oracle7; then
+		if has_version  'dev-db/oracle-instantclient-basic'; then
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficent."
+		fi
+	fi
+
+	if useq dba ; then
+		#                     extension     USE flag    shared support?
+		enable_extension_with "cdb"			"cdb"		1
+		enable_extension_with "db4"			"berkdb"	1
+		enable_extension_with "dbm"			"dbm"		1
+		enable_extension_with "flatfile"	"flatfile"	1
+		enable_extension_with "gdbm"		"gdbm"		1
+		enable_extension_with "inifile"		"inifile"	1
+		enable_extension_with "qdbm"		"qdbm"		1
+	fi
+
+	if useq dbx ; then
+		confutils_use_depend_any "dbx" "frontbase" "mssql" "odbc" "postgres" "sybase-ct" "oci8" "sqlite"
+		enable_extension_enable		"dbx"	"dbx"		1
+	fi
+
+	enable_extension_with 	"jpeg-dir" 		"jpeg" 		0 "/usr"
+	if useq gd-external ; then
+		enable_extension_with 	"gd" 			"gd-external" 1 "/usr"
+		enable_extension_enable	"gd-jis-conf"	"nls" 		0
+		enable_extension_enable	"gd-native-ttf"	"truetype" 	0
+	else
+		enable_extension_with	"freetype-dir"	"truetype"	0 "/usr"
+		enable_extension_with	"t1lib"			"truetype"	0 "/usr"
+		enable_extension_with	"ttf"			"truetype"	0 "/usr"
+		enable_extension_enable	"gd-jis-conf"	"nls"		0
+		enable_extension_enable	"gd-native-ttf"	"truetype"	0
+		enable_extension_with 	"png-dir" 		"png" 		0 "/usr"
+		enable_extension_with 	"tiff-dir" 		"tiff" 		0 "/usr"
+		enable_extension_with 	"xpm-dir" 		"xpm" 		0 "/usr/X11R6"
+		# enable gd last, so configure can pick up the previous settings
+		enable_extension_with 	"gd" 			"gd" 		0
+	fi
+
+	confutils_use_depend_any "jpeg" "gd" "gd-external" "cpdflib"
+	confutils_use_depend_any "png"  "gd" "gd-external"
+	confutils_use_depend_any "tiff" "gd" "gd-external"
+	confutils_use_depend_any "xpm"  "gd" "gd-external"
+	confutils_use_depend_all "png"  "zlib"
+
+	if useq imap ; then
+		enable_extension_with 	"imap" 			"imap" 		1
+		# this is a PITA to deal with
+		if useq ssl ; then
+			#if [ -n "`strings ${ROOT}/usr/$(get_libdir)/c-client.* 2>/dev/null | grep ssl_onceonlyinit`" ]; then
+			if built_with_use virtual/imap-c-client ssl ; then
+				# the IMAP-SSL arg doesn't parse 'shared,/usr/lib' right
+				enable_extension_with 	"imap-ssl" 		"ssl" 		0
+			else
+				msg="IMAP+SSL requested, but your IMAP libraries are built without SSL!"
+				eerror "${msg}"
+				die "${msg}"
+			fi
+		fi
+	fi
+
+	if useq ldap ; then
+		enable_extension_with 		"ldap" 			"ldap" 			1
+		enable_extension_with 		"ldap-sasl" 	"sasl" 			0
+	fi
+
+	if useq odbc ; then
+		enable_extension_with		"unixODBC"		"odbc"			1
+
+		enable_extension_with		"adabas"		"adabas"		1
+		enable_extension_with		"birdstep"		"birdstep"		1
+		enable_extension_with		"dbmaker"		"dbmaker"		1
+		enable_extension_with		"empress"		"empress"		1
+		if useq empress ; then
+			enable_extension_with	"empress-bcs"	"empress-bcs"	0
+		fi
+		enable_extension_with		"esoob"			"esoob"			1
+		enable_extension_with		"ibm-db2"		"db2"			1
+		enable_extension_with		"iodbc"			"iodbc"			1
+		enable_extension_with		"sapdb"			"sapdb"			1
+		enable_extension_with		"solid"			"solid"			1
+	fi
+
+	if useq mysql; then
+		enable_extension_with		"mysql"			"mysql"			1
+		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
+	fi
+	if useq mysqli; then
+		enable_extension_with		"mysqli"		"mysqli"		1
+	fi
+
+	# QDBM doesn't play nicely with GDBM _or_ DBM
+	confutils_use_conflict "qdbm" "gdbm" "dbm"
+	# both provide the same functionality
+	confutils_use_conflict "readline" "libedit"
+	# Recode is not liked.
+	confutils_use_conflict "recode" "mysql" "imap" "nis" #"yaz"
+
+	if ! useq session ; then
+		enable_extension_disable	"session"		"session"		1
+	else
+		enable_extension_with		"mm"			"sharedmem"		0
+		enable_extension_with		"msession"		"msession"		1
+	fi
+
+	if ! useq sqlite ; then
+		enable_extension_without	"sqlite"	"sqlite"	0
+	else
+		enable_extension_enable		"sqlite-utf8"	"nls"	0
+	fi
+
+	# MCVE needs openSSL
+	confutils_use_depend_all "mcve"		"ssl"
+	# A variety of extensions need DBA
+	confutils_use_depend_all "cdb"		"dba"
+	confutils_use_depend_all "berkdb"	"dba"
+	confutils_use_depend_all "flatfile"	"dba"
+	confutils_use_depend_all "gdbm"		"dba"
+	confutils_use_depend_all "inifile"	"dba"
+	confutils_use_depend_all "qdbm"		"dba"
+
+	# build EXIF support if we support a file format that uses it
+	confutils_use_depend_any "exif" "jpeg" "tiff"
+
+	# GD library support
+	confutils_use_depend_any "truetype" "gd" "gd-external"
+
+	# ldap support
+	confutils_use_depend_all "sasl" "ldap"
+
+	# mysql support
+	# This shouldn't conflict actually
+	#confutils_use_conflict "mysqli" "mysql"
+
+	# odbc support
+	confutils_use_depend_all "adabas"		"odbc"
+	confutils_use_depend_all "birdstep"		"odbc"
+	confutils_use_depend_all "dbmaker"		"odbc"
+	confutils_use_depend_all "empress"		"odbc"
+	confutils_use_depend_all "empress-bcs"	"odbc" "empress"
+	confutils_use_depend_all "esoob"		"odbc"
+	confutils_use_depend_all "db2"			"odbc"
+	confutils_use_depend_all "sapdb"		"odbc"
+	confutils_use_depend_all "solid"		"odbc"
+
+	# session support
+	confutils_use_depend_all "msession"	"session"
+
+	confutils_warn_about_missing_deps
+}
+
+# are we the CLI ebuild or not?
+# used to conditionally install a few things
+
+php5-sapi_is_providerbuild() {
+	if [ "${CATEGORY}/${PN}" == "${PHP_PROVIDER_PKG}" ]; then
+		return 0
+	else
+		return 1
+	fi
+}
 
 # ========================================================================
 # EXPORTED FUNCTIONS
 # ========================================================================
 
-php5-sapi_src_compile () {
+php5-sapi_pkg_setup() {
+	# let's do all the USE flag testing before we do anything else
+	# this way saves a lot of time
+
+	php5-sapi_check_awkward_uses
+}
+
+php5-sapi_src_unpack() {
+	unpack ${A}
+	# Fix for HTTP auth bug, #59755
+	[ "x${PV}" == "x5.0.0" ] && epatch ${FILESDIR}/php-5.0.0-httpauthfix.patch
+
+	cd ${S}
 
+	# Patch PHP to show Gentoo as the server platform
+	sed -i "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" configure
+	# Patch for PostgreSQL support
+	sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure
+
+	# Patch for session persistence bug
+	epatch ${FILESDIR}/php5_soap_persistence_session.diff
+
+	# stop php from activating the apache config, as we will do that ourselves
+	for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
+		sed -i.orig -e 's,-i -a -n php5,-i -n php5,g' $i
+	done
+
+	# fix configure scripts to recognize uClibc
+	uclibctoolize
+
+	# Just in case ;-)
+	chmod 755 configure
+}
+
+php5-sapi_src_compile() {
 	confutils_init
 
-	my_conf="${my_conf} --with-config-file-path=/etc/php/${PHPSAPI}-php5/php.ini"
+	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}"
+	php5-sapi_is_providerbuild || my_conf="${my_conf} --without-pear"
 
 	#							extension		USE flag		shared support?
 	enable_extension_enable		"bcmath"		"bcmath"		1
-	enable_extension_with		"bz2"			"bzlib"			1
+	enable_extension_with		"bz2"			"bzip2"			1
 	enable_extension_enable		"calendar"		"calendar"		1
-	enable_extension_with		"cpdflib"		"cpdflib"		1
+	enable_extension_with		"cpdflib"		"cpdflib"		1 # depends on jpeg
 	enable_extension_disable	"ctype"			"ctype"			0
 	enable_extension_with		"curl"			"curl"			1
 	enable_extension_with		"curlwrappers"	"curlwrappers"	1
 	enable_extension_enable		"dbase"			"dbase"			1
-	enable_extension_enable		"dbx"			"dbx"			1
 	enable_extension_enable		"dio"			"dio"			1
 	enable_extension_disable	"dom"			"xml2"			0
 	enable_extension_enable		"exif"			"exif"			1
 	enable_extension_with		"fam"			"fam"			1
 	enable_extension_with		"fbsql"			"frontbase"		1
-	enable_extension_with		"fdftk"			"fdftk"			1
+	enable_extension_with		"fdftk"			"fdftk"			1 "/opt/fdftk-6.0"
 	enable_extension_enable		"filepro"		"filepro"		1
 	enable_extension_enable		"ftp"			"ftp"			1
 	enable_extension_with		"gettext"		"nls"			1
@@ -64,13 +365,16 @@ php5-sapi_src_compile () {
 	enable_extension_with		"iconv"			"iconv"			1
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_with		"ingres"		"ingres"		1
-	enable_extension_with		"interbase"		"interbase"		1
+	enable_extension_with		"interbase"		"firebird"		1
 	# ircg extension not supported on Gentoo at this time
+	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
 	enable_extension_disable	"libxml"		"xml2"			0
 	enable_extension_enable		"mbstring"		"nls"			1
 	enable_extension_with		"mcrypt"		"crypt"			1
 	enable_extension_with		"mcve"			"mcve"			1
+	enable_extension_enable		"memory-limit"	"memlimit"		0
 	enable_extension_with		"mhash"			"mhash"			1
+	enable_extension_with		"mime-magic"	"mime"			0 "/usr/share/misc/file/magic.mime"
 	enable_extension_with		"ming"			"ming"			1
 	enable_extension_with		"mnogosearch"	"mnogosearch"	1
 	enable_extension_with		"msql"			"msql"			1
@@ -79,7 +383,9 @@ php5-sapi_src_compile () {
 	enable_extension_with		"oci8"			"oci8"			1
 	enable_extension_with		"oracle"		"oracle7"		1
 	enable_extension_with		"openssl"		"ssl"			1
+	enable_extension_with		"openssl-dir"	"ssl"			0 "/usr"
 	enable_extension_with		"ovrimos"		"ovrimos"		1
+	enable_extension_enable		"pcntl" 		"pcntl" 		1
 	enable_extension_without	"pcre-regx"		"pcre"			1
 	enable_extension_with		"pfpro"			"pfpro"			1
 	enable_extension_with		"pgsql"			"postgres"		1
@@ -87,8 +393,9 @@ php5-sapi_src_compile () {
 	enable_extension_with		"pspell"		"spell"			1
 	enable_extension_with		"recode"		"recode"		1
 	enable_extension_disable	"simplexml"		"simplexml"		1
+	enable_extension_enable		"shmop"			"sharedmem"		0
 	enable_extension_with		"snmp"			"snmp"			1
-	enable_extension_with		"soap"			"soap"			1
+	enable_extension_enable		"soap"			"soap"			1
 	enable_extension_enable		"sockets"		"sockets"		1
 	enable_extension_disable	"spl"			"spl"			1
 	enable_extension_with		"sybase"		"sybase"		1
@@ -100,150 +407,105 @@ php5-sapi_src_compile () {
 	enable_extension_disable	"tokenizer"		"tokenizer"		1
 	enable_extension_enable		"wddx"			"wddx"			1
 	enable_extension_with		"xsl"			"xsl"			1
-	enable_extension_disable	"xml"			"xml2"			1
+	#enable_extension_disable	"xml"			"xml2"			1 # PEAR needs --enable-xml
 	enable_extension_with		"xmlrpc"		"xmlrpc"		1
 	enable_extension_enable		"yp"			"nis"			1
 	enable_extension_with		"zlib"			"zlib"			1
+	enable_extension_enable		"debug"			"debug"			0
 
-	# DBA support
-	confutils_use_depend_all "cdb"		"dba"
-	confutils_use_depend_all "db4"		"dba"
-	confutils_use_depend_all "flatfile"	"dba"
-	confutils_use_depend_all "gdbm"		"dba"
-	confutils_use_depend_all "inifile"	"dba"
-	confutils_use_depend_all "qdbm"		"dba"
+	php5-sapi_check_awkward_uses
 
+	# DBA support
 	enable_extension_enable		"dba"		"dba" 1
 
-	if useq dba ; then
-		#                     extension     USE flag    shared support?
-		enable_extension_with "cdb"			"cdb"		1
-		enable_extension_with "db4"			"berkdb"	1
-		enable_extension_with "dbm"			"dbm"		1
-		enable_extension_with "flatfile"	"flatfile"	1
-		enable_extension_with "gdbm"		"gdbm"		1
-		enable_extension_with "inifile"		"inifile"	1
-		enable_extension_with "ndbm"		"ndbm"		1
-		enable_extension_with "qdbm"		"qdbm"		1
-	fi
-
-	# GD library support
-
-	confutils_use_depend_any "truetype" "gd" "gd-external"
-
-	if useq gd-external ; then
-		enable_extension_with "gd" "gd-external" 1 "/usr"
-		enable_extension_enable	"gd-jis-conf"	"nls" 0
-		enable_extension_enable	"gd-native-ttf"	"truetype" 0
-	else
-		enable_extension_with "gd" "gd" 1
-		enable_extension_enable	"gd-jis-conf"	"nls" 0
-		enable_extension_enable	"gd-native-ttf"	"truetype" 0
-	fi
-	
-	# imap support
+	# readline support
+	#
+	# you can use readline or libedit, but you can't use both
+	enable_extension_with		"readline"		"readline"		0
+	enable_extension_with		"libedit"		"libedit"		1
 
-	confutils_use_depend_all "kerberos" "imap"
+	# optimization/setting stuff
+	my_conf="${my_conf} --enable-versioning"
 
-	if useq imap ; then
-		enable_extension_with "imap" "imap" 1
-		enable_extension_with "kerberos" "kerberos" 1
-		enable_extension_with "imap-ssl" "ssl" 1
-	fi
+	# all done
 
-	# ldap support
+	echo "${my_conf}"
 
-	confutils_use_depend_all "sasl" "ldap"
+	econf ${my_conf} || die "configure failed"
+	emake || die "make failed"
+}
 
-	if useq ldap ; then
-		enable_extension_with "ldap" "ldap" 1
-		enable_extension_with "ldap-sasl" "sasl" 1
-	fi
+php5-sapi_src_install() {
+	addpredict /usr/share/snmp/mibs/.index
 
-	# mysql support
-	confutils_use_conflict "mysqli" "mysql"
+	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
+	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
-	if useq mysql ; then
-		enable_extension_with		"mysql"			"mysql"			1
-	else
-		enable_extension_with		"mysqli"		"mysql"			1
+	# annoyingly, we have to install the CLI by hand
+	if [ "$PHPSAPI" = "cli" ]; then
+		dobin sapi/cli/php
 	fi
 
-	# odbc support
-	confutils_use_depend_all "adabas"		"odbc"
-	confutils_use_depend_all "birdstep"		"odbc"
-	confutils_use_depend_all "dbmaker"		"odbc"
-	confutils_use_depend_all "empress"		"odbc"
-	confutils_use_depend_all "empress-bcs"	"odbc empress"
-	confutils_use_depend_all "esoob"		"odbc"
-	confutils_use_depend_all "db2"			"odbc"
-	confutils_use_depend_all "sapdb"		"odbc"
-	confutils_use_depend_all "solid"		"odbc"
+	# get the extension dir
+	PHPEXTDIR="`${D}/usr/bin/php-config --extension-dir`"
 
-	if useq odbc ; then
-		enable_extension_with		"unixODBC"		"odbc"			1
+	# don't forget the php.ini file
+	local phpinisrc=php.ini-dist
+	einfo "Setting extension_dir in php.ini"
+	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
 
-		enable_extension_with		"adabas"		"adabas"		1
-		enable_extension_with		"birdstep"		"birdstep"		1
-		enable_extension_with		"dbmaker"		"dbmaker"		1
-		enable_extension_with		"empress"		"empress"		1
-		if useq empress ; then
-			enable_extension_with	"empress-bcs"	"empress-bcs"	0
-		fi
-		enable_extension_with		"esoob"			"esoob"			1
-		enable_extension_with		"ibm-db2"		"db2"			1
-		enable_extension_with		"iodbc"			"iodbc"			1
-		enable_extension_with		"sapdb"			"sapdb"			1
-		enable_extension_with		"solid"			"solid"			1
+	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
+	# fed bad data from outside.
+	if [ "${PHPSAPI}" != "cli" ]; then
+		einfo "Securing fopen wrappers"
+		sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i ${phpinisrc}
 	fi
 
-	# pcntl support
-
-	case "$PHPSAPI" in
-		cli|cgi)
-			enable_extension_with "pcntl" "pcntl" 1 ;;
-	esac
+	einfo "Setting correct include_path"
+	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
 
-	# readline support
-	#
-	# you can use readline or libedit, but you can't use both
-
-	confutils_use_conflict "readline" "libedit"
-
-	enable_extension_with		"readline"		"readline"		0
-	enable_extension_with		"libedit"		"libedit"		1
-
-	# session support
-
-	confutils_use_depend_all "mm"		"session"
-	confutils_use_depend_all "msession"	"session"
-
-	if ! useq session ; then
-		enable_extension_disable	"session"		"session"		1
-	else
-		enable_extension_with		"mm"			"mmap"			0
-		enable_extension_with		"msession"		"msession"		1
+	if useq sharedext; then
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
+			echo "extension=`basename ${x}`" >> ${phpinisrc}
+		done;
 	fi
 
-	# sqlite support
-
-	if ! useq sqlite ; then
-		enable_extension_without	"sqlite"	"sqlite"	0
-	else
-		enable_extension_enable		"sqlite-utf8"	"nls"	0
+	dodir ${PHP_INI_DIR}
+	insinto ${PHP_INI_DIR}
+	newins ${phpinisrc} ${PHP_INI_FILE}
+
+	# Fix PEAR stuff
+	if php5-sapi_is_providerbuild ; then
+		einfo "Fixing PEAR cache location"
+		local oldloc="${T}/pear/cache"
+		local old="s:${#oldloc}:\"${oldloc}\""
+		local newloc="${PEAR_CACHE}"
+		local new="s:${#newloc}:\"${newloc}\""
+		sed "s|${old}|${new}|" -i ${D}/etc/pear.conf
+		keepdir ${PEAR_CACHE}
+		fperms 1777 ${PEAR_CACHE}
 	fi
 
-	echo "$my_conf"
-
-	econf ${my_conf} || die "configure failed"
-	emake || die "make failed"
+	# we only install the following for the PHP_PROVIDER_PKG ebuild
+	if ! php5-sapi_is_providerbuild ; then
+		rm -rf ${D}/usr/bin/{php,phpextdist,phpize,php-config}
+		rm -rf ${D}/usr/lib/php/build
+		rm -rf ${D}/usr/include/php
+		rm -rf ${D}/usr/share/man/man1/php.1*
+	fi
 }
 
-php5-sapi_src_install () {
-	useq shared && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
-	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
+php5-sapi_pkg_postinst() {
+	# make sure the directory exists
+	# and is usable
+	mkdir -p ${PEAR_CACHE}
+	chmod 1777 ${PEAR_CACHE}
 
-	if [ "$PHPSAPI" = "cli" ]; then
-		dobin sapi/cli/php
+	ewarn "If you have additional third party PHP extensions (such as"
+	ewarn "dev-php/eaccelerator) you may need to recompile them now."
+
+	if use curl; then
+		ewarn "Please be aware that CURL can allow the bypass of open_basedir restrictions."
 	fi
 }
+
diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index 181aa4fda8a0..2f1bb8b76b4f 100644
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.1.1.1 2005/11/30 09:59:14 chriswhite Exp $
 #
 # ########################################################################
 #
@@ -14,12 +14,12 @@
 # Author(s)		Stuart Herbert
 #				<stuart@gentoo.org>
 #
-#				CHTEKK
-#				<chtekk@longitekk.org>
+#				Luca Longinotti
+#				<chtekk@gentoo.org>
 #
 # ========================================================================
 
-CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct"
+CONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob frontbase hyperwave-api informix interbase mnogosearch msql oci8 oracle7 ovrimos pfpro sapdb solid sybase sybase-ct"
 EBUILD_SUPPORTS_SHAREDEXT=1
 
 inherit flag-o-matic eutils confutils libtool php-common-r1
@@ -39,26 +39,32 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external jpeg kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 odbc oracle7 ovrimos pcntl pcre pdo-external pear pfpro png posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xml2 xmlrpc xpm xsl yaz zip zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker debug doc empress empress-bcs esoob exif frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming mnogosearch msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc oracle7 ovrimos pcntl pcre pdo-external pear pfpro pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype wddx xml2 xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="${DEPEND}
 	!dev-php/php
 	!dev-php/php-cgi
 	!dev-php/mod_php
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18
+	>=sys-devel/automake-1.9.6
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59
+	sys-devel/autoconf-wrapper
 	berkdb? ( =sys-libs/db-4* )
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( dev-db/cdb )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
 	curl? ( >=net-misc/curl-7.10.5 )
 	fdftk? ( app-text/fdftk )
-	firebird? ( dev-db/firebird  )
+	firebird? ( dev-db/firebird )
+	gd? ( >=media-libs/jpeg-6b media-libs/libpng )
 	gd-external? ( media-libs/gd )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( dev-libs/gmp )
 	imap? ( virtual/imap-c-client )
 	iodbc? ( dev-db/libiodbc )
-	jpeg? ( >=media-libs/jpeg-6b )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	libedit? ( dev-libs/libedit )
@@ -70,17 +76,18 @@ DEPEND="${DEPEND}
 	mysqli? ( >=dev-db/mysql-4.1 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
 	postgres? ( >=dev-db/postgresql-7.1 )
-	png? ( media-libs/libpng )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline )
 	recode? ( app-text/recode )
+	sasl? ( dev-libs/cyrus-sasl )
 	sharedmem? ( dev-libs/mm )
 	simplexml? ( >=dev-libs/libxml2-2.6.8 )
 	snmp? ( >=net-analyzer/net-snmp-5.2 )
 	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.60 )
+	spell? ( >=app-text/aspell-0.50 )
 	ssl? ( >=dev-libs/openssl-0.9.7 )
 	sybase? ( dev-db/freetds )
 	tidy? ( app-text/htmltidy )
@@ -88,6 +95,7 @@ DEPEND="${DEPEND}
 	truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 )
 	wddx? ( dev-libs/expat )
 	xml2? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? ( virtual/x11 )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib )
@@ -126,6 +134,7 @@ PHP_INI_FILE="php.ini"
 
 case "${PV}" in
 	5.0.4) HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.1.patch.gz" ;;
+	5.0.5) HARDENEDPHP_PATCH="hardening-patch-${PV}-0.4.3.patch.gz" ;;
 esac
 
 [ -n "${HARDENEDPHP_PATCH}" ] && SRC_URI="${SRC_URI} hardenedphp? ( http://www.hardened-php.net/${HARDENEDPHP_PATCH} )"
@@ -156,26 +165,21 @@ php5_0-sapi_check_awkward_uses() {
 	# A variety of extensions need DBA
 	confutils_use_depend_all "berkdb"	"dba"
 	confutils_use_depend_all "cdb"		"dba"
-	confutils_use_depend_all "dbm"		"dba"
 	confutils_use_depend_all "flatfile"	"dba"
 	confutils_use_depend_all "gdbm"		"dba"
 	confutils_use_depend_all "inifile"	"dba"
 	confutils_use_depend_all "qdbm"		"dba"
 
 	# EXIF only gets built if we support a file format that uses it
-	confutils_use_depend_any "exif" "jpeg" "tiff"
+	confutils_use_depend_any "exif" "gd" "tiff"
 
 	# support for the GD graphics library
 	confutils_use_conflict "gd" "gd-external"
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	confutils_use_depend_any "jpeg" "gd" "gd-external"
-	confutils_use_depend_any "png"  "gd" "gd-external"
-	confutils_use_depend_any "tiff" "gd" "gd-external"
-	confutils_use_depend_any "xpm"  "gd" "gd-external"
-	confutils_use_depend_all "png"  "zlib"
-
-	# Hardened-PHP doesn't work well with Apache; needs further investigation
-	confutils_use_conflict "hardenedphp" "apache" "apache2"
+	confutils_use_depend_any "cjk"	"gd" "gd-external"
+	confutils_use_depend_all "tiff"	"gd"
+	confutils_use_depend_all "xpm"	"gd"
+	confutils_use_depend_all "gd"	"zlib"
 
 	# IMAP support
 	php_check_imap
@@ -187,6 +191,7 @@ php5_0-sapi_check_awkward_uses() {
 	php_check_mta
 
 	# Oracle support
+	confutils_use_conflict "oci8" "oci8-instant-client"
 	php_check_oracle
 
 	# LDAP-sasl support
@@ -208,10 +213,10 @@ php5_0-sapi_check_awkward_uses() {
 	confutils_use_depend_all "solid"		"odbc"
 
 	# PEAR support
-	confutils_use_depend_all "pear"			"cli" "pcre" "xml2"
+	confutils_use_depend_all "pear"			"cli" "pcre" "xml2" "zlib"
 
-	# QDBM doesn't play nicely with GDBM or DBM
-	confutils_use_conflict "qdbm" "gdbm" "dbm"
+	# QDBM doesn't play nicely with GDBM
+	confutils_use_conflict "qdbm" "gdbm"
 
 	# Readline and libedit do the same thing; you can't have both
 	confutils_use_conflict "readline" "libedit"
@@ -237,19 +242,20 @@ php5_0-sapi_pkg_setup() {
 }
 
 php5_0-sapi_src_unpack() {
-	if [ "${PHP_PACKAGE}" == 1 ]; then
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
 		unpack ${A}
 	fi
 
-	cd ${PHP_S}
+	cd "${S}"
 
 	# Patch PHP to show Gentoo as the server platform
-	sed -i "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" configure
+	sed -e "s/PHP_UNAME=\`uname -a | xargs\`/PHP_UNAME=\`uname -s -n -r -v | xargs\`/g" -i configure.in
+
 	# Patch for PostgreSQL support
-	sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure
+	use postgres && sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i ext/pgsql/config.m4
 
 	# Patch for session persistence bug
-	epatch ${FILESDIR}/5.1.0/php5_soap_persistence_session.diff
+	epatch "${FILESDIR}/5.0-any/php5-soap_persistence_session.diff"
 
 	# stop php from activating the apache config, as we will do that ourselves
 	for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
@@ -257,48 +263,60 @@ php5_0-sapi_src_unpack() {
 		sed -i.orig -e 's,-i -A -n php5,-i -n php5,g' ${i}
 	done
 
-	# hardenedphp support
-	use hardenedphp && [ -n "${HARDENEDPHP_PATCH}" ] && epatch ${DISTDIR}/${HARDENEDPHP_PATCH}
-
 	# imap support
-	use imap && epatch ${FILESDIR}/5.0.0/php5-imap-symlink.diff
+	use imap && epatch "${FILESDIR}/5.0-any/php5-imap-symlink.diff"
 
 	# iodbc support
-	use iodbc && epatch ${FILESDIR}/5.0.0/php5-iodbc-config.diff
-	use iodbc && epatch ${FILESDIR}/5.1.0/php5-with-iodbc.diff
-
-	# fix configure scripts to recognize uClibc
-	uclibctoolize
+	use iodbc && epatch "${FILESDIR}/5.0-any/php5-iodbc-config.diff"
+	use iodbc && epatch "${FILESDIR}/5.0-any/php5-with-iodbc.diff"
 
-	# Just in case ;-)
-	chmod 755 configure
+	# hardenedphp support
+	if use hardenedphp ; then
+		if [ -n "${HARDENEDPHP_PATCH}" ] ; then
+			epatch "${DISTDIR}/${HARDENEDPHP_PATCH}"
+		else
+			ewarn "There is no Hardened-PHP available for this PHP release yet!"
+		fi
+	fi
 
 	# fix problems compiling with apache2
 	if useq apache2 && ! useq threads ; then
-		epatch ${FILESDIR}/5.1.0/php5-prefork.patch || die "Unable to patch for prefork support"
+		epatch "${FILESDIR}/5.0-any/php5-prefork.patch" || die "Unable to patch for prefork support"
 	fi
 
+	# fix configure scripts to correctly support HardenedPHP
+	# and patch PHP to support libtool 1.5
+	epatch "${FILESDIR}/5.0-any/php5-libtool-1.5.patch"
+	einfo "Running aclocal"
+	WANT_AUTOMAKE=1.9 aclocal --force || die "Unable to run aclocal successfully"
+	einfo "Running libtoolize"
+	libtoolize --copy --force || die "Unable to run libtoolize successfully"
+
 	# rebuild configure to make sure it's up to date
 	einfo "Rebuilding configure script"
-	WANT_AUTOCONF=2.5 autoconf -W no-cross || die "Unable to regenerate configure script"
+	WANT_AUTOCONF=2.5 autoreconf --force -W no-cross || die "Unable to regenerate configure script"
+
+	# run elibtoolize
+	elibtoolize
 
-	# fix DBA support
-	sed -e 's!for LIB in dbm c gdbm!for LIB in dbm c gdbm gdbm_compat!' -i configure
+	# Just in case ;-)
+	chmod 755 configure
 }
 
 set_php_ini_dir() {
 	PHP_INI_DIR="/etc/php/${PHPSAPI}-php5"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 
 php5_0-sapi_src_compile() {
 	destdir=/usr/$(get_libdir)/php5
 	set_php_ini_dir
 
-	cd ${PHP_S}
+	cd "${S}"
 	confutils_init
 
-	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} --with-config-file-scan-dir=${PHP_EXT_INI_DIR} --without-pear"
+	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE} --without-pear"
 
 	#				extension		USE flag		shared support?
 	enable_extension_enable		"bcmath"		"bcmath"		1
@@ -321,7 +339,6 @@ php5_0-sapi_src_compile() {
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_disable	"ipv6"			"ipv6"			0
 	# ircg extension not supported on Gentoo at this time
-	enable_extension_with 		"jpeg-dir" 		"jpeg" 			0 "/usr"
 	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
 	enable_extension_disable	"libxml"		"xml2"			0
 	enable_extension_enable		"mbstring"		"nls"			1
@@ -330,10 +347,12 @@ php5_0-sapi_src_compile() {
 	enable_extension_enable		"memory-limit"	"memlimit"		0
 	enable_extension_with		"mhash"			"mhash"			1
 	enable_extension_with		"ming"			"ming"			1
+	enable_extension_with		"mnogosearch"	"mnogosearch"	1
 	enable_extension_with		"msql"			"msql"			1
 	enable_extension_with		"mssql"			"mssql"			1
 	enable_extension_with		"ncurses"		"ncurses"		1
 	enable_extension_with		"oci8"			"oci8"			1
+	enable_extension_with		"oci8-instant-client"	"oci8-instant-client"	1
 	enable_extension_with		"oracle"		"oracle7"		1
 	enable_extension_with		"openssl"		"ssl"			1
 	enable_extension_with		"openssl-dir"	"ssl"			0 "/usr"
@@ -371,7 +390,6 @@ php5_0-sapi_src_compile() {
 	if useq dba ; then
 		enable_extension_with "cdb"			"cdb"		1
 		enable_extension_with "db4"			"berkdb"	1
-		enable_extension_with "dbm"			"dbm"		1
 		enable_extension_with "flatfile"	"flatfile"	1
 		enable_extension_with "gdbm"		"gdbm"		1
 		enable_extension_with "inifile"		"inifile"	1
@@ -382,15 +400,16 @@ php5_0-sapi_src_compile() {
 	if useq gd-external ; then
 		enable_extension_with	"freetype-dir"	"truetype"		0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"		0 "/usr"
-		enable_extension_enable	"gd-jis-conv"	"nls" 			0
+		enable_extension_enable	"gd-jis-conv"	"cjk" 			0
 		enable_extension_enable	"gd-native-ttf"	"truetype"		0
 		enable_extension_with 	"gd" 			"gd-external"	1 "/usr"
 	else
 		enable_extension_with	"freetype-dir"	"truetype"		0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"		0 "/usr"
-		enable_extension_enable	"gd-jis-conv"	"nls"			0
+		enable_extension_enable	"gd-jis-conv"	"cjk"			0
 		enable_extension_enable	"gd-native-ttf"	"truetype"		0
-		enable_extension_with 	"png-dir" 		"png" 			0 "/usr"
+		enable_extension_with	"jpeg-dir"		"gd"			0 "/usr"
+		enable_extension_with 	"png-dir" 		"gd" 			0 "/usr"
 		enable_extension_with 	"tiff-dir" 		"tiff" 			0 "/usr"
 		enable_extension_with 	"xpm-dir" 		"xpm" 			0 "/usr/X11R6"
 		# enable gd last, so configure can pick up the previous settings
@@ -461,7 +480,7 @@ php5_0-sapi_src_compile() {
 	fi
 
 	# fix ELF-related problems
-	if has_pic ; then
+	if useq pic ; then
 		einfo "Enabling PIC support"
 		my_conf="${my_conf} --with-pic"
 	fi
@@ -490,12 +509,12 @@ php5_0-sapi_src_compile() {
 php5_0-sapi_src_install() {
 	destdir=/usr/$(get_libdir)/php5
 
-	cd ${PHP_S}
+	cd "${S}"
 	addpredict /usr/share/snmp/mibs/.index
 
 	PHP_INSTALLTARGETS="install-build install-headers install-programs"
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
-	make INSTALL_ROOT=${D} ${PHP_INSTALLTARGETS} || die "install failed"
+	make INSTALL_ROOT="${D}" ${PHP_INSTALLTARGETS} || die "install failed"
 
 	# install missing header files
 	if useq nls ; then
@@ -507,7 +526,7 @@ php5_0-sapi_src_install() {
 	fi
 
 	# get the extension dir
-	PHPEXTDIR="`${D}/${destdir}/bin/php-config --extension-dir`"
+	PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
 
 	# don't forget the php.ini file
 	local phpinisrc=php.ini-dist
@@ -521,22 +540,21 @@ php5_0-sapi_src_install() {
 
 	# Set the include path to point to where we want to find PEAR packages
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path .*|include_path = ".:/usr/share/php:/usr/share/php5"|' -i ${phpinisrc}
-
-	# Install any extensions built as shared objects
-	if useq sharedext; then
-		for x in `ls ${D}/${PHPEXTDIR}/*.so | sort`; do
-			echo "extension=`basename ${x}`" >> ${phpinisrc}
-		done;
-	fi
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php5:/usr/share/php"|' -i ${phpinisrc}
 
 	# create the directory where we'll put php5-only php scripts
 	keepdir /usr/share/php5
 }
 
 php5_0-sapi_install_ini() {
+	destdir=/usr/$(get_libdir)/php5
+
+	# get the extension dir
+	PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
+
 	# work out where we are installing the ini file
 	set_php_ini_dir
+
 	local phpinisrc=php.ini-dist
 
 	dodir ${PHP_INI_DIR}
@@ -544,14 +562,86 @@ php5_0-sapi_install_ini() {
 	newins ${phpinisrc} ${PHP_INI_FILE}
 
 	dodir ${PHP_EXT_INI_DIR}
+	dodir ${PHP_EXT_INI_DIR_ACTIVE}
+
+	# Install any extensions built as shared objects
+	if useq sharedext ; then
+		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort` ; do
+			inifilename=${x/.so/.ini}
+			inifilename=`basename ${inifilename}`
+			echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
+			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
+		done
+	fi
 }
 
 php5_0-sapi_pkg_postinst() {
+	# Create the symlinks for php-cli
+	if useq cli ; then
+		if test -h "/usr/bin/php"; then
+			ewarn "/usr/bin/php is a symlink."
+			ewarn "The PHP packages will not update that symlink,"
+			ewarn "please check it and do so yourself if you need"
+			ewarn "to, using eselect."
+			ewarn "For example with the command:"
+			ewarn "eselect php set php5"
+			ewarn "to symlink to /usr/lib/php5/bin/php."
+			ewarn
+		else
+			eselect php set php5
+		fi
+	fi
+
+	# Create the symlinks for php-cgi
+	if useq cgi ; then
+		if test -h "/usr/bin/php-cgi"; then
+			ewarn "/usr/bin/php-cgi is a symlink."
+			ewarn "The PHP packages will not update that symlink,"
+			ewarn "please check it and do so yourself if you need"
+			ewarn "to, using eselect."
+			ewarn "For example with the command:"
+			ewarn "eselect php-cgi set php5"
+			ewarn "to symlink to /usr/lib/php5/bin/php-cgi."
+			ewarn
+		else
+			eselect php-cgi set php5
+		fi
+	fi
+
+	# Create the symlinks for php-devel
+	if test -h "/usr/bin/phpize" || test -h "/usr/bin/php-config" ; then
+		ewarn "/usr/bin/phpize and/or /usr/bin/php-config are symlinks."
+		ewarn "The PHP packages will not update these symlinks,"
+		ewarn "please check them and do so yourself if you need"
+		ewarn "to, using eselect."
+		ewarn "For example with the command:"
+		ewarn "eselect php-devel set php5"
+		ewarn "to symlink to /usr/lib/php5/bin/phpize and"
+		ewarn "/usr/lib/php5/bin/php-config."
+		ewarn
+	else
+		eselect php-devel set php5
+	fi
+
 	ewarn "If you have additional third party PHP extensions (such as"
 	ewarn "dev-php5/phpdbg) you may need to recompile them now."
+	ewarn "A new way of enabling/disabling PHP extensions was introduced"
+	ewarn "with the newer PHP packages releases, so please reemerge any"
+	ewarn "PHP extensions you have installed to automatically adapt to"
+	ewarn "the new configuration layout."
+	ewarn
 
 	if useq curl; then
 		ewarn "Please be aware that CURL can allow the bypass of open_basedir restrictions."
 		ewarn "This can be a security risk!"
+		ewarn
 	fi
+
+	ewarn "The 'pic' USE flag was added to newer releases of dev-lang/php."
+	ewarn "With PIC enabled, your PHP installation may become slower, but"
+	ewarn "PIC is required on Hardened-Gentoo platforms (where the USE flag"
+	ewarn "is enabled automatically). You may also need this on other"
+	ewarn "configurations where you disabled TEXTRELs, for example using"
+	ewarn "PaX in the kernel."
+	ewarn
 }
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index effa5d43ad19..ee42feb20b82 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.1 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.1.1.1 2005/11/30 09:59:16 chriswhite Exp $
 #
 # ########################################################################
 #
@@ -14,8 +14,8 @@
 # Author(s)		Stuart Herbert
 #				<stuart@gentoo.org>
 #
-#				CHTEKK
-#				<chtekk@longitekk.org>
+#				Luca Longinotti
+#				<chtekk@gentoo.org>
 #
 # ========================================================================
 
@@ -39,26 +39,32 @@ if [ "${PHP_PACKAGE}" = 1 ]; then
 	S="${WORKDIR}/${MY_PHP_P}"
 fi
 
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb crypt ctype curl curlwrappers db2 dba dbase dbm dbmaker debug doc empress empress-bcs esoob exif fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external jpeg kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 odbc oracle7 ovrimos pcntl pcre pdo pdo-external pear pfpro png posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype vm-goto vm-switch wddx xml2 xmlreader xmlrpc xpm xsl yaz zip zlib"
+IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk crypt ctype curl curlwrappers db2 dba dbase dbmaker debug doc empress empress-bcs esoob exif fastbuild frontbase fdftk filepro firebird flatfile ftp gd gd-external gdbm gmp hardenedphp hyperwave-api iconv imap informix inifile interbase iodbc ipv6 java-external kerberos ldap libedit mcve memlimit mhash ming msql mssql mysql mysqli ncurses nls oci8 oci8-instant-client odbc oracle7 ovrimos pcntl pcre pdo pdo-external pear pfpro pic posix postgres qdbm readline recode sapdb sasl session sharedext sharedmem simplexml snmp soap sockets solid spell spl sqlite ssl sybase sybase-ct sysvipc threads tidy tiff tokenizer truetype vm-goto vm-switch wddx xml2 xmlreader xmlrpc xpm xsl yaz zip zlib"
 
 # these USE flags should have the correct dependencies
 DEPEND="${DEPEND}
 	!dev-php/php
 	!dev-php/php-cgi
 	!dev-php/mod_php
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18
+	>=sys-devel/automake-1.9.6
+	sys-devel/automake-wrapper
+	>=sys-devel/autoconf-2.59
+	sys-devel/autoconf-wrapper
 	berkdb? ( =sys-libs/db-4* )
 	bzip2? ( app-arch/bzip2 )
 	cdb? ( dev-db/cdb )
 	crypt? ( >=dev-libs/libmcrypt-2.4 )
 	curl? ( >=net-misc/curl-7.10.5 )
 	fdftk? ( app-text/fdftk )
-	firebird? ( dev-db/firebird  )
+	firebird? ( dev-db/firebird )
+	gd? ( >=media-libs/jpeg-6b media-libs/libpng )
 	gd-external? ( media-libs/gd )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	gmp? ( dev-libs/gmp )
 	imap? ( virtual/imap-c-client )
 	iodbc? ( dev-db/libiodbc )
-	jpeg? ( >=media-libs/jpeg-6b )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11 )
 	libedit? ( dev-libs/libedit )
@@ -70,17 +76,18 @@ DEPEND="${DEPEND}
 	mysqli? ( >=dev-db/mysql-4.1 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
 	postgres? ( >=dev-db/postgresql-7.1 )
-	png? ( media-libs/libpng )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline )
 	recode? ( app-text/recode )
+	sasl? ( dev-libs/cyrus-sasl )
 	sharedmem? ( dev-libs/mm )
 	simplexml? ( >=dev-libs/libxml2-2.6.8 )
 	snmp? ( >=net-analyzer/net-snmp-5.2 )
 	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.60 )
+	spell? ( >=app-text/aspell-0.50 )
 	ssl? ( >=dev-libs/openssl-0.9.7 )
 	sybase? ( dev-db/freetds )
 	tidy? ( app-text/htmltidy )
@@ -89,6 +96,7 @@ DEPEND="${DEPEND}
 	wddx? ( dev-libs/expat )
 	xml2? ( >=dev-libs/libxml2-2.6.8 )
 	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 )
 	xpm? ( virtual/x11 )
 	xsl? ( dev-libs/libxslt )
 	zlib? ( sys-libs/zlib )
@@ -157,26 +165,21 @@ php5_1-sapi_check_awkward_uses() {
 	# A variety of extensions need DBA
 	confutils_use_depend_all "berkdb"	"dba"
 	confutils_use_depend_all "cdb"		"dba"
-	confutils_use_depend_all "dbm"		"dba"
 	confutils_use_depend_all "flatfile"	"dba"
 	confutils_use_depend_all "gdbm"		"dba"
 	confutils_use_depend_all "inifile"	"dba"
 	confutils_use_depend_all "qdbm"		"dba"
 
 	# EXIF only gets built if we support a file format that uses it
-	confutils_use_depend_any "exif" "jpeg" "tiff"
+	confutils_use_depend_any "exif" "gd" "tiff"
 
 	# support for the GD graphics library
 	confutils_use_conflict "gd" "gd-external"
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	confutils_use_depend_any "jpeg" "gd" "gd-external"
-	confutils_use_depend_any "png"  "gd" "gd-external"
-	confutils_use_depend_any "tiff" "gd" "gd-external"
-	confutils_use_depend_any "xpm"  "gd" "gd-external"
-	confutils_use_depend_all "png"  "zlib"
-
-	# Hardened-PHP doesn't work well with Apache; needs further investigation
-	confutils_use_conflict "hardenedphp" "apache" "apache2"
+	confutils_use_depend_any "cjk"	"gd" "gd-external"
+	confutils_use_depend_all "tiff"	"gd"
+	confutils_use_depend_all "xpm"	"gd"
+	confutils_use_depend_all "gd"	"zlib"
 
 	# IMAP support
 	php_check_imap
@@ -188,6 +191,7 @@ php5_1-sapi_check_awkward_uses() {
 	php_check_mta
 
 	# Oracle support
+	confutils_use_conflict "oci8" "oci8-instant-client"
 	php_check_oracle
 
 	# LDAP-sasl support
@@ -213,10 +217,10 @@ php5_1-sapi_check_awkward_uses() {
 	confutils_use_conflict "pdo" "pdo-external"
 
 	# PEAR support
-	confutils_use_depend_all "pear"			"cli" "pcre" "xml2"
+	confutils_use_depend_all "pear"			"cli" "pcre" "xml2" "zlib"
 
-	# QDBM doesn't play nicely with GDBM or DBM
-	confutils_use_conflict "qdbm" "gdbm" "dbm"
+	# QDBM doesn't play nicely with GDBM
+	confutils_use_conflict "qdbm" "gdbm"
 
 	# Readline and libedit do the same thing; you can't have both
 	confutils_use_conflict "readline" "libedit"
@@ -245,19 +249,20 @@ php5_1-sapi_pkg_setup() {
 }
 
 php5_1-sapi_src_unpack() {
-	if [ "${PHP_PACKAGE}" == 1 ]; then
+	if [ "${PHP_PACKAGE}" == 1 ] ; then
 		unpack ${A}
 	fi
 
-	cd ${PHP_S}
+	cd "${S}"
 
 	# Patch PHP to show Gentoo as the server platform
-	sed -i "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" configure
+	sed -e "s/PHP_UNAME=\`uname -a | xargs\`/PHP_UNAME=\`uname -s -n -r -v | xargs\`/g" -i configure.in
+
 	# Patch for PostgreSQL support
-	sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i configure
+	use postgres && sed -e 's|include/postgresql|include/postgresql include/postgresql/pgsql|g' -i ext/pgsql/config.m4
 
 	# Patch for session persistence bug
-	epatch ${FILESDIR}/5.1.0/php5_soap_persistence_session.diff
+	epatch "${FILESDIR}/5.1-any/php5-soap_persistence_session.diff"
 
 	# stop php from activating the apache config, as we will do that ourselves
 	for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do
@@ -265,51 +270,61 @@ php5_1-sapi_src_unpack() {
 		sed -i.orig -e 's,-i -A -n php5,-i -n php5,g' ${i}
 	done
 
-	# hardenedphp support
-	use hardenedphp && [ -n "${HARDENEDPHP_PATCH}" ] && epatch ${DISTDIR}/${HARDENEDPHP_PATCH}
-
 	# imap support
-	use imap && epatch ${FILESDIR}/5.1.0/php5-imap-symlink.diff
+	use imap && epatch "${FILESDIR}/5.1-any/php5-imap-symlink.diff"
 
 	# iodbc support
-	use iodbc && epatch ${FILESDIR}/5.1.0/php5-iodbc-config.diff
-	use iodbc && epatch ${FILESDIR}/5.1.0/php5-with-iodbc.diff
+	use iodbc && epatch "${FILESDIR}/5.1-any/php5-iodbc-config.diff"
+	use iodbc && epatch "${FILESDIR}/5.1-any/php5-with-iodbc.diff"
 
-	# fix configure scripts to recognize uClibc
-	uclibctoolize
+	# hardenedphp support
+	if use hardenedphp ; then
+		if [ -n "${HARDENEDPHP_PATCH}" ] ; then
+			epatch "${DISTDIR}/${HARDENEDPHP_PATCH}"
+		else
+			ewarn "There is no Hardened-PHP available for this PHP release yet!"
+		fi
+	fi
 
-	# Just in case ;-)
-	chmod 755 configure
+	# fastbuild support
+	use fastbuild && epatch "${FILESDIR}/5.1-any/php5-fastbuild.patch"
 
 	# fix problems compiling with apache2
 	if useq apache2 && ! useq threads ; then
-		epatch ${FILESDIR}/5.1.0/php5-prefork.patch || die "Unable to patch for prefork support"
+		epatch "${FILESDIR}/5.1-any/php5-prefork.patch" || die "Unable to patch for prefork support"
 	fi
 
-	# fastbuild support
-	use fastbuild && epatch ${FILESDIR}/5.1.0/fastbuild.patch
+	# fix configure scripts to correctly support HardenedPHP
+	einfo "Running aclocal"
+	WANT_AUTOMAKE=1.9 aclocal --force || die "Unable to run aclocal successfully"
+	einfo "Running libtoolize"
+	libtoolize --copy --force || die "Unable to run libtoolize successfully"
 
 	# rebuild configure to make sure it's up to date
 	einfo "Rebuilding configure script"
-	WANT_AUTOCONF=2.5 autoconf -W no-cross || die "Unable to regenerate configure script"
+	WANT_AUTOCONF=2.5 autoreconf --force -W no-cross || die "Unable to regenerate configure script"
+
+	# run elibtoolize
+	elibtoolize
 
-	# fix DBA support
-	sed -e 's!for LIB in dbm c gdbm!for LIB in dbm c gdbm gdbm_compat!' -i configure
+	# Just in case ;-)
+	chmod 755 configure
 }
 
 set_php_ini_dir() {
 	PHP_INI_DIR="/etc/php/${PHPSAPI}-php5"
 	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
 }
 
 php5_1-sapi_src_compile() {
 	destdir=/usr/$(get_libdir)/php5
 	set_php_ini_dir
 
-	cd ${PHP_S}
+	cd "${S}"
 	confutils_init
 
-	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} --with-config-file-scan-dir=${PHP_EXT_INI_DIR} --without-pear"
+	my_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE} --without-pear"
 
 	#				extension		USE flag		shared support?
 	enable_extension_enable		"bcmath"		"bcmath"		1
@@ -332,7 +347,6 @@ php5_1-sapi_src_compile() {
 	enable_extension_with		"informix"		"informix"		1
 	enable_extension_disable	"ipv6"			"ipv6"			0
 	# ircg extension not supported on Gentoo at this time
-	enable_extension_with 		"jpeg-dir" 		"jpeg" 			0 "/usr"
 	enable_extension_with		"kerberos"		"kerberos"		0 "/usr"
 	enable_extension_disable	"libxml"		"xml2"			0
 	enable_extension_enable		"mbstring"		"nls"			1
@@ -345,6 +359,7 @@ php5_1-sapi_src_compile() {
 	enable_extension_with		"mssql"			"mssql"			1
 	enable_extension_with		"ncurses"		"ncurses"		1
 	enable_extension_with		"oci8"			"oci8"			1
+	enable_extension_with		"oci8-instant-client"	"oci8-instant-client"	1
 	enable_extension_with		"oracle"		"oracle7"		1
 	enable_extension_with		"openssl"		"ssl"			1
 	enable_extension_with		"openssl-dir"	"ssl"			0 "/usr"
@@ -384,7 +399,6 @@ php5_1-sapi_src_compile() {
 	if useq dba ; then
 		enable_extension_with "cdb"			"cdb"		1
 		enable_extension_with "db4"			"berkdb"	1
-		enable_extension_with "dbm"			"dbm"		1
 		enable_extension_with "flatfile"	"flatfile"	1
 		enable_extension_with "gdbm"		"gdbm"		1
 		enable_extension_with "inifile"		"inifile"	1
@@ -395,15 +409,16 @@ php5_1-sapi_src_compile() {
 	if useq gd-external ; then
 		enable_extension_with	"freetype-dir"	"truetype"		0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"		0 "/usr"
-		enable_extension_enable	"gd-jis-conv"	"nls" 			0
+		enable_extension_enable	"gd-jis-conv"	"cjk" 			0
 		enable_extension_enable	"gd-native-ttf"	"truetype"		0
 		enable_extension_with 	"gd" 			"gd-external"	1 "/usr"
 	else
 		enable_extension_with	"freetype-dir"	"truetype"		0 "/usr"
 		enable_extension_with	"t1lib"			"truetype"		0 "/usr"
-		enable_extension_enable	"gd-jis-conv"	"nls"			0
+		enable_extension_enable	"gd-jis-conv"	"cjk"			0
 		enable_extension_enable	"gd-native-ttf"	"truetype"		0
-		enable_extension_with 	"png-dir" 		"png" 			0 "/usr"
+		enable_extension_with	"jpeg-dir"		"gd"			0 "/usr"
+		enable_extension_with 	"png-dir" 		"gd" 			0 "/usr"
 		enable_extension_with 	"tiff-dir" 		"tiff" 			0 "/usr"
 		enable_extension_with 	"xpm-dir" 		"xpm" 			0 "/usr/X11R6"
 		# enable gd last, so configure can pick up the previous settings
@@ -460,6 +475,11 @@ php5_1-sapi_src_compile() {
 		enable_extension_with		"pdo-firebird"	"firebird"		1
 		enable_extension_with		"pdo-mysql"		"mysql"			1 "/usr"
 		enable_extension_with		"pdo-oci"		"oci8"			1
+		if useq oci8-instant-client ; then
+			OCI8IC_PKG="`best_version dev-db/oracle-instantclient-basic`"
+			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g'`"
+		fi
+		enable_extension_with		"pdo-oci"		"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
 		enable_extension_with		"pdo-odbc"		"odbc"			1 "unixODBC,/usr"
 		enable_extension_with		"pdo-pgsql"		"postgres"		1
 		enable_extension_without	"pdo-sqlite"	"sqlite"		1
@@ -483,7 +503,7 @@ php5_1-sapi_src_compile() {
 	else
 		enable_extension_enable		"sqlite-utf8"	"nls"		0
 	fi
-	
+
 	# Zend-GOTO-VM support
 	if useq vm-goto ; then
 		my_conf="${my_conf} --with-zend-vm=GOTO"
@@ -495,7 +515,7 @@ php5_1-sapi_src_compile() {
 	fi
 
 	# fix ELF-related problems
-	if has_pic ; then
+	if useq pic ; then
 		einfo "Enabling PIC support"
 		my_conf="${my_conf} --with-pic"
 	fi
@@ -524,12 +544,12 @@ php5_1-sapi_src_compile() {
 php5_1-sapi_src_install() {
 	destdir=/usr/$(get_libdir)/php5
 
-	cd ${PHP_S}
+	cd "${S}"
 	addpredict /usr/share/snmp/mibs/.index
 
 	PHP_INSTALLTARGETS="install-build install-headers install-programs"
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
-	make INSTALL_ROOT=${D} ${PHP_INSTALLTARGETS} || die "install failed"
+	make INSTALL_ROOT="${D}" ${PHP_INSTALLTARGETS} || die "install failed"
 
 	# install missing header files
 	if useq nls ; then
@@ -541,7 +561,7 @@ php5_1-sapi_src_install() {
 	fi
 
 	# get the extension dir
-	PHPEXTDIR="`${D}/${destdir}/bin/php-config --extension-dir`"
+	PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
 
 	# don't forget the php.ini file
 	local phpinisrc=php.ini-dist
@@ -555,22 +575,21 @@ php5_1-sapi_src_install() {
 
 	# Set the include path to point to where we want to find PEAR packages
 	einfo "Setting correct include_path"
-	sed -e 's|^;include_path .*|include_path = ".:/usr/share/php:/usr/share/php5"|' -i ${phpinisrc}
-
-	# Install any extensions built as shared objects
-	if useq sharedext; then
-		for x in `ls ${D}/${PHPEXTDIR}/*.so | sort`; do
-			echo "extension=`basename ${x}`" >> ${phpinisrc}
-		done;
-	fi
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php5:/usr/share/php"|' -i ${phpinisrc}
 
 	# create the directory where we'll put php5-only php scripts
 	keepdir /usr/share/php5
 }
 
 php5_1-sapi_install_ini() {
+	destdir=/usr/$(get_libdir)/php5
+
+	# get the extension dir
+	PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
+
 	# work out where we are installing the ini file
 	set_php_ini_dir
+
 	local phpinisrc=php.ini-dist
 
 	dodir ${PHP_INI_DIR}
@@ -578,14 +597,86 @@ php5_1-sapi_install_ini() {
 	newins ${phpinisrc} ${PHP_INI_FILE}
 
 	dodir ${PHP_EXT_INI_DIR}
+	dodir ${PHP_EXT_INI_DIR_ACTIVE}
+
+	# Install any extensions built as shared objects
+	if useq sharedext ; then
+		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort` ; do
+			inifilename=${x/.so/.ini}
+			inifilename=`basename ${inifilename}`
+			echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
+			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
+		done
+	fi
 }
 
 php5_1-sapi_pkg_postinst() {
+	# Create the symlinks for php-cli
+	if useq cli ; then
+		if test -h "/usr/bin/php"; then
+			ewarn "/usr/bin/php is a symlink."
+			ewarn "The PHP packages will not update that symlink,"
+			ewarn "please check it and do so yourself if you need"
+			ewarn "to, using eselect."
+			ewarn "For example with the command:"
+			ewarn "eselect php set php5"
+			ewarn "to symlink to /usr/lib/php5/bin/php."
+			ewarn
+		else
+			eselect php set php5
+		fi
+	fi
+
+	# Create the symlinks for php-cgi
+	if useq cgi ; then
+		if test -h "/usr/bin/php-cgi"; then
+			ewarn "/usr/bin/php-cgi is a symlink."
+			ewarn "The PHP packages will not update that symlink,"
+			ewarn "please check it and do so yourself if you need"
+			ewarn "to, using eselect."
+			ewarn "For example with the command:"
+			ewarn "eselect php-cgi set php5"
+			ewarn "to symlink to /usr/lib/php5/bin/php-cgi."
+			ewarn
+		else
+			eselect php-cgi set php5
+		fi
+	fi
+
+	# Create the symlinks for php-devel
+	if test -h "/usr/bin/phpize" || test -h "/usr/bin/php-config" ; then
+		ewarn "/usr/bin/phpize and/or /usr/bin/php-config are symlinks."
+		ewarn "The PHP packages will not update these symlinks,"
+		ewarn "please check them and do so yourself if you need"
+		ewarn "to, using eselect."
+		ewarn "For example with the command:"
+		ewarn "eselect php-devel set php5"
+		ewarn "to symlink to /usr/lib/php5/bin/phpize and"
+		ewarn "/usr/lib/php5/bin/php-config."
+		ewarn
+	else
+		eselect php-devel set php5
+	fi
+
 	ewarn "If you have additional third party PHP extensions (such as"
 	ewarn "dev-php5/phpdbg) you may need to recompile them now."
+	ewarn "A new way of enabling/disabling PHP extensions was introduced"
+	ewarn "with the newer PHP packages releases, so please reemerge any"
+	ewarn "PHP extensions you have installed to automatically adapt to"
+	ewarn "the new configuration layout."
+	ewarn
 
 	if useq curl; then
 		ewarn "Please be aware that CURL can allow the bypass of open_basedir restrictions."
 		ewarn "This can be a security risk!"
+		ewarn
 	fi
+
+	ewarn "The 'pic' USE flag was added to newer releases of dev-lang/php."
+	ewarn "With PIC enabled, your PHP installation may become slower, but"
+	ewarn "PIC is required on Hardened-Gentoo platforms (where the USE flag"
+	ewarn "is enabled automatically). You may also need this on other"
+	ewarn "configurations where you disabled TEXTRELs, for example using"
+	ewarn "PaX in the kernel."
+	ewarn
 }
diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index a83e35441482..d89c55fb3b32 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.1 2005/09/18 17:33:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.1.1.1 2005/11/30 09:59:30 chriswhite Exp $
 #
 # Author: Diego Pettenò <flameeyes@gentoo.org>
 #
@@ -28,30 +28,16 @@ treecopy() {
 #
 # compatibility function that mimes seq command if not available
 seq() {
-	local p
-	p=$(type -P seq)
+	local p=$(type -P seq)
 
 	case $# in
-		1)
-			min=1
-			max=$1
-			step=1
-			;;
-		2)
-			min=$1
-			max=$2
-			step=1
-			;;
-		3)
-			min=$1
-			max=$3
-			step=$2
-			;;
-		*)
-			die "seq called with wrong parameters number"
+		1) min=1  max=$1 step=1  ;;
+		2) min=$1 max=$2 step=1  ;;
+		3) min=$1 max=$3 step=$2 ;;
+		*) die "seq called with wrong number of arguments" ;;
 	esac
 
-	if [[ -z "${p}" ]]; then
+	if [[ -z ${p} ]] ; then
 		local reps
 		# BSD userland
 		if [[ ${step} != 0 ]]; then
@@ -73,3 +59,37 @@ dlopen_lib() {
 	fi
 }
 
+# Gets the home directory for the specified user
+# it's a wrap around egetent as the position of the home directory in the line
+# varies depending on the os used.
+#
+# To use that, inherit eutils, not portability!
+egethome() {
+	ent=$(egetent passwd $1)
+
+	if [[ "${USERLAND}" == "Darwin" || "${ELIBC}" == "FreeBSD" ]]; then
+		# Darwin/OSX and FreeBSD uses position 9 to store the home dir
+		cut -d: -f9 <<<${ent}
+	else
+		# Linux and NetBSD uses position 6 instead
+		cut -d: -f6 <<<${ent}
+	fi
+}
+
+# Gets the name of the BSD-ish make command (pmake from NetBSD)
+#
+# This will return make (provided by system packages) for BSD userlands,
+# or bsdmake for Darwin userlands and pmake for the rest of userlands,
+# both of which are provided by sys-devel/pmake package.
+#
+# Note: the bsdmake for Darwin userland is with compatibility with MacOSX
+# default name.
+get_bmake() {
+	if [[ ${USERLAND} == *BSD ]]; then
+		echo make
+	elif [[ ${USERLAND} == "Darwin" ]]; then
+		echo bsdmake
+	else
+		echo pmake
+	fi
+}
diff --git a/eclass/python.eclass b/eclass/python.eclass
index c90ad2469aac..5d24149c16e3 100644
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -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/eclass/python.eclass,v 1.1 2003/10/08 14:07:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 #
 # Author: Alastair Tse <liquidx@gentoo.org>
 #
@@ -13,30 +13,67 @@
 # python_mod_exists()     - Checks if a python module exists
 # python_mod_compile()    - Compiles a .py file to a .pyc/.pyo
 # python_mod_optimize()   - Generates .pyc/.pyo precompiled scripts
-# python_mod_cleanup()    - Goes through /usr/lib/python* to remove
+# python_mod_cleanup()    - Goes through /usr/lib*/python* to remove
 #                           orphaned *.pyc *.pyo
 # python_makesym()        - Makes /usr/bin/python symlinks
 
 inherit alternatives
 
-ECLASS="python"
-INHERITED="$INHERITED $ECLASS"
+
+
+__python_eclass_test() {
+	__python_version_extract 2.3
+	echo -n "2.3 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR"
+	echo " PYVER_MINOR: $PYVER_MINOR PYVER_MICRO: $PYVER_MICRO"
+	__python_version_extract 2.3.4
+	echo -n "2.3.4 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR"
+	echo " PYVER_MINOR: $PYVER_MINOR PYVER_MICRO: $PYVER_MICRO"
+	__python_version_extract 2.3.5
+	echo -n "2.3.5 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR"
+	echo " PYVER_MINOR: $PYVER_MINOR PYVER_MICRO: $PYVER_MICRO"
+	__python_version_extract 2.4
+	echo -n "2.4 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR"
+	echo " PYVER_MINOR: $PYVER_MINOR PYVER_MICRO: $PYVER_MICRO"
+}
+
+#
+# name:   python_disable/enable_pyc
+# desc:   tells python not to automatically recompile modules to .pyc/.pyo
+#         even if the timestamps/version stamps don't match. this is
+#         done to protect sandbox.
+#
+# note:   supported by >=dev-lang/python-2.2.3-r3 only.
+#
+python_disable_pyc() {
+	export PYTHON_DONTCOMPILE=1
+}
+
+python_enable_pyc() {
+	unset PYTHON_DONTCOMPILE
+}
+
+python_disable_pyc
 
 #
 # name:   python_version
 # desc:   run without arguments and it will export the version of python
 #         currently in use as $PYVER
 #
+
+__python_version_extract() {
+	verstr=$1
+	export PYVER_MAJOR=${verstr:0:1}
+	export PYVER_MINOR=${verstr:2:1}
+	export PYVER_MICRO=${verstr:4}
+	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+}
+
 python_version() {
 	local tmpstr
 	python=${python:-/usr/bin/python}
 	tmpstr="$(${python} -V 2>&1 )"
 	export PYVER_ALL="${tmpstr#Python }"
-
-	export PYVER_MAJOR=$(echo ${PYVER_ALL} | cut -d. -f1)
-	export PYVER_MINOR=$(echo ${PYVER_ALL} | cut -d. -f2)
-	export PYVER_MICRO=$(echo ${PYVER_ALL} | cut -d. -f3-)
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
+	__python_version_extract $PYVER_ALL
 }
 
 #
@@ -45,14 +82,14 @@ python_version() {
 #         to the latest installed version
 #
 python_makesym() {
-	alternatives_auto_makesym "/usr/bin/python" "/usr/bin/python[0-9].[0-9]"
-	alternatives_auto_makesym "/usr/bin/python2" "/usr/bin/python[0-9].[0-9]"
+	alternatives_auto_makesym "/usr/bin/python" "python[0-9].[0-9]"
+	alternatives_auto_makesym "/usr/bin/python2" "python2.[0-9]"
 }
 
 #
 # name:   python_tkinter_exists
-# desc:   run without arguments, it will return TRUE(0) if python is compiled
-#         with tkinter or FALSE(1) if python is compiled without tkinter.
+# desc:   run without arguments, checks if python was compiled with Tkinter
+#         support.  If not, prints an error message and dies.
 #
 python_tkinter_exists() {
 	if ! python -c "import Tkinter" >/dev/null 2>&1; then
@@ -65,16 +102,17 @@ python_tkinter_exists() {
 
 #
 # name:   python_mod_exists
-# desc:   run with the module name as an argument. it will check if a 
+# desc:   run with the module name as an argument. it will check if a
 #         python module is installed and loadable. it will return
 #         TRUE(0) if the module exists, and FALSE(1) if the module does
 #         not exist.
-# exam:   
+# exam:
 #         if python_mod_exists gtk; then
 #             echo "gtk support enabled
 #         fi
 #
 python_mod_exists() {
+	[ -z "$1" ] && die "${FUNCTION} requires an argument!"
 	if ! python -c "import $1" >/dev/null 2>&1; then
 		return 1
 	fi
@@ -89,14 +127,21 @@ python_mod_exists() {
 #         python_mod_compile ${ROOT}usr/lib/python2.3/site-packages/pygoogle.py
 #
 python_mod_compile() {
+	# allow compiling for older python versions
+	if [ -n "${PYTHON_OVERRIDE_PYVER}" ]; then
+		PYVER=${PYTHON_OVERRIDE_PYVER}
+	else
+		python_version
+	fi
+
 	if [ -f "$1" ]; then
-		python -c "import py_compile; py_compile.compile('${1}')" || \
+		python${PYVER} -c "import py_compile; py_compile.compile('${1}')" || \
+			ewarn "Failed to compile ${1}"
+		python${PYVER} -O -c "import py_compile; py_compile.compile('${1}')" || \
 			ewarn "Failed to compile ${1}"
-		python -O -c "import py_compile; py_compile.compile('${1}')" || \
-			ewarn "Failed to compile ${1}"			
 	else
 		ewarn "Unable to find ${1}"
-	fi		
+	fi
 }
 
 #
@@ -104,49 +149,74 @@ python_mod_compile() {
 # desc:   if no arguments supplied, it will recompile all modules under
 #         sys.path (eg. /usr/lib/python2.3, /usr/lib/python2.3/site-packages/ ..)
 #         no recursively
-# 
+#
 #         if supplied with arguments, it will recompile all modules recursively
 #         in the supplied directory
 # exam:
 #         python_mod_optimize ${ROOT}usr/share/codegen
 #
 python_mod_optimize() {
-	einfo "Byte Compiling Python modules .."
-	python_version
-	echo ${PYVER}
-	python ${ROOT}usr/lib/python${PYVER}/compileall.py $@
+	local myroot
+	# strip trailing slash
+	myroot="${ROOT%/}"
+
+	# allow compiling for older python versions
+	if [ -n "${PYTHON_OVERRIDE_PYVER}" ]; then
+		PYVER=${PYTHON_OVERRIDE_PYVER}
+	else
+		python_version
+	fi
+
+	# set opts
+	if [ "${PYVER}" = "2.2" ]; then
+		compileopts=""
+	else
+		compileopts="-q"
+	fi
+
+	ebegin "Byte compiling python modules for python-${PYVER} .."
+	python${PYVER} ${myroot}/usr/lib/python${PYVER}/compileall.py ${compileopts} $@
+	python${PYVER} -O ${myroot}/usr/lib/python${PYVER}/compileall.py ${compileopts} $@
+	eend $?
 }
 
 #
 # name:   python_mod_cleanup
 # desc:   run with optional arguments, where arguments are directories of
 #         python modules. if none given, it will look in /usr/lib/python[0-9].[0-9]
-#         
+#
 #         it will recursively scan all compiled python modules in the directories
 #         and determine if they are orphaned (eg. their corresponding .py is missing.)
 #         if they are, then it will remove their corresponding .pyc and .pyo
 #
 python_mod_cleanup() {
-	local SEARCH_PATH
+	local SEARCH_PATH myroot
 
-	for path in $@; do
-		SEARCH_PATH="${SEARCH_PATH} ${ROOT}${dir}"
-	done		
+	# strip trailing slash
+	myroot="${ROOT%/}"
+
+	if [ $# -gt 0 ]; then
+		for path in $@; do
+			SEARCH_PATH="${SEARCH_PATH} ${myroot}/${path#/}"
+		done
+	else
+		for path in ${myroot}/usr/lib*/python*/site-packages; do
+			SEARCH_PATH="${SEARCH_PATH} ${path}"
+		done
+	fi
 
-	for path in ${ROOT}usr/lib/python*/site-packages; do
-		SEARCH_PATH="${SEARCH_PATH} ${path}"
-	done
-	
 	for path in ${SEARCH_PATH}; do
-		einfo "Searching ${path} .."
+		einfo "Cleaning orphaned Python bytecode from ${path} .."
 		for obj in $(find ${path} -name *.pyc); do
-			src_py="$(echo $obj | sed 's:c$::')"
+			src_py="${obj%c}"
 			if [ ! -f "${src_py}" ]; then
 				einfo "Purging ${src_py}[co]"
 				rm -f ${src_py}[co]
 			fi
 		done
-	done		
+		# attempt to remove directories that maybe empty
+		for dir in $(find ${path} -type d | sort -r); do
+			rmdir ${dir} 2>/dev/null
+		done
+	done
 }
-
-
diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass
index 138c2b97153a..6951d02d7a8a 100644
--- a/eclass/qt3.eclass
+++ b/eclass/qt3.eclass
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.1 2005/07/07 04:12:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author Caleb Tennis <caleb@gentoo.org>
 #
@@ -16,20 +16,16 @@
 
 inherit versionator
 
-
 QTPKG="x11-libs/qt-"
-QT3VERSIONS="3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 3.1.0"
+QT3MAJORVERSIONS="3.3 3.2 3.1 3.0"
+QT3VERSIONS="3.3.5 3.3.4-r8 3.3.4-r7 3.3.4-r6 3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 3.1.0"
 
-qt_pkg_setup() {
-	if has_version =x11-libs/qt-3*; then
-		if [[ -z $QTDIR ]]; then
-			QTDIR="/usr/qt/3"
-		fi
+if [[ -z "${QTDIR}" ]]; then
+	QTDIR="/usr/qt/3"
+fi
 
-		[[ -d "$QTDIR/etc/settings" ]] && addwrite "$QTDIR/etc/settings"
-		addpredict "$QTDIR/etc/settings"
-	fi
-}
+addwrite "${QTDIR}/etc/settings"
+addpredict "${QTDIR}/etc/settings"
 
 qt_min_version() {
 	echo "|| ("
@@ -38,32 +34,27 @@ qt_min_version() {
 }
 
 qt_min_version_list() {
-	local MINVER=$1
+	local MINVER="$1"
 	local VERSIONS=""
 
-	case $MINVER in
+	case "${MINVER}" in
 		3|3.0|3.0.0) VERSIONS="=${QTPKG}3*";;
-		4|4.0|4.0.0) VERSIONS="=${QTPKG}4*";;
-		3*)
-			for x in $QT3VERSIONS; do
-				if $(version_is_at_least $MINVER $x); then
-					VERSIONS="${VERSIONS} =${QTPKG}${x}"
+		3.1|3.1.0|3.2|3.2.0|3.3|3.3.0)
+			for x in ${QT3MAJORVERSIONS}; do
+				if $(version_is_at_least "${MINVER}" "${x}"); then
+					VERSIONS="${VERSIONS} =${QTPKG}${x}*"
 				fi
 			done
 			;;
-		4*)
-			for x in $QT4VERSIONS; do
-				if $(version_is_at_least $MINVER $x); then
+		3*)
+			for x in ${QT3VERSIONS}; do
+				if $(version_is_at_least "${MINVER}" "${x}"); then
 					VERSIONS="${VERSIONS} =${QTPKG}${x}"
 				fi
 			done
 			;;
-		*)    
-			die "qt_min_version called with invalid parameter: \"$1\""
-			;;
+		*) VERSIONS="=${QTPKG}3*";;
 	esac
 
-	echo "$VERSIONS"
+	echo "${VERSIONS}"
 }
-
-EXPORT_FUNCTIONS pkg_setup
diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass
index 1101d2af2e5a..2b0d88aeb4e4 100644
--- a/eclass/qt4.eclass
+++ b/eclass/qt4.eclass
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.1 2005/11/17 13:48:46 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Author Caleb Tennis <caleb@gentoo.org>
 #
diff --git a/eclass/rox.eclass b/eclass/rox.eclass
index b16816f52018..f0d818427f44 100644
--- a/eclass/rox.eclass
+++ b/eclass/rox.eclass
@@ -1,56 +1,106 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.1 2004/11/26 18:05:51 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.1.1.1 2005/11/30 09:59:27 chriswhite Exp $
 
-# Author: Sergey Kuleshov <svyatogor@gentoo.org>
-#
-# This eclass is intended to be used with Rox desktop application.
-# See ebuilds in rox-extras/ for examples.
+# ROX eclass Version 2
 
-ECLASS=rox
-INHERITED="$INHERITED $ECLASS"
+# This eclass was created by Sergey Kuleshov (svyatogor@gentoo.org) and
+# Alexander Simonov (devil@gentoo.org.ua) to ease installation of ROX desktop
+# applications.
+
+# APPNAME - the actual name of the application as the app folder is named
+# ROX_VER - the minimum version of rox filer required. Default is 2.1.0
+# ROX_LIB_VER - version of rox-lib required if any
+# ROX_CLIB_VER - version of rox-clib required if any
+# SET_PERM - specifies if permisions for arch specific files need to  be set
+
+# For examples refer to ebuilds in rox-extra/
+
+# need python to byte compile modules, if any
+inherit python
 
 if [ -z "$ROX_VER" ]; then
 	ROX_VER="2.1.0"
 fi
 
 DEPEND="${DEPEND}
-		>=app-rox/rox-$ROX_VER"
+		>=rox-base/rox-$ROX_VER"
 
 if [ -n "$ROX_LIB_VER" ]; then
 	DEPEND="${DEPEND}
-			  >=app-rox/rox-lib-$ROX_LIB_VER"
+			  >=rox-base/rox-lib-$ROX_LIB_VER"
 fi
 
 if [ -n "$ROX_CLIB_VER" ]; then
 	DEPEND="${DEPEND}
-			  >=app-rox/rox-clib-$ROX_CLIB_VER"
+			  >=rox-base/rox-clib-$ROX_CLIB_VER"
 fi
 
 
 rox_src_compile() {
-	cd $APPNAME
+	cd ${APPNAME}
 	#Some packages need to be compiled.
 	chmod 755 ./AppRun
 	if [ -d "src/" ]; then
-		./AppRun --compile || die "Failed to compile the package" 
+		./AppRun --compile || die "Failed to compile the package"
 		rm -rf src
 	fi
 }
 
 rox_src_install() {
-	dodir /usr/lib/rox/
 	if [ -d "$APPNAME/Help/" ]; then
 		for i in $APPNAME/Help/*; do
 			dodoc "$i"
 		done
 	fi
-	cp -r $APPNAME ${D}/usr/lib/rox/
+	insinto /usr/lib/rox
+	doins -r ${APPNAME}
+	#set correct permissions on files, in case they are wrong
+	#include all subdirectories in search, just in case
+	find ${D}/usr/lib/rox/${APPNAME} -name 'AppRun' | xargs chmod 755 	>/dev/null 2>&1
+	find ${D}/usr/lib/rox/${APPNAME} -name 'AppletRun' | xargs chmod 755 >/dev/null 2>&1
+
+	# set permissions for programs where we have libdir script
+	if [ -f ${D}/usr/lib/rox/${APPNAME}/libdir ]; then
+		chmod 755 ${D}/usr/lib/rox/${APPNAME}/libdir
+	fi
+
+	# set permissions for programs where we have rox_run script (all who using rox-clib )
+	if [ -f ${D}/usr/lib/rox/${APPNAME}/rox_run ]; then
+	    chmod 755 ${D}/usr/lib/rox/${APPNAME}/rox_run
+	fi
+
+	# some programs have choice_install script
+	if [ -f ${D}/usr/lib/rox/${APPNAME}/choice_install ]; then
+	    chmod 755 ${D}/usr/lib/rox/${APPNAME}/choice_install
+	fi
+
+	# set permissions on all binares files for compiled programs per arch
+	if [ -n "$SET_PERM" ]; then
+	    ARCH="`uname -m`"
+	    case $ARCH in
+		i?86) ARCH=ix86 ;;
+	    esac
+	    PLATFORM="`uname -s`-$ARCH"
+	    chmod -R 755 ${D}/usr/lib/rox/${APPNAME}/${PLATFORM}
+	fi
+
+	#create a script in bin to run the application from command line
+	dodir /usr/bin/
+	cat >${D}/usr/bin/${APPNAME} <<EOF
+#!/bin/sh
+exec /usr/lib/rox/${APPNAME}/AppRun "\$@"
+EOF
+	chmod 755 ${D}/usr/bin/${APPNAME}
+
+	#now compile any and all python files
+	python_mod_optimize ${D}/usr/lib/rox/${APPNAME} >/dev/null 2>&1
 }
 
 rox_pkg_postinst() {
-	einfo "The $APPNAME has been installed into /usr/lib/rox"
-	einfo "You can run it by pointing Rox file manage to that location"
+	einfo "$APPNAME has been installed into /usr/lib/rox"
+	einfo "You can run it by enter $APPNAME in command line or"
+	einfo "can run it by pointing Rox file manage to that location"
 	einfo "and click on new application"
 }
 
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index cd0a744fec26..4cef38c8c6a7 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -1,41 +1,66 @@
-# 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/eclass/rpm.eclass,v 1.1 2003/06/21 13:24:12 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 
 # Author : Alastair Tse <liquidx@gentoo.org> (21 Jun 2003)
 #
 # Convienence class for extracting RPMs
-# 
+#
 # Basically, rpm_src_unpack does:
 #
-# 1. convert all *.rpm in ${A} to tar.gz, non rpm files are passed through 
-#    unpack()
-# 2. unpacks the tar.gz into ${WORKDIR}
-# 3. if it is a source rpm, it finds all .tar .tar.gz, .tgz, .tbz2, .tar.bz2,
+# 1. uses rpm_unpack to unpack a rpm file using rpmoffset and cpio
+# 2. if it is a source rpm, it finds all .tar .tar.gz, .tgz, .tbz2, .tar.bz2,
 #    .zip, .ZIP and unpacks them using unpack() (with a little hackery)
-# 4. deletes all the unpacked tarballs and zip files from ${WORKDIR}
+# 3. deletes all the unpacked tarballs and zip files from ${WORKDIR}
+#
+# This ebuild now re-defines a utility function called rpm_unpack which
+# basically does what rpm2targz does, except faster. It does not gzip the
+# output tar again but directly extracts to ${WORKDIR}
+#
+# It will autodetect for rpm2cpio (included in app-arch/rpm) and if it exists
+# it will use that instead of the less reliable rpmoffset. This means if a
+# particular rpm cannot be read using rpmoffset, you just need to put :
 #
-# Warning !!
+# DEPEND="app-arch/rpm"
 #
-# Sometimes, pure rpm2targz will fail on certain RPMs (eg: scim-chinese)
-# because their code for detecting RPM header offset is not good enough.
-# In that case, you need to add app-arch/rpm to your DEPEND. rpm2targz
-# will automatically find rpm2cpio and use it instead of its own rpmoffset.
+# in your ebuild and it will install and use rpm2cpio instead. If you wish
+# to force your ebuild to use rpmoffset in the presence of rpm2cpio, define:
 #
-# Also, rpm2targz-8.0 behaves differently from rpm2targz-9.0. The newer
-# versions will autodetect rpm2cpio whereas 8.0 doesn't. Also, 9.0 will
-# detect if it is a source rpm and place files in ${prefix%.src} whereas
-# 8.0 will just place them in the current directory. This eclass DEPENDS
-# on rpm2targz 9.0.
+# USE_RPMOFFSET_ONLY="1"
+
+
+USE_RPMOFFSET_ONLY=${USE_RPMOFFSET_ONLY-""}
+
+DEPEND=">=app-arch/rpm2targz-9.0-r1"
 
-ECLASS="rpm"
-INHERITED="$INHERITED $ECLASS"
+# extracts the contents of the RPM in ${WORKDIR}
+rpm_unpack() {
+	local rpmfile rpmoff decompcmd
+	rpmfile=$1
+	if [ -z "${rpmfile}" ]; then
+		return 1
+	fi
+	if [ -x /usr/bin/rpm2cpio -a -z "${USE_RPMOFFSET_ONLY}" ]; then
+		rpm2cpio ${rpmfile} | cpio -idmu --no-preserve-owner --quiet || return 1
+	else
+		rpmoff=`rpmoffset < ${rpmfile}`
+		[ -z "${rpmoff}" ] && return 1
 
-newdepend ">=app-arch/rpm2targz-0.9"
+		decompcmd="gzip -dc"
+		if [ -n "`dd if=${rpmfile} skip=${rpmoff} bs=1 count=3 2>/dev/null | file - | grep bzip2`" ]; then
+			decompcmd="bzip2 -dc"
+		fi
+		dd ibs=${rpmoff} skip=1 if=${rpmfile} 2> /dev/null \
+			| ${decompcmd} \
+			| cpio -idmu --no-preserve-owner --quiet || return 1
+	fi
+
+	return 0
+}
 
 rpm_src_unpack() {
 	local x prefix ext myfail OLD_DISTDIR
-	
+
 	for x in ${A}; do
 		myfail="failure unpacking ${x}"
 		ext=${x##*.}
@@ -44,35 +69,28 @@ rpm_src_unpack() {
 			echo ">>> Unpacking ${x}"
 			prefix=${x%.rpm}
 			cd ${WORKDIR}
-			# convert rpm to tar.gz and then extract
-			rpm2targz ${DISTDIR}/${x} || die "${myfail}"
-			if [ "$(tar tzvf ${WORKDIR}/${prefix}.tar.gz | wc -l)" -lt 2 ]; then
-				die "rpm2targz failed, produced an empty tar.gz"
-			fi
-			tar xz --no-same-owner -f ${WORKDIR}/${prefix}.tar.gz || die "${myfail}"
-			rm -f ${WORKDIR}/${prefix}.tar.gz
-			
+			rpm_unpack ${DISTDIR}/${x} || die "${myfail}"
+
 			# find all tar.gz files and extract for srpms
 			if [ "${prefix##*.}" = "src" ]; then
 				OLD_DISTDIR=${DISTDIR}
 				DISTDIR=${WORKDIR}
-				findopts="-name *.tar"
+				findopts="* -maxdepth 0 -name *.tar"
 				for t in *.tar.gz *.tgz *.tbz2 *.tar.bz2 *.zip *.ZIP; do
 					findopts="${findopts} -o -name ${t}"
 				done
-				for t in $(find ${prefix%.src} ${findopts} | xargs); do
+				for t in $(find ${findopts} | xargs); do
 					unpack ${t}
 					rm -f ${t}
 				done
 				DISTDIR=${OLD_DISTDIR}
-			fi				
+			fi
 			;;
 		*)
 			unpack ${x}
 			;;
 		esac
 	done
-			
 }
 
 EXPORT_FUNCTIONS src_unpack
diff --git a/eclass/ruby-gnome2.eclass b/eclass/ruby-gnome2.eclass
index 86bfc6c50b85..28ac2cd74fc7 100644
--- a/eclass/ruby-gnome2.eclass
+++ b/eclass/ruby-gnome2.eclass
@@ -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/eclass/ruby-gnome2.eclass,v 1.1 2003/08/06 13:31:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-gnome2.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
 #
 # This eclass simplifies installation of the various pieces of
 # ruby-gnome2 since they share a very common installation procedure.
@@ -8,30 +8,36 @@
 # ruby-module.eclass, but at the moment it contains some things
 # specific to ruby-gnome2
 
-ECLASS=ruby-gnome2
-INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS src_compile src_install
 
 IUSE=""
 
 subbinding=${PN#ruby-} ; subbinding=${subbinding%2}
-S=${WORKDIR}/ruby-gnome2-${PV}/${subbinding}
-SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-${PV}.tar.gz"
+if [[ ${PV} == 0.5.0 ]]; then
+	S=${WORKDIR}/ruby-gnome2-${PV}/${subbinding}
+	SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-${PV}.tar.gz"
+else
+	S=${WORKDIR}/ruby-gnome2-all-${PV}/${subbinding}
+	SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-${PV}.tar.gz"
+fi
 HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
 LICENSE="Ruby"
 SLOT="0"
 
-DEPEND="${DEPEND} >=dev-lang/ruby-1.6"
-RDEPEND="${RDEPEND} >=dev-lang/ruby-1.6"
+DEPEND="virtual/ruby"
+RDEPEND="virtual/ruby"
 
 ruby-gnome2_src_compile() {
 	ruby extconf.rb || die "extconf.rb failed"
-	emake || die "emake failed"
+	emake CC=${CC:-gcc} CXX=${CXX:-g++} || die "emake failed"
 }
 
 ruby-gnome2_src_install() {
+	dodir $(ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc ../AUTHORS ../NEWS ChangeLog README
+	for doc in ../AUTHORS ../NEWS ChangeLog README; do
+		[ -s "$doc" ] && dodoc $doc
+	done
 	if [[ -d sample ]]; then
 		dodir /usr/share/doc/${PF}
 		cp -a sample ${D}/usr/share/doc/${PF} || die "cp failed"
diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass
index 9a3274626bd4..91d194e7e597 100644
--- a/eclass/ruby.eclass
+++ b/eclass/ruby.eclass
@@ -1,68 +1,231 @@
-# 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/eclass/ruby.eclass,v 1.1 2003/09/07 02:37:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.1.1.1 2005/11/30 09:59:16 chriswhite Exp $
 #
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
 # The ruby eclass is designed to allow easier installation of ruby
 # softwares, and their incorporation into the Gentoo Linux system.
 
-ECLASS=ruby
-INHERITED="${INHERITED} ${ECLASS}"
-EXPORT_FUNCTIONS src_compile src_install
+# src_unpack, src_compile and src_install call a set of functions to emerge
+# ruby with SLOT support; econf, emake and einstall is a wrapper for ruby
+# to automate configuration, make and install process (they override default
+# econf, emake and einstall defined by ebuild.sh respectively).
+
+# Functions:
+# src_unpack	Unpacks source archive(s) and apply patches if any.
+# src_compile	Invokes econf and emake.
+# src_install	Runs einstall and erubydoc.
+# econf		Detects setup.rb, install.rb, extconf.rb and configure,
+#		and then runs the configure script.
+# emake		Runs make if any Makefile exists.
+# einstall	Calls install script or Makefile. If both not present,
+#		installs programs under sitedir.
+# erubydoc	Finds any documents and puts them in the right place.
+#		erubydoc needs more sophistication to handle all types of
+#		appropriate documents.
+
+# Variables:
+# USE_RUBY	Space delimited list of supported ruby.
+#		Set it to "any" if it installs only version independent files.
+#		If your ebuild supports both ruby 1.6 and 1.8 but has version
+#		depenedent files such as libraries, set it to something like
+#		"ruby16 ruby18". Possible values are "any ruby16 ruby18 ruby19"
+# RUBY_ECONF	You can pass extra arguments to econf by defining this
+#		variable. Note that you cannot specify them by command line
+#		if you are using <sys-apps/portage-2.0.49-r17.
+# PATCHES	Space delimited list of patch files.
+
+inherit eutils toolchain-funcs
+
+EXPORT_FUNCTIONS src_unpack src_compile src_install econf emake einstall
 
 HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=${PN}"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
+IUSE="examples"
+
 SLOT="0"
 LICENSE="Ruby"
 
-newdepend ">=dev-lang/ruby-1.6.8"
+DEPEND="virtual/ruby"
 
-ruby_src_compile() {
+[[ -z "${RUBY}" ]] && export RUBY=/usr/bin/ruby
+
+ruby_src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# apply bulk patches
+	if [[ -n "${PATCHES}" ]] ; then
+		for p in ${PATCHES} ; do
+			epatch $p
+		done
+	fi
+}
+
+ruby_econf() {
+
+	RUBY_ECONF="${RUBY_ECONF} ${EXTRA_ECONF}"
+	if [ -f configure ] ; then
+		./configure \
+			--prefix=/usr \
+			--host=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib \
+			--with-ruby=${RUBY} \
+			${RUBY_ECONF} \
+			"$@" || die "econf failed"
+	fi
+	if [ -f install.rb ] ; then
+		${RUBY} install.rb config --prefix=/usr "$@" \
+			${RUBY_ECONF} || die "install.rb config failed"
+		${RUBY} install.rb setup "$@" \
+			${RUBY_ECONF} || die "install.rb setup failed"
+	fi
+	if [ -f setup.rb ] ; then
+		${RUBY} setup.rb config --prefix=/usr "$@" \
+			${RUBY_ECONF} || die "setup.rb config failed"
+		${RUBY} setup.rb setup "$@" \
+			${RUBY_ECONF} || die "setup.rb setup failed"
+	fi
 	if [ -f extconf.rb ] ; then
-		ruby extconf.rb || die "extconf.rb failed"
-		emake || die "make failed"
-	elif [ -f install.rb ] ; then
-		ruby install.rb config --prefix=/usr \
-			|| die "insall.rb config failed"
-		ruby install.rb setup \
-			|| die "install.rb setup failed"
-	elif [ -f configure ] ; then
-		econf || die "econf failed"
-		emake || die "emake failed"
-	elif [ -f Makefile ] ; then
-		emake || die "emake failed"
+		${RUBY} extconf.rb "$@" \
+			${RUBY_ECONF} || die "extconf.rb failed"
 	fi
 }
 
-ruby_src_install() {
-	local siteruby=$(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
-	local rdbase=/usr/share/doc/${PF}/rd
-
-	if [ -f extconf.rb -o -f Makefile ] ; then
-		einstall DESTDIR=${D} || die "einstall failed"
-	elif [ -f install.rb ] ; then
-		ruby install.rb config --prefix=${D}/usr \
-			|| die "install.rb config failed"
-		ruby install.rb install \
-			|| die "install.rb install failed"
+ruby_emake() {
+	if [ -f makefiles -o -f GNUmakefile -o -f makefile -o -f Makefile ] ; then
+		make CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${MAKEOPTS} ${EXTRA_EMAKE} "$@" || die "emake for ruby failed"
+	fi
+}
+
+ruby_src_compile() {
+
+	# You can pass configure options via RUBY_ECONF
+	ruby_econf || die
+	ruby_emake "$@" || die
+}
+
+ruby_einstall() {
+	local siteruby
+
+	RUBY_ECONF="${RUBY_ECONF} ${EXTRA_ECONF}"
+	if [ -f install.rb ] ; then
+		${RUBY} install.rb config --prefix=${D}/usr "$@" \
+			${RUBY_ECONF} || die "install.rb config failed"
+		${RUBY} install.rb install "$@" \
+			${RUBY_ECONF} || die "install.rb install failed"
+	elif [ -f setup.rb ] ; then
+		${RUBY} setup.rb config --prefix=${D}/usr "$@" \
+			${RUBY_ECONF} || die "setup.rb config failed"
+		${RUBY} setup.rb install "$@" \
+			${RUBY_ECONF} || die "setup.rb install failed"
+	elif [ -f extconf.rb -o -f Makefile ] ; then
+		make DESTDIR=${D} "$@" install || die "make install failed"
 	else
-		insinto ${siteruby}/${PN}
-		doins *.rb || "doins failed"
+		siteruby=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
+		insinto ${siteruby}
+		doins *.rb || die "doins failed"
 	fi
+}
+
+erubydoc() {
+	local rdbase=/usr/share/doc/${PF}/rd rdfiles=$(find . -name '*.rd*')
+
+	einfo "running dodoc for ruby ;)"
 
 	insinto ${rdbase}
-	find . -name '*.rd*' | xargs doins
-	rmdir --ignore-fail-on-non-empty ${D}${rdbase}
-	if [ -d doc -o -d docs -o examples ] ; then
-		dohtml -r doc/* docs/* examples/*
+	[ -n "${rdfiles}" ] && doins ${rdfiles}
+	rmdir ${D}${rdbase} 2>/dev/null || true
+	if [ -d doc -o -d docs ] ; then
+		dohtml -x html -r {doc,docs}/*
+		dohtml -r {doc,docs}/html/*
 	else
 		dohtml -r *
 	fi
-	if [ -d sample ] ; then
-		dodir /usr/share/doc/${PF}
-		cp -a sample ${D}/usr/share/doc/${PF} || "cp failed"
+
+	if ( use examples ); then	
+		for dir in sample example examples; do
+			if [ -d ${dir} ] ; then
+				dodir /usr/share/doc/${PF}
+				cp -pPR ${dir} ${D}/usr/share/doc/${PF} || die "cp failed"
+			fi
+		done
+	fi
+
+	for i in ChangeLog* [A-Z][A-Z]* ; do
+		[ -e $i ] && dodoc $i
+	done
+}
+
+ruby_src_install() {
+
+	ruby_einstall "$@" || die
+
+	erubydoc
+}
+
+# erubyconf, erubymake and erubyinstall are kept for compatibility
+erubyconf() {
+	ruby_econf "$@"
+}
+
+erubymake() {
+	ruby_emake "$@"
+}
+
+erubyinstall() {
+	ruby_einstall "$@"
+}
+
+# prepall adds SLOT support for ruby.eclass
+prepall() {
+
+	[[ ! -x /usr/bin/ruby16 ]] && export USE_RUBY=${USE_RUBY/ruby16/}
+	[[ ! -x /usr/bin/ruby18 ]] && export USE_RUBY=${USE_RUBY/ruby18/}
+	[[ ! -x /usr/bin/ruby19 ]] && export USE_RUBY=${USE_RUBY/ruby19/}
+
+	local ruby_slots=$(echo "${USE_RUBY}" | wc -w)
+
+	if [ "$ruby_slots" -ge 2 ] || (use ppc-macos && [ "$ruby_slots" -ge 1 ])
+	then
+		einfo "Now we are building the package for ${USE_RUBY}"
+		for rb in ${USE_RUBY} ruby ; do
+			einfo "Using $rb"
+			export RUBY=/usr/bin/$rb
+			ruby() { /usr/bin/$rb "$@" ; }
+			mkdir -p ${S}
+			cd ${WORKDIR}
+			einfo "Unpacking for $rb"
+			src_unpack || die "src_unpack failed"
+			cd ${S}
+			find . -name '*.[ao]' -exec rm {} \;
+			einfo "Building for $rb"
+			src_compile || die "src_compile failed"
+			cd ${S}
+			einfo "Installing for $rb"
+			src_install || die "src_install failed"
+		done
+	elif [ "${USE_RUBY}" == "any" ] ; then
+		siteruby=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
+		# in case no directories found in siteruby
+		shopt -sq nullglob
+
+		for x in ${D}/${siteruby}/* ; do
+			mv $x ${D}/${siteruby}/..
+		done
+		if [ -d ${D}${siteruby} ] ; then
+			rmdir --ignore-fail-on-non-empty ${D}/${siteruby}
+		fi
 	fi
-	dodoc ChangeLog* [A-Z][A-Z]*
+
+	prepallman
+	prepallinfo
+	prepallstrip
 }
+
diff --git a/eclass/scsh.eclass b/eclass/scsh.eclass
index 52df5ba86233..407ec692bbea 100644
--- a/eclass/scsh.eclass
+++ b/eclass/scsh.eclass
@@ -1,28 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/scsh.eclass,v 1.1 2005/08/09 17:59:50 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/scsh.eclass,v 1.1.1.1 2005/11/30 09:59:22 chriswhite Exp $
 #
 
 inherit eutils
 
-ECLASS=scsh
-INHERITED="$INHERITED $ECLASS"
-
-LICENSE="as-is | BSD"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~x86"
 
-IUSE="fhs scsh"
+IUSE="scsh"
 
 SCSH_SCSH_PATH=/usr/$(get_libdir)/scsh
 
 set_layout() {
-	if use fhs;	then
-		SCSH_LAYOUT=fhs
-	elif use scsh; then
+	if use scsh; then
 		SCSH_LAYOUT=scsh
 	else
-		ewarn "No layout was specified via USE, defaulting to fhs."
+		ewarn "No layout was specified via USE, defaulting to FHS."
 		SCSH_LAYOUT=fhs
 	fi
 	export SCSH_LAYOUT
@@ -34,14 +29,14 @@ set_path_variables() {
 	SCSH_MV="${SCSH_MV//app-shells\/scsh-}"
 	export SCSH_VERSION SCSH_MV
 
-	case $SCSH_LAYOUT in
+	case ${SCSH_LAYOUT} in
 		fhs)
 			SCSH_PREFIX=/usr
-			SCSH_MODULES_PATH=/usr/share/scsh-$SCSH_MV/modules
+			SCSH_MODULES_PATH=/usr/share/scsh-${SCSH_MV}/modules
 			;;
 		scsh)
 			SCSH_PREFIX=/usr/$(get_libdir)/scsh/modules
-			SCSH_MODULES_PATH=/usr/$(get_libdir)/scsh/modules/$SCSH_MV
+			SCSH_MODULES_PATH=/usr/$(get_libdir)/scsh/modules/${SCSH_MV}
 			;;
 	esac
 	export SCSH_PREFIX SCSH_MODULES_PATH
@@ -53,15 +48,15 @@ set_path_variables() {
 scsh_src_unpack() {
 	set_layout
 	set_path_variables
-	einfo "Using $SCSH_LAYOUT layout"
+	einfo "Using ${SCSH_LAYOUT} layout"
 	unpack ${A}
 }
 
 scsh_get_layout_conf() {
-	SCSH_LAYOUT_CONF=" --build $CHOST
+	SCSH_LAYOUT_CONF=" --build ${CHOST}
 		--force
-		--layout $SCSH_LAYOUT
-		--prefix $SCSH_PREFIX
+		--layout ${SCSH_LAYOUT}
+		--prefix ${SCSH_PREFIX}
 		--no-user-defaults
 		--dest-dir ${D}"
 	export SCSH_LAYOUT_CONF
@@ -72,7 +67,7 @@ scsh_src_compile() {
 }
 
 scsh_src_install() {
-	dodir $SCSH_MODULES_PATH
+	dodir ${SCSH_MODULES_PATH}
 	scsh-install-pkg ${SCSH_LAYOUT_CONF} || die "./scsh-install-pkg failed"
 }
 
diff --git a/eclass/selinux-policy.eclass b/eclass/selinux-policy.eclass
index 89a7fcbce561..554ec466c200 100644
--- a/eclass/selinux-policy.eclass
+++ b/eclass/selinux-policy.eclass
@@ -1,25 +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/eclass/selinux-policy.eclass,v 1.1 2003/07/29 02:55:56 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 
 # Eclass for installing SELinux policy, and optionally
 # reloading the policy
 
-ECLASS="selinux-policy"
-INHERITED="$INHERITED $ECLASS"
+inherit eutils
 
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-S="${WORKDIR}/policy"
+S="${WORKDIR}/${PN/selinux-}"
 
-IUSE="loadpolicy"
+IUSE=""
 
-newrdepend sys-apps/selinux-small sec-policy/selinux-base-policy
+RDEPEND=">=sec-policy/selinux-base-policy-20030729"
 
-[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
+[ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy"
 
 SAVENAME="`date +%Y%m%d%H%M`-${PN}.tar.bz2"
 SAVEDIR="`echo "${POLICYDIR}" | cut -d/ -f6`"
@@ -45,38 +44,54 @@ selinux-policy_src_install() {
 	if [ -n "${TEFILES}" ]; then
 		debug-print "TEFILES is \"${TEFILES}\""
 		insinto ${POLICYDIR}/domains/program
-		doins ${TEFILES}
+		doins ${TEFILES} || die
+	fi
+
+	if [ -n "${TEMISC}" ]; then
+		debug-print "TEMISC is \"${TEMISC}\""
+		insinto ${POLICYDIR}/domains/misc
+		doins ${TEMISC} || die
 	fi
 
 	if [ -n "${FCFILES}" ]; then
 		debug-print "FCFILES is \"${FCFILES}\""
 		insinto ${POLICYDIR}/file_contexts/program
-		doins ${FCFILES}
+		doins ${FCFILES} || die
+	fi
+
+	if [ -n "${FCMISC}" ]; then
+		debug-print "FCMISC is \"${FCMISC}\""
+		insinto ${POLICYDIR}/file_contexts/misc
+		doins ${FCMISC} || die
 	fi
 
 	if [ -n "${MACROS}" ]; then
 		debug-print "MACROS is \"${MACROS}\""
 		insinto ${POLICYDIR}/macros/program
-		doins ${MACROS}
+		doins ${MACROS} || die
 	fi
 }
 
 selinux-policy_pkg_postinst() {
-	if [ "`use loadpolicy`" ]; then
-		ebegin "Automatically loading policy"
-		make -C ${POLICYDIR} load
-		eend $?
-
-		ebegin "Regenerating file contexts"
-		[ -f ${POLICYDIR}/file_contexts/file_contexts ] && \
-			rm -f ${POLICYDIR}/file_contexts/file_contexts
-		make -C ${POLICYDIR} file_contexts/file_contexts &> /dev/null
-
-		# do a test relabel to make sure file
-		# contexts work (doesnt change any labels)
-		echo "/etc/passwd" | /usr/sbin/setfiles \
-			${POLICYDIR}/file_contexts/file_contexts -sqn
-		eend $?
+	if has "loadpolicy" $FEATURES ; then
+		if [ -x /usr/bin/checkpolicy -a -x /usr/sbin/load_policy -a -x /usr/sbin/setfiles ]; then
+			# only do this if all tools are installed
+
+			ebegin "Automatically loading policy"
+			make -C ${POLICYDIR} load
+			eend $?
+
+			ebegin "Regenerating file contexts"
+			[ -f ${POLICYDIR}/file_contexts/file_contexts ] && \
+				rm -f ${POLICYDIR}/file_contexts/file_contexts
+			make -C ${POLICYDIR} file_contexts/file_contexts &> /dev/null
+
+			# do a test relabel to make sure file
+			# contexts work (doesnt change any labels)
+			echo "/etc/passwd" | /usr/sbin/setfiles \
+				${POLICYDIR}/file_contexts/file_contexts -sqn
+			eend $?
+		fi
 	else
 		echo
 		echo
@@ -84,18 +99,11 @@ selinux-policy_pkg_postinst() {
 		eerror "that the policy be loaded before continuing!!"
 		echo
 		einfo "Automatic policy loading can be enabled by adding"
-		einfo "\"loadpolicy\" to the USE flags."
+		einfo "\"loadpolicy\" to the FEATURES in make.conf."
 		echo
 		echo
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-		sleep 4
+		ebeep 4
+		epause 4
 	fi
 }
 
diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass
index 310cfe035d4a..dd5c9ee503c0 100644
--- a/eclass/sgml-catalog.eclass
+++ b/eclass/sgml-catalog.eclass
@@ -1,62 +1,82 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author Matthew Turk <satai@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.1 2002/12/31 04:35:01 satai Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.1.1.1 2005/11/30 09:59:19 chriswhite Exp $
 #
+# Author Matthew Turk <satai@gentoo.org>
 
 inherit base
-INHERITED="$INHERITED $ECLASS"
 
-newdepend ">=sgml-common-0.6.3-r2"
-ECLASS=sgml-catalog
+DEPEND=">=app-text/sgml-common-0.6.3-r2"
+
+
+# List of catalogs to install
+SGML_TOINSTALL=""
 
-declare -a toinstall
-declare -i catcounter
-let "catcounter=0"
 
 sgml-catalog_cat_include() {
-    debug-print function $FUNCNAME $*
-    toinstall["catcounter++"]="${1}:${2}"
+	debug-print function $FUNCNAME $*
+	SGML_TOINSTALL="${SGML_TOINSTALL} ${1}:${2}"
 }
 
 sgml-catalog_cat_doinstall() {
-    debug-print function $FUNCNAME $*
-    /usr/bin/install-catalog --add $1 $2 &>/dev/null
+	debug-print function $FUNCNAME $*
+	/usr/bin/install-catalog --add $1 $2 &>/dev/null
 }
 
 sgml-catalog_cat_doremove() {
-    debug-print function $FUNCNAME $*
-    /usr/bin/install-catalog --remove $1 $2 &>/dev/null
+	debug-print function $FUNCNAME $*
+	/usr/bin/install-catalog --remove $1 $2 &>/dev/null
 }
 
 sgml-catalog_pkg_postinst() {
-    debug-print function $FUNCNAME $*
-    declare -i topindex
-    topindex="catcounter-1"
-    for i in `seq 0 ${topindex}`
-    do
-        arg1=`echo ${toinstall[$i]} | cut -f1 -d\:`
-        arg2=`echo ${toinstall[$i]} | cut -f2 -d\:`
-        einfo "Now adding $arg1 to $arg2 and /etc/sgml/catalog"
-        sgml-catalog_cat_doinstall $arg1 $arg2
-    done
+	debug-print function $FUNCNAME $*
+
+	for entry in ${SGML_TOINSTALL}; do
+		arg1=`echo ${entry} | cut -f1 -d\:`
+		arg2=`echo ${entry} | cut -f2 -d\:`
+		if [ ! -e ${arg2} ]
+		then
+			ewarn "${arg2} doesn't appear to exist, although it ought to!"
+			continue
+		fi
+		einfo "Now adding ${arg2} to ${arg1} and /etc/sgml/catalog"
+		sgml-catalog_cat_doinstall ${arg1} ${arg2}
+	done
+	sgml-catalog_cleanup
 }
 
 sgml-catalog_pkg_prerm() {
-    debug-print function $FUNCNAME $*
-    declare -i topindex
-    topindex="catcounter-1"
-    for i in `seq 0 ${topindex}`
-    do
-        arg1=`echo ${toinstall[$i]} | cut -f1 -d\:`
-        arg2=`echo ${toinstall[$i]} | cut -f2 -d\:`
-        einfo "Now removing $arg1 from $arg2 and /etc/sgml/catalog"
-        sgml-catalog_cat_doremove $arg1 $arg2
-    done
+	sgml-catalog_cleanup
+}
+
+sgml-catalog_pkg_postrm() {
+	debug-print function $FUNCNAME $*
+
+	for entry in ${SGML_TOINSTALL}; do
+		arg1=`echo ${entry} | cut -f1 -d\:`
+		arg2=`echo ${entry} | cut -f2 -d\:`
+		if [ -e ${arg2} ]
+		then
+			ewarn "${arg2} still exists!  Not removing from ${arg1}"
+			ewarn "This is normal behavior for an upgrade ..."
+			continue
+		fi
+		einfo "Now removing $arg1 from $arg2 and /etc/sgml/catalog"
+		sgml-catalog_cat_doremove ${arg1} ${arg2}
+	done
+}
+
+sgml-catalog_cleanup() {
+	if [ -e /usr/bin/gensgmlenv ]
+	then
+		einfo Regenerating SGML environment variables ...
+		gensgmlenv
+		grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
+	fi
 }
 
 sgml-catalog_src_compile() {
-    dummy="DUMMY"
+	return
 }
 
-EXPORT_FUNCTIONS pkg_prerm pkg_postinst src_compile
+EXPORT_FUNCTIONS pkg_postrm pkg_postinst src_compile pkg_prerm
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 665a24341b49..cb5e7be81b1d 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -1,20 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.1 2003/10/30 17:14:37 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.1.1.1 2005/11/30 09:59:20 chriswhite Exp $
 #
 # Author: Max Kalika <max@gentoo.org>
 #
 # This eclass implements standard installation procedure for installing
 # self-signed SSL certificates.
 
-ECLASS=ssl-cert
-INHERITED="$INHERITED $ECLASS"
-
 # Conditionally depend on OpenSSL: allows inheretence
 # without pulling extra packages if not needed
-newdepend "ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl )"
+IUSE="ssl"
 
-# Initializes variables and generates the needed 
+# Initializes variables and generates the needed
 # OpenSSL configuration file and a CA serial file
 #
 # Access: private
@@ -25,7 +23,7 @@ gen_cnf() {
 	SSL_SERIAL="${T}/${$}ca.ser"
 	# Location of some random files OpenSSL can use: don't use
 	# /dev/u?random here -- doesn't work properly on all platforms
-	SSL_RANDOM="${T}/evironment:${T}/eclass-debug.log:/etc/resolv.conf"
+	SSL_RANDOM="${T}/environment:${T}/eclass-debug.log:/etc/resolv.conf"
 
 	# These can be overridden in the ebuild
 	SSL_DAYS="${SSL_BITS:-730}"
@@ -33,7 +31,7 @@ gen_cnf() {
 	SSL_COUNTRY="${SSL_COUNTRY:-US}"
 	SSL_STATE="${SSL_STATE:-California}"
 	SSL_LOCALITY="${SSL_LOCALITY:-Santa Barbara}"
-	SSL_ORGANIZATION="${SSL_ORGANIZTION:-SSL Server}"
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-SSL Server}"
 	SSL_UNIT="${SSL_UNIT:-For Testing Purposes Only}"
 	SSL_COMMONNAME="${SSL_COMMONNAME:-localhost}"
 	SSL_EMAIL="${SSL_EMAIL:-root@localhost}"
@@ -58,7 +56,7 @@ gen_cnf() {
 		emailAddress       = ${SSL_EMAIL}
 	EOF
 	eend $?
-	
+
 	return $?
 }
 
diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass
index 7071fb446758..45d4646ad962 100644
--- a/eclass/stardict.eclass
+++ b/eclass/stardict.eclass
@@ -1,11 +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/eclass/stardict.eclass,v 1.1 2003/06/04 13:13:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/stardict.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 
 # Author : Alastair Tse <liquidx@gentoo.org>
 #
 # Convienence class to do stardict dictionary installations.
-# 
+#
 # Usage:
 #   - Variables to set :
 #      * FROM_LANG     -  From this language
@@ -13,10 +13,8 @@
 #      * DICT_PREFIX   -  SRC_URI prefix, like "dictd_www.mova.org_"
 #	   * DICT_SUFFIX   -  SRC_URI after the prefix.
 
-ECLASS="stardict"
-INHERITED="$INHERITED $ECLASS"
 
-RESTRICT="nostrip nosharedlib"
+RESTRICT="nostrip"
 
 [ -z "${DICT_SUFFIX}" ] && DICT_SUFFIX=${PN#stardict-[a-z]*-}
 [ -z "${DICT_P}" ] && DICT_P=stardict-${DICT_PREFIX}${DICT_SUFFIX}-${PV}
@@ -25,14 +23,15 @@ if [ -n "${FROM_LANG}" -a -n "${TO_LANG}" ]; then
 	DESCRIPTION="Stardict Dictionary ${FROM_LANG} to ${TO_LANG}"
 elif [ -z "${DESCRIPTION}" ]; then
 	DESCRIPTION="Another Stardict Dictionary"
-fi	
-	
-HOMEPAGE="http://stardict.sourceforge.net/ ${HOMEPAGE}"
+fi
+
+HOMEPAGE="http://stardict.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stardict/${DICT_P}.tar.bz2"
 
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~sparc ~x86"
 
 DEPEND=">=app-dicts/stardict-2.1"
 
@@ -43,9 +42,11 @@ stardict_src_compile() {
 }
 
 stardict_src_install() {
+	cd ${S}
 	insinto /usr/share/stardict/dic
 	doins *.dict.dz
-	doins *.idx.gz
+	doins *.idx*
+	doins *.ifo
 }
 
 EXPORT_FUNCTIONS src_compile src_install
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 29034b7a46cb..dd4f4f840a6a 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -1,32 +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/eclass/subversion.eclass,v 1.1 2004/01/25 12:27:18 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.1.1.1 2005/11/30 09:59:21 chriswhite Exp $
 
 ## --------------------------------------------------------------------------- #
 # Author: Akinori Hattori <hattya@gentoo.org>
-# 
+#
 # The subversion eclass is written to fetch the software sources from
 # subversion repositories like the cvs eclass.
 #
 #
 # Description:
 #   If you use this eclass, the ${S} is ${WORKDIR}/${P}.
-#   It is necessary to define the ESVN_REPOURI variable at least.
+#   It is necessary to define the ESVN_REPO_URI variable at least.
 #
 ## --------------------------------------------------------------------------- #
 
+inherit eutils
 
-ECLASS="subversion"
-INHERITED="${INHERITED} ${ECLASS}"
+ESVN="subversion.eclass"
 
 EXPORT_FUNCTIONS src_unpack
 
 HOMEPAGE="http://subversion.tigris.org/"
+DESCRIPTION="Based on the ${ECLASS} eclass"
 
 
 ## -- add subversion in DEPEND
 #
-newdepend "dev-util/subversion"
+DEPEND="dev-util/subversion"
 
 
 ## -- ESVN_STORE_DIR:  subversion sources store directory
@@ -50,7 +51,11 @@ ESVN_STORE_DIR="${DISTDIR}/svn-src"
 ## -- ESVN_REPO_URI:  repository uri
 #
 # e.g. http://foo/trunk, svn://bar/trunk
-# but currentry support http only.
+#
+# supported protocols:
+#   http://
+#   https://
+#   svn://
 #
 [ -z "${ESVN_REPO_URI}" ]  && ESVN_REPO_URI=""
 
@@ -74,86 +79,150 @@ ESVN_STORE_DIR="${DISTDIR}/svn-src"
 
 ## -- ESVN_BOOTSTRAP:
 #
-# bootstrap script. like autogen.sh or etc..
+# bootstrap script or command like autogen.sh or etc..
 #
 [ -z "${ESVN_BOOTSTRAP}" ] && ESVN_BOOTSTRAP=""
 
 
-## -- subversion_svn_fetch() ------------------------------------------------- #
+## -- ESVN_PATCHES:
+#
+# subversion eclass can apply pathces in subversion_bootstrap().
+# you can use regexp in this valiable like *.diff or *.patch or etc.
+# NOTE: this patches will apply before eval ESVN_BOOTSTRAP.
+#
+# the process of applying the patch is:
+#   1. just epatch it, if the patch exists in the path.
+#   2. scan it under FILESDIR and epatch it, if the patch exists in FILESDIR.
+#   3. die.
+#
+[ -z "${ESVN_PATCHES}" ] && ESVN_PATCHES=""
 
-subversion_svn_fetch() {
 
-	# http only...
-	if [ "${ESVN_REPO_URI%%:*}" != "http" ]; then
-		if [ -z "${ESVN_REPO_URI}" ]; then
-			die "subversion.eclass: ESVN_REPO_URI is not empty."
+## -- subversion_svn_fetch() ------------------------------------------------- #
 
-		elif [ "${ESVN_REPO_URI}" = "none" ]; then
-			die "subversion.eclass: ESVN_REPO_URI is not define."
+function subversion_svn_fetch() {
+
+	# ESVN_REPO_URI is empty.
+	[ -z "${ESVN_REPO_URI}" ] && die "${ESVN}: ESVN_REPO_URI is empty."
+
+	# check for the protocol.
+	case ${ESVN_REPO_URI%%:*} in
+		http|https)
+			if built_with_use dev-util/subversion nowebdav ; then
+				eerror "In order to emerge this package, you need to"
+				eerror "re-emerge subversion with USE=-nowebdav"
+				die "Please run 'USE=-nowebdav emerge subversion'"
+			fi
+			;;
+		svn) ;;
+		*)
+			die "${ESVN}: fetch from "${ESVN_REPO_URI%:*}" is not yet implemented."
+			;;
+	esac
 
-		else
-			die "subversion.eclass: fetch from "${ESVN_REPO_URI%:*}" is not yet implemented."
+	if [ ! -d "${ESVN_STORE_DIR}" ]; then
+		debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
 
-		fi
+		addwrite /
+		mkdir -p "${ESVN_STORE_DIR}"      || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
+		chmod -f o+rw "${ESVN_STORE_DIR}" || die "${ESVN}: can't chmod ${ESVN_STORE_DIR}."
+		export SANDBOX_WRITE="${SANDBOX_WRITE%%:/}"
 	fi
 
-	if [ ! -d "${ESVN_STORE_DIR}" ]; then
-		mkdir -p "${ESVN_STORE_DIR}"
-		einfo "created store directory: ${ESVN_STORE_DIR}"
-		einfo
-	fi
+	cd -P "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
+	ESVN_STORE_DIR=${PWD}
 
-	cd "${ESVN_STORE_DIR}"
+	# every time
 	addwrite "/etc/subversion"
-	einfo
+	addwrite "${ESVN_STORE_DIR}"
 
-	if [ -z ${ESVN_REPO_URI##*/} ]; then
-		ESVN_REPO_FIX="${ESVN_REPO_FIX%/}"
-	fi
+	# -userpriv
+	! has userpriv ${FEATURE} && addwrite "/root/.subversion"
 
+	[ -z "${ESVN_REPO_URI##*/}" ] && ESVN_REPO_URI="${ESVN_REPO_URI%/}"
 	ESVN_CO_DIR="${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"
 
 	if [ ! -d "${ESVN_CO_DIR}/.svn" ]; then
 		# first check out
 		einfo "subversion check out start -->"
-		einfo
-		einfo "check out from: ${ESVN_REPO_URI}"
+		einfo "   checkout from: ${ESVN_REPO_URI}"
 
-		mkdir -p "${ESVN_PROJECT}"
+		mkdir -p "${ESVN_PROJECT}"      || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
+		chmod -f o+rw "${ESVN_PROJECT}" || die "${ESVN}: can't chmod ${ESVN_PROJECT}."
 		cd "${ESVN_PROJECT}"
+		${ESVN_FETCH_CMD} "${ESVN_REPO_URI}" || die "${ESVN}: can't fetch from ${ESVN_REPO_URI}."
 
-		#${ESVN_FETCH_CMD} "${ESVN_REPO_URI}"
-		einfo "     stored in: ${ESVN_STORE_DIR}/${ESVN_CO_DIR}"
+		einfo "   checkouted in: ${ESVN_STORE_DIR}/${ESVN_CO_DIR}"
 
 	else
 		# update working copy
 		einfo "subversion update start -->"
-		einfo
 		einfo "   update from: ${ESVN_REPO_URI}"
-
 		cd "${ESVN_CO_DIR}"
-		#${ESVN_UPDATE_CMD}
+
+		local NOW=$(date +%s) UPDATE=$(date -r .svn/entries +%s) INTERVAL=3600
+		if (( ${NOW} - ${UPDATE} > ${INTERVAL} )); then
+			${ESVN_UPDATE_CMD} || die "${ESVN}: can't update from ${ESVN_REPO_URI}."
+
+		else
+			echo "Skip updating..."
+
+		fi
+
 		einfo "    updated in: ${ESVN_STORE_DIR}/${ESVN_CO_DIR}"
+
 	fi
 
 	# copy to the ${WORKDIR}
-	cp -Rf "${ESVN_STORE_DIR}/${ESVN_CO_DIR}" "${WORKDIR}/${P}"
-	einfo
+	cp -Rf "${ESVN_STORE_DIR}/${ESVN_CO_DIR}" "${S}" || die "${ESVN}: can't copy to ${S}."
+	einfo "     copied to: ${S}"
+	echo
 
 }
 
 
 ## -- subversion_bootstrap() ------------------------------------------------ #
 
-subversion_bootstrap() {
+function subversion_bootstrap() {
 
-	if [ -n "${ESVN_BOOTSTRAP}" ]; then
-		cd "${WORKDIR}/${P}"
+	local patch lpatch
 
-		if [ -x "${ESVN_BOOTSTRAP}" ]; then
-			./${ESVN_BOOTSTRAP}
-		fi
+	cd "${S}"
+
+	if [ "${ESVN_PATCHES}" ]; then
+		einfo "apply patches -->"
 
+		for patch in ${ESVN_PATCHES}; do
+			if [ -f "${patch}" ]; then
+				epatch ${patch}
+
+			else
+				for lpatch in ${FILESDIR}/${patch}; do
+					if [ -f "${lpatch}" ]; then
+						epatch ${lpatch}
+
+					else
+						die "${ESVN}; ${patch} is not found"
+
+					fi
+				done
+			fi
+		done
+		echo
+	fi
+
+	if [ "${ESVN_BOOTSTRAP}" ]; then
+		einfo "begin bootstrap -->"
+
+		if [ -f "${ESVN_BOOTSTRAP}" -a -x "${ESVN_BOOTSTRAP}" ]; then
+			einfo "   bootstrap with a file: ${ESVN_BOOTSTRAP}"
+			eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
+
+		else
+			einfo "   bootstrap with commands: ${ESVN_BOOTSTRAP}"
+			eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
+
+		fi
 	fi
 
 }
@@ -161,9 +230,13 @@ subversion_bootstrap() {
 
 ## -- subversion_src_unpack() ------------------------------------------------ #
 
-subversion_src_unpack() {
+function subversion_src_unpack() {
+
+	if [[ -n ${A} ]] ; then
+		unpack ${A}
+	fi
 
-	subversion_svn_fetch
-	subversion_bootstrap
+	subversion_svn_fetch || die "${ESVN}: unknown problem in subversion_svn_fetch()."
+	subversion_bootstrap || die "${ESVN}: unknown problem in subversion_bootstrap()."
 
 }
diff --git a/eclass/tetex-2.eclass b/eclass/tetex-2.eclass
index 0e7c0ac94b54..f0f4d0faa908 100644
--- a/eclass/tetex-2.eclass
+++ b/eclass/tetex-2.eclass
@@ -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/eclass/tetex-2.eclass,v 1.1 2005/04/05 17:07:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-2.eclass,v 1.1.1.1 2005/11/30 09:59:17 chriswhite Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
@@ -9,8 +9,6 @@
 
 inherit tetex
 
-ECLASS=tetex-2
-INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS src_unpack src_install
 
 tetex-2_src_unpack() {
@@ -22,7 +20,7 @@ tetex-2_src_unpack() {
 	unpack ${TETEX_TEXMF_SRC}
 	sed -i -e "s/-sys//g" ${T}/texmf-update || die
 
-	# fix up misplaced listings.sty in the 2.0.2 archive. 
+	# fix up misplaced listings.sty in the 2.0.2 archive.
 	# this should be fixed in the next release <obz@gentoo.org>
 	mv source/latex/listings/listings.sty tex/latex/listings/ || die
 
diff --git a/eclass/tetex-3.eclass b/eclass/tetex-3.eclass
index a32afed28424..51dd546b13fd 100644
--- a/eclass/tetex-3.eclass
+++ b/eclass/tetex-3.eclass
@@ -1,17 +1,47 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-3.eclass,v 1.1 2005/04/05 17:07:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-3.eclass,v 1.1.1.1 2005/11/30 09:59:33 chriswhite Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
 # A generic eclass to install tetex 3.x distributions.
 
+TEXMF_PATH=/var/lib/texmf
+
 inherit tetex
 
-ECLASS=tetex-3
-INHERITED="${INHERITED} ${ECLASS}"
-EXPORT_FUNCTIONS src_unpack src_install pkg_preinst pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst pkg_postinst
+
+IUSE="X Xaw3d lesstif motif neXt"
+
+DEPEND="X? ( motif? ( lesstif? ( x11-libs/lesstif )
+			!lesstif? ( x11-libs/openmotif ) )
+		!motif? ( neXt? ( x11-libs/neXtaw )
+			!neXt? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
+		!app-text/xdvik
+	)
+	!dev-tex/memoir
+	!dev-tex/lineno
+	!dev-tex/SIunits
+	!dev-tex/floatflt
+	!dev-tex/g-brief
+	!dev-tex/pgf
+	!dev-tex/xcolor
+	!dev-tex/xkeyval
+	!dev-tex/latex-beamer"
+
+tetex-3_pkg_setup() {
+	tetex_pkg_setup
+
+	ewarn
+	ewarn "teTeX 3.0 ebuild will remove config files stored in /usr/share/texmf."
+	ewarn "Please make a backup before upgrading if you changed anything."
+	ewarn
+
+	ebeep
+	epause
+}
 
 tetex-3_src_unpack() {
 
@@ -22,9 +52,37 @@ tetex-3_src_unpack() {
 		${S}/texmf/tex/latex/hyperref/hyperref.cfg
 }
 
+tetex-3_src_compile() {
+	sed -i -e "/mktexlsr/,+3d" \
+		-e "s/\(updmap-sys\)/\1 --nohash/" \
+		Makefile.in || die
+
+	use amd64 && replace-flags "-O3" "-O2"
+
+	if use X ; then
+		if use motif ; then
+			if use lesstif ; then
+				append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
+				export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
+			fi
+			toolkit="motif"
+		elif use neXt ; then
+			toolkit="neXtaw"
+		elif use Xaw3d ; then
+			toolkit="xaw3d"
+		else
+			toolkit="xaw"
+		fi
+
+		TETEX_ECONF="${TETEX_ECONF} --with-xdvi-x-toolkit=${toolkit}"
+	fi
+
+	tetex_src_compile
+}
+
 tetex-3_src_install() {
 
-	tetex_src_install	
+	tetex_src_install
 
 	dodir /etc/env.d
 	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c"' > ${D}/etc/env.d/98tetex
diff --git a/eclass/tetex.eclass b/eclass/tetex.eclass
index c44024219c10..5f8529a15ba1 100644
--- a/eclass/tetex.eclass
+++ b/eclass/tetex.eclass
@@ -1,37 +1,41 @@
-# 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/eclass/tetex.eclass,v 1.1 2003/11/12 18:08:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.1.1.1 2005/11/30 09:59:17 chriswhite Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
+# Author: Mamoru KOMACHI <usata@gentoo.org>
 #
-# A generic eclass to install tetex distributions.
+# A generic eclass to install tetex distributions. This shouldn't be
+# inherited directly in any ebuilds. It should be inherited from
+# tetex-{2,3}.eclass.
 
-inherit eutils flag-o-matic
-filter-flags "-fstack-protector"
-ECLASS=tetex
-INHERITED="${INHERITED} ${ECLASS}"
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst
+inherit eutils flag-o-matic toolchain-funcs
+
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_setup pkg_postinst
 
 if [ -z "${TETEX_PV}" ] ; then
 	TETEX_PV=${PV}
 fi
 
+IUSE="X doc"
+
 S=${WORKDIR}/tetex-src-${TETEX_PV}
 TETEX_SRC="tetex-src-${TETEX_PV}.tar.gz"
 TETEX_TEXMF="tetex-texmf-${TETEX_PV}.tar.gz"
 TETEX_TEXMF_SRC="tetex-texmfsrc-${TETEX_PV}.tar.gz"
 
 DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
 SRC_PATH_TETEX=ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib
 SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
 	${SRC_PATH_TETEX}/${TETEX_TEXMF}
-	${SRC_PATH_TETEX}/${TETEX_TEXMF_SRC}"
-HOMEPAGE="http://tug.org/teTeX/"
+	${SRC_PATH_TETEX}/${TETEX_TEXMF_SRC}
+	mirror://gentoo/tetex-${TETEX_PV}-gentoo.tar.gz
+	http://dev.gentoo.org/~usata/distfiles/tetex-${TETEX_PV}-gentoo.tar.gz"
 
-KEYWORDS="~ia64 ~x86 ~ppc ~sparc ~alpha ~amd64"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="X"
+KEYWORDS="~ia64 ~x86 ~ppc ~sparc ~alpha ~amd64"
 
 DEPEND="!app-text/tetex
 	!app-text/ptex
@@ -43,59 +47,112 @@ DEPEND="!app-text/tetex
 	sys-libs/ncurses
 	>=net-libs/libwww-5.3.2-r1"
 RDEPEND="${DEPEND}
+	!app-text/dvipdfm
+	!dev-tex/currvita
+	!dev-tex/eurosym
+	!dev-tex/extsizes
 	>=dev-lang/perl-5.2
 	dev-util/dialog"
-#PDEPEND="app-text/xdvik"
 PROVIDE="virtual/tetex"
 
+tetex_pkg_setup() {
+
+	# hundreds of bugs reporting "cannot find -lmysqlclient" :(
+	if ! has_version 'dev-db/mysql' && (libwww-config --libs | grep mysql >/dev/null 2>&1); then
+		eerror
+		eerror "Your libwww was compiled with MySQL but MySQL is missing from system."
+		eerror "Please install MySQL or remerge libwww without mysql USE flag."
+		eerror
+		die "libwww was compiled with mysql but mysql is not installed"
+	fi
+}
+
 tetex_src_unpack() {
 
 	[ -z "$1" ] && tetex_src_unpack all
 
 	while [ "$1" ]; do
-    	case $1 in
-    		unpack)
+	case $1 in
+		unpack)
 			unpack ${TETEX_SRC}
+			unpack tetex-${TETEX_PV}-gentoo.tar.gz
 
 			mkdir ${S}/texmf; cd ${S}/texmf
 			umask 022
-			unpack ${TETEX_TEXMF_SRC}
 			unpack ${TETEX_TEXMF}
+
+			# create update script
+			cat >${T}/texmf-update<<'EOF'
+#!/bin/bash
+#
+# Utility to update Gentoo teTeX distribution configuration files
+#
+
+PATH=/bin:/usr/bin
+
+for conf in texmf.cnf fmtutil.cnf updmap.cfg
+do
+	if [ -d "/etc/texmf/${conf/.*/.d}" ]
+	then
+		echo "Generating /etc/texmf/web2c/${conf} from /etc/texmf/${conf/.*/.d} ..."
+		cat /etc/texmf/${conf/.*/.d}/* > "/etc/texmf/web2c/${conf}"
+	fi
+done
+
+# configure
+echo "Configuring teTeX ..."
+mktexlsr &>/dev/null
+texconfig-sys init &>/dev/null
+texconfig-sys confall &>/dev/null
+texconfig-sys font rw &>/dev/null
+texconfig-sys font vardir /var/cache/fonts &>/dev/null
+texconfig-sys font options varfonts &>/dev/null
+updmap-sys &>/dev/null
+
+# generate
+echo "Generating format files ..."
+fmtutil-sys --missing &>/dev/null
+echo
+echo "Use 'texconfig font ro' to disable font generation for users"
+echo
+EOF
 			;;
-    		patch)
+		patch)
 			# Do not run config. Also fix local texmf tree.
 			cd ${S}
-			epatch ${FILESDIR}/../../tetex/files/tetex-${TETEX_PV}-dont-run-config.diff
-			epatch ${FILESDIR}/../../tetex/files/tetex-${TETEX_PV}.diff
-
-			# fix up misplaced listings.sty in the 2.0.2 archive. 
-			# this should be fixed in the next release <obz@gentoo.org>
-			mv texmf/source/latex/listings/listings.sty texmf/tex/latex/listings/
+			for p in ${WORKDIR}/patches/* ; do
+				epatch $p
+			done
 
-			# need to fix up the hyperref driver, see bug #31967
-			sed -i -e "/providecommand/s/hdvips/hypertex/" \
-				${S}/texmf/tex/latex/config/hyperref.cfg
+			if useq ppc-macos ; then
+				sed -i -e "/^HOMETEXMF/s:\$HOME/texmf:\$HOME/Library/texmf:" ${S}/texk/kpathsea/texmf.in || die "sed texmf.in failed."
+			fi
 			;;
-    		all)
-    			tetex_src_unpack unpack patch
+		all)
+			tetex_src_unpack unpack patch
 			;;
-    	esac
-    	shift
-    done
+	esac
+	shift
+	done
 }
 
 tetex_src_compile() {
 
+	# filter -Os; bug #74307.
+	filter-flags "-fstack-protector" "-Os"
+
+	einfo "Building teTeX"
+
 	local xdvik
 
-	if [ "${P%%-*}" = "ptex" ] ; then
-		xdvik="--without-xdvik"
+	if useq X ; then
+		addwrite /var/cache/fonts
+		xdvik="--with-xdvik --with-oxdvik"
+		#xdvik="$xdvik --with-system-t1lib"
 	else
-		xdvik="--with-xdvik"
+		xdvik="--without-xdvik --without-oxdvik"
 	fi
 
-	einfo "Building teTeX"
-
 	econf --bindir=/usr/bin \
 		--datadir=${S} \
 		--with-system-wwwlib \
@@ -104,6 +161,7 @@ tetex_src_compile() {
 		--with-system-pnglib \
 		--without-texinfo \
 		--without-dialog \
+		--without-texi2html \
 		--with-system-zlib \
 		--disable-multiplatform \
 		--with-epsfwin \
@@ -114,121 +172,113 @@ tetex_src_compile() {
 		--with-ps=gs \
 		--enable-ipc \
 		--with-etex \
-		`use_with X x` \
+		$(use_with X x) \
 		${xdvik} \
-		${myconf} || die
+		${TETEX_ECONF} || die
 
-	make texmf=/usr/share/texmf || die "make teTeX failed"
-}
-
-tetex_src_install() {
+	if useq X && useq ppc-macos ; then
+		for f in $(find ${S} -name config.status) ; do
+			sed -i -e "s:-ldl::g" $f
+		done
+	fi
 
-	dodir /usr/share/
-	# Install texmf files
-	einfo "Installing texmf..."
-	cp -Rv texmf ${D}/usr/share
-
-	# Install teTeX files
-	einfo "Installing teTeX..."
-	einstall bindir=${D}/usr/bin texmf=${D}/usr/share/texmf || die
-
-	dodoc PROBLEMS README
-	docinto texk
-	dodoc texk/ChangeLog texk/README
-	docinto kpathesa
-	cd ${S}/texk/kpathsea
-	dodoc README* NEWS PROJECTS HIER
-	docinto dviljk
-	cd ${S}/texk/dviljk
-	dodoc AUTHORS README NEWS
-	docinto dvipsk
-	cd ${S}/texk/dvipsk
-	dodoc AUTHORS ChangeLog INSTALLATION README
-	docinto makeindexk
-	cd ${S}/texk/makeindexk
-	dodoc CONTRIB COPYING NEWS NOTES PORTING README
-	docinto ps2pkm
-	cd ${S}/texk/ps2pkm
-	dodoc ChangeLog CHANGES.type1 INSTALLATION README*
-	docinto web2c
-	cd ${S}/texk/web2c
-	dodoc AUTHORS ChangeLog NEWS PROJECTS README
-	#docinto xdvik
-	#cd ${S}/texk/xdvik
-	#dodoc BUGS FAQ README*
-
-	#fix for conflicting readlink binary:
-	rm -f ${D}/bin/readlink
-	rm -f ${D}/usr/bin/readlink
-	#add /var/cache/fonts directory
-	dodir /var/cache/fonts
-
-	#fix for lousy upstream permisssions on /usr/share/texmf files
-	#NOTE: do not use fowners, as its not recursive ...
-	einfo "Fixing permissions..."
-	chown -R root:root ${D}/usr/share/texmf
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/xdvi/"' > ${D}/etc/env.d/98tetex
-
-	#fix for texlinks
-	local src dst
-	sed -e '/^#/d' -e '/^$/d' -e 's/^ *//' \
-		${D}/usr/share/texmf/web2c/fmtutil.cnf > ${T}/fmtutil.cnf || die
-	while read l; do
-		dst=/usr/bin/`echo $l | awk '{ print $1 }'`
-		src=/usr/bin/`echo $l | awk '{ print $2 }'`
-		if [ ! -f ${D}$dst ] ; then
-			einfo "Making symlinks from $src to $dst"
-			dosym $src $dst
-		fi
-	done < ${T}/fmtutil.cnf
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" texmf=${TEXMF_PATH:-/usr/share/texmf} || die "make teTeX failed"
 }
 
-tetex_pkg_preinst() {
+tetex_src_install() {
 
-	if [ -d "/usr/share/texmf/dvipdfm/config" ]
-	then
-		ewarn "Removing /usr/share/texmf/dvipdfm/config/"
-		rm -rf /usr/share/texmf/dvipdfm/config
+	if [ -z "$1" ]; then
+		tetex_src_install all
 	fi
 
-	# Let's take care of config protecting.
-	einfo "Here I am!"
-}
+	while [ "$1" ]; do
+	case $1 in
+		base)
+			dodir /usr/share/
+			# Install texmf files
+			einfo "Installing texmf ..."
+			cp -Rv texmf ${D}/usr/share
 
-tetex_pkg_postinst() {
+			# Install teTeX files
+			einfo "Installing teTeX ..."
+			dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+			einstall bindir=${D}/usr/bin texmf=${D}${TEXMF_PATH:-/usr/share/texmf} || die
 
-	[ -z "$1" ] && tetex_pkg_postinst all
+			dosbin ${T}/texmf-update
+			;;
+		doc)
+			dodoc PROBLEMS README
+			docinto texk
+			dodoc texk/ChangeLog texk/README
+			docinto kpathesa
+			cd ${S}/texk/kpathsea
+			dodoc README* NEWS PROJECTS HIER
+			docinto dviljk
+			cd ${S}/texk/dviljk
+			dodoc AUTHORS README NEWS
+			docinto dvipsk
+			cd ${S}/texk/dvipsk
+			dodoc AUTHORS ChangeLog INSTALLATION README
+			docinto makeindexk
+			cd ${S}/texk/makeindexk
+			dodoc CONTRIB COPYING NEWS NOTES PORTING README
+			docinto ps2pkm
+			cd ${S}/texk/ps2pkm
+			dodoc ChangeLog CHANGES.type1 INSTALLATION README*
+			docinto web2c
+			cd ${S}/texk/web2c
+			dodoc AUTHORS ChangeLog NEWS PROJECTS README
+			#docinto xdvik
+			#cd ${S}/texk/xdvik
+			#dodoc BUGS FAQ README*
 
-	while [ "$1" ]; do
-    	case $1 in
-    		configure)
-			if [ $ROOT = "/" ]
-			then
-				einfo "Configuring teTeX..."
-				mktexlsr &>/dev/null
-				texconfig init &>/dev/null
-				texconfig confall &>/dev/null
-				texconfig font rw &>/dev/null
-				texconfig font vardir /var/cache/fonts &>/dev/null
-				texconfig font options varfonts &>/dev/null
-				updmap &>/dev/null
+			# move docs to /usr/share/doc/${PF}
+			if useq doc ; then
+				dodir /usr/share/doc/${PF}
+				mv ${D}/usr/share/texmf/doc/* \
+					${D}/usr/share/doc/${PF} \
+					|| die "mv doc failed."
+				cd ${D}/usr/share/texmf
+				rmdir doc
+				ln -s ../doc/${PF} doc \
+					|| die "ln -s doc failed."
+				cd -
+			else
+				rm -rf ${D}/usr/share/texmf/doc
 			fi
 			;;
-    		generate)
-			if [ $ROOT = "/" ]
-			then
-				einfo "Generating format files..."
-				fmtutil --missing &>/dev/null
-				einfo
-				einfo "Use 'texconfig font ro' to disable font generation for users"
-				einfo
-			fi
+		fixup)
+			#fix for conflicting readlink binary:
+			rm -f ${D}/bin/readlink
+			rm -f ${D}/usr/bin/readlink
+
+			#add /var/cache/fonts directory
+			dodir /var/cache/fonts
+
+			#fix for lousy upstream permisssions on /usr/share/texmf files
+			#NOTE: do not use fowners, as its not recursive ...
+			einfo "Fixing permissions ..."
+			# root group name doesn't exist on Mac OS X
+			chown -R 0:0 ${D}/usr/share/texmf
+			find ${D} -name "ls-R" -exec rm {} \;
 			;;
-    		all)
-    			tetex_pkg_postinst configure generate
+		all)
+			tetex_src_install base doc fixup
 			;;
-    	esac
-    	shift
-    done
+	esac
+	shift
+	done
+}
+
+tetex_pkg_postinst() {
+
+	if [ "$ROOT" = "/" ] ; then
+		/usr/sbin/texmf-update
+	fi
+	if [ -d "/etc/texmf" ] ; then
+		einfo
+		einfo "If you have configuration files in /etc/texmf to merge,"
+		einfo "please update them and run /usr/sbin/texmf-update."
+		einfo
+	fi
 }
diff --git a/eclass/tla.eclass b/eclass/tla.eclass
index 606897a85dd4..e95f7a45d0de 100644
--- a/eclass/tla.eclass
+++ b/eclass/tla.eclass
@@ -1,6 +1,6 @@
-# Copyright 2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.1 2003/11/21 17:39:58 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
 #
 # Original Author:    Jeffrey Yasskin <jyasskin@mail.utexas.edu>
 #
@@ -17,14 +17,12 @@
 # TODO:
 # Make it support particular revisions.
 
-ECLASS=tla
-INHERITED="$INHERITED $ECLASS"
 
 # Don't download anything other than the tla archive
 SRC_URI=""
 
 # You shouldn't change these settings yourself! The ebuild/eclass inheriting
-# this eclass will take care of that. 
+# this eclass will take care of that.
 
 # --- begin ebuild-configurable settings
 
@@ -58,14 +56,14 @@ SRC_URI=""
 # --- end ebuild-configurable settings ---
 
 # add tla to deps
-newdepend "dev-util/tla"
+DEPEND="dev-util/tla"
 
 # registers archives mentioned in $ETLA_ARCHIVES
 tla_register_archives() {
 	debug-print-function $FUNCNAME $* $ETLA_ARCHIVES
 
 	for archive in $ETLA_ARCHIVES; do
-		$ETLA_TLA_CMD register-archive $archive || die "Could not register archive $archive"
+		$ETLA_TLA_CMD register-archive -f $archive || die "Could not register archive $archive"
 	done
 }
 
@@ -111,7 +109,7 @@ tla_fetch() {
 	local tla_archive=`$ETLA_TLA_CMD parse-package-name --arch $ETLA_VERSION`
 	local tla_version=`$ETLA_TLA_CMD parse-package-name --package-version $ETLA_VERSION`
 	#local tla_revision=`$ETLA_TLA_CMD parse-package-name --lvl $ETLA_VERSION`
-	
+
 	# determine checkout or update mode and change to the right directory.
 	if [ ! -d "$ETLA_TOP_DIR/$ETLA_CACHE_DIR/{arch}" ]; then
 		mode=get
@@ -141,7 +139,7 @@ tla_fetch() {
 	local cmdupdate="${ETLA_TLA_CMD} ${ETLA_UPDATE_CMD} ${ETLA_VERSION}"
 
 	if [ "${mode}" == "get" ]; then
-		einfo "Running $cmdget" 
+		einfo "Running $cmdget"
 		eval $cmdget || die "tla get command failed"
 	elif [ "${mode}" == "update" ]; then
 		einfo "Running $cmdupdate"
@@ -165,17 +163,17 @@ tla_src_unpack() {
 	ETLA_CACHE_DIR=$ETLA_CACHE_DIR
 	ETLA_CLEAN=$ETLA_CLEAN"
 
-	einfo "Registering Archives..."
+	einfo "Registering Archives ..."
 	tla_register_archives
 
-	einfo "Checking that passed-in variables are rational..."
+	einfo "Checking that passed-in variables are rational ..."
 	tla_check_vars
 
-	einfo "Fetching tla version $ETLA_VERSION into $ETLA_TOP_DIR..."
+	einfo "Fetching tla version $ETLA_VERSION into $ETLA_TOP_DIR ..."
 	tla_fetch
-	
-	einfo "Copying $ETLA_CACHE_DIR from $ETLA_TOP_DIR..."
-	debug-print "Copying $ETLA_CACHE_DIR from $ETLA_TOP_DIR..."
+
+	einfo "Copying $ETLA_CACHE_DIR from $ETLA_TOP_DIR ..."
+	debug-print "Copying $ETLA_CACHE_DIR from $ETLA_TOP_DIR ..."
 
 	# probably redundant, but best to make sure
 	# Use ${WORKDIR}/${P} rather than ${S} so user can point ${S} to something inside.
@@ -197,7 +195,7 @@ tla_src_unpack() {
 	#	# tla_src_unpack may be called several times
 	#	export PATCHES=""
 	#fi
-	
+
 	einfo "Version ${ETLA_VERSION} is now in ${WORKDIR}/${P}"
 
 }
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 2f4e366b727e..5b32f6af2d84 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -1,62 +1,132 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.1 2004/11/14 09:05:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
 
-inherit eutils libtool flag-o-matic gnuconfig
-ECLASS=toolchain
-INHERITED="$INHERITED $ECLASS"
-EXPORT_FUNCTIONS src_unpack src_compile src_install
+# We install binutils into CTARGET-VERSION specific directories.  This lets
+# us easily merge multiple versions for multiple targets (if we wish) and
+# then switch the versions on the fly (with `binutils-config`).
+#
+# binutils-9999           -> live cvs
+# binutils-9999_preYYMMDD -> nightly snapshot date YYMMDD
+# binutils-#              -> normal release
 
-export CTARGET="${CTARGET:-${CHOST}}"
+extra_eclass=""
+if [[ ${PV} == "9999" ]] ; then
+	extra_eclass="cvs"
+	ECVS_SERVER="sourceware.org:/cvs/src"
+	ECVS_MODULE="binutils"
+	ECVS_USER="anoncvs"
+	ECVS_PASS="anoncvs"
+	BTYPE="cvs"
+	BVER="cvs"
+elif [[ ${PV} == 9999_pre* ]] ; then
+	BTYPE="snap"
+	BVER=${PV/9999_pre}
+else
+	BTYPE="rel"
+	BVER=${PV}
+fi
+
+inherit eutils libtool flag-o-matic gnuconfig multilib ${extra_eclass}
+EXPORT_FUNCTIONS src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="http://sources.redhat.com/binutils/"
-SRC_URI="mirror://kernel/linux/devel/binutils/${P}.tar.bz2
-	mirror://kernel/linux/devel/binutils/test/${P}.tar.bz2"
-[ -n "${PATCHVER}" ] && \
-	SRC_URI="${SRC_URI} mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-[ -n "${UCLIBC_PATCHVER}" ] && \
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV:0:4}-uclibc-patches-${UCLIBC_PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2 | LGPL-2"
-use cross \
-	&& SLOT="${CTARGET}-${PV}" \
-	|| SLOT="${CTARGET}"
-IUSE="nls bootstrap build multitarget uclibc cross"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )
-	sys-devel/binutils-config
-	!build? ( !bootstrap? ( dev-lang/perl ) )"
-
-LIBPATH="/usr/lib/${PN}/${CTARGET}/${PV}"
-INCPATH="${LIBPATH}/include"
-BINPATH="/usr/${CTARGET}/binutils-bin/${PV}"
-DATAPATH="/usr/share/${PN}-data/${CTARGET}/${PV}"
-MY_BUILDDIR="${WORKDIR}/build"
-
-is_cross() { [ "${CHOST}" != "${CTARGET}" ] ; }
-
-src_unpack() {
+
+case ${BTYPE} in
+	cvs)  SRC_URI="";;
+	snap) SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2";;
+	rel)
+		SRC_URI="mirror://kernel/linux/devel/binutils/binutils-${PV}.tar.bz2
+			mirror://kernel/linux/devel/binutils/test/binutils-${PV}.tar.bz2
+			mirror://gnu/binutils/binutils-${PV}.tar.bz2"
+esac
+[[ -n ${PATCHVER} ]] && \
+	SRC_URI="${SRC_URI} mirror://gentoo/binutils-${PV}-patches-${PATCHVER}.tar.bz2"
+[[ -n ${UCLIBC_PATCHVER} ]] && \
+	SRC_URI="${SRC_URI} mirror://gentoo/binutils-${PV}-uclibc-patches-${UCLIBC_PATCHVER}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+IUSE="nls multitarget multislot test"
+if use multislot ; then
+	SLOT="${CTARGET}-${BVER}"
+elif [[ ${CTARGET} != ${CHOST} ]] ; then
+	SLOT="${CTARGET}"
+else
+	SLOT="0"
+fi
+
+RDEPEND=">=sys-devel/binutils-config-1.8"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/binutils
+[[ ${BVER} != "cvs" ]] && S=${S}-${BVER}
+
+LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+INCPATH=${LIBPATH}/include
+BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
+DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
+MY_BUILDDIR=${WORKDIR}/build
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+tc-binutils_unpack() {
 	unpack ${A}
 	mkdir -p "${MY_BUILDDIR}"
+	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
 }
 
-apply_binutils_updates() {
-	cd ${S}
+tc-binutils_apply_patches() {
+	cd "${S}"
+
+	if [[ -n ${PATCHVER} ]] ; then
+		EPATCH_SOURCE=${WORKDIR}/patch
+		[[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \
+			&& EPATCH_SUFFIX="patch.bz2" \
+			|| EPATCH_SUFFIX="patch"
+		epatch
+	fi
+	if [[ -n ${UCLIBC_PATCHVER} ]] ; then
+		EPATCH_SOURCE=${WORKDIR}/uclibc-patches
+		[[ -n $(ls "${EPATCH_SOURCE}"/*.bz2 2>/dev/null) ]] \
+			&& EPATCH_SUFFIX="patch.bz2" \
+			|| EPATCH_SUFFIX="patch"
+		EPATCH_MULTI_MSG="Applying uClibc fixes ..." \
+		epatch
+	elif [[ ${CTARGET} == *-uclibc ]] ; then
+		die "sorry, but this binutils doesn't yet support uClibc :("
+	fi
 
-	[ -n "${PATCHVER}" ] && epatch ${WORKDIR}/patch
-	[ -n "${UCLIBC_PATCHVER}" ] && epatch ${WORKDIR}/uclibc-patches
+	# Fix po Makefile generators
+	sed -i \
+		-e '/^datadir = /s:$(prefix)/@DATADIRNAME@:@datadir@:' \
+		-e '/^gnulocaledir = /s:$(prefix)/share:$(datadir):' \
+		*/po/Make-in || die "sed po's failed"
 
 	# Run misc portage update scripts
 	gnuconfig_update
 	elibtoolize --portage --no-uclibc
 
+	# make sure we filter $LINGUAS so that only ones that
+	# actually work with all the subdirs make it through
 	strip-linguas -i */po
 }
 
-src_compile() {
-	filter-flags -fomit-frame-pointer -fssa #6730
+toolchain-binutils_src_unpack() {
+	tc-binutils_unpack
+	tc-binutils_apply_patches
+}
+
+toolchain-binutils_src_compile() {
 	strip-flags && replace-flags -O3 -O2 #47581
 
 	cd "${MY_BUILDDIR}"
@@ -65,9 +135,8 @@ src_compile() {
 		&& myconf="${myconf} --without-included-gettext" \
 		|| myconf="${myconf} --disable-nls"
 	use multitarget && myconf="${myconf} --enable-targets=all"
-	[ -n "${CBUILD}" ] && myconf="${myconf} --build=${CBUILD}"
-	${S}/configure \
-		--prefix=/usr \
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+	myconf="--prefix=/usr \
 		--host=${CHOST} \
 		--target=${CTARGET} \
 		--datadir=${DATAPATH} \
@@ -77,74 +146,101 @@ src_compile() {
 		--libdir=${LIBPATH} \
 		--libexecdir=${LIBPATH} \
 		--includedir=${INCPATH} \
-		--enable-shared \
 		--enable-64-bit-bfd \
-		${myconf} ${EXTRA_ECONF} || die
+		--enable-shared \
+		--disable-werror \
+		${myconf} ${EXTRA_ECONF}"
+	echo ./configure ${myconf}
+	"${S}"/configure ${myconf} || die "configure failed"
 
-	make configure-bfd || die "configure-bfd"
-	make headers -C bfd || die "headers-bfd"
-	emake all || die "emake"
+	# binutils' build system is a bit broken with internal
+	# dependencies, so we manually run these first two bfd
+	# targets so that we can than use -j# and have it work
+	emake -j1 configure-bfd || die "make configure-bfd failed"
+	emake -j1 headers -C bfd || die "make headers-bfd failed"
+	emake all || die "emake failed"
 
-	if ! use build ; then
-		if ! has noinfo ${FEATURES} ; then
-			# Make the info pages (makeinfo included with gcc is used)
-			make info || die "info"
-		fi
-		if ! use bootstrap && ! has noman ${FEATURES} ; then
-			cd "${S}"
-			# Nuke the manpages to recreate them (only use this if we have perl)
-			find . -name '*.1' -exec rm -f {} \; || :
+	# only build info pages if we user wants them, and if
+	# we have makeinfo (may not exist when we bootstrap)
+	if ! has noinfo ${FEATURES} ; then
+		if type -p makeinfo ; then
+			make info || die "make info failed"
 		fi
 	fi
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 | xargs rm -f
 }
 
-src_test() {
-	emake check
+toolchain-binutils_src_test() {
+	cd "${MY_BUILDDIR}"
+	make check || die "check failed :("
 }
 
-# TODO: COMMENT THIS CRAP :)
-src_install() {
+toolchain-binutils_src_install() {
 	local x d
 
 	cd "${MY_BUILDDIR}"
 	make DESTDIR="${D}" tooldir="${LIBPATH}" install || die
 	rm -rf "${D}"/${LIBPATH}/bin
 
-	# Now we collect everything in /usr
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
 	if is_cross ; then
 		cd "${D}"/${BINPATH}
 		for x in * ; do
 			mv ${x} ${x/${CTARGET}-}
 		done
 
-		mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH}
-		mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/
-		rm -r "${D}"/usr/${CHOST}
+		if [[ -d ${D}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${D}"/usr/${CHOST}/${CTARGET}/include "${D}"/${INCPATH}
+			mv "${D}"/usr/${CHOST}/${CTARGET}/lib/* "${D}"/${LIBPATH}/
+			rm -r "${D}"/usr/${CHOST}
+		fi
 	else
 		insinto ${INCPATH}
 		doins "${S}/include/libiberty.h"
 	fi
-	mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/
-	rm -r "${D}"/${LIBPATH}/lib
+	if [[ -d ${D}/${LIBPATH}/lib ]] ; then
+		mv "${D}"/${LIBPATH}/lib/* "${D}"/${LIBPATH}/
+		rm -r "${D}"/${LIBPATH}/lib
+	fi
+	dodir /usr/${CTARGET}/{bin,include,lib}
+	prepman ${DATAPATH}
 
-	cd "${D}"/${BINPATH}
-	dodir /usr/bin
-	for x in * ; do
-		dosym ../${CTARGET}/bin/${x} /usr/bin/${CTARGET}-${x}
-		is_cross || dosym ${CTARGET}-${x} /usr/bin/${x}
-	done
+	# Now, some binutils are tricky and actually provide
+	# for multiple TARGETS.  Really, we're talking just
+	# 32bit/64bit support (like mips/ppc/sparc).  Here
+	# we want to tell binutils-config that it's cool if
+	# it generates multiple sets of binutil symlinks.
+	# e.g. sparc gets {sparc,sparc64}-unknown-linux-gnu
+	local targ=${CTARGET/-*} src="" dst=""
+	local FAKE_TARGETS=${CTARGET}
+	case ${targ} in
+		mips*)    src="mips"    dst="mips64";;
+		powerpc*) src="powerpc" dst="powerpc64";;
+		s390*)    src="s390"    dst="s390x";;
+		sparc*)   src="sparc"   dst="sparc64";;
+	esac
+	case ${targ} in
+		mips64*|powerpc64*|s390x*|sparc64*) targ=${src} src=${dst} dst=${targ};;
+	esac
+	[[ -n ${src}${dst} ]] && FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/${src}/${dst}}"
 
 	# Generate an env.d entry for this binutils
-	cd ${S}
+	cd "${S}"
 	insinto /etc/env.d/binutils
-	cat << EOF > env.d
-TARGET="${CTARGET}"
-VER="${PV}"
-EOF
-	newins env.d ${CTARGET}-${PV}
+	cat <<-EOF > env.d
+		TARGET="${CTARGET}"
+		VER="${BVER}"
+		LIBPATH="${LIBPATH}"
+		FAKE_TARGETS="${FAKE_TARGETS}"
+	EOF
+	newins env.d ${CTARGET}-${BVER}
 
 	# Handle documentation
-	if ! use build && ! is_cross ; then
+	if ! is_cross ; then
 		cd "${S}"
 		dodoc README
 		docinto bfd
@@ -162,8 +258,38 @@ EOF
 		docinto opcodes
 		dodoc opcodes/ChangeLog*
 	fi
+	# Punt all the fun stuff if user doesn't want it :)
+	has noinfo ${FEATURES} && rm -r "${D}"/${DATAPATH}/info
+	has noman ${FEATURES} && rm -r "${D}"/${DATAPATH}/man
+	# Remove shared info pages
+	rm -f "${D}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+}
+
+toolchain-binutils_pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${ROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${BVER}
 }
 
-pkg_postinst() {
-	binutils-config ${CTARGET}-${PV}
+toolchain-binutils_pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
+		binutils-config ${CTARGET}-${BVER}
+	fi
 }
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index dfaef5dd4ced..7f8198c8d8da 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1,61 +1,156 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.1 2004/10/13 14:14:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.1.1.1 2005/11/30 09:59:25 chriswhite Exp $
 #
-# Author: Toolchain Ninjas <ninjas@gentoo.org>
+# Author: Toolchain Ninjas <toolchain@gentoo.org>
 #
-# This eclass contains (or should) functions to get common info 
+# This eclass contains (or should) functions to get common info
 # about the toolchain (libc/compiler/binutils/etc...)
 
-inherit eutils
-
-ECLASS=toolfuncs
-INHERITED="$INHERITED $ECLASS"
+inherit multilib
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
 tc-getPROG() {
-	local var="$1"
-	local prog="$2"
-	local search=""
+	local var=$1
+	local prog=$2
 
-	if [ -n "${!var}" ] ; then
+	if [[ -n ${!var} ]] ; then
 		echo "${!var}"
 		return 0
 	fi
 
-	# how should we handle the host/target/build ?
-	if [ -n "${CHOST}" ] ; then
-		search="$(type -p "${CHOST}-${prog}")"
-	else
-		if [ -n "${CTARGET}" ] ; then
-			search="$(type -p "${CTARGET}-${prog}")"
-		fi
-	fi
+	local search=
+	[[ -n $3 ]] && search=$(type -p "$3-${prog}")
+	[[ -z ${search} && -n ${CHOST} ]] && search=$(type -p "${CHOST}-${prog}")
+	[[ -n ${search} ]] && prog=${search##*/}
 
-	if [ -z "${search}" ] ; then
-		prog="${search##*/}"
-	fi
-	export ${var}="${prog}"
+	export ${var}=${prog}
 	echo "${!var}"
 }
 
 # Returns the name of the archiver
-tc-getAR() { tc-getPROG AR ar; }
+tc-getAR() { tc-getPROG AR ar "$@"; }
 # Returns the name of the assembler
-tc-getAS() { tc-getPROG AS as; }
+tc-getAS() { tc-getPROG AS as "$@"; }
 # Returns the name of the C compiler
-tc-getCC() { tc-getPROG CC gcc; }
+tc-getCC() { tc-getPROG CC gcc "$@"; }
 # Returns the name of the C++ compiler
-tc-getCXX() { tc-getPROG CXX g++; }
+tc-getCXX() { tc-getPROG CXX g++ "$@"; }
 # Returns the name of the linker
-tc-getLD() { tc-getPROG LD ld; }
+tc-getLD() { tc-getPROG LD ld "$@"; }
 # Returns the name of the symbol/object thingy
-tc-getNM() { tc-getPROG NM nm; }
+tc-getNM() { tc-getPROG NM nm "$@"; }
 # Returns the name of the archiver indexer
-tc-getRANLIB() { tc-getPROG RANLIB ranlib; }
+tc-getRANLIB() { tc-getPROG RANLIB ranlib "$@"; }
+# Returns the name of the fortran compiler
+tc-getF77() { tc-getPROG F77 f77 "$@"; }
+# Returns the name of the java compiler
+tc-getGCJ() { tc-getPROG GCJ gcj "$@"; }
+
+# Returns the name of the C compiler for build
+tc-getBUILD_CC() {
+	local v
+	for v in CC_FOR_BUILD BUILD_CC HOSTCC ; do
+		if [[ -n ${!v} ]] ; then
+			export BUILD_CC=${!v}
+			echo "${!v}"
+			return 0
+		fi
+	done
+
+	local search=
+	if [[ -n ${CBUILD} ]] ; then
+		search=$(type -p ${CBUILD}-gcc)
+		search=${search##*/}
+	fi
+	search=${search:-gcc}
+
+	export BUILD_CC=${search}
+	echo "${search}"
+}
+
+# Quick way to export a bunch of vars at once
+tc-export() {
+	local var
+	for var in "$@" ; do
+		eval tc-get${var} > /dev/null
+	done
+}
+
+# A simple way to see if we're using a cross-compiler ...
+tc-is-cross-compiler() {
+	return $([[ ${CBUILD:-${CHOST}} != ${CHOST} ]])
+}
+
 
+# Parse information from CBUILD/CHOST/CTARGET rather than
+# use external variables from the profile.
+tc-ninja_magic_to_arch() {
+ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
 
+	local type=$1
+	local host=$2
+	[[ -z ${host} ]] && host=${CTARGET:-${CHOST}}
+
+	case ${host} in
+		alpha*)		echo alpha;;
+		arm*)		echo arm;;
+		cris*)		echo cris;;
+		hppa*)		ninj parisc hppa;;
+		i?86*)		ninj i386 x86;;
+		ia64*)		echo ia64;;
+		m68*)		echo m68k;;
+		mips*)		echo mips;;
+		powerpc64*)	echo ppc64;;
+		powerpc*)	[[ ${PROFILE_ARCH} == "ppc64" ]] \
+						&& ninj ppc64 ppc \
+						|| echo ppc
+					;;
+		s390*)		echo s390;;
+		sh64*)		ninj sh64 sh;;
+		sh*)		echo sh;;
+		sparc64*)	ninj sparc64 sparc;;
+		sparc*)		[[ ${PROFILE_ARCH} == "sparc64" ]] \
+						&& ninj sparc64 sparc \
+						|| echo sparc
+					;;
+		vax*)		echo vax;;
+		x86_64*)	ninj x86_64 amd64;;
+		*)			echo ${ARCH};;
+	esac
+}
+tc-arch-kernel() {
+	tc-ninja_magic_to_arch kern $@
+}
+tc-arch() {
+	tc-ninja_magic_to_arch portage $@
+}
+tc-endian() {
+	local host=$1
+	[[ -z ${host} ]] && host=${CTARGET:-${CHOST}}
+	host=${host%%-*}
+
+	case ${host} in
+		alpha*)		echo big;;
+		arm*b*)		echo big;;
+		arm*)		echo little;;
+		cris*)		echo little;;
+		hppa*)		echo big;;
+		i?86*)		echo little;;
+		ia64*)		echo little;;
+		m68*)		echo big;;
+		mips*l*)	echo little;;
+		mips*)		echo big;;
+		powerpc*)	echo big;;
+		s390*)		echo big;;
+		sh*b*)		echo big;;
+		sh*)		echo little;;
+		sparc*)		echo big;;
+		x86_64*)	echo little;;
+		*)			echo wtf;;
+	esac
+}
 
 # Returns the version as by `$CC -dumpversion`
 gcc-fullversion() {
@@ -63,17 +158,65 @@ gcc-fullversion() {
 }
 # Returns the version, but only the <major>.<minor>
 gcc-version() {
-	echo "$(cc-fullversion | cut -f1,2 -d.)"
+	echo "$(gcc-fullversion | cut -f1,2 -d.)"
 }
 # Returns the Major version
 gcc-major-version() {
-	echo "$(cc-version | cut -f1 -d.)"
+	echo "$(gcc-version | cut -f1 -d.)"
 }
 # Returns the Minor version
 gcc-minor-version() {
-	echo "$(cc-version | cut -f2 -d.)"
+	echo "$(gcc-version | cut -f2 -d.)"
 }
 # Returns the Micro version
 gcc-micro-version() {
-	echo "$(cc-fullversion | cut -f3 -d.)"
+	echo "$(gcc-fullversion | cut -f3 -d. | cut -f1 -d-)"
+}
+
+# Returns requested gcc specs directive
+# Note; later specs normally overwrite earlier ones; however if a later
+# spec starts with '+' then it appends.
+# gcc -dumpspecs is parsed first, followed by files listed by "gcc -v"
+# as "Reading <file>", in order.
+gcc-specs-directive() {
+	local specfiles=$($(tc-getCC) -v 2>&1 | awk '$1=="Reading" {print $NF}')
+	$(tc-getCC) -dumpspecs 2> /dev/null | cat - ${specfiles} | awk -v directive=$1 \
+'BEGIN	{ pspec=""; spec=""; outside=1 }
+$1=="*"directive":"  { pspec=spec; spec=""; outside=0; next }
+	outside || NF==0 || ( substr($1,1,1)=="*" && substr($1,length($1),1)==":" ) { outside=1; next }
+	spec=="" && substr($0,1,1)=="+" { spec=pspec " " substr($0,2); next }
+	{ spec=spec $0 }
+END	{ print spec }'
+	return 0
+}
+
+# Returns true if gcc sets relro
+gcc-specs-relro() {
+	local directive
+	directive=$(gcc-specs-directive link_command)
+	return $([[ ${directive/\{!norelro:} != ${directive} ]])
+}
+# Returns true if gcc sets now
+gcc-specs-now() {
+	local directive
+	directive=$(gcc-specs-directive link_command)
+	return $([[ ${directive/\{!nonow:} != ${directive} ]])
+}
+# Returns true if gcc builds PIEs
+gcc-specs-pie() {
+	local directive
+	directive=$(gcc-specs-directive cc1)
+	return $([[ ${directive/\{!nopie:} != ${directive} ]])
+}
+# Returns true if gcc builds with the stack protector
+gcc-specs-ssp() {
+	local directive
+	directive=$(gcc-specs-directive cc1)
+	return $([[ ${directive/\{!fno-stack-protector:} != ${directive} ]])
+}
+# Returns true if gcc upgrades fstack-protector to fstack-protector-all
+gcc-specs-ssp-to-all() {
+	local directive
+	directive=$(gcc-specs-directive cc1)
+	return $([[ ${directive/\{!fno-stack-protector-all:} != ${directive} ]])
 }
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 833f96df39d5..d3c5be647bac 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,22 +1,167 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.1 2004/09/04 23:14:43 lv Exp $
-#
-# This eclass should contain general toolchain-related functions that are
-# expected to not change, or change much.
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.1.1.1 2005/11/30 09:59:37 chriswhite Exp $
+
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+LICENSE="GPL-2 LGPL-2.1"
+RESTRICT="nostrip" # cross-compilers need controlled stripping
+
+#---->> eclass stuff <<----
+inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails
 
-inherit eutils
-ECLASS=toolchain
-INHERITED="$INHERITED $ECLASS"
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
-# BIG FAT WARNING!!!!!
-# NO EBUILDS IN THE TREE SHOULD USE THIS ECLASS UNTIL IT IS FINISHED AND
-# STABLE!!! THIS ECLASS IS STILL A WORK IN PROGRESS!!
-# This eclass is only in the tree so that i can trick^H^H^H^H^Hencourage
-# others to help me out. That and I expect super-agent Mr_Bones_ to see
-# the commit and beat me for any mistakes I might have made. ;)
+FEATURES=${FEATURES/multilib-strict/}
 
+toolchain_pkg_setup() {
+	gcc_pkg_setup
+}
+toolchain_src_unpack() {
+	gcc_src_unpack
+}
+toolchain_src_compile() {
+	gcc_src_compile
+}
+toolchain_src_test() {
+	gcc_src_test
+}
+toolchain_pkg_preinst() {
+	${ETYPE}_pkg_preinst
+}
+toolchain_src_install() {
+	${ETYPE}_src_install
+}
+toolchain_pkg_postinst() {
+	${ETYPE}_pkg_postinst
+}
+toolchain_pkg_prerm() {
+	${ETYPE}_pkg_prerm
+}
+toolchain_pkg_postrm() {
+	${ETYPE}_pkg_postrm
+}
+#----<< eclass stuff >>----
+
+
+#---->> globals <<----
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+GCC_RELEASE_VER=$(get_version_component_range 1-3)
+GCC_BRANCH_VER=$(get_version_component_range 1-2)
+GCCMAJOR=$(get_version_component_range 1)
+GCCMINOR=$(get_version_component_range 2)
+GCCMICRO=$(get_version_component_range 3)
+[[ ${BRANCH_UPDATE-notset} == "notset" ]] && BRANCH_UPDATE=$(get_version_component_range 4)
+
+# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
+# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
+GCC_CONFIG_VER=${GCC_CONFIG_VER:-"$(replace_version_separator 3 '-')"}
+
+# Pre-release support
+if [[ ${PV} != ${PV/_pre/-} ]] ; then
+	PRERELEASE=${PV/_pre/-}
+fi
+# make _alpha and _beta ebuilds automatically use a snapshot
+if [[ ${PV} != ${PV/_alpha/} ]] ; then
+	SNAPSHOT=${GCC_BRANCH_VER}-${PV##*_alpha}
+elif [[ ${PV} != ${PV/_beta/} ]] ; then
+	SNAPSHOT=${GCC_BRANCH_VER}-${PV##*_beta}
+fi
+export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
+
+if [[ ${ETYPE} == "gcc-library" ]] ; then
+	GCC_VAR_TYPE=${GCC_VAR_TYPE:-non-versioned}
+	GCC_LIB_COMPAT_ONLY=${GCC_LIB_COMPAT_ONLY:-true}
+	GCC_TARGET_NO_MULTILIB=${GCC_TARGET_NO_MULTILIB:-true}
+else
+	GCC_VAR_TYPE=${GCC_VAR_TYPE:-versioned}
+	GCC_LIB_COMPAT_ONLY="false"
+	GCC_TARGET_NO_MULTILIB=${GCC_TARGET_NO_MULTILIB:-false}
+fi
+
+PREFIX=${TOOLCHAIN_PREFIX:-/usr}
+
+if [[ ${GCC_VAR_TYPE} == "versioned" ]] ; then
+	if version_is_at_least 3.4.0 ; then
+		LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
+	else
+		LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
+	fi
+	LIBEXECPATH=${TOOLCHAIN_LIBEXE:-${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}}
+	INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
+	BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
+	DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}}
+	# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
+	# We will handle /usr/include/g++-v3/ with gcc-config ...
+	STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
+elif [[ ${GCC_VAR_TYPE} == "non-versioned" ]] ; then
+	# using non-versioned directories to install gcc, like what is currently
+	# done for ppc64 and 3.3.3_pre, is a BAD IDEA. DO NOT do it!! However...
+	# setting up variables for non-versioned directories might be useful for
+	# specific gcc targets, like libffi. Note that we dont override the value
+	# returned by get_libdir here.
+	LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/$(get_libdir)}
+	LIBEXECPATH=${TOOLCHAIN_LIBEXE:-${PREFIX}/libexec/gcc}
+	INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${PREFIX}/include}
+	BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/bin}
+	DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share}
+	STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${PREFIX}/include/g++-v3}
+fi
+
+XGCC="${WORKDIR}/build/gcc/xgcc -B${WORKDIR}/build/gcc"
+#----<< globals >>----
+
+
+#---->> SLOT+IUSE logic <<----
+if [[ ${ETYPE} == "gcc-library" ]] ; then
+	IUSE="nls build"
+	SLOT="${CTARGET}-${SO_VERSION_SLOT:-5}"
+else
+	IUSE="altivec bootstrap build fortran gcj gtk hardened ip28 multilib multislot n32 n64 nls nocxx objc objc-gc vanilla mudflap"
+	[[ -n ${PIE_VER}    ]] && IUSE="${IUSE} nopie"
+	[[ -n ${PP_VER}     ]] && IUSE="${IUSE} nossp"
+	[[ -n ${HTB_VER}    ]] && IUSE="${IUSE} boundschecking"
+	# Support upgrade paths here or people get pissed
+	if use multislot ; then
+		SLOT="${CTARGET}-${GCC_CONFIG_VER}"
+	elif is_crosscompile; then
+		SLOT="${CTARGET}-${GCC_BRANCH_VER}"
+	else
+		SLOT="${GCC_BRANCH_VER}"
+	fi
+fi
+#----<< SLOT+IUSE logic >>----
+
+
+#---->> S + SRC_URI essentials <<----
+
+# This function sets the source directory depending on whether we're using
+# a prerelease, snapshot, or release tarball. To use it, just set S with:
+#
+#	S="$(gcc_get_s_dir)"
+#
+# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
+#
+gcc_get_s_dir() {
+	if [[ -n ${PRERELEASE} ]] ; then
+		GCC_S=${WORKDIR}/gcc-${PRERELEASE}
+	elif [[ -n ${SNAPSHOT} ]] ; then
+		GCC_S=${WORKDIR}/gcc-${SNAPSHOT}
+	else
+		GCC_S=${WORKDIR}/gcc-${GCC_RELEASE_VER}
+	fi
+
+	echo "${GCC_S}"
+}
 
 # This function handles the basics of setting the SRC_URI for a gcc ebuild.
 # To use, set SRC_URI with:
@@ -26,13 +171,6 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 # Other than the variables normally set by portage, this function's behavior
 # can be altered by setting the following:
 #
-#	GENTOO_TOOLCHAIN_BASE_URI
-#			This sets the base URI for all gentoo-specific patch files. Note
-#			that this variable is only important for a brief period of time,
-#			before your source files get picked up by mirrors. However, it is
-#			still highly suggested that you keep files in this location
-#			available.
-#
 #	SNAPSHOT
 #			If set, this variable signals that we should be using a snapshot
 #			of gcc from ftp://sources.redhat.com/pub/gcc/snapshots/. It is
@@ -49,23 +187,36 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 #			has a _pre suffix.
 #
 #	PATCH_VER
+#	PATCH_GCC_VER
 #			This should be set to the version of the gentoo patch tarball.
 #			The resulting filename of this tarball will be:
-#			${P}-patches-${PATCH_VER}.tar.bz2
+#			gcc-${PATCH_GCC_VER:-${GCC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
 #
 #	PIE_VER
-#	PIE_CORE
+#	PIE_GCC_VER
+#	obsoleted: PIE_CORE
 #			These variables control patching in various updates for the logic
 #			controlling Position Independant Executables. PIE_VER is expected
-#			to be the version of this patch, and PIE_CORE the actual filename
-#			of the patch. An example:
+#			to be the version of this patch, PIE_GCC_VER the gcc version of
+#			the patch, and PIE_CORE (obsoleted) the actual filename of the patch.
+#			An example:
 #					PIE_VER="8.7.6.5"
+#					PIE_GCC_VER="3.4.0"
+#			The resulting filename of this tarball will be:
+#			gcc-${PIE_GCC_VER:-${GCC_RELEASE_VER}}-piepatches-v${PIE_VER}.tar.bz2
+#				old syntax (do not define PIE_CORE anymore):
 #					PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
 #
 #	PP_VER
-#	PP_FVER
+#	PP_GCC_VER
+#	obsoleted: PP_FVER
 #			These variables control patching in stack smashing protection
 #			support. They both control the version of ProPolice to download.
+#
+#		PP_VER / PP_GCC_VER
+#			Used to roll our own custom tarballs of ssp.
+#		PP_FVER / PP_VER
+#			Used for mirroring ssp straight from IBM.
 #			PP_VER sets the version of the directory in which to find the
 #			patch, and PP_FVER sets the version of the patch itself. For
 #			example:
@@ -73,425 +224,885 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
 #					PP_FVER="${PP_VER//_/.}-2"
 #			would download gcc3_4/protector-3.4-2.tar.gz
 #
-#	GCC_MANPAGE_VERSION
+#	HTB_VER
+#	HTB_GCC_VER
+#			These variables control whether or not an ebuild supports Herman
+#			ten Brugge's bounds-checking patches. If you want to use a patch
+#			for an older gcc version with a new gcc, make sure you set
+#			HTB_GCC_VER to that version of gcc.
+#
+#	MAN_VER
 #			The version of gcc for which we will download manpages. This will
-#			default to ${PV}, but we may not want to pre-generate man pages
+#			default to ${GCC_RELEASE_VER}, but we may not want to pre-generate man pages
 #			for prerelease test ebuilds for example. This allows you to
 #			continue using pre-generated manpages from the last stable release.
+#			If set to "none", this will prevent the downloading of manpages,
+#			which is useful for individual library targets.
 #
-# Travis Tilley <lv@gentoo.org> (02 Sep 2004)
-#
+gentoo_urls() {
+	local devspace="HTTP~lv/GCC/URI HTTP~eradicator/gcc/URI HTTP~vapier/dist/URI
+	HTTP~halcy0n/patches/URI"
+	devspace=${devspace//HTTP/http:\/\/dev.gentoo.org\/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
 get_gcc_src_uri() {
-	# This variable should be set to the devspace of whoever is currently
-	# maintaining GCC. Please dont set this to mirror, that would just
-	# make the files unavailable until they get mirrored.
-	local devspace_uri="http://dev.gentoo.org/~lv/toolchain-files/"
-	GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:=${devspace_uri}}
+	export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
+	export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
+	export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
+	export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}}
+	export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
 
-	MAIN_BRANCH="${PV}"  # Tarball, etc used ...
-
-	# Pre-release support
-	if [ ${PV} != ${PV/_pre/-} ] ; then
-		PRERELEASE=${PV/_pre/-}
-	fi
+	[[ -n ${PIE_VER} ]] && \
+		PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2}
 
 	# Set where to download gcc itself depending on whether we're using a
 	# prerelease, snapshot, or release tarball.
-	if [ -n "${PRERELEASE}" ] ; then
+	if [[ -n ${PRERELEASE} ]] ; then
 		GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
-	elif [ -n "${SNAPSHOT}" ] ; then
-		GCC_SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT//-}.tar.bz2"
+	elif [[ -n ${SNAPSHOT} ]] ; then
+		GCC_SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
 	else
-		GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${PN}-${MAIN_BRANCH}.tar.bz2"
+		GCC_SRC_URI="mirror://gnu/gcc/gcc-${PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
 		# we want all branch updates to be against the main release
-		if [ -n "${BRANCH_UPDATE}" ] ; then
-			GCC_SRC_URI="${GCC_SRC_URI}
-				${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-		fi
-	fi
-
-	# various gentoo patches
-	if [ -n "${PATCH_VER}" ] ; then
-		GCC_SRC_URI="${GCC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/${P}-patches-${PATCH_VER}.tar.bz2"
+		[[ -n ${BRANCH_UPDATE} ]] && \
+			GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
 	fi
 
 	# propolice aka stack smashing protection
-	if [ -n "${PP_VER}" ] ; then
-	GCC_SRC_URI="${GCC_SRC_URI}
-		http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz"
+	if [[ -n ${PP_VER} ]] ; then
+		if [[ -n ${PP_FVER} ]] ; then
+			GCC_SRC_URI="${GCC_SRC_URI}
+				!nossp? (
+					http://www.research.ibm.com/trl/projects/security/ssp/gcc${PP_VER}/protector-${PP_FVER}.tar.gz
+					$(gentoo_urls protector-${PP_FVER}.tar.gz)
+				)"
+		else
+			GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${PP_GCC_VER}-ssp-${PP_VER}.tar.bz2)"
+		fi
 	fi
 
+	# uclibc lovin
+	[[ -n ${UCLIBC_VER} ]] && \
+		GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
+
 	# PERL cannot be present at bootstrap, and is used to build the man pages.
 	# So... lets include some pre-generated ones, shall we?
-	GCC_MANPAGE_VERSION=${GCC_MANPAGE_VERSION:=${PV}}
-	GCC_SRC_URI="${GCC_SRC_URI}
-		${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GCC_MANPAGE_VERSION}-manpages.tar.bz2"
+	[[ -n ${MAN_VER} ]] && \
+		GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${MAN_VER}-manpages.tar.bz2)"
+
+	# various gentoo patches
+	[[ -n ${PATCH_VER} ]] && \
+		GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
 
-	# mmm... PIE =D
-	if [ -n "${PIE_CORE}" ] ; then
+	# strawberry pie, Cappuccino and a Gauloises (it's a good thing)
+	[[ -n ${PIE_VER} ]] && \
+		GCC_SRC_URI="${GCC_SRC_URI} !nopie? ( $(gentoo_urls ${PIE_CORE}) )"
+
+	# gcc bounds checking patch
+	if [[ -n ${HTB_VER} ]] ; then
+		local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
 		GCC_SRC_URI="${GCC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}${PIE_CORE}"
+			boundschecking? (
+				mirror://sourceforge/boundschecking/${HTBFILE}
+				http://web.inter.nl.net/hcc/Haj.Ten.Brugge/${HTBFILE}
+				$(gentoo_urls ${HTBFILE})
+			)"
 	fi
 
 	echo "${GCC_SRC_URI}"
 }
+S=$(gcc_get_s_dir)
+SRC_URI=$(get_gcc_src_uri)
+#---->> S + SRC_URI essentials >>----
+
+
+#---->> support checks <<----
+
+# The gentoo piessp patches allow for 3 configurations:
+# 1) PIE+SSP by default
+# 2) PIE by default
+# 3) SSP by default
+hardened_gcc_works() {
+	if [[ $1 == "pie" ]] ; then
+		want_pie || return 1
+		hardened_gcc_is_stable pie && return 0
+		if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
+			hardened_gcc_check_unsupported pie && return 1
+			ewarn "Allowing pie-by-default for an unstable arch ($(tc-arch))"
+			return 0
+		fi
+		return 1
+	elif [[ $1 == "ssp" ]] ; then
+		[[ -z ${PP_VER} ]] && return 1
+		hardened_gcc_is_stable ssp && return 0
+		if has ~$(tc-arch) ${ACCEPT_KEYWORDS} ; then
+			hardened_gcc_check_unsupported ssp && return 1
+			ewarn "Allowing ssp-by-default for an unstable arch ($(tc-arch))"
+			return 0
+		fi
+		return 1
+	else
+		# laziness ;)
+		hardened_gcc_works pie || return 1
+		hardened_gcc_works ssp || return 1
+		return 0
+	fi
+}
 
+hardened_gcc_is_stable() {
+	if [[ $1 == "pie" ]] ; then
+		# HARDENED_* variables are deprecated and here for compatibility
+		local tocheck="${HARDENED_PIE_WORKS} ${HARDENED_GCC_WORKS}"
+		if is_uclibc ; then
+			tocheck="${tocheck} ${PIE_UCLIBC_STABLE}"
+		else
+			tocheck="${tocheck} ${PIE_GLIBC_STABLE}"
+		fi
+	elif [[ $1 == "ssp" ]] ; then
+		# ditto
+		local tocheck="${HARDENED_SSP_WORKS} ${HARDENED_GCC_WORKS}"
+		if is_uclibc ; then
+			tocheck="${tocheck} ${SSP_UCLIBC_STABLE}"
+		else
+			tocheck="${tocheck} ${SSP_STABLE}"
+		fi
+	else
+		die "hardened_gcc_stable needs to be called with pie or ssp"
+	fi
 
-# This function sets the source directory depending on whether we're using
-# a prerelease, snapshot, or release tarball. To use it, just set S with:
-#
-#	S="$(gcc_get_s_dir)"
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-gcc_get_s_dir() {
-	if [ -n "${PRERELEASE}" ] ; then
-		GCC_S="${WORKDIR}/gcc-${PRERELEASE}"
-	elif [ -n "${SNAPSHOT}" ] ; then
-		GCC_S="${WORKDIR}/gcc-${SNAPSHOT//-}"
+	hasq $(tc-arch) ${tocheck} && return 0
+	return 1
+}
+
+hardened_gcc_check_unsupported() {
+	local tocheck=""
+	# if a variable is unset, we assume that all archs are unsupported. since
+	# this function is never called if hardened_gcc_is_stable returns true,
+	# this shouldn't cause problems... however, allowing this logic to work
+	# even with the variables unset will break older ebuilds that dont use them.
+	if [[ $1 == "pie" ]] ; then
+		if is_uclibc ; then
+			[[ -z ${PIE_UCLIBC_UNSUPPORTED} ]] && return 0
+			tocheck="${tocheck} ${PIE_UCLIBC_UNSUPPORTED}"
+		else
+			[[ -z ${PIE_GLIBC_UNSUPPORTED} ]] && return 0
+			tocheck="${tocheck} ${PIE_GLIBC_UNSUPPORTED}"
+		fi
+	elif [[ $1 == "ssp" ]] ; then
+		if is_uclibc ; then
+			[[ -z ${SSP_UCLIBC_UNSUPPORTED} ]] && return 0
+			tocheck="${tocheck} ${SSP_UCLIBC_UNSUPPORTED}"
+		else
+			[[ -z ${SSP_UNSUPPORTED} ]] && return 0
+			tocheck="${tocheck} ${SSP_UNSUPPORTED}"
+		fi
 	else
-		GCC_S="${WORKDIR}/${PN}-${MAIN_BRANCH}"
+		die "hardened_gcc_check_unsupported needs to be called with pie or ssp"
 	fi
 
-	echo "${GCC_S}"
+	hasq $(tc-arch) ${tocheck} && return 0
+	return 1
 }
 
+has_libssp() {
+	[[ -e /$(get_libdir)/libssp.so ]] && return 0
+	return 1
+}
 
-# gcc_quick_unpack will unpack the gcc tarball and patches in a way that is
-# consistant with the behavior of get_gcc_src_uri. The only patch it applies
-# itself is the branch update if present.
+want_libssp() {
+	[[ ${GCC_LIBSSP_SUPPORT} == "true" ]] || return 1
+	has_libssp || return 1
+	[[ -n ${PP_VER} ]] || return 1
+	return 0
+}
+
+_want_stuff() {
+	local var=$1 flag=$2
+	[[ -z ${!var} ]] && return 1
+	use ${flag} && return 0
+	return 1
+}
+want_boundschecking() { _want_stuff HTB_VER boundschecking ; }
+want_pie() { _want_stuff PIE_VER !nopie ; }
+want_ssp() { _want_stuff PP_VER !nossp ; }
+
+want_split_specs() {
+	[[ ${SPLIT_SPECS} == "true" ]] && want_pie
+}
+
+# This function checks whether or not glibc has the support required to build
+# Position Independant Executables with gcc.
+glibc_have_pie() {
+	if [[ ! -f ${ROOT}/usr/$(get_libdir)/Scrt1.o ]] ; then
+		echo
+		ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
+		ewarn "Please update your glibc to a proper version or disable hardened"
+		echo
+		return 1
+	fi
+}
+
+# This function determines whether or not libc has been patched with stack
+# smashing protection support.
+libc_has_ssp() {
+	local libc_prefix
+	[[ $(tc-arch) == "ppc64" ]] && [[ -z ${ABI} ]] && libc_prefix="lib64"
+	libc_prefix=${libc_prefix:-$(get_libdir)}
+	libc_prefix=${libc_prefix:-lib}
+
+	echo 'int main(){}' > "${T}"/libctest.c
+	gcc "${T}"/libctest.c -lc -o libctest
+	local libc_file=$(readelf -d libctest | grep 'NEEDED.*\[libc\.so[0-9\.]*\]' | awk '{print $NF}')
+	libc_file=${libc_file:1:${#libc_file}-2}
+
+	local my_libc=${ROOT}/${libc_prefix}/${libc_file}
+
+	# Check for the libc to have the __guard symbols
+	if  [[ -n $(readelf -s "${my_libc}" 2>/dev/null | \
+	            grep 'OBJECT.*GLOBAL.*__guard') ]] && \
+	    [[ -n $(readelf -s "${my_libc}" 2>/dev/null | \
+	            grep 'FUNC.*GLOBAL.*__stack_smash_handler') ]]
+	then
+		return 0
+	elif is_crosscompile ; then
+		die "'${my_libc}' was detected w/out ssp, that sucks (a lot)"
+	else
+		return 1
+	fi
+}
+
+# This is to make sure we don't accidentally try to enable support for a
+# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc.
 #
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
+# Travis Tilley <lv@gentoo.org> (26 Oct 2004)
 #
-gcc_quick_unpack() {
-	pushd ${WORKDIR}
+gcc-lang-supported() {
+	grep ^language=\"${1}\" ${S}/gcc/*/config-lang.in > /dev/null && return 0
+	return 1
+}
 
-	if [ -n "${PRERELEASE}" ] ; then
-		unpack gcc-${PRERELEASE}.tar.bz2
-	elif [ -n "${SNAPSHOT}" ] ; then
-		unpack gcc-${SNAPSHOT//-}.tar.bz2
+#----<< support checks >>----
+
+#---->> specs + env.d logic <<----
+
+# defaults to enable for all hardened toolchains
+gcc_common_hard="-DEFAULT_RELRO -DEFAULT_BIND_NOW"
+
+# configure to build with the hardened GCC specs as the default
+make_gcc_hard() {
+	if hardened_gcc_works ; then
+		einfo "Updating gcc to use automatic PIE + SSP building ..."
+		sed -e "s|^HARD_CFLAGS = |HARD_CFLAGS = -DEFAULT_PIE_SSP ${gcc_common_hard} |" \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+	elif hardened_gcc_works pie ; then
+		einfo "Updating gcc to use automatic PIE building ..."
+		ewarn "SSP has not been enabled by default"
+		sed -e "s|^HARD_CFLAGS = |HARD_CFLAGS = -DEFAULT_PIE ${gcc_common_hard} |" \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+	elif hardened_gcc_works ssp ; then
+		einfo "Updating gcc to use automatic SSP building ..."
+		ewarn "PIE has not been enabled by default"
+		sed -e "s|^HARD_CFLAGS = |HARD_CFLAGS = -DEFAULT_SSP ${gcc_common_hard} |" \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
 	else
-		unpack ${PN}-${MAIN_BRANCH}.tar.bz2
-		# We want branch updates to be against a release tarball
-		if [ -n "${BRANCH_UPDATE}" ] ; then
-			pushd ${S:="$(gcc_get_s_dir)"}
-			epatch ${DISTDIR}/${PN}-${MAIN_BRANCH}-branch-update-${BRANCH_UPDATE}.patch.bz2
-			popd
-		fi
+		# do nothing if hardened isnt supported, but dont die either
+		ewarn "hardened is not supported for this arch in this gcc version"
+		ebeep
+		return 0
 	fi
 
-	if [ -n "${PATCH_VER}" ]
-	then
-		unpack ${P}-patches-${PATCH_VER}.tar.bz2
-	fi
+	# rebrand to make bug reports easier
+	release_version="${release_version/Gentoo/Gentoo Hardened}"
+}
 
-	if [ -n "${PP_VER}" ]
-	then
-		unpack protector-${PP_FVER}.tar.gz
+create_vanilla_specs_file() {
+	pushd ${WORKDIR}/build/gcc > /dev/null
+	if use hardened ; then
+		# if using hardened, then we need to move xgcc out of the way
+		# and recompile it
+		cp Makefile Makefile.orig
+		sed -i -e 's/^HARD_CFLAGS.*/HARD_CFLAGS = /g' Makefile
+		mv xgcc xgcc.hard
+		mv gcc.o gcc.o.hard
+		make xgcc
+		einfo "Creating a vanilla gcc specs file"
+		./xgcc -dumpspecs > ${WORKDIR}/build/vanilla.specs
+		# restore everything to normal
+		mv gcc.o.hard gcc.o
+		mv xgcc.hard xgcc
+		mv Makefile.orig Makefile
+	else
+		einfo "Creating a vanilla gcc specs file"
+		./xgcc -dumpspecs > ${WORKDIR}/build/vanilla.specs
 	fi
+	popd > /dev/null
+}
 
-	if [ -n "${PIE_VER}" ]
-	then
-		unpack ${PIE_CORE}
+create_hardened_specs_file() {
+	pushd ${WORKDIR}/build/gcc > /dev/null
+	if ! use hardened ; then
+		# if not using hardened, then we need to move xgcc out of the way
+		# and recompile it
+		cp Makefile Makefile.orig
+		sed -i -e "s/^HARD_CFLAGS.*/HARD_CFLAGS = -DEFAULT_PIE_SSP ${gcc_common_hard}/g" Makefile
+		mv xgcc xgcc.vanilla
+		mv gcc.o gcc.o.vanilla
+		make xgcc
+		einfo "Creating a hardened gcc specs file"
+		./xgcc -dumpspecs > ${WORKDIR}/build/hardened.specs
+		# restore everything to normal
+		mv gcc.o.vanilla gcc.o
+		mv xgcc.vanilla xgcc
+		mv Makefile.orig Makefile
+	else
+		einfo "Creating a hardened gcc specs file"
+		./xgcc -dumpspecs > ${WORKDIR}/build/hardened.specs
 	fi
+	popd > /dev/null
+}
 
-	popd
+create_hardenednossp_specs_file() {
+	pushd ${WORKDIR}/build/gcc > /dev/null
+	cp Makefile Makefile.orig
+	sed -i -e "s/^HARD_CFLAGS.*/HARD_CFLAGS = -DEFAULT_PIE ${gcc_common_hard}/g" Makefile
+	mv xgcc xgcc.moo
+	mv gcc.o gcc.o.moo
+	make xgcc
+	einfo "Creating a hardened no-ssp gcc specs file"
+	./xgcc -dumpspecs > ${WORKDIR}/build/hardenednossp.specs
+	# restore everything to normal
+	mv gcc.o.moo gcc.o
+	mv xgcc.moo xgcc
+	mv Makefile.orig Makefile
+	popd > /dev/null
 }
 
+create_hardenednopie_specs_file() {
+	pushd ${WORKDIR}/build/gcc > /dev/null
+	cp Makefile Makefile.orig
+	sed -i -e "s/^HARD_CFLAGS.*/HARD_CFLAGS = -DEFAULT_SSP ${gcc_common_hard}/g" Makefile
+	mv xgcc xgcc.moo
+	mv gcc.o gcc.o.moo
+	make xgcc
+	einfo "Creating a hardened no-pie gcc specs file"
+	./xgcc -dumpspecs > ${WORKDIR}/build/hardenednopie.specs
+	# restore everything to normal
+	mv gcc.o.moo gcc.o
+	mv xgcc.moo xgcc
+	mv Makefile.orig Makefile
+	popd > /dev/null
+}
 
-# Exclude any unwanted patches, as specified by the following variables:
-#
-#	GENTOO_PATCH_EXCLUDE
-#			List of filenames, relative to ${WORKDIR}/patch/
-#
-#	PIEPATCH_EXCLUDE
-#			List of filenames, relative to ${WORKDIR}/piepatch/
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-exclude_gcc_patches() {
-	local i
-	for i in ${GENTOO_PATCH_EXCLUDE} ; do
-		if [ -f ${WORKDIR}/patch/${i} ] ; then
-			einfo "Excluding patch ${i}"
-			rm -f ${WORKDIR}/patch/${i} || die "failed to delete ${i}"
-		fi
-	done
-	for i in ${PIEPATCH_EXCLUDE} ; do
-		if [ -f ${WORKDIR}/piepatch/${i} ] ; then
-			einfo "Excluding piepatch ${i}"
-			rm -f ${WORKDIR}/piepatch/${i} || die "failed to delete ${i}"
-		fi
-	done
+create_hardenednopiessp_specs_file() {
+	pushd ${WORKDIR}/build/gcc > /dev/null
+	cp Makefile Makefile.orig
+	sed -i -e "s/^HARD_CFLAGS.*/HARD_CFLAGS = ${gcc_common_hard}/g" Makefile
+	mv xgcc xgcc.moo
+	mv gcc.o gcc.o.moo
+	make xgcc
+	einfo "Creating a hardened no-pie no-ssp gcc specs file"
+	./xgcc -dumpspecs > ${WORKDIR}/build/hardenednopiessp.specs
+	# restore everything to normal
+	mv gcc.o.moo gcc.o
+	mv xgcc.moo xgcc
+	mv Makefile.orig Makefile
+	popd > /dev/null
 }
 
+split_out_specs_files() {
+	if hardened_gcc_works ; then
+		create_hardened_specs_file
+		create_vanilla_specs_file
+		create_hardenednossp_specs_file
+		create_hardenednopie_specs_file
+	elif hardened_gcc_works pie ; then
+		create_vanilla_specs_file
+		create_hardenednossp_specs_file
+	elif hardened_gcc_works ssp ; then
+		create_vanilla_specs_file
+		create_hardenednopie_specs_file
+	fi
+	create_hardenednopiessp_specs_file
+}
 
-# patch in ProPolice Stack Smashing protection
-do_gcc_SSP_patches() {
-	epatch ${WORKDIR}/protector.dif
-	epatch ${FILESDIR}/pro-police-docs.patch
+create_gcc_env_entry() {
+	dodir /etc/env.d/gcc
+	local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
+
+	if [[ -z $1 ]] ; then
+		gcc_envd_file="${D}${gcc_envd_base}"
+		# I'm leaving the following commented out to remind me that it
+		# was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
+		# on chroot or in non-toolchain.eclass gcc ebuilds!
+		#gcc_specs_file="${LIBPATH}/specs"
+		gcc_specs_file=""
+	else
+		gcc_envd_file="${D}${gcc_envd_base}-$1"
+		gcc_specs_file="${LIBPATH}/$1.specs"
+	fi
 
-	cp ${WORKDIR}/gcc/protector.c ${S}/gcc/ || die "protector.c not found"
-	cp ${WORKDIR}/gcc/protector.h ${S}/gcc/ || die "protector.h not found"
-	cp -R ${WORKDIR}/gcc/testsuite/* ${S}/gcc/testsuite/ || die "testsuite not found"
-	# we apply only the needed parts of protectonly.dif
-	sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector-all |' \
-		-i gcc/Makefile.in || die "Failed to update crtstuff!"
+	echo "PATH=\"${BINPATH}\"" > ${gcc_envd_file}
+	echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file}
 
-	# if gcc in a stage3 defaults to ssp, is version 3.4.0 and a stage1 is built
-	# the build fails building timevar.o w/:
-	# cc1: stack smashing attack in function ix86_split_to_parts()
-	if gcc -dumpspecs | grep -q "fno-stack-protector:"
-	then
-		use build && epatch ${FILESDIR}/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch
+	if use multilib && ! has_multilib_profile; then
+		LDPATH="${LIBPATH}"
+		for path in 32 64 o32 ; do
+			[[ -d ${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
+		done
+	else
+		local MULTIDIR
+		LDPATH="${LIBPATH}"
+
+		# We want to list the default ABI's LIBPATH first so libtool
+		# searches that directory first.  This is a temporary
+		# workaround for libtool being stupid and using .la's from
+		# conflicting ABIs by using the first one in the search path
+
+		# XXX: This breaks when cross-compiling a native compiler (CBUILD != CHOST)
+
+		local abi=${DEFAULT_ABI}
+		local MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+		if [[ ${MULTIDIR} == "." ]] ; then
+			LDPATH=${LIBPATH}
+		else
+			LDPATH=${LIBPATH}/${MULTIDIR}
+		fi
+
+		for abi in $(get_all_abis) ; do
+			[[ ${abi} == ${DEFAULT_ABI} ]] && continue
+
+			MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+			if [[ ${MULTIDIR} == "." ]] ; then
+				LDPATH=${LDPATH}:${LIBPATH}
+			else
+				LDPATH=${LDPATH}:${LIBPATH}/${MULTIDIR}
+			fi
+		done
 	fi
 
-	release_version="${release_version}, ssp-${PP_FVER}"
-	update_gcc_for_libc_ssp
+	echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file}
+
+	local mbits
+	CC=${XGCC} has_m32 && mbits="${mbits:+${mbits} }32"
+	CC=${XGCC} has_m64 && mbits="${mbits:+${mbits} }64"
+	echo "GCCBITS=\"${mbits}\"" >> ${gcc_envd_file}
+
+	echo "MANPATH=\"${DATAPATH}/man\"" >> ${gcc_envd_file}
+	echo "INFOPATH=\"${DATAPATH}/info\"" >> ${gcc_envd_file}
+	echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${gcc_envd_file}
+
+	is_crosscompile && echo "CTARGET=${CTARGET}" >> ${gcc_envd_file}
+
+	# Set which specs file to use
+	[[ -n ${gcc_specs_file} ]] && echo "GCC_SPECS=\"${gcc_specs_file}\"" >> ${gcc_envd_file}
 }
 
+add_profile_eselect_conf() {
+	local compiler_config_file=$1
+	local abi=$2
+	local specs=$3
+	local gcc_specs_file
+	local var
+
+	if [[ -z ${specs} ]] ; then
+		# I'm leaving the following commented out to remind me that it
+		# was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
+		# on chroot or in non-toolchain.eclass gcc ebuilds!
+		#gcc_specs_file="${LIBPATH}/specs"
+		gcc_specs_file=""
+
+		if use hardened ; then
+			specs="hardened"
+		else
+			specs="vanilla"
+		fi
+	else
+		gcc_specs_file="${LIBPATH}/${specs}.specs"
+	fi
 
-# If glibc or uclibc has been patched to provide the necessary symbols itself,
-# then lets use those for SSP instead of libgcc.
-update_gcc_for_libc_ssp() {
-	if libc_has_ssp ; then
-		einfo "Updating gcc to use SSP from glibc..."
-		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
-			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+	echo >> ${compiler_config_file}
+	if ! is_multilib ; then
+		echo "[${specs}]" >> ${compiler_config_file}
+		echo "	ctarget=${CTARGET}" >> ${compiler_config_file}
+	else
+		echo "[${abi}-${specs}]" >> ${compiler_config_file}
+		var="CTARGET_${abi}"
+		if [[ -n ${!var} ]] ; then
+			echo "	ctarget=${!var}" >> ${compiler_config_file}
+		else
+			var="CHOST_${abi}"
+			if [[ -n ${!var} ]] ; then
+				echo "	ctarget=${!var}" >> ${compiler_config_file}
+			else
+				echo "	ctarget=${CTARGET}" >> ${compiler_config_file}
+			fi
+		fi
+	fi
+
+	local MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory)
+	local LDPATH=${LIBPATH}
+	if [[ ${MULTIDIR} != "." ]] ; then
+		LDPATH="${LIBPATH}/${MULTIDIR}"
+	fi
+
+	echo "	ldpath=${LDPATH}" >> ${compiler_config_file}
+
+	if [[ -n ${gcc_specs_file} ]] ; then
+		echo "	specs=${gcc_specs_file}" >> ${compiler_config_file}
+	fi
+
+	var="CFLAGS_${abi}"
+	if [[ -n ${!var} ]] ; then
+		echo "	cflags=${!var}" >> ${compiler_config_file}
 	fi
 }
 
+create_eselect_conf() {
+	local config_dir="/etc/eselect/compiler"
+	local compiler_config_file="${D}/${config_dir}/${CTARGET}-${GCC_CONFIG_VER}.conf"
+	local abi
+
+	dodir ${config_dir}
+
+	echo "[global]" > ${compiler_config_file}
+	echo "	version=${CTARGET}-${GCC_CONFIG_VER}" >> ${compiler_config_file}
+	echo "	binpath=${BINPATH}" >> ${compiler_config_file}
+	echo "	manpath=${DATAPATH}/man" >> ${compiler_config_file}
+	echo "	infopath=${DATAPATH}/info" >> ${compiler_config_file}
+	echo "	alias_cc=gcc" >> ${compiler_config_file}
+	echo "	stdcxx_incdir=${STDCXX_INCDIR##*/}" >> ${compiler_config_file}
+	echo "	bin_prefix=${CTARGET}" >> ${compiler_config_file}
+
+	if [[ -x "${D}/${BINPATH}/${CTARGET}-g77" ]] ; then
+		echo "	alias_gfortran=g77" >> ${compiler_config_file}
+	elif [[ -x "${D}/${BINPATH}/${CTARGET}-gfortran" ]] ; then
+		echo "	alias_g77=gfortran" >> ${compiler_config_file}
+	fi
 
-# do various updates to PIE logic
-do_gcc_PIE_patches() {
-	# corrects startfile/endfile selection and shared/static/pie flag usage
-	epatch ${WORKDIR}/piepatch/upstream
-	# adds non-default pie support (rs6000)
-	epatch ${WORKDIR}/piepatch/nondef
-	# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
-	epatch ${WORKDIR}/piepatch/def
-	# disable relro/now
-	use uclibc && epatch ${FILESDIR}/3.3.3/gcc-3.3.3-norelro.patch
+	for abi in $(get_all_abis) ; do
+		add_profile_eselect_conf "${compiler_config_file}" "${abi}"
 
-	release_version="${release_version}, pie-${PIE_VER}"
+		if want_split_specs ; then
+			if use hardened ; then
+				add_profile_eselect_conf "${compiler_config_file}" "${abi}" vanilla
+			elif hardened_gcc_works ; then
+				add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardened
+			fi
+
+			if hardened_gcc_works || hardened_gcc_works pie ; then
+				add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardenednossp
+			fi
+
+			if hardened_gcc_works || hardened_gcc_works ssp ; then
+				add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardenednopie
+			fi
+
+			add_profile_eselect_conf "${compiler_config_file}" "${abi}" hardenednopiessp
+		fi
+	done
 }
 
+#----<< specs + env.d logic >>----
 
-# configure to build hardened GCC
-make_gcc_hard() {
-	einfo "Updating gcc to use automatic PIE + SSP building ..."
-	sed -e 's|^ALL_CFLAGS = |ALL_CFLAGS = -DEFAULT_PIE_SSP |' \
-		-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+#---->> pkg_* <<----
+gcc_pkg_setup() {
+	if [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && ( ${LD_PRELOAD} == "/lib/libsandbox.so" || ${LD_PRELOAD} == "/usr/lib/libsandbox.so" ) ]] && is_multilib ; then
+		eerror "Sandbox in your installed portage does not support compilation."
+		eerror "of a multilib gcc.  Please set FEATURES=-sandbox and try again."
+		eerror "After you have a multilib gcc, re-emerge portage to have a working sandbox."
+		die "No 32bit sandbox.  Retry with FEATURES=-sandbox."
+	fi
 
-	# rebrand to make bug reports easier
-	release_version="${release_version/Gentoo/Gentoo Hardened}"
+	if [[ ${ETYPE} == "gcc-compiler" ]] ; then
+		case $(tc-arch) in
+		mips)
+			# Must compile for mips64-linux target if we want n32/n64 support
+			case "${CTARGET}" in
+				mips64*) ;;
+				*)
+					if use n32 || use n64; then
+						eerror "n32/n64 can only be used when target host is mips64*-*-linux-*";
+						die "Invalid USE flags for CTARGET ($CTARGET)";
+					fi
+				;;
+			esac
+
+			#cannot have both n32 & n64 without multilib
+			if use n32 && use n64 && ! is_multilib; then
+				eerror "Please enable multilib if you want to use both n32 & n64";
+				die "Invalid USE flag combination";
+			fi
+		;;
+		esac
+
+		# Setup variables which would normally be in the profile
+		if is_crosscompile ; then
+			multilib_env ${CTARGET}
+			if ! use multilib ; then
+				MULTILIB_ABIS=${DEFAULT_ABI}
+			fi
+		fi
+
+		# we dont want to use the installed compiler's specs to build gcc!
+		unset GCC_SPECS
+	fi
+
+	want_libssp && libc_has_ssp && \
+		die "libssp cannot be used with a glibc that has been patched to provide ssp symbols"
 }
 
+gcc-compiler_pkg_preinst() {
+	:
+}
 
-# This function allows us to gentoo-ize gcc's version number and bugzilla
-# URL without needing to use patches.
-#
-# Travis Tilley <lv@gentoo.org> (02 Sep 2004)
-#
-gcc_version_patch() {
-	[ -z "$1" ] && die "no arguments to gcc_version_patch"
+gcc-compiler_pkg_postinst() {
+	export LD_LIBRARY_PATH=${LIBPATH}:${LD_LIBRARY_PATH}
+	do_gcc_config
+
+	echo
+	einfo "If you have issues with packages unable to locate libstdc++.la,"
+	einfo "then try running 'fix_libtool_files.sh' on the old gcc versions."
+	echo
 
-	sed -i -e 's~\(const char version_string\[\] = "\S\+\s\+\)[^"]\+\(".*\)~\1@GENTOO@\2~' ${S}/gcc/version.c || die "failed to add @GENTOO@"
-	sed -i -e "s:@GENTOO@:$1:g" ${S}/gcc/version.c || die "failed to patch version"
-	sed -i -e 's~http:\/\/gcc\.gnu\.org\/bugs\.html~http:\/\/bugs\.gentoo\.org\/~' ${S}/gcc/version.c || die "failed to update bugzilla URL"
+	# If our gcc-config version doesn't like '-' in it's version string,
+	# tell our users that gcc-config will yell at them, but it's all good.
+	if ! has_version '>=sys-devel/gcc-config-1.3.10-r1' && [[ ${GCC_CONFIG_VER/-/} != ${GCC_CONFIG_VER} ]] ; then
+		ewarn "Your version of gcc-config will issue about having an invalid profile"
+		ewarn "when switching to this profile.  It is safe to ignore this warning,"
+		ewarn "and this problem has been corrected in >=sys-devel/gcc-config-1.3.10-r1."
+	fi
+
+	if ! is_crosscompile && ! use multislot && [[ ${GCCMAJOR}.${GCCMINOR} == 3.4 ]] ; then
+		echo
+		einfo "You should make sure to rebuild all your C++ packages when"
+		einfo "upgrading between different versions of gcc.  For example,"
+		einfo "when moving to gcc-3.4 from gcc-3.3, emerge gentoolkit and run:"
+		einfo "  # revdep-rebuild --library libstdc++.so.5"
+		echo
+	fi
 }
 
+gcc-compiler_pkg_prerm() {
+	# TODO: flesh this out when I care
+	return 0
+}
 
-# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs
-# to live in lib instead of lib64 where they belong, with 32bit libraries
-# in lib32. This hack has been around since the beginning of the amd64 port,
-# and we're only now starting to fix everything that's broken. Eventually
-# this should go away.
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-disgusting_gcc_multilib_HACK() {
-	sed -i -e 's~^MULTILIB_OSDIRNAMES.*~MULTILIB_OSDIRNAMES = ../lib64 ../lib32~' ${S}/gcc/config/i386/t-linux64
+gcc-compiler_pkg_postrm() {
+	# to make our lives easier (and saner), we do the fix_libtool stuff here.
+	# rather than checking SLOT's and trying in upgrade paths, we just see if
+	# the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
+	# unmerging.  if it does, that means this was a simple re-emerge.
+
+	# clean up the cruft left behind by cross-compilers
+	if is_crosscompile ; then
+		if [[ -z $(ls "${ROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
+			rm -f "${ROOT}"/etc/env.d/gcc/config-${CTARGET}
+			rm -f "${ROOT}"/etc/env.d/??gcc-${CTARGET}
+			rm -f "${ROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
+		fi
+		return 0
+	fi
+
+	# ROOT isnt handled by the script
+	[[ ${ROOT} != "/" ]] && return 0
+
+	if [[ ! -e ${LIBPATH}/libstdc++.la ]] ; then
+		/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}
+		[[ -z ${BRANCH_UPDATE} ]] || /sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}
+	fi
+
+	return 0
 }
 
+#---->> pkg_* <<----
+
+#---->> src_* <<----
 
 # generic GCC src_unpack, to be called from the ebuild's src_unpack.
 # BIG NOTE regarding hardened support: ebuilds with support for hardened are
-# expected to provide a function called hardened_gcc_works. An example:
-#
-# hardened_gcc_works() {
-# 	use x86 && true || false
-# }
+# expected to export the following variable:
 #
-# This allows for additional archs to be supported by hardened when ready.
+#	HARDENED_GCC_WORKS
+#			This variable should be set to the archs on which hardened should
+#			be allowed. For example: HARDENED_GCC_WORKS="x86 sparc amd64"
+#			This allows for additional archs to be supported by hardened when
+#			ready.
 #
 # Travis Tilley <lv@gentoo.org> (03 Sep 2004)
 #
-gcc_src_unpack() {
-	local release_version="Gentoo Linux ${PVR}"
-
+gcc-compiler_src_unpack() {
 	# fail if using pie patches, building hardened, and glibc doesnt have
 	# the necessary support
-	[ -n "${PIE_VER}" ] && use hardened && glibc_have_pie
+	want_pie && use hardened && glibc_have_pie
+
+	if use hardened ; then
+		einfo "updating configuration to build hardened GCC"
+		make_gcc_hard || die "failed to make gcc hard"
+	fi
+}
+gcc-library_src_unpack() {
+	:
+}
+guess_patch_type_in_dir() {
+	[[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
+		&& EPATCH_SUFFIX="patch.bz2" \
+		|| EPATCH_SUFFIX="patch"
+}
+gcc_src_unpack() {
+	local release_version="Gentoo ${PVR}"
+
+	[[ -z ${UCLIBC_VER} ]] && is_uclibc && die "Sorry, this version does not support uClibc"
 
 	gcc_quick_unpack
 	exclude_gcc_patches
 
-	cd ${S:="$(gcc_get_s_dir)"}
+	cd ${S:=$(gcc_get_s_dir)}
 
-	if [ -n "${PATCH_VER}" ] ; then
-		epatch ${WORKDIR}/patch
-	fi
-	if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" -a -n "${PP_VER}" ] ; then
+	if ! use vanilla ; then
+		if [[ -n ${PATCH_VER} ]] ; then
+			guess_patch_type_in_dir "${WORKDIR}"/patch
+			EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
+			epatch "${WORKDIR}"/patch
+		fi
+		if [[ -n ${UCLIBC_VER} ]] ; then
+			guess_patch_type_in_dir "${WORKDIR}"/uclibc
+			EPATCH_MULTI_MSG="Applying uClibc patches ..." \
+			epatch "${WORKDIR}"/uclibc
+		fi
+		do_gcc_HTB_boundschecking_patches
 		do_gcc_SSP_patches
-	fi
-	if [ -n "${PIE_VER}" ] ; then
 		do_gcc_PIE_patches
 	fi
-	if use hardened && hardened_gcc_works ; then
-		einfo "updating configuration to build hardened GCC"
-		make_gcc_hard || die "failed to make gcc hard"
-	fi
-	if use multilib && use amd64 && [ -z "${SKIP_MULTILIB_HACK}" ] ; then
+
+	${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
+
+	fix_files=""
+	for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
+		[[ -e ${x} ]] && fix_files="${fix_files} ${x}"
+	done
+	ht_fix_file ${fix_files} */configure *.sh
+
+	if ! is_crosscompile && is_multilib && \
+	   [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
 		disgusting_gcc_multilib_HACK || die "multilib hack failed"
 	fi
-	einfo "patching gcc version: ${BRANCH_UPDATE} (${release_version})"
-	gcc_version_patch "${BRANCH_UPDATE} (${release_version})"
 
-	# Misdesign in libstdc++ (Redhat)
-	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+	local version_string="${GCC_CONFIG_VER}"
 
-	# disable --as-needed from being compiled into gcc specs
-	# natively when using >=sys-devel/binutils-2.15.90.0.1 this is
-	# done to keep our gcc backwards compatible with binutils. 
-	# gcc 3.4.1 cvs has patches that need back porting.. 
-	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
-	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
+	# Backwards support... add the BRANCH_UPDATE for 3.3.5-r1 and 3.4.3-r1
+	# which set it directly rather than using ${PV}
+	if [[ ${PVR} == "3.3.5-r1" || ${PVR} = "3.4.3-r1" ]] ; then
+		 version_string="${version_string} ${BRANCH_UPDATE}"
+	fi
 
-	use uclibc && gnuconfig_update
+	version_string="${version_string} (${release_version})"
+	einfo "patching gcc version: ${version_string}"
+	gcc_version_patch "${version_string}"
 
-	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
-}
+	# Misdesign in libstdc++ (Redhat)
+	if [[ ${GCCMAJOR} -ge 3 ]] && [[ -e ${S}/libstdc++-v3/config/cpu/i486/atomicity.h ]] ; then
+		cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
+	fi
 
+	# disable --as-needed from being compiled into gcc specs
+	# natively when using a gcc version < 3.4.4
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992
+	if [[ ${GCCMAJOR} < 3 ]] || \
+	   [[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] || \
+	   [[ ${GCCMAJOR}.${GCCMINOR}.${GCCMICRO} < 3.4.4 ]]
+	then
+		sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in
+	fi
 
-# This function sets up a few essential variables. You can override any of
-# the variables defined here before (or after) calling the function. This needs
-# to be done for gcc 3.3.x ebuilds, since the default LIBPATH is a sane default
-# only for gcc 3.4 and later. An example of this would be the libstdc++-v3
-# ebuilds, which are currently based on 3.3 only. You may optionally specify
-# that non-versioned directories be used by calling the function with:
-#
-#	gcc_setup_variables non-versioned
-#
-# though using non-versioned directories for anything other than possibly a
-# few library targets is STRONGLY discouraged. This function sets the following
-# variables:
-#
-#	LOC
-#			If for some reason you want to set your prefix to a location other
-#			than /usr, this is the variable you want to change.
-#
-#	LIBPATH
-#			This variable (hopefully) sets the root for all installed libraries.
-#
-#	DATAPATH
-#			This variable sets the root for misc installed data. This includes
-#			info pages, man pages, and gcc message translations.
-#
-#	STDCXX_INCDIR
-#			Location to install any c++ headers to.
-#
-# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
-#
-gcc_setup_variables() {
-	MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
-	MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+	# Fixup libtool to correctly generate .la files with portage
+	cd "${S}"
+	elibtoolize --portage --shallow --no-uclibc
 
-	MAIN_BRANCH="${PV}"  # Tarball, etc used ...
-	# Pre-release support. Needed for unpacking source with _pre ebuilds.
-	if [ ${PV} != ${PV/_pre/-} ] ; then
-		PRERELEASE=${PV/_pre/-}
-	fi
+	gnuconfig_update
 
-	# Theoretical cross compiler support
-	[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
+	# update configure files
+	einfo "Fixing misc issues in configure files"
+	for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
+		ebegin "  Updating ${f/${S}\/}"
+		patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
+			|| eerror "Please file a bug about this"
+		eend $?
+	done
 
-	LOC="${LOC:="/usr"}"
+	./contrib/gcc_update --touch &> /dev/null
 
-	if [ -z "$1" ] ; then
-	  # until all of the necessary tools are lib32/lib64 aware, this HAS to
-	  # return lib!!!
-	  get_libdir_override lib
-	  # GCC 3.4 no longer uses gcc-lib.
-	  LIBPATH="${LIBPATH:="${LOC}/$(get_libdir)/gcc/${CCHOST}/${MY_PV_FULL}"}"
-	  BINPATH="${BINPATH:="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"}"
-	  DATAPATH="${DATAPATH:="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"}"
-	  # Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-	  # We will handle /usr/include/g++-v3/ with gcc-config ...
-	  STDCXX_INCDIR="${STDCXX_INCDIR:="${LIBPATH}/include/g++-v${MY_PV/\.*/}"}"
-	elif [ "$1" == "non-versioned" ] ; then
-	  # using non-versioned directories to install gcc, like what is currently
-	  # done for ppc64 and 3.3.3_pre, is a BAD IDEA. DO NOT do it!! However...
-	  # setting up variables for non-versioned directories might be useful for
-	  # specific gcc targets, like ffcall. Note that we dont override the value
-	  # returned by get_libdir here.
-	  LIBPATH="${LIBPATH:="${LOC}/$(get_libdir)"}"
-	  BINPATH="${BINPATH:="${LOC}/bin/"}"
-	  DATAPATH="${DATAPATH:="${LOC}/share/"}"
-	  STDCXX_INCDIR="${STDCXX_INCDIR:="${LOC}/include/g++-v3/"}"
-	fi
+	disable_multilib_libjava || die "failed to disable multilib java"
 }
 
+gcc-library-configure() {
+	# multilib support
+	[[ ${GCC_TARGET_NO_MULTILIB} == "true" ]] \
+		&& confgcc="${confgcc} --disable-multilib" \
+		|| confgcc="${confgcc} --enable-multilib"
+}
 
-# This function checks whether or not glibc has the support required to build
-# Position Independant Executables with gcc.
-glibc_have_pie() {
-	if [ ! -f ${ROOT}/usr/$(get_libdir)/Scrt1.o ] ; then
-		echo
-		ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
-		ewarn "Please update your glibc to a proper version or disable hardened"
-		echo
-		return 1
+gcc-compiler-configure() {
+	# multilib support
+	if is_multilib || [[ ${CTARGET} == "avr" ]] ; then
+		confgcc="${confgcc} --enable-multilib"
+	else
+		confgcc="${confgcc} --disable-multilib"
 	fi
-}
 
+	confgcc="${confgcc} $(use_enable mudflap libmudflap)"
 
-# This function determines whether or not libc has been patched with stack
-# smashing protection support.
-libc_has_ssp() {
-	local libc_prefix
-	use ppc64 && libc_prefix="/lib64/"
-	libc_prefix="${libc_prefix:="/$(get_libdir)/"}"
+	# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
+	# right now). Much thanks to <csm@gnu.org> for the heads up.
+	# Travis Tilley <lv@gentoo.org>  (11 Jul 2004)
+	if ! is_gcj ; then
+		confgcc="${confgcc} --disable-libgcj"
+	elif use gtk ; then
+		confgcc="${confgcc} --enable-java-awt=gtk"
+	fi
+
+	case $(tc-arch) in
+		# Add --with-abi flags to enable respective MIPS ABIs
+		mips)
+		if is_multilib; then
+			confgcc="${confgcc} --with-abi=32 --with-abi=64 --with-abi=n32"
+		elif ! is_crosscompile ; then
+			is_multilib && confgcc="${confgcc} --with-abi=32"
+			use n64 && confgcc="${confgcc} --with-abi=64"
+			use n32 && confgcc="${confgcc} --with-abi=n32"
+		fi
+		;;
+		# Enable sjlj exceptions for backward compatibility on hppa
+		hppa)
+			[[ ${PV:0:1} == "3" ]] && \
+			confgcc="${confgcc} --enable-sjlj-exceptions"
+		;;
+	esac
+
+	GCC_LANG="c"
+	is_cxx && GCC_LANG="${GCC_LANG},c++"
+	is_gcj && GCC_LANG="${GCC_LANG},java"
+	if is_objc ; then
+		GCC_LANG="${GCC_LANG},objc"
+		use objc-gc && confgcc="${confgcc} --enable-objc-gc"
+	fi
 
-	use uclibc \
-		&& local libc_file="libc.so.0" \
-		|| local libc_file="libc.so.6"
+	# fortran support just got sillier! the lang value can be f77 for
+	# fortran77, f95 for fortran95, or just plain old fortran for the
+	# currently supported standard depending on gcc version.
+	is_fortran && GCC_LANG="${GCC_LANG},fortran"
+	is_f77 && GCC_LANG="${GCC_LANG},f77"
+	is_f95 && GCC_LANG="${GCC_LANG},f95"
 
-	local my_libc=${ROOT}/${libc_prefix}/${libc_file}
+	# We do NOT want 'ADA support' in here!
+	# is_ada && GCC_LANG="${GCC_LANG},ada"
 
-	# Check for the glibc to have the __guard symbols
-	if  [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep OBJECT | grep '__guard')" ] && \
-	    [ "$(readelf -s "${my_libc}" 2>/dev/null | \
-	         grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-	then
-		return 0
-	else
-		return 1
-	fi
+	einfo "configuring for GCC_LANG: ${GCC_LANG}"
 }
 
-
-# This function configures gcc. It requires at least one argument, specifying
-# whether or not to use versioned directories. Example:
-#
-#	gcc_do_configure versioned|non-versioned ${other_conf_options}
-#
 # Other than the variables described for gcc_setup_variables, the following
 # will alter tha behavior of gcc_do_configure:
 #
-#	CCHOST
+#	CTARGET
 #	CBUILD
 #			Enable building for a target that differs from CHOST
 #
@@ -506,127 +1117,123 @@ libc_has_ssp() {
 gcc_do_configure() {
 	local confgcc
 
-	[ "$1" != "versioned" -a "$1" != "non-versioned" ] && \
-		die "gcc_do_configure called without specifying versioned/non-versioned"
-	[ "$1" == "versioned" ] && confgcc="--enable-version-specific-runtime-libs"
-	shift
-
-	# If we've forgotten to set the path variables, this will give us
-	# reasonable defaults.
-	gcc_setup_variables
-
 	# Set configuration based on path variables
 	confgcc="${confgcc} \
-		--prefix=${LOC} \
+		--prefix=${PREFIX} \
 		--bindir=${BINPATH} \
-		--includedir=${LIBPATH}/include \
+		--includedir=${INCLUDEPATH} \
 		--datadir=${DATAPATH} \
 		--mandir=${DATAPATH}/man \
 		--infodir=${DATAPATH}/info \
-		--with-gxx-include-dir=${STDCXX_INCDIR} \
-		--with-local-prefix=${LOC}/local"
-
-	# Where to install libgcc_s (no worky for versioned?)
-	#SLIBDIR="${SLIBDIR:="${LIBPATH}"}"
-	#confgcc="${confgcc} --with-slibdir=${SLIBDIR}"
+		--with-gxx-include-dir=${STDCXX_INCDIR}"
 
-	# Incredibly theoretical cross-compiler support
+	# All our cross-compile logic goes here !  woo !
 	confgcc="${confgcc} --host=${CHOST}"
-	if [ "${CCHOST}" != "${CHOST}" -a "${CCHOST}" != "" ] ; then
+	if is_crosscompile || tc-is-cross-compiler ; then
 		# Straight from the GCC install doc:
-		# "GCC has code to correctly determine the correct value for target 
+		# "GCC has code to correctly determine the correct value for target
 		# for nearly all native systems. Therefore, we highly recommend you
 		# not provide a configure target when configuring a native compiler."
-		confgcc="${confgcc} --target=${CCHOST}"
-	fi
-	if [ "${CBUILD}" != "" ] ; then
-		confgcc="${confgcc} --build=${CBUILD}"
+		confgcc="${confgcc} --target=${CTARGET}"
 	fi
+	[[ -n ${CBUILD} ]] && confgcc="${confgcc} --build=${CBUILD}"
 
-	# multilib support
-	if use multilib && [ -z "${GCC_TARGET_NO_MULTILIB}" ] ; then
-		confgcc="${confgcc} --enable-multilib"
-	else
-		confgcc="${confgcc} --disable-multilib"
-	fi
+	# ppc altivec support
+	confgcc="${confgcc} $(use_enable altivec)"
 
-	# altivec support
-	if use ppc || use ppc64 ; then
-		use altivec && confgcc="${confgcc} --enable-altivec"
-		use !altivec && confgcc="${confgcc} --disable-altivec"
-	fi
+	[[ ${CTARGET} == *-softfloat-* ]] && confgcc="${confgcc} --with-float=soft"
 
 	# Native Language Support
-	if use nls && use !build ; then
+	if use nls && ! use build ; then
 		confgcc="${confgcc} --enable-nls --without-included-gettext"
 	else
 		confgcc="${confgcc} --disable-nls"
 	fi
 
-	# __cxa_atexit is "essential for fully standards-compliant handling of
-	# destructors", but apparently requires glibc.
-	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
-	# for statically linked apps but not dynamic
-	# so use setjmp/longjmp exceptions by default
-	# uclibc uses --enable-clocale=uclibc (autodetected)
-	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
-	if use !uclibc ; then
-		confgcc="${confgcc} --enable-__cxa_atexit"
-	else
-		confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace \
-			--enable-sjlj-exceptions"
-	fi
-
 	# reasonably sane globals (hopefully)
+	# --disable-libunwind-exceptions needed till unwind sections get fixed. see ps.m for details
 	confgcc="${confgcc} \
-		--enable-shared \
 		--with-system-zlib \
 		--disable-checking \
 		--disable-werror \
-		--disable-libunwind-exceptions \
-		--with-gnu-ld \
-		--enable-threads=posix"
+		--disable-libunwind-exceptions"
 
-	# what languages should we enable?
-	if [ -z "${GCC_LANG}" ] ; then
-		# if not specified, assume we are building for a target that only
-		# requires C support
-		GCC_LANG="c"
-	fi
+	# etype specific configuration
+	einfo "running ${ETYPE}-configure"
+	${ETYPE}-configure || die
+
+	# if not specified, assume we are building for a target that only
+	# requires C support
+	GCC_LANG=${GCC_LANG:-c}
 	confgcc="${confgcc} --enable-languages=${GCC_LANG}"
-	use build || use !gcj && confgcc="${confgcc} --disable-libgcj"
 
-	# default arch support
-	use sparc && confgcc="${confgcc} --with-cpu=v7"
-	use ppc && confgcc="${confgcc} --with-cpu=default32"
+	if is_crosscompile ; then
+		# When building a stage1 cross-compiler (just C compiler), we have to
+		# disable a bunch of features or gcc goes boom
+		local needed_libc=""
+		case ${CTARGET} in
+			*-dietlibc) needed_libc=dietlibc;;
+			*-freebsd*) needed_libc=freebsd-lib;;
+			*-gnu)      needed_libc=glibc;;
+			*-klibc)    needed_libc=klibc;;
+			*-uclibc)   needed_libc=uclibc;;
+			avr)        confgcc="${confgcc} --enable-shared --disable-threads";;
+		esac
+		if [[ -n ${needed_libc} ]] ; then
+			if ! has_version ${CATEGORY}/${needed_libc} ; then
+				confgcc="${confgcc} --disable-shared --disable-threads --without-headers"
+			elif built_with_use ${CATEGORY}/${needed_libc} _E_CROSS_HEADERS_ONLY ; then
+				confgcc="${confgcc} --disable-shared --with-sysroot=${PREFIX}/${CTARGET}"
+			else
+				confgcc="${confgcc} --with-sysroot=${PREFIX}/${CTARGET}"
+			fi
+		fi
+	else
+		confgcc="${confgcc} --enable-shared --enable-threads=posix"
+	fi
+	# __cxa_atexit is "essential for fully standards-compliant handling of
+	# destructors", but apparently requires glibc.
+	# --enable-sjlj-exceptions : currently the unwind stuff seems to work
+	# for statically linked apps but not dynamic
+	# so use setjmp/longjmp exceptions by default
+	if is_uclibc ; then
+		confgcc="${confgcc} --disable-__cxa_atexit --enable-target-optspace"
+		[[ ${GCCMAJOR}.${GCCMINOR} == 3.3 ]] && \
+			confgcc="${confgcc} --enable-sjlj-exceptions"
+	else
+		confgcc="${confgcc} --enable-__cxa_atexit"
+	fi
+	[[ ${CTARGET} == *-gnu* ]] && confgcc="${confgcc} --enable-clocale=gnu"
+	[[ ${CTARGET} == *-uclibc* ]] && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]] \
+		&& confgcc="${confgcc} --enable-clocale=uclibc"
 
 	# Nothing wrong with a good dose of verbosity
 	echo
-	einfo "LOC:             ${LOC}"
+	einfo "PREFIX:          ${PREFIX}"
 	einfo "BINPATH:         ${BINPATH}"
 	einfo "LIBPATH:         ${LIBPATH}"
 	einfo "DATAPATH:        ${DATAPATH}"
 	einfo "STDCXX_INCDIR:   ${STDCXX_INCDIR}"
 	echo
-	einfo "Configuring GCC with: ${confgcc} ${@}"
+	einfo "Configuring GCC with: ${confgcc//--/\n\t--} ${@} ${EXTRA_ECONF}"
 	echo
 
 	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	pushd ${WORKDIR}/build
+	mkdir -p "${WORKDIR}"/build
+	pushd "${WORKDIR}"/build > /dev/null
 
 	# and now to do the actual configuration
-	addwrite "/dev/zero"
-	${S}/configure ${confgcc} ${@} || die "failed to run configure"
+	addwrite /dev/zero
+	"${S}"/configure ${confgcc} $@ ${EXTRA_ECONF} \
+		|| die "failed to run configure"
 
 	# return to whatever directory we were in before
-	popd
+	popd > /dev/null
 }
 
-
 # This function accepts one optional argument, the make target to be used.
 # If ommitted, gcc_do_make will try to guess whether it should use all,
-# profiledbootstrap, or bootstrap-lean depending on CCHOST and arch. An
+# profiledbootstrap, or bootstrap-lean depending on CTARGET and arch. An
 # example of how to use this function:
 #
 #	gcc_do_make all-target-libstdc++-v3
@@ -643,81 +1250,953 @@ gcc_do_configure() {
 #	BOOT_CFLAGS
 #			CFLAGS to use during stages 2+3 of a gcc bootstrap.
 #
-# Travis Tiley <lv@gentoo.org> (04 Sep 2004)
+# Travis Tilley <lv@gentoo.org> (04 Sep 2004)
 #
 gcc_do_make() {
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	# Only build it static if we are just building the C frontend, else
-	# a lot of things break because there are not libstdc++.so ....
-	if use static && [ "${gcc_lang}" = "c" ] ; then
-		LDFLAGS="${LDFLAGS:="-static"}"
-	fi
-	
-	STAGE1_CFLAGS="${STAGE1_CFLAGS:="-O"}"
-	LIBCFLAGS="${LIBCFLAGS:="${CFLAGS} -g"}"
-	LIBCXXFLAGS="${LIBCXXFLAGS:="${CFLAGS} -g -fno-implicit-templates"}"
-
-	if [ -z "${CCHOST}" -o "${CCHOST}" == "${CHOST}" ] ; then
-		# we only want to use the system's CFLAGS if not building a
-		# cross-compiler.
-		BOOT_CFLAGS="${BOOT_CFLAGS:="${CFLAGS}"}"
-	else
-		BOOT_CFLAGS="${BOOT_CFLAGS:="-O2"}"
-	fi
-
 	# Fix for libtool-portage.patch
-	local OLDS="${S}"
-	S="${WORKDIR}/build"
+	local OLDS=${S}
+	S=${WORKDIR}/build
 
 	# Set make target to $1 if passed
-	[ "$1" != "" ] && GCC_MAKE_TARGET="$1"
+	[[ -n $1 ]] && GCC_MAKE_TARGET="$1"
 	# default target
-	if [ "${CCHOST}" != "${CHOST}" ] ; then
+	if is_crosscompile || tc-is-cross-compiler ; then
 		# 3 stage bootstrapping doesnt quite work when you cant run the
 		# resulting binaries natively ^^;
-		GCC_MAKE_TARGET="${GCC_MAKE_TARGET:=all}"
-	elif use x86 || use amd64 || use ppc64 ; then
-		GCC_MAKE_TARGET="${GCC_MAKE_TARGET:=profiledbootstrap}"
+		GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
+	elif [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ]] \
+	     && [[ ${GCCMAJOR}.${GCCMINOR} > 3.3 ]]
+	then
+		GCC_MAKE_TARGET=${GCC_MAKE_TARGET-profiledbootstrap}
 	else
-		GCC_MAKE_TARGET="${GCC_MAKE_TARGET:=bootstrap-lean}"
+		GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
 	fi
 
 	# the gcc docs state that parallel make isnt supported for the
 	# profiledbootstrap target, as collisions in profile collecting may occur.
-	if [ "${GCC_MAKE_TARGET}" == "profiledbootstrap" ] ; then
-		MAKE_COMMAND="make"
+	[[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] && export MAKEOPTS="${MAKEOPTS} -j1"
+
+	# boundschecking seems to introduce parallel build issues
+	want_boundschecking && export MAKEOPTS="${MAKEOPTS} -j1"
+
+	if [[ ${GCC_MAKE_TARGET} == "all" ]] ; then
+		STAGE1_CFLAGS=${STAGE1_CFLAGS-"${CFLAGS}"}
+	elif [[ $(gcc-version) == "3.4" && ${GCC_BRANCH_VER} == "3.4" ]] && has_hardened ; then
+		# See bug #79852
+		STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O2"}
 	else
-		MAKE_COMMAND="emake"
+		STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O"}
+	fi
+
+	if is_crosscompile; then
+		# In 3.4, BOOT_CFLAGS is never used on a crosscompile...
+		# but I'll leave this in anyways as someone might have had
+		# some reason for putting it in here... --eradicator
+		BOOT_CFLAGS=${BOOT_CFLAGS-"-O2"}
+	else
+		# we only want to use the system's CFLAGS if not building a
+		# cross-compiler.
+		BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS) ${CFLAGS}"}
 	fi
 
 	pushd ${WORKDIR}/build
-	einfo "Running ${MAKE_COMMAND} LDFLAGS=\"${LDFLAGS}\" STAGE1_CFLAGS=\"${STAGE1_CFLAGS}\" LIBCFLAGS=\"${LIBCFLAGS}\" LIBCXXFLAGS=\"${LIBCXXFLAGS}\" LIBPATH=\"${LIBPATH}\" BOOT_CFLAGS=\"${BOOT_CFLAGS}\" ${GCC_MAKE_TARGET}"
+	einfo "Running make LDFLAGS=\"${LDFLAGS}\" STAGE1_CFLAGS=\"${STAGE1_CFLAGS}\" LIBPATH=\"${LIBPATH}\" BOOT_CFLAGS=\"${BOOT_CFLAGS}\" ${GCC_MAKE_TARGET}"
+
+	emake \
+		LDFLAGS="${LDFLAGS}" \
+		STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
+		LIBPATH="${LIBPATH}" \
+		BOOT_CFLAGS="${BOOT_CFLAGS}" \
+		${GCC_MAKE_TARGET} \
+		|| die "emake failed with ${GCC_MAKE_TARGET}"
+
+	if ! use build && ! is_crosscompile && ! use nocxx ; then
+		if type -p doxygen > /dev/null ; then
+			cd "${CTARGET}"/libstdc++-v3
+			make doxygen-man || ewarn "failed to make docs"
+		else
+			ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed"
+		fi
+	fi
 
-	${MAKE_COMMAND} LDFLAGS="${LDFLAGS}" STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
-		LIBCFLAGS="${LIBCFLAGS}" LIBCXXFLAGS="${LIBCXXFLAGS}" \
-		LIBPATH="${LIBPATH}" BOOT_CFLAGS="${BOOT_CFLAGS} ${GCC_MAKE_TARGET}" \
-		|| die
 	popd
 }
 
+# This function will add ${GCC_CONFIG_VER} to the names of all shared libraries in the
+# directory specified to avoid filename collisions between multiple slotted
+# non-versioned gcc targets. If no directory is specified, it is assumed that
+# you want -all- shared objects to have ${GCC_CONFIG_VER} added. Example
+#
+#	add_version_to_shared ${D}/usr/$(get_libdir)
+#
+# Travis Tilley <lv@gentoo.org> (05 Sep 2004)
+#
+add_version_to_shared() {
+	local sharedlib sharedlibdir
+	[[ -z $1 ]] \
+		&& sharedlibdir=${D} \
+		|| sharedlibdir=$1
+
+	for sharedlib in $(find ${sharedlibdir} -name *.so.*) ; do
+		if [[ ! -L ${sharedlib} ]] ; then
+			einfo "Renaming `basename "${sharedlib}"` to `basename "${sharedlib/.so*/}-${GCC_CONFIG_VER}.so.${sharedlib/*.so./}"`"
+			mv "${sharedlib}" "${sharedlib/.so*/}-${GCC_CONFIG_VER}.so.${sharedlib/*.so./}" \
+				|| die
+			pushd `dirname "${sharedlib}"` > /dev/null || die
+			ln -sf "`basename "${sharedlib/.so*/}-${GCC_CONFIG_VER}.so.${sharedlib/*.so./}"`" \
+				"`basename "${sharedlib}"`" || die
+			popd > /dev/null || die
+		fi
+	done
+}
+
+# This is mostly a stub function to be overwritten in an ebuild
+gcc_do_filter_flags() {
+	strip-flags
+
+	# 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
+
+	# ... sure, why not?
+	strip-unsupported-flags
+
+	# dont want to funk ourselves
+	filter-flags '-mabi*' -m31 -m32 -m64
+
+	case ${GCC_BRANCH_VER} in
+	3.2|3.3)
+		case $(tc-arch) in
+			x86)   filter-flags '-mtune=*';;
+			amd64) filter-flags '-mtune=*'
+			       replace-cpu-flags k8 athlon64 opteron i686;;
+		esac
+		;;
+	3.4|4.*)
+		case $(tc-arch) in
+			x86|amd64) filter-flags '-mcpu=*';;
+		esac
+		;;
+	esac
+
+	# Compile problems with these (bug #6641 among others)...
+	#filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
+
+	# CFLAGS logic (verified with 3.4.3):
+	# CFLAGS:
+	#   This conflicts when creating a crosscompiler, so set to a sane
+	#     default in this case:
+	#   used in ./configure and elsewhere for the native compiler
+	#   used by gcc when creating libiberty.a
+	#   used by xgcc when creating libstdc++ (and probably others)!
+	#     this behavior should be removed...
+	#
+	# CXXFLAGS:
+	#   used by xgcc when creating libstdc++
+	#
+	# STAGE1_CFLAGS (not used in creating a crosscompile gcc):
+	#   used by ${CHOST}-gcc for building stage1 compiler
+	#
+	# BOOT_CFLAGS (not used in creating a crosscompile gcc):
+	#   used by xgcc for building stage2/3 compiler
+
+	if is_crosscompile ; then
+		# Set this to something sane for both native and target
+		CFLAGS="-O2 -pipe"
+
+		local VAR="CFLAGS_"${CTARGET//-/_}
+		CXXFLAGS=${!VAR}
+	fi
+
+	export GCJFLAGS=${GCJFLAGS:-${CFLAGS}}
+}
+
+gcc_src_compile() {
+	gcc_do_filter_flags
+	einfo "CFLAGS=\"${CFLAGS}\""
+	einfo "CXXFLAGS=\"${CXXFLAGS}\""
+
+	# Build in a separate build tree
+	mkdir -p ${WORKDIR}/build
+	pushd ${WORKDIR}/build > /dev/null
+
+	# Install our pre generated manpages if we do not have perl ...
+	[[ ! -x /usr/bin/perl ]] && [[ -n ${MAN_VER} ]] && \
+		unpack gcc-${MAN_VER}-manpages.tar.bz2
+
+	einfo "Configuring ${PN} ..."
+	gcc_do_configure
+
+	touch ${S}/gcc/c-gperf.h
+
+	# Do not make manpages if we do not have perl ...
+	[[ ! -x /usr/bin/perl ]] \
+		&& find "${WORKDIR}"/build -name '*.[17]' | xargs touch
+
+	einfo "Compiling ${PN} ..."
+	gcc_do_make ${GCC_MAKE_TARGET}
+
+	# Do not create multiple specs files for PIE+SSP if boundschecking is in
+	# USE, as we disable PIE+SSP when it is.
+	if [[ ${ETYPE} == "gcc-compiler" ]] && want_split_specs ; then
+		split_out_specs_files || die "failed to split out specs"
+	fi
+
+	popd > /dev/null
+}
+
+gcc_src_test() {
+	cd "${WORKDIR}"/build
+	make check || ewarn "check failed and that sucks :("
+}
+
+gcc-library_src_install() {
+	einfo "Installing ${PN} ..."
+	# Do the 'make install' from the build directory
+	cd "${WORKDIR}"/build
+	S=${WORKDIR}/build \
+	make DESTDIR="${D}" \
+		prefix=${PREFIX} \
+		bindir=${BINPATH} \
+		includedir=${LIBPATH}/include \
+		datadir=${DATAPATH} \
+		mandir=${DATAPATH}/man \
+		infodir=${DATAPATH}/info \
+		LIBPATH="${LIBPATH}" \
+		${GCC_INSTALL_TARGET} || die
+
+	if [[ ${GCC_LIB_COMPAT_ONLY} == "true" ]] ; then
+		rm -rf "${D}"${INCLUDEPATH}
+		rm -rf "${D}"${DATAPATH}
+		pushd "${D}"${LIBPATH}/
+		rm *.a *.la *.so
+		popd
+	fi
+
+	if [[ -n ${GCC_LIB_USE_SUBDIR} ]] ; then
+		mkdir -p ${WORKDIR}/${GCC_LIB_USE_SUBDIR}/
+		mv "${D}"${LIBPATH}/* ${WORKDIR}/${GCC_LIB_USE_SUBDIR}/
+		mv ${WORKDIR}/${GCC_LIB_USE_SUBDIR}/ "${D}"${LIBPATH}
+
+		dodir /etc/env.d
+		echo "LDPATH=\"${LIBPATH}/${GCC_LIB_USE_SUBDIR}/\"" >> "${D}"/etc/env.d/99${PN}
+	fi
+
+	if [[ ${GCC_VAR_TYPE} == "non-versioned" ]] ; then
+		# if we're not using versioned directories, we need to use versioned
+		# filenames.
+		add_version_to_shared
+	fi
+}
+
+gcc-compiler_src_install() {
+	local x=
+
+	# Do allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${GCC_CONFIG_VER}/include as
+	# this can break the build.
+	for x in "${WORKDIR}"/build/gcc/include/* ; do
+		[[ -L ${x} ]] && rm -f "${x}"
+	done
+	# Remove generated headers, as they can cause things to break
+	# (ncurses, openssl, etc).
+	for x in $(find "${WORKDIR}"/build/gcc/include/ -name '*.h') ; do
+		grep -q 'It has been auto-edited by fixincludes from' "${x}" \
+			&& rm -f "${x}"
+	done
+
+	einfo "Installing GCC..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S=${WORKDIR}/build \
+	make DESTDIR="${D}" install || die
+	# Punt some tools which are really only useful while building gcc
+	rm -r "${D}${LIBEXECPATH}"/install-tools
+	# Now do the fun stripping stuff
+	env RESTRICT="" STRIP=${CHOST}-strip prepstrip "${D}${BINPATH}" "${D}${LIBEXECPATH}"
+	env RESTRICT="" STRIP=${CTARGET}-strip prepstrip "${D}${LIBPATH}"
+
+	is_crosscompile || [[ -r ${D}${BINPATH}/gcc ]] || die "gcc not found in ${D}"
+
+	dodir /lib /usr/bin
+	dodir /etc/env.d/gcc
+	create_gcc_env_entry
+
+	if want_split_specs ; then
+		if use hardened ; then
+			create_gcc_env_entry vanilla
+		fi
+		! use hardened && hardened_gcc_works && create_gcc_env_entry hardened
+		if hardened_gcc_works || hardened_gcc_works pie ; then
+			create_gcc_env_entry hardenednossp
+		fi
+		if hardened_gcc_works || hardened_gcc_works ssp ; then
+			create_gcc_env_entry hardenednopie
+		fi
+		create_gcc_env_entry hardenednopiessp
+
+		cp ${WORKDIR}/build/*.specs "${D}"${LIBPATH}
+	fi
+
+	# Move the libraries to the proper location
+	gcc_movelibs
+
+	# Make sure we dont have stuff lying around that
+	# can nuke multiple versions of gcc
+	if ! use build ; then
+		cd ${D}${LIBPATH}
+
+		# Move Java headers to compiler-specific dir
+		for x in ${D}${PREFIX}/include/gc*.h ${D}${PREFIX}/include/j*.h ; do
+			[[ -f ${x} ]] && mv -f "${x}" ${D}${LIBPATH}/include/
+		done
+		for x in gcj gnu java javax org ; do
+			if [[ -d ${D}${PREFIX}/include/${x} ]] ; then
+				dodir /${LIBPATH}/include/${x}
+				mv -f ${D}${PREFIX}/include/${x}/* ${D}${LIBPATH}/include/${x}/
+				rm -rf ${D}${PREFIX}/include/${x}
+			fi
+		done
+
+		if [[ -d ${D}${PREFIX}/lib/security ]] ; then
+			dodir /${LIBPATH}/security
+			mv -f ${D}${PREFIX}/lib/security/* ${D}${LIBPATH}/security
+			rm -rf ${D}${PREFIX}/lib/security
+		fi
+
+		# Move libgcj.spec to compiler-specific directories
+		[[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
+			mv -f ${D}${PREFIX}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
+
+		# Rename jar because it could clash with Kaffe's jar if this gcc is
+		# primary compiler (aka don't have the -<version> extension)
+		cd ${D}${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}
+		[[ -f jar ]] && mv -f jar gcj-jar
+
+		# Move <cxxabi.h> to compiler-specific directories
+		[[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \
+			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${D}${LIBPATH}/include/
+
+		# These should be symlinks
+		dodir /usr/bin
+		cd "${D}"${BINPATH}
+		for x in gcc g++ c++ g77 gcj gcjh gfortran ; do
+			# For some reason, g77 gets made instead of ${CTARGET}-g77...
+			# this should take care of that
+			[[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
+
+			if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile; then
+				ln -sf ${CTARGET}-${x} ${x}
+
+				# Create version-ed symlinks
+				dosym ${BINPATH}/${CTARGET}-${x} \
+					/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
+				dosym ${BINPATH}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_CONFIG_VER}
+			fi
+
+			if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
+				rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
+				ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
+			fi
+		done
+
+		# I do not know if this will break gcj stuff, so I'll only do it for
+		#   objc for now; basically "ffi.h" is the correct file to include,
+		#   but it gets installed in .../GCCVER/include and yet it does
+		#   "#include <ffitarget.h>" which (correctly, as it's an "extra" file)
+		#   is installed in .../GCCVER/include/libffi; the following fixes
+		#   ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
+		if is_objc && ! is_gcj ; then
+			#dosed "s:<ffitarget.h>:<libffi/ffitarget.h>:g" /${LIBPATH}/include/ffi.h
+			mv "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include
+			rm -Rf "${D}"${LIBPATH}/include/libffi
+		fi
+	fi
+
+	cd "${S}"
+	if use build || is_crosscompile; then
+		rm -rf "${D}"/usr/share/{man,info}
+		rm -rf "${D}"${DATAPATH}/{man,info}
+	else
+		if [[ -d ${WORKDIR}/build/${CTARGET}/libstdc++-v3/docs/doxygen/man ]] ; then
+			cp -r ${WORKDIR}/build/${CTARGET}/libstdc++-v3/docs/doxygen/man/man? ${D}/${DATAPATH}/man/
+		fi
+		prepman ${DATAPATH}
+		prepinfo ${DATAPATH}
+	fi
+
+	# Rather install the script, else portage with changing $FILESDIR
+	# between binary and source package borks things ....
+	if ! is_crosscompile; then
+		insinto /lib/rcscripts/awk
+		doins "${GCC_FILESDIR}"/awk/fixlafiles.awk
+		exeinto /sbin
+		doexe "${GCC_FILESDIR}"/fix_libtool_files.sh
+	fi
+
+	# use gid of 0 because some stupid ports don't have
+	# the group 'root' set to gid 0
+	chown -R root:0 "${D}"${LIBPATH}
+
+	# Create config files for eselect-compiler
+	create_eselect_conf
+}
+
+# Move around the libs to the right location.  For some reason,
+# when installing gcc, it dumps internal libraries into /usr/lib
+# instead of the private gcc lib path
+gcc_movelibs() {
+	# This one comes with binutils
+	find "${D}" -name libiberty.a -exec rm -f {} \;
+
+	# XXX: This breaks when cross-compiling a native compiler (CBUILD != CHOST)
+
+	local multiarg
+	for multiarg in $(${XGCC} -print-multi-lib) ; do
+		multiarg=${multiarg#*;}
+		multiarg=${multiarg/@/-}
+
+		local OS_MULTIDIR=$(${XGCC} ${multiarg} --print-multi-os-directory)
+		local MULTIDIR=$(${XGCC} ${multiarg} --print-multi-directory)
+		local TODIR=${D}${LIBPATH}/${MULTIDIR}
+		local FROMDIR=
+
+		[[ -d ${TODIR} ]] || mkdir -p ${TODIR}
+
+		FROMDIR=${D}${LIBPATH}/${OS_MULTIDIR}
+		if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then
+			mv ${FROMDIR}/{*.a,*.so*,*.la} ${TODIR}
+			rmdir ${FROMDIR}
+		fi
+
+		FROMDIR=${D}${LIBPATH}/../${MULTIDIR}
+		if [[ -d ${FROMDIR} ]] ; then
+			mv ${FROMDIR}/{*.a,*.so*,*.la} ${TODIR}
+			rmdir ${FROMDIR}
+		fi
+
+		FROMDIR=${D}${PREFIX}/lib/${OS_MULTIDIR}
+		if [[ -d ${FROMDIR} ]] ; then
+			mv ${FROMDIR}/{*.a,*.so*,*.la} ${TODIR}
+			rmdir ${FROMDIR}
+		fi
+
+		FROMDIR=${D}${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR}
+		if [[ -d ${FROMDIR} ]] ; then
+			mv ${FROMDIR}/{*.a,*.so*,*.la} ${TODIR}
+			rmdir ${FROMDIR}
+		fi
+
+		FROMDIR=${D}${PREFIX}/lib/${MULTIDIR}
+		if [[ -d ${FROMDIR} ]] ; then
+			# The only thing that ends up here is libiberty.a (which is deleted)
+			# Lucky for us nothing mistakenly gets placed here that we need...
+			# otherwise we'd have a potential conflict when OS_MULTIDIR=../lib and
+			# MULTIDIR=. for different ABI.  If this happens, the fix is to patch
+			# the gcc Makefiles to behave with LIBDIR properly.
+			#mv ${FROMDIR}/{*.a,*.so*,*.la} ${TODIR}
+			rmdir ${FROMDIR}
+		fi
+	done
+
+	# make sure the libtool archives have libdir set to where they actually
+	# -are-, and not where they -used- to be.
+	fix_libtool_libdir_paths "$(find ${D}${LIBPATH} -name *.la)"
+}
+
+#----<< src_* >>----
+
+#---->> unorganized crap in need of refactoring follows
+
+# gcc_quick_unpack will unpack the gcc tarball and patches in a way that is
+# consistant with the behavior of get_gcc_src_uri. The only patch it applies
+# itself is the branch update if present.
+#
+# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
+#
+gcc_quick_unpack() {
+	pushd ${WORKDIR} > /dev/null
+	export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
+	export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
+	export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
+	export PP_GCC_VER=${PP_GCC_VER:-${GCC_RELEASE_VER}}
+	export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
+
+	if [[ -n ${GCC_A_FAKEIT} ]] ; then
+		unpack ${GCC_A_FAKEIT}.tar.bz2
+		mv ${GCC_A_FAKEIT} "${S}"
+	elif [[ -n ${PRERELEASE} ]] ; then
+		unpack gcc-${PRERELEASE}.tar.bz2
+	elif [[ -n ${SNAPSHOT} ]] ; then
+		unpack gcc-${SNAPSHOT}.tar.bz2
+	else
+		unpack gcc-${GCC_RELEASE_VER}.tar.bz2
+		# We want branch updates to be against a release tarball
+		if [[ -n ${BRANCH_UPDATE} ]] ; then
+			pushd ${S:-"$(gcc_get_s_dir)"} > /dev/null
+			epatch ${DISTDIR}/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+			popd > /dev/null
+		fi
+	fi
+
+	[[ -n ${PATCH_VER} ]] && \
+		unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2
+
+	[[ -n ${UCLIBC_VER} ]] && \
+		unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2
+
+	if want_ssp ; then
+		if [[ -n ${PP_FVER} ]] ; then
+			# The gcc 3.4 propolice versions are meant to be unpacked to ${S}
+			pushd ${S:-$(gcc_get_s_dir)} > /dev/null
+			unpack protector-${PP_FVER}.tar.gz
+			popd > /dev/null
+		else
+			unpack gcc-${PP_GCC_VER}-ssp-${PP_VER}.tar.bz2
+		fi
+	fi
+
+	if want_pie ; then
+		if [[ -n ${PIE_CORE} ]] ; then
+			unpack ${PIE_CORE}
+		else
+			unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
+		fi
+	fi
+
+	# pappy@gentoo.org - Fri Oct  1 23:24:39 CEST 2004
+	want_boundschecking && \
+		unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
+
+	popd > /dev/null
+}
+
+# Exclude any unwanted patches, as specified by the following variables:
+#
+#	GENTOO_PATCH_EXCLUDE
+#			List of filenames, relative to ${WORKDIR}/patch/
+#
+#	PIEPATCH_EXCLUDE
+#			List of filenames, relative to ${WORKDIR}/piepatch/
+#
+# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
+#
+exclude_gcc_patches() {
+	local i
+	for i in ${GENTOO_PATCH_EXCLUDE} ; do
+		if [[ -f ${WORKDIR}/patch/${i} ]] ; then
+			einfo "Excluding patch ${i}"
+			rm -f ${WORKDIR}/patch/${i} || die "failed to delete ${i}"
+		fi
+	done
+	for i in ${PIEPATCH_EXCLUDE} ; do
+		if [[ -f ${WORKDIR}/piepatch/${i} ]] ; then
+			einfo "Excluding piepatch ${i}"
+			rm -f ${WORKDIR}/piepatch/${i} || die "failed to delete ${i}"
+		fi
+	done
+}
+
+# Try to apply some stub patches so that gcc won't error out when
+# passed parameters like -fstack-protector but no ssp is found
+do_gcc_stub() {
+	local v stub_patch=""
+	for v in ${GCC_RELEASE_VER} ${GCC_BRANCH_VER} ; do
+		stub_patch=${GCC_FILESDIR}/stubs/gcc-${v}-$1-stub.patch
+		if [[ -e ${stub_patch} ]] ; then
+			EPATCH_SINGLE_MSG="Applying stub patch for $1 ..." \
+			epatch "${stub_patch}"
+			return 0
+		fi
+	done
+}
+
+do_gcc_HTB_boundschecking_patches() {
+	if ! want_boundschecking || \
+	   (want_ssp && [[ ${HTB_EXCLUSIVE} == "true" ]])
+	then
+		do_gcc_stub htb
+		return 0
+	fi
+
+	# modify the bounds checking patch with a regression patch
+	epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
+	release_version="${release_version}, HTB-${HTB_GCC_VER}-${HTB_VER}"
+}
+
+# patch in ProPolice Stack Smashing protection
+do_gcc_SSP_patches() {
+	# PARISC has no love ... it's our stack :(
+	if [[ $(tc-arch) == "hppa" ]] || \
+	   ! want_ssp || \
+	   (want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]])
+	then
+		do_gcc_stub ssp
+		return 0
+	fi
+
+	local ssppatch
+	local sspdocs
+
+	if [[ -n ${PP_FVER} ]] ; then
+		# Etoh keeps changing where files are and what the patch is named
+		if version_is_at_least 3.4.1 ; then
+			# >3.4.1 uses version in patch name, and also includes docs
+			ssppatch="${S}/gcc_${PP_VER}.dif"
+			sspdocs="yes"
+		elif version_is_at_least 3.4.0 ; then
+			# >3.4 put files where they belong and 3_4 uses old patch name
+			ssppatch="${S}/protector.dif"
+			sspdocs="no"
+		elif version_is_at_least 3.2.3 ; then
+			# earlier versions have no directory structure or docs
+			mv ${S}/protector.{c,h} ${S}/gcc
+			ssppatch="${S}/protector.dif"
+			sspdocs="no"
+		fi
+	else
+		# Just start packaging the damn thing ourselves
+		mv "${WORKDIR}"/ssp/protector.{c,h} "${S}"/gcc/
+		ssppatch=${WORKDIR}/ssp/gcc-${PP_GCC_VER}-ssp.patch
+		# allow boundschecking and ssp to get along
+		(want_boundschecking && [[ -e ${WORKDIR}/ssp/htb-ssp.patch ]]) \
+			&& patch -s "${ssppatch}" "${WORKDIR}"/ssp/htb-ssp.patch
+	fi
 
-create_gcc_multilib_scripts() {
-	mkdir -p ${D}/${BINPATH}
-	if has_m32 ; then
-cat > ${D}/${BINPATH}/gcc32 <<EOF
-#!/bin/sh
-exec /usr/bin/gcc -m32 "$@"
-EOF
-chmod +x ${D}/${BINPATH}/gcc32
+	[[ -z ${ssppatch} ]] && die "Sorry, SSP is not supported in this version"
+	epatch ${ssppatch}
+
+	if [[ ${PN} == "gcc" && ${sspdocs} == "no" ]] ; then
+		epatch "${GCC_FILESDIR}"/pro-police-docs.patch
 	fi
-	if has_m64 ; then
-cat > ${D}/${BINPATH}/gcc64 <<EOF
-#!/bin/sh
-exec /usr/bin/gcc -m64 "$@"
-EOF
-chmod +x ${D}/${BINPATH}/gcc64
+
+	# we apply only the needed parts of protectonly.dif
+	sed -e 's|^CRTSTUFF_CFLAGS = |CRTSTUFF_CFLAGS = -fno-stack-protector-all |'\
+		-i gcc/Makefile.in || die "Failed to update crtstuff!"
+
+	# if gcc in a stage3 defaults to ssp, is version 3.4.0 and a stage1 is built
+	# the build fails building timevar.o w/:
+	# cc1: stack smashing attack in function ix86_split_to_parts()
+	if use build && version_is_at_least 3.4.0 ; then
+		if gcc -dumpspecs | grep -q "fno-stack-protector:" ; then
+			epatch "${GCC_FILESDIR}"/3.4.0/gcc-3.4.0-cc1-no-stack-protector.patch
+		fi
+	fi
+
+	release_version="${release_version}, ssp-${PP_FVER:-${PP_GCC_VER}-${PP_VER}}"
+	if want_libssp ; then
+		update_gcc_for_libssp
+	else
+		update_gcc_for_libc_ssp
 	fi
 }
 
+# If glibc or uclibc has been patched to provide the necessary symbols itself,
+# then lets use those for SSP instead of libgcc.
+update_gcc_for_libc_ssp() {
+	if libc_has_ssp ; then
+		einfo "Updating gcc to use SSP from libc ..."
+		sed -e 's|^\(LIBGCC2_CFLAGS.*\)$|\1 -D_LIBC_PROVIDES_SSP_|' \
+			-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+	fi
+}
+
+# a split out non-libc non-libgcc ssp requires additional spec logic changes
+update_gcc_for_libssp() {
+	einfo "Updating gcc to use SSP from libssp..."
+	sed -e 's|^\(INTERNAL_CFLAGS.*\)$|\1 -D_LIBSSP_PROVIDES_SSP_|' \
+		-i ${S}/gcc/Makefile.in || die "Failed to update gcc!"
+}
+
+# do various updates to PIE logic
+do_gcc_PIE_patches() {
+	if ! want_pie || \
+	   (want_boundschecking && [[ ${HTB_EXCLUSIVE} == "true" ]])
+	then
+		return 0
+	fi
+
+	want_boundschecking \
+		&& rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-no.patch* \
+		|| rm -f "${WORKDIR}"/piepatch/*/*-boundschecking-yes.patch*
+
+	guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
+
+	# corrects startfile/endfile selection and shared/static/pie flag usage
+	EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
+	epatch "${WORKDIR}"/piepatch/upstream
+	# adds non-default pie support (rs6000)
+	EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
+	epatch "${WORKDIR}"/piepatch/nondef
+	# adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
+	EPATCH_MULTI_MSG="Applying default pie patches ..." \
+	epatch "${WORKDIR}"/piepatch/def
+
+	# we want to be able to control the pie patch logic via something other
+	# than ALL_CFLAGS...
+	sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
+		-e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
+		-i ${S}/gcc/Makefile.in
+
+	release_version="${release_version}, pie-${PIE_VER}"
+}
+
+should_we_gcc_config() {
+	# we only want to switch compilers if installing to / or /tmp/stage1root
+	[[ ${ROOT} == "/" || ${ROOT} == "/tmp/stage1root" ]] || return 1
+
+	# we always want to run gcc-config if we're bootstrapping, otherwise
+	# we might get stuck with the c-only stage1 compiler
+	use bootstrap && return 0
+	use build && return 0
+
+	# if the current config is invalid, we definitely want a new one
+	if has_version 'app-admin/eselect-compiler' ; then
+		env -i eselect compiler show ${CTARGET} >&/dev/null || return 0
+	else
+		env -i gcc-config -c ${CTARGET} >&/dev/null || return 0
+	fi
+
+	# if the previously selected config has the same major.minor (branch) as
+	# the version we are installing, then it will probably be uninstalled
+	# for being in the same SLOT, make sure we run gcc-config.
+	local curr_config_ver
+	if has_version 'app-admin/eselect-compiler' ; then
+		curr_config_ver=$(env -i eselect compiler show ${CTARGET} | cut -f1 -d/ | awk -F - '{ print $5 }')
+	else
+		curr_config_ver=$(env -i gcc-config -c ${CTARGET} | awk -F - '{ print $5 }')
+	fi
+
+	local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver})
+
+	# If we're using multislot, just run gcc-config if we're installing
+	# to the same profile as the current one.
+	use multislot && return $([[ ${curr_config_ver} == ${GCC_CONFIG_VER} ]])
+
+	if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then
+		return 0
+	else
+		# if we're installing a genuinely different compiler version,
+		# we should probably tell the user -how- to switch to the new
+		# gcc version, since we're not going to do it for him/her.
+		# We don't want to switch from say gcc-3.3 to gcc-3.4 right in
+		# the middle of an emerge operation (like an 'emerge -e world'
+		# which could install multiple gcc versions).
+		einfo "The current gcc config appears valid, so it will not be"
+		einfo "automatically switched for you.  If you would like to"
+		einfo "switch to the newly installed gcc version, do the"
+		einfo "following:"
+		echo
+		if has_version 'app-admin/eselect-compiler' ; then
+			einfo "eselect compiler set <profile>"
+		else
+			einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}"
+		fi
+		einfo "source /etc/profile"
+		echo
+		ebeep
+		return 1
+	fi
+}
+
+do_gcc_config() {
+	if ! should_we_gcc_config ; then
+		# Just make sure all our LDPATH's are updated
+		if has_version 'app-admin/eselect-compiler' ; then
+			eselect compiler update
+		else
+			gcc-config --use-old --force
+		fi
+		return 0
+	fi
+
+	if has_version 'app-admin/eselect-compiler' ; then
+		local current_gcc_config=$(env -i eselect compiler show ${CTARGET})
+		local current_specs=$(echo ${current_gcc_config} | cut -f2 -d/)
+		if eselect compiler set ${CTARGET}-${GCC_CONFIG_VER}/${current_specs} &> /dev/null; then
+			einfo "The following compiler profile has been activated based on your previous profile:"
+			einfo "${CTARGET}-${GCC_CONFIG_VER}/${current_specs}"
+		else
+			local prefix=${current_specs%-*}
+			[[ -n ${prefix} ]] && prefix="${prefix}-"
+
+			local spec
+			if use hardened ; then
+				spec="hardened"
+			else
+				spec="vanilla"
+			fi
+
+			if eselect compiler set ${CTARGET}-${GCC_CONFIG_VER}/${prefix}${spec} &> /dev/null ; then
+				ewarn "We were not able to select the currently in use profile with"
+				ewarn "your newly emerged gcc.  Instead, we have enabled the following:"
+				ewarn "${CTARGET}-${GCC_CONFIG_VER}/${prefix}${spec}"
+				ewarn "If this is incorrect, please use 'eselect compiler set' to"
+				ewarn "select another profile."
+			else
+				if [[ -n ${DEFAULT_ABI} ]] ; then
+					prefix="${DEFAULT_ABI}-"
+				fi
+
+				if eselect compiler set ${CTARGET}-${GCC_CONFIG_VER}/${prefix}${spec} &> /dev/null ; then
+					ewarn "We were not able to select the currently in use profile with"
+					ewarn "your newly emerged gcc.  Instead, we have enabled the following:"
+					ewarn "${CTARGET}-${GCC_CONFIG_VER}/${prefix}${spec}"
+					ewarn "If this is incorrect, please use 'eselect compiler set' to"
+					ewarn "select another profile."
+				else
+					eerror "We were not able to automatically set the current compiler"
+					eerror "to your newly emerged gcc.  Please use 'eselect compiler set'"
+					eerror "to select your compiler."
+				fi
+			fi
+		fi
+	else
+		local current_gcc_config=$(env -i gcc-config -c ${CTARGET} | grep -v ^\ )
+
+		# figure out which specs-specific config is active. yes, this works
+		# even if the current config is invalid.
+		local current_specs=$(echo ${current_gcc_config} | awk -F - '{ print $6 }')
+
+		local use_specs=""
+		[[ -n ${current_specs} ]] && use_specs=-${current_specs}
+
+		if [[ -n ${use_specs} ]] && \
+		   [[ ! -e ${ROOT}/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}${use_specs} ]]
+		then
+			ewarn "The currently selected specs-specific gcc config,"
+			ewarn "${current_specs}, doesn't exist anymore. This is usually"
+			ewarn "due to enabling/disabling hardened or switching to a version"
+			ewarn "of gcc that doesnt create multiple specs files. The default"
+			ewarn "config will be used, and the previous preference forgotten."
+			ebeep
+			epause
+			use_specs=""
+		fi
+
+		gcc-config ${CTARGET}-${GCC_CONFIG_VER}${use_specs}
+	fi
+}
+
+# This function allows us to gentoo-ize gcc's version number and bugzilla
+# URL without needing to use patches.
+#
+# Travis Tilley <lv@gentoo.org> (02 Sep 2004)
+#
+gcc_version_patch() {
+	[[ -z $1 ]] && die "no arguments to gcc_version_patch"
+
+	sed -i -e "s~\(const char version_string\[\] = \"\).*\(\".*\)~\1$1\2~" \
+	       -e 's~http:\/\/gcc\.gnu\.org\/bugs\.html~http:\/\/bugs\.gentoo\.org\/~' ${S}/gcc/version.c || die "failed to update version.c with Gentoo branding."
+}
+
+# The purpose of this DISGUSTING gcc multilib hack is to allow 64bit libs
+# to live in lib instead of lib64 where they belong, with 32bit libraries
+# in lib32. This hack has been around since the beginning of the amd64 port,
+# and we're only now starting to fix everything that's broken. Eventually
+# this should go away.
+#
+# Travis Tilley <lv@gentoo.org> (03 Sep 2004)
+#
+disgusting_gcc_multilib_HACK() {
+	local config
+	local libdirs
+	if has_multilib_profile ; then
+		case $(tc-arch) in
+			amd64)
+				config="i386/t-linux64"
+				libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
+			;;
+			ppc64)
+				config="rs6000/t-linux64"
+				libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
+			;;
+		esac
+	else
+		# Remove this hunk when amd64's 2004.3 is purged from portage.
+		use amd64 || die "Your profile is no longer supported by portage."
+		config="i386/t-linux64"
+		libdirs="../$(get_libdir) ../$(get_multilibdir)"
+	fi
+
+	einfo "updating multilib directories to be: ${libdirs}"
+	sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" ${S}/gcc/config/${config}
+}
+
+disable_multilib_libjava() {
+	if is_gcj ; then
+		# We dont want a multilib libjava, so lets use this hack taken from fedora
+		pushd ${S} > /dev/null
+		sed -i -e 's/^all: all-redirect/ifeq (\$(MULTISUBDIR),)\nall: all-redirect\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
+		sed -i -e 's/^install: install-redirect/ifeq (\$(MULTISUBDIR),)\ninstall: install-redirect\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
+		sed -i -e 's/^check: check-redirect/ifeq (\$(MULTISUBDIR),)\ncheck: check-redirect\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
+		sed -i -e 's/^all: all-recursive/ifeq (\$(MULTISUBDIR),)\nall: all-recursive\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
+		sed -i -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
+		sed -i -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
+		popd > /dev/null
+	fi
+}
+
+fix_libtool_libdir_paths() {
+	local dirpath
+	for archive in $* ; do
+		dirpath=$(dirname ${archive} | sed -e "s:^${D}::")
+		sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':"
+	done
+}
+
+is_multilib() {
+	[[ ${GCCMAJOR} < 3 ]] && return 1
+	case ${CTARGET} in
+		mips64*|powerpc64*|s390x*|sparc64*|x86_64*)
+			has_multilib_profile || use multilib ;;
+		*)	false ;;
+	esac
+}
+
+is_uclibc() {
+	[[ ${GCCMAJOR} -lt 3 ]] && return 1
+	[[ ${CTARGET} == *-uclibc ]]
+}
+
+is_cxx() {
+	gcc-lang-supported 'c++' || return 1
+	use build && return 1
+	! use nocxx
+}
+
+is_f77() {
+	gcc-lang-supported f77 || return 1
+	use build && return 1
+	use fortran
+}
+
+is_f95() {
+	gcc-lang-supported f95 || return 1
+	use build && return 1
+	use fortran
+}
+
+is_fortran() {
+	gcc-lang-supported fortran || return 1
+	use build && return 1
+	use fortran
+}
+
+is_gcj() {
+	gcc-lang-supported java || return 1
+	use build && return 1
+	use gcj
+}
+
+is_objc() {
+	gcc-lang-supported objc || return 1
+	use build && return 1
+	use objc
+}
+
+is_ada() {
+	gcc-lang-supported ada || return 1
+	use build && return 1
+	use ada
+}
diff --git a/eclass/twisted.eclass b/eclass/twisted.eclass
index 7346b34cf6bb..ed5807d6aac6 100644
--- a/eclass/twisted.eclass
+++ b/eclass/twisted.eclass
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/twisted.eclass,v 1.1 2005/11/27 20:57:36 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/twisted.eclass,v 1.1.1.1 2005/11/30 09:59:31 chriswhite Exp $
 #
 # Author: Marien Zwart <marienz@gentoo.org>
 #
diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass
index 31d1caa7dc24..2c5400301186 100644
--- a/eclass/vdr-plugin.eclass
+++ b/eclass/vdr-plugin.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.1 2005/07/23 15:11:25 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author:
 #   Matthias Schwarzott <zzam@gentoo.org>
@@ -22,14 +22,32 @@
 #	KEYWORDS="~x86"
 #	DEPEND=">=media-video/vdr-1.3.27"
 #
-# 
+#
+
+# There are some special files in ${FILESDIR} which get installed when
+# they exist:
+
+# ${FILESDIR}/confd-${PV} or ${FILESDIR}/confd:
+#     The first matching is installed under /etc/conf.d/vdr.${VDRPLUGIN}
+#       (in example vdr-femon this would be /etc/conf.d/vdr.femon)
+#
+#     Everything put in variable _EXTRAOPTS is appended to the command line of
+#     the plugin.
 
 
+# ${FILESDIR}/rc-addon-${PV}.sh or ${FILESDIR}/rc-addon.sh:
+#     The first matching is installed under /usr/lib/vdr/rcscript/plugin-${VDRPLUGIN}.sh
+#     (in example vdr-femon this would be /usr/lib/vdr/rcscript/plugin-femon.sh)
+#
+#     This file is sourced by the startscript when plugin is activated in /etc/conf.d/vdr
+#     It could be used for special startup actions for this plugins, or to create the
+#     plugin command line options from a nicer version of a conf.d file.
+
 inherit eutils flag-o-matic
 
 # Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
 VDRPLUGIN="${PN/#vdrplugin-/}"
-VDRPLUGIN="${PN/#vdr-/}"
+VDRPLUGIN="${VDRPLUGIN/#vdr-/}"
 VDRPLUGIN="${VDRPLUGIN/%-cvs/}"
 
 DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin.eclass)"
@@ -47,10 +65,36 @@ DEPEND="|| (
 # Where should the plugins live in the filesystem
 VDR_PLUGIN_DIR="/usr/lib/vdr/plugins"
 
+VDR_RC_DIR="/usr/lib/vdr/rcscript"
+
 # Pathes to includes
 VDR_INCLUDE_DIR="/usr/include"
 DVB_INCLUDE_DIR="/usr/include"
 
+
+# this code is from linux-mod.eclass
+update_vdrplugindb() {
+	local VDRPLUGINDB_DIR=${ROOT}/var/lib/vdrplugin-rebuild/
+
+	if [[ ! -f ${VDRPLUGINDB_DIR}/vdrplugindb ]]; then
+		[[ ! -d ${VDRPLUGINDB_DIR} ]] && mkdir -p ${VDRPLUGINDB_DIR}
+		touch ${VDRPLUGINDB_DIR}/vdrplugindb
+	fi
+	if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${VDRPLUGINDB_DIR}/vdrplugindb) ]]; then
+		einfo "Adding plugin to vdrplugindb."
+		echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${VDRPLUGINDB_DIR}/vdrplugindb
+	fi
+}
+
+remove_vdrplugindb() {
+	local VDRPLUGINDB_DIR=${ROOT}/var/lib/vdrplugin-rebuild/
+
+	if [[ -n $(grep ${CATEGORY}/${PN}-${PVR} ${VDRPLUGINDB_DIR}/vdrplugindb) ]]; then
+		einfo "Removing ${CATEGORY}/${PN}-${PVR} from vdrplugindb."
+		sed -ie "/.*${CATEGORY}\/${P}.*/d" ${VDRPLUGINDB_DIR}/vdrplugindb
+	fi
+}
+
 vdr-plugin_pkg_setup() {
 	# -fPIC is needed for shared objects on some platforms (amd64 and others)
 	append-flags -fPIC
@@ -72,7 +116,7 @@ vdr-plugin_src_unpack() {
 			cd ${S}
 
 			ebegin "Patching Makefile"
-			sed -i Makefile \
+			sed -i.orig Makefile \
 				-e "s:^VDRDIR.*$:VDRDIR = ${VDR_INCLUDE_DIR}:" \
 				-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
 				-e "s:^LIBDIR.*$:LIBDIR = ${S}:" \
@@ -90,25 +134,149 @@ vdr-plugin_src_unpack() {
 	done
 }
 
+vdr-plugin_copy_source_tree() {
+	cp -r ${S} ${T}/source-tree
+	cd ${T}/source-tree
+	mv Makefile.orig Makefile
+	sed -i Makefile \
+		-e "s:^DVBDIR.*$:DVBDIR = ${DVB_INCLUDE_DIR}:" \
+		-e 's:^CXXFLAGS:#CXXFLAGS:' \
+		-e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \
+		-e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):'
+}
+
+vdr-plugin_install_source_tree() {
+	einfo "Installing sources"
+	destdir=${VDRSOURCE_DIR}/vdr-${VDRVERSION}/PLUGINS/src/${VDRPLUGIN}
+	insinto ${destdir}-${PV}
+	doins -r ${T}/source-tree/*
+
+	dosym ${VDRPLUGIN}-${PV} ${destdir}
+}
+
 vdr-plugin_src_compile() {
-	cd ${S}
+	[ -z "$1" ] && vdr-plugin_src_compile prepare compile
+
+	while [ "$1" ]; do
+
+		case "$1" in
+		prepare)
+			[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_copy_source_tree
+			;;
+		compile)
+			cd ${S}
 
-	emake ${VDRPLUGIN_MAKE_TARGET:-all} || die "emake failed"
+			emake ${VDRPLUGIN_MAKE_TARGET:-all} || die "emake failed"
+			;;
+		esac
+
+		shift
+	done
 }
 
 vdr-plugin_src_install() {
+	[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_install_source_tree
 	cd ${S}
 
 	insinto "${VDR_PLUGIN_DIR}"
 	doins libvdr-*.so.*
 	dodoc README* HISTORY CHANGELOG
+
+	for f in ${FILESDIR}/confd-${PV} ${FILESDIR}/confd; do
+		if [[ -f "${f}" ]]; then
+			insinto /etc/conf.d
+			newins "${f}" vdr.${VDRPLUGIN}
+			break
+		fi
+	done
+
+	for f in ${FILESDIR}/rc-addon-${PV}.sh ${FILESDIR}/rc-addon.sh; do
+		if [[ -f "${f}" ]]; then
+			insinto "${VDR_RC_DIR}"
+			newins "${f}" plugin-${VDRPLUGIN}.sh
+			break
+		fi
+	done
 }
 
 vdr-plugin_pkg_postinst() {
+	update_vdrplugindb
+	einfo
+	einfo "The vdr plugin ${VDRPLUGIN} has now been installed."
+	einfo "To activate execute the following command:"
 	einfo
-	einfo "The vdr plugin ${VDRPLUGIN} has now been installed,"
-	einfo "to activate it you have to add it to /etc/conf.d/vdr."
+	einfo "  emerge --config ${PN}"
 	einfo
 }
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
+vdr-plugin_pkg_postrm() {
+	remove_vdrplugindb
+}
+
+vdr-plugin_pkg_config_final() {
+	diff ${conf_orig} ${conf}
+	rm ${conf_orig}
+}
+
+vdr-plugin_pkg_config() {
+	if [[ -z "${INSTALLPLUGIN}" ]]; then
+		INSTALLPLUGIN="${VDRPLUGIN}"
+	fi
+	# First test if plugin is already inside PLUGINS
+	local conf=/etc/conf.d/vdr
+	conf_orig=${conf}.before_emerge_config
+	cp ${conf} ${conf_orig}
+
+	einfo "Reading ${conf}"
+	if ! grep -q "^PLUGINS=" ${conf}; then
+		local LINE=$(sed ${conf} -n -e '/^#.*PLUGINS=/=' | tail -n 1)
+		if [[ -n "${LINE}" ]]; then
+			sed -e ${LINE}'a PLUGINS=""' -i ${conf}
+		else
+			echo 'PLUGINS=""' >> ${conf}
+		fi
+		unset LINE
+	fi
+
+	unset PLUGINS
+	PLUGINS=$(source /etc/conf.d/vdr; echo ${PLUGINS})
+
+	active=0
+	for p in ${PLUGINS}; do
+		if [[ "${p}" == "${INSTALLPLUGIN}" ]]; then
+			active=1
+			break;
+		fi
+	done
+
+	if [[ "${active}" == "1" ]]; then
+		einfo "${INSTALLPLUGIN} already activated"
+		echo
+		read -p "Do you want to deactivate ${INSTALLPLUGIN} (yes/no) " answer
+		if [[ "${answer}" != "yes" ]]; then
+			einfo "aborted"
+			return
+		fi
+		einfo "Removing ${INSTALLPLUGIN} from active plugins."
+		local LINE=$(sed ${conf} -n -e '/^PLUGINS=.*\<'${INSTALLPLUGIN}'\>/=' | tail -n 1)
+		sed -i ${conf} -e ${LINE}'s/\<'${INSTALLPLUGIN}'\>//' \
+			-e ${LINE}'s/ \( \)*/ /g' \
+			-e ${LINE}'s/ "/"/g' \
+			-e ${LINE}'s/" /"/g'
+
+		vdr-plugin_pkg_config_final
+		return
+	fi
+
+
+	einfo "Adding ${INSTALLPLUGIN} to active plugins."
+	local LINE=$(sed ${conf} -n -e '/^PLUGINS=/=' | tail -n 1)
+	sed -i ${conf} -e ${LINE}'s/^PLUGINS=" *\(.*\)"/PLUGINS="\1 '${INSTALLPLUGIN}'"/' \
+		-e ${LINE}'s/ \( \)*/ /g' \
+		-e ${LINE}'s/ "/"/g' \
+		-e ${LINE}'s/" /"/g'
+
+	vdr-plugin_pkg_config_final
+}
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_postrm pkg_config
diff --git a/eclass/versionator.eclass b/eclass/versionator.eclass
index 682e78cc9884..9142e6bb2bec 100644
--- a/eclass/versionator.eclass
+++ b/eclass/versionator.eclass
@@ -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/eclass/versionator.eclass,v 1.1 2004/09/10 18:45:01 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 #
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
 #
@@ -23,9 +23,17 @@
 #     get_after_major_version         ver_str
 #     replace_version_separator       index     newvalue   ver_str
 #     replace_all_version_separators  newvalue  ver_str
+#     delete_version_separator        index ver_str
+#     delete_all_version_separators   ver_str
+#
+# Rather than being a number, the index parameter can be a separator character
+# such as '-', '.' or '_'. In this case, the first separator of this kind is
+# selected.
+#
+# There's also:
+#     version_is_at_least             want      have
+# which may be buggy, so use with caution.
 
-ECLASS=versionator
-INHERITED="$INHERITED $ECLASS"
 
 shopt -s extglob
 
@@ -151,18 +159,31 @@ get_after_major_version() {
 #     1 '_' 1.2.3       -> 1_2.3
 #     2 '_' 1.2.3       -> 1.2_3
 #     1 '_' 1b-2.3      -> 1b_2.3
+# Rather than being a number, $1 can be a separator character such as '-', '.'
+# or '_'. In this case, the first separator of this kind is selected.
 replace_version_separator() {
-	local i c found=0 v="${3:-${PV}}"
+	local w i c found=0 v="${3:-${PV}}"
+	w=${1:-1}
 	c=( $(get_all_version_components ${v} ) )
-	for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do
-		if [[ -n "${c[${i}]//[^-._]}" ]] ; then
-			found=$(($found + 1))
-			if [[ "$found" == "${1:-1}" ]] ; then
+	if [[ "${w//[[:digit:]]/}" == "${w}" ]] ; then
+		# it's a character, not an index
+		for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do
+			if [[ "${c[${i}]}" == "${w}" ]] ; then
 				c[${i}]="${2}"
 				break
 			fi
-		fi
-	done
+		done
+	else
+		for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do
+			if [[ -n "${c[${i}]//[^-._]}" ]] ; then
+				found=$(($found + 1))
+				if [[ "$found" == "${w}" ]] ; then
+					c[${i}]="${2}"
+					break
+				fi
+			fi
+		done
+	fi
 	c=${c[@]}
 	echo ${c// }
 }
@@ -176,3 +197,282 @@ replace_all_version_separators() {
 	echo ${c// }
 }
 
+# Delete the $1th separator in $2 (defaults to $PV if $2 is not supplied). If
+# there are fewer than $1 separators, don't change anything.
+#     1 1.2.3       -> 12.3
+#     2 1.2.3       -> 1.23
+#     1 1b-2.3      -> 1b2.3
+# Rather than being a number, $1 can be a separator character such as '-', '.'
+# or '_'. In this case, the first separator of this kind is deleted.
+delete_version_separator() {
+	replace_version_separator "${1}" "" "${2}"
+}
+
+# Delete all version separators in $1 (defaults to $PV).
+#     1b.2.3        -> 1b23
+delete_all_version_separators() {
+	replace_all_version_separators "" "${1}"
+}
+
+# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses
+# only. May not be reliable, be sure to do very careful testing before actually
+# using this. Prod ciaranm if you find something it can't handle.
+version_is_at_least() {
+	local want_s="$1" have_s="${2:-${PVR}}" r
+	version_compare "${want_s}" "${have_s}"
+	r=$?
+	case $r in
+		1|2)
+			return 0
+			;;
+		3)
+			return 1
+			;;
+		*)
+			die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]"
+			;;
+	esac
+}
+
+# Takes two parameters (a, b) which are versions. If a is an earlier version
+# than b, returns 1. If a is identical to b, return 2. If b is later than a,
+# return 3. You probably want version_is_at_least rather than this function.
+# May not be very reliable. Test carefully before using this.
+version_compare() {
+	local ver_a=${1} ver_b=${2} parts_a parts_b cur_idx_a=0 cur_idx_b=0
+	parts_a=( $(get_all_version_components "${ver_a}" ) )
+	parts_b=( $(get_all_version_components "${ver_b}" ) )
+
+	### compare number parts.
+	local inf_loop=0
+	while true ; do
+		inf_loop=$(( ${inf_loop} + 1 ))
+		[[ ${inf_loop} -gt 20 ]] && \
+			die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
+
+		# grab the current number components
+		local cur_tok_a=${parts_a[${cur_idx_a}]}
+		local cur_tok_b=${parts_b[${cur_idx_b}]}
+
+		# number?
+		if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then
+			cur_idx_a=$(( ${cur_idx_a} + 1 ))
+			[[ ${parts_a[${cur_idx_a}]} == "." ]] \
+				&& cur_idx_a=$(( ${cur_idx_a} + 1 ))
+		else
+			cur_tok_a=""
+		fi
+
+		if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then
+			cur_idx_b=$(( ${cur_idx_b} + 1 ))
+			[[ ${parts_b[${cur_idx_b}]} == "." ]] \
+				&& cur_idx_b=$(( ${cur_idx_b} + 1 ))
+		else
+			cur_tok_b=""
+		fi
+
+		# done with number components?
+		[[ -z ${cur_tok_a} ]] && [[ -z ${cur_tok_b} ]] && break
+
+		# to avoid going into octal mode, strip any leading zeros. otherwise
+		# bash will throw a hissy fit on versions like 6.3.068.
+		cur_tok_a=${cur_tok_a##+(0)}
+		cur_tok_b=${cur_tok_b##+(0)}
+
+		# if a component is blank, make it zero.
+		[[ -z ${cur_tok_a} ]] && cur_tok_a=0
+		[[ -z ${cur_tok_b} ]] && cur_tok_b=0
+
+		# compare
+		[[ ${cur_tok_a} -lt ${cur_tok_b} ]] && return 1
+		[[ ${cur_tok_a} -gt ${cur_tok_b} ]] && return 3
+	done
+
+	### number parts equal. compare letter parts.
+	local letter_a=
+	letter_a=${parts_a[${cur_idx_a}]}
+	if [[ ${#letter_a} -eq 1 ]] && [[ -z ${letter_a/[a-z]} ]] ; then
+		cur_idx_a=$(( ${cur_idx_a} + 1 ))
+	else
+		letter_a="@"
+	fi
+
+	local letter_b=
+	letter_b=${parts_b[${cur_idx_b}]}
+	if [[ ${#letter_b} -eq 1 ]] && [[ -z ${letter_b/[a-z]} ]] ; then
+		cur_idx_b=$(( ${cur_idx_b} + 1 ))
+	else
+		letter_b="@"
+	fi
+
+	# compare
+	[[ ${letter_a} < ${letter_b} ]] && return 1
+	[[ ${letter_a} > ${letter_b} ]] && return 3
+
+	### letter parts equal. compare suffixes in order.
+	local suffix rule part r_lt r_gt
+	for rule in "alpha=1" "beta=1" "pre=1" "rc=1" "p=3" "r=3" ; do
+		suffix=${rule%%=*}
+		r_lt=${rule##*=}
+		[[ ${r_lt} -eq 1 ]] && r_gt=3 || r_gt=1
+
+		local suffix_a=
+		for part in ${parts_a[@]} ; do
+			[[ ${part#${suffix}} != ${part} ]] && \
+				[[ -z ${part##${suffix}*([[:digit:]])} ]] && \
+				suffix_a=${part#${suffix}}0
+		done
+
+		local suffix_b=
+		for part in ${parts_b[@]} ; do
+			[[ ${part#${suffix}} != ${part} ]] && \
+				[[ -z ${part##${suffix}*([[:digit:]])} ]] && \
+				suffix_b=${part#${suffix}}0
+		done
+
+		[[ -z ${suffix_a} ]] && [[ -z ${suffix_b} ]] && continue
+
+		[[ -z ${suffix_a} ]] && return ${r_gt}
+		[[ -z ${suffix_b} ]] && return ${r_lt}
+
+		# avoid octal problems
+		suffix_a=${suffix_a##+(0)} ; suffix_a=${suffix_a:-0}
+		suffix_b=${suffix_b##+(0)} ; suffix_b=${suffix_b:-0}
+
+		[[ ${suffix_a} -lt ${suffix_b} ]] && return 1
+		[[ ${suffix_a} -gt ${suffix_b} ]] && return 3
+	done
+
+	### no differences.
+	return 2
+}
+
+# Returns its parameters sorted, highest version last. We're using a quadratic
+# algorithm for simplicity, so don't call it with more than a few dozen items.
+# Uses version_compare, so be careful.
+version_sort() {
+	local items= left=0
+	items=( $@ )
+	while [[ ${left} -lt ${#items[@]} ]] ; do
+		local lowest_idx=${left}
+		local idx=$(( ${lowest_idx} + 1 ))
+		while [[ ${idx} -lt ${#items[@]} ]] ; do
+			version_compare "${items[${lowest_idx}]}" "${items[${idx}]}"
+			[[ $? -eq 3 ]] && lowest_idx=${idx}
+			idx=$(( ${idx} + 1 ))
+		done
+		local tmp=${items[${lowest_idx}]}
+		items[${lowest_idx}]=${items[${left}]}
+		items[${left}]=${tmp}
+		left=$(( ${left} + 1 ))
+	done
+	echo ${items[@]}
+}
+
+__versionator__test_version_compare() {
+	local lt=1 eq=2 gt=3 p q
+
+	__versionator__test_version_compare_t() {
+		version_compare "${1}" "${3}"
+		local r=$?
+		[[ ${r} -eq ${2} ]] || echo "FAIL: ${@} (got ${r} exp ${2})"
+	}
+
+	echo "
+		0             $lt 1
+		1             $lt 2
+		2             $gt 1
+		2             $eq 2
+		0             $eq 0
+		10            $lt 20
+		68            $eq 068
+		068           $gt 67
+		068           $lt 69
+
+		1.0           $lt 2.0
+		2.0           $eq 2.0
+		2.0           $gt 1.0
+
+		1.0           $gt 0.0
+		0.0           $eq 0.0
+		0.0           $lt 1.0
+
+		0.1           $lt 0.2
+		0.2           $eq 0.2
+		0.3           $gt 0.2
+
+		1.2           $lt 2.1
+		2.1           $gt 1.2
+
+		1.2.3         $lt 1.2.4
+		1.2.4         $gt 1.2.3
+
+		1.2.0         $eq 1.2
+		1.2.1         $gt 1.2
+		1.2           $lt 1.2.1
+
+		1.2b          $eq 1.2b
+		1.2b          $lt 1.2c
+		1.2b          $gt 1.2a
+		1.2b          $gt 1.2
+		1.2           $lt 1.2a
+
+		1.3           $gt 1.2a
+		1.3           $lt 1.3a
+
+		1.0_alpha7    $lt 1.0_beta7
+		1.0_beta      $lt 1.0_pre
+		1.0_pre5      $lt 1.0_rc2
+		1.0_rc2       $lt 1.0
+
+		1.0_p1        $gt 1.0
+		1.0_p1-r1     $gt 1.0_p1
+
+		1.0_alpha6-r1 $gt 1.0_alpha6
+		1.0_beta6-r1  $gt 1.0_alpha6-r2
+
+		1.0_pre1      $lt 1.0-p1
+
+		1.0p          $gt 1.0_p1
+		1.0r          $gt 1.0-r1
+		1.6.15        $gt 1.6.10-r2
+		1.6.10-r2     $lt 1.6.15
+
+	" | while read a b c ; do
+		[[ -z "${a}${b}${c}" ]] && continue;
+		__versionator__test_version_compare_t "${a}" "${b}" "${c}"
+	done
+
+
+	for q in "alpha beta pre rc=${lt};${gt}" "p r=${gt};${lt}" ; do
+		for p in ${q%%=*} ; do
+			local c=${q##*=}
+			local alt=${c%%;*} agt=${c##*;}
+			__versionator__test_version_compare_t "1.0" $agt "1.0_${p}"
+			__versionator__test_version_compare_t "1.0" $agt "1.0_${p}1"
+			__versionator__test_version_compare_t "1.0" $agt "1.0_${p}068"
+
+			__versionator__test_version_compare_t "2.0_${p}"    $alt "2.0"
+			__versionator__test_version_compare_t "2.0_${p}1"   $alt "2.0"
+			__versionator__test_version_compare_t "2.0_${p}068" $alt "2.0"
+
+			__versionator__test_version_compare_t "1.0_${p}"  $eq "1.0_${p}"
+			__versionator__test_version_compare_t "0.0_${p}"  $lt "0.0_${p}1"
+			__versionator__test_version_compare_t "666_${p}3" $gt "666_${p}"
+
+			__versionator__test_version_compare_t "1_${p}7"  $lt "1_${p}8"
+			__versionator__test_version_compare_t "1_${p}7"  $eq "1_${p}7"
+			__versionator__test_version_compare_t "1_${p}7"  $gt "1_${p}6"
+			__versionator__test_version_compare_t "1_${p}09" $eq "1_${p}9"
+		done
+	done
+
+	for p in "-r" "_p" ; do
+		__versionator__test_version_compare_t "7.2${p}1" $lt "7.2${p}2"
+		__versionator__test_version_compare_t "7.2${p}2" $gt "7.2${p}1"
+		__versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2"
+		__versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3"
+	done
+
+}
+
diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index 74662ecc1cd0..afab4dd45f77 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -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/eclass/vim-doc.eclass,v 1.1 2003/07/30 18:47:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 #
 # This eclass is used by vim.eclass and vim-plugin.eclass to update
 # the documentation tags.  This is necessary since vim doesn't look in
@@ -11,8 +11,6 @@
 # DEPEND in vim-plugin or by whatever version of vim is being
 # installed by the eclass.
 
-ECLASS=vim-doc
-INHERITED="$INHERITED $ECLASS"
 
 update_vim_helptags() {
 	local vimfiles vim d s
@@ -20,12 +18,18 @@ update_vim_helptags() {
 	# This is where vim plugins are installed
 	vimfiles=/usr/share/vim/vimfiles
 
-	# Find a suitable vim binary
-	local vim=`which vim 2>/dev/null`
-	[[ -z "$vim" ]] && vim=`which gvim 2>/dev/null`
-	[[ -z "$vim" ]] && vim=`which kvim 2>/dev/null`
-	if [[ -z "$vim" ]]; then
-		ewarn "No suitable vim binary to rebuild documentation tags"
+	if [[ $PN != vim-core ]]; then
+		# Find a suitable vim binary for updating tags :helptags
+		if use ppc-macos ; then
+			vim=$(which gvim 2>/dev/null )
+		else
+			vim=$(which vim 2>/dev/null)
+			[[ -z "$vim" ]] && vim=$(which gvim 2>/dev/null)
+			[[ -z "$vim" ]] && vim=$(which kvim 2>/dev/null)
+		fi
+		if [[ -z "$vim" ]]; then
+			ewarn "No suitable vim binary to rebuild documentation tags"
+		fi
 	fi
 
 	# Install the documentation symlinks into the versioned vim
@@ -35,10 +39,9 @@ update_vim_helptags() {
 
 		# Remove links, and possibly remove stale dirs
 		find $d/doc -name \*.txt -type l | while read s; do
-			[[ `readlink "$s"` = ${vimfiles}/* ]] && rm -f "$s"
+			[[ $(readlink "$s") = $vimfiles/* ]] && rm -f "$s"
 		done
-		if [[ -f "$d/doc/tags" && 
-				$(find "$d" | wc -l | awk '{print $1}') = 3 ]]; then
+		if [[ -f "$d/doc/tags" && $(find "$d" | wc -l | tr -d ' ') = 3 ]]; then
 			# /usr/share/vim/vim61
 			# /usr/share/vim/vim61/doc
 			# /usr/share/vim/vim61/doc/tags
@@ -48,8 +51,8 @@ update_vim_helptags() {
 		fi
 
 		# Re-create / install new links
-		if [[ -d ${vimfiles}/doc ]]; then
-			ln -s ${vimfiles}/doc/*.txt $d/doc 2>/dev/null
+		if [[ -d $vimfiles/doc ]]; then
+			ln -s $vimfiles/doc/*.txt $d/doc 2>/dev/null
 		fi
 
 		# Update tags; need a vim binary for this
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index 8951ed41f7aa..8be3ea667673 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -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/eclass/vim-plugin.eclass,v 1.1 2003/07/30 18:47:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.1.1.1 2005/11/30 09:59:24 chriswhite Exp $
 #
 # This eclass simplifies installation of app-vim plugins into
 # /usr/share/vim/vimfiles.  This is a version-independent directory
@@ -8,26 +8,129 @@
 # documentation, for which we make a special case via vim-doc.eclass
 
 inherit vim-doc
-ECLASS=vim-plugin
-INHERITED="$INHERITED $ECLASS"
+EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
 IUSE=""
-DEPEND="|| ( >=app-editors/vim-6.2 >=app-editors/gvim-6.2 )"
+DEPEND="|| ( >=app-editors/vim-6.3
+	>=app-editors/gvim-6.3 )"
 RDEPEND="${DEPEND}"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 SLOT="0"
 
-src_install() {
+vim-plugin_src_install() {
+	local f
+
+	ebegin "Fixing file permissions"
+	# Make sure perms are good
+	chmod -R a+rX ${S} || die "chmod failed"
+	find ${S} -user  'portage' -exec chown root '{}' \; || die "chown failed"
+	find ${S} -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed"
+	eend $?
+
+	# Install non-vim-help-docs
+	cd ${S}
+	for f in *; do
+		[[ -f "${f}" ]] || continue
+		if [[ "${f}" = *.html ]]; then
+			dohtml "${f}"
+		else
+			dodoc "${f}"
+		fi
+		rm -f "${f}"
+	done
+
+	# Install remainder of plugin
 	cd ${WORKDIR}
-	chmod -R a+rX ${S}
 	dodir /usr/share/vim
 	mv ${S} ${D}/usr/share/vim/vimfiles
 }
 
-pkg_postinst() {
-	update_vim_helptags
+vim-plugin_pkg_postinst() {
+	update_vim_helptags		# from vim-doc
+	update_vim_afterscripts	# see below
+	display_vim_plugin_help	# see below
+}
+
+vim-plugin_pkg_postrm() {
+	update_vim_helptags		# from vim-doc
+	update_vim_afterscripts	# see below
+
+	# Remove empty dirs; this allows
+	# /usr/share/vim to be removed if vim-core is unmerged
+	find /usr/share/vim/vimfiles -depth -type d -exec rmdir {} \; 2>/dev/null
+}
+
+# update_vim_afterscripts: create scripts in
+# /usr/share/vim/vimfiles/after/* comprised of the snippets in
+# /usr/share/vim/vimfiles/after/*/*.d
+update_vim_afterscripts() {
+	local d f afterdir=/usr/share/vim/vimfiles/after
+
+	# Nothing to do if the dir isn't there
+	[ -d ${afterdir} ] || return 0
+
+	einfo "Updating scripts in /usr/share/vim/vimfiles/after"
+	find ${afterdir} -type d -name \*.vim.d | \
+	while read d; do
+		echo '" Generated by update_vim_afterscripts' > "${d%.d}"
+		find "${d}" -name \*.vim -type f -maxdepth 1 -print0 | \
+		sort -z | xargs -0 cat >> "${d%.d}"
+	done
+
+	einfo "Removing dead scripts in /usr/share/vim/vimfiles/after"
+	find ${afterdir} -type f -name \*.vim | \
+	while read f; do
+		[[ "$(head -n 1 ${f})" == '" Generated by update_vim_afterscripts' ]] \
+			|| continue
+		# This is a generated file, but might be abandoned.  Check
+		# if there's no corresponding .d directory, or if the
+		# file's effectively empty
+		if [[ ! -d "${f}.d" || -z "$(grep -v '^"')" ]]; then
+			rm -f "${f}"
+		fi
+	done
 }
 
-pkg_postrm() {
-	update_vim_helptags
+# Display a message with the plugin's help file if one is available. Uses the
+# VIM_PLUGIN_HELPFILES env var. If multiple help files are available, they
+# should be separated by spaces. If no help files are available, but the env
+# var VIM_PLUGIN_HELPTEXT is set, that is displayed instead. Finally, if we
+# have nothing else, display a link to VIM_PLUGIN_HELPURI. An extra message
+# regarding enabling filetype plugins is displayed if VIM_PLUGIN_MESSAGES
+# includes the word "filetype".
+display_vim_plugin_help() {
+	local h
+
+	if [[ -n "${VIM_PLUGIN_HELPFILES}" ]] ; then
+		einfo " "
+		einfo "This plugin provides documentation via vim's help system. To"
+		einfo "view it, use:"
+		for h in ${VIM_PLUGIN_HELPFILES} ; do
+			einfo "    :help ${h}"
+		done
+		einfo " "
+
+	elif [[ -n "${VIM_PLUGIN_HELPTEXT}" ]] ; then
+		einfo " "
+		while read h ; do
+			einfo "$h"
+		done <<<"${VIM_PLUGIN_HELPTEXT}"
+		einfo " "
+
+	elif [[ -n "${VIM_PLUGIN_HELPURI}" ]] ; then
+		einfo " "
+		einfo "Documentation for this plugin is available online at:"
+		einfo "    ${VIM_PLUGIN_HELPURI}"
+		einfo " "
+	fi
+
+	if hasq "filetype" "${VIM_PLUGIN_MESSAGES}" ; then
+		einfo "This plugin makes use of filetype settings. To enable these,"
+		einfo "add lines like:"
+		einfo "    filetype plugin on"
+		einfo "    filetype indent on"
+		einfo "to your ~/.vimrc file."
+		einfo " "
+	fi
 }
+
diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass
index bf6d7811df5b..1d70700837b3 100644
--- a/eclass/vim-spell.eclass
+++ b/eclass/vim-spell.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.1 2005/09/28 18:27:00 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 
 #
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
@@ -24,16 +24,10 @@
 #   things. The vim herd will handle unmasking your spell packages when vim7
 #   comes out of package.mask.
 #
-# * Create the app-vim/vim-spell-${CODE} package. A sample ebuild will look
-#   something like (header removed):
-#
-#     VIM_SPELL_LANGUAGE="French"
-#
-#     inherit vim-spell
-#
-#     LICENSE="GPL-2"
-#     KEYWORDS="~sparc ~mips"
-#     IUSE=""
+# * Create the app-vim/vim-spell-${CODE} package. You should base your ebuild
+#   upon app-vim/vim-spell-en. You will need to change VIM_SPELL_LANGUAGE,
+#   KEYWORDS and LICENSE. Check the license carefully! The README will tell
+#   you what it is.
 #
 # * Don't forget metadata.xml. You should list vim as the herd, and yourself
 #   as the maintainer (there is no need to join the vim herd just for spell
@@ -61,7 +55,9 @@
 # spell files. It's best to let upstream know if you've generated spell files
 # for another language rather than keeping them Gentoo-specific.
 
-EXPORT_FUNCTIONS src_install
+inherit eutils
+
+EXPORT_FUNCTIONS src_install pkg_postinst
 
 IUSE=""
 DEPEND="|| ( >=app-editors/vim-7_alpha
@@ -74,9 +70,7 @@ if [[ -z "${VIM_SPELL_CODE}" ]] ; then
 	VIM_SPELL_CODE="${PN/vim-spell-/}"
 fi
 
-if [[ -z "${DESCRIPTION}" ]] ; then
-	DESCRIPTION="vim spell files: ${VIM_SPELL_LANGUAGE} (${VIM_SPELL_CODE})"
-fi
+DESCRIPTION="vim spell files: ${VIM_SPELL_LANGUAGE} (${VIM_SPELL_CODE})"
 
 if [[ -z "${HOMEPAGE}" ]] ; then
 	HOMEPAGE="http://www.vim.org/"
@@ -100,3 +94,24 @@ vim-spell_src_install() {
 	[[ -z "${had_spell_file}" ]] && die "Didn't install any spell files?"
 }
 
+vim-spell_pkg_postinst() {
+	target="/usr/share/vim/vimfiles/spell/"
+	echo
+	einfo "To enable ${VIM_SPELL_LANGUAGE} spell checking, use"
+	einfo "    :setlocal spell spelllang=${VIM_SPELL_CODE}"
+	echo
+	einfo "The following (Vim internal, not file) encodings are supported for"
+	einfo "this language:"
+	for f in "${ROOT}/${target}/${VIM_SPELL_CODE}".*.spl ; do
+		enc="${f##*/${VIM_SPELL_CODE}.}"
+		enc="${enc%.spl}"
+		[[ -z "${enc}" ]] && continue
+		einfo "    ${enc}"
+	done
+	echo
+	einfo "For further documentation, use:"
+	einfo "    :help spell"
+	echo
+	epause
+}
+
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index 248a0022386c..5adaf82f1df4 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,110 +1,808 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author Ryan Phillips <rphillips@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.1 2002/10/27 22:40:58 rphillips Exp $
-# Ripped from the vim ebuilds. src_compile and install
-# should be integrated in at some point
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-213.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.1.1.1 2005/11/30 09:59:30 chriswhite Exp $
+
+# Authors:
+# 	Ryan Phillips <rphillips@gentoo.org>
+# 	Seemant Kulleen <seemant@gentoo.org>
+# 	Aron Griffis <agriffis@gentoo.org>
+# 	Ciaran McCreesh <ciaranm@gentoo.org>
+
+# This eclass handles vim, gvim and vim-core.  Support for -cvs ebuilds is
+# included in the eclass, since it's rather easy to do, but there are no
+# official vim*-cvs ebuilds in the tree.
+
+# gvim's GUI preference order is as follows:
+# aqua                          CARBON (not tested, 7+)
+# -aqua gtk gnome               GNOME2 (6.3-r1+, earlier uses GTK2)
+# -aqua gtk -gnome              GTK2
+# -aqua -gtk qt                 QT (7+)
+# -aqua -gtk -qt motif          MOTIF
+# -aqua -gtk -motif nextaw      NEXTAW (7+)
+# -aqua -gtk -motif -nextaw     ATHENA
+
+inherit eutils vim-doc flag-o-matic versionator fdo-mime
+
+# Support -cvs ebuilds, even though they're not in the official tree.
+MY_PN="${PN%-cvs}"
+
+# This isn't a conditional inherit from portage's perspective, since $MY_PN is
+# constant at cache creation time. It's therefore legal and doesn't break
+# anything. I even checked with carpaski first :) (08 Sep 2004 ciaranm)
+if [[ "${MY_PN}" != "vim-core" ]] && ! version_is_at_least "6.3.086" ; then
+	inherit debug
+fi
+
+if [[ "${PN##*-}" == "cvs" ]] ; then
+	inherit cvs
+fi
+
+if version_is_at_least 6.3.1 ; then
+	inherit bash-completion
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install src_test pkg_postinst pkg_postrm
+
+if version_is_at_least "6.4_beta" ; then
+	IUSE="nls acl"
 else
-	die "Eek!  I don't know how to interpret the version!"
+	IUSE="selinux nls acl"
+fi
+
+if version_is_at_least "6.3.086" ; then
+#	DEPEND="${DEPEND} nls? ( elibc_uclib? ( dev-libs/libiconv ) )"
+#	RDEPEND="${RDEPEND} nls? ( elibc_uclib? ( dev-libs/libiconv ) )"
+	:
+elif version_is_at_least "6.3.075" ; then
+	IUSE="${IUSE} termcap-compat"
+else
+	IUSE="${IUSE} ncurses"
+fi
+
+if [[ "${MY_PN}" == "vim-core" ]] ; then
+	IUSE="${IUSE} livecd"
+else
+	IUSE="${IUSE} cscope gpm perl python ruby"
+	DEPEND="${DEPEND}
+		cscope?  ( dev-util/cscope )
+		gpm?     ( >=sys-libs/gpm-1.19.3 )
+		perl?    ( dev-lang/perl )
+		python?  ( dev-lang/python )
+		acl?     ( sys-apps/acl )
+		ruby?    ( virtual/ruby )"
+	RDEPEND="${RDEPEND}
+		cscope?  ( dev-util/cscope )
+		gpm?     ( >=sys-libs/gpm-1.19.3 )
+		perl?    ( dev-lang/perl )
+		python?  ( dev-lang/python )
+		acl?     ( sys-apps/acl )
+		ruby?    ( virtual/ruby )"
+
+	if ! version_is_at_least "6.4_beta" ; then
+		DEPEND="${DEPEND} selinux? ( sys-libs/libselinux )"
+		RDEPEND="${RDEPEND} selinux? ( sys-libs/libselinux )"
+	fi
+
+	if [[ "${MY_PN}" == "vim" ]] ; then
+		IUSE="${IUSE} vim-with-x minimal"
+		# see bug #111979 for modular X deps
+		DEPEND="${DEPEND} vim-with-x? ( || (
+			( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto )
+			virtual/x11 ) )"
+		RDEPEND="${RDEPEND} vim-with-x? ( || ( x11-libs/libXt virtual/x11 ) )"
+	elif [[ "${MY_PN}" == "gvim" ]] ; then
+		if version_is_at_least "6.3.086" ; then
+			IUSE="${IUSE} gnome gtk motif"
+		else
+			IUSE="${IUSE} gnome gtk gtk2 motif"
+		fi
+	fi
+fi
+
+# vim7 has some extra options. tcltk is working again, and mzscheme support
+# has been added. netbeans now has its own USE flag, but it's only available
+# under gvim. We have a few new GUI toolkits, and we can also install a
+# vimpager (this is in vim6 as well, but the ebuilds don't handle it).
+if [[ $(get_major_version ) -ge 7 ]] ; then
+	if [[ "${MY_PN}" != "vim-core" ]] ; then
+		IUSE="${IUSE} tcltk mzscheme"
+		DEPEND="${DEPEND}
+			tcltk?    ( dev-lang/tcl )
+			mzscheme? ( dev-lisp/mzscheme )"
+		RDEPEND="${RDEPEND}
+			tcltk?    ( dev-lang/tcl )
+			mzscheme? ( dev-lisp/mzscheme )"
+	fi
+	if [[ "${MY_PN}" == "gvim" ]] ; then
+		IUSE="${IUSE} netbeans aqua nextaw qt"
+		DEPEND="${DEPEND}   netbeans? ( dev-util/netbeans )"
+		RDEPEND="${RDEPEND} netbeans? ( dev-util/netbeans )"
+	fi
+	if [[ "${MY_PN}" == "vim" ]] ; then
+		IUSE="${IUSE} vim-pager"
+	fi
+
+	# app-vim blocks
+	if [[ "${MY_PN}" != "vim-core" ]] ; then
+		# align: bug 79982
+		RDEPEND="${RDEPEND}
+			!<app-vim/align-30-r1
+			!app-vim/vimspell
+			!<app-vim/vimbuddy-0.9.1-r1
+			!app-vim/autoalign
+			!app-vim/supertab"
+	fi
 fi
 
 HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
-KEYWORDS="x86 ppc sparc sparc64 alpha"
-
-DEPEND="dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-src_unpack() {
+
+# Portage dependancy is for use_with/use_enable.
+# ctags dependancy allows help tags to be rebuilt properly, along
+# with detection of exuberant-ctags by configure.
+DEPEND="${DEPEND}
+	>=sys-apps/portage-2.0.45-r3
+	>=sys-apps/sed-4
+	sys-devel/autoconf
+	dev-util/ctags"
+RDEPEND="${RDEPEND} dev-util/ctags"
+
+if version_is_at_least "6.3.086" ; then
+	DEPEND="${DEPEND} >=sys-libs/ncurses-5.2-r2"
+	RDEPEND="${RDEPEND} >=sys-libs/ncurses-5.2-r2"
+elif version_is_at_least "6.3.075" ; then
+	DEPEND="${DEPEND}
+		!termcap-compat?  ( >=sys-libs/ncurses-5.2-r2 )
+		termcap-compat?   ( sys-libs/libtermcap-compat )"
+	RDEPEND="${RDEPEND}
+		!termcap-compat?  ( >=sys-libs/ncurses-5.2-r2 )
+		termcap-compat?   ( sys-libs/libtermcap-compat )"
+else
+	DEPEND="${DEPEND}
+		ncurses?  ( >=sys-libs/ncurses-5.2-r2 )
+		!ncurses? ( sys-libs/libtermcap-compat )"
+	RDEPEND="${RDEPEND}
+		ncurses?  ( >=sys-libs/ncurses-5.2-r2 )
+		!ncurses? ( sys-libs/libtermcap-compat )"
+fi
+
+apply_vim_patches() {
+	local p
+	cd ${S} || die "cd ${S} failed"
+
+	# Scan the patches, applying them only to files that either
+	# already exist or that will be created by the patch
+	#
+	# Changed awk to gawk in the below; BSD's awk chokes on it
+	# --spb, 2004/12/18
+	einfo "Filtering vim patches ..."
+	p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch
+	ls ${WORKDIR}/vimpatches | sort | \
+	while read f; do gzip -dc ${WORKDIR}/vimpatches/${f}; done | gawk '
+		/^Subject: Patch/ {
+			if (patchnum) {printf "\n" >"/dev/stderr"}
+			patchnum = $3
+			printf "%s:", patchnum >"/dev/stderr"
+		}
+		$1=="***" && $(NF-1)~/^[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/ {
+			# First line of a patch; suppress printing
+			firstlines = $0
+			next
+		}
+		$1=="---" && $(NF-1)~/^[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/ {
+			# Second line of a patch; try to open the file to see
+			# if it exists.
+			thisfile = $2
+			if (!seen[thisfile] && (getline tryme < thisfile) == -1) {
+				# Check if it will be created
+				firstlines = firstlines "\n" $0
+				getline
+				firstlines = firstlines "\n" $0
+				getline
+				if ($0 != "*** 0 ****") {
+					# Non-existent and not created, stop printing
+					printing = 0
+					printf " (%s)", thisfile >"/dev/stderr"
+					next
+				}
+			}
+			# Print the previous lines and start printing
+			print firstlines
+			printing = 1
+			printf " %s", thisfile >"/dev/stderr"
+			# Remember that we have seen this file
+			seen[thisfile] = 1
+		}
+		printing { print }
+		END { if (patchnum) {printf "\n" >"/dev/stderr"} }
+		' > ${p} || die
+
+	# For reasons yet unknown, epatch fails to apply this cleanly
+	ebegin "Applying filtered vim patches ..."
+	TMPDIR=${T} patch -f -s -p0 < ${p}
+	eend 0
+}
+
+vim_pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+}
+
+vim_src_unpack() {
 	unpack ${A}
+
+	if [[ "${PN##*-}" == "cvs" ]] ; then
+		ECVS_SERVER="cvs.sourceforge.net:/cvsroot/vim"
+		ECVS_PASS=""
+		if [[ $(get_major_version ) -ge 7 ]] ; then
+			ECVS_MODULE="vim7"
+		else
+			ECVS_MODULE="vim"
+		fi
+		ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
+		cvs_src_unpack
+
+	else
+		# Apply any patches available from vim.org for this version
+		[[ -n "$VIM_ORG_PATCHES" ]] && apply_vim_patches
+
+		# Unpack the runtime snapshot if available (only for vim-core)
+		if [[ -n "$VIM_RUNTIME_SNAP" ]] ; then
+			cd ${S} || die
+			ebegin "Unpacking vim runtime snapshot"
+			rm -rf runtime
+			# Changed this from bzip2 |tar to tar -j since the former broke for
+			# some reason on freebsd.
+			#  --spb, 2004/12/18
+			tar xjf ${DISTDIR}/${VIM_RUNTIME_SNAP}
+			assert  # this will check both parts of the pipeline; eend would not
+			eend 0
+		fi
+	fi
+
+	# Another set of patches borrowed from src rpm to fix syntax errors etc.
+	cd ${S} || die "cd ${S} failed"
+	EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
+		epatch ${WORKDIR}/gentoo/patches-all/
+
+	# Unpack an updated netrw snapshot if necessary. This is nasty. Don't
+	# ask, you don't want to know.
+	if [[ -n "${VIM_NETRW_SNAP}" ]] ; then
+		ebegin "Unpacking updated netrw snapshot"
+		tar xjf ${DISTDIR}/${VIM_NETRW_SNAP} -C runtime/
+		eend $?
+	fi
+
 	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-	
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				echo -n "Applying patch $a..."
-				patch -p0 < $a > /dev/null || die
-				echo "OK"
-			done
-			;;
-	esac
-	
-	# Also apply the ebuild syntax patch, until this is in Vim proper
-	cd $S/runtime
-	patch -f -p0 < ${FILESDIR}/ebuild.patch
+	sed -i '1s|.*|#!/usr/bin/awk -f|' ${S}/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Patch to build with ruby-1.8.0_pre5 and following
+	sed -i 's/defout/stdout/g' ${S}/src/if_ruby.c
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> ${S}/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "/etc/vim/gvimrc"' >> ${S}/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		${S}/runtime/doc/syntax.txt \
+		${S}/runtime/doc/tagsrch.txt \
+		${S}/runtime/doc/usr_29.txt \
+		${S}/runtime/menu.vim \
+		${S}/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' ${S}/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find ${S} -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# if we're vim-7 and USE vim-pager, make the manpager.sh script
+	if [[ "${MY_PN}" == "vim" ]] && [[ $(get_major_version ) -ge 7 ]] \
+			&& use vim-pager ; then
+		cat <<END > ${S}/runtime/macros/manpager.sh
+#!/bin/sh
+tr '\\267' '.' | col -b | \\
+		vim \\
+			-c 'let no_plugin_maps = 1' \\
+			-c 'set nolist nomod ft=man' \\
+			-c 'let g:showmarks_enable=0' \\
+			-c 'runtime! macros/less.vim' -
+END
+	fi
+
+}
+
+vim_src_compile() {
+	local myconf confrule
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	ebegin "Creating configure script"
+	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	# vim-6.2 changed the name of this rule from auto/configure to autoconf
+	confrule=auto/configure
+	grep -q ^autoconf: src/Makefile && confrule=autoconf
+	# autoconf-2.13 needed for this package -- bug 35319
+	# except it seems we actually need 2.5 now -- bug 53777
+	WANT_AUTOCONF=2.5 \
+		make -C src $confrule || die "make $confrule failed"
+	eend $?
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if [[ "${MY_PN}" == "vim-core" ]] ||
+			( [[ "${MY_PN}" == "vim" ]] && use minimal ); then
+		myconf="--with-features=tiny \
+			--enable-gui=no \
+			--without-x \
+			--disable-perlinterp \
+			--disable-pythoninterp \
+			--disable-rubyinterp \
+			--disable-gpm"
+
+	else
+		if ! version_is_at_least "6.3.086" ; then
+			use debug && append-flags "-DDEBUG"
+		fi
+
+		myconf="--with-features=huge \
+			--enable-multibyte"
+		myconf="${myconf} `use_enable cscope`"
+		myconf="${myconf} `use_enable gpm`"
+		myconf="${myconf} `use_enable perl perlinterp`"
+		myconf="${myconf} `use_enable python pythoninterp`"
+		myconf="${myconf} `use_enable ruby rubyinterp`"
+		# tclinterp is broken; when you --enable-tclinterp flag, then
+		# the following command never returns:
+		#   VIMINIT='let OS=system("uname -s")' vim
+		# vim7 seems to be ok though. (24 Sep 2004 ciaranm)
+		if [[ $(get_major_version ) -ge 7 ]] ; then
+			myconf="${myconf} `use_enable tcltk tclinterp`"
+			myconf="${myconf} `use_enable mzscheme mzschemeinterp`"
+			if [[ "${MY_PN}" == "gvim" ]] ; then
+				myconf="${myconf} `use_enable netbeans`"
+			fi
+		fi
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		if [[ "${MY_PN}" == "vim" ]] ; then
+			# don't test USE=X here ... see bug #19115
+			# but need to provide a way to link against X ... see bug #20093
+			myconf="${myconf} --enable-gui=no `use_with vim-with-x x`"
+
+		elif [[ "${MY_PN}" == "gvim" ]] ; then
+			myconf="${myconf} --with-vim-name=gvim --with-x"
+
+			echo ; echo
+			if [[ $(get_major_version ) -ge 7 ]] && use aqua ; then
+				einfo "Building gvim with the Carbon GUI"
+				myconf="${myconf} --enable-gui=carbon"
+			elif use gtk ; then
+				if version_is_at_least "6.3.086" ; then
+					myconf="${myconf} --enable-gtk2-check"
+					if use gnome ; then
+						einfo "Building gvim with the Gnome 2 GUI"
+						myconf="${myconf} --enable-gui=gnome2"
+					else
+						einfo "Building gvim with the gtk+-2 GUI"
+						myconf="${myconf} --enable-gui=gtk2"
+					fi
+				else
+					if use gtk2 ; then
+						myconf="${myconf} --enable-gtk2-check"
+						if use gnome ; then
+							einfo "Building gvim with the Gnome 2 GUI"
+							myconf="${myconf} --enable-gui=gnome2"
+						else
+							einfo "Building gvim with the gtk+-2 GUI"
+							myconf="${myconf} --enable-gui=gtk2"
+						fi
+					else
+						if use gnome ; then
+							einfo "Building gvim with the Gnome 1 GUI"
+							myconf="${myconf} --enable-gui=gnome"
+						else
+							einfo "Building gvim with the gtk+-1.2 GUI"
+							myconf="${myconf} --enable-gui=gtk"
+						fi
+					fi
+				fi
+			elif [[ $(get_major_version ) -ge 7 ]] && use qt ; then
+				einfo "Building gvim with the Qt GUI"
+				myconf="${myconf} --enable-gui=kde --enable-kde-toolbar"
+			elif use motif ; then
+				einfo "Building gvim with the MOTIF GUI"
+				myconf="${myconf} --enable-gui=motif"
+			elif [[ $(get_major_version ) -ge 7 ]] && use nextaw ; then
+				einfo "Building gvim with the neXtaw GUI"
+				myconf="${myconf} --enable-gui=nextaw"
+			else
+				einfo "Building gvim with the Athena GUI"
+				myconf="${myconf} --enable-gui=athena"
+			fi
+			echo ; echo
+
+		else
+			die "vim.eclass doesn't understand MY_PN=${MY_PN}"
+		fi
+	fi
+
+	if [[ "${MY_PN}" == "vim" ]] && use minimal ; then
+		myconf="${myconf} --disable-nls --disable-multibyte --disable-acl"
+	else
+		myconf="${myconf} `use_enable nls` `use_enable acl`"
+	fi
+
+	# Note: If USE=gpm, then ncurses will still be required. See bug #93970
+	# for the reasons behind the USE flag change.
+	if version_is_at_least "6.3.086" ; then
+		myconf="${myconf} --with-tlib=ncurses"
+	elif version_is_at_least "6.3.075" ; then
+		use termcap-compat \
+			&& myconf="${myconf} --with-tlib=termcap" \
+			|| myconf="${myconf} --with-tlib=ncurses"
+	else
+		use ncurses \
+			&& myconf="${myconf} --with-tlib=ncurses" \
+			|| myconf="${myconf} --with-tlib=termcap"
+	fi
+
+	if version_is_at_least "6.4_beta" ; then
+		myconf="${myconf} --disable-selinux"
+	else
+		use selinux \
+			|| myconf="${myconf} --disable-selinux"
+	fi
+
+	econf ${myconf} || die "vim configure failed"
+
+	# The following allows emake to be used
+	make -C src auto/osdef.h objects || die "make failed"
+
+	if [[ "${MY_PN}" == "vim-core" ]] ; then
+		emake tools || die "emake tools failed"
+		rm -f src/vim
+	else
+		if version_is_at_least "6.3.075" ; then
+			if ! emake ; then
+				eerror "If the above messages seem to be talking about perl"
+				eerror "and undefined references, please try re-emerging both"
+				eerror "perl and libperl with the same USE flags. For more"
+				eerror "information, see:"
+				eerror "    https://bugs.gentoo.org/show_bug.cgi?id=18129"
+				die "emake failed"
+			fi
+		else
+			if [[ $(get_major_version ) -ge 7 ]] ; then
+				# parallel make temporarily b0rked -- ciaranm, 20051127
+				emake -j1 || die "emake failed"
+			else
+				emake || die "emake failed"
+			fi
+		fi
+	fi
+
+	[[ $(get_major_version ) -ge 7 ]] && [[ -f src/kvim ]] && mv src/{k,g}vim
+}
+
+vim_src_install() {
+	if [[ "${MY_PN}" == "vim-core" ]] ; then
+		dodir /usr/{bin,share/{man/man1,vim}}
+		cd src || die "cd src failed"
+		if [[ $(get_major_version ) -ge 7 ]] ; then
+			make \
+				installruntime \
+				installmanlinks \
+				installmacros \
+				installtutor \
+				installtools \
+				install-languages \
+				install-icons \
+				DESTDIR=${D} \
+				BINDIR=/usr/bin \
+				MANDIR=/usr/share/man \
+				DATADIR=/usr/share \
+				|| die "install failed"
+		else
+			make \
+				installruntime \
+				installhelplinks \
+				installmacros \
+				installtutor \
+				installtools \
+				install-languages \
+				install-icons \
+				DESTDIR=${D} \
+				BINDIR=/usr/bin \
+				MANDIR=/usr/share/man \
+				DATADIR=/usr/share \
+				|| die "install failed"
+		fi
+
+		keepdir /usr/share/vim/vim${VIM_VERSION/./}/keymap
+
+		# default vimrc is installed by vim-core since it applies to
+		# both vim and gvim
+		insinto /etc/vim/
+		newins ${FILESDIR}/vimrc${VIMRC_FILE_SUFFIX} vimrc
+
+		if use livecd ; then
+			# To save space, install only a subset of the files if we're on a
+			# livecd. bug 65144.
+			einfo "Removing some files for a smaller livecd install ..."
+
+			local vimfiles=${D}/usr/share/vim/vim${VIM_VERSION/.}
+			shopt -s extglob
+			rm -fr ${vimfiles}/{compiler,doc,ftplugin,indent}
+			rm -fr ${vimfiles}/{macros,print,tools,tutor}
+			rm ${D}/usr/bin/vimtutor
+
+			local keep_colors="default"
+			ignore=$(rm -fr ${vimfiles}/colors/!(${keep_colors}).vim )
+
+			local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+			# tinkering with the next line might make bad things happen ...
+			keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+			ignore=$(rm -fr ${vimfiles}/syntax/!(${keep_syntax}).vim )
+		fi
+
+		# These files might have slight security issues, so we won't
+		# install them. See bug #77841. We don't mind if these don't
+		# exist.
+		rm ${D}/usr/share/vim/vim${VIM_VERSION/.}/tools/{vimspell.sh,tcltags} \
+			|| true
+
+	elif [[ "${MY_PN}" == "gvim" ]] ; then
+		dobin src/gvim
+		dosym gvim /usr/bin/gvimdiff
+		dosym gvim /usr/bin/evim
+		dosym gvim /usr/bin/eview
+		# bug #74349 says we should install these
+		if version_is_at_least "6.3-r4" ; then
+			dosym gvim /usr/bin/gview
+			dosym gvim /usr/bin/rgvim
+			dosym gvim /usr/bin/rgview
+		fi
+		insinto /etc/vim
+		newins ${FILESDIR}/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
+
+		# as of 6.3-r1, we install a desktop entry. bug #44633, and bug #68622
+		# for the nicer updated version.
+		insinto /usr/share/applications
+		doins ${FILESDIR}/gvim.desktop
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/gvim.xpm
+
+	else
+		dobin src/vim
+		ln -s vim ${D}/usr/bin/vimdiff && \
+		ln -s vim ${D}/usr/bin/rvim && \
+		ln -s vim ${D}/usr/bin/ex && \
+		ln -s vim ${D}/usr/bin/view && \
+		ln -s vim ${D}/usr/bin/rview \
+			|| die "/usr/bin symlinks failed"
+		if [[ $(get_major_version ) -ge 7 ]] && use vim-pager ; then
+			ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/less.sh \
+					${D}/usr/bin/vimpager
+			ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/manpager.sh \
+					${D}/usr/bin/vimmanpager
+			insinto /usr/share/vim/vim${VIM_VERSION//./}/macros
+			doins runtime/macros/manpager.sh
+			fperms a+x /usr/share/vim/vim${VIM_VERSION//./}/macros/manpager.sh
+		fi
+	fi
+
+	# bash completion script, bug #79018.
+	if version_is_at_least 6.3.1 ; then
+		if [[ "${MY_PN}" == "vim-core" ]] ; then
+			dobashcompletion ${FILESDIR}/xxd-completion xxd
+		else
+			dobashcompletion ${FILESDIR}/${MY_PN}-completion ${MY_PN}
+		fi
+	fi
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vi vimdiff rvim ex view rview"
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f ${ROOT}/usr/bin/gvim ]]; then
+		ln -s gvim ${ROOT}/usr/bin/vim 2>/dev/null
+	elif [[ -L ${ROOT}/usr/bin/vim && ! -f ${ROOT}/usr/bin/vim ]]; then
+		rm ${ROOT}/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f ${ROOT}/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim ${ROOT}/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L ${ROOT}/usr/bin/${f} && ! -f ${ROOT}/usr/bin/${f} ]]; then
+				rm -f ${ROOT}/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+vim_pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	if [[ "${MY_PN}" == "gvim" ]] ; then
+		fdo-mime_mime_database_update
+	fi
+
+	if [[ $(get_major_version ) -lt 7 ]] ; then
+		if [[ "${MY_PN}" == "gvim" ]] ; then
+			echo
+			einfo "To enable UTF-8 viewing, set guifont and guifontwide: "
+			einfo ":set guifont=-misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1"
+			einfo ":set guifontwide=-misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1"
+			einfo
+			einfo "note: to find out which fonts you can use, please read the UTF-8 help:"
+			einfo ":h utf-8"
+			einfo
+			einfo "Then, set read encoding to UTF-8:"
+			einfo ":set encoding=utf-8"
+		elif [[ "${MY_PN}" == "vim" ]] ; then
+			echo
+			einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
+		fi
+	else
+		if [[ "${MY_PN}" == "gvim" ]] ; then
+			echo
+			# TODO: once we have all the GUIs working, display a message
+			# explaining them.
+		elif [[ "${MY_PN}" == "vim" ]] ; then
+			echo
+			einfo "To install a GUI version of vim, use the app-editors/gvim"
+			einfo "package."
+		fi
+		echo
+		einfo "Vim 7 includes an integrated spell checker. You need to install"
+		einfo "word list files before you can use it. There are ebuilds for"
+		einfo "some of these named app-vim/vim-spell-*. If your language of"
+		einfo "choice is not included, please consult vim-spell.eclass for"
+		einfo "instructions on how to make a package."
+		ewarn
+		ewarn "Note that the English word lists are no longer installed by"
+		ewarn "default."
+	fi
+
+	if [[ "${MY_PN}" != "vim-core" ]] ; then
+		echo
+		einfo "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
+	fi
+
+	# Warn about VIMRUNTIME
+	if [ -n "$VIMRUNTIME" -a "${VIMRUNTIME##*/vim}" != "${VIM_VERSION/./}" ] ; then
+		ewarn
+		ewarn "WARNING: You have VIMRUNTIME set in your environment from an old"
+		ewarn "installation.  You will need to either unset VIMRUNTIME in each"
+		ewarn "terminal, or log out completely and back in.  This problem won't"
+		ewarn "happen again since the ebuild no longer sets VIMRUNTIME."
+	fi
+
+	# Scream loudly if the user is using a -cvs ebuild
+	if [[ -z "${PN/*-cvs/}" ]] ; then
+		ewarn
+		ewarn "You are using a -cvs ebuild. Be warned that this is not"
+		ewarn "officially supported and may not work."
+		ebeep 5
+	fi
+
+	echo
+
+	if version_is_at_least 6.3.1 ; then
+		bash-completion_pkg_postinst
+	fi
 
+	# Make convenience symlinks
+	update_vim_symlinks
 }
 
+vim_pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+
+	# Update fdo mime stuff, bug #78394
+	if [[ "${MY_PN}" == "gvim" ]] ; then
+		fdo-mime_mime_database_update
+	fi
+}
+
+vim_src_test() {
+
+	if [[ "${MY_PN}" == "vim-core" ]] ; then
+		einfo "No testing needs to be done for vim-core"
+		return
+	fi
+
+	einfo " "
+	einfo "Starting vim tests. Several error messages will be shown "
+	einfo "whilst the tests run. This is normal behaviour and does not "
+	einfo "indicate a fault."
+	einfo " "
+	ewarn "If the tests fail, your terminal may be left in a strange "
+	ewarn "state. Usually, running 'reset' will fix this."
+	ewarn " "
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	if [[ "${MY_PN}" == "gvim" ]] ; then
+		# Make gvim not try to connect to X. See :help gui-x11-start
+		# in vim for how this evil trickery works.
+		ln -s ${S}/src/gvim ${S}/src/testvim
+		testprog="../testvim"
+	else
+		testprog="../vim"
+	fi
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd ${S}/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i -e 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+
+	# Give the user time to read the "what to do if these break" messages
+	epause 10
+
+	# Don't try to do the additional GUI test
+	make VIMPROG=${testprog} nongui \
+		|| die "At least one test failed"
+}
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index c261ad7d1e3a..d5248d47668e 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,26 +1,90 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.1.1.1 2005/11/30 09:59:31 chriswhite Exp $
+#
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.1 2002/04/09 06:17:29 azarah Exp $
+#
 # This eclass can be used for packages that needs a working X environment to build
-ECLASS=virtualx
-newdepend virtual/x11
+
+DEPEND="X? ( || ( x11-base/xorg-server virtual/x11 ) )"
+IUSE="X"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 
+#
+# Brian Harring <ferringb@gentoo.org> 11/04/2004
+# do not disable the sandbox during the depend phase.
+# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
+#
+if [[ ${EBUILD_PHASE/depend} == "${EBUILD_PHASE}" ]] ; then
+	[[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
+fi
+
 virtualmake() {
 	local retval=0
-	local Xconnect="/usr/X11R6/bin/xhost"
+	local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
+	local XVFB=$(type -p Xvfb)
+	local XHOST=$(type -p xhost)
+
+	# If $DISPLAY is not set, or xhost cannot connect to an X
+	# display, then do the Xvfb hack.
+	if [[ -n ${XVFB} && -n ${XHOST} ]] && \
+	   ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
+		export XAUTHORITY=
+		# The following is derived from Mandrake's hack to allow
+		# compiling without the X display
+
+		einfo "Scanning for a open DISPLAY to start Xvfb ..."
+
+		# We really do not want SANDBOX enabled here
+		export SANDBOX_DISABLED="1"
 
-	#If $DISPLAY is not set, or xhost cannot connect to an X
-	#display, then do the Xvfb hack.
-	if [ -z "$DISPLAY" ] || ! /usr/X11R6/bin/xhost
-	then
-		# Mandrake's hack to allow compiling without the X display
 		local i=0
-		XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i})
-		/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x32 &>/dev/null &
-		
+		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i})
+
+		# If we are in a chrooted environment, and there is already a
+		# X server started outside of the chroot, Xvfb will fail to start
+		# on the same display (most cases this is :0 ), so make sure
+		# Xvfb is started, else bump the display number
+		#
+		# Azarah - 5 May 2002
+		#
+		# Changed the mode from 800x600x32 to 800x600x24 because the mfb
+		# support has been dropped in Xvfb in the xorg-x11 pre-releases.
+		# For now only depths up to 24-bit are supported.
+		#
+		# Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
+		#
+		${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
+		sleep 2
+
+		local start=${XDISPLAY}
+		while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
+			# Stop trying after 15 tries
+			if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
+
+				eerror ""
+				eerror "Unable to start Xvfb."
+				eerror ""
+				eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
+				eerror ""
+				${XVFB} :${XDISPLAY} -screen 0 800x600x24
+				eerror ""
+				eerror "If possible, correct the above error and try your emerge again."
+				eerror ""
+				die
+			fi
+
+			XDISPLAY=$((${XDISPLAY}+1))
+			${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
+			sleep 2
+		done
+
+		# Now enable SANDBOX again if needed.
+		export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
+
+		einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
+
 		export DISPLAY=:${XDISPLAY}
 		#Do not break on error, but setup $retval, as we need
 		#to kill Xvfb
@@ -34,18 +98,24 @@ virtualmake() {
 		${maketype} $*
 		retval=$?
 	fi
-	return $retval
+
+	return ${retval}
 }
 
 #Same as "make", but setup the Xvfb hack if needed
-xmake() {
+Xmake() {
 	export maketype="make"
 	virtualmake "$*"
 }
 
 #Same as "emake", but setup the Xvfb hack if needed
-xemake() {
+Xemake() {
 	export maketype="emake"
 	virtualmake "$*"
 }
 
+#Same as "econf", but setup the Xvfb hack if needed
+Xeconf() {
+	export maketype="econf"
+	virtualmake "$*"
+}
diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass
index 221e174ff533..4aa8e698e203 100644
--- a/eclass/webapp-apache.eclass
+++ b/eclass/webapp-apache.eclass
@@ -1,14 +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/eclass/webapp-apache.eclass,v 1.1 2003/08/03 19:20:11 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 #
 # Author: Stuart Herbert <stuart@gentoo.org>
-# 
+#
 # Based on discussions held on gentoo-dev mailing list, and a bug report
-# contributed by <??> in bug #14870, and robbat2's mod_php ebuild
+# contributed by Ian Leitch <port001@w0r.mine.nu> in bug #14870,
+# and robbat2's mod_php ebuild
+#
+# This package will be offically depreciated when vhost-config and
+# webapp-config from GLEP11 are released.
+
+IUSE="apache2"
+DEPEND="${DEPEND} net-www/apache"
 
-ECLASS=webapp-apache
-INHERITED="$INHERITED $ECLASS"
+EXPORT_FUNCTIONS pkg_setup
 
 # NOTE:
 #
@@ -19,36 +25,66 @@ INHERITED="$INHERITED $ECLASS"
 
 function webapp-apache-detect ()
 {
-	local domsg=
-	[ -n "$1" ] && domsg=1
-
 	APACHEVER=
-	has_version '=net-www/apache-1*' && APACHEVER=1
-	has_version '=net-www/apache-2*' && use apache2 && APACHEVER=2
-	[ -z "${APACHEVER}" ] && has_version '=net-www/apache-2*' && APACHEVER=2
+	has_version '=net-www/apache-1*' && APACHEVER=1 && CONFVER=
+	has_version '=net-www/apache-2*' && use apache2 && APACHEVER=2 && CONFVER=2
+	[ -z "${APACHEVER}" ] && has_version '=net-www/apache-2*' && APACHEVER=2 && CONFVER=2
 
 	if [ "${APACHEVER}+" = "+" ]; then
 		# no apache version detected
-		eerror "I can't find a copy of Apache on your machine"
-		die 1
+		return 1
 	fi
 
-	APACHECONF="/etc/apache${APACHEVER}/conf/apache${APACHEVER}.conf"
+	APACHECONF="/etc/apache${CONFVER}/conf/apache${CONFVER}.conf"
+	APACHECONF_COMMON="/etc/apache${CONFVER}/conf/commonapache${CONFVER}.conf"
+	APACHECONF_DIR="/etc/apache${CONFVER}/conf/"
 	WEBAPP_SERVER="Apache v${APACHEVER}"
 }
 
 # run the function, so we know which version of apache we are using
-webapp-apache-detect
 
-function webapp-determine-htdocsdir ()
-{
+function webapp-detect () {
+	webapp-apache-detect || return 1
 	webapp-determine-installowner
+	webapp-determine-htdocsdir
+	webapp-determine-cgibindir
+
+	# explicit return here to ensure the return code
+	# from webapp-determine-cgibindir above isn't returned instead
+
+	return 0
+}
+
+function webapp-mkdirs () {
+	webapp-determine-htdocsdir
+	webapp-determine-cgibindir
 
-	HTTPD_ROOT="`grep '^DocumentRoot' ${APACHECONF} | cut -d ' ' -f 2`"
-	[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
 	keepdir "$HTTPD_ROOT"
-	fowners "$HTTPD_USER"."$HTTPD_GROUP" "$HTTPD_ROOT"
+	fowners "$HTTPD_USER":"$HTTPD_GROUP" "$HTTPD_ROOT"
 	fperms 755 "$HTTPD_ROOT"
+
+	# explicit return here to ensure the return code
+	# from above isn't returned instead
+
+	return 0
+}
+
+function webapp-determine-htdocsdir ()
+{
+	webapp-determine-installowner
+
+#	HTTPD_ROOT="`grep '^DocumentRoot' ${APACHECONF} | cut -d ' ' -f 2`"
+#    [ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs/"
+	# temporary fix for webapps
+	HTTPD_ROOT="/var/www/localhost/htdocs/"
+}
+
+function webapp-determine-cgibindir ()
+{
+	#HTTPD_CGIBIN="`grep 'ScriptAlias /cgi-bin/' ${APACHECONF_COMMON} | cut -d ' ' -f 7`"
+	#[ -z "${HTTPD_CGIBIN}" ] && HTTPD_CGIBIN="/home/httpd/cgi-bin/"
+	# temporary fix for webapps
+	HTTPD_CGIBIN="/var/www/localhost/cgi-bin/"
 }
 
 function webapp-determine-installowner ()
@@ -57,3 +93,48 @@ function webapp-determine-installowner ()
 	HTTPD_GROUP="apache"
 }
 
+
+function webapp-pkg_setup ()
+{
+	if [ "$1" == "1" ]; then
+		msg="I couldn't find an installation of Apache"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+
+	ewarn "Ebuilds (like this one) that use the webapp-apache.eclass need to"
+	ewarn "be converted to use the new webapp.eclass, to be compatible with"
+	ewarn "webapp-config."
+	ewarn
+	ewarn "Please file a bug on http://bugs.gentoo.org/, stating that this"
+	ewarn "ebuild needs converting to use the new approach."
+}
+
+# shamelessly stolen from Max Kalika <max@gentoo.org>'s horde stuff ;-)
+#
+# call this from your ebuild's pkg_setup() function!!
+
+function webapp-check-php ()
+{
+	local missing=""
+	local php_use="$(</var/db/pkg/`best_version dev-php/mod_php`/USE)"
+	local i
+
+	for i in $* ; do
+		if [ ! "`has ${i} ${php_use}`" ] ; then
+			missing="${missing} ${i}"
+		fi
+	done
+
+	# let's tell the user how to fix these problems
+
+	if [ -n "${missing}" ]; then
+		eerror "PHP is missing support for one or more options:"
+		eerror " ${missing}"
+		eerror
+		eerror "Please add '${missing}' to your USE flags, and re-install mod_php"
+		die "mod_php needs re-compiling with missing options"
+	fi
+
+	return 0
+}
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 8140b38c52d1..7af44fd815fd 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -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/eclass/webapp.eclass,v 1.1 2003/10/07 21:54:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.1.1.1 2005/11/30 09:59:13 chriswhite Exp $
 #
 # eclass/webapp.eclass
 #				Eclass for installing applications to run under a web server
@@ -8,30 +8,54 @@
 #				Part of the implementation of GLEP #11
 #
 # Author(s)		Stuart Herbert <stuart@gentoo.org>
+#				Renat Lumpau <rl03@gentoo.org>
+#				Gunnar Wrobel <php@gunnarwrobel.org>
 #
 # ------------------------------------------------------------------------
 #
-# Please do not make modifications to this file without checking with a
-# member of the web-apps herd first!
+# The master copy of this eclass is held in our subversion repository.
+# http://svn.gnqs.org/projects/vhost-tools/browser/
 #
-# ------------------------------------------------------------------------
-#
-# THIS IS A BETA RELEASE ONLY.  ALL DETAILS ARE SUBJECT TO CHANGE BEFORE
-# WE ARE READY TO START PORTING EVERYTHING TO THIS ECLASS
+# If you make changes to this file and don't tell us, chances are that
+# your changes will be overwritten the next time we release a new version
+# of webapp-config.
 #
 # ------------------------------------------------------------------------
 
-ECLASS=webapp
-INHERITED="$INHERITED $ECLASS"
-#DEPEND="${DEPEND} net-www/apache"
 SLOT="${PVR}"
-IUSE="$IUSE vhosts"
+IUSE="vhosts"
+DEPEND="app-admin/webapp-config"
+RDEPEND="${DEPEND}"
+
+EXPORT_FUNCTIONS pkg_postinst pkg_setup src_install pkg_prerm
+
+INSTALL_DIR="/${PN}"
+IS_UPGRADE=0
+IS_REPLACE=0
+
+INSTALL_CHECK_FILE="installed_by_webapp_eclass"
 
-if [ -f /usr/share/webapp-config/settings.sh ] ; then
-	. /usr/share/webapp-config/settings.sh
-fi
+ETC_CONFIG="${ROOT}/etc/vhosts/webapp-config"
+WEBAPP_CONFIG="${ROOT}/usr/sbin/webapp-config"
+
+# ------------------------------------------------------------------------
+# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
+#
+# Load the config file /etc/vhosts/webapp-config
+#
+# Supports both the old bash version, and the new python version
+#
+# ------------------------------------------------------------------------
 
-EXPORT_FUNCTIONS pkg_setup src_install
+function webapp_read_config ()
+{
+	if has_version '>=app-admin/webapp-config-1.50'; then
+		ENVVAR=$(${WEBAPP_CONFIG} --query ${PN} ${PVR}) || die "Could not read settings from webapp-config!"
+		eval ${ENVVAR}
+	else
+		. ${ETC_CONFIG} || die "Unable to read ${ETC_CONFIG}"
+	fi
+}
 
 # ------------------------------------------------------------------------
 # INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
@@ -40,13 +64,18 @@ EXPORT_FUNCTIONS pkg_setup src_install
 # or not.
 #
 # @param 	$1 - file to look for
+# @param	$2 - prefix directory to use
 # @return	0 on success, never returns on an error
 # ------------------------------------------------------------------------
 
 function webapp_checkfileexists ()
 {
-	if [ ! -e ${D}/$1 ]; then
-		msg="ebuild fault: file $1 not found in ${D}"
+	local my_prefix
+
+	[ -n "${2}" ] && my_prefix="${2}/" || my_prefix=
+
+	if [ ! -e "${my_prefix}${1}" ]; then
+		msg="ebuild fault: file '${1}' not found"
 		eerror "$msg"
 		eerror "Please report this as a bug at http://bugs.gentoo.org/"
 		die "$msg"
@@ -54,6 +83,110 @@ function webapp_checkfileexists ()
 }
 
 # ------------------------------------------------------------------------
+# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
+# ------------------------------------------------------------------------
+
+function webapp_check_installedat
+{
+	local my_output
+
+	${WEBAPP_CONFIG} --show-installed -h localhost -d "${INSTALL_DIR}" 2> /dev/null
+}
+
+# ------------------------------------------------------------------------
+# INTERNAL FUNCTION - USED BY THIS ECLASS ONLY
+#
+# ------------------------------------------------------------------------
+
+function webapp_strip_appdir ()
+{
+	local my_stripped="${1}"
+	echo "${1}" | sed -e "s|${MY_APPDIR}/||g;"
+}
+
+function webapp_strip_d ()
+{
+	echo "${1}" | sed -e "s|${D}||g;"
+}
+
+function webapp_strip_cwd ()
+{
+	local my_stripped="${1}"
+	echo "${1}" | sed -e 's|/./|/|g;'
+}
+
+# ------------------------------------------------------------------------
+# EXPORTED FUNCTION - FOR USE IN EBUILDS
+#
+# Identify a config file for a web-based application.
+#
+# @param	$1 - config file
+# ------------------------------------------------------------------------
+
+function webapp_configfile ()
+{
+	webapp_checkfileexists "${1}" "${D}"
+
+	local MY_FILE="$(webapp_strip_appdir ${1})"
+	MY_FILE="$(webapp_strip_cwd ${MY_FILE})"
+
+	einfo "(config) ${MY_FILE}"
+	echo "${MY_FILE}" >> ${D}/${WA_CONFIGLIST}
+}
+
+# ------------------------------------------------------------------------
+# EXPORTED FUNCTION - FOR USE IN EBUILDS
+#
+# Install a script that will run after a virtual copy is created, and
+# before a virtual copy has been removed
+#
+# @param	$1 - the script to run
+# ------------------------------------------------------------------------
+
+function webapp_hook_script ()
+{
+	webapp_checkfileexists "${1}"
+
+	einfo "(hook) ${1}"
+	cp "${1}" "${D}/${MY_HOOKSCRIPTSDIR}/$(basename ${1})" || die "Unable to install ${1} into ${D}/${MY_HOOKSCRIPTSDIR}/"
+	chmod 555 "${D}/${MY_HOOKSCRIPTSDIR}/$(basename ${1})"
+}
+
+# ------------------------------------------------------------------------
+# EXPORTED FUNCTION - FOR USE IN EBUILDS
+#
+# Install a text file containing post-installation instructions.
+#
+# @param	$1 - language code (use 'en' for now)
+# @param	$2 - the file to install
+# ------------------------------------------------------------------------
+
+function webapp_postinst_txt ()
+{
+	webapp_checkfileexists "${2}"
+
+	einfo "(info) ${2} (lang: ${1})"
+	cp "${2}" "${D}/${MY_APPDIR}/postinst-${1}.txt"
+}
+
+# ------------------------------------------------------------------------
+# EXPORTED FUNCTION - FOR USE IN EBUILDS
+#
+# Install a text file containing post-upgrade instructions.
+#
+# @param	$1 - language code (use 'en' for now)
+# @param	$2 - the file to install
+# ------------------------------------------------------------------------
+
+function webapp_postupgrade_txt ()
+{
+	webapp_checkfileexists "${2}"
+
+	einfo "(info) ${2} (lang: ${1})"
+	cp "${2}" "${D}/${MY_APPDIR}/postupgrade-${1}.txt"
+}
+
+# ------------------------------------------------------------------------
 # EXPORTED FUNCTION - FOR USE IN EBUILDS
 #
 # Identify a file which must be owned by the webserver's user:group
@@ -68,41 +201,93 @@ function webapp_checkfileexists ()
 
 function webapp_serverowned ()
 {
-	webapp_checkfileexists $1
-	echo "$1" >> $WA_SOLIST
+	webapp_checkfileexists "${1}" "$D"
+	local MY_FILE="$(webapp_strip_appdir ${1})"
+	MY_FILE="$(webapp_strip_cwd ${MY_FILE})"
+	
+	einfo "(server owned) ${MY_FILE}"
+	echo "${MY_FILE}" >> "${D}/${WA_SOLIST}"
 }
 
 # ------------------------------------------------------------------------
 # EXPORTED FUNCTION - FOR USE IN EBUILDS
 #
-# Identify a config file for a web-based application.
+# @param	$1 - the webserver to install the config file for
+#			     (one of apache1, apache2, cherokee)
+# @param	$2 - the config file to install
+# @param	$3 - new name for the config file (default is `basename $2`)
+#				 this is an optional parameter
 #
-# @param	$1 - config file
+# NOTE:
+#	this function will automagically prepend $1 to the front of your
+#	config file's name
 # ------------------------------------------------------------------------
 
-function webapp_configfile ()
+function webapp_server_configfile ()
 {
-	webapp_checkfileexists $1
-	echo "$1" >> $WA_CONFIGLIST
+	webapp_checkfileexists "${2}"
+
+	# sort out what the name will be of the config file
+
+	local my_file
+
+	if [ -z "${3}" ]; then
+		my_file="${1}-$(basename ${2})"
+	else
+		my_file="${1}-${3}"
+	fi
+
+	# warning:
+	#
+	# do NOT change the naming convention used here without changing all
+	# the other scripts that also rely upon these names
+ 
+	einfo "(${1}) config file '${my_file}'"
+	cp "${2}" "${D}/${MY_SERVERCONFIGDIR}/${my_file}"
 }
 
 # ------------------------------------------------------------------------
 # EXPORTED FUNCTION - FOR USE IN EBUILDS
 #
-# Identify a script file (usually, but not always PHP or Perl) which is
-#
-# Files in this list may be modified to #! the required CGI engine when
-# installed by webapp-config tool in the future.
-#
-# @param	$1 - the cgi engine to use
-# @param	$2 - the script file that could run under a cgi-bin
-#
+# @param	$1 - the db engine that the script is for
+#				 (one of: mysql|postgres)
+# @param	$2 - the sql script to be installed
+# @param	$3 - the older version of the app that this db script
+#				 will upgrade from
+#				 (do not pass this option if your SQL script only creates
+#				  a new db from scratch)
 # ------------------------------------------------------------------------
 
-function webapp_runbycgibin ()
+function webapp_sqlscript ()
 {
-	webapp_checkfileexists $2
-	echo "$1 $2" >> $WA_RUNBYCGIBINLIST
+	webapp_checkfileexists "${2}"
+
+	# create the directory where this script will go
+	#
+	# scripts for specific database engines go into their own subdirectory
+	# just to keep things readable on the filesystem
+
+	if [ ! -d "${D}/${MY_SQLSCRIPTSDIR}/${1}" ]; then
+		mkdir -p "${D}/${MY_SQLSCRIPTSDIR}/${1}" || die "unable to create directory ${D}/${MY_SQLSCRIPTSDIR}/${1}"
+	fi
+
+	# warning:
+	#
+	# do NOT change the naming convention used here without changing all
+	# the other scripts that also rely upon these names
+ 
+	# are we dealing with an 'upgrade'-type script?
+	if [ -n "${3}" ]; then
+		# yes we are
+		einfo "(${1}) upgrade script from ${PN}-${PVR} to ${3}"
+		cp "${2}" "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql"
+		chmod 600 "${D}${MY_SQLSCRIPTSDIR}/${1}/${3}_to_${PVR}.sql"
+	else
+		# no, we are not
+		einfo "(${1}) create script for ${PN}-${PVR}"
+		cp "${2}" "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql"
+		chmod 600 "${D}/${MY_SQLSCRIPTSDIR}/${1}/${PVR}_create.sql"
+	fi
 }
 
 # ------------------------------------------------------------------------
@@ -110,19 +295,31 @@ function webapp_runbycgibin ()
 # everything else has run
 #
 # For now, we just make sure that root owns everything, and that there
-# are no setuid files.  I'm sure this will change significantly before
-# the final version!
+# are no setuid files.
 # ------------------------------------------------------------------------
 
 function webapp_src_install ()
 {
-	chown -R root:root ${D}/
-	chmod -R u-s ${D}/
-	chmod -R g-s ${D}/
+	chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/"
+	chmod -R u-s "${D}/"
+	chmod -R g-s "${D}/"
+
+	keepdir "${MY_PERSISTDIR}"
+	fowners "root:root" "${MY_PERSISTDIR}"
+	fperms 755 "${MY_PERSISTDIR}"
+
+	# to test whether or not the ebuild has correctly called this function
+	# we add an empty file to the filesystem
+	#
+	# we used to just set a variable in the shell script, but we can
+	# no longer rely on Portage calling both webapp_src_install() and
+	# webapp_pkg_postinst() within the same shell process
+
+	touch "${D}/${MY_APPDIR}/${INSTALL_CHECK_FILE}"
 }
 
 # ------------------------------------------------------------------------
-# EXPORTED FUNCTION - call from inside your ebuild's pkg_setup AFTER
+# EXPORTED FUNCTION - call from inside your ebuild's pkg_config AFTER
 # everything else has run
 #
 # If 'vhosts' USE flag is not set, auto-install this app
@@ -131,4 +328,223 @@ function webapp_src_install ()
 
 function webapp_pkg_setup ()
 {
-	use vhosts || webapp-config -u root -d /var/www/localhost/htdocs/${PN}/ ${PN}
+	# add sanity checks here
+
+	if [ "${SLOT}+" != "${PVR}+" ]; then
+		# special case - some ebuilds *do* need to overwride the SLOT
+		if [ "${WEBAPP_MANUAL_SLOT}" != "yes" ]; then
+			die "ebuild sets SLOT, overrides webapp.eclass"
+		else
+			ewarn
+			ewarn "This ebuild overrides the default SLOT behaviour for webapps"
+			ewarn "If this package installs files into the htdocs dir, this is"
+			ewarn "probably a bug in the ebuild."
+			ewarn
+		fi
+	fi
+
+	# pull in the shared configuration file
+
+	G_HOSTNAME="localhost"
+	webapp_read_config
+
+	# are we installing a webapp-config solution over the top of a
+	# non-webapp-config solution?
+
+	if ! use vhosts ; then
+		local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}"
+		local my_output
+
+		if [ -d "${my_dir}" ] ; then
+			einfo "You already have something installed in ${my_dir}"
+			einfo "Are you trying to install over the top of something I cannot upgrade?"
+
+			my_output="$(webapp_check_installedat)"
+
+			if [ "$?" != "0" ]; then
+
+				# okay, whatever is there, it isn't webapp-config-compatible
+				ewarn
+				ewarn "Whatever is in ${my_dir}, it's not"
+				ewarn "compatible with webapp-config."
+				ewarn
+				ewarn "This ebuild may be overwriting important files."
+				ewarn
+			elif [ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]; then
+				eerror "${my_dir} contains ${my_output}"
+				eerror "I cannot upgrade that"
+				die "Cannot upgrade contents of ${my_dir}"
+			else
+				einfo
+				einfo "I can upgrade the contents of ${my_dir}"
+				einfo
+			fi
+		fi
+	fi
+}
+
+function webapp_getinstalltype ()
+{
+	# or are we upgrading?
+
+	if ! use vhosts ; then
+		# we only run webapp-config if vhosts USE flag is not set
+
+		local my_output
+
+		my_output="$(webapp_check_installedat)"
+
+		if [ "${?}" = "0" ] ; then
+			# something is already installed there
+			#
+			# make sure it isn't the same version
+
+			local my_pn="$(echo ${my_output} | awk '{ print $1 }')"
+			local my_pvr="$(echo ${my_output} | awk '{ print $2 }')"
+
+			REMOVE_PKG="${my_pn}-${my_pvr}"
+
+			if [ "${my_pn}" == "${PN}" ]; then
+				if [ "${my_pvr}" != "${PVR}" ]; then
+					einfo "This is an upgrade"
+					IS_UPGRADE=1
+				else
+					einfo "This is a re-installation"
+					IS_REPLACE=1
+				fi
+			else
+				einfo "${my_output} is installed there"
+			fi
+		else
+			einfo "This is an installation"
+		fi
+	fi
+}
+
+function webapp_src_preinst ()
+{
+	# create the directories that we need
+
+	dodir "${MY_HTDOCSDIR}"
+	dodir "${MY_HOSTROOTDIR}"
+	dodir "${MY_CGIBINDIR}"
+	dodir "${MY_ICONSDIR}"
+	dodir "${MY_ERRORSDIR}"
+	dodir "${MY_SQLSCRIPTSDIR}"
+	dodir "${MY_HOOKSCRIPTSDIR}"
+	dodir "${MY_SERVERCONFIGDIR}"
+}
+
+function webapp_pkg_postinst ()
+{
+	webapp_read_config
+
+	# sanity checks, to catch bugs in the ebuild
+
+	if [ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]; then
+		eerror
+		eerror "This ebuild did not call webapp_src_install() at the end"
+		eerror "of the src_install() function"
+		eerror
+		eerror "Please log a bug on http://bugs.gentoo.org"
+		eerror
+		eerror "You should use emerge -C to remove this package, as the"
+		eerror "installation is incomplete"
+		eerror
+		die "Ebuild did not call webapp_src_install() - report to http://bugs.gentoo.org"
+	fi
+
+	# if 'vhosts' is not set in your USE flags, we install a copy of
+	# this application in ${ROOT}/var/www/localhost/htdocs/${PN}/ for you
+	
+	if ! use vhosts ; then
+		echo
+		einfo "vhosts USE flag not set - auto-installing using webapp-config"
+
+		webapp_getinstalltype
+
+		G_HOSTNAME="localhost"
+		local my_mode=-I
+		webapp_read_config
+
+		if [ "${IS_REPLACE}" = "1" ]; then
+			einfo "${PN}-${PVR} is already installed - replacing"
+			my_mode=-I
+		elif [ "${IS_UPGRADE}" = "1" ]; then
+			einfo "${REMOVE_PKG} is already installed - upgrading"
+			my_mode=-U
+		else
+			einfo "${PN}-${PVR} is not installed - using install mode"
+		fi
+	
+		my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}"
+		einfo "Running ${my_cmd}"
+		${my_cmd}
+
+		# remove the old version
+		#
+		# why do we do this?  well ...
+		#
+		# normally, emerge -u installs a new version and then removes the
+		# old version.  however, if the new version goes into a different
+		# slot to the old version, then the old version gets left behind
+		#
+		# if USE=-vhosts, then we want to remove the old version, because
+		# the user is relying on portage to do the magical thing for it
+
+		if [ "${IS_UPGRADE}" = "1" ] ; then
+			einfo "Removing old version ${REMOVE_PKG}"
+
+			emerge -C "${REMOVE_PKG}"
+		fi
+	else
+		# vhosts flag is on
+		#
+		# let's tell the administrator what to do next
+
+		einfo
+		einfo "The 'vhosts' USE flag is switched ON"
+		einfo "This means that Portage will not automatically run webapp-config to"
+		einfo "complete the installation."
+		einfo
+		einfo "To install ${PN}-${PVR} into a virtual host, run the following command:"
+		einfo
+		einfo "    webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}"
+		einfo
+		einfo "For more details, see the webapp-config(8) man page"
+	fi
+
+	return 0
+}
+
+function webapp_pkg_prerm ()
+{
+	# remove any virtual installs that there are
+
+	local my_output
+	local x
+
+	my_output="$(${WEBAPP_CONFIG} --list-installs ${PN} ${PVR})"
+
+	if [ "${?}" != "0" ]; then
+		return
+	fi
+
+	for x in ${my_output} ; do
+		[ -f ${x}/.webapp ] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp"
+
+		if [ -z "${WEB_HOSTNAME}" -o -z "${WEB_INSTALLDIR}" ]; then
+			ewarn "Don't forget to use webapp-config to remove the copy of"
+			ewarn "${PN}-${PVR} installed in"
+			ewarn
+			ewarn "    ${x}"
+			ewarn
+		else
+			# we have enough information to remove the virtual copy ourself
+
+			${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR}
+
+			# if the removal fails - we carry on anyway!
+		fi
+	done
+}
diff --git a/eclass/wxlib.eclass b/eclass/wxlib.eclass
index 0303b8c87ccb..115cacdfe497 100644
--- a/eclass/wxlib.eclass
+++ b/eclass/wxlib.eclass
@@ -1,19 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/wxlib.eclass,v 1.1 2005/05/01 20:55:42 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/wxlib.eclass,v 1.1.1.1 2005/11/30 09:59:34 chriswhite Exp $
 
 # Author Diego Pettenò <flameeyes@gentoo.org>
-# Maintained by wxwindows herd
+# Maintained by wxwidgets herd
 
 # This eclass is used by wxlib-based packages (wxGTK, wxMotif, wxBase, wxMac) to share code between
 # them.
 
-inherit eutils gnuconfig 
+inherit flag-o-matic eutils multilib toolchain-funcs
 
-ECLASS="wxlib"
-INHERITED="${INHERITED} ${ECLASS}"
 
-IUSE="doc debug unicode dmalloc zlib"
+IUSE="debug doc odbc unicode"
 
 LICENSE="wxWinLL-3"
 
@@ -21,10 +19,9 @@ LICENSE="wxWinLL-3"
 #         has its own implementation of it
 # Note 2: PCX support is enabled if the correct libraries are detected.
 #         There is no USE flag for this.
-RDEPEND="    dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
-	zlib? ( sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
+	sys-libs/zlib
 	sys-apps/sed"
 
 HOMEPAGE="http://www.wxwindows.org"
@@ -32,14 +29,6 @@ SRC_URI="mirror://sourceforge/wxwindows/wxWidgets-${PV}.tar.bz2
 	doc? ( mirror://sourceforge/wxwindows/wxWidgets-${PV}-HTML.tar.gz )"
 S=${WORKDIR}/wxWidgets-${PV}
 
-# Verify wxWidget-2.6 tarball still has this hardcoded: pythonhead aprl 24 2005
-# Removes hard-coded -O2 optimization from configure
-wxlib_src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s/-O2//g" configure || die "sed configure failed"
-	gnuconfig_update
-}
 
 # Configure a build.
 # It takes three parameters;
@@ -49,26 +38,26 @@ wxlib_src_unpack() {
 # $3: all the extra parameters to pass to configure script
 configure_build() {
 	export LANG='C'
-	
+
 	mkdir ${S}/$1_build
 	cd ${S}/$1_build
 	# odbc works with ansi only:
-	subconfigure $3 $(use_with odbc) || die "odbc does not work with unicode"
-	emake -j5 || die "emake failed"
+	subconfigure $3 $(use_with odbc)
+	emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake failed"
 	#wxbase has no contrib:
 	if [[ -e contrib/src ]]; then
 		cd contrib/src
-		emake -j5 || die "emake contrib failed"
+		emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake contrib failed"
 	fi
 
 	if [[ "$2" == "unicode" ]] && use unicode; then
 		mkdir ${S}/$1_build_unicode
 		cd ${S}/$1_build_unicode
 		subconfigure $3 --enable-unicode
-		emake -j5 || die "Unicode emake failed"
+		emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake failed"
 		if [[ -e contrib/src ]]; then
 			cd contrib/src
-			emake -j5 || die "Unicode emake contrib failed"
+			emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake contrib failed"
 		fi
 	fi
 }
@@ -76,20 +65,14 @@ configure_build() {
 # This is a commodity function which calls configure script
 # with the default parameters plus extra parameters. It's used
 # as building the unicode version required redoing it.
-# It takes all the params and pass them to the script
+# It takes all the params and passes them to the script
 subconfigure() {
-	debug_conf=""
-	if use debug; then
-		debug_conf="--enable-debug --enable-debug_gdb"	
-		debug_conf="${debug_conf} `use_with dmalloc`"
-	fi
-	${S}/configure --enable-monolithic \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		`use_with zlib` \
-		${debug_conf} \
-		$*
+	ECONF_SOURCE="${S}" \
+		econf \
+			--disable-debugreport \
+			--with-zlib \
+			$(use_enable debug) $(use_enable debug debug_gdb) \
+			$* || die "./configure failed"
 }
 
 # Installs a build
@@ -97,20 +80,24 @@ subconfigure() {
 # see configure_build function
 install_build() {
 	cd ${S}/$1_build
-	einstall || die "Install failed"
-	cd contrib/src
-	einstall || die "Install contrib failed"
+	einstall libdir="${D}/usr/$(get_libdir)" || die "Install failed"
+	if [[ -e contrib ]]; then
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "Install contrib failed"
+	fi
 	if [[ -e ${S}/$1_build_unicode ]]; then
 		cd ${S}/$1_build_unicode
-		einstall || die "Unicode install failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install failed"
 		cd contrib/src
-		einstall || die "Unicode install contrib failed"
+		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install contrib failed"
 	fi
 }
 
 # To be called at the end of src_install to perform common cleanup tasks
 wxlib_src_install() {
 
+	cp ${D}/usr/bin/wx-config ${D}/usr/bin/wx-config-2.6 || die "Failed to cp wx-config"
+
 	# In 2.6 all wx-config*'s go in/usr/lib/wx/config not
 	# /usr/bin where 2.4 keeps theirs.
 	# Only install wx-config if 2.4 is not installed:
@@ -120,20 +107,19 @@ wxlib_src_install() {
 		fi
 	fi
 
-	# Remove wxrc because SLOT'd versions will overwrite each other.
-	# There will be a /usr/bin/wxrc-2.6 installed:
-	rm ${D}/usr/bin/wxrc
-
 
 	if use doc; then
+		dodir /usr/share/doc/${PF}/{demos,samples,utils}
 		dohtml ${S}/contrib/docs/html/ogl/*
 		dohtml ${S}/docs/html/*
-		dodir /usr/share/doc/${PF}/demos
 		cp -R ${S}/demos/* ${D}/usr/share/doc/${PF}/demos/
+		cp -R ${S}/utils/* ${D}/usr/share/doc/${PF}/utils/
+		cp -R ${S}/samples/* ${D}/usr/share/doc/${PF}/samples/
 		dodoc ${S}/*.txt
 	fi
 
 }
 
 
-EXPORT_FUNCTIONS src_unpack src_install
+EXPORT_FUNCTIONS src_install
+
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index f4b98e251c46..fd0c41261860 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,34 +1,54 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.1 2004/08/05 16:28:11 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.1.1.1 2005/11/30 09:59:30 chriswhite Exp $
 #
 # Author Rob Cakebread <pythonhead@gentoo.org>
 
 # This eclass helps you find the correct wx-config script so ebuilds
-# can use gtk, gtk2 or gtk2+unicode versions of wxGTK 
+# can use gtk, gtk2 or gtk2+unicode versions of wxGTK
 
-#FUNCTIONS:
+# FUNCTIONS:
 # need-wxwidgets:
-#   Arguments: gtk, gtk2 or unicode
+#   Arguments:
+#     2.4: gtk gtk2 unicode
+#     2.6: gtk gtk2 unicode base base-unicode mac mac-unicode
+#
 #
 # set-wxconfig
-#   Arguments wxgtk, wxgtk2, or wxgtk2u
+#   Arguments: (wxGTK 2.4) wxgtk, wxgtk2, or wxgtk2u
+#   Arguments: (wxGTK 2.6) gtk-ansi gtk2-ansi unicode base-ansi base-unicode mac-ansi mac-unicode
+#   Note: Don't call this function directly from ebuilds
 
-ECLASS=wxwidgets
-INHERITED="$INHERITED $ECLASS"
+inherit multilib
 
 need-wxwidgets() {
-
 	debug-print-function $FUNCNAME $*
+	#If you want to use wxGTK-2.6* export WX_GTK_VER in your ebuild:
+	if [ "${WX_GTK_VER}" = "2.6" ]; then
+		case $1 in
+			gtk)		set-wxconfig gtk-ansi;;
+			gtk2)		set-wxconfig gtk2-ansi;;
+			unicode)	set-wxconfig gtk2-unicode;;
+			base)		set-wxconfig base-ansi;;
+			base-unicode)	set-wxconfig base-unicode;;
+			mac)		set-wxconfig mac-ansi;;
+			mac-unicode)	set-wxconfig mac-unicode;;
+			*)		echo "!!! $FUNCNAME: Error: wxGTK was not comipled with $1."
+					echo "!!! Adjust your USE flags or re-emerge wxGTK with version you want."
+			exit 1;;
+		esac
 
-	case $1 in
-		gtk)		set-wxconfig wxgtk;;
-		gtk2)		set-wxconfig wxgtk2;;
-		unicode)	set-wxconfig wxgtk2u;;
-		*)		echo "!!! $FUNCNAME: Error: unrecognized wxconfig version $1 requested"
-		exit 1;;
-	esac
-
+	else
+		WX_GTK_VER="2.4"
+		case $1 in
+			gtk)		set-wxconfig wxgtk;;
+			gtk2)		set-wxconfig wxgtk2;;
+			unicode)	set-wxconfig wxgtk2u;;
+			*)		echo "!!! $FUNCNAME: Error: wxGTK was not compiled with $1."
+					echo "!!! Adjust your USE flags or re-emerge wxGTK with the version you want."
+			exit 1;;
+		esac
+	fi
 }
 
 
@@ -36,22 +56,52 @@ set-wxconfig() {
 
 	debug-print-function $FUNCNAME $*
 
-	local wxgtk_ver=`/usr/bin/wx-config --release`
-	local wxconfig="/usr/bin/${1}-${wxgtk_ver}-config"
-	local wxconfig_debug="/usr/bin/${1}d-${wxgtk_ver}-config"
+	if [ "${WX_GTK_VER}" = "2.6" ] ; then
+		wxconfig_prefix="/usr/$(get_libdir)/wx/config"
+		wxconfig_name="${1}-release-${WX_GTK_VER}"
+		wxconfig="${wxconfig_prefix}/${wxconfig_name}"
+		wxconfig_debug_name="${1}-debug-${WX_GTK_VER}"
+		wxconfig_debug="${wxconfig_prefix}/${wxconfig_debug_name}"
+	else
+		# Default is 2.4:
+		wxconfig_prefix="/usr/bin"
+		wxconfig_name="${1}-${WX_GTK_VER}-config"
+		wxconfig="${wxconfig_prefix}/${wxconfig_name}"
+		wxconfig_debug_name="${1}d-${WX_GTK_VER}-config"
+		wxconfig_debug="${wxconfig_prefix}/${wxconfig_debug_name}"
+	fi
 
 	if [ -e ${wxconfig} ] ; then
 		export WX_CONFIG=${wxconfig}
+		export WX_CONFIG_NAME=${wxconfig_name}
+		export WXBASE_CONFIG_NAME=${wxconfig_name}
 		echo " * Using ${wxconfig}"
 	elif [ -e ${wxconfig_debug} ] ; then
 		export WX_CONFIG=${wxconfig_debug}
+		export WX_CONFIG_NAME=${wxconfig_debug_name}
+		export WXBASE_CONFIG_NAME=${wxconfig_debug_name}
 		echo " * Using ${wxconfig_debug}"
 	else
 		echo "!!! $FUNCNAME: Error:  Can't find normal or debug version:"
-		echo "!!! $FUNCNAME: !!!     ${wxconfig} not found"
-		echo "!!! $FUNCNAME: !!!     ${wxconfig_debug} not found"
+		echo "!!! $FUNCNAME:         ${wxconfig} not found"
+		echo "!!! $FUNCNAME:         ${wxconfig_debug} not found"
+		case $1 in
+			wxgtk)	 echo "!!! You need to emerge wxGTK with wxgtk1 in your USE";;
+			wxgtkd)	 echo "!!! You need to emerge wxGTK with wxgtk1 in your USE";;
+			gtk-ansi)  echo "!!! You need to emerge wxGTK with wxgtk1 in your USE";;
+			gtkd-ansi) echo "!!! You need to emerge wxGTK with wxgtk1 in your USE";;
+
+			wxgtk2)	 echo "!!! You need to emerge wxGTK with gtk2 in your USE";;
+			wxgtk2d) echo "!!! You need to emerge wxGTK with gtk2 in your USE";;
+			gtk2-ansi)  echo "!!! You need to emerge wxGTK with gtk2 in your USE";;
+			gtk2d-ansi) echo "!!! You need to emerge wxGTK with gtk2 in your USE";;
+
+			wxgtk2u)  echo "!!! You need to emerge wxGTK with unicode in your USE";;
+			wxgtk2ud) echo "!!! You need to emerge wxGTK with unicode in your USE";;
+			gtk2-unicode)  echo "!!! You need to emerge wxGTK with unicode in your USE";;
+			gtk2d-unicode) echo "!!! You need to emerge wxGTK with unicode in your USE";;
+		esac
 		exit 1
 	fi
 }
 
-
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass
index 204f0380d37f..9ffb40f46528 100644
--- a/eclass/x-modular.eclass
+++ b/eclass/x-modular.eclass
@@ -1,23 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.1 2005/08/08 02:57:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.1.1.1 2005/11/30 09:59:28 chriswhite Exp $
 #
 # Author: Donnie Berkholz <spyderous@gentoo.org>
 #
 # This eclass is designed to reduce code duplication in the modularized X11
 # ebuilds.
+#
+# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to
+# the subdirectories within /usr/share/fonts to which it installs fonts.
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst
 
-inherit eutils
+inherit eutils libtool
 
 # Directory prefix to use for everything
-# Change to /usr/X11R6 once it's standard
 XDIR="/usr"
 
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
-SRC_URI="http://xorg.freedesktop.org/X11R7.0-RC0/everything/${P}.tar.bz2"
+SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
+	http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
+	http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
 LICENSE="X11"
 SLOT="0"
 
@@ -31,19 +35,41 @@ if [ -n "${SNAPSHOT}" ]; then
 		>=sys-devel/m4-1.4"
 fi
 
+# If we're a font package, but not the font.alias one
+if [[ "${PN/#font-}" != "${PN}" ]] && [[ "${PN}" != "font-alias" ]]; then
+	# Activate font code in the rest of the eclass
+	FONT="yes"
+
+	RDEPEND="${RDEPEND}
+		media-fonts/encodings"
+	PDEPEND="${PDEPEND}
+		media-fonts/font-alias"
+fi
+
+# If we're a driver package
+if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
+	# Don't build static driver modules
+	DRIVER_OPTIONS="--disable-static"
+fi
+
 DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	x11-misc/util-macros"
+	>=dev-util/pkgconfig-0.18
+	>=x11-misc/util-macros-0.99.0_p20051007"
 
-RDEPEND="${RDEPEND}"
-# Shouldn't be necessary once we're in a standard location
+# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
+RDEPEND="${RDEPEND}
+	!<=x11-base/xorg-x11-6.9
+	>=sys-apps/man-1.6b-r2"
+# Provides virtual/x11 for temporary use until packages are ported
 #	x11-base/x11-env"
-# FIXME: Uncomment once it's in portage
-#	!x11-base/xorg-x11"
 
 x-modular_unpack_source() {
 	unpack ${A}
 	cd ${S}
+
+	# Joshua Baergen - October 23, 2005
+	# Fix shared lib issues on MIPS, FBSD, etc etc
+	elibtoolize
 }
 
 x-modular_patch_source() {
@@ -77,7 +103,7 @@ x-modular_reconf_source() {
 		if [ -f "${S}/configure.ac" ]
 		then
 			einfo "Running autoreconf..."
-			autoreconf -v --install
+			autoreconf -v --force --install
 		fi
 	fi
 
@@ -89,16 +115,25 @@ x-modular_src_unpack() {
 	x-modular_reconf_source
 }
 
-x-modular_src_compile() {
+x-modular_src_configure() {
 	# If prefix isn't set here, .pc files cause problems
 	if [ -x ./configure ]; then
 		econf --prefix=${XDIR} \
 			--datadir=${XDIR}/share \
+			${DRIVER_OPTIONS} \
 			${CONFIGURE_OPTIONS}
 	fi
+}
+
+x-modular_src_make() {
 	emake || die "emake failed"
 }
 
+x-modular_src_compile() {
+	x-modular_src_configure
+	x-modular_src_make
+}
+
 x-modular_src_install() {
 	# Install everything to ${XDIR}
 	make \
@@ -108,4 +143,126 @@ x-modular_src_install() {
 # einstall forces datadir, so we need to re-force it
 #		datadir=${XDIR}/share \
 #		mandir=${XDIR}/share/man \
+
+	# Don't install libtool archives for server modules
+	if [[ -e ${D}/usr/lib/xorg/modules ]]; then
+		find ${D}/usr/lib/xorg/modules -name '*.la' \
+			| xargs rm -f
+	fi
+}
+
+x-modular_pkg_preinst() {
+	if [[ -n "${FONT}" ]]; then
+		discover_font_dirs
+	fi
+}
+
+x-modular_pkg_postinst() {
+	if [[ -n "${FONT}" ]]; then
+		setup_fonts
+	fi
+}
+
+setup_fonts() {
+	if [[ ! -n "${FONT_DIRS}" ]]; then
+		msg="FONT_DIRS empty. Set it to at least one subdir of /usr/share/fonts."
+		eerror ${msg}
+		die ${msg}
+	fi
+
+	create_fonts_scale
+	create_fonts_dir
+	fix_font_permissions
+	create_font_cache
+}
+
+discover_font_dirs() {
+	pushd ${IMAGE}/usr/share/fonts
+	FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
+	FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
+	popd
+}
+
+create_fonts_scale() {
+	ebegin "Creating fonts.scale files"
+		local x
+		for FONT_DIR in ${FONT_DIRS}; do
+			x=${ROOT}/usr/share/fonts/${FONT_DIR}
+			[ -z "$(ls ${x}/)" ] && continue
+			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
+
+			# Only generate .scale files if truetype, opentype or type1
+			# fonts are present ...
+
+			# First truetype (ttf,ttc)
+			# NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
+			# Also, there is no way to regenerate Speedo/CID fonts.scale
+			# <spyderous@gentoo.org> 2 August 2004
+			if [ "${x/encodings}" = "${x}" -a \
+				-n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then
+				if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then
+					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
+					${ROOT}/usr/bin/ttmkfdir -x 2 \
+						-e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
+						-o ${x}/fonts.scale -d ${x}
+					# ttmkfdir fails on some stuff, so try mkfontscale if it does
+					local ttmkfdir_return=$?
+				else
+					# We didn't use ttmkfdir at all
+					local ttmkfdir_return=2
+				fi
+				if [ ${ttmkfdir_return} -ne 0 ]; then
+					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
+					${ROOT}/usr/bin/mkfontscale \
+						-a /usr/share/fonts/encodings/encodings.dir \
+						-- ${x}
+				fi
+			# Next type1 and opentype (pfa,pfb,otf,otc)
+			elif [ "${x/encodings}" = "${x}" -a \
+				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then
+				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
+				${ROOT}/usr/bin/mkfontscale \
+					-a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
+					-- ${x}
+			fi
+		done
+	eend 0
+}
+
+create_fonts_dir() {
+	ebegin "Generating fonts.dir files"
+		for FONT_DIR in ${FONT_DIRS}; do
+			x=${ROOT}/usr/share/fonts/${FONT_DIR}
+			[ -z "$(ls ${x}/)" ] && continue
+			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
+
+			if [ "${x/encodings}" = "${x}" ]; then
+				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
+				${ROOT}/usr/bin/mkfontdir \
+					-e ${ROOT}/usr/share/fonts/encodings \
+					-e ${ROOT}/usr/share/fonts/encodings/large \
+					-- ${x}
+			fi
+		done
+	eend 0
+}
+
+fix_font_permissions() {
+	ebegin "Fixing permissions"
+		for FONT_DIR in ${FONT_DIRS}; do
+			find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \
+				-exec chmod 0644 {} \;
+		done
+	eend 0
+}
+
+create_font_cache() {
+	# danarmak found out that fc-cache should be run AFTER all the above
+	# stuff, as otherwise the cache is invalid, and has to be run again
+	# as root anyway
+	if [ -x ${ROOT}/usr/bin/fc-cache ]; then
+		ebegin "Creating FC font cache"
+			HOME="/root" ${ROOT}/usr/bin/fc-cache
+		eend 0
+	fi
 }
diff --git a/eclass/x11.eclass b/eclass/x11.eclass
index 3879adfbae6b..288406bb2995 100644
--- a/eclass/x11.eclass
+++ b/eclass/x11.eclass
@@ -1,21 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x11.eclass,v 1.1 2004/10/04 06:23:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x11.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
-# The xfree.eclass is designed to ease the checking functions that are
-# performed in xfree and xfree-drm ebuilds.  In the new scheme, a variable
-# called VIDEO_CARDS will be used to indicate which cards a user wishes to
-# build support for.  Note, that this variable is only unlocked if the USE
-# variable "expertxfree" is switched on, at least for xfree.
+# The x11.eclass is designed to ease the checking functions that are
+# performed in xorg-x11, xfree and x11-drm ebuilds.  In the new scheme, a
+# variable called VIDEO_CARDS will be used to indicate which cards a user
+# wishes to build support for.  Note, that this variable is only unlocked if
+# the USE variable "expertxfree" is switched on, at least for xfree.
 
-ECLASS=xfree
-INHERITED="${INHERITED} ${ECLASS}"
 
-EXPORT_FUNCTIONS vcards is_kernel strip_bins
-
-vcards() {	
+vcards() {
 	has "$1" ${VIDEO_CARDS} && return 0
 	return 1
 }
@@ -86,7 +82,7 @@ is_kernel() {
 # /usr/X11R6/lib/modules for xfree modules:
 # $1=\/usr\/X11R6\/lib\/modules
 strip_bins() {
-	einfo "Stripping binaries..."
+	einfo "Stripping binaries ..."
 	# This bit I got from Redhat ... strip binaries and drivers ..
 	# NOTE:  We do NOT want to strip the drivers, modules or DRI modules!
 	for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \
diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
index 8247d1786039..19d6e5a20106 100644
--- a/eclass/xemacs-packages.eclass
+++ b/eclass/xemacs-packages.eclass
@@ -1,14 +1,14 @@
-# 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/eclass/xemacs-packages.eclass,v 1.1 2002/12/16 09:54:23 rendhalver Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-packages.eclass,v 1.1.1.1 2005/11/30 09:59:30 chriswhite Exp $
+#
 # xemacs-packages eclass inherited by all xemacs packages
 # $PKG_CAT need's to be set before inheriting xemacs-packages
 
-ECLASS=xemacs-packages
-INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS src_unpack src_install
 
+DEPEND="virtual/xemacs"
+
 [ -z "$HOMEPAGE" ]    && HOMEPAGE="http://xemacs.org/"
 [ -z "$LICENSE" ]     && LICENSE="GPL-2"
 
@@ -24,8 +24,6 @@ case "${PKG_CAT}" in
 esac
 [ -n "$DEBUG" ] && einfo "MY_INSTALL_DIR is ${MY_INSTALL_DIR}"
 
-KEYWORDS="~x86 ~ppc ~alpha"
-
 if [ -n "$EXPERIMENTAL" ]
 then
 	[ -z "$SRC_URI" ] && SRC_URI="ftp://ftp.xemacs.org/beta/experimental/packages/${P}-pkg.tar.gz"
@@ -46,5 +44,4 @@ xemacs-packages_src_install() {
 	dodir ${MY_INSTALL_DIR}
 	cd ${D}${MY_INSTALL_DIR}
 	unpack ${A}
-#	chmod -R ugo=rX *
-}
\ No newline at end of file
+}
diff --git a/eclass/xfce4.eclass b/eclass/xfce4.eclass
index ad56aff36ee9..cc493d35b426 100644
--- a/eclass/xfce4.eclass
+++ b/eclass/xfce4.eclass
@@ -1,78 +1,103 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfce4.eclass,v 1.1 2005/01/06 19:52:02 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfce4.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 # Author: Brad Cowan <bcowan@gentoo.org>
 
 # Xfce4 Eclass
 #
 # Eclass to simplify Xfce4 package installation
 
-ECLASS=xfce4
-INHERITED="$INHERITED $ECLASS"
 
-[[ ${BZIPPED} = "1" ]] \
-    && COMPRESS=".tar.bz2" \
-    || COMPRESS=".tar.gz"
+if [[ ${BZIPPED} = "1" ]];then
+	COMPRESS=".tar.bz2"
+	ZIP="-bz2"
+else
+	COMPRESS=".tar.gz"
+	ZIP=""
+fi
 
 if [[ ${GOODIES_PLUGIN} = "1" ]]; then
-    [[ -z ${MY_P} ]] && MY_P="${PN}-plugin-${PV}"
-    SRC_URI="http://download.berlios.de/xfce-goodies/${MY_P}${COMPRESS}"    
-    XFCE_RDEPEND=">=xfce4-panel-${PV}"
+	[[ -z ${MY_P} ]] && MY_P="${PN}-plugin-${PV}"
+	SRC_URI="http://download.berlios.de/xfce-goodies/${MY_P}${COMPRESS}"
+	[[ -z ${HOMEPAGE} ]] && HOMEPAGE="http://xfce-goodies.berlios.de/"
+	[[ -z ${XFCE_VERSION} ]] && XFCE_VERSION="4.2.0"
+	RDEPEND="${RDEPEND} >=xfce-base/xfce4-panel-${XFCE_VERSION}"
 fi
 
-if [[ ${XFCE_META} = "1" ]]; then
-    SRC_URI=""
-else
-    SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src/${P}${COMPRESS}"
+if [[ ${PLUGIN} = "1" ]]; then
+	MY_P="${PN}-plugin-${PV}"
+	[[ -z ${XFCE_VERSION} ]] && XFCE_VERSION="4.2.0"
+	RDEPEND="${RDEPEND} >=xfce-base/xfce4-panel-${XFCE_VERSION}"
 fi
 
+if [[ ${GOODIES} = "1" ]]; then
+	SRC_URI="http://download.berlios.de/xfce-goodies/${MY_P:-${P}}${COMPRESS}"
+	[[ -z ${HOMEPAGE} ]] && HOMEPAGE="http://xfce-goodies.berlios.de/"
+fi
+
+[[ -n ${SRC_URI} ]] \
+	|| SRC_URI="http://www.xfce.org/archive/xfce-${PV}/src${ZIP}/${P}${COMPRESS}"
+
+[[ ${XFCE_META} = "1" ]] \
+	&& SRC_URI=""
+
 [[ -z ${LICENSE} ]] \
-    && LICENSE="GPL-2"
+	&& LICENSE="GPL-2"
+
+[[ -z ${HOMEPAGE} ]] \
+	&& HOMEPAGE="http://www.xfce.org/"
 
-HOMEPAGE="http://www.xfce.org/"
 SLOT="0"
-IUSE="${IUSE} doc debug"
+IUSE="debug doc"
 
 RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2.2*
+	>=x11-libs/gtk+-2.2
 	dev-libs/libxml2
 	x11-libs/startup-notification
 	>=dev-libs/dbh-1.0.20
-	>=x11-themes/gtk-engines-xfce-2.2.4
-	>=xfce-base/xfce-mcs-manager-${PV}
-	${XFCE_RDEPEND}"
+	>=x11-themes/gtk-engines-xfce-2.2.5
+	${RDEPEND}"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	${XFCE_DEPEND}"
+	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P:-${P}}"
+[[ -z ${XFCE_S} ]] \
+	&& S="${WORKDIR}/${MY_P:-${P}}" \
+	|| S="${XFCE_S}"
 
 xfce4_src_compile() {
 	if [[ "${DEBUG_OFF}" = "1" ]] && use debug; then
-	    XFCE_CONFIG="${XFCE_CONFIG}" 
+	    XFCE_CONFIG="${XFCE_CONFIG}"
 	elif use debug; then
 	    XFCE_CONFIG="${XFCE_CONFIG} --enable-debug=yes"
-	fi 
-	
-	econf ${XFCE_CONFIG} || die
-    
-	if [[ "${SINGLE_MAKE}" = "1" ]]; then
-	    emake -j1 || die
+	fi
+
+	if [[ ${XFCE_META} = "1" ]]; then
+	    einfo "Meta Build, Nothing to compile."
 	else
-	    emake || die
+	    econf ${XFCE_CONFIG} || die
+
+	    if [[ "${SINGLE_MAKE}" = "1" ]]; then
+		emake -j1 || die
+	    else
+		emake || die
+	    fi
 	fi
 }
 
 xfce4_src_install() {
-	if [[ "${WANT_EINSTALL}" = "1" ]]; then
-	    einstall || die
+	if [[ ${XFCE_META} = "1" ]]; then
+	    einfo "Meta Build, Nothing to install."
 	else
-	    make DESTDIR=${D} install || die
-	fi
-	
-	if use doc; then
-	    dodoc ${XFCE_DOCS} AUTHORS INSTALL README COPYING ChangeLog HACKING NEWS THANKS TODO
+	    if [[ "${WANT_EINSTALL}" = "1" ]]; then
+		einstall || die
+	    else
+		make DESTDIR=${D} install || die
+	    fi
+
+	    if use doc; then
+		dodoc ${XFCE_DOCS} AUTHORS INSTALL README COPYING ChangeLog HACKING NEWS THANKS TODO
+	    fi
 	fi
 }
 
-EXPORT_FUNCTIONS src_compile src_install
\ No newline at end of file
+EXPORT_FUNCTIONS src_compile src_install
diff --git a/eclass/xfce42.eclass b/eclass/xfce42.eclass
index b5753469af8a..a254c1d3cbb3 100644
--- a/eclass/xfce42.eclass
+++ b/eclass/xfce42.eclass
@@ -61,10 +61,10 @@ single_make() {
 	JOBS="-j1"
 }
 
-## want_einstall 
+## want_einstall
 want_einstall() {
 	INSTALL="einstall"
-} 
+}
 
 ## LICENSE is set to Xfce base packages default
 LICENSE="GPL-2"
@@ -72,14 +72,13 @@ SLOT="0"
 
 IUSE="${IUSE}"
 
-RDEPEND=">=x11-libs/gtk+-2.2*
+RDEPEND=">=x11-libs/gtk+-2.2
         dev-libs/libxml2
-        x11-libs/startup-notification
         >=dev-libs/dbh-1.0.20
         >=x11-themes/gtk-engines-xfce-2.2.5
 	${RDEPEND}"
 DEPEND="${RDEPEND}
-        dev-util/pkgconfig"	
+        dev-util/pkgconfig"
 
 #S="${WORKDIR}/${MY_P:-${P}}"
 
diff --git a/eclass/xfree.eclass b/eclass/xfree.eclass
index 64e9fa7b702f..ced9fcd9f39a 100644
--- a/eclass/xfree.eclass
+++ b/eclass/xfree.eclass
@@ -1,23 +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/eclass/xfree.eclass,v 1.1 2003/06/29 07:59:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfree.eclass,v 1.1.1.1 2005/11/30 09:59:34 chriswhite Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
 # The xfree.eclass is designed to ease the checking functions that are
 # performed in xfree and xfree-drm ebuilds.  In the new scheme, a variable
-# called XFREE_CARDS will be used to indicate which cards a user wishes to
+# called VIDEO_CARDS will be used to indicate which cards a user wishes to
 # build support for.  Note, that this variable is only unlocked if the USE
-# variable "expertxfree" is switched on
+# variable "expertxfree" is switched on, at least for xfree.
 
-ECLASS=xfree
-INHERITED="${INHERITED} ${ECLASS}"
-
-EXPORT_FUNCTIONS xcards
-
-
-xcards() {
-	
-	has "$1" "${XFREE_CARDS}" && return 0
-	return 1
-}
+inherit x11
diff --git a/eclass/xmms-plugin.eclass b/eclass/xmms-plugin.eclass
index ff6de1e72e7f..5abc995323f8 100644
--- a/eclass/xmms-plugin.eclass
+++ b/eclass/xmms-plugin.eclass
@@ -1,176 +1,109 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xmms-plugin.eclass,v 1.1 2004/10/19 23:02:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xmms-plugin.eclass,v 1.1.1.1 2005/11/30 09:59:32 chriswhite Exp $
 #
 # Jeremy Huddleston <eradicator@gentoo.org>
-#
-# Usage:
-# Source Code:
-# You have multiple methods with which to specify how we get the source code
-# for the patckages.
-#
-# (1) - Separate tarballs
-# If your package provides separate tarballs for the xmms and bmp plugins,
-# then specify them in the XMMS_SRC_URI and BMP_SRC_URI variables.
-# XMMS_SRC_URI="xmms-plugin.tar.bz2"
-# BMP_SRC_URI="bmp-plugin.tar.bz2"
-# BASE_SRC_URI="common-stuff.tar.bz2"
-#
-# (2) - xmms->bmp patch
-# If you have a patch to turn an xmms plugin into a bmp plugin, specify it
-# in the variable XMMS2BMP_PATCH:
-# XMMS2BMP_PATCH="${FILESDIR}/${P}-xmms2bmp.patch"
-#
-# (3) - automated
-# The eclass will try to do some sedage to get the plugin to work with bmp.
-#
-# Common patches:
-# If you have patches that need to apply to both xmms and bmp sources,
-# Place them in the PATCHES variable:
-# PATCHES="${FILESDIR}/${P}-gcc34.patch ${FILESDIR}/${P}-config.patch"
-#
-# Source Location:
-# By default, we assume a ${S} of ${XMMS_S} or ${BMP_S} for the two packages.
-# These default to ${XMMS_WORKDIR}/${P} or ${BMP_WORKDIR}/${P}.
-# ${XMMS_WORKDIR} and ${BMP_WORKDIR}/${P} default to ${WORKDIR}/xmms and
-# ${WORKDIR}/bmp.  You may override ${*_S}, but not the ${*_WORKDIR}.
-#
-# Documentation:
-# Set the DOCS variable to contain the documentation to be dodocd:
-# DOCS="ChangeLog AUTHORS README"
 
-inherit eutils libtool gnuconfig
+# Usage:
+# This eclass is used to create ebuilds for xmms plugins which are contained
+# within the main xmms tarball.  Usage:
 
-ECLASS=xmms-plugin
-INHERITED="${INHERITED} ${ECLASS}"
+# PATCH_VER:
+# M4_VER:
+# GENTOO_URI:
+GENTOO_URI=${GENTOO_URI-"http://dev.gentoo.org/~eradicator/xmms"}
+# Set this variable if you want to use a gentoo specific patchset.  This adds
+# ${GENTOO_URI}/xmms-${PV}-gentoo-patches-${PATCH_VER}.tar.bz2 to the SRC_URI
 
-IUSE="${IUSE} xmms bmp"
+# PLUGIN_PATH:
+# Set this variable to the plugin location you want to build.
+# Example:
+# PLUGIN_PATH="Input/mpg123"
 
-DEPEND="bmp? ( >=media-sound/beep-media-player-0.9.7_rc2-r2 )
-	xmms? ( media-sound/xmms )"
+# SONAME:
+# Set this variable to the filename of the plugin that is copied over
+# Example:
+# SONAME="libmpg123.so"
 
-XMMS_WORKDIR="${WORKDIR}/xmms"
-BMP_WORKDIR="${WORKDIR}/bmp"
+inherit eutils flag-o-matic
 
-# We don't use ${S}
-S="${WORKDIR}"
+DESCRIPTION="Xmms Plugin: ${PN}"
+HOMEPAGE="http://www.xmms.org"
+LICENSE="GPL-2"
 
-if [ -z "${XMMS_S}" ]; then
-	XMMS_S="${XMMS_WORKDIR}/${P}"
-fi
+SRC_URI="http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2
+	 ${M4_VER:+${GENTOO_URI}/xmms-${PV}-gentoo-m4-${M4_VER}.tar.bz2}
+	 ${PATCH_VER:+${GENTOO_URI}/xmms-${PV}-gentoo-patches-${PATCH_VER}.tar.bz2}"
 
-if [ -z "${BMP_S}" ]; then
-	BMP_S="${BMP_WORKDIR}/${P}"
-fi
+# Set S to something which exists
+S="${WORKDIR}/xmms-${PV}"
 
-if [ -n "${BMP_SRC_URI}" -a -n "${XMMS_SRC_URI}" ]; then
-	SRC_URI="${BASE_SRC_URI}
-	         bmp? ( ${BMP_SRC_URI} )
-	         xmms? ( ${XMMS_SRC_URI} )"
-fi
+RDEPEND="${RDEPEND+${RDEPEND}}${RDEPEND-${DEPEND}}"
+DEPEND="${DEPEND}
+	=sys-devel/automake-1.7*
+	=sys-devel/autoconf-2.5*
+	sys-devel/libtool"
 
 xmms-plugin_src_unpack() {
-	use xmms && mkdir ${XMMS_WORKDIR}
-	use bmp && mkdir ${BMP_WORKDIR}
-
-	if [ -n "${BMP_SRC_URI}" -a -n "${XMMS_SRC_URI}" ]; then
-		if use xmms; then
-			cd ${XMMS_WORKDIR}
-			for f in ${XMMS_SRC_URI} ${BASE_SRC_URI}; do
-				unpack ${f}
-			done
-		fi
-
-		if use bmp; then
-			cd ${BMP_WORKDIR}
-			for f in ${BMP_SRC_URI} ${BASE_SRC_URI}; do
-				unpack ${f}
-			done
-		fi
-	else
-		if use xmms; then
-			cd ${XMMS_WORKDIR}
-			unpack ${A}
-		fi
-
-		if use bmp; then
-			cd ${BMP_WORKDIR}
-			unpack ${A}
-
-			if [ -n "${XMMS2BMP_PATCH}" ]; then
-				cd ${BMP_S}
-				epatch ${XMMS2BMP_PATCH}
-			else
-				cd ${BMP_S}
-				xmms2bmp_automate
-			fi
-		fi
+	if ! has_version '>=media-sound/xmms-1.2.10-r13'; then
+		ewarn "You don't have >=media-sound/xmms-1.2.10-r13, so we are using the SDK in"
+		ewarn "this package rather that the one installed on your system. It is recommended"
+		ewarn "that you cancel this emerge and grab >=media-sound/xmms-1.2.10-r13 first."
+		epause 5
 	fi
 
-	if [ -n "${PATCHES}" ]; then
-		if use xmms; then
-			cd ${XMMS_S}
-			epatch ${PATCHES}
-		fi
+	unpack ${A}
 
-		if use bmp; then
-			cd ${BMP_S}
-			epatch ${PATCHES}
-		fi
+	cd ${S}
+	if [[ -n "${PATCH_VER}" ]]; then
+		EPATCH_SUFFIX="patch"
+		epatch ${WORKDIR}/patches
 	fi
 
-	if use xmms; then
-		cd ${XMMS_S}
-		S="${XMMS_S}"
-		elibtoolize
-		gnuconfig_update
-	fi
+	cd ${S}/${PLUGIN_PATH}
+	sed -i -e "s:-I\$(top_srcdir)::g" \
+	       -e "s:\$(top_builddir)/libxmms/libxmms.la:/usr/$(get_libdir)/libxmms.la:g" \
+	       Makefile.am || die "Failed to edit Makefile.am"
 
-	if use bmp; then
-		cd ${BMP_S}
-		S="${BMP_S}"
-		elibtoolize
-		gnuconfig_update
-	fi
-}
+	cd ${S}
 
-xmms-plugin_src_compile() {
-	myconf="${myconf} --disable-static"
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	libtoolize --force --copy || die "libtoolize --force --copy failed"
 
-	if use xmms; then
-		cd ${XMMS_S}
-		econf ${myconf} ${xmms_myconf} || die
-		emake || die
+	if [[ -n "${M4_VER}" ]]; then
+		rm acinclude.m4
+		aclocal -I ${WORKDIR}/m4 || die "aclocal failed"
+	else
+		aclocal || die "aclocal failed"
 	fi
+	autoheader || die "autoheader failed"
+	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
 
-	if use bmp; then
-		cd ${BMP_S}
-		export FAKE_XMMS_VERSION=1.2.10
-		econf ${myconf} ${bmp_myconf}|| die
-		emake || die
+	cd ${S}/${PLUGIN_PATH}
+	if has_version '>=media-sound/xmms-1.2.10-r13'; then
+		sed -i -e "s:^DEFAULT_INCLUDES = .*$:DEFAULT_INCLUDES = -I. $(xmms-config --cflags):" \
+			Makefile.in || die "Failed to edit Makefile.in"
 	fi
+
+	cd ${S}
+	autoconf || die "autoconf failed"
 }
 
-xmms-plugin_src_install() {
-	if use xmms; then
-		cd ${XMMS_S}
-		make DESTDIR="${D}" install || die
-	fi
+xmms-plugin_src_compile() {
+	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 
-	if use bmp; then
-		cd ${BMP_S}
-		make DESTDIR="${D}" install || die
-	fi
+	econf ${myconf}
+	cp config.h ${S}/${PLUGIN_PATH}
 
-	if [ -n "${DOCS}" ]; then
-		dodoc ${DOCS}
-	fi
+	cd ${S}/${PLUGIN_PATH}
+	emake -j1 || die
 }
 
-xmms2bmp_automate() {
-	find . -name Makefile -o -name Makefile.in -o -name configure |
-		xargs sed -i -e 's:xmms-config:beep-config:g' \
-		             -e 's:libdir)/xmms:libdir)/bmp:g'
+xmms-plugin_src_install() {
+	cd ${S}/${PLUGIN_PATH}
+	make DESTDIR="${D}" install || die
 }
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
diff --git a/eclass/zproduct.eclass b/eclass/zproduct.eclass
index d4354e326ac9..5d6b1f2f23ff 100644
--- a/eclass/zproduct.eclass
+++ b/eclass/zproduct.eclass
@@ -1,35 +1,34 @@
-# Copyright 2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.1.1.1 2005/11/30 09:59:26 chriswhite Exp $
 # Author: Jason Shoemaker <kutsuya@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.1 2003/02/17 05:06:48 kutsuya Exp $
 
 # This eclass is designed to streamline the construction of
 # ebuilds for new zope products
 
-ECLASS=zproduct
-INHERITED="${INHERITED} ${ECLASS}"
-EXPORT_FUNCTIONS src_install pkg_prerm pkg_postinst
+EXPORT_FUNCTIONS src_install pkg_prerm pkg_postinst pkg_config
+
+DESCRIPTION="This is a zope product"
+#HOMEPAGE=""
+#SRC_URI=""
+
+RDEPEND=">=net-zope/zope-2.6.0-r2
+	app-admin/zprod-manager"
 
-DESCRIPTION="Define me."
-HOMEPAGE=""
-SRC_URI=""
-DEPEND=""
-RDEPEND=">=net-www/zope-2.6.0-r2"
 IUSE=""
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 S=${WORKDIR}
 
-ZI_DIR="/var/lib/zope/"
-ZP_DIR="/usr/share/zproduct"
+ZI_DIR="${ROOT}/var/lib/zope/"
+ZP_DIR="${ROOT}/usr/share/zproduct"
 DOT_ZFOLDER_FPATH="${ZP_DIR}/${PF}/.zfolder.lst"
 
 zproduct_src_install()
 {
-	local N=
 	## Assume that folders or files that shouldn't be installed
-	#  have been already been removed.
-    ## Assume $S set to the parent directory of the zproduct(s).
+	#  in the zproduct directory have been already been removed.
+	## Assume $S set to the parent directory of the zproduct(s).
 
 	debug-print-function ${FUNCNAME} ${*}
 	[ -n "${ZPROD_LIST}" ] || die "ZPROD_LIST isn't defined."
@@ -43,61 +42,111 @@ zproduct_src_install()
 		case ${1} in
 			do_zpfolders)
 				## Create .zfolders.lst from $ZPROD_LIST.
-				debug-print-section do_zpfolders 
+				debug-print-section do_zpfolders
 				for N in ${ZPROD_LIST} ; do
 					echo ${N} >> ${D}/${DOT_ZFOLDER_FPATH}
-				done ;;					
+				done
+				;;
 			do_docs)
-				#*Moves txt docs 
-				debug-print-section do_docs 
-				docinto /
-				dodoc *.txt
-				rm -f *.txt
-				for N in ${ZPROD_LIST} ; do
-					docinto ${N}
-					dodoc ${N}/*.txt
-					rm -f ${N}/*.txt
-					if [ -d "${N}/docs" ] ; then
-						docinto ${N}/docs
-						dodoc ${N}/docs/*
-						rm -Rf ${N}/docs
-					fi
-				done ;;
+				#*Moves txt docs
+				debug-print-section do_docs
+				docs_move
+				for ZPROD in ${ZPROD_LIST} ; do
+					docs_move ${ZPROD}/
+				done
+				;;
 			do_install)
 				debug-print-section do_install
 				# Copy everything that's left to ${D}${ZP_DIR}
-				cp -a ${S}/* ${D}/${ZP_DIR}/${PF} ;;
-						
+				# modified to not copy ownership (QA)
+				cp --recursive --no-dereference --preserve=timestamps,mode,links ${S}/* ${D}/${ZP_DIR}/${PF}
+				;;
 			all)
-				debug-print-section all 
- 				zproduct_src_install do_zpfolders do_docs do_install ;;
+				debug-print-section all
+				zproduct_src_install do_zpfolders do_docs do_install ;;
 		esac
 		shift
-	done	
+	done
 	debug-print "${FUNCNAME}: result is ${RESULT}"
 }
 
+docs_move()
+{
+	# if $1 == "/", then this breaks.
+	if [ -n "$1" ] ; then
+		docinto $1
+	else
+		docinto /
+	fi
+	dodoc $1HISTORY.txt $1README{.txt,} $1INSTALL{.txt,} > /dev/null
+	dodoc $1AUTHORS $1COPYING $1CREDITS.txt $1TODO{.txt,} > /dev/null
+	dodoc $1LICENSE{.GPL,.txt,} $1CHANGES{.txt,} > /dev/null
+	dodoc $1DEPENDENCIES.txt $1FAQ.txt $1UPGRADE.txt > /dev/null
+	for item in ${MYDOC} ; do
+		dodoc ${1}${item} > /dev/null
+	done
+}
+
 zproduct_pkg_postinst()
 {
-    #*check for multiple zinstances, if several display install help msg.
+	#*check for multiple zinstances, if several display install help msg.
 
-    #*Use zprod-update to install this zproduct to the default zinstance.
+	#*Use zprod-update to install this zproduct to the default zinstance.
 	debug-print-function ${FUNCNAME} ${*}
-	chown -R zope:root ${ZP_DIR}/${PF}
-	einfo ">>> Installing zproduct into the .default zinstance..."
-	/usr/sbin/zprod-update add ${ZP_DIR}/${PF} 
+
+	# this is a shared directory, so root should be owner;
+	# zprod-manager or whatever is used to copy products into the
+	# instances has to take care of setting the right permissions in
+	# the target directory
+
+	chown -R root:root ${ZP_DIR}/${PF}
+	# make shure there is nothing writable in the new dir, and all is readable
+	chmod -R go-w,a+rX ${ZP_DIR}/${PF}
+	einfo ">>> Installing ${PF} into the \"$(zope-config --zidef-get)\" zinstance ..."
+	${ROOT}/usr/sbin/zprod-manager add ${ZP_DIR}/${PF}
 }
 
+# This function is deprecated! Still used, until a new system developed.
+
 zproduct_pkg_prerm()
 {
 	# remove this zproduct from all zinstances.
 	# process zinstance.lst and proceed with zprod-update del
 	debug-print-function ${FUNCNAME} ${*}
-	ewarn "Uninstalling from all zinstances..."
 	ZINST_LST=$(ls /var/lib/zope/)
 	if [ "${ZINST_LST}" ] ; then
+		# first check and warn on any installed products into instances
+		ARE_INSTALLED=0
+		for N in ${ZINST_LST} ; do
+			if [ -s $DOT_ZFOLDER_FPATH ]
+			then
+				# check only if installed product has non empty folder lists
+				#
+				# for every fodler inside product ...
+				for PFOLD in `cat $DOT_ZFOLDER_FPATH`
+				do
+					# ... check if its in instance.
+					if [ -d "${ZI_DIR}${N}/Products/${PFOLD}" ]
+					then
+						ARE_INSTALLED=$[ARE_INSTALLED + 1]
+					fi
+				done
+			fi
+		done
+		# Info and wait ...
+		if [ $ARE_INSTALLED -gt 0 ]
+		then
+			#TODO: should use ebeep and epause, but i got some inheritance errors on eutils
+			#so as for now i use local version. in futuure we should inherit ueilts
+			ewarn "Detected at least $ARE_INSTALLED copies of product being removed."
+			ewarn "Sleeping 10seconds, please use CTRL+C to abort!"
+			echo -ne "\a"
+			sleep 10
+		fi
+
+		ewarn "Uninstalling from all zinstances ..."
 		for N in ${ZINST_LST} ; do
-			/usr/sbin/zprod-update del ${ZP_DIR}/${PF} ${ZI_DIR}${N}
+			${ROOT}/usr/sbin/zprod-manager del ${ZP_DIR}/${PF} ${ZI_DIR}${N}
 		done
 	fi
 }
@@ -107,5 +156,5 @@ zproduct_pkg_prerm()
 zproduct_pkg_config()
 {
 	einfo "To add zproducts to other zinstances execute:"
-	einfo "\tzprod-update add"
+	einfo "\tzprod-manager add"
 }
diff --git a/kde-misc/filelight/ChangeLog b/kde-misc/filelight/ChangeLog
index f58734964735..2aa44a961864 100644
--- a/kde-misc/filelight/ChangeLog
+++ b/kde-misc/filelight/ChangeLog
@@ -1,6 +1,40 @@
-# ChangeLog for sys-apps/filelight
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/ChangeLog,v 1.1 2004/10/30 18:00:42 carlo Exp $
+# ChangeLog for kde-misc/filelight
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
+
+  25 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  filelight-1.0_beta6.ebuild:
+  stable on amd64
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  filelight-1.0_beta6.ebuild:
+  Stable on ppc.
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> filelight-1.0_beta6.ebuild:
+  stable on x86
+
+*filelight-1.0_beta6 (30 Nov 2004)
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/filelight-1.0_beta6-pic.patch, +filelight-1.0_beta6.ebuild:
+  version bump
+
+*filelight-1.0_beta5 (21 Nov 2004)
+
+  21 Nov 2004; Dominik Stadler <centic@gentoo.org>
+  +filelight-1.0_beta5.ebuild:
+  Add new Version 1.0beta5
+
+*filelight-1.0_beta4 (10 Nov 2004)
+
+  10 Nov 2004; Carsten Lohrke <carlo@gentoo.org> -filelight-0.6.4.1.ebuild,
+  -filelight-1.0_beta1.ebuild, -filelight-1.0_beta2-r1.ebuild,
+  -filelight-1.0_beta2-r2.ebuild, -filelight-1.0_beta2.ebuild,
+  +filelight-1.0_beta4.ebuild:
+  version bump and clean up
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> filelight-1.0_beta2-r2.ebuild:
+  Added ~sparc keyword.
 
 *filelight-0.6.4.1 (30 Oct 2004)
 
diff --git a/kde-misc/filelight/Manifest b/kde-misc/filelight/Manifest
index bd2eb8b3b6b9..bd5c05a633a2 100644
--- a/kde-misc/filelight/Manifest
+++ b/kde-misc/filelight/Manifest
@@ -1,14 +1,15 @@
-MD5 c786be208d69f90503165f6712a366bd ChangeLog 1762
-MD5 909ec5c10391083a4dc7db3e365bbfb6 filelight-0.6.4.1-r1.ebuild 642
-MD5 00461b55d4102e41d6563422ca470d40 filelight-0.6.4.1.ebuild 536
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 5b740d63f31849e38dc4771f850052a1 filelight-1.0_beta1.ebuild 646
-MD5 2d083139c8308c591fde9a52e69afcae filelight-1.0_beta2.ebuild 643
-MD5 e9f696c1b1cb1ff45b4fc7b2732b1f84 filelight-1.0_beta2-r1.ebuild 718
-MD5 128864b74c83e63199a6a9a278087bcc filelight-1.0_beta2-r2.ebuild 781
-MD5 a9c5dd52f323f7bcea2c21a3cc5c2210 files/digest-filelight-0.6.4.1 69
-MD5 a9c5dd52f323f7bcea2c21a3cc5c2210 files/digest-filelight-0.6.4.1-r1 69
-MD5 9783f32c2b7f0d478632e43fc9104d03 files/digest-filelight-1.0_beta1 72
-MD5 e1f0425ca083f593d2be6aa3b41d41a0 files/digest-filelight-1.0_beta2 72
-MD5 e1f0425ca083f593d2be6aa3b41d41a0 files/digest-filelight-1.0_beta2-r1 72
-MD5 e1f0425ca083f593d2be6aa3b41d41a0 files/digest-filelight-1.0_beta2-r2 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6e096bd66735777c0d2e22100fc875e5 ChangeLog 3113
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 7c4b93a7aa9388fb186259ec6a50f6d8 filelight-1.0_beta6.ebuild 683
+MD5 7ef6c74df9f1f4873b4647add19f5152 files/digest-filelight-1.0_beta6 72
+MD5 681713bf05f8bbf1693fa8728cc22861 files/filelight-1.0_beta6-pic.patch 1025
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCvXfHBXaUFmZvwyMRAu/SAJsFHoXLBmkxoZzdeToRgofsijabNwCgjTrB
+r/fdx7dbqd/Isb8h6KdlN2E=
+=qojh
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/filelight/filelight-1.0_beta6.ebuild b/kde-misc/filelight/filelight-1.0_beta6.ebuild
index 026e5b99db76..6f83ec6635de 100644
--- a/kde-misc/filelight/filelight-1.0_beta6.ebuild
+++ b/kde-misc/filelight/filelight-1.0_beta6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/filelight-1.0_beta6.ebuild,v 1.1 2004/11/30 19:21:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/filelight-1.0_beta6.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.methylblue.com/filelight/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~hppa ~sparc"
+KEYWORDS="amd64 ~hppa ppc ~sparc x86"
 IUSE=""
 
 need-kde 3.2
diff --git a/kde-misc/filelight/metadata.xml b/kde-misc/filelight/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/filelight/metadata.xml
+++ b/kde-misc/filelight/metadata.xml
@@ -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/kde-misc/kadslwatch/ChangeLog b/kde-misc/kadslwatch/ChangeLog
index 7b4ac927ee77..318f9767375b 100644
--- a/kde-misc/kadslwatch/ChangeLog
+++ b/kde-misc/kadslwatch/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for kde-misc/kadslwatch
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kadslwatch/ChangeLog,v 1.1 2004/10/29 14:12:24 motaboy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kadslwatch/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  22 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kadslwatch-01.00.06.ebuild:
+  Stable on x86.
+
+*kadslwatch-01.00.06 (17 Aug 2005)
+
+  17 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kadslwatch-01.00.06-configure.patch, +kadslwatch-01.00.06.ebuild:
+  New version (#102686).
+
+  05 Dec 2004; Simone Gotti <motaboy@gentoo.org> kadslwatch-01.00.05.ebuild:
+  Stable on x86.
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kadslwatch-01.00.05.ebuild:
+  QA: missing "inherit eutils"
+
+  30 Oct 2004; Simone Gotti <motaboy@gentoo.org> kadslwatch-01.00.05.ebuild:
+  Don't install README.html 2 times in the doc dir.
 
 *kadslwatch-01.00.05 (29 Oct 2004)
 
diff --git a/kde-misc/kadslwatch/Manifest b/kde-misc/kadslwatch/Manifest
index 2751d6c7696d..7ae7d3fc0c3f 100644
--- a/kde-misc/kadslwatch/Manifest
+++ b/kde-misc/kadslwatch/Manifest
@@ -1,5 +1,5 @@
-MD5 c6c938dc4b5cd8435e97c52b5d0e3766 kadslwatch-01.00.05.ebuild 658
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
-MD5 86a06d84922a5ed4bed06c10ae0c036b files/digest-kadslwatch-01.00.05 71
-MD5 c7fdc44e6f308206a89317cb4ec3e9a3 files/kadslwatch-01.00.05-Makefiles.patch 4657
-MD5 35ad82ec670513cec79e4a1042d9c1a8 files/kadslwatch-01.00.05-configure.patch 3563
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 c798686df7784d640f874820b55ce29a ChangeLog 1237
+MD5 ad562302cb080f871e00d19fef0c356a kadslwatch-01.00.06.ebuild 699
+MD5 28ba7da7b8941933a4398f13549a7051 files/kadslwatch-01.00.06-configure.patch 3678
+MD5 9803c3460011cb575f9568a7fc80d13c files/digest-kadslwatch-01.00.06 71
diff --git a/kde-misc/kadslwatch/kadslwatch-01.00.06.ebuild b/kde-misc/kadslwatch/kadslwatch-01.00.06.ebuild
index a82b5d51b55a..a27cf779643d 100644
--- a/kde-misc/kadslwatch/kadslwatch-01.00.06.ebuild
+++ b/kde-misc/kadslwatch/kadslwatch-01.00.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kadslwatch/kadslwatch-01.00.06.ebuild,v 1.1 2005/08/17 10:09:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kadslwatch/kadslwatch-01.00.06.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.avm.de/tools/k_adsl_watch.linux/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="net-dialup/capi4k-utils"
diff --git a/kde-misc/kadslwatch/metadata.xml b/kde-misc/kadslwatch/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/kde-misc/kadslwatch/metadata.xml
+++ b/kde-misc/kadslwatch/metadata.xml
@@ -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/kde-misc/kalbum/ChangeLog b/kde-misc/kalbum/ChangeLog
index 69d763e7c6b4..7277283550e9 100644
--- a/kde-misc/kalbum/ChangeLog
+++ b/kde-misc/kalbum/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-misc/kalbum
+# ChangeLog for kde-misc/kalbum
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/ChangeLog,v 1.1 2004/10/30 23:31:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 *kalbum-0.8.0 (31 Oct 2004)
 
diff --git a/kde-misc/kalbum/Manifest b/kde-misc/kalbum/Manifest
index 86d9f141ac83..6597ab0edfa4 100644
--- a/kde-misc/kalbum/Manifest
+++ b/kde-misc/kalbum/Manifest
@@ -1,3 +1,4 @@
-MD5 080c7dfeb9c745677b24682e37805644 ChangeLog 873
-MD5 d72cf3a846774c4bc740820ecb5ee518 kalbum-0.8.0.ebuild 602
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 24b4ff80bb32aba57f362c07d98729af ChangeLog 1043
+MD5 7afb07234e772e2854eea92932d42c11 kalbum-0.8.0.ebuild 602
 MD5 f501ad837ca304264a23f6ef285aae0c files/digest-kalbum-0.8.0 65
diff --git a/kde-misc/kalbum/kalbum-0.8.0.ebuild b/kde-misc/kalbum/kalbum-0.8.0.ebuild
index a515cd544a1d..6fe1778ebb96 100644
--- a/kde-misc/kalbum/kalbum-0.8.0.ebuild
+++ b/kde-misc/kalbum/kalbum-0.8.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/kde-misc/kalbum/kalbum-0.8.0.ebuild,v 1.1 2004/10/30 23:31:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/kalbum-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/kalbum/metadata.xml b/kde-misc/kalbum/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kalbum/metadata.xml
+++ b/kde-misc/kalbum/metadata.xml
@@ -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/kde-misc/kaptain/ChangeLog b/kde-misc/kaptain/ChangeLog
index d73b5550dfc2..77fed850a460 100644
--- a/kde-misc/kaptain/ChangeLog
+++ b/kde-misc/kaptain/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for app-misc/kaptain
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/ChangeLog,v 1.1 2004/10/30 16:48:26 carlo Exp $
+# ChangeLog for kde-misc/kaptain
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kaptain-0.72.ebuild:
+  Stable on ppc.
+
+  15 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kaptain-0.72.ebuild:
+  Stable on x86.
+
+*kaptain-0.72 (20 Jan 2005)
+
+  20 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kaptain-0.72.ebuild:
+  Version bump.
+
+  20 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> kaptain-0.71.ebuild:
+  Stable on x86.
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kaptain-0.71.ebuild:
+  Added ~sparc keyword.
 
 *kaptain-0.71 (30 Oct 2004)
 
diff --git a/kde-misc/kaptain/Manifest b/kde-misc/kaptain/Manifest
index b2c095035db2..9cff666fd00d 100644
--- a/kde-misc/kaptain/Manifest
+++ b/kde-misc/kaptain/Manifest
@@ -1,5 +1,4 @@
-MD5 079ea46aac8e54c1db352c84c05209c0 kaptain-0.71.ebuild 752
-MD5 cf8d768931d041de975224869cdc80f9 ChangeLog 474
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 2663b98e3a503fbe5ad65775a66a9c79 files/0.71-assert.patch 250
-MD5 cbbcdca451b0b9504f21390e7ac03563 files/digest-kaptain-0.71 64
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 86b8658df64dd3aed9fb1a3d44e09ae1 ChangeLog 1148
+MD5 c51a86d3da862352f2fc097dcb937cfe kaptain-0.72.ebuild 577
+MD5 6b08955b6f6578ad4b9335bc411b6e6f files/digest-kaptain-0.72 65
diff --git a/kde-misc/kaptain/kaptain-0.72.ebuild b/kde-misc/kaptain/kaptain-0.72.ebuild
index b73d216aed8f..83e79b666e63 100644
--- a/kde-misc/kaptain/kaptain-0.72.ebuild
+++ b/kde-misc/kaptain/kaptain-0.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/kaptain-0.72.ebuild,v 1.1 2005/01/20 13:18:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/kaptain-0.72.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde-functions eutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="ppc ~sparc x86"
 
 need-qt 3
 
diff --git a/kde-misc/kaptain/metadata.xml b/kde-misc/kaptain/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kaptain/metadata.xml
+++ b/kde-misc/kaptain/metadata.xml
@@ -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/kde-misc/katalog/ChangeLog b/kde-misc/katalog/ChangeLog
index 96f293bd3b0b..c017fd2dee4a 100644
--- a/kde-misc/katalog/ChangeLog
+++ b/kde-misc/katalog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/katalog
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/katalog/ChangeLog,v 1.1 2004/11/08 19:12:19 motaboy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/katalog/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> katalog-0.3.ebuild:
+  Added ~sparc keyword.
+
+  10 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> katalog-0.3.ebuild:
+  Stable on x86.
 
 *katalog-0.3 (08 Nov 2004)
 
diff --git a/kde-misc/katalog/Manifest b/kde-misc/katalog/Manifest
index adcc7dbdbc0a..564a20bfbecb 100644
--- a/kde-misc/katalog/Manifest
+++ b/kde-misc/katalog/Manifest
@@ -1,3 +1,4 @@
-MD5 0c41713960ebe06ac79514c51aa8a514 katalog-0.3.ebuild 340
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
+MD5 a9400a0f0b46b38086b2963ef4bda773 ChangeLog 558
+MD5 75bfe08031e2c2d168e17b01c7c61c16 katalog-0.3.ebuild 439
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 MD5 433799eace68a98c676a0153ad60b919 files/digest-katalog-0.3 63
diff --git a/kde-misc/katalog/katalog-0.3.ebuild b/kde-misc/katalog/katalog-0.3.ebuild
index 1ad327fa83b3..aea32ec3c6ce 100644
--- a/kde-misc/katalog/katalog-0.3.ebuild
+++ b/kde-misc/katalog/katalog-0.3.ebuild
@@ -1,17 +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/kde-misc/katalog/katalog-0.3.ebuild,v 1.1 2004/11/08 19:12:19 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/katalog/katalog-0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
-
 DESCRIPTION="Integrated cataloger for KDE"
 SRC_URI="http://salvaste.altervista.org/${P}.tar.gz"
 HOMEPAGE="http://salvaste.altervista.org/"
-
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+
+SLOT="0"
+KEYWORDS="~sparc x86"
 IUSE=""
 
 need-kde 3.2
-need-qt 3.1
\ No newline at end of file
diff --git a/kde-misc/katalog/metadata.xml b/kde-misc/katalog/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/kde-misc/katalog/metadata.xml
+++ b/kde-misc/katalog/metadata.xml
@@ -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/kde-misc/kbeam/ChangeLog b/kde-misc/kbeam/ChangeLog
index b58f852d44a8..088562e65e85 100644
--- a/kde-misc/kbeam/ChangeLog
+++ b/kde-misc/kbeam/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for app-misc/kbeam
+# ChangeLog for kde-misc/kbeam
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/ChangeLog,v 1.1 2004/10/30 16:50:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
+
+  02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kbeam-0.61.ebuild:
+  QA: need-kde() after R/DEPEND
 
 *kbeam-0.61 (30 Oct 2004)
 
diff --git a/kde-misc/kbeam/Manifest b/kde-misc/kbeam/Manifest
index 8f711969540a..91e9fbc10b29 100644
--- a/kde-misc/kbeam/Manifest
+++ b/kde-misc/kbeam/Manifest
@@ -1,4 +1,4 @@
-MD5 de69f537036a103080035b10e12f4920 ChangeLog 801
-MD5 c7905dd20e49deed0bced0499a9f714c metadata.xml 222
-MD5 d5a990b2471084ea014a6a416db28c95 kbeam-0.61.ebuild 565
+MD5 2834f1cb97eea873f19ab95ccad6bc6d metadata.xml 216
+MD5 5878b62f167a899122af6e0c9116d52c kbeam-0.61.ebuild 564
+MD5 cd1d41903d1659f36cb466dac1ecc4cc ChangeLog 1063
 MD5 ba873639f681c915eb79da03aecaa9b3 files/digest-kbeam-0.61 62
diff --git a/kde-misc/kbeam/kbeam-0.61.ebuild b/kde-misc/kbeam/kbeam-0.61.ebuild
index f427063bb126..916ebc699b38 100644
--- a/kde-misc/kbeam/kbeam-0.61.ebuild
+++ b/kde-misc/kbeam/kbeam-0.61.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/kbeam-0.61.ebuild,v 1.1 2004/10/30 16:50:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbeam/kbeam-0.61.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit kde
-need-kde 3.2
 
 KLV="14683"
 DESCRIPTION="A KDE application that lets you send and receive files to devices, using your Infrared port."
@@ -15,3 +14,4 @@ IUSE=""
 SLOT="0"
 
 DEPEND=">=dev-libs/openobex-1.0.0"
+need-kde 3.2
\ No newline at end of file
diff --git a/kde-misc/kbeam/metadata.xml b/kde-misc/kbeam/metadata.xml
index 051cbc4ed73a..f360420caeb2 100644
--- a/kde-misc/kbeam/metadata.xml
+++ b/kde-misc/kbeam/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd>
+<herd>kde</herd>
 <maintainer>
 	<email>voxus@gentoo.org</email>
 </maintainer>
diff --git a/kde-misc/kbrain/ChangeLog b/kde-misc/kbrain/ChangeLog
index 944b8683083c..5435c5c4633a 100644
--- a/kde-misc/kbrain/ChangeLog
+++ b/kde-misc/kbrain/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for app-misc/kbrain
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbrain/ChangeLog,v 1.1 2004/11/24 21:54:09 carlo Exp $
+# ChangeLog for kde-misc/kbrain
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbrain/ChangeLog,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> kbrain-0.1.3.ebuild:
+  Added to ~ppc.
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> kbrain-0.1.3.ebuild:
+  Added ~sparc keyword.
+
+  26 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/kbrain-0.1.3-gentoo.diff:
+  lost patch while moving
 
   30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> kbrain-0.1.3.ebuild:
   Adding amd64 keyword. Closing #43748.
diff --git a/kde-misc/kbrain/Manifest b/kde-misc/kbrain/Manifest
index 2d962798be69..bc17a4aaf371 100644
--- a/kde-misc/kbrain/Manifest
+++ b/kde-misc/kbrain/Manifest
@@ -1,4 +1,5 @@
-MD5 30dd65da8aaf4905fdbea3e64566adb5 kbrain-0.1.3.ebuild 490
-MD5 b6590dede6acadb3fe99d0218c404811 ChangeLog 1139
+MD5 b858afc81792655caafe1e3413bb835f ChangeLog 1423
+MD5 3887ebe6dd067dbb3990ee16154173a6 kbrain-0.1.3.ebuild 498
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 dfd825077e0db8c8f18798e5f9a1a4e4 files/digest-kbrain-0.1.3 64
 MD5 4055d10f0e4a06b52f8c2be53aa00296 files/kbrain-0.1.3-gentoo.diff 1286
diff --git a/kde-misc/kbrain/kbrain-0.1.3.ebuild b/kde-misc/kbrain/kbrain-0.1.3.ebuild
index d9c350cfedb8..878610f995fb 100644
--- a/kde-misc/kbrain/kbrain-0.1.3.ebuild
+++ b/kde-misc/kbrain/kbrain-0.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbrain/kbrain-0.1.3.ebuild,v 1.1 2004/11/24 21:54:09 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kbrain/kbrain-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit kde
 need-kde 3
@@ -12,4 +12,4 @@ SRC_URI="http://cmjartan.freezope.org/kbrain/files/${P}.tar.gz"
 HOMEPAGE="http://cmjartan.freezope.org/kbrain"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
diff --git a/kde-misc/kbrain/metadata.xml b/kde-misc/kbrain/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kbrain/metadata.xml
+++ b/kde-misc/kbrain/metadata.xml
@@ -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/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index c4aee31a7185..7d7b048d2594 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,32 @@
-# ChangeLog for app-misc/kdiff3
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.1 2004/10/30 17:45:28 carlo Exp $
+# ChangeLog for kde-misc/kdiff3
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> kdiff3-0.9.88.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> kdiff3-0.9.88.ebuild:
+  Stable on ppc64
+
+  05 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> kdiff3-0.9.88.ebuild:
+  Marked stable on amd64.
+
+  28 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdiff3-0.9.88.ebuild:
+  Stable on sparc
+
+  25 Mar 2005; Carsten Lohrke <carlo@gentoo.org> kdiff3-0.9.88.ebuild:
+  stable on x86
+
+*kdiff3-0.9.88 (25 Feb 2005)
+
+  25 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +kdiff3-0.9.88.ebuild:
+  version bump
+
+*kdiff3-0.9.87 (01 Feb 2005)
+
+  01 Feb 2005; Carsten Lohrke <carlo@gentoo.org> -kdiff3-0.9.80.ebuild,
+  -kdiff3-0.9.82.ebuild, +kdiff3-0.9.87.ebuild:
+  version bump, clean up
 
 *kdiff3-0.9.86 (30 Oct 2004)
 
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e78c131a4e09..aae73cc8b7d4 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,8 +1,4 @@
-MD5 b55dca5fdb287d4009541c7d89eb0c1c ChangeLog 2238
-MD5 6bcf80bad22d30da1e460149857e4f5c kdiff3-0.9.80.ebuild 455
-MD5 7d09e863eba0fdf9d8e00b4a97291926 kdiff3-0.9.82.ebuild 480
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 93cbb8fccac1eb80620c36d75a099c90 kdiff3-0.9.86.ebuild 478
-MD5 802d1d72d68f79e1d1506cfe88ed3802 files/digest-kdiff3-0.9.86 66
-MD5 51ecc674056ba4f8d97cad7996ccd5d5 files/digest-kdiff3-0.9.80 66
-MD5 571d23192f62bc1c9f2d678a31cf265e files/digest-kdiff3-0.9.82 66
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 c2d53c08b86e55516b0cc1d31164dbd0 ChangeLog 3215
+MD5 ce8c8bb9b56f238acc5d20327f042a4b kdiff3-0.9.88.ebuild 479
+MD5 a733b0724ffb1c8b34a8416a1ebfab2f files/digest-kdiff3-0.9.88 66
diff --git a/kde-misc/kdiff3/kdiff3-0.9.88.ebuild b/kde-misc/kdiff3/kdiff3-0.9.88.ebuild
index a57551d9946c..174423d66482 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.88.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.88.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.88.ebuild,v 1.1 2005/02/25 20:39:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.88.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
+KEYWORDS="x86 amd64 ppc sparc ppc64"
 IUSE=""
 
 RDEPEND="sys-apps/diffutils"
diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -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/kde-misc/kdirstat/ChangeLog b/kde-misc/kdirstat/ChangeLog
index acb04ac3949b..d3764acfa2e1 100644
--- a/kde-misc/kdirstat/ChangeLog
+++ b/kde-misc/kdirstat/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for app-misc/kdirstat
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdirstat/ChangeLog,v 1.1 2004/10/30 17:23:11 carlo Exp $
+# ChangeLog for kde-misc/kdirstat
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdirstat/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> kdirstat-2.4.3.ebuild:
+  stable on amd64
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  kdirstat-2.4.3.ebuild:
+  Stable on ppc.
+
+  10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdirstat-2.4.3.ebuild:
+  Stable on sparc
+
+  01 May 2005; Carsten Lohrke <carlo@gentoo.org> kdirstat-2.4.3.ebuild:
+  stable on x86
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> kdirstat-2.4.0.ebuild:
+  Stable on ppc.
+
+*kdirstat-2.4.3 (13 Mar 2005)
+
+  13 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +kdirstat-2.4.3.ebuild:
+  version bump
+
+  29 Dec 2004; Chris White <chriswhite@gentoo.org> kdirstat-2.4.0.ebuild:
+  Marked ~ppc.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> kdirstat-2.2.0.ebuild:
+  Fixed SRC_URI to match real filename.
 
 *kdirstat-2.3.7 (30 Oct 2004)
 
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index 1083f8a580ca..d9f244520c70 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,10 +1,4 @@
-MD5 2ca6be9bcf37a477ad4c1e6cb2fb7064 ChangeLog 2257
-MD5 6ea8dfb73199f2eebc72cf079c7198f1 kdirstat-2.2.0.ebuild 464
-MD5 085535450e113091ef8b6a437f6dd5de kdirstat-2.3.7.ebuild 463
-MD5 db4f53d5853f6a4db4c57a17da73018e kdirstat-2.4.0.ebuild 649
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 ea038c6b98cd537013bdfe6344d0401a files/digest-kdirstat-2.2.0 63
-MD5 6c8b58bdea9797a5386fae5a69f23bc5 files/digest-kdirstat-2.3.7 67
-MD5 50612723fa9ed6e09e2f2b300d07aa1b files/digest-kdirstat-2.4.0 67
-MD5 1293616790e16b7e5814d2a9b6a975be files/kdirstatapp.h.fix.patch 248
-MD5 12d1a6dba51fffa13b56b37b8c58b68a files/kdirstat-2.4.0-configure.patch 3569
+MD5 5d97206dc0cec76e3a84b192982d0871 ChangeLog 3347
+MD5 2849a372f14d17be4d9711392ff7c2e2 kdirstat-2.4.3.ebuild 548
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 133b737a305e4f7562dce60ec961dfb0 files/digest-kdirstat-2.4.3 67
diff --git a/kde-misc/kdirstat/kdirstat-2.4.3.ebuild b/kde-misc/kdirstat/kdirstat-2.4.3.ebuild
index 885a0db4bc26..983f8899656a 100644
--- a/kde-misc/kdirstat/kdirstat-2.4.3.ebuild
+++ b/kde-misc/kdirstat/kdirstat-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/kde-misc/kdirstat/kdirstat-2.4.3.ebuild,v 1.1 2005/03/13 16:04:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdirstat/kdirstat-2.4.3.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,9 +10,9 @@ SRC_URI="http://kdirstat.sourceforge.net/download/${P}.tar.bz2"
 #SRC_URI="mirror://sourceforge/kdirstat/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="amd64 ppc sparc x86"
 
 IUSE=""
 SLOT="0"
 
-need-kde 3
\ No newline at end of file
+need-kde 3
diff --git a/kde-misc/kdirstat/metadata.xml b/kde-misc/kdirstat/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kdirstat/metadata.xml
+++ b/kde-misc/kdirstat/metadata.xml
@@ -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/kde-misc/kdissert/ChangeLog b/kde-misc/kdissert/ChangeLog
index 1180d334981d..23031436f439 100644
--- a/kde-misc/kdissert/ChangeLog
+++ b/kde-misc/kdissert/ChangeLog
@@ -1,6 +1,86 @@
 # ChangeLog for kde-misc/kdissert
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/ChangeLog,v 1.1 2004/11/25 17:27:10 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  24 Nov 2005; Chris White <chriswhite@gentoo.org> kdissert-1.0.5.ebuild:
+  x86 stable for bug #112837.
+
+  22 Nov 2005; Joseph Jezak <josejx@gentoo.org> kdissert-1.0.5.ebuild:
+  Marked ppc stable for bug #112837.
+
+  20 Nov 2005; Malcolm Lashley <malc@gentoo.org> kdissert-1.0.5.ebuild:
+  Stable on amd64
+
+  19 Nov 2005; Jason Wever <weeve@gentoo.org> kdissert-1.0.5.ebuild:
+  Stable on SPARC wrt bug #112837.
+
+*kdissert-1.0.5 (17 Oct 2005)
+
+  17 Oct 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kde.py-bksys-1.5.1.diff, -kdissert-1.0.4.ebuild,
+  +kdissert-1.0.5.ebuild:
+  version bump
+
+  15 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kdissert-1.0.3.ebuild:
+  Stable on x86.
+
+*kdissert-1.0.4 (15 Aug 2005)
+
+  15 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +kdissert-1.0.4.ebuild:
+  New version (#102578).
+
+  20 Jul 2005; David Holm <dholm@gentoo.org> kdissert-1.0.3.ebuild:
+  Added to ~ppc.
+
+*kdissert-1.0.3 (19 Jul 2005)
+
+  19 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdissert-1.0.3.ebuild:
+  New version (#98323).
+
+  11 May 2005; Carsten Lohrke <carlo@gentoo.org> kdissert-0.9.0.ebuild:
+  whitespace
+
+*kdissert-0.9.0 (11 May 2005)
+
+  11 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdissert-0.9.0-SConstruct.diff, +kdissert-0.9.0.ebuild:
+  version bump
+
+*kdissert-0.3.8 (28 Mar 2005)
+
+  28 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +kdissert-0.3.8.ebuild:
+  version bump
+
+  21 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdissert-0.3.6.ebuild:
+  Marked ~amd64, closes bug 86086.
+
+*kdissert-0.3.6 (01 Mar 2005)
+
+  01 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +kdissert-0.3.6.ebuild:
+  version bump
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> kdissert-0.3.5.ebuild:
+  Added ~sparc keyword.
+
+*kdissert-0.3.5 (03 Feb 2005)
+
+  03 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +kdissert-0.3.5.ebuild:
+  version bump
+
+  26 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> -kdissert-0.3.0.ebuild,
+  -kdissert-0.3.1.ebuild, kdissert-0.3.4.1.ebuild:
+  Fixed homepage. Removed old ebuilds.
+
+*kdissert-0.3.4.1 (21 Jan 2005)
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdissert-0.3.2-SConstruct.diff, +kdissert-0.3.4.1.ebuild:
+  version bump
+
+*kdissert-0.3.1 (13 Dec 2004)
+
+  13 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +kdissert-0.3.1.ebuild:
+  version bump
 
 *kdissert-0.3.0 (25 Nov 2004)
 
diff --git a/kde-misc/kdissert/Manifest b/kde-misc/kdissert/Manifest
index d88f026e6d49..576d0b16c2f3 100644
--- a/kde-misc/kdissert/Manifest
+++ b/kde-misc/kdissert/Manifest
@@ -1,4 +1,17 @@
-MD5 e0240546fdee2672edcb420a0e65a704 kdissert-0.3.0.ebuild 556
-MD5 2b92b02411f62ee44bc59cf876d8f2bc ChangeLog 266
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 f06680e6ac003bf8f19d160aed29561a files/digest-kdissert-0.3.0 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 150668a8c2ee1e5ac42d4b32bd4b1d6b kdissert-1.0.5.ebuild 920
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 935de6fae57077ee990a606f0c675ae8 kdissert-1.0.3.ebuild 881
+MD5 29b6912e7082004d383241e7b6a03419 ChangeLog 2650
+MD5 41a4e81509b92498f4cf56f577e8d50b files/digest-kdissert-1.0.5 67
+MD5 224682b74cb25c9b5edce3c08e50e758 files/digest-kdissert-1.0.3 67
+MD5 fbfadc487e34ee447f1484ccd1b6d701 files/kde.py-bksys-1.5.1.diff 504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDhR+oFdQwWVoAgN4RAhWHAJ95nR38jRLqoGPlQZFPrVW/Mi1QFgCg7Sjt
+pVUmpYVbjWrRxJcZHA7pCyg=
+=hZSU
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/kdissert/kdissert-1.0.3.ebuild b/kde-misc/kdissert/kdissert-1.0.3.ebuild
index 30602c4dfc4c..5cca474bc9ec 100644
--- a/kde-misc/kdissert/kdissert-1.0.3.ebuild
+++ b/kde-misc/kdissert/kdissert-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/kde-misc/kdissert/kdissert-1.0.3.ebuild,v 1.1 2005/07/19 14:02:49 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/kdissert-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.freehackers.org/~tnagy/kdissert/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-util/scons-0.96.1
diff --git a/kde-misc/kdissert/kdissert-1.0.5.ebuild b/kde-misc/kdissert/kdissert-1.0.5.ebuild
index 52cdda9f4ebf..bcdd9c0d18b3 100644
--- a/kde-misc/kdissert/kdissert-1.0.5.ebuild
+++ b/kde-misc/kdissert/kdissert-1.0.5.ebuild
@@ -1,33 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/kdissert-1.0.5.ebuild,v 1.1 2005/10/17 15:00:29 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdissert/kdissert-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
-MY_P=${P/_/\.}
-S=${WORKDIR}/${MY_P}
-
 DESCRIPTION="KDissert - a mindmapping-like tool"
 HOMEPAGE="http://www.freehackers.org/~tnagy/kdissert/index.html"
-SRC_URI="http://www.freehackers.org/~tnagy/kdissert/${MY_P}.tar.bz2"
-#SRC_URI="http://www.kde-apps.org/content/files/12725-${MY_P}.tar.bz2"
+SRC_URI="http://www.freehackers.org/~tnagy/kdissert/${P}.tar.bz2"
+LICENSE="GPL-2"
 
 SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND=">=dev-util/scons-0.96.1
 	>=dev-lang/python-2.3"
+RDEPEND=""
+
 need-kde 3.3
 
 PATCHES="${FILESDIR}/kde.py-bksys-1.5.1.diff"
 
 src_compile() {
-	[ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
-	addpredict "$QTDIR/etc/settings"
-
-	local myconf="kdeincludes=$(kde-config --prefix)/include prefix=/usr "
+	local myconf="qtdir=${QTDIR} kdedir=${KDEDIR} prefix=/usr"
 	use amd64 && myconf="${myconf} libsuffix=64"
 
 	scons configure ${myconf} || die "configure failed"
diff --git a/kde-misc/kdissert/metadata.xml b/kde-misc/kdissert/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kdissert/metadata.xml
+++ b/kde-misc/kdissert/metadata.xml
@@ -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/kde-misc/kexchange/ChangeLog b/kde-misc/kexchange/ChangeLog
index aa7569972d2b..8b2968d81f42 100644
--- a/kde-misc/kexchange/ChangeLog
+++ b/kde-misc/kexchange/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-misc/kexchange
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kexchange/ChangeLog,v 1.1 2004/10/30 17:05:47 carlo Exp $
+# ChangeLog for kde-misc/kexchange
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kexchange/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kexchange-1.0.ebuild:
+  Stable on ppc.
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kexchange-1.0.ebuild:
+  Marked stable on amd64.
+
+  10 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kexchange-1.0.ebuild:
+  Stable on x86.
 
 *kexchange-1.0 (30 Oct 2004)
 
diff --git a/kde-misc/kexchange/Manifest b/kde-misc/kexchange/Manifest
index a6ec34e68614..be0dd12f8ca2 100644
--- a/kde-misc/kexchange/Manifest
+++ b/kde-misc/kexchange/Manifest
@@ -1,4 +1,4 @@
-MD5 a09ca1f1bc25da400a1b710e823a6afb ChangeLog 755
-MD5 e29c45c61e2ccd4495028d7d20e6ac18 kexchange-1.0.ebuild 465
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 f0ad0ad55a46c6a96bbcce38c37c6491 ChangeLog 1216
+MD5 606e23e25990ada05e97809c48b547f7 kexchange-1.0.ebuild 463
 MD5 55216ba80fc050bfec9c94d5f5ade191 files/digest-kexchange-1.0 65
diff --git a/kde-misc/kexchange/kexchange-1.0.ebuild b/kde-misc/kexchange/kexchange-1.0.ebuild
index 10cfb6461a24..4759d6cef028 100644
--- a/kde-misc/kexchange/kexchange-1.0.ebuild
+++ b/kde-misc/kexchange/kexchange-1.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kexchange/kexchange-1.0.ebuild,v 1.1 2004/10/30 17:05:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kexchange/kexchange-1.0.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="A currency converter for KDE"
 HOMEPAGE="http://www.favorin.com/projects/kexchange/"
 SRC_URI="mirror://sourceforge/kexchange/${P}.tar.gz"
-
 LICENSE="GPL-2"
+
 SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
+need-kde 3
diff --git a/kde-misc/kexchange/metadata.xml b/kde-misc/kexchange/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kexchange/metadata.xml
+++ b/kde-misc/kexchange/metadata.xml
@@ -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/kde-misc/kfish/ChangeLog b/kde-misc/kfish/ChangeLog
index 159aa6e9c6a8..fc4b708f03d0 100644
--- a/kde-misc/kfish/ChangeLog
+++ b/kde-misc/kfish/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for app-misc/kfish
+# ChangeLog for kde-misc/kfish
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kfish/ChangeLog,v 1.1 2004/10/30 23:25:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kfish/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  30 Dec 2004; Jason Wever <weeve@gentoo.org> kfish-2.01.ebuild:
+  Added ~sparc keyword.
 
 *kfish-2.01 (31 Oct 2004)
 
diff --git a/kde-misc/kfish/Manifest b/kde-misc/kfish/Manifest
index c641ab53b045..26251a264d63 100644
--- a/kde-misc/kfish/Manifest
+++ b/kde-misc/kfish/Manifest
@@ -1,3 +1,4 @@
-MD5 1e2a149d269e9030ad25413df269981c ChangeLog 985
-MD5 54525ba43e6700f3fde4261f5b4f5d41 kfish-2.01.ebuild 471
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ec5ffcfefd74f0bddaae25e1a300df8d kfish-2.01.ebuild 475
+MD5 a869bd60940946a1a5658b88af63e14b ChangeLog 1252
 MD5 59ce5a126e5b91005cedde258006e725 files/digest-kfish-2.01 63
diff --git a/kde-misc/kfish/kfish-2.01.ebuild b/kde-misc/kfish/kfish-2.01.ebuild
index df7ac2a411c4..67c0b403f934 100644
--- a/kde-misc/kfish/kfish-2.01.ebuild
+++ b/kde-misc/kfish/kfish-2.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kfish/kfish-2.01.ebuild,v 1.1 2004/10/30 23:25:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kfish/kfish-2.01.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 need-kde 3
@@ -11,5 +11,5 @@ HOMEPAGE="http://sourceforge.net/projects/scofmb/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE=""
diff --git a/kde-misc/kfish/metadata.xml b/kde-misc/kfish/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kfish/metadata.xml
+++ b/kde-misc/kfish/metadata.xml
@@ -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/kde-misc/kgraphspace/ChangeLog b/kde-misc/kgraphspace/ChangeLog
index dde056012a98..34ac930ae7b0 100644
--- a/kde-misc/kgraphspace/ChangeLog
+++ b/kde-misc/kgraphspace/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for app-misc/kgraphspace
+# ChangeLog for kde-misc/kgraphspace
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/ChangeLog,v 1.1 2004/10/30 17:29:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/ChangeLog,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  kgraphspace-0.3.0_pre1.ebuild:
+  QA: missing "inherit eutils"
+
+  06 Nov 2004; Jason Wever <weeve@gentoo.org> kgraphspace-0.3.0_pre1.ebuild:
+  Added ~sparc keyword.
 
 *kgraphspace-0.3.0_pre1 (30 Oct 2004)
 
diff --git a/kde-misc/kgraphspace/Manifest b/kde-misc/kgraphspace/Manifest
index 6b4bc3911a2f..9c0e4ba7a51d 100644
--- a/kde-misc/kgraphspace/Manifest
+++ b/kde-misc/kgraphspace/Manifest
@@ -1,5 +1,5 @@
-MD5 b0762c72939e685d05c6b54044fb7917 kgraphspace-0.3.0_pre1.ebuild 571
-MD5 c4344dc2566705be7c1ae35cb939d509 ChangeLog 1600
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
-MD5 0c58d548c0e64f8bf92ae514770de156 files/digest-kgraphspace-0.3.0_pre1 75
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 f246ca02c62585fdb29f82790ef10424 ChangeLog 2060
+MD5 ec6f544bfb960ac1425c6f260018d75a kgraphspace-0.3.0_pre1.ebuild 582
 MD5 8aeb4c1ce5b9fab4d89167227f68d932 files/kgraphspace-0.3.0_pre1-configure.patch 3567
+MD5 0c58d548c0e64f8bf92ae514770de156 files/digest-kgraphspace-0.3.0_pre1 75
diff --git a/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild b/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild
index f7e08fbd2e07..340fb4b507dc 100644
--- a/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild
+++ b/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild,v 1.1 2004/10/30 17:29:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgraphspace/kgraphspace-0.3.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="A Disk space utility "
 HOMEPAGE="http://kgraphspace.sourceforge.net"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kgraphspace/${P//_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~sparc"
 IUSE=""
 
 S="$WORKDIR/${P//_/-}"
diff --git a/kde-misc/kgraphspace/metadata.xml b/kde-misc/kgraphspace/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/kde-misc/kgraphspace/metadata.xml
+++ b/kde-misc/kgraphspace/metadata.xml
@@ -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/kde-misc/kio-locate/ChangeLog b/kde-misc/kio-locate/ChangeLog
index acaa3e29195e..a7ab6706bd2f 100644
--- a/kde-misc/kio-locate/ChangeLog
+++ b/kde-misc/kio-locate/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for kde-misc/kio-locate
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/ChangeLog,v 1.1 2004/10/28 21:22:42 motaboy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+*kio-locate-0.4.4 (24 Oct 2005)
+
+  24 Oct 2005; Carsten Lohrke <carlo@gentoo.org> +kio-locate-0.4.4.ebuild:
+  version bump
+
+  17 Oct 2005; Carsten Lohrke <carlo@gentoo.org> kio-locate-0.4.3.ebuild:
+  accidentally dropped scons dependency
+
+*kio-locate-0.4.3 (17 Oct 2005)
+
+  17 Oct 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kde.py-bksys-1.5.1.diff, +kio-locate-0.4.3.ebuild:
+  version bump
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kio-locate-0.3.4.ebuild:
+  Stable on ppc.
+
+  10 May 2005; Marcus D. Hanwell <cryos@gentoo.org> kio-locate-0.3.4.ebuild:
+  Stable on amd64.
+
+  13 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> kio-locate-0.3.4.ebuild:
+  Stable on x86.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kio-locate-0.3.4.ebuild:
+  Marked ~amd64, closes bug 69486.
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> kio-locate-0.3.4.ebuild:
+  Added ~sparc keyword.
+
+*kio-locate-0.3.4 (27 Jan 2005)
+
+  27 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kio-locate-0.3.4.ebuild:
+  Version bump.
+
+*kio-locate-0.3.2 (19 Jan 2005)
+
+  19 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> -kio-locate-0.2.4.ebuild,
+  +kio-locate-0.3.2.ebuild:
+  Version bump. Removed old version.
+
+  28 Nov 2004; Simone Gotti <motaboy@gentoo.org> kio-locate-0.3.0.ebuild:
+  Stable on x86.
+
+  28 Nov 2004; Simone Gotti <motaboy@gentoo.org> kio-locate-0.2.4.ebuild:
+  Stable on x86.
+
+*kio-locate-0.3.0 (02 Nov 2004)
+
+  02 Nov 2004; Simone Gotti <motaboy@gentoo.org> +kio-locate-0.3.0.ebuild:
+  Version bump
+
+  02 Nov 2004; Simone Gotti <motaboy@gentoo.org> kio-locate-0.2.4.ebuild:
+  Fix the SRC_URI
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> kio-locate-0.2.4.ebuild:
+  Added ~ppc keyword.
+
+  28 Oct 2004; Simone Gotti <motaboy@gentoo.org> kio-locate-0.2.4.ebuild:
+  Use the kde eclass instead of kde-base that is deprecated.
 
 *kio-locate-0.2.4 (28 Oct 2004)
 
diff --git a/kde-misc/kio-locate/Manifest b/kde-misc/kio-locate/Manifest
index 3cf762d8b7d2..0227d3011b10 100644
--- a/kde-misc/kio-locate/Manifest
+++ b/kde-misc/kio-locate/Manifest
@@ -1,3 +1,9 @@
-MD5 e052543836571274d7b823f2303ec8a3 kio-locate-0.2.4.ebuild 431
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
-MD5 df27237bea73170b86b6e81b81d379d1 files/digest-kio-locate-0.2.4 68
+MD5 9236f23e7ccb7fe8cec20c2c5ca5e9ec kio-locate-0.3.4.ebuild 538
+MD5 855dac34e9133c80debdd59366f30c03 kio-locate-0.4.4.ebuild 1053
+MD5 2efa12b98b3032c685f76b471f206bc1 kio-locate-0.4.3.ebuild 1053
+MD5 d51758e375bddec5ef9e1de2b8690086 ChangeLog 2230
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 b4f99851d93b23a06933e2cc883efcdb files/kde.py-bksys-1.5.1.diff 504
+MD5 149ef0ef857ecaa5596a4efc341027a9 files/digest-kio-locate-0.3.4 68
+MD5 5bd3f548f1edfa37dd7bb8ec16792269 files/digest-kio-locate-0.4.3 68
+MD5 303a3e274ff1ef17146ee7e057475c89 files/digest-kio-locate-0.4.4 68
diff --git a/kde-misc/kio-locate/kio-locate-0.3.4.ebuild b/kde-misc/kio-locate/kio-locate-0.3.4.ebuild
index 6115c2abf587..c79eec8f79c9 100644
--- a/kde-misc/kio-locate/kio-locate-0.3.4.ebuild
+++ b/kde-misc/kio-locate/kio-locate-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.3.4.ebuild,v 1.1 2005/01/27 20:13:46 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.3.4.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://arminstraub.de/browse.php?page=programs_kiolocate"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 RDEPEND="sys-apps/slocate"
 
diff --git a/kde-misc/kio-locate/kio-locate-0.4.3.ebuild b/kde-misc/kio-locate/kio-locate-0.4.3.ebuild
index b2d151fe900a..0a6aa1c2ea35 100644
--- a/kde-misc/kio-locate/kio-locate-0.4.3.ebuild
+++ b/kde-misc/kio-locate/kio-locate-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.4.3.ebuild,v 1.1 2005/10/17 15:42:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.4.3.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -13,6 +13,7 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
+DEPEND=">=dev-util/scons-0.96.1"
 RDEPEND="|| ( sys-apps/slocate sys-apps/rlocate )"
 need-kde 3.1
 
diff --git a/kde-misc/kio-locate/kio-locate-0.4.4.ebuild b/kde-misc/kio-locate/kio-locate-0.4.4.ebuild
index abbfb8c6852f..efc937573a6e 100644
--- a/kde-misc/kio-locate/kio-locate-0.4.4.ebuild
+++ b/kde-misc/kio-locate/kio-locate-0.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/kde-misc/kio-locate/kio-locate-0.4.4.ebuild,v 1.1 2005/10/24 15:36:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.4.4.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/kio-locate/metadata.xml b/kde-misc/kio-locate/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/kde-misc/kio-locate/metadata.xml
+++ b/kde-misc/kio-locate/metadata.xml
@@ -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/kde-misc/kisdnwatch/ChangeLog b/kde-misc/kisdnwatch/ChangeLog
index 2dd5400b7f59..418f48a7a716 100644
--- a/kde-misc/kisdnwatch/ChangeLog
+++ b/kde-misc/kisdnwatch/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for kde-misc/kisdnwatch
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kisdnwatch/ChangeLog,v 1.1 2004/10/29 23:56:48 motaboy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kisdnwatch/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  22 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kisdnwatch-01.00.10.ebuild:
+  Stable on x86.
+
+*kisdnwatch-01.00.10 (17 Aug 2005)
+
+  17 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kisdnwatch-01.00.10-configure.patch, +kisdnwatch-01.00.10.ebuild:
+  New version (#102687).
+
+  26 Jun 2005; Simon Stelling <blubb@gentoo.org> kisdnwatch-01.00.08.ebuild:
+  added ~amd64 keyword
+
+  05 Dec 2004; Simone Gotti <motaboy@gentoo.org> kisdnwatch-01.00.08.ebuild:
+  Stable on x86.
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kisdnwatch-01.00.08.ebuild:
+  QA: missing "inherit eutils"
 
 *kisdnwatch-01.00.08 (30 Oct 2004)
 
diff --git a/kde-misc/kisdnwatch/Manifest b/kde-misc/kisdnwatch/Manifest
index 855c25b160fe..d4385eb04d16 100644
--- a/kde-misc/kisdnwatch/Manifest
+++ b/kde-misc/kisdnwatch/Manifest
@@ -1,4 +1,5 @@
-MD5 2b8e4408b445bc3e62988037bc0c809f kisdnwatch-01.00.08.ebuild 641
-MD5 bf66245be83728192ade75947a7c2da4 files/kisdnwatch-01.00.08-Makefiles.patch 4609
-MD5 ed67b76fe789f96d44b658ee581ceb6e files/kisdnwatch-01.00.08-configure.patch 3679
-MD5 397f792877643704a4efda1166625fb1 files/digest-kisdnwatch-01.00.08 71
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+MD5 0dbe7c2ed98722de3815363ae8355194 ChangeLog 1088
+MD5 8dc171af18d6439620a2274751ddfa76 kisdnwatch-01.00.10.ebuild 685
+MD5 230989bd5edd7a6387a465d64331a883 files/digest-kisdnwatch-01.00.10 71
+MD5 10a51dce62932ccc5ab4395f7ceaf911 files/kisdnwatch-01.00.10-configure.patch 3678
diff --git a/kde-misc/kisdnwatch/kisdnwatch-01.00.10.ebuild b/kde-misc/kisdnwatch/kisdnwatch-01.00.10.ebuild
index 0b0cd6947cdc..6272971ff3f6 100644
--- a/kde-misc/kisdnwatch/kisdnwatch-01.00.10.ebuild
+++ b/kde-misc/kisdnwatch/kisdnwatch-01.00.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/kde-misc/kisdnwatch/kisdnwatch-01.00.10.ebuild,v 1.1 2005/08/17 10:08:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kisdnwatch/kisdnwatch-01.00.10.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.avm.de/tools/k_isdn_watch.linux/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="net-dialup/capi4k-utils"
diff --git a/kde-misc/kisdnwatch/metadata.xml b/kde-misc/kisdnwatch/metadata.xml
index ec42e9fd586b..3399d0876645 100644
--- a/kde-misc/kisdnwatch/metadata.xml
+++ b/kde-misc/kisdnwatch/metadata.xml
@@ -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/kde-misc/kkbswitch/ChangeLog b/kde-misc/kkbswitch/ChangeLog
index 9af725ae69e8..7e3c0111fca0 100644
--- a/kde-misc/kkbswitch/ChangeLog
+++ b/kde-misc/kkbswitch/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-misc/kkbswitch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/ChangeLog,v 1.1 2005/01/28 20:29:07 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  23 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> kkbswitch-1.4.3.ebuild:
+  Marked ~amd64, closes bug 106958.
+
+  23 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kkbswitch-1.4.3.ebuild:
+  Stable on x86.
+
+  09 Jul 2005; Joseph Jezak <josejx@gentoo.org> kkbswitch-1.4.3.ebuild:
+  Marked ~ppc for bug #97904.
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> kkbswitch-1.4.3.ebuild:
+  Added ~sparc keyword.
 
 *kkbswitch-1.4.3 (28 Jan 2005)
 
diff --git a/kde-misc/kkbswitch/Manifest b/kde-misc/kkbswitch/Manifest
index 6dbefa880458..83ec2b6c4ff0 100644
--- a/kde-misc/kkbswitch/Manifest
+++ b/kde-misc/kkbswitch/Manifest
@@ -1,3 +1,4 @@
-MD5 30e08a2a4ac3b2276d7d9b80d39e7d0b kkbswitch-1.4.3.ebuild 420
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 47e2a16a8a83f23bcc79a19a190d57e6 kkbswitch-1.4.3.ebuild 551
+MD5 c7b90455316201472b22af5d1f7eaccf ChangeLog 768
 MD5 384be3f0b9f59f847a7ffaf35c5e0253 files/digest-kkbswitch-1.4.3 67
diff --git a/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild b/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild
index 5abeb5fa3947..4c4df901af4a 100644
--- a/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild
+++ b/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild,v 1.1 2005/01/28 20:29:07 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkbswitch/kkbswitch-1.4.3.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="Keyboard layout indicator for KDE"
+HOMEPAGE="http://kkbswitch.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kkbswitch/${P}.tar.gz"
-HOMEPAGE="http://kkbswitch.sourceforge.net"
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
 
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+IUSE=""
+
 need-kde 3.1
 
 src_install() {
diff --git a/kde-misc/kkbswitch/metadata.xml b/kde-misc/kkbswitch/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kkbswitch/metadata.xml
+++ b/kde-misc/kkbswitch/metadata.xml
@@ -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/kde-misc/kkeyled/ChangeLog b/kde-misc/kkeyled/ChangeLog
index 10f2c964fb18..c251eb985183 100644
--- a/kde-misc/kkeyled/ChangeLog
+++ b/kde-misc/kkeyled/ChangeLog
@@ -1,6 +1,26 @@
-# ChangeLog for app-misc/kkeyled
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkeyled/ChangeLog,v 1.1 2004/10/30 16:59:06 carlo Exp $
+# ChangeLog for kde-misc/kkeyled
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkeyled/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kkeyled-0.8.11.ebuild:
+  Stable on ppc.
+
+  20 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kkeyled-0.8.11.ebuild:
+  Stable on x86.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kkeyled-0.8.9.ebuild:
+  Stable on ppc.
+
+*kkeyled-0.8.11 (01 Apr 2005)
+
+  01 Apr 2005; Dominik Stadler <centic@gentoo.org> +kkeyled-0.8.11.ebuild:
+  Add new Version 0.8.11, fixes Bug 86922
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kkeyled-0.8.9.ebuild:
+  stable on x86
+
+  06 Nov 2004; Jason Wever <weeve@gentoo.org> kkeyled-0.8.9.ebuild:
+  Added ~sparc keyword.
 
 *kkeyled-0.8.6 (30 Oct 2004)
 
diff --git a/kde-misc/kkeyled/Manifest b/kde-misc/kkeyled/Manifest
index a6a5a1d41a39..8e87b200f18d 100644
--- a/kde-misc/kkeyled/Manifest
+++ b/kde-misc/kkeyled/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 981c1883b3e3a4e28623397916dd9c77 ChangeLog 721
-MD5 bb6360145468609fc45814bdf514c6ff kkeyled-0.8.6.ebuild 521
-MD5 d7463b73b1ef4bbef405cf51a014b702 kkeyled-0.8.9.ebuild 699
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 bfba59f5f3416be40e3cc7a19e39ce17 files/digest-kkeyled-0.8.6 66
-MD5 af4684be24134da6c009d6b9f4d7cb5e files/digest-kkeyled-0.8.9 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBW0bZI1lqEGTUzyQRAmcpAKDeaYA8L/XvXAGqM0CKNn0MT5GCzQCfY3DN
-IN608LxpxVIh0B4AEnRoydI=
-=zo7O
------END PGP SIGNATURE-----
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 61444f4fb3dbcc21f33d889cb2ae2842 kkeyled-0.8.11.ebuild 562
+MD5 3753ed9eb5ea592cf4cd373e855e6d06 ChangeLog 1523
+MD5 af314199a900893c0eae603cfa37101f files/digest-kkeyled-0.8.11 67
diff --git a/kde-misc/kkeyled/kkeyled-0.8.11.ebuild b/kde-misc/kkeyled/kkeyled-0.8.11.ebuild
index bceda49211c9..eba087f12280 100644
--- a/kde-misc/kkeyled/kkeyled-0.8.11.ebuild
+++ b/kde-misc/kkeyled/kkeyled-0.8.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/kde-misc/kkeyled/kkeyled-0.8.11.ebuild,v 1.1 2005/04/01 21:29:05 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kkeyled/kkeyled-0.8.11.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.truesoft.ch/dieter/kkeyled.html"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="ppc ~sparc x86"
 
 S=${WORKDIR}/${PN}
 
diff --git a/kde-misc/kkeyled/metadata.xml b/kde-misc/kkeyled/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kkeyled/metadata.xml
+++ b/kde-misc/kkeyled/metadata.xml
@@ -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/kde-misc/kleds/ChangeLog b/kde-misc/kleds/ChangeLog
index 887dfe120b6f..d235b6075da2 100644
--- a/kde-misc/kleds/ChangeLog
+++ b/kde-misc/kleds/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-misc/kleds
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kleds/ChangeLog,v 1.1 2004/10/30 16:55:27 carlo Exp $
+# ChangeLog for kde-misc/kleds
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kleds/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kleds-0.8.0.ebuild:
+  Stable on ppc.
+
+  11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> kleds-0.8.0.ebuild:
+  Stable on amd64.
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kleds-0.8.0.ebuild:
+  stable on x86
 
 *kleds-0.8.0 (30 Oct 2004)
 
diff --git a/kde-misc/kleds/Manifest b/kde-misc/kleds/Manifest
index 19a7f5ab8313..aba27af0483c 100644
--- a/kde-misc/kleds/Manifest
+++ b/kde-misc/kleds/Manifest
@@ -1,6 +1,4 @@
-MD5 309893145c05c05158fd6885d4899004 ChangeLog 878
-MD5 fe49deb7cb379590862acc0017ff3bec kleds-0.7.1.ebuild 513
-MD5 cadc5943d866cb6a191b0dfbdc1480e6 kleds-0.8.0.ebuild 522
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 b1d699b1e4f276eadb4fd0c0c214ae39 files/digest-kleds-0.7.1 63
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 5c5439193ec8dda5d397bb5472af3d97 ChangeLog 1333
+MD5 31e7077fbfe2cd856fd1635d1c22662c kleds-0.8.0.ebuild 520
 MD5 709c615f4d607c9e89425efddef91c02 files/digest-kleds-0.8.0 63
diff --git a/kde-misc/kleds/kleds-0.8.0.ebuild b/kde-misc/kleds/kleds-0.8.0.ebuild
index 3717de7b5998..09e9f573c5a3 100644
--- a/kde-misc/kleds/kleds-0.8.0.ebuild
+++ b/kde-misc/kleds/kleds-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kleds/kleds-0.8.0.ebuild,v 1.1 2004/10/30 16:55:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kleds/kleds-0.8.0.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit kde
 need-kde 3.0
@@ -11,7 +11,7 @@ SRC_URI="http://www.hansmatzen.de/software/kleds/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 S="${WORKDIR}/kleds-${PV}"
diff --git a/kde-misc/kleds/metadata.xml b/kde-misc/kleds/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kleds/metadata.xml
+++ b/kde-misc/kleds/metadata.xml
@@ -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/kde-misc/kload/ChangeLog b/kde-misc/kload/ChangeLog
index f4d983f4eecd..2b0cd6d3426d 100644
--- a/kde-misc/kload/ChangeLog
+++ b/kde-misc/kload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kload
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/ChangeLog,v 1.1 2005/08/22 21:33:35 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/ChangeLog,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
+
+  03 Sep 2005; Luca Barbato <lu_zero@gentoo.org> kload-0.9.4.ebuild:
+  Marked ~ppc
+
+  25 Aug 2005; Stefan Briesenick <sbriesen@gentoo.org> files/kloadd.initd:
+  adding depend() to init-script
 
 *kload-0.9.4 (22 Aug 2005)
 
diff --git a/kde-misc/kload/Manifest b/kde-misc/kload/Manifest
index 9746352408a7..5c819d29c232 100644
--- a/kde-misc/kload/Manifest
+++ b/kde-misc/kload/Manifest
@@ -1,5 +1,6 @@
-MD5 59fe265a4200f2dbedb278e37f071e58 kload-0.9.4.ebuild 946
 MD5 fb41d485ecc1a293fd040d19dbf58fb0 metadata.xml 366
+MD5 10c6f32ae4e59b0ce6d9f0fa98735ef9 kload-0.9.4.ebuild 1045
+MD5 072c6ac7251174c5e573fb30a81702f8 ChangeLog 621
 MD5 d150f9205197841fa03d6d52336690cd files/digest-kload-0.9.4 62
+MD5 32e5a828a3214c4fa6604aaddbd9a03f files/kloadd.initd 511
 MD5 247b11049aa8d57b2c90812caacb5a98 files/kloadd.confd 107
-MD5 b97568bb22b965f564e47de6cc3b29fa files/kloadd.initd 391
diff --git a/kde-misc/kload/files/kloadd.initd b/kde-misc/kload/files/kloadd.initd
index 8befe07778f4..bd47a08d5c24 100644
--- a/kde-misc/kload/files/kloadd.initd
+++ b/kde-misc/kload/files/kloadd.initd
@@ -1,7 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/files/kloadd.initd,v 1.1 2005/08/22 21:33:35 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/files/kloadd.initd,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
+
+depend() {
+	use net
+}
 
 start() {
 	ebegin "Starting kloadd"
diff --git a/kde-misc/kload/kload-0.9.4.ebuild b/kde-misc/kload/kload-0.9.4.ebuild
index 47f1f65198e4..b5219499f806 100644
--- a/kde-misc/kload/kload-0.9.4.ebuild
+++ b/kde-misc/kload/kload-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/kde-misc/kload/kload-0.9.4.ebuild,v 1.1 2005/08/22 21:33:35 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kload/kload-0.9.4.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.richard-schneider.de/uwe/kde/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="minimal"
 
 DEPEND="!minimal? ( >=kde-base/kdelibs-3 )"
diff --git a/kde-misc/komics/ChangeLog b/kde-misc/komics/ChangeLog
index 846348931100..2667673ff9cd 100644
--- a/kde-misc/komics/ChangeLog
+++ b/kde-misc/komics/ChangeLog
@@ -1,6 +1,51 @@
-# ChangeLog for x11-misc/komics
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/ChangeLog,v 1.1 2004/10/30 18:44:30 carlo Exp $
+# ChangeLog for kde-misc/komics
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/komics-1.3-gcc34.patch, -komics-1.0.ebuild, -komics-1.2.ebuild,
+  -komics-1.3.ebuild, -komics-1.4-r1.ebuild:
+  clean up
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  komics-1.4-r2.ebuild:
+  Stable on ppc.
+
+  06 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> komics-1.4-r2.ebuild:
+  Marked stable on amd64.
+
+*komics-1.4-r2 (03 Feb 2005)
+
+  03 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/komics-1.4-Dilbert.patch, +komics-1.4-r2.ebuild:
+  Pawel can't live without Dilbert, #80449
+
+  16 Jan 2005; Simone Gotti <motaboy@gentoo.org> komics-1.4-r1.ebuild:
+  Stable on x86
+
+*komics-1.4-r1 (01 Jan 2005)
+
+  01 Jan 2005; Simone Gotti <motaboy@gentoo.org>
+  +files/komics-1.4-RightClickMenu.patch, +komics-1.4-r1.ebuild,
+  -komics-1.4.ebuild:
+  Added a patch to fix bug #72814.
+
+  30 Dec 2004; Jason Wever <weeve@gentoo.org> komics-1.4.ebuild:
+  Added ~sparc keyword.
+
+  07 Dec 2004; Carsten Lohrke <carlo@gentoo.org> komics-1.3.ebuild,
+  komics-1.4.ebuild:
+  QA: inherit eutils
+
+  29 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/komics-1.4-Makefiles.patch, komics-1.4.ebuild:
+  Fix problems with parallel make. Fixes bug #72779.
+
+*komics-1.4 (28 Nov 2004)
+
+  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/komics-1.4-gcc3.4.patch, +komics-1.4.ebuild:
+  Version Bump. Closes bug #71431.
 
 *komics-1.3 (30 Oct 2004)
 
diff --git a/kde-misc/komics/Manifest b/kde-misc/komics/Manifest
index 0598aef96f84..426f0fe90eab 100644
--- a/kde-misc/komics/Manifest
+++ b/kde-misc/komics/Manifest
@@ -1,9 +1,8 @@
-MD5 c412c1514e915cc6d5d257daeae5c6bd komics-1.3.ebuild 797
-MD5 8690e868630c1642f4002bd3c485b744 komics-1.0.ebuild 589
-MD5 bc86c3552bab44b6838b27ef3476eb7f komics-1.2.ebuild 732
-MD5 4ca02c7f83801ef1afb5b7e4b5cc3a01 ChangeLog 1926
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 78250fa508313c0d5d704b4398b04880 files/digest-komics-1.0 63
-MD5 1287f8b8cc536896a4a3db94d29d10c9 files/digest-komics-1.2 63
-MD5 f21e02e1332ff99cf64e159ed0e7502c files/digest-komics-1.3 63
-MD5 af3b9a959c22def6991fc0eeb5a2d955 files/komics-1.3-gcc34.patch 293
+MD5 c5db986ea4158660dd52cf86c9caec08 komics-1.4-r2.ebuild 814
+MD5 94550c4717111bf1f3dc7a73af08e1e9 ChangeLog 3538
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 f2c6c650dde8d37588007b2807e7b571 files/komics-1.4-Dilbert.patch 355
+MD5 4119fc189427f7f733911a3d3c9baab2 files/komics-1.4-RightClickMenu.patch 324
+MD5 fa8ba7139b31187b660ce22badd75289 files/digest-komics-1.4-r2 63
+MD5 27931c65c3407925b26fed69e1d68098 files/komics-1.4-gcc3.4.patch 366
+MD5 3cd58a3315a7690b2e36a622209a8199 files/komics-1.4-Makefiles.patch 1182
diff --git a/kde-misc/komics/komics-1.4-r2.ebuild b/kde-misc/komics/komics-1.4-r2.ebuild
index 31a224a51b07..155e06efbf40 100644
--- a/kde-misc/komics/komics-1.4-r2.ebuild
+++ b/kde-misc/komics/komics-1.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/kde-misc/komics/komics-1.4-r2.ebuild,v 1.1 2005/02/03 15:15:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/komics-1.4-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.orson.it/~domine/komics/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 amd64 ppc ~sparc"
 IUSE=""
 
 S=${WORKDIR}/komics
diff --git a/kde-misc/komics/metadata.xml b/kde-misc/komics/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/komics/metadata.xml
+++ b/kde-misc/komics/metadata.xml
@@ -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/kde-misc/kompose/ChangeLog b/kde-misc/kompose/ChangeLog
index bbfbeb10b65a..13279db6d7f1 100644
--- a/kde-misc/kompose/ChangeLog
+++ b/kde-misc/kompose/ChangeLog
@@ -1,6 +1,40 @@
-# ChangeLog for x11-misc/kompose
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/ChangeLog,v 1.1 2004/10/31 00:00:14 carlo Exp $
+# ChangeLog for kde-misc/kompose
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  23 Jul 2005; Carsten Lohrke <carlo@gentoo.org> kompose-0.5.3.ebuild:
+  reissued tarball
+
+*kompose-0.5.3 (22 Jul 2005)
+
+  22 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +kompose-0.5.3.ebuild:
+  version bump
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org> -kompose-0.3.ebuild,
+  -kompose-0.4.1.ebuild, -kompose-0.4.2.ebuild, kompose-0.5.ebuild,
+  kompose-0.5.1.ebuild:
+  Fix bug 94881: require imlib2 build with USE=X. Also, removed some old
+  ebuild versions.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kompose-0.5.1.ebuild:
+  Stable on ppc.
+
+  30 May 2005; Marcus D. Hanwell <marcus@gentoo.org> kompose-0.5.1.ebuild:
+  Stable on amd64.
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> kompose-0.5.1.ebuild:
+  stable on x86
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> kompose-0.5.1.ebuild:
+  Added ~sparc keyword.
+
+*kompose-0.5.1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +kompose-0.5.1.ebuild:
+  version bump
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kompose-0.5.ebuild:
+  stable on x86
 
 *kompose-0.4.2 (31 Oct 2004)
 
diff --git a/kde-misc/kompose/Manifest b/kde-misc/kompose/Manifest
index 9ae2ea284695..a577218ca6ce 100644
--- a/kde-misc/kompose/Manifest
+++ b/kde-misc/kompose/Manifest
@@ -1,10 +1,6 @@
-MD5 cd507af0fb2dd77b9b46417ce966741d kompose-0.5.ebuild 501
-MD5 62977b3c378816da7ad9d9149d370e8b kompose-0.4.1.ebuild 505
-MD5 e7792f47db47f44c60d0359e841e3f92 kompose-0.4.2.ebuild 503
-MD5 7b1d5cd3a1aa73b8c0d4410c3e8fd57a ChangeLog 1147
-MD5 ed89fa1aa371498a65fa2b238a2f92e6 kompose-0.3.ebuild 478
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 56cd1ffdc72ce2bf99c8772482ad6ceb files/digest-kompose-0.4.1 66
-MD5 e9dac40c72df3ad65456c25eea055d6b files/digest-kompose-0.4.2 66
-MD5 0b66fd01b68c84aa8facffe68dcb40bb files/digest-kompose-0.3 70
-MD5 940d03f7ca83b7e2d11b40b4013b0d12 files/digest-kompose-0.5 64
+MD5 91f0c9146c5ea9fb176886b380ed25c6 kompose-0.5.1.ebuild 797
+MD5 ef75765b2d586218a7f9233f2e5f491e kompose-0.5.3.ebuild 878
+MD5 807cc6e8fedc8c4d3a86752c06e8e40a ChangeLog 2422
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 bb8349056aacdedf127c2fc397eee839 files/digest-kompose-0.5.1 66
+MD5 163415b92497270bb6d8471405c92953 files/digest-kompose-0.5.3 67
diff --git a/kde-misc/kompose/files/digest-kompose-0.5.3 b/kde-misc/kompose/files/digest-kompose-0.5.3
index ee629a4c4c56..42081049783a 100644
--- a/kde-misc/kompose/files/digest-kompose-0.5.3
+++ b/kde-misc/kompose/files/digest-kompose-0.5.3
@@ -1 +1 @@
-MD5 f1aeaaa0f52d37090d04b0b71acb806d kompose-0.5.3.tar.bz2 506457
+MD5 d0605f3651ed3f2eca9b961266669d30 kompose-0.5.3g.tar.bz2 506626
diff --git a/kde-misc/kompose/kompose-0.5.1.ebuild b/kde-misc/kompose/kompose-0.5.1.ebuild
index e3c358d9029c..ce3a04246ec1 100644
--- a/kde-misc/kompose/kompose-0.5.1.ebuild
+++ b/kde-misc/kompose/kompose-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.1.ebuild,v 1.1 2004/12/22 20:59:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
@@ -10,9 +10,18 @@ SRC_URI="http://download.berlios.de/kompose/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="media-libs/imlib2"
 RDEPEND="media-libs/imlib2"
 need-kde 3.2
+
+function pkg_setup() {
+	# bug 94881
+	if ! built_with_use media-libs/imlib2 X; then
+		eerror "This package requires imlib2 to be built with X11 support."
+		eerror "Please run USE=X emerge media-libs/imlib2, then try emerging kompose again."
+		die "imlib2 must be built with USE=X"
+	fi
+}
diff --git a/kde-misc/kompose/kompose-0.5.3.ebuild b/kde-misc/kompose/kompose-0.5.3.ebuild
index ef7e119d9002..a2cc241c75b6 100644
--- a/kde-misc/kompose/kompose-0.5.3.ebuild
+++ b/kde-misc/kompose/kompose-0.5.3.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/kde-misc/kompose/kompose-0.5.3.ebuild,v 1.1 2005/07/22 19:26:19 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A KDE fullscreen task manager."
 HOMEPAGE="http://kompose.berlios.de"
-SRC_URI="http://download.berlios.de/kompose/${P}.tar.bz2"
-
+#SRC_URI="http://download.berlios.de/kompose/${P}.tar.bz2"
+# 0.5.3 tarball was reissued upstream...
+SRC_URI="mirror://gentoo/${P}g.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
diff --git a/kde-misc/kompose/metadata.xml b/kde-misc/kompose/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kompose/metadata.xml
+++ b/kde-misc/kompose/metadata.xml
@@ -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/kde-misc/kooldock/ChangeLog b/kde-misc/kooldock/ChangeLog
index e4c52f0d48ea..660a84948482 100644
--- a/kde-misc/kooldock/ChangeLog
+++ b/kde-misc/kooldock/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for kde-misc/kooldock
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kooldock/ChangeLog,v 1.1 2004/10/31 18:29:52 motaboy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kooldock/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kooldock-0.3-r1.ebuild:
+  Stable on ppc.
+
+  22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kooldock-0.3-r1.ebuild:
+  Stable on sparc
+
+  20 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kooldock-0.3-r1.ebuild:
+  Stable on x86.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kooldock-0.3.ebuild:
+  Stable on ppc.
+
+*kooldock-0.3-r1 (31 Mar 2005)
+
+  31 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kooldock-0.3-fix-left-segfault.patch, +kooldock-0.3-r1.ebuild:
+  Patched to stop the segfault on exit left, thanks to David Leaver
+  <danzel@localhost.geek.nz> for the patch. Also marked ~amd64 as it now works
+  properly. Closes bug 85071.
+
+  12 Jan 2005; Jason Wever <weeve@gentoo.org> kooldock-0.3.ebuild:
+  Stable on sparc.
+
+  08 Dec 2004; Marc Hildebrand <zypher@gentoo.org> kooldock-0.3.ebuild:
+  Added ~ppc keyword.
+
+  05 Dec 2004; Simone Gotti <motaboy@gentoo.org> kooldock-0.3.ebuild:
+  Stable on x86.
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kooldock-0.3.ebuild:
+  QA: missing "inherit eutils"
+
+  16 Nov 2004; Jason Wever <weeve@gentoo.org> kooldock-0.3.ebuild:
+  Added ~sparc keyword.
 
 *kooldock-0.3 (31 Oct 2004)
 
diff --git a/kde-misc/kooldock/Manifest b/kde-misc/kooldock/Manifest
index 88a3f59d829c..c8078c864ae3 100644
--- a/kde-misc/kooldock/Manifest
+++ b/kde-misc/kooldock/Manifest
@@ -1,2 +1,6 @@
-MD5 2e359dbb03d5e1243f7fd638e34258c4 kooldock-0.3.ebuild 506
-MD5 789e37ac05ff3871ada15b4af18a97a9 files/digest-kooldock-0.3 65
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ce7e90f4c0eaf1071fa73208de33389a ChangeLog 1677
+MD5 4dff4e07c5fe20ca340662c6961a05cd kooldock-0.3-r1.ebuild 748
+MD5 b2e74e5e22ab6d40875f7495796d2bd0 files/kooldock-0.3-configure.patch 3567
+MD5 789e37ac05ff3871ada15b4af18a97a9 files/digest-kooldock-0.3-r1 65
+MD5 2e8e3b07f85fa6909ef9fae6bd0bd289 files/kooldock-0.3-fix-left-segfault.patch 484
diff --git a/kde-misc/kooldock/kooldock-0.3-r1.ebuild b/kde-misc/kooldock/kooldock-0.3-r1.ebuild
index e22b21d0ccd1..bd909faba25c 100644
--- a/kde-misc/kooldock/kooldock-0.3-r1.ebuild
+++ b/kde-misc/kooldock/kooldock-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/kde-misc/kooldock/kooldock-0.3-r1.ebuild,v 1.1 2005/03/31 22:54:36 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kooldock/kooldock-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://ktown.kde.cl/kooldock/dist/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 
 SLOT="0"
 IUSE=""
diff --git a/kde-misc/kooldock/metadata.xml b/kde-misc/kooldock/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/kooldock/metadata.xml
+++ b/kde-misc/kooldock/metadata.xml
@@ -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/kde-misc/krecipes/ChangeLog b/kde-misc/krecipes/ChangeLog
index 0c86d8d7b69b..01439f0416c4 100644
--- a/kde-misc/krecipes/ChangeLog
+++ b/kde-misc/krecipes/ChangeLog
@@ -1,6 +1,68 @@
-# ChangeLog for app-misc/krecipes
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.1 2004/10/30 17:10:38 carlo Exp $
+# ChangeLog for kde-misc/krecipes
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  23 Nov 2005; Chris White <chriswhite@gentoo.org> krecipes-0.8.1.ebuild:
+  x86 stable per bug #112836.
+
+  22 Nov 2005; Luis Medinas <metalgod@gentoo.org> krecipes-0.8.1.ebuild:
+  Stable on amd64. Bug #112836.
+
+  22 Nov 2005; Joseph Jezak <josejx@gentoo.org> krecipes-0.8.1.ebuild:
+  Marked ppc stable for bug #112836.
+
+  19 Nov 2005; Jason Wever <weeve@gentoo.org> krecipes-0.8.1.ebuild:
+  Stable on SPARC wrt bug #112836.
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> krecipes-0.8.1.ebuild:
+  Correct handling of mysql and postgres dependencies.
+
+*krecipes-0.8.1 (31 Jul 2005)
+
+  31 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +krecipes-0.8.1.ebuild:
+  version bump
+
+  04 Jul 2005; David Holm <dholm@gentoo.org> krecipes-0.8.ebuild:
+  Added to ~ppc.
+
+*krecipes-0.8 (03 Jul 2005)
+
+  03 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +krecipes-0.8.ebuild:
+  version bump
+
+*krecipes-0.7.1 (04 Mar 2005)
+
+  04 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +krecipes-0.7.1.ebuild,
+  -krecipes-0.7b.ebuild:
+  New version.
+
+*krecipes-0.7b (14 Feb 2005)
+
+  14 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -krecipes-0.7.ebuild,
+  +krecipes-0.7b.ebuild:
+  Version bump.
+
+*krecipes-0.7 (13 Feb 2005)
+
+  13 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +krecipes-0.7.ebuild:
+  Version bump.
+
+*krecipes-0.6.2 (19 Jan 2005)
+
+  19 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> -krecipes-0.5_beta.ebuild,
+  +krecipes-0.6.2.ebuild, -krecipes-0.6_beta.ebuild:
+  Version Bump. Removed old versions.
+
+  16 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> krecipes-0.6_beta.ebuild:
+  added ~amd64 to KEYWORDS. fixes #63066.
+
+  10 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> krecipes-0.6_beta.ebuild:
+  Not forcing sqlite-2 anymore, krecipes works with sqlite-3, too.
+
+*krecipes-0.6_beta (31 Oct 2004)
+
+  31 Oct 2004; Simone Gotti <motaboy@gentoo.org> +krecipes-0.6_beta.ebuild:
+  Bump to version 0.6_beta. Closes bug #67889.
 
 *krecipes-0.5_beta (30 Oct 2004)
 
diff --git a/kde-misc/krecipes/Manifest b/kde-misc/krecipes/Manifest
index 7e1f92df52f7..3f924f717c35 100644
--- a/kde-misc/krecipes/Manifest
+++ b/kde-misc/krecipes/Manifest
@@ -1,4 +1,20 @@
-MD5 47c1c2b1954b39ed48148ba4530d3321 ChangeLog 585
-MD5 2ae032c0699efdd4201908adef961d21 krecipes-0.5_beta.ebuild 547
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 04b7fb0d62563d5838b09714d71d79b0 files/digest-krecipes-0.5_beta 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53f701d833b47b725e29875a6116ed35 krecipes-0.7.1.ebuild 934
+MD5 a320f2f74e65ce58eca4bf9d25ad010b krecipes-0.8.1.ebuild 1474
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 e3227bbb7541cebc0175cba35837d10a ChangeLog 2677
+MD5 61216635310e25918699db773c2e79da krecipes-0.6.2.ebuild 729
+MD5 4410a07415be79fd4586a58403add2a1 krecipes-0.8.ebuild 936
+MD5 bc16a9f75213a67c72cbdfa3be0d8f10 files/digest-krecipes-0.8 70
+MD5 80e835a04c9e0b2dcb98285e4a0a2f8f files/digest-krecipes-0.6.2 72
+MD5 d00a1f7bbd75711a0e4f8b8c102be821 files/digest-krecipes-0.8.1 67
+MD5 ac2c77f4c2dac4b10437291117132b89 files/digest-krecipes-0.7.1 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDhDdEFdQwWVoAgN4RAlixAKCl3j/NDn4kQvhfsmsnHioT3q+MCwCgm6BK
+H8ZsWV6cd65dwUzQ/3DJPMo=
+=Bek8
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/krecipes/krecipes-0.6.2.ebuild b/kde-misc/krecipes/krecipes-0.6.2.ebuild
index 9038bb6e72c5..1e5ac9a25d64 100644
--- a/kde-misc/krecipes/krecipes-0.6.2.ebuild
+++ b/kde-misc/krecipes/krecipes-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/kde-misc/krecipes/krecipes-0.6.2.ebuild,v 1.1 2005/01/19 20:05:11 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/krecipes/krecipes-0.7.1.ebuild b/kde-misc/krecipes/krecipes-0.7.1.ebuild
index 54dd6e286f89..3b6ae8b579ae 100644
--- a/kde-misc/krecipes/krecipes-0.7.1.ebuild
+++ b/kde-misc/krecipes/krecipes-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/kde-misc/krecipes/krecipes-0.7.1.ebuild,v 1.1 2005/03/04 14:07:33 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/krecipes/krecipes-0.8.1.ebuild b/kde-misc/krecipes/krecipes-0.8.1.ebuild
index 28ded45baacb..4bb8e62d7605 100644
--- a/kde-misc/krecipes/krecipes-0.8.1.ebuild
+++ b/kde-misc/krecipes/krecipes-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/kde-misc/krecipes/krecipes-0.8.1.ebuild,v 1.1 2005/07/31 23:10:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -10,26 +10,39 @@ SRC_URI="mirror://sourceforge/krecipes/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="mysql postgres sqlite"
 
 DEPEND="sqlite? ( dev-db/sqlite )"
-RDEPEND="${DEPEND}
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
 
 need-kde 3
 
 pkg_setup() {
 	if ! use sqlite && ! use mysql && ! use postgres; then
-		eerror krecipes needs either SQLite, MySQL or PostgreSQL to work,
-		eerror please try again with USE=\"sqlite\", USE=\"mysql\" or USE=\"postgres\".
+		eerror "krecipes needs either SQLite, MySQL or PostgreSQL to work,"
+		eerror "please try again with USE=\"sqlite\","
+		eerror "USE=\"mysql\" (and Qt compiled with USE=\"mysql\") or"
+		eerror "USE=\"postgres\" (and Qt compiled with USE=\"postgres\")."
 		die
 	fi
+
+	if use mysql && ! built_with_use x11-libs/qt mysql; then
+		eerror "MySQL support was requested, but Qt"
+		eerror "was compiled without MySQL support."
+		eerror "Please reemerge Qt with USE=\"mysql\"."
+		die "MySQL support for Qt not found"
+	fi
+
+	if use postgres && ! built_with_use x11-libs/qt postgres; then
+		eerror "PostgreSQL support was requested, but Qt"
+		eerror "was compiled without PostgreSQL support."
+		eerror "Please reemerge Qt with USE=\"postgres\"."
+		die "PostgreSQL support for Qt not found"
+	fi
 }
 
 src_compile() {
-	myconf="$(use_with sqlite) $(use_with mysql) $(use_with postgres postgresql)"
+	local myconf="$(use_with sqlite) $(use_with mysql) $(use_with postgres postgresql)"
 
 	kde_src_compile
 }
diff --git a/kde-misc/krecipes/krecipes-0.8.ebuild b/kde-misc/krecipes/krecipes-0.8.ebuild
index 9cde8834040a..b3f79e40d5ef 100644
--- a/kde-misc/krecipes/krecipes-0.8.ebuild
+++ b/kde-misc/krecipes/krecipes-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/kde-misc/krecipes/krecipes-0.8.ebuild,v 1.1 2005/07/03 17:37:51 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.8.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/krecipes/${PN}_beta_${PV}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 DEPEND="sqlite? ( dev-db/sqlite )"
diff --git a/kde-misc/krecipes/metadata.xml b/kde-misc/krecipes/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/krecipes/metadata.xml
+++ b/kde-misc/krecipes/metadata.xml
@@ -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/kde-misc/krename/ChangeLog b/kde-misc/krename/ChangeLog
index 67916715420d..d9bed2d3b75b 100644
--- a/kde-misc/krename/ChangeLog
+++ b/kde-misc/krename/ChangeLog
@@ -1,6 +1,84 @@
-# ChangeLog for app-misc/krename
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.1 2004/10/30 17:42:15 carlo Exp $
+# ChangeLog for kde-misc/krename
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  19 Nov 2005; Jason Wever <weeve@gentoo.org> krename-3.0.9.ebuild:
+  Stable on SPARC wrt bug #112835.
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org> krename-3.0.9.ebuild:
+  Stable on x86; bug #112835
+
+*krename-3.0.9 (19 Oct 2005)
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +krename-3.0.9.ebuild:
+  New version (#109787).
+
+*krename-3.0.8 (24 Sep 2005)
+
+  24 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.8.ebuild:
+  version bump
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> krename-3.0.6.ebuild:
+  Stable on ppc.
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> krename-3.0.6.ebuild:
+  Stable on amd64.
+
+  20 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> krename-3.0.6.ebuild:
+  Stable on x86.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> krename-3.0.5.ebuild:
+  Stable on ppc.
+
+  10 Aug 2005; Luis Medinas <metalgod@gentoo.org> krename-3.0.5.ebuild:
+  Marked Stable on AMD64.
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> krename-3.0.5.ebuild,
+  +krename-3.0.6.ebuild:
+  stable on x86
+
+*krename-3.0.6 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.6.ebuild:
+  version bump
+
+*krename-3.0.5 (23 May 2005)
+
+  23 May 2005; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.5.ebuild:
+  version bump
+
+*krename-3.0.4 (21 Apr 2005)
+
+  21 Apr 2005; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.4.ebuild:
+  version bump
+
+  05 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> krename-3.0.3.ebuild:
+  Marked stable on amd64.
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> krename-3.0.3.ebuild:
+  Stable on ppc.
+
+  25 Mar 2005; Carsten Lohrke <carlo@gentoo.org> krename-3.0.3.ebuild:
+  stable on x86
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> krename-3.0.3.ebuild:
+  Added ~sparc keyword.
+
+*krename-3.0.3 (14 Feb 2005)
+
+  14 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.3.ebuild,
+  -krename-3.0.3_rc1.ebuild, -krename-3.0.3_rc2.ebuild:
+  version bump
+
+*krename-3.0.3_rc2 (07 Jan 2005)
+
+  07 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.3_rc2.ebuild:
+  version bump
+
+*krename-3.0.3_rc1 (02 Dec 2004)
+
+  02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +krename-3.0.3_rc1.ebuild:
+  version bump
 
 *krename-3.0.2 (30 Oct 2004)
 
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 2291778f7e3e..b1eb4951eaed 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,6 +1,10 @@
-MD5 d7ca36cc2b375c6b9aa2785ffcaac92c ChangeLog 4420
-MD5 d68c5ee48b0490f514de3bc3c5a00ae8 krename-2.8.5.ebuild 452
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 e3c4e778aef468d6527dad87c9e7f4e7 krename-3.0.2.ebuild 515
-MD5 7372bce6a0f5a08335a2b91a138b0d5a files/digest-krename-2.8.5 66
-MD5 3117f21ba1aa2efe42e3d374cb1508d3 files/digest-krename-3.0.2 66
+MD5 d57487f960e109b7ecb991b5547d4cc4 ChangeLog 6802
+MD5 f5940e475031b9736997d71c8d4efa26 files/digest-krename-3.0.5 128
+MD5 3f0073c71b765e148becfb2f81f30acf files/digest-krename-3.0.6 128
+MD5 e1bed4bf387cb4b642bd96c05cdea85a files/digest-krename-3.0.8 128
+MD5 cf0132a517e537d5d0bec606891234fb files/digest-krename-3.0.9 128
+MD5 7995863351a84fe394373cbcdbff361b krename-3.0.5.ebuild 755
+MD5 a622e20283d5c22b75ec7678a7aa77fc krename-3.0.6.ebuild 755
+MD5 a4e1d2749dfb3b0ad1586c1860a5bc51 krename-3.0.8.ebuild 757
+MD5 a6e689c3bb929f1fb43fd605100c2ea7 krename-3.0.9.ebuild 694
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-misc/krename/files/digest-krename-3.0.9 b/kde-misc/krename/files/digest-krename-3.0.9
index 3c33e93a2452..fd4c4c35654d 100644
--- a/kde-misc/krename/files/digest-krename-3.0.9
+++ b/kde-misc/krename/files/digest-krename-3.0.9
@@ -1,2 +1,2 @@
-MD5 e07485fd50c929164d3e168c81818ed5 krename-3.0.9.tar.bz2 723042
 MD5 0e598b7acf88e80bf76fdfd22d8c7929 krename-3.0.3.pdf 640098
+MD5 e07485fd50c929164d3e168c81818ed5 krename-3.0.9.tar.bz2 723042
diff --git a/kde-misc/krename/krename-3.0.5.ebuild b/kde-misc/krename/krename-3.0.5.ebuild
index 74f3d2c8dcd4..62f837bccdc3 100644
--- a/kde-misc/krename/krename-3.0.5.ebuild
+++ b/kde-misc/krename/krename-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/kde-misc/krename/krename-3.0.5.ebuild,v 1.1 2005/05/23 17:18:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-3.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
@@ -14,11 +14,11 @@ DOC="krename-3.0.3.pdf"
 DESCRIPTION="KRename - a very powerful batch file renamer"
 HOMEPAGE="http://www.krename.net/"
 SRC_URI="mirror://sourceforge/krename/${MY_P}.tar.bz2
-	doc? ( mirror://sourceforge/krename/${DOC})"
+	doc? ( mirror://sourceforge/krename/${DOC} )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="doc"
 
 need-kde 3.1
diff --git a/kde-misc/krename/krename-3.0.6.ebuild b/kde-misc/krename/krename-3.0.6.ebuild
index 92d63c49f4d0..f7bd3ef8da4b 100644
--- a/kde-misc/krename/krename-3.0.6.ebuild
+++ b/kde-misc/krename/krename-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/kde-misc/krename/krename-3.0.6.ebuild,v 1.1 2005/06/27 10:56:34 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-3.0.6.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/krename/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="doc"
 
 need-kde 3.1
diff --git a/kde-misc/krename/krename-3.0.8.ebuild b/kde-misc/krename/krename-3.0.8.ebuild
index 44a31901bfe3..ac35f0eccb11 100644
--- a/kde-misc/krename/krename-3.0.8.ebuild
+++ b/kde-misc/krename/krename-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/kde-misc/krename/krename-3.0.8.ebuild,v 1.1 2005/09/24 20:22:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-3.0.8.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/krename/krename-3.0.9.ebuild b/kde-misc/krename/krename-3.0.9.ebuild
index 9efa45be5932..bdc3712c4fd1 100644
--- a/kde-misc/krename/krename-3.0.9.ebuild
+++ b/kde-misc/krename/krename-3.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/kde-misc/krename/krename-3.0.9.ebuild,v 1.1 2005/10/19 15:36:16 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-3.0.9.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="doc"
 
 need-kde 3.1
diff --git a/kde-misc/krename/metadata.xml b/kde-misc/krename/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/krename/metadata.xml
+++ b/kde-misc/krename/metadata.xml
@@ -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/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index f8ec712c9df9..1a4236cd6642 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,102 @@
-# ChangeLog for app-misc/krusader
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.1 2004/10/30 17:48:33 carlo Exp $
+# ChangeLog for kde-misc/krusader
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
+
+  06 Nov 2005; Mark Loeser <halcy0n@gentoo.org> krusader-1.60.1.ebuild:
+  Stable on x86; bug #111076
+
+  05 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> krusader-1.60.1.ebuild:
+  Readd workaround to avoid a wrongly installed file.
+
+  03 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  krusader-1.60.1.ebuild:
+  Stable on sparc wrt #111076
+
+  03 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  krusader-1.60.1.ebuild:
+  Stable on ppc. See bug #111076.
+
+*krusader-1.60.1 (03 Nov 2005)
+
+  03 Nov 2005; Carsten Lohrke <carlo@gentoo.org> +krusader-1.60.1.ebuild:
+  version bump
+
+*krusader-1.70.0_beta1 (06 Oct 2005)
+
+  06 Oct 2005; Carsten Lohrke <carlo@gentoo.org>
+  +krusader-1.70.0_beta1.ebuild:
+  version bump
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  krusader-1.60.0.ebuild:
+  Stable on ppc.
+
+  14 Jun 2005; Jason Wever <weeve@gentoo.org> krusader-1.60.0.ebuild:
+  Stable on SPARC.
+
+  29 May 2005; Marcus D. Hanwell <marcus@gentoo.org> krusader-1.60.0.ebuild:
+  Stable on amd64.
+
+  28 May 2005; Diego Pettenò <flameeyes@gentoo.org> krusader-1.60.0.ebuild:
+  Suggest installing virtual/eject instead of sys-apps/eject.
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org> krusader-1.60.0.ebuild:
+  Stable on x86.
+
+*krusader-1.60.0 (13 Apr 2005)
+
+  13 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> +krusader-1.60.0.ebuild:
+  New version (#88897).
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> krusader-1.51.ebuild:
+  Stable on ppc.
+
+*krusader-1.60.0_beta2 (22 Mar 2005)
+
+  22 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  +krusader-1.60.0_beta2.ebuild:
+  version bump
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> krusader-1.51.ebuild:
+  Stable on sparc
+
+  05 Mar 2005; Simon Stelling <blubb@gentoo.org> krusader-1.51.ebuild:
+  stable on amd64
+
+  05 Mar 2005; Carsten Lohrke <carlo@gentoo.org> krusader-1.60.0_beta1.ebuild:
+  dependency fix
+
+*krusader-1.60.0_beta1 (04 Mar 2005)
+
+  04 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  +krusader-1.60.0_beta1.ebuild:
+  version bump
+
+  04 Mar 2005; Carsten Lohrke <carlo@gentoo.org> krusader-1.51.ebuild:
+  stable on x86
+
+  10 Feb 2005; Simone Gotti <motaboy@gentoo.org> krusader-1.50.ebuild,
+  krusader-1.51.ebuild:
+  Add deps on kde-base/libkonq kde-base/kdebase-kioslaves. Fixes bug #78782.
+
+*krusader-1.51 (16 Dec 2004)
+
+  16 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +krusader-1.51.ebuild:
+  version bump
+
+  07 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> krusader-1.50.ebuild:
+  Stable on sparc
+
+  05 Dec 2004; Simone Gotti <motaboy@gentoo.org> krusader-1.50.ebuild:
+  Stable on x86.
+
+  05 Dec 2004; Simone Gotti <motaboy@gentoo.org> krusader-1.40.ebuild:
+  `` calls emerge inside the ebuild instead of printing it. Fixes bug #71521.
+
+*krusader-1.50 (04 Nov 2004)
+
+  04 Nov 2004; Simone Gotti <motaboy@gentoo.org> +krusader-1.50.ebuild:
+  Version Bump. Closes bug #69980
 
 *krusader-1.40 (30 Oct 2004)
 
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index ba4c75eb6e4b..94a94b0f88da 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,6 +1,18 @@
-MD5 38a6b9ea5a6994a514e9984dd71fc12f krusader-1.40.ebuild 1074
-MD5 9ee0bf413fa9f55da38be642964070dd ChangeLog 4320
-MD5 69fa78263a04354e09cd3dff9d8244d7 krusader-1.50_beta1.ebuild 1277
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 49275a58f3cced10d296042c331d833e files/digest-krusader-1.40 66
-MD5 be6d149cdf6b7df43387e333c9e4e906 files/digest-krusader-1.50_beta1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2a5033c04c2ee007a11d112484d4865e ChangeLog 7452
+MD5 5114fe81b3da50dc171889c659b60a34 files/digest-krusader-1.60.0 68
+MD5 197fa5c939ba779dbd4ee97668c43233 files/digest-krusader-1.60.1 68
+MD5 f1bf274c06d0a559f975579ed684bfdf files/digest-krusader-1.70.0_beta1 74
+MD5 fca1ac57741d1327d8a82d4c4870fc83 krusader-1.60.0.ebuild 1451
+MD5 6d77bb6e752d1dc2de0a5b3f416c30ee krusader-1.60.1.ebuild 1531
+MD5 7375a40f9959feb71f69a5389f4b875c krusader-1.70.0_beta1.ebuild 1508
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbZjeCRZPokWLroQRAsR3AJ98I9jsaoiwpe5LNuht9QiiWDJ9wQCdEq41
+uXYmjspJlzxFjkzm8WecJP8=
+=YmCI
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/krusader/krusader-1.60.0.ebuild b/kde-misc/krusader/krusader-1.60.0.ebuild
index 9c85bf5e2aa5..ba5603c7e25b 100644
--- a/kde-misc/krusader/krusader-1.60.0.ebuild
+++ b/kde-misc/krusader/krusader-1.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.60.0.ebuild,v 1.1 2005/04/13 17:14:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.60.0.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit kde
 
@@ -10,13 +10,13 @@ SRC_URI="mirror://sourceforge/krusader/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="javascript kde"
 # kde: adds support for Konqueror's right-click actions
 
 DEPEND="kde? ( || ( ( kde-base/libkonq kde-base/kdebase-kioslaves )
 		    >=kde-base/kdebase-3.3 ) )
-	x86? ( javascript? ( kde-base/kjsembed ) )"
+	javascript? ( kde-base/kjsembed )"
 
 need-kde 3.3
 
@@ -35,7 +35,7 @@ pkg_postinst() {
 	einfo "- KDiff3  (app-misc/kdiff3)"
 	einfo "- XXdiff  (dev-util/xxdiff)"
 	einfo "- KRename (app-misc/krename)"
-	einfo "- Eject   (sys-apps/eject)"
+	einfo "- Eject   (virtual/eject)"
 	einfo ""
 	einfo "It supports also quite a few archive formats, including:"
 	einfo "- app-arch/arj"
diff --git a/kde-misc/krusader/krusader-1.60.1.ebuild b/kde-misc/krusader/krusader-1.60.1.ebuild
index b45bdee1d4b2..3811a5d2314b 100644
--- a/kde-misc/krusader/krusader-1.60.1.ebuild
+++ b/kde-misc/krusader/krusader-1.60.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.60.1.ebuild,v 1.1 2005/11/03 14:43:11 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.60.1.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit kde
 
@@ -10,17 +10,26 @@ SRC_URI="mirror://sourceforge/krusader/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="javascript kde"
 # kde: adds support for Konqueror's right-click actions
 
 DEPEND="kde? ( || ( ( kde-base/libkonq kde-base/kdebase-kioslaves )
 		    >=kde-base/kdebase-3.3 ) )
 	javascript? ( kde-base/kjsembed )"
+
 RDEPEND="${DEPEND}
 	kde? ( || ( kde-base/konqueror >=kde-base/kdebase-3.3 ) )"
+
 need-kde 3.3
 
+src_compile() {
+	sed -i -e 's/^rcdir =/#rcdir =/' krusader/Makefile.in krusader/Makefile.am
+	sed -i -e 's/^rc_DATA =/#rc_DATA =/' krusader/Makefile.in krusader/Makefile.am
+
+	kde_src_compile
+}
+
 pkg_postinst() {
 	echo
 	einfo "Krusader can use various external applications, including:"
diff --git a/kde-misc/krusader/krusader-1.70.0_beta1.ebuild b/kde-misc/krusader/krusader-1.70.0_beta1.ebuild
index 37430f965ff5..733821b52455 100644
--- a/kde-misc/krusader/krusader-1.70.0_beta1.ebuild
+++ b/kde-misc/krusader/krusader-1.70.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/kde-misc/krusader/krusader-1.70.0_beta1.ebuild,v 1.1 2005/10/06 01:01:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.70.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -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/kde-misc/ksensors/ChangeLog b/kde-misc/ksensors/ChangeLog
index 0311279b7227..8ad704302b5a 100644
--- a/kde-misc/ksensors/ChangeLog
+++ b/kde-misc/ksensors/ChangeLog
@@ -1,6 +1,32 @@
-# ChangeLog for app-misc/ksensors
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ChangeLog,v 1.1 2004/10/30 17:26:28 carlo Exp $
+# ChangeLog for kde-misc/ksensors
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+  09 Oct 2005; Luis Medinas <metalgod@gentoo.org> ksensors-0.7.3.ebuild:
+  Marked Stable on amd64.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  ksensors-0.7.2-r1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> ksensors-0.7.3.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> ksensors-0.7.2.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> ksensors-0.7.2-r1.ebuild,
+  ksensors-0.7.2.ebuild, ksensors-0.7.3.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; Michael Hanselmann <hansmi@gentoo.org>
+  ksensors-0.7.2-r1.ebuild:
+  Removed from ppc, because lm-sensors no longer works on ppc.
+
+  07 Dec 2004; Carsten Lohrke <carlo@gentoo.org> ksensors-0.7.3.ebuild:
+  stable on x86
 
 *ksensors-0.7.3 (30 Oct 2004)
 
diff --git a/kde-misc/ksensors/Manifest b/kde-misc/ksensors/Manifest
index dab589642871..b98fe3dc8c45 100644
--- a/kde-misc/ksensors/Manifest
+++ b/kde-misc/ksensors/Manifest
@@ -1,10 +1,14 @@
-MD5 cb55918f9d91f62e3d95eb312ca4908d ksensors-0.7.3.ebuild 587
-MD5 64417ae658f7615f917bab0453797af4 ksensors-0.7.2-r1.ebuild 643
-MD5 d2b3c6aace644401b18d9b9d0bb67485 ksensors-0.7.2.ebuild 589
-MD5 a4c5baf947dac2ccacb69b4b2dd98e00 ChangeLog 1726
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 5735dac5885bda1ec14e3015ad47f87a files/startupcrash.diff 618
-MD5 7e219e54436163ee72f99d92a157215a files/digest-ksensors-0.7.2 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b95874043c0c62d57f3aa33d798232c5 ChangeLog 3073
+MD5 dd82c5b7b3bc5a018033ced343e2e7ff ksensors-0.7.3.ebuild 561
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 5fd4df1755f6106cd51487b5399f82ee files/digest-ksensors-0.7.3 66
-MD5 8c18772cb6400af497858e0c7f9658ec files/ksensors-0.7.2-scaling.diff 2085
-MD5 7e219e54436163ee72f99d92a157215a files/digest-ksensors-0.7.2-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSWlPwUpWvClEHQoRAlSAAJ9h7dyIx5oBVKu1d08S7gSpfrs9RgCggt7M
+S21aR38kZL6+Xcf39ENF9SM=
+=Gf6q
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/ksensors/ksensors-0.7.3.ebuild b/kde-misc/ksensors/ksensors-0.7.3.ebuild
index e658b4527b12..88373799849c 100644
--- a/kde-misc/ksensors/ksensors-0.7.3.ebuild
+++ b/kde-misc/ksensors/ksensors-0.7.3.ebuild
@@ -1,23 +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/kde-misc/ksensors/ksensors-0.7.3.ebuild,v 1.1 2004/10/30 17:26:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksensors/ksensors-0.7.3.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="KSensors - a nice lm_sensors frontend for KDE"
 SRC_URI="mirror://sourceforge/ksensors/${P}.tar.gz"
 HOMEPAGE="http://ksensors.sourceforge.net/"
-
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
 
-IUSE=""
 SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-DEPEND=">=sys-apps/lm-sensors-2.6.3
-	>=kde-base/kdebase-3.0"
+DEPEND=">=sys-apps/lm_sensors-2.6.3"
 
-need-kde 3.0
+need-kde 3
 
 src_unpack()
 {
diff --git a/kde-misc/ksensors/metadata.xml b/kde-misc/ksensors/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/ksensors/metadata.xml
+++ b/kde-misc/ksensors/metadata.xml
@@ -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/kde-misc/kshutdown/ChangeLog b/kde-misc/kshutdown/ChangeLog
index 1df0e87e02fe..e1189d8fd7cd 100644
--- a/kde-misc/kshutdown/ChangeLog
+++ b/kde-misc/kshutdown/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-misc/kshutdown
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.1 2004/10/30 17:13:36 carlo Exp $
+# ChangeLog for kde-misc/kshutdown
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  09 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kshutdown-0.6.0.ebuild:
+  Stable on x86.
+
+*kshutdown-0.6.0 (10 Mar 2005)
+
+  10 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kshutdown-0.6.0-makefile-fix.patch, +kshutdown-0.6.0.ebuild:
+  New version.
 
 *kshutdown-0.2.1 (30 Oct 2004)
 
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index 17b880546167..6a248d664293 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fc0c0aba7d770718ba216c98c9e94d3c ChangeLog 496
-MD5 3b9c380a36f29fa045ccc25084a07b07 kshutdown-0.2.1.ebuild 428
-MD5 c7905dd20e49deed0bced0499a9f714c metadata.xml 222
-MD5 c05706865f3fbece9ef827b1b4ea4c5f files/digest-kshutdown-0.2.1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBYHgFI1lqEGTUzyQRAtLFAJwNDKEsewEUcdiuUJf7hIpkF7oruACeLduF
-ShJNtydEZCn/B0xQZcQaCEY=
-=wQSE
------END PGP SIGNATURE-----
+MD5 2834f1cb97eea873f19ab95ccad6bc6d metadata.xml 216
+MD5 c39f752c777891f242763131e4c39333 ChangeLog 936
+MD5 7e7062106494e118a03cdc51a8a18c3d kshutdown-0.6.0.ebuild 601
+MD5 84ede688edce48bdffbd9ae801575289 files/digest-kshutdown-0.6.0 68
+MD5 97e80e69f35ea1528ac7f174bc01a6f8 files/kshutdown-0.6.0-makefile-fix.patch 660
diff --git a/kde-misc/kshutdown/kshutdown-0.6.0.ebuild b/kde-misc/kshutdown/kshutdown-0.6.0.ebuild
index 560b29b6aa11..b708ce36d422 100644
--- a/kde-misc/kshutdown/kshutdown-0.6.0.ebuild
+++ b/kde-misc/kshutdown/kshutdown-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/kde-misc/kshutdown/kshutdown-0.6.0.ebuild,v 1.1 2005/03/10 15:34:53 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kshutdown/kshutdown-0.6.0.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="A shutdown manager for KDE"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -10,7 +10,7 @@ HOMEPAGE="http://kshutdown.sourceforge.net"
 LICENSE="GPL-2"
 
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 SLOT="0"
 
 need-kde 3.3
@@ -18,6 +18,7 @@ need-kde 3.3
 src_unpack() {
 	kde_src_unpack
 
+	# Patch sent upstream, will be in 0.6.1.
 	epatch "${FILESDIR}/${P}-makefile-fix.patch"
 	make -f admin/Makefile.common
 }
diff --git a/kde-misc/kshutdown/metadata.xml b/kde-misc/kshutdown/metadata.xml
index 051cbc4ed73a..f360420caeb2 100644
--- a/kde-misc/kshutdown/metadata.xml
+++ b/kde-misc/kshutdown/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd>
+<herd>kde</herd>
 <maintainer>
 	<email>voxus@gentoo.org</email>
 </maintainer>
diff --git a/kde-misc/ksmoothdock/ChangeLog b/kde-misc/ksmoothdock/ChangeLog
index 51b348a7223f..d05126a60374 100644
--- a/kde-misc/ksmoothdock/ChangeLog
+++ b/kde-misc/ksmoothdock/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for x11-themes/ksmoothdock
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksmoothdock/ChangeLog,v 1.1 2004/10/30 16:42:42 carlo Exp $
+# ChangeLog for kde-misc/ksmoothdock
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksmoothdock/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ksmoothdock-3.5.1.ebuild:
+  Stable on ppc.
+
+  12 Jan 2005; Jason Wever <weeve@gentoo.org> ksmoothdock-3.5.1.ebuild:
+  Stable on sparc.
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> metadata.xml:
+  minor fix
+
+  28 Nov 2004; Dominik Stadler <centic@gentoo.org> ksmoothdock-3.2.ebuild,
+  ksmoothdock-3.5.1.ebuild, ksmoothdock-3.5.ebuild:
+  Mark stable on x86
+
+  25 Nov 2004; Simone Gotti <motaboy@gentoo.org> ksmoothdock-3.5.1.ebuild:
+  QA: inherits eutils.
+
+  22 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/ksmoothdock-3.5.1-configure-arts.patch, ksmoothdock-3.5.1.ebuild:
+  Added a patch to the configure script to honor the arts use flag. Fixes bug
+  #71919.
 
 *ksmoothdock-3.5 (30 Oct 2004)
 
diff --git a/kde-misc/ksmoothdock/Manifest b/kde-misc/ksmoothdock/Manifest
index 214afbea5c2b..406f0d3fa934 100644
--- a/kde-misc/ksmoothdock/Manifest
+++ b/kde-misc/ksmoothdock/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 999c9b311fc869b261b9b7c02cf16dbc ChangeLog 1160
-MD5 b47096f48d0a4a17d4f120439814edd4 ksmoothdock-3.2.ebuild 499
-MD5 7fe3eaf41168f0984b3efd54838ae0a1 ksmoothdock-3.5.1.ebuild 509
-MD5 92e7ca57e97c4be3aab14e716121e764 ksmoothdock-3.5.ebuild 505
-MD5 77a747b5fbf7edf698a0c698141ecf02 metadata.xml 163
-MD5 eb1ce10707fba71aa9c9c8b61e0e5790 files/digest-ksmoothdock-3.2 67
-MD5 4c09574bba5c29e4dd929b6420eda3c3 files/digest-ksmoothdock-3.5 67
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 96e195c9bf652820da8fda61b11ab9c9 ChangeLog 2119
+MD5 e95e0dd7dd8494cc093ddf0c0be3f85a ksmoothdock-3.5.1.ebuild 606
 MD5 41352f1db4f71f715446f4ed052bf758 files/digest-ksmoothdock-3.5.1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXsy+I1lqEGTUzyQRAruCAJ4t92c7MSrRD/u/up0qnic7Uh0kowCdGVtI
-Wq7Kec1SRtAUP1zzpwisyu8=
-=nOvz
------END PGP SIGNATURE-----
+MD5 c43e0faa7bfc58b5cf69228ee3d0695a files/ksmoothdock-3.5.1-configure-arts.patch 3567
diff --git a/kde-misc/ksmoothdock/ksmoothdock-3.5.1.ebuild b/kde-misc/ksmoothdock/ksmoothdock-3.5.1.ebuild
index e42b21fbed14..bcbe2ba983f2 100644
--- a/kde-misc/ksmoothdock/ksmoothdock-3.5.1.ebuild
+++ b/kde-misc/ksmoothdock/ksmoothdock-3.5.1.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/kde-misc/ksmoothdock/ksmoothdock-3.5.1.ebuild,v 1.1 2004/10/30 16:42:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksmoothdock/ksmoothdock-3.5.1.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
-inherit kde
-need-kde 3.2
+inherit kde eutils
 
 DESCRIPTION="KSmoothDock is a dock program for KDE with smooth parabolic zooming."
 HOMEPAGE="http://ksmoothdock.sourceforge.net"
@@ -11,7 +10,14 @@ SRC_URI="mirror://sourceforge/ksmoothdock/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
+need-kde 3.2
+
+src_unpack() {
+	kde_src_unpack
+
+	use arts || epatch ${FILESDIR}/${P}-configure-arts.patch
+}
 
diff --git a/kde-misc/ksmoothdock/metadata.xml b/kde-misc/ksmoothdock/metadata.xml
index 7a70bd761f0b..8d1e86a9cefb 100644
--- a/kde-misc/ksmoothdock/metadata.xml
+++ b/kde-misc/ksmoothdock/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-themes</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-misc/ksynaptics/ChangeLog b/kde-misc/ksynaptics/ChangeLog
index 1b59e1afe698..bb2714f0a053 100644
--- a/kde-misc/ksynaptics/ChangeLog
+++ b/kde-misc/ksynaptics/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for kde-misc/ksynaptics
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksynaptics/ChangeLog,v 1.1 2005/10/19 13:22:45 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksynaptics/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 *ksynaptics-0.2.2 (19 Oct 2005)
 
diff --git a/kde-misc/ksynaptics/Manifest b/kde-misc/ksynaptics/Manifest
index 26c903025c81..97108327f07a 100644
--- a/kde-misc/ksynaptics/Manifest
+++ b/kde-misc/ksynaptics/Manifest
@@ -1,4 +1,4 @@
-MD5 b8ed015681b9c4ada34edbbd27bb61e0 .ksynaptics-0.2.2.ebuild.swp 12288
+MD5 d3a97ff6d3426e6da9c2ae5139433669 ChangeLog 358
 MD5 15954059d83531ff72b5fa2eebae7b89 files/digest-ksynaptics-0.2.2 69
-MD5 0ed5f60c8740d6a50c847df460399eb4 ksynaptics-0.2.2.ebuild 360
+MD5 770cb9d3e9a4c765ae39cc115db68ed8 ksynaptics-0.2.2.ebuild 465
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
diff --git a/kde-misc/ksynaptics/ksynaptics-0.2.2.ebuild b/kde-misc/ksynaptics/ksynaptics-0.2.2.ebuild
index d9a4c72fc173..0ff841f951c0 100644
--- a/kde-misc/ksynaptics/ksynaptics-0.2.2.ebuild
+++ b/kde-misc/ksynaptics/ksynaptics-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/kde-misc/ksynaptics/ksynaptics-0.2.2.ebuild,v 1.1 2005/10/19 13:22:45 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksynaptics/ksynaptics-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/ksystemlog/ChangeLog b/kde-misc/ksystemlog/ChangeLog
index 93c4222c76f4..c1fbb01edf65 100644
--- a/kde-misc/ksystemlog/ChangeLog
+++ b/kde-misc/ksystemlog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/ksystemlog
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksystemlog/ChangeLog,v 1.1 2005/07/26 04:07:40 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksystemlog/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> ksystemlog-0.3.1.ebuild:
+  Added to ~ppc.
 
 *ksystemlog-0.3.1 (26 Jul 2005)
 
diff --git a/kde-misc/ksystemlog/Manifest b/kde-misc/ksystemlog/Manifest
index 948c0733a3c9..2eaab7165cf3 100644
--- a/kde-misc/ksystemlog/Manifest
+++ b/kde-misc/ksystemlog/Manifest
@@ -1,4 +1,4 @@
-MD5 507a459a83d085d07e9e5d5d4e6a2c11 ksystemlog-0.3.1.ebuild 404
-MD5 fecdcdc6c980d2919d61fcebdecbdd24 ChangeLog 305
+MD5 4d0abbfd8dd9ad855bbf440182a0500f ChangeLog 483
+MD5 d3ab877b7b6fc95276a771439bb43bcf ksystemlog-0.3.1.ebuild 513
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 8dfa337c2acb747a52bf433487f044aa files/digest-ksystemlog-0.3.1 69
diff --git a/kde-misc/ksystemlog/ksystemlog-0.3.1.ebuild b/kde-misc/ksystemlog/ksystemlog-0.3.1.ebuild
index 284c6b857bce..8d07c6651d36 100644
--- a/kde-misc/ksystemlog/ksystemlog-0.3.1.ebuild
+++ b/kde-misc/ksystemlog/ksystemlog-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/kde-misc/ksystemlog/ksystemlog-0.3.1.ebuild,v 1.1 2005/07/26 04:07:40 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksystemlog/ksystemlog-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 RESTRICT="nomirror"
 
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 
 need-kde 3.3
diff --git a/kde-misc/kxdocker-resources/ChangeLog b/kde-misc/kxdocker-resources/ChangeLog
index c9e4181226fe..c9f0ab328d3b 100644
--- a/kde-misc/kxdocker-resources/ChangeLog
+++ b/kde-misc/kxdocker-resources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-misc/kxdocker-resources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-resources/ChangeLog,v 1.1 2005/10/01 01:15:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-resources/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+  20 Nov 2005; Danny van Dyk <kugelfang@gentoo.org>
+  kxdocker-resources-0.14.ebuild:
+  Marked ~amd64.
+
+*kxdocker-resources-0.14 (01 Oct 2005)
+
+  01 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +kxdocker-resources-0.14.ebuild:
+  version bump
 
 *kxdocker-resources-0.13 (01 Oct 2005)
 
diff --git a/kde-misc/kxdocker-resources/Manifest b/kde-misc/kxdocker-resources/Manifest
index 8dc966d04804..08dc4a8c3e8d 100644
--- a/kde-misc/kxdocker-resources/Manifest
+++ b/kde-misc/kxdocker-resources/Manifest
@@ -1,2 +1,16 @@
-MD5 3a3c3a01716bcbdc000824b621fb5c85 kxdocker-resources-0.13.ebuild 442
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 63ed15042114de76d8bb5a3ed44fa868 ChangeLog 700
 MD5 61cd5d6e015ac14d5a0e7bd0f1bfc9cc files/digest-kxdocker-resources-0.13 77
+MD5 10cb8611bbdfd4345a4559f32dda5ea5 files/digest-kxdocker-resources-0.14 77
+MD5 dad10e6fb852b9e4a4044310381e304c kxdocker-resources-0.13.ebuild 567
+MD5 a89fc380ea6272f245339d596ba055f8 kxdocker-resources-0.14.ebuild 572
+MD5 af0f2c1aa4185c52dd4f4ea588f22286 metadata.xml 349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDgGcK5mJXAu5GbtIRAjVrAJ4pGHWvI12Gkv2NgPnVzYhTjLv+owCdEJ5I
+058ldrtDB+G8JSjiWcIysRI=
+=ccxK
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/kxdocker-resources/kxdocker-resources-0.13.ebuild b/kde-misc/kxdocker-resources/kxdocker-resources-0.13.ebuild
index 3fea93339481..1ee7d899759e 100644
--- a/kde-misc/kxdocker-resources/kxdocker-resources-0.13.ebuild
+++ b/kde-misc/kxdocker-resources/kxdocker-resources-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/kde-misc/kxdocker-resources/kxdocker-resources-0.13.ebuild,v 1.1 2005/10/01 01:15:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-resources/kxdocker-resources-0.13.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/kxdocker-resources/kxdocker-resources-0.14.ebuild b/kde-misc/kxdocker-resources/kxdocker-resources-0.14.ebuild
index e12309169741..0b71a7fefc51 100644
--- a/kde-misc/kxdocker-resources/kxdocker-resources-0.14.ebuild
+++ b/kde-misc/kxdocker-resources/kxdocker-resources-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/kde-misc/kxdocker-resources/kxdocker-resources-0.14.ebuild,v 1.1 2005/10/01 01:50:56 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker-resources/kxdocker-resources-0.14.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.xiaprojects.com/www/downloads/files/kxdocker/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 need-kde 3.2
diff --git a/kde-misc/kxdocker/ChangeLog b/kde-misc/kxdocker/ChangeLog
index 85b919c3fe91..3dbeead79fd0 100644
--- a/kde-misc/kxdocker/ChangeLog
+++ b/kde-misc/kxdocker/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for kde-misc/kxdocker
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/ChangeLog,v 1.1 2005/10/01 01:26:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
+
+  20 Nov 2005; Danny van Dyk <kugelfang@gentoo.org> kxdocker-0.39.ebuild:
+  Marked ~amd64.
+
+*kxdocker-0.39 (20 Nov 2005)
+
+  20 Nov 2005; Daniel Black <dragonheart@gentoo.org> +kxdocker-0.39.ebuild:
+  version bump as per bug #112850 thanks Alessio Cassibba
+
+*kxdocker-0.38 (01 Oct 2005)
+
+  01 Oct 2005; Daniel Black <dragonheart@gentoo.org> +kxdocker-0.38.ebuild:
+  version bump
 
 *kxdocker-0.37 (01 Oct 2005)
 
diff --git a/kde-misc/kxdocker/Manifest b/kde-misc/kxdocker/Manifest
index f4ba9fb881ba..043d13f12fef 100644
--- a/kde-misc/kxdocker/Manifest
+++ b/kde-misc/kxdocker/Manifest
@@ -1,2 +1,18 @@
-MD5 1d5a07b160a5e7fa1237494aa51c6d61 kxdocker-0.37.ebuild 546
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 56d2c0eba6cac57c074061ac9d06b4f9 ChangeLog 791
 MD5 83da188cebd5a60bb4844220506340a4 files/digest-kxdocker-0.37 66
+MD5 64a5aa7a0bf4b46a83edf1b9361ef7bb files/digest-kxdocker-0.38 66
+MD5 93c158a428e555c9c380b5b4f63cee36 files/digest-kxdocker-0.39 66
+MD5 0c8a60f440cfb9d75d136c9e06b619d9 kxdocker-0.37.ebuild 651
+MD5 501b01b87cdcb9c8f8e5dff2c5cac1aa kxdocker-0.38.ebuild 651
+MD5 7f02c6ca06b5b201f7df728e560e4772 kxdocker-0.39.ebuild 912
+MD5 af0f2c1aa4185c52dd4f4ea588f22286 metadata.xml 349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDgGe/5mJXAu5GbtIRAqr2AJ0bd+rLEYt2iC4hpMe0vLKsZdNyFwCfRhxt
+kSAs35wbuZRioSC5VsmkEpo=
+=LLxZ
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/kxdocker/kxdocker-0.37.ebuild b/kde-misc/kxdocker/kxdocker-0.37.ebuild
index 64397a03afdd..d829c8f787f2 100644
--- a/kde-misc/kxdocker/kxdocker-0.37.ebuild
+++ b/kde-misc/kxdocker/kxdocker-0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-0.37.ebuild,v 1.1 2005/10/01 01:26:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-0.37.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/kxdocker/kxdocker-0.38.ebuild b/kde-misc/kxdocker/kxdocker-0.38.ebuild
index 379c8102c116..3e9daea2d941 100644
--- a/kde-misc/kxdocker/kxdocker-0.38.ebuild
+++ b/kde-misc/kxdocker/kxdocker-0.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/kde-misc/kxdocker/kxdocker-0.38.ebuild,v 1.1 2005/10/01 01:53:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-0.38.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/kxdocker/kxdocker-0.39.ebuild b/kde-misc/kxdocker/kxdocker-0.39.ebuild
index b129f20c5323..f9733253fc4e 100644
--- a/kde-misc/kxdocker/kxdocker-0.39.ebuild
+++ b/kde-misc/kxdocker/kxdocker-0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-0.39.ebuild,v 1.1 2005/11/20 00:28:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kxdocker/kxdocker-0.39.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.xiaprojects.com/www/downloads/files/kxdocker/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=kde-misc/kxdocker-resources-0.14"
diff --git a/kde-misc/metabar/ChangeLog b/kde-misc/metabar/ChangeLog
index 822319032664..97a6c7882591 100644
--- a/kde-misc/metabar/ChangeLog
+++ b/kde-misc/metabar/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for kde-misc/metabar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/ChangeLog,v 1.1 2005/04/05 17:59:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/ChangeLog,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
+
+  20 Jul 2005; David Holm <dholm@gentoo.org> metabar-0.8.ebuild:
+  Added to ~ppc.
+
+*metabar-0.8 (19 Jul 2005)
+
+  19 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +metabar-0.8.ebuild:
+  New version (#99267).
+
+  12 May 2005; Gregorio Guidi <greg_g@gentoo.org> metabar-0.7.ebuild:
+  Force arts to be enabled (#89941).
+
+  23 Apr 2005; Jason Wever <weeve@gentoo.org> metabar-0.7.ebuild:
+  Added ~sparc keyword.
 
 *metabar-0.7 (05 Apr 2005)
 
diff --git a/kde-misc/metabar/Manifest b/kde-misc/metabar/Manifest
index bf77907b4181..7091eb55c804 100644
--- a/kde-misc/metabar/Manifest
+++ b/kde-misc/metabar/Manifest
@@ -1,4 +1,6 @@
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 d037447cf1ceaf46cd523dd44eead419 ChangeLog 449
-MD5 9787e614d9f343a782c6562e79cca86b metabar-0.7.ebuild 682
+MD5 29bc9f34e376c5650dfcb50f229f0fea ChangeLog 854
+MD5 f0376e6426fe9fd5d520907262d42b46 metabar-0.7.ebuild 833
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 a6d23b9a8eb79bb6e90d5d0e07e1a562 metabar-0.8.ebuild 696
 MD5 e7ca82d62ed7be0b7a72c7c6fad010f2 files/digest-metabar-0.7 63
+MD5 f72587cee0737f72b18ad3eff6f06608 files/digest-metabar-0.8 63
diff --git a/kde-misc/metabar/metabar-0.7.ebuild b/kde-misc/metabar/metabar-0.7.ebuild
index 666fd607dd62..8c27747892fd 100644
--- a/kde-misc/metabar/metabar-0.7.ebuild
+++ b/kde-misc/metabar/metabar-0.7.ebuild
@@ -1,28 +1,37 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/metabar-0.7.ebuild,v 1.1 2005/04/05 17:59:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/metabar-0.7.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A sidebar plugin for konqueror."
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=21168"
 SRC_URI="mirror://sourceforge/metabar/${P}.tar.gz"
-SLOT="0"
-
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE=""
 
-DEPEND="|| ( kde-base/konqueror >=kde-base/kdebase-3.3 )"
+DEPEND="|| ( kde-base/konqueror >=kde-base/kdebase-3.4 )"
 
-need-kde 3.3
+need-kde 3.4
 
 S="${WORKDIR}/${PN}"
 
+pkg_setup() {
+	if ! use arts; then
+		eerror "${PN} needs USE=\"arts\" (and kdelibs compiled with USE=\"arts\")"
+		die
+	fi
+
+	kde_pkg_setup
+}
+
 pkg_postinst()
 {
 	echo
 	einfo "To use Metabar, run Konqueror, right-click the sidebar,"
-	einfo "and choose 'Add->Add Metabar'"
+	einfo "and choose 'Add New -> Metabar'."
 	echo
 }
diff --git a/kde-misc/metabar/metabar-0.8.ebuild b/kde-misc/metabar/metabar-0.8.ebuild
index 8cee2f72aa46..99bc9a0f2881 100644
--- a/kde-misc/metabar/metabar-0.8.ebuild
+++ b/kde-misc/metabar/metabar-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/kde-misc/metabar/metabar-0.8.ebuild,v 1.1 2005/07/19 14:21:11 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/metabar-0.8.ebuild,v 1.1.1.1 2005/11/30 09:57:13 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/metabar/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="|| ( kde-base/konqueror >=kde-base/kdebase-3.3 )"
diff --git a/kde-misc/metabar/metadata.xml b/kde-misc/metabar/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/metabar/metadata.xml
+++ b/kde-misc/metabar/metadata.xml
@@ -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/kde-misc/metadata.xml b/kde-misc/metadata.xml
index 59b3b2a04e80..76f684ae76bb 100644
--- a/kde-misc/metadata.xml
+++ b/kde-misc/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The kde-misc category contains various miscellaneous KDE packages.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie kde-misc enthält verschiedene KDE-Pakete.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría kde-misc contiene paquetes misceláneos de KDE.
+	</longdescription>
+	<longdescription lang="ja">
+		kde-baseカテゴリーにはKDEの多種多様なパッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De kde-misc categorie bevat allerlei pakketten voor KDE.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm kde-misc chứa các gói KDE linh tinh khác.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria kde-misc contiene vari pacchetti per KDE.
+	</longdescription>
 </catmetadata>
 
diff --git a/kde-misc/pwmanager/ChangeLog b/kde-misc/pwmanager/ChangeLog
index 98221476c134..3893949527b9 100644
--- a/kde-misc/pwmanager/ChangeLog
+++ b/kde-misc/pwmanager/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for kde-misc/pwmanager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/ChangeLog,v 1.1 2005/05/12 20:52:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/ChangeLog,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
+
+*pwmanager-1.2.4 (10 Nov 2005)
+
+  10 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +pwmanager-1.2.4.ebuild:
+  New version. Add support for i18n.
+
+  20 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> pwmanager-1.2.3.ebuild:
+  Stable on x86.
+
+  10 Aug 2005; Simon Stelling <blubb@gentoo.org> pwmanager-1.2.3.ebuild:
+  added ~amd64 keyword
+
+  16 Jul 2005; David Holm <dholm@gentoo.org> pwmanager-1.2.3.ebuild:
+  Added to ~ppc.
+
+*pwmanager-1.2.3 (16 Jul 2005)
+
+  16 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +pwmanager-1.2.3.ebuild:
+  New version.
 
 *pwmanager-1.2.1 (12 May 2005)
 
diff --git a/kde-misc/pwmanager/Manifest b/kde-misc/pwmanager/Manifest
index 2a258fd205c9..6fbe07c00431 100644
--- a/kde-misc/pwmanager/Manifest
+++ b/kde-misc/pwmanager/Manifest
@@ -1,4 +1,6 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 b8fcda5655374c4fafc0c081c9f10fa7 pwmanager-1.2.1.ebuild 1133
-MD5 10ea5d33659567fe342094ecad2a0417 ChangeLog 465
-MD5 0410721d08ca9413e6ddda547033e359 files/digest-pwmanager-1.2.1 68
+MD5 b810adc453553f577f375f34b436b1ff pwmanager-1.2.3.ebuild 1144
+MD5 d63d80da57cdc52d9416158a908b73e7 ChangeLog 1009
+MD5 bb1c5a9d15623c3409c6462d4c2ad5ac pwmanager-1.2.4.ebuild 1777
+MD5 43c58493312a9cb9a04ff820f0f8de67 files/digest-pwmanager-1.2.3 68
+MD5 bd97a5bace12e5b222e66941c7af4dfc files/digest-pwmanager-1.2.4 141
diff --git a/kde-misc/pwmanager/pwmanager-1.2.3.ebuild b/kde-misc/pwmanager/pwmanager-1.2.3.ebuild
index 3fb993a0a4df..f21743ca4762 100644
--- a/kde-misc/pwmanager/pwmanager-1.2.3.ebuild
+++ b/kde-misc/pwmanager/pwmanager-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/kde-misc/pwmanager/pwmanager-1.2.3.ebuild,v 1.1 2005/07/16 07:31:57 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/pwmanager-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:57:11 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/passwordmanager/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="smartcard"
 
 DEPEND="smartcard? ( sys-libs/libchipcard )
diff --git a/kde-misc/pwmanager/pwmanager-1.2.4.ebuild b/kde-misc/pwmanager/pwmanager-1.2.4.ebuild
index e8ce6d989abc..0fcdce8ca211 100644
--- a/kde-misc/pwmanager/pwmanager-1.2.4.ebuild
+++ b/kde-misc/pwmanager/pwmanager-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/kde-misc/pwmanager/pwmanager-1.2.4.ebuild,v 1.1 2005/11/10 15:27:33 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/pwmanager/pwmanager-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -23,7 +23,7 @@ LANGS_PKG=${PN}-i18n-${PV}
 LANGS="ca da de el es et fr hu it lt nl pl ro sv"
 
 for X in ${LANGS}; do
-        SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/passwordmanager/${LANGS_PKG}.tar.bz2 )"
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/passwordmanager/${LANGS_PKG}.tar.bz2 )"
 done
 
 src_compile() {
diff --git a/kde-misc/styleclock/ChangeLog b/kde-misc/styleclock/ChangeLog
index e81a6f92f8da..d3ee23f58717 100644
--- a/kde-misc/styleclock/ChangeLog
+++ b/kde-misc/styleclock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/styleclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/styleclock/ChangeLog,v 1.1 2005/01/15 17:24:10 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/styleclock/ChangeLog,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
+
+  30 May 2005; Marcus D. Hanwell <marcus@gentoo.org>
+  styleclock-0.5.1.ebuild:
+  Stable on amd64.
 
   10 Jan 2005; Dominik Stadler <centic@gentoo.org> :
   New package, fixes Bug 68297
diff --git a/kde-misc/styleclock/Manifest b/kde-misc/styleclock/Manifest
index c27fd08a3192..b7213083a840 100644
--- a/kde-misc/styleclock/Manifest
+++ b/kde-misc/styleclock/Manifest
@@ -1,4 +1,14 @@
-MD5 70d3e7b681a19e1a808cd6b8be7097ff styleclock-0.5.1.ebuild 502
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 69ad9cc045188241ffb2d6fb1b036603 ChangeLog 205
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13609c643b3e8e514a1e0c431c0069b3 styleclock-0.5.1.ebuild 607
+MD5 2422bcd42b58446594dc453012dbb2c5 ChangeLog 395
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 87d92f3b975e6bdf2e94b5f60dbe1421 files/digest-styleclock-0.5.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCml0XntT9W3vfTuoRApCYAJ91oSlcgkeJssYZj5ePM4EK5JeR+QCeInU3
+aR3LSp9OflIYfAzbzHkBGA0=
+=ataH
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/styleclock/metadata.xml b/kde-misc/styleclock/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/styleclock/metadata.xml
+++ b/kde-misc/styleclock/metadata.xml
@@ -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/kde-misc/styleclock/styleclock-0.5.1.ebuild b/kde-misc/styleclock/styleclock-0.5.1.ebuild
index 54c43ab56c17..f6ed4290a558 100644
--- a/kde-misc/styleclock/styleclock-0.5.1.ebuild
+++ b/kde-misc/styleclock/styleclock-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/kde-misc/styleclock/styleclock-0.5.1.ebuild,v 1.1 2005/01/15 17:24:10 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/styleclock/styleclock-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit kde eutils
 
@@ -11,6 +11,6 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 
 need-kde 3.2
diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog
index bf4e3de732c0..00461e608319 100644
--- a/kde-misc/tellico/ChangeLog
+++ b/kde-misc/tellico/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for kde-misc/tellico
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.1 2004/10/30 18:26:51 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+*tellico-1.0.2 (12 Oct 2005)
+
+  12 Oct 2005; Carsten Lohrke <carlo@gentoo.org> +tellico-1.0.2.ebuild:
+  version bump
+
+*tellico-1.0.1 (24 Sep 2005)
+
+  24 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +tellico-1.0.1.ebuild:
+  version bump
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> tellico-0.13.8.ebuild:
+  Stable on ppc.
+
+  22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> tellico-0.13.8.ebuild:
+  Stable on sparc
+
+  20 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> tellico-0.13.8.ebuild:
+  Stable on x86.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tellico-0.13.7.ebuild:
+  Stable on ppc.
+
+*tellico-0.13.8 (03 Jul 2005)
+
+  03 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +tellico-0.13.8.ebuild:
+  version bump
+
+  27 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tellico-0.13.7.ebuild:
+  Stable on sparc
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> tellico-0.13.7.ebuild:
+  stable on x86
+
+  06 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tellico-0.13.6.ebuild:
+  Stable on sparc
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tellico-0.13.6.ebuild:
+  Stable on ppc.
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org> tellico-0.13.6.ebuild:
+  stable on x86
+
+*tellico-0.13.7 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +tellico-0.13.7.ebuild:
+  New version.
+
+  26 Apr 2005; Jason Wever <weeve@gentoo.org> tellico-0.13.5.ebuild:
+  Stable on SPARC.
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> tellico-0.13.5.ebuild:
+  Stable on ppc.
+
+  14 Apr 2005; Carsten Lohrke <carlo@gentoo.org> tellico-0.13.5.ebuild,
+  tellico-0.13.6.ebuild:
+  corrected dependencies
+
+*tellico-0.13.6 (14 Apr 2005)
+
+  14 Apr 2005; Carsten Lohrke <carlo@gentoo.org> tellico-0.13.5.ebuild,
+  +tellico-0.13.6.ebuild:
+  0.13.5 stable on x86, version bump
+
+*tellico-0.13.5 (11 Mar 2005)
+
+  11 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +tellico-0.13.5.ebuild:
+  version bump
+
+*tellico-0.13.4 (01 Mar 2005)
+
+  01 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +tellico-0.13.4.ebuild:
+  version bump
+
+*tellico-0.13.3 (13 Feb 2005)
+
+  13 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +tellico-0.13.3.ebuild:
+  version bump
+
+  25 Jan 2005; Jason Wever <weeve@gentoo.org> tellico-0.13.1.ebuild:
+  Stable on sparc.
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> tellico-0.13.1.ebuild:
+  stable on x86
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> tellico-0.12.ebuild,
+  tellico-0.13.1.ebuild:
+  Changed dep on kdemultimedia to accept kdemultimedia-meta, the split 'meta'
+  package. This dep will be narrowed down in the future to the precise split
+  packages required.
+
+*tellico-0.13.1 (12 Dec 2004)
+
+  12 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +tellico-0.13.1.ebuild,
+  -tellico-0.13.ebuild:
+  version bump
+
+*tellico-0.13 (04 Dec 2004)
+
+  04 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +tellico-0.13.ebuild:
+  version bump
+
+  30 Nov 2004; Mike Doty <kingtaco@gentoo.org> tellico-0.12.ebuild:
+  ~amd64 keyword added per #65514
+
+  31 Oct 2004; Lars Weiler <pylon@gentoo.org> tellico-0.12.ebuild:
+  Stable on ppc as requested in bug #65514
+
+  30 Oct 2004; Jason Wever <weeve@gentoo.org> tellico-0.12.ebuild:
+  Stable on sparc wrt bug #65514
 
 *tellico-0.12 (30 Oct 2004)
 
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 9fd5f7c1de76..99ad769afaf2 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,3 +1,8 @@
-MD5 bfa5442b18207b124061c89e2e5d86ac tellico-0.12.ebuild 488
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 41b4021f4d3c931cbfa8fb1efd45580c files/digest-tellico-0.12 65
+MD5 0d39c979c44afe58b16f990e046767dd tellico-1.0.2.ebuild 737
+MD5 bdfaddba74fd3d4b7a0c3612a3cd029c tellico-1.0.1.ebuild 737
+MD5 08d89bdd9cf15f77618a9642179a81cc tellico-0.13.8.ebuild 639
+MD5 e8f3ccb1202ddc763a9d3a5cd37afcc8 ChangeLog 3548
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 5b60965cffd2a5573ce2f307d1be7757 files/digest-tellico-1.0.1 66
+MD5 6045fd6d740eb50cb2308f3bab5d31e3 files/digest-tellico-1.0.2 66
+MD5 31393b53f07a7c3549818f83deaf7347 files/digest-tellico-0.13.8 67
diff --git a/kde-misc/tellico/metadata.xml b/kde-misc/tellico/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/kde-misc/tellico/metadata.xml
+++ b/kde-misc/tellico/metadata.xml
@@ -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/kde-misc/tellico/tellico-0.13.8.ebuild b/kde-misc/tellico/tellico-0.13.8.ebuild
index 68b62efd4db5..de6b714f1e56 100644
--- a/kde-misc/tellico/tellico-0.13.8.ebuild
+++ b/kde-misc/tellico/tellico-0.13.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/kde-misc/tellico/tellico-0.13.8.ebuild,v 1.1 2005/07/03 17:40:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-0.13.8.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.periapsis.org/tellico/download/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="yaz"
 
 DEPEND=">=dev-libs/libxml2-2.4.23
@@ -19,4 +19,4 @@ DEPEND=">=dev-libs/libxml2-2.4.23
 	media-libs/taglib
 	yaz? ( dev-libs/yaz )"
 
-need-kde 3.2
\ No newline at end of file
+need-kde 3.2
diff --git a/kde-misc/tellico/tellico-1.0.1.ebuild b/kde-misc/tellico/tellico-1.0.1.ebuild
index ce99ebc61e91..1b9c14544fb2 100644
--- a/kde-misc/tellico/tellico-1.0.1.ebuild
+++ b/kde-misc/tellico/tellico-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/kde-misc/tellico/tellico-1.0.1.ebuild,v 1.1 2005/09/24 20:20:18 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/tellico/tellico-1.0.2.ebuild b/kde-misc/tellico/tellico-1.0.2.ebuild
index 36320c0d70c8..53bc40b54668 100644
--- a/kde-misc/tellico/tellico-1.0.2.ebuild
+++ b/kde-misc/tellico/tellico-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/kde-misc/tellico/tellico-1.0.2.ebuild,v 1.1 2005/10/12 14:05:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-misc/yakuake/ChangeLog b/kde-misc/yakuake/ChangeLog
index 58e891fd7220..0d440d4af47a 100644
--- a/kde-misc/yakuake/ChangeLog
+++ b/kde-misc/yakuake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/yakuake
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/ChangeLog,v 1.1 2005/10/16 16:11:13 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/ChangeLog,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
+
+*yakuake-2.7.3 (28 Oct 2005)
+
+  28 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> -yakuake-2.7.2.ebuild,
+  +yakuake-2.7.3.ebuild:
+  Version bump.
 
 *yakuake-2.7.2 (16 Oct 2005)
 
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index df612220e6a8..4ada838de202 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -1,3 +1,14 @@
-MD5 fd148a0b02d4c33850efad8f7dd05b63 files/digest-yakuake-2.7.2 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2fc82573a477282147927da31c2e6baa ChangeLog 595
+MD5 d3fe61d339a4df8b6191566fbdf7c725 files/digest-yakuake-2.7.3 66
 MD5 347e6648a3ba3fa79c7ebeb403703646 metadata.xml 504
-MD5 59cf57aaa1034ecfc5fb518067fe32a7 yakuake-2.7.2.ebuild 402
+MD5 e306be203a4c37783c8b5e4a664c6954 yakuake-2.7.3.ebuild 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDYhsantT9W3vfTuoRAtMxAKCMkkcJE1GQhxFly8lVsn6F40DV+ACfcUpx
+yUcLuH847ukDAb35sOvG9wM=
+=K3Mp
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/yakuake/yakuake-2.7.3.ebuild b/kde-misc/yakuake/yakuake-2.7.3.ebuild
index 28c4effdebb5..4743001bf280 100644
--- a/kde-misc/yakuake/yakuake-2.7.3.ebuild
+++ b/kde-misc/yakuake/yakuake-2.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/kde-misc/yakuake/yakuake-2.7.3.ebuild,v 1.1 2005/10/28 12:35:18 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.7.3.ebuild,v 1.1.1.1 2005/11/30 09:57:12 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-video/SDLcam/ChangeLog b/media-video/SDLcam/ChangeLog
index e72fead68612..f197b543e08e 100644
--- a/media-video/SDLcam/ChangeLog
+++ b/media-video/SDLcam/ChangeLog
@@ -1,10 +1,26 @@
 # ChangeLog for media-video/SDLcam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.1 2002/10/01 00:22:14 mkeadle Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/ChangeLog,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
+
+*SDLcam-0.7.3-r2 (14 Oct 2005)
+
+  14 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/SDLcam-0.7.3-prototypes.patch, +files/SDLcam-0.7.3-tsc.patch,
+  +SDLcam-0.7.3-r2.ebuild:
+  Add tsc fix by Tobias Klausmann #109161.
+
+*SDLcam-0.7.3-r1 (30 Jan 2004)
+
+  30 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Disable divx.so because it needs to be ported to newer avifile.
+  Fix installing of source modules #39782.  Also change the default
+  cflags of -g to the ones the user has.
 
 *SDLcam-0.7.3 (30 Sep 2002)
 
-  30 Sep 2002; Matt Keadle <mkeadle@gentoo.org> SDLcam-0.7.3.ebuild :
+  10 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  gcc3 patch #27535.
 
+  30 Sep 2002; Matt Keadle <mkeadle@gentoo.org> SDLcam-0.7.3.ebuild :
   SDLcam was in portage, then it went missing, now it's back. This
   version cures past issues with gcc3.x.
diff --git a/media-video/SDLcam/Manifest b/media-video/SDLcam/Manifest
index e69de29bb2d1..5e9f98e0a456 100644
--- a/media-video/SDLcam/Manifest
+++ b/media-video/SDLcam/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 afb9134e4f2a677d88851973c1a88dab ChangeLog 974
+MD5 7b80507b7eb8ac2429c56569cd60cc3d SDLcam-0.7.3-r1.ebuild 1517
+MD5 683da4b3fc1258de05b95134b1a43471 SDLcam-0.7.3-r2.ebuild 1626
+MD5 2357ecf5188cac42c1b2d985a8f4a036 files/0.7.3-gcc3.patch 3271
+MD5 eb83f71dceccfba016349f3f2cf22538 files/0.7.3-linux-2.6.patch 517
+MD5 a523b1e156a6131b8713b7d1e1206d9b files/0.7.3-no-divx.patch 395
+MD5 f0dcf5387852f05d423f26f645d4df43 files/SDLcam-0.7.3-prototypes.patch 1045
+MD5 6a6efe94d07cda44c908c7cf8fcfcc2a files/SDLcam-0.7.3-tsc.patch 1172
+MD5 0c1ad55a2817e3ef4a1141f8ba9ccefb files/digest-SDLcam-0.7.3-r1 64
+MD5 0c1ad55a2817e3ef4a1141f8ba9ccefb files/digest-SDLcam-0.7.3-r2 64
+MD5 9c86830b089cab3e08a1f927b14d78b9 metadata.xml 579
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTv39gIKl8Uu19MoRAgyoAJwLm2SMaAxZndF08+u/N/5UxVH3igCfX3Or
+lly6fz7IlMvV0kNxMLCEs/w=
+=oNwr
+-----END PGP SIGNATURE-----
diff --git a/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild b/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild
index 8796816d7400..d0df5e7fbb69 100644
--- a/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild
+++ b/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild,v 1.1 2004/01/30 09:40:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Webcam application that uses the SDL library"
-HOMEPAGE="http://raph.darktech.org/SDLcam/"
-SRC_URI="http://raph.darktech.org/SDLcam/downloads/${P}.tar.gz"
+HOMEPAGE="http://sdlcam.raphnet.net/"
+SRC_URI="http://sdlcam.raphnet.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="dev-libs/libxml2
+	media-libs/libfame
 	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-ttf"
@@ -25,7 +27,7 @@ src_unpack() {
 	rm capture/divx.c   # the divx.so needs to be ported to newer avifile
 	epatch ${FILESDIR}/${PV}-linux-2.6.patch
 	sed -i "s: -g: ${CFLAGS} `avifile-config --cflags`:" Makefile
-	sed -i "/#include/s:avifile/::" capture/divx2.cpp 
+	sed -i "/#include/s:avifile/::" capture/divx2.cpp
 
 	# Don't you love hardcoded vars?
 	sed -i \
@@ -39,14 +41,14 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
-	dobin SDLcam
+src_install() {
+	dobin SDLcam || die
 	insinto /usr/share/SDLcam
-	doins LucidaSansRegular.ttf LucidaTypewriterRegular.ttf SDLcam.xml SDLcam.cfg
+	doins LucidaSansRegular.ttf LucidaTypewriterRegular.ttf SDLcam.xml SDLcam.cfg || die
 	insinto /usr/lib/SDLcam/filters
-	doins filter/*.so
+	doins filter/*.so || die
 	insinto /usr/lib/SDLcam/capture
-	doins capture/*.so
+	doins capture/*.so || die
 	insinto /usr/lib/SDLcam/sources
-	doins sources/*.so
+	doins sources/*.so || die
 }
diff --git a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild b/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild
index 744412b9c4e8..c62806c493ed 100644
--- a/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild
+++ b/media-video/SDLcam/SDLcam-0.7.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-video/SDLcam/SDLcam-0.7.3-r2.ebuild,v 1.1 2005/10/14 00:36:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/SDLcam/SDLcam-0.7.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/acidrip/ChangeLog b/media-video/acidrip/ChangeLog
index 5d372b667c20..f0207774f538 100644
--- a/media-video/acidrip/ChangeLog
+++ b/media-video/acidrip/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for media-video/acidrip
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.1 2003/03/11 10:11:05 vladimir Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> acidrip-0.14.ebuild:
+  Remove glade-perl dependency as per bug #97066.
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> acidrip-0.14.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  14 Aug 2005; Carsten Lohrke <carlo@gentoo.org> acidrip-0.14.ebuild:
+  Fixed homepage url.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  26 Nov 2004; Chris White <chriswhite@gentoo.org> -acidrip-0.10.ebuild,
+  -acidrip-0.11.ebuild, -acidrip-0.12.ebuild:
+  old ebuild cleanup.
+
+*acidrip-0.14 (18 Oct 2004)
+
+  18 Oct 2004; Luca Barbato <lu_zero@gentoo.org> +acidrip-0.14.ebuild:
+  New version
+
+  05 Sep 2004; Malcolm Lashley <malc@gentoo.org> acidrip-0.12.ebuild:
+  ~amd64 bug #60354
+
+*acidrip-0.12 (18 Aug 2004)
+
+  18 Aug 2004; Chris White <chriswhite@gentoo.org> +acidrip-0.12.ebuild:
+  Version bump to 0.12. Thanks to Peter Rob <peter@newproject.pl> for email
+  report.
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added myself as primary maintainer.
+
+*acidrip-0.11 (25 Nov 2003)
+
+  25 Nov 2003; Martin Holzer <mholzer@gentoo.org> acidrip-0.11.ebuild:
+  Version bumped. Closes #33618.
+
+  24 Nov 2003; Martin Holzer <mholzer@gentoo.org> acidrip-0.10.ebuild:
+  updating depend
+
+*acidrip-0.10 (18 Nov 2003)
+
+  18 Nov 2003; Martin Holzer <mholzer@gentoo.org> acidrip-0.10.ebuild:
+  Version bumped.
+
+  18 Nov 2003; Martin Holzer <mholzer@gentoo.org> acidrip-0.7.ebuild,
+  acidrip-0.8.ebuild, acidrip-0.9.ebuild:
+  added RESTRICT="nomirror"
+
+  30 Jul 2003; Michael Cummings <mcummings@gentoo.org> acidrip-0.9.ebuild:
+  Bug 22671 - vapier found the fix - should work again
+
+*acidrip-0.9 (11 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*acidrip-0.8 (22 Mar 2003)
+
+  30 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> acidrip-0.8.ebuild:
+  added dep for dev-perl/gtk-perl-glade
+
+  22 Mar 2003; Graham Forest <vladimir@gentoo.org> acidrip-0.8.ebuild:
+  Version bump
 
 *acidrip-0.7 (05 Mar 2003)
 
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
index e69de29bb2d1..d7c2b0301aad 100644
--- a/media-video/acidrip/Manifest
+++ b/media-video/acidrip/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fcf2644beaa89cc41408c4f0a990a9ad ChangeLog 2382
+MD5 05e6bb7af016e3b5c28e714c3dba8f82 acidrip-0.14.ebuild 862
+MD5 8975d2ef7a7d50d426d4273702df56ea files/digest-acidrip-0.14 63
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZVVUj5H05b2HAEkRAuAsAJ9EnI99oOAfI2ZvDA/YuVneNJCoegCfRn2/
+D+Mxn7EYl6RCmiDBqJ8OGQo=
+=vukV
+-----END PGP SIGNATURE-----
diff --git a/media-video/acidrip/acidrip-0.14.ebuild b/media-video/acidrip/acidrip-0.14.ebuild
index 2401d76c7de6..b02c729e5c48 100644
--- a/media-video/acidrip/acidrip-0.14.ebuild
+++ b/media-video/acidrip/acidrip-0.14.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14.ebuild,v 1.1 2004/10/18 21:27:18 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
 inherit perl-module
 
 DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
-HOMEPAGE="http://acidrip.thirtythreeandathird.net"
+HOMEPAGE="http://untrepid.com/acidrip/"
 SRC_URI="mirror://sourceforge/acidrip/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
@@ -15,7 +15,6 @@ IUSE="encode"
 
 DEPEND="dev-lang/perl
 		dev-perl/gtk2-perl
-		dev-perl/glade-perl
 		>=media-video/lsdvd-0.10
 		media-video/mplayer
 		encode? ( >=media-sound/lame-3.92 )"
@@ -33,6 +32,5 @@ src_compile() {
 src_install() {
 	perl-module_src_install
 	#dobin acidrip
-	dodoc INSTALL CHANGELOG COPYING TODO
-	dohtml INSTALL.html
+	dodoc CHANGELOG TODO
 }
diff --git a/media-video/acidrip/metadata.xml b/media-video/acidrip/metadata.xml
index 1cadc2e4ec21..d9df1878d8e2 100644
--- a/media-video/acidrip/metadata.xml
+++ b/media-video/acidrip/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
-<maintainer>
-  <email>media-video@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index 995731b052d1..dde20e158f1b 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for media-video/alevt
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.1 2002/04/23 15:52:01 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
+
+  29 Jul 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/alevt-1.6.1-gcc4.patch, alevt-1.6.1-r1.ebuild:
+  Patch against gcc4 trouble, see bug #100587
+
+*alevt-1.6.1-r1 (27 Jul 2005)
+
+  27 Jul 2005; Patrick Kursawe <phosphan@gentoo.org> +alevt-1.6.1-r1.ebuild,
+  alevt-1.6.1.ebuild:
+  Adding DVB patch (bug #58746)
+
+  27 Jul 2005; Patrick Kursawe <phosphan@gentoo.org> alevt-1.6.1.ebuild:
+  1.6.1 considered stable for x86
+
+  17 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> alevt-1.6.1.ebuild:
+  generall cleanups, suggested by Diego Pettenò <dgp85@users.sourceforge.net>.
+  fixes #81803
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> alevt-1.6.1.ebuild:
+  Readding to ~amd64.  Added to ~sparc.
+
+  15 Nov 2004; Patrick Kursawe <phosphan@gentoo.org> +files/xio_timer.patch,
+  alevt-1.6.0-r3.ebuild, alevt-1.6.1.ebuild:
+  Applying user-provided patch for gcc 3.4 problems (bug #70992), declaring
+  latest version stable.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> alevt-1.6.0-r3.ebuild,
+  alevt-1.6.1.ebuild:
+  Trimmed trailing whitespace.
+
+  08 Jun 2004; Aron Griffis <agriffis@gentoo.org> alevt-1.6.0-r3.ebuild:
+  Fix use invocation
+
+  13 May 2004; David Holm <dholm@gentoo.org> alevt-1.6.1.ebuild:
+  Added to ~ppc.
+
+*alevt-1.6.1 (12 May 2004)
+
+  12 May 2004; Patrick Kursawe <phosphan@gentoo.org> alevt-1.6.1.ebuild,
+  files/alevt-1.6.1-gentoo.diff:
+  Version bump, see bug #45836
+  Added another SRC_URI, the tarball seems to be about the same the debian guys
+  use.
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> alevt-1.6.0-r3.ebuild:
+  added ~amd64 keyword
+
+*alevt-1.6.0-r3 (09 Jul 2002)
+
+  09 Jul 2002; Seemant Kulleen <seemant@gentoo.org> alevt-1.6.0-r3.ebuild
+  files/alevt.desktop files/digest-alevt-1.6.0-r3 :
+
+  This now adds icons and a menu entry for Gnome2 users.
+
+*alevt-1.6.0-r2 (03 Jul 2002)
+
+  03 Jul 2002; Seemant Kulleen <seemant@gentoo.org> alevt-1.6.0-r2.ebuild
+  files/digest-alevt-1.6.0-r2 :
+
+  twanger@bluetwanger.de (Markus Bertheau) submitted this a loooong time ago
+  in bug #1657.  This is actually a cleaner ebuild, and he patched it to
+  work with emake.
+
+*alevt-1.6.0-r1 (28 Jun 2002)
+
+  28 Jun 2002; Seemant Kulleen <seemant@gentoo.org> alevt-1.6.0-r1.ebuild
+  files/digest-alevt-1.6.0-r1 :
+
+  LFH/man page fixes and emake fixes (needs just make)
 
 *alevt-1.6.0 (23 Apr 2002)
 
diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest
index e69de29bb2d1..92bc16040266 100644
--- a/media-video/alevt/Manifest
+++ b/media-video/alevt/Manifest
@@ -0,0 +1,13 @@
+MD5 71800b30685d4cede4910d9706b0b9a4 alevt-1.6.1-r1.ebuild 1176
+MD5 efb04d47b0c9e0a1c96e9462aad5ea18 alevt-1.6.1.ebuild 1057
+MD5 05cc8edacedcc7e918ad06583c58fbac alevt-1.6.0-r3.ebuild 955
+MD5 e547fae4c527896b6da7600444dade9b ChangeLog 2658
+MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
+MD5 9a3fcfb347b9abd5f81f793a18727c86 files/xio_timer.patch 382
+MD5 2eee39ac17210c63326ffee22c2cffb1 files/alevt.desktop 159
+MD5 4b33a59a4f04a8a1edaf6d18f71e7101 files/digest-alevt-1.6.1 63
+MD5 9b2908a22bc1aeee2713dd6447f077e4 files/alevt-1.6.0-gentoo.diff 1430
+MD5 55d9505c13b404139c9f9b2111482ca3 files/digest-alevt-1.6.0-r3 63
+MD5 009c3ba83c0f16b20b2066f15fbe295e files/digest-alevt-1.6.1-r1 122
+MD5 1386e3fc0925198ef09da46956f42d0d files/alevt-1.6.1-gcc4.patch 658
+MD5 8c88e060926481334f381229aa9c85c5 files/alevt-1.6.1-gentoo.diff 734
diff --git a/media-video/alevt/alevt-1.6.0-r3.ebuild b/media-video/alevt/alevt-1.6.0-r3.ebuild
index 60ba4bd67344..847839fe8b10 100644
--- a/media-video/alevt/alevt-1.6.0-r3.ebuild
+++ b/media-video/alevt/alevt-1.6.0-r3.ebuild
@@ -1,48 +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-video/alevt/alevt-1.6.0-r3.ebuild,v 1.1 2002/07/09 09:21:00 seemant Exp $ 
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
 
 DESCRIPTION="Teletext viewer for X11"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz"
 HOMEPAGE="http://www.goron.de/~froese/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz"
+
 SLOT="0"
+KEYWORDS="x86 ~amd64"
+IUSE="gnome"
 LICENSE="GPL-2"
-KEYWORDS="x86"
 
-DEPEND=">=x11-base/xfree-4.0.1
+DEPEND="virtual/x11
 	>=media-libs/libpng-1.0.12"
-	
-
-LICENSE="GPL-2"
 
 src_unpack() {
-
 	unpack ${P}.tar.gz
-	cd ${WORKDIR}
-
-	# Parallel make patch
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-
+	epatch ${FILESDIR}/${P}-gentoo.diff # Parallel make patch
+	epatch ${FILESDIR}/xio_timer.patch
 }
 
 src_compile() {
-	
 	emake || die
-
 }
 
-src_install () {
-
+src_install() {
 	dobin alevt alevt-cap alevt-date
 	doman alevt.1x alevt-date.1 alevt-cap.1
 	dodoc CHANGELOG COPYRIGHT README
 
-	use gnome && ( \
+	if use gnome ; then
 		insinto /usr/share/pixmaps
 		newins contrib/mini-alevt.xpm alevt.xpm
 		insinto /usr/share/applications
 		doins ${FILESDIR}/alevt.desktop
-	)
+	fi
 }
diff --git a/media-video/alevt/alevt-1.6.1-r1.ebuild b/media-video/alevt/alevt-1.6.1-r1.ebuild
index dbf9eed6bdc7..4b7a4cb86978 100644
--- a/media-video/alevt/alevt-1.6.1-r1.ebuild
+++ b/media-video/alevt/alevt-1.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/media-video/alevt/alevt-1.6.1-r1.ebuild,v 1.1 2005/07/27 08:22:19 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	sed -i -e "s:^OPT=.*:OPT = ${CFLAGS} -s:" Makefile
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gcc4.patch
 	epatch ${DISTDIR}/${PN}-dvb.patch
 }
 
diff --git a/media-video/alevt/alevt-1.6.1.ebuild b/media-video/alevt/alevt-1.6.1.ebuild
index e55634bc7001..a5195f776ed2 100644
--- a/media-video/alevt/alevt-1.6.1.ebuild
+++ b/media-video/alevt/alevt-1.6.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1.ebuild,v 1.1 2004/05/12 11:33:45 phosphan Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.1.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Teletext viewer for X11"
 HOMEPAGE="http://www.goron.de/~froese/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz
-	http://fresh.t-systems-sfr.com/linux/src/${P}.tar.gz"
+	 http://fresh.t-systems-sfr.com/linux/src/${P}.tar.gz"
 
-IUSE="gnome"
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND="virtual/x11
 	>=media-libs/libpng-1.0.12"
@@ -33,10 +33,10 @@ src_install() {
 	doman alevt.1x alevt-date.1 alevt-cap.1
 	dodoc CHANGELOG COPYRIGHT README
 
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins contrib/mini-alevt.xpm alevt.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/alevt.desktop
-	fi
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins contrib/mini-alevt.xpm alevt.xpm
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins contrib/icon48x48.xpm alevt.xpm
+
+	make_desktop_entry alevt "AleVT" alevt
 }
diff --git a/media-video/alevt/metadata.xml b/media-video/alevt/metadata.xml
index 1cadc2e4ec21..6e1d55b1eb69 100644
--- a/media-video/alevt/metadata.xml
+++ b/media-video/alevt/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>video</herd>
 <maintainer>
-  <email>media-video@gentoo.org</email>
+  <email>phosphan@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-video/asfrecorder/ChangeLog b/media-video/asfrecorder/ChangeLog
index 0f2a8288e48e..a9933527d9ce 100644
--- a/media-video/asfrecorder/ChangeLog
+++ b/media-video/asfrecorder/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for media-video/asfrecorder
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/asfrecorder/ChangeLog,v 1.1 2002/11/16 18:53:37 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/asfrecorder/ChangeLog,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
+
+  29 Oct 2005; Fabian Groffen <grobian@gentoo.org> asfrecorder-1.1.ebuild:
+  Marked ~ppc-macos (bug #107932)
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> asfrecorder-1.1.ebuild:
+  Added to ~ppc.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> asfrecorder-1.1.ebuild:
+  Moved to use toolchain-funcs eclass.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  08 Jan 2005; Chris White <chriswhite@gentoo.org> asfrecorder-1.1.ebuild:
+  Fixing Bug #69831.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.  Taking over as maintainer.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  asfrecorder-1.1.ebuild:
+  virtual/glibc -> virtual/libc
 
 *asfrecorder-1.1 (16 Nov 2002)
 
diff --git a/media-video/asfrecorder/Manifest b/media-video/asfrecorder/Manifest
index e69de29bb2d1..eaa647c1741e 100644
--- a/media-video/asfrecorder/Manifest
+++ b/media-video/asfrecorder/Manifest
@@ -0,0 +1,4 @@
+MD5 d060c767a2b819eb6fbaa3921fe9a938 asfrecorder-1.1.ebuild 905
+MD5 01479f8d09987c0b41389926b3f92b5c ChangeLog 1238
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 fe471e385d94bb62aff194ad8f541441 files/digest-asfrecorder-1.1 60
diff --git a/media-video/asfrecorder/asfrecorder-1.1.ebuild b/media-video/asfrecorder/asfrecorder-1.1.ebuild
index 697dc1b66222..1d0d5876e23c 100644
--- a/media-video/asfrecorder/asfrecorder-1.1.ebuild
+++ b/media-video/asfrecorder/asfrecorder-1.1.ebuild
@@ -1,26 +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-video/asfrecorder/asfrecorder-1.1.ebuild,v 1.1 2002/11/16 18:53:37 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/asfrecorder/asfrecorder-1.1.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
-IUSE=""
+inherit toolchain-funcs
 
 MY_PN="${PN/asfr/ASFR}"
 DESCRIPTION="ASFRecorder - Download Windows Media Streaming files"
-HOMEPAGE="http://sourceforge.net/projects/${P}/"
+HOMEPAGE="http://sourceforge.net/projects/asfrecorder/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
+
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~ppc-macos x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${MY_PN}"
+S=${WORKDIR}/${MY_PN}
 
 src_compile() {
 	# There is a Makefile, but it only works for Cygwin, so we
 	# only compile this single program.
 	cd ${S}/source
-	gcc -o asfrecorder ${CXXFLAGS} asfrecorder.c || die "Build failed"
+	$(tc-getCC) -o asfrecorder ${CFLAGS} asfrecorder.c || die "Build failed"
 }
 
 src_install () {
diff --git a/media-video/asfrecorder/metadata.xml b/media-video/asfrecorder/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/asfrecorder/metadata.xml
+++ b/media-video/asfrecorder/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/ati-gatos/ChangeLog b/media-video/ati-gatos/ChangeLog
index a5a7d76409ba..6940b4629c4a 100644
--- a/media-video/ati-gatos/ChangeLog
+++ b/media-video/ati-gatos/ChangeLog
@@ -1,6 +1,76 @@
 # ChangeLog for media-video/ati-gatos
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ChangeLog,v 1.1 2002/04/05 21:15:33 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ChangeLog,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  19 Jan 2005; Bryan Stine <battousai@gentoo.org> -ati-gatos-4.3.0.ebuild:
+  Nuke ati-gatos-4.3.0. XFree 4.3, upon which this depends, is no longer in
+  portage.
+
+  23 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/ati-gatos-4.4.0-prototypes.patch, ati-gatos-4.4.0.ebuild:
+  Patch to fix compiling with gcc-3.4.x.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; ati-gatos-4.4.0.ebuild:
+  Update XFree references to Xorg.
+
+*ati-gatos-4.4.0 (30 Sep 2004)
+
+  30 Sep 2004; Bryan Stine <battousai@gentoo.org>; +ati-gatos-4.4.0.ebuild:
+  Version bump to xorg-ready ati.4.4.0. This ebuild also includes a patch to
+  apply when using xorg-x11 6.8.0.
+
+  11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; ati-gatos-4.3.0.ebuild:
+  xfree -r6 became -r7.
+
+  21 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; ati-gatos-4.3.0.ebuild:
+  Add check for xfree version.
+
+  14 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; ati-gatos-4.3.0.ebuild:
+  Change dep to xfree-4.3.0-r6, another security fix in -r5.
+
+  09 Feb 2004; Bryan Stine <battousai@gentoo.org>; ati-gatos-4.3.0.ebuild:
+  Change xfree dependency to 4.3.0-r5, reflecting new release plan.
+
+  08 Feb 2004; <bryan@gentoo.org> ati-gatos-4.3.0.ebuild:
+  Now depends on xfree >=4.3.0-r4 for the gatos-SDK patch
+
+  05 Feb 2004; Bryan Stine <battousai@gentoo.org>; :
+  Fix globbing in xfree sdk USE detection. If sdk was in USE when emerging
+  xfree-drm, this would catch that and accept it, which would allow it to
+  install without an actual SDK present.
+
+*ati-gatos-4.3.0 (13 Jan 2004)
+
+  15 Jan 2004; Bryan Stine <battousai@gentoo.org> ati-gatos-4.3.0.ebuild:
+  Add quotes around the ModulePath example paths to avoid confusion.
+
+  13 Jan 2004; <battousai@gentoo.org> ChangeLog, ati-gatos-4.3.0.ebuild:
+  Warn user about SDK only if XFree was merged without the sdk USE flag. Also,
+  fix the SRC_URI, making it use the Gentoo mirrors.
+
+  13 Jan 2004; <battousai@gentoo.org> ati-gatos-4.3.0.ebuild:
+  Updated ebuild. This will build against xfree 4.3.0 with the sdk installed,
+  putting drivers in an alternate location so as not to interfere with the
+  original ati drivers.
+
+  18 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  ati-gatos-4.2.0.11-r1.ebuild:
+  added RESTRICT="nomirror"
+
+*ati-gatos-4.2.0.11-r1 (19 August 2002)
+
+  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, ati-gatos-4.2.0.11-r1.ebuild :
+
+  Added -ppc to the keywords.
+
+*ati-gatos-4.2.0.11-r1 (3 Jun 2002)
+
+  3 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Resolve bug #1947.
 
 *ati-gatos-4.2.0.11 (5 Apr 2002)
 
diff --git a/media-video/ati-gatos/Manifest b/media-video/ati-gatos/Manifest
index e69de29bb2d1..eefd3d202f21 100644
--- a/media-video/ati-gatos/Manifest
+++ b/media-video/ati-gatos/Manifest
@@ -0,0 +1,6 @@
+MD5 86abdeee91821be6e1e1e9fa49e8b5c0 ChangeLog 3087
+MD5 5fe70a037aa372f569d20caf624642ec ati-gatos-4.4.0.ebuild 2406
+MD5 6b90d73762a470bdd83a43fe8840a7d9 metadata.xml 345
+MD5 f0a4b78e9cfa26b4ffdf829e000d0459 files/ati-gatos-4.4.0-new-xorg.patch 10854
+MD5 ee56241b288c93ecd41472ee630a1ace files/digest-ati-gatos-4.4.0 77
+MD5 21b46c970264da1f4d614d8357e56336 files/ati-gatos-4.4.0-prototypes.patch 1100
diff --git a/media-video/ati-gatos/ati-gatos-4.4.0.ebuild b/media-video/ati-gatos/ati-gatos-4.4.0.ebuild
index bc2a7142d752..25ff41f37b0b 100644
--- a/media-video/ati-gatos/ati-gatos-4.4.0.ebuild
+++ b/media-video/ati-gatos/ati-gatos-4.4.0.ebuild
@@ -1,28 +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-video/ati-gatos/ati-gatos-4.4.0.ebuild,v 1.1 2004/09/30 22:17:01 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ati-gatos-4.4.0.ebuild,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
 
 inherit eutils
 
-IUSE=""
-
 SNAPSHOT=20040930
 MYP=${P}-${SNAPSHOT}
 
-DESCRIPTION="ATI Multimedia-capable drivers for XFree86"
-SRC_URI="mirror://gentoo/${MYP}.tar.bz2"
+DESCRIPTION="ATI Multimedia-capable drivers for Xorg"
 HOMEPAGE="http://gatos.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MYP}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
-DEPEND="${DEPEND}
-	>=x11-base/xorg-x11-6.7.0-r1"
+DEPEND=">=x11-base/xorg-x11-6.7.0-r1"
 
 pkg_setup() {
-	if [ ! "`grep sdk /var/db/pkg/x11-base/xorg-x11-[0-9]*/USE`" ]
-	then
+	if ! built_with_use x11-base/xorg-x11 sdk ; then
 		ewarn "This package requires that xorg-x11 was merged with the sdk USE flag enabled."
 		die "Please merge xorg-x11 with the sdk USE flag enabled."
 	fi
@@ -32,13 +29,14 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if has_version '>=x11-base/xorg-x11-6.7.99*'
-	then
+	if has_version '>=x11-base/xorg-x11-6.7.99*' ; then
 		einfo "Patching ati-gatos for use with >=x11-base/xorg-x11-6.7.99"
 		epatch ${FILESDIR}/${P}-new-xorg.patch
 	fi
 
-	# Build makefiles against XFree SDK
+	epatch ${FILESDIR}/${P}-prototypes.patch
+
+	# Build makefiles against Xorg SDK
 	imake -I/usr/X11R6/lib/Server/config/cf -DUseInstalled -DXF86DriverSDK
 
 	# Makefile fixes
@@ -56,14 +54,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "To have XFree86 make use of the new GATOS modules, you should add the following"
+	einfo "To have Xorg make use of the new GATOS modules, you should add the following"
 	einfo "line to /etc/X11/XF86Config, in the files section and above any other"
 	einfo "ModulePath directives:"
 	einfo
 	einfo "      ModulePath \"/usr/X11R6/lib/modules-extra/gatos\""
 	einfo
 	einfo "Please note that you may need to uncomment or add another ModulePath line with"
-	einfo "the default module path in it. If XFree86 does not start after adding the line"
+	einfo "the default module path in it. If Xorg does not start after adding the line"
 	einfo "above, add this one under it:"
 	einfo
 	einfo "      ModulePath \"/usr/X11R6/lib/modules\""
@@ -72,7 +70,7 @@ pkg_postinst() {
 fix_makefile() {
 	cp Makefile Makefile.orig
 
-	# Add the XFree86 SDK include directories that gatos will use
+	# Add the Xorg SDK include directories that gatos will use
 	sed -i -e "s:\ *INCLUDES = \(.\+\):INCLUDES = \\1 -I/usr/X11R6/lib/Server/include -I/usr/X11R6/lib/Server/include/extensions:" Makefile
 
 	# Clean up the ugly sandbox violations
diff --git a/media-video/ati-gatos/metadata.xml b/media-video/ati-gatos/metadata.xml
index 72cb6bccefda..a7c0c98a0ea8 100644
--- a/media-video/ati-gatos/metadata.xml
+++ b/media-video/ati-gatos/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>xfree</herd>
+<herd>X11-drivers</herd>
 <maintainer>
-  <email>lu_zero@gentoo.org</email>
+  <email>battousai@gentoo.org</email>
 </maintainer>
+<longdescription>GATOS provides tuning and capture capabilities to ATI cards with those features.</longdescription>
 </pkgmetadata>
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 5fead5e83837..657f56660b91 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,452 @@
 # ChangeLog for media-video/avidemux
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.1 2002/10/25 19:01:47 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.1.1.1 2005/11/30 09:57:41 chriswhite Exp $
+
+  04 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avidemux-2.1_pre1.ebuild:
+  Bump requirement of spidermonkey to a version that actually provide jsapi.h.
+  See bug #111445. Move flags filtering in pkg_setup in the mean time.
+
+*avidemux-2.0.42-r1 (03 Sep 2005)
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -avidemux-2.0.42.ebuild, +avidemux-2.0.42-r1.ebuild:
+  Added patch to fix hangs during export of JPEG sequences. Thanks to Alexey
+  Drobiyan in bug #104013.
+
+  30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/2.0.38_rc2-fix-faad.patch, -avidemux-2.0.38.ebuild,
+  -avidemux-2.0.38-r1.ebuild, -avidemux-2.0.40.ebuild,
+  -avidemux-2.0.40-r1.ebuild:
+  Removed extra versions, leaving 2.1 pre, 2.0.24 (stable) and 2.0.42 (target
+  stable?).
+
+*avidemux-2.1_pre1 (22 Aug 2005)
+
+  22 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.1_pre1.ebuild:
+  Added pre version of Avidemux 2.1, with heavy patching. Need quite a bit of
+  testing.
+
+  08 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
+  Added patch to respect CXXFLAGS.
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
+  Use fixheadtails eclass to fix non-POSIX head calls.
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.42.ebuild:
+  Updated patchlevel with PIC/__PIC__ patch.
+
+*avidemux-2.0.42 (23 Jul 2005)
+
+  23 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.42.ebuild:
+  New upstream version. Closes #99984.
+
+  29 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avidemux-2.0.40-r1.ebuild:
+  Now install icon and .desktop file for Avidemux2.
+
+*avidemux-2.0.40-r1 (26 May 2005)
+
+  26 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.40-r1.ebuild:
+  New revision to cope with latest faad2 API changes.
+
+  25 May 2005; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.38.ebuild,
+  avidemux-2.0.38-r1.ebuild, avidemux-2.0.40.ebuild:
+  Added a check to avoid compiling without audio devices (make the compilation
+  fail). Closes #93943.
+
+*avidemux-2.0.40 (25 May 2005)
+
+  25 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -avidemux-2.0.36.ebuild, -avidemux-2.0.38_rc2.ebuild,
+  -avidemux-2.0.38_rc2-r1.ebuild, -avidemux-2.0.38_rc3-r1.ebuild,
+  +avidemux-2.0.40.ebuild:
+  New upstream version, removed some old versions.
+
+*avidemux-2.0.38-r1 (18 May 2005)
+
+  18 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.38-r1.ebuild:
+  Added the two patches from upstream for latest version.
+
+*avidemux-2.0.38 (14 May 2005)
+
+  14 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.38.ebuild:
+  New upstream version, out of rc. Removed mmx useflag as upstream removed
+  --enable-mmx and just enable it at runtime if found. Patchset updated as
+  needed.
+
+  12 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avidemux-2.0.38_rc3-r1.ebuild:
+  Added patch which should fix bug #89356.
+
+*avidemux-2.0.38_rc3-r1 (07 May 2005)
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -avidemux-2.0.38_rc3.ebuild, +avidemux-2.0.38_rc3-r1.ebuild:
+  Removed faad patch as faad2-2.0-r6 broken the build. Fixes #91799.
+
+*avidemux-2.0.38_rc3 (02 May 2005)
+
+  02 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.38_rc3.ebuild:
+  New upstream version. Updated patchset for new version.
+
+  01 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/2.0.38_rc1_mpegidentify.patch,
+  -files/avidemux-0.9-libxml2.5.7.patch,
+  -files/avidemux-2.0.30_amd64_cpuutil.patch,
+  -files/avidemux-2.0.30_fixes.patch,
+  -files/avidemux-2.0.32_mpeg_ps_fix.patch,
+  -files/avidemux-2.0.34-test1_faac.patch,
+  -files/avidemux-2.0.38_rc2-aclocal.patch, -files/alsa.patch,
+  -files/gcc2.patch, -files/avidemux-2.0.38_rc2-mmx_altivec.patch,
+  -files/patch_jpeg.diff, -files/resize_crash.patch, -files/xvid.patch,
+  -avidemux-2.0.34_rc1.ebuild, -avidemux-2.0.34_rc1-r1.ebuild,
+  -avidemux-2.0.34_rc2.ebuild, -avidemux-2.0.38_rc1.ebuild,
+  avidemux-2.0.38_rc2-r1.ebuild:
+  Removed old ebuilds (release candidates) and orphaned files. Make a new
+  patchset tarball so that it doesn't need files in FILESDIR. Now just one
+  file is there.
+
+  29 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avidemux-2.0.38_rc2-r1.ebuild:
+  Fixed patchset urls.
+
+  21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avidemux-2.0.38_rc2-r1.ebuild:
+  Increased requirement of faad of at least -r5 which has the change in API
+  calls so that can't be installed in old-API systems.
+
+  19 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avidemux-2.0.38_rc2-mmx_altivec.patch,
+  avidemux-2.0.38_rc2-r1.ebuild:
+  Added patch to fix upstream --enable params on configure which are borked.
+  Fixes #89356.
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avidemux-2.0.38_rc2-aclocal.patch, avidemux-2.0.38_rc2-r1.ebuild:
+  Added a patch for some strange autotools combination which doesn't look in
+  m4 directory. Fixes #89575.
+
+*avidemux-2.0.38_rc2-r1 (18 Apr 2005)
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.38_rc2-r1.ebuild:
+  Added a new revision to avidemux with configure patches which makes
+  deprecated the configure cache tricks. Fixes #89097.
+
+  15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  avidemux-2.0.34_rc1-r1.ebuild, avidemux-2.0.34_rc2.ebuild,
+  avidemux-2.0.36.ebuild, avidemux-2.0.38_rc1.ebuild,
+  avidemux-2.0.38_rc2.ebuild:
+  doesnt makes use of the pic useflag any longer
+
+  06 Apr 2005; Luca Barbato <lu_zero@gentoo.org> avidemux-2.0.38_rc2.ebuild:
+  Another fix to configure args
+
+  06 Apr 2005; Luca Barbato <lu_zero@gentoo.org> avidemux-2.0.38_rc2.ebuild:
+  Minor fix
+
+  05 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/2.0.38_rc2-fix-faad.patch, avidemux-2.0.38_rc2.ebuild:
+  fix for bug #86935, thanks again Diego
+
+*avidemux-2.0.38rc2b (31 Mar 2005)
+
+  03 Apr 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.38_rc2.ebuild:
+  Version bump.
+
+  31 Mar 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.36.ebuild:
+  Fixed typo, closing bug #87380.
+
+*avidemux-2.0.38rc1 (20 Feb 2005)
+
+  21 Feb 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.38_rc1.ebuild:
+  Version bump.
+
+*avidemux-2.0.36 (12 Jan 2005)
+
+  14 Jan 2005; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.36.ebuild:
+  Version bump.
+
+  14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  avidemux-2.0.34_rc1-r1.ebuild, avidemux-2.0.34_rc2.ebuild:
+  Using 'aac' instead of faad and faac.
+
+*avidemux-2.0.34_rc2 (11 Dec 2004)
+
+  12 Dec 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc2.ebuild:
+  Version bump, changed usage of mmx-flag to autodetect if not diabled.
+
+  30 Nov 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc1-r1.ebuild,
+  Cleanup and addition of missing USE-flags, solves bug #72217.
+  Thanks go to Diego Pettenò for bug and suggested fix.
+
+  26 Nov 2004; Chris White <chriswhite@gentoo.org> -avidemux-0.9-r1.ebuild,
+  -avidemux-2.0.18.ebuild, -avidemux-2.0.20.ebuild, -avidemux-2.0.22.ebuild,
+  -avidemux-2.0.26.ebuild, -avidemux-2.0.28.ebuild, -avidemux-2.0.30.ebuild,
+  -avidemux-2.0.32.ebuild:
+  Removed old ebuilds with permission from zypher.
+
+  09 Nov 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.34_rc1.ebuild:
+  Version bump.
+
+*avidemux-2.0.32 (26 Okt 2004)
+
+  29 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.32.ebuild:
+  Version bump.
+  
+  19 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
+  Added amd64-patch, closes bug #68052.
+
+*avidemux-2.0.30 (15 Okt 2004)
+
+  17 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
+  Version bump.
+  
+  23 Sep 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild,
+  avidemux-2.0.28.ebuild:
+  Added faad2 dependency, closes bug #59556
+
+  29 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+  Added xvid-(0.9)-patch.
+  Closes bug #61895
+
+  26 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+  Added "-fforce-addr" to the list of filtered flags.
+  Closes bug #61632 and #61612
+
+*avidemux-2.0.28 (12 Aug 2004)
+
+  24 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+  Version bump, closes bug #60254.Introducing xvid-1.0 as a dependency.
+  Thanks to Ken Garland for his submission.
+  
+  23 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild:
+  Cleaned up filter-flags, closes bug #58112.
+
+  23 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild:
+  Version bump.
+  Added dependency to faac, closes bug #58080.
+
+  22 Jul 2004; Marc Hildebrand <zypher@gentoo.org> metadata.xml,
+  avidemux-2.0.24.ebuild:
+  Changed package maintainer (Added myself).
+  Fixed configure and configure.in, closing bug #57831
+
+  22 Jul 2004; Chris White <chriswhite@gentoo.org> metadata.xml,
+  avidemux-2.0.24.ebuild:
+  Added myself to metadata.xml as package maintainer. Added -funroll-all-loops
+  to the filter-flags list. It appears that both -funroll-loops and
+  -funroll-all-loops both kill the build.
+
+  19 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+  Added dependency for automake-1.8.3, fixes bug #57328
+
+  26 Jun 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+  Marked stable for ppc and testing for ~amd64.
+  
+  23 Jun 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+  Marked stable for x86.
+  
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> avidemux-0.9-r1.ebuild,
+  avidemux-2.0.18.ebuild, avidemux-2.0.20.ebuild, avidemux-2.0.22.ebuild,
+  avidemux-2.0.24.ebuild:
+  Fix use invocation
+
+*avidemux-2.0.24 (08 May 2004)
+
+  08 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
+  Version bump.
+  
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  avidemux-0.9-r1.ebuild, avidemux-2.0.18.ebuild, avidemux-2.0.20.ebuild,
+  avidemux-2.0.22.ebuild:
+  Changing mad dep to madplay.
+
+  Removed divx4linux dep as it's not used anyway. Closes bug #45176
+  bumped to stable
+
+*avidemux-2.0.22 (28 Feb 2004)
+  
+  28 Feb 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.22.ebuild:
+  Version bumped.
+
+  01 Feb 2004; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+  files/alsa.patch:
+  adding alsa.patch Closes 38982
+
+  01 Feb 2004; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+  avidemux-2.0.20.ebuild:
+  adding filter. Closes 39980.
+
+*avidemux-2.0.20 (21 Dec 2003)
+
+  01 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.20.ebuild:
+  Removed divx4linux dep as it's not used anyway. Closes bug #45176
+  
+  21 Dec 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.20.ebuild:
+  Version bumped. Closes 36224.
+
+  27 Nov 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.18.ebuild,
+  files/resize_crash.patch:
+  adding patch. Closes #33993.
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  avidemux-2.0.16.ebuild, avidemux-2.0.18.ebuild, files/gcc2.patch:
+  adding gcc2 patch.
+
+*avidemux-2.0.18 (01 Nov 2003)
+
+  01 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.18.ebuild:
+  Removed divx4linux dep as it's not used anyway. Closes bug #45176
+  
+  01 Nov 2003; Markus Nigbur <pyrania@gentoo.org> avidemux-2.0.18.ebuild:
+  Version bump.
+
+  30 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> avidemux-0.9.ebuild:
+  removed old ebuild that had an odd DEPEND on a no longer existing libxml2
+
+*avidemux-2.0.16 (29 Sep 2003)
+
+  29 Sep 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.16.ebuild:
+  Version bumped. Closes #29824.
+
+  20 Aug 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.12.ebuild,
+  avidemux-2.0.14.ebuild:
+  Filtering out flag. Closes #26936.
+
+*avidemux-2.0.14 (17 Aug 2003)
+
+  17 Aug 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.14.ebuild:
+  Version bumped.
+
+*avidemux-2.0.12 (04 Aug 2003)
+
+  04 Aug 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.12.ebuild:
+  Verison bumped as always #25896.
+
+*avidemux-0.9-r1 (22 Jul 2003)
+
+  22 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9-r1.ebuild,
+  files/avidemux-0.9-libxml2.5.7.patch:
+  Fixing libxml2 issue. Submitted by Marc Hildebrand
+  <marc.hildebrand@t-online.de> in #24545.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> avidemux-2.0.10-r1.ebuild:
+  Readjusted for a mad metapackage Changed to econf.  Added debug and 
+  nls USE variables.  Author suggests marking 2.0.10 as stable.  Also 
+  added alsa, arts, oggvorbis, and truetype USE variables albeit with no 
+  configure opts.
+
+*avidemux-2.0.10-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> avidemux-2.0.10-r1.ebuild:
+  New ebuild which depends on media-libs/{libmad,libid3tag}
+
+*avidemux-2.0.10 (14 Jul 2003)
+
+  14 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.10.ebuild:
+  Version bumped.
+
+*avidemux-2.0.9 (11 Jul 2003)
+
+  11 Jul 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.2.ebuild,
+  avidemux-2.0.9.ebuild:
+  Version bumped. Ebuild submitted by Marc Hildebrand
+  <marc.hildebrand@t-online.de> in #24216.
+
+*avidemux-2.0.8 (28 Jun 2003)
+
+  28 Jun 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.8.ebuild:
+  Version bumped. Ebuild submitted by Marc Hildebrand
+  <marc.hildebrand@t-online.de> in #20182.
+
+*avidemux-2.0.3_rc2 (24 May 2003)
+
+  24 May 2003; Lars Weiler <pylon@gentoo.org> avidemux-2.0.3_rc2.ebuild:
+  Newer release candidat added. Thanks to Marc Hildebrand
+  <marc.hildebrand@t-online.de> for the ebuild.
+
+*avidemux-0.9 (27 Apr 2003)
+
+  01 May 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9.ebuild:
+  Marked as stable
+
+  28 Apr 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9.ebuild:
+  Added libxml2 IUSE. Closes #20097.
+
+  27 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*avidemux-0.9_rc3 (23 Mar 2003)
+
+  29 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc3.ebuild:
+  Marked as stable.
+
+  23 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc1.ebuild,
+  avidemux-0.9_rc3.ebuild:
+  Version bumped and cleanup.
+
+*avidemux-0.9_rc2 (12 Mar 2003)
+
+  12 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc2.ebuild
+  files/digest-avidemux-0.9_rc2 ChangeLog :
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted
+  in #17292.
+
+*avidemux-0.9-rc1 (10 Mar 2003)
+
+  10 Mar 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_rc1.ebuild
+  files/digest-avidemux-0.9_rc1 ChangeLog :
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+  #16909.
+
+*avidemux-0.9-pre32 (09 Feb 2003)
+
+  21 Feb 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre32.ebuild
+  Marked as stable.
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre32.ebuild
+  files/digest-avidemux-0.9_pre32 ChangeLog :
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+  #15366.
+
+*avidemux-0.9-pre30 (20 Jan 2003)
+
+  20 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre30.ebuild
+  files/digest-avidemux-0.9_pre30 files/ASM_vidDeintAsm.cpp.diff.gz 
+  files/gui_filter.diff.gz ChangeLog : 
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in 
+  #14174.
+
+*avidemux-0.9-pre28 (09 Jan 2003)
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre28.ebuild
+  files/digest-avidemux-0.9_pre28 ChangeLog :
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
+  #13300. Including now fix to compile with -O3
+
+*avidemux-0.9-pre26 (08 Jan 2003)
+
+  08 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre26.ebuild
+  files/digest-avidemux-0.9_pre26 ChangeLog :
+  New Version + Patch to compile with freetype 2.1.3
+
+*avidemux-0.9-pre24 (09 Dec 2002)
+
+  09 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  version bump #11776
+
+*avidemux-0.9-pre22 (22 Nov 2002)
+
+  22 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  version bump #11024
 
 *avidemux-0.9-pre18 (06 Okt 2002)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 2aa7e76654ab..44f205afba14 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,5 +1,18 @@
-MD5 99e81aa6b91837c6dece9d7105076166 ChangeLog 4129
-MD5 8142d5e0bf3979ab81b6c67c48555ef5 avidemux-0.9_rc3.ebuild 875
-MD5 84a8e06c46de08d146899143b34f905c avidemux-0.9.ebuild 959
-MD5 163ee38dad11a35f2e663cc77837434c files/digest-avidemux-0.9_rc3 65
-MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a334cfca0dcd72127516891408c711a5 ChangeLog 17574
+MD5 ee5806b95c2dcfc5b397bcf7b64fc053 avidemux-2.0.24.ebuild 2486
+MD5 d573443c44494270349c77440f8b3435 avidemux-2.0.42-r1.ebuild 2851
+MD5 0c90a24580fdf60989581fbb1f95bfc3 avidemux-2.1_pre1.ebuild 2966
+MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
+MD5 0d0a90c34a5456ea2cad99a4bab62b50 files/digest-avidemux-2.0.42-r1 139
+MD5 829b17a9790d79f257614bfcd384f049 files/digest-avidemux-2.1_pre1 142
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDazqIj5H05b2HAEkRAgW4AKCLpXmp94UXQ3p6dI9k8JtED9ooYgCfXpCr
+2apkGeu+IF+Wt0k9rpcnS+s=
+=Uffb
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.0.24.ebuild b/media-video/avidemux/avidemux-2.0.24.ebuild
index b745ebfb6d26..77dd4a0c1ca2 100644
--- a/media-video/avidemux/avidemux-2.0.24.ebuild
+++ b/media-video/avidemux/avidemux-2.0.24.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-video/avidemux/avidemux-2.0.24.ebuild,v 1.1 2004/05/08 18:13:29 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.24.ebuild,v 1.1.1.1 2005/11/30 09:57:41 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,8 +11,8 @@ SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug nls oggvorbis arts truetype alsa xvid"
+KEYWORDS="x86 ppc ~amd64"
+IUSE="alsa arts debug nls oggvorbis truetype xvid"
 
 RDEPEND="virtual/x11
 	media-sound/madplay
@@ -31,16 +31,21 @@ RDEPEND="virtual/x11
 	alsa? ( >=media-libs/alsa-lib-0.9.8 )"
 # media-sound/toolame is supported as well
 
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.58
+		>=sys-devel/automake-1.8.3"
 
 S=${WORKDIR}/${MY_P}
 
-filter-flags "-fno-default-inline"
+filter-flags "-fno-default-inline -funroll-loops -funroll-all-loops \
+	    -maltivec -mabi=altivec"
 
 src_compile() {
 	# Fixes a possible automake error due to clock skew
 	touch -r *
 
+	# Small cosmetic correction of configure:
+	sed -i -e /^d$/d ${S}/configure ${S}/configure.in ${S}/configure.in.in
+
 	export WANT_AUTOCONF=2.5
 	autoconf
 
@@ -61,9 +66,6 @@ src_compile() {
 	use debug && myconf="${myconf} --enable-debug=full"
 	use nls || myconf="${myconf} --disable-nls"
 
-	filter-flags -funroll-loops
-	filter-flags -maltivec -mabi=altivec
-
 	econf ${myconf} || die "configure failed"
 
 	make || die "make failed"
@@ -75,7 +77,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ `use pcc` ] ; then
+	if use ppc ; then
 		echo
 		einfo "OSS sound output may not work on ppc"
 		einfo "If your hear only static noise, try"
diff --git a/media-video/avidemux/avidemux-2.0.42-r1.ebuild b/media-video/avidemux/avidemux-2.0.42-r1.ebuild
index b7c74056b050..1e6e9592b16c 100644
--- a/media-video/avidemux/avidemux-2.0.42-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.0.42-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.1 2005/09/03 10:21:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
diff --git a/media-video/avidemux/avidemux-2.1_pre1.ebuild b/media-video/avidemux/avidemux-2.1_pre1.ebuild
index 21f655fcc809..6c424f1b9d2d 100644
--- a/media-video/avidemux/avidemux-2.1_pre1.ebuild
+++ b/media-video/avidemux/avidemux-2.1_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/media-video/avidemux/avidemux-2.1_pre1.ebuild,v 1.1 2005/08/22 12:04:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.1_pre1.ebuild,v 1.1.1.1 2005/11/30 09:57:41 chriswhite Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -20,7 +20,7 @@ IUSE="a52 aac alsa altivec arts encode mad nls vorbis sdl truetype xvid xv oss"
 RDEPEND="
 	>=x11-libs/gtk+-2.6
 	>=dev-libs/libxml2-2.6.7
-	dev-lang/spidermonkey
+	>=dev-lang/spidermonkey-1.5_rc6-r1
 	xv? ( virtual/x11 )
 	a52? ( >=media-libs/a52dec-0.7.4 )
 	encode? ( >=media-sound/lame-3.93 )
@@ -41,14 +41,14 @@ DEPEND="$RDEPEND
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/automake-1.8.3"
 
-filter-flags "-fno-default-inline"
-filter-flags "-funroll-loops"
-filter-flags "-funroll-all-loops"
-filter-flags "-fforce-addr"
-
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
+	filter-flags "-fno-default-inline"
+	filter-flags "-funroll-loops"
+	filter-flags "-funroll-all-loops"
+	filter-flags "-fforce-addr"
+
 	if ! ( use oss || use arts || use alsa ); then
 		die "You must select at least one between oss, arts and alsa audio output."
 	fi
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index d9df1878d8e2..210f2b0d5ddb 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
+<maintainer>
+  <email>zypher@gentoo.org</email>
+  <name>Marc Hildebrand</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 472e9900764f..2a590a569f80 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,11 +1,550 @@
 # ChangeLog for media-video/avifile
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/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-video/avifile/ChangeLog,v 1.1.1.1 2005/11/30 09:57:44 chriswhite Exp $
+
+  24 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avifile-0.7.38.20030710-r1.ebuild, avifile-0.7.41.20041001-r1.ebuild,
+  avifile-0.7.41.20041001-r2.ebuild, avifile-0.7.43.20050224-r1.ebuild,
+  avifile-0.7.43.20050224-r2.ebuild:
+  Remove divx4linux dependency entirely.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  avifile-0.7.38.20030710-r1.ebuild:
+  Add divx4linux useflag
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  avifile-0.7.43.20050224-r1.ebuild:
+  Mark 0.7.43.20050224-r1 stable on alpha
+
+  10 Aug 2005; Markus Rothe <corsair@gentoo.org>
+  avifile-0.7.43.20050224-r2.ebuild:
+  added ~ppc64
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  avifile-0.7.38.20030710-r1.ebuild, avifile-0.7.41.20041001-r1.ebuild,
+  avifile-0.7.41.20041001-r2.ebuild, avifile-0.7.43.20050224-r1.ebuild,
+  avifile-0.7.43.20050224-r2.ebuild:
+  Change qt dep for bug #100235
+
+  15 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  avifile-0.7.43.20050224-r1.ebuild:
+  Stable on ia64, bug 98891.
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avifile-0.7.43.20050224-r1.ebuild:
+  Stable on amd64, closes #93814.
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avifile-0.7.43.20050224-pic.patch,
+  avifile-0.7.43.20050224-r2.ebuild:
+  Add pic patch for x86 as per bug #88582. Thanks to Kevin F. Quinn
+  <kevquinn@gentoo.org> for the patch.
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avifile-0.7.43.20050224-r1.ebuild, avifile-0.7.43.20050224-r2.ebuild:
+  Backport lib64 fixes in avifile-0.7.43.20050224-r1.
+
+*avifile-0.7.43.20050224-r2 (28 Jun 2005)
+
+  28 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+  +avifile-0.7.43.20050224-r2.ebuild:
+  Fix broken acinclude.m4 that have a broken SDL test that clobber
+  '/usr/lib64' to '4'.
+
+  18 Jun 2005; Guy Martin <gmsoft@gentoo.org> files/avifile-mad.patch,
+  avifile-0.7.43.20050224-r1.ebuild:
+  Fixed and marked stable for hppa.
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  avifile-0.7.43.20050224-r1.ebuild:
+  Stable on sparc
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch,
+  avifile-0.7.43.20050224-r1.ebuild:
+  Fix building with gcc4.  Patch from Debian.
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  avifile-0.7.43.20050224-r1.ebuild:
+  Added check so that qt and dmalloc can't be enabled at the same time as they
+  make avifile not compile at all. Fixes #80874.
+
+  22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avifile-0.7.43.20050224-fixlabels.patch,
+  avifile-0.7.43.20050224-r1.ebuild:
+  Added patch to convert labels to local form, fixes #86320.
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avifile-0.7.43.20050224-sdllibs.patch,
+  avifile-0.7.43.20050224-r1.ebuild:
+  Added win32codecs useflag (which allows to disable win32codecs support
+  instead of harddepend it on x86 systems). Renamed oggvorbis flag into
+  vorbis. Renamed dvd flag into a52 (it enables a52 support in avi files, not
+  in dvds, anyway). Used mad useflag in use_enable libmad. Remove dependency
+  on sed-4 (in system now). Added a patch to fix compilation of sdl support on
+  amd64 (at least). Fixed disabling of sdl with useflag. Removed x86
+  conditional on divx4linux as it's usemasked out of x86.
+
+  15 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
+  avifile-0.7.41.20041001-r1.ebuild:
+  changed to -mips because of hard dep on madplay
+
+*avifile-0.7.43.20050224-r1 (26 Mar 2005)
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/avifile-0.7.41.20041001-sparc.patch,
+  +files/avifile-0.7.43.20050224-sysffmpeg.patch,
+  -avifile-0.7.32.20030219.ebuild, -avifile-0.7.37.20030522-r2.ebuild,
+  -avifile-0.7.41.20041001.ebuild, -avifile-0.7.43.20050224.ebuild,
+  +avifile-0.7.43.20050224-r1.ebuild:
+  Now uses system ffmpeg and installs both static and shared libs. Removing
+  old versions. Added to ~sparc.
+
+*avifile-0.7.43.20050224 (22 Mar 2005)
+
+  22 Mar 2005; Chris White <chriswhite@gentoo.org> +files/avifile-mad.patch,
+  +avifile-0.7.43.20050224.ebuild:
+  Changed the following:
+  
+  1) changed SRC_URI since upstream extension is now .tar.bz2 instead of
+  .tar.gz 2) added alsa dep virutal/alsa (helps to have alsa if you're going
+  to use it) 3) removed useless audiofile and ffmpeg depends 4) made qt
+  sed-ing look a little bit cleaner and more explanitory 5) removed throw and
+  gcc2 patches as they no longer apply 6) changed sparc patch to a sed based
+  patch 7) removed avifile.pc.in sed-ing as it no longer applies 8) made the
+  AM_CFLAGS apply to x86 as it should have been (conflicts with sparc patch)
+  9) changed `use_enable`'s to $(use_enable)'s 10) rid of pointless dodir in
+  src_install 10) added a fpm patch to fix FPM_* not being set for use in
+  libmad plugin
+  
+  And that's all.
+
+  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  avifile-0.7.41.20041001-r1.ebuild:
+  made divx4linux dependency optional, controlled by the respective useflag.
+  fixes #81787
+
+  31 Jan 2005; <lucky@gentoo.org> avifile-0.7.41.20041001-r2.ebuild:
+  removed the pic functionality. fixes #80034
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  avifile-0.7.41.20041001-r2.ebuild:
+  avi? dependency now only possible on x86. thanks to KingTaco.
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  avifile-0.7.41.20041001-r2.ebuild:
+  excluded amd64 from optional dmalloc usage.
+
+*avifile-0.7.41.20041001-r2 (29 Jan 2005)
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +avifile-0.7.41.20041001-r2.ebuild:
+  various cleanups which were suggested by Diego Pettenò
+  <dgp85@users.sourceforge.net>, fixes bug #72182. thanks a lot, Diego.
+
+  20 Jan 2005; Marcus Hanwell <cryos@gentoo.org>
+  avifile-0.7.41.20041001-r1.ebuild:
+  Marking stable for amd64.
+
+  09 Dec 2004; Patrick Kursawe <phosphan@gentoo.org>
+  avifile-0.7.41.20041001-r1.ebuild:
+  Declaring stable for x86 - still broken (see bug #72182), but less broken than
+  older versions.
+
+*avifile-0.7.41.20041001 (01 Dec 2004)
+
+  01 Dec 2004; Chris White <chriswhite@gentoo.org>
+  avifile-0.7.41.20041001-r1.ebuild, +avifile-0.7.41.20041001.ebuild:
+  Re-added 0.7.41.ebuild as it's the latest x86 stable.
+
+*avifile-0.7.32.20030219 (01 Dec 2004)
+
+  01 Dec 2004; Chris White <chriswhite@gentoo.org>
+  +avifile-0.7.32.20030219.ebuild:
+  Re-adding .32 to unbreak mjpegtools.. again.
+
+*avifile-0.7.37.20030522-r2 (01 Dec 2004)
+
+  01 Dec 2004; Chris White <chriswhite@gentoo.org>
+  +avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.41.20041001-r1.ebuild:
+  Added avifile-0.7.37-20030522-r2.ebuild back to unbreak swftools and
+  mjpegtools deps.
+
+  30 Nov 2004; Chris White <chriswhite@gentoo.org>
+  -avifile-0.7.32.20030219.ebuild, -avifile-0.7.37.20030522-r2.ebuild,
+  -avifile-0.7.38.20030710.ebuild, -avifile-0.7.41.20041001.ebuild:
+  Ebuild cleanup.
+
+  26 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  avifile-0.7.41.20041001-r1.ebuild:
+  Fixing bug #70920 (fails to build on platforms that don't know
+  no-omit-leaf-frame-pointer).
+
+  16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  avifile-0.7.41.20041001.ebuild:
+  Adding compile bug fixes from -r1
+
+*avifile-0.7.41.20041001-r1 (12 Nov 2004)
+
+  12 Nov 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/avifile-0.7.41.20041001-gcc2.patch,
+  +avifile-0.7.41.20041001-r1.ebuild:
+  Fixing bug #67441 (configure script stripped -g from CFLAGS - even in the
+  middle of a word), bug #68899 (hard-coded -lXrender in some Makefile, removing
+  it if not using X), bug #70074 (doesn't compile with gcc 2.95) and
+  bug #69511 (parts of the build did not use our CFLAGS)
+
+  23 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  avifile-0.7.41.20041001.ebuild:
+  Disabling maketest for now because of bug #66740.
+
+  22 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  avifile-0.7.41.20041001.ebuild:
+  Older versions seem to cause more trouble than .41 - declaring stable for x86.
+
+  07 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> files/throw.patch:
+  throw.patch finally works with latest glibc versions - closing bug #64893.
+  Modifying postinst to only show the message if the file it refers to was
+  actually built. (closing bug #56973)
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  avifile-0.7.41.20041001.ebuild:
+  get_libdir fixes.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/avifile-0.7.41.20041001-sparc.patch,
+  avifile-0.7.41.20041001.ebuild:
+  Recreated sparc CFLAGS patch, but still -sparc.  Readded to ~amd64.
+  Closes bug #66422.
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> files/throw.patch:
+  Patch was broken (bug #64893)
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +files/throw.patch,
+  avifile-0.7.41.20041001.ebuild:
+  Fixing wrong attribute locations in source, see bug #64893
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  avifile-0.7.41.20041001.ebuild:
+  Filtering flag -momit-leaf-frame-pointer (bug #66445)
+
+*avifile-0.7.41.20041001 (05 Oct 2004)
+
+  05 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +avifile-0.7.41.20041001.ebuild:
+  New version that works with xvid 1.x and does not unset compiler flags.
+
+*avifile-0.7.38.20030710-r1 (12 Jul 2004)
+
+  12 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  +avifile-0.7.38.20030710-r1.ebuild:
+  Make sure pkgconfig file spits out right include path #53183 by Luke Worth and
+  clean up the ebuild in general.
+
+  29 May 2004; Travis Tilley <lv@gentoo.org> +files/avifile-x86-gcc34.patch,
+  avifile-0.7.38.20030710.ebuild:
+  added an additional gcc 3.4 fix for x86
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  avifile-0.7.32.20030219.ebuild, avifile-0.7.37.20030522-r2.ebuild,
+  avifile-0.7.38.20030710.ebuild:
+  Changing mad dep to madplay.
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/avifile-gcc34.patch,
+  avifile-0.7.38.20030710.ebuild:
+  patched to compile using gcc 3.4
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild:
+  Add inherit eutils
+
+  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  avifile-0.7.32.20030219.ebuild, avifile-0.7.37.20030522-r2.ebuild,
+  avifile-0.7.38.20030710.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  09 Mar 2004; <agriffis@gentoo.org> avifile-0.7.38.20030710.ebuild:
+  stable on alpha and ia64
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org>
+  avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild:
+  add alpha and ia64 keywords
+
+  28 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.38.20030710.ebuild:
+  adding patch
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> avifile-0.7.38.20030710.ebuild:
+  Added patch for sparc to fix bug #36040.
+
+  26 Dec 2003; <plasmaroo@gentoo.org> avifile-0.7.38.20030710.ebuild,
+  files/avifile-0.7.38.20030710-2.6.patch:
+  Added a patch which allows avifile to compile successfully on 2.6 series
+  kernels - note; this patch requires compatible, patched 2.6.0 linux-headers.
+
+  14 Dec 2003; Martin Holzer <mholzer@gentoo.org> files/flvenc-patch:
+  chaning patch. Closes #35802
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> avifile-0.7.38.20030710.ebuild:
+  Add amd64 keyword. Patch contributed by MATSUU Takuto <matsuu@gentoo.org> in #33655.
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.37.20030522-r2.ebuild, avifile-0.7.38.20030710.ebuild:
+  adding RESTRICT="nomirror"
+
+  16 Sep 2003; Max Kalika <max@gentoo.org> avifile-0.7.38.20030710.ebuild,
+  metadata.xml:
+  Bump to stable x86.
+
+  06 Sep 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.38.20030710.ebuild:
+  Fixing bug with gcc 2.95. Closes #27987
+
+*avifile-0.7.38.20030710 (17 Aug 2003)
+
+  17 Aug 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.38.20030710.ebuild:
+  Version bumped.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.37.20030522-r2.ebuild:
+  Fixed mad dep
+
+*avifile-0.7.37.20030522-r2 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> 
+  avifile-0.7.27.20030522-r2.ebuild:
+  Changed from media-sound/mad to media-libs/{libmad,libid3tag} and
+  from $DEBUGBUILD to `use debug`
+
+*avifile-0.7.37.20030522-r1 (09 Jul 2003)
+
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.37.20030522-r1.ebuild, files/avifile-0.7.37.20030522-divx.patch: 
+  Adding latest divx support. Closes #23795
+
+  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
+  avifile-0.7.32.20030219.ebuild, avifile-0.7.34.20030319.ebuild,
+  avifile-0.7.37.20030522.ebuild:
+  USE flag is truetype NOT freetype. Thanks to: Chris Hornbaker
+  <chrishornbaker@earthlink.net> in bug #21802
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org>
+  avifile-0.7.37.20030522.ebuild:
+  Added fix for qt compile errors. Thanks to Daniel Steinberger
+  <Daniel.Steinberger@gmx.de>. (#21804)
+
+*avifile-0.7.37.20030522 (22 May 2003)
+
+  22 May 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.37.20030522.ebuild:
+  Version bumped.
+
+*avifile-0.7.34.20030319 (22 Apr 2003)
+
+  22 Apr 2003; Martin Holzer <mholzer@gentoo.org>
+  avifile-0.7.34.20030319.ebuild:
+  Version bumped. Ebuild submitted by TGL <degrenier@easyconnect.fr> in #18709.
+
+*avifile-0.7.32.20030219 (20 Feb 2003)
+
+  17 Apr 2003; foser <foser@gentoo.org> * :
+  Fixed xft dep to be virtual
+
+  20 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.32.20030219.ebuild,
+  files/digest-avifile-0.7.32.20030219 :
+  Version bump.  Fixes for compatibility with the newest qt builds and
+  many other bug fixes.  This is possibly the last 0.7.x build
+  according to the upstream author. 
+
+*avifile-0.7.29.20030204 (04 Feb 2003)
+
+  18 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.29.20030204.ebuild :
+  Changed the freetype USE flag to truetype.  Thanks to Pascal Labit
+  on bug #15888 for noticing this misnomer.
+
+  10 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.29.20030204.ebuild :
+  Removed --enable-timing from DEBUGBUILD as it causes compile
+  failures.
+
+  09 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.29.20030204.ebuild :
+  Marked stable again.  Forcing --enable-oss
+
+  07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Cleaned out old, crusty ebuilds. More importantly, divx4linux and
+  win32codecs are installed ONLY on the x86 arch, not any others.  Added
+  ~sparc KEYWORD.  Closing bug #15276 by Alvaro Figueroa
+  <fede2@fuerzag.ulatina.ac.cr>
+
+  05 Feb 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.29.20030204.ebuild :
+  Added a pkg_postinst with a note about making aviplay suid root
+  so certain video functions work properly.
+  Marked stable.
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.2920030204,
+  files/digest-avifile-0.7.29.20030204 :
+  Added esd and alsa USE variables.  No patches... so autoconf... just
+  configure+options and go... I still need vidix support!
+
+*avifile-0.7.27.20030122-r1 (30 Jan 2003)
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  avifile-0.7.27.20030122-r1.ebuild:
+  freetype USE to truetype USE, which ACTUALLY EXISTS, Sheesh
+
+  01 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.27.20030130-r1.ebuild :
+  Added the missing download link for the patch.  Added dependancies on
+  alsa-lib, esound, and audiofile.
+
+  30 Jan 2003; Nick Hadaway <raker@gentoo.org>
+  avifile-0.7.27.20030122-r1.ebuild,
+  files/digest-avifile-0.7.27.200301220-r1 :
+  cvs updated from 2003/01/30 which actually plays avi files!  :)
+  This is actually marked as 0.7.28 but since I am patching
+  the 0.7.27 version i figured a rev bump was a better idea.
+
+*avifile-0.7.27.20030122 (23 jan 2003)
+
+  23 Jan 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.27.20030122.ebuild,
+  files/digest-/avifile-0.7.27.20030122 :
+  Version bump.  Removed automake dependancy.  This has a fix for avi
+  movies over ~4200 seconds.
+
+*avifile-0.7.26.20030117 (23 Jan 2003)
+
+  23 Jan 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.26.20030117.ebuild,
+  files/digest-avifile-0.7.26.20030117 :
+  Version bump.  Total ebuild reorganization fully supporting all
+  available configure options.  A couple of local variables added for
+  explicit disabling or enabling of certain features.  Unset CC and
+  CXX during configure to avoid problems during the mad configuration.
+  Reset for emake.
+
+  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> :
+  Disable KDE support, as it is broken anyhow.  Bug #13608.
+
+*avifile-0.7.25.20030114 (15 Jan 2003)
+
+  15 Jan 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.25.20030114.ebuild,
+  files/digest-avifile-0.7.25.20030114 :
+  Version bump.  subtitles should be working now.
+
+*avifile-0.7.22.20021129 (13 Dec 2002)
+
+  13 Dec 2002; Brandon Low <lostlogic@gentoo.org> avifile-0.7.22.20021129.ebuild,
+  Fix sandbox error
+
+  13 Dec 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.22.20021129.ebuild,
+  files/digest-avifile-0.7.22.20021129 :
+  Version bump.  Added a sed fix so qt is detected properly.  WM9 audio and
+  video is now supported!  Currently marked unstable.
+
+*avifile-0.7.15.20020816-r1 (13 Dec 2002)
+
+  13 Dec Martin Schlemmer <azarah@gentoo.org> avifile-0.7.15.20020816-r1.ebuild :
+  Make sure we include freetype2 headers before freetype1 headers, else Xft2
+  borks, bug #11941.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords
+ 
+*avifile-0.7.15.20020816 (27 Aug 2002)
+
+  04 Nov 2002; Seemant Kulleen <seemant@gentoo.org>
+  avifile-0.7.15.20020816.ebuild :
+
+  small typo fix: ${S}->${D} to install the pixmaps.  Thanks to:
+  dareynol@ij.net (dareynol) in bug #10178
+
+  Sep 2002; Maarten Thibaut <murphy@gentoo.org> avifile-0.7.15.20020816.ebuild :
+  Added sparc/sparc64 keywords.
+
+  27 Aug 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.15.20020816.ebuild,
+  files/digest-avifile-0.7.15.20020816 : Version bump.  Currently masked for freeze.
+
+*avifile-0.7.14.20020802 (04 Aug 2002)
+
+  17 Aug 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.14.20020802.ebuild :
+  Changed to econf.  Removed redundant "use kde" section.  Fixed
+  invalid logic in the script.  Added datadir=${D}/usr/share to make install.
+
+  14 Aug 2002; Martin Schlemmer <azarah@gentoo.org> avifile-0.7.14.20020802.ebuild :
+  Elibtoolize this one.
+
+  04 Aug 2002; Nick Hadaway <raker@gentoo.org> avifile-0.7.14.20020802.ebuild,
+  files/digest-avifile-0.7.14.2020802 : Version bump.  Many bug fixes.
+
+*avifile-0.7.7.20020523 (25 Jun 2002)
+
+  25 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : New version closing bug #3855.
+
+*avifile-0.7.4-20020426-r2 (26 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> : Remove the suffix added to
+  all binaries.
+
+*avifile-0.7.4-20020426 (25 May 2002)
+
+  25 May 2002; Matthew Kennedy <mkennedy@gentoo.org> avifile-0.7.4-20020426-r1.ebuild
+  files/digest-avifile-0.7.4-r1-20020426,
+  files/avifile-0.7.4.20020426-gcc3.1-gentoo.patch : Fix avifile code to compile
+  under gcc3.1. This will be an upstream patch also. I'm masking this until
+  gcc-2.95.3 users verify that it works for them too.
+
+*avifile-0.7.4-20020426 (20 Apr 2002)
+
+  30 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.4-20020426.ebuild
+  files/digest-avifile-0.7.4-20020426 : Version bump to newest snapshot.
+  Upstream claims this is a bugfix release.
+
+*avifile-0.7.3.20020419-r1 (28 Apr 2002)
+
+  28 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org> avifile-0.7.3.20020419-r1.ebuild,
+  ChangeLog, files/digest-avifile-0.7.3.20020419-r1 : Should be --without-qt
+  instead of --disable-qt (only users without qt installed will see this produce
+  a fatal error).
+
+*avifile-0.7.3.20020419 (24 Apr 2002)
+
+  24 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.3.20020419.ebuild
+  files/digest-avifile-0.7.3.20020419 : Version bump to newest snapshot.
+  This should work with the latest divx4linux and now has ffmpeg compiled as default.
+  And they have actually named this thing consistent with the 0.6 series!
+
+*avifile-0.6.0.20011220-r2 (13 Apr 2002) 
+
+  13 Apr 2002; Seemant Kulleen <seemant@gentoo.org> :  Trying to make avifile more
+  friendly towards kde3 users.  This closes bug #1713 -- so thanks to
+  edwardam@interlix.com (Edward Muller) for discovering this.  Also, many thanks
+  to andee in #gentoo for being the tester, and woodchip for his insight.
+
+  13 Apr 2002; M.Schlemmer <azarah@gentoo.org> : After much thought, decided to
+  remove the "avi" USE flag, as it enabling or disabling use of the win32 codecs
+  is not valid.  Also, avifile's main use *is* to do avi.
+
+*avifile-0.7.20020412 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.20020412.ebuild:
+  New release, and they keep changing the naming scheme -- aaarrgh
+
+*avifile-0.6.0.20011220-r1 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.6.0-20011220-r1.ebuild :
+  Many changes in here, involving USE dependent compilation of support for:
+  oggvorbis, avi (win32codecs), sdl, mmx/3dnow/sse (x86 optimisation), kde
+  (for kde sample somethings)
+
+*avifile-0.6.0.20011220 (17 Feb 2002)
 
 *avifile-0.53.5-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-video/avifile/Manifest b/media-video/avifile/Manifest
index 50b4fdb663bb..29e2b29b6646 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,9 +1,37 @@
-MD5 5c18e8173e4d5e7a902f9dfc4bbf1b80 ChangeLog 8704
-MD5 57d49dcece64d038049874257f89f20c avifile-0.7.15.20020816-r1.ebuild 2226
-MD5 6ced5e3f190d3b31cb9e15f9214c7553 avifile-0.7.29.20030204.ebuild 4100
-MD5 232af89cb62a54d98be0b94837100253 avifile-0.7.32.20030219.ebuild 4099
-MD5 70df3d765d7b54122053e641b0017355 avifile-0.7.34.20030319.ebuild 4176
-MD5 f568371b0b1dd7cb7dfd933c551fddc9 files/digest-avifile-0.7.15.20020816-r1 73
-MD5 081b0f05ada052539e0eb16ae2eb441d files/digest-avifile-0.7.34.20030319 73
-MD5 8f9263344e2823ef236a16dd9dd9683a files/digest-avifile-0.7.29.20030204 73
-MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 be3ce44ebda98923f67424b9d0d05ba0 ChangeLog 21606
+MD5 8981c162145c43fd70699f83c3f94ae0 avifile-0.7.38.20030710-r1.ebuild 3980
+MD5 35a55f8388e88bfab099edd7bf8ccffb avifile-0.7.41.20041001-r1.ebuild 4568
+MD5 38ecc8f255e1a65a1759b55320f836d5 avifile-0.7.41.20041001-r2.ebuild 4537
+MD5 f4b7a72550bd92613f4e250a4fea99b9 avifile-0.7.43.20050224-r1.ebuild 4658
+MD5 ea26b6b07746ae89640d78116a826973 avifile-0.7.43.20050224-r2.ebuild 4737
+MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
+MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
+MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
+MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
+MD5 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
+MD5 d004578ed49e07cac372c21c044775fe files/avifile-0.7.43.20050224-1.0.0.1.gcc4.patch 5878
+MD5 7404620a2904bb27683df4a0ed2f412d files/avifile-0.7.43.20050224-fixlabels.patch 559
+MD5 db5a5ee4d4627cbfa05d775c118cbc53 files/avifile-0.7.43.20050224-pic.patch 1416
+MD5 6cab3d2acc1d30f101f100f9549613d8 files/avifile-0.7.43.20050224-sdllibs.patch 569
+MD5 6eb792de0d30abfb680655dcdec8b15c files/avifile-0.7.43.20050224-sysffmpeg.patch 14435
+MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
+MD5 1c397a5be4ce93dd90fde2b9ab3aa937 files/avifile-mad.patch 1846
+MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r2 72
+MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
+MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXKf7j5H05b2HAEkRAqhBAJ9FMDoiLVTAl7zuBbjFpONmaE5tWgCfRxUL
+5/mMQ0K21by0NpylKibn3mA=
+=esox
+-----END PGP SIGNATURE-----
diff --git a/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild b/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild
index b3448d7a65ae..b4c30dc88b74 100644
--- a/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.38.20030710-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-video/avifile/avifile-0.7.38.20030710-r1.ebuild,v 1.1 2004/07/12 05:06:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:44 chriswhite Exp $
 
-inherit eutils
+inherit eutils qt3
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:0:6}
@@ -16,11 +16,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0.7"
 KEYWORDS="x86 ~sparc alpha amd64 ia64"
-IUSE="static truetype xv sdl dvd mmx sse 3dnow zlib oggvorbis X qt alsa esd debug"
+IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
 
 DEPEND=">=media-libs/jpeg-6b
-	x86? ( >=media-libs/divx4linux-20030428
-		>=media-libs/win32codecs-0.90 )
+	x86? ( >=media-libs/win32codecs-0.90 )
 	>=media-video/ffmpeg-0.4
 	>=media-libs/xvid-0.9.0
 	>=media-sound/lame-3.90
@@ -35,7 +34,7 @@ DEPEND=">=media-libs/jpeg-6b
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
 	X? ( virtual/x11 virtual/xft )
-	qt? ( >=x11-libs/qt-3.0.3 )
+	qt? ( $(qt_min_version 3.1) )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	esd? ( >=media-sound/esound-0.2.28 )"
 
diff --git a/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild b/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild
index 56db09650c22..d36bdaa0c948 100644
--- a/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.41.20041001-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-video/avifile/avifile-0.7.41.20041001-r1.ebuild,v 1.1 2004/11/12 10:57:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:45 chriswhite Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic qt3
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:0:6}
@@ -17,12 +17,11 @@ LICENSE="GPL-2"
 SLOT="0.7"
 
 #-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
-KEYWORDS="~alpha ~amd64 ~ia64 -sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 -mips -sparc x86"
 IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
 
 DEPEND=">=media-libs/jpeg-6b
-	x86? ( >=media-libs/divx4linux-20030428
-		>=media-libs/win32codecs-0.90 )
+	x86? ( >=media-libs/win32codecs-0.90 )
 	>=media-video/ffmpeg-0.4
 	=media-libs/xvid-1*
 	>=media-sound/lame-3.90
@@ -37,7 +36,7 @@ DEPEND=">=media-libs/jpeg-6b
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
 	X? ( virtual/x11 virtual/xft )
-	qt? ( >=x11-libs/qt-3.0.3 )
+	qt? ( $(qt_min_version 3.1) )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	esd? ( >=media-sound/esound-0.2.28 )"
 
@@ -63,7 +62,11 @@ src_unpack() {
 		sed -e 's/-lXrender//g' -i lib/video/Makefile.* \
 		|| die "sed failed (Xrender)"
 	fi
-
+	# adding CFLAGS by default which exists only for x86 is no good idea
+	# but I can't get it through gcc 3.4.3 without omit-frame-pointer
+	find . -name "Makefile.in" | while read file; do
+		sed -e "s/^AM_CFLAGS = .*/AM_CFLAGS = -fomit-frame-pointer/" -i $file
+	done
 }
 
 src_compile() {
diff --git a/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild b/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild
index 0a91e3715075..9f230db54f9e 100644
--- a/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild
+++ b/media-video/avifile/avifile-0.7.41.20041001-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-video/avifile/avifile-0.7.41.20041001-r2.ebuild,v 1.1 2005/01/29 15:49:36 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:44 chriswhite Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic qt3
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:0:6}
@@ -18,19 +18,18 @@ SLOT="0.7"
 
 #-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips -sparc ~x86"
-IUSE="3dnow X alsa avi debug divx4linux dmalloc dpms dvd encode esd mad matrox
-mmx oggvorbis oss pic qt sblive sdl sse static truetype v4l vidix xinerama xv xvid zlib"
+IUSE="3dnow X alsa avi debug dmalloc dpms dvd encode esd mad matrox
+mmx oggvorbis oss qt sblive sdl sse static truetype v4l vidix xinerama xv xvid zlib"
 
 DEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	avi? ( !alpha? ( !arm? ( !ia64? ( !mips? ( >=media-libs/win32codecs-0.90 ) ) ) ) )
-	divx4linux? ( x86? ( >=media-libs/divx4linux-20030428 ) )
-	dmalloc? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) )
+	avi? ( x86? ( >=media-libs/win32codecs-0.90 ) )
+	dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
 	dvd? ( >=media-libs/a52dec-0.7 )
 	encode? ( >=media-sound/lame-3.90 )
 	esd? ( >=media-sound/esound-0.2.28 )
 	mad? ( media-libs/libmad )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	qt? ( >=x11-libs/qt-3.0.3 )
+	qt? ( $(qt_min_version 3.1) )
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xv? ( virtual/x11 )
@@ -108,7 +107,6 @@ src_compile() {
 		`use_enable matrox mga` \
 		`use_enable oggvorbis vorbis` `use_enable oggvorbis oggtest` `use_enable oggvorbis vorbistest` \
 		`use_enable oss` \
-		`use_with pic fpic` `use_enable pic fpic` \
 		`use_with qt` \
 		`use_enable sblive ac3passthrough` \
 		`use_enable sdl` `use_enable sdl sdltest` \
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
index 1bfbdceec091..36e4a917cf5c 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-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-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.1 2005/03/26 04:27:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:44 chriswhite Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic qt3
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:0:6}
@@ -16,21 +16,20 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0.7"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86"
-IUSE="3dnow X alsa debug divx4linux dmalloc dpms dvd encode esd mad matrox
-mmx oggvorbis oss qt sblive sdl sse truetype v4l vidix xinerama xv xvid zlib"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips sparc ~x86"
+IUSE="3dnow X alsa debug dmalloc dpms a52 encode esd mad matrox
+mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
+zlib"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	x86? ( >=media-libs/win32codecs-0.90 )
-	alsa? ( virtual/alsa )
-	divx4linux? ( x86? ( >=media-libs/divx4linux-20030428 ) )
+	win32codecs? ( >=media-libs/win32codecs-0.90 )
 	dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
-	dvd? ( >=media-libs/a52dec-0.7 )
+	a52? ( >=media-libs/a52dec-0.7 )
 	encode? ( >=media-sound/lame-3.90 )
 	esd? ( >=media-sound/esound-0.2.28 )
 	mad? ( media-libs/libmad )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	qt? ( >=x11-libs/qt-3.0.3 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	qt? ( $(qt_min_version 3.1) )
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xv? ( virtual/x11 )
@@ -41,20 +40,33 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	>=media-libs/jpeg-6b"
 
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.59
 	>=sys-devel/automake-1.4_p6
 	sys-devel/libtool"
+#	v4l needs linux headers
+#	v4l? ( virtual/os-headers )
+
+pkg_setup() {
+	if use qt && use dmalloc; then
+		die "Sorry, qt and dmalloc can't be enabled at the same time."
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
 
-	# fixes mad FPM detection
-	epatch ${FILESDIR}/${PN}-mad.patch
+	cd ${S}
 
 	epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
-
-	if use !qt ; then
+	# removes sed-out of -L/usr/lib(64?) on sdl libs flags
+	epatch ${FILESDIR}/avifile-0.7.43.20050224-sdllibs.patch
+	# fixes bug #86320
+	epatch ${FILESDIR}/${P}-fixlabels.patch
+	# fix building with gcc4
+	# http://debian-amd64.alioth.debian.org/gcc-3.4/patches/avifile_0.7.43.20050224-1.0.0.1.gcc4.patch
+	epatch ${FILESDIR}/${P}-1.0.0.1.gcc4.patch
+
+	if ! use qt ; then
 		sed -i -e 's/qtvidcap\ qtrecompress//g' \
 		${S}/samples/Makefile.am || die "qt based sample test removal failed"
 	fi
@@ -69,15 +81,15 @@ src_unpack() {
 
 	# Run autotools...
 	cd ${S}
-	[[ -f configure.ac && -f configure.in ]] && rm configure.in
+	[[ -f configure.ac ]] && rm -f configure.in
+	# acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
+	rm -f acinclude.m4
+
+	# Reconfigure autotools
+	ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"
 
-	export WANT_AUTOMAKE=1.6
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die "libtoolize failed"
-	aclocal -I ${S}/m4 || die "aclocal failed"
-	autoheader || die "autoheader failed"
-	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
-	autoconf || die "autoconf failed"
+	# fixes mad FPM detection
+	epatch ${FILESDIR}/${PN}-mad.patch
 
 	# make sure pkgconfig file is correct #53183
 	rm -f avifile.pc
@@ -107,17 +119,17 @@ src_compile() {
 	export FFMPEG_CFLAGS="${CFLAGS}"
 
 	econf \
-		$(use_enable x86 win32) \
+		$(use_enable win32codecs win32) \
 		$(use_with dmalloc dmallocth) \
-		$(use_enable dvd a52) $(use_enable dvd ffmpeg-a52) \
+		$(use_enable a52) $(use_enable a52 ffmpeg-a52) \
 		$(use_enable dpms) \
-		$(use_enable mad) $(use_enable libmad) \
+		$(use_enable mad) $(use_enable mad libmad) \
 		$(use_enable matrox mga) \
-		$(use_enable oggvorbis vorbis) $(use_enable oggvorbis oggtest) $(use_enable oggvorbis vorbistest) \
+		$(use_enable vorbis) \
 		$(use_enable oss) \
 		$(use_with qt) \
 		$(use_enable sblive ac3passthrough) \
-		$(use_enable sdl) $(use_enable sdl sdltest) \
+		$(use_with sdl) \
 		$(use_enable truetype freetype2) \
 		$(use_enable v4l) \
 		$(use_enable vidix) \
@@ -133,7 +145,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	dodoc README INSTALL
+	dodoc README
 	cd doc
 	dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
 }
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
index 48178a4ef39f..9316ca5914fc 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-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-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.1 2005/06/28 22:13:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:45 chriswhite Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic qt3
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:0:6}
@@ -16,21 +16,20 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0.7"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~sparc ~x86"
-IUSE="3dnow X alsa debug divx4linux dmalloc dpms a52 encode esd mad matrox
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
+IUSE="3dnow X alsa debug dmalloc dpms a52 encode esd mad matrox
 mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
 zlib"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	win32codecs? ( >=media-libs/win32codecs-0.90 )
-	divx4linux? ( >=media-libs/divx4linux-20030428 )
 	dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
 	a52? ( >=media-libs/a52dec-0.7 )
 	encode? ( >=media-sound/lame-3.90 )
 	esd? ( >=media-sound/esound-0.2.28 )
 	mad? ( media-libs/libmad )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
-	qt? ( >=x11-libs/qt-3.0.3 )
+	qt? ( $(qt_min_version 3.1) )
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xv? ( virtual/x11 )
@@ -66,6 +65,8 @@ src_unpack() {
 	# fix building with gcc4
 	# http://debian-amd64.alioth.debian.org/gcc-3.4/patches/avifile_0.7.43.20050224-1.0.0.1.gcc4.patch
 	epatch ${FILESDIR}/${P}-1.0.0.1.gcc4.patch
+	# Fix pic building (bug #88582)
+	epatch ${FILESDIR}/${P}-pic.patch
 
 	if ! use qt ; then
 		sed -i -e 's/qtvidcap\ qtrecompress//g' \
@@ -82,9 +83,9 @@ src_unpack() {
 
 	# Run autotools...
 	cd ${S}
-	[[ -f configure.ac && -f configure.in ]] && rm -f configure.in
+	[[ -f configure.ac ]] && rm -f configure.in
 	# acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
-	[[ -f acinclude.m4 ]] && rm -f acinclude.m4
+	rm -f acinclude.m4
 
 	# Reconfigure autotools
 	ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"
diff --git a/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch b/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
index df9a82e8d936..e89243275a37 100644
--- a/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
+++ b/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
@@ -28,79 +28,20 @@ diff -ur avifile-0.7-0.7.38/ffmpeg/libavformat/grab.c avifile-0.7-0.7.38.plasmar
  
  typedef struct {
      int fd;
-diff -ur avifile-0.7-0.7.38/plugins/libwin32/loader/ldt_keeper.c avifile-0.7-0.7.38.plasmaroo/plugins/libwin32/loader/ldt_keeper.c
+diff -ur avifile-0.7-0.7.38/samples/qtvidcap/main.cpp avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp
 --- avifile-0.7-0.7.38/plugins/libwin32/loader/ldt_keeper.c	2002-08-08 10:05:51.000000000 +0100
-+++ avifile-0.7-0.7.38.plasmaroo/plugins/libwin32/loader/ldt_keeper.c	2003-12-26 21:54:33.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- #include <unistd.h>
++++ avifile-0.7-0.7.38.plasmaroo/plugins/libwin32/loader/ldt_keeper.c	2004-01-02 16:17:06.000000000 +0000
+@@ -24,6 +24,10 @@
  #ifdef __linux__
-+#include <linux/version.h>
  #include <asm/unistd.h>
  #include <asm/ldt.h>
- /* prototype it here, so we won't depend on kernel headers */
-@@ -109,8 +110,13 @@
- #ifdef __linux__
- /* XXX: why is this routine from libc redefined here? */
- /* NOTE: the redefined version ignores the count param, count is hardcoded as 16 */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static int LDT_Modify( int func, struct user_desc *ptr,
-+		       unsigned long count )
-+#else
- static int LDT_Modify( int func, struct modify_ldt_ldt_s *ptr,
- 		       unsigned long count )
-+#endif
- {
-     int res;
- #ifdef __PIC__
-@@ -141,7 +147,15 @@
- #endif
- 
- #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
--static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
-+#if defined(__linux__) 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		static void LDT_EntryToBytes( unsigned long *buffer, const struct user_desc *content )
-+	#else
-+		static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
-+	#endif
-+#else
-+	static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,47)
++	#define modify_ldt_ldt_s user_desc
 +#endif
- {
-     *buffer++ = ((content->base_addr & 0x0000ffff) << 16) |
- 	(content->limit & 0x0ffff);
-@@ -158,7 +172,15 @@
- 
- ldt_fs_t* Setup_LDT_Keeper(void)
- {
--    struct modify_ldt_ldt_s array;
-+    #if defined(__linux__) 
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+ 	    struct user_desc array;
-+	#else
-+	    struct modify_ldt_ldt_s array;
-+	#endif
-+    #else
-+	    struct modify_ldt_ldt_s array;
-+    #endif
-     int ret;
-     ldt_fs_t* ldt_fs = (ldt_fs_t*) malloc(sizeof(ldt_fs_t));
- 
-@@ -190,7 +212,11 @@
-     array.limit_in_pages=0;
- #ifdef __linux__
-     //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s));
--    ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s));
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	ret=modify_ldt(0x1, &array, sizeof(struct user_desc));
-+    #else
-+	ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s));
-+    #endif
-     if(ret<0)
-     {
- 	perror("install_fs");
-diff -ur avifile-0.7-0.7.38/samples/qtvidcap/main.cpp avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp
+ /* prototype it here, so we won't depend on kernel headers */
+ #ifdef  __cplusplus
+ extern "C" {
 --- avifile-0.7-0.7.38/samples/qtvidcap/main.cpp	2003-06-08 18:26:04.000000000 +0100
 +++ avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp	2003-12-26 19:21:20.000000000 +0000
 @@ -1,9 +1,6 @@
diff --git a/media-video/avifile/files/avifile-mad.patch b/media-video/avifile/files/avifile-mad.patch
index 2376e15e674f..25e80a6a05d4 100644
--- a/media-video/avifile/files/avifile-mad.patch
+++ b/media-video/avifile/files/avifile-mad.patch
@@ -1,6 +1,7 @@
---- avifile-0.7-0.7.43-old/configure	2005-02-24 23:25:46.000000000 +0900
-+++ avifile-0.7-0.7.43/configure	2005-03-22 15:18:44.000000000 +0900
-@@ -3769,7 +3769,7 @@
+diff -uNr avifile-0.7-0.7.43.orig/configure avifile-0.7-0.7.43/configure
+--- avifile-0.7-0.7.43.orig/configure	2005-06-18 09:23:56.000000000 +0200
++++ avifile-0.7-0.7.43/configure	2005-06-18 09:26:34.000000000 +0200
+@@ -19998,7 +19998,7 @@
  case "$target" in
    i?86*)
      test x$ac_cv_c_compiler_gnu = xyes && DEFAULT_FLAGS="-mcpu=$DEFAULT_FLAGS -march=$DEFAULT_FLAGS -ffast-math -fomit-frame-pointer"
@@ -9,7 +10,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_X86 1
  _ACEOF
-@@ -3781,21 +3781,21 @@
+@@ -20010,29 +20010,37 @@
  
      ;;
    ia64*)
@@ -34,16 +35,24 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_ALPHA 1
  _ACEOF
-@@ -3803,7 +3803,7 @@
+ 
      enable_alphaopt=yes
      ;;
-   arm*)
--
+-  arm*)
++  hppa*)
++MAD_FLAGS="-DFPM_DEFAULT"
++cat >>confdefs.h <<\_ACEOF
++#define ARCH_HPPA 1
++_ACEOF
+ 
++    enable_hppaopt=yes
++    ;;
++  arm*)
 +MAD_FLAGS="-DFPM_ARM"
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_ARM 1
  _ACEOF
-@@ -3811,14 +3811,14 @@
+@@ -20040,14 +20048,14 @@
      enable_armopt=yes
      ;;
    sparc*)
@@ -60,7 +69,7 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_MIPS 1
  _ACEOF
-@@ -3826,7 +3826,7 @@
+@@ -20055,7 +20063,7 @@
      enable_mipsopt=yes
      ;;
    ppc*|powerpc*)
@@ -69,12 +78,12 @@
  cat >>confdefs.h <<\_ACEOF
  #define ARCH_POWERPC 1
  _ACEOF
-@@ -3836,7 +3836,7 @@
+@@ -20065,7 +20073,7 @@
  esac
  
  
 -DEFAULT_DEFINES="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $PTHREAD_CFLAGS"
 +DEFAULT_DEFINES="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $PTHREAD_CFLAGS $MAD_FLAGS"
  
- 
      echo "$as_me:$LINENO: checking if you need GNU extensions" >&5
+ echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6
diff --git a/media-video/avifile/files/flvenc-patch b/media-video/avifile/files/flvenc-patch
index a634abdeb344..b71dffcc3dd4 100644
--- a/media-video/avifile/files/flvenc-patch
+++ b/media-video/avifile/files/flvenc-patch
@@ -1,5 +1,5 @@
 --- flvenc.c.org	2003-09-06 17:56:37.000000000 +0000
-+++ ffmpeg/libavformat/flvenc.c	2003-09-06 17:51:55.000000000 +0000
++++ avifile-0.7-0.7.38/ffmpeg/libavformat/flvenc.c	2003-09-06 17:51:55.000000000 +0000
 @@ -224,13 +224,15 @@
  
  static int flv_write_trailer(AVFormatContext *s)
diff --git a/media-video/avifile/files/throw.patch b/media-video/avifile/files/throw.patch
index 696aaaa16cec..cec741b95f15 100644
--- a/media-video/avifile/files/throw.patch
+++ b/media-video/avifile/files/throw.patch
@@ -6,7 +6,7 @@ diff -ru avifile-0.7-0.7.41/include/avm_cpuinfo.h avifile-0.7-0.7.41.new/include
  #endif /* __cplusplus */
  
 -static inline int avm_is_mmx_state() __THROW
-+__THROW static inline int avm_is_mmx_state()
++ __NTH(static inline int avm_is_mmx_state())
  {
  #ifdef ARCH_X86
      if (freq.HaveMMX())
@@ -15,7 +15,7 @@ diff -ru avifile-0.7-0.7.41/include/avm_cpuinfo.h avifile-0.7-0.7.41.new/include
   *  with longcount().
   */
 -static inline float to_float(int64_t tend, int64_t tbegin) __THROW
-+__THROW static inline float to_float(int64_t tend, int64_t tbegin)
++ __NTH(static inline float to_float(int64_t tend, int64_t tbegin))
  {
      return float((tend - tbegin) / (double)freq / 1000.);
  }
@@ -27,7 +27,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
   * - right now dump implementation - as we could check functionality
   */
 -static inline uint16_t avm_get_le16(const void* p) __THROW {
-+__THROW static inline uint16_t avm_get_le16(const void* p) {
++ __NTH(static inline uint16_t avm_get_le16(const void* p) ) {
  #ifdef WORDS_BIGENDIAN 
      const uint8_t* c = (const uint8_t*) p;
      return c[0] | c[1] << 8;
@@ -36,7 +36,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint8_t* avm_set_le16(void* p, uint16_t v) __THROW {
-+__THROW static inline uint8_t* avm_set_le16(void* p, uint16_t v) {
++ __NTH(static inline uint8_t* avm_set_le16(void* p, uint16_t v) ) {
      uint8_t* b = (uint8_t*) p;
  #ifdef WORDS_BIGENDIAN 
      b[0] = v & 0xff;
@@ -45,7 +45,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint32_t avm_get_le32(const void* p) __THROW {
-+__THROW static inline uint32_t avm_get_le32(const void* p) {
++ __NTH(static inline uint32_t avm_get_le32(const void* p) ) {
  #ifdef WORDS_BIGENDIAN 
      const uint8_t* c = (const uint8_t*) p;
      return c[0] | c[1] << 8 | c[2] << 16 | c[3] << 24;
@@ -54,7 +54,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint8_t* avm_set_le32(void* p, uint32_t v) __THROW {
-+__THROW static inline uint8_t* avm_set_le32(void* p, uint32_t v) {
++ __NTH(static inline uint8_t* avm_set_le32(void* p, uint32_t v) ) {
      uint8_t* b = (uint8_t*) p;
  #ifdef WORDS_BIGENDIAN 
      b[0] = v & 0xff;
@@ -63,7 +63,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint64_t avm_get_le64(const void* p) __THROW {
-+__THROW static inline uint64_t avm_get_le64(const void* p) {
++ __NTH(static inline uint64_t avm_get_le64(const void* p) ) {
  #ifdef WORDS_BIGENDIAN 
      const uint8_t* c = (const uint8_t*) p;
      return avm_get_le32(c) | (((uint64_t)avm_get_le32(c + 4)) << 32);
@@ -72,7 +72,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint16_t avm_get_be16(const void* p) __THROW {
-+__THROW static inline uint16_t avm_get_be16(const void* p) {
++ __NTH(static inline uint16_t avm_get_be16(const void* p) ) {
  #ifdef WORDS_BIGENDIAN
      return *(const uint16_t*)p;
  #else
@@ -81,7 +81,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint8_t* avm_set_be16(void* p, uint16_t v) __THROW {
-+__THROW static inline uint8_t* avm_set_be16(void* p, uint16_t v) {
++ __NTH(static inline uint8_t* avm_set_be16(void* p, uint16_t v) ) {
      uint8_t* b = (uint8_t*) p;
      b[0] = (v >> 8) & 0xff;
      b[1] = v & 0xff;
@@ -89,7 +89,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint32_t avm_get_be32(const void* p) __THROW  {
-+__THROW static inline uint32_t avm_get_be32(const void* p) {
++ __NTH(static inline uint32_t avm_get_be32(const void* p) ) {
  #ifdef WORDS_BIGENDIAN
      return *(const uint32_t*)p;
  #else
@@ -98,7 +98,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint8_t* avm_set_be32(void* p, uint32_t v) __THROW {
-+__THROW static inline uint8_t* avm_set_be32(void* p, uint32_t v) {
++ __NTH(static inline uint8_t* avm_set_be32(void* p, uint32_t v) ) {
      uint8_t* b = (uint8_t*) p;
      b[0] = (v >> 24) & 0xff;
      b[1] = (v >> 16) & 0xff;
@@ -107,7 +107,7 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline uint64_t avm_get_be64(const void* p) __THROW  {
-+__THROW static inline uint64_t avm_get_be64(const void* p)  {
++ __NTH(static inline uint64_t avm_get_be64(const void* p) ) {
  #ifdef WORDS_BIGENDIAN
      return *(const uint64_t*)p;
  #else
@@ -116,17 +116,17 @@ diff -ru avifile-0.7-0.7.41/include/utils.h avifile-0.7-0.7.41.new/include/utils
  }
  
 -static inline int avm_img_is_rgb(fourcc_t fmt) __THROW
-+__THROW static inline int avm_img_is_rgb(fourcc_t fmt)
++ __NTH(static inline int avm_img_is_rgb(fourcc_t fmt))
  {
      return ((fmt & 0xffffff00) == IMG_FMT_RGB);
  }
 -static inline int avm_img_is_bgr(fourcc_t fmt) __THROW
-+__THROW static inline int avm_img_is_bgr(fourcc_t fmt)
++ __NTH(static inline int avm_img_is_bgr(fourcc_t fmt))
  {
      return ((fmt & 0xffffff00) == IMG_FMT_BGR);
  }
 -static inline int avm_img_get_depth(fourcc_t fmt) __THROW
-+__THROW static inline int avm_img_get_depth(fourcc_t fmt)
++ __NTH(static inline int avm_img_get_depth(fourcc_t fmt))
  {
      return fmt & 0xff;
  }
@@ -138,7 +138,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/fcc_type.c avifile-0.7-0.7.41.new/lib/com
  //#include <stdio.h>
  
 -const char* avm_fcc_name(fourcc_t fcc) __THROW
-+__THROW const char* avm_fcc_name(fourcc_t fcc)
++ __NTH(const char* avm_fcc_name(fourcc_t fcc))
  {
      switch (fcc)
      {
@@ -147,7 +147,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/fcc_type.c avifile-0.7-0.7.41.new/lib/com
  };
  
 -const char *avm_img_format_name(fourcc_t fmt) __THROW
-+__THROW const char *avm_img_format_name(fourcc_t fmt)
++ __NTH(const char *avm_img_format_name(fourcc_t fmt))
  {
      const struct dts* t = data;
  
@@ -159,7 +159,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
  int64_t (*longcount)(void);
  
 -WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf) __THROW
-+__THROW WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf)
++ __NTH(WAVEFORMATEX* avm_get_leWAVEFORMATEX(WAVEFORMATEX* wf))
  {
      wf->wFormatTag	= avm_get_le16(&wf->wFormatTag);
      wf->nChannels	= avm_get_le16(&wf->nChannels);
@@ -168,7 +168,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
  }
  
 -BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi) __THROW
-+__THROW BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi)
++ __NTH(BITMAPINFOHEADER* avm_get_leBITMAPINFOHEADER(BITMAPINFOHEADER* bi))
  {
      bi->biSize		= avm_get_le32(&bi->biSize);
      bi->biWidth		= avm_get_le32(&bi->biWidth);
@@ -177,7 +177,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
   */
  #ifndef WIN32
 -int avm_usleep(unsigned long delay) __THROW
-+__THROW int avm_usleep(unsigned long delay)
++ __NTH(int avm_usleep(unsigned long delay))
  {
  #if   HAVE_NANOSLEEP
      struct timespec tsp;
@@ -186,7 +186,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
   * and avm_unsetenv() in libc, provide our own implementation.
   */
 -int avm_setenv(const char *name, const char *value, int overwrite) __THROW
-+__THROW int avm_setenv(const char *name, const char *value, int overwrite)
++ __NTH(int avm_setenv(const char *name, const char *value, int overwrite))
  {
  #if HAVE_SETENV
      return setenv(name, value, overwrite);
@@ -195,7 +195,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/utils.c avifile-0.7-0.7.41.new/lib/common
  }
  
 -void avm_unsetenv(const char *name) __THROW
-+__THROW void avm_unsetenv(const char *name) 
++ __NTH(void avm_unsetenv(const char *name) )
  {
  #if HAVE_UNSETENV
      unsetenv(name);
@@ -207,7 +207,7 @@ diff -ru avifile-0.7-0.7.41/lib/common/wave_type.c avifile-0.7-0.7.41.new/lib/co
  #include <stdio.h>
  
 -const char* avm_wave_format_name(short fmt) __THROW
-+__THROW const char* avm_wave_format_name(short fmt) 
++ __NTH(const char* avm_wave_format_name(short fmt) )
  {
      switch ((unsigned short)fmt)
      {
@@ -216,7 +216,18 @@ diff -ru avifile-0.7-0.7.41/lib/common/wave_type.c avifile-0.7-0.7.41.new/lib/co
  }
  
 -char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf) __THROW
-+__THROW char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf)
++ __NTH(char* avm_wave_format(char* buf, uint_t s, const WAVEFORMATEX* wf))
  {
      if (buf)
      {
+--- avifile-0.7-0.7.41/include/avm_default.h	2004-03-10 10:58:24.000000000 +0100
++++ avifile-0.7-0.7.41/include/avm_default.h.new	2004-10-07 09:26:27.571849713 +0200
+@@ -76,4 +76,8 @@
+ #define __THROW
+ #endif
+ 
++#ifndef __NTH
++#define __NTH(func) func
++#endif
++
+ #endif /* AVIFILE_DEFAULT_H */
diff --git a/media-video/avifile/metadata.xml b/media-video/avifile/metadata.xml
index 0c2b9fd7fead..a4a2e2cc4ec2 100644
--- a/media-video/avifile/metadata.xml
+++ b/media-video/avifile/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>video</herd>
 <maintainer><email>mholzer@gentoo.org</email></maintainer>
 <maintainer><email>max@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/media-video/avinfo/ChangeLog b/media-video/avinfo/ChangeLog
index 5b300102f9c4..2146aff059b1 100644
--- a/media-video/avinfo/ChangeLog
+++ b/media-video/avinfo/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for media-video/avinfo
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avinfo/ChangeLog,v 1.1 2004/11/16 15:28:08 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avinfo/ChangeLog,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  avinfo-1.0_alpha15.ebuild:
+  Stable on ppc.
+
+  10 May 2005; David Holm <dholm@gentoo.org> avinfo-1.0_alpha15.ebuild:
+  Added to ~ppc.
+
+  08 May 2005; Malcolm Lashley <malc@gentoo.org> :
+  ~amd64 - Closes bug #91390 - Tested with every avi on my system.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  17 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> avinfo-1.0_alpha15.ebuild:
+  added missing unzip dependency. see #69831
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Fixed herd in metadata.xml.
+
+  26 Nov 2004; Chris White <chriswhite@gentoo.org> avinfo-1.0_alpha15.ebuild:
+  Use custom cflags. Marked stable on x86 by testing on 17 uniquely encoded avi
+  files on stable x86 system.
 
 *avinfo-1.0_alpha15 (17 Nov 2004)
 
diff --git a/media-video/avinfo/Manifest b/media-video/avinfo/Manifest
index 3691606545b9..7a5e9d22a7f0 100644
--- a/media-video/avinfo/Manifest
+++ b/media-video/avinfo/Manifest
@@ -1,4 +1,4 @@
-MD5 6e37d2bb0d50d90fae85b3dde400f2b5 avinfo-1.0_alpha15.ebuild 525
-MD5 194354179c380c5dab0498d715fae079 metadata.xml 230
-MD5 121c98578540229e2c84e3ac7f784088 ChangeLog 397
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 d332f71b29b128809952c017d476da60 ChangeLog 1320
+MD5 c9c8c3e85bdb3ede33c173be02c5c4a0 avinfo-1.0_alpha15.ebuild 674
 MD5 ebc518a8585fd39dbe7888a14b38975b files/digest-avinfo-1.0_alpha15 62
diff --git a/media-video/avinfo/avinfo-1.0_alpha15.ebuild b/media-video/avinfo/avinfo-1.0_alpha15.ebuild
index 63405925801a..d638c35a46f2 100644
--- a/media-video/avinfo/avinfo-1.0_alpha15.ebuild
+++ b/media-video/avinfo/avinfo-1.0_alpha15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/avinfo/avinfo-1.0_alpha15.ebuild,v 1.1 2004/11/16 15:28:08 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avinfo/avinfo-1.0_alpha15.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit eutils
 
@@ -11,16 +11,16 @@ SRC_URI="http://shounen.ru/soft/avinfo/${MY_P}.zip"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc x86"
 
 IUSE=""
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
 src_compile() {
 	cd src
-	emake OUTPUTNAME=avinfo || die
+	emake CFLAGS="${CFLAGS}" OUTPUTNAME=avinfo || die
 }
 
 src_install() {
diff --git a/media-video/avinfo/metadata.xml b/media-video/avinfo/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/avinfo/metadata.xml
+++ b/media-video/avinfo/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/bbtools/ChangeLog b/media-video/bbtools/ChangeLog
index f1e7aa2df5b8..50a3c784f084 100644
--- a/media-video/bbtools/ChangeLog
+++ b/media-video/bbtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/bbtools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/ChangeLog,v 1.1 2005/03/27 23:14:13 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/ChangeLog,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
+
+  16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> bbtools-1.9.ebuild:
+  needs app-arch/unzip; tidy
+
+  10 May 2005; David Holm <dholm@gentoo.org> bbtools-1.9.ebuild:
+  Added to ~ppc.
 
 *bbtools-1.9 (28 Mar 2005)
 
diff --git a/media-video/bbtools/Manifest b/media-video/bbtools/Manifest
index 2aac47222c34..e99f07c4171d 100644
--- a/media-video/bbtools/Manifest
+++ b/media-video/bbtools/Manifest
@@ -1,3 +1,5 @@
-MD5 d31f54e098e4facadc24ecc087f74e7f bbtools-1.9.ebuild 742
-MD5 3935934a35196bfef16ebe39883f7200 files/bbtools-1.9-gentoo.patch 2768
+MD5 6059c9f32e94dffa31351ebdfa61917c metadata.xml 559
+MD5 0bb363190c317e24032bfa93aa11df11 bbtools-1.9.ebuild 915
+MD5 b248079b8bc723ac8a6ec0402e30df96 ChangeLog 640
 MD5 a4a1e55a94bc7019f6c88f684d1286f4 files/digest-bbtools-1.9 60
+MD5 3935934a35196bfef16ebe39883f7200 files/bbtools-1.9-gentoo.patch 2768
diff --git a/media-video/bbtools/bbtools-1.9.ebuild b/media-video/bbtools/bbtools-1.9.ebuild
index 4397b10fdff1..0dfa221e1603 100644
--- a/media-video/bbtools/bbtools-1.9.ebuild
+++ b/media-video/bbtools/bbtools-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-video/bbtools/bbtools-1.9.ebuild,v 1.1 2005/03/27 23:14:13 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bbtools/bbtools-1.9.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 inherit eutils
 
@@ -10,30 +10,31 @@ SRC_URI="http://files.digital-digest.com/downloads/files/encode/bbtool${PV/./}_s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="~ppc ~x86"
 IUSE=""
-DEPEND="virtual/libc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
 
 S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
 
-	mv BBINFO.cpp bbinfo.cpp
-	mv BITS.CPP bits.cpp
-	mv BITS.H bits.h
-	mv bbdmux.CPP bbdmux.cpp
+	mv BBINFO.cpp bbinfo.cpp || die
+	mv BITS.CPP bits.cpp || die
+	mv BITS.H bits.h || die
+	mv bbdmux.CPP bbdmux.cpp || die
 	rm *.ide
 	edos2unix *.cpp *.h
 
-	epatch ${FILESDIR}/bbtools-${PV}-gentoo.patch
+	epatch "${FILESDIR}"/bbtools-${PV}-gentoo.patch
 }
 
 src_compile() {
-	make || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	dobin bbainfo bbdmux bbinfo bbvinfo
+	dobin bbainfo bbdmux bbinfo bbvinfo || die "dobin failed"
 }
diff --git a/media-video/binkplayer/ChangeLog b/media-video/binkplayer/ChangeLog
index c427e4890498..19153292c1da 100644
--- a/media-video/binkplayer/ChangeLog
+++ b/media-video/binkplayer/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-video/binkplayer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/ChangeLog,v 1.1 2003/11/17 21:42:59 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
+
+*binkplayer-1.8c (25 May 2005)
+
+  25 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +binkplayer-1.8c.ebuild:
+  version bump
+
+*binkplayer-1.6g (12 Sep 2004)
+
+  12 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +binkplayer-1.6g.ebuild:
+  version bump (bug #63835)
+
+*binkplayer-1.6d (16 Jul 2004)
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +binkplayer-1.6d.ebuild:
+  version bump
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  binkplayer-1.5y.ebuild, binkplayer-1.6b.ebuild, binkplayer-1.6c.ebuild:
+  virtual/glibc -> virtual/libc
+
+*binkplayer-1.6c (27 Mar 2004)
+
+  27 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> binkplayer-1.6c.ebuild:
+  version bump
+
+*binkplayer-1.6b (19 Jan 2004)
+
+  19 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> binkplayer-1.5y.ebuild,
+  binkplayer-1.6b.ebuild:
+  mark 1.5 stable for x86; version bump for unstable
 
 *binkplayer-1.5y (17 Nov 2003)
 
diff --git a/media-video/binkplayer/Manifest b/media-video/binkplayer/Manifest
index 0d95b14989c2..5f07677b4892 100644
--- a/media-video/binkplayer/Manifest
+++ b/media-video/binkplayer/Manifest
@@ -1,2 +1,10 @@
-MD5 5d7a92c2fd53a8103fdad1548726c9e2 binkplayer-1.5y.ebuild 648
-MD5 8cfa8d4eef43eb608f2d110ad0d7b1bd files/digest-binkplayer-1.5y 64
+MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
+MD5 c5d86141f4b7d0c716314e3e5642a4d8 binkplayer-1.8c.ebuild 755
+MD5 7a33c5354a3d6960306d0fe0fa88aac1 binkplayer-1.6d.ebuild 757
+MD5 baca13359b7ca29809950b7b92957d70 binkplayer-1.6g.ebuild 757
+MD5 5fcf0626b10a335dd7f170e71c56cba4 ChangeLog 1246
+MD5 4443283065bed7fb9f34507f96f6faf5 binkplayer-1.6c.ebuild 758
+MD5 e6f15fdc2d45c3b9779e438ee16fecc1 files/digest-binkplayer-1.6g 64
+MD5 d2a577ded3512db9f4b323a5f2fe80e3 files/digest-binkplayer-1.6c 64
+MD5 2c516e804abcb7ee21fce51503ecf3d8 files/digest-binkplayer-1.6d 64
+MD5 2bd9e9971bf501fde61632271c25557b files/digest-binkplayer-1.8c 64
diff --git a/media-video/binkplayer/binkplayer-1.6c.ebuild b/media-video/binkplayer/binkplayer-1.6c.ebuild
index 8dc86c89ede2..0ff5efea67ab 100644
--- a/media-video/binkplayer/binkplayer-1.6c.ebuild
+++ b/media-video/binkplayer/binkplayer-1.6c.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-video/binkplayer/binkplayer-1.6c.ebuild,v 1.1 2004/03/28 06:48:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/binkplayer-1.6c.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 DESCRIPTION="Bink Video! Player"
 HOMEPAGE="http://www.radgametools.com/default.htm"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.radgametools.com/default.htm"
 SRC_URI="mirror://gentoo/${P}.zip"
 
 DEPEND="app-arch/unzip"
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	media-libs/libsdl
 	media-libs/sdl-mixer"
 
diff --git a/media-video/binkplayer/binkplayer-1.6d.ebuild b/media-video/binkplayer/binkplayer-1.6d.ebuild
index e2d6f396ced9..930d9f10a2fd 100644
--- a/media-video/binkplayer/binkplayer-1.6d.ebuild
+++ b/media-video/binkplayer/binkplayer-1.6d.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-video/binkplayer/binkplayer-1.6d.ebuild,v 1.1 2004/07/17 02:18:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/binkplayer-1.6d.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 DESCRIPTION="Bink Video! Player"
 HOMEPAGE="http://www.radgametools.com/default.htm"
diff --git a/media-video/binkplayer/binkplayer-1.6g.ebuild b/media-video/binkplayer/binkplayer-1.6g.ebuild
index ed986c53748e..7d24c85ab13f 100644
--- a/media-video/binkplayer/binkplayer-1.6g.ebuild
+++ b/media-video/binkplayer/binkplayer-1.6g.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-video/binkplayer/binkplayer-1.6g.ebuild,v 1.1 2004/09/12 22:32:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/binkplayer-1.6g.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 DESCRIPTION="Bink Video! Player"
 HOMEPAGE="http://www.radgametools.com/default.htm"
diff --git a/media-video/binkplayer/binkplayer-1.8c.ebuild b/media-video/binkplayer/binkplayer-1.8c.ebuild
index 07f3319d5d63..747094de3fa0 100644
--- a/media-video/binkplayer/binkplayer-1.8c.ebuild
+++ b/media-video/binkplayer/binkplayer-1.8c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/binkplayer-1.8c.ebuild,v 1.1 2005/05/25 02:38:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/binkplayer/binkplayer-1.8c.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 DESCRIPTION="Bink Video! Player"
 HOMEPAGE="http://www.radgametools.com/default.htm"
diff --git a/media-video/came/ChangeLog b/media-video/came/ChangeLog
index dd30a796366f..76a86b7fa12f 100644
--- a/media-video/came/ChangeLog
+++ b/media-video/came/ChangeLog
@@ -1,7 +1,31 @@
 # ChangeLog for media-video/came
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/came/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-video/came/ChangeLog,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*came-1.9 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +came-1.9.ebuild:
+  Version bump.
+
+  10 May 2005; David Holm <dholm@gentoo.org> came-1.7.ebuild:
+  Added to ~ppc.
+
+*came-1.7 (29 Dec 2003)
+
+  11 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to define TRUE/FALSE if they're not already defined.
+  #47424 by Claes Nästén.
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> came-1.7.ebuild:
+  Version bumped. Closes 34158
+
+*came-1.3 (09 Feb 2003)
+
+  09 Feb 2003; Jared H. Hudson <jhhudso@gentoo.org> : Version bump.
+	
 *came-1.2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/media-video/came/Manifest b/media-video/came/Manifest
index e69de29bb2d1..3a3039765cc1 100644
--- a/media-video/came/Manifest
+++ b/media-video/came/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cfb43c02f4ed5d9b15f60f7aff7e1ace came-1.9.ebuild 730
+MD5 b1a58a9eebfee381f6414ee4125be12b came-1.7.ebuild 846
+MD5 3ab58c86719dde2a493f617bed8aa556 metadata.xml 219
+MD5 742d5cd0cfe3a9bd700def77924786c8 ChangeLog 1327
+MD5 1fa59c4f95015feb3cb965f4c9951304 files/digest-came-1.7 59
+MD5 c56b3f3e9001377bd3df60c9274718c1 files/digest-came-1.9 59
+MD5 789d8429d5cdaa27f79660c1511ed047 files/1.7-true-false.patch 391
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1CmLLFUmVNQ7rkRAmOMAJ9PGspJx6CzkRTTkeWmbqZsS4s0gQCgnw1w
+Pe+Y86b0SustL9S/e8yTugQ=
+=jhWQ
+-----END PGP SIGNATURE-----
diff --git a/media-video/came/came-1.7.ebuild b/media-video/came/came-1.7.ebuild
index 07cdd7e5faac..79e9277ac433 100644
--- a/media-video/came/came-1.7.ebuild
+++ b/media-video/came/came-1.7.ebuild
@@ -1,30 +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-video/came/came-1.7.ebuild,v 1.1 2003/12/29 10:58:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/came/came-1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
-S=${WORKDIR}/camE-${PV}
-DESCRIPTION="camE is a rewrite of the xawtv webcam app, which adds imlib2 support and a lot of new features"
-SRC_URI="http://linuxbrit.co.uk/downloads/camE-${PV}.tar.gz"
+inherit eutils
+
+DESCRIPTION="rewrite of the xawtv webcam app, which adds imlib2 support and a lot of new features"
 HOMEPAGE="http://linuxbrit.co.uk/camE/"
+SRC_URI="http://linuxbrit.co.uk/downloads/camE-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
-DEPEND=">=net-ftp/curl-7.9.1
+DEPEND=">=net-misc/curl-7.9.1
 	>=media-libs/giblib-1.2.3"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
+S=${WORKDIR}/camE-${PV}
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	sed -i -e "s:/usr/local:/usr:" Makefile
+	epatch ${FILESDIR}/${PV}-true-false.patch
+}
+
+src_compile() {
 	emake || die
 }
 
-src_install () {
-	insinto /usr
-	dobin camE
-	dodoc AUTHORS
-	dodoc camE_text.style
-	dodoc camE_title.style
-	dodoc example.camErc
-	dodoc example.camErc.ssh
+src_install() {
+	dobin camE || die
+	dodoc AUTHORS camE_text.style camE_title.style example.camErc example.camErc.ssh
 }
diff --git a/media-video/came/came-1.9.ebuild b/media-video/came/came-1.9.ebuild
index 476b6f8cff6b..863c9c5f9fca 100644
--- a/media-video/came/came-1.9.ebuild
+++ b/media-video/came/came-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-video/came/came-1.9.ebuild,v 1.1 2005/07/17 11:07:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/came/came-1.9.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/came/metadata.xml b/media-video/came/metadata.xml
index 1cadc2e4ec21..dddcf641a419 100644
--- a/media-video/came/metadata.xml
+++ b/media-video/came/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>video</herd>
 <maintainer>
-  <email>media-video@gentoo.org</email>
+ <email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog
index 21f1b3835d49..2d33e79e6fc0 100644
--- a/media-video/camorama/ChangeLog
+++ b/media-video/camorama/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/camorama
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.1 2003/04/13 17:56:13 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
+
+  25 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> camorama-0.17.ebuild:
+  Added to ~ppc, bug 79239.
+
+  06 Dec 2004; Karol Wojtaszek <sekretarz@gentoo.org> camorama-0.17.ebuild:
+  Added to ~amd64, bug #60984
+
+*camorama-0.17 (26 Nov 2004)
+
+  26 Nov 2004; Chris White <chriswhite@gentoo.org> metadata.xml,
+  +camorama-0.17.ebuild:
+  Fixed bad metadata.xml and bumped to version 0.17.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Added missing metadata.xml.
 
 *camorama-0.16 (13 Apr 2003)
 
diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
index bc13dddfa809..d959ef03719b 100644
--- a/media-video/camorama/Manifest
+++ b/media-video/camorama/Manifest
@@ -1,2 +1,6 @@
-MD5 7b00e3579d4cbf4a1ba024f7263d9abc camorama-0.16.ebuild 403
+MD5 ae4e57adb8abb6ceb9f5f4eeea55a492 camorama-0.16.ebuild 655
+MD5 6c09e582882781b8e5e951830cc70bf9 metadata.xml 224
+MD5 372798ecf44adec6103371e49efe2993 ChangeLog 842
+MD5 740eb120a1cc41f836f1a3af18000a1c camorama-0.17.ebuild 669
 MD5 728eb1852fda23d5f256ad3407321e20 files/digest-camorama-0.16 65
+MD5 9a2c7e8eab2e03086ac2a287651ae019 files/digest-camorama-0.17 66
diff --git a/media-video/camorama/camorama-0.16.ebuild b/media-video/camorama/camorama-0.16.ebuild
index f9f6d263e9d3..411acac3b4ec 100644
--- a/media-video/camorama/camorama-0.16.ebuild
+++ b/media-video/camorama/camorama-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-video/camorama/camorama-0.16.ebuild,v 1.1 2003/04/13 17:56:13 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.16.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
 inherit gnome2
 
@@ -11,14 +11,12 @@ SRC_URI="http://camorama.fixedgear.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 DEPEND=">=x11-libs/gtk+-2.0
 	>=gnome-base/libgnomeui-2.0
 	>=gnome-base/gconf-2.0
 	>=gnome-base/libglade-2.0
 	>=sys-devel/gettext-0.11
 	>=dev-util/intltool-0.20"
-	
-S=${WORKDIR}/${P}
 
 SCROLLKEEPER_UPDATE="0"
diff --git a/media-video/camorama/camorama-0.17.ebuild b/media-video/camorama/camorama-0.17.ebuild
index b289c73703f5..d68117ef1011 100644
--- a/media-video/camorama/camorama-0.17.ebuild
+++ b/media-video/camorama/camorama-0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/camorama/camorama-0.17.ebuild,v 1.1 2004/11/25 21:52:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.17.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="http://camorama.fixedgear.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 DEPEND=">=x11-libs/gtk+-2.0
 	>=gnome-base/libgnomeui-2.0
 	>=gnome-base/gconf-2.0
diff --git a/media-video/camorama/metadata.xml b/media-video/camorama/metadata.xml
index da89b65a8e42..2c5e04917119 100644
--- a/media-video/camorama/metadata.xml
+++ b/media-video/camorama/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>video</herd>
 <maintainer>
-	<email></email>
+	<email>media-video@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-video/camserv/ChangeLog b/media-video/camserv/ChangeLog
index ede0753e00e0..0d4444148959 100644
--- a/media-video/camserv/ChangeLog
+++ b/media-video/camserv/ChangeLog
@@ -1,11 +1,61 @@
 # ChangeLog for media-video/camserv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.1 2002/06/18 20:34:39 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/ChangeLog,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  camserv-0.5.1-r2.ebuild:
+  Fix dependencies: autoconf is not a runtime dep. Use eautoconf from
+  autotools eclass. Use newinitd.
+
+  26 Nov 2004; Chris White <chriswhite@gentoo.org> -camserv-0.5.0.ebuild:
+  Old ebuild cleanup.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  05 Jul 2004; David Holm <dholm@gentoo.org> camserv-0.5.1-r2.ebuild:
+  Added to ~ppc.
+
+  11 Jun 2004; Mike Frysinger <vapier@gentoo.org> camserv-0.5.0.ebuild,
+  -camserv-0.5.1-r1.ebuild, camserv-0.5.1-r2.ebuild, -camserv-0.5.1.ebuild:
+  Fix the ugly hack to work around the old libtool configure files.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> camserv-0.5.1-r1.ebuild,
+  camserv-0.5.1-r2.ebuild, camserv-0.5.1.ebuild:
+  Add inherit eutils
+
+  13 Oct 2003; Martin Holzer <mholzer@gentoo.org> camserv-0.5.1-r1.ebuild,
+  camserv-0.5.1.ebuild:
+  added gcc3 patch. Closes #29041.
+
+  06 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> camserv-0.5.0.ebuild,
+  camserv-0.5.1-r2.ebuild, files/camserv-0.5-errno.patch:
+  Added patch for the "errno" issue, see bug 29041.
+
+*camserv-0.5.1-r2 (19 Jun 2003)
+
+  19 Jun 2003; mkeadle <mkeadle@gentoo.org> camserv-0.5.1-r2.ebuild,
+  files/camserv.init:
+  adding init script to start/stop camserv. closes bug request #22204.
+
+  09 Feb 2003; Jared Hudson <jhhudso@gentoo.org> : Fixed a bug that was
+  keeping it from compiling.
+	
+*camserv-0.5.1-r1 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*camserv-0.5.1 (08 Feb 2003)
+
+  08 Feb 2003; Jared Hudson <jhhudso@gentoo.org> : Version bump.
+	
 *camserv-0.5.0 (18 Jun 2002)
 
+  17 Sep 2002; Nick Hadaway <raker@gentoo.org> camserv-0.5.0.ebuild :
+  Updated ebuild as suggested on bug #8033
+
   18 Jun 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/media-video/camserv/Manifest b/media-video/camserv/Manifest
index e69de29bb2d1..eba5428ee693 100644
--- a/media-video/camserv/Manifest
+++ b/media-video/camserv/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3806929133884075b17bc6950d523b06 camserv-0.5.1-r2.ebuild 815
+MD5 f7c5e50e04e0c2d8697ae85d2f19b721 ChangeLog 2464
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 bf0782107eda233c33ce533acf362e48 files/camserv.init 553
+MD5 fb27a1787753b6c9ee46b573c6b8fc5e files/camserv-0.5-errno.patch 3105
+MD5 0cc8188d6f8abfc2eb25e9b9352283ac files/digest-camserv-0.5.1-r2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGMY3j5H05b2HAEkRAg6BAJ45sI0G4PAhCDa2zQGMKY0CrGUP+ACeMKPG
+Pq7xcV7wGMqirluN6A0QwQw=
+=ONrK
+-----END PGP SIGNATURE-----
diff --git a/media-video/camserv/camserv-0.5.1-r2.ebuild b/media-video/camserv/camserv-0.5.1-r2.ebuild
index 6a669e38e1c0..fb1d161ec711 100644
--- a/media-video/camserv/camserv-0.5.1-r2.ebuild
+++ b/media-video/camserv/camserv-0.5.1-r2.ebuild
@@ -1,56 +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-video/camserv/camserv-0.5.1-r2.ebuild,v 1.1 2003/06/19 19:03:50 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/camserv-0.5.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A streaming video server."
-SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
+inherit eutils autotools
+
+DESCRIPTION="A streaming video server"
 HOMEPAGE="http://cserv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cserv/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
-DEPEND=">=media-libs/jpeg-6b-r2
+RDEPEND=">=media-libs/jpeg-6b-r2
 	>=media-libs/imlib-1.9.13-r2"
 
-src_compile() {
-
-	_CC="${CC}"
-	_CFLAGS="${CFLAGS}"
-	_CXXFLAGS="${CXXFLAGS}"
-	_CHOST="${CHOST}"
-	unset CC
-	unset CFLAGS
-	unset CXXFLAGS
-	unset CHOST
-
-        ./configure \
-           --prefix=/usr \
-           --mandir=/usr/share/man \
-           --infodir=/usr/share/info \
-           --datadir=/usr/share \
-           --sysconfdir=/etc \
-           --localstatedir=/var/lib || die "./configure failed"
-
-	CC="${_CC}"
-	CFLAGS="${_CFLAGS}"
-	CXXFLAGS="${_CXXFLAGS}"
-	CHOST="${_CHOST}"
-
-	emake || die
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.5-errno.patch
+	cd libltdl
+	eautoconf
 }
 
-src_install () {
-
-	einstall datadir=${D}/usr/share/${PN} || die
-
-	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO javascript.txt
-	dohtml defpage.html
-	# new init script
-	insinto /etc/init.d
-	newins ${FILESDIR}/camserv.init camserv
-	fperms +x /etc/init.d/camserv
+src_install() {
+	make install DESTDIR=${D} || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO javascript.txt
 
+	newinitd ${FILESDIR}/camserv.init camserv
 }
diff --git a/media-video/camserv/files/camserv.init b/media-video/camserv/files/camserv.init
index a717b7a45498..7ccfdcd73543 100644
--- a/media-video/camserv/files/camserv.init
+++ b/media-video/camserv/files/camserv.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/files/camserv.init,v 1.1 2003/06/19 19:03:50 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camserv/files/camserv.init,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 depend() {
     need net
diff --git a/media-video/camserv/metadata.xml b/media-video/camserv/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/camserv/metadata.xml
+++ b/media-video/camserv/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/camsource/ChangeLog b/media-video/camsource/ChangeLog
index 59ae423e4e7a..9dc658875589 100644
--- a/media-video/camsource/ChangeLog
+++ b/media-video/camsource/ChangeLog
@@ -1 +1,55 @@
-Camsource Initial Commit by ZhEN <zhen@gentoo.org>
+# ChangeLog for media-video/camsource
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camsource/ChangeLog,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> camsource-0.7.0.ebuild,
+  camsource-0.7.0-r1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  16 Aug 2005; Luis Medinas <metalgod@gentoo.org> camsource-0.7.0-r1.ebuild:
+  Added ~amd64 keywords. Closes bug #98422.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  camsource-0.7.0-r1.ebuild:
+  Stable on ppc.
+
+  01 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +files/gcc34.patch,
+  camsource-0.7.0-r1.ebuild:
+  Added a missing semicolon (failed with gcc 3.4).
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> camsource-0.5.1.ebuild,
+  camsource-0.7.0-r1.ebuild, camsource-0.7.0.ebuild:
+  Changed SRC_URI to use mirror:// syntax. Removed RDEPEND="".
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org> camsource-0.7.0-r1.ebuild:
+  Stable on sparc.
+
+*camsource-0.7.0-r1 (10 Jun 2003)
+
+  10 Jun 2003; <zhen@gentoo.org> camsource-0.7.0-r1.ebuild:
+  Added ~ppc to the keywords, because it compiles fine on my ibook 750
+  
+
+*camsource-0.7.0-r1 (09 Jun 2003)
+
+  09 Jun 2003; <zhen@gentoo.org> camsource-0.7.0-r1.ebuild:
+  Initial import, I tagged it as stable because the only change
+  from the 0.7.0 ebuild was that installed the necessary docs
+  that came with it. I don't know why it wasn't done before,
+  must have been an oversight.
+
+*camsource-0.7.0 (09 Jun 2003)
+
+  09 Jun 2003; <zhen@gentoo.org> camsource-0.7.0.ebuild:
+  Marked as stable for x86.
+
+*camsource-0.7.0 (05 May 2003)
+
+  05 May 2003; <zhen@gentoo.org> camsource-0.7.0.ebuild:
+  just the updated ebuild, nothing too crazy. I changed the description so it
+  wasn't so fugly.
+
+*camsource-0.5.1 (26 Nov 2002)
+
+  26 Nov 2002; ZhEN <zhen@gentoo.org> :
+  Initial import.
diff --git a/media-video/camsource/Manifest b/media-video/camsource/Manifest
index e69de29bb2d1..ff9f1050eb39 100644
--- a/media-video/camsource/Manifest
+++ b/media-video/camsource/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8e70e49f60d377846db37a195691c910 camsource-0.5.1.ebuild 873
+MD5 bc2a5a511eb4dc60ec0ec612ad5d6cee ChangeLog 1914
+MD5 44a0f1af09515ff1330dcda3d5c9f166 camsource-0.7.0.ebuild 755
+MD5 a2c5e5d37bcbe01e2f92ec71769a2ecf camsource-0.7.0-r1.ebuild 863
+MD5 a63918ab97ab6a3af981fd661ce4fa13 metadata.xml 240
+MD5 0555dd5d68747acc49fb1b15c7868ffc files/gcc34.patch 181
+MD5 8630e4637bf5d94b5908cf1b41e6dc31 files/digest-camsource-0.5.1 67
+MD5 3ae193dc0b1b9dad7855eaeae74cec78 files/digest-camsource-0.7.0 67
+MD5 3ae193dc0b1b9dad7855eaeae74cec78 files/digest-camsource-0.7.0-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGjEBj5H05b2HAEkRAgkSAJ9xKOSda5joRwOrSIGFbWCCU2NdNQCghzSb
+xZyuWusg/FXFZYmLjY/VzJ8=
+=boXy
+-----END PGP SIGNATURE-----
diff --git a/media-video/camsource/camsource-0.5.1.ebuild b/media-video/camsource/camsource-0.5.1.ebuild
index 3a99a24e2998..652ff017e872 100644
--- a/media-video/camsource/camsource-0.5.1.ebuild
+++ b/media-video/camsource/camsource-0.5.1.ebuild
@@ -1,38 +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-video/camsource/camsource-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 DESCRIPTION="Camsource grabs images from a video4linux device and makes them available
-			to various plugins for processing or handling. Camsource can also be used 
+			to various plugins for processing or handling. Camsource can also be used
 			as a streaming webcam server."
 
 HOMEPAGE="http://camsource.sourceforge.net/"
-SRC_URI="ftp://ftp.sf.net/pub/sourceforge/camsource/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/camsource/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~sparc64 ~ppc ~alpha"
+KEYWORDS="x86 sparc ~ppc ~alpha"
 IUSE=""
 
-DEPEND=">=dev-libs/libxml2-2.4.22 
-		>=media-libs/imlib-1.9.13-r2"
-		
-RDEPEND=""
-S=${WORKDIR}/${P}
+DEPEND=">=dev-libs/libxml2-2.4.22
+		>=media-libs/jpeg-6b"
 
 src_compile() {
-	
+
 	econf || die
 	emake || die
 }
 
 src_install() {
-	
-	einstall 
+
+	einstall
 }
 
 pkg_postinst() {
 
-	einfo "Please edit the configuration file: "
+	einfo
+	einfo "Please edit the configuration file:"
 	einfo "/etc/camsource.conf.example"
 	einfo "to your liking."
+	einfo
 
 }
diff --git a/media-video/camsource/camsource-0.7.0-r1.ebuild b/media-video/camsource/camsource-0.7.0-r1.ebuild
index 7e7e572ee877..42a29d82a587 100644
--- a/media-video/camsource/camsource-0.7.0-r1.ebuild
+++ b/media-video/camsource/camsource-0.7.0-r1.ebuild
@@ -1,40 +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/media-video/camsource/camsource-0.7.0-r1.ebuild,v 1.1 2003/06/09 04:24:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camsource/camsource-0.7.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Camsource grabs images from a video4linux webcam device."
 
 HOMEPAGE="http://camsource.sourceforge.net/"
-SRC_URI="http://umn.dl.sourceforge.net/sourceforge/camsource/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/camsource/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND=">=dev-libs/libxml2-2.4.22 
+DEPEND=">=dev-libs/libxml2-2.4.22
 		>=media-libs/jpeg-6b"
-		
-RDEPEND=""
-S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gcc34.patch
+}
 
 src_compile() {
-	
 	econf || die
 	emake || die
 }
 
 src_install() {
-	
+
 	einstall
-	dodoc AUTHORS COPYING INSTALL README NEWS
+	dodoc AUTHORS README NEWS
 }
 
 pkg_postinst() {
 
-	einfo ""
-	einfo "Please edit the configuration file: "
+	einfo
+	einfo "Please edit the configuration file:"
 	einfo "/etc/camsource.conf.example"
 	einfo "to your liking."
-	einfo ""
+	einfo
 
 }
diff --git a/media-video/camsource/camsource-0.7.0.ebuild b/media-video/camsource/camsource-0.7.0.ebuild
index 356b44053f16..b59fffeb730f 100644
--- a/media-video/camsource/camsource-0.7.0.ebuild
+++ b/media-video/camsource/camsource-0.7.0.ebuild
@@ -1,39 +1,37 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camsource/camsource-0.7.0.ebuild,v 1.1 2003/05/05 15:48:16 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camsource/camsource-0.7.0.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 DESCRIPTION="Camsource grabs images from a video4linux webcam device."
 
 HOMEPAGE="http://camsource.sourceforge.net/"
-SRC_URI="http://umn.dl.sourceforge.net/sourceforge/camsource/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/camsource/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=dev-libs/libxml2-2.4.22 
+DEPEND=">=dev-libs/libxml2-2.4.22
 		>=media-libs/jpeg-6b"
-		
-RDEPEND=""
-S=${WORKDIR}/${P}
 
 src_compile() {
-	
+
 	econf || die
 	emake || die
 }
 
 src_install() {
-	
-	einstall 
+
+	einstall
+	dodoc AUTHORS README NEWS
 }
 
 pkg_postinst() {
 
-	einfo ""
-	einfo "Please edit the configuration file: "
+	einfo
+	einfo "Please edit the configuration file:"
 	einfo "/etc/camsource.conf.example"
 	einfo "to your liking."
-	einfo ""
+	einfo
 
 }
diff --git a/media-video/camsource/metadata.xml b/media-video/camsource/metadata.xml
index c03f955d13de..36f5d9be7740 100644
--- a/media-video/camsource/metadata.xml
+++ b/media-video/camsource/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>zhen@gentoo.org</email>
-  <name>John Davis</name>
-  <description>Full time maintainer, please post all bugs to me.</description>
-</maintainer>
+<herd>video</herd>
 <longdescription>camsource is a utility specializing in webcams</longdescription>
 </pkgmetadata>
diff --git a/media-video/camstream/ChangeLog b/media-video/camstream/ChangeLog
index 1b60bcc299b3..11f1343f18b5 100644
--- a/media-video/camstream/ChangeLog
+++ b/media-video/camstream/ChangeLog
@@ -1,9 +1,62 @@
 # ChangeLog for media-video/camstream
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/ChangeLog,v 1.1 2003/03/19 14:28:16 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/ChangeLog,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
+
+  26 Jul 2005; Simon Stelling <blubb@gentoo.org> camstream-0.26.3.ebuild:
+  stable on amd64
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> camstream-0.26.3.ebuild:
+  Fix qt dep
+
+  20 Jun 2005; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.3.ebuild:
+  Fixing #96555 (need autoreconf when using latest portage which sets $CBUILD)
+
+  07 May 2004; David Holm <dholm@gentoo.org> camstream-0.26.3.ebuild:
+  Set -ppc as it requires x86-asm.
+
+  20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.3.ebuild,
+  files/x86_64-asm.patch:
+  Now should work for amd64, see bug #48145
+
+  20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild,
+  camstream-0.26.3.ebuild:
+  Fixed what was broken by the last fixes, moved .3 to stable, cleanup.
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> camstream-0.26.2.ebuild,
+  camstream-0.26.3.ebuild:
+  Remove the need-qt function, put the dependency directly in the ebuild
+  Since qt depends on virtual/x11, just change the dep to that.
+  Remove inherit kde-functions as it shouldn't be needed anymore.
+
+*camstream-0.26.3 (24 Nov 2003)
+
+  24 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.3.ebuild:
+  New bugfix release - patches not required any more.
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild,
+  files/camstream-0.26.2-gcc33-multiline-string-fix.patch,
+  files/uicmocpath.patch:
+  Now really fixing bug 31940 (uic/moc not found error)
+
+  14 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild,
+  files/camstream-0.26.2-fix-qt-dir.patch:
+  Removing the fix-qt-dir.patch because it breaks compiling, see bug 33053
+
+  31 Oct 2003; Caleb Tennis <caleb@gentoo.org> camstream-0.26.2.ebuild,
+  files/camstream-0.26.2-fix-qt-dir.patch:
+  Fix qt installation dir patch for gentoo to work
+  Fixes bug 31940.
 
 *camstream-0.26.2 (19 Mar 2003)
 
+  04 Oct 2003; Joshua Kinard <kumba@gentoo.org> camstream-0.26.2.ebuild,
+  files/camstream-0.26.2-gcc33-multiline-string-fix.patch:
+  Added a patch that fixes a multi-line string issue w/ gcc-3.3.x.
+  Closes Bug #30292.
+
+  24 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> camstream-0.26.2.ebuild :
+  marked as stable
+
   19 Mar 2003; Patrick Kursawe <phosphan@gentoo.org> ChangeLog,
   camstream-0.26.2.ebuild, files/digest-camstream-0.26.2 :
   Initial import. This closes bug #13059 - let's see if it has
diff --git a/media-video/camstream/Manifest b/media-video/camstream/Manifest
index 21f91b9749ca..1a3668cd46b3 100644
--- a/media-video/camstream/Manifest
+++ b/media-video/camstream/Manifest
@@ -1,3 +1,7 @@
-MD5 8738fce6e5b4dcd9369b7b65e9c6cf94 camstream-0.26.2.ebuild 738
-MD5 1d2c3aa65fc759b57f2144c6efb4378c ChangeLog 600
-MD5 16c80fafcb4c0feffe28ec968596af68 files/digest-camstream-0.26.2 69
+MD5 7f3b42e2563d6f5a47720b5c5ab1673a ChangeLog 2652
+MD5 c46f61c49728c26ed4835c1bdc88ed26 camstream-0.26.3.ebuild 1211
+MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
+MD5 fa77f9f938f5a434d5732389213b7b5a files/camstream-0.26.2-gcc33-multiline-string-fix.patch 888
+MD5 4c28fbabd709a27f5fee4d7bafea0f26 files/digest-camstream-0.26.3 69
+MD5 e44f9499a8044ecb7eb25cc6aa60f587 files/uicmocpath.patch 692
+MD5 55ae29f8111814f90a59ce1692028d3e files/x86_64-asm.patch 7265
diff --git a/media-video/camstream/camstream-0.26.3.ebuild b/media-video/camstream/camstream-0.26.3.ebuild
index becab0b16b0e..b9e40659fe71 100644
--- a/media-video/camstream/camstream-0.26.3.ebuild
+++ b/media-video/camstream/camstream-0.26.3.ebuild
@@ -1,22 +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-video/camstream/camstream-0.26.3.ebuild,v 1.1 2003/11/24 06:45:09 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camstream/camstream-0.26.3.ebuild,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
 
-inherit kde-functions
+inherit eutils
 
 DESCRIPTION="Collection of tools for webcams and other video devices"
 HOMEPAGE="http://www.smcc.demon.nl/camstream/"
 SRC_URI="http://www.smcc.demon.nl/camstream/download/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 -ppc x86"
 SLOT="0"
 IUSE="doc"
 
-need-qt 3
+DEPEND="=x11-libs/qt-3*
+	sys-devel/autoconf"
 
-# camstream configure script gets it wrong, sometimes
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	# Camstream has 32 bit asssembler normally.
+	use amd64 && epatch ${FILESDIR}/x86_64-asm.patch
+}
 
-DEPEND="virtual/x11"
+src_compile () {
+	# Need to fake out Qt or we'll get sandbox problems
+	REALHOME="$HOME"
+	mkdir -p $T/fakehome/.qt
+	export HOME="$T/fakehome"
+	addwrite "${QTDIR}/etc/settings"
+	autoreconf &> autoreconf-output || \
+		die "autoreconf failed. Output in ${S}/autoreconf-output"
+	econf || die "configure failed"
+	emake || die "emake failed"
+}
 
 src_install () {
 	dobin camstream/camstream camstream/caminfo camstream/ftpput
diff --git a/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch b/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch
index ded6899887d2..d56eb4de22a6 100644
--- a/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch
+++ b/media-video/camstream/files/camstream-0.26.2-gcc33-multiline-string-fix.patch
@@ -1,5 +1,5 @@
---- ./camstream-0.26.2/camstream/ftpput.cc	2002-05-01 01:23:20.000000000 +0100
-+++ ./camstream-0.26.2/camstream/ftpput.cc.patched	2003-10-04 05:26:00.000000000 +0100
+--- ./camstream/ftpput.cc	2002-05-01 01:23:20.000000000 +0100
++++ ./camstream/ftpput.cc.patched	2003-10-04 05:26:00.000000000 +0100
 @@ -35,18 +35,19 @@
  
  void CFTPPut::Usage()
diff --git a/media-video/camstream/metadata.xml b/media-video/camstream/metadata.xml
index bce3a70882f8..6e1d55b1eb69 100644
--- a/media-video/camstream/metadata.xml
+++ b/media-video/camstream/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>video</herd>
 <maintainer>
   <email>phosphan@gentoo.org</email>
 </maintainer>
diff --git a/media-video/chaplin/ChangeLog b/media-video/chaplin/ChangeLog
index 68232d7432cc..e16b4bac73cf 100644
--- a/media-video/chaplin/ChangeLog
+++ b/media-video/chaplin/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for media-sound/chaplin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.1 2004/10/06 20:16:11 trapni Exp $
+# ChangeLog for media-video/chaplin
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> chaplin-1.10.ebuild:
+  Added to ~ppc.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> chaplin-1.10.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  chaplin-1.10.ebuild:
+  Added to ~amd64.
 
 *chaplin-1.10 (06 Oct 2004)
 
diff --git a/media-video/chaplin/Manifest b/media-video/chaplin/Manifest
index fc5dc331e254..29380821e271 100644
--- a/media-video/chaplin/Manifest
+++ b/media-video/chaplin/Manifest
@@ -1,3 +1,4 @@
-MD5 0edb14d5be790d6f6c0a42361b815b9e chaplin-1.10.ebuild 673
-MD5 f00e05306cc18eccad70c85f4254778c README 94
+MD5 53bcb0ded3074c61c62b59bd97219717 ChangeLog 705
+MD5 53dde564120f28b2ae663a06ab45a04b chaplin-1.10.ebuild 815
+MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
 MD5 a147b729492280334d6bbae85da44c32 files/digest-chaplin-1.10 60
diff --git a/media-video/chaplin/chaplin-1.10.ebuild b/media-video/chaplin/chaplin-1.10.ebuild
index 3c0de9264a55..97422481168d 100644
--- a/media-video/chaplin/chaplin-1.10.ebuild
+++ b/media-video/chaplin/chaplin-1.10.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-video/chaplin/chaplin-1.10.ebuild,v 1.1 2004/10/06 20:16:11 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+IUSE="vcdimager transcode"
+
+MY_S="${WORKDIR}/chaplin"
 
 DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread"
 HOMEPAGE="http://www.lallafa.de/bp/chaplin.html"
 SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="vcdimager transcode"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="
-	>=libdvdread-0.9.4
-	>=imagemagick-5.5.7.14
-	transcode? ( >=transcode-0.6.2 )
-	vcdimager? ( >=vcdimager-0.7.2 )
-"
-
-MY_S="${WORKDIR}/chaplin"
+DEPEND=">=media-libs/libdvdread-0.9.4
+	>=media-gfx/imagemagick-5.5.7.14
+	transcode? ( >=media-video/transcode-0.6.2 )
+	vcdimager? ( >=media-video/vcdimager-0.7.2 )"
 
 src_compile() {
 	cd ${MY_S} || die
diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index 670a42301279..3cb1c5cdd77d 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for media-video/cinelerra-cvs
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.1 2004/09/18 14:20:39 zypher Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
+
+  31 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  cinelerra-cvs-20051005.ebuild:
+  Dep fix, as pointed in the bug #108525
+
+*cinelerra-cvs-20051005 (05 Oct 2005)
+
+  06 Oct 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20051005.ebuild:
+  Version bump. This introduces Cinelerra version 2.0. Removed ppc keyword.
+
+  01 Aug 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050801.ebuild:
+  Added libtheora dependency.
+
+*cinelerra-cvs-20050801 (01 Aug 2005)
+
+  01 Aug 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050801.ebuild:
+  Version bump. Removed four old ebuilds.
+
+  18 May 2005; <zypher@gentoo.org> cinelerra-cvs-20050506.ebuild:
+  Marked ~ppc.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  cinelerra-cvs-20040917.ebuild, cinelerra-cvs-20050102.ebuild,
+  cinelerra-cvs-20050127.ebuild, cinelerra-cvs-20050315.ebuild,
+  cinelerra-cvs-20050506.ebuild:
+  Converted to toolchain-funcs eclass. Added for a check for at least gcc3.
+  Moved nasm as a buildtime dependency on latest version.
+
+*cinelerra-cvs-20050506 (06 May 2005)
+
+  06 May 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050506.ebuild:
+  Version bump.
+
+  30 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  cinelerra-cvs-20050315.ebuild:
+  Added faad2 dep, removed mmx and 3dnow useflags for now
+
+*cinelerra-cvs-20050315 (15 Mar 2005)
+
+  18 Mar 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050315.ebuild:
+  Version bump plus needed mjpegtools-dependency.
+
+*cinelerra-cvs-20050127 (27 Jan 2005)
+
+  28 Jan 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050127.ebuild:
+  Version bump.
+
+  15 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/libmpeg3-20050102-gcc3.4.patch, cinelerra-cvs-20050102.ebuild:
+  Fix asm statement problem
+
+  12 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
+  cinelerra-cvs-20040917.ebuild, cinelerra-cvs-20050102.ebuild:
+  Fixed dependencies (!media-video/cinelerra). Marked ~amd64.
+
+*cinelerra-cvs-20050102 (02 Jan 2004)
+
+  11 Jan 2005; Marc Hildebrand <zypher@gentoo.org> cinelerra-cvs-20050102.ebuild:
+  Version bump.
 
 *cinelerra-cvs-20040917 (17 Sep 2004)
 
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index 056ff038e363..333e4c9ffdb4 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -1,3 +1,10 @@
-MD5 d93b32268a93ae1248a9696478305c53 cinelerra-cvs-20040917.ebuild 1515
-MD5 eba326432d26a3e8eb926c52124bbb9c metadata.xml 257
-MD5 a56da7b2ea792c89025790c53a2ed2c0 files/digest-cinelerra-cvs-20040917 77
+MD5 48758a0f6c456cfaf728e604f9b8c951 ChangeLog 2450
+MD5 52bb20649b74c2aa7f6f9204cec3f7f8 cinelerra-cvs-20050506.ebuild 1688
+MD5 3e962f56ba898d0261d3569f4bf277db cinelerra-cvs-20050801.ebuild 1784
+MD5 ed559d644906fb09f7493178937fb548 cinelerra-cvs-20051005.ebuild 1884
+MD5 b775c5b9f768f5e27002063c6693a623 files/20051005-nox264.patch 3391
+MD5 0a7a7d289ef0d57df644a1cc47144170 files/digest-cinelerra-cvs-20050506 77
+MD5 4bd71d15accb4c84eda25a5266c82112 files/digest-cinelerra-cvs-20050801 77
+MD5 af930f0191a6c60306ce736e62c6db74 files/digest-cinelerra-cvs-20051005 77
+MD5 6a608309dd1406724b18475452d2e410 files/libmpeg3-20050102-gcc3.4.patch 6060
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
index 635a66bcaa67..d54b15874dde 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild,v 1.1 2005/05/08 11:09:47 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050506.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
-inherit gcc eutils flag-o-matic
-
-export WANT_GCC_3="yes"
+inherit toolchain-funcs eutils flag-o-matic
 
 #filter-flags "-fPIC -fforce-addr"
 
@@ -16,13 +14,11 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="alsa ffmpeg oss static"
 
-DEPEND="!media-video/cinelerra
+RDEPEND="!media-video/cinelerra
 	virtual/x11
-	virtual/libc
-	=sys-devel/gcc-3*
 	media-libs/libpng
 	media-libs/libdv
 	media-libs/faad2
@@ -31,11 +27,15 @@ DEPEND="!media-video/cinelerra
 	>=sys-libs/libraw1394-0.9.0
 	>=media-sound/esound-0.2.34
 	>=media-libs/openexr-1.2.1
-	!media-video/cinelerra
+	!media-video/cinelerra"
+
+DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-src_unpack() {
-	unpack ${A}
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "3" ]]; then
+		die "You must use gcc 3 or better."
+	fi
 }
 
 src_compile() {
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild
index 64799b6c8d65..569f94ae7e0e 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild,v 1.1 2005/08/01 13:35:19 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20050801.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -29,6 +29,7 @@ RDEPEND="!media-video/cinelerra
 	>=media-libs/openexr-1.2.1
 	>=media-libs/libvorbis-1.0.1-r2
 	>=media-libs/libogg-1.0
+	>=media-libs/libtheora-1.0_alpha4-r1
 	!media-video/cinelerra"
 
 DEPEND="${RDEPEND}
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
index 1e82f1dbd1ba..c0057ecde87a 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild,v 1.1 2005/10/06 14:00:08 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20051005.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -26,7 +26,7 @@ RDEPEND="!media-video/cinelerra
 	x86? ( media-libs/x264-svn )
 	media-libs/libiec61883
 	media-video/mjpegtools
-	>=sys-libs/libavc1394-0.4.1
+	>=sys-libs/libavc1394-0.5.0
 	>=sys-libs/libraw1394-0.9.0
 	esd? ( >=media-sound/esound-0.2.34 )
 	>=media-libs/openexr-1.2.2
diff --git a/media-video/cinelerra-cvs/metadata.xml b/media-video/cinelerra-cvs/metadata.xml
index 7e2267698e35..210f2b0d5ddb 100644
--- a/media-video/cinelerra-cvs/metadata.xml
+++ b/media-video/cinelerra-cvs/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>zypher@gentoo.org</email>
   <name>Marc Hildebrand</name>
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 668168283637..017f86ed3f51 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,9 +1,102 @@
 # ChangeLog for media-video/cinelerra
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.1 2002/09/12 01:11:04 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
+
+  21 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> cinelerra-1.2.1.ebuild:
+  filter-flags not in global scope
+
+  21 Oct 2004; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.2.1.ebuild:
+  Fix bug #62367, a misuse of filter-flags
+
+*cinelerra-1.2.1 (27 Aug 2004)
+
+  27 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/cinelerra-1.2.1-locale.patch, +cinelerra-1.2.1.ebuild:
+  New release
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  cinelerra-1.0.0.ebuild, cinelerra-1.1.5.ebuild, cinelerra-1.1.7.ebuild,
+  cinelerra-1.1.9.ebuild, cinelerra-1.2.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  11 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/cinelerra-1.2.0-gcc34.patch, cinelerra-1.2.0.ebuild:
+  Added gcc-3.4 compatibility patch as well as a global #undef HAVE_V4L2 to
+  avoid a linker error. This is a workaround until upstream fixes.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> cinelerra-1.0.0.ebuild,
+  cinelerra-1.1.5.ebuild, cinelerra-1.1.7.ebuild, cinelerra-1.1.9.ebuild,
+  cinelerra-1.2.0.ebuild:
+  Fix use invocation
+
+  26 May 2004; Danny van Dyk <kugelfang@gentoo.org> cinelerra-1.2.0.ebuild:
+  Patched to work on amd64, marked ~amd64. Fixes BUG #51740.
+
+*cinelerra-1.2.0 (15 May 2004)
+
+  15 May 2004; Luca Barbato <lu_zero@gentoo.org> +metadata.xml,
+  +cinelerra-1.2.0.ebuild:
+  New version, added metadata.xml
+
+  03 May 2004; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.9.ebuild:
+  fix suggested by zypher
+
+*cinelerra-1.1.9 (14 Feb 2004)
+
+  14 Feb 2004; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+  Fixed a missing dep
+
+  03 Oct 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+  Fixed bugs 28859, 26795
+
+  26 Sep 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+  Fixed bugs 28767, 27824
+
+  01 Sep 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+  Pinned nasm version, should avoid bug 27704
+
+  29 Aug 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+  Filtered some CFLAGS, should fix bug 27396
+
+*cinelerra-1.1.7 (13 Aug 2003)
+
+  13 Aug 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.7.ebuild:
+  New version, thanks to suka <suka@t0.or.at> for the ebuild
+
+  13 Jul 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.5.ebuild,
+  files/digest-cinelerra-1.1.5 files/compile-1.1.5.diff :
+  moved the patch to the distfiles mirror
+    
+*cinelerra-1.1.6 (13 Mar 2003)
+
+  13 Mar 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.6.ebuild,
+  files/digest-cinelerra-1.1.6 files/compile-1.1.6.diff :
+  New ebuild. Should build correctly. Thanks to suka <suka@t0.or.at> and 
+  ndep8515@postoffice.uri.edu 
+
+  06 May 2003; Bartosch Pixa <darkspecter@gentoo.org> cinelerra-1.1.5.ebuild:
+  CFLAGS magic as everything above -O2 seems to break cinelerra
+
+*cinelerra-1.1.5 (4 Mar 2003)
+
+  4 Mar 2003; Luca Barbato <lu_zero@gentoo.org> cinelerra-1.1.5.ebuild,
+  files/digest-cinelerra-1.1.5 files/compile-1.1.5.diff :
+  New ebuild. Builds for me.
+
+*cinelerra-110802 (25 Nov 2002)
+
+  25 Nov 2002; Nick Hadaway <raker@gentoo.org> cinelerra-110802.ebuild,
+  files/digest-cinelerra-110802 :
+  New ebuild.  Doesn't build for me.  Adding as a work in progress.
 
 *cinelerra-1.0.0 (11 Sep 2002)
 
+  15 Nov 2002; Nick Hadaway <raker@gentoo.org> cinelerra-1.0.0.ebuild :
+  Added gcc.eclass stuff so gcc3 is used if both 2 and 3 are installed.
+
+  05 Nov 2002; Nick Hadaway <raker@gentoo.org> cinelerra-1.0.0.ebuild :
+  Updated dependancies so it will only build on gcc3 systems
+
   11 Sep 2002; Nick Hadaway <raker@gentoo.org> cinelerra-1.0.0.ebuild,
   files/digest-cinelerra-1.0.0 :
   New ebuild!  The ebuild is very simple.  Install stanza used from
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index c53d74a45dde..97241ad66762 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,8 +1,19 @@
-MD5 c18bf54dd581c75c7fc22a61bc9e3b27 ChangeLog 933
-MD5 9043f9ea66cbdd82c650a3335809d387 cinelerra-1.1.5.ebuild 1179
-MD5 a4f1bc017ca723056dcf4d643683573c cinelerra-1.0.0.ebuild 1128
-MD5 c69120050a1046a849e4231a12794dc9 cinelerra-110802.ebuild 1200
-MD5 07cc4d63fc6636b11a09265bd359f02c files/digest-cinelerra-1.1.5 74
+MD5 528583136c7d6cc72aff2189d5871cdc ChangeLog 3899
+MD5 56ae0dc8c2ee3b2e7646fe48a5d1a6fc cinelerra-1.0.0.ebuild 1057
+MD5 c9d76018d43bf8a5cdf0b97f9e79cd66 cinelerra-1.1.5.ebuild 1262
+MD5 0b2f3fc9afd057528083fd391ccca822 cinelerra-1.1.7.ebuild 1632
+MD5 9ae2c8448a61196a8f4bf2f38cbcc3f0 cinelerra-1.1.9.ebuild 1616
+MD5 8e005b6bf6ce2528fb96749e93fd2f4f cinelerra-1.2.0.ebuild 1804
+MD5 7a869ae1cd18658a7486607289aac4ca metadata.xml 221
+MD5 5dea66b18d19f943158d158ca419889b cinelerra-1.2.1.ebuild 1803
+MD5 6a0e5d7afc5e123e9c6a059b38351548 files/compile-1.1.6.diff 7517
 MD5 bb1b390c6a20a9240f1100c3a3974b0d files/digest-cinelerra-1.0.0 73
-MD5 0251b5e587fcbf93534c1633a3d27ad1 files/digest-cinelerra-110802 74
-MD5 ea82f6b3b08112f20623ddb10bf97fce files/compile-1.1.5.diff 300491
+MD5 d2363d0c13405512bf1341d84a12d744 files/digest-cinelerra-1.1.5 148
+MD5 bffe8c026a4ffdf9220cbc62a75deb8e files/digest-cinelerra-1.1.9 74
+MD5 5a786a19ac60d4ef490c82ccec2975b2 files/digest-cinelerra-1.1.7 74
+MD5 6f63e3977c7e50e2cf783311d7dda0aa files/digest-cinelerra-1.2.0 74
+MD5 12c40f831322db75d68c5449efaa4ac6 files/gcc-3.3.1-collate.patch 539
+MD5 3d915d40f23c642ed22fa5a627519aec files/pthread_t_not_int.patch 880
+MD5 b2ee9332ec581ccf59714537ef55fc4b files/cinelerra-1.2.0-gcc34.patch 4523
+MD5 e4d5bcabebf377896bb5023460cbe4cb files/cinelerra-1.2.1-locale.patch 414
+MD5 24ec03198ece5721568ba647098c703c files/digest-cinelerra-1.2.1 74
diff --git a/media-video/cinelerra/cinelerra-1.0.0.ebuild b/media-video/cinelerra/cinelerra-1.0.0.ebuild
index 5d480000cb64..d13c3a408923 100644
--- a/media-video/cinelerra/cinelerra-1.0.0.ebuild
+++ b/media-video/cinelerra/cinelerra-1.0.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-video/cinelerra/cinelerra-1.0.0.ebuild,v 1.1 2002/09/12 01:11:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
-S=${WORKDIR}/hvirtual-${PV}
+inherit gcc
+export WANT_GCC_3="yes"
 
 DESCRIPTION="Cinelerra - Professional Video Editor"
 HOMEPAGE="http://heroinewarrior.com/cinelerra.php3"
 SRC_URI="mirror://sourceforge/heroines/hvirtual-${PV}-src.tar.bz2"
 
-DEPEND="virtual/x11
-	virtual/glibc"
-RDEPEND="${DEPEND}"
-
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
-src_compile() {
+DEPEND="virtual/x11
+	virtual/libc
+	=sys-devel/gcc-3*"
 
-	echo ${CFLAGS} > i686/c_flags
+S=${WORKDIR}/hvirtual-${PV}
 
+src_compile() {
+	echo ${CFLAGS} > i686/c_flags
 	make || die "make failed"
-
 }
 
 src_install() {
-
 	cd ${S}/${PN}/i686
 
-	dobin ${PN} 
+	dobin ${PN}
 
 	cd ${S}/plugins
 	insinto /usr/lib/${PN}
@@ -36,7 +36,7 @@ src_install() {
 	doins titler/fonts
 
 	cd ${S}/libmpeg3/i686
-	dobin mpeg3dump mpeg3cat mpeg3toc 
+	dobin mpeg3dump mpeg3cat mpeg3toc
 
 	cd ${S}/mix/i686
 	dobin mix2000
@@ -50,10 +50,7 @@ src_install() {
 	cd ${S}/mplexlo/i686
 	dobin mplexlo
 
-	cd ${S} 
-	dodoc CVS COPYING 
-	dohtml -a png,html,texi,sdw -r doc/*	
-
+	cd ${S}
+	dodoc CVS COPYING
+	dohtml -a png,html,texi,sdw -r doc/*
 }
-
-
diff --git a/media-video/cinelerra/cinelerra-1.1.5.ebuild b/media-video/cinelerra/cinelerra-1.1.5.ebuild
index e453bbdd6f0f..6d0a3bacabd9 100644
--- a/media-video/cinelerra/cinelerra-1.1.5.ebuild
+++ b/media-video/cinelerra/cinelerra-1.1.5.ebuild
@@ -1,20 +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-video/cinelerra/cinelerra-1.1.5.ebuild,v 1.1 2003/05/04 14:15:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.1.5.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
 inherit gcc eutils
 export WANT_GCC_3="yes"
 
+export CFLAGS=${CFLAGS/-O?/-O2}
+
 DESCRIPTION="Cinelerra - Professional Video Editor"
 HOMEPAGE="http://heroinewarrior.com/cinelerra.php3"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
+SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
+		mirror://gentoo/${PN}-fixes-${PV}.diff.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/x11
-	virtual/glibc
+	virtual/libc
 	=sys-devel/gcc-3*
 	>=media-libs/a52dec-0.7.3"
 
@@ -22,7 +26,8 @@ DEPEND="virtual/x11
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/compile-1.1.5.diff
+	epatch ${DISTDIR}/${PN}-fixes-${PV}.diff.bz2
+
 }
 
 src_compile() {
@@ -42,7 +47,7 @@ src_install() {
 	doins titler/fonts/*
 
 	cd ${S}/libmpeg3/i686
-	dobin mpeg3dump mpeg3cat mpeg3toc 
+	dobin mpeg3dump mpeg3cat mpeg3toc
 
 #	cd ${S}/mix/i686
 #	dobin mix2000
@@ -56,7 +61,7 @@ src_install() {
 	cd ${S}/mplexlo/i686
 	dobin mplexlo
 
-	cd ${S} 
-#	dodoc CVS COPYING 
+	cd ${S}
+#	dodoc CVS COPYING
 	dohtml -a png,html,texi,sdw -r doc/*
 }
diff --git a/media-video/cinelerra/cinelerra-1.1.7.ebuild b/media-video/cinelerra/cinelerra-1.1.7.ebuild
index 138402dc4772..082a07ee6b83 100644
--- a/media-video/cinelerra/cinelerra-1.1.7.ebuild
+++ b/media-video/cinelerra/cinelerra-1.1.7.ebuild
@@ -1,11 +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-video/cinelerra/cinelerra-1.1.7.ebuild,v 1.1 2003/08/13 01:24:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
-inherit gcc eutils
+inherit gcc eutils flag-o-matic
 export WANT_GCC_3="yes"
 
-export CFLAGS=${CFLAGS/-O?/-O2}
+#export CFLAGS=${CFLAGS/-O?/-O2}
+
+filter-flags "-fPIC -fforce-addr"
 
 DESCRIPTION="Cinelerra - Professional Video Editor"
 HOMEPAGE="http://heroinewarrior.com/cinelerra.php3"
@@ -14,16 +16,22 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 -ppc"
+IUSE=""
 
 DEPEND="virtual/x11
-	virtual/glibc
-	=sys-devel/gcc-3*"
+	virtual/libc
+	=sys-devel/gcc-3*
+	dev-lang/nasm"
 #	>=media-libs/a52dec-0.7.3"
 
-#src_unpack() {
-#	unpack ${A}
-	#epatch ${FILESDIR}/compile-${PV}.diff	
-#}
+RDEPEND="virtual/libc
+		virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/gcc-3.3.1-collate.patch
+	epatch ${FILESDIR}/pthread_t_not_int.patch
+}
 
 src_compile() {
 	export CFLAGS=${CFLAGS}
@@ -38,14 +46,14 @@ src_compile() {
 
 src_install() {
 	local myarch
-	if [ -n "`use x86`" ]; then
-	myarch="i686"
+	if use x86; then
+	myarch="${CHOST/-*/}" #should solve the i586/i686 problem
 	fi
-	if [ -n "`use ppc`" ]; then
-	myarch="ppc"	
+	if use ppc; then
+	myarch="ppc"
 	fi
 	cd ${S}/${PN}/${myarch}
-	dobin ${PN}
+	dobin ${PN} || die "cinelerra not built"
 
 	cd ${S}/plugins
 	insinto /usr/lib/${PN}
@@ -54,7 +62,7 @@ src_install() {
 	doins titler/fonts/*
 
 	cd ${S}/libmpeg3/${myarch}
-	dobin mpeg3dump mpeg3cat mpeg3toc 
+	dobin mpeg3dump mpeg3cat mpeg3toc
 
 #	cd ${S}/mix/i686
 #	dobin mix2000
@@ -68,7 +76,7 @@ src_install() {
 	cd ${S}/mplexlo/${myarch}
 	dobin mplexlo
 
-	cd ${S} 
-#	dodoc CVS COPYING 
+	cd ${S}
+#	dodoc CVS COPYING
 	dohtml -a png,html,texi,sdw -r doc/*
 }
diff --git a/media-video/cinelerra/cinelerra-1.1.9.ebuild b/media-video/cinelerra/cinelerra-1.1.9.ebuild
index 7d6433129e80..80be9367d09a 100644
--- a/media-video/cinelerra/cinelerra-1.1.9.ebuild
+++ b/media-video/cinelerra/cinelerra-1.1.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/media-video/cinelerra/cinelerra-1.1.9.ebuild,v 1.1 2004/02/14 15:41:33 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.1.9.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 inherit gcc eutils flag-o-matic
 export WANT_GCC_3="yes"
@@ -9,6 +9,8 @@ export WANT_GCC_3="yes"
 
 filter-flags "-fPIC -fforce-addr"
 
+RESTRICT="nostrip"
+
 DESCRIPTION="Cinelerra - Professional Video Editor"
 HOMEPAGE="http://heroinewarrior.com/cinelerra.php3"
 SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
@@ -16,9 +18,10 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 -ppc"
+IUSE=""
 
 DEPEND="virtual/x11
-	virtual/glibc
+	virtual/libc
 	=sys-devel/gcc-3*
 	dev-lang/nasm"
 #	>=media-libs/a52dec-0.7.3"
@@ -42,10 +45,10 @@ src_compile() {
 
 src_install() {
 	local myarch
-	if [ -n "`use x86`" ]; then
+	if use x86; then
 	myarch="${CHOST/-*/}" #should solve the i586/i686 problem
 	fi
-	if [ -n "`use ppc`" ]; then
+	if use ppc; then
 	myarch="ppc"
 	fi
 	cd ${S}/${PN}/${myarch}
diff --git a/media-video/cinelerra/cinelerra-1.2.0.ebuild b/media-video/cinelerra/cinelerra-1.2.0.ebuild
index 0c2dce65edc6..f9862c8cdb9c 100644
--- a/media-video/cinelerra/cinelerra-1.2.0.ebuild
+++ b/media-video/cinelerra/cinelerra-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.2.0.ebuild,v 1.1 2004/05/15 19:18:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 inherit gcc eutils flag-o-matic
 export WANT_GCC_3="yes"
@@ -17,10 +17,11 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="~x86 -ppc ~amd64"
+IUSE=""
 
 DEPEND="virtual/x11
-	virtual/glibc
+	virtual/libc
 	=sys-devel/gcc-3*
 	dev-lang/nasm"
 #	>=media-libs/a52dec-0.7.3"
@@ -29,6 +30,7 @@ src_unpack() {
 	unpack ${A}
 #	epatch ${FILESDIR}/gcc-3.3.1-collate.patch
 #	epatch ${FILESDIR}/pthread_t_not_int.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 	touch ${S}/hvirtual_config.h
 }
 
@@ -39,17 +41,22 @@ src_compile() {
 	cd ${S}/quicktime/ffmpeg-0.4.8
 	econf ||die
 
+	echo "#undef HAVE_V4L2" >> ${S}/hvirtual_config.h
+
 	cd ${S}
 	make || die "make failed"
 }
 
 src_install() {
 	local myarch
-	if [ -n "`use x86`" ]; then
-	myarch="${CHOST/-*/}" #should solve the i586/i686 problem
+	if use x86; then
+		myarch="${CHOST/-*/}" #should solve the i586/i686 problem
+	fi
+	if use amd64; then
+		myarch="x86_64" #Fixes BUG #51740
 	fi
-	if [ -n "`use ppc`" ]; then
-	myarch="ppc"
+	if use ppc; then
+		myarch="ppc"
 	fi
 	cd ${S}/${PN}/${myarch}
 	dobin ${PN} || die "cinelerra not built"
diff --git a/media-video/cinelerra/cinelerra-1.2.1.ebuild b/media-video/cinelerra/cinelerra-1.2.1.ebuild
index 511fdb645860..f3af917518aa 100644
--- a/media-video/cinelerra/cinelerra-1.2.1.ebuild
+++ b/media-video/cinelerra/cinelerra-1.2.1.ebuild
@@ -1,14 +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-video/cinelerra/cinelerra-1.2.1.ebuild,v 1.1 2004/08/27 14:52:06 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
 inherit gcc eutils flag-o-matic
 export WANT_GCC_3="yes"
 
 #export CFLAGS=${CFLAGS/-O?/-O2}
 
-filter-flags "-fPIC -fforce-addr"
-
 RESTRICT="nostrip"
 
 DESCRIPTION="Cinelerra - Professional Video Editor"
@@ -35,6 +33,7 @@ src_unpack() {
 }
 
 src_compile() {
+	filter-flags -fPIC -fforce-addr
 	export CFLAGS=${CFLAGS}
 	cd ${S}/freetype-2.1.4/builds/unix
 	econf ||die
diff --git a/media-video/cinelerra/files/compile-1.1.6.diff b/media-video/cinelerra/files/compile-1.1.6.diff
index ece53176446b..b2cf763b4570 100644
--- a/media-video/cinelerra/files/compile-1.1.6.diff
+++ b/media-video/cinelerra/files/compile-1.1.6.diff
@@ -1,6 +1,6 @@
 diff -ruN cinelerra-1.1.6.orig/libmpeg3/mpeg3io.c cinelerra-1.1.6/libmpeg3/mpeg3io.c
---- cinelerra-1.1.6.orig/libmpeg3/mpeg3io.c	2003-05-13 19:11:23.000000000 +0200
-+++ cinelerra-1.1.6/libmpeg3/mpeg3io.c	2003-05-13 19:13:30.000000000 +0200
+--- cinelerra-1.1.6.orig/libmpeg3/mpeg3io.c	2003-04-14 02:10:55.000000000 +0200
++++ cinelerra-1.1.6/libmpeg3/mpeg3io.c	2003-05-13 19:51:33.000000000 +0200
 @@ -35,8 +35,8 @@
  
  int64_t mpeg3io_get_total_bytes(mpeg3_fs_t *fs)
@@ -47,8 +47,8 @@ diff -ruN cinelerra-1.1.6.orig/libmpeg3/mpeg3io.c cinelerra-1.1.6/libmpeg3/mpeg3
  		{
  			strncpy(device, mnt->mnt_fsname, MPEG3_STRLEN);
 diff -ruN cinelerra-1.1.6.orig/libmpeg3/mpeg3private.h cinelerra-1.1.6/libmpeg3/mpeg3private.h
---- cinelerra-1.1.6.orig/libmpeg3/mpeg3private.h	2003-05-13 19:11:23.000000000 +0200
-+++ cinelerra-1.1.6/libmpeg3/mpeg3private.h	2003-05-13 19:19:52.000000000 +0200
+--- cinelerra-1.1.6.orig/libmpeg3/mpeg3private.h	2003-05-11 05:44:45.000000000 +0200
++++ cinelerra-1.1.6/libmpeg3/mpeg3private.h	2003-05-13 19:51:33.000000000 +0200
 @@ -3,7 +3,7 @@
  
  #include <stdint.h>
@@ -59,22 +59,145 @@ diff -ruN cinelerra-1.1.6.orig/libmpeg3/mpeg3private.h cinelerra-1.1.6/libmpeg3/
  
  
 diff -ruN cinelerra-1.1.6.orig/quicktime/Makefile cinelerra-1.1.6/quicktime/Makefile
---- cinelerra-1.1.6.orig/quicktime/Makefile	2003-05-13 19:11:24.000000000 +0200
-+++ cinelerra-1.1.6/quicktime/Makefile	2003-05-13 19:48:02.000000000 +0200
-@@ -44,7 +44,6 @@
+--- cinelerra-1.1.6.orig/quicktime/Makefile	2003-04-30 08:04:13.000000000 +0200
++++ cinelerra-1.1.6/quicktime/Makefile	2003-05-14 00:06:31.000000000 +0200
+@@ -42,9 +42,9 @@
+ include Makefile.jpeg
+ include Makefile.libraw
  include Makefile.vorbis
++include Makefile.dv
  include Makefile.ffmpeg
  include Makefile.lame
 -include Makefile.dv
  include Makefile.encore50
  
  
-@@ -207,7 +206,7 @@
- 	$(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
+@@ -161,7 +161,6 @@
  
+ CFLAGS += \
+ 	-ffast-math \
+-	-mno-ieee-fp \
+ 	-DHAVE_ALLOCA_H=1 \
+ 	-DHAVE_ALLOCA=1 \
+ 	-DHAVE_SQRTF=1 \
+@@ -296,7 +295,7 @@
  
--LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm
-+LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread -lglib -ldl -lm -ldv
  
- $(shell echo  $(CFLAGS) > $(OBJDIR)/c_flags)
- $(shell echo  $(LIBRAW_CFLAGS) > $(OBJDIR)/libraw_cflags)
+ $(FFMPEG_OBJS):
+-	$(CC) `cat $(OBJDIR)/ffmpeg_flags` -c $(subst $(OBJDIR)/,, $*.c) -o $*.o
++	$(CC) `cat $(OBJDIR)/ffmpeg_flags` -c $(subst /PPC/,/ppc/, $(subst $(OBJDIR)/,, $(subst /ppc/,/PPC/, $*.c))) -o $*.o
+ 
+ $(LAME_OBJS):
+ 	$(CC) `cat $(OBJDIR)/lame_flags` -c $(subst $(OBJDIR)/,, $*.c) -o $*.o
+diff -ruN cinelerra-1.1.6.orig/quicktime/Makefile.dv cinelerra-1.1.6/quicktime/Makefile.dv
+--- cinelerra-1.1.6.orig/quicktime/Makefile.dv	2003-04-04 10:28:51.000000000 +0200
++++ cinelerra-1.1.6/quicktime/Makefile.dv	2003-05-13 20:46:54.000000000 +0200
+@@ -1,4 +1,4 @@
+-DV_DIR := $(shell expr libdv-0.98 )
++DV_DIR := libdv-0.98
+ 
+ DV_OBJS := \
+ 	$(OBJDIR)/$(DV_DIR)/libdv/audio.o \
+@@ -22,7 +22,7 @@
+ 	$(OBJDIR)/$(DV_DIR)/libdv/YV12.o
+ 
+ 
+-
++CFLAGS += -I$(DV_DIR) -I$(DV_DIR)/libdv
+ 
+ ifeq ($(USE_MMX), 1)
+ 
+diff -ruN cinelerra-1.1.6.orig/quicktime/Makefile.ffmpeg cinelerra-1.1.6/quicktime/Makefile.ffmpeg
+--- cinelerra-1.1.6.orig/quicktime/Makefile.ffmpeg	2003-04-25 06:41:44.000000000 +0200
++++ cinelerra-1.1.6/quicktime/Makefile.ffmpeg	2003-05-14 00:36:21.000000000 +0200
+@@ -15,14 +15,23 @@
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/fft.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/h263dec.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/h263.o \
+-	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/huffyuv.o \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/huffyuv.o
++ifeq ($(OBJDIR), i686)
++FFMPEG_OBJS += \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/cputest.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/dsputil_mmx.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/fdct_mmx.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/idct_mmx.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/motion_est_mmx.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/mpegvideo_mmx.o \
+-	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/simple_idct_mmx.o \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/simple_idct_mmx.o 
++endif
++ifeq ($(OBJDIR), ppc)
++FFMPEG_OBJS += \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/dsputil_ppc.o \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/mpegvideo_ppc.o 
++endif
++FFMPEG_OBJS += \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/imgconvert.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/imgresample.o \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/jfdctfst.o \
+@@ -103,8 +112,16 @@
+ FFMPEG_CFLAGS := \
+ 	-O2 \
+ 	-I$(FFMPEG_DIR)/ \
+-	-I$(FFMPEG_DIR)/libavcodec \
+-	-I$(FFMPEG_DIR)/libavcodec/i386 \
++	-I$(FFMPEG_DIR)/libavcodec
++ifeq ($(OBJDIR), i686)
++FFMPEG_CFLAGS += \
++	-I$(FFMPEG_DIR)/libavcodec/i386 
++endif
++ifeq ($(OBJDIR), ppc)
++FFMPEG_CFLAGS += \
++	-I$(FFMPEG_DIR)/libavcodec/ppc 
++endif
++FFMPEG_CFLAGS += \
+ 	-I$(FFMPEG_DIR)/libavcodec/libac3 \
+ 	-I$(FFMPEG_DIR)/libavcodec/mpglib \
+ 	-I$(FFMPEG_DIR)/libavformat \
+@@ -113,8 +130,16 @@
+ 
+ FFMPEG_DIRS := \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/ \
+-	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec \
+-	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386 \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec 
++ifeq ($(OBJDIR), i686)
++FFMPEG_DIRS += \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386
++endif
++ifeq ($(OBJDIR), ppc)
++FFMPEG_DIRS += \
++	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc
++endif
++FFMPEG_DIRS += \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/liba52 \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/mpglib \
+ 	$(OBJDIR)/$(FFMPEG_DIR)/libavformat
+diff -ruN cinelerra-1.1.6.orig/quicktime/depend.ffmpeg cinelerra-1.1.6/quicktime/depend.ffmpeg
+--- cinelerra-1.1.6.orig/quicktime/depend.ffmpeg	2003-04-25 06:42:27.000000000 +0200
++++ cinelerra-1.1.6/quicktime/depend.ffmpeg	2003-05-13 23:45:47.000000000 +0200
+@@ -20,6 +20,11 @@
+ $(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/motion_est_mmx.o: 	  $(FFMPEG_DIR)/libavcodec/i386/motion_est_mmx.c
+ $(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/mpegvideo_mmx.o: 	  $(FFMPEG_DIR)/libavcodec/i386/mpegvideo_mmx.c
+ $(OBJDIR)/$(FFMPEG_DIR)/libavcodec/i386/simple_idct_mmx.o:    $(FFMPEG_DIR)/libavcodec/i386/simple_idct_mmx.c
++$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/dsputil_ppc.o:  	  $(FFMPEG_DIR)/libavcodec/ppc/dsputil_ppc.c
++$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/dsputil_altivec.o:  	  $(FFMPEG_DIR)/libavcodec/ppc/dsputil_altivec.c
++$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/idct_altivec.o: 		  $(FFMPEG_DIR)/libavcodec/ppc/idct_altivec.c
++$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/mpegvideo_ppc.o: 	  $(FFMPEG_DIR)/libavcodec/ppc/mpegvideo_ppc.c
++$(OBJDIR)/$(FFMPEG_DIR)/libavcodec/ppc/mpegvideo_altivec.o: 	  $(FFMPEG_DIR)/libavcodec/ppc/mpegvideo_altivec.c
+ $(OBJDIR)/$(FFMPEG_DIR)/libavcodec/imgconvert.o: 			  $(FFMPEG_DIR)/libavcodec/imgconvert.c
+ $(OBJDIR)/$(FFMPEG_DIR)/libavcodec/imgresample.o: 			  $(FFMPEG_DIR)/libavcodec/imgresample.c
+ $(OBJDIR)/$(FFMPEG_DIR)/libavcodec/jfdctfst.o:  			  $(FFMPEG_DIR)/libavcodec/jfdctfst.c
+diff -ruN cinelerra-1.1.6.orig/quicktime/libdv-0.98/libdv/vlc.h cinelerra-1.1.6/quicktime/libdv-0.98/libdv/vlc.h
+--- cinelerra-1.1.6.orig/quicktime/libdv-0.98/libdv/vlc.h	2002-11-08 14:44:37.000000000 +0100
++++ cinelerra-1.1.6/quicktime/libdv-0.98/libdv/vlc.h	2003-05-14 00:25:36.000000000 +0200
+@@ -69,7 +69,7 @@
+ extern void dv_decode_vlc(int bits,int maxbits, dv_vlc_t *result);
+ extern void __dv_decode_vlc(int bits, dv_vlc_t *result);
+ 
+-extern __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
++static __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) {
+   if(maxbits < 16)
+     dv_decode_vlc(bitstream_show(bs,16),maxbits,result);
+   else
diff --git a/media-video/cinelerra/files/digest-cinelerra-1.1.5 b/media-video/cinelerra/files/digest-cinelerra-1.1.5
index 2132fa680b8d..d92c09764e21 100644
--- a/media-video/cinelerra/files/digest-cinelerra-1.1.5
+++ b/media-video/cinelerra/files/digest-cinelerra-1.1.5
@@ -1 +1,2 @@
 MD5 0c9082049bd7b05a80fe604493d8da02 cinelerra-1.1.5-src.tar.bz2 19098210
+MD5 96f991144e8db32813f5f3f3c76a7161 cinelerra-fixes-1.1.5.diff.bz2 54084
diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml
index 6b8a75eb232d..ce6cc0094b16 100644
--- a/media-video/cinelerra/metadata.xml
+++ b/media-video/cinelerra/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>lu_zero@gentoo.org</email>
 </maintainer>
diff --git a/media-video/cinepaint/ChangeLog b/media-video/cinepaint/ChangeLog
index 15b2911b1822..8b4053cba239 100644
--- a/media-video/cinepaint/ChangeLog
+++ b/media-video/cinepaint/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for media-video/cinepaint
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.1 2003/07/31 18:36:55 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> cinepaint-0.18.ebuild,
+  cinepaint-0.18.3.ebuild, cinepaint-0.19.0.ebuild:
+  Don't install COPYING file.
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  cinepaint-0.19.0.ebuild:
+  Added missing inherit flag-o-matic. Fixes bug #103924.
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/cinepaint-lcms.patch, cinepaint-0.19.0.ebuild:
+  Don't apply a patch to use /usr/include/lcms path, just append a -I flag if
+  the file is there (nothing needed for newer version of media-libs/lcms that
+  don't install in /lcms path).
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*cinepaint-0.19.0 (19 Mar 2005)
+
+  19 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/cinepaint-lcms.patch, +cinepaint-0.19.0.ebuild:
+  Bump to version 0.19. gcc3.4 patch no longer needed. Added a patch to fix
+  lcms header locations.
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/cinepaint-0.18.3-gcc34.patch, cinepaint-0.18.3.ebuild:
+  added patch to fix compilation with gcc3.4, also added ~amd64 to KEYWORDS.
+  fixed #60753
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Added missing metadata.xml.  Taking over as maintainer.
+
+*cinepaint-0.18.3 (03 Aug 2004)
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> +cinepaint-0.18.3.ebuild:
+  Version bumped and added to ~ppc.
 
 *cinepaint-0.18 (31 Jul 2003)
 
diff --git a/media-video/cinepaint/Manifest b/media-video/cinepaint/Manifest
index 6fc7a98ff0ac..d4a7b5ee0b47 100644
--- a/media-video/cinepaint/Manifest
+++ b/media-video/cinepaint/Manifest
@@ -1,3 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4e6a39ba39528657cb2a3980a256468b ChangeLog 2029
+MD5 a58c23e506283ac94e8023f3a4f6ab5d cinepaint-0.18.ebuild 726
+MD5 6ff9450a868c99b8eaccf27105ea764f cinepaint-0.19.0.ebuild 1027
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 3724738736d0161c65518adeed7625e9 cinepaint-0.18.3.ebuild 976
+MD5 b599a2e8ee54c88ac8fd777a115ee471 files/digest-cinepaint-0.19.0 69
 MD5 18b54df1c9a511a226297daf13dccaec files/digest-cinepaint-0.18 67
-MD5 d26f0676b84ced9566d70529e372a5d7 ChangeLog 607
-MD5 8b4111513b7f23ebfe5b8ca5d5f1a3d7 cinepaint-0.18.ebuild 741
+MD5 732e3bb45a2f1945a5c3217a87c53a50 files/cinepaint-0.18.3-gcc34.patch 1476
+MD5 0f99a4352d9c27f40fe6b07cea9d759d files/digest-cinepaint-0.18.3 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGjCfj5H05b2HAEkRApnxAJ0XpbRqHlLe8Xc+K1MsstUcnhstrACgg8Lz
+Gm9LdEzjqf0/L2Cwvdtjy4Y=
+=UHHn
+-----END PGP SIGNATURE-----
diff --git a/media-video/cinepaint/cinepaint-0.18.3.ebuild b/media-video/cinepaint/cinepaint-0.18.3.ebuild
index 12e1c48d9cc5..5871913e3aac 100644
--- a/media-video/cinepaint/cinepaint-0.18.3.ebuild
+++ b/media-video/cinepaint/cinepaint-0.18.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-video/cinepaint/cinepaint-0.18.3.ebuild,v 1.1 2004/08/03 09:07:09 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.3.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="motion picture editing tool used for painting and retouching of mov
 SRC_URI="mirror://sourceforge/cinepaint/${PN}-${MY_PV}.tar.gz"
 HOMEPAGE="http://cinepaint.sourceforge.net/"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 IUSE="png zlib"
 
@@ -21,6 +21,13 @@ DEPEND="=x11-libs/gtk+-1*
 	media-libs/tiff
 	media-libs/jpeg"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile(){
 	econf --with-openexr-prefix=/usr || die "econf failed"
 	emake || die "emake failed"
@@ -28,5 +35,5 @@ src_compile(){
 
 src_install(){
 	einstall DESTDIR=${D} || die "einstall failed"
-	dodoc AUTHORS ChangeLog COPYING* README* NEWS
+	dodoc AUTHORS ChangeLog README* NEWS
 }
diff --git a/media-video/cinepaint/cinepaint-0.18.ebuild b/media-video/cinepaint/cinepaint-0.18.ebuild
index 0fd6721a8a29..202bff78af8c 100644
--- a/media-video/cinepaint/cinepaint-0.18.ebuild
+++ b/media-video/cinepaint/cinepaint-0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.ebuild,v 1.1 2003/07/31 18:36:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
 DESCRIPTION="motion picture editing tool used for painting and retouching of movies"
 SRC_URI="mirror://sourceforge/cinepaint/${P}.tar.gz"
@@ -24,5 +24,5 @@ src_compile(){
 
 src_install(){
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING* README* NEWS
+	dodoc AUTHORS ChangeLog README* NEWS
 }
diff --git a/media-video/cinepaint/cinepaint-0.19.0.ebuild b/media-video/cinepaint/cinepaint-0.19.0.ebuild
index c0ebff45150d..fc4bcb238577 100644
--- a/media-video/cinepaint/cinepaint-0.19.0.ebuild
+++ b/media-video/cinepaint/cinepaint-0.19.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-video/cinepaint/cinepaint-0.19.0.ebuild,v 1.1 2005/03/18 20:06:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.19.0.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
-inherit eutils versionator
+inherit eutils versionator flag-o-matic
 
 MY_PV=$(replace_version_separator 2 '-')
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -21,22 +21,15 @@ DEPEND="=x11-libs/gtk+-1*
 	media-libs/tiff
 	media-libs/jpeg"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# lcms is <lcms/lcms.h> not <lcms.h>
-	# fix that in configure detection
-	# and in source
-	epatch ${FILESDIR}/${PN}-lcms.patch
-}
-
 src_compile(){
+	[[ -f /usr/include/lcms/lcms.h ]] && \
+		append-flags -I/usr/include/lcms
+
 	econf --with-openexr-prefix=/usr || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install(){
 	einstall DESTDIR=${D} || die "einstall failed"
-	dodoc AUTHORS ChangeLog COPYING* README* NEWS
+	dodoc AUTHORS ChangeLog README* NEWS
 }
diff --git a/media-video/cinepaint/metadata.xml b/media-video/cinepaint/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/cinepaint/metadata.xml
+++ b/media-video/cinepaint/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/codeine/ChangeLog b/media-video/codeine/ChangeLog
index f892c1c39e2f..0f60086faaba 100644
--- a/media-video/codeine/ChangeLog
+++ b/media-video/codeine/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for media-video/codeine
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.1 2004/10/24 05:40:28 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
+
+*codeine-1.0 (06 Sep 2005)
+
+  06 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> +codeine-1.0.ebuild:
+  Version bump, fixed multilib issues, closes bug 104500.
+
+*codeine-1.0_rc1 (21 Jul 2005)
+
+  21 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +codeine-1.0_rc1.ebuild:
+  New version (#99741).
+
+*codeine-1.0_beta3 (14 Apr 2005)
+
+  14 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  +codeine-1.0_beta3.ebuild:
+  New version (#89014). Add kde herd to metadata.xml.
+
+*codeine-1.0_beta2 (11 Apr 2005)
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -files/codeine-1.0_beta1-xine-lib-1.0.patch,
+  +files/codeine-xine-lib-1.0.patch, codeine-1.0_beta1.ebuild,
+  +codeine-1.0_beta2.ebuild:
+  new upstream version, fixes #70658. generalised patchname, it also works for
+  the new version. updated maintainer information, chriswhite is retired. marked
+  older version stable on amd64 and x86.
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/codeine-1.0_beta1-xine-lib-1.0.patch, codeine-1.0_beta1.ebuild:
+  added a configure patch to let codeine compile again xine-1.0. fixes bug
+  #76252.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Fixed herd in metadata.xml.
 
 *codeine-1.0_beta1 (24 Oct 2004)
 
diff --git a/media-video/codeine/Manifest b/media-video/codeine/Manifest
index f9314f856f73..813b5ff3ee67 100644
--- a/media-video/codeine/Manifest
+++ b/media-video/codeine/Manifest
@@ -1,2 +1,23 @@
-MD5 770cebe06af5fc5f7ece642508600e80 codeine-1.0_beta1.ebuild 560
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fb6823bcf11eeb188f9c5b0876e113ce codeine-1.0_beta1.ebuild 858
+MD5 ed45e813b137b1d55fbc58b6e6191c21 codeine-1.0.ebuild 888
+MD5 b9103b75f9bb5b2fb6522d05dc52e388 codeine-1.0_beta3.ebuild 812
+MD5 2e34ba59404192c55cd66e0c220084a5 codeine-1.0_rc1.ebuild 815
+MD5 949dc11d040c52b9508a253b70b0508c codeine-1.0_beta2.ebuild 895
+MD5 621051e248ac0c0e975be942242d3b0c ChangeLog 1681
+MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
+MD5 8b19270db8b52ad5d72216e9a49a3f1f files/digest-codeine-1.0 64
+MD5 9d838d8987e1f759ec0f4eb891d73b52 files/codeine-xine-lib-1.0.patch 455
 MD5 4b415d0e0a2bd3e13d00a5890479afae files/digest-codeine-1.0_beta1 69
+MD5 d0a0a5400e52df4745220ab7def2cecf files/digest-codeine-1.0_beta2 69
+MD5 0906ddfaadfffa484469a5bba7729451 files/digest-codeine-1.0_beta3 69
+MD5 0eadb2f9120e3e34ad09a31ef726d6b1 files/digest-codeine-1.0_rc1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDHP0hntT9W3vfTuoRAns6AJ9+IK169gaLF+ZiIN6mx0urHxDCTwCeJ319
+5zQK2lX0PWdiNhOeY+FAYJU=
+=I/Ac
+-----END PGP SIGNATURE-----
diff --git a/media-video/codeine/codeine-1.0.ebuild b/media-video/codeine/codeine-1.0.ebuild
index 2fda7bfb441c..bf65711803f4 100644
--- a/media-video/codeine/codeine-1.0.ebuild
+++ b/media-video/codeine/codeine-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-video/codeine/codeine-1.0.ebuild,v 1.1 2005/09/06 02:20:56 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 inherit kde multilib
 
diff --git a/media-video/codeine/codeine-1.0_beta1.ebuild b/media-video/codeine/codeine-1.0_beta1.ebuild
index c323d5172f9c..966a56abae03 100644
--- a/media-video/codeine/codeine-1.0_beta1.ebuild
+++ b/media-video/codeine/codeine-1.0_beta1.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-video/codeine/codeine-1.0_beta1.ebuild,v 1.1 2004/10/24 05:40:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
-inherit kde
+inherit eutils kde
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
@@ -13,18 +13,25 @@ SRC_URI="http://www.methylblue.com/codeine/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE="debug"
 
 DEPEND="media-libs/xine-lib"
 need-kde 3.1
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-xine-lib-1.0.patch
+}
+
 src_compile(){
 	local myconf=""
 
 	use debug && myconf="${myconf} --debug"
 
-	./configure $myconf
+	./configure $myconf || die "bla"
 	emake
 }
 src_install() {
diff --git a/media-video/codeine/codeine-1.0_beta2.ebuild b/media-video/codeine/codeine-1.0_beta2.ebuild
index e26b69396c38..6615a2c0e779 100644
--- a/media-video/codeine/codeine-1.0_beta2.ebuild
+++ b/media-video/codeine/codeine-1.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_beta2.ebuild,v 1.1 2005/04/11 12:28:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_beta2.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 inherit eutils kde
 
diff --git a/media-video/codeine/codeine-1.0_beta3.ebuild b/media-video/codeine/codeine-1.0_beta3.ebuild
index a24b3cabedb4..28694a118a39 100644
--- a/media-video/codeine/codeine-1.0_beta3.ebuild
+++ b/media-video/codeine/codeine-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-video/codeine/codeine-1.0_beta3.ebuild,v 1.1 2005/04/14 09:46:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_beta3.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-video/codeine/codeine-1.0_rc1.ebuild b/media-video/codeine/codeine-1.0_rc1.ebuild
index efdf2ac3d656..7a0990f49724 100644
--- a/media-video/codeine/codeine-1.0_rc1.ebuild
+++ b/media-video/codeine/codeine-1.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-video/codeine/codeine-1.0_rc1.ebuild,v 1.1 2005/07/21 08:16:04 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-video/codeine/metadata.xml b/media-video/codeine/metadata.xml
index 6fb162be6d97..8a4280444123 100644
--- a/media-video/codeine/metadata.xml
+++ b/media-video/codeine/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-video/coriander/ChangeLog b/media-video/coriander/ChangeLog
index d80f528c0d5b..66f5a3786a97 100644
--- a/media-video/coriander/ChangeLog
+++ b/media-video/coriander/ChangeLog
@@ -1,6 +1,21 @@
-# ChangeLog for media-plugins/coriander
+# ChangeLog for media-video/coriander
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/ChangeLog,v 1.1 2005/08/26 16:13:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/ChangeLog,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
+
+*coriander-2.0.0_pre4 (03 Nov 2005)
+
+  03 Nov 2005; Seemant Kulleen <seemant@gentoo.org>
+  coriander-2.0.0_pre3.ebuild, +coriander-2.0.0_pre4.ebuild:
+  version bump to, you know, actually *work* with libdc1394-2.0.0-pre4
+
+*coriander-2.0.0_pre3 (29 Aug 2005)
+
+  29 Aug 2005; Seemant Kulleen <seemant@gentoo.org>
+  +coriander-2.0.0_pre3.ebuild:
+  Version bump to newest prerelease -- this is a gnome2 app finally
+
+  26 Aug 2005; Seemant Kulleen <seemant@gentoo.org> +metadata.xml:
+  add metadata
 
   26 Aug 2005; Seemant Kulleen <seemant@gentoo.org>
   +coriander-1.0.0_pre3.ebuild, +coriander-1.0.0.ebuild:
diff --git a/media-video/coriander/Manifest b/media-video/coriander/Manifest
index f6957902aa87..5969a9121ebf 100644
--- a/media-video/coriander/Manifest
+++ b/media-video/coriander/Manifest
@@ -1,5 +1,8 @@
-MD5 5bee7f7ae48d795b249aa1d55c45ca5a ChangeLog 1217
-MD5 373179ae21648480cf3c4893fa17e42d coriander-1.0.0.ebuild 720
-MD5 d109fe8592b17fc9790fa014bccbf50d coriander-1.0.0_pre3.ebuild 718
+MD5 525d90893eaa418e8256c990a7638a4f ChangeLog 1967
+MD5 b3449a0140ef200d4a7813c58d833cf2 coriander-1.0.0.ebuild 621
+MD5 ee131c63d2d475cc6740240ae59a7695 coriander-2.0.0_pre3.ebuild 975
+MD5 73306a063e8261ee6c066c8a4e115d90 coriander-2.0.0_pre4.ebuild 975
 MD5 c344d5253d439210e7f818d87596934c files/digest-coriander-1.0.0 67
-MD5 3ef71e548387cb21fa1e7d1750970bbd files/digest-coriander-1.0.0_pre3 72
+MD5 ece152bc683f3a8bd90f78386b6cce81 files/digest-coriander-2.0.0_pre3 72
+MD5 491d4c9441a79bec91c7ae6124b004cc files/digest-coriander-2.0.0_pre4 72
+MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
diff --git a/media-video/coriander/coriander-1.0.0.ebuild b/media-video/coriander/coriander-1.0.0.ebuild
index 0d7722dcf351..c6a1d5f5821c 100644
--- a/media-video/coriander/coriander-1.0.0.ebuild
+++ b/media-video/coriander/coriander-1.0.0.ebuild
@@ -1,28 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation and Pieter Van den Abeele
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-1.0.0.ebuild,v 1.1 2005/08/26 16:13:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
-DESCRIPTION="coriander makes the apple isight video4linux compatible"
+DESCRIPTION="A GUI for firewire cameras"
 HOMEPAGE="http://sourceforge.net/projects/coriander/"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc ~x86 ppc64"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 
-S=${WORKDIR}/coriander-1.0.0/
-
 DEPEND="media-libs/libdc1394
 	gnome-base/gnome-libs
 	sys-devel/libtool"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dodoc NEWS README AUTHORS
 }
diff --git a/media-video/coriander/coriander-2.0.0_pre3.ebuild b/media-video/coriander/coriander-2.0.0_pre3.ebuild
index ecd658a97c60..7bf9e9a1608c 100644
--- a/media-video/coriander/coriander-2.0.0_pre3.ebuild
+++ b/media-video/coriander/coriander-2.0.0_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation and Pieter Van den Abeele
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-2.0.0_pre3.ebuild,v 1.1 2005/08/29 12:42:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-2.0.0_pre3.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 MY_P=${P/_/-}
 
@@ -16,7 +16,7 @@ IUSE="ffmpeg"
 S=${WORKDIR}/${MY_P}
 
 
-RDEPEND=">=media-libs/libdc1394-2.0.0_pre3
+RDEPEND="=media-libs/libdc1394-2.0.0_pre4*
 	ffmpeg? ( media-video/ffmpeg )
 	media-libs/libsdl
 	gnome-base/libgnomeui
diff --git a/media-video/coriander/coriander-2.0.0_pre4.ebuild b/media-video/coriander/coriander-2.0.0_pre4.ebuild
index 02066b3f6fd6..a2b2ff80f872 100644
--- a/media-video/coriander/coriander-2.0.0_pre4.ebuild
+++ b/media-video/coriander/coriander-2.0.0_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation and Pieter Van den Abeele
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-2.0.0_pre4.ebuild,v 1.1 2005/11/03 16:12:50 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-2.0.0_pre4.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 MY_P=${P/_/-}
 
diff --git a/media-video/cpdvd/ChangeLog b/media-video/cpdvd/ChangeLog
index 3285bcc766a3..564435aafba8 100644
--- a/media-video/cpdvd/ChangeLog
+++ b/media-video/cpdvd/ChangeLog
@@ -1,10 +1,22 @@
-# ChangeLog for media-sound/cpdvd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cpdvd/ChangeLog,v 1.1 2004/10/06 20:31:27 trapni Exp $
+# ChangeLog for media-video/cpdvd
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cpdvd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> cpdvd-1.10.ebuild:
+  Added to ~ppc.
+
+  29 Mar 2005; Chris White <chriswhite@gentoo.org> cpdvd-1.10.ebuild:
+  Fix bug #86966.  Add a built_with_use check for transcode and dvdread.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> cpdvd-1.10.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> cpdvd-1.10.ebuild:
+  Added to ~amd64.  Fixed LICENSE.
 
 *cpdvd-1.10 (21 Aug 2004)
 
-  21 Aug 2004; Christian Parpart <cparpart@surakware.net>:
+  21 Aug 2004; Christian Parpart <trapni@gentoo.org>:
   Initial import. Ebuild submitted (#64508) 
   by henning <henning@wh9.tu-dresden.de>.
   Adapted to meet gentoo policies.
diff --git a/media-video/cpdvd/Manifest b/media-video/cpdvd/Manifest
index 97e358c3814b..99cadef4160d 100644
--- a/media-video/cpdvd/Manifest
+++ b/media-video/cpdvd/Manifest
@@ -1,3 +1,4 @@
-MD5 eee20a6e39038dc332093f897bedcb6e .cpdvd-1.10.ebuild.swp 12288
-MD5 8437f58453a83a7198ba418141e07ac5 cpdvd-1.10.ebuild 454
+MD5 a2d559b82db1e0c8d6727a1eb08e6c63 ChangeLog 851
+MD5 5d409338ba2f1d1f730baf2e196a0082 cpdvd-1.10.ebuild 816
+MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
 MD5 85d0ed9827e48584fda4aec1d45ec0a8 files/digest-cpdvd-1.10 56
diff --git a/media-video/cpdvd/cpdvd-1.10.ebuild b/media-video/cpdvd/cpdvd-1.10.ebuild
index 5fa18b866242..e22d6b323dea 100644
--- a/media-video/cpdvd/cpdvd-1.10.ebuild
+++ b/media-video/cpdvd/cpdvd-1.10.ebuild
@@ -1,29 +1,35 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cpdvd/cpdvd-1.10.ebuild,v 1.1 2004/10/06 20:31:27 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cpdvd/cpdvd-1.10.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+inherit eutils
+
+IUSE=""
+
+S="${WORKDIR}"
 
 DESCRIPTION="transfer a DVD title to your harddisk with ease on Linux"
-SRC_URI="http://www.lallafa.de/bp/files/${P}.gz"
 HOMEPAGE="http://www.lallafa.de/bp/cpdvd.html"
-KEYWORDS="~x86"
-LICENSE="GPL-1"
+SRC_URI="http://www.lallafa.de/bp/files/${P}.gz"
+
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="
-	>=media-video/transcode-0.6.2
-	>=perl-5.8.0-r12
-	>=cpvts-1.2
-"
+DEPEND=""
 
-MY_S=${WORKDIR}
+RDEPEND=">=media-video/transcode-0.6.2
+	>=dev-lang/perl-5.8.0-r12
+	>=media-video/cpvts-1.2"
+
+pkg_setup() {
+	built_with_use media-video/transcode dvdread || die "Transcode needs dvdread support builtin for this package to work."
+}
 
 src_compile () {
-	#there are probably other places to rename the file...
-	cd ${MY_S} || die
-	mv ${P} ${PN} || die
+	einfo "Nothing to compile."
 }
 
 src_install () {
-	dobin ${MY_S}/${PN} || die
+	newbin ${P} ${PN} || die
 }
diff --git a/media-video/cpvts/ChangeLog b/media-video/cpvts/ChangeLog
index 553eff78d919..a2c4c94ca47f 100644
--- a/media-video/cpvts/ChangeLog
+++ b/media-video/cpvts/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for media-sound/cpvts
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cpvts/ChangeLog,v 1.1 2004/10/06 20:26:56 trapni Exp $
+# ChangeLog for media-video/cpvts
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cpvts/ChangeLog,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> cpvts-1.2.ebuild:
+  Added to ~ppc.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> cpvts-1.2.ebuild:
+  Added to ~amd64.  Fixed LICENSE.
 
 *cpvts-1.2 (06 Oct 2004)
 
diff --git a/media-video/cpvts/Manifest b/media-video/cpvts/Manifest
index 08f787fc8652..2dd0a8bd8c4c 100644
--- a/media-video/cpvts/Manifest
+++ b/media-video/cpvts/Manifest
@@ -1,3 +1,4 @@
-MD5 0697c7cf12181a548e8dfcaad0454bdc .cpvts-1.2.ebuild.swp 12288
-MD5 442a3f8530bd08f811862529f037562e cpvts-1.2.ebuild 346
+MD5 1786d83501a6a8719a664b5a81bf3c32 ChangeLog 600
+MD5 97220db3fca11df4a604d03ef85ef2cb cpvts-1.2.ebuild 596
+MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
 MD5 cbb33c789712e1a80054963c6d74928d files/digest-cpvts-1.2 56
diff --git a/media-video/cpvts/cpvts-1.2.ebuild b/media-video/cpvts/cpvts-1.2.ebuild
index 4a0efcb9819e..99b6e22baad8 100644
--- a/media-video/cpvts/cpvts-1.2.ebuild
+++ b/media-video/cpvts/cpvts-1.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-video/cpvts/cpvts-1.2.ebuild,v 1.1 2004/10/06 20:26:56 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cpvts/cpvts-1.2.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
+
+IUSE=""
+
+MY_S="${WORKDIR}/${PN}"
 
 DESCRIPTION="raw copy title sets from a DVD to your harddisc"
 SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
 HOMEPAGE="http://www.lallafa.de/bp/cpvts.html"
+
 SLOT="0"
-IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="media-libs/libdvdread"
 
-KEYWORDS="~x86"
-LICENSE="GPL-1"
-
-MY_S=${WORKDIR}/${PN}
-
 src_compile () {
 	cd ${MY_S} || die
 	emake || die
diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index e723b610fc1a..beb96d228957 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,8 +1,55 @@
 # ChangeLog for media-video/cxfe
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.1 2004/08/25 20:10:51 arj Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> cxfe-0.7.5.ebuild,
+  cxfe-0.9.1.ebuild, cxfe-0.9.1-r1.ebuild, cxfe-0.9.1-r2.ebuild:
+  Don't install COPYING file.
+
+*cxfe-0.9.1-r2 (23 Sep 2005)
+
+  23 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +cxfe-0.9.1-r2.ebuild:
+  Added new patch which makes the background of the window black instead
+  of whatever data was in the allocated memory from X.
+	
+  04 May 2005; David Holm <dholm@gentoo.org> cxfe-0.9.1-r1.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bugreport.
+
+  01 Mar 2005; Anders Rune Jensen <arj@gentoo.org> files/position-osd.patch:
+  Better position patch.
+
+  24 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> cxfe-0.9.1-r1.ebuild:
+  apllied a patch to fix #82684.
+
+  16 Feb 2005; Anders Rune Jensen <arj@gentoo.org>
+  files/gcc-2.95-fix.patch, files/max-osd-fix.patch:
+  Convert these two patches from dos format to unix. Hopefully fixing #81523.
+	
+  15 Jan 2005; Anders Rune Jensen <arj@gentoo.org> +cxfe-0.9.1-r1.ebuild:
+  Two more patches, one to disable dpms in x11 fullscreen and another to
+  add a status button.
+	
+  13 Jan 2005; Anders Rune Jensen <arj@gentoo.org> cxfe-0.9.1.ebuild:
+  Tested and works on amd64. 3 Patches, one to fix OSD, another to 
+  make it compile on gcc 2.95 and the last to make xv the default output 
+  device.
+
+*cxfe-0.9.1 (28 Nov 2004)
+
+  28 Nov 2004; Anders Rune Jensen <arj@gentoo.org> cxfe-0.9.1.ebuild:
+  New version.
+
+  27 Sep 2004; Anders Rune Jensen <arj@gentoo.org> cxfe-0.7.5.ebuild:
+  Updated Makefile patch which makes it a little cleaner and makes it work
+  with xorg-x11.
+
+  18 Sep 2004; Anders Rune Jensen <arj@gentoo.org> cxfe-0.7.5.ebuild:
+  Stable on x86.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> cxfe-0.7.5.ebuild:
+  Added to ~ppc.
 
 *cxfe-0.7.5 (25 Aug 2004)
 
   25 Aug 2004; Anders Rune Jensen <arj@gentoo.org> cxfe-0.7.5.ebuild:
-  Initial port.  Ebuild contributed by <anders@gentoo.org>
+  Initial import.
diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest
index 2a580e0cb8bb..6fcc46d1fec2 100644
--- a/media-video/cxfe/Manifest
+++ b/media-video/cxfe/Manifest
@@ -1,3 +1,27 @@
-MD5 16988ac949cb63432166c321258197a9 metadata.xml 253
-MD5 fe541f9536933e6cd2db3b7f80b5c042 cxfe-0.7.5.ebuild 532
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 92ffcef903eacf54a9eaad8a4c530dbf ChangeLog 2107
+MD5 b38f2e4778a7bc69cc6b8b85d39b04d3 cxfe-0.7.5.ebuild 724
+MD5 2b6d56b572e270e8bb121ba1c7aad624 cxfe-0.9.1-r1.ebuild 960
+MD5 f3009dbd4d9e30f22fb11ded861c9e35 cxfe-0.9.1-r2.ebuild 1003
+MD5 142391a8678ce5685d3c25d2f01bff6c cxfe-0.9.1.ebuild 775
+MD5 8b9e755c332942ee010472cb4db6a68f files/Makefile-fix.patch 1509
+MD5 f8e468cea0a41a9ed57857a1bb0436d7 files/black-background.patch 792
 MD5 d75978f6e55a95ec4a87ba6144aaea71 files/digest-cxfe-0.7.5 61
+MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1 61
+MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r1 61
+MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r2 61
+MD5 0d403e10e19e0524e5687b7dcdc710c2 files/disable-dpms.patch 3277
+MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583
+MD5 b7df88994713f7337645ce491f5d76d9 files/max-osd-fix.patch 728
+MD5 89258150099c21b29f6ba5c5f27cdb56 files/position-osd.patch 1784
+MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbyoMj5H05b2HAEkRAsejAJ9MfMB1F0Ka4SXkslIA6hSsFBxv4wCginpe
+w6Ar2tU1uJOSawtWVpcqOt0=
+=Aw70
+-----END PGP SIGNATURE-----
diff --git a/media-video/cxfe/cxfe-0.7.5.ebuild b/media-video/cxfe/cxfe-0.7.5.ebuild
index 79938fc5f94f..99176cbabe30 100644
--- a/media-video/cxfe/cxfe-0.7.5.ebuild
+++ b/media-video/cxfe/cxfe-0.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.7.5.ebuild,v 1.1 2004/08/25 20:10:51 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.7.5.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE="lirc"
 
 DEPEND=">=media-libs/xine-lib-1_rc1
@@ -31,5 +31,5 @@ src_unpack() {
 
 src_install() {
 	dobin cxfe
-	dodoc COPYING README TODO lircrc-example
+	dodoc README TODO lircrc-example
 }
diff --git a/media-video/cxfe/cxfe-0.9.1-r1.ebuild b/media-video/cxfe/cxfe-0.9.1-r1.ebuild
index 7a1e8aed81dd..05db9deae679 100644
--- a/media-video/cxfe/cxfe-0.9.1-r1.ebuild
+++ b/media-video/cxfe/cxfe-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/media-video/cxfe/cxfe-0.9.1-r1.ebuild,v 1.1 2005/01/15 04:48:31 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="lirc"
 
 DEPEND=">=media-libs/xine-lib-1_rc1
@@ -28,9 +28,12 @@ src_unpack() {
 	epatch ${FILESDIR}/xv-default.patch
 	epatch ${FILESDIR}/disable-dpms.patch
 	epatch ${FILESDIR}/position-osd.patch
+
+	# add missing space, see #82684
+	sed -i -e 's/\-lXext\@LDFLAGS/\-lXext \@LDFLAGS/' Makefile.in
 }
 
 src_install() {
 	dobin cxfe
-	dodoc COPYING README TODO lircrc-example
+	dodoc README TODO lircrc-example
 }
diff --git a/media-video/cxfe/cxfe-0.9.1-r2.ebuild b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
index 0670bdbd138e..08bf53b6c10f 100644
--- a/media-video/cxfe/cxfe-0.9.1-r2.ebuild
+++ b/media-video/cxfe/cxfe-0.9.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-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.1 2005/09/23 21:24:59 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 inherit eutils
 
@@ -36,5 +36,5 @@ src_unpack() {
 
 src_install() {
 	dobin cxfe
-	dodoc COPYING README TODO lircrc-example
+	dodoc README TODO lircrc-example
 }
diff --git a/media-video/cxfe/cxfe-0.9.1.ebuild b/media-video/cxfe/cxfe-0.9.1.ebuild
index f24547cb4ea9..d7defbd2a249 100644
--- a/media-video/cxfe/cxfe-0.9.1.ebuild
+++ b/media-video/cxfe/cxfe-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/media-video/cxfe/cxfe-0.9.1.ebuild,v 1.1 2004/11/28 15:51:03 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 amd64"
 IUSE="lirc"
 
 DEPEND=">=media-libs/xine-lib-1_rc1
@@ -22,9 +22,13 @@ DEPEND=">=media-libs/xine-lib-1_rc1
 src_unpack() {
 	unpack ${A}
 	mv cxfe ${P}
+	cd ${P}
+	epatch ${FILESDIR}/gcc-2.95-fix.patch
+	epatch ${FILESDIR}/max-osd-fix.patch
+	epatch ${FILESDIR}/xv-default.patch
 }
 
 src_install() {
 	dobin cxfe
-	dodoc COPYING README TODO lircrc-example
+	dodoc README TODO lircrc-example
 }
diff --git a/media-video/cxfe/files/Makefile-fix.patch b/media-video/cxfe/files/Makefile-fix.patch
index 4104e79f67cb..a1d97a50ae1a 100644
--- a/media-video/cxfe/files/Makefile-fix.patch
+++ b/media-video/cxfe/files/Makefile-fix.patch
@@ -1,12 +1,52 @@
 --- Makefile.in	2004-08-15 01:11:43.000000000 +0200
-+++ ../cxfe-modified/Makefile.in	2004-08-25 19:03:47.273757920 +0200
-@@ -34,8 +34,7 @@
++++ ../cxfe-edited/Makefile.in	2004-09-25 10:56:21.820612240 +0200
+@@ -1,7 +1,7 @@
+ SHELL = /bin/sh
+ VPATH = @srcdir@
+ 
+-subdirs = @subdirs@
++subdirs = .
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+ prefix = @prefix@
+@@ -13,9 +13,9 @@
+ 
+ CC = @CC@ -Wall
+ CPPFLAGS = @CPPFLAGS@
+-CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags`
++CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags` -I/usr/X11R6/include
+ LIBS = @LIBS@
+-LDFLAGS = `xine-config --libs` @LDFLAGS@ -lX11 @LIBS@ 
++LDFLAGS = `xine-config --libs` -L/usr/X11R6/lib -lX11 -lXext @LDFLAGS@ @LIBS@ 
+ INSTALL = @INSTALL@
+ 
+ #CC=gcc -Wall -g -O2
+@@ -29,15 +29,20 @@
+ cxfe: cxfe.o termio/getch2.o
+ 
+ clean:
+-	rm cxfe.o cxfe termio/*.o
++	@if test -f cxfe.o ; then rm cxfe.o ; fi
++	@if test -f cxfe ; then rm cxfe termio/*.o ; fi
++	@if test -f termio/getch2.o ; then rm cxfe termio/*.o ; fi
+ 
  install:
- 	cp cxfe $(bindir)/cxfe
- 	chmod 755 $(bindir)/cxfe
+-	cp cxfe $(bindir)/cxfe
+-	chmod 755 $(bindir)/cxfe
 -        if test ! -d $(prefix)/share/cxfe ; then mkdir -p $(prefix)/share/cxfe ; 
 -fi
-+	if test ! -d $(prefix)/share/cxfe ; then mkdir -p $(prefix)/share/cxfe ; fi
- 	cp lircrc-example $(prefix)/share/cxfe/lircrc
+-	cp lircrc-example $(prefix)/share/cxfe/lircrc
++	@echo "Installing cxfe to:" $(bindir)/cxfe
++	@chmod +x cxfe
++	@cp cxfe $(bindir)/cxfe
++	@if test ! -d $(prefix)/share/cxfe ; \
++	then mkdir -p $(prefix)/share/cxfe ; \
++	fi
++	@echo "Installing lirc example to:" $(prefix)/share/cxfe/lircrc
++	@cp lircrc-example $(prefix)/share/cxfe/lircrc
  
  uninstall:
+-	rm -f $(bindir)/cxfe
+-	rm -Rf $(prefix)/share/cxfe
++	@rm -f $(bindir)/cxfe
++	@rm -Rf $(prefix)/share/cxfe
diff --git a/media-video/cxfe/files/gcc-2.95-fix.patch b/media-video/cxfe/files/gcc-2.95-fix.patch
index 9f1b1e4b4eb2..4f8b7f934490 100644
--- a/media-video/cxfe/files/gcc-2.95-fix.patch
+++ b/media-video/cxfe/files/gcc-2.95-fix.patch
@@ -1,23 +1,23 @@
---- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100

-+++ cxfe-0.91/cxfe.c	2004-11-30 11:32:48.230792288 +0100

-@@ -955,6 +955,9 @@

-   static            pthread_t lirc_thread;

-   static	    pthread_t osd_thread;

-   int               err;

-+  int dvd_mrl = 0;

-+  int vcd_mrl = 0;

-+  int cd_mrl = 0;

-   /* default values */

-   fullscreen = 0;

-   

-@@ -1075,10 +1078,6 @@

-   xine_init(cxfe.xine);

-   

-     // check which mrl types was specified:

--  int dvd_mrl = 0;

--  int vcd_mrl = 0;

--  int cd_mrl = 0;

--  

-   for(i = 0; i < m; i++){

-      if (strstr(mrl[i], "dvd:"))

-        dvd_mrl = 1;

+--- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
++++ cxfe-0.91/cxfe.c	2004-11-30 11:32:48.230792288 +0100
+@@ -955,6 +955,9 @@
+   static            pthread_t lirc_thread;
+   static	    pthread_t osd_thread;
+   int               err;
++  int dvd_mrl = 0;
++  int vcd_mrl = 0;
++  int cd_mrl = 0;
+   /* default values */
+   fullscreen = 0;
+   
+@@ -1075,10 +1078,6 @@
+   xine_init(cxfe.xine);
+   
+     // check which mrl types was specified:
+-  int dvd_mrl = 0;
+-  int vcd_mrl = 0;
+-  int cd_mrl = 0;
+-  
+   for(i = 0; i < m; i++){
+      if (strstr(mrl[i], "dvd:"))
+        dvd_mrl = 1;
diff --git a/media-video/cxfe/files/max-osd-fix.patch b/media-video/cxfe/files/max-osd-fix.patch
index e6fc4660f110..92847a9a4d09 100644
--- a/media-video/cxfe/files/max-osd-fix.patch
+++ b/media-video/cxfe/files/max-osd-fix.patch
@@ -1,34 +1,34 @@
---- cxfe.c	2004-11-27 03:07:59.000000000 +0100

-+++ cxfe-max-osd.c	2004-12-11 18:22:29.171711112 +0100

-@@ -125,11 +125,22 @@

- //  if(fbxine.osd.enabled) {

-     va_list   args;

-     char     *buf;

--    int       n, size = 100;

-+    int       n, size = 47;

-     

-     if((buf = xine_xmalloc(size)) == NULL) 

-       return;

-     

-+    va_start(args, info);

-+    n = vsnprintf(buf, size, info, args);

-+    va_end(args);

-+

-+    buf = realloc(buf, size+3);

-+    buf[size-1] = '.';

-+    buf[size] = '.';

-+    buf[size+1] = '.';

-+    buf[size+2] = '\0';

-+

-+#if 0

-     while(1) {

-       

-       va_start(args, info);

-@@ -147,6 +158,7 @@

-       if((buf = realloc(buf, size)) == NULL)

- 	return;

-     }

-+#endif

- 

-     xine_osd_clear(osd);

- 

+--- cxfe.c	2004-11-27 03:07:59.000000000 +0100
++++ cxfe-max-osd.c	2004-12-11 18:22:29.171711112 +0100
+@@ -125,11 +125,22 @@
+ //  if(fbxine.osd.enabled) {
+     va_list   args;
+     char     *buf;
+-    int       n, size = 100;
++    int       n, size = 47;
+     
+     if((buf = xine_xmalloc(size)) == NULL) 
+       return;
+     
++    va_start(args, info);
++    n = vsnprintf(buf, size, info, args);
++    va_end(args);
++
++    buf = realloc(buf, size+3);
++    buf[size-1] = '.';
++    buf[size] = '.';
++    buf[size+1] = '.';
++    buf[size+2] = '\0';
++
++#if 0
+     while(1) {
+       
+       va_start(args, info);
+@@ -147,6 +158,7 @@
+       if((buf = realloc(buf, size)) == NULL)
+ 	return;
+     }
++#endif
+ 
+     xine_osd_clear(osd);
+ 
diff --git a/media-video/cxfe/files/position-osd.patch b/media-video/cxfe/files/position-osd.patch
index 00faa4b18dc0..2d04a38c14cd 100644
--- a/media-video/cxfe/files/position-osd.patch
+++ b/media-video/cxfe/files/position-osd.patch
@@ -1,25 +1,12 @@
-Common subdirectories: cxfe/CVS and cxfe-mod/CVS
-diff -uN cxfe/README cxfe-mod/README
---- cxfe/README	2004-11-27 03:32:10.000000000 +0100
-+++ cxfe-mod/README	2005-01-15 06:26:10.714383896 +0100
-@@ -91,6 +91,7 @@
- Up Arrow - increases Volume
- Down Arrow - decrease Volume
- f - Full Screen/Window Toggle (X only)
-+o - Display position in stream
- d - Toggle Deinterlace/post processing (uses default or post set with
-     -p switch)
- s - Skip to next MRL if multiple MRLS supplied.  If only one
-diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
 --- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
-+++ cxfe-mod/cxfe.c	2005-01-15 06:30:27.162397872 +0100
-@@ -476,6 +476,27 @@
++++ cxfe-mod/cxfe.c	2005-03-01 23:37:18.394875952 +0100
+@@ -476,6 +476,28 @@
     percent_done = (ltime/llength)*100;
     printf("Time:%d sec Length:%d sec \n",ltime/1000,llength/1000);
  }
 +static void print_osd_status()
 +{
-+   int               lpos, ltime, llength;
++   int	     lpos, ltime, llength;
 +   int	     percent_done;
 +   
 +   
@@ -35,13 +22,14 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
 +   int tot_min = (llength/1000-tot_hour*60*60)/60;
 +   int tot_sec= llength/1000-tot_hour*60*60-tot_min*60;
 +   
-+   osd_display_info("%d:%d:%d / %d:%d:%d (%d%%)", cur_hour, cur_min, cur_sec, 
-+		    tot_hour, tot_min, tot_sec, percent_done);
++   osd_display_info("%02d:%02d:%02d / %02d:%02d:%02d (%2d%%)", cur_hour, 
++		    cur_min, cur_sec, tot_hour, tot_min, tot_sec, 
++		    percent_done);
 +}
  #ifdef HAVE_LIBLIRC_CLIENT
  static void *process_lirc_thread()
  {
-@@ -518,6 +539,8 @@
+@@ -518,6 +540,8 @@
                  if (!strcmp(c,"Quit")){
                      running = 0;
                      next_mrl = FALSE;}
@@ -50,7 +38,7 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
  		if (!strcmp(c,"ASPECT_CHANGE"))
  		    aspect_change();
  		if (!strcmp(c,"Menu"))
-@@ -679,6 +702,10 @@
+@@ -679,6 +703,10 @@
  	case 'D':
  	        toggle_deinterlace();
  		break;
@@ -61,7 +49,7 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
          case 'l':
          case 13:
             	send_event(XINE_EVENT_INPUT_SELECT);
-@@ -864,6 +891,10 @@
+@@ -864,6 +892,10 @@
             case XK_M:
               send_event(XINE_EVENT_INPUT_DOWN);
               break;
@@ -72,21 +60,3 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c
             case XK_Return:
               send_event(XINE_EVENT_INPUT_SELECT);
               break;
-diff -uN cxfe/lircrc-example cxfe-mod/lircrc-example
---- cxfe/lircrc-example	2004-11-15 15:44:06.000000000 +0100
-+++ cxfe-mod/lircrc-example	2005-01-15 06:29:39.959573792 +0100
-@@ -99,6 +99,13 @@
- end
- begin
-         remote = REALmagic
-+	button = OSD
-+        prog   = cxfe
-+        repeat = 0
-+        config = STATUS
-+end
-+begin
-+        remote = REALmagic
- 	button = 1
-         prog   = cxfe
-         repeat = 0
-Common subdirectories: cxfe/termio and cxfe-mod/termio
diff --git a/media-video/cxfe/metadata.xml b/media-video/cxfe/metadata.xml
index a277cdfeb55d..0e3b862ed279 100644
--- a/media-video/cxfe/metadata.xml
+++ b/media-video/cxfe/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-video</herd>
+<herd>video</herd>
 <maintainer>
 <email>arj@gentoo.org</email>
 <name>Anders Rune Jensen</name>
diff --git a/media-video/dfbsee/ChangeLog b/media-video/dfbsee/ChangeLog
index ac1fee25b3ec..b14c6460c5d9 100644
--- a/media-video/dfbsee/ChangeLog
+++ b/media-video/dfbsee/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for media-video/DFBSee
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dfbsee/ChangeLog,v 1.1 2004/11/25 20:40:59 chriswhite Exp $
+# ChangeLog for media-video/dfbsee
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dfbsee/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> dfbsee-0.7.4.ebuild:
+  Don't append -Wl,-z,now; use $(bindnow-flags) instead.
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> dfbsee-0.7.4.ebuild:
+  Remove unneeded virtual/x11 dependency as per bug #96481.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> dfbsee-0.7.4.ebuild:
+  Don't install INSTALL file.
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> dfbsee-0.7.4.ebuild:
+  corrected path for S to fix #76211.also appended some ldflags to get rid of a
+  QA notice.
 
 *dfbsee-0.7.4 (26 Nov 2004)
 
diff --git a/media-video/dfbsee/Manifest b/media-video/dfbsee/Manifest
index 9794cbbabce1..376cfd2aa4af 100644
--- a/media-video/dfbsee/Manifest
+++ b/media-video/dfbsee/Manifest
@@ -1,4 +1,14 @@
-MD5 521b3a5c331107dfab260c228eff9f16 ChangeLog 1224
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 1a67e0e8f2fab7776bce03d7e94164f9 dfbsee-0.7.4.ebuild 645
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fb9d667456b6e732e86070b7380684b3 ChangeLog 1919
+MD5 e10c0e6461a0109b5655701842238f1c dfbsee-0.7.4.ebuild 783
 MD5 3f38d255bd61645e0aba8a013bb4a35a files/digest-dfbsee-0.7.4 64
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZf0Cj5H05b2HAEkRAqE8AJ4hscDYlVqI3vKlg0LZIe5u+irseACePshD
+J02n/RAPCrzq8o/y8KGjX9w=
+=h+sM
+-----END PGP SIGNATURE-----
diff --git a/media-video/dfbsee/dfbsee-0.7.4.ebuild b/media-video/dfbsee/dfbsee-0.7.4.ebuild
index f3da002b82f3..2a3a112cac84 100644
--- a/media-video/dfbsee/dfbsee-0.7.4.ebuild
+++ b/media-video/dfbsee/dfbsee-0.7.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-video/dfbsee/dfbsee-0.7.4.ebuild,v 1.1 2004/11/25 20:40:59 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dfbsee/dfbsee-0.7.4.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+inherit flag-o-matic
 
 MY_PN="DFBSee"
 MY_P=${MY_PN}-${PV}
@@ -14,13 +16,19 @@ LICENSE="GPL-2"
 KEYWORDS="x86 -sparc ~amd64"
 IUSE=""
 
-DEPEND="virtual/x11
-	dev-libs/DirectFB
+DEPEND="dev-libs/DirectFB
 	dev-util/pkgconfig"
 
-src_install () {
+S=${WORKDIR}/${MY_P}
 
-	make DESTDIR=${D} install || die
-	dodoc README INSTALL AUTHORS
+src_compile() {
+	append-ldflags $(bindnow-flags)
 
+	econf || die "./configure failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc README AUTHORS
 }
diff --git a/media-video/dirac/ChangeLog b/media-video/dirac/ChangeLog
index c2317084cd94..cae72de08db9 100644
--- a/media-video/dirac/ChangeLog
+++ b/media-video/dirac/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/dirac
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/ChangeLog,v 1.1 2005/06/10 01:45:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 *dirac-0.5.2 (10 Jun 2005)
 
diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest
index 302f63a79016..56b184dab229 100644
--- a/media-video/dirac/Manifest
+++ b/media-video/dirac/Manifest
@@ -1,3 +1,15 @@
-MD5 d9fbcce1fb0af2df6a0308ff6890a147 dirac-0.5.2.ebuild 925
-MD5 ca09da424bd17b30c7f8372d29eb4929 files/dirac-0.5.2-doc.patch 2436
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 83a4ad50d2574b952705c2640217465c dirac-0.5.2.ebuild 1076
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 337f052023408dbbdaf5bfa79a272917 ChangeLog 595
+MD5 75a42cb31d27cafec5f65b4289a303d1 files/dirac-0.5.2-doc.patch 2300
 MD5 dda7e7b65c9d20118346c4beef33b6a7 files/digest-dirac-0.5.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCqO/kj5H05b2HAEkRAgWeAJ0RIzfc5DmOoe7mTRJ4sQbadSaamACfeiUj
+iCLziJo+j+Vz+ru7/fprv0I=
+=f4jL
+-----END PGP SIGNATURE-----
diff --git a/media-video/dirac/dirac-0.5.2.ebuild b/media-video/dirac/dirac-0.5.2.ebuild
index 54178e833815..c61f309f1470 100644
--- a/media-video/dirac/dirac-0.5.2.ebuild
+++ b/media-video/dirac/dirac-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-0.5.2.ebuild,v 1.1 2005/06/10 01:45:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-0.5.2.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/dpencoder/ChangeLog b/media-video/dpencoder/ChangeLog
index 21e54b7432a4..38ba678507c6 100644
--- a/media-video/dpencoder/ChangeLog
+++ b/media-video/dpencoder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/dpencoder
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dpencoder/ChangeLog,v 1.1 2004/03/09 03:13:45 rphillips Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dpencoder/ChangeLog,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> dpencoder-0.6c.ebuild:
+  Added to ~ppc.
+
+  14 Apr 2004; Jason Wever <weeve@gentoo.org> dpencoder-0.6c.ebuild:
+  Added ~sparc keyword.
 
 *dpencoder-0.6c (08 Mar 2004)
 
diff --git a/media-video/dpencoder/Manifest b/media-video/dpencoder/Manifest
index d6822afad418..bbd97574d833 100644
--- a/media-video/dpencoder/Manifest
+++ b/media-video/dpencoder/Manifest
@@ -1,2 +1,4 @@
-MD5 6a90ecdea3eedb57ea4139a290be3aa7 dpencoder-0.6c.ebuild 576
+MD5 c0b99080b58c63431005446021097fb1 ChangeLog 526
+MD5 57cdc72665b598aae9ce3d4618588a22 dpencoder-0.6c.ebuild 679
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 b18bc9b73b946d03b185a6eec13674ff files/digest-dpencoder-0.6c 66
diff --git a/media-video/dpencoder/dpencoder-0.6c.ebuild b/media-video/dpencoder/dpencoder-0.6c.ebuild
index db617588059c..b2e42de05b3a 100644
--- a/media-video/dpencoder/dpencoder-0.6c.ebuild
+++ b/media-video/dpencoder/dpencoder-0.6c.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-video/dpencoder/dpencoder-0.6c.ebuild,v 1.1 2004/03/09 03:13:45 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dpencoder/dpencoder-0.6c.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://dpencoder.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dpencoder/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 S=${WORKDIR}/${P}/DPencoder
 
diff --git a/media-video/dvbackup/ChangeLog b/media-video/dvbackup/ChangeLog
index 2de046b179fc..838a80bf48fa 100644
--- a/media-video/dvbackup/ChangeLog
+++ b/media-video/dvbackup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/dvbackup
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbackup/ChangeLog,v 1.1 2005/01/17 09:45:03 kzimmerm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbackup/ChangeLog,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> dvbackup-0.0.4.ebuild:
+  Added to ~ppc.
 
 *dvbackup-0.0.4 (17 Jan 2005)
 
diff --git a/media-video/dvbackup/Manifest b/media-video/dvbackup/Manifest
index 14b137d17c32..6e6f81ea8b33 100644
--- a/media-video/dvbackup/Manifest
+++ b/media-video/dvbackup/Manifest
@@ -1,2 +1,4 @@
-MD5 8786b8c3c6e1560f0e9b76b22aeb892e dvbackup-0.0.4.ebuild 532
+MD5 7ef2ef276af67f105d66c70c94b14ec9 ChangeLog 495
+MD5 60ff02df1a1799cc917de2a653c6d890 dvbackup-0.0.4.ebuild 640
+MD5 a741469ea595fb76ba3553cb2f3f9b9a metadata.xml 222
 MD5 9e4f8e847ed04c5a412695d9a64403ca files/digest-dvbackup-0.0.4 66
diff --git a/media-video/dvbackup/dvbackup-0.0.4.ebuild b/media-video/dvbackup/dvbackup-0.0.4.ebuild
index e6723c1f6bbb..4a6ac1b551c2 100644
--- a/media-video/dvbackup/dvbackup-0.0.4.ebuild
+++ b/media-video/dvbackup/dvbackup-0.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-video/dvbackup/dvbackup-0.0.4.ebuild,v 1.1 2005/01/17 09:45:03 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbackup/dvbackup-0.0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 DESCRIPTION="A small utility for creating backups on DV tapes."
 HOMEPAGE="http://dvbackup.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/dvbackup/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND="sys-libs/glibc"
diff --git a/media-video/dvbsnoop/ChangeLog b/media-video/dvbsnoop/ChangeLog
index d6d23a6a7391..b77b14c9d8f3 100644
--- a/media-video/dvbsnoop/ChangeLog
+++ b/media-video/dvbsnoop/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-video/dvbsnoop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbsnoop/ChangeLog,v 1.1 2005/06/22 21:10:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbsnoop/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+*dvbsnoop-1.4.00 (07 Sep 2005)
+
+  07 Sep 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +dvbsnoop-1.4.00.ebuild:
+  Version bumped.
+
+  24 Aug 2005; Matthias Schwarzott <zzam@gentoo.org> dvbsnoop-1.3.77.ebuild:
+  stable on x86
+
+  13 Jul 2005; Matthias Schwarzott <zzam@gentoo.org> dvbsnoop-1.3.77.ebuild:
+  Changed dependency on dvb according to Bug #98672
+
+  08 Jul 2005; Matthias Schwarzott <zzam@gentoo.org> dvbsnoop-1.3.77.ebuild:
+  Added ~amd64
+
+  23 Jun 2005; David Holm <dholm@gentoo.org> dvbsnoop-1.3.77.ebuild:
+  Added to ~ppc.
 
 *dvbsnoop-1.3.77 (22 Jun 2005)
 
diff --git a/media-video/dvbsnoop/Manifest b/media-video/dvbsnoop/Manifest
index d1a536449f3d..90d64e110254 100644
--- a/media-video/dvbsnoop/Manifest
+++ b/media-video/dvbsnoop/Manifest
@@ -1,4 +1,6 @@
-MD5 7a80cbf22d82152af6f0206fa61adf35 dvbsnoop-1.3.77.ebuild 673
-MD5 60f7fc11bd6070065d6c5d7a458c6d21 ChangeLog 266
-MD5 0e52bccae5b7bfcd57ac7b21c66cdac2 metadata.xml 431
+MD5 eda9ba5dd93e3fa8bf962ef8b81662b4 dvbsnoop-1.4.00.ebuild 691
+MD5 7772721be0361ea87951b4ffaaac64f4 dvbsnoop-1.3.77.ebuild 690
+MD5 e45d05119d4213b3cb063790e89cccc2 ChangeLog 891
+MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 MD5 ed2e9df178616955bbec8e1b59e178ad files/digest-dvbsnoop-1.3.77 67
+MD5 72d613e1e54e2ccc79bc5fbb87c69b21 files/digest-dvbsnoop-1.4.00 67
diff --git a/media-video/dvbsnoop/dvbsnoop-1.3.77.ebuild b/media-video/dvbsnoop/dvbsnoop-1.3.77.ebuild
index b557e577c88b..3cf46e62e662 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.3.77.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.3.77.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbsnoop/dvbsnoop-1.3.77.ebuild,v 1.1 2005/06/22 21:10:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbsnoop/dvbsnoop-1.3.77.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 DESCRIPTION="DVB/MPEG stream analyzer program"
 SRC_URI="mirror://sourceforge/dvbsnoop/${P}.tar.gz"
 HOMEPAGE="http://dvbsnoop.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-DEPEND="=media-tv/linuxtv-dvb-headers-3*"
+KEYWORDS="~amd64 ~ppc x86"
+DEPEND="|| (
+		>=sys-kernel/linux-headers-2.6.11-r2
+		media-tv/linuxtv-dvb
+	)"
+
 RDEPEND=""
 SLOT="0"
 IUSE=""
 
 src_compile() {
-	econf \
-		CPPFLAGS=-I/usr/include/dvb || die "econf failed"
+	econf || die "econf failed"
 	emake || die "emake failed"
 }
 
diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.00.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.00.ebuild
index 0da86b5c7bb8..ad4d043ec572 100644
--- a/media-video/dvbsnoop/dvbsnoop-1.4.00.ebuild
+++ b/media-video/dvbsnoop/dvbsnoop-1.4.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-video/dvbsnoop/dvbsnoop-1.4.00.ebuild,v 1.1 2005/09/07 17:46:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbsnoop/dvbsnoop-1.4.00.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 DESCRIPTION="DVB/MPEG stream analyzer program"
 SRC_URI="mirror://sourceforge/dvbsnoop/${P}.tar.gz"
diff --git a/media-video/dvbsnoop/metadata.xml b/media-video/dvbsnoop/metadata.xml
index b21862c88565..fb84c475836b 100644
--- a/media-video/dvbsnoop/metadata.xml
+++ b/media-video/dvbsnoop/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>media-tv</herd>
 	<maintainer>
 		<email>zzam@gentoo.org</email>
 		<name>Matthias Schwarzott</name>
 	</maintainer>
-	<longdescription lang="de">dvbsnoop is a DVB / MPEG stream analyzer program, which enables you to watch (live) stream information in human readable form.</longdescription>
 </pkgmetadata>
diff --git a/media-video/dvd-slideshow/ChangeLog b/media-video/dvd-slideshow/ChangeLog
index e12b56e87212..a3c76dcc4b80 100644
--- a/media-video/dvd-slideshow/ChangeLog
+++ b/media-video/dvd-slideshow/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for media-video/dvd-slideshow
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/ChangeLog,v 1.1 2005/01/28 19:53:47 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/ChangeLog,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
+
+  05 Aug 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  dvd-slideshow-0.7.1.ebuild:
+  adding sox and bash dependency, fixing 'dodoc', installing 'dvd-slideshowrc'
+  into doc dir.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> dvd-slideshow-0.7.1.ebuild:
+  Added to ~ppc.
+
+*dvd-slideshow-0.7.1 (27 May 2005)
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -dvd-slideshow-0.6.0.ebuild, dvd-slideshow-0.7.0.ebuild,
+  +dvd-slideshow-0.7.1.ebuild:
+  added missing jhead dependency, fixes #94113. 0.7.0 stable on amd64 and x86.
+  new upstream version
+
+*dvd-slideshow-0.7.0 (22 Feb 2005)
+
+  22 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +dvd-slideshow-0.7.0.ebuild:
+  version bump. fixes #82715
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  dvd-slideshow-0.6.0.ebuild:
+  added missing toolame dependency, fixes #80976
 
 *dvd-slideshow-0.6.0 (28 Jan 2005)
 
diff --git a/media-video/dvd-slideshow/Manifest b/media-video/dvd-slideshow/Manifest
index 375552dc3c0a..14a7c6a1fee3 100644
--- a/media-video/dvd-slideshow/Manifest
+++ b/media-video/dvd-slideshow/Manifest
@@ -1,2 +1,6 @@
-MD5 c2391d679c2ba91bf75a8f447ecab056 dvd-slideshow-0.6.0.ebuild 741
-MD5 383321b29438c6662a0dc2bed878a9bf files/digest-dvd-slideshow-0.6.0 70
+MD5 75723b853110837bd3094d86ca48084d dvd-slideshow-0.7.1.ebuild 925
+MD5 a3cae7086798f0729176684506a85692 dvd-slideshow-0.7.0.ebuild 870
+MD5 15ba7696cad391bbeed1d1566def10d1 ChangeLog 1286
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 9eeaa96206c49f0ce3f0c96b946cc478 files/digest-dvd-slideshow-0.7.0 70
+MD5 c671c24f2d3103c2e3ff212c656385d2 files/digest-dvd-slideshow-0.7.1 70
diff --git a/media-video/dvd-slideshow/dvd-slideshow-0.7.0.ebuild b/media-video/dvd-slideshow/dvd-slideshow-0.7.0.ebuild
index 34dcefedd163..bafa375380a0 100644
--- a/media-video/dvd-slideshow/dvd-slideshow-0.7.0.ebuild
+++ b/media-video/dvd-slideshow/dvd-slideshow-0.7.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-video/dvd-slideshow/dvd-slideshow-0.7.0.ebuild,v 1.1 2005/02/22 18:33:49 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/dvd-slideshow-0.7.0.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 MY_P="${PN}_${PV}"
 
 DESCRIPTION="DVD Slideshow - Turn your pictures into a dvd with menus!"
 HOMEPAGE="http://dvd-slideshow.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dvd-slideshow/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DEPEND=">=media-video/dvdauthor-0.6.9
@@ -21,7 +21,8 @@ DEPEND=">=media-video/dvdauthor-0.6.9
 	media-video/transcode
 	media-video/ffmpeg
 	media-sound/lame
-	media-sound/toolame"
+	media-sound/toolame
+	media-gfx/jhead"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-video/dvd-slideshow/dvd-slideshow-0.7.1.ebuild b/media-video/dvd-slideshow/dvd-slideshow-0.7.1.ebuild
index 969bf3f66907..7b8d2699ea11 100644
--- a/media-video/dvd-slideshow/dvd-slideshow-0.7.1.ebuild
+++ b/media-video/dvd-slideshow/dvd-slideshow-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-video/dvd-slideshow/dvd-slideshow-0.7.1.ebuild,v 1.1 2005/05/27 16:21:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/dvd-slideshow-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 MY_P="${PN}_${PV}"
 
@@ -10,17 +10,19 @@ SRC_URI="mirror://sourceforge/dvd-slideshow/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=media-video/dvdauthor-0.6.9
+DEPEND=">=media-video/dvdauthor-0.6.10
 	virtual/cdrtools
+	app-shells/bash
 	media-libs/netpbm
 	>=media-gfx/imagemagick-5.5.4
 	media-video/mjpegtools
 	media-video/transcode
-	media-video/ffmpeg
+	>=media-video/ffmpeg-0.4.8
 	media-sound/lame
+	media-sound/sox
 	media-sound/toolame
 	media-gfx/jhead"
 
@@ -30,7 +32,7 @@ src_compile() { :; }
 
 src_install() {
 	dobin dvd-* *2slideshow
-	dodoc *.txt doc/*.txt
+	dodoc *.txt dvd-slideshowrc
 	dohtml doc/*.html
 	doman man/*
 }
diff --git a/media-video/dvd9to5/ChangeLog b/media-video/dvd9to5/ChangeLog
index 3f1a2bc75cec..1e89200bf659 100644
--- a/media-video/dvd9to5/ChangeLog
+++ b/media-video/dvd9to5/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/dvd9to5
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvd9to5/ChangeLog,v 1.1 2005/03/29 05:33:36 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd9to5/ChangeLog,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> dvd9to5-0.1.7.ebuild:
+  Don't install INSTALL file.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> dvd9to5-0.1.7.ebuild:
+  Added to ~ppc.
+
+  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> dvd9to5-0.1.7.ebuild:
+  Marked ~amd64 wrt bug #97735.
 
 *dvd9to5-0.1.7 (29 Mar 2005)
 
diff --git a/media-video/dvd9to5/Manifest b/media-video/dvd9to5/Manifest
index 1cb461eb439b..702a38c6c57b 100644
--- a/media-video/dvd9to5/Manifest
+++ b/media-video/dvd9to5/Manifest
@@ -1,2 +1,14 @@
-MD5 d4940c7455a532427ec50850c0ae2680 dvd9to5-0.1.7.ebuild 592
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc8e128532b2bafca913c1b6c33778db ChangeLog 727
+MD5 8ee654216a63408e1cda1a1c072eb222 dvd9to5-0.1.7.ebuild 706
+MD5 46a123e069298184bd47544866925825 metadata.xml 346
 MD5 21077aca793ff3742426a075e7036ba7 files/digest-dvd9to5-0.1.7 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv7rj5H05b2HAEkRApWCAJ9p17oiXqshOvsv4InzP4QGFW1p7QCgjWnt
+T8HugvI9C/dqCysKtLAIhOs=
+=gnvI
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvd9to5/dvd9to5-0.1.7.ebuild b/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
index ae99f9a980d3..a44b84c9914e 100644
--- a/media-video/dvd9to5/dvd9to5-0.1.7.ebuild
+++ b/media-video/dvd9to5/dvd9to5-0.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-video/dvd9to5/dvd9to5-0.1.7.ebuild,v 1.1 2005/03/29 05:33:36 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd9to5/dvd9to5-0.1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 DESCRIPTION="Perl script to backup the main feature of a DVD-9 on DVD-5"
 HOMEPAGE="http://lakedaemon.netmindz.net/dvd9to5/"
@@ -8,7 +8,7 @@ SRC_URI="http://lakedaemon.netmindz.net/dvd9to5/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=">=media-video/transcode-0.6.11
 	>=media-video/mjpegtools-1.6.2
@@ -20,5 +20,5 @@ src_compile() {
 
 src_install() {
 	dobin dvd9to5.pl
-	dodoc CHANGELOG INSTALL README TODO dvd9to5.conf.example
+	dodoc CHANGELOG README TODO dvd9to5.conf.example
 }
diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index 212a6958c7ad..20d9c03005cc 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for media-video/dvdauthor
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.1 2003/03/11 06:13:50 rac Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
+
+  24 May 2005; Markus Rothe <corsair@gentoo.org> dvdauthor-0.6.11.ebuild:
+  Stable on ppc64
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  dvdauthor-0.6.11.ebuild:
+  Stable on sparc
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -dvdauthor-0.5.0.ebuild,
+  -dvdauthor-0.5.3.ebuild, dvdauthor-0.6.11.ebuild:
+  stable on amd64 and x86, did some cleanup
+
+*dvdauthor-0.6.11 (13 Apr 2005)
+
+  13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +dvdauthor-0.6.11.ebuild:
+  new upstream release, fixes #81730
+
+  04 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/dvdauthor-0.6.10-debugsegfault.patch, dvdauthor-0.6.10.ebuild:
+  added a patch contributed by Danny van Dyk <kugelfang@gentoo.org>. please see
+  #62836
+
+  08 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdauthor-0.5.0.ebuild,
+  dvdauthor-0.5.3.ebuild, dvdauthor-0.6.10.ebuild:
+  added missing media-libs/libpng dependency. fixes bug #60299.
+
+  08 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/dvdauthor-0.6.10-im6.patch, dvdauthor-0.6.10.ebuild:
+  Make dvdauthor work with imagemagick-6*, bug #66226
+
+  04 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> dvdauthor-0.5.0.ebuild,
+  dvdauthor-0.5.3.ebuild, dvdauthor-0.6.10.ebuild:
+  Correcting "HOMEPAGE" (see bug #66009)
+
+  29 Aug 2004; Tom Gall <tgall@gentoo.org> dvdauthor-0.6.10.ebuild:
+  added ~ppc64, bug #60786
+
+  13 Jul 2004; Tom Martin <slarti@gentoo.org> dvdauthor-0.6.10.ebuild,
+  files/0.6.10-gcc34.patch:
+  Changed epatch lines from ${PV} to ${P} so that the 64bit-utf8 patch would
+  apply. Renamed 0.6.10-gcc34.patch -> dvdauthor-0.6.10-gcc34.patch for
+  consistency. Thanks for the heads up kumquat (bug 56870).
+
+  10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/dvdauthor-0.6.10-utf8.patch, dvdauthor-0.6.10.ebuild:
+  Added utf8 patch on 64-bit ${ARCH}s. BUG #56482.
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> dvdauthor-0.6.10.ebuild:
+  stable on amd64
+
+  18 May 2004; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  +files/0.6.10-gcc34.patch, dvdauthor-0.6.10.ebuild, -dvdauthor-0.6.8.ebuild,
+  -dvdauthor-0.6.9.ebuild:
+  Add gcc-3.4 patch and clean up old ebuilds.
+
+*dvdauthor-0.6.10 (16 May 2004)
+
+  16 May 2004; Martin Holzer <mholzer@gentoo.org> dvdauthor-0.6.10.ebuild:
+  Version bumped. Closes 47857
+
+  02 May 2004; David Holm <dholm@gentoo.org> dvdauthor-0.6.9.ebuild:
+  Added to ~ppc.
+
+*dvdauthor-0.6.9 (01 Feb 2004)
+
+  01 Feb 2004; Martin Holzer <mholzer@gentoo.org> dvdauthor-0.6.9.ebuild:
+  Version bumped. Closes 40003
+
+  22 Jan 2004; Jon Portnoy <avenj@gentoo.org> dvdauthor-0.6.8.ebuild :
+  AMD64 keywords.
+
+  04 Jan 2004; Martin Holzer <mholzer@gentoo.org> dvdauthor-0.6.8.ebuild:
+  adding imagemagick as depend. Closes 37140
+
+*dvdauthor-0.6.8 (03 Jan 2004)
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org> dvdauthor-0.5.0.ebuild,
+  dvdauthor-0.5.3.ebuild, dvdauthor-0.6.8.ebuild:
+  Version bumped. Closes 36694.
+
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> dvdauthor-0.5.3.ebuild:
+  Added ~sparc to keywords.
+
+*dvdauthor-0.5.3 (08 Jul 2003)
+
+  08 Jul 2003; Martin Holzer <mholzer@gentoo.org> dvdauthor-0.5.3.ebuild:
+  Version bumped. Closes #22975.
 
 *dvdauthor-0.5.0 (10 Mar 2003)
 
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index e69de29bb2d1..e2ac9c9f1f7d 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -0,0 +1,11 @@
+MD5 c20e52e82d9771a2f1ec17274d016302 ChangeLog 3490
+MD5 0ae88d73735418c45938a8de1de695ff dvdauthor-0.6.11.ebuild 702
+MD5 f19430c51a300365f3d8005dc22febbd dvdauthor-0.6.10.ebuild 919
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/0.6.10-gcc34.patch 427
+MD5 7dc0471c612f68f8c3cc66a8064e4263 files/digest-dvdauthor-0.6.10 68
+MD5 f98a1701d0a682dcbaa5be92cfe177d8 files/dvdauthor-0.6.10-debugsegfault.patch 1274
+MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/dvdauthor-0.6.10-gcc34.patch 427
+MD5 d121c9be3efefbcbf6b07a1fba9a8afc files/dvdauthor-0.6.10-im6.patch 360
+MD5 8a50d588492e032aad69586764b81edf files/dvdauthor-0.6.10-utf8.patch 464
+MD5 79879b2e10592c662bf26806a513a3cb files/digest-dvdauthor-0.6.11 68
diff --git a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
index f4777152c9de..929dc26360ea 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
@@ -1,27 +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-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.1 2004/05/16 14:59:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
-HOMEPAGE="http://sourceforge.net/projects/dvdauthor/"
+HOMEPAGE="http://dvdauthor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-IUSE="png zlib"
+KEYWORDS="~x86 ~ppc ~sparc amd64 ~ppc64"
+IUSE=""
 
 DEPEND="media-libs/libdvdread
 	>=media-gfx/imagemagick-5.5.7.14
-	>=dev-libs/libxml2-2.5.0"
+	>=dev-libs/libxml2-2.5.0
+	media-libs/libpng"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-utf8.patch
+	epatch ${FILESDIR}/${P}-im6.patch
 
-src_compile() {
-	econf || die "configuration failed"
-	emake || die "make failed"
+	# see #62836
+	epatch ${FILESDIR}/${P}-debugsegfault.patch
 }
 
 src_install() {
-	einstall || die "installation failed"
+	make install DESTDIR=${D} || die "installation failed"
 	dodoc README HISTORY TODO
 }
diff --git a/media-video/dvdauthor/dvdauthor-0.6.11.ebuild b/media-video/dvdauthor/dvdauthor-0.6.11.ebuild
index f2d038accd75..b6597f4a7a70 100644
--- a/media-video/dvdauthor/dvdauthor-0.6.11.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.11.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-video/dvdauthor/dvdauthor-0.6.11.ebuild,v 1.1 2005/04/13 18:09:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.11.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
-inherit eutils 64-bit
+inherit eutils
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
 HOMEPAGE="http://dvdauthor.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="media-libs/libdvdread
@@ -19,6 +19,6 @@ DEPEND="media-libs/libdvdread
 	media-libs/libpng"
 
 src_install() {
-	make install DESTDIR=${D} || die "installation failed"
+	make install DESTDIR="${D}" || die "installation failed"
 	dodoc README TODO
 }
diff --git a/media-video/dvdbackup/ChangeLog b/media-video/dvdbackup/ChangeLog
index b4fc5f8aa507..30a1234bc443 100644
--- a/media-video/dvdbackup/ChangeLog
+++ b/media-video/dvdbackup/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for media-video/dvdbackup
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdbackup/ChangeLog,v 1.1 2003/03/24 18:37:57 rac Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdbackup/ChangeLog,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
+
+  03 Oct 2005; Markus Rothe <corsair@gentoo.org> dvdbackup-0.1.1-r1.ebuild:
+  Stable on ppc64
+
+  09 Aug 2005; Markus Rothe <corsair@gentoo.org> dvdbackup-0.1.1-r1.ebuild:
+  Added ~ppc64
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  dvdbackup-0.1.1-r1.ebuild:
+  Moved using toolchain-funcs
+
+  28 Feb 2005; Kito <kito@gentoo.org> dvdbackup-0.1.1-r1.ebuild:
+  stable on ppc-macos
+
+  24 Sep 2004; kito@gentoo.org dvdbackup-0.1.1-r1.ebuild:
+  added to ~ppc-macos
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> dvdbackup-0.1.1-r1.ebuild:
+  Added to ~ppc.
+
+*dvdbackup-0.1.1-r1 (09 Apr 2004)
+
+  09 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add debian patch to fix floating point exception when there a dvd
+  only contains one title set.
 
 *dvdbackup-0.1.1 (24 Mar 2003)
 
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> dvdbackup-0.1.1.ebuild:
+  Added ~sparc to keywords.
+
   24 Mar 2003; <rac@gentoo.org> dvdbackup-0.1.1.ebuild:
   Initial commit
 
diff --git a/media-video/dvdbackup/Manifest b/media-video/dvdbackup/Manifest
index e69de29bb2d1..7d7a4be4bed9 100644
--- a/media-video/dvdbackup/Manifest
+++ b/media-video/dvdbackup/Manifest
@@ -0,0 +1,5 @@
+MD5 e63f31c42cec248678bfdd2ef65d4408 ChangeLog 1168
+MD5 4fe2696804b58b12ca5d0f1b03f3ac77 dvdbackup-0.1.1-r1.ebuild 826
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 ed788d5aef0628a2098684adad1ec7b8 files/0.1.1-debian-FPE.patch 546
+MD5 a407bd72496e53b75fed9eb61a40e6d1 files/digest-dvdbackup-0.1.1-r1 66
diff --git a/media-video/dvdbackup/dvdbackup-0.1.1-r1.ebuild b/media-video/dvdbackup/dvdbackup-0.1.1-r1.ebuild
index 1d152651867f..11ead6172a69 100644
--- a/media-video/dvdbackup/dvdbackup-0.1.1-r1.ebuild
+++ b/media-video/dvdbackup/dvdbackup-0.1.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-video/dvdbackup/dvdbackup-0.1.1-r1.ebuild,v 1.1 2004/04/09 06:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdbackup/dvdbackup-0.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Backup content from DVD to hard disk"
 HOMEPAGE="http://dvd-create.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="http://dvd-create.sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc amd64"
+KEYWORDS="amd64 ~ppc ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="media-libs/libdvdread"
@@ -24,7 +24,7 @@ src_unpack() {
 }
 
 src_compile() {
-	$(gcc-getCC) ${CFLAGS} -I/usr/include/dvdread \
+	$(tc-getCC) ${CFLAGS} -I/usr/include/dvdread \
 		-ldvdread -o dvdbackup src/dvdbackup.c \
 		|| die "compile failed"
 }
diff --git a/media-video/dvdimagecmp/ChangeLog b/media-video/dvdimagecmp/ChangeLog
index aa80544ae22f..cacf58997e3b 100644
--- a/media-video/dvdimagecmp/ChangeLog
+++ b/media-video/dvdimagecmp/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for media-video/cxfe
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdimagecmp/ChangeLog,v 1.1 2004/09/06 22:20:01 arj Exp $
+# ChangeLog for media-video/dvdimagecmp
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdimagecmp/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  14 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdimagecmp-0.2.ebuild:
+  added ~amd64 to KEYWORDS, fixes #89024
+
+  15 Oct 2004; David Holm <dholm@gentoo.org> dvdimagecmp-0.2.ebuild:
+  Added to ~ppc.
+
+  19 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *dvdimagecmp-0.2 (06 Sep 2004)
 
diff --git a/media-video/dvdimagecmp/Manifest b/media-video/dvdimagecmp/Manifest
index 38cdfd62bc3d..972defbdc5d9 100644
--- a/media-video/dvdimagecmp/Manifest
+++ b/media-video/dvdimagecmp/Manifest
@@ -1,3 +1,14 @@
-MD5 526f11a066c4a4c196484c623e3aa5c5 metadata.xml 164
-MD5 8390636bdcf277f7129e30247c798dd6 dvdimagecmp-0.2.ebuild 612
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8a4de438f312f4027e3c1c0a05d2b7f3 dvdimagecmp-0.2.ebuild 614
+MD5 51ef6f7d5e26df207571a567a669db84 ChangeLog 699
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 09b53c1c3844f4c42b986438b77d9b5a files/digest-dvdimagecmp-0.2 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCXkOS06ebR+OMO78RAiQXAJ4jp9Bx90cwQjtKC4rCMzMDt+CE/wCdHD6S
+uBNr78Z67lhx56foZkMXzKs=
+=94ML
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdimagecmp/dvdimagecmp-0.2.ebuild b/media-video/dvdimagecmp/dvdimagecmp-0.2.ebuild
index c612d273cba0..f3541fa3a1f8 100644
--- a/media-video/dvdimagecmp/dvdimagecmp-0.2.ebuild
+++ b/media-video/dvdimagecmp/dvdimagecmp-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdimagecmp/dvdimagecmp-0.2.ebuild,v 1.1 2004/09/06 22:20:01 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdimagecmp/dvdimagecmp-0.2.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 DESCRIPTION="Tool to compare a burned DVD with an image to check for errors"
 HOMEPAGE="http://home.zonnet.nl/panteltje/dvd/"
@@ -8,7 +8,7 @@ SRC_URI="http://home.zonnet.nl/panteltje/dvd/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND=""
@@ -19,5 +19,5 @@ src_compile() {
 
 src_install() {
 	dobin dvdimagecmp
-	dodoc CHANGES LICENSE README *.lsm
+	dodoc CHANGES README *.lsm
 }
diff --git a/media-video/dvdimagecmp/metadata.xml b/media-video/dvdimagecmp/metadata.xml
index ab2e21eea39f..d9df1878d8e2 100644
--- a/media-video/dvdimagecmp/metadata.xml
+++ b/media-video/dvdimagecmp/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/dvdrip/ChangeLog b/media-video/dvdrip/ChangeLog
index 13ae6e2c28ea..c90eaaed4dba 100644
--- a/media-video/dvdrip/ChangeLog
+++ b/media-video/dvdrip/ChangeLog
@@ -1,6 +1,246 @@
 # ChangeLog for media-video/dvdrip
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.1 2002/04/21 23:47:03 mkennedy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
+
+*dvdrip-0.97.2 (10 Oct 2005)
+
+  10 Oct 2005; Daniel Goller <morfic@gentoo.org> +dvdrip-0.97.2.ebuild:
+  Bump to 0.97.2 thanks to Chandler Carruth
+
+  08 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  dvdrip-0.52.5.ebuild:
+  Added warning to AMD64 users.
+
+  28 May 2005; Diego Pettenò <flameeyes@gentoo.org> dvdrip-0.52.5.ebuild:
+  Changed dependency of latest dvdrip to virtual/eject.
+
+  27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdrip-0.52.5.ebuild:
+  install a .desktop file and an icon for dvdrip, fixes #93898
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  dvdrip-0.52.3-r1.ebuild:
+  dev-perl/Storable => perl-core/Storable migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> dvdrip-0.52.3.ebuild:
+  dev-perl/Storable => perl-core/Storable migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> dvdrip-0.52.0.ebuild:
+  dev-perl/Storable => perl-core/Storable migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> dvdrip-0.52.5.ebuild:
+  dev-perl/Storable => perl-core/Storable migration
+
+*dvdrip-0.52.5 (19 May 2005)
+
+  19 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -dvdrip-0.52.4.ebuild,
+  +dvdrip-0.52.5.ebuild:
+  new upstream version
+
+  17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdrip-0.52.4.ebuild:
+  cosmetic changes
+
+*dvdrip-0.52.4 (17 May 2005)
+
+  17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> +dvdrip-0.52.4.ebuild:
+  new upstream version
+
+  15 May 2005; Joseph Jezak <josejx@gentoo.org> dvdrip-0.52.3-r1.ebuild:
+  Marked ~ppc for bug #90101.
+
+  12 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -dvdrip-0.50.16.ebuild,
+  -dvdrip-0.50.16-r1.ebuild, -dvdrip-0.50.17.ebuild, -dvdrip-0.50.18.ebuild,
+  dvdrip-0.52.0.ebuild:
+  0.52.0 stable on amd64 and x86, fixes #92360 . did some cleanup.
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> dvdrip-0.50.18.ebuild:
+  Added check for at least transcode 0.6.14 before checking if it was built
+  with dvdread useflag. Fixes #89371.
+
+*dvdrip-0.52.3-r1 (25 Apr 2005)
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +dvdrip-0.52.3-r1.ebuild:
+  Added subtitles useflag which adds runtime dependency on subtitleripper
+  which provides subtitle2pgm. Fixes #90101.
+
+  23 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> dvdrip-0.52.3.ebuild:
+  Added to ~ppc.
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdrip-0.52.3.ebuild:
+  changed gnome-extra/gtkhtml dependency to gnome-extra/libgtkhtml. fixes #67987
+
+  28 Mar 2005; Chris White <chriswhite@gentoo.org> dvdrip-0.50.18.ebuild,
+  dvdrip-0.52.3.ebuild:
+  Adjusted some hard depends per bug #48548. Added a built_with_use check for
+  transcode dvd support.
+
+*dvdrip-0.52.3 (16 Mar 2005)
+
+  16 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +dvdrip-0.52.3.ebuild:
+  new upstream version, fixes #85537
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  dvdrip-0.50.16-r1.ebuild, dvdrip-0.50.16.ebuild, dvdrip-0.50.17.ebuild,
+  dvdrip-0.50.18.ebuild, dvdrip-0.52.0.ebuild:
+  Move sys-apps/procps -> sys-process/procps
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdrip-0.50.16-r1.ebuild,
+  dvdrip-0.50.16.ebuild, dvdrip-0.50.17.ebuild, dvdrip-0.50.18.ebuild,
+  dvdrip-0.52.0.ebuild:
+  changed app-cdr/cdrtools dependency to virtual/cdrtools. fixes bug #76556.
+  also see bug #77817.
+
+*dvdrip-0.52.0 (09 Jan 2005)
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +dvdrip-0.52.0.ebuild:
+  new upstream version. fixes #76827.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dvdrip-0.50.18.ebuild:
+  stable on amd64
+
+*dvdrip-0.50.18 (19 Apr 2004)
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.18.ebuild:
+  Version bumped.
+
+*dvdrip-0.50.17 (10 Apr 2004)
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.17.ebuild:
+  Version bumped.
+
+*dvdrip-0.50.16-r1 (17 Mar 2004)
+
+  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> dvdrip-0.50.15.ebuild,
+  dvdrip-0.50.16-r1.ebuild:
+  Adding build dependencies to runtime dependencies.
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.16.ebuild:
+  x86 stable.
+
+*dvdrip-0.50.16 (26 Oct 2003)
+
+  26 Oct 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.16.ebuild:
+  Version bumped.
+
+  31 Aug 2003; Luca Barbato <lu_zero@gentoo.org> ddvdrip-0.50.14.ebuild,
+  dvdrip-0.50.15.ebuild:
+  Marked ~ppc
+
+*dvdrip-0.50.15 (25 Aug 2003)
+
+  25 Aug 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.15.ebuild:
+  Version bumped.
+
+*dvdrip-0.50.14 (29 Jun 2003)
+
+  29 Jun 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.14.ebuild:
+  Version bumped. Closes #23688
+
+*dvdrip-0.50.13 (25 May 2003)
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.10.ebuild,
+  dvdrip-0.50.12.ebuild, dvdrip-0.50.13.ebuild, dvdrip-0.50.4.ebuild:
+  Version bumped & Cleanup. Closes #21652
+
+*dvdrip-0.50.12 (17 May 2003)
+
+  17 May 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.12.ebuild:
+  Version bumped. Closes #20269
+
+  10 May 2003; <jrray@gentoo.org> dvdrip-0.50.10.ebuild:
+  Adding runtime dependency on sys-apps/eject.
+
+*dvdrip-0.50.10 (17 Apr 2003)
+
+  17 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, dvdrip-0.46.ebuild,
+  dvdrip-0.46.ebuild, dvdrip-0.48.5.ebuild, dvdrip-0.48.5.ebuild,
+  dvdrip-0.48.8.ebuild, dvdrip-0.48.8.ebuild, dvdrip-0.50.10.ebuild:
+  Version bumped. Cleanup. Closes #17619.
+
+*dvdrip-0.50.7 (05 Mar 2003)
+
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> dvdrip-0.50.7.ebuild,
+  files/digest-dvdrip-0.50.7 ChangeLog:
+  Version bumped. Thanks to Fridtjof Busse <fridtjof@fbunet.de> for
+  the contribution. This closes bug #16764.
+
+*dvdrip-0.50.4 (24 Feb 2003)
+
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> dvdrip-0.50.4.ebuild :
+  Marked this ebuild stable ('x86').
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> dvdrip-0.50.4.ebuild,
+  files/digest-dvdrip-0.50.4 ChangeLog:
+  Version bumped. Thanks to Fridtjof Busse <fridtjof@fbunet.de> for
+  the contribution. This closes bug #15640.
+
+*dvdrip-0.50.1 (13 Feb 2003)
+
+  05 Mar 2003; phoen][x <phoenix@gentoo.org> dvdrip-0.50.1.ebuild :
+  Marked this ebuild stable ('x86').
+
+  14 Feb 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.1.ebuild :
+  Fixed DEPEND.
+
+  13 Feb 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.50.1.ebuild,
+  files/digest-dvdrip-0.50.1 ChangeLog:
+  Version bumped submitted by fridtjof@fbunet.de in #15554. 
+
+*dvdrip-0.48.8 (12 Feb 2003)
+
+  13 Feb 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.48.8.ebuild
+  Marked as stable.
+
+  12 Feb 2003; Martin Holzer <mholzer@gentoo.org> dvdrip-0.48.8.ebuild,
+  files/digest-dvdrip-0.48.8 ChangeLog:
+  Version bump submitted by fridtjof@fbunet.de in #14835.
+
+*dvdrip-0.48.5 (16 Nov 2002) 
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+  removed crusty old ebuilds and added/updated IUSE, per bug #7981 and
+  Michiel de Bruijne <M.deBruijne@HCCNet.nl>
+
+  12 Dec 2002; phoen][x <phoenix@gentoo.org> dvdrip-0.48.5.ebuild,
+  files/digest-dvdrip-0.48.5:
+  Version bump submitted by Tobias Sager <moixa@gmx.ch>. This closes bug
+  11958. 
+
+*dvdrip-0.47_12 (16 Nov 2002) 
+
+  6 Dec 2002; Michael Cummings <mcummings@gentoo.org>; dvdrip deps
+  There are deps that are not needed by dvdrip for gnome. Returned those
+  to an optional status instead of a mandatory. See bug 5887, thanks to
+  Dylan Carlson for point this out.
+   
+  16 Nov 2002; phoen][x <phoenix@gentoo.org>; dvdrip-0.47_12.ebuild,
+  files/digest-dvdrip-0.47_12 :
+  Version bump submitted by David Nielsen <lovechild@foolclan.com>. This version 
+  adds support for Ogg Vorbis - thats why it optionally depends on media-audio/ogmtools. 
+
+*dvdrip-0.46 (08 Oct 2002)
+
+  08 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Version bump
+
+*dvdrip-0.44 (28 Jun 2002)
+
+  28 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Fixed the fping dependancy to reside in the new catagory.
+
+*dvdrip-0.41_pre03 (2 Jun 2002)
+*dvdrip-0.40 (2 Jun 2002)
+
+  2 Jun 2002; Martin Schlemmer <azarah@gentoo.org> dvdrip-0.4{0,1_pre03}.ebuild :
+
+  Version bump ... added the pre as it seems stable ... converted a dvd ;)
+
+*dvdrip-0.39 (21 Apr 2002)
+
+  1 May 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  dvdrip-0.39.ebuild, files/digest-dvdrip-0.39 :
+
+  Version bump.
 
 *dvdrip-0.38 (21 Apr 2002)
 
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index b8829179e9f3..62e9e51712e7 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,9 +1,12 @@
-MD5 b4fac301de85b0738868130679d883ac ChangeLog 3261
-MD5 6cf40eba4a88cd67e04246162e8af4df dvdrip-0.50.10.ebuild 1194
-MD5 d8d43c00ed5abf7288c5b15ddec3d647 dvdrip-0.50.1.ebuild 1081
-MD5 73893764cda64cadc12e3a5ec2939a3e dvdrip-0.50.4.ebuild 1193
-MD5 6cf40eba4a88cd67e04246162e8af4df dvdrip-0.50.7.ebuild 1194
-MD5 e12f4df5bd1ec3bc82b7c01ae4242434 files/digest-dvdrip-0.50.10 72
-MD5 f7c0b644f928c4ce3e6519486e8b2046 files/digest-dvdrip-0.50.1 71
-MD5 304ecfdbbd87ef70b19bfbb8e64deb62 files/digest-dvdrip-0.50.4 71
-MD5 5bb5c0fc6d51d19c15f5cfb7a97ac7ab files/digest-dvdrip-0.50.7 71
+MD5 e2b58babf0d996beaaa09f2abd3326e2 ChangeLog 8553
+MD5 88105f416527cd7fd3342189e2852c92 dvdrip-0.52.0.ebuild 1518
+MD5 90d22a4f2fc0bee9e26b0b7176a8cb76 dvdrip-0.52.3-r1.ebuild 1903
+MD5 b263c738906afee7771069b32e807f4f dvdrip-0.52.3.ebuild 1820
+MD5 7a7aec135b1024a852f763c65fa115fd dvdrip-0.52.5.ebuild 2152
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 c3fe8b3e55c5c76af06fb29d8fc9f67b dvdrip-0.97.2.ebuild 2146
+MD5 748c8776c847405991432e3a345432fd files/digest-dvdrip-0.52.0 71
+MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3 71
+MD5 2754107db18d3dea07e9d0a57e8bab32 files/digest-dvdrip-0.52.3-r1 71
+MD5 14587c2ff6ca6a5d6b84323f64de11d0 files/digest-dvdrip-0.52.5 71
+MD5 bdb952ef59732d9d67760a5d7b49f40b files/digest-dvdrip-0.97.2 71
diff --git a/media-video/dvdrip/dvdrip-0.52.0.ebuild b/media-video/dvdrip/dvdrip-0.52.0.ebuild
index c318b7860d1e..c92ff8b6db4b 100644
--- a/media-video/dvdrip/dvdrip-0.52.0.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.0.ebuild,v 1.1 2005/01/09 02:28:20 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.0.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 inherit perl-module
 
@@ -17,18 +17,18 @@ SRC_URI="http://www.exit1.org/${PN}/${MY_URL}/${MY_P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="cdr gnome"
 
 DEPEND=" gnome? ( gnome-extra/gtkhtml )
 	cdr? ( >=media-video/vcdimager-0.7.19
 		>=app-cdr/cdrdao-1.1.7
-		>=app-cdr/cdrtools-2.0 )
+		virtual/cdrtools )
 	>=media-video/transcode-0.6.13
 	>=media-gfx/imagemagick-5.5.7
-	sys-apps/procps
+	sys-process/procps
 	dev-perl/gtk-perl
-	dev-perl/Storable
+	perl-core/Storable
 	dev-perl/Event"
 RDEPEND="${DEPEND}
 	>=net-analyzer/fping-2.3
diff --git a/media-video/dvdrip/dvdrip-0.52.3-r1.ebuild b/media-video/dvdrip/dvdrip-0.52.3-r1.ebuild
index a05a103c7944..62b25c9d2c84 100644
--- a/media-video/dvdrip/dvdrip-0.52.3-r1.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.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-video/dvdrip/dvdrip-0.52.3-r1.ebuild,v 1.1 2005/04/25 02:57:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 inherit perl-module eutils
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.exit1.org/${PN}/${MY_URL}/${MY_P}.tar.gz"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 # ~ppc needs subtitleripper
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="cdr gnome xvid rar mplayer ogg fping subtitles"
 
 DEPEND="gnome? ( gnome-extra/libgtkhtml )
@@ -32,7 +32,7 @@ DEPEND="gnome? ( gnome-extra/libgtkhtml )
 	>=media-video/transcode-0.6.14
 	>=media-gfx/imagemagick-5.5.3
 	dev-perl/gtk-perl
-	dev-perl/Storable
+	perl-core/Storable
 	dev-perl/Event"
 RDEPEND="${DEPEND}
 	fping? ( >=net-analyzer/fping-2.3 )
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 	dev-perl/libintl-perl"
 
 pkg_setup() {
-	built_with_use transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
+	built_with_use media-video/transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
 }
 
 src_unpack() {
diff --git a/media-video/dvdrip/dvdrip-0.52.3.ebuild b/media-video/dvdrip/dvdrip-0.52.3.ebuild
index 857b521c4937..1c6cb2ff5f3b 100644
--- a/media-video/dvdrip/dvdrip-0.52.3.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.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/media-video/dvdrip/dvdrip-0.52.3.ebuild,v 1.1 2005/03/16 19:22:49 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.3.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 MY_P=${P/dvdr/Video-DVDR}
 # Next three lines are to handle PRE versions
@@ -17,26 +17,32 @@ SRC_URI="http://www.exit1.org/${PN}/${MY_URL}/${MY_P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="cdr gnome"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="cdr gnome xvid rar mplayer ogg fping"
 
-DEPEND=" gnome? ( gnome-extra/gtkhtml )
+DEPEND=" gnome? ( gnome-extra/libgtkhtml )
 	cdr? ( >=media-video/vcdimager-0.7.19
 		>=app-cdr/cdrdao-1.1.7
-		virtual/cdrtools )
+		virtual/cdrtools
+		>=media-video/mjpegtools-1.6.0 )
+	xvid? ( media-video/xvid4conf )
+	rar? ( app-arch/rar )
+	mplayer? ( media-video/mplayer )
 	>=media-video/transcode-0.6.14
-	>=media-gfx/imagemagick-5.5.7
-	sys-process/procps
+	>=media-gfx/imagemagick-5.5.3
 	dev-perl/gtk-perl
-	dev-perl/Storable
+	perl-core/Storable
 	dev-perl/Event"
 RDEPEND="${DEPEND}
-	>=net-analyzer/fping-2.3
-	>=media-sound/ogmtools-1.000
-	>=media-video/mjpegtools-1.6.0
+	fping? ( >=net-analyzer/fping-2.3 )
+	ogg? ( >=media-sound/ogmtools-1.000 )
 	sys-apps/eject
 	dev-perl/libintl-perl"
 
+pkg_setup() {
+	built_with_use media-video/transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/media-video/dvdrip/dvdrip-0.52.5.ebuild b/media-video/dvdrip/dvdrip-0.52.5.ebuild
index 98fcfb2ba80b..ac8adff8a33f 100644
--- a/media-video/dvdrip/dvdrip-0.52.5.ebuild
+++ b/media-video/dvdrip/dvdrip-0.52.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-video/dvdrip/dvdrip-0.52.5.ebuild,v 1.1 2005/05/19 20:38:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.52.5.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 inherit perl-module eutils
 
@@ -32,26 +32,29 @@ DEPEND="gnome? ( gnome-extra/libgtkhtml )
 	>=media-video/transcode-0.6.14
 	>=media-gfx/imagemagick-5.5.3
 	dev-perl/gtk-perl
-	dev-perl/Storable
+	perl-core/Storable
 	dev-perl/Event"
 RDEPEND="${DEPEND}
 	fping? ( >=net-analyzer/fping-2.3 )
 	ogg? ( >=media-sound/ogmtools-1.000 )
 	subtitles? ( media-video/subtitleripper )
-	sys-apps/eject
+	virtual/eject
 	dev-perl/libintl-perl"
 
 pkg_setup() {
-	built_with_use transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
+	built_with_use media-video/transcode dvdread || die "transcode needs dvdread support builtin.  Please re-emerge transcode with the dvdread USE flag."
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:cc :$(CC) :' src/Makefile || die "sed failed"
+	sed -i -e 's:cc :$(CC) :' src/Makefile || die "sed failed"
 }
 
 src_install() {
+	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+	make_desktop_entry dvdrip dvd::rip dvdrip.xpm Video
+
 	perl-module_src_install
 }
 
@@ -63,4 +66,9 @@ pkg_postinst() {
 	einfo "for bash: export PERLIO=stdio"
 	einfo "for csh:  setenv PERLIO stdio"
 	einfo "into your /.${shell}rc"
+	if ( use amd64 );
+	then
+		einfo "If you get messages about not finding the tools, go t preferences"
+		einfo "And deactivate the NPTL workaround"
+	fi
 }
diff --git a/media-video/dvdrip/dvdrip-0.97.2.ebuild b/media-video/dvdrip/dvdrip-0.97.2.ebuild
index c4f0449c0346..d983c56f14c0 100644
--- a/media-video/dvdrip/dvdrip-0.97.2.ebuild
+++ b/media-video/dvdrip/dvdrip-0.97.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.2.ebuild,v 1.1 2005/10/11 02:59:06 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdrip/dvdrip-0.97.2.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 
 
diff --git a/media-video/dvdrip/metadata.xml b/media-video/dvdrip/metadata.xml
index 47ec49344c32..d9df1878d8e2 100644
--- a/media-video/dvdrip/metadata.xml
+++ b/media-video/dvdrip/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>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index 382d10520bda..d565d38e9a57 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,8 +1,97 @@
 # ChangeLog for media-video/dvdstyler
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.1 2004/07/30 04:59:28 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
-  30 Jul 2004; Daniel Black <dragonheart@gentoo.org> :
-  inital import as per bug #47899. Thanks to Ian Haylock
-  <haylocki@v21mail.co.uk> for the bug
+  07 Sep 2005; Daniel Black <dragonheart@gentoo.org> -dvdstyler-1.31.ebuild:
+  removed 1.31 as per bug #104872 to remove version problem. ~amd64 still has
+  issues according to Jim in bug #104872
 
+  05 Sep 2005; Daniel Black <dragonheart@gentoo.org> dvdstyler-1.31.ebuild:
+  drop x86 keyword to avoid downgrade - bug #104872
+
+  05 Sep 2005; Daniel Black <dragonheart@gentoo.org> dvdstyler-1.4.ebuild:
+  x86 stable on 1.4 plan to remove 1.31
+
+*dvdstyler-1.4 (04 Sep 2005)
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> +dvdstyler-1.4.ebuild,
+  dvdstyler-1.31.ebuild, -dvdstyler-1.40.ebuild:
+  QA clean - removed obscelete build commands, corrected versioing, removed
+  INSTALL and README from installation. Inspired by flameeyes
+
+  08 Jun 2005; David Holm <dholm@gentoo.org> dvdstyler-1.40.ebuild:
+  Added to ~ppc.
+
+  07 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdstyler-1.31.ebuild,
+  dvdstyler-1.40.ebuild:
+  We now depend on =wxGTK-2.4*, see #93746 for details.
+
+*dvdstyler-1.40 (07 Jun 2005)
+
+  07 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> +dvdstyler-1.40.ebuild:
+  New upstream release, fixes #95328.
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/1.1-AutoMakefile.patch, -files/1.1-code.patch,
+  -files/1.1-gcc34.patch, -files/1.3_beta-code.patch, -dvdstyler-1.1.ebuild,
+  dvdstyler-1.31.ebuild, -dvdstyler-1.3_beta.ebuild:
+  stable on amd64 and x86, did some cleanup
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdstyler-1.31.ebuild:
+  stable on amd64 and x86
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  30 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdstyler-1.31.ebuild:
+  dvdstyler now generates desktop file using make_desktop_entry, fixes #82209
+
+*dvdstyler-1.31 (06 Feb 2005)
+
+  06 Feb 2005; <augustus@gentoo.org> +dvdstyler-1.31.ebuild:
+  Added new build 1.31.
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvdstyler-1.1.ebuild,
+  dvdstyler-1.3_beta.ebuild:
+  changed app-cdr/cdrtools dependency to virtual/cdrtools. see bug #77817.
+
+*dvdstyler-1.3_beta (21 Nov 2004)
+
+  21 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/1.3_beta-code.patch, +dvdstyler-1.3_beta.ebuild:
+  version bump.
+
+*dvdstyler-1.1 (21 Nov 2004)
+
+  21 Nov 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/1.05-AutoMakefile.patch, -files/1.05-code.patch,
+  -files/1.05-gcc34.patch, +files/1.1-AutoMakefile.patch,
+  +files/1.1-code.patch, +files/1.1-gcc34.patch, -dvdstyler-1.05-r1.ebuild,
+  +dvdstyler-1.1.ebuild:
+  version bump and cleanout. Ebuild and patches thanks to Philippe Weibel
+  <philippe.weibel@free.fr> and Patrick Dawson <pkdawson@gentoo.org> in bug
+  #47899.
+
+  18 Oct 2004; Danny van Dyk <kugelfang@gentoo.org>
+  dvdstyler-1.05-r1.ebuild:
+  Marked ~amd64.
+
+  04 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +files/1.05-gcc34.patch,
+  dvdstyler-1.05-r1.ebuild:
+  gcc-3.4 fix, closes bug #65983.
+
+*dvdstyler-1.05-r1 (05 Aug 2004)
+
+  05 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  files/1.05-AutoMakefile.patch, +dvdstyler-1.05-r1.ebuild,
+  -dvdstyler-1.05.ebuild:
+  Changed to use installed dev-libs/expat rather than one that came with the
+  package. Also moved silence.mp2 to the correct directory.
+
+*dvdstyler-1.05 (30 Jul 2004)
+
+  30 Jul 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  +dvdstyler-1.05.ebuild, +files/1.05-code.patch, 
+  +files/1.05-AutoMakefile.patch:
+  Inital import as per bug #47899. Thanks to Ian Haylock
+  <haylocki@v21mail.co.uk> for the bug.
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 006d7fdd23fb..1ed05716cc6e 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,10 +1,14 @@
-MD5 bee230371518a5dbcb6bd46ef6dec8c2 ChangeLog 318
-MD5 120e384dcf35fd092e15c0d6e10dee59 dvdstyler-1.0_beta2.ebuild 1311
-MD5 50c1da0de828cea5851ae51571c1b34a dvdstyler-1.05.ebuild 1216
-MD5 3fd2aa08ab171a250c139fa29e28408b files/digest-dvdstyler-1.0 70
-MD5 b35b84e2dbe157267063d898998b08af files/1.0b2-Makefile.patch 419
-MD5 319f66e3e23eb9ab1959a11390379432 files/1.0b2-MainWin.patch 1681
-MD5 ea30a1d226dfb91d1813b20f2c704175 files/1.0b2-MenuBox.patch 853
-MD5 e626d29ad240fcc289afc775f4b22995 files/digest-dvdstyler-1.0_beta2 67
-MD5 9743089cc18b068cd41b24ab805241c7 files/digest-dvdstyler-1.0.5 64
-MD5 371cffa55d3999c3330b141722406ca9 files/digest-dvdstyler-1.05 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7b8272e7ae37d5a3a3ff29fb0ca281cc ChangeLog 3749
+MD5 59aae5dcb06a68bd02cec60c627dbe53 metadata.xml 253
+MD5 859a0ef4388d57c8e34226660719468f dvdstyler-1.4.ebuild 1148
+MD5 0a61283275c4c6e267cc98a00f00f8cc files/digest-dvdstyler-1.4 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHrcKmdTrptrqvGERAsS7AJ92O9styqfz/GetUEwtOj3Mquyc/QCeP89I
+knQC5TcWxujLwsXSPZtPURQ=
+=m9eO
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-1.4.ebuild b/media-video/dvdstyler/dvdstyler-1.4.ebuild
index 323c1bc77ab0..9b8117dd5e86 100644
--- a/media-video/dvdstyler/dvdstyler-1.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-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-video/dvdstyler/dvdstyler-1.4.ebuild,v 1.1 2005/09/04 02:03:41 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.4.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/dvdstyler/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gnome"
 
 RDEPEND="app-cdr/dvd+rw-tools
diff --git a/media-video/dvdstyler/metadata.xml b/media-video/dvdstyler/metadata.xml
index 866ae3a9796b..1b850b495d70 100644
--- a/media-video/dvdstyler/metadata.xml
+++ b/media-video/dvdstyler/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>dragonheart@gentoo.org</email>
   <name>Daniel Black</name>
diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index cf0e352afa4d..e6dc2e15fb33 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for media-video/dvgrab
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.1 2004/03/20 21:36:23 kanaka Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  19 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> dvgrab-1.7.ebuild,
+  dvgrab-1.8.ebuild:
+  Remove probably outdated comment.
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> dvgrab-1.8.ebuild:
+  Added to ~ppc (Tested by Victor Barba in bug 104239).
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> dvgrab-1.7.ebuild,
+  dvgrab-1.8.ebuild:
+  Don't install INSTALL file.
+
+*dvgrab-1.8 (25 May 2005)
+
+  25 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/dvgrab_gcc34_fix,
+  -dvgrab-1.5.ebuild, dvgrab-1.7.ebuild, +dvgrab-1.8.ebuild:
+  1.7 stable on amd64 and x86, fixes #93821. new stable upstream version
+  added, fixes #92904
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvgrab-1.7.ebuild:
+  updated dependency. fixes #79073
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvgrab-1.7.ebuild:
+  minor fixes.
+
+*dvgrab-1.7 (20 Jan 2005)
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> dvgrab-1.5.ebuild,
+  +dvgrab-1.7.ebuild:
+  version bump, fixes bug #59120. corrected dependency, fixes bug #78370.
+
+*dvgrab-1.6 (20 Jan 2005)
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +dvgrab-1.6.ebuild:
+  version bump. fixes bug #59120.
+
+  31 Dec 2004; Sven Wegener <swegener@gentoo.org> dvgrab-1.5.ebuild:
+  Moved inherit to the top. Do patching in src_unpack() instead of src_compile().
+
+  31 Jul 2004; <malc@gentoo.org> dvgrab-1.5.ebuild:
+  Add gcc34 compilation fix (same as kino) closes bug #58067
+
+  31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> dvgrab-1.5.ebuild:
+  Adding amd64 keyword, closing 46276.
 
 *dvgrab-1.5 (20 Mar 2004)
 
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index 8c126c52867d..b01636db30ae 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,2 +1,16 @@
-MD5 40500f96609565f399124f419d03bd15 dvgrab-1.5.ebuild 773
-MD5 ec8a599b8a5508fbe911ca55c2e18b4d files/digest-dvgrab-1.5 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 10debb1def77296af7a434508702108d dvgrab-1.7.ebuild 737
+MD5 4fb06ad6c8d70e8122979e680632f623 ChangeLog 1903
+MD5 de3fe96d249d03197a962ee47b44ba55 dvgrab-1.8.ebuild 719
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 db7e9be0f32a0c3572d08c1576fa69ad files/digest-dvgrab-1.7 62
+MD5 3670e0aa1ecf6c4c161d949b330c59b6 files/digest-dvgrab-1.8 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLgJnj5H05b2HAEkRAvWtAJ49FgodJ1KjhyviUozjX76XE0HHiACfUQKc
+XdgN2cUJK/CRKU4BRIIXGPo=
+=PBYk
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvgrab/dvgrab-1.7.ebuild b/media-video/dvgrab/dvgrab-1.7.ebuild
index c89abfe64b88..73cd03c87ca7 100644
--- a/media-video/dvgrab/dvgrab-1.7.ebuild
+++ b/media-video/dvgrab/dvgrab-1.7.ebuild
@@ -1,43 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.7.ebuild,v 1.1 2005/01/20 13:44:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
-SRC_URI="http://kino.schirmacher.de/filemanager/download/20/${P}.tar.gz"
+SRC_URI="http://kino.schirmacher.de/filemanager/download/43/${P}.tar.gz"
 LICENSE="GPL-2"
 IUSE="jpeg quicktime"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND="sys-libs/libavc1394
-	<=media-libs/libdv-0.102
+	>=media-libs/libdv-0.102
 	jpeg? ( media-libs/jpeg )
 	quicktime? ( media-libs/libquicktime )"
 
-# The following would be better but if it's satisfied by
-# quicktime4linux then we need to use some special linker options
-# (-ldl -lglib)
-#	quicktime? ( virtual/quicktime )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-
-	epatch ${FILESDIR}/dvgrab_gcc34_fix || die
-	mv ${PN}-1.5 ${P} # the directory is still ...1.5.
-}
-
-src_compile() {
-	econf ${myconf} || die "./configure failed"
-	emake || die "make failed"
-}
-
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog README INSTALL TODO NEWS \
-		|| die "dodoc failed"
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
 }
diff --git a/media-video/dvgrab/dvgrab-1.8.ebuild b/media-video/dvgrab/dvgrab-1.8.ebuild
index 60d3a48fdba8..51a27dfa66b1 100644
--- a/media-video/dvgrab/dvgrab-1.8.ebuild
+++ b/media-video/dvgrab/dvgrab-1.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-video/dvgrab/dvgrab-1.8.ebuild,v 1.1 2005/05/25 18:27:46 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.8.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="jpeg quicktime"
 
 DEPEND="sys-libs/libavc1394
@@ -18,12 +18,7 @@ DEPEND="sys-libs/libavc1394
 	jpeg? ( media-libs/jpeg )
 	quicktime? ( media-libs/libquicktime )"
 
-# The following would be better but if it's satisfied by
-# quicktime4linux then we need to use some special linker options
-# (-ldl -lglib)
-#	quicktime? ( virtual/quicktime )"
-
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog README INSTALL TODO NEWS || die "dodoc failed"
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
 }
diff --git a/media-video/dvgrab/files/digest-dvgrab-1.7 b/media-video/dvgrab/files/digest-dvgrab-1.7
index 6a55b76c6dc5..aad63fd83707 100644
--- a/media-video/dvgrab/files/digest-dvgrab-1.7
+++ b/media-video/dvgrab/files/digest-dvgrab-1.7
@@ -1 +1 @@
-MD5 1bddb6bcda3835d96b96b5c440991114 dvgrab-1.7.tar.gz 152654
+MD5 42d14bcc6375774c2623c05530c5a5dd dvgrab-1.7.tar.gz 163596
diff --git a/media-video/dxr2-driver/ChangeLog b/media-video/dxr2-driver/ChangeLog
index 0272165793f8..7dddefee8e95 100644
--- a/media-video/dxr2-driver/ChangeLog
+++ b/media-video/dxr2-driver/ChangeLog
@@ -1,8 +1,18 @@
 # ChangeLog for media-video/dxr2-driver
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/ChangeLog,v 1.1 2002/08/08 00:47:24 chouser Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/ChangeLog,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
+
+  21 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  chouser is gone at the moment
+
+  02 Sep 2003; <chouser@gentoo.org> dxr2-driver-1.0.4.ebuild:
+  Installation was sometimes failing; fixed by creating a /dev directory.
 
 *dxr2-driver-1.0.4 (07 Aug 2002)
 
+  13 Aug 2002; Chris Houser <chouser@gentoo.org> dxr2-driver-1.0.4.ebuild,
+  ChangeLog: DEPEND was set incorrectly, preventing the ebuild from working.
+  Fixed.
+
   07 Aug 2002; Chris Houser <chouser@gentoo.org> dxr2-driver-1.0.4.ebuild,
   files/digest-dxr2-driver-1.0.4, ChangeLog: New ebuild.
diff --git a/media-video/dxr2-driver/Manifest b/media-video/dxr2-driver/Manifest
index e69de29bb2d1..4ee6ed3f3dc1 100644
--- a/media-video/dxr2-driver/Manifest
+++ b/media-video/dxr2-driver/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4b09b00fbc80905fd465e3c90bfa8208 dxr2-driver-1.0.4.ebuild 1968
+MD5 9855e8c12b51a023ba8251c8182bd9e5 ChangeLog 788
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 08b8bbf9c3d00ee2fbe7ed57c22bfc60 files/digest-dxr2-driver-1.0.4 122
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBpQE9I1lqEGTUzyQRAoPHAJ9NzD3KP6qZ60lRpyfJgh0SYv6g9wCdG180
+jS09VZWlbpXcevTud8Djb+c=
+=/CMZ
+-----END PGP SIGNATURE-----
diff --git a/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild b/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild
index 30103e54d59e..1a6352e2440e 100644
--- a/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild
+++ b/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild,v 1.1 2002/08/08 00:47:24 chouser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr2-driver/dxr2-driver-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 DESCRIPTION="Driver and minimal DVD player(s) for the Creative Labs Dxr2 Card"
 HOMEPAGE="http://dxr2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dxr2/${P}.tar.gz
-	${HOMEPAGE}/projects/dxr2-driver/firmware/DVD12.UX"
+	http://dxr2.sourceforge.net/projects/dxr2-driver/firmware/DVD12.UX"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=media-libs/libdvdread-0.9.3-r1"
-#RDEPEND=""
+DEPEND=">=media-libs/libdvdread-0.9.3"
 
 # Non-standard source dir name for dxr2-driver
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	# Don't try to unpack the last item -- should be the .UX firmware file
@@ -42,7 +42,7 @@ src_compile() {
 
 src_install () {
 	# make install doesn't create standard dirs -- do that now
-	mkdir -p ${D}/usr/bin ${D}/usr/lib ${D}/usr/src ${D}/etc/modules.d || die
+	dodir /usr/bin /usr/lib /usr/src /etc/modules.d /dev
 
 	# no devfs support in dxr2 yet?
 	mknod ${D}/dev/dxr2 c 120 0 || die
diff --git a/media-video/dxr2-driver/files/digest-dxr2-driver-1.0.4 b/media-video/dxr2-driver/files/digest-dxr2-driver-1.0.4
index 80ba21ce4f79..36fb169757ca 100644
--- a/media-video/dxr2-driver/files/digest-dxr2-driver-1.0.4
+++ b/media-video/dxr2-driver/files/digest-dxr2-driver-1.0.4
@@ -1,4 +1,2 @@
 MD5 d31c9513bf1e6901ab459f08c2c14424 dxr2-driver-1.0.4.tar.gz 163825
-MD5 cd2c717e5a53f95fc939560772206b5f dxr2install-0.4 1556147
-MD5 3553622d2d9c449f677a5a8ccf60dcd3 libdvdread-0.9.2_hack_2.tar.gz 198392
 MD5 65276b77a981bb3d8b9b928aa7969a10 DVD12.UX 141378
diff --git a/media-video/dxr2-driver/metadata.xml b/media-video/dxr2-driver/metadata.xml
index 1c0377faab32..20ce219711a2 100644
--- a/media-video/dxr2-driver/metadata.xml
+++ b/media-video/dxr2-driver/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer><email>chouser@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/media-video/dxr3player/ChangeLog b/media-video/dxr3player/ChangeLog
index 9b31789d0611..9b1f1fe7fcff 100644
--- a/media-video/dxr3player/ChangeLog
+++ b/media-video/dxr3player/ChangeLog
@@ -1,6 +1,39 @@
-# ChangeLog for media-video/cxfe
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dxr3player/ChangeLog,v 1.1 2004/09/18 21:55:24 arj Exp $
+# ChangeLog for media-video/dxr3player
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr3player/ChangeLog,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> dxr3player-0.9.ebuild,
+  dxr3player-0.9.4.ebuild, dxr3player-0.10.ebuild:
+  Don't install COPYING or INSTALL files.
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> dxr3player-0.10.ebuild:
+  Added to ~ppc.
+
+  01 Mar 2005; Anders Rune Jensen <arj@gentoo.org> dxr3player-0.10.ebuild:
+  Stable on x86 and amd64.
+
+*dxr3player-0.10 (24 Apr 2005)
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org> dxr3player-0.10.ebuild:
+  New version.
+
+  21 Mar 2005; Anders Rune Jensen <arj@gentoo.org>
+  dxr3player-0.9.4.ebuild, dxr3player-0.9.ebuild:
+  Correctly fix #86073
+
+  21 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> dxr3player-0.9.4.ebuild:
+  added missing libmpeg2 dependency, fixes #86073
+
+*dxr3player-0.9.4 (15 Jan 2005)
+
+  15 Jan 2005; Anders Rune Jensen <arj@gentoo.org> dxr3player-0.9.4.ebuild:
+  New version. Tested and works on amd64.
+
+  09 Nov 2004; Anders Rune Jensen <arj@gentoo.org> dxr3player-0.9.ebuild:
+  Stable on x86.
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *dxr3player-0.9 (18 Sep 2004)
 
diff --git a/media-video/dxr3player/Manifest b/media-video/dxr3player/Manifest
index 5f7dfe36503c..04943802b515 100644
--- a/media-video/dxr3player/Manifest
+++ b/media-video/dxr3player/Manifest
@@ -1,3 +1,18 @@
-MD5 16988ac949cb63432166c321258197a9 metadata.xml 253
-MD5 04daeb1962144523310853a780019ebf dxr3player-0.9.ebuild 1023
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c1a6f6a395dea87a9c9c0d01d7e1233a ChangeLog 1403
+MD5 931a96e22f0f3beca263d8a19c5c7f2f dxr3player-0.10.ebuild 1350
+MD5 cd1d37782a92adc987e824f756732d3c dxr3player-0.9.4.ebuild 1350
+MD5 4840631df34a505cc6a9f7c7e69e61a5 dxr3player-0.9.ebuild 1338
+MD5 0a7aad83e7f8dad3e5f038c7c032a527 files/digest-dxr3player-0.10 67
 MD5 57cd59eb28a1dc86a9c1cb14fa1428fb files/digest-dxr3player-0.9 66
+MD5 3ab54ab305847ceb514d48f1a8d75a8b files/digest-dxr3player-0.9.4 68
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbykZj5H05b2HAEkRApUwAJ4xYCnAPJYppN91n+Dw5JeVZ5pzfACfX3qL
+44a4aOmJg2C+P26iHVesvFM=
+=e+l4
+-----END PGP SIGNATURE-----
diff --git a/media-video/dxr3player/dxr3player-0.10.ebuild b/media-video/dxr3player/dxr3player-0.10.ebuild
index e54e552ce4af..9f1fa9be1524 100644
--- a/media-video/dxr3player/dxr3player-0.10.ebuild
+++ b/media-video/dxr3player/dxr3player-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-video/dxr3player/dxr3player-0.10.ebuild,v 1.1 2005/04/24 14:15:45 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr3player/dxr3player-0.10.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 DESCRIPTION="A DVD player for Linux, supports the DXR3 (aka Hollywood+) board."
 HOMEPAGE="http://dxr3player.sourceforge.net/"
@@ -9,12 +9,12 @@ SRC_URI="mirror://sourceforge/dxr3player/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc sdl mmx sse 3dnow"
 
 DEPEND=">=media-libs/libmad-0.15.1b
 	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl media-libs/libmpeg2)"
+	sdl? ( media-libs/libsdl media-libs/libmpeg2 )"
 
 src_compile() {
 
@@ -48,7 +48,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog INSTALL INSTALL.fr LISEZMOI NEWS README
+	dodoc AUTHORS ChangeLog LISEZMOI NEWS README
 
 	mybin="src/dxr3player/dumpdvd"
 
diff --git a/media-video/dxr3player/dxr3player-0.9.4.ebuild b/media-video/dxr3player/dxr3player-0.9.4.ebuild
index 095122735f38..c873ef493893 100644
--- a/media-video/dxr3player/dxr3player-0.9.4.ebuild
+++ b/media-video/dxr3player/dxr3player-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-video/dxr3player/dxr3player-0.9.4.ebuild,v 1.1 2005/01/14 02:08:47 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr3player/dxr3player-0.9.4.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 DESCRIPTION="A DVD player for Linux, supports the DXR3 (aka Hollywood+) board."
 HOMEPAGE="http://dxr3player.sourceforge.net/"
@@ -14,7 +14,7 @@ IUSE="lirc sdl mmx sse 3dnow"
 
 DEPEND=">=media-libs/libmad-0.15.1b
 	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl )"
+	sdl? ( media-libs/libsdl media-libs/libmpeg2 )"
 
 src_compile() {
 
@@ -48,7 +48,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog INSTALL INSTALL.fr LISEZMOI NEWS README
+	dodoc AUTHORS ChangeLog LISEZMOI NEWS README
 
 	mybin="src/dxr3player/dumpdvd"
 
diff --git a/media-video/dxr3player/dxr3player-0.9.ebuild b/media-video/dxr3player/dxr3player-0.9.ebuild
index 3160dc12ca0a..9e5051689d17 100644
--- a/media-video/dxr3player/dxr3player-0.9.ebuild
+++ b/media-video/dxr3player/dxr3player-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dxr3player/dxr3player-0.9.ebuild,v 1.1 2004/09/18 21:55:24 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dxr3player/dxr3player-0.9.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 DESCRIPTION="A DVD player for Linux, supports the DXR3 (aka Hollywood+) board."
 HOMEPAGE="http://dxr3player.sourceforge.net/"
@@ -9,12 +9,12 @@ SRC_URI="mirror://sourceforge/dxr3player/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="lirc sdl mmx sse 3dnow"
 
 DEPEND=">=media-libs/libmad-0.15.1b
 	lirc? ( app-misc/lirc )
-	sdl? ( media-libs/libsdl )"
+	sdl? ( media-libs/libsdl media-libs/libmpeg2 )"
 
 src_compile() {
 
@@ -48,7 +48,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog INSTALL INSTALL.fr LISEZMOI NEWS README
+	dodoc AUTHORS ChangeLog LISEZMOI NEWS README
 
 	mybin="src/dxr3player/dumpdvd"
 
diff --git a/media-video/dxr3player/metadata.xml b/media-video/dxr3player/metadata.xml
index a277cdfeb55d..0e3b862ed279 100644
--- a/media-video/dxr3player/metadata.xml
+++ b/media-video/dxr3player/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-video</herd>
+<herd>video</herd>
 <maintainer>
 <email>arj@gentoo.org</email>
 <name>Anders Rune Jensen</name>
diff --git a/media-video/eclair/ChangeLog b/media-video/eclair/ChangeLog
index 342deb9b8415..ffb964855702 100644
--- a/media-video/eclair/ChangeLog
+++ b/media-video/eclair/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for x11-wm/eclair
+# ChangeLog for media-video/eclair
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/eclair/ChangeLog,v 1.1 2005/04/25 00:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/eclair/ChangeLog,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
 
 *eclair-* (24 Apr 2005)
 
diff --git a/media-video/eclair/Manifest b/media-video/eclair/Manifest
index e69de29bb2d1..072ad00bfeaa 100644
--- a/media-video/eclair/Manifest
+++ b/media-video/eclair/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
+MD5 4e41032816d8e5e4522ac7be21a91106 eclair-9999.ebuild 480
+MD5 b7ed4a4367606e2b94ab13ca88bacde4 ChangeLog 353
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eclair-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDHQ5kgIKl8Uu19MoRAsFMAJY0iMmCn7sps2UA2iIEXzqDtNHEAJ9ztmG4
+EcmkAzqRNMIwFxYSooz0oA==
+=b/KG
+-----END PGP SIGNATURE-----
diff --git a/media-video/eclair/eclair-9999.ebuild b/media-video/eclair/eclair-9999.ebuild
index 6e1e5c8568f9..d2f68eb7b456 100644
--- a/media-video/eclair/eclair-9999.ebuild
+++ b/media-video/eclair/eclair-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-video/eclair/eclair-9999.ebuild,v 1.1 2005/04/25 00:21:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/eclair/eclair-9999.ebuild,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
 
 inherit enlightenment
 
@@ -12,6 +12,7 @@ RDEPEND="media-libs/taglib
 	media-libs/edje
 	media-libs/emotion
 	x11-libs/esmart
-	=x11-libs/gtk+-2*"
+	dev-libs/libxml2
+	>=dev-db/sqlite-3"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	>=dev-util/pkgconfig-0.17"
diff --git a/media-video/effectv/ChangeLog b/media-video/effectv/ChangeLog
index 516230411a40..deef4522aa5a 100644
--- a/media-video/effectv/ChangeLog
+++ b/media-video/effectv/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/effectv
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/ChangeLog,v 1.1 2005/03/29 22:50:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 *effectv-0.3.10 (30 Mar 2005)
 
diff --git a/media-video/effectv/Manifest b/media-video/effectv/Manifest
index 0d9cef4fd03e..edd644a2bb0a 100644
--- a/media-video/effectv/Manifest
+++ b/media-video/effectv/Manifest
@@ -1,2 +1,14 @@
-MD5 9c023af63a5da3564a598bffec57e19e effectv-0.3.10.ebuild 1027
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 177e74fd3e0f0c5dcf8dbcc1fef93ede effectv-0.3.10.ebuild 1037
+MD5 7cd1f4a9f91a4f84362d4d5baadabf25 metadata.xml 323
+MD5 f07fbf44913c1c97d05d42c5c00a5a27 ChangeLog 432
 MD5 04e4ca37e7ef9c7138e8b2147dda4d7f files/digest-effectv-0.3.10 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCSdQ6FdQwWVoAgN4RAo4aAKCcaq6MljNbmgpEY45yRJ4ZCJ+eawCcCQTz
+kuD5vhsENuHiIuMgKtbrXvI=
+=r5EH
+-----END PGP SIGNATURE-----
diff --git a/media-video/effectv/effectv-0.3.10.ebuild b/media-video/effectv/effectv-0.3.10.ebuild
index ea93ab46994a..c62324a72a88 100644
--- a/media-video/effectv/effectv-0.3.10.ebuild
+++ b/media-video/effectv/effectv-0.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-video/effectv/effectv-0.3.10.ebuild,v 1.1 2005/03/29 22:50:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/effectv/effectv-0.3.10.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/elation/ChangeLog b/media-video/elation/ChangeLog
index 2ffa960c4341..72849e2d4a38 100644
--- a/media-video/elation/ChangeLog
+++ b/media-video/elation/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/elation
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/elation/ChangeLog,v 1.1 2004/08/11 05:38:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/elation/ChangeLog,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 *elation-0.0.1.* (11 Aug 2004)
 
diff --git a/media-video/elation/Manifest b/media-video/elation/Manifest
index d9158c4fa693..01885fc70dc1 100644
--- a/media-video/elation/Manifest
+++ b/media-video/elation/Manifest
@@ -1,2 +1,6 @@
-MD5 22fedf28cc43f5dcd0bbcee3d1abf7d7 elation-0.0.1.20040807.ebuild 424
-MD5 d7459f25f10133d1eae9bfa984756594 files/digest-elation-0.0.1.20040807 75
+MD5 1169a9b0c424b45c5f8b6ca2987d87fc ChangeLog 338
+MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
+MD5 0c0f8ffe3053133e0bd682c35d3ce2b0 elation-0.0.1.20050220.ebuild 445
+MD5 0eac18661f60e8e1d1e004e837629382 elation-9999.ebuild 435
+MD5 bf7433be5b56517fdefca21b49a8170f files/digest-elation-0.0.1.20050220 75
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-elation-9999 0
diff --git a/media-video/elation/elation-0.0.1.20050220.ebuild b/media-video/elation/elation-0.0.1.20050220.ebuild
index e473da082299..3f4e5c9a07dd 100644
--- a/media-video/elation/elation-0.0.1.20050220.ebuild
+++ b/media-video/elation/elation-0.0.1.20050220.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/media-video/elation/elation-0.0.1.20050220.ebuild,v 1.1 2005/02/21 12:04:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/elation/elation-0.0.1.20050220.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit enlightenment
 
 DESCRIPTION="an e17 media player"
 
 DEPEND=">=dev-libs/eet-0.9.9
-	>=x11-libs/evas-1.0.0_pre13
+	>=x11-libs/evas-0.9.9
 	>=media-libs/edje-0.5.0
-	>=x11-libs/ecore-1.0.0_pre7
+	>=x11-libs/ecore-0.9.9
 	>=dev-libs/embryo-0.9.0
 	>=media-libs/emotion-0.0.1"
diff --git a/media-video/elation/elation-9999.ebuild b/media-video/elation/elation-9999.ebuild
index f03462429978..3dc308e52acf 100644
--- a/media-video/elation/elation-9999.ebuild
+++ b/media-video/elation/elation-9999.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/media-video/elation/elation-9999.ebuild,v 1.1 2005/02/21 09:11:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/elation/elation-9999.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit enlightenment
 
 DESCRIPTION="an e17 media player"
 
 DEPEND=">=dev-libs/eet-0.9.9
-	>=x11-libs/evas-1.0.0_pre13
+	>=x11-libs/evas-0.9.9
 	>=media-libs/edje-0.5.0
-	>=x11-libs/ecore-1.0.0_pre7
+	>=x11-libs/ecore-0.9.9
 	>=dev-libs/embryo-0.9.0
 	>=media-libs/emotion-0.0.1"
diff --git a/media-video/em8300-libraries/ChangeLog b/media-video/em8300-libraries/ChangeLog
index 7529d8b514be..eea3873ef6e8 100644
--- a/media-video/em8300-libraries/ChangeLog
+++ b/media-video/em8300-libraries/ChangeLog
@@ -1,9 +1,93 @@
 # ChangeLog for media-video/em8300-libraries
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/ChangeLog,v 1.1 2002/04/23 02:54:25 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/ChangeLog,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
+
+*em8300-libraries-0.15.1 (18 Oct 2005)
+  18 Oct 2005; Anders Rune Jensen <arj@gentoo.org>
+  +em8300-libraries-0.15.1.ebuild:
+  new version
+
+  18 Oct 2005; Anders Rune Jensen <arj@gentoo.org> 
+  -em8300-libraries-0.12.0-r1.ebuild, -em8300-libraries-0.13.0.ebuild,
+  -em8300-libraries-0.14.0.ebuild,
+  -em8300-libraries-0.15.0_pre20040525.ebuild,
+  -em8300-libraries-0.15.0_pre20040906.ebuild, 
+  -em8300-libraries-0.15.0_pre20050310.ebuild:
+  Removed old versions.
+
+  15 Jun 2005; David Holm <dholm@gentoo.org> em8300-libraries-0.15.0.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+*em8300-libraries-0.15.0 (03 Jun 2005)
+  03 Jun 2005; Anders Rune Jensen <arj@gentoo.org>
+  +em8300-libraries-0.15.0.ebuild:
+  new version
+	
+*em8300-libraries-0.15.0_pre20050310 (10 Mar 2005)
+  10 Mar 2005; Anders Rune Jensen <arj@gentoo.org>
+  +em8300-libraries-0.15.0_pre20050310:
+  Sync library with modules.
+
+  14 Jan 2005; Anders Rune Jensen <arj@gentoo.org>
+  em8300-libraries-0.15.0_pre20040906.ebuild:
+  works on amd64 with fpic
+	
+  07 Oct 2004; Brandon Low <lostlogic@gentoo.org>
+  em8300-libraries-0.15.0_pre20040906.ebuild:
+  make depend more specific
+
+*em8300-libraries-0.15.0_pre20040609 (06 Sep 2004)
+  06 Sep 2004; Anders Rune Jensen <arj@gentoo.org> +em8300-libraries-0.15.0_pre20040906:
+
+  01 Sep 2004; Anders Rune Jensen <arj@gentoo.org>
+  em8300-libraries-0.15.0_pre20040525.ebuild:
+  Move the tarball to the mirrors also.
+
+  29 Aug 2004; David Holm <dholm@gentoo.org>
+  em8300-libraries-0.15.0_pre20040525.ebuild:
+  Added to ~ppc.
+
+*em8300-libraries-0.15.0_pre20040525 (11 Aug 2004)
+ 
+  11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-libraries-0.15.0_pre20040525 :
+  New pre-release which works with kernel 2.6.
+	
+*em8300-libraries-0.14.0 (11 Aug 2003)
+ 
+  11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-libraries-0.14.0:
+  New official version (fixes #52623). Add myself as maintainer.
+
+*em8300-libraries-0.13.0-r1 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*em8300-libraries-0.13.0 (12 Dec 2002)
+
+  05 Jan 2003; Arcady Genkin <agenkin@gentoo.org> em8300-libraries-0.13.0-r1 :
+  Disabled GTK dependency for users without gtk in their USE flags.
+  The patch came from Steven Brookes <stevenjb@mda.co.uk>.
+  Closes bug #10339.
+	
+  15 Dec 2002; Brandon Low <lostlogic@gentoo.org> em8300-libraries-0.13.0 :
+  oops, info wrong, and extra line in ebuild.
+
+  12 Dec 2002; Brandon Low <lostlogic@gentoo.org> em8300-libraries-0.13.0 :
+  Bump
+
+*em8300-libraries-0.12.0-r1 (April 29, 2002)
+
+  11 May 2002; Arcady Genkin <agenkin@thpoon.com> em8300-libraries-0.12.0-r1 :
+  
+  More updates by Brandon Low.  No user-visible changes.
+
+  29 April 2002; Arcady Genkin <agenkin@thpoon.com> em8300-libraries-0.12.0-r1 :
+  
+  Further updates by Brandon Low.  Fixed some issues in microcode upload
+  script.
 
 *em8300-libraries-0.12.0 (April 22, 2002)
 
   22 April 2002; Arcady Genkin <agenkin@thpoon.com> em8300-libraries-0.12.0 :
   
-  Initial version, submitted by Brandon Low <lostlogic@lostlogicx.com>.
\ No newline at end of file
+  Initial version, submitted by Brandon Low <lostlogic@lostlogicx.com>.
diff --git a/media-video/em8300-libraries/Manifest b/media-video/em8300-libraries/Manifest
index e69de29bb2d1..f5f0bbb15e56 100644
--- a/media-video/em8300-libraries/Manifest
+++ b/media-video/em8300-libraries/Manifest
@@ -0,0 +1,8 @@
+MD5 c5d3ace6380b28928e7b2e20145da42e ChangeLog 3328
+MD5 f44ec5185e2800bd9ed7c758693fefcf em8300-libraries-0.13.0-r1.ebuild 2138
+MD5 768d3285097481a24279b42e72ec5573 em8300-libraries-0.15.0.ebuild 2196
+MD5 18a9dd2a04a4b0d9b91bf24347b4d30f em8300-libraries-0.15.1.ebuild 2194
+MD5 29a6f23e30a4e4d57e5a0daf1d61f8c5 files/digest-em8300-libraries-0.13.0-r1 65
+MD5 ee5ed479a61194274ece9b4d034bf598 files/digest-em8300-libraries-0.15.0 65
+MD5 f0b1bbd962955837a701644a03b32eed files/digest-em8300-libraries-0.15.1 65
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
diff --git a/media-video/em8300-libraries/em8300-libraries-0.13.0-r1.ebuild b/media-video/em8300-libraries/em8300-libraries-0.13.0-r1.ebuild
index 4b1302d1575d..a2d14bb06993 100644
--- a/media-video/em8300-libraries/em8300-libraries-0.13.0-r1.ebuild
+++ b/media-video/em8300-libraries/em8300-libraries-0.13.0-r1.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-video/em8300-libraries/em8300-libraries-0.13.0-r1.ebuild,v 1.1 2003/01/06 04:03:32 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.13.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
 
 DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries"
 HOMEPAGE="http://dxr3.sourceforge.net"
@@ -10,10 +10,9 @@ DEPEND="media-video/em8300-modules
 	gtk? ( x11-libs/gtk+ )"
 
 SRC_URI="mirror://sourceforge/dxr3/${P/-libraries/}.tar.gz"
-S="${WORKDIR}/${P}"
 
 IUSE="gtk"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 
 src_unpack () {
@@ -47,7 +46,7 @@ src_compile ()	{
 		--sysconfdir=/etc \
 		--datadir=/usr/share || die
 	make all || die
-	
+
 }
 
 src_install () {
@@ -75,7 +74,7 @@ src_install () {
 
 pkg_postinst() {
 
-	einfo 
+	einfo
 	einfo "The em8300 libraries and modules have now beein installed,"
 	einfo "you will probably want to add /usr/bin/em8300setup to your"
 	einfo "/etc/conf.d/local.start so that your em8300 card is "
@@ -83,6 +82,6 @@ pkg_postinst() {
 	einfo
 	einfo "If you still need a microcode other than the one included"
 	einfo "with the package, you can simply use em8300setup <microcode.ux>"
-	einfo 
+	einfo
 
 }
diff --git a/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild b/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild
index e14648f33350..9c2c66c5ce0e 100644
--- a/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild
+++ b/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild,v 1.1 2005/06/03 11:30:59 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.0.ebuild,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ DEPEND="media-video/em8300-modules
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk"
 
 src_unpack () {
diff --git a/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild b/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild
index f401bb7e8e50..b1c3ad1273c1 100644
--- a/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild
+++ b/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild,v 1.1 2005/10/18 14:43:39 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.1.ebuild,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/media-video/em8300-libraries/metadata.xml b/media-video/em8300-libraries/metadata.xml
index a277cdfeb55d..0e3b862ed279 100644
--- a/media-video/em8300-libraries/metadata.xml
+++ b/media-video/em8300-libraries/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-video</herd>
+<herd>video</herd>
 <maintainer>
 <email>arj@gentoo.org</email>
 <name>Anders Rune Jensen</name>
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index 8f4693f6af87..05b07751b34b 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,9 +1,96 @@
 # ChangeLog for media-video/em8300-modules
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.1 2002/04/23 02:54:25 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
+*em8300-modules-0.15.1 (18 Oct 2005)
+  18 Oct 2005; Anders Rune Jensen <arj@gentoo.org>
+  +em8300-modules-0.15.1.ebuild:
+  new version
+
+  18 Oct 2005; Anders Rune Jensen <arj@gentoo.org> 
+  -em8300-modules-0.12.0.ebuild, -em8300-modules-0.14.0.ebuild,
+  -em8300-modules-0.15.0_pre20040525.ebuild,
+  -em8300-modules-0.15.0_pre20040906.ebuild, 
+  -em8300-modules-0.15.0_pre20050310.ebuild:
+  Removed old versions.
+
+  15 Jun 2005; David Holm <dholm@gentoo.org> em8300-modules-0.15.0.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+*em8300-modules-0.15.0 (03 Jun 2005)
+
+  03 Jun 2005; Anders Rune Jensen <arj@gentoo.org> 
+  +em8300-modules-0.15.0.ebuild:
+  New version.
+
+*em8300-modules-0.15.0_pre20050310 (10 Mar 2005)
+
+  10 Mar 2005; Anders Rune Jensen <arj@gentoo.org>
+  +em8300-modules-0.15.0_pre20050310.ebuild:
+  New cvs snapsnot. Fixes #84644. Also make it use linux-info eclass.
+	
+  14 Jan 2005; Anders Rune Jensen <arj@gentoo.org>
+  em8300-modules-0.15.0_pre20040906-r1.ebuild:
+  works on amd64
+
+*em8300-modules-0.15.0_pre20040906-r1 (07 Oct 2004)
+
+  07 Oct 2004; Brandon Low <lostlogic@gentoo.org>
+  +em8300-modules-0.15.0_pre20040906-r1.ebuild:
+  Make sure we are using the right KV throughout. This is _not_ elegantly
+  done, and uses sed instead of a patch, feel free to fix it.
+
+  03 Oct 2004; <iggy@gentoo.org> em8300-modules-0.15.0_pre20040525.ebuild,
+  em8300-modules-0.15.0_pre20040906.ebuild:
+  switched custom ARCH setting code to use set_arch_to_* from eutils
+
+*em8300-modules-0.15.0_pre20040906 (06 Sep 2004)
+
+  06 Sep 2004; Anders Rune Jensen <arj@gentoo.org> +em8300-modules-0.15.0_pre20040906 :
+  New snapshot release which fixes two bugs.
+	
+  01 Sep 2004; Anders Rune Jensen <arj@gentoo.org>
+  em8300-modules-0.15.0_pre20040525.ebuild:
+  Move the tarball to the mirrors also.
+
+  29 Aug 2004; David Holm <dholm@gentoo.org>
+  em8300-modules-0.15.0_pre20040525.ebuild:
+  Added to ~ppc.
+
+  17 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.0_pre20040525 :
+  Don't install 2.4 modules on a 2.6 kernel. Will confuse modprobe. Thanx
+  to Rasmus B. Nielsen <r10@cs.auc.dk> for pointing it out. Also get the
+  correct kernel version.
+	
+*em8300-modules-0.15.0_pre20040525 (11 Aug 2004)
+ 
+  11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.0_pre20040525 :
+  New pre-release which works with kernel 2.6.
+
+*em8300-modules-0.14.0 (11 Aug 2004)
+ 
+  11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.14.0 :
+  New official version (fixes #52623). Also fix #26117, #15440. Add myself as maintainer.
+
+*em8300-modules-0.13.0 (12 Dec 2002)
+ 
+  12 Dec 2002; Brandon Low <lostlogic@gentoo.org> em8300-libraries-0.13.0 :
+  Bump.
+  
 *em8300-modules-0.12.0 (April 22, 2002)
+ 
+  11 May 2002; Arcady Genkin <agenkin@thpoon.com> em8300-libraries-0.12.0 :
+  
+  Committed further clean-ups by Brandon Low.  No user-visible changes.
+
+  8 May 2002; Jon Nelson <jnelson@gentoo.org> em8300-modules-0.12.0 :
+  
+  Use check_KV and depend on portage >= 1.9.10
+
+  3 May 2002; Arcady Genkin <agenkin@thpoon.com> em8300-libraries-0.12.0 :
+  
+  Cleaned up the ebuild a little.
 
   22 April 2002; Arcady Genkin <agenkin@thpoon.com> em8300-libraries-0.12.0 :
   
-  Initial version, submitted by Brandon Low <lostlogic@lostlogicx.com>.
\ No newline at end of file
+  Initial version, submitted by Brandon Low <lostlogic@lostlogicx.com>.
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index e69de29bb2d1..e7cfa9615bf8 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -0,0 +1,9 @@
+MD5 8949b9b37d21e2fead0ba6d9e13e6ab8 ChangeLog 3528
+MD5 9557b4f8c9c17637a04a126438963dad em8300-modules-0.13.0.ebuild 2433
+MD5 4c36f1e57f417946efba2a3b4290248f em8300-modules-0.15.0.ebuild 2312
+MD5 0655f9e97b37b95b44f16ea33551cbf0 em8300-modules-0.15.1.ebuild 2310
+MD5 29a6f23e30a4e4d57e5a0daf1d61f8c5 files/digest-em8300-modules-0.13.0 65
+MD5 ee5ed479a61194274ece9b4d034bf598 files/digest-em8300-modules-0.15.0 65
+MD5 f0b1bbd962955837a701644a03b32eed files/digest-em8300-modules-0.15.1 65
+MD5 40448834cd5bc1bdc07ab84d8a3727cc files/modules.em8300 28
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
diff --git a/media-video/em8300-modules/em8300-modules-0.13.0.ebuild b/media-video/em8300-modules/em8300-modules-0.13.0.ebuild
index c0e929f978d8..b34aef9ffced 100644
--- a/media-video/em8300-modules/em8300-modules-0.13.0.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.13.0.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-video/em8300-modules/em8300-modules-0.13.0.ebuild,v 1.1 2002/12/13 05:24:47 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.13.0.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 S="${WORKDIR}/${P}/modules"
 DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules"
@@ -14,6 +14,7 @@ RDEPEND="${DEPEND}
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+IUSE=""
 
 
 src_unpack () {
@@ -51,7 +52,7 @@ src_install () {
 	# The driver goes into the standard modules location
 	insinto "/lib/modules/${KV}/kernel/drivers/video"
 	doins em8300.o bt865.o adv717x.o
-		
+
 	# Docs
 	dodoc README-modoptions \
 	      README-modules.conf \
@@ -79,10 +80,10 @@ pkg_postinst () {
 	einfo "the contents of /usr/share/doc/${P}/devfs_symlinks.gz"
 	einfo "to your devfsd.conf so that the em8300 devices will be linked"
 	einfo "correctly."
-	einfo 
+	einfo
 	einfo "You will also need to have the i2c kernel modules compiled for"
 	einfo "this to be happy, no need to patch any kernel though just turn"
 	einfo "all the i2c stuff in kernel config to M and you'll be fine."
-	einfo 
+	einfo
 
 }
diff --git a/media-video/em8300-modules/em8300-modules-0.15.0.ebuild b/media-video/em8300-modules/em8300-modules-0.15.0.ebuild
index 485dfce6c3ee..62908b376c38 100644
--- a/media-video/em8300-modules/em8300-modules-0.15.0.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.0.ebuild,v 1.1 2005/06/03 11:34:33 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.0.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 inherit eutils linux-info
 
@@ -13,7 +13,7 @@ DEPEND="virtual/linux-sources"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 src_unpack () {
diff --git a/media-video/em8300-modules/em8300-modules-0.15.1.ebuild b/media-video/em8300-modules/em8300-modules-0.15.1.ebuild
index 2b0f5b66e45e..8a1fb7e0fa5d 100644
--- a/media-video/em8300-modules/em8300-modules-0.15.1.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.1.ebuild,v 1.1 2005/10/18 14:45:02 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.1.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 inherit eutils linux-info
 
diff --git a/media-video/em8300-modules/metadata.xml b/media-video/em8300-modules/metadata.xml
index a277cdfeb55d..0e3b862ed279 100644
--- a/media-video/em8300-modules/metadata.xml
+++ b/media-video/em8300-modules/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-video</herd>
+<herd>video</herd>
 <maintainer>
 <email>arj@gentoo.org</email>
 <name>Anders Rune Jensen</name>
diff --git a/media-video/emovix/ChangeLog b/media-video/emovix/ChangeLog
index 286b8b6c7216..6870969d7170 100644
--- a/media-video/emovix/ChangeLog
+++ b/media-video/emovix/ChangeLog
@@ -1,10 +1,27 @@
 # ChangeLog for media-video/emovix
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/emovix/ChangeLog,v 1.1 2003/09/13 01:16:25 luke-jr Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/emovix/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
-*emovix-0.8.0_rc2 (13 Sep 2003)
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  emovix-0.9.0_pre1.ebuild:
+  Don't install INSTALL file.
 
-  13 Sep 2003; Luke-Jr <luke-jr@gentoo.org> emovix-0.8.0_rc2.ebuild,
-  metadata.xml:
-  Initial addition to Portage
+  21 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  emovix-0.9.0_pre1.ebuild:
+  Use the ein32codecs package instead of installing separate ones.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> emovix-0.9.0_pre1.ebuild:
+  changed app-cdr/cdrtools dependency to virtual/cdrtools. see bug #77817.
+
+  08 Sep 2004; <blubb@gentoo.org> emovix-0.9.0_pre1.ebuild:
+  added ~amd64 keyword
+
+*emovix-0.9.0_pre1 (27 Jul 2004)
+
+  27 Jul 2004; Chris White <chriswhite@gentoo.org> +metadata.xml,
+  +emovix-0.9.0_pre1.ebuild:
+  Initial submission to the tree.  Closes bug #51315.
 
diff --git a/media-video/emovix/Manifest b/media-video/emovix/Manifest
index f2c490eae944..1d2995d3eec4 100644
--- a/media-video/emovix/Manifest
+++ b/media-video/emovix/Manifest
@@ -1,3 +1,14 @@
-MD5 9e75e34240b08fe4911d49e83e17ccf5 metadata.xml 275
-MD5 1233449c3b58e09f1e03e7be478a2a60 emovix-0.8.0_rc2.ebuild 411
-MD5 03adcc06742cb3d029a0ee639d20f373 files/digest-emovix-0.8.0_rc2 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7a042c343928749e445e00ec095876a3 ChangeLog 1013
+MD5 a2ad921f453a52a276512c80ddd08a8b emovix-0.9.0_pre1.ebuild 861
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 d165d11d02d880d3cd0dc77679e325b0 files/digest-emovix-0.9.0_pre1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv7Dj5H05b2HAEkRAo/qAKCDWFqWhrUZqWyJFlx/jtZiYwLXfgCfXgF5
+pCGI6sWmz9/3T2joL+I5YzU=
+=D9lz
+-----END PGP SIGNATURE-----
diff --git a/media-video/emovix/emovix-0.9.0_pre1.ebuild b/media-video/emovix/emovix-0.9.0_pre1.ebuild
index 1dc2cf828055..972a8cc87a4d 100644
--- a/media-video/emovix/emovix-0.9.0_pre1.ebuild
+++ b/media-video/emovix/emovix-0.9.0_pre1.ebuild
@@ -1,42 +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-video/emovix/emovix-0.9.0_pre1.ebuild,v 1.1 2004/07/27 07:51:36 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/emovix/emovix-0.9.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:57:46 chriswhite Exp $
 
 MY_P="${P/_/}"
 
 DESCRIPTION="Micro Linux distro to boot from a CD and play every video file localized in the CD root."
 HOMEPAGE="http://movix.sourceforge.net/"
 CODEC_URI="http://www1.mplayerhq.hu/MPlayer/releases/codecs/"
-SRC_URI="mirror://sourceforge/movix/${MY_P}.tar.gz
-			codecs? ( ${CODEC_URI}qt63dlls-20040626.tar.bz2
-					${CODEC_URI}rp9codecs-20040626.tar.bz2
-					${CODEC_URI}rp9codecs-win32-20040626.tar.bz2
-					${CODEC_URI}win32codecs-20040703.tar.bz2
-					${CODEC_URI}xanimdlls-20040626.tar.bz2 )"
+SRC_URI="mirror://sourceforge/movix/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="codecs"
+KEYWORDS="~x86 ~amd64"
+IUSE="win32codecs"
 DEPEND=">=dev-lang/perl-5.0
-		sys-apps/gawk
-		app-cdr/cdrtools"
+	sys-apps/gawk"
 
-S="${WORKDIR}/${MY_P}"
+RDEPEND="${DEPEND}
+	 win32codecs? ( media-libs/win32codecs )
+	 virtual/cdrtools"
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
+S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL README* TODO
-	if use codecs
-	then
-		insinto /usr/share/emovix/codecs
-		insopts -m622
-		doins ${DISTDIR}/qt63dlls-20040626.tar.bz2 ${DISTDIR}/rp9codecs-20040626.tar.bz2 \
-		${DISTDIR}/rp9codecs-win32-20040626.tar.bz2 ${DISTDIR}/win32codecs-20040703.tar.bz2 \
-		${DISTDIR}/xanimdlls-20040626.tar.bz2
-	fi
+	dodoc AUTHORS ChangeLog README* TODO
+
+	dosym /usr/lib/win32 /usr/share/emovix/codecs
 }
 
diff --git a/media-video/emovix/files/digest-emovix-0.9.0_pre1 b/media-video/emovix/files/digest-emovix-0.9.0_pre1
index f874bb65045b..7c138e9be376 100644
--- a/media-video/emovix/files/digest-emovix-0.9.0_pre1
+++ b/media-video/emovix/files/digest-emovix-0.9.0_pre1
@@ -1,6 +1 @@
 MD5 ce10d147c45e7b0faee20ec77e335423 emovix-0.9.0pre1.tar.gz 10554757
-MD5 f2fe6e94618a4e58d4240a52b95a975c qt63dlls-20040626.tar.bz2 2692919
-MD5 00e075a083163317bce06435134602e4 rp9codecs-20040626.tar.bz2 511450
-MD5 921976403ea42052e287159c4245fbb0 rp9codecs-win32-20040626.tar.bz2 528186
-MD5 90ba6a76ded2f9fd9f865024bd8de3d3 win32codecs-20040703.tar.bz2 7176589
-MD5 a7c980a1a94fbac6ebd34c7485a1891d xanimdlls-20040626.tar.bz2 318850
diff --git a/media-video/emovix/metadata.xml b/media-video/emovix/metadata.xml
index a91caec6492d..d9df1878d8e2 100644
--- a/media-video/emovix/metadata.xml
+++ b/media-video/emovix/metadata.xml
@@ -2,11 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
-<maintainer>
-  <email>luke-jr@gentoo.org</email>
-  <name>Luke-Jr</name>
-</maintainer>
-<longdescription>eMoviX makes a CD able to play by 
-itself all audio/video files it contains (DivX, XviD, 
-QuickTime, MP3 etc.).</longdescription>
 </pkgmetadata>
diff --git a/media-video/envision/ChangeLog b/media-video/envision/ChangeLog
index 8ec8c87d2f93..f97b8262d8d8 100644
--- a/media-video/envision/ChangeLog
+++ b/media-video/envision/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/envision
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/envision/ChangeLog,v 1.1 2005/02/21 09:19:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/envision/ChangeLog,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 *elation-* (21 Feb 2005)
 
diff --git a/media-video/envision/Manifest b/media-video/envision/Manifest
index af88d7e4d107..2df41fef60de 100644
--- a/media-video/envision/Manifest
+++ b/media-video/envision/Manifest
@@ -1,6 +1,4 @@
-MD5 1169a9b0c424b45c5f8b6ca2987d87fc ChangeLog 338
+MD5 7c001414bf1103f36eef2df67fc94455 envision-9999.ebuild 415
+MD5 50784ad38b4fddc021ac4aeb331b2c54 ChangeLog 334
 MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
-MD5 8468d329112e6b5d47dcf85a5bc5af55 elation-0.0.1.20040807.ebuild 456
-MD5 d75755028aaac1bccf2c638bf4365d21 elation-9999.ebuild 446
-MD5 d7459f25f10133d1eae9bfa984756594 files/digest-elation-0.0.1.20040807 75
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-elation-9999 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-envision-9999 0
diff --git a/media-video/envision/envision-9999.ebuild b/media-video/envision/envision-9999.ebuild
index ebf42b2b7ff9..a5e99c6b8e8b 100644
--- a/media-video/envision/envision-9999.ebuild
+++ b/media-video/envision/envision-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/envision/envision-9999.ebuild,v 1.1 2005/02/21 09:19:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/envision/envision-9999.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
+ECVS_MODULE="misc/envision"
 inherit enlightenment
 
 DESCRIPTION="an e17 video player"
diff --git a/media-video/episoder/ChangeLog b/media-video/episoder/ChangeLog
index af1bd6e12908..d9555d5aa97e 100644
--- a/media-video/episoder/ChangeLog
+++ b/media-video/episoder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/episoder
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/episoder/ChangeLog,v 1.1 2005/01/21 13:40:14 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/episoder/ChangeLog,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> episoder-0.2.1.ebuild:
+  Added to ~ppc.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> episoder-0.2.1.ebuild:
+  added ~amd64 to KEYWORDS. fixes #79186
 
 *episoder-0.2.1 (21 Jan 2005)
 
diff --git a/media-video/episoder/Manifest b/media-video/episoder/Manifest
index 43aa319dd53b..76af78af7e52 100644
--- a/media-video/episoder/Manifest
+++ b/media-video/episoder/Manifest
@@ -1,2 +1,4 @@
-MD5 d4bbd7e24045c7a3da50dd5a655575df episoder-0.2.1.ebuild 599
+MD5 b9801bf22841d1024c4182ac27908b95 ChangeLog 630
+MD5 ec9a24556bef93d117f8ef79806afc6b episoder-0.2.1.ebuild 713
+MD5 28acfcf66d18dd63a24022b53fbfba19 metadata.xml 221
 MD5 6554b03a5163c5fd5fc20b39d682f421 files/digest-episoder-0.2.1 64
diff --git a/media-video/episoder/episoder-0.2.1.ebuild b/media-video/episoder/episoder-0.2.1.ebuild
index e092e65ab42b..7be4e474e308 100644
--- a/media-video/episoder/episoder-0.2.1.ebuild
+++ b/media-video/episoder/episoder-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-video/episoder/episoder-0.2.1.ebuild,v 1.1 2005/01/21 13:40:14 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/episoder/episoder-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 DESCRIPTION="episoder is a tool to tell you when new episodes of your favourite
 TV shows are airing"
@@ -9,7 +9,7 @@ SRC_URI="http://tools.desire.ch/data/episoder/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="net-misc/wget"
diff --git a/media-video/fame/ChangeLog b/media-video/fame/ChangeLog
index c10fda95c25d..47ddc2ee1a0f 100644
--- a/media-video/fame/ChangeLog
+++ b/media-video/fame/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/fame
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/fame/ChangeLog,v 1.1 2002/11/15 15:33:20 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/fame/ChangeLog,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> fame-0.9.0.ebuild:
+  Added to ~ppc.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> fame-0.9.0.ebuild:
+  Typo in DESCRIPTION: optionnaly -> optionally. Bug 59717.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> fame-0.9.0.ebuild:
+  virtual/glibc -> virtual/libc
 
 *fame-0.9.0 (15 Nov 2002)
 
diff --git a/media-video/fame/Manifest b/media-video/fame/Manifest
index e69de29bb2d1..5f231bb62341 100644
--- a/media-video/fame/Manifest
+++ b/media-video/fame/Manifest
@@ -0,0 +1,4 @@
+MD5 dae968f31bf52a3a07d038293a66c8e4 ChangeLog 862
+MD5 a96493333b77d0485476d021eca083c8 fame-0.9.0.ebuild 877
+MD5 770246af90c6161ac995f6d5c574b676 metadata.xml 246
+MD5 f68b19935b1ceae8b0204bfbc8c78bdf files/digest-fame-0.9.0 61
diff --git a/media-video/fame/fame-0.9.0.ebuild b/media-video/fame/fame-0.9.0.ebuild
index 2e1e2b828c1e..412669c37968 100644
--- a/media-video/fame/fame-0.9.0.ebuild
+++ b/media-video/fame/fame-0.9.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/fame/fame-0.9.0.ebuild,v 1.1 2002/11/15 15:33:20 phoenix Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/fame/fame-0.9.0.ebuild,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
 
-IUSE=""
-
-DESCRIPTION="fame is a multimedia encoder, which captures video from a video4linux device, and optionnaly sound, for MPEG encoding."
+DESCRIPTION="fame is a multimedia encoder, which captures video from a video4linux device, and optionally sound, for MPEG encoding."
+HOMEPAGE="http://fame.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://fame.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE="mmx sse"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=media-libs/libfame-0.9.0"
 
 src_compile() {
@@ -27,7 +26,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr/lib
-    
+
 	einstall install || die "einstall failed"
 
 	dodoc AUTHORS BUGS CHANGES README TODO
diff --git a/media-video/fame/metadata.xml b/media-video/fame/metadata.xml
index b7c0ebb85855..26b1dbaa1cb5 100644
--- a/media-video/fame/metadata.xml
+++ b/media-video/fame/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-video</herd>
+<herd>video</herd>
 <herd>media-tv</herd>
 <maintainer>
 	<email>media-video@gentoo.org</email>
diff --git a/media-video/fenice/ChangeLog b/media-video/fenice/ChangeLog
index 59104f0cc375..2b562a76cb38 100644
--- a/media-video/fenice/ChangeLog
+++ b/media-video/fenice/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for media-video/fenice
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/ChangeLog,v 1.1 2005/01/06 17:13:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/ChangeLog,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
+
+  02 Nov 2005; Stefan Schweizer <genstef@gentoo.org> fenice-1.7.ebuild,
+  fenice-1.8.ebuild, fenice-1.9.ebuild, fenice-1.10.ebuild:
+  app-text/ghostscript -> virtual/ghostscript
+
+*fenice-1.10 (03 Aug 2005)
+
+  03 Aug 2005; Luca Barbato <lu_zero@gentoo.org> +fenice-1.10.ebuild:
+  New version
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> fenice-1.8.ebuild,
+  fenice-1.9.ebuild:
+  Use virtual/libc instead of sys-libs/glibc.
+
+  13 Apr 2005; Luca Barbato <lu_zero@gentoo.org> fenice-1.9.ebuild:
+  Minor workaround
+
+  08 Apr 2005; Luca Barbato <lu_zero@gentoo.org> fenice-1.9.ebuild:
+  updated homepage, thanks to Jovi for pointing out
+
+*fenice-1.9 (04 Apr 2005)
+
+  04 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +fenice-1.9.ebuild:
+  New version
+
+*fenice-1.8 (07 Mar 2005)
+
+  07 Mar 2005; Luca Barbato <lu_zero@gentoo.org> +fenice-1.8.ebuild:
+  New version
+
+*fenice-1.7 (03 Feb 2005)
+
+  03 Feb 2005; Luca Barbato <lu_zero@gentoo.org> +fenice-1.7.ebuild:
+  New version
+
+  08 Jan 2005; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  fenice-1.6.ebuild:
+  Removed unneeded src_unpack and src_compile. Fixed herd name in metadata.xml.
 
 *fenice-1.6 (06 Jan 2005)
 
diff --git a/media-video/fenice/Manifest b/media-video/fenice/Manifest
index e9e6a2f48a05..94797cd404c0 100644
--- a/media-video/fenice/Manifest
+++ b/media-video/fenice/Manifest
@@ -1,4 +1,12 @@
-MD5 b4b6dc94a8982d285049c4d66fa5e83c ChangeLog 248
-MD5 02304979e33c8ccbae30edecd011acd1 fenice-1.6.ebuild 567
-MD5 138067f3c0019f8388056e28af7c08db metadata.xml 297
+MD5 7645d55659ab1257e4e0cb351fc57488 ChangeLog 1480
+MD5 9845eb623a10c8a6aba854f476690ba6 fenice-1.10.ebuild 764
+MD5 5250c600bda9563ad37ec8e576b4f581 fenice-1.6.ebuild 531
+MD5 548ae257b32ca27818a0366d689a45af fenice-1.7.ebuild 671
+MD5 09a107cee085d5ff91d389b9985e82ec fenice-1.8.ebuild 667
+MD5 2cec99ae4724ec9b310eaedcee3a0209 fenice-1.9.ebuild 763
+MD5 0b80ee45def63c904757b1f83593b322 files/digest-fenice-1.10 64
 MD5 17a0b9f65221ff4aa90ddd3a16d9abe0 files/digest-fenice-1.6 63
+MD5 cecc025c9f7f5ae46df82a1ab2145b2f files/digest-fenice-1.7 63
+MD5 70d6a92bff330ffa1813cb3d2565194d files/digest-fenice-1.8 63
+MD5 13aa29cc19fb485c527f21888bc21e43 files/digest-fenice-1.9 63
+MD5 a410c19dfae7b9b1948abd3c64b51970 metadata.xml 291
diff --git a/media-video/fenice/fenice-1.10.ebuild b/media-video/fenice/fenice-1.10.ebuild
index 2eab323caf8f..3b205f468c17 100644
--- a/media-video/fenice/fenice-1.10.ebuild
+++ b/media-video/fenice/fenice-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/media-video/fenice/fenice-1.10.ebuild,v 1.1 2005/08/03 12:12:31 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/fenice-1.10.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 DESCRIPTION="Experimental rtsp streaming server"
 HOMEPAGE="http://streaming.polito.it/server"
@@ -11,7 +11,7 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc
-		app-text/ghostscript"
+		virtual/ghostscript"
 
 RDEPEND="virtual/libc"
 src_unpack() {
diff --git a/media-video/fenice/fenice-1.6.ebuild b/media-video/fenice/fenice-1.6.ebuild
index 4c9fa43f9b8f..5bd41567d74e 100644
--- a/media-video/fenice/fenice-1.6.ebuild
+++ b/media-video/fenice/fenice-1.6.ebuild
@@ -1,35 +1,17 @@
-# 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-video/fenice/fenice-1.6.ebuild,v 1.1 2005/01/06 17:13:19 lu_zero Exp $
-DESCRIPTION="Experimental rtsp streaming server"
+# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/fenice-1.6.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
+DESCRIPTION="Experimental rtsp streaming server"
 HOMEPAGE="http://streaming.polito.it/fenice.shtml"
-
 SRC_URI="http://streaming.polito.it/files/${P}.tar.bz2"
-
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~x86 ~ppc"
-
 IUSE=""
 
 DEPEND="sys-libs/glibc"
 
-export WANT_AUTOMAKE="1.6"
-
-src_unpack(){
-	unpack ${A}
-#	cd ${S}
-#	./autogen.sh
-}
-
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 }
diff --git a/media-video/fenice/fenice-1.7.ebuild b/media-video/fenice/fenice-1.7.ebuild
index 839315550c13..098a20a76338 100644
--- a/media-video/fenice/fenice-1.7.ebuild
+++ b/media-video/fenice/fenice-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-video/fenice/fenice-1.7.ebuild,v 1.1 2005/02/03 12:56:54 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/fenice-1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 DESCRIPTION="Experimental rtsp streaming server"
 HOMEPAGE="http://streaming.polito.it/fenice.shtml"
@@ -11,7 +11,7 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="sys-libs/glibc
-		app-text/ghostscript"
+		virtual/ghostscript"
 
 RDEPEND="sys-libs/glibc"
 
diff --git a/media-video/fenice/fenice-1.8.ebuild b/media-video/fenice/fenice-1.8.ebuild
index 2e6a846f6bda..e6d7bfb4a2aa 100644
--- a/media-video/fenice/fenice-1.8.ebuild
+++ b/media-video/fenice/fenice-1.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-video/fenice/fenice-1.8.ebuild,v 1.1 2005/03/07 12:41:07 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/fenice-1.8.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 DESCRIPTION="Experimental rtsp streaming server"
 HOMEPAGE="http://streaming.polito.it/fenice.shtml"
@@ -10,10 +10,10 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-DEPEND="sys-libs/glibc
-		app-text/ghostscript"
+DEPEND="virtual/libc
+		virtual/ghostscript"
 
-RDEPEND="sys-libs/glibc"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	econf --disable-fhs23 || die "econf failed"
diff --git a/media-video/fenice/fenice-1.9.ebuild b/media-video/fenice/fenice-1.9.ebuild
index c91401761c6e..cfdff3d4ba7a 100644
--- a/media-video/fenice/fenice-1.9.ebuild
+++ b/media-video/fenice/fenice-1.9.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/fenice-1.9.ebuild,v 1.1 2005/04/04 09:17:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/fenice/fenice-1.9.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 DESCRIPTION="Experimental rtsp streaming server"
-HOMEPAGE="http://streaming.polito.it/fenice.shtml"
+HOMEPAGE="http://streaming.polito.it/server"
 SRC_URI="http://streaming.polito.it/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-DEPEND="sys-libs/glibc
-		app-text/ghostscript"
-
-RDEPEND="sys-libs/glibc"
+DEPEND="virtual/libc
+		virtual/ghostscript"
 
+RDEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:PACKAGE_NAME/avroot:PACKAGE_NAME/avroot/:g" ${S}/configure
+}
 src_compile() {
 	econf --disable-fhs23 || die "econf failed"
 	emake || die "emake failed"
diff --git a/media-video/fenice/metadata.xml b/media-video/fenice/metadata.xml
index 8afa8626154d..e4f560d81cf4 100644
--- a/media-video/fenice/metadata.xml
+++ b/media-video/fenice/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>lu_zero@gentoo.org</email>
 </maintainer>
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index fd26e9665cce..feb89486f2b4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,9 +1,428 @@
 # ChangeLog for media-video/ffmpeg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/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-video/ffmpeg/ChangeLog,v 1.1.1.1 2005/11/30 09:57:55 chriswhite Exp $
 
+  21 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20051120.ebuild:
+  Marked ~ppc
+
+  21 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  ffmpeg-0.4.9_p20051120.ebuild:
+  Added ~ppc64 keyword; bug #113107
+
+  21 Nov 2005; Herbie Hopkins <herbs@gentoo.org>
+  ffmpeg-0.4.9_p20051120.ebuild:
+  Marked ~amd64 wrt bug #113107.
+
+  21 Nov 2005; Chris White <chriswhite@gentoo.org>
+  ffmpeg-0.4.9_p20051120.ebuild:
+  Added ~x86 keyword as per bug #113107.
+
+*ffmpeg-0.4.9_p20051120 (20 Nov 2005)
+
+  20 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ffmpeg-configure.patch, +ffmpeg-0.4.9_p20051120.ebuild:
+  New experimental snapshot
+
+  18 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  Add ~alpha keyword.
+
+  17 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  ~alpha temporary dropped
+
+  17 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  Dep fix for xvid, thanks to Staffan Palmroos <spalmroos@gmail.com>
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Mark 0.4.9_p20050226-r5 stable on alpha
+
+  15 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  ieee1394 issues, fixed the stable ebuild.
+
+  12 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ffmpeg-0.4.9_p20050906-osx.patch, ffmpeg-0.4.9_p20050906.ebuild:
+  Other fixes and dylib support
+
+  12 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  Fix ieee1394 issues
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  Comments cleanup for missing keywords. Don't install INSTALL file.
+
+  10 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  Fix Ogg support
+
+*ffmpeg-0.4.9_p20050906 (08 Sep 2005)
+
+  08 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ffmpeg-0.4.9_p20050906.ebuild:
+  New snapshot, src_test added.
+
+  26 Aug 2005; Seemant Kulleen <seemant@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  moved libdc1394 from media-plugins to media-libs
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  stable on ia64
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Add ~alpha keyword.
+
+  10 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Use memalign hack on FreeBSD.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Stable on ppc64
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Stable on sparc
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_pre1-r1.ebuild, ffmpeg-0.4.9_p20050226-r3.ebuild,
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Removed unused gcc inheriting. Inherited toolchain-funcs where needed.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild, ffmpeg-0.4.9_p20050226-r5.ebuild:
+  mark 0.4.9_p20050226-r3 stable on ia64.  add ~ia64 to 0.4.9_p20050226-r5
+
+  06 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Marked amd64.
+
+  06 May 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Marked ppc and x86
+
+  05 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.4.8-gcc3.4-magicF2W.patch:
+  Re-add missing patch.
+
+*ffmpeg-0.4.9_pre1-r1 (04 May 2005)
+
+  04 May 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/ffmpeg-osx.patch,
+  +ffmpeg-0.4.9_pre1-r1.ebuild:
+  Re-added the pre1 ebuild since there are extensive patches made against it
+  that do not yet work with upstream's CVS. We're working on the latter, but
+  I'm not going to hold up ffmpeg any longer.
+
+  02 May 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Forced -fomit-frame-pointer
+
+*ffmpeg-0.4.9_p20050226-r5 (26 Apr 2005)
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/ffmpeg-0.4.7-2.6.patch, -files/0.4.8-gcc3.4-magicF2W.patch,
+  -files/alpha-idct.patch, +files/ffmpeg-a52.patch,
+  -files/ffmpeg-configure-extralibs.patch,
+  +files/ffmpeg-missing_links.patch, -ffmpeg-0.4.7.ebuild,
+  -ffmpeg-0.4.8.20040222.ebuild, -ffmpeg-0.4.8.20040322.ebuild,
+  -ffmpeg-0.4.8.20040322-r1.ebuild, -ffmpeg-0.4.9_pre1.ebuild,
+  -ffmpeg-0.4.9_p20050226-r1.ebuild, -ffmpeg-0.4.9_p20050226.ebuild,
+  -ffmpeg-0.4.9_p20050226-r2.ebuild, ffmpeg-0.4.9_p20050226-r3.ebuild,
+  -ffmpeg-0.4.9_p20050226-r4.ebuild, +ffmpeg-0.4.9_p20050226-r5.ebuild:
+  Revbump to add missing links to needed libs in libavformat. Handle a52 and
+  faad properly. Removing old versions.
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/ffmpeg-0.4.9_p20050226-gcc4.patch, ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Fixup mafteah's patch the other way around, else it breaks avifile among
+  things.
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/ffmpeg-0.4.9_p20050226-gcc4.patch,
+  ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Fix building with gcc4. Patch from Genady Okrain (mafteah) 's overlay, with
+  some added hunks that was needed this side.
+
+  24 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ffmpeg-configure-extralibs.patch, ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Added patch to link to libdc1394 when ieee1394 is enabled. Fixes #90150.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Stable on hppa.
+
+  24 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Stable on alpha.
+
+  24 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Stable on ppc64
+
+  22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Fixed typo on pic/mmx if condition.
+
+*ffmpeg-0.4.9_p20050226-r4 (21 Apr 2005)
+
+  21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Added new revision which applies cleanups on bug #89172, and patch to enable
+  mmx on amd64 as for bug #88965.
+
+  19 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Marked ppc and x86
+
+  19 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Mark ffmpeg-0.4.9_p20050226-r3 stable on amd64.
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Changed xvid dependency to 1.0. Fixes #88879.
+
+*ffmpeg-0.4.9_p20050226-r3 (03 Apr 2005)
+
+  03 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +ffmpeg-0.4.9_p20050226-r3.ebuild:
+  revision bump to indicate the latest changes, fixes #87681
+
+  30 Mar 2005; Chris White <chriswhite@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r1.ebuild, ffmpeg-0.4.9_p20050226-r2.ebuild,
+  ffmpeg-0.4.9_p20050226.ebuild:
+  Fixed bug #87069.
+
+  21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r2.ebuild:
+  Use the right toolchain compiler.
+
+  20 Mar 2005; Chris White <chriswhite@gentoo.org>
+  files/gentoo-ffmpeg001.patch, ffmpeg-0.4.9_p20050226-r2.ebuild:
+  Fixed a52 linking (again).  Closes bugs #85929 and #85952.
+
+*ffmpeg-0.4.9_p20050226-r2 (19 Mar 2005)
+
+  19 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/ffmpeg-libdir-pic.patch, files/gentoo-ffmpeg001.patch,
+  +ffmpeg-0.4.9_p20050226-r2.ebuild:
+  Fix bug #84241 (multilib and pic).
+
+  16 Mar 2005; Chris White <chriswhite@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r1.ebuild:
+  Added missing emake.
+
+  11 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r1.ebuild:
+  Put back xvid support
+
+*ffmpeg-0.4.9_p20050226-r1 (10 Mar 2005)
+
+  10 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +ffmpeg-0.4.9_p20050226-r1.ebuild:
+  Fixed bug #67947. -fPIC logic makes sense now. Thanks to Kevin Quin for
+  supplying the logic.
+
+  07 Mar 2005; Chris White <chriswhite@gentoo.org>
+  ffmpeg-0.4.9_p20050226.ebuild:
+  Added threading support.
+
+  03 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226.ebuild:
+  Removed xvid useflag
+
+  01 Mar 2005; Chris White <chriswhite@gentoo.org>
+  ffmpeg-0.4.9_p20050226.ebuild:
+  Fix bad spelling.
+
+*ffmpeg-0.4.9_p20050226 (01 Mar 2005)
+
+  01 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/gentoo-ffmpeg001.patch, +ffmpeg-0.4.9_p20050226.ebuild:
+  Bumped to 20050226 snapshot release.
+
+  24 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ffmpeg-0.4.8.ebuild:
+  fixed #82873, emerge failed due to missing patch.
+
+  06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ffmpeg-0.4.7.ebuild,
+  ffmpeg-0.4.8.20040222.ebuild, ffmpeg-0.4.8.20040322-r1.ebuild,
+  ffmpeg-0.4.8.20040322.ebuild, ffmpeg-0.4.8.ebuild, ffmpeg-0.4.9_pre1.ebuild:
+  added dummy src_test() to fix #77212
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> ffmpeg-0.4.9_pre1.ebuild:
+  Stable on ppc64
+
+  14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ffmpeg-0.4.7.ebuild, ffmpeg-0.4.8.20040222.ebuild,
+  ffmpeg-0.4.8.20040322-r1.ebuild, ffmpeg-0.4.8.20040322.ebuild,
+  ffmpeg-0.4.8.ebuild, ffmpeg-0.4.9_pre1.ebuild:
+  Using 'aac' instead of faad and faac.
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> ffmpeg-0.4.9_pre1.ebuild:
+  Marked ~ppc64
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> ffmpeg-0.4.9_pre1.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+*ffmpeg-0.4.9_pre1 (21 Jul 2004)
+
+  21 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +ffmpeg-0.4.9_pre1.ebuild:
+  Version bump closes bug #56613.
+
+  25 Jun 2004; Daniel Goller <morfic@gentoo.org> ffmpeg-0.4.8.20040322-r1.ebuild:
+    ffmpeg-0.4.8.20040322-r1.ebuild adding patch for gcc 3.4.x 
+    closes 49383 Credit goes to Ed Catmur for the patch
+
+  24 Jun 2004; Martin Holzer <mholzer@gentoo.org>
+  ffmpeg-0.4.8.20040322-r1.ebuild, ffmpeg-0.4.8.20040322.ebuild:
+  removing symblink from ffplay to ffmpeg. closes 51014
+
+  09 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.8.20040322-r1.ebuild:
+  Same fix from amd64
+
+  09 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  ffmpeg-0.4.8.20040322-r1.ebuild:
+  only enable faac when we are not on ia64 or alpha in src_compile
+
+*ffmpeg-0.4.8.20040322-r1 (09 Jun 2004)
+
+  09 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  +ffmpeg-0.4.8.20040322-r1.ebuild:
+  -r1 adds faac support, added local USE flag
+  fixes bug #48090, thanks to Stefan Briesenick <sbriesen@gmx.de>
+
+  07 Jun 2004; Travis Tilley <lv@gentoo.org> ffmpeg-0.4.8.20040322.ebuild:
+  stable on amd64
+
+  05 Jun 2004; <tester@gentoo.org> ffmpeg-0.4.8.20040322.ebuild:
+  No longer available from SRC_URI, changed the keywords to -*.. oops
+  we have it on our mirrors... sorry..
+
+  30 Mar 2004; Sven Blumenstein <bazik@gentoo.org>
+  ffmpeg-0.4.8.20040322.ebuild:
+  Stable on sparc.
+
+  26 Mar 2004; Joel Martin <kanaka@gentoo.org> ffmpeg-0.4.8.20040222.ebuild,
+  ffmpeg-0.4.8.20040322.ebuild:
+  Filter out -momit-leaf-frame-pointer flag from libpostproc compilation
+
+*ffmpeg-0.4.8.20040322 (22 Mar 2004)
+
+  22 Mar 2004; Luca Barbato <lu_zero@gentoo.org> ffmpeg-0.4.8.20040322.ebuild:
+  New snapshot, works with ppc
+
+  15 Mar 2004; Luca Barbato <lu_zero@gentoo.org> ffmpeg-0.4.8.20040222.ebuild:
+  Marked -ppc pending a fix for misbuild.
+
+*ffmpeg-0.4.8.20040222 (11 Mar 2004)
+
+  11 Mar 2004; <kanaka@gentoo.org> ffmpeg-0.4.8.20040222.ebuild:
+  Install libpostproc library. Update to newer snapshot. Bug 27051
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> ffmpeg-0.4.8.ebuild:
+  stable on alpha and ia64
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> ffmpeg-0.4.8.ebuild:
+  set ppc in keywords
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> ffmpeg-0.4.8.ebuild:
+  amd64 needs -fPIC to compile properly
+
+  22 Nov 2003; Luca Barbato <lu_zero@gentoo.org> ffmpeg-0.4.8.ebuild:
+  altivec related fix, thanks to Olivier <ocastan@noos.fr> for the report
+  and the patch
+
+*ffmpeg-0.4.8 (18 Oct 2003)
+
+  18 Oct 2003; <iggy@gentoo.org> ffmpeg-0.4.8.ebuild:
+  version bump, fix a bug where it was trying to include X11/Xlib.h for no
+  apparent reason
+
+*ffmpeg-0.4.7 (09 Sep 2003)
+
+  09 Sep 2003; Martin Holzer <mholzer@gentoo.org> ffmpeg-0.4.7.ebuild:
+  Version bumped.
+
+  14 Jul 2003; Alastair Tse <liquidx@gentoo.org>
+  ffmpeg-0.4.7_pre20030624.ebuild:
+  depend on a non-masked version of imlib2
+
+  13 Jul 2003; Nick Hadaway <raker@gentoo.org> ffmpeg-0.4.7_pre20030624.ebuild:
+  Adding sdl, imlib, and truetype use flags.
+
+  06 Jul 2003; Nick Hadaway <raker@gentoo.org> ffmpeg-0.4.7_pre20030624.ebuild:
+  Marked stble for x86
+
+  02 Jul 2003; Nick Hadaway <raker@gentoo.org> ffmpeg-0.4.7_pre20030624.ebuild,
+  files/alpha-idct.patch:
+  Addresses bug #23563.  This problem was fixed upstream in cvs.
+  Added a small patch.  
+
+*ffmpeg-0.4.7_pre20030624 (26 Jun 2003)
+
+  26 Jun 2003; Nick Hadaway <raker@gentoo.org> ffmpeg-0.4.7_pre20030624.ebuild:
+  As of June 9th, 0.4.6 is considered obsolete by the upstream author.
+  This build pulled from a cvs snapshot now has support for the dvd
+  and static use variables.  Also added faad as a local use variable.
+
+*ffmpeg-0.4.6-r1 (4 Jan 2003)
+
+  10 Mar 2003; Will Woods <wwoods@gentoo.org> ffmpeg-0.4.6-r1.ebuild:
+  Added ~alpha to keywords and -fPIC to flags, fixes bug #16281
+
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> ffmpeg-0.4.6-r1.ebuild :
+  Marked as stable.
+ 
+  26 Jan 2003; Seemant Kulleen <seemant@gentoo.org> ffmpeg-0.4.6-r1.ebuild :
+
+  Added -fPIC to the filter-flags to sort out compiling issues such as
+  those reported in bug #14500 by atomicdog@akier.net (Conrad Akier)
+ 
+  4 Jan 2003; Joshua Brindle <method@gentoo.org> ffmpeg-0.4.6-r1.ebuild :
+  merge patches to ebuild and package from Rene Wagner <reenoo@gmx.de>
+  to install libavcodec as a .so. 
+
+*ffmpeg-0.4.6 (3 Jan 2003)
+  
+  3 Jan 2003; Joshua Brindle <method@gentoo.org> ffmpeg-0.4.6.ebuild :
+  version bump, this is a release non-snapshot version, recommend upgrade
+
+*ffmpeg-0.4.5.20021212 (13 Dec 2002)
+
+  5 Jan 2002; Joshua Brindle <method@gentoo.org ffmpeg-0.4.5.20021212.ebuild :
+  removed this ebuild from portage, it is old and was a cvs snapshot, 0.4.6 
+  contains everything this did and is a release version
+
+  14 Dec 2002; Joshua Brindle <method@gentoo.org> ffmpeg-0.4.5.20021212.ebuild :
+  Changing url to reflect where author moved his.
+  
+  13 Dec 2002; Bryon Roche <kain@gentoo.org> ffmpeg-0.4.5.20021212.ebuild :
+  ffmpeg isn't REALLY x86 specific.  Giving ppc and sparc a nice big ~.
+  
+  12 Dec 2002; Joshua Brindle <method@gentoo.org> ffmpeg-0.4.5.20021212.ebuild :
+  cvs snapshot so that streaming will work, also added mp3lame and oggvorbis
+  support with encode and oggvorbis use vars.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ffmpeg-0.4.5 (1 Feb 2002)
 
+  25 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> ffmpeg-0.4.5.ebuild :
+  Filter out "-fforce-addr".
+
+  05 Sep 2002; Seemant Kulleen <seemant@gentoo.org> ffmpeg-0.4.5.ebuild :
+
+  Added nasm to DEPEND. Thanks to: jfelice@cronosys.com (Jay 'Eraserhead'
+  Felice) in bug #7481.  Also tagged it x86 only due to this.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b1d9c9c600e7..fcf54e4e7fd7 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,11 +1,23 @@
-MD5 b8d4df63af0f0633787736a258c9dfd3 ChangeLog 2653
-MD5 2d75291c4685dc1a93c5e91901df57c0 ffmpeg-0.4.5.ebuild 693
-MD5 6c484228a17602440a3c7967e3eabd33 ffmpeg-0.4.6-r1.ebuild 1561
-MD5 f25e86f18c90204cd2da37a3c131b829 ffmpeg-0.4.6.ebuild 1526
-MD5 feb482b09e002972d3aad3523d05811e ffmpeg-0.4.6.20030304.ebuild 1970
-MD5 57e0978ef4a4ff1662572740a8d94ed7 files/digest-ffmpeg-0.4.5 64
-MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6 64
-MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6-r1 64
-MD5 30ba42e8d259ef5fe8c439670f685c1f files/ffmpeg-0.4.6-Makefiles.diff 3429
-MD5 33a085015b0495eeacfe3232499d9d6e files/ffmpeg-0.4.6.20030304-Makefiles.diff 3681
-MD5 706ff3758cc43215be55f96444770ef5 files/digest-ffmpeg-0.4.6.20030304 67
+MD5 6f28ac5a2c8ec783b009188bdc391ce6 ChangeLog 15551
+MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
+MD5 bb5094085c4fff51dc773d7735117475 ffmpeg-0.4.9_p20050226-r3.ebuild 4393
+MD5 ff615b7d4ca2c8355c1d0a358271e2d8 ffmpeg-0.4.9_p20050226-r5.ebuild 4543
+MD5 e4e188b8783b45bbc9c454b9f4de3aad ffmpeg-0.4.9_p20050906.ebuild 4781
+MD5 027d2d7a2a05fbc74905f8be014737fa ffmpeg-0.4.9_p20051120.ebuild 4684
+MD5 437df7598487b85a8678e49317d897b1 ffmpeg-0.4.9_pre1-r1.ebuild 4065
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
+MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
+MD5 39cf7a98d0f59cfde5b82ab7fedf19d0 files/digest-ffmpeg-0.4.9_p20050906 73
+MD5 e7fdab307678c48f460afd6a50358fd2 files/digest-ffmpeg-0.4.9_p20051120 76
+MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
+MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
+MD5 7ff9e08e701f8a8a860c09bd9259843f files/ffmpeg-0.4.9_p20050906-osx.patch 11103
+MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
+MD5 96c7f1f67e0299ad71b9c0fad55c3960 files/ffmpeg-configure.patch 585
+MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
+MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
+MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
+MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
index 16065039e7a3..7f8a568052b1 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
@@ -1,35 +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-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.1 2003/10/18 19:30:27 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.1.1.1 2005/11/30 09:57:55 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://ffmpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE="mmx encode oggvorbis doc faad dvd static sdl imlib truetype"
-
-inherit flag-o-matic
-filter-flags "-fforce-addr -fPIC"
-# fixes bug #16281
-use alpha && append-flags "-fPIC"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc alpha amd64 ia64 arm ~mips hppa"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
 
 DEPEND="encode? ( >=media-sound/lame-3.92 )
 	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
 	doc? ( >=app-text/texi2html-1.64 )
-	faad? ( >=media-libs/faad2-1.1 )
+	aac? ( >=media-libs/faad2-1.1 )
 	dvd? ( >=media-libs/a52dec-0.7.4 )
 	sdl? ( >=media-libs/libsdl-1.2.5 )
 	imlib? ( >=media-libs/imlib2-1.0.6 )
 	truetype? ( >=media-libs/freetype-2.1.2 )"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
@@ -37,20 +29,26 @@ src_unpack() {
 	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
 	cd ${S}
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
 }
 
 src_compile() {
+	filter-flags -fforce-addr -fPIC
+	# fixes bug #16281
+	use alpha && append-flags -fPIC
+	use amd64 && append-flags -fPIC
+	use hppa && append-flags -fPIC
+
 	local myconf
 	myconf="${myconf} --disable-opts --enable-pp"
 	use mmx || myconf="${myconf} --disable-mmx"
 	use encode && myconf="${myconf} --enable-mp3lame"
 	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use faad && myconf="${myconf} --enable-faad --enable-faadbin"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
 	use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
 	use static || myconf="${myconf} --enable-shared"
 	use sdl || myconf="${myconf} --disable-ffplay"
 	use debug || myconf="${myconf} --disable-debug"
+	use altivec || myconf="${myconf} --disable-altivec"
 
 	./configure ${myconf} \
 		--prefix=/usr || die "./configure failed."
@@ -59,7 +57,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make \
 		DESTDIR=${D} \
 		prefix=${D}/usr \
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
index bfd95bea81b5..fc8020d71db1 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.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-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild,v 1.1 2005/04/03 01:11:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:55 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
 HOMEPAGE="http://ffmpeg.sourceforge.net/"
@@ -16,19 +16,19 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l xvid"
 
-DEPEND="imlib? (media-libs/imlib2)
-		truetype? (>=media-libs/freetype-2)
-		sdl? (>=media-libs/libsdl-1.2.1)
-		doc? (app-text/texi2html)
-		encode? (media-sound/lame)
-		oggvorbis? (media-libs/libvorbis
-					media-libs/libogg)
-		!alpha? ( aac? (media-libs/faad2 media-libs/faac) )
-		dvd? (>=media-libs/a52dec-0.7.4-r4)
-		xvid? (media-libs/xvid)
+DEPEND="imlib? ( media-libs/imlib2 )
+		truetype? ( >=media-libs/freetype-2 )
+		sdl? ( >=media-libs/libsdl-1.2.1 )
+		doc? ( app-text/texi2html )
+		encode? ( media-sound/lame )
+		oggvorbis? ( media-libs/libvorbis
+					media-libs/libogg )
+		!alpha? ( aac? ( media-libs/faad2 media-libs/faac ) )
+		dvd? ( >=media-libs/a52dec-0.7.4-r4 )
+		xvid? ( >=media-libs/xvid-1.0 )
 		"
 
 src_unpack() {
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild
index 22ad799ba1c3..b56e7040bb64 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-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/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild,v 1.1 2005/04/26 01:21:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r5.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
 HOMEPAGE="http://ffmpeg.sourceforge.net/"
@@ -17,8 +17,8 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
 # ~alpha need to test aac useflag
-# ~ia64 ~arm ~mips ~hppa 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# ~ia64 ~arm ~mips ~hppa
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss threads truetype v4l xvid dts network zlib sdl"
 
 # Theora support has switch but there's no oggtheora.c sourcefile...
@@ -30,18 +30,21 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	encode? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	vorbis? ( media-libs/libvorbis )
-	aac? (media-libs/faad2 media-libs/faac)
+	aac? ( media-libs/faad2 media-libs/faac )
 	a52? ( >=media-libs/a52dec-0.7.4-r4 )
 	xvid? ( >=media-libs/xvid-1.0 )
 	zlib? ( sys-libs/zlib )
 	dts? ( media-libs/libdts )
-	ieee1394? ( media-plugins/libdc1394
+	ieee1394? ( =media-libs/libdc1394-1*
 	            sys-libs/libraw1394 )"
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S_BASE}
 
+	#Append -fomit-frame-pointer to avoid some common issues
+	use debug || append-flags "-fomit-frame-pointer"
+
 	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
 
@@ -80,6 +83,10 @@ src_compile() {
 		myconf="${myconf} --disable-mmx"
 	fi
 
+	if use elibc_FreeBSD; then
+		myconf="${myconf} --enable-memalign-hack"
+	fi
+
 	myconf="${myconf}
 		$(use_enable altivec) \
 		$(use_enable debug) \
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
index b05d6e5d655a..1c1ad9eb3c3e 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild,v 1.1 2005/09/08 14:27:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild,v 1.1.1.1 2005/11/30 09:57:55 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # ~alpha need to test aac useflag
 # ~ia64 ~arm ~mips ~hppa
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
 
 DEPEND="imlib? ( media-libs/imlib2 )
@@ -31,10 +31,10 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	theora? ( media-libs/libtheora )
 	aac? ( media-libs/faad2 media-libs/faac )
 	a52? ( >=media-libs/a52dec-0.7.4-r4 )
-	xvid? ( >=media-libs/xvid-1.0 )
+	xvid? ( >=media-libs/xvid-1.0.3 )
 	zlib? ( sys-libs/zlib )
 	dts? ( media-libs/libdts )
-	ieee1394? ( media-libs/libdc1394
+	ieee1394? ( =media-libs/libdc1394-1*
 	            sys-libs/libraw1394 )
 	test? ( net-misc/wget )"
 
@@ -49,7 +49,7 @@ src_unpack() {
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
 
 	# Fix building with gcc4
-	# epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-osx.patch
 
 	#ffmpeg doesn'g use libtool, so the condition for PIC code
 	#is __PIC__, not PIC.
@@ -98,7 +98,7 @@ src_compile() {
 		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
 		$(use_enable threads pthreads) \
 		$(use_enable xvid) \
-		$(use_enable ogg) \
+		$(use_enable ogg libogg) \
 		$(use_enable vorbis) \
 		$(use_enable theora) \
 		$(use_enable dts) \
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
index bdd32f215368..788c3f780841 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild,v 1.1 2005/11/20 18:18:39 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20051120.ebuild,v 1.1.1.1 2005/11/30 09:57:55 chriswhite Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -19,7 +19,7 @@ SLOT="0"
 # ~alpha need to test aac useflag
 # ~ia64 ~arm ~mips ~hppa
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-KEYWORDS="-*"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
 
 DEPEND="imlib? ( media-libs/imlib2 )
@@ -59,7 +59,7 @@ src_unpack() {
 		libavutil/common.h \
 		|| die "sed failed (__PIC__)"
 
-	# To make sure the ffserver test will work 
+	# To make sure the ffserver test will work
 	sed -i -e "s:-e debug=off::" tests/server-regression.sh
 	cd ${S}
 	cp -R ${S_BASE} ${S_STATIC}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild
index fbf378c888ec..c4761c9e5a9d 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_pre1-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-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild,v 1.1 2005/05/04 01:13:37 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic toolchain-funcs
 
 # TODO: --enablea52bin breaks compile
 
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch
index 48a2640f95a4..bdc80c371f01 100644
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch
+++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20050226-gcc4.patch
@@ -1,86 +1,3 @@
---- ffmpeg-0.4.9-p20050226.orig/libavcodec/avcodec.h
-+++ ffmpeg-0.4.9-p20050226/libavcodec/avcodec.h
-@@ -1784,37 +1784,7 @@
- /**
-  * AVOption.
-  */
--typedef struct AVOption {
--    /** options' name */
--    const char *name; /* if name is NULL, it indicates a link to next */
--    /** short English text help or const struct AVOption* subpointer */
--    const char *help; //   const struct AVOption* sub;
--    /** offset to context structure where the parsed value should be stored */
--    int offset;
--    /** options' type */
--    int type;
--#define FF_OPT_TYPE_BOOL 1      ///< boolean - true,1,on  (or simply presence)
--#define FF_OPT_TYPE_DOUBLE 2    ///< double
--#define FF_OPT_TYPE_INT 3       ///< integer
--#define FF_OPT_TYPE_STRING 4    ///< string (finished with \0)
--#define FF_OPT_TYPE_MASK 0x1f   ///< mask for types - upper bits are various flags
--//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
--#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
--#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
--    /** min value  (min == max   ->  no limits) */
--    double min;
--    /** maximum value for double/int */
--    double max;
--    /** default boo [0,1]l/double/int value */
--    double defval;
--    /**
--     * default string value (with optional semicolon delimited extra option-list
--     * i.e.   option1;option2;option3
--     * defval might select other then first argument as default
--     */
--    const char *defstr;
--#define FF_OPT_MAX_DEPTH 10
--} AVOption;
-+typedef struct AVOption AVOption;
- 
- /**
-  * Parse option(s) and sets fields in passed structure
---- ffmpeg-0.4.9-p20050226.orig/libavcodec/common.h
-+++ ffmpeg-0.4.9-p20050226/libavcodec/common.h
-@@ -54,7 +54,38 @@
- #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
- #define AVOPTION_END() AVOPTION_SUB(NULL)
- 
--struct AVOption;
-+struct AVOption {
-+    /** options' name */
-+    const char *name; /* if name is NULL, it indicates a link to next */
-+    /** short English text help or const struct AVOption* subpointer */
-+    const char *help; //   const struct AVOption* sub;
-+    /** offset to context structure where the parsed value should be stored */
-+    int offset;
-+    /** options' type */
-+    int type;
-+#define FF_OPT_TYPE_BOOL 1      ///< boolean - true,1,on  (or simply presence)
-+#define FF_OPT_TYPE_DOUBLE 2    ///< double
-+#define FF_OPT_TYPE_INT 3       ///< integer
-+#define FF_OPT_TYPE_STRING 4    ///< string (finished with \0)
-+#define FF_OPT_TYPE_MASK 0x1f   ///< mask for types - upper bits are various flags
-+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
-+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
-+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-+    /** min value  (min == max   ->  no limits) */
-+    double min;
-+    /** maximum value for double/int */
-+    double max;
-+    /** default boo [0,1]l/double/int value */
-+    double defval;
-+    /**
-+     * default string value (with optional semicolon delimited extra option-list
-+     * i.e.   option1;option2;option3
-+     * defval might select other then first argument as default
-+     */
-+    const char *defstr;
-+#define FF_OPT_MAX_DEPTH 10
-+};
-+
- #ifdef HAVE_MMX
- extern const struct AVOption avoptions_common[3 + 5];
- #else 
 --- ffmpeg-0.4.9-p20050226/libavcodec/libpostproc/postprocess_template.c	2005-04-25 13:48:06.000000000 +0000
 +++ ffmpeg-0.4.9-p20050226.az/libavcodec/libpostproc/postprocess_template.c	2005-04-25 13:53:55.000000000 +0000
 @@ -611,6 +611,7 @@
@@ -117,3 +34,36 @@
  		);
  	}else
  		src+= step; // src points to begin of the 8x8 Block
+--- ffmpeg-0.4.9-p20050226/libavcodec/avcodec.h	2005-04-25 21:20:47.000000000 +0000
++++ ffmpeg-0.4.9-p20050226.az/libavcodec/avcodec.h	2005-04-25 21:21:39.000000000 +0000
+@@ -1816,6 +1816,13 @@
+ #define FF_OPT_MAX_DEPTH 10
+ } AVOption;
+ 
++#ifdef HAVE_MMX
++extern const struct AVOption avoptions_common[3 + 5];
++#else
++extern const struct AVOption avoptions_common[3];
++#endif
++extern const struct AVOption avoptions_workaround_bug[11];
++
+ /**
+  * Parse option(s) and sets fields in passed structure
+  * @param strct	structure where the parsed results will be written
+--- ffmpeg-0.4.9-p20050226/libavcodec/common.h	2005-04-25 21:20:54.000000000 +0000
++++ ffmpeg-0.4.9-p20050226.az/libavcodec/common.h	2005-04-25 21:21:16.000000000 +0000
+@@ -54,14 +54,6 @@
+ #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
+ #define AVOPTION_END() AVOPTION_SUB(NULL)
+ 
+-struct AVOption;
+-#ifdef HAVE_MMX
+-extern const struct AVOption avoptions_common[3 + 5];
+-#else
+-extern const struct AVOption avoptions_common[3];
+-#endif
+-extern const struct AVOption avoptions_workaround_bug[11];
+-
+ #endif /* HAVE_AV_CONFIG_H */
+ 
+ /* Suppress restrict if it was not defined in config.h.  */
diff --git a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
index 0cf09dd5470b..30cd0edd31a7 100644
--- a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
+++ b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
@@ -1,14 +1,3 @@
---- libavcodec/Makefile.old	2005-02-28 10:26:08.306815960 +0900
-+++ libavcodec/Makefile	2005-02-28 10:26:42.517615128 +0900
-@@ -75,6 +75,8 @@
- ifneq ($(CONFIG_A52BIN),yes)
- OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
- 	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
-+else
-+EXTRALIBS += -la52
- endif
- endif
- 
 --- libavcodec/a52dec.c.old	2005-02-28 10:23:54.002233360 +0900
 +++ libavcodec/a52dec.c	2005-02-28 10:35:36.910375080 +0900
 @@ -73,7 +73,7 @@
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index 7b5e0460d863..73857a54931f 100644
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,8 +1,34 @@
 # ChangeLog for media-video/ffmpeg2theora
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.1 2005/02/08 16:52:25 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
+
+*ffmpeg2theora-0.15 (17 Oct 2005)
+
+  17 Oct 2005; Hanno Boeck <hanno@gentoo.org> +ffmpeg2theora-0.15.ebuild:
+  Version bump.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ffmpeg2theora-0.12.ebuild, ffmpeg2theora-0.13.ebuild:
+  Don't install INSTALL file.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> ffmpeg2theora-0.13.ebuild:
+  Added to ~ppc.
+
+  23 Jun 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  ffmpeg2theora-0.12.ebuild, ffmpeg2theora-0.13.ebuild:
+  forced re-keywording due to libtheora encode issue
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  ffmpeg2theora-0.12.ebuild:
+  stable on x86
+
+*ffmpeg2theora-0.13 (16 Apr 2005)
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> ffmpeg2theora-0.12.ebuild,
+  +ffmpeg2theora-0.13.ebuild:
+  new upstream release, fixes #89237. added ~amd64 to KEYWORDS.
 
 *ffmpeg2theora-0.12 (08 Feb 2005)
 
-	08 Feb 2005;  Kai Zimmermann <kzimmerm@gentoo.org> :
-	Initial import into the tree.  Closes bug #66458.
+  08 Feb 2005;  Kai Zimmermann <kzimmerm@gentoo.org> :
+  Initial import into the tree.  Closes bug #66458.
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index 37dabfa68abb..f7fff43b2c8b 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,2 +1,18 @@
-MD5 3cc64a1c659e170b218515b6238c0217 ffmpeg2theora-0.12.ebuild 605
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6e22915b9a2da0acf097cb867bfe0e3b ChangeLog 1193
+MD5 e7d81912ff4607d269aa631cb0d6de62 ffmpeg2theora-0.12.ebuild 744
+MD5 8d3db4e56b0208360c424d80e915fe53 ffmpeg2theora-0.13.ebuild 756
+MD5 05abb8fa6ab265379a09c82b6581f203 ffmpeg2theora-0.15.ebuild 978
 MD5 0d6f7ece558f9b1b206da912327edabd files/digest-ffmpeg2theora-0.12 71
+MD5 a7f89b818311037ceabf640863dc07c2 files/digest-ffmpeg2theora-0.13 71
+MD5 2b03309b2b92e1372d1c1e82dcee9904 files/digest-ffmpeg2theora-0.15 71
+MD5 a741469ea595fb76ba3553cb2f3f9b9a metadata.xml 222
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVA6dr2QksT29OyARAmdPAKCGASd9eQMWhNitFQGB5fMO6TLSCgCgopXV
+2aWPsS35fKX2DjIpq9iGL2c=
+=sKdn
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.12.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.12.ebuild
index 96504508fe49..3b9ac5619953 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.12.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-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-video/ffmpeg2theora/ffmpeg2theora-0.12.ebuild,v 1.1 2005/02/08 16:52:25 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.12.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 DESCRIPTION="A simple converter to create Ogg Theora files."
 HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
@@ -14,12 +14,11 @@ IUSE=""
 RDEPEND=">=media-video/ffmpeg-0.4.9_pre1
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.0_alpha4"
-
+	>=media-libs/libtheora-1.0_alpha4-r1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_install() {
-	make DESTDIR=${D} install
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.13.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.13.ebuild
index 994a4a49014b..1f1301374bd7 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.13.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-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-video/ffmpeg2theora/ffmpeg2theora-0.13.ebuild,v 1.1 2005/04/16 11:58:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.13.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 DESCRIPTION="A simple converter to create Ogg Theora files."
 HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
@@ -8,17 +8,17 @@ SRC_URI="http://www.v2v.cc/~j/ffmpeg2theora/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=media-video/ffmpeg-0.4.9_pre1
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.0_alpha4"
+	>=media-libs/libtheora-1.0_alpha4-r1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.15.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.15.ebuild
index 257e862b65de..8220d3e6cf94 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.15.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-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-video/ffmpeg2theora/ffmpeg2theora-0.15.ebuild,v 1.1 2005/10/17 20:49:20 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.15.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/flumotion/ChangeLog b/media-video/flumotion/ChangeLog
index 485c05c292b7..badc22f6804e 100644
--- a/media-video/flumotion/ChangeLog
+++ b/media-video/flumotion/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-video/flumotion
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.1 2005/03/25 00:25:19 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
+
+  14 Sep 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  flumotion-0.1.6.ebuild, flumotion-0.1.7.ebuild, flumotion-0.1.8.ebuild:
+  dont use bin/false as login shell
+
+*flumotion-0.1.8 (20 May 2005)
+
+  20 May 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/flumotion-init-0.1.8, +flumotion-0.1.8.ebuild:
+  New version
+
+  10 May 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  flumotion-0.1.6.ebuild:
+  remove cruft
+
+  07 Apr 2005; <zaheerm@gentoo.org> :
+  Version bump
+
+  26 Mar 2005; <zaheerm@gentoo.org> files/flumotion-init:
+  fixed typo
 
 *flumotion-0.1.6 (25 Mar 2005)
 
diff --git a/media-video/flumotion/Manifest b/media-video/flumotion/Manifest
index 6c7cbae9a29f..97236afcfe67 100644
--- a/media-video/flumotion/Manifest
+++ b/media-video/flumotion/Manifest
@@ -1,4 +1,10 @@
-MD5 ff802654be3e1581fa5775dfdbac6db2 flumotion-0.1.6.ebuild 2245
+MD5 9f9ba2943ab70fc6a8564b115b8845ba flumotion-0.1.6.ebuild 2269
+MD5 b6375873c3757deb48a289969d70affb flumotion-0.1.8.ebuild 2694
+MD5 1a370621f7436c11ef14f53bd35c6229 flumotion-0.1.7.ebuild 2269
+MD5 2d8833fdc163815b4b43f43c2729e503 ChangeLog 946
 MD5 6050196ef420c3e4025029ebee5a813f metadata.xml 162
-MD5 8e6e2463c4524b7786f678ca197fd7af files/flumotion-init 1021
+MD5 64fe71faf82cc8e8ab2fd47c3dedb02b files/flumotion-init-0.1.8 952
+MD5 580aa0b30c3ddad180dcf614364f9dbb files/flumotion-init 1019
 MD5 f421d5bbf35e1bda4cde73c86517fbd3 files/digest-flumotion-0.1.6 68
+MD5 423fb37f9e1c267e6d5836e73b651d73 files/digest-flumotion-0.1.7 68
+MD5 5ca0386f44527ee15b57cc2883c95815 files/digest-flumotion-0.1.8 68
diff --git a/media-video/flumotion/files/flumotion-init b/media-video/flumotion/files/flumotion-init
index 7f144e7e4ccd..7626c9852e8c 100755
--- a/media-video/flumotion/files/flumotion-init
+++ b/media-video/flumotion/files/flumotion-init
@@ -3,7 +3,7 @@
 flumotion_manager=/usr/bin/flumotion-manager
 flumotion_worker=/usr/bin/flumotion-worker
 flumotion_manager_pidfile=/var/run/flumotion/manager.default.pid
-flumotion_worker_pidfile=/var/run/flumotion/worker.localhost.pid
+flumotion_worker_pidfile=/var/run/flumotion/worker.default.pid
 
 depend() {
     need net
diff --git a/media-video/flumotion/flumotion-0.1.6.ebuild b/media-video/flumotion/flumotion-0.1.6.ebuild
index bc71f5c69a0a..22044579e20f 100644
--- a/media-video/flumotion/flumotion-0.1.6.ebuild
+++ b/media-video/flumotion/flumotion-0.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-video/flumotion/flumotion-0.1.6.ebuild,v 1.1 2005/03/25 00:25:19 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.6.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit eutils
 
@@ -74,13 +74,8 @@ src_install() {
 	keepdir /var/log/flumotion
 }
 
-# borrowed from jboss ebuild
-without_error() {
-	$@ &>/dev/null || true
-}
-
 pkg_postinst() {
-	if ! enewgroup flumotion || ! enewuser flumotion -1 /bin/false /usr/share/flumotion flumotion,audio,video,sys; then
+	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
 		die "Unable to add flumotion user and flumotion group."
 	fi
 
diff --git a/media-video/flumotion/flumotion-0.1.7.ebuild b/media-video/flumotion/flumotion-0.1.7.ebuild
index 63cd30f317b1..04b7b6f9f69f 100644
--- a/media-video/flumotion/flumotion-0.1.7.ebuild
+++ b/media-video/flumotion/flumotion-0.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-video/flumotion/flumotion-0.1.7.ebuild,v 1.1 2005/04/07 12:23:20 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit eutils
 
@@ -75,7 +75,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! enewgroup flumotion || ! enewuser flumotion -1 /bin/false /usr/share/flumotion flumotion,audio,video,sys; then
+	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
 		die "Unable to add flumotion user and flumotion group."
 	fi
 
diff --git a/media-video/flumotion/flumotion-0.1.8.ebuild b/media-video/flumotion/flumotion-0.1.8.ebuild
index f46a2ffc469e..634cf4e26fe3 100644
--- a/media-video/flumotion/flumotion-0.1.8.ebuild
+++ b/media-video/flumotion/flumotion-0.1.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-video/flumotion/flumotion-0.1.8.ebuild,v 1.1 2005/05/20 14:03:54 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.1.8.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit eutils
 
@@ -85,7 +85,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! enewgroup flumotion || ! enewuser flumotion -1 /bin/false /usr/share/flumotion flumotion,audio,video,sys; then
+	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
 		die "Unable to add flumotion user and flumotion group."
 	fi
 
diff --git a/media-video/frameworks/ChangeLog b/media-video/frameworks/ChangeLog
index 1b895e8c66a6..31a104702361 100644
--- a/media-video/frameworks/ChangeLog
+++ b/media-video/frameworks/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/frameworks
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/ChangeLog,v 1.1 2005/03/28 03:23:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/ChangeLog,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> frameworks-0.3.4.ebuild:
+  Added to ~ppc.
 
 *frameworks-0.3.4 (28 Mar 2005)
 
diff --git a/media-video/frameworks/Manifest b/media-video/frameworks/Manifest
index d48b74bbbf4e..336924c357d4 100644
--- a/media-video/frameworks/Manifest
+++ b/media-video/frameworks/Manifest
@@ -1,2 +1,4 @@
-MD5 1e396f0dcdf423d0db6049b116ab7448 frameworks-0.3.4.ebuild 537
+MD5 80fa6dedc22ed8220a5f9ba288e32be7 ChangeLog 531
+MD5 29a178dedf096de4153c020650817091 frameworks-0.3.4.ebuild 657
+MD5 90ab9fc3643aa1588bc59744d1968035 metadata.xml 374
 MD5 68b3cd3bd0383ae097a9225a85b997c7 files/digest-frameworks-0.3.4 68
diff --git a/media-video/frameworks/frameworks-0.3.4.ebuild b/media-video/frameworks/frameworks-0.3.4.ebuild
index 304da5d91ef5..8e047112929f 100644
--- a/media-video/frameworks/frameworks-0.3.4.ebuild
+++ b/media-video/frameworks/frameworks-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/frameworks-0.3.4.ebuild,v 1.1 2005/03/28 03:23:40 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/frameworks/frameworks-0.3.4.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 DESCRIPTION="A small v4l frame capture utility especially suited for stop motion animation."
 SRC_URI="http://www.polycrystal.org/software/frameworks/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.polycrystal.org/software/frameworks.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND=">=gnome-base/libglade-2
diff --git a/media-video/freej/ChangeLog b/media-video/freej/ChangeLog
index a9562936387e..dcf4449a02fe 100644
--- a/media-video/freej/ChangeLog
+++ b/media-video/freej/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/freej
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/freej/ChangeLog,v 1.1 2004/11/20 02:03:17 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+*freej-0.8.1 (13 Nov 2005)
+
+  13 Nov 2005; Luca Barbato <lu_zero@gentoo.org> freej-0.7.ebuild,
+  +freej-0.8.1.ebuild:
+  New version -* pending major patching, avifile removal
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> freej-0.7.ebuild:
+  Added to ~ppc.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Fixed herd in metadata.xml.
 
 *freej-0.7 (20 Nov 2004)
 
diff --git a/media-video/freej/Manifest b/media-video/freej/Manifest
index ebeb3ee05840..1474d6581eb0 100644
--- a/media-video/freej/Manifest
+++ b/media-video/freej/Manifest
@@ -1,5 +1,9 @@
-MD5 896aaf0d18a218e9e19cafa92d2394be freej-0.7.ebuild 1334
+MD5 714be6fb9b5f9734c210c45fd7add637 ChangeLog 1079
 MD5 e5641ba29fa7159b9329480d820c1a9a files/digest-freej-0.7 61
+MD5 1964ff7c2ef5f5e26820c67fe0ba0356 files/digest-freej-0.8.1 64
 MD5 0060b7f722bb0974847d296ef8403ebd files/freej-0.7-errno.patch 741
 MD5 e6a0544f5627d624dcc6d314be575360 files/freej-0.7-fastmemcpy.patch 2554
 MD5 fbc899d7160ab39e47de15461a90b452 files/freej-0.7-v4l.patch 256
+MD5 165089178a718ec628cfd61fdf09b8ea freej-0.7.ebuild 1368
+MD5 91014b04b1375ca247c0c9027c5597c5 freej-0.8.1.ebuild 1276
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
diff --git a/media-video/freej/freej-0.7.ebuild b/media-video/freej/freej-0.7.ebuild
index aa9032884b21..623171c5ab36 100644
--- a/media-video/freej/freej-0.7.ebuild
+++ b/media-video/freej/freej-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-video/freej/freej-0.7.ebuild,v 1.1 2004/11/20 02:03:17 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/freej-0.7.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 inherit eutils
 
@@ -10,14 +10,13 @@ SRC_URI="ftp://freej.dyne.org/freej/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="avi v4l debug"
+KEYWORDS="~ppc ~x86"
+IUSE="v4l debug"
 
 DEPEND=">=media-libs/libsdl-1.2.0
 	>=media-libs/libpng-1.2.0
 	>=media-libs/freetype-2
-	!avi? ( media-video/ffmpeg )
-	avi? ( >=media-video/avifile-0.7.16 )"
+	media-video/ffmpeg"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-video/freej/freej-0.8.1.ebuild b/media-video/freej/freej-0.8.1.ebuild
index d6802d06c3d8..d48c7090ff5a 100644
--- a/media-video/freej/freej-0.8.1.ebuild
+++ b/media-video/freej/freej-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/media-video/freej/freej-0.8.1.ebuild,v 1.1 2005/11/13 18:08:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/freej/freej-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/freej/metadata.xml b/media-video/freej/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/freej/metadata.xml
+++ b/media-video/freej/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/gephex/ChangeLog b/media-video/gephex/ChangeLog
index 96c82d700d90..d701ef748c4f 100644
--- a/media-video/gephex/ChangeLog
+++ b/media-video/gephex/ChangeLog
@@ -1,8 +1,43 @@
 # ChangeLog for media-video/gephex
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/ChangeLog,v 1.1 2004/03/02 15:14:06 zypher Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/ChangeLog,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
-*gephex-0.0.4 (14 Dez 2003)
+  19 Nov 2005; Luca Barbato <lu_zero@gentoo.org> gephex-0.4.3.ebuild:
+  Avifile removed
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> gephex-0.0.4.ebuild,
+  gephex-0.0.4-r1.ebuild, gephex-0.4.ebuild, gephex-0.4.1.ebuild,
+  gephex-0.4.3.ebuild:
+  Fix qt dep
+
+*gephex-0.4.3 (04 un 2005)
+
+  11 Jun 2005; Marc Hildebrand <zypher@gentoo.org>; gephex-0.4.1.ebuild :
+  Version bump, closes bug #95256 Thanks to Bruno Roggeri for the ebuild.
+
+*gephex-0.4.1 (29 Oct 2004)
+
+  05 Nov 2004; Marc Hildebrand <zypher@gentoo.org>; gephex-0.4.1.ebuild :
+  Version bump.
+
+  30 Sep 2004; Chris White <chriswhite@gentoo.org> :
+  Fixed +x permissions on ebuild.
+
+*gephex-0.4 (06 Jun 2004)
+
+  09 Jul 2004; Marc Hildebrand <zypher@gentoo.org>; gephex-0.4.ebuild :
+  Version bump.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gephex-0.0.4-r1.ebuild,
+  gephex-0.0.4.ebuild:
+  Add inherit eutils
+
+*gephex-0.0.4-r1 (19 Apr 2004)
+
+*gephex-0.0.4 (14 Dec 2003)
+
+  19 Apr 2004; Marc Hildebrand <zypher@gentoo.org>; gephex-0.0.4-r1.ebuild :
+  Added disable-glx patch.
 
   02 Mar 2004; Marc Hildebrand <zypher@gentoo.org>; gephex-0.0.4.ebuild :
   Initial ebuild.
diff --git a/media-video/gephex/Manifest b/media-video/gephex/Manifest
index a3a40d3a7828..193c0bf31543 100644
--- a/media-video/gephex/Manifest
+++ b/media-video/gephex/Manifest
@@ -1,4 +1,15 @@
-MD5 1bbc08e87e7c533987d3f0e86067152e gephex-0.0.4.ebuild 1093
-MD5 8ce45a490b11be332445c5166c2be858 files/digest-gephex-0.0.4 65
-MD5 d0c894eccb6239538b954cb1d6680c5d files/0.0.4-makefile.in.patch 873
+MD5 06571375ad1436ea217766dd677df074 ChangeLog 1349
 MD5 0e6024af9a9dd49daca8977ba601c8f5 files/0.0.4-alsa-api-fix.patch 832
+MD5 060f2d352bb4bee71e647beb2b8135a1 files/0.0.4-disable-glx.patch 159
+MD5 d0c894eccb6239538b954cb1d6680c5d files/0.0.4-makefile.in.patch 873
+MD5 8ce45a490b11be332445c5166c2be858 files/digest-gephex-0.0.4 65
+MD5 8ce45a490b11be332445c5166c2be858 files/digest-gephex-0.0.4-r1 65
+MD5 4fe4a3b7c2fad145df1bbedc08e914db files/digest-gephex-0.4 64
+MD5 1eefed026f973fc48b260ef40cecad56 files/digest-gephex-0.4.1 66
+MD5 fc047dc0d3d92510ae3f30e10856ad7c files/digest-gephex-0.4.3 67
+MD5 7b2c352a0aa2c49ca2fedcb9d115e820 gephex-0.0.4-r1.ebuild 1229
+MD5 37497dabdc62d2b97419fc35be78e7eb gephex-0.0.4.ebuild 1156
+MD5 66d151fbbacf8120d08b01ab0cf85e58 gephex-0.4.1.ebuild 1157
+MD5 a4aacd09dc573205a50c4913d4e7cd44 gephex-0.4.3.ebuild 1503
+MD5 7681df3ee8d2ff201b5379c7992d6b3b gephex-0.4.ebuild 1044
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
diff --git a/media-video/gephex/gephex-0.0.4-r1.ebuild b/media-video/gephex/gephex-0.0.4-r1.ebuild
index 0324ecb8e223..bd10ad184113 100644
--- a/media-video/gephex/gephex-0.0.4-r1.ebuild
+++ b/media-video/gephex/gephex-0.0.4-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-video/gephex/gephex-0.0.4-r1.ebuild,v 1.1 2004/04/19 18:03:59 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
+
+inherit eutils
 
 MY_P=${P/_/}
 DESCRIPTION="GePhex is a modular video effect framework."
@@ -16,7 +18,7 @@ KEYWORDS="x86"
 S="${WORKDIR}/${MY_P}"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
+	=x11-libs/qt-3*
 	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/libpng-1.2.5-r4
 	>=media-libs/sdl-ttf-2.0.6
diff --git a/media-video/gephex/gephex-0.0.4.ebuild b/media-video/gephex/gephex-0.0.4.ebuild
index cb70e063081b..de2e972504da 100644
--- a/media-video/gephex/gephex-0.0.4.ebuild
+++ b/media-video/gephex/gephex-0.0.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.0.4.ebuild,v 1.1 2004/03/02 15:14:06 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
+
+inherit eutils
 
 MY_P=${P/_/}
 DESCRIPTION="GePhex is a modular video effect framework."
@@ -15,7 +17,7 @@ KEYWORDS="~x86"
 S="${WORKDIR}/${MY_P}"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
+	=x11-libs/qt-3*
 	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/libpng-1.2.5-r4
 	>=media-libs/sdl-ttf-2.0.6
@@ -23,8 +25,6 @@ DEPEND="virtual/x11
 	>=media-video/avifile-0.7.38.20030710
 	aalib?	( >=media-libs/aalib-1.4_rc4-r2 )"
 
-RDEPEND=${DEPEND}
-
 src_compile() {
 	cd ${S}
 	epatch ${FILESDIR}/0.0.4-alsa-api-fix.patch || die
diff --git a/media-video/gephex/gephex-0.4.1.ebuild b/media-video/gephex/gephex-0.4.1.ebuild
index 4c9a6d4c7ce3..938de678f646 100644
--- a/media-video/gephex/gephex-0.4.1.ebuild
+++ b/media-video/gephex/gephex-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.1.ebuild,v 1.1 2004/11/05 08:24:06 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 DESCRIPTION="GePhex is a modular video effect framework."
 HOMEPAGE="http://www.gephex.org"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
+	=x11-libs/qt-3*
 	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/sdl-image-1.2.3
 	>=media-libs/libpng-1.2.5-r4
diff --git a/media-video/gephex/gephex-0.4.3.ebuild b/media-video/gephex/gephex-0.4.3.ebuild
index 8be944d4bbd9..d077178789ac 100644
--- a/media-video/gephex/gephex-0.4.3.ebuild
+++ b/media-video/gephex/gephex-0.4.3.ebuild
@@ -1,27 +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-video/gephex/gephex-0.4.3.ebuild,v 1.1 2005/06/12 08:36:04 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.3.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 DESCRIPTION="GePhex is a modular video effect framework."
 HOMEPAGE="http://www.gephex.org"
 MY_P=${P}b
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-IUSE="aalib alsa avi ffmpeg joystick mmx mpeg opengl oss png sdl static v4l"
+IUSE="aalib alsa ffmpeg joystick mmx mpeg opengl oss png sdl static v4l"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~x86"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
-	sdl? (>=media-libs/libsdl-1.2.6-r3)
-	sdl? (>=media-libs/sdl-image-1.2.3)
-	png? (>=media-libs/libpng-1.2.5-r4)
-	sdl? (>=media-libs/sdl-ttf-2.0.6)
-	alsa? (>=media-libs/alsa-lib-0.9.8)
-	avi? (>=media-video/avifile-0.7.38.20030710)
+	=x11-libs/qt-3*
+	sdl? ( >=media-libs/libsdl-1.2.6-r3 )
+	sdl? ( >=media-libs/sdl-image-1.2.3 )
+	png? ( >=media-libs/libpng-1.2.5-r4 )
+	sdl? ( >=media-libs/sdl-ttf-2.0.6 )
+	alsa? ( >=media-libs/alsa-lib-0.9.8 )
 	aalib?	( >=media-libs/aalib-1.4_rc4-r2 )
-	opengl? (virtual/opengl)"
+	opengl? ( virtual/opengl )"
 
 RDEPEND=${DEPEND}
 
@@ -36,17 +35,16 @@ src_compile() {
 	econf \
 	`use_enable mmx` \
 	`use_enable static` \
-	`use_with aalib AALIB`\
-	`use_with ffmpeg FFMPEG`\
-	`use_with alsa ASOUNDLIB`\
-	`use_with oss OSS`\
-	`use_with v4l V4L`\
-	`use_with joystick LINUX_JOYSTICK`\
-	`use_with opengl GL`\
+	`use_with aalib AALIB` \
+	`use_with ffmpeg FFMPEG` \
+	`use_with alsa ASOUNDLIB` \
+	`use_with oss OSS` \
+	`use_with v4l V4L` \
+	`use_with joystick LINUX_JOYSTICK` \
+	`use_with opengl GL` \
 	`use_with sdl SDL` \
 	`use_with png LIBPNG` \
 	`use_with mpeg MPEG3` \
-	`use_with avi AVIFILE` \
 	${myconf} \
 	|| die
 	emake || die
diff --git a/media-video/gephex/gephex-0.4.ebuild b/media-video/gephex/gephex-0.4.ebuild
index 80579a746191..73eaa40b9641 100644
--- a/media-video/gephex/gephex-0.4.ebuild
+++ b/media-video/gephex/gephex-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.ebuild,v 1.1 2004/07/09 11:16:41 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gephex/gephex-0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 DESCRIPTION="GePhex is a modular video effect framework."
 HOMEPAGE="http://www.gephex.org"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="virtual/x11
-	>=x11-libs/qt-3
+	=x11-libs/qt-3*
 	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/sdl-image-1.2.3
 	>=media-libs/libpng-1.2.5-r4
diff --git a/media-video/goggles/ChangeLog b/media-video/goggles/ChangeLog
index bb02757e5e1f..8faf4e13d64a 100644
--- a/media-video/goggles/ChangeLog
+++ b/media-video/goggles/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for media-video/goggles
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/ChangeLog,v 1.1 2004/08/26 05:14:59 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/ChangeLog,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  goggles-0.7.4-r1.ebuild, goggles-0.7.10.ebuild, goggles-0.8.0-r1.ebuild:
+  Moved using toolchain-funcs eclass.
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -goggles-0.7.4.ebuild,
+  goggles-0.7.4-r1.ebuild:
+  stable on amd64 and x86
+
+*goggles-0.8.0-r1 (04 Apr 2005)
+
+  04 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +goggles-0.8.0-r1.ebuild,
+  -goggles-0.8.0.ebuild:
+  modified startscript, fixes #87618
+
+*goggles-0.8.0 (31 Mar 2005)
+
+  31 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +goggles-0.8.0.ebuild:
+  new upstream version
+
+*goggles-0.7.10 (22 Mar 2005)
+
+  22 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +goggles-0.7.10.ebuild:
+  new upstream version, fixes #74198
+
+*goggles-0.7.4-r1 (05 Feb 2005)
+
+  05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +goggles-0.7.4-r1.ebuild,
+  goggles-0.7.4.ebuild:
+  added ~amd64 to KEYWORDS. added enhancements suggested by Przemyslaw Maciag
+  <p_maciag@wp.pl>. fixes #80808 and #61844
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> goggles-0.7.4.ebuild:
+  Added to ~ppc.
 
 *goggles-0.7.4 (26 Aug 2004)
 
diff --git a/media-video/goggles/Manifest b/media-video/goggles/Manifest
index c822c0fe99b3..8ce2bd174b44 100644
--- a/media-video/goggles/Manifest
+++ b/media-video/goggles/Manifest
@@ -1,2 +1,9 @@
-MD5 a1b617ba3f9d6e2ef315064bb4b01a6b goggles-0.7.4.ebuild 823
-MD5 24eefdf711e3a7ce5e095b5b989741b8 files/digest-goggles-0.7.4 66
+MD5 1fb249d827424df3e8e9e1d406d58845 ChangeLog 1452
+MD5 157d6297e2f9394f4b6dc17bd036b383 goggles-0.7.10.ebuild 1313
+MD5 d3a4338b6b4a7b4ea48e84aea30c60af goggles-0.7.4-r1.ebuild 1223
+MD5 b2e738143bdaea6b7dde8327ab5f01bf goggles-0.8.0-r1.ebuild 1308
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b831562bf7983a728b4d8f8ef78158c4 files/digest-goggles-0.7.10 67
+MD5 24eefdf711e3a7ce5e095b5b989741b8 files/digest-goggles-0.7.4-r1 66
+MD5 564d5b86d27c7e0186d0f3f91a1ea6e8 files/digest-goggles-0.8.0-r1 66
+MD5 5f4a7441d17566f5347a2e65d589e863 files/goggles-0.7.4-gentoo.patch 874
diff --git a/media-video/goggles/goggles-0.7.10.ebuild b/media-video/goggles/goggles-0.7.10.ebuild
index a6deaa9d2553..f3d6ae6db4bc 100644
--- a/media-video/goggles/goggles-0.7.10.ebuild
+++ b/media-video/goggles/goggles-0.7.10.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-video/goggles/goggles-0.7.10.ebuild,v 1.1 2005/03/22 17:48:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/goggles-0.7.10.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="User-friendly frontend for the Ogle DVD Player"
 HOMEPAGE="http://www.fifthplanet.net/goggles.html"
@@ -22,8 +22,8 @@ src_unpack() {
 
 	cd ${S}
 	sed -i \
-		-e "/^export CC=/s:=.*:=\"$(gcc-getCC)\":" \
-		-e "/^export CXX=/s:=.*:=\"$(gcc-getCXX)\":" \
+		-e "/^export CC=/s:=.*:=\"$(t-getCC)\":" \
+		-e "/^export CXX=/s:=.*:=\"$(tc-getCXX)\":" \
 		-e "/^export CFLAGS=/s:=.*:=\"${CFLAGS}\":" \
 		-e "/^export CXXFLAGS=/s:=.*:=\"${CXXFLAGS}\":" \
 		build/config.linux
diff --git a/media-video/goggles/goggles-0.7.4-r1.ebuild b/media-video/goggles/goggles-0.7.4-r1.ebuild
index e5e1110c425b..21e806e457f8 100644
--- a/media-video/goggles/goggles-0.7.4-r1.ebuild
+++ b/media-video/goggles/goggles-0.7.4-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-video/goggles/goggles-0.7.4-r1.ebuild,v 1.1 2005/02/05 00:56:07 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/goggles-0.7.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="User-friendly frontend for the Ogle DVD Player"
 HOMEPAGE="http://www.fifthplanet.net/goggles.html"
@@ -10,7 +10,7 @@ SRC_URI="http://www.fifthplanet.net/files/goggles-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc amd64"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fox-1.2
@@ -24,8 +24,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	sed -i \
-		-e "/^export CC=/s:=.*:=\"$(gcc-getCC)\":" \
-		-e "/^export CXX=/s:=.*:=\"$(gcc-getCXX)\":" \
+		-e "/^export CC=/s:=.*:=\"$(tc-getCC)\":" \
+		-e "/^export CXX=/s:=.*:=\"$(tc-getCXX)\":" \
 		-e "/^export CFLAGS=/s:=.*:=\"${CFLAGS}\":" \
 		-e "/^export CXXFLAGS=/s:=.*:=\"${CXXFLAGS}\":" \
 		build/config.linux
diff --git a/media-video/goggles/goggles-0.8.0-r1.ebuild b/media-video/goggles/goggles-0.8.0-r1.ebuild
index 7061e7a9ad91..c776ab05e970 100644
--- a/media-video/goggles/goggles-0.8.0-r1.ebuild
+++ b/media-video/goggles/goggles-0.8.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-video/goggles/goggles-0.8.0-r1.ebuild,v 1.1 2005/04/04 19:12:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/goggles/goggles-0.8.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="User-friendly frontend for the Ogle DVD Player"
 HOMEPAGE="http://www.fifthplanet.net/goggles.html"
@@ -22,8 +22,8 @@ src_unpack() {
 
 	cd ${S}
 	sed -i \
-		-e "/^export CC=/s:=.*:=\"$(gcc-getCC)\":" \
-		-e "/^export CXX=/s:=.*:=\"$(gcc-getCXX)\":" \
+		-e "/^export CC=/s:=.*:=\"$(tc-getCC)\":" \
+		-e "/^export CXX=/s:=.*:=\"$(tc-getCXX)\":" \
 		-e "/^export CFLAGS=/s:=.*:=\"${CFLAGS}\":" \
 		-e "/^export CXXFLAGS=/s:=.*:=\"${CXXFLAGS}\":" \
 		build/config.linux
diff --git a/media-video/goggles/metadata.xml b/media-video/goggles/metadata.xml
index ab2e21eea39f..d9df1878d8e2 100644
--- a/media-video/goggles/metadata.xml
+++ b/media-video/goggles/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 6c716a062e29..741fa047a8cc 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.1 2005/03/30 17:14:02 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> gpac-0.2.1.ebuild:
+  Remove divx4linux useflag.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gpac-0.2.1.ebuild:
+  Don't install INSTALL file.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> gpac-0.2.1.ebuild:
+  Added to ~ppc.
 
 *gpac-0.2.1 (31 Mar 2005)
 
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index d7fd0a2501b8..2272408c3725 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,14 @@
-MD5 280256706d5850f1a79a1121431aa46a gpac-0.2.1.ebuild 2132
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6b2ad09c987c10fdbe966f949bb7fd73 ChangeLog 663
 MD5 9ad278193077b6ebdc824745ba8600c2 files/digest-gpac-0.2.1 143
+MD5 b1903ea2936f4dfef488f1d3e877e2fe gpac-0.2.1.ebuild 2367
+MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZRytj5H05b2HAEkRAsreAJ46gxnh8GCpRbe4KLxRRZRC5FRlxgCbBoOY
+f5IGtK7kdjxCM+s+qUgADIc=
+=vEXm
+-----END PGP SIGNATURE-----
diff --git a/media-video/gpac/gpac-0.2.1.ebuild b/media-video/gpac/gpac-0.2.1.ebuild
index 4f1a57ebcbab..c1835450f6a1 100644
--- a/media-video/gpac/gpac-0.2.1.ebuild
+++ b/media-video/gpac/gpac-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-video/gpac/gpac-0.2.1.ebuild,v 1.1 2005/03/30 17:14:02 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 inherit wxwidgets flag-o-matic
 
@@ -8,13 +8,12 @@ DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed
 HOMEPAGE="http://gpac.sourceforge.net/"
 LVER=0.1.3
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	amr? ( mirror://sourceforge/${PN}/${PN}_extra_libs-${LVER}_linux.tar.gz )
-	divx4linux? ( mirror://sourceforge/${PN}/${PN}_extra_libs-${LVER}_linux.tar.gz )"
+	amr? ( mirror://sourceforge/${PN}/${PN}_extra_libs-${LVER}_linux.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="amr debug divx4linux jpeg mad mozilla mpeg oss png sdl truetype xml2 xvid"
+KEYWORDS="~ppc ~x86"
+IUSE="amr debug jpeg mad mozilla mpeg oss png sdl truetype xml2 xvid"
 S=${WORKDIR}/${PN}
 
 DEPEND="jpeg? ( media-libs/jpeg )
@@ -26,12 +25,10 @@ DEPEND="jpeg? ( media-libs/jpeg )
 	truetype? ( >=media-libs/freetype-2.1 )
 	xml2? ( >=dev-libs/libxml2-2.6.0 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
-	sdl? (media-libs/libsdl)"
+	sdl? ( media-libs/libsdl )"
 
 src_unpack() {
 	unpack ${A}
-	use divx4linux && \
-		mv gpac_extra_libs/opendivx/* gpac/Plugins/OpenDivx/divx
 	# audio codec used in 3GP
 	use amr && \
 		mv gpac_extra_libs/amr_nb gpac/Plugins/amr_dec/AMR_NB
@@ -64,7 +61,6 @@ src_compile() {
 		--localstatedir=${D}/var/lib \
 		$(use_enable amr amr-nb) \
 		$(use_enable debug) \
-		$(use_enable divx4linux opendivx) \
 		$(use_enable mpeg faad) \
 		$(use_enable mpeg ffmpeg) \
 		$(use_enable jpeg) \
@@ -82,6 +78,6 @@ src_compile() {
 src_install() {
 	make OPTFLAGS="${CFLAGS}" install || die
 
-	dodoc AUTHORS BUGS Changelog INSTALL README TODO
+	dodoc AUTHORS BUGS Changelog README TODO
 	dodoc doc/*.html doc/*.txt doc/libisomedia_license doc/SGGen
 }
diff --git a/media-video/gqcam/ChangeLog b/media-video/gqcam/ChangeLog
index 3bd0b47b3280..5a60e39818b4 100644
--- a/media-video/gqcam/ChangeLog
+++ b/media-video/gqcam/ChangeLog
@@ -1,9 +1,29 @@
 # ChangeLog for media-video/gqcam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/gqcam/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-video/gqcam/ChangeLog,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gqcam-0.9.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gqcam-0.9.ebuild:
+  Stable on ppc.
+
+  26 Jan 2005; Jason Wever <weeve@gentoo.org> gqcam-0.9.ebuild:
+  Added ~sparc keyword.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  13 May 2004; David Holm <dholm@gentoo.org> gqcam-0.9.ebuild:
+  Added to ~ppc.
 
 *gqcam-0.9 (7 May 2002)
 
+  04 Nov 2003; Joshua Kinard <kumba@gentoo.org> gqcam-0.9.ebuild:
+  Added ~mips to KEYWORDS
+
+  27 Nov 2002; foser <foser@gentoo.org> gqcam-0.9.ebuild :
+  Fix problems with libpng-1.2.5 (bug #9792)
+
   7 May 2002; Lasse Mikkelsen <lbm@fatalerror.dk> gqcam-0.9.ebuild :
-  
   Initial release of Gqcam ebuild.
diff --git a/media-video/gqcam/Manifest b/media-video/gqcam/Manifest
index e69de29bb2d1..7a1559e98540 100644
--- a/media-video/gqcam/Manifest
+++ b/media-video/gqcam/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9e6d40b8596dfc6f8ea1dbf4fbf3e48d gqcam-0.9.ebuild 804
+MD5 1f9c38fb40eaec786a1d8c7afaeff66b ChangeLog 1011
+MD5 284a70da1011bec7eafebb5d5e4b0fb5 metadata.xml 247
+MD5 b8c1e451d3454ca158a17c74b58031c8 files/digest-gqcam-0.9 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGjEYj5H05b2HAEkRAgGVAKCjNiRUGpC2cV1qSO1Hw9T/FgVW4QCeIbXc
+TJQB4soupqb8OdzdnazZ9os=
+=20Pd
+-----END PGP SIGNATURE-----
diff --git a/media-video/gqcam/gqcam-0.9.ebuild b/media-video/gqcam/gqcam-0.9.ebuild
index 3617f7b95fc3..4a0619be3a88 100644
--- a/media-video/gqcam/gqcam-0.9.ebuild
+++ b/media-video/gqcam/gqcam-0.9.ebuild
@@ -1,21 +1,28 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Lasse Mikkelsen <lbm@fatalerror.dk>
-# $Header: /var/cvsroot/gentoo-x86/media-video/gqcam/gqcam-0.9.ebuild,v 1.1 2002/05/17 18:35:00 blauwers 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-video/gqcam/gqcam-0.9.ebuild,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
 
 DESCRIPTION="A V4L-compatible frame grabber - works with many webcams."
 SRC_URI="http://cse.unl.edu/~cluening/gqcam/download/${P}.tar.gz"
-
 HOMEPAGE="http://cse.unl.edu/~cluening/gqcam/"
 
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ~mips amd64 ppc ~sparc"
+IUSE=""
 
-DEPEND=">=x11-libs/gtk+-1.2.10-r7
+DEPEND="=x11-libs/gtk+-1.2*
 		>=media-libs/jpeg-6b-r2
 		>=media-libs/libpng-1.2.1-r1"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	mv Makefile Makefile.bad
+	sed -e "s:-lpng:\`libpng-config --libs\`:" Makefile.bad > Makefile
+}
+
 src_compile() {
 	emake || die
 }
@@ -23,5 +30,5 @@ src_compile() {
 src_install () {
 	dobin gqcam
 
-	dodoc CHANGES COPYING INSTALL README README.threads
+	dodoc CHANGES README README.threads
 }
diff --git a/media-video/gqcam/metadata.xml b/media-video/gqcam/metadata.xml
index 9150541c31b4..5dd37336ce32 100644
--- a/media-video/gqcam/metadata.xml
+++ b/media-video/gqcam/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-video</herd>
+<herd>video</herd>
 <herd>media-tv</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
diff --git a/media-video/gsubedit/ChangeLog b/media-video/gsubedit/ChangeLog
index e8a8320661c6..0d3d4a1e8636 100644
--- a/media-video/gsubedit/ChangeLog
+++ b/media-video/gsubedit/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-video/gsubedit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/ChangeLog,v 1.1 2003/09/30 07:23:14 phosphan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/ChangeLog,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org>
+  gsubedit-0.4_pre1-r1.ebuild:
+  added ~amd64
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> gsubedit-0.4_pre1-r1.ebuild:
+  Added to ~ppc.
+
+*gsubedit-0.4_pre1-r1 (15 Jun 2004)
+
+  15 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  gsubedit-0.4_pre1-r1.ebuild, gsubedit-0.4_pre1.ebuild, files/crashes.patch,
+  files/langlist.patch:
+  Fixing another stupid segfault. See bug #52776.
 
 *gsubedit-0.4_pre1 (30 Sep 2003)
 
diff --git a/media-video/gsubedit/Manifest b/media-video/gsubedit/Manifest
index 1d6e0648e182..09f6a072bf1e 100644
--- a/media-video/gsubedit/Manifest
+++ b/media-video/gsubedit/Manifest
@@ -1,2 +1,5 @@
-MD5 97ad95c67c638ae9a22626b1a7f01ec7 gsubedit-0.4_pre1.ebuild 545
-MD5 8b179a14b86d986d420f5e622fb1859e files/digest-gsubedit-0.4_pre1 68
+MD5 fbe13c718112548189124c718d7aa29b ChangeLog 814
+MD5 f37c47625439710da23eed6d6a6f3640 gsubedit-0.4_pre1-r1.ebuild 776
+MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
+MD5 a08b3a299e0b28b84e9e96c34f3504f7 files/crashes.patch 861
+MD5 8b179a14b86d986d420f5e622fb1859e files/digest-gsubedit-0.4_pre1-r1 68
diff --git a/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild b/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild
index 35d8b640033b..74c976e462d1 100644
--- a/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild
+++ b/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild,v 1.1 2004/06/15 07:18:08 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
diff --git a/media-video/gtranscode/ChangeLog b/media-video/gtranscode/ChangeLog
index c7508dc731d2..3f2173409693 100644
--- a/media-video/gtranscode/ChangeLog
+++ b/media-video/gtranscode/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/gtranscode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gtranscode/ChangeLog,v 1.1 2005/01/17 17:08:29 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gtranscode/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> gtranscode-0.3.ebuild:
+  Added ~sparc keyword.
+
+  24 Jun 2005; Alex Howells <astinus@gentoo.org> gtranscode-0.3.ebuild:
+  Marking ~amd64, works fine for me!
+
+  01 May 2005; David Holm <dholm@gentoo.org> gtranscode-0.3.ebuild:
+  Added to ~ppc.
 
 *gtranscode-0.3 (17 Jan 2005)
 
diff --git a/media-video/gtranscode/Manifest b/media-video/gtranscode/Manifest
index 8f2bd89efcd8..2edc3f7f56bc 100644
--- a/media-video/gtranscode/Manifest
+++ b/media-video/gtranscode/Manifest
@@ -1,2 +1,4 @@
-MD5 ffd65b016ed57e99419bd3ac13370947 gtranscode-0.3.ebuild 538
+MD5 d193095c64645554320fe455f561fb8e ChangeLog 717
+MD5 8d7c21ea1b10da0c621113011d56b0e6 gtranscode-0.3.ebuild 662
+MD5 a741469ea595fb76ba3553cb2f3f9b9a metadata.xml 222
 MD5 1f9d52e6b2d00a7042db2ad45fb11676 files/digest-gtranscode-0.3 66
diff --git a/media-video/gtranscode/gtranscode-0.3.ebuild b/media-video/gtranscode/gtranscode-0.3.ebuild
index 2ec018687d2c..c05e80abe7f1 100644
--- a/media-video/gtranscode/gtranscode-0.3.ebuild
+++ b/media-video/gtranscode/gtranscode-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-video/gtranscode/gtranscode-0.3.ebuild,v 1.1 2005/01/17 17:08:29 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gtranscode/gtranscode-0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
 inherit eutils
 DESCRIPTION="A GTK2 frontend for transcode."
@@ -9,7 +9,7 @@ SRC_URI="http://www.fuzzymonkey.org/files/${PN}-v${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2.4.9
diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 04fa5fdd558e..9cd3909c73b6 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,208 @@
 # ChangeLog for media-video/gxine
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.1 2002/12/12 09:46:47 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> gxine-0.5.0.ebuild:
+  Bumped requirement of spidermonkey to have a newer version that installs the
+  headers correctly. Fixes bug #110896.
+
+*gxine-0.5.0 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +gxine-0.5.0.ebuild:
+  Updated to latest upstream version.
+
+*gxine-0.4.9 (14 Oct 2005)
+
+  14 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +gxine-0.4.9.ebuild:
+  Update to latest upstream version.
+
+*gxine-0.4.8 (12 Sep 2005)
+
+  12 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/gxine-0.4.4-secfix.patch, -files/gxine-0.4.6-literals.patch,
+  -files/gxine-0.4.6-mkstemp.patch, -gxine-0.4.1-r1.ebuild,
+  -gxine-0.4.6.ebuild, +gxine-0.4.8.ebuild:
+  Update to latest upstream (0.4.8), and dropped the patches applied upstream.
+  Removed 0.4.6 an d0.4.1-r1 (now that sparc has a newer stable).
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gxine-0.4.1-r1.ebuild,
+  gxine-0.4.5.ebuild, gxine-0.4.6.ebuild:
+  Don't install INSTALL file.
+
+  17 Aug 2005; Josh Grebe <squash@gentoo.org> gxine-0.4.5.ebuild:
+  Good on sparc - bug #89510
+
+  11 Aug 2005; Olivier Crête <tester@gentoo.org> gxine-0.4.5.ebuild:
+  Stable on x86 per bug #100841
+
+  01 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.4.6-literals.patch, +files/gxine-0.4.6-mkstemp.patch,
+  gxine-0.4.6.ebuild:
+  Added patches to avoid printf() with non-literal format string and to
+  replace tmpnam() use with mkstemp().
+
+  01 Aug 2005; Joseph Jezak <josejx@gentoo.org> gxine-0.4.5.ebuild:
+  Marked ppc stable for bug #100841.
+
+  31 Jul 2005; Markus Rothe <corsair@gentoo.org> gxine-0.4.5.ebuild:
+  Stable on ppc64 (bug #100841)
+
+*gxine-0.4.6 (31 Jul 2005)
+
+  31 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> +gxine-0.4.6.ebuild:
+  Added latest upstream version.
+
+  30 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/gxine-0.3.3-Makefile.in.patch,
+  -files/gxine-0.3.3-http-overflow.patch, -files/gxine-0.3.3-secfix.patch,
+  -gxine-0.3.3-r1.ebuild, -gxine-0.3.3-r2.ebuild, -gxine-0.4.1.ebuild,
+  -gxine-0.4.3.ebuild, -gxine-0.4.4.ebuild:
+  Removed old and outdated ebuilds. Leave 0.4.1-r1 (for sparc and x86) and 0.4.5.
+
+  30 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> gxine-0.4.5.ebuild:
+  Stable on amd64.
+
+  12 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> gxine-0.4.1.ebuild,
+  gxine-0.4.1-r1.ebuild, gxine-0.4.3.ebuild, gxine-0.4.4.ebuild,
+  gxine-0.4.5.ebuild:
+  Rename mozilla useflag into nsplugin.
+
+  26 May 2005; Jan Brinkmann <luckyduck@gentoo.org> gxine-0.4.1-r1.ebuild:
+  stable on x86 wrt #93532
+
+  26 May 2005; Jason Wever <weeve@gentoo.org> gxine-0.4.1-r1.ebuild:
+  Stable on SPARC wrt security bug #93532.
+
+*gxine-0.4.5 (25 May 2005)
+
+  25 May 2005; Diego Pettenò <flameeyes@gentoo.org> +gxine-0.4.5.ebuild:
+  New upstream version. Also enabled gtk+-2.6 features (and moved the gtk
+  requirements) as reported by Tero Grundström in bug #93936.
+
+*gxine-0.4.4 (24 May 2005)
+*gxine-0.4.1-r1 (24 May 2005)
+*gxine-0.3.3-r2 (24 May 2005)
+
+  24 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.3.3-secfix.patch, +files/gxine-0.4.4-secfix.patch,
+  +gxine-0.3.3-r2.ebuild, +gxine-0.4.1-r1.ebuild, +gxine-0.4.4.ebuild:
+  Added new 0.4.4 version which was missing. Added new revisions to fix format
+  string vulnerabilities.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  18 Apr 2005; Markus Rothe <corsair@gentoo.org> gxine-0.4.3.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #89510
+
+*gxine-0.4.3 (18 Apr 2005)
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> +gxine-0.4.3.ebuild:
+  Added new gxine version (0.4.3) which should also fix a couple of upstream
+  bugs.
+
+  29 Mar 2005; Chris White <chriswhite@gentoo.org> gxine-0.3.3-r1.ebuild,
+  gxine-0.4.1.ebuild:
+  Fixed the desktop icon mess, more specifically bug #50296.
+
+  28 Mar 2005; Chris White <chriswhite@gentoo.org> gxine-0.4.1.ebuild:
+  Fixed bug #85964 and a couple of other ones.
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> gxine-0.4.1.ebuild:
+  added mozilla useflag to install plugin
+
+*gxine-0.4.1 (23 Jan 2005)
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org>
+  +files/gxine-0.4.1-menu-fix.patch, +gxine-0.4.1.ebuild:
+  version bump; bug #74916
+
+  07 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -gxine-0.3.3.ebuild:
+  Removing insecure version.
+
+  06 Nov 2004; Jason Wever <weeve@gentoo.org> gxine-0.3.3-r1.ebuild:
+  Stable on sparc wrt security bug #70055.
+
+  06 Nov 2004; Olivier Crete <tester@gentoo.org> gxine-0.3.3-r1.ebuild:
+  Stable on x86 for #70055
+
+*gxine-0.3.3-r1 (07 Nov 2004)
+
+  07 Nov 2004; Chris White <chriswhite@gentoo.org>
+  +files/gxine-0.3.3-http-overflow.patch, +gxine-0.3.3-r1.ebuild:
+  Took care of gxine ebuild for Bug #70055.
+
+  23 Oct 2004; Chris White <chriswhite@gentoo.org>
+  +files/gxine-0.3.3-Makefile.in.patch, gxine-0.3.3.ebuild:
+  Patched gxine makefile to properly include X11 libs.  This closes bug #65303.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> gxine-0.3.3.ebuild:
+  get_libdir fixes.
+
+  28 Aug 2004; Tom Gall <tgall@gentoo.org> gxine-0.3.3.ebuild:
+  marked ~ppc64, bug #59651
+
+  13 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> gxine-0.3.3.ebuild:
+  Marked ~amd64.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.  Taking over as maintainer.
+
+  12 Aug 2004; Tom Martin <slarti@gentoo.org> gxine-0.3.3.ebuild:
+  Removing ~amd64 for now. The mozilla plugin causes the entire browser to crash
+  when invoked, and switching from fullscreen to windowed mode after watching a
+  DVD also causes a segfault.
+
+  12 Aug 2004; Tom Martin <slarti@gentoo.org> gxine-0.3.3.ebuild:
+  Marked ~amd64.
+
+  29 Dec 2003; Sven Blumenstein <bazik@gentoo.org> gxine-0.3.3.ebuild:
+  Stable on sparc.
+
+  06 Dec 2003; <spider@gentoo.org> gxine-0.2.1.ebuild, gxine-0.2.ebuild,
+  gxine-0.3.1.ebuild, gxine-0.3.2.ebuild, gxine-0.3.3.ebuild,
+  gxine-0.3.ebuild:
+  Cleaning out bigtime. Fixed the gnome dep that wasn't in use (Nothing in the
+  current build uses ORBit )
+
+  04 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> gxine-0.3.3.ebuild :
+  Added installation of browser plugin.
+
+  11 Aug 2003; Jason Wever <weeve@gentoo.org> gxine-0.3.3.ebuild:
+  Added ~sparc to keywords to fix bug #26126.
+
+  10 Jul 2003; Lars Weiler <pylon@gentoo.org> gxine-0.3.3.ebuild:
+  Set ~ppc in KEYWORDS
+
+*gxine-0.3.3 (09 Apr 2003)
+
+  15 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Marking stable on x86.
+
+  09 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*gxine-0.3.2 (27 Mar 2003)
+
+  27 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+  Made dependency on lirc obey 'lirc' USE flag.
+
+*gxine-0.3.1 (10 Mar 2003)
+
+  10 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*gxine-0.3 (04 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.  Thanks to Fridtjof Busse <fridtjof@fbunet.de>.
+
+*gxine-0.2.1 (26 Dec 2002)
+
+  26 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
 
 *gxine-0.2 (12 Dec 2002)
 
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 8d13ac526145..ad5107db3cfb 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,13 +1,21 @@
-MD5 2acd18e820ee2a4121d89dfdf1873b0c ChangeLog 1075
-MD5 b8b9c1120a55107b7accdee8e35d6d93 gxine-0.2.1.ebuild 1453
-MD5 6979e2f29ec552f192e4785f7ca19054 gxine-0.2.ebuild 1451
-MD5 ca8337004212bcf48988959830e448bf gxine-0.3.1.ebuild 1057
-MD5 bb3ef693bb1d5fca408916ecf068ff4c gxine-0.3.ebuild 1055
-MD5 92a44294f69be536d408201e3e344ca8 gxine-0.3.2.ebuild 1072
-MD5 2d156d118e75d833753301386a5bc65b gxine-0.3.3.ebuild 1072
-MD5 b0c77f31ba79fd3b332464f35af28dfe files/digest-gxine-0.2 61
-MD5 c8e240a8d79cd5f26441ad6a7b08cdde files/digest-gxine-0.2.1 63
-MD5 540f72974fd027a6a6347ad564efed2f files/digest-gxine-0.3 61
-MD5 a707be76407f7c11e20a3cae221827a2 files/digest-gxine-0.3.1 63
-MD5 83d8480689e2cf6ed9f343654294424f files/digest-gxine-0.3.2 64
-MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 589e5001f8c0368ca01620c41c9c323d ChangeLog 7483
+MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
+MD5 d3f2297a49721a0558f863ba3f8ba2f0 files/digest-gxine-0.4.8 64
+MD5 541e4a5a4b8747eeee6782cb6cd5e53d files/digest-gxine-0.4.9 64
+MD5 d4d21433f6ba3db5176cc5d994c4ce19 files/digest-gxine-0.5.0 63
+MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
+MD5 79d0920e2fdab22f9ef6792340afbdd8 gxine-0.4.5.ebuild 1512
+MD5 a53419425249e78a98a55debf6e5c088 gxine-0.4.8.ebuild 1538
+MD5 f354b1289fdbf406c700b5620398b6b3 gxine-0.4.9.ebuild 1538
+MD5 964d303551ff5f2e77882d55b08ffbd4 gxine-0.5.0.ebuild 1551
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZOp8j5H05b2HAEkRAvisAKCKCOQv7qMT2E2T0U3oNMRiOMeMYQCgh3GX
+wcnKkRUWQZCj//ms05yG0Hs=
+=BR2P
+-----END PGP SIGNATURE-----
diff --git a/media-video/gxine/gxine-0.4.5.ebuild b/media-video/gxine/gxine-0.4.5.ebuild
index 930f568ff220..0d64c3c16918 100644
--- a/media-video/gxine/gxine-0.4.5.ebuild
+++ b/media-video/gxine/gxine-0.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-video/gxine/gxine-0.4.5.ebuild,v 1.1 2005/05/25 14:54:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.5.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -18,11 +18,11 @@ DEPEND="media-libs/libpng
 RDEPEND="nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"
 
-IUSE="nls lirc mozilla"
+IUSE="nls lirc nsplugin"
 
 SLOT="0"
 # Those needs spidermonkey: ~sparc
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
 
@@ -39,7 +39,7 @@ src_compile() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable lirc) \
-		$(use_with mozilla browser-plugin) \
+		$(use_with nsplugin browser-plugin) \
 		--disable-gtk-compat \
 		--disable-dependency-tracking || die
 	emake || die
@@ -51,12 +51,12 @@ src_install() {
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 
 	insinto /usr/share/icons/hicolor/48x48/apps
 	newins pixmaps/gxine-logo.png gxine.png
 
-	use mozilla && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
 }
 
 pkg_postinst() {
diff --git a/media-video/gxine/gxine-0.4.8.ebuild b/media-video/gxine/gxine-0.4.8.ebuild
index e46a5d2c562a..d7d41804cb6d 100644
--- a/media-video/gxine/gxine-0.4.8.ebuild
+++ b/media-video/gxine/gxine-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-video/gxine/gxine-0.4.8.ebuild,v 1.1 2005/09/12 08:50:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.8.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 inherit eutils nsplugins fdo-mime
 
diff --git a/media-video/gxine/gxine-0.4.9.ebuild b/media-video/gxine/gxine-0.4.9.ebuild
index 14a79dc46b37..e0d5da3df3b3 100644
--- a/media-video/gxine/gxine-0.4.9.ebuild
+++ b/media-video/gxine/gxine-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/media-video/gxine/gxine-0.4.9.ebuild,v 1.1 2005/10/14 22:26:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.9.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 inherit eutils nsplugins fdo-mime
 
diff --git a/media-video/gxine/gxine-0.5.0.ebuild b/media-video/gxine/gxine-0.5.0.ebuild
index 986c871184cb..c907d20b6fbf 100644
--- a/media-video/gxine/gxine-0.5.0.ebuild
+++ b/media-video/gxine/gxine-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-video/gxine/gxine-0.5.0.ebuild,v 1.1 2005/10/30 09:29:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.0.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -12,7 +12,7 @@ DEPEND="media-libs/libpng
 	>=media-libs/xine-lib-1_beta10
 	>=x11-libs/gtk+-2.6
 	>=dev-libs/glib-2.6
-	dev-lang/spidermonkey
+	>=dev-lang/spidermonkey-1.5_rc6-r1
 	lirc? ( app-misc/lirc )
 	X? ( virtual/x11 )"
 RDEPEND="nls? ( sys-devel/gettext )
diff --git a/media-video/gxine/metadata.xml b/media-video/gxine/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/gxine/metadata.xml
+++ b/media-video/gxine/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/helixplayer/ChangeLog b/media-video/helixplayer/ChangeLog
index b0145ea24e23..e70f2d18ebae 100644
--- a/media-video/helixplayer/ChangeLog
+++ b/media-video/helixplayer/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for media-video/helixplayer
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/helixplayer/ChangeLog,v 1.1 2004/07/14 20:18:27 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/helixplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
+
+  15 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  helixplayer-1.0.4.ebuild, helixplayer-1.0.5.ebuild:
+  Add to -amd64.
+
+  12 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  helixplayer-1.0.4.ebuild, helixplayer-1.0.5.ebuild:
+  Rename mozilla useflag into nsplugin.
+
+  06 Jul 2005; John Mylchreest <johnm@gentoo.org> helixplayer-1.0.5.ebuild:
+  Marking ~x86 as per bug #96923
+
+*helixplayer-1.0.5 (24 Jun 2005)
+
+  24 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +helixplayer-1.0.5.ebuild:
+  New upstream version. Dropped keywords as I can't test it for now.
+
+  02 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/helixplayer-1.0.1-bif.patch, -files/helixplayer-1.0.1-sem_t.patch,
+  -files/helixplayer-1.0.3-bif.patch, -files/50helix,
+  -files/helixplayer-1.0.3-sem_t.patch,
+  -files/helixplayer-1.0_beta1-bif.patch, -files/buildrc,
+  -files/gcc_versioncheck.patch, -files/gentoo_bif.patch,
+  -files/installer-naming.patch, -helixplayer-1.0_beta1.ebuild,
+  -helixplayer-1.0.1.ebuild, -helixplayer-1.0.3-r1.ebuild,
+  helixplayer-1.0.4.ebuild:
+  Removed vulnerable versions and related files. Moved patch and files for
+  latest version into a patchset tarball.
+
+  21 Apr 2005; Olivier Crête <tester@gentoo.org> helixplayer-1.0.4.ebuild:
+  Mark ~x86 per security bug #89862
+
+*helixplayer-1.0.4 (21 Apr 2005)
+
+  21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +helixplayer-1.0.4.ebuild:
+  Added new upstream revision (-* as I can't test it).
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*helixplayer-1.0.3-r1 (18 Apr 2005)
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -helixplayer-1.0.3.ebuild, +helixplayer-1.0.3-r1.ebuild:
+  Added 1.0.3-r1 ebuild which removes the dangerous setup script. Removed
+  1.0.3 for safety.
+
+  30 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> helixplayer-1.0.3.ebuild:
+  now we generate a menu entry for the helixplayer, fixes #75554 and #60633
+
+*helixplayer-1.0.3 (27 Mar 2005)
+
+  27 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/helixplayer-1.0.3-bif.patch, +files/helixplayer-1.0.3-sem_t.patch,
+  +helixplayer-1.0.3.ebuild:
+  Bumping to 1.0.3 for security fixes.
+
+  18 Nov 2004; Chris White <chriswhite@gentoo.org> helixplayer-1.0.1.ebuild,
+  helixplayer-1.0_beta1.ebuild:
+  Fixed inherit location.
+
+*helixplayer-1.0.1 (14 Nov 2004)
+
+  14 Nov 2004; Chris White <chriswhite@gentoo.org>
+  +files/helixplayer-1.0.1-bif.patch, +files/helixplayer-1.0.1-sem_t.patch,
+  +files/helixplayer-1.0_beta1-bif.patch, +helixplayer-1.0.1.ebuild,
+  helixplayer-1.0_beta1.ebuild:
+  Fixed an nptl bug before it happens. Removed the gcc patch as it's fixed by
+  upstream. Bumped to 1.0.1. Re-organized the patches.
+
+  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  helixplayer-1.0_beta1.ebuild:
+  -amd64 -sparc. Build fails silently on both platforms. Amd64 needs a build
+  system patch, but it still fails. Sparc appears to be supported, but it fails
+  to build as well.
 
 *helixplayer-1.0_beta1 (15 Jul 2004)
 
diff --git a/media-video/helixplayer/Manifest b/media-video/helixplayer/Manifest
index 44e7f92915dc..e378ece15631 100644
--- a/media-video/helixplayer/Manifest
+++ b/media-video/helixplayer/Manifest
@@ -1,9 +1,16 @@
-MD5 4a711a3d2fffa8603cbe1b0f517c1c00 helixplayer-1.0_beta1.ebuild 3177
-MD5 bcccb1f941e30566bb372ec395297e30 metadata.xml 348
-MD5 681032b07036c389bd5c5613bae3b1dc ChangeLog 532
-MD5 6438303cb10431e6fe1fd8c1a24328d4 files/50helix 22
-MD5 9ff4380a6e2acce72f2685a5f5a03b2c files/buildrc 35
-MD5 d9d3bd60b0c7de98d93ccde45775936d files/digest-helixplayer-1.0_beta1 88
-MD5 b3efbf0d42d95ec571e60aaf9377d787 files/gcc_versioncheck.patch 502
-MD5 b83696db32d29e1c07d27cb6ba16414e files/gentoo_bif.patch 10461
-MD5 bded820ce4994950f10c24c5177f50fa files/installer-naming.patch 555
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7f802f11ed5ce11847abceb5f0e59307 ChangeLog 3536
+MD5 8c402c466c3575feaeb4ba79f8b26dc1 helixplayer-1.0.4.ebuild 2285
+MD5 75ed185b972cd276a339309609fba567 metadata.xml 276
+MD5 1ab341d3ade36889215f257ef27691cc helixplayer-1.0.5.ebuild 2282
+MD5 b58761808153ad55d61baf4017ea8486 files/digest-helixplayer-1.0.4 139
+MD5 5ce59341635af14a578e0f26c81fce2f files/digest-helixplayer-1.0.5 139
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2ANFj5H05b2HAEkRAvkCAKCSNEpii6fPSl+nMfeeSjGfWHhGQQCdHLDD
+q6PebOSXXDy/RG6nTL3K6fw=
+=NNeZ
+-----END PGP SIGNATURE-----
diff --git a/media-video/helixplayer/files/digest-helixplayer-1.0.4 b/media-video/helixplayer/files/digest-helixplayer-1.0.4
index a9ecc1a91d9c..74508b2856f9 100644
--- a/media-video/helixplayer/files/digest-helixplayer-1.0.4
+++ b/media-video/helixplayer/files/digest-helixplayer-1.0.4
@@ -1 +1,2 @@
 MD5 e1f70532956c0cc1547282957021efc6 hxplay-1.0.4.tar.bz2 13978308
+MD5 bc0c0131a88a893cc33a740710993c89 helixplayer-patches-1.tar.bz2 1634
diff --git a/media-video/helixplayer/helixplayer-1.0.4.ebuild b/media-video/helixplayer/helixplayer-1.0.4.ebuild
index 685bf09c9bcf..b6f1f0d53fd1 100644
--- a/media-video/helixplayer/helixplayer-1.0.4.ebuild
+++ b/media-video/helixplayer/helixplayer-1.0.4.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/helixplayer/helixplayer-1.0.4.ebuild,v 1.1 2005/04/21 11:09:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/helixplayer/helixplayer-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 inherit nsplugins eutils
 
 MY_PKG=${P/helixplayer/hxplay}
 
+PATCHLEVEL="1"
 DESCRIPTION="A free open-source media player by real"
 HOMEPAGE="http://www.helixplayer.org/"
-SRC_URI="https://helixcommunity.org/download.php/1138/${MY_PKG}.tar.bz2"
+SRC_URI="https://helixcommunity.org/download.php/1138/${MY_PKG}.tar.bz2
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 # -sparc -amd64: 1.0_beta1: build fails on both platforms... --eradicator
-KEYWORDS="-*"
-IUSE="mozilla nptl"
+KEYWORDS="-* -amd64 ~x86"
+IUSE="nsplugin nptl"
 DEPEND="media-libs/libtheora
 	media-libs/libogg"
 RDEPEND=">=dev-libs/glib-2
@@ -28,14 +31,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	#adjust strange naming for helixplayer tarball
-	epatch ${FILESDIR}/installer-naming.patch
-
-	#fixes the .bif file to create a gentoo_player custom target
-	epatch ${FILESDIR}/${PN}-1.0.3-bif.patch
-
-	#fixes sem_t based issues
-	use nptl && epatch ${FILESDIR}/${PN}-1.0.3-sem_t.patch
+	use nptl || EPATCH_EXCLUDE="03_all_sem-t.patch"
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 
 	#fixes icon name in .desktop file
 	sed -i -e 's:hxplay.png:hxplay:' ${S}/player/installer/common/hxplay.desktop
@@ -45,7 +42,7 @@ src_compile() {
 
 	#copies our buildrc file over with information on where
 	#ogg and theora libs are kept
-	cp ${FILESDIR}/buildrc ${S}
+	cp ${WORKDIR}/${PV}/buildrc ${S}
 
 	export BUILDRC="${S}/buildrc"
 	export BUILD_ROOT="${S}/build"
@@ -56,19 +53,19 @@ src_compile() {
 
 src_install() {
 
-	# install the tarballed installation into 
+	# install the tarballed installation into
 	# the /opt directory
 	keepdir /opt/HelixPlayer
 	tar -jxf ${S}/release/helixplayer.tar.bz2 -C ${D}/opt/HelixPlayer
 
-	if use mozilla ; then
+	if use nsplugin ; then
 		cd ${D}/opt/HelixPlayer/mozilla
 		exeinto /opt/netscape/plugins
 		doexe nphelix.so
 		inst_plugin /opt/netscape/plugins/nphelix.so
 	fi
 
-	doenvd ${FILESDIR}/50helix
+	doenvd ${WORKDIR}/${PV}/50helix
 
 	for res in 16 192 32 48; do
 		insinto /usr/share/icons/hicolor/${res}x${res}/apps
diff --git a/media-video/helixplayer/helixplayer-1.0.5.ebuild b/media-video/helixplayer/helixplayer-1.0.5.ebuild
index adb198620785..d3a73ac35fb3 100644
--- a/media-video/helixplayer/helixplayer-1.0.5.ebuild
+++ b/media-video/helixplayer/helixplayer-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/media-video/helixplayer/helixplayer-1.0.5.ebuild,v 1.1 2005/06/24 22:08:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/helixplayer/helixplayer-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit nsplugins eutils
 
@@ -15,8 +15,8 @@ SRC_URI="https://helixcommunity.org/download.php/1340/${MY_PKG}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 # -sparc -amd64: 1.0_beta1: build fails on both platforms... --eradicator
-KEYWORDS="-*"
-IUSE="mozilla nptl"
+KEYWORDS="-amd64 ~x86"
+IUSE="nsplugin nptl"
 DEPEND="media-libs/libtheora
 	media-libs/libogg"
 RDEPEND=">=dev-libs/glib-2
@@ -58,7 +58,7 @@ src_install() {
 	keepdir /opt/HelixPlayer
 	tar -jxf ${S}/release/helixplayer.tar.bz2 -C ${D}/opt/HelixPlayer
 
-	if use mozilla ; then
+	if use nsplugin ; then
 		cd ${D}/opt/HelixPlayer/mozilla
 		exeinto /opt/netscape/plugins
 		doexe nphelix.so
diff --git a/media-video/helixplayer/metadata.xml b/media-video/helixplayer/metadata.xml
index 223f9374a77a..2b3c43e2fc46 100644
--- a/media-video/helixplayer/metadata.xml
+++ b/media-video/helixplayer/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 <longdescription>An open-source version of realplayer 
 that supports formats such as ogg and theora</longdescription>
 </pkgmetadata>
diff --git a/media-video/jahshaka/ChangeLog b/media-video/jahshaka/ChangeLog
index 2319a19128d9..bccb05f48460 100644
--- a/media-video/jahshaka/ChangeLog
+++ b/media-video/jahshaka/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for media-video/jahshaka
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/ChangeLog,v 1.1 2004/08/26 02:43:44 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/ChangeLog,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  jahshaka-2.0_rc1.ebuild:
+  Don't use cp -a.
+
+  10 Aug 2005; Markus Rothe <corsair@gentoo.org> jahshaka-2.0_rc1.ebuild:
+  added ~ppc64
+
+*jahshaka-2.0_rc1 (07 Aug 2005)
+
+  09 Aug 2005; Marc Hildebrand <zypher@gentoo.org> jahshaka-2.0_rc1.ebuild,
+  Version bump.
+
+  21 Jul 2005; Caleb Tennis <caleb@gentoo.org> files/configure:
+  Patching configure to follow bug #97535
+
+  17 Jul 2005; Danny van Dyk <kugelfang@gentoo.org>
+  jahshaka-1.9_alpha90-r1.ebuild:
+  Marked ~amd64.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> jahshaka-1.9_alpha90.ebuild,
+  jahshaka-1.9_alpha90-r1.ebuild:
+  Fix qt dep
+
+  09 May 2005; Marc Hildebrand <zypher@gentoo.org> jahshaka-1.9_alpha90-r1.ebuild:
+  Fixed plugin installation, should close bug #91931.
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -jahshaka-1.9_alpha5.ebuild, -jahshaka-1.9_alpha85.ebuild,
+  jahshaka-1.9_alpha90.ebuild:
+  added missing dep, fixes #74079. updated maintainer information, chriswhite is
+  retired. did some cleanup.
+
+  28 Nov 2004; Chris White <chriswhite@gentoo.org> +files/configure,
+  jahshaka-1.9_alpha90.ebuild:
+  Added a bash configure script instead of tcsh since bash is more avaliable.
+
+*jahshaka-1.9_alpha90 (28 Nov 2004)
+
+  28 Nov 2004; Chris White <chriswhite@gentoo.org>
+  +jahshaka-1.9_alpha90.ebuild:
+  Fixed some Manifest issues.  Bumped to version 1.9_alpha 9.
+
+* jahshaka-1.9_alpha8.5 (08 Nov 2004)
+  10 Nov 2004; Marc Hildebrand <zypher@gentoo.org> jahshaka-1.9_alpha85.ebuild:
+  Version bump.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> jahshaka-1.9_alpha5.ebuild:
+  Added to ~ppc.
 
 *jahshaka-1.9_alpha5 (26 Aug 2004)
 
diff --git a/media-video/jahshaka/Manifest b/media-video/jahshaka/Manifest
index 6ef3f6a8f632..f9f440bb725e 100644
--- a/media-video/jahshaka/Manifest
+++ b/media-video/jahshaka/Manifest
@@ -1,4 +1,21 @@
-MD5 84b3b99babf32c2cb9dcc1768fe641ae jahshaka-1.9_alpha5.ebuild 1856
-MD5 313d2b2cfddddf54563e829bb1ffc688 files/digest-jahshaka-1.9_alpha5 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3f8daf16c1164a5cdc8755c22bc1deae jahshaka-1.9_alpha90-r1.ebuild 1993
+MD5 158c155f8894b957002b9924fb7e1844 ChangeLog 2084
+MD5 b5f6a8932505b64b1f9fee94a110eb24 jahshaka-1.9_alpha90.ebuild 2077
+MD5 4aa8ecd9db3af45d540c3fa4034fe1d0 jahshaka-2.0_rc1.ebuild 1673
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 eccbf141ba80b57f8127d38e4fcda2ec files/FT_Open_Flags.patch 489
+MD5 d6a0064257b0ac77fa6c2db28ac89f90 files/configure 549
+MD5 d976b3529c773978dadcb54605be5f3c files/digest-jahshaka-1.9_alpha90-r1 67
+MD5 7ec7294a7819533a7d0988eec0afd776 files/digest-jahshaka-2.0_rc1 69
+MD5 d976b3529c773978dadcb54605be5f3c files/digest-jahshaka-1.9_alpha90 67
 MD5 c3cb7840c08ef0ced53f6b8d58442449 files/ftgl.h.patch 793
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC2dij5H05b2HAEkRAuEvAJ9vVqNrBCzJUAUIdPUh+Pmg8uE9awCgj5Yf
+0plhACfTe1zjejT2WM7a09o=
+=ApA3
+-----END PGP SIGNATURE-----
diff --git a/media-video/jahshaka/files/configure b/media-video/jahshaka/files/configure
index 74a23a69a93a..b90d0b998377 100644
--- a/media-video/jahshaka/files/configure
+++ b/media-video/jahshaka/files/configure
@@ -9,20 +9,20 @@ case "$BUILDTYPE" in
 	"jahshaka")
 		echo build jahshaka
 		cp -vf jahshakaSettings.pro Settings.pro
-		qmake jahshaka.pro
+		${QTDIR}/bin/qmake jahshaka.pro
 		CONFIGURED="true"
 	;;
 	"jahplayer")
 		echo build jahplayer
 		cp -vf jahplayerSettings.pro Settings.pro
-		qmake jahplayer.pro
+		${QTDIR}/bin/qmake jahplayer.pro
 		CONFIGURED="true"
 	;;
 	* )
 		echo nothing entered or invalid entry
 		echo build jahshaka
 		cp -vf jahshakaSettings.pro Settings.pro
-		qmake jahshaka.pro
+		${QTDIR}/bin/qmake jahshaka.pro
 		CONFIGURED="true"
 	;;
 esac
diff --git a/media-video/jahshaka/jahshaka-1.9_alpha90-r1.ebuild b/media-video/jahshaka/jahshaka-1.9_alpha90-r1.ebuild
index e13f8cac8c23..fc19dd6f818b 100644
--- a/media-video/jahshaka/jahshaka-1.9_alpha90-r1.ebuild
+++ b/media-video/jahshaka/jahshaka-1.9_alpha90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/jahshaka-1.9_alpha90-r1.ebuild,v 1.1 2005/05/09 09:46:26 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/jahshaka-1.9_alpha90-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.jahshaka.com/downloads/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
@@ -19,7 +19,7 @@ DEPEND="virtual/x11
 	media-video/avifile
 	>=media-libs/glut-3.7.1
 	>=media-libs/freetype-2.1.4
-	>=x11-libs/qt-3"
+	=x11-libs/qt-3*"
 
 RDEPEND=${DEPEND}
 
diff --git a/media-video/jahshaka/jahshaka-1.9_alpha90.ebuild b/media-video/jahshaka/jahshaka-1.9_alpha90.ebuild
index 5861d0dadc9f..bdcca0c4bc2d 100644
--- a/media-video/jahshaka/jahshaka-1.9_alpha90.ebuild
+++ b/media-video/jahshaka/jahshaka-1.9_alpha90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/jahshaka/jahshaka-1.9_alpha90.ebuild,v 1.1 2004/11/27 16:18:08 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/jahshaka-1.9_alpha90.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils
 
@@ -16,9 +16,10 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/x11
+	media-video/avifile
 	>=media-libs/glut-3.7.1
 	>=media-libs/freetype-2.1.4
-	>=x11-libs/qt-3"
+	=x11-libs/qt-3*"
 
 RDEPEND=${DEPEND}
 
@@ -28,6 +29,8 @@ src_unpack() {
 	unpack ${A}
 	einfo "Patching plugins.pro"
 	sed -e '/jitplugins/a csplugins \\' -i ${S}/plugins/plugins.pro
+
+	cp ${FILESDIR}/configure ${S}/configure
 }
 
 cflags_replacement() {
@@ -71,7 +74,7 @@ src_install() {
 	done
 
 	dodir /opt/${PN}/plugins
-	local dirs="csplugins jfxplugins jitplugins rfxplugins ftplugins"
+	local dirs="csplugins jfxplugins jitplugins rfxplugins rtplugins"
 	for i in $dirs ; do
 	    dodir /opt/${PN}/plugins/${i}
 	    cp -a ${S}/plugins/${i}/*.so ${D}/opt/${PN}/plugins/${i}/
@@ -79,6 +82,7 @@ src_install() {
 
 	cp -a jahshaka ${D}/opt/${PN}/
 
+	dodir /usr/bin
 	ln -s ${D}/opt/${PN}/jahshaka ${D}/usr/bin/jahshaka
 
 	dodoc README AUTHORS TODO
diff --git a/media-video/jahshaka/jahshaka-2.0_rc1.ebuild b/media-video/jahshaka/jahshaka-2.0_rc1.ebuild
index 5a2d27964caa..61d3f6a3f6a2 100644
--- a/media-video/jahshaka/jahshaka-2.0_rc1.ebuild
+++ b/media-video/jahshaka/jahshaka-2.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-video/jahshaka/jahshaka-2.0_rc1.ebuild,v 1.1 2005/08/09 14:21:10 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/jahshaka-2.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}fx/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE=""
 
@@ -25,6 +25,7 @@ RDEPEND=${DEPEND}
 
 RESTRICT="nostrip"
 
+
 S="${WORKDIR}/${PN}"
 
 src_compile() {
@@ -56,11 +57,11 @@ src_install() {
 	done
 
 	dodir /usr/lib/jahshaka
-	cp -a ${S}/source/OpenLibraries/lib/* ${D}/usr/lib/${PN}/
-	cp -a --parent $(find plugins -iname *.so) ${D}usr/share/${PN}/
-	cp -a --parent $(find plugins -iname *.fp) ${D}usr/share/${PN}/
+	cp -pPR ${S}/source/OpenLibraries/lib/* ${D}/usr/lib/${PN}/
+	cp -pPR $(find plugins -iname *.so) ${D}usr/share/${PN}/
+	cp -pPR $(find plugins -iname *.fp) ${D}usr/share/${PN}/
 
-	cp -a ${S}/database/JahDesktopDB.bak ${D}/usr/share/jahshaka/database/JahDesktopDB
+	cp -pPR ${S}/database/JahDesktopDB.bak ${D}/usr/share/jahshaka/database/JahDesktopDB
 	chmod 664 ${D}/usr/share/jahshaka/database/*
 
 	dodir /etc/env.d
diff --git a/media-video/jahshaka/metadata.xml b/media-video/jahshaka/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/jahshaka/metadata.xml
+++ b/media-video/jahshaka/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 10206bb9e17c..568c25c78019 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,151 @@
 # ChangeLog for media-video/kaffeine
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.1 2003/08/14 15:13:08 sergey Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+  06 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> kaffeine-0.7.1.ebuild:
+  Add dependency on modular xorg for bug #110174.
+
+  20 Sep 2005; Caleb Tennis <caleb@gentoo.org> kaffeine-0.7.1.ebuild:
+  x86 stable
+
+*kaffeine-0.7.1 (04 Sep 2005)
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -kaffeine-0.7.ebuild,
+  +kaffeine-0.7.1.ebuild:
+  Updated to 0.7.1.
+
+*kaffeine-0.7 (07 Aug 2005)
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> +kaffeine-0.7.ebuild:
+  New upstream version with preliminary gstreamer support (unstable). Xine
+  backend works fine.
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org> kaffeine-0.6-r1.ebuild:
+  Added stable x86, amd64 keywords. Cf bug 84032.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kaffeine-0.6-r1.ebuild:
+  added ~ppc64
+
+  29 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kaffeine-0.6-formats.patch, kaffeine-0.6-r1.ebuild:
+  Added patch for format strings warnings. Could fix problems with HTTP
+  streams on 64-bit systems.
+
+  18 Apr 2005; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.6.ebuild,
+  kaffeine-0.6-r1.ebuild:
+  corrected dependencies
+
+*kaffeine-0.6-r1 (03 Apr 2005)
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> +kaffeine-0.6-r1.ebuild:
+  Fix X threading issue (#86797).
+
+*kaffeine-0.6 (21 Mar 2005)
+
+  21 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kaffeine-0.6.ebuild:
+  New version, with support for DVB (#86006).
+
+  26 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.5.ebuild:
+  added xorg configure option: #75722, #59746
+
+*kaffeine-0.5 (24 Dec 2004)
+
+  24 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +kaffeine-0.5.ebuild:
+  version bump
+
+  25 Nov 2004; Dominik Stadler <centic@gentoo.org> kaffeine-0.5_rc2.ebuild:
+  Requires xine-lib-1_rc5 according to comment in Bug 66207
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.4.3b-r1.ebuild,
+  kaffeine-0.5_rc1-r1.ebuild:
+  QA: missing "inherit eutils"
+
+*kaffeine-0.5_rc2 (08 Nov 2004)
+
+  08 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +kaffeine-0.5_rc2.ebuild:
+  version bump
+
+  03 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -kaffeine-0.4.2.ebuild, -kaffeine-0.4.3.ebuild, -kaffeine-0.5_rc1.ebuild,
+  kaffeine-0.4.3b-r1.ebuild:
+  Stable amd64 for security fix.  Removing insecure versions.
+
+*kaffeine-0.4.3b-r1 (03 Nov 2004)
+
+  03 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kaffeine-0.4.3b-SecurityTracker-1011936.patch,
+  +files/kaffeine-0.5_rc1-SecurityTracker-1011936.patch,
+  +kaffeine-0.4.3b-r1.ebuild, +kaffeine-0.5_rc1-r1.ebuild:
+  Buffer Overflow in Processing Content-Type Headers fix, bug #69663
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> kaffeine-0.5_rc1.ebuild:
+  keywords ~amd64.
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.4.3b.ebuild:
+  stable on x86
+
+  09 Oct 2004; Jason Wever <weeve@gentoo.org> kaffeine-0.5_rc1.ebuild:
+  Added ~sparc keyword wrt bug #66207.
+
+  06 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> kaffeine-0.5_rc1.ebuild:
+  Added to ~ppc.
+
+*kaffeine-0.5_rc1 (05 Oct 2004)
+
+  05 Oct 2004; Dominik Stadler <centic@gentoo.org> +kaffeine-0.5_rc1.ebuild:
+  Add new Version 0.5-rc1, fixes Bug 66207
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.4.2.ebuild,
+  kaffeine-0.4.3.ebuild, kaffeine-0.4.3b.ebuild:
+  QA: need-kde after R/DEPEND
+
+*kaffeine-0.4.3b (13 Jun 2004)
+
+  13 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kaffeine-0.4.3b.ebuild:
+  version bump
+
+  12 May 2004; Dominik Stadler <centic@gentoo.org> kaffeine-0.4.3.ebuild:
+  Correct dependency on xine-lib-1_rc4, thanks to shanachie@yucom.be in Bug 50275.
+  Because of this, ~amd64 had to go as xine-lib-1_rc4 is not available there.
+
+  10 May 2004; Jason Wever <weeve@gentoo.org> kaffeine-0.4.3.ebuild:
+  Added ~sparc keyword.
+
+*kaffeine-0.4.3 (03 May 2004)
+
+  03 May 2004; Dominik Stadler <centic@gentoo.org> +kaffeine-0.4.3.ebuild:
+  Add new Version 0.4.3
+
+  18 Apr 2004; Travis Tilley <lv@gentoo.org> kaffeine-0.4.2.ebuild:
+  marking stable on amd64 just a little bit earlier than usual
+
+  28 Mar 2004; Martin Holzer <mholzer@gentoo.org> kaffeine-0.4.2.ebuild:
+  updated depend. closes 45829
+
+*kaffeine-0.4.2 (25 Mar 2004)
+
+  25 Mar 2004; Markus Nigbur <pyrania@gentoo.org> kaffeine-0.4.2.ebuild:
+  Version bump. Closing #45653.
+
+  09 Mar 2004; David Holm <dholm@gentoo.org> kaffeine-0.4.1.ebuild:
+  Added to ~ppc.
+
+  08 Feb 2004; Sergey Kuleshov <svyatogor@gentoo.org> kaffeine-0.4.1.ebuild:
+  Fixed the DEPEND.
+
+  07 Feb 2004; Brian Harring <ferringb@gentoo.org> kaffeine-0.4.ebuild:
+  Changing GenericName entry to english, closing #40602
+
+*kaffeine-0.4.1 (06 Feb 2004)
+
+  06 Feb 2004; Sergey Kuleshov <svyatogor@gentoo.org> kaffeine-0.4.1.ebuild:
+  Version bump. Thanks to Gregorio Guidi for providing the patch to previous
+  ebuilds.
+
+*kaffeine-0.4 (20 Nov 2003)
+
+  20 Nov 2003; Sergey Kuleshov <svyatogor@gentoo.org> kaffeine-0.4.ebuild:
+  Version bump. Closing bug #33617.
 
 *kaffeine-0.3.2 (14 Aug 2003)
 
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 8e6958207c5e..ce663018b158 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,2 +1,7 @@
-MD5 cf14a837865f9e90efc35cd40c179576 kaffeine-0.3.2.ebuild 448
-MD5 971a6f285892ff4a6e79a35b5cd54eec files/digest-kaffeine-0.3.2 67
+MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
+MD5 553db0d4886a4603e97f6e44f3aa19ec kaffeine-0.7.1.ebuild 932
+MD5 228883a9a662dd142bcf3e30cf31531a ChangeLog 5348
+MD5 eb11794e0440683d63c7663fe8ae5cdc kaffeine-0.6-r1.ebuild 737
+MD5 3b5f1da0e1ceab40aabee361a20e6ae5 files/kaffeine-0.6-formats.patch 3420
+MD5 0fc6c600e680a127863fc22e097daec4 files/digest-kaffeine-0.6-r1 66
+MD5 297331248320491bcc0f2926e32ccacc files/digest-kaffeine-0.7.1 68
diff --git a/media-video/kaffeine/kaffeine-0.6-r1.ebuild b/media-video/kaffeine/kaffeine-0.6-r1.ebuild
index d90a5d96718a..51cd82dd4985 100644
--- a/media-video/kaffeine/kaffeine-0.6-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.6-r1.ebuild,v 1.1 2005/04/03 14:24:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
-inherit kde
+inherit eutils kde
 
 DESCRIPTION="Media player for KDE based on xine-lib."
 HOMEPAGE="http://kaffeine.sourceforge.net/"
@@ -10,14 +10,20 @@ SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="dvb"
 
 DEPEND=">=x11-base/xorg-x11-6.8.0-r4
 	>=media-libs/xine-lib-1
-	dvb? ( || ( sys-kernel/linux26-headers
-		    >=sys-kernel/linux-headers-2.6 ) )"
+	dvb? ( >=sys-kernel/linux-headers-2.6 )"
 
 # the dependency on xorg-x11 is meant to avoid bug #59746
 
 need-kde 3.2
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-formats.patch
+}
diff --git a/media-video/kaffeine/kaffeine-0.7.1.ebuild b/media-video/kaffeine/kaffeine-0.7.1.ebuild
index 7f88c7b50d9a..607148590d2e 100644
--- a/media-video/kaffeine/kaffeine-0.7.1.ebuild
+++ b/media-video/kaffeine/kaffeine-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-video/kaffeine/kaffeine-0.7.1.ebuild,v 1.1 2005/09/04 22:17:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
 inherit eutils kde
 
@@ -10,10 +10,11 @@ SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="dvb gstreamer"
 
-RDEPEND=">=x11-base/xorg-x11-6.8.0-r4
+RDEPEND="|| ( x11-base/xorg-server
+	      >=x11-base/xorg-x11-6.8.0-r4 )
 	>=media-libs/xine-lib-1
 	gstreamer? ( >=media-libs/gstreamer-0.8.8
 		>=media-libs/gst-plugins-0.8.6 )"
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 13f11feaf07e..8a4280444123 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/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>sound</herd>
-<herd>kde-other</herd>
+<herd>video</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-video/kavi2svcd/ChangeLog b/media-video/kavi2svcd/ChangeLog
index c66ff1a1c10b..de8f9966763d 100644
--- a/media-video/kavi2svcd/ChangeLog
+++ b/media-video/kavi2svcd/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for media-video/kavi2svcd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kavi2svcd/ChangeLog,v 1.1 2003/10/19 02:33:53 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kavi2svcd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> kavi2svcd-0.8.2.ebuild:
+  Add eutils inherit for epatch, for safety.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> kavi2svcd-0.8.4.ebuild:
+  Remove comments that doesn't apply anymore.
+
+*kavi2svcd-0.8.4 (19 May 2005)
+
+  19 May 2005; Dominik Stadler <centic@gentoo.org>
+  +files/kavi2svcd-0.8.4-configure-arts.patch, +kavi2svcd-0.8.4.ebuild:
+  Add new version 0.8.4
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> kavi2svcd-0.8.2.ebuild:
+  added ~amd64 to KEYWORDS to fix #64530 and applied a patch to fix #78792.
+  thanks to Fabio Rossi <rossi.f@inwind.it>.
+
+  29 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kavi2svcd-0.8.2-configure-arts.patch, kavi2svcd-0.8.2.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #72567.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kavi2svcd-0.8.2.ebuild:
+  QA: need-kde after R/DEPEND, missing sed dependency
+
+  17 Apr 2004; David Holm <dholm@gentoo.org> kavi2svcd-0.8.2.ebuild:
+  Added to ~ppc.
+
+  01 Feb 2004; Martin Holzer <mholzer@gentoo.org> kavi2svcd-0.8.2.ebuild,
+  kavi2svcd-0.8a.ebuild:
+  adding depend. closes 39360
+
+*kavi2svcd-0.8.2 (01 Feb 2004)
+
+  01 Feb 2004; Martin Holzer <mholzer@gentoo.org> kavi2svcd-0.8.2.ebuild,
+  kavi2svcd-0.8a.ebuild:
+  Verison bumped.
 
 *kavi2svcd-0.8a (18 Oct 2003)
 
diff --git a/media-video/kavi2svcd/Manifest b/media-video/kavi2svcd/Manifest
index 3f4236a8a85c..d3382b07e312 100644
--- a/media-video/kavi2svcd/Manifest
+++ b/media-video/kavi2svcd/Manifest
@@ -1,4 +1,18 @@
-MD5 870a35229108ac63255b41faf21d81fb files/digest-kavi2svcd-0.8a 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b3c82a2e80b7c20dce311426374aab3 ChangeLog 1721
 MD5 802335f62c0bbb68a2e0745f7b2e126c files/0.8a-gcc3.patch 386
-MD5 7fdd4b0354da9d8aacb3f74709cb7bfb kavi2svcd-0.8a.ebuild 708
-MD5 f708ae107b8fb5878abcdb8276adce8a ChangeLog 397
+MD5 79f3b71170b916ad066d39d29114815c files/digest-kavi2svcd-0.8.2 68
+MD5 d9df9bf60f2c1c9762955ea50aae0c93 files/digest-kavi2svcd-0.8.4 70
+MD5 da1cf7fb7841887e0312a44fabb23506 files/kavi2svcd-0.8.2-configure-arts.patch 3567
+MD5 d849bc8d9c81573fe2c64997d4ddd6fb kavi2svcd-0.8.2.ebuild 882
+MD5 98d6a9c9575a405507bf226aad3ed150 kavi2svcd-0.8.4.ebuild 807
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbyOej5H05b2HAEkRAjWnAJ4yIfa3dUZprXGrqTfwdwd2lop/mwCeM3iA
+Id3QpFq+Oa85trZoalq4IW0=
+=EqVt
+-----END PGP SIGNATURE-----
diff --git a/media-video/kavi2svcd/kavi2svcd-0.8.2.ebuild b/media-video/kavi2svcd/kavi2svcd-0.8.2.ebuild
index 456476c4cec9..403daeba872b 100644
--- a/media-video/kavi2svcd/kavi2svcd-0.8.2.ebuild
+++ b/media-video/kavi2svcd/kavi2svcd-0.8.2.ebuild
@@ -1,21 +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-video/kavi2svcd/kavi2svcd-0.8.2.ebuild,v 1.1 2004/02/01 20:12:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kavi2svcd/kavi2svcd-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
-inherit kde-base
-need-kde 3
+inherit kde eutils
 
 DESCRIPTION="GUI for generating VCD-compliant MPEG files from an AVI or MPEG file"
 HOMEPAGE="http://kavi2svcd.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kavi2svcd/${P}.tar.gz"
-RESTRICT="nomirror"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~amd64"
+IUSE="cdr"
 
-DEPEND=">=media-video/transcode-0.6.6
+DEPEND="sys-apps/sed
+	>=media-video/transcode-0.6.6
 	>=media-video/mjpegtools-1.6.0-r7
 	cdr? ( >=media-video/vcdimager-0.7.19
 		>=app-cdr/cdrdao-1.1.7-r1 )"
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+	sed -i 's:;;$:;:' ${S}/kavi2svcd/{prefclass,vcdclass}.h
+	sed -i -e 's@/usr/local/bin@/usr/bin@' ${S}/kavi2svcd/Makefile.in
 
+	use arts || epatch ${FILESDIR}/${P}-configure-arts.patch
+}
diff --git a/media-video/kavi2svcd/kavi2svcd-0.8.4.ebuild b/media-video/kavi2svcd/kavi2svcd-0.8.4.ebuild
index c363632c1f1b..878df8a0a894 100644
--- a/media-video/kavi2svcd/kavi2svcd-0.8.4.ebuild
+++ b/media-video/kavi2svcd/kavi2svcd-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-video/kavi2svcd/kavi2svcd-0.8.4.ebuild,v 1.1 2005/05/19 22:15:46 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kavi2svcd/kavi2svcd-0.8.4.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
 inherit kde
 
@@ -25,7 +25,4 @@ S=${WORKDIR}/${PN}
 src_unpack() {
 	kde_src_unpack
 	sed -i 's:;;$:;:' ${S}/src/{prefclass,vcdclass}.h || die
-#	sed -i -e 's@/usr/local/bin@/usr/bin@' ${S}/kavi2svcd/Makefile.in || die
-
-#	use arts || epatch ${FILESDIR}/${P}-configure-arts.patch || die
 }
diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index 4d157bcf6ebc..fbb4bb898be9 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-video/kdenlive
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.1 2004/03/18 22:09:08 zypher Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
+
+  04 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> kdenlive-0.2.4.ebuild:
+  Don't depend on kdesdk, package builds and runs fine without.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> kdenlive-0.2.4.ebuild:
+  Removed use of gcc eclass. Patch applied unconditionally as it's sane.
+
+  23 Jan 2005; Dominik Stadler <centic@gentoo.org> kdenlive-0.2.4.ebuild:
+  Update homepage
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kdenlive-0.2.4.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.
+
+  26 Oct 2004; Malcolm Lashley <malc@gentoo.org> kdenlive-0.2.4.ebuild:
+  ~amd64 - closes bug #59344
+
+  18 Oct 2004; Marc Hildebrand <zypher@gentoo.org> kdenlive-0.2.4.ebuild:
+  Added gcc-3.4 patch. Thanks to Mathijs Mohlmann for the patch.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kdenlive-0.2.4.ebuild:
+  QA: IUSE, need-kde after R/DEPEND
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> kdenlive-0.2.4.ebuild:
+  Added digest for kdenlive-0.2.4 ebuild.
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> kdenlive-0.2.4.ebuild:
+  Added to ~ppc.
 
 *kdenlive-0.2.4 (07 Mar 2004)
 
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index ac6fb6caf497..f9bb0b902227 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -1,3 +1,15 @@
-MD5 b87bef56a8c118b816082d7a5ffe332c ChangeLog 345
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1f60e4842c9c5725242b820c2fc46f97 ChangeLog 1641
 MD5 b930e21bf22fd73f984ae65f871fdc2d metadata.xml 253
-MD5 ea81cdf23374b4417831647fc62c7827 kdenlive-0.2.4.ebuild 869
+MD5 cfba341b66477d7e5a0fc81c2c8b0715 kdenlive-0.2.4.ebuild 642
+MD5 e0e37c5c67335b510278e92e08bb01d8 files/digest-kdenlive-0.2.4 67
+MD5 9b7f530fe5c63b0114d2445b9d352e43 files/kdenlive-0.2.4-gcc34.patch 3723
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8igDj5H05b2HAEkRAi7jAJ9bSaQZYQoYeZUvB2AgnEQhifeQvACdGDoh
+fhI4xP6n1ecpKg+ATwczqRk=
+=S4FK
+-----END PGP SIGNATURE-----
diff --git a/media-video/kdenlive/kdenlive-0.2.4.ebuild b/media-video/kdenlive/kdenlive-0.2.4.ebuild
index ed03ddfd626f..bf3b0101cfe2 100644
--- a/media-video/kdenlive/kdenlive-0.2.4.ebuild
+++ b/media-video/kdenlive/kdenlive-0.2.4.ebuild
@@ -1,32 +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-video/kdenlive/kdenlive-0.2.4.ebuild,v 1.1 2004/03/18 22:09:08 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
+
+inherit eutils kde
 
 DESCRIPTION="Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE."
-HOMEPAGE="http://www.uchian.pwp.blueyonder.co.uk/kdenlive.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://kdenlive.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kdenlive/${P}.tar.gz"
 
-IUSE="debug"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
-
-S="${WORKDIR}/${P}"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+IUSE=""
 
-DEPEND="virtual/x11
-	>=x11-libs/qt-3
-	>=media-video/piave-0.2.4
-	>=kde-base/kdesdk-3.2"
-
-src_compile() {
-	
-	myconf="--with-gnu-ld --prefix=${KDEDIR}"
-	use debug && myconf="${myconf} --enable-debug=yes"
-	econf ${myconf} || die "configure failed"
-	emake || die
-}
+DEPEND=">=media-video/piave-0.2.4"
+need-kde 3
 
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog README TODO
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/kdenlive-0.2.4-gcc34.patch
 }
diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index f8855e646258..dde5efa3a9b4 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,10 +1,128 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.1 2002/10/14 13:41:09 hanno Exp $
+# ChangeLog for media-video/kino
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/kino-0.7.6-configure.diff, kino-0.7.6.ebuild:
+  added configure patch, kino installed some files into the wrong location.
+  fixes #90496
+
+*kino-0.7.6 (20 May 2005)
+
+  20 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/kino-0.7.1-64bit-clean.patch, -files/kino_gcc33_fix,
+  -files/kino_gcc34_fix, -kino-0.6.4.ebuild, -kino-0.7.1.ebuild,
+  -kino-0.7.4.ebuild, -kino-0.7.5.ebuild, kino-0.7.5-r1.ebuild,
+  +kino-0.7.6.ebuild:
+  new upstream version, some cleanup. 0.7.5-r1 stable on x86
+
+  18 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> kino-0.7.5-r1.ebuild:
+  Stable on sparc wrt #87464
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> kino-0.7.5-r1.ebuild:
+  The big-endian patch applies to... well... all of the big-endian architectures
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/kino-0.7.5-ppc.diff, kino-0.7.5-r1.ebuild:
+  added patch for ppc, fixes bug #88555
+
+  26 Jan 2005; Sven Wegener <swegener@gentoo.org> kino-0.7.5-r1.ebuild:
+  Added missing ? in *DEPEND.
+
+  25 Jan 2005; Marc Hildebrand <zypher@gentoo.org> kino-0.7.5-r1.ebuild:
+  Added ffmpeg-dep. Should close bug #70062.
+
+  16 Jan 2005; Malcolm Lashley <malc@gentoo.org> kino-0.7.5.ebuild:
+  Stable on amd64 as 0.7.1 has known issues - bug 52446
+
+*kino-0.7.5 (03 Nov 2004)
+
+  03 Nov 2004; Patrick Kursawe <phosphan@gentoo.org> -kino-0.6.5.ebuild,
+  -kino-0.7.0.ebuild, -kino-0.7.2.ebuild, +kino-0.7.5.ebuild:
+  Version bump (bug #69735), cleanup
+
+  28 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> kino-0.7.4.ebuild:
+  Removing imlib dependency
+
+*kino-0.7.4 (27 Oct 2004)
+
+  27 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +kino-0.7.4.ebuild:
+  Version bump, see bug #66091
+
+  28 Jul 2004; Daniel Goller <morfic@gentoo.org> :
+  Revision bump for upstream fixes including for gcc-3.4
+
+  14 Jul 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/kino-0.7.1-64bit-clean.patch:
+  Fixed BUG #52446.
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kino-0.7.1.ebuild:
+  stable on amd64
+
+  30 May 2004; Travis Tilley <lv@gentoo.org> +files/kino_gcc34_fix,
+  kino-0.7.1.ebuild:
+  added gcc 3.4 fix. thanks to Malcolm Lashley for submitting it.
+
+  11 May 2004; Patrick Kursawe <phosphan@gentoo.org> kino-0.7.1.ebuild:
+  Bumped gnome dependencies to 2.x, see bug #36242
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kino-0.6.4.ebuild:
+  Add inherit eutils
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> :
+  updating digest. closes 47534
+
+  11 Apr 2004; Martin Holzer <mholzer@gentoo.org> kino-0.7.0.ebuild,
+  kino-0.7.1.ebuild:
+  adding depend. fixing econf issue. closes 47449.
+
+*kino-0.7.1 (10 Apr 2004)
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> kino-0.7.0.ebuild,
+  kino-0.7.1.ebuild, metadata.xml:
+  Version bumped.
+
+  17 Mar 2004; David Holm <dholm@gentoo.org> kino-0.7.0.ebuild:
+  Added to ~ppc.
+
+*kino-0.7.0 (17 Mar 2004)
+
+  17 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> kino-0.7.0.ebuild:
+  Version bump. Ebuild submitted by Cena Salvatore <cena@cenas.it>.
+
+  09 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> kino-0.6.5.ebuild:
+  AMD64 keyword.
+
+  29 Jan 2004; <gustavoz@gentoo.org> kino-0.6.4.ebuild, kino-0.6.5.ebuild:
+  keyworded sparc and ~sparc
+
+*kino-0.6.5 (08 Dec 2003)
+
+  08 Dec 2003; Hanno Boeck <hanno@gentoo.org> kino-0.6.5.ebuild:
+  Version bump.
+
+  06 Sep 2003; Hanno Boeck <hanno@gentoo.org> kino-0.6.4.ebuild,
+  files/kino_gcc33_fix:
+  Compile fix for gcc 3.3.
+
+*kino-0.6.4 (13 Mar 2003)
+
+  13 Mar 2003; Hanno Boeck <hanno@gentoo.org> kino-0.6.4.ebuild :
+  User submitted ebuild by Alex Boissy. Resolves bug #16279.
+
+*kino-0.60 (06 Dez 2002)
+
+  13 Mar 2003; Hanno Boeck <hanno@gentoo.org> kino-0.6.ebuild :
+  Changed version to avoid conflicts with new version 0.6.4.
+
+  06 Dez 2002; Hanno Boeck <hanno@gentoo.org> kino-0.60.ebuild :
+  New version.
+  It actually is called 0.6, but portage cannot handle that, so I renamed
+  it to 0.60.
 
 *kino-0.51 (14 Oct 2002)
 
-  14 Oct 2002 Hanno Boeck <hanno@gentoo.org> kino-0.51.ebuild:
+  14 Oct 2002; Hanno Boeck <hanno@gentoo.org> kino-0.51.ebuild :
   
   kino ebuild added.
   kino is a digital video editing software for linux.
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index e69de29bb2d1..e917b7c31cff 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 94d6f5306cfe3f5894b93240d6bd4767 kino-0.7.5-r1.ebuild 1310
+MD5 03d293c5b909a49da4e7c7204341d714 ChangeLog 4351
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 c681bc04ca61db53b8249a7646fa327b kino-0.7.6.ebuild 1358
+MD5 30181ed68c1351c7b6eea135e5ee7ad3 files/digest-kino-0.7.5-r1 63
+MD5 2c7645b5cf0d9f0f221fb87ca44b46fe files/digest-kino-0.7.6 63
+MD5 33d7b5aeacaf3400bbd60f827ca9515b files/kino-0.7.6-configure.diff 913
+MD5 3de7378299c687b8b3b8dec40d4f553c files/kino-0.7.5-ppc.diff 8058
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCjxKG06ebR+OMO78RAlc5AJ9jnOIhQAykOpXZXs/JjJ3hHqZ5FwCfUYgb
+Sa09MW9sihBg6htLNChAa9E=
+=d+RN
+-----END PGP SIGNATURE-----
diff --git a/media-video/kino/kino-0.7.5-r1.ebuild b/media-video/kino/kino-0.7.5-r1.ebuild
index 007d58cb1210..ab4a6bfb29fb 100644
--- a/media-video/kino/kino-0.7.5-r1.ebuild
+++ b/media-video/kino/kino-0.7.5-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.5-r1.ebuild,v 1.1 2005/01/26 10:36:25 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
 SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-RESTRICT="nomirror"
+RESTRICT="primaryuri"
 IUSE="quicktime dvdr ffmpeg"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ~ppc"
 
 DEPEND="x11-libs/gtk+
 	>=gnome-base/libglade-2
@@ -27,20 +27,27 @@ DEPEND="x11-libs/gtk+
 	media-libs/libsamplerate
 	media-video/mjpegtools
 	media-sound/rawrec
-	ffmpeg ( media-video/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	quicktime? ( virtual/quicktime )
 	dvdr? ( media-video/dvdauthor )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if [[ $(tc-endian) == "big" ]] ; then
+		epatch ${FILESDIR}/${P}-ppc.diff
+	fi
+}
+
 src_compile() {
 	econf \
 		--disable-dependency-tracking \
 		--disable-debug \
-		`use_with quicktime`\
-		`use_with ffmpeg avcodec` || die
-
-	emake || die
+		$(use_with quicktime) \
+		$(use_with ffmpeg avcodec) || 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-video/kino/kino-0.7.6.ebuild b/media-video/kino/kino-0.7.6.ebuild
index 5a01d0bb8d7c..47bccf074230 100644
--- a/media-video/kino/kino-0.7.6.ebuild
+++ b/media-video/kino/kino-0.7.6.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-video/kino/kino-0.7.6.ebuild,v 1.1 2005/05/20 14:53:55 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.7.6.ebuild,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
 SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE="quicktime dvdr ffmpeg"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="quicktime dvdr ffmpeg"
 
 DEPEND="x11-libs/gtk+
 	>=gnome-base/libglade-2
@@ -31,6 +31,17 @@ DEPEND="x11-libs/gtk+
 	quicktime? ( virtual/quicktime )
 	dvdr? ( media-video/dvdauthor )"
 
+RESTRICT="primaryuri"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# some things are getting installed into the wrong location, see #90496
+	epatch ${FILESDIR}/${P}-configure.diff
+	autoconf
+}
+
 src_compile() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/media-video/klvemkdvd/ChangeLog b/media-video/klvemkdvd/ChangeLog
index b35d5dc05e87..eb5c80ab4bd5 100644
--- a/media-video/klvemkdvd/ChangeLog
+++ b/media-video/klvemkdvd/ChangeLog
@@ -1,8 +1,27 @@
 # ChangeLog for media-video/klvemkdvd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/ChangeLog,v 1.1 2004/05/01 14:35:39 zypher Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
-*lve-0.4 (26 Jan 2004)
+  02 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> klvemkdvd-0.4.ebuild:
+  Add need-kde call to be sure that $KDEDIR is set. Removed dependency over
+  kdebase as the sources don't seem to need it.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> klvemkdvd-0.4.ebuild:
+  Changed dep on a kde-base monolithic package to accept the equivalent split
+  or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and
+  either alternative may provide the same files. This dep may have to be
+  narrowed down in the future to the precise split packages required.
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> klvemkdvd-0.4.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  05 May 2004; Daniel Black <dragonheart@gentoo.org> klvemkdvd-0.4.ebuild:
+  QA Fix - inherit before DESCRIPTION
+
+  02 May 2004; David Holm <dholm@gentoo.org> klvemkdvd-0.4.ebuild:
+  Added to ~ppc.
+
+*lvemkdvd-0.4 (26 Jan 2004)
 
   01 May 2004; Marc Hildebrand <zypher@gentoo.org> klvemkdvd-0.4.ebuild :
   Initial import. Ebuild submitted by Ian Haylock <haylocki@v21mail.co.uk>.
diff --git a/media-video/klvemkdvd/Manifest b/media-video/klvemkdvd/Manifest
index 3da6239b06d3..80c53a5111f5 100644
--- a/media-video/klvemkdvd/Manifest
+++ b/media-video/klvemkdvd/Manifest
@@ -1,2 +1,15 @@
-MD5 3de02b31c3e7d8c71ca40442b1f3b97a klvemkdvd-0.4.ebuild 610
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c191fd734db7881e91dc65e56f98dce2 ChangeLog 1279
+MD5 99d4afd79d8ed4c873b8fe4f0b48be5b klvemkdvd-0.4.ebuild 745
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 ce8bb2eb80b388a41e45721f10c42c41 files/digest-klvemkdvd-0.4 67
+MD5 aa26d1bed27c6fe20478c957e209fe12 files/klvemkdvd-0.4-gcc3.4.patch 354
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxpnUj5H05b2HAEkRAv7JAJwKZWoCEhN2+JN/XNBGNXAhY2FK8wCffvu3
+13LBET9p9loAm7DF7q8LIhA=
+=kihw
+-----END PGP SIGNATURE-----
diff --git a/media-video/klvemkdvd/klvemkdvd-0.4.ebuild b/media-video/klvemkdvd/klvemkdvd-0.4.ebuild
index 2b1a35bcdf4c..f813f1a9696b 100644
--- a/media-video/klvemkdvd/klvemkdvd-0.4.ebuild
+++ b/media-video/klvemkdvd/klvemkdvd-0.4.ebuild
@@ -1,27 +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-video/klvemkdvd/klvemkdvd-0.4.ebuild,v 1.1 2004/05/01 14:35:39 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/klvemkdvd/klvemkdvd-0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
+inherit kde eutils
 
 DESCRIPTION="DVD filesystem Builder"
 HOMEPAGE="http://lvempeg.sourceforge.net"
-SRC_URI="http://heanet.dl.sourceforge.net/sourceforge/lvempeg/klvemkdvd-0.4.src.tgz"
+SRC_URI="mirror://sourceforge/lvempeg/klvemkdvd-0.4.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-inherit kde
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
 
 DEPEND=">=media-video/lve-040322
-	>=x11-libs/qt-3.3.0-r1
-	>=kde-base/kdebase-3.2.1
 	>=media-video/dvdauthor-0.5.0
 	>=app-cdr/dvd+rw-tools-5.13.4.7.4
 	>=media-video/mplayer-0.92-r1"
 
+need-kde 3.2
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
+}
+
+
 src_install() {
 	cd ${WORKDIR}/lveripdvd
 	make || die
 	einstall || die
 }
+
diff --git a/media-video/kmenc15/ChangeLog b/media-video/kmenc15/ChangeLog
index dc629baa527e..bdf9469d382d 100644
--- a/media-video/kmenc15/ChangeLog
+++ b/media-video/kmenc15/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-video/kmenc15
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/ChangeLog,v 1.1 2005/03/15 00:17:30 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/ChangeLog,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> kmenc15-0.03.ebuild,
+  kmenc15-0.04.ebuild:
+  Don't install COPYING file.
+
+  24 Aug 2005; Christian Parpart <trapni@gentoo.org> kmenc15-0.03.ebuild,
+  kmenc15-0.04.ebuild:
+  fixing dead/broken links
+
+*kmenc15-0.04 (04 Apr 2005)
+
+  04 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +kmenc15-0.04.ebuild:
+  New version, now ~ppc
 
 *kmenc15-0.03 (15 Mar 2005)
 
diff --git a/media-video/kmenc15/Manifest b/media-video/kmenc15/Manifest
index 27bcc163d5e9..099e98c17d9c 100644
--- a/media-video/kmenc15/Manifest
+++ b/media-video/kmenc15/Manifest
@@ -1,4 +1,16 @@
-MD5 7f736a66509031420fe361992874752a kmenc15-0.03.ebuild 503
-MD5 80d717f539470bba82a72a896e50897b metadata.xml 220
-MD5 6c9c89dbd21a08576923addf4b1629ba ChangeLog 364
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 405b6d21bc87ea0dbbf56068a2ac3e55 ChangeLog 836
 MD5 559352f3366fc3c9c81946564a9db2d7 files/digest-kmenc15-0.03 65
+MD5 b23ab29c5c9fa31da0c2cb03c6ecb235 files/digest-kmenc15-0.04 65
+MD5 7536226456513ace3496ee3f2e83432b kmenc15-0.03.ebuild 589
+MD5 63de14d3b9e4fb501c5d48a84367f2ea kmenc15-0.04.ebuild 594
+MD5 80d717f539470bba82a72a896e50897b metadata.xml 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbyZZj5H05b2HAEkRAs4EAKCEdzWKtPi2Px6wVUUdxxnYJS7CJwCglups
+lBF7E2scGDNJsuEESWiJeWA=
+=h+m9
+-----END PGP SIGNATURE-----
diff --git a/media-video/kmenc15/kmenc15-0.03.ebuild b/media-video/kmenc15/kmenc15-0.03.ebuild
index d28f7c5a98b2..1e14885a0048 100644
--- a/media-video/kmenc15/kmenc15-0.03.ebuild
+++ b/media-video/kmenc15/kmenc15-0.03.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/media-video/kmenc15/kmenc15-0.03.ebuild,v 1.1 2005/03/15 00:17:30 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/kmenc15-0.03.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
 
 inherit eutils kde
 
 DESCRIPTION="Kmenc15 is an advanced Qt/KDE MEncoder frontend"
 HOMEPAGE="http://kmenc15.sourceforge.net"
-SRC_URI="http://dividedsky.net/%7Eods15/kmenc15/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/kmenc15/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -19,7 +19,7 @@ src_compile() {
 
 src_install() {
 	dobin kmenc15
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 }
 
 need-kde 3.3
diff --git a/media-video/kmenc15/kmenc15-0.04.ebuild b/media-video/kmenc15/kmenc15-0.04.ebuild
index cfd7b67c3bf0..117efeed1da3 100644
--- a/media-video/kmenc15/kmenc15-0.04.ebuild
+++ b/media-video/kmenc15/kmenc15-0.04.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/kmenc15-0.04.ebuild,v 1.1 2005/04/04 09:33:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/kmenc15-0.04.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
 
 inherit eutils kde
 
 DESCRIPTION="Kmenc15 is an advanced Qt/KDE MEncoder frontend"
 HOMEPAGE="http://kmenc15.sourceforge.net"
-SRC_URI="http://dividedsky.net/~ods15/kmenc15/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/kmenc15/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 DEPEND="media-video/mplayer"
 IUSE=""
-RESTRICT="nomirror $RESTRICT"
 
 src_compile() {
 	emake || die
@@ -20,7 +19,7 @@ src_compile() {
 
 src_install() {
 	dobin kmenc15
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 }
 
 need-kde 3.3
diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 2a6504e79cd1..ba7967ea7420 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,8 +1,220 @@
 # ChangeLog for media-video/kmplayer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.1 2003/01/02 12:30:42 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+  24 Oct 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  kmplayer-0.9.0c.ebuild:
+  Marked ppc stable, bug #109812
+
+  23 Oct 2005; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.9.0c.ebuild:
+  stable on x86
+
+  23 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> -kmplayer-0.9.0b.ebuild,
+  kmplayer-0.9.0c.ebuild:
+  Stable on amd64, bug 109812. Pruned 0.9.0b.
+
+  09 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> kmplayer-0.8.4b.ebuild,
+  kmplayer-0.9.0b.ebuild, kmplayer-0.9.0c.ebuild:
+  Fix homepage (#108554).
+
+  29 Aug 2005; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.9.0c.ebuild:
+  reconstitution of mplayer use flag and additional warning
+
+  29 Aug 2005; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.9.0c.ebuild:
+  reverted mplayer use flag, #103919
+
+*kmplayer-0.9.0c (29 Aug 2005)
+
+  29 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -kmplayer-0.9.0_rc1.ebuild, -kmplayer-0.9.0.ebuild,
+  +kmplayer-0.9.0c.ebuild:
+  Version bump and added mplayer local USE flag, closing bug 103919. Clean up.
+
+*kmplayer-0.9.0b (07 Aug 2005)
+
+  07 Aug 2005; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.9.0b.ebuild:
+  version bump
+
+*kmplayer-0.9.0 (31 Jul 2005)
+
+  31 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.9.0.ebuild:
+  version bump
+
+  10 Jul 2005; Carsten Lohrke <carlo@gentoo.org> -kmplayer-0.8.1.ebuild,
+  -kmplayer-0.8.2.ebuild, -kmplayer-0.8.3a.ebuild, -kmplayer-0.8.4a.ebuild,
+  -kmplayer-0.9.0_pre2.ebuild, +kmplayer-0.9.0_rc1.ebuild:
+  clean up
+
+*kmplayer-0.9.0_rc1 (10 Jul 2005)
+
+  10 Jul 2005; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.9.0_rc1.ebuild:
+  version bump
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kmplayer-0.8.4b.ebuild:
+  Stable on ppc.
+
+  29 May 2005; Marcus D. Hanwell <marcus@gentoo.org> kmplayer-0.8.4b.ebuild:
+  Stable on amd64.
+
+  28 May 2005; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.8.4b.ebuild:
+  stable on x86
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  kmplayer-0.8.3a.ebuild:
+  Stable on ppc.
+
+*kmplayer-0.9.0_pre2 (07 Apr 2005)
+*kmplayer-0.8.4b (07 Apr 2005)
+
+  07 Apr 2005; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.8.4b.ebuild,
+  +kmplayer-0.9.0_pre2.ebuild:
+  version bump
+
+  21 Mar 2005; Heinrich Wendel <lanius@gentoo.org> kmplayer-0.8.4a.ebuild:
+  stable on amd64
+
+  06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmplayer-0.8.3a.ebuild:
+  Marked stable on amd64.
+
+*kmplayer-0.8.4a (20 Feb 2005)
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/kmplayer-0.6.3-gentoo.diff, -files/xine.diff, -kmplayer-0.8.4.ebuild,
+  -kmplayer-0.8.4_rc2.ebuild, -kmplayer-0.8.4_rc5.ebuild,
+  +kmplayer-0.8.4a.ebuild:
+  version bump and clean up
+
+*kmplayer-0.8.4 (31 Jan 2005)
+
+  31 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.8.4.ebuild:
+  version bump
+
+  08 Jan 2005; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.8.4_rc5.ebuild:
+  fixed dependency
+
+*kmplayer-0.8.4_rc5 (07 Jan 2005)
+
+  07 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/xine.diff,
+  +kmplayer-0.8.4_rc5.ebuild:
+  version bump
+
+  30 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.8.3a.ebuild,
+  kmplayer-0.8.4_rc2.ebuild:
+  0.8.3a stable on x86, removed koffice plugin support #71648
+
+*kmplayer-0.8.4_rc2 (08 Nov 2004)
+
+  08 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.8.4_rc2.ebuild:
+  version bump
+
+*kmplayer-0.8.3a (11 Oct 2004)
+
+  11 Oct 2004; Carsten Lohrke <carlo@gentoo.org> -kmplayer-0.8.3_rc3.ebuild,
+  -kmplayer-0.8.3_rc4.ebuild, +kmplayer-0.8.3a.ebuild:
+  version bump
+
+*kmplayer-0.8.3_rc4 (16 Jul 2004)
+
+  16 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +kmplayer-0.8.3_rc4.ebuild:
+  version bump
+
+*kmplayer-0.8.3_rc3 (15 Jul 2004)
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> +kmplayer-0.8.3_rc3.ebuild:
+  ChangeLog version bump to 0.8.3_rc3
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> -kmplayer-0.7.95.ebuild,
+  kmplayer-0.8.1.ebuild, kmplayer-0.8.2.ebuild:
+  rm old ebuild, QA: kde-base -> kde, ...
+
+  09 Feb 2004; Caleb Tennis <caleb@gentoo.org> kmplayer-0.8.2.ebuild:
+  Add compilable support for koffice-plugins.
+
+  08 Feb 2004; <absinthe@gentoo.org> kmplayer-0.8.2.ebuild:
+  added amd64 keyword. 
+
+*kmplayer-0.8.2 (05 Feb 2004)
+
+  05 Feb 2004; Caleb Tennis <caleb@gentoo.org> kmplayer-0.8.2.ebuild:
+  New version - closes bug #40286
+
+*kmplayer-0.8.1 (12 Nov 2003)
+
+  12 Nov 2003; Caleb Tennis <caleb@gentoo.org> kmplayer-0.7.2.ebuild,
+  kmplayer-0.7.3.ebuild, kmplayer-0.7.4a.ebuild, kmplayer-0.8b.ebuild:
+  Version bump, closes bug #33014. Note that I had to remove the 0.8b ebuild
+  because portage thinks that it's newer than 0.8.1 even though it's not. Since
+  0.8.1 is a bugfix release, I left x86 and ppc alone. Someone yell at me if you
+  don't like this method.
+
+  04 Oct 2003; Heinrich Wendel <lanius@gentoo.org> kmplayer-0.8b.ebuild:
+  stable bump #30274 and #29445
+
+*kmplayer-0.8b (02 Oct 2003)
+
+  02 Oct 2003; Heinrich Wendel <lanius@gentoo.org> kmplayer-0.8b.ebuild:
+  version bump #30191
+
+*kmplayer-0.7.95 (17 Jul 2003)
+
+  17 Jul 2003; Brad Laue <brad@gentoo.org> kmplayer-0.7.95.ebuild:
+  Version bump
+
+*kmplayer-0.7.4a (26 Apr 2003)
+
+  26 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.7.3.ebuild,
+  kmplayer-0.7.4a.ebuild:
+  marked 0.7.3 stable; version bump, thanks to Frantz Dhin <fd@redspot.dk> (bug
+  #19514)
+
+*kmplayer-0.7.3 (15 Mar 2003)
+
+  15 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.7.3.ebuild:
+  version bump, thanks to bsolar <bsolar@bluewin.ch>, fixes bug #17441
+
+  3 March 2003; Bart Verwilst <verwilst@gentoo.org>:
+  removed old versions, and added the latest to stable
+
+*kmplayer-0.7.2 (18 Feb 2003)
+
+  18 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.7.2.ebuild:
+  version bump
+
+*kmplayer-0.7 (08 Feb 2003)
+
+  08 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.7.ebuild:
+  version bump
+
+*kmplayer-0.6.5b (03 Feb 2003)
+
+  03 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.6.5b.ebuild:
+  version bump
+
+  02 Feb 2003; Mark Guertin <gerk@gentoo.org> kmplayer-0.6.5a.ebuild:
+  set to ~ppc
+
+*kmplayer-0.6.5a (28 Jan 2003)
+
+  28 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.6.5a.ebuild:
+  version bump
+
+*kmplayer-0.6.3a (18 Jan 2003)
+
+  18 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.6.3a.ebuild:
+  version bump
+
+*kmplayer-0.6.3 (17 Jan 2003)
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.6.3.ebuild:
+  version bump
+
+*kmplayer-0.6.1 (10 Jan 2003)
+
+  10 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kmplayer-0.6.1.ebuild:
+  version bump
 
 * kmplayer-0.6 (2 Jan 2002) Bart Verwilst <verwilst@gentoo.org>
 
-  Initial ebuild.
+  Initial ebuild. Brought to you by Matt <matt@schick.mine.nu> ! *crowd goes wild*
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 002444571765..88dbea1e00db 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,8 +1,6 @@
-MD5 4329fc2d3a4f1c5857ba369ec0def44d kmplayer-0.7.4a.ebuild 521
-MD5 cfc88bdb65c8725afc27de9eaa4d4d40 kmplayer-0.7.2.ebuild 552
-MD5 d74aa528a97abcc70587566fd140a631 ChangeLog 1806
-MD5 744b95f3432384cf1679d25d2b3ddc43 kmplayer-0.7.3.ebuild 523
-MD5 06e1172d65e2b66a3ffc373adfa5a8d4 files/digest-kmplayer-0.7.4a 68
-MD5 53e63d9cb0db59bedb5386345b274598 files/kmplayer-0.6.3-gentoo.diff 1352
-MD5 3aef317d51bc1fcd02d19f54a738229a files/digest-kmplayer-0.7.2 67
-MD5 6607e2cb0430ec426dba20936ee7a57d files/digest-kmplayer-0.7.3 67
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 02164fbf8b67b4e65dbb4831eaa97342 kmplayer-0.9.1.ebuild 1110
+MD5 896f6bb2ece9e3eeab213769b7b954cf ChangeLog 6837
+MD5 78cc0774c221e2df3449a9eefbb616f9 kmplayer-0.9.0c.ebuild 1113
+MD5 f29e659db42381b323bdabe29fa20a09 files/digest-kmplayer-0.9.1 67
+MD5 cc7843dcf532036a977b880a100fb2ac files/digest-kmplayer-0.9.0c 68
diff --git a/media-video/kmplayer/kmplayer-0.9.0c.ebuild b/media-video/kmplayer/kmplayer-0.9.0c.ebuild
index abafa2a08d8d..4689856f2d75 100644
--- a/media-video/kmplayer/kmplayer-0.9.0c.ebuild
+++ b/media-video/kmplayer/kmplayer-0.9.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-video/kmplayer/kmplayer-0.9.0c.ebuild,v 1.1 2005/08/29 12:43:52 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.0c.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit kde
 
@@ -8,20 +8,30 @@ MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="MPlayer frontend for KDE"
-HOMEPAGE="http://www.xs4all.nl/~jjvrieze/kmplayer.html"
-SRC_URI="http://www.xs4all.nl/~jjvrieze/${MY_P}.tar.bz2"
+HOMEPAGE="http://kmplayer.kde.org/"
+SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gstreamer mplayer xine"
 
 # Removed koffice plugin, since the compilation fails and it's not supported upstream.
-DEPEND="mplayer? ( >=media-video/mplayer-0.90 )
+DEPEND="xine? ( >=media-libs/xine-lib-1_beta12 )
+	gstreamer? ( >=media-libs/gst-plugins-0.8.7 )"
+RDEPEND="mplayer? ( >=media-video/mplayer-0.90 )
 	xine? ( >=media-libs/xine-lib-1_beta12 )
 	gstreamer? ( >=media-libs/gst-plugins-0.8.7 )"
 need-kde 3.1
 
+pkg_setup() {
+	if ! use mplayer && ! use xine ; then
+		echo
+		ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
+		ewarn "You can install mplayer later, though.\n"
+	fi
+}
+
 src_compile(){
 	local myconf="$(use_with gstreamer) $(use_with xine)"
 	kde_src_compile
diff --git a/media-video/kmplayer/kmplayer-0.9.1.ebuild b/media-video/kmplayer/kmplayer-0.9.1.ebuild
index ff4408456620..399b52983006 100644
--- a/media-video/kmplayer/kmplayer-0.9.1.ebuild
+++ b/media-video/kmplayer/kmplayer-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-video/kmplayer/kmplayer-0.9.1.ebuild,v 1.1 2005/10/30 16:47:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-video/kmplayer/metadata.xml
+++ b/media-video/kmplayer/metadata.xml
@@ -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-video/konverter/ChangeLog b/media-video/konverter/ChangeLog
index 4d33e87995f8..32141cbee7b6 100644
--- a/media-video/konverter/ChangeLog
+++ b/media-video/konverter/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for media-video/konverter
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/konverter/ChangeLog,v 1.1 2004/03/18 20:14:47 centic Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/konverter/ChangeLog,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
+
+  12 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  konverter-0.92_beta1.ebuild:
+  Add dependency on xine-lib (#89813).
+
+*konverter-0.92_beta1 (19 Apr 2005)
+
+  19 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -konverter-0.5.ebuild,
+  +konverter-0.92_beta1.ebuild:
+  new upstream version, fixes #58534
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> konverter-0.5.ebuild,
+  konverter-0.6.ebuild:
+  QA: need-kde after R/DEPEND
+
+  12 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> konverter-0.6.ebuild:
+  marked ~amd64
+
+*konverter-0.6 (04 Apr 2004)
+
+  04 Apr 2004; Dominik Stadler <centic@gentoo.org> konverter-0.6.ebuild:
+  Add ebuild for new Version 0.6
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> konverter-0.5.ebuild:
+  Added to ~ppc.
 
 *konverter-0.5 (18 Mar 2004)
 
diff --git a/media-video/konverter/Manifest b/media-video/konverter/Manifest
index cae026c87042..d0de244d0cba 100644
--- a/media-video/konverter/Manifest
+++ b/media-video/konverter/Manifest
@@ -1,3 +1,6 @@
-MD5 7d51d76555ca662bc922834d44a1e109 konverter-0.5.ebuild 2863
-MD5 5a6598b1a58a3c2894b85e24665db31c files/digest-konverter-0.4 65
-MD5 95c0b261b77765a208a0cbbdd09e78c8 files/digest-konverter-0.5 65
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 67a9c294cdeadc37370e8c3e496f0965 konverter-0.92_beta1.ebuild 573
+MD5 9c12d5972c3564aa2f46dce5ae26ef12 ChangeLog 1146
+MD5 5e328d2b2aee18d0c6dd9d2af5017969 konverter-0.6.ebuild 637
+MD5 1a1c26300ff0c3992e2a957be7b1b70c files/digest-konverter-0.92_beta1 72
+MD5 94ac335c777d2ab382f81d53ab7d34ff files/digest-konverter-0.6 65
diff --git a/media-video/konverter/konverter-0.6.ebuild b/media-video/konverter/konverter-0.6.ebuild
index b33cb9ad43f1..9d36c0b95d6c 100644
--- a/media-video/konverter/konverter-0.6.ebuild
+++ b/media-video/konverter/konverter-0.6.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/konverter/konverter-0.6.ebuild,v 1.1 2004/04/04 20:51:41 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/konverter/konverter-0.6.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="A KDE MEncoder frontend for video-conversion."
 HOMEPAGE="http://www.libsdl.de/projects/konverter/"
 SRC_URI="http://p15108941.pureserver.info/libsdl/projects/${PN}/sources/${P}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 
 DEPEND="media-video/mplayer"
+need-kde 3
 
 src_install() {
 	einstall || die
-	dodoc ChangeLog TODO README NEWS INSTALL COPYING AUTHORS || die
+	dodoc ChangeLog TODO README NEWS INSTALL COPYING AUTHORS
 }
 
diff --git a/media-video/konverter/konverter-0.92_beta1.ebuild b/media-video/konverter/konverter-0.92_beta1.ebuild
index c5ecc4ccee36..69dfff7d427c 100644
--- a/media-video/konverter/konverter-0.92_beta1.ebuild
+++ b/media-video/konverter/konverter-0.92_beta1.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/konverter/konverter-0.92_beta1.ebuild,v 1.1 2005/04/19 20:12:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/konverter/konverter-0.92_beta1.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A KDE MEncoder frontend for video-conversion."
 HOMEPAGE="http://www.kraus.tk/projects/konverter/"
 SRC_URI="http://www.kraus.tk/projects/${PN}/sources/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
 
 SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 S=${WORKDIR}/${P/_/-}
 
-DEPEND="media-video/mplayer"
-need-kde 3
-
-src_install() {
-	einstall || die "make install failed"
-	dodoc ChangeLog TODO README NEWS INSTALL AUTHORS
-}
+DEPEND="media-libs/xine-lib
+	media-video/mplayer"
 
+need-kde 3
diff --git a/media-video/konverter/metadata.xml b/media-video/konverter/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-video/konverter/metadata.xml
+++ b/media-video/konverter/metadata.xml
@@ -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-video/kplayer/ChangeLog b/media-video/kplayer/ChangeLog
index e1197f48a9be..e195381e7b5e 100644
--- a/media-video/kplayer/ChangeLog
+++ b/media-video/kplayer/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for media-video/kplayer
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.1 2003/02/02 20:18:11 hannes Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+  28 May 2005; Carsten Lohrke <carlo@gentoo.org> kplayer-0.5.3.ebuild:
+  stable on x86
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*kplayer-0.5.3 (12 Jan 2005)
+
+  12 Jan 2005; Carsten Lohrke <carlo@gentoo.org> metadata.xml,
+  kplayer-0.5.2.ebuild, +kplayer-0.5.3.ebuild:
+  0.5.2 stable on x86, version bump
+
+*kplayer-0.5.2 (11 Oct 2004)
+
+  11 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +kplayer-0.5.2.ebuild:
+  version bump
+
+  03 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> kplayer-0.5.1.ebuild:
+  Marked ~amd64.
+
+  18 Jul 2004; Carsten Lohrke <carlo@gentoo.org> -kplayer-0.1.0.ebuild,
+  kplayer-0.2.0.ebuild, -kplayer-0.4.0.ebuild, kplayer-0.5.1.ebuild:
+  ebuild clean up, QA: newdepend -> R/DEPEND, need-kde after R/DEPEND
+
+*kplayer-0.5.1 (16 Jul 2004)
+
+  16 Jul 2004; Chris White <chriswhite@gentoo.org> +metadata.xml,
+  +kplayer-0.5.1.ebuild:
+  Version bump to 0.5.1. Thanks to Eric Ball <me@ericball.id.au> for posting the
+  bug. Created new metadata.xml and added myself as maintainer.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> kplayer-0.1.0.ebuild,
+  kplayer-0.2.0.ebuild, kplayer-0.4.0.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*kplayer-0.4.0 (09 Mar 2004)
+
+  09 Mar 2004; David Holm <dholm@gentoo.org> kplayer-0.4.0.ebuild:
+  Added to ~ppc.
+
+  09 Mar 2004; Brian Harring <ferringb@gentoo.org> :
+  Version bump to 0.4.0, closing bug 33374
+
+*kplayer-0.2.0 (12 Apr 2003)
+
+  12 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kplayer-0.2.0.ebuild:
+  version bump, closes bug #19165, thanks to b88901143@ms88.ntu.edu.tw
 
 *kplayer-0.1.0 (02 Feb 2003)
 
diff --git a/media-video/kplayer/Manifest b/media-video/kplayer/Manifest
index 2524bd00f9b5..d98054f91eb0 100644
--- a/media-video/kplayer/Manifest
+++ b/media-video/kplayer/Manifest
@@ -1,5 +1,4 @@
-MD5 bfc32df6debff894ec6ec18589a1d239 kplayer-0.1.0.ebuild 504
-MD5 47f8cea0cb357a529750c63d6eef82e2 kplayer-0.2.0.ebuild 529
-MD5 43cd20e21aabfb779f564df44361b8af ChangeLog 525
-MD5 bc92c03101a57c731863306048e522a2 files/digest-kplayer-0.1.0 69
-MD5 bc2b102a24f8195c784bd5c10a96e3fa files/digest-kplayer-0.2.0 69
+MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
+MD5 dfec547e174e8ebe5c8f19d0c65b7221 ChangeLog 1965
+MD5 798de6fa26bb30b09d94e5e90f9a9b76 kplayer-0.5.3.ebuild 507
+MD5 36a0accae5a9e1071ca74d73a261f8fd files/digest-kplayer-0.5.3 67
diff --git a/media-video/kplayer/kplayer-0.5.3.ebuild b/media-video/kplayer/kplayer-0.5.3.ebuild
index 6944b59c419c..74db8bcd64ac 100644
--- a/media-video/kplayer/kplayer-0.5.3.ebuild
+++ b/media-video/kplayer/kplayer-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.5.3.ebuild,v 1.1 2005/01/12 22:05:29 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kplayer/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND="media-video/mplayer"
diff --git a/media-video/kplayer/metadata.xml b/media-video/kplayer/metadata.xml
index 6fb162be6d97..8a4280444123 100644
--- a/media-video/kplayer/metadata.xml
+++ b/media-video/kplayer/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-video/ks3switch/ChangeLog b/media-video/ks3switch/ChangeLog
index 9d410250bdb9..04819ad58022 100644
--- a/media-video/ks3switch/ChangeLog
+++ b/media-video/ks3switch/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-video/ks3switch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ks3switch/ChangeLog,v 1.1 2002/08/06 13:27:18 danarmak Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ks3switch/ChangeLog,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Added missing metadata.xml.
+
+  06 Jul 2004; Carsten Lohrke <carlo@gentoo.org> ks3switch-0.1.ebuild:
+  QA: newdepend -> R/DEPEND, need-kde
+
+  23 May 2004; Seemant Kulleen <seemant@gentoo.org> ks3switch-0.1.ebuild:
+  URI and HOMEPAGE fix, thanks to: Francois Bochatay <francois@bochatay.net> in
+  bug #51565. Please note there's a little tail on the c in Francois that my
+  bash doesn't like
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ks3switch-0.1.ebuild:
+  inherit kde instead of deprecated kde-base
 
 *ks3switch-0.1 (06 Aug 2002)
 
diff --git a/media-video/ks3switch/Manifest b/media-video/ks3switch/Manifest
index e69de29bb2d1..a419555f7d86 100644
--- a/media-video/ks3switch/Manifest
+++ b/media-video/ks3switch/Manifest
@@ -0,0 +1,4 @@
+MD5 82796a4dd7b8a4ba0289ef531a692ab3 ks3switch-0.1.ebuild 486
+MD5 d35d290159059270ad78821b8c0398d7 ChangeLog 1045
+MD5 284a70da1011bec7eafebb5d5e4b0fb5 metadata.xml 247
+MD5 ed5d3705022cb527bb0e8eb03772b8d7 files/digest-ks3switch-0.1 65
diff --git a/media-video/ks3switch/ks3switch-0.1.ebuild b/media-video/ks3switch/ks3switch-0.1.ebuild
index 5c786a71e316..41a02053b0f5 100644
--- a/media-video/ks3switch/ks3switch-0.1.ebuild
+++ b/media-video/ks3switch/ks3switch-0.1.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-video/ks3switch/ks3switch-0.1.ebuild,v 1.1 2002/08/06 13:27:18 danarmak Exp $
-inherit kde-base
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ks3switch/ks3switch-0.1.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
-need-kde 3
+inherit kde
 
 DESCRIPTION="GUI for s3switch"
-SRC_URI="http://www.bochatay.net/francois/${P}.tar.gz"
-HOMEPAGE="http://www.bochatay.net/francois/ks3switch.html"
+HOMEPAGE="http://code.bochatay.net/ks3switch"
+SRC_URI="http://code.bochatay.net/ks3switch/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
+IUSE=""
 
-newdepend "sys-apps/s3switch"
+DEPEND="sys-apps/s3switch"
+RDEPEND="sys-apps/s3switch"
+need-kde 3
\ No newline at end of file
diff --git a/media-video/ks3switch/metadata.xml b/media-video/ks3switch/metadata.xml
index 9150541c31b4..5dd37336ce32 100644
--- a/media-video/ks3switch/metadata.xml
+++ b/media-video/ks3switch/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-video</herd>
+<herd>video</herd>
 <herd>media-tv</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
diff --git a/media-video/ksubtile/ChangeLog b/media-video/ksubtile/ChangeLog
index f23085ac43b4..6e592da5ede6 100644
--- a/media-video/ksubtile/ChangeLog
+++ b/media-video/ksubtile/ChangeLog
@@ -1,8 +1,24 @@
 # ChangeLog for media-video/ksubtile
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ksubtile/ChangeLog,v 1.1 2005/02/01 15:19:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ksubtile/ChangeLog,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
-  01 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> :
+*ksubtile-1.2 (10 Nov 2005)
+
+  10 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +ksubtile-1.2.ebuild:
+  New version.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> ksubtile-1.1.ebuild:
+  Added to ~ppc.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> ksubtile-1.1.ebuild:
+  Marked ~amd64 wrt bug #90719.
+
+  05 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> ksubtile-1.1.ebuild:
+  Stable on x86.
+
+*ksubtile-1.1 (01 Feb 2005)
+
+  01 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +ksubtile-1.1.ebuild:
   Initial import (#30907, #69906). Ebuild suggested by Thomas Ferencz
   <strangedr@gentoo.org> and Rodrigo Severo <rodrigo.lists@fabricadeideias.com>.
 
diff --git a/media-video/ksubtile/Manifest b/media-video/ksubtile/Manifest
index 298f29a65d49..ca9379ab89fc 100644
--- a/media-video/ksubtile/Manifest
+++ b/media-video/ksubtile/Manifest
@@ -1,4 +1,6 @@
-MD5 6af0687244e62a3e40c62c7e391754dc metadata.xml 181
-MD5 6b18381b00a3a728e9225a536357b89b ksubtile-1.1.ebuild 356
-MD5 38ed6a911abecc40b888431cf6adc042 ChangeLog 120
+MD5 01ba4a24c895931d11a8e08565712090 metadata.xml 175
+MD5 fce97dc70d24c44480ff169f0af76831 ksubtile-1.2.ebuild 492
+MD5 32dbb91a92c13545d36e23531e188939 ksubtile-1.1.ebuild 491
+MD5 dcd58c2b567ba08f888fd15383f2a604 ChangeLog 859
+MD5 89d7d5b6df696b39f4572488c8e2ce7f files/digest-ksubtile-1.2 64
 MD5 adb768142f4f9e60195bdab2a3c1e581 files/digest-ksubtile-1.1 67
diff --git a/media-video/ksubtile/ksubtile-1.1.ebuild b/media-video/ksubtile/ksubtile-1.1.ebuild
index ee18fcd27ccc..71f2e42e0ee1 100644
--- a/media-video/ksubtile/ksubtile-1.1.ebuild
+++ b/media-video/ksubtile/ksubtile-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-video/ksubtile/ksubtile-1.1.ebuild,v 1.1 2005/02/01 15:19:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ksubtile/ksubtile-1.1.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://ksubtile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ksubtile/${PN}_${PV}-2.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="media-video/mplayer"
 
diff --git a/media-video/ksubtile/ksubtile-1.2.ebuild b/media-video/ksubtile/ksubtile-1.2.ebuild
index e2eac0e2126a..f62ea5d12999 100644
--- a/media-video/ksubtile/ksubtile-1.2.ebuild
+++ b/media-video/ksubtile/ksubtile-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-video/ksubtile/ksubtile-1.2.ebuild,v 1.1 2005/11/10 17:26:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ksubtile/ksubtile-1.2.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 inherit kde
 
diff --git a/media-video/ksubtile/metadata.xml b/media-video/ksubtile/metadata.xml
index b5df5a8cb1a1..f397af66dd88 100644
--- a/media-video/ksubtile/metadata.xml
+++ b/media-video/ksubtile/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>video</herd>
 </pkgmetadata>
diff --git a/media-video/kyro-drivers/ChangeLog b/media-video/kyro-drivers/ChangeLog
index 6327c5c3376a..c923a23309c5 100644
--- a/media-video/kyro-drivers/ChangeLog
+++ b/media-video/kyro-drivers/ChangeLog
@@ -1,6 +1,25 @@
-# ChangeLog for media-video/kyro-kernel
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kyro-drivers/ChangeLog,v 1.1 2004/03/22 00:25:36 spyderous Exp $
+# ChangeLog for media-video/kyro-drivers
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kyro-drivers/ChangeLog,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
+
+  27 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Add myself as maintainer so I don't have to be on the alias.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  23 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  kyro-drivers-2.01.21.7.ebuild:
+  Fix SRC_URI. Noticed from ferringb's mirror-dist deletion page at
+  http://dev.gentoo.org/~ferringb/failure.xml.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  kyro-drivers-2.01.21.7.ebuild:
+  x86.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  kyro-drivers-2.00.20.516.ebuild:
+  Add inherit eutils
 
 *kyro-drivers-2.01.21.7 (21 Mar 2004)
 
@@ -19,7 +38,7 @@
   kyro-kernel-2.01.21.7.ebuild, metadata.xml:
   Version bump.
 
-*kyro-kernel-2.00.20.516 (02 Jun 2003)
+*kyro-drivers-2.00.20.516 (02 Jun 2003)
 
   02 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
   kyro-kernel-2.00.20.0427.ebuild, kyro-kernel-2.00.20.516.ebuild:
diff --git a/media-video/kyro-drivers/Manifest b/media-video/kyro-drivers/Manifest
index 5704f447831a..9b8113251481 100644
--- a/media-video/kyro-drivers/Manifest
+++ b/media-video/kyro-drivers/Manifest
@@ -1,7 +1,7 @@
-MD5 e64b83f0d2a09b62d131146639e3b87f ChangeLog 1163
-MD5 1c4350feeb7c515e82ea0a5b71f16b41 kyro-kernel-2.00.20.516.ebuild 1152
-MD5 86a018612d159617f7b9439763aee43c kyro-kernel-2.01.21.7.ebuild 1155
-MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 2308f8f2e7a449482a039aafc8c23c88 files/digest-kyro-kernel-2.00.20.516 68
+MD5 af1d178a992ae805bcc2c8ad0c664db3 ChangeLog 2028
+MD5 9a5c02196024aefd66ff3c70a37cf83c kyro-drivers-2.00.20.516.ebuild 1169
+MD5 e2be75a65372d0484bb1b5fe8c9c9cf0 kyro-drivers-2.01.21.7.ebuild 1224
+MD5 1a99c92c9a037a25087f3b1d1d1a8fd0 metadata.xml 260
+MD5 2308f8f2e7a449482a039aafc8c23c88 files/digest-kyro-drivers-2.00.20.516 68
+MD5 2b030d7956b28c42a2c37e60791e97a9 files/digest-kyro-drivers-2.01.21.7 66
 MD5 883c1813ce151154652f82412787ccb0 files/mtrr-include-fix.diff 272
-MD5 2b030d7956b28c42a2c37e60791e97a9 files/digest-kyro-kernel-2.01.21.7 66
diff --git a/media-video/kyro-drivers/kyro-drivers-2.00.20.516.ebuild b/media-video/kyro-drivers/kyro-drivers-2.00.20.516.ebuild
index 4d602a64e123..335c24c216f8 100644
--- a/media-video/kyro-drivers/kyro-drivers-2.00.20.516.ebuild
+++ b/media-video/kyro-drivers/kyro-drivers-2.00.20.516.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-video/kyro-drivers/kyro-drivers-2.00.20.516.ebuild,v 1.1 2004/03/22 00:25:36 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kyro-drivers/kyro-drivers-2.00.20.516.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
+
+inherit eutils
 
 MY_P=powervr-${PV%.*}-${PV#*.*.*.}
 S=${WORKDIR}/${MY_P}
@@ -11,6 +13,7 @@ SRC_URI="http://www.powervr.com/Drivers/Linux/${MY_P}.tgz"
 LICENSE="ImaginationTechnologies"
 SLOT="${KV}"
 KEYWORDS="-* x86"
+IUSE=""
 RESTRICT="nostrip"
 
 DEPEND="virtual/x11
diff --git a/media-video/kyro-drivers/kyro-drivers-2.01.21.7.ebuild b/media-video/kyro-drivers/kyro-drivers-2.01.21.7.ebuild
index b8c59d1d31c1..6b33502a170d 100644
--- a/media-video/kyro-drivers/kyro-drivers-2.01.21.7.ebuild
+++ b/media-video/kyro-drivers/kyro-drivers-2.01.21.7.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-video/kyro-drivers/kyro-drivers-2.01.21.7.ebuild,v 1.1 2004/03/22 00:25:36 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kyro-drivers/kyro-drivers-2.01.21.7.ebuild,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
 
 inherit eutils
 
-MY_P=powervr-${PV%.*}-${PV#*.*.*.}
+MY_PV="${PV%.*}-${PV#*.*.*.}"
+MY_P="powervr-${MY_PV}"
+MY_PRE_PV="${MY_PV/7/0007}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="XFree86 DRI drivers for the KyroII card"
 HOMEPAGE="http://www.powervr.com/"
-SRC_URI="http://www.powervr.com/Drivers/Linux/${MY_P}.tgz"
+SRC_URI="http://www.powervr.com/Downloads/Drivers/${MY_PRE_PV//./-}/${MY_P}.tgz"
 
 LICENSE="ImaginationTechnologies"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
+IUSE=""
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources
diff --git a/media-video/kyro-drivers/metadata.xml b/media-video/kyro-drivers/metadata.xml
index d458318e80ba..2765ab78cc8c 100644
--- a/media-video/kyro-drivers/metadata.xml
+++ b/media-video/kyro-drivers/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>xfree</herd>
+<herd>X11-drivers</herd>
+<maintainer>
+  <email>spyderous@gentoo.org</email>
+  <name>Donnie Berkholz</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/ldvd/ChangeLog b/media-video/ldvd/ChangeLog
index a6f5a443bf84..dbc8f525cea5 100644
--- a/media-video/ldvd/ChangeLog
+++ b/media-video/ldvd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ldvd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ldvd/ChangeLog,v 1.1 2005/03/29 05:11:26 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ldvd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> ldvd-1.9.4.ebuild:
+  Added to ~ppc.
 
 *ldvd-1.9.4 (29 Mar 2005)
 
diff --git a/media-video/ldvd/Manifest b/media-video/ldvd/Manifest
index 6dad35a22937..8e1a833f2b79 100644
--- a/media-video/ldvd/Manifest
+++ b/media-video/ldvd/Manifest
@@ -1,2 +1,4 @@
-MD5 df8f6663fc50f375e6fd49a98c90e05c ldvd-1.9.4.ebuild 561
+MD5 143c0037e374444d9a6e1edcc365e8f3 ChangeLog 517
+MD5 ece23893c40d8b8fe802da12926ba9f3 ldvd-1.9.4.ebuild 669
+MD5 3b48bbf9061ed96a98fce71b232f9213 metadata.xml 387
 MD5 b0beb8940effade8af0cc5c152d26fbf files/digest-ldvd-1.9.4 62
diff --git a/media-video/ldvd/ldvd-1.9.4.ebuild b/media-video/ldvd/ldvd-1.9.4.ebuild
index d1b8b97ac966..2664fabb4ef1 100644
--- a/media-video/ldvd/ldvd-1.9.4.ebuild
+++ b/media-video/ldvd/ldvd-1.9.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/media-video/ldvd/ldvd-1.9.4.ebuild,v 1.1 2005/03/29 05:11:26 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ldvd/ldvd-1.9.4.ebuild,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
 
 DESCRIPTION="dvd ripping tool with GUI"
 HOMEPAGE="http://ldvd9to5.gff-clan.net/"
 SRC_URI="http://files.gff-clan.net/pub/ldvd/testing/${P}.tar.bz2"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 SLOT="0"
 
diff --git a/media-video/linuxvideostudio/ChangeLog b/media-video/linuxvideostudio/ChangeLog
index 2e3d1bb0c845..d270c72eb9a3 100644
--- a/media-video/linuxvideostudio/ChangeLog
+++ b/media-video/linuxvideostudio/ChangeLog
@@ -1,9 +1,23 @@
 # ChangeLog for media-video/linuxvideostudio
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/linuxvideostudio/ChangeLog,v 1.1 2003/09/29 08:46:09 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/linuxvideostudio/ChangeLog,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  linuxvideostudio-0.1.7.ebuild:
+  Remove INSTALL documentation.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> linuxvideostudio-0.1.7.ebuild:
+  Added to ~ppc.
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  linuxvideostudio-0.1.7.ebuild:
+  QA - fix use invocation
 
 *linuxvideostudio-0.1.7 (29 Sep 2003)
 
+  23 Feb 2004; Marc Hildebrand <zypher@gentoo.org> linuxvideostudio-0.1.7.ebuild:
+  Added media-libs/gdk-pixbuf as dep, see bug #40064
+
   29 Sep 2003; Patrick Kursawe <phosphan@gentoo.org>
   linuxvideostudio-0.1.7.ebuild, metadata.xml:
   Initial import, suggested in bug 24011
diff --git a/media-video/linuxvideostudio/Manifest b/media-video/linuxvideostudio/Manifest
index e75cd1bfcd01..90eeb3fc406f 100644
--- a/media-video/linuxvideostudio/Manifest
+++ b/media-video/linuxvideostudio/Manifest
@@ -1,2 +1,14 @@
-MD5 5c013e8addd27c4d609cdae47582911e linuxvideostudio-0.1.7.ebuild 624
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 736f1b90104c8d9a6d709e96d783a697 ChangeLog 872
 MD5 65433bfc8e3aeddb1d94ad1b37f9d53e files/digest-linuxvideostudio-0.1.7 74
+MD5 8585f199ad97a340cbcaf2cde8946763 linuxvideostudio-0.1.7.ebuild 891
+MD5 f935ca6b6e2481293e6beb9700c64cd0 metadata.xml 347
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbycDj5H05b2HAEkRAjN8AJwIKUYlJt+gLRZO7iY8CCYeYKHA2ACgpl5l
+/iC7ikL0IDS8NBwecl0j0ls=
+=WLw4
+-----END PGP SIGNATURE-----
diff --git a/media-video/linuxvideostudio/linuxvideostudio-0.1.7.ebuild b/media-video/linuxvideostudio/linuxvideostudio-0.1.7.ebuild
index ae21fd2090a7..443b61d490d6 100644
--- a/media-video/linuxvideostudio/linuxvideostudio-0.1.7.ebuild
+++ b/media-video/linuxvideostudio/linuxvideostudio-0.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/linuxvideostudio/linuxvideostudio-0.1.7.ebuild,v 1.1 2003/09/29 08:46:09 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/linuxvideostudio/linuxvideostudio-0.1.7.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 DESCRIPTION="small-'n-simple GUI for the MJPEG-tools"
 HOMEPAGE="http://ronald.bitfreak.net/"
@@ -8,12 +8,13 @@ SRC_URI="http://ronald.bitfreak.net/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE="lirc"
 
 DEPEND=">=media-video/mjpegtools-1.6.0-r7
 		=x11-libs/gtk+-1.2*
+		media-libs/gdk-pixbuf
 		media-libs/libpng
 		media-libs/jpeg
 		lirc? ( app-misc/lirc )"
@@ -21,7 +22,7 @@ DEPEND=">=media-video/mjpegtools-1.6.0-r7
 src_compile() {
 	local myconf
 	# setting the --with-lircd option somehow makes the test fail
-	if [ -z $(use lirc) ]; then
+	if ! use lirc; then
 		myconf="--without-lircd"
 	fi
 	econf $myconf || die
@@ -30,5 +31,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS ChangeLog README TODO README.stv ChangeLog.stv INSTALL.stv INSTALL
+	dodoc AUTHORS ChangeLog README TODO README.stv ChangeLog.stv
 }
diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index be131718be88..334e0d382f31 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -1,8 +1,42 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.1 2003/09/03 22:13:24 lu_zero Exp $
+# ChangeLog for media-video/lives
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/ChangeLog,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
-*LiVES-0.7.1 (03 Sep 2003)
+*lives-0.9.5_pre3 (09 Apr 2005)
+
+  17 Jun 2005; Marc Hildebrand <zyper@gentoo.org> +lives-0.9.5_pre3.ebuild:
+  Version bump. Closes bug #96121, thanks to Andre Kloth for the ebuild.
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> lives-0.9.1.ebuild:
+  introduced libvisual support, controlled by the respective useflag. also
+  removed gdk-pixbuf dependency, fixes #75765
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> lives-0.7.1.ebuild,
+  lives-0.8.1.ebuild, lives-0.8.5.ebuild:
+  changed app-cdr/cdrtools dependency to virtual/cdrtools. see bug #77817.
+
+  11 Jan 2005; Luca Barbato <lu_zero@gentoo.org> lives-0.9.1.ebuild:
+  Workaround for amd64
+
+*lives-0.9.1 (16 Dec 2004)
+
+  16 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +lives-0.9.1.ebuild:
+  New version
+
+*lives-0.8.5 (03 Jun 2004)
+
+  03 Jun 2004; Luca Barbato <lu_zero@gentoo.org> +lives-0.8.5.ebuild:
+  New version
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> lives-0.8.1.ebuild:
+  Adding amd64 keyword. Closing #44305.
+
+*lives-0.8.1 (23 Dec 2003)
+
+  23 Dec 2003; Luca Barbato <lu_zero@gentoo.org> lives-0.8.1.ebuild:
+  New version
+
+*lives-0.7.1 (03 Sep 2003)
 
   03 Sep 2003; Luca Barbato <lu_zero@gentoo.org>:
   Thanks to Ian Haylock <haylocki@v21mail.co.uk> for the initial ebuild.
diff --git a/media-video/lives/Manifest b/media-video/lives/Manifest
index 9786d87f2cdc..e77a914e57b2 100644
--- a/media-video/lives/Manifest
+++ b/media-video/lives/Manifest
@@ -1,3 +1,22 @@
-MD5 60bec586c85a68fd0017881ec0a64c4f ChangeLog 229
-MD5 db6e99c8fc9433c189c0f65cd002679f lives-0.7.1.ebuild 847
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c9cc5cb939fa8d3a204759e50ceba4be lives-0.8.1.ebuild 1179
+MD5 3224c25483955d6626a0cb70fb790dd3 lives-0.7.1.ebuild 1018
+MD5 7669379140f795c39192d8c92c513817 lives-0.9.1.ebuild 1357
+MD5 d575a57a58b4f19072dd93169381b778 lives-0.9.5_pre3.ebuild 1458
+MD5 7a869ae1cd18658a7486607289aac4ca metadata.xml 221
+MD5 e1cd45e8a0008e22e1d605cf3bc31ccc lives-0.8.5.ebuild 1612
+MD5 79dd587b783bd9d6a249fceab2f047eb ChangeLog 1467
+MD5 c91e14653dd56cec040e0c713525d5dc files/digest-lives-0.8.1 135
+MD5 1b0651671174c9538041c40633dc0558 files/digest-lives-0.9.1 69
 MD5 2a440292415e6970c054d5b0fd0a2398 files/digest-lives-0.7.1 68
+MD5 14c653499dd72251adf4c09b5c57f6b3 files/digest-lives-0.8.5 68
+MD5 33ed8f5a5c0320b2ad572ef375640b99 files/digest-lives-0.9.5_pre3 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsqFxpNOQ4DjaQW0RAogAAKDOv0IlgWNKeBiyATzJY4/rDFh0kQCfRqzB
+0PWaNfNn3XymFGMbEmr3hgc=
+=l8YG
+-----END PGP SIGNATURE-----
diff --git a/media-video/lives/lives-0.7.1.ebuild b/media-video/lives/lives-0.7.1.ebuild
index 8bea129252df..d842dc4ceab3 100644
--- a/media-video/lives/lives-0.7.1.ebuild
+++ b/media-video/lives/lives-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.7.1.ebuild,v 1.1 2003/09/03 22:13:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
 DESCRIPTION="Linux Video Editing System"
 
@@ -27,7 +27,7 @@ DEPEND=">=media-video/mplayer-0.90-r2
 		>=media-libs/jpeg-6b-r3
 		>=media-sound/sox-12.17.3-r3
 		xmms? ( >=media-sound/xmms-1.2.7-r20 )
-		>=app-cdr/cdrtools-2.01_alpha14"
+		virtual/cdrtools"
 
 RDEPEND=""
 
diff --git a/media-video/lives/lives-0.8.1.ebuild b/media-video/lives/lives-0.8.1.ebuild
index 985e9d547481..d19978cd27a9 100644
--- a/media-video/lives/lives-0.8.1.ebuild
+++ b/media-video/lives/lives-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.8.1.ebuild,v 1.1 2003/12/23 18:35:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
 DESCRIPTION="Linux Video Editing System"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 IUSE="xmms"
 
@@ -28,7 +28,7 @@ DEPEND=">=media-video/mplayer-0.90-r2
 		>=media-libs/jpeg-6b-r3
 		>=media-sound/sox-12.17.3-r3
 		xmms? ( >=media-sound/xmms-1.2.7-r20 )
-		>=app-cdr/cdrtools-2.01_alpha14"
+		virtual/cdrtools"
 
 RDEPEND=""
 
diff --git a/media-video/lives/lives-0.8.5.ebuild b/media-video/lives/lives-0.8.5.ebuild
index 76506979fd8f..c966e0e69943 100644
--- a/media-video/lives/lives-0.8.5.ebuild
+++ b/media-video/lives/lives-0.8.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-video/lives/lives-0.8.5.ebuild,v 1.1 2004/06/03 21:13:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.8.5.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
 DESCRIPTION="Linux Video Editing System"
 
@@ -28,7 +28,7 @@ DEPEND=">=media-video/mplayer-0.90-r2
 		>=media-libs/jpeg-6b-r3
 		>=media-sound/sox-12.17.3-r3
 		xmms? ( >=media-sound/xmms-1.2.7-r20 )
-		>=app-cdr/cdrtools-2.01_alpha14"
+		virtual/cdrtools"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-video/lives/lives-0.9.1.ebuild b/media-video/lives/lives-0.9.1.ebuild
index 4b5d25716293..df101c6b372d 100644
--- a/media-video/lives/lives-0.9.1.ebuild
+++ b/media-video/lives/lives-0.9.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-video/lives/lives-0.9.1.ebuild,v 1.1 2004/12/16 14:25:22 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Linux Video Editing System"
 
@@ -17,13 +19,12 @@ SLOT="0"
 
 KEYWORDS="~x86 ~ppc ~amd64"
 
-IUSE="xmms matroska ogg theora"
+IUSE="xmms matroska ogg theora libvisual"
 
 DEPEND=">=media-video/mplayer-0.90-r2
 		>=media-gfx/imagemagick-5.5.6
 		>=dev-lang/perl-5.8.0-r12
 		>=x11-libs/gtk+-2.2.1
-		media-libs/gdk-pixbuf
 		media-libs/libsdl
 		>=media-video/ffmpeg-0.4.8
 		>=media-libs/jpeg-6b-r3
@@ -36,7 +37,7 @@ DEPEND=">=media-video/mplayer-0.90-r2
 					media-libs/libmatroska )
 		ogg? ( media-sound/ogmtools )
 		>=media-video/mjpegtools-1.6.2
-		"
+		libvisual? ( >=media-libs/libvisual-0.2.0 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,8 +46,10 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die
-	emake || die
+	use amd64 && append-flags -fPIC -DPIC
+	econf \
+		$(use_enable libvisual) || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
diff --git a/media-video/lives/lives-0.9.5_pre3.ebuild b/media-video/lives/lives-0.9.5_pre3.ebuild
index 4bf41799ed3d..c47e940c6deb 100644
--- a/media-video/lives/lives-0.9.5_pre3.ebuild
+++ b/media-video/lives/lives-0.9.5_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.9.5_pre3.ebuild,v 1.1 2005/06/17 10:09:28 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lives/lives-0.9.5_pre3.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/media-video/lives/metadata.xml b/media-video/lives/metadata.xml
index 03410066be67..ce6cc0094b16 100644
--- a/media-video/lives/metadata.xml
+++ b/media-video/lives/metadata.xml
@@ -4,8 +4,5 @@
 <herd>video</herd>
 <maintainer>
   <email>lu_zero@gentoo.org</email>
-<!--  <name>Full name</name> -->
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/media-video/lsdvd/ChangeLog b/media-video/lsdvd/ChangeLog
index cf5d4d0812a0..d379485fd85c 100644
--- a/media-video/lsdvd/ChangeLog
+++ b/media-video/lsdvd/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for media-video/lsdvd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.1 2003/03/05 22:54:54 vladimir Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
+
+*lsdvd-0.15 (08 Jun 2005)
+
+  08 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -lsdvd-0.7.ebuild,
+  lsdvd-0.10.ebuild, +lsdvd-0.15.ebuild:
+  New upstream version, fixes #95183.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> lsdvd-0.10.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> lsdvd-0.10.ebuild:
+  stable on amd64
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  31 Oct 2004; <iggy@gentoo.org> lsdvd-0.10.ebuild:
+  0.10 to x86
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.  Taking over as maintainer.
+
+  14 Apr 2004; Jason Wever <weeve@gentoo.org> lsdvd-0.10.ebuild:
+  Added ~sparc keyword.
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> lsdvd-0.10.ebuild,
+  lsdvd-0.7.ebuild:
+  fix depend (bug #45110); tidy
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> lsdvd-0.6.ebuild,
+  lsdvd-0.9.ebuild:
+  tidy number of ebuilds
+
+  02 Mar 2004; <augustus@gentoo.org> lsdvd-0.10.ebuild:
+  Added ~amd64 keyword.
+
+*lsdvd-0.10 (18 Nov 2003)
+
+  18 Nov 2003; Martin Holzer <mholzer@gentoo.org> lsdvd-0.10.ebuild:
+  Version bumped.
+
+  18 Nov 2003; Martin Holzer <mholzer@gentoo.org> lsdvd-0.6.ebuild,
+  lsdvd-0.7.ebuild, lsdvd-0.9.ebuild:
+  adding RESTRICT="nomirror"
+
+*lsdvd-0.9 (30 Jul 2003)
+
+  30 Jul 2003; Michael Cummings <mcummings@gentoo.org> lsdvd-0.9.ebuild:
+  acidrip requires at least 0.9 of lsdvd. spoke to robh and got his go ahead to
+  add this masked.
+
+*lsdvd-0.7 (22 Mar 2003)
+
+  22 Mar 2003; Graham Forest <vladimir@gentoo.org> lsdvd-0.7.ebuild:
+  Version bump
 
 *lsdvd-0.6 (05 Mar 2003)
 
diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest
index e69de29bb2d1..631cb8163894 100644
--- a/media-video/lsdvd/Manifest
+++ b/media-video/lsdvd/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f9f721df2a39fbd5b1562b1f20ef87d8 lsdvd-0.15.ebuild 576
+MD5 eef2e5bf3a8692feb0114782ccf8f85c lsdvd-0.10.ebuild 573
+MD5 f9f7f0ac4f3cea2a8865ac15efb5fa08 ChangeLog 1965
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 7c79ba5df2a82f2097890ac88e751d7d files/digest-lsdvd-0.10 61
+MD5 413017127b5d04811a6a1cf2340ba22d files/digest-lsdvd-0.15 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCpvzb06ebR+OMO78RAuYJAJwI+u77PfbGbeU/4yzDsQRL812q1ACeNtZN
+pog7DnoW0Ol+9ki14SCbNYM=
+=bUMN
+-----END PGP SIGNATURE-----
diff --git a/media-video/lsdvd/lsdvd-0.10.ebuild b/media-video/lsdvd/lsdvd-0.10.ebuild
index 6164b8349acd..009ca224d221 100644
--- a/media-video/lsdvd/lsdvd-0.10.ebuild
+++ b/media-video/lsdvd/lsdvd-0.10.ebuild
@@ -1,31 +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-video/lsdvd/lsdvd-0.10.ebuild,v 1.1 2003/11/18 17:31:09 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.10.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 DESCRIPTION="Utility for getting info out of DVDs"
-HOMEPAGE="http://acidrip.thirtythreeandathird.net"
+HOMEPAGE="http://acidrip.sourceforge.net"
 SRC_URI="mirror://sourceforge/acidrip/${P}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc x86 amd64 ~sparc"
 IUSE=""
 
-# Build-time dependencies, such as
-#    ssl? ( >=openssl-0.9.6b )
-#    >=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="=libdvdread-0.9*"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="=media-libs/libdvdread-0.9*"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS NEWS README
 }
diff --git a/media-video/lsdvd/lsdvd-0.15.ebuild b/media-video/lsdvd/lsdvd-0.15.ebuild
index 33d76f61cea5..ec6ca92bd963 100644
--- a/media-video/lsdvd/lsdvd-0.15.ebuild
+++ b/media-video/lsdvd/lsdvd-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-video/lsdvd/lsdvd-0.15.ebuild,v 1.1 2005/06/08 14:12:15 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.15.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 DESCRIPTION="Utility for getting info out of DVDs"
 HOMEPAGE="http://acidrip.sourceforge.net"
diff --git a/media-video/lsdvd/metadata.xml b/media-video/lsdvd/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/lsdvd/metadata.xml
+++ b/media-video/lsdvd/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/lve/ChangeLog b/media-video/lve/ChangeLog
index 42888d1ea6df..3e2c3e968046 100644
--- a/media-video/lve/ChangeLog
+++ b/media-video/lve/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for media-video/lve
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lve/ChangeLog,v 1.1 2004/05/01 14:25:48 zypher Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lve/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> lve-040322.ebuild:
+  Fix qt dep per bug #100235
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> lve-040322.ebuild:
+  Moved using toolchain-funcs
+
+  28 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> lve-040322.ebuild:
+  added missing libmpeg2 dependency. fixes #69229
+
+  12 Jan 2005; Chris White <chriswhite@gentoo.org> lve-040322.ebuild:
+  Fixed lots of broken things as far as CFLAGS and configuration.
+
+  05 Sep 2004; Malcolm Lashley <malc@gentoo.org> lve-040322.ebuild:
+  ~amd64 closes 59091
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> lve-040322.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  11 Jul 2004; Daniel Goller <morfic@gentoo.org> lve-040322.ebuild:
+  made a couple changes to the ebuild to allow compilation with gcc-3.4
+
+  04 May 2004; Marc Hildebrand <zypher@gentoo.org> lve-040322.ebuild :
+  Changed xfree dependency to virtual/x11
+
+  02 May 2004; David Holm <dholm@gentoo.org> lve-040322.ebuild:
+  Added to ~ppc.
+
+  01 May 2004; Aron Griffis <agriffis@gentoo.org> lve-040322.ebuild:
+  Add inherit eutils
 
 *lve-040322 (22 Mar 2004)
 
diff --git a/media-video/lve/Manifest b/media-video/lve/Manifest
index d84bdb8526da..fed5f2455ab4 100644
--- a/media-video/lve/Manifest
+++ b/media-video/lve/Manifest
@@ -1,5 +1,7 @@
-MD5 51340fe4a3f68791973027367d5bdbdd lve-040322.ebuild 1121
-MD5 b088dea309811978b424a8c438afa7fc ChangeLog 298
-MD5 1fe99652576bdf83ed189fdf976d85ab files/digest-lve-040322 132
+MD5 9f4df969c118be5187157d65ac9fbe30 lve-040322.ebuild 1795
+MD5 0c9da889f94d82b0988989f5263bca34 ChangeLog 1467
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 f6a56b9b5742f37d30acfe66fe559962 files/digest-lve-040322 136
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 645ad6f9362f014e0574e74743244039 files/040322-qtlib.patch 262
 MD5 6ac2650d872e299e257254f743e18744 files/040322-lve.patch 405
diff --git a/media-video/lve/files/digest-lve-040322 b/media-video/lve/files/digest-lve-040322
index 37700b256c43..494a5bf75524 100644
--- a/media-video/lve/files/digest-lve-040322
+++ b/media-video/lve/files/digest-lve-040322
@@ -1,2 +1,2 @@
 MD5 079f976cee2b26a96caf3e4428c6456d lve-040322.src.tar.bz2 736414
-MD5 e00d47614ba1afd99ad2ea387e782dd9 ffmpeg-0.4.8.tar.gz 1352874
+MD5 24c6e9073699ccdb8119b2fcfd476bd2 ffmpeg-20040322.tar.bz2 1301977
diff --git a/media-video/lve/lve-040322.ebuild b/media-video/lve/lve-040322.ebuild
index 272b72b882a2..81d02527bfbd 100644
--- a/media-video/lve/lve-040322.ebuild
+++ b/media-video/lve/lve-040322.ebuild
@@ -1,21 +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-video/lve/lve-040322.ebuild,v 1.1 2004/05/01 14:25:48 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lve/lve-040322.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+inherit eutils toolchain-funcs qt3
 
 # This is the version of ffmpeg lve must currently be compiled against
 FFMPEG="ffmpeg-0.4.8"
+PDATE=20${PV##*.}
 
 DESCRIPTION="Linux Video Editor"
 HOMEPAGE="http://lvempeg.sourceforge.net"
-SRC_URI="http://heanet.dl.sourceforge.net/sourceforge/lvempeg/lve-040322.src.tar.bz2
-http://heanet.dl.sourceforge.net/sourceforge/ffmpeg/ffmpeg-0.4.8.tar.gz"
+SRC_URI="mirror://sourceforge/lvempeg/lve-040322.src.tar.bz2
+	http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PDATE}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND=">=x11-base/xfree-4.3.0-r5
+IUSE=""
+KEYWORDS="~x86 ~ppc ~amd64"
+DEPEND="virtual/x11
 	>=media-libs/libsdl-1.2.6-r3
-	>=x11-libs/qt-3.3.0-r1"
+	$(qt_min_version 3.3)
+	media-libs/libmpeg2"
 
 
 src_unpack() {
@@ -26,12 +31,36 @@ src_unpack() {
 
 	# Patch to change LIB and BIN paths
 	epatch ${FILESDIR}/${PV}-lve.patch
+
+	cd ${WORKDIR}/lve
+
+	rm ffmpeg
+	ln -s ../ffmpeg-20040322 ffmpeg
+
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
+		sed -i "s:(T_REGION \*):T_REGION \*:" src/region.c || die "Source couldnt be fixed"
+		cd ffmpeg
+		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
+		cd ${WORKDIR}/lve
+	fi
 }
 
 src_compile() {
 	cd ${WORKDIR}/lve
 
-	make || die
+	make config
+
+	cd src
+	make global_config
+	cd ..
+
+	sed -e "s:CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+	-i src/global_config \
+	|| die "Could not patch in CFLAGS"
+
+	make CLFAGS="${CFLAGS}" || die
 }
 
 src_install() {
diff --git a/media-video/lxdvdrip/ChangeLog b/media-video/lxdvdrip/ChangeLog
index b73d39a8738d..8072e1ed46e6 100644
--- a/media-video/lxdvdrip/ChangeLog
+++ b/media-video/lxdvdrip/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for media-video/lxdvdrip
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/ChangeLog,v 1.1 2004/07/23 15:13:39 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
+
+  04 May 2005; David Holm <dholm@gentoo.org> lxdvdrip-1.42.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bugreport.
+
+*lxdvdrip-1.42 (23 Feb 2005)
+
+  23 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +lxdvdrip-1.42.ebuild:
+  version bump. fixes #82814
+
+*lxdvdrip-1.42_pre3 (07 Feb 2005)
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +lxdvdrip-1.42_pre3.ebuild:
+  new upstream version, fixes #81112
+
+*lxdvdrip-1.41_p3 (27 Jan 2005)
+
+  27 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +lxdvdrip-1.41_p3.ebuild:
+  new upstream release. also added ~amd64 to KEYWORDS. fixes bug #70153
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> lxdvdrip-1.10_pre2.ebuild,
+  lxdvdrip-1.10_pre5.ebuild, lxdvdrip-1.20_pre1-r1.ebuild,
+  lxdvdrip-1.20_pre1.ebuild, lxdvdrip-1.30_pre4.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+*lxdvdrip-1.30_pre4 (09 Oct 2004)
+
+  09 Oct 2004; Christian Parpart <trapni@gentoo.org>
+  +lxdvdrip-1.30_pre4.ebuild:
+  updated to new version, as requested in bug #66793
+
+  20 Sep 2004; Chris White <chriswhite@gentoo.org>
+  files/lxdvdrip-1.20_pre1-overflow.patch:
+  Fixed yet another issue. strncpy'ed buffers needed null terminated assurance.
+  Thanks to Florian Shilhabel that out for me.
+
+  19 Sep 2004; Chris White <chriswhite@gentoo.org>
+  files/lxdvdrip-1.20_pre1-overflow.patch:
+  Fixed the overflow patch.  Thanks to Florian Schilhabel for input on that.
+
+*lxdvdrip-1.20_pre1-r1 (19 Sep 2004)
+
+  19 Sep 2004; Chris White <chriswhite@gentoo.org>
+  +files/lxdvdrip-1.20_pre1-overflow.patch, +lxdvdrip-1.20_pre1-r1.ebuild:
+  Fixed this thing per security bug #64628.
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> lxdvdrip-1.20_pre1.ebuild:
+  Added to ~ppc.
+
+  05 Sep 2004; Malcolm Lashley <malc@gentoo.org> lxdvdrip-1.20_pre1.ebuild:
+  Add ~amd64 - closes bug #59090
+
+*lxdvdrip-1.20_pre1 (31 Aug 2004)
+
+  31 Aug 2004; Michael Imhof <tantive@gentoo.org> +lxdvdrip-1.20_pre1.ebuild:
+  Version bumped. Closes #62228.
+
+*lxdvdrip-1.10_pre5 (23 Jul 2004)
+
+  23 Jul 2004; Michael Imhof <tantive@gentoo.org> +lxdvdrip-1.10_pre5.ebuild:
+  Version bumped.
 
 *lxdvdrip-1.10_pre2 (23 Jul 2004)
 
diff --git a/media-video/lxdvdrip/Manifest b/media-video/lxdvdrip/Manifest
index 031a9d82e945..8f8fedf320a4 100644
--- a/media-video/lxdvdrip/Manifest
+++ b/media-video/lxdvdrip/Manifest
@@ -1,3 +1,19 @@
-MD5 06bdeb336705cae428bd73b3003796b7 lxdvdrip-1.10_pre2.ebuild 758
-MD5 06bdeb336705cae428bd73b3003796b7 lxdvdrip-1.10_pre1.ebuild 758
+MD5 a46d4b97ffc4ec7fa1ae8ce35e505664 ChangeLog 2477
+MD5 98ffb17e0e60ca73e26b84cc01000a08 lxdvdrip-1.10_pre2.ebuild 824
+MD5 faa88f4f50b963458131d92d9902be49 lxdvdrip-1.10_pre5.ebuild 824
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 34f1ee9687b0ac4675557ddc5b229a44 lxdvdrip-1.20_pre1.ebuild 836
+MD5 1f2085867aca8430be678e0ba64a8f53 lxdvdrip-1.20_pre1-r1.ebuild 908
+MD5 758018800ab6d96a6f1bcebd1ac475f0 lxdvdrip-1.30_pre4.ebuild 826
+MD5 e45c8af23f99443baa37eccf1301dad7 lxdvdrip-1.41_p3.ebuild 839
+MD5 ba363ccde4c8eae9ee357e83e3d19d62 lxdvdrip-1.42_pre3.ebuild 840
+MD5 7d7e560be0a6848a90cf43e206bf6bc6 lxdvdrip-1.42.ebuild 832
 MD5 877c7bda100ae6f083ce5137aae3e5b1 files/digest-lxdvdrip-1.10_pre2 67
+MD5 cd76c64399dac2e89416dd89ccf32dda files/digest-lxdvdrip-1.10_pre5 67
+MD5 57482d8cce4aacca938b4e43c345e578 files/digest-lxdvdrip-1.20_pre1 67
+MD5 57482d8cce4aacca938b4e43c345e578 files/digest-lxdvdrip-1.20_pre1-r1 67
+MD5 9b28c10d15e06eb087911a837ec3a97c files/lxdvdrip-1.20_pre1-overflow.patch 752
+MD5 10cbb6fe087db5e0ce75173d95d03df0 files/digest-lxdvdrip-1.30_pre4 67
+MD5 c79bf474d5d152eba84500037e5b4085 files/digest-lxdvdrip-1.41_p3 64
+MD5 7acdd334a9016bfaddcad1b1ede3963d files/digest-lxdvdrip-1.42_pre3 67
+MD5 0e271bb785f8bc65ef7d1be75c332f6a files/digest-lxdvdrip-1.42 62
diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.20_pre1-overflow.patch b/media-video/lxdvdrip/files/lxdvdrip-1.20_pre1-overflow.patch
index 7eb21b1c83bb..c551dd4ab663 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.20_pre1-overflow.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.20_pre1-overflow.patch
@@ -1,11 +1,26 @@
---- lxdvdrip.c_old	2004-09-19 14:49:07.013638160 +0900
-+++ lxdvdrip.c	2004-09-19 14:50:06.330620608 +0900
-@@ -333,7 +333,7 @@
+--- lxdvdrip.c_old	2004-09-20 01:47:51.957933304 +0900
++++ lxdvdrip.c	2004-09-20 01:49:26.367580856 +0900
+@@ -333,7 +333,10 @@
      char szPfad[4096];
      int i;
      char szVerzeichnis[1024];
 -    strcpy (szPfad, getenv ("PATH"));
 +    strncpy (szPfad, getenv ("PATH"), 4096);
++
++    szPfad[sizeof(szPfad) -1]='\0';
++
      strcpy (szVerzeichnis, "");
      for (i=0; i<strlen(szPfad); i++)
      {
+@@ -1033,7 +1036,10 @@
+ 
+         // Auslesen der Parameter aus einer Datei
+         // Zuerst lokal versuchen
+-        strcpy (szBefehl, getenv ("HOME"));
++        strncpy (szBefehl, getenv ("HOME"), 4096);
++
++	szBefehl[sizeof(szBefehl)-1]='\0';
++
+         strcat (szBefehl, "/.lxdvdrip.conf");
+         fConf=fopen(szBefehl, "r");
+         if (!fConf)
diff --git a/media-video/lxdvdrip/lxdvdrip-1.10_pre2.ebuild b/media-video/lxdvdrip/lxdvdrip-1.10_pre2.ebuild
index 511aae392d9e..98b271b0ad64 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.10_pre2.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.10_pre2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/lxdvdrip/lxdvdrip-1.10_pre2.ebuild,v 1.1 2004/07/23 15:13:39 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.10_pre2.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND=">=dvdauthor-0.6.9"
+DEPEND=">=media-video/dvdauthor-0.6.9"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.10_pre5.ebuild b/media-video/lxdvdrip/lxdvdrip-1.10_pre5.ebuild
index 8019d83e824d..5ed397438714 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.10_pre5.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.10_pre5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/lxdvdrip/lxdvdrip-1.10_pre5.ebuild,v 1.1 2004/07/23 15:34:07 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.10_pre5.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND=">=dvdauthor-0.6.9"
+DEPEND=">=media-video/dvdauthor-0.6.9"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.20_pre1-r1.ebuild b/media-video/lxdvdrip/lxdvdrip-1.20_pre1-r1.ebuild
index 8758110674a5..fb768368a90f 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.20_pre1-r1.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.20_pre1-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-video/lxdvdrip/lxdvdrip-1.20_pre1-r1.ebuild,v 1.1 2004/09/19 15:36:00 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.20_pre1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-DEPEND=">=dvdauthor-0.6.9"
+DEPEND=">=media-video/dvdauthor-0.6.9"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.20_pre1.ebuild b/media-video/lxdvdrip/lxdvdrip-1.20_pre1.ebuild
index 8b2fddb047c0..76b48c84fa70 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.20_pre1.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.20_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/lxdvdrip/lxdvdrip-1.20_pre1.ebuild,v 1.1 2004/08/30 23:15:59 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.20_pre1.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -11,9 +11,9 @@ SRC_URI="http://download.berlios.de/lxdvdrip/${MY_P}.tgz"
 HOMEPAGE="http://developer.berlios.de/projects/lxdvdrip/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-DEPEND=">=dvdauthor-0.6.9"
+DEPEND=">=media-video/dvdauthor-0.6.9"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.30_pre4.ebuild b/media-video/lxdvdrip/lxdvdrip-1.30_pre4.ebuild
index a77e1ff3f6de..a5c09bf7d243 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.30_pre4.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.30_pre4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/lxdvdrip/lxdvdrip-1.30_pre4.ebuild,v 1.1 2004/10/09 19:17:13 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.30_pre4.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND=">=dvdauthor-0.6.9"
+DEPEND=">=media-video/dvdauthor-0.6.9"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.41_p3.ebuild b/media-video/lxdvdrip/lxdvdrip-1.41_p3.ebuild
index 3bbc348d942c..eb10fa00df6e 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.41_p3.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.41_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/media-video/lxdvdrip/lxdvdrip-1.41_p3.ebuild,v 1.1 2005/01/27 20:15:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.41_p3.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.42.ebuild b/media-video/lxdvdrip/lxdvdrip-1.42.ebuild
index 25b14b7363e6..76290b23091a 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.42.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.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-video/lxdvdrip/lxdvdrip-1.42.ebuild,v 1.1 2005/02/23 18:05:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.42.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.berlios.de/lxdvdrip/${MY_P}.tgz"
 HOMEPAGE="http://developer.berlios.de/projects/lxdvdrip/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 DEPEND=">=media-video/dvdauthor-0.6.9"
 
diff --git a/media-video/lxdvdrip/lxdvdrip-1.42_pre3.ebuild b/media-video/lxdvdrip/lxdvdrip-1.42_pre3.ebuild
index 8407f00ad8d7..6f122375ed72 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.42_pre3.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.42_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.42_pre3.ebuild,v 1.1 2005/02/07 15:53:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lxdvdrip/lxdvdrip-1.42_pre3.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/matroxset/ChangeLog b/media-video/matroxset/ChangeLog
index 7a204b0e74cd..74f473ad8247 100644
--- a/media-video/matroxset/ChangeLog
+++ b/media-video/matroxset/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for media-video/mgavideo
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/matroxset/ChangeLog,v 1.1 2003/03/25 06:24:36 george Exp $
+# ChangeLog for media-video/matroxset
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/matroxset/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+  01 Sep 2005; Joel Martin <kanaka@gentoo.org> matroxset-0.4.ebuild:
+  0.4 stable on x86
+
+*matroxset-0.4 (29 Sep 2004)
+
+  29 Sep 2004; Joel Martin <kanaka@gentoo.org> +matroxset-0.4.ebuild:
+  Bumped version, added ncurses dependency
+
+  11 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> matroxset-0.3.ebuild:
+  Added amd64 keyword.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> matroxset-0.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 May 2004; David Holm <dholm@gentoo.org> matroxset-0.3.ebuild:
+  Added to ~ppc.
+
+  18 Mar 2004; Joel Martin <kanaka@gentoo.org> matroxset-0.3.ebuild,
+  metadata.xml:
+  Fix copyright, add metadata.xml, make description more descriptive.
 
 *matroxset-0.3 (23 Mar 2003)
  
diff --git a/media-video/matroxset/Manifest b/media-video/matroxset/Manifest
index e69de29bb2d1..e3865740378b 100644
--- a/media-video/matroxset/Manifest
+++ b/media-video/matroxset/Manifest
@@ -0,0 +1,6 @@
+MD5 f733c56bd278e547dc85e998a41a5ce8 ChangeLog 1242
+MD5 ec9a96c8e5c8f879039611063817d21f matroxset-0.3.ebuild 982
+MD5 954929dbdba2a3ddf63037a197b67bf3 metadata.xml 242
+MD5 00adaa8d68ef0d7a95a6cf1d94a6712d matroxset-0.4.ebuild 911
+MD5 26112125752e87510ab1ea7214ef4a1f files/digest-matroxset-0.3 63
+MD5 19f27c51bae69671315457b62927d34f files/digest-matroxset-0.4 64
diff --git a/media-video/matroxset/matroxset-0.3.ebuild b/media-video/matroxset/matroxset-0.3.ebuild
index d03907f77c6e..cc80179e4764 100644
--- a/media-video/matroxset/matroxset-0.3.ebuild
+++ b/media-video/matroxset/matroxset-0.3.ebuild
@@ -1,19 +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-video/matroxset/matroxset-0.3.ebuild,v 1.1 2003/03/25 06:24:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/matroxset/matroxset-0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 IUSE=""
 
 S=${WORKDIR}/${PN}
-DESCRIPTION="Matrox Utility"
+DESCRIPTION="Matrox utility to switch output modes (activate tvout)"
 HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/"
 SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/${P}.tar.gz"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 
 src_compile() {
 	cd ${S}
diff --git a/media-video/matroxset/matroxset-0.4.ebuild b/media-video/matroxset/matroxset-0.4.ebuild
index e085f48207a6..3a6d2c0c1c93 100644
--- a/media-video/matroxset/matroxset-0.4.ebuild
+++ b/media-video/matroxset/matroxset-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/matroxset/matroxset-0.4.ebuild,v 1.1 2004/09/29 21:08:05 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/matroxset/matroxset-0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ DEPEND="virtual/libc
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 src_compile() {
 	cd ${S}
diff --git a/media-video/maven-poke/ChangeLog b/media-video/maven-poke/ChangeLog
index 459d44618df7..81e5296b78ab 100644
--- a/media-video/maven-poke/ChangeLog
+++ b/media-video/maven-poke/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/maven-poke
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/maven-poke/ChangeLog,v 1.1 2004/03/18 15:24:18 kanaka Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/maven-poke/ChangeLog,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> maven-poke-0.0.1.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  maven-poke-0.0.1.ebuild:
+  virtual/glibc -> virtual/libc
 
 *maven-poke-0.0.1 (18 Mar 2004)
 
diff --git a/media-video/maven-poke/Manifest b/media-video/maven-poke/Manifest
index a848cf6d0427..4b952845bf59 100644
--- a/media-video/maven-poke/Manifest
+++ b/media-video/maven-poke/Manifest
@@ -1,2 +1,4 @@
-MD5 195b30f151005294bcda68971dc3757f maven-poke-0.0.1.ebuild 1068
+MD5 57857601f7fb667a3b11a4843c097be2 ChangeLog 559
+MD5 7c9299c91e57068d4d826c165c4dc8c0 maven-poke-0.0.1.ebuild 1064
+MD5 954929dbdba2a3ddf63037a197b67bf3 metadata.xml 242
 MD5 fd5e4e556ca00d9e434efec2b2dc50b3 files/digest-maven-poke-0.0.1 64
diff --git a/media-video/maven-poke/maven-poke-0.0.1.ebuild b/media-video/maven-poke/maven-poke-0.0.1.ebuild
index 1c18c6ae3f7d..efa798c82f31 100644
--- a/media-video/maven-poke/maven-poke-0.0.1.ebuild
+++ b/media-video/maven-poke/maven-poke-0.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-video/maven-poke/maven-poke-0.0.1.ebuild,v 1.1 2004/03/18 15:24:18 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/maven-poke/maven-poke-0.0.1.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 IUSE=""
 
@@ -9,11 +9,11 @@ DESCRIPTION="Matrox utility to read and set maven registers (tune tvout)"
 HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/"
 SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/${P}.tgz"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 src_compile() {
 	cd ${S}
diff --git a/media-video/metadata.xml b/media-video/metadata.xml
index 4426cc20486e..617297ee6c9b 100644
--- a/media-video/metadata.xml
+++ b/media-video/metadata.xml
@@ -4,5 +4,26 @@
 	<longdescription lang="en">
 		The media-video category contains video-related applications.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-video enthält Applikationen rund um das Thema Video.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-video contiene aplicaciones para video.
+	</longdescription>
+	<longdescription lang="ja">
+		media-videoカテゴリーにはビデオ関連のアプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De media-video categorie bevat video-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-video chứa các ứng dụng liên quan đến phim ảnh.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória media-video obsahuje aplikácie pre prácu s videomateriálom.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-video contiene applicazioni video.
+	</longdescription>
 </catmetadata>
 
diff --git a/media-video/mgavideo/ChangeLog b/media-video/mgavideo/ChangeLog
index ed86feb5e5e7..a93ea6d50c20 100644
--- a/media-video/mgavideo/ChangeLog
+++ b/media-video/mgavideo/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for media-video/mgavideo
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mgavideo/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-video/mgavideo/ChangeLog,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
+
+  02 Jan 2005; Daniel Drake <dsd@gentoo.org> mgavideo-0.1.0.ebuild:
+  Change virtual/kernel to virtual/linux-sources
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mgavideo-0.1.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mgavideo-0.1.0.ebuild:
+  Add inherit eutils
+
+  12 Jul 2003; Chris PeBenito <pebenito@gentoo.org> mgavideo-0.1.0.ebuild,
+  files/mgavideo-0.1.0-rmap_fix.patch:
+  Add fix so mgavideo can compile on a rmap kernel.
+
+*mgavideo-0.1.0 (08 Jun 2002)
+  
+  08 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> mgavideo-0.1.0.ebuild :
+
+  New version. (0.6 was a test version). See bug #3495
+ 
 
 *mgavideo-0.1.0.6 (1 Feb 2002)
 
+  8 May 2002; Jon Nelson <jnelson@gentoo.org> mgavideo-0.1.0.6.ebuild :
+  
+  Use check_KV and depend on portage >= 1.9.10
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-video/mgavideo/Manifest b/media-video/mgavideo/Manifest
index e69de29bb2d1..0b8d488399e4 100644
--- a/media-video/mgavideo/Manifest
+++ b/media-video/mgavideo/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b032851170c3d1e1106b68f180b8a15 ChangeLog 1561
+MD5 8d2f2950a74b68006dcaa01ef7c8c4e4 mgavideo-0.1.0.ebuild 1787
+MD5 284a70da1011bec7eafebb5d5e4b0fb5 metadata.xml 247
+MD5 134be36fbdc71740c294e9c6d30dab27 files/digest-mgavideo-0.1.0 66
+MD5 219dbcbe61f9163c297fe87e38b93273 files/mgavideo-0.1.0-rmap_fix.patch 484
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB2FbviJcSIUGNthERAkwvAKDGKmWPODonPgI+mjKl9lih+aLasgCdGBP4
+3Pmt5PcC9C9RGHULCKxc8ak=
+=kxAq
+-----END PGP SIGNATURE-----
diff --git a/media-video/mgavideo/metadata.xml b/media-video/mgavideo/metadata.xml
index 9150541c31b4..5dd37336ce32 100644
--- a/media-video/mgavideo/metadata.xml
+++ b/media-video/mgavideo/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-video</herd>
+<herd>video</herd>
 <herd>media-tv</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
diff --git a/media-video/mgavideo/mgavideo-0.1.0.ebuild b/media-video/mgavideo/mgavideo-0.1.0.ebuild
index 89e062e976a2..a40adc04d860 100644
--- a/media-video/mgavideo/mgavideo-0.1.0.ebuild
+++ b/media-video/mgavideo/mgavideo-0.1.0.ebuild
@@ -1,21 +1,27 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mgavideo/mgavideo-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
 
-A=${PN}-0.1.0.tar.gz
-S=${WORKDIR}/${PN}-0.1.0/driver
-SRC_URI="http://telia.dl.sourceforge.net/marvel/${A}"
+inherit eutils
+
+S=${WORKDIR}/${P}/driver
 DESCRIPTION="Matrox Marvel G200/G400/Rainbow Runner G-series V4L I and II
 drivers"
 HOMEPAGE="http://marvel.sourceforge.net"
+SRC_URI="mirror://sourceforge/marvel/${P}.tar.gz"
 
-DEPEND="virtual/glibc
-	virtual/kernel"
+DEPEND="virtual/libc"
+RDEPEND="virtual/linux-sources"
 
-RDEPEND="virtual/kernel"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	[ -f /usr/src/linux/mm/rmap.c ] && epatch ${FILESDIR}/${P}-rmap_fix.patch
 
 	# This allows us to compile the i2c-algo-ks.o module even if the user doesn't have
 	# the i2c-core.o module, incase they want to compile that later.  At the end of this
@@ -53,11 +59,7 @@ src_install() {
 pkg_postinst() {
 	depmod -a
 	if [ ! -f /lib/modules/${KVERS}/kernel/drivers/i2c/i2c-core.o ] ; then
-		echo
-		echo '###############################################################'
-		echo '##  WARNING: i2c support must be compiled into your kernel   ##'
-		echo '##  as a module for these drivers to work.                   ##'
-		echo '###############################################################'
-		echo
+		ewarn "i2c support must be compiled into your kernel as a module"
+		ewarn "for these drivers to work."
 	fi
 }
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 045edcb5f893..1237feef2329 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,11 +1,462 @@
 # ChangeLog for media-video/mjpegtools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/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-video/mjpegtools/ChangeLog,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
 
-*mjpegtools-1.5.20011611-r1 (1 Feb 2002)
+  13 Nov 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r4.ebuild,
+  mjpegtools-1.8.0-r1.ebuild:
+  avifile removed
+
+*mjpegtools-1.8.0-r1 (01 Nov 2005)
+
+  01 Nov 2005; Simon Stelling <blubb@gentoo.org>
+  +mjpegtools-1.8.0-r1.ebuild:
+  revision bump to enable SIMD extensions on amd64; bug 108417
+
+*mjpegtools-1.8.0 (19 Sep 2005)
+
+  05 Oct 2005; Marc Hildebrand <zypher@gentoo.org>
+  +mjpegtools-1.8.0.ebuild:
+  Version bump, closes bug #107824. Thanks to Paul Dunwoody for the ebuild.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  mjpegtools-1.6.2-r4.ebuild:
+  Mark 1.6.2-r4 stable on alpha
+
+  06 Aug 2005; Doug Goldstein <cardoe@gentoo.org>
+  -mjpegtools-1.6.2-r3.ebuild:
+  remove old version that had some old stuff that was making the reporter 
+  of bug #100974 angry
+
+  28 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild, mjpegtools-1.6.2-r4.ebuild:
+  Updated dependeny over jpeg-mmx as per bug #100554.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> mjpegtools-1.6.2-r4.ebuild:
+  Stable on ppc64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mjpegtools-1.6.2-r4.ebuild:
+  Stable on ppc.
+
+  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mjpegtools-1.6.2-r4.ebuild:
+  Stable on sparc
+
+  06 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mjpegtools-1.6.2-r4.ebuild:
+  stable on amd64 and x86.
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild:
+  Stable on sparc
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild, mjpegtools-1.6.2-r4.ebuild:
+  Moved to use toolchain-functs eclass.
+
+  08 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  mjpegtools-1.6.2-r4.ebuild:
+  ~alpha keyword.
+
+*mjpegtools-1.6.2-r4 (17 Apr 2005)
+
+  17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +mjpegtools-1.6.2-r4.ebuild:
+  added a patch to fix #78404. thanks to Kevin F. Quinn <co@kevquinn.com> and
+  Ned Ludd <solar@gentoo.org>
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/mjpegtools-1.6.2-libquicktime094.patch, mjpegtools-1.6.2-r3.ebuild:
+  added patch to make compilation with libquicktime-0.9.4 possible (patch based
+  on upstream cvs), also enabled largefile support which fixes #66039
+
+  27 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/mjpegtools-1.6.2-configure.patch, mjpegtools-1.6.2-r3.ebuild:
+  Updated ebuild, from Diego Pettenò <dgp85@users.sourceforge.net>
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/1.6.0-r7-ppc.patch, -files/mjpegtools-1.6.0-gcc3.patch,
+  -files/mjpegtools-1.6.1.91-fPIC.patch,
+  -files/mjpegtools-1.6.1.92-fPIC.patch,
+  -files/mjpegtools-1.6.1.93-fPIC.patch, -files/no-x11-lib.patch,
+  -mjpegtools-1.6.0-r7.ebuild, -mjpegtools-1.6.1.90-r2.ebuild,
+  -mjpegtools-1.6.2-r1.ebuild, mjpegtools-1.6.2-r3.ebuild:
+  Removing older versions. Fixing avifile dependency to accept newer versions
+  as it does compile with them.
+
+  15 Mar 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  yet another workaround for gcc
+
+  13 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/mjpegtools-1.6.2-dv.patch, mjpegtools-1.6.2-r3.ebuild:
+  Fixed libdv issues
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild:
+  changed the dv and yv12 use_enable logic, fixes #79379
+
+  20 Feb 2005; Joseph Jezak <josejx@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  Changed the libtool fix to apply to everyone.
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  Stable on ppc64
+
+  11 Jan 2005; Luca Barbato <lu_zero@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  Deps updated, should fix bug #71867
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  added ~ppc64 to KEYWORDS; bug #74834
+
+  16 Dec 2004; Simon Stelling <blubb@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  fix libtool-stuff; bug #74664
+
+  14 Nov 2004; Simon Stelling <blubb@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  fix bug #70334 with a autoreconf
+
+  03 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild:
+  Temporary fix for the SDL-problem in bug 66927.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
+  Added ~sparc keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild:
+  Stable on amd64.
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +files/mjpegtools-1.6.2-nogtk.patch, mjpegtools-1.6.2-r3.ebuild:
+  mark x86
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +files/mjpegtools-1.6.2-nogtk.patch, mjpegtools-1.6.2-r3.ebuild:
+  strip -fstack-protector if compiled with mmx|3dnow|sse, bug #37972
+
+  05 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/mjpegtools-1.6.2-gcc34-altivec.patch, mjpegtools-1.6.2-r3.ebuild:
+  Minor fix for altivec
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  mjpegtools-1.6.2-r1.ebuild:
+  Fixed BUG #55222. -fPIC neccessary for libmjpegutils.a, as it is used to
+  create shared objects.
+
+*mjpegtools-1.6.2-r3 (23 Jun 2004)
+
+  23 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  files/mjpegtools-1.6.2-fPIC.patch, -mjpegtools-1.6.2-r2.ebuild,
+  +mjpegtools-1.6.2-r3.ebuild:
+  Make sure the libraries get built with -fPIC otherwise people like ppc get mad
+  #47335 by Heinrich Wendel.
+
+  14 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
+  +files/altivec-fix-1.6.2.patch, mjpegtools-1.6.2-r2.ebuild:
+  Added a patch to fix compilation-errors on PowerPC with Altivec disabled. This
+  may happen if the code is being compiled for a G3-processor (-mcpu=G3 or
+  -mcpu=750). It patches the configure.in-file. Added ~ppc to KEYWORDS.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
+  mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.2-r1.ebuild,
+  mjpegtools-1.6.2-r2.ebuild:
+  Fix use invocation
+
+*mjpegtools-1.6.2-r2 (17 May 2004)
+
+  17 May 2004; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  mjpegtools-1.6.2-r2.ebuild,
+  Adding optional yv12 support and changing CFLAGS handling as suggested in bug
+  #42414
+  Corrected metadata syntax.
+
+  17 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.91.ebuild,
+  mjpegtools-1.6.1.92.ebuild, mjpegtools-1.6.1.93.ebuild,
+  mjpegtools-1.6.1.ebuild, mjpegtools-1.6.2.ebuild:
+  Big cleanup.
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> mjpegtools-1.6.2-r1.ebuild:
+  added new hardened PIE SSP switches
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org>
+  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild,
+  mjpegtools-1.6.1.91.ebuild, mjpegtools-1.6.1.92.ebuild,
+  mjpegtools-1.6.1.93.ebuild, mjpegtools-1.6.2.ebuild:
+  removed hardened-gcc logic, added filter-flags fPIC logic
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/mjpegtools-1.6.2-gcc34.patch, mjpegtools-1.6.2-r1.ebuild:
+  added fix for compiling with gcc 3.4. thanks go to Igor V. Kovanlenko and
+  "LordKow". MOOOO!
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild,
+  mjpegtools-1.6.1.91.ebuild, mjpegtools-1.6.1.92.ebuild,
+  mjpegtools-1.6.1.93.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  mjpegtools-1.6.1.90-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild,
+  mjpegtools-1.6.1.91.ebuild, mjpegtools-1.6.1.92.ebuild,
+  mjpegtools-1.6.1.93.ebuild:
+  Add die following econf for bug 48950
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.2-r1.ebuild:
+  fixing via ezra. closes 48160
+
+  15 Apr 2004; Scott W Taylor <swtaylor@gentoo.org>
+  mjpegtools-1.6.2-r1.ebuild:
+  More universal check for hardened
+
+  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mjpegtools-1.6.0-r7.ebuild, mjpegtools-1.6.1.90-r1.ebuild,
+  mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.1.91.ebuild,
+  mjpegtools-1.6.1.92.ebuild, mjpegtools-1.6.1.93.ebuild,
+  mjpegtools-1.6.1.ebuild, mjpegtools-1.6.2-r1.ebuild,
+  mjpegtools-1.6.2.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  18 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.2-r1.ebuild:
+  Updating dependencies because of bug #38665
+
+  18 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.2-r1.ebuild:
+  Added the patch to the latest version aswell, see bug #44645
+
+  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.1.93.ebuild, files/no-x11-lib-2.patch:
+  Adding no-x11-lib patch, see bug #36771
+
+  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.1.90-r2.ebuild:
+  The no-x11-lib.patch should be only applied when not using X, see bug #42037.
+
+*mjpegtools-1.6.2-r1 (15 Mar 2004)
+*mjpegtools-1.6.1.90-r2 (15 Mar 2004)
+
+  15 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mjpegtools-1.6.2-r1.ebuild, mjpegtools-1.6.1.90-r2.ebuild:
+  Adding missing info directory entries (bug #38459).
+
+  24 Feb 2004; Martin Holzer <mholzer@gentoo.org>
+  files/mjpegtools-1.6.1.92-fPIC.patch, files/mjpegtools-1.6.1.93-fPIC.patch:
+  adding fPIC patches. Closes 39268.
+
+*mjpegtools-1.6.2 (05 Feb 2004)
+
+  05 Feb 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.2.ebuild:
+  Version bumped.
+
+*mjpegtools-1.6.1.93 (18 Jan 2004)
+
+  18 Jan 2004; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.93.ebuild:
+  Version bumped.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  mjpegtools-1.6.0-r7.ebuild:
+  set ppc in keywords
+
+*mjpegtools-1.6.1.92 (16 Jan 2004)
+
+  16 Jan 2004; Wout Mertens <wmertens@gentoo.org> mjpegtools-1.6.1.92.ebuild:
+  Version bump and disabling -fPIC on x86 where it fails. Also first go at
+  making it work for Via C3-I chips (That don't have the cmov instruction)
+  Closing #37133, #36502 and #30345
   
+  02 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> mjpegtools-1.6.1.91.ebuild:
+  Added fPIC patch to make it compile on amd64. Also updated dependencies so
+  that mmx, 3dnow and sse dependencies only gets pulled in for x86. Closing
+  #36843.
+
+  28 Dec 2003; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:
+  Fixed ebuild so it works better with non-x86 arches. Adding ~sparc keyword as
+  it compiled fine. Fixes bug #36680.
+
+*mjpegtools-1.6.1.91 (26 Nov 2003)
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.91.ebuild:
+  Version bumped.
+
+  14 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  mjpegtools-1.6.1.90-r1.ebuild:
+  updated slot. closes #30908.
+
+  06 Oct 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
+  files/mjpegtools-1.6.0-gcc3.patch:
+  Added gcc3 fix. Closes #25163.
+
+  23 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild:
+  Forward-port the hardened-gcc fixes.
+
+  20 Sep 2003; Alexander Gabert <pappy@gentoo.org> mjpegtools-1.6.1.90.ebuild:
+  added hardened-gcc exclusion gcc flags for failing assembler
+
+*mjpegtools-1.6.1.90-r1 (19 Sep 2003)
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild,
+  files/no-x11-lib.patch:
+  Remove dangling -lX11. Fixes bug 29070. Thanks to Christian Jiresjö for the
+  patch
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild:
+  Less aggressive flag filtering.
+
+  16 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild:
+  Bump to stable x86.
+
+*mjpegtools-1.6.1.90 (10 Sep 2003)
+
+  10 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild:
+  Bump to version 1.6.1.90.
+
+  25 Aug 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
+  mjpegtools-1.6.1.ebuild:
+  Require avifile < 0.7.38. Doesn't compile with the newest version.
+
+  04 Aug 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
+  mjpegtools-1.6.1.ebuild:
+  Adding more Filtering options.
+
+  15 Jul 2003; pvdabeel <pvdabeel@gentoo.org> mjpegtools-1.6.1.ebuild:
+  -ppc for now , lots of altivec troubles
+
+  16 Jun 2003; <msterret@gentoo.org> mjpegtools-1.6.1.ebuild:
+  use mirror:// in SRC_URI
+
+  10 Jun 2003; <msterret@gentoo.org> mjpegtools-1.6.0-r7.ebuild:
+  DEPEND on sed >= 4
+
+  09 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:
+  Added eutils which is needed for ppc. closes #19224.
+
+  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.ebuild:
+  Making gcc 2.95 compatible
+
+  01 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:
+  Making gcc 2.95 compatible
+
+*mjpegtools-1.6.1 (09 Feb 2003)
+
+  02 May 2003; Jon Portnoy <avenj@gentoo.org> mjpegtools-1.6.1.ebuild :
+  Made gtk-1.2 an optional dependency to fix bug #19804.
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.ebuild
+  files/digest-mjpegtools-1.6.1 ChangeLog :
+  Version bumped. Submitted by mathewalexander@surewest.net in #10970.
+
+*mjpegtools-1.6.0-r7 (27 Dec 2002)
+
+  29 Apr 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:
+  Adding filtering. Closes #16238.
+
+  01 Mar 2003; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.0-r7.ebuild:
+  Added ~sparc to keywords.
+
+  22 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild :
+  Fix problem in SRC_URI... see bug 16159
+
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild :
+  Disable quicktime support on alpha, where it doesn't build.
+  Mark stable on alpha in support of Gnome 2.2.
+
+  20 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild :
+  Make svgalib dependent on USE=svga.  This isn't really the best
+  fix because it's actually libsdl that depends on svgalib, but it
+  will do for the moment.  Add ~alpha to KEYWORDS and fix a couple
+  niglets in the ebuild.
+
+  18 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7 :
+  Added svgalib to DEPEND. Closes #15876.
+
+  10 Feb 2003; Mark Guertin <gerk@gentoo.org> mjpegtools-1.6.0-r7.ebuild
+  files/1.6.0-r7-ppc.patch:
+  Added patch to close bug #15441, thanks go to Lapo Calamandrei.
+
+  09 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild :
+  Marked as stable for x86. 
+
+  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mjpegtools-1.6.0-r7.ebuild :
+  Moved elibtoolize to src_compile.  Remove the unneeded 'if then fi' 's for
+  the 'mmx' 'sse' and '3dnow' USE flags in [R]DEPEND, as they are already
+  in [R]DEPEND ...
+
+*mjpegtools-1.6.0-r6 (03 Dec 2002)
+
+  18 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r6 :
+  Added svgalib to DEPEND. Closes #15876.
+
+  03 Dec 2002; Jon Nall <nall@gentoo.org> mjpegtools-1.6.0-r6.ebuild :
+  I didn't create this version. there was no ChangeLog entry for -r6
+  (though i think phoen][x's comment from 25 Nov 2002 refers to -r6.)
+  
+  I added ~ppc and made libmovtar mmx-dependent
+
+*mjpegtools-1.6.0-r5 (d1814 Nov 2002)
+
+  18 Feb 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r5 :
+  Added svgalib to DEPEND. Closes #15876.
+
+  25 Nov 2002; phoen][x <phoenix@gentoo.org>  mjpegtools-1.6.0-r5 :
+  Fixed a really evil bug which caused mjpegtools to fail in lavtools/
+  when merged with USE="quicktime" - the problem comes down to this:
+  lav_common.c and lav_io.c both use "dv_decoder_new(0,0,0);" which is
+  wrong because dv_decoder_new() doesn't take any arguments. I used sed
+  to work around that - it should work flawlessy now. This fixes bug #11163.
+
+  14 Nov 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  mjpegtools-1.6.0-r5.ebuild files/digest-mjpegtools-1.6.0-r5, ChangeLog : 
+  Filter compiler flags. Resolves bug #10962
+
+*mjpegtools-1.6.0-r4 (14 Nov 2002)
+
+  14 Nov 2002; Seemant Kulleen <seemant@gentoo.org>
+  mjpegtools-1.6.0-r4.ebuild files/digest-mjpegtools-1.6.0-r4 :
+  Added avifile as a dependency (based on "avi" USE flag), so that it
+  installs lav2divx utilities as well. Closes bug #10516 by
+  ajacoutot@lphp.org (ajacoutot)
+
+*mjpegtools-1.6.0-r3 (26 Jul 2002)
+
+  30 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+  Add missing deps on libdv and arts (tha latter one is optional); see
+  bug #7081.
+
+  26 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> mjpegtools-1.6.0-r3.ebuild :
+  Closes #4702. Also added nasm to dependancy list (if 3dnow, sse or mmx are in USE)
+  to make mjpegtools more optimized.
+
+*mjpegtools-1.6.0-r2 (08 Jul 2002)
+
+  08 Jul 2002; Spider <spider@gentoo.org> mjpegtools-1.6.0-r2.ebuild :
+  fixed remnants of ${D} in .la files
+  
+*mjpegtools-1.6.0-r1 (30 May 2002)
+
+  30 May 2002; Seemant Kulleen <seemant@gentoo.org>
+  mjpegtools-1.6.0-r1.ebuild files/digest-mjpegtools-1.6.0-r1 :
+  Fixed some dependency information, thanks to: aliz@telia.com (Daniel
+  Ahlberg) in bug #3108
+
+*mjpegtools-1.6.0 (26 May 2002)
+
+  26 May 2002; Seemant Kulleen <seemant@gentoo.org> mjpegtools-1.6.0.ebuild
+  files/digest-mjpegtools-1.6.0 :
+  Version bump to newest stable
+
+*mjpegtools-1.5.20011611-r2 (12 Apr 2002)
+  12 Apr 2002; Spider <spider@gentoo.org>
+  Updating dependency for libpng 1.2.1
+
+*mjpegtools-1.5.20011611-r1 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> 
+  mjpegtools-1.5.20011611-r1.ebuild :
+  Changed avifile USE flag to avi USE flag instead and cleaned up ebuild
+  a little.
+
+*mjpegtools-1.5.20011611-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-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index ef69afab2521..1f1c22ae014d 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,10 +1,17 @@
-MD5 6dc1f5f3dd310439bfa5f59f8d647b00 mjpegtools-1.6.0-r6.ebuild 2766
-MD5 cf0462eb5f7d08ea353754e085e2d42e mjpegtools-1.6.0-r5.ebuild 2295
-MD5 e0030893889b79022e2cfa4699e93a6b mjpegtools-1.6.0-r7.ebuild 2914
-MD5 39c34921becb38e9b97b56e861334994 ChangeLog 5106
-MD5 1cb4a07c74742d23bdc9086f7ad38255 mjpegtools-1.6.1.ebuild 2551
-MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147
-MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r5 147
-MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r6 147
-MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 7379b60b404afabffe16e31fb577db6f ChangeLog 17591
+MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
+MD5 0d8b5844ab88ae9b60a7785572273347 files/digest-mjpegtools-1.6.2-r4 213
+MD5 e0c5507384a9c0a03df00cde6fe67164 files/digest-mjpegtools-1.8.0 69
+MD5 e0c5507384a9c0a03df00cde6fe67164 files/digest-mjpegtools-1.8.0-r1 69
+MD5 1b2c526400f0a0f1e0c150c6ff42e8c6 files/mjpegtools-1.6.2-configure.patch 2592
+MD5 39b5dadaf6e522165490f099d98b954c files/mjpegtools-1.6.2-dv.patch 634
+MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
+MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
+MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
+MD5 ff67ff91c5a8ae610b882510d8d9f43c files/mjpegtools-1.6.2-libquicktime094.patch 12934
+MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
+MD5 6bc4c32743683d5ce9f4686ea9c32041 mjpegtools-1.6.2-r4.ebuild 3275
+MD5 17a5f76a3ddabbab6b62607b1ef093bb mjpegtools-1.8.0-r1.ebuild 2759
+MD5 0f4410c758d53e51381b2ced54eaa9ce mjpegtools-1.8.0.ebuild 2678
diff --git a/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch b/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch
index cf8b91f0801d..bac879b634b3 100644
--- a/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch
+++ b/media-video/mjpegtools/files/mjpegtools-1.6.2-fPIC.patch
@@ -1,11 +1,291 @@
---- utils/Makefile.in	2004-01-02 20:41:53.687970979 +0000
-+++ utils/Makefile.in	2004-01-02 20:42:03.468500179 +0000
-@@ -289,7 +289,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/aenc/Makefile.am,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- mjpeg/mjpeg_play/aenc/Makefile.am	2003/11/25 10:36:30	1.17
++++ mjpeg/mjpeg_play/aenc/Makefile.am	2004/03/03 17:55:45	1.18
+@@ -27,4 +27,4 @@
+ 	table_th.h \
+ 	wav_io.h
+ 
+-mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
++mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/Makefile.am,v
+retrieving revision 1.90
+retrieving revision 1.92
+diff -u -r1.90 -r1.92
+--- mjpeg/mjpeg_play/lavtools/Makefile.am	2004/01/01 19:59:55	1.90
++++ mjpeg/mjpeg_play/lavtools/Makefile.am	2004/03/03 17:55:45	1.92
+@@ -8,6 +8,8 @@
+         -I /usr/X11R6/include -I$(top_srcdir)/utils \
+ 	${GTK_CFLAGS} $(JPEG_CFLAGS)
+ 
++LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
++
+ # *********************************************************************
+ # Support lib
+ 
+@@ -133,113 +136,108 @@
+ 	yuvcorrect.h
+ 
+ ypipe_SOURCES = ypipe.c
+-ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
++ypipe_LDADD = $(LIBMJPEGUTILS)
+ 
+ yuv2lav_SOURCES = yuv2lav.c
+-yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+-		 liblavfile.la liblavjpeg.la ${LIBM_LIBS}
++yuv2lav_LDADD = $(LIBMJPEGUTILS) liblavfile.la liblavjpeg.la ${LIBM_LIBS}
+ 
+ transist_flt_SOURCES = transist.flt.c
+-transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
++transist_flt_LDADD = $(LIBMJPEGUTILS)
+ 
+ matteblend_flt_SOURCES = matteblend.flt.c
+-matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
++matteblend_flt_LDADD = $(LIBMJPEGUTILS)
+ 
+ multiblend_flt_SOURCES = multiblend.flt.c
+-multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
++multiblend_flt_LDADD = $(LIBMJPEGUTILS)
+ 
+ if HAVE_X
+   LAVPLAY_X_LIBS = $(X_LIBS) -lX11
+ endif
+ 
+ lavplay_SOURCES = lavplay.c
+-lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
++lavplay_LDADD = $(LIBMJPEGUTILS) \
+ 	liblavplay.la liblavjpeg.la liblavfile.la \
+ 	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS)
+ 
+ lavrec_SOURCES = lavrec.c
+-lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.a \
++lavrec_LDADD = $(LIBMJPEGUTILS) \
+ 	liblavrec.la liblavfile.la liblavjpeg.la \
+ 	@LIBGETOPT_LIB@ $(PTHREAD_LIBS)
+ 
+ testrec_SOURCES = testrec.c audiolib.c
+-testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
++testrec_LDADD = $(PTHREAD_LIBS) $(LIBMJPEGUTILS)
+ 
+ lav2yuv_SOURCES = lav2yuv.c lav_common.c
+-lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a \
++lav2yuv_LDADD = $(LIBMJPEGUTILS) \
+ 		liblavfile.la liblavjpeg.la $(DV_LIBS)
+ 
+ jpeg2yuv_SOURCES = jpeg2yuv.c
+-jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a liblavjpeg.la
++jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la
+ 
+ png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c
+-png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a -lpng -lz -lm
++png2yuv_LDADD = $(LIBMJPEGUTILS) -lpng -lz -lm
+ 
+ lavpipe_SOURCES = lavpipe.c pipelist.c
+-lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.a
++lavpipe_LDADD = $(LIBMJPEGUTILS)
+ 
+ yuvmedianfilter_SOURCES = yuvmedianfilter.c
+-yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.a
++yuvmedianfilter_LDADD = $(LIBMJPEGUTILS)
+ 
+ lav2wav_SOURCES = lav2wav.c
+-lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+-	 liblavfile.la
++lav2wav_LDADD = $(LIBMJPEGUTILS) liblavfile.la
+ 
+ lavtrans_SOURCES = lavtrans.c
+-lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+-	 liblavfile.la
++lavtrans_LDADD = $(LIBMJPEGUTILS) liblavfile.la
+ 
+ lavaddwav_SOURCES = lavaddwav.c
+-lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+-	 liblavfile.la
++lavaddwav_LDADD = $(LIBMJPEGUTILS) liblavfile.la
+ 
+ glav_SOURCES = glav.c glav_main.c
+-glav_LDADD = $(top_builddir)/utils/libmjpegutils.a ${GTK_LIBS}
++glav_LDADD = $(LIBMJPEGUTILS) ${GTK_LIBS}
+ 
+ lavvideo_SOURCES = lavvideo.c frequencies.c
+ 
+ yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
+-yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
++yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ 
+ yuvcorrect_SOURCES = yuvcorrect.c yuvcorrect_functions.c
+-yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
++yuvcorrect_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ 
+ yuvcorrect_tune_SOURCES = yuvcorrect_tune.c yuvcorrect_functions.c
+-yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
++yuvcorrect_tune_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ 
+ yuvplay_SOURCES = yuvplay.c
+-yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a
++yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(LIBMJPEGUTILS)
+ 
+ ppmtoy4m_SOURCES = ppmtoy4m.c colorspace.c subsample.c
+-ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
++ppmtoy4m_LDADD = $(LIBMJPEGUTILS)
+ 
+ pgmtoy4m_SOURCES = pgmtoy4m.c
+-pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a
++pgmtoy4m_LDADD = $(LIBMJPEGUTILS)
+ 
+ y4mtoppm_SOURCES = y4mtoppm.c colorspace.c subsample.c
+-y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.a
++y4mtoppm_LDADD = $(LIBMJPEGUTILS)
+ 
+ y4mcolorbars_SOURCES = y4mcolorbars.c colorspace.c subsample.c
+-y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.a
++y4mcolorbars_LDADD = $(LIBMJPEGUTILS)
+ 
+ lavinfo_SOURCES = lavinfo.c
+-lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+-	liblavfile.la
++lavinfo_LDADD = $(LIBMJPEGUTILS) liblavfile.la
+ 
+ y4mshift_SOURCES = y4mshift.c
+-y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.a
++y4mshift_LDADD = $(LIBMJPEGUTILS)
+ 
+ y4mblack_SOURCES = y4mblack.c
+-y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.a
++y4mblack_LDADD = $(LIBMJPEGUTILS)
+ 
+ y4mtoyuv_SOURCES = y4mtoyuv.c
+-y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.a
++y4mtoyuv_LDADD = $(LIBMJPEGUTILS)
+ 
+ yuv4mpeg_SOURCES = yuv4mpeg.c
+-yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.a
++yuv4mpeg_LDADD = $(LIBMJPEGUTILS)
+ 
+ yuvfps_SOURCES = yuvfps.c
+-yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.a
++yuvfps_LDADD = $(LIBMJPEGUTILS)
+ 
+ yuvinactive_SOURCES = yuvinactive.c
+-yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.a
++yuvinactive_LDADD = $(LIBMJPEGUTILS)
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/mpeg2enc/Makefile.am,v
+retrieving revision 1.67
+retrieving revision 1.68
+diff -u -r1.67 -r1.68
+--- mjpeg/mjpeg_play/mpeg2enc/Makefile.am	2003/12/20 17:33:38	1.67
++++ mjpeg/mjpeg_play/mpeg2enc/Makefile.am	2004/03/03 17:55:46	1.68
+@@ -26,6 +26,8 @@
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
+ 
++LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
++
+ lib_LTLIBRARIES = libmpeg2encpp.la
+ 
+ if HAVE_ASM_MMX
+@@ -113,24 +115,24 @@
+ 	-export-dynamic 
+ 
+ libmpeg2encpp_la_DEPENDENCIES = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(LIBMJPEGUTILS) \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+ 	$(top_builddir)/utils/libmotion.la \
+ 	$(LIBSIMDASM_LIB)
+ 
+ libmpeg2encpp_la_LIBADD = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(LIBMJPEGUTILS) \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+ 	$(top_builddir)/utils/libmotion.la \
+ 	$(LIBSIMDASM_LIB)
+ 
+ mpeg2enc_DEPENDENCIES = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(LIBMJPEGUTILS) \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(LIBMJPEGUTILS) \
+ 	@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS)
+ 
+ # VITAL: Override default compilation rules generated by automake...
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/mplex/Makefile.am,v
+retrieving revision 1.41
+retrieving revision 1.42
+diff -u -r1.41 -r1.42
+--- mjpeg/mjpeg_play/mplex/Makefile.am	2003/12/20 17:33:38	1.41
++++ mjpeg/mjpeg_play/mplex/Makefile.am	2004/03/03 17:55:46	1.42
+@@ -67,7 +67,7 @@
+ 	-export-dynamic 
+ 
+ libmplex2_la_LIBADD = \
+-	$(top_builddir)/utils/libmjpegutils.a
++	$(top_builddir)/utils/libmjpegutils.la
+ 
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ 
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/yuvdenoise/Makefile.am,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- mjpeg/mjpeg_play/yuvdenoise/Makefile.am	2003/12/20 17:33:39	1.18
++++ mjpeg/mjpeg_play/yuvdenoise/Makefile.am	2004/03/03 17:55:46	1.19
+@@ -25,5 +25,5 @@
+ 
+ yuvdenoise_LDADD = \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	@LIBM_LIBS@
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/yuvfilters/Makefile.am,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- mjpeg/mjpeg_play/yuvfilters/Makefile.am	2003/12/21 14:37:44	1.20
++++ mjpeg/mjpeg_play/yuvfilters/Makefile.am	2004/03/03 17:55:46	1.21
+@@ -7,7 +7,7 @@
+ noinst_LTLIBRARIES = libyuvfilters.la
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/utils
+-MJPEGLIB = $(top_builddir)/utils/libmjpegutils.a
++MJPEGLIB = $(top_builddir)/utils/libmjpegutils.la
+ 
+ libyuvfilters_la_SOURCES = \
+ 	addtask.c \
+===================================================================
+RCS file: /cvsroot/mjpeg/mjpeg_play/utils/Makefile.am,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- mjpeg/mjpeg_play/utils/Makefile.am	2003/12/20 17:33:38	1.21
++++ mjpeg/mjpeg_play/utils/Makefile.am	2004/03/03 17:55:46	1.22
+@@ -15,10 +15,14 @@
+ 
+ noinst_LTLIBRARIES = libmotion.la libcpuaccel.la
+ 
+-# FIXME: make this libtool (but static-only!) too
+-lib_LIBRARIES = libmjpegutils.a
++lib_LTLIBRARIES = libmjpegutils.la
+ 
+-libmjpegutils_a_SOURCES = \
++libmjpegutils_la_LDFLAGS = \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-export-dynamic
++
++libmjpegutils_la_SOURCES = \
+ 	mjpeg_logging.c \
+ 	mpegconsts.c \
+ 	mpegtimecode.c \
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
index 9c40384d9ae5..ed3689728c35 100644
--- a/media-video/mjpegtools/metadata.xml
+++ b/media-video/mjpegtools/metadata.xml
@@ -3,4 +3,10 @@
 <pkgmetadata>
 <herd>video</herd>
 <herd>media-tv</herd>
+<maintainer>
+  <email>media-video@gentoo.org</email>
+</maintainer>
+<maintainer>
+  <email>media-tv@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
index 703a16167797..3ddeed85c092 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild,v 1.1 2005/04/17 20:56:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
 
-inherit flag-o-matic gcc eutils
+inherit flag-o-matic toolchain-funcs eutils
 
 M4V="1"
 
@@ -14,16 +14,15 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
-IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
 
 RDEPEND="media-libs/jpeg
 	x86? ( media-libs/libmovtar
-		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
+		mmx? ( >=media-libs/jpeg-mmx-0.1.6 )
 	)
 	gtk? ( =x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2* )
-	avi? ( media-video/avifile )
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 4f6012b7fb6b..c8e8ceb724a5 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.1 2005/11/01 20:47:39 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
+IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
 
 RDEPEND="media-libs/jpeg
 	x86? ( media-libs/libmovtar
@@ -21,7 +21,6 @@ RDEPEND="media-libs/jpeg
 	)
 	gtk? ( =x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2* )
-	avi? ( media-video/avifile )
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
@@ -68,12 +67,12 @@ src_compile() {
 
 		[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
 	fi
-	
+
 	if use amd64; then
 		myconf="${myconf} --enable-simd-accel"
 		myconf="${myconf} --enable-cmov-extension"
 	fi
-	
+
 	econf \
 		$(use_with X x) \
 		$(use_enable dga xfree-ext) \
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0.ebuild
index b57111d39bbb..75dfc03b9d6a 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-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/media-video/mjpegtools/mjpegtools-1.8.0.ebuild,v 1.1 2005/10/05 08:06:32 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0.ebuild,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index da4128a9f6bd..0225b59ed1f5 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,214 @@
 # ChangeLog for media-video/mkvtoolnix
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.1 2003/07/20 08:01:32 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
+
+  19 Nov 2005; Joseph Jezak <josejx@gentoo.org> mkvtoolnix-1.5.5.ebuild:
+  Marked ppc stable for bug #111049.
+
+  05 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -mkvtoolnix-1.0.1.ebuild:
+  Remove old and broken 1.0.1 version.
+
+  05 Nov 2005; Luis Medinas <metalgod@gentoo.org> mkvtoolnix-1.5.5.ebuild:
+  Marked Stable on amd64. Bug #111049.
+
+  03 Nov 2005; <soulse@gentoo.org> mkvtoolnix-1.5.5.ebuild:
+  Stable on x86 wrt bug #111049.
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-wx_config.patch,
+  -files/mkvtoolnix-configure-checks.patch, -mkvtoolnix-0.9.5-r1.ebuild,
+  -mkvtoolnix-0.9.7-r1.ebuild, -mkvtoolnix-1.4.2.ebuild,
+  -mkvtoolnix-1.4.2-r1.ebuild, -mkvtoolnix-1.5.0.ebuild:
+  Cleanup old versions of mkvtoolnix.
+
+*mkvtoolnix-1.6.0 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mkvtoolnix-1.6.0.ebuild:
+  Bump to 1.6.0 version as per bug #105190.
+
+*mkvtoolnix-1.5.5 (03 Sep 2005)
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mkvtoolnix-1.5.5.ebuild:
+  Added mkvtoolnix 1.5.5 as per bug #104687. This time it fixes bug #91328 so
+  re-added ~amd64 marking.
+
+*mkvtoolnix-1.5.0 (02 Sep 2005)
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mkvtoolnix-1.5.0.ebuild:
+  Added mkvtoolnix 1.5.0. -amd64 until it's sorted out the crash on Add button.
+
+*mkvtoolnix-1.4.2-r1 (03 Jun 2005)
+
+  03 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mkvtoolnix-1.4.2-r1.ebuild:
+  Added new revision which uses wxGTK 2.6 instead of 2.4. Added an huge patch
+  to fix format string mismatch for 64-bit arches.
+
+  30 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mkvtoolnix-0.9.7-r1.ebuild, mkvtoolnix-1.0.1.ebuild,
+  mkvtoolnix-1.4.2.ebuild:
+  Fixed dependency over wxGTK 2.4 for all current ebuilds.
+
+  04 May 2005; David Holm <dholm@gentoo.org> mkvtoolnix-1.4.2.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+  24 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mkvtoolnix-1.0.1.ebuild:
+  Fixed dependencies for mkvtoolnix-1.0.1. Fixes #90224.
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> mkvtoolnix-1.0.1.ebuild:
+  1.0.1 stable on amd64, backported some changes from the 1.4.2 ebuild to the
+  1.0.1 ebuild
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mkvtoolnix-configure-checks.patch, mkvtoolnix-1.4.2.ebuild:
+  Cleanup of useflags, removed oggvorbis as it's a requested dependency, added
+  patch to enforce disabling of flac, renamed X useflag to wxwindows as it
+  enables wxGTK support. Moved wxwidget selection into pkg_setup (under
+  wxwindows useflag conditional).
+
+*mkvtoolnix-1.4.2 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -mkvtoolnix-0.9.4-r1.ebuild, -mkvtoolnix-1.0.ebuild,
+  -mkvtoolnix-1.4.0.ebuild, +mkvtoolnix-1.4.2.ebuild:
+  new upstream version, fixes #85078. also did some cleanup
+
+*mkvtoolnix-1.4.0 (11 Mar 2005)
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -mkvtoolnix-0.8.1.ebuild,
+  -mkvtoolnix-0.8.5.ebuild, -mkvtoolnix-0.8.7.ebuild,
+  -mkvtoolnix-0.8.8.ebuild, -mkvtoolnix-0.8.9.ebuild,
+  -mkvtoolnix-0.9.0.ebuild, -mkvtoolnix-0.9.1.ebuild,
+  -mkvtoolnix-0.9.2.ebuild, -mkvtoolnix-0.9.3.ebuild, mkvtoolnix-1.0.1.ebuild,
+  +mkvtoolnix-1.4.0.ebuild:
+  removed old versions, marked 1.0.1 stable on x86 and added 1.4.0 with ~amd64
+  KEYWORD.
+
+*mkvtoolnix-1.0.1 (29 Jan 2005)
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +mkvtoolnix-1.0.1.ebuild:
+  version bump. fixes #74542
+
+*mkvtoolnix-1.0 (07 Dec 2004)
+
+  07 Dec 2004; Martin Holzer <mholzer@gentoo.org> +mkvtoolnix-1.0.ebuild:
+  Version bumped. Closes 71699
+
+  07 Dec 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.8.ebuild:
+  x86 stable.
+
+*mkvtoolnix-0.9.7-r1 (07 Dec 2004)
+
+  07 Dec 2004; Martin Holzer <mholzer@gentoo.org>
+  +mkvtoolnix-0.9.4-r1.ebuild, +mkvtoolnix-0.9.5-r1.ebuild,
+  +mkvtoolnix-0.9.7-r1.ebuild:
+  Fixing gtk detect. closes 62543
+
+  27 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> mkvtoolnix-0.9.7.ebuild:
+  Fixing bug #69115 (libmatroska-0.7.4 needed).
+
+*mkvtoolnix-0.9.7 (25 Oct 2004)
+
+  25 Oct 2004; Anders Rune Jensen <arj@gentoo.org> mkvtoolnix-0.9.7.ebuild:
+  Version bumped. Closes #66954
+
+  02 Sep 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.5.ebuild:
+  fixing depend. closes 62563
+
+*mkvtoolnix-0.9.5 (29 Aug 2004)
+
+  29 Aug 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.5.ebuild:
+  Version bumped. Closes 61209
+
+*mkvtoolnix-0.9.4 (25 Aug 2004)
+
+  25 Aug 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.4.ebuild,
+  files/configure-wx_config.patch:
+  Version bumped. Closes 58284.
+
+*mkvtoolnix-0.9.3 (01 Aug 2004)
+
+  01 Aug 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.3.ebuild:
+  Version bumped.
+
+*mkvtoolnix-0.9.2 (27 Jul 2004)
+
+  27 Jul 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.2.ebuild:
+  Version bumped.
+
+*mkvtoolnix-0.9.1 (24 Jun 2004)
+
+  24 Jun 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.1.ebuild:
+  Version bumped. Closes 53816
+
+*mkvtoolnix-0.9.0 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.9.0.ebuild:
+  Version bumped.
+
+*mkvtoolnix-0.8.9 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.9.ebuild:
+  Version bumped. Closes 52601
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> mkvtoolnix-0.8.8.ebuild:
+  Added to ~ppc.
+
+*mkvtoolnix-0.8.8 (27 Apr 2004)
+
+  27 Apr 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.8.ebuild:
+  Version bumped.
+
+*mkvtoolnix-0.8.7 (10 Apr 2004)
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.7.ebuild:
+  Version bumped. Closes 47123
+
+  18 Mar 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.1.ebuild,
+  mkvtoolnix-0.8.5.ebuild:
+  updated src_uri
+
+  23 Feb 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.1.ebuild:
+  x86 stable.
+
+*mkvtoolnix-0.8.5 (23 Feb 2004)
+
+  23 Feb 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.5.ebuild:
+  Version bumped. Closes 42558
+
+  23 Feb 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.7.5.ebuild,
+  mkvtoolnix-0.7.7.ebuild, mkvtoolnix-0.8.0.ebuild, mkvtoolnix-0.8.1.ebuild:
+  updating depend. closes 42310
+
+*mkvtoolnix-0.8.1 (15 Jan 2004)
+
+  15 Jan 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.1.ebuild:
+  Version bumped. Closes 38000
+
+*mkvtoolnix-0.8.0 (04 Jan 2004)
+
+  04 Jan 2004; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.8.0.ebuild:
+  Version bumped. Closes 37126.
+
+*mkvtoolnix-0.7.7 (29 Dec 2003)
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.7.7.ebuild:
+  Version bumped.
+
+*mkvtoolnix-0.7.5 (21 Nov 2003)
+
+  21 Nov 2003; Martin Holzer <mholzer@gentoo.org> mkvtoolnix-0.7.5.ebuild:
+  Version bumped. Closes #33160.
+
+*mkvtoolnix-0.7.1 (05 Oct 2003)
+
+  05 Oct 2003; Joel Hill <hillster@gentoo.org> mkvtoolnix-0.7.1.ebuild:
+  Version Bump, added docs. closes #30355
 
 *mkvtoolnix-0.5.0 (20 Jul 2003)
 
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 34a6d1ad4035..26702d6fe3d8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,16 @@
-MD5 cf479085f33eb644d9b32ac75699559d mkvtoolnix-0.5.0.ebuild 796
-MD5 ec33f80b24e51dc28fbdf705bbd221e9 ChangeLog 363
-MD5 d9a1567f65f9ea747c24b1df1af798b7 files/digest-mkvtoolnix-0.5.0 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02a436708c965bd6bbb88c1e8896f7b9 ChangeLog 7223
+MD5 dc82e2c687345769c53a013331f2abb3 files/digest-mkvtoolnix-1.5.5 69
+MD5 91ac5c9285fd2276b87d33e01746488a files/digest-mkvtoolnix-1.6.0 69
+MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
+MD5 b6108f77ecc6287e1e86786261f0d40f mkvtoolnix-1.5.5.ebuild 1475
+MD5 63619e91f73daaecfcdf1412cff70352 mkvtoolnix-1.6.0.ebuild 1481
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf7c2csIHjyDViGQRAovTAJ9ejisiek1RNP033nThdy9vJm0kywCfb5nR
+FAY5cXOmiSKAV9wPr3RRW7c=
+=gxvc
+-----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild
index aa8f9bd08a4d..2d18b3942d6f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.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/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild,v 1.1 2005/09/03 10:24:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.5.5.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 inherit eutils wxwidgets
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gtk2 wxwindows flac bzip2 lzo"
 
 DEPEND=">=dev-libs/libebml-0.7.3
diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
index 65eb7d55c597..8d657b38e386 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-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/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild,v 1.1 2005/10/30 23:37:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
 
 inherit eutils wxwidgets
 
diff --git a/media-video/mmsv2/ChangeLog b/media-video/mmsv2/ChangeLog
index c9a857c214e5..2068376f87dd 100644
--- a/media-video/mmsv2/ChangeLog
+++ b/media-video/mmsv2/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for media-video/mmsv2
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/ChangeLog,v 1.1 2004/11/10 01:02:57 arj Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/ChangeLog,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
+
+  12 Oct 2005; Anders Rune Jensen <arj@gentoo.org> -mmsv2-1.0.ebuild, 
+  -mmsv2-1.0.1.ebuild, -mmsv2-1.0.3.ebuild:
+  Remove old versions
+
+*mmsv2-1.0.4 (23 Sep 2005)
+
+  23 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +mmsv2-1.0.4.ebuild:
+  New version.
+
+*mmsv2-1.0.3 (02 Sep 2005)
+
+  02 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +mmsv2-1.0.3.ebuild:
+  New version.
+
+  02 Sep 2005; Anders Rune Jensen <arj@gentoo.org> mmsv2-1.0.2.2.ebuild:
+  Mark stable on x86 and amd64
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> mmsv2-1.0.2.2.ebuild:
+  Added to ~ppc.
+
+*mmsv2-1.0.2.2 (05 Jul 2005)
+
+  05 Jul 2005; Anders Rune Jensen <arj@gentoo.org> +mmsv2-1.0.2.2.ebuild:
+  New version.
+
+  01 May 2005; Anders Rune Jensen <arj@gentoo.org> mmsv2-1.0.1.ebuild:
+  Marked stable on amd64 and x86.
+
+  21 Apr 2005; Anders Rune Jensen <arj@gentoo.org>
+  +files/fix-configure.diff,mmsv2-1.0.ebuild,mmsv2-1.0.1.ebuild:
+  Fix bug #89717
+	
+*mmsv2-1.0.1 (28 Mar 2005)
+
+  28 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +mmsv2-1.0.1.ebuild:
+  New version.
+
+  01 Mar 2005; Anders Rune Jensen <arj@gentoo.org> mmsv2-1.0.ebuild:
+  Fix compilation with svga enabled. Found by Andreas.
+	
+*mmsv2-1.0.0 (24 Jan 2005)
+
+  24 Jan 2005; Anders Rune Jensen <arj@gentoo.org> +mmsv2-1.0.ebuild:
+  New version. Works on amd64.
+	
+  21 Jan 2005; Anders Rune Jensen <arj@gentoo.org> mmsv2-0.9.3.ebuild:
+  Wrong name in ebuild found by Lars T. Mikkelsen. Also fix
+  dependency to sqlite version 2.
 
 *mmsv2-0.9.3 (10 Nov 2004)
 
diff --git a/media-video/mmsv2/Manifest b/media-video/mmsv2/Manifest
index 64f2501bc140..84dcb40c4656 100644
--- a/media-video/mmsv2/Manifest
+++ b/media-video/mmsv2/Manifest
@@ -1,3 +1,13 @@
-MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
-MD5 079d6e4d2d01043c407f795385024b2d mmsv2-0.93.ebuild 1513
+MD5 3355fac0a7a3fbf0c73b59d4dae11860 ChangeLog 1782
+MD5 15f841e3a249b011bec2ecda0ee6c223 files/config.diff 628
 MD5 930867e107776e2dbea0db0152cebbf0 files/digest-mmsv2-0.93 64
+MD5 2065e5ae3d1ae99b4de3f1489359fd95 files/digest-mmsv2-1.0.2.2 67
+MD5 ef17db3cdb3563e178fa10a68f64112a files/digest-mmsv2-1.0.4 65
+MD5 27ae21aa60c47ad6aaf5ab34e7eaf9d1 files/fix-configure.diff 534
+MD5 f4458312970b2d8e986d84a9d05a3a22 files/input-keyboard.diff 547
+MD5 c37b9e69a333c9c7eaead7353ea5ee9a files/input-lirc.diff 544
+MD5 9135587faf412d13acfbabc90302583c files/vgagl-compile-fix 633
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+MD5 9cb82c1bc9b9ad04be5014e871c2c815 mmsv2-0.93.ebuild 2054
+MD5 190d024ec157ac859f6cf7fbb42cfdec mmsv2-1.0.2.2.ebuild 1966
+MD5 7401af61752f62358feddfcc8603f739 mmsv2-1.0.4.ebuild 1966
diff --git a/media-video/mmsv2/mmsv2-0.93.ebuild b/media-video/mmsv2/mmsv2-0.93.ebuild
index 510ffb5f296e..17919883853e 100644
--- a/media-video/mmsv2/mmsv2-0.93.ebuild
+++ b/media-video/mmsv2/mmsv2-0.93.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/mmsv2/mmsv2-0.93.ebuild,v 1.1 2004/11/10 01:02:57 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/mmsv2-0.93.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE="debug lirc svga sdl xine"
 RDEPEND="media-libs/imlib2
 	media-libs/taglib
 	>=dev-libs/libpcre-4.3
-	>=dev-db/sqlite-2.8
+	=dev-db/sqlite-2*
 	media-tv/xmltv
 	lirc? ( app-misc/lirc )
 	svga? ( media-libs/svgalib )
@@ -80,7 +80,7 @@ src_install() {
 	     BINDIR=${D}/usr/bin \
 	     CONFIGDIR=${D}/etc/mms \
 	     DATADIR=${D}/usr/share/mms \
-	     install || die "Failed to install MPlayer!"
+	     install || die "Failed to install mmsv2!"
 
 	dodoc doc/BUGS doc/Changelog doc/LICENSE doc/README doc/TODO
 }
@@ -88,6 +88,6 @@ src_install() {
 pkg_postinst() {
 	einfo "Be sure to change /etc/mms/config and /etc/mms/input* to your needs"
 	einfo "You also need to place a TV.xml file in /etc/mms for epg to work"
-	einfo ""
+	einfo
 	einfo "Documentation is available online: http://mms.sunsite.dk/doc/index.html"
 }
diff --git a/media-video/mmsv2/mmsv2-1.0.2.2.ebuild b/media-video/mmsv2/mmsv2-1.0.2.2.ebuild
index a47a1a3e92e8..270d849b9f3d 100644
--- a/media-video/mmsv2/mmsv2-1.0.2.2.ebuild
+++ b/media-video/mmsv2/mmsv2-1.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/media-video/mmsv2/mmsv2-1.0.2.2.ebuild,v 1.1 2005/07/05 01:39:24 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/mmsv2-1.0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://mms.sunsite.dk/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug lirc svga sdl dvb xine"
 
 RDEPEND="media-libs/imlib2
@@ -81,6 +81,6 @@ src_install() {
 pkg_postinst() {
 	einfo "Be sure to change /etc/mms/config and /etc/mms/input* to your needs"
 	einfo "You also need to place a TV.xml file in /etc/mms for epg to work"
-	einfo ""
+	einfo
 	einfo "Documentation is available online: http://mms.sunsite.dk/doc/index.html"
 }
diff --git a/media-video/mmsv2/mmsv2-1.0.4.ebuild b/media-video/mmsv2/mmsv2-1.0.4.ebuild
index 0e28f12f0f43..49afdc4ee577 100644
--- a/media-video/mmsv2/mmsv2-1.0.4.ebuild
+++ b/media-video/mmsv2/mmsv2-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/media-video/mmsv2/mmsv2-1.0.4.ebuild,v 1.1 2005/09/23 18:32:15 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/mmsv2-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index c04283a1d9cc..3acfb666255d 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for media-video/avifile
+# ChangeLog for media-video/motion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.1 2005/04/08 01:34:56 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
+
+  19 May 2005; Jan Brinkmann <luckyduck@gentoo.org> +metadata.xml,
+  motion-3.1.19.ebuild:
+  added ~amd64 to KEYWORDS, fixes #93110
+
+  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> motion-3.1.19.ebuild:
+  ~alpha keyword, bug 89340.
 
 * motion-3.1.19 (08 Apr 2005):
   08 Apr 2005 - Pieter Van den Abeele <pvdabeel@gentoo.org> : motion-3.1.19.ebuild
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 89a48d8cca58..0842bbf66644 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,3 +1,14 @@
-MD5 0adadd2d7071c3f86426894d82d299fa motion-3.1.19.ebuild 563
-MD5 55dccdcc424ffd4faf87fbefc7a19092 ChangeLog 344
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab5db4df532cd0fb00da364ba70f9001 motion-3.1.19.ebuild 582
+MD5 4295a718a37b99df8a9c697f2e074f78 ChangeLog 578
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 150a9a86e892532ffc13a9da72230efb files/digest-motion-3.1.19 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCjQrh06ebR+OMO78RAhlVAJ0Xorz96U4M2Hj73JPlihbmRKP0igCePwGw
+LahjAmcQubyqB16dzI2MErE=
+=xmVf
+-----END PGP SIGNATURE-----
diff --git a/media-video/motion/motion-3.1.19.ebuild b/media-video/motion/motion-3.1.19.ebuild
index 2a6b0d852fd1..e295adecf178 100644
--- a/media-video/motion/motion-3.1.19.ebuild
+++ b/media-video/motion/motion-3.1.19.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-video/motion/motion-3.1.19.ebuild,v 1.1 2005/04/08 01:34:56 pvdabeel Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.1.19.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 DESCRIPTION="Motion is a video surveillance system"
 HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
@@ -10,12 +8,12 @@ SRC_URI="mirror://sourceforge/motion/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 IUSE=""
 
 DEPEND="media-video/ffmpeg
-		dev-libs/xmlrpc-c"
+	dev-libs/xmlrpc-c"
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR=${D} || die "make install failed"
 }
diff --git a/media-video/motioneye/ChangeLog b/media-video/motioneye/ChangeLog
index e7219a106c90..c8d12c101d9d 100644
--- a/media-video/motioneye/ChangeLog
+++ b/media-video/motioneye/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/motioneye
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.1 2003/09/29 09:46:25 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+*motioneye-1.3 (26 Aug 2005)
+
+  26 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> +motioneye-1.3.ebuild:
+  Version bump. Using custom CFLAGS now, patch no longer needed.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> motioneye-1.2.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> motioneye-1.2.ebuild:
+  Add inherit eutils
 
 *motioneye-1.2 (29 Sep 2003)
 
diff --git a/media-video/motioneye/Manifest b/media-video/motioneye/Manifest
index ce02fdd17c25..74a651333854 100644
--- a/media-video/motioneye/Manifest
+++ b/media-video/motioneye/Manifest
@@ -1,3 +1,7 @@
-MD5 4499a1bf7f586ddc41e965632a3ae91c motioneye-1.2.ebuild 614
+MD5 792b7cbf60861363950860d8d46a8244 motioneye-1.2.ebuild 719
+MD5 719e51dfb3a5f4a7abb8acb952a6a436 motioneye-1.3.ebuild 765
+MD5 4362173e8e3593d6f664b681384cf7e1 ChangeLog 775
+MD5 f935ca6b6e2481293e6beb9700c64cd0 metadata.xml 347
 MD5 128dd9baaab4670b680bf36e89000f0a files/digest-motioneye-1.2 64
+MD5 8878fa14a38030a03298f40afce05702 files/digest-motioneye-1.3 64
 MD5 0d53ead4c9f82be6444880b879181c1d files/motioneye-1.2-Makefile.diff 476
diff --git a/media-video/motioneye/motioneye-1.2.ebuild b/media-video/motioneye/motioneye-1.2.ebuild
index c7d658bc1530..fb1ef03e3484 100644
--- a/media-video/motioneye/motioneye-1.2.ebuild
+++ b/media-video/motioneye/motioneye-1.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-video/motioneye/motioneye-1.2.ebuild,v 1.1 2003/09/29 09:46:25 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.2.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ppm, jpeg or mjpeg grabber for the MotionEye camera on Sony VAIO Picturebooks."
 HOMEPAGE="http://spop.free.fr/meye/"
@@ -15,7 +17,7 @@ DEPEND="X? ( virtual/x11
 src_compile() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-Makefile.diff
-	if [ `use X` ]; then
+	if use X; then
 		export WITHX='yes'
 	else
 		export WITHX='no'
diff --git a/media-video/motioneye/motioneye-1.3.ebuild b/media-video/motioneye/motioneye-1.3.ebuild
index 9315db116cc8..a9aad72da11d 100644
--- a/media-video/motioneye/motioneye-1.3.ebuild
+++ b/media-video/motioneye/motioneye-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/media-video/motioneye/motioneye-1.3.ebuild,v 1.1 2005/08/26 12:41:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/motiontrack/ChangeLog b/media-video/motiontrack/ChangeLog
index 6756e37c4668..80ff98591d66 100644
--- a/media-video/motiontrack/ChangeLog
+++ b/media-video/motiontrack/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for media-video/motiontrack
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/ChangeLog,v 1.1 2004/07/20 06:23:17 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/ChangeLog,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*motiontrack-0.1.3 (09 Dec 2004)
+
+  09 Dec 2004; Chris White <chriswhite@gentoo.org> +motiontrack-0.1.3.ebuild:
+  Bumped to version 0.1.3.
+
+  19 Oct 2004; Chris White <chriswhite@gentoo.org> motiontrack-0.1.0.ebuild,
+  motiontrack-0.1.2.ebuild:
+  Fixed some QA issues.
+
+*motiontrack-0.1.2 (19 Oct 2004)
+
+  19 Oct 2004; Chris White <chriswhite@gentoo.org> +motiontrack-0.1.2.ebuild:
+  Bumped to version 0.1.2.  Thanks to upstream for reporting :).
+
+  23 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  motiontrack-0.1.0.ebuild:
+  don't use deprecated ? : syntax
+
+*motiontrack-0.1.0 (23 Jul 2004)
+
+  23 Jul 2004; Jon Hood <squinky86@gentoo.org> motiontrack-0.1.0.ebuild:
+  Change virtual/glibc -> virtual/libc.
+
+*motiontrack-0.1.0 (23 Jul 2004)
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> motiontrack-0.1.0.ebuild:
+  Replaced virtual/glibc with virtual/libc.
 
   20 Jul 2004; Chris White <chriswhite@gentoo.org> :
   Initial addition to the tree. Thanks to gentoo <eric.noack@gemia.de> for
diff --git a/media-video/motiontrack/Manifest b/media-video/motiontrack/Manifest
index 8559addc129d..d63b520649b2 100644
--- a/media-video/motiontrack/Manifest
+++ b/media-video/motiontrack/Manifest
@@ -1,2 +1,18 @@
-MD5 d529d7f9259e5bab2d8ad075c620aea4 motiontrack-0.1.0.ebuild 1820
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac908302d887b4233619e690a742d288 ChangeLog 1371
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 7f0ef93ebeeff9fba5bc65344b9d1b35 motiontrack-0.1.3.ebuild 2009
+MD5 5e17175bc71732b667f810dbaf4a4b7b motiontrack-0.1.2.ebuild 1955
+MD5 95dd1ae456ce1489665da5631c29ced9 motiontrack-0.1.0.ebuild 1946
 MD5 1e0932e975040bc45ea22a77983a2247 files/digest-motiontrack-0.1.0 69
+MD5 657b34d97059cec1a62b7e41615ed406 files/digest-motiontrack-0.1.2 69
+MD5 69f35a2546de93eff00bbf1dba20c9b1 files/digest-motiontrack-0.1.3 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZM58Kf2g/qXtneoRAvP/AJ9GNmHseVQSK+OStCYUE40VEYzwtgCfTAEQ
+NRBAEnYLBkuBRUSZqp1Wjwo=
+=kLe7
+-----END PGP SIGNATURE-----
diff --git a/media-video/motiontrack/metadata.xml b/media-video/motiontrack/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/motiontrack/metadata.xml
+++ b/media-video/motiontrack/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/motiontrack/motiontrack-0.1.0.ebuild b/media-video/motiontrack/motiontrack-0.1.0.ebuild
index ce3ef504c7bf..b536285fd679 100644
--- a/media-video/motiontrack/motiontrack-0.1.0.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.0.ebuild,v 1.1 2004/07/20 06:23:17 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 
 DESCRIPTION="A set of tools that detect motion between two images"
@@ -11,35 +11,40 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~hppa ~amd64"
 
-IUSE="libgd imagemagick debug"
+IUSE="gd imagemagick debug"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	debug? (
-		libgd? (
-			imagemagick?  ( >=media-gfx/imagemagick-5.5.7 ) : ( media-libs/gd )
-		) : ( >=media-gfx/imagemagick-5.5.7 )
-	) : (
+		gd? (
+			imagemagick? ( >=media-gfx/imagemagick-5.5.7 )
+			!imagemagick? ( media-libs/gd )
+		)
+		!gd? ( >=media-gfx/imagemagick-5.5.7 )
+	)
+	!debug? (
 		imagemagick? (
-			gd? ( media-libs/gd ) : ( >=media-gfx/imagemagick-5.5.7 )
-		) : ( media-libs/gd )
+			gd? ( media-libs/gd )
+			!gd? ( >=media-gfx/imagemagick-5.5.7 )
+		)
+		!imagemagick? ( media-libs/gd )
 	)"
 
 src_compile() {
 
 	local myconf
 
-	if use libgd; then
-	 if use imagemagick; then
-		einfo "motiontrack can only use one of libgd or imagemagick, not both."
-		einfo "default is libgd when debug is unset, imagemagick otherwise."
-		einfo "please unset one of these use flags if you have other intentions."
-	 fi
+	if use gd; then
+		if use imagemagick; then
+			einfo "motiontrack can only use one of gd or imagemagick, not both."
+			einfo "default is gd when debug is unset, imagemagick otherwise."
+			einfo "please unset one of these use flags if you have other intentions."
+		fi
 	fi
 	if use debug; then
 		#default to imagemagick for providing better features
 		#for debugging
 		myconf="--enable-debug"
-		if use libgd; then
+		if use gd; then
 			if use imagemagick; then
 				myconf="${myconf} --enable-magick --disable-gd";
 			else
@@ -49,10 +54,10 @@ src_compile() {
 			myconf="${myconf} --enable-magick --disable-gd";
 		fi
 	else
-		#default to libgd for being faster
+		#default to gd for being faster
 		myconf="--disable-debug"
 		if use imagemagick; then
-			if use libgd; then
+			if use gd; then
 				myconf="${myconf} --disable-magick --enable-gd";
 			else
 				myconf="${myconf} --enable-magick --disable-gd";
@@ -71,5 +76,3 @@ src_install() {
 	make DESTDIR=${D} install || die "install failed"
 	dodoc README src/TheCode.txt
 }
-
-
diff --git a/media-video/motiontrack/motiontrack-0.1.2.ebuild b/media-video/motiontrack/motiontrack-0.1.2.ebuild
index 3c40d10e8954..68e63797b099 100644
--- a/media-video/motiontrack/motiontrack-0.1.2.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.2.ebuild,v 1.1 2004/10/20 00:24:56 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.2.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 
 DESCRIPTION="A set of tools that detect motion between two images"
@@ -11,15 +11,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~hppa ~amd64"
 
-IUSE="libgd imagemagick debug"
+IUSE="gd imagemagick debug"
 
 DEPEND="virtual/libc
 	debug? (
-		libgd? (
+		gd? (
 			imagemagick? ( >=media-gfx/imagemagick-5.5.7 )
 			!imagemagick? ( media-libs/gd )
 		)
-		!libgd? ( >=media-gfx/imagemagick-5.5.7 )
+		!gd? ( >=media-gfx/imagemagick-5.5.7 )
 	)
 	!debug? (
 		imagemagick? (
@@ -33,7 +33,7 @@ src_compile() {
 
 	local myconf
 
-	if use libgd; then
+	if use gd; then
 		if use imagemagick; then
 			einfo "motiontrack can only use one of libgd or imagemagick, not both."
 			einfo "default is libgd when debug is unset, imagemagick otherwise."
@@ -44,7 +44,7 @@ src_compile() {
 		#default to imagemagick for providing better features
 		#for debugging
 		myconf="--enable-debug"
-		if use libgd; then
+		if use gd; then
 			if use imagemagick; then
 				myconf="${myconf} --enable-magick --disable-gd";
 			else
@@ -57,7 +57,7 @@ src_compile() {
 		#default to libgd for being faster
 		myconf="--disable-debug"
 		if use imagemagick; then
-			if use libgd; then
+			if use gd; then
 				myconf="${myconf} --disable-magick --enable-gd";
 			else
 				myconf="${myconf} --enable-magick --disable-gd";
diff --git a/media-video/motiontrack/motiontrack-0.1.3.ebuild b/media-video/motiontrack/motiontrack-0.1.3.ebuild
index a4b07e60397a..c1b1a35f1f41 100644
--- a/media-video/motiontrack/motiontrack-0.1.3.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.3.ebuild,v 1.1 2004/12/09 01:24:42 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 
 DESCRIPTION="A set of tools that detect motion between two images"
diff --git a/media-video/mpeg-movie/ChangeLog b/media-video/mpeg-movie/ChangeLog
index e054705fac75..63cb6f7c39f4 100644
--- a/media-video/mpeg-movie/ChangeLog
+++ b/media-video/mpeg-movie/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-video/mpeg-movie
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/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-video/mpeg-movie/ChangeLog,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
+
+  10 Jul 2005; Sven Wegener <swegener@gentoo.org>
+  mpeg-movie-1.6.0-r1.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.
+
+  09 Jan 2005; <lucky@gentoo.org> +files/mpeg-movie-1.6.0-r1-gentoo.patch,
+  mpeg-movie-1.6.0-r1.ebuild:
+  added patch to make it compile again. fixes #60695
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mpeg-movie-1.6.0-r1.ebuild:
+  Fix use invocation
+
+*mpeg-movie-1.6.0-r1 (27 Mar 2002)
+
+  09 Jan 2003; Seemant Kulleen <seemant@gentoo.org> mpeg-movie-1.6.0-r1.ebuild :
+  
+  Made some fixes for GCC-3 compilation.  Added #include <cstring> in three
+  of the header files to allow for compilation.
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mpeg-movie-1.6.0-r1.ebuild :
+
+  Cleaned up ebuild and ungzipped HTML documentation.
 
 *mpeg-movie-1.6.0 (1 Feb 2002)
 
diff --git a/media-video/mpeg-movie/Manifest b/media-video/mpeg-movie/Manifest
index e69de29bb2d1..ae7c30c5d1a7 100644
--- a/media-video/mpeg-movie/Manifest
+++ b/media-video/mpeg-movie/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 55b7c1b7f32738bac69f382bee1bda69 ChangeLog 1658
+MD5 1f5979214c419ba2946b7d77663a69fa files/digest-mpeg-movie-1.6.0-r1 69
+MD5 653a9a9061cfbdb84938b0dd02a01b33 files/mpeg-movie-1.6.0-r1-gentoo.patch 1281
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 0ed02c0029e26582360f4f545ce40fee mpeg-movie-1.6.0-r1.ebuild 2800
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Y72I1lqEGTUzyQRAs7WAKCAzQq9osq3TfkxYNosyHhcHKiwVwCgga60
+S85l5uzNGtPusCzB1t+i00E=
+=Ip49
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg-movie/metadata.xml b/media-video/mpeg-movie/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/mpeg-movie/metadata.xml
+++ b/media-video/mpeg-movie/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
index ccd915dfcecf..00693ddddfce 100644
--- a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
+++ b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
@@ -1,58 +1,65 @@
-# 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-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.1 2002/03/27 11:06:25 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
-MY_P="mpeg_movie"
+inherit eutils
+
+MY_P=${PN/-/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Tools for MPEG-I movies"
 SRC_URI="http://heroine.linuxave.net/${MY_P}-${PV}.tar.gz"
 HOMEPAGE="http://heroine.linuxave.net/toys.html"
 
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
+SLOT="0"
+LICENSE="BSD LGPL-2 GPL-2"
+KEYWORDS="x86"
+IUSE="nas"
+
+DEPEND="virtual/x11
 	>=media-libs/jpeg-6b
-	>=media-libs/libsdl-1.1.5
-	virtual/x11"
+	>=media-libs/libsdl-1.1.5"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	epatch ${FILESDIR}/${PF}-gentoo.patch
+
 	for i in video_in video_out
 	do
 		cd ${S}/${i}
 		cp Makefile Makefile.orig
 		sed -e "s:gnu/types\.h:bits/types\.h:" \
-		-e "s:stdio_lim\.h:bits/stdio_lim\.h:" \
-		-e "s:bytesex\.h::" \
-		-e "s:selectbits\.h::" \
-		-e "s:huge_val\.h:bits/huge_val\.h:" \
-		-e "s:mathcalls\.h:bits/mathcalls\.h:" \
-		-e "s:posix1_lim\.h:bits/posix1_lim\.h:" \
-		-e "s:posix2_lim\.h:bits/posix2_lim\.h:" \
-		-e "s:posix_opt\.h:bits/posix_opt\.h:" \
-		-e "s:local_lim\.h:bits/local_lim\.h:" \
-		-e "s:socketbits\.h::" \
-		-e "s:sockaddrcom\.h::" \
-		-e "s:errnos\.h::" \
-		-e "s:statbuf\.h::" \
-		-e "s:ipc_buf\.h::" \
-		-e "s:shm_buf\.h::" \
-		-e "s:timebits\.h::" \
-		-e "s:confname\.h:bits/confname\.h:" \
-		-e "s:sigset\.h:bits/sigset\.h:" \
-		-e "s:signum\.h:bits/signum\.h:" \
-		-e "s:sigaction\.h:bits/sigaction\.h:" \
-		-e "s:asm/sigcontext\.h:bits/sigcontext\.h:" \
-		-e "s:include/sigcontext\.h:include/bits/sigcontext\.h:" \
-		-e "s:/usr/lib/X11:/usr/X11R6/lib:" \
-		Makefile.orig > Makefile
+			-e "s:stdio_lim\.h:bits/stdio_lim\.h:" \
+			-e "s:bytesex\.h::" \
+			-e "s:selectbits\.h::" \
+			-e "s:huge_val\.h:bits/huge_val\.h:" \
+			-e "s:mathcalls\.h:bits/mathcalls\.h:" \
+			-e "s:posix1_lim\.h:bits/posix1_lim\.h:" \
+			-e "s:posix2_lim\.h:bits/posix2_lim\.h:" \
+			-e "s:posix_opt\.h:bits/posix_opt\.h:" \
+			-e "s:local_lim\.h:bits/local_lim\.h:" \
+			-e "s:socketbits\.h::" \
+			-e "s:sockaddrcom\.h::" \
+			-e "s:errnos\.h::" \
+			-e "s:statbuf\.h::" \
+			-e "s:ipc_buf\.h::" \
+			-e "s:shm_buf\.h::" \
+			-e "s:timebits\.h::" \
+			-e "s:confname\.h:bits/confname\.h:" \
+			-e "s:sigset\.h:bits/sigset\.h:" \
+			-e "s:signum\.h:bits/signum\.h:" \
+			-e "s:sigaction\.h:bits/sigaction\.h:" \
+			-e "s:asm/sigcontext\.h:bits/sigcontext\.h:" \
+			-e "s:include/sigcontext\.h:include/bits/sigcontext\.h:" \
+			-e "s:/usr/lib/X11:/usr/X11R6/lib:" \
+			Makefile.orig > Makefile
 	done
 
 	cd ${S}/audio_out
 	cp GNUmake GNUmake.orig
 	sed -e "s:SDL_DIR += /usr/local:SDL_DIR += /usr:" GNUmake.orig > GNUmake
-	if [ "`use nas`" ] ; then
+	if use nas ; then
 		cp GNUmake GNUmake.orig
 		sed -e "s#^SDLLIB := -L#SDLLIB := -L/usr/X11R6/lib -lXt -L#"	\
 			GNUmake.orig > GNUmake
@@ -62,25 +69,35 @@ src_unpack() {
 	cp Makefile Makefile.orig
 	sed -e "s:c_flags:./c_flags:g"	\
 		Makefile.orig > Makefile
-  
-  
-}
-src_compile() {
 
-    emake || die
+	# GCC-3.2.1 fix:
+	cd ${S}/audio_out
+	cp MPEGstream.h MPEGstream.h.orig
+	sed -e 's:\(#include "MPEGerror.h"\):\1\n#include <cstring>:' \
+		MPEGstream.h.orig > MPEGstream.h
+
+	cp MPEGring.h MPEGring.h.orig
+	sed -e 's:\(#include "SDL_mutex.h"\):\1\n#include <cstring>:' \
+		MPEGring.h.orig > MPEGring.h
 
+
+	cp mpeg_export.h mpeg_export.h.orig
+	sed -e 's:\(#include "quicktime.h"\):\1\n#include <cstring>:' \
+		mpeg_export.h.orig > mpeg_export.h
 }
 
-src_install () {
+src_compile() {
+	emake -j1 || die
+}
 
-    into /usr
-    newbin audio_in/encode mpeg_audio_encode
-    newbin audio_out/plaympeg mpeg_audio_play
-    newbin mplex_in/mplex mpeg_mplex
-    newbin mplex_out/dmplex mpeg_dmplex
-    newbin video_in/mpeg_encode mpeg_video_encode
-    dobin video_out/mpeg_play
+src_install () {
+	newbin audio_in/encode mpeg_audio_encode
+	newbin audio_out/plaympeg mpeg_audio_play
+	newbin mplex_in/mplex mpeg_mplex
+	newbin mplex_out/dmplex mpeg_dmplex
+	newbin video_in/mpeg_encode mpeg_video_encode
+	dobin video_out/mpeg_play
 
-    dodoc docs/*.txt
+	dodoc docs/*.txt
 	dohtml -r ./
 }
diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index 802093dada96..d34bd5f6a530 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,13 +1,54 @@
 # ChangeLog for media-video/mpeg-tools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/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-video/mpeg-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:57:18 chriswhite Exp $
+
+  30 Sep 2005; Simon Stelling <blubb@gentoo.org> mpeg-tools-1.5b-r2.ebuild:
+  stable on amd64 wrt bug 107344
+
+  29 Sep 2005; Mark Loeser <halcy0n@gentoo.org> mpeg-tools-1.5b-r2.ebuild:
+  Stable on x86; bug #107344
+
+*mpeg-tools-1.5b-r2 (27 Sep 2005)
+
+  27 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  files/mpeg-tools-1.5b-64bit_fixes.patch,
+  +files/mpeg-tools-1.5b-build.patch,
+  +files/mpeg-tools-1.5b-system-jpeg.patch,
+  +files/mpeg-tools-1.5b-tempfile-convert.patch,
+  +files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch,
+  +files/mpeg-tools-1.5b-tempfile-tests.patch, +mpeg-tools-1.5b-r2.ebuild:
+  Clean up source code, fix insecure tempfile usage #107344, and let netpbm
+  install the converting programs eyuvtoppm/ppmtoeyuv since it has newer
+  versions #78777.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mpeg-tools-1.5b-r1.ebuild,
+  mpeg-tools-1.5b.ebuild:
+  Add inherit eutils
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> mpeg-tools-1.5b-r1.ebuild:
+  Add patch with 64bit fixes and other cleanups by Mikael Rosbacke
+  <rosbacke@nada.kth.se> in #38951.
+
+*mpeg-tools-1.5b-r1 (07 Nov 2003)
+
+  07 Nov 2003; Martin Schlemmer <azarah@gentoo.org> mpeg-tools-1.5b-r1.ebuild,
+  files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch:
+  Fix exit() being called without arguments, bug #32801.
+
+  11 Jun 2003; <msterret@gentoo.org> mpeg-tools-1.5b.ebuild:
+  Fix url (Bug#: 22544)
 
 *mpeg-tools-1.5b (1 Feb 2002)
 
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  mpeg-tools-1.5b.ebuild, files/1.5b/mpeg-tools-1.5b-gentoo.patch:
+  errno fix from Ian Abbott <ian@abbott.org> in bug #19152
+
+  28 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> mpeg-tools-1.5b files/1.5b/libpnmrw.c files/1.5b/libpnmrw.h :
+  Fixed a few files so that it compiles with gcc-3.2. Fixes #7041.
+
   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-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 3afe03e7fc32..0f729570afef 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,5 +1,18 @@
-MD5 cc159ac44e6896e7012e03816f0ffa18 mpeg-tools-1.5b.ebuild 1068
-MD5 9cb5fc06f2b6f359508b7e5d35077cf4 ChangeLog 525
-MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b 73
+MD5 00e2a839fa0458dd161e8e4f828212a5 ChangeLog 2186
 MD5 1c465916c02ad5e984eefda8b236fbc9 files/1.5b/libpnmrw.c 37348
 MD5 1f0b9c5d21516dc0b597bdd8563a7e39 files/1.5b/libpnmrw.h 6791
+MD5 b45f0ebe9bad10888b67ac1d1475c0d4 files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch 464
+MD5 ee6ac6a97ef340aecff643f24bc2f02c files/1.5b/mpeg-tools-1.5b-gentoo.patch 560
+MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b 73
+MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b-r1 73
+MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b-r2 73
+MD5 411d4b0fde7b753d3ff9008eb9eaefcc files/mpeg-tools-1.5b-64bit_fixes.patch 6986
+MD5 44b911d91abb56f60d64cc8b07074b11 files/mpeg-tools-1.5b-build.patch 1414
+MD5 0971aef5099bdb3d5c9a962c308a1d43 files/mpeg-tools-1.5b-system-jpeg.patch 893
+MD5 20a27f243e783c15b17079c112876d10 files/mpeg-tools-1.5b-tempfile-convert.patch 4097
+MD5 ac3d41c507a2fc1b1cfcf8ca91e1e983 files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538
+MD5 f7cc407da44caa2318d26dab75f3459a files/mpeg-tools-1.5b-tempfile-tests.patch 5256
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 0ca9d85354046cd139e1fab894900df0 mpeg-tools-1.5b-r1.ebuild 1354
+MD5 fe2b153c4f7fa1e923db108b7ca18c85 mpeg-tools-1.5b-r2.ebuild 1644
+MD5 8d067537a06634e898b40532dd5d3233 mpeg-tools-1.5b.ebuild 1127
diff --git a/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b b/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b
index c0f91065d0e7..63605b69a15d 100644
--- a/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b
+++ b/media-video/mpeg-tools/files/digest-mpeg-tools-1.5b
@@ -1 +1 @@
-MD5 ff125fb82118efc7c852f0d26d5552c6 mpeg_encode-1.5b-src.tar.gz
+MD5 ff125fb82118efc7c852f0d26d5552c6 mpeg_encode-1.5b-src.tar.gz 2028724
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
index 1f693e311a90..fa2e70304dbe 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
@@ -1,6 +1,5 @@
-diff -urN work.orig/convert/eyuvtojpeg.c work/convert/eyuvtojpeg.c
---- work.orig/convert/eyuvtojpeg.c	1995-04-14 23:16:52.000000000 +0200
-+++ work/convert/eyuvtojpeg.c	2004-01-21 21:19:20.463187922 +0100
+--- work/convert/eyuvtojpeg.c
++++ work/convert/eyuvtojpeg.c
 @@ -22,6 +22,7 @@
  /*==============*
   * HEADER FILES *
@@ -26,9 +25,8 @@ diff -urN work.orig/convert/eyuvtojpeg.c work/convert/eyuvtojpeg.c
  }
  
  
-diff -urN work.orig/convert/eyuvtoppm.c work/convert/eyuvtoppm.c
---- work.orig/convert/eyuvtoppm.c	1995-04-14 23:16:52.000000000 +0200
-+++ work/convert/eyuvtoppm.c	2004-01-21 21:19:20.463187922 +0100
+--- work/convert/eyuvtoppm.c
++++ work/convert/eyuvtoppm.c
 @@ -22,6 +22,7 @@
  /*==============*
   * HEADER FILES *
@@ -55,9 +53,8 @@ diff -urN work.orig/convert/eyuvtoppm.c work/convert/eyuvtoppm.c
  }
  
  void Usage(void)
-diff -urN work.orig/convert/mtv/archdep.h work/convert/mtv/archdep.h
---- work.orig/convert/mtv/archdep.h	1995-01-24 23:42:33.000000000 +0100
-+++ work/convert/mtv/archdep.h	2004-01-21 21:19:20.464187759 +0100
+--- work/convert/mtv/archdep.h
++++ work/convert/mtv/archdep.h
 @@ -45,16 +45,46 @@
  			    ((char *)(to))[5] = ((char *)(from))[2];	\
  			    ((char *)(to))[6] = ((char *)(from))[1];	\
@@ -107,9 +104,8 @@ diff -urN work.orig/convert/mtv/archdep.h work/convert/mtv/archdep.h
  /* Define types of specific length */
  typedef char		i_8;
  typedef short		i_16;
-diff -urN work.orig/convert/mtv/movieToVid.c work/convert/mtv/movieToVid.c
---- work.orig/convert/mtv/movieToVid.c	1995-01-24 23:42:33.000000000 +0100
-+++ work/convert/mtv/movieToVid.c	2004-01-21 21:19:20.465187595 +0100
+--- work/convert/mtv/movieToVid.c
++++ work/convert/mtv/movieToVid.c
 @@ -295,7 +295,7 @@
      exit (0);
  }
@@ -125,14 +121,17 @@ diff -urN work.orig/convert/mtv/movieToVid.c work/convert/mtv/movieToVid.c
      fprintf (stderr, "done\n");
 +    return 0;
  }
-diff -urN work.orig/convert/ppmtoeyuv.c work/convert/ppmtoeyuv.c
---- work.orig/convert/ppmtoeyuv.c	1995-01-20 04:25:37.000000000 +0100
-+++ work/convert/ppmtoeyuv.c	2004-01-21 21:19:20.462188086 +0100
-@@ -39,6 +39,7 @@
+--- work/convert/ppmtoeyuv.c
++++ work/convert/ppmtoeyuv.c
+@@ -39,6 +39,11 @@
   * HEADER FILES *
   *==============*/
  
 +#include <malloc.h> 
++#include <unistd.h>
++#include <string.h>
++#include <stdlib.h>
++#include <ctype.h>
  #include <stdio.h>
  #include "ansi.h"
  
@@ -153,9 +152,8 @@ diff -urN work.orig/convert/ppmtoeyuv.c work/convert/ppmtoeyuv.c
  }
  
  
-diff -urN work.orig/mpeg_encode/bitio.c work/mpeg_encode/bitio.c
---- work.orig/mpeg_encode/bitio.c	1995-06-21 20:36:12.000000000 +0200
-+++ work/mpeg_encode/bitio.c	2004-01-21 21:19:20.458188741 +0100
+--- work/mpeg_encode/bitio.c
++++ work/mpeg_encode/bitio.c
 @@ -79,6 +79,8 @@
   * HEADER FILES *
   *==============*/
@@ -165,9 +163,8 @@ diff -urN work.orig/mpeg_encode/bitio.c work/mpeg_encode/bitio.c
  #include <assert.h>
  #include "all.h"
  #include "byteorder.h"
-diff -urN work.orig/mpeg_encode/jpeg.c work/mpeg_encode/jpeg.c
---- work.orig/mpeg_encode/jpeg.c	1995-08-05 01:35:07.000000000 +0200
-+++ work/mpeg_encode/jpeg.c	2004-01-21 21:19:20.461188250 +0100
+--- work/mpeg_encode/jpeg.c
++++ work/mpeg_encode/jpeg.c
 @@ -65,6 +65,8 @@
   *==============*/
  
@@ -177,20 +174,54 @@ diff -urN work.orig/mpeg_encode/jpeg.c work/mpeg_encode/jpeg.c
  #include "all.h"
  #include "mtypes.h"
  #include "frames.h"
-diff -urN work.orig/mpeg_encode/libpnmrw.c work/mpeg_encode/libpnmrw.c
---- work.orig/mpeg_encode/libpnmrw.c	2004-01-21 19:41:38.000000000 +0100
-+++ work/mpeg_encode/libpnmrw.c	2004-01-21 21:19:20.460188414 +0100
-@@ -27,6 +27,7 @@
+--- work/mpeg_encode/headers/libpnmrw.h
++++ work/mpeg_encode/headers/libpnmrw.h
+@@ -20,9 +20,6 @@
+ ** that point here, feel free to tweak or remove these declarations.
+ */
+ #include <malloc.h>
+-#if !defined(sco)  &&  !defined(sgi) && !defined(IRIX)
+-extern char* malloc();
+-#endif
+ /* End of configurable definitions. */
+ 
+ 
+--- work/mpeg_encode/libpnmrw.c
++++ work/mpeg_encode/libpnmrw.c
+@@ -27,6 +27,9 @@
  /* #define MSDOS */
  #endif
  
 +#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
  #include <stdio.h>
  #include "libpnmrw.h"
  
-diff -urN work.orig/mpeg_encode/opts.c work/mpeg_encode/opts.c
---- work.orig/mpeg_encode/opts.c	1995-08-15 20:34:09.000000000 +0200
-+++ work/mpeg_encode/opts.c	2004-01-21 21:19:20.459188578 +0100
+@@ -128,11 +128,9 @@
+   pm_perror( reason )
+ char* reason;
+ {
+-  extern char* sys_errlist[];
+-  extern int errno;
+   char* e;
+ 
+-  e = sys_errlist[errno];
++  e = strerror(errno);
+ 
+   if ( reason != 0 && reason[0] != '\0' )
+     (void) fprintf( stderr, "%s: %s - %s\n", progname, reason, e );
+@@ -361,7 +361,7 @@
+ int cols, format;
+ {
+   register int col, bitshift, b;
+-  register int item;
++  register int item = 0;
+   register bit* bP;
+ 
+   switch ( format )
+--- work/mpeg_encode/opts.c
++++ work/mpeg_encode/opts.c
 @@ -35,6 +35,7 @@
   * HEADER FILES *
   *==============*/
@@ -199,3 +230,57 @@ diff -urN work.orig/mpeg_encode/opts.c work/mpeg_encode/opts.c
  #include <stdio.h>
  #include <string.h>
  #include "opts.h"
+--- work/mpeg_encode/iframe.c
++++ work/mpeg_encode/iframe.c
+@@ -235,6 +235,8 @@
+ int SetFCodeHelper _ANSI_ARGS_((int sr));
+ void CalcDistortion _ANSI_ARGS_((MpegFrame *current, int y, int x));
+ 
++void Mpost_UnQuantZigBlockLaplace _ANSI_ARGS_((FlatBlock in, Block out, int qscale, boolean iblock));
++
+ int
+   SetFCodeHelper(SR)
+ int SR;
+--- work/convert/jmovie2jpeg.c
++++ work/convert/jmovie2jpeg.c
+@@ -33,6 +33,9 @@
+ ************************************************************************/
+ 
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+@@ -54,7 +54,6 @@
+     FILE *inFile;         /* Jmovie file pointer */
+     FILE *outFile;        /* JPEG file pointer for output file */
+     FILE *audiooutfile;   /* SPARC .AU audio output file pointer*/
+-    extern char *malloc();
+     int fd, i;            /* input file descriptor and a counting variable*/
+     int start, end;       /* first and last frames to be extracted */
+     char ofname[256];     /* output filename string */
+@@ -283,12 +283,12 @@
+     if (fread (&(image_offset),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading image offset");
+-	exit();
++	exit(1);
+     }
+     if (fread (&(audio_tracks),sizeof(int),1,inFile) != 1)
+     {
+ 	perror("Error in reading audio tracks");
+-	exit();
++	exit(1);
+     }
+     if (audio_tracks != 1) 
+       { 
+@@ -373,6 +373,7 @@
+     fclose(inFile);
+     fclose(audiooutfile);
+     
++    return 0;
+ }
+ 
+ 
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
index d766786b6eed..260f279d2d4b 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
@@ -31,12 +31,12 @@ Also rewrite the diffscript in sh since csh isnt always available
 --- mepg_encode/tst/diffscript.sh
 +++ mepg_encode/tst/diffscript.sh
 @@ -0,0 +1,16 @@
-+diff $1 $2 > ./tst/foobar
-+egrep Blocks ./tst/foobar > ./tst/blockbar
++diff $1 $2 > ./foobar
++egrep Blocks ./foobar > ./blockbar
 +
-+if test ! -s ./tst/blockbar ; then
-+	diff $3 $4 > ./tst/foobar.mpg
-+	if test -s ./tst/foobar.mpg ; then
++if test ! -s ./blockbar ; then
++	diff $3 $4 > ./foobar.mpg
++	if test -s ./foobar.mpg ; then
 +		echo "FAILURE! (different output -- probably endian bug).  Please send bug report."
 +		exit 1
 +	else
@@ -50,7 +50,8 @@ Also rewrite the diffscript in sh since csh isnt always available
 --- mpeg_encode/tst/test_all
 +++ mpeg_encode/tst/test_all
 @@ -1,19 +1,19 @@
- #!/bin/csh -f
+-#!/bin/csh -f
++#!/bin/sh
  cd ..
 -echo "First we encode three mpegs... (note requires 5MB on /tmp)"
 -rm -f /tmp/ts{,2,d}.{mpg,stat}
@@ -67,15 +68,15 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  echo "Test one - tst/ts.param"
 -csh diffscript /tmp/ts.stat ts.stat /tmp/ts.mpg ts.mpg
-+sh diffscript.sh ./tst/ts.stat ts.stat ./tst/ts.mpg ts.mpg
++sh diffscript.sh ./ts.stat.new ts.stat ./ts.mpg.new ts.mpg
  
  echo "Test two - tst/ts2.param (different pattern)"
 -csh diffscript /tmp/ts2.stat ts2.stat /tmp/ts2.mpg ts2.mpg
-+sh diffscript.sh ./tst/ts2.stat ts2.stat ./tst/ts2.mpg ts2.mpg
++sh diffscript.sh ./ts2.stat.new ts2.stat ./ts2.mpg.new ts2.mpg
  
  echo "Test three - tst/tsd.param (uses decoded frames)"
 -csh diffscript /tmp/tsd.stat tsd.stat /tmp/tsd.mpg tsd.mpg
-+sh diffscript.sh ./tst/tsd.stat tsd.stat ./tst/tsd.mpg tsd.mpg
++sh diffscript.sh ./tsd.stat.new tsd.stat ./tsd.mpg.new tsd.mpg
  
 --- mpeg_encode/tst/diffscript
 +++ mpeg_encode/tst/diffscript
diff --git a/media-video/mpeg-tools/metadata.xml b/media-video/mpeg-tools/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/mpeg-tools/metadata.xml
+++ b/media-video/mpeg-tools/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild
index e4eef942a25d..dfe5750b3112 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-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-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild,v 1.1 2003/11/07 18:54:45 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:18 chriswhite Exp $
+
+inherit eutils
 
 MY_PN=mpeg_encode
 S=${WORKDIR}/${MY_PN}
@@ -12,17 +14,22 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
+IUSE=""
 
 src_unpack () {
-	unpack ${A}
-	cd ${S}
+	unpack ${A} ; cd ${S}
+
 	cp ${FILESDIR}/${PV}/libpnmrw.c .
 	cp ${FILESDIR}/${PV}/libpnmrw.h headers/
 	epatch ${FILESDIR}/${PV}/${P}-gentoo.patch
 	cd ${S}/../convert
 	# Fix exit() being called without arguments
 	epatch ${FILESDIR}/${PV}/${P}-fix-exit-call.patch
+
+	if [ "${ARCH}" == "amd64" ]; then
+		cd ${S}/../.. ; epatch ${FILESDIR}/${P}-64bit_fixes.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
index a8290ab55c06..4a086b8385d8 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-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-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.1 2005/09/27 00:38:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:18 chriswhite Exp $
 
 inherit eutils
 
@@ -11,10 +11,11 @@ SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="virtual/x11
+	media-libs/jpeg"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b.ebuild
index 69f79bbdae1b..e745d4bbe045 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b.ebuild
@@ -1,48 +1,48 @@
-# 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-video/mpeg-tools/mpeg-tools-1.5b.ebuild,v 1.1 2000/08/15 18:10:54 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b.ebuild,v 1.1.1.1 2005/11/30 09:57:18 chriswhite Exp $
 
-P=mpeg-tools-1.5b
-A=mpeg_encode-1.5b-src.tar.gz
-S=${WORKDIR}/mpeg_encode
-CATEGORY="media-video"
+inherit eutils
+
+MY_PN=mpeg_encode
+S=${WORKDIR}/${MY_PN}
 DESCRIPTION="Tools for MPEG video"
-SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${A}"
-HOMEPAGE="http://bmrc.bercley.edu/research/mpeg/mpeg_encode.html"
+SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
+
+DEPEND="virtual/x11"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
+IUSE=""
 
 src_unpack () {
-    unpack ${A}
-    cd ${S}
-    cp libpnmrw.c libpnmrw.c.orig
-    sed -e "s:extern char\* sys_errlist:extern __const char \*__const sys_errlist:" \
-	libpnmrw.c.orig > libpnmrw.c
+	unpack ${A}
+	cd ${S}
+	cp ${FILESDIR}/${PV}/libpnmrw.c .
+	cp ${FILESDIR}/${PV}/libpnmrw.h headers/
+	epatch ${FILESDIR}/${PV}/${P}-gentoo.patch
 }
-src_compile() {
 
-    cd ${S}
-    make
-    cd ../convert
-    make
-    cd mtv
-    make
+src_compile() {
+	cd ${S}
+	make || die
+	cd ../convert
+	make || die
+	cd mtv
+	make || die
 }
 
 src_install () {
-
-    cd ${S}
-    into /usr
-    dobin mpeg_encode
-    doman docs/*.1
-    dodoc BUGS CHANGES COPYRIGHT README TODO VERSION
-    dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
-    docinto examples
-    dodoc examples/*
-    cd ../convert
-    dobin eyuvtojpeg eyuvtoppm jmovie2jpeg mpeg_demux ppmtoeyuv mtv/movieToVid
-    
-    
-
+	cd ${S}
+	into /usr
+	dobin mpeg_encode
+	doman docs/*.1
+	dodoc BUGS CHANGES COPYRIGHT README TODO VERSION
+	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
+	docinto examples
+	dodoc examples/*
+	cd ../convert
+	dobin eyuvtojpeg eyuvtoppm jmovie2jpeg mpeg_demux ppmtoeyuv mtv/movieToVid
 }
-
-
diff --git a/media-video/mpeg2vidcodec/ChangeLog b/media-video/mpeg2vidcodec/ChangeLog
index e9fcb4f0b9a1..81f38d3e21ac 100644
--- a/media-video/mpeg2vidcodec/ChangeLog
+++ b/media-video/mpeg2vidcodec/ChangeLog
@@ -1,9 +1,53 @@
 # ChangeLog for media-video/mpeg2vidcodec
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/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-video/mpeg2vidcodec/ChangeLog,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $
+
+  20 Feb 2005; <gongloo@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Stable on ppc-macos.
+
+  20 Jan 2005; <gongloo@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Keyworded ~ppc-macos.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  stable on ppc64 bug #55801
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpeg2vidcodec-12-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  07 Mar 2004; Bret Curtis <psi29a@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  30 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  mpeg2vidcodec-12-r1.ebuild:
+  use sed -i; use emake; more error checking/messages
+
+  03 Dec 2003; Aron Griffis <agriffis@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Stable on alpha to support lilypond-1.8.2
+
+  17 Nov 2003; Jason Wever <weeve@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Marked stable on sparc.
 
 *mpeg2vidcodec-12-r1 (1 Feb 2002)
 
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> mpeg2vidcodec-12-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  02 Apr 2003; Graham Forest <vladimir@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  set ppc in keywords
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Added ~sparc to keywords.
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
+  Add ~alpha to KEYWORDS
+
+  14 Jan 2003; Jon Nall <nall@gentoo.org> mpeg2vidcodec-12-r1.ebuild :
+  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-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
index e69de29bb2d1..fd4819e8f327 100644
--- a/media-video/mpeg2vidcodec/Manifest
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 f0d7a51c9f190dd222c64b5a27f31f38 mpeg2vidcodec-12-r1.ebuild 777
+MD5 e7b5ca6fca7f8dcbb96bd134e8c6b336 ChangeLog 2162
+MD5 ddb2656db72efd82cb2053a7e1eca471 files/digest-mpeg2vidcodec-12-r1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC8sQsgIKl8Uu19MoRAv16AJ9UT63ggKiaH/ik6yrZRLEgrlS6xgCeKgK6
+4bV85ApJ40RwKHI+gc4CxXY=
+=r5ai
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12-r1 b/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12-r1
index 8a1a59cfd148..44b15f51a070 100644
--- a/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12-r1
+++ b/media-video/mpeg2vidcodec/files/digest-mpeg2vidcodec-12-r1
@@ -1 +1 @@
-MD5 4a66565979be0818bd8a41d948943451 mpeg2vidcodec_v12.tar.gz
+MD5 4a66565979be0818bd8a41d948943451 mpeg2vidcodec_v12.tar.gz 259790
diff --git a/media-video/mpeg2vidcodec/metadata.xml b/media-video/mpeg2vidcodec/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/mpeg2vidcodec/metadata.xml
+++ b/media-video/mpeg2vidcodec/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index 9b5488b3e38b..df7173ed20b0 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -1,39 +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-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $
 
-P=mpeg2vidcodec_v12
-A=${P}.tar.gz
-S=${WORKDIR}/mpeg2
+MY_P="${PN}_v${PV}"
 DESCRIPTION="MPEG Library"
-SRC_URI="ftp://ftp.mpeg.org/pub/mpeg/mssg/${A}"
-HOMEPAGE="http://www.mpeg.org"
-
-DEPEND=">=sys-libs/glibc-2.1.3"
+HOMEPAGE="http://www.mpeg.org/"
+SRC_URI="ftp://ftp.mpeg.org/pub/mpeg/mssg/${MY_P}.tar.gz"
 
-src_unpack () {
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
+IUSE=""
 
-  unpack ${A}
-  cd ${S}
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-
-}
-src_compile() {
+RDEPEND=""
+DEPEND=">=sys-apps/sed-4"
 
-    cd ${S}
-    try make
+S=${WORKDIR}/mpeg2
 
+src_unpack() {
+	unpack ${A}
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		"${S}"/Makefile \
+		|| die "sed Makefile failed"
 }
 
-src_install () {
-
-    cd ${S}
-    into /usr
-    dobin src/mpeg2dec/mpeg2decode
-    dobin src/mpeg2enc/mpeg2encode
-    dodoc README doc/*
-
+src_install() {
+	dobin src/mpeg2dec/mpeg2decode src/mpeg2enc/mpeg2encode \
+		|| die "dobin failed"
+	dodoc README doc/*
 }
-
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 8cc768ef41bf..c08191acda6e 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for media-video/mpeg4ip
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.1 2003/11/24 17:10:57 tester Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
+
+  19 Nov 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.4.1.ebuild:
+  Stripped -Werror, fixes bug #97936
+
+*mpeg4ip-1.4.1 (11 Nov 2005)
+
+  11 Nov 2005; Olivier Crête <tester@gentoo.org> -mpeg4ip-1.4.ebuild,
+  +mpeg4ip-1.4.1.ebuild:
+  Version bump
+
+  10 Nov 2005; Olivier Crête <tester@gentoo.org>
+  -files/mpeg4ip-1.2-mp4encode-template-path.patch, -mpeg4ip-1.0.ebuild,
+  mpeg4ip-1.1.ebuild, -mpeg4ip-1.2.ebuild, mpeg4ip-1.3.ebuild,
+  mpeg4ip-1.4.ebuild:
+  Block faad2, mpeg4ip should be made a dep of faad2
+
+*mpeg4ip-1.4 (10 Nov 2005)
+
+  10 Nov 2005; Olivier Crête <tester@gentoo.org> +mpeg4ip-1.4.ebuild:
+  Version bump, added optional dep on x264
+
+  05 Nov 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild,
+  mpeg4ip-1.3.ebuild:
+  Remove -Werror to fix bug #97936
+
+  04 Nov 2005; Daniel Drake <dsd@gentoo.org> mpeg4ip-1.1.ebuild:
+  Add a libtoolize call. Closes bug #98133
+
+*mpeg4ip-1.3 (19 May 2005)
+
+  19 May 2005; Olivier Crête <tester@gentoo.org> +mpeg4ip-1.3.ebuild:
+  Version bump
+
+  17 Jan 2005; Olivier Crête <tester@gentoo.org> :
+  Moved libtool/autoconf/automake to DEPEND
+
+  06 Jan 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild:
+  enable-v4l2 now works ok too
+
+  03 Jan 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild:
+  Really fix compilation without X, changed use flag from gtk to X
+
+  31 Dec 2004; Olivier Crête <tester@gentoo.org>
+  +files/mpeg4ip-1.2-mp4encode-template-path.patch:
+  Fixed compilation without the X stuff, thanks to Christian Zoffoli
+  <czoffoli@xmerlin.org> see bug #74189. Fixed compilation problem, bug #73761.
+  Fix path problem, thanks to Christian Zoffoli <czoffoli@xmerlin.org> again,
+  bug 74469. Another patch to install more docs from Christian (bug #74500)
+
+  06 Dec 2004; Olivier Crete <tester@gentoo.org>
+  -files/mpeg4ip-1.2-gentoo-fixes.patch:
+  Removed useless patch
+
+*mpeg4ip-1.2 (04 Dec 2004)
+
+  04 Dec 2004; Olivier Crete <tester@gentoo.org>
+  +files/mpeg4ip-1.2-gentoo-fixes.patch, +mpeg4ip-1.2.ebuild:
+  Version bimp, disabled ffmpeg support because it just doesnt build
+
+  05 Nov 2004; Travis Tilley <lv@gentoo.org> mpeg4ip-1.1.ebuild:
+  fix a silly libdir bug and mark 1.1 stable on amd64
+
+  05 Nov 2004; Olivier Crete <tester@gentoo.org> mpeg4ip-1.1.ebuild:
+  Fix compilation problems (bugs 60616, 65190). Thanks to 
+  Tyler Montbriand <tsm@accesscomm.ca> and centic@gentoo.org.
+
+  26 Jul 2004; Travis Tilley <lv@gentoo.org> mpeg4ip-1.1.ebuild:
+  removed invalid blocker that prevents faad2 from being installed when mpeg4ip
+  is also installed
+
+  29 Jun 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.1.ebuild:
+  Removed superfluous S= and marked 1.1 stable on x86
+
+  08 Jun 2004; <tester@gentoo.org> mpeg4ip-1.1.ebuild:
+  Removed -Werror because it breaks with some versions of gcc (#51617)
+
+  05 Jun 2004; <tester@gentoo.org> mpeg4ip-1.1.ebuild:
+  Made xvid, nas, alsa, esd, arts support use flags. Fixed a few bugs (including
+  #52693 and 52071). And disabled mp4live because I can't get it to build.
+
+  01 Jun 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.1.ebuild:
+  only --disable-v4l2 is valid, fixes bug #52649, removed useless cruft from
+  pre-releases
+
+*mpeg4ip-1.1 (20 May 2004)
+
+  20 May 2004; Travis Tilley <lv@gentoo.org> +mpeg4ip-1.1.ebuild:
+  version bump and removal of the now unnecessary SDL magic. finally... a
+  version of mpeg4ip that works on amd64. yay! *does a little dance*
+
+  27 Feb 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.0_rc1.ebuild,
+  mpeg4ip-1.0_rc3.ebuild, files/sliver.patch:
+  Add block on faad2 as it provides libmp4v2 too, also removed ~ppc as faac 
+  doesnt have it
+
+  21 Jan 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild:
+  Trying to fix bug 38316 which I believe is the same as 34804 since mpeg4ip has
+  its private SDL. Compiling SDL first and fixing its .la file.
+
+*mpeg4ip-1.0 (05 Jan 2004)
+
+  05 Jan 2004; Olivier Crete <tester@gentoo.org> mpeg4ip-1.0.ebuild:
+  Version bump.. now 1.0!
+
+  09 Dec 2003; Olivier Crete <tester@gentoo.org> mpeg4ip-1.0_rc1.ebuild,
+  mpeg4ip-1.0_rc3.ebuild, files/sliver.patch:
+  Marking rc1 stable on x86, added patch for m4a file handling
+
+*mpeg4ip-1.0_rc3 (03 Dec 2003)
+
+  03 Dec 2003; Olivier Crete <tester@gentoo.org> mpeg4ip-1.0_rc3.ebuild:
+  Version bump
 
 *mpeg4ip-1.0_rc1 (24 Nov 2003)
 
diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index bf7b802e398d..eb507a63dbd7 100644
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,3 +1,20 @@
-MD5 c4ac21a107014bb21ee6f9c16a689391 mpeg4ip-1.0_rc1.ebuild 940
-MD5 a090b9d809b76b0d8b075efe6868595a metadata.xml 254
-MD5 e4f8176e7bdb754b483129ba0cc83b7f files/digest-mpeg4ip-1.0_rc1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 31544d8d7b7e74d1dc0c885b357daa18 mpeg4ip-1.1.ebuild 1756
+MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
+MD5 4a1d2954f18bc7134095f468a9831117 ChangeLog 4821
+MD5 fa65b1bd694348c5794512bc6db1ca30 mpeg4ip-1.4.1.ebuild 3389
+MD5 3152b9a0685b9506c5ccd32eef11376c mpeg4ip-1.3.ebuild 3165
+MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
+MD5 f66eabf6e140aef8962a75cf06d15df0 files/digest-mpeg4ip-1.4.1 66
+MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
+MD5 e4ff7ab91be9fcfe456f8c9d9d5050ce files/mpeg4ip-1.1-gcc3.4.patch 8110
+MD5 9dc5a82373d611ff96499fe69690fe62 files/digest-mpeg4ip-1.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDf10HmOfEJZHYOKcRAlZTAKDTH6Ho/dUZiPPFdTrwssFZQm/jpgCgic9I
+R/QoLt+SfIMHi9JprB8yelw=
+=bEJS
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpeg4ip/metadata.xml b/media-video/mpeg4ip/metadata.xml
index ffbf3f71e4ac..dd18ff55d3cd 100644
--- a/media-video/mpeg4ip/metadata.xml
+++ b/media-video/mpeg4ip/metadata.xml
@@ -6,5 +6,5 @@
   <email>tester@gentoo.org</email>
     <name>Olivier Crête</name>
 </maintainer>
-/pkgmetadata>
+</pkgmetadata>
 
diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
index 78b7873920f3..81dff4532210 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
@@ -1,47 +1,71 @@
-# Copyright 1999-2004 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-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.1 2004/05/21 03:52:12 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="MPEG 4 implementation library"
 
 HOMEPAGE="http://www.mpeg4ip.net/"
 
-PV2=`echo $PV | sed s/_rc/RC/`
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV2}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1 LGPL-2 GPL-2 LGPL-2.1 BSD UCL MPEG4"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
-# not 64 bit safe yet
+KEYWORDS="x86 amd64"
+
+IUSE="ipv6 mmx gtk v4l2 xvid nas alsa esd arts"
+
+RDEPEND=">=media-libs/faac-1.20.1
+	>=media-sound/lame-3.92
+	gtk? ( >=x11-libs/gtk+-2 )
+	media-libs/libid3tag
+	xvid? ( media-libs/xvid )
+	nas? ( media-libs/nas virtual/x11 )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	!media-libs/faad2"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's/-Wmissing-prototypes//g' -e 's/-Werror//g' configure
 
-IUSE="ipv6 mmx gtk v4l2"
+	cd ${S}/lib/SDLAudio
+	sed -i -e 's:-laudio:-L/usr/X11R6/lib -laudio:' configure
 
-DEPEND="sys-devel/libtool
-		sys-devel/autoconf
-		sys-devel/automake
-		media-libs/faac
-		>=media-sound/lame-3.92
-		gtk? ( >=x11-libs/gtk+-2 )
-		x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )
-		media-video/ffmpeg
-		media-libs/libid3tag"
+	cd ${S}
+	epatch ${FILESDIR}/mpeg4ip-1.1-gcc3.4.patch
+	epatch ${FILESDIR}/mpeg4ip-1.1-gentoo-fixes.patch
 
-S="${WORKDIR}/${PN}-${PV2}"
+	# ships with old version of libtool, causes problems (bug #98133)
+	libtoolize --copy --force
+}
 
 src_compile() {
 
 	cd ${S}
 
 	local myconf
-	myconf=" `use_enable ipv6`
-			`use_enable mmx`
-			`use_enable v4l2`
-			` use_enable ppc`"
-	use amd64 && myconf="$myconf --disable-mp4live" && \
-		ewarn "mp4live disabled on amd64"
+
+	# mp4live doesnt build, disable it..
+	myconf=" $(use_enable ipv6)
+			$(use_enable mmx)
+			$(use_enable ppc)
+			$(use_enable nas)
+			$(use_enable esd)
+			$(use_enable alsa)
+			$(use_enable arts)"
+	use v4l2 || myconf="${myconf} --disable-v4l2"
 
 	econf ${myconf} || die "configure failed"
 
@@ -53,6 +77,6 @@ src_compile() {
 src_install () {
 
 	cd ${S}
-	einstall || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 
 }
diff --git a/media-video/mpeg4ip/mpeg4ip-1.3.ebuild b/media-video/mpeg4ip/mpeg4ip-1.3.ebuild
index 0c619fe98ce7..0641aa24883e 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.3.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-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/media-video/mpeg4ip/mpeg4ip-1.3.ebuild,v 1.1 2005/05/19 01:53:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.3.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -36,13 +36,14 @@ RDEPEND=" media-libs/libsdl
 	nas? ( media-libs/nas virtual/x11 )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
-	esd? ( media-sound/esound )"
+	esd? ( media-sound/esound )
+	!media-libs/faad2"
 
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	sys-devel/autoconf
 	sys-devel/automake
-	player?( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )"
+	player? ( x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) ) )"
 
 
 pkg_setup() {
@@ -110,6 +111,7 @@ src_compile() {
 		${EXTRA_ECONF} \
 		${myconf} || die "configure failed"
 
+	sed -i -e 's:-Werror::' common/video/iso-mpeg4/src/Makefile || die "sed failed"
 
 	emake || die "make failed"
 }
@@ -118,7 +120,7 @@ src_install () {
 	cd ${S}
 	make install DESTDIR="${D}" || die "make install failed"
 
-	dodoc doc/MPEG4IP_Guide.pdf doc/*txt AUTHORS COPYING TODO
+	dodoc doc/MPEG4IP_Guide.pdf doc/*txt AUTHORS TODO
 
 	dohtml doc/*.html FEATURES.html || die
 
diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
index 01a913f0f0cd..07d9ba2dc2c0 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-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-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.1 2005/11/11 06:47:55 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -120,6 +120,7 @@ src_compile() {
 		${EXTRA_ECONF} \
 		${myconf} || die "configure failed"
 
+	sed -i -e 's:-Werror::' common/video/iso-mpeg4/src/Makefile || die "sed failed"
 
 	emake || die "make failed"
 }
diff --git a/media-video/mpglen/ChangeLog b/media-video/mpglen/ChangeLog
index 547f55345408..55d619a6c86b 100644
--- a/media-video/mpglen/ChangeLog
+++ b/media-video/mpglen/ChangeLog
@@ -1,10 +1,19 @@
-# ChangeLog for media-sound/mpglen
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpglen/ChangeLog,v 1.1 2004/10/06 20:08:02 trapni Exp $
+# ChangeLog for media-video/mpglen
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpglen/ChangeLog,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mpglen-0.1.ebuild:
+  Don't install COPYING file.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> mpglen-0.1.ebuild:
+  Added to ~ppc.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> mpglen-0.1.ebuild:
+  Added to ~amd64.
 
 *mpglen-0.1 (21 Aug 2004)
 
-  21 Aug 2004; Christian Parpart <cparpart@surakware.net>:
+  21 Aug 2004; Christian Parpart <trapni@gentoo.org>:
   Initial import. Ebuild submitted (#64511) 
   by henning <henning@wh9.tu-dresden.de>.
   Adapted to meet gentoo policies.
diff --git a/media-video/mpglen/Manifest b/media-video/mpglen/Manifest
index e466e2fa50f6..1dbb83f21849 100644
--- a/media-video/mpglen/Manifest
+++ b/media-video/mpglen/Manifest
@@ -1,2 +1,14 @@
-MD5 5bffaa2f4ad837ad2ef1eb066e569c90 mpglen-0.1.ebuild 405
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3451b64b7b2a0acbf97a9b343157a96b ChangeLog 696
+MD5 8655bfcafc56b0f4d3f036014b6d552f mpglen-0.1.ebuild 669
+MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
 MD5 f2eedfb2e2a712991121c442e5465a9c files/digest-mpglen-0.1 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGi9tj5H05b2HAEkRAnaMAJ4uIeaFEpzq07Tj0uO/RuB2SiAElgCfd6rn
+XTCG0udMAOFtquucJ712sWc=
+=vHY4
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpglen/mpglen-0.1.ebuild b/media-video/mpglen/mpglen-0.1.ebuild
index 4a8524c6015f..719a6c5ed132 100644
--- a/media-video/mpglen/mpglen-0.1.ebuild
+++ b/media-video/mpglen/mpglen-0.1.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpglen/mpglen-0.1.ebuild,v 1.1 2004/10/06 20:08:02 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpglen/mpglen-0.1.ebuild,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
+
+IUSE=""
+
+MY_S=${WORKDIR}/${PN}
 
 DESCRIPTION="A program to scan through a MPEG file and count the number of GOPs and frames"
-SRC_URI="http://www.iamnota.net/mpglen/${PN}.tar.gz"
 HOMEPAGE="http://www.iamnota.net/mpglen/"
-KEYWORDS="~x86"
+SRC_URI="http://www.iamnota.net/mpglen/${PN}.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
-MY_S=${WORKDIR}/${PN}
+DEPEND="virtual/libc"
 
 src_compile () {
 	cd ${MY_S} || die
@@ -21,5 +24,5 @@ src_compile () {
 src_install () {
 	cd ${MY_S} || die
 	dobin ${PN} || die
-	dodoc AUTHORS COPYING Changelog README || die
+	dodoc AUTHORS Changelog README || die
 }
diff --git a/media-video/mpgtx/ChangeLog b/media-video/mpgtx/ChangeLog
index 72e73d5b54a6..dff8fb1c9f0a 100644
--- a/media-video/mpgtx/ChangeLog
+++ b/media-video/mpgtx/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for media-video/mpgtx
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/ChangeLog,v 1.1 2003/09/08 17:34:34 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/ChangeLog,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> mpgtx-1.3.1.ebuild:
+  Improved check for gcc 3.4 or better, considering gcc 4.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> mpgtx-1.3.1.ebuild:
+  Moved to toolchain-funcs eclass and removed virtual/libc dep.
+
+  23 Apr 2005; Kito <kito@gentoo.org> mpgtx-1.3.1.ebuild:
+  DEPEND=virtual/libc instead of glibc. ~ppc-macos keyword, closes Bug 67043
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/mpgtx-1.3-gcc34.patch:
+  removed unneeded patch
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> mpgtx-1.3.1.ebuild,
+  -mpgtx-1.3.ebuild:
+  stable on amd64 and x86, also did some cleanup
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+*mpgtx-1.3.1 (28 Jan 2005)
+
+  28 Jan 2005; Chris White <chriswhite@gentoo.org> +mpgtx-1.3.1.ebuild:
+  Bumped to 1.3.1.  Fixes bug #79160.  Thanks to Martin Deirs for the report.
+
+  18 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> mpgtx-1.3.ebuild:
+  Marked ~amd64.
+
+  29 Sep 2004; Patrick Dawson <pkdawson@gentoo.org>
+  +files/mpgtx-1.3-gcc34.patch, mpgtx-1.3.ebuild:
+  gcc-3.4 fix
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.  Taking over as maintainer.
 
 *mpgtx-1.3 (08 Sep 2003)
 
diff --git a/media-video/mpgtx/Manifest b/media-video/mpgtx/Manifest
index 91f6623e8e17..e5b5afceface 100644
--- a/media-video/mpgtx/Manifest
+++ b/media-video/mpgtx/Manifest
@@ -1,2 +1,4 @@
-MD5 ce7c2a877f504f35e6442ddb5cdce66c mpgtx-1.3.ebuild 1155
-MD5 2f7766f539f18c11a67ea4d0ceaaadda files/digest-mpgtx-1.3 57
+MD5 f4fae7f6a2fd30b887b06cddf71e2821 ChangeLog 1679
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 2f3030f4b9b295a7e312393e025a95ed mpgtx-1.3.1.ebuild 1445
+MD5 e7a438b14d3a5d4e41f591b09d90b6cf files/digest-mpgtx-1.3.1 62
diff --git a/media-video/mpgtx/metadata.xml b/media-video/mpgtx/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/mpgtx/metadata.xml
+++ b/media-video/mpgtx/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/mpgtx/mpgtx-1.3.1.ebuild b/media-video/mpgtx/mpgtx-1.3.1.ebuild
index 1a95922f6232..439712c8dde8 100644
--- a/media-video/mpgtx/mpgtx-1.3.1.ebuild
+++ b/media-video/mpgtx/mpgtx-1.3.1.ebuild
@@ -1,25 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/mpgtx-1.3.1.ebuild,v 1.1 2005/01/28 01:46:17 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpgtx/mpgtx-1.3.1.ebuild,v 1.1.1.1 2005/11/30 09:57:21 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="mpgtx a command line MPEG audio/video/system file toolbox"
 SRC_URI="mirror://sourceforge/mpgtx/${P}.tar.gz"
 HOMEPAGE="http://mpgtx.sourceforge.net/"
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc amd64 ~ppc-macos"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="sys-libs/glibc"
+DEPEND=""
 
 src_compile() {
 	./configure --parachute --prefix=/usr
-	if [ "$(gcc-major-version)" -ge "3" -a "$(gcc-minor-version)" -ge "4" ]; then
+
+	if [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "4" ] || \
+	[ "$(gcc-major-version)" -ge "4" ]; then
 		sed -i "s:-O3:-O3 -fno-unit-at-a-time:" Makefile
 	fi
+
 	emake || die "emake failed"
 }
 
diff --git a/media-video/mplayer-bin/ChangeLog b/media-video/mplayer-bin/ChangeLog
index 40ec6537d95f..97eca23c6350 100644
--- a/media-video/mplayer-bin/ChangeLog
+++ b/media-video/mplayer-bin/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-video/mplayer-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/ChangeLog,v 1.1 2005/08/29 23:58:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/ChangeLog,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
+
+*mplayer-bin-1.0_pre7-r3 (01 Nov 2005)
+
+  01 Nov 2005; <dang@gentoo.org> +mplayer-bin-1.0_pre7-r3.ebuild:
+  mplayer-bin now has lirc support
+
+  08 Sep 2005; <dang@gentoo.org> mplayer-bin-1.0_pre7-r2.ebuild:
+  Update deps, because libesd moved from medialibs to soundlibs
+
+*mplayer-bin-1.0_pre7-r2 (02 Sep 2005)
+
+  02 Sep 2005; <dang@gentoo.org> -mplayer-bin-1.0_pre7.ebuild,
+  +mplayer-bin-1.0_pre7-r2.ebuild:
+  Include fix for bug #103555; Fix quoting on scripts, so mplayer-bin can play
+  files with spaces; move linked win32codecs dir to /opt/mplayer-bin/lib/win32
+  and symlink that to the correct location
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mplayer-bin-1.0_pre7-r1.ebuild:
+  Don't use -a option with cp.
+
+*mplayer-bin-1.0_pre7-r1 (31 Aug 2005)
+
+  31 Aug 2005; <dang@gentoo.org> +mplayer-bin-1.0_pre7-r1.ebuild:
+  Revbump to add new features.  These include:
+  	 mmx2/sse2/3dnow/3dnowext, bidi, cpudetection, dts, dv, dvb, and xinerama
+
+
+  30 Aug 2005; <dang@gentoo.org> mplayer-bin-1.0_pre7.ebuild:
+  Add missing gtklibs dep Bug #104306
+
+  30 Aug 2005; <dang@gentoo.org> mplayer-bin-1.0_pre7.ebuild:
+  Add emul-linux-x86-sdl dep. Bug #104301
 
 *mplayer-bin-1.0_pre7 (29 Aug 2005)
 
diff --git a/media-video/mplayer-bin/Manifest b/media-video/mplayer-bin/Manifest
index 9d6526803183..049d09cfbe35 100644
--- a/media-video/mplayer-bin/Manifest
+++ b/media-video/mplayer-bin/Manifest
@@ -1,3 +1,18 @@
-MD5 9feb02ea8ce89647635ef3b6a6b0cd2b mplayer-bin-1.0_pre7.ebuild 685
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5bd0270302c21a41d0906a5f8687c73f ChangeLog 1594
+MD5 31fa5b3a7f08192c5f7c2b6f56c96e2c files/digest-mplayer-bin-1.0_pre7-r1 77
+MD5 3b5cbccfff9e3a30c952716ad4a600d1 files/digest-mplayer-bin-1.0_pre7-r2 77
+MD5 6de0d18bfdfdfe51517d3eb29b2d4df1 files/digest-mplayer-bin-1.0_pre7-r3 77
 MD5 d138fbd38b04f78fe9b3766051723a5b metadata.xml 218
-MD5 6016bcda0338c21a0c9b9aa7910dcffc files/digest-mplayer-bin-1.0_pre7 74
+MD5 d9ec6c5a0cd8021bea43b1d8abccdf01 mplayer-bin-1.0_pre7-r1.ebuild 829
+MD5 14801b83d2fcbb186b1f2972fa0b6fb5 mplayer-bin-1.0_pre7-r2.ebuild 1110
+MD5 e9c94d2d375925b0f970898cf1fbb722 mplayer-bin-1.0_pre7-r3.ebuild 1147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZ4+tomPajV0RnrERAt6EAJ9cAiTAqGcfxTP+yQEwpimEPw1+bQCfSvyt
+Gr4m1xHih+yLrSNDSveFPh0=
+=YSnc
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r1.ebuild b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r1.ebuild
index 69fae34b4c05..1de12ee85c41 100644
--- a/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r1.ebuild,v 1.1 2005/08/31 18:01:15 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
 
 DESCRIPTION="Pre-build mplayer binary for amd64 systems"
 HOMEPAGE="http://www.gentoo.org/"
@@ -21,6 +21,6 @@ RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
 S=${WORKDIR}
 
 src_install() {
-	cp -avf ${WORKDIR}/* ${D}/
+	cp -pPRvf ${WORKDIR}/* ${D}/
 	dosym /opt/mplayer-bin/bin/mplayer-bin /opt/mplayer-bin/bin/gmplayer-bin
 }
diff --git a/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild
index e006a4adbbc6..a2716d86e65e 100644
--- a/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild
+++ b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-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-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild,v 1.1 2005/09/02 19:38:54 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
 
 inherit multilib
 
@@ -14,10 +14,10 @@ KEYWORDS="-* ~amd64"
 IUSE=""
 
 RDEPEND=">=app-emulation/emul-linux-x86-baselibs-2.0
-	>=app-emulation/emul-linux-x86-soundlibs-2.1
+	>=app-emulation/emul-linux-x86-soundlibs-2.2
 	>=app-emulation/emul-linux-x86-gtklibs-2.1
 	>=app-emulation/emul-linux-x86-sdl-2.1
-	>=app-emulation/emul-linux-x86-medialibs-1.1
+	>=app-emulation/emul-linux-x86-medialibs-1.1-r1
 	>=media-libs/win32codecs-20050412"
 
 S=${WORKDIR}
diff --git a/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r3.ebuild b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r3.ebuild
index f5a1615d8a48..0f63c0b54444 100644
--- a/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r3.ebuild
+++ b/media-video/mplayer-bin/mplayer-bin-1.0_pre7-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-video/mplayer-bin/mplayer-bin-1.0_pre7-r3.ebuild,v 1.1 2005/11/01 15:54:12 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-bin/mplayer-bin-1.0_pre7-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
 
 inherit multilib
 
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index d98bb4647fc0..999afcfa9be2 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,1565 @@
 # ChangeLog for media-video/mplayer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/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-video/mplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:57:34 chriswhite Exp $
+
+  01 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/mplayer-1.0_pre6-codecs.patch,
+  -files/mplayer-1.0_pre6-configure.patch,
+  -files/mplayer-1.0_pre6-pic.patch, -files/mplayer-1.0_pre6-ppc64.patch,
+  +files/mplayer-1.0_pre7-ppc64.patch, -files/mplayer-avi_crash.patch,
+  -files/mplayer-gcc_detection.patch, -files/mplayer-jack.patch,
+  -files/mplayer-nl.patch, -mplayer-1.0_pre6-r4.ebuild,
+  -mplayer-1.0_pre6-r5.ebuild, -mplayer-1.0_pre6-r6.ebuild,
+  -mplayer-1.0_pre7.ebuild, mplayer-1.0_pre7-r1.ebuild:
+  Complete cleanup
+
+  01 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  -mplayer-1.0_pre6-r4.ebuild, -mplayer-1.0_pre6-r5.ebuild,
+  -mplayer-1.0_pre6-r6.ebuild:
+  Pruning mplayer-1.0_pre6 ebuilds
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mplayer-1.0_pre6-r4.ebuild, mplayer-1.0_pre6-r5.ebuild,
+  mplayer-1.0_pre6-r6.ebuild, mplayer-1.0_pre7.ebuild:
+  Disable divx4linux in every version, not just the last one, to avoid
+  breakage now that the package is gone.
+
+  30 Oct 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  Removed ancient divx4linux support, internal support if far better anyway.
+
+  06 Nov 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  disable x264 for now
+
+  10 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre7-gcc4-amd64.patch, mplayer-1.0_pre7-r1.ebuild:
+  Fix for gcc-4.0.1 and amd64
+
+  31 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  mplayer-1.0_pre7-r1.ebuild:
+  stable on alpha #103555
+
+  31 Aug 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  Cleanup
+
+  30 Aug 2005; Ian Leitch <port001@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  Stable on x86, bug #103555
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mplayer-1.0_pre7-r1.ebuild:
+  Stable on sparc wrt #103555
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  mplayer-1.0_pre7-r1.ebuild:
+  Stable on amd64 wrt bug 103555.
+
+  27 Aug 2005; Markus Rothe <corsair@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  Stable on ppc64 (bug #103555)
+
+  27 Aug 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  Marked ppc
+
+*mplayer-1.0_pre7-r1 (27 Aug 2005)
+
+  27 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +mplayer-1.0_pre7-r1.ebuild:
+  Hotfix release for a recently discovered buffer overflow, bug #103555
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> mplayer-1.0_pre7.ebuild:
+  stable on ia64
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7.ebuild:
+  Removed the libmatroska dep, fixes bug #99024, thanks to Giacomo Perale
+  <ghepeu@virgilio.it> for pointing out
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org> files/mplayer.desktop:
+  Fix for the .desktop file, bug #98268
+
+  25 May 2005; Herbie Hopkins <herbs@gentoo.org> mplayer-1.0_pre7.ebuild:
+  Multilib fix, bad path to libxmms.
+
+  16 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Fix bug #92751
+
+  10 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7.ebuild:
+  aalib support fixed
+
+  09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  3dfx requires dga. Fix for bug #91351
+
+  09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Purge problematic cflag
+
+  09 May 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/mplayer-gcc_detection.patch:
+  Simpler gcc_detection patch, update from Diego Biurrun
+
+  09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Minor updates
+
+  06 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Fix the ebuilds to enable cpudetection correctly, thanks to Emanuele
+  Giaquinta <emanuele.giaquinta@gmail.com>
+
+  05 May 2005; Aron Griffis <agriffis@gentoo.org> mplayer-1.0_pre6-r5.ebuild,
+  mplayer-1.0_pre6-r6.ebuild, mplayer-1.0_pre7.ebuild:
+  add ~ia64
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/mplayer-0.90-coreutils-fixup.patch, -files/mplayer-1.0-gtk2.patch,
+  -files/mplayer-1.0_pre5-alsa-gcc34.patch,
+  -files/mplayer-1.0_pre5-bio2jack.patch,
+  -files/mplayer-1.0_pre5-configure.patch,
+  -files/mplayer-1.0_pre5-gcc_detection.patch,
+  -files/mplayer-1.0_pre5-help_mp-ro.h.patch,
+  -files/mplayer-1.0_pre5-live.patch,
+  -files/mplayer-1.0_pre5-mga-kernel-2.6.patch,
+  -files/mplayer-1.0_pre5-mips64.patch,
+  -files/mplayer-1.0_pre5-r1-conf_locale.patch,
+  -files/mplayer-1.0_pre5-r4-ppc64.patch,
+  -files/mplayer-1.0_pre5-r5-configure.patch,
+  -files/mplayer-1.0_pre5-yuv2rgb_fix.patch, -files/cachefill.patch,
+  -files/gui_vuln_code.patch, -files/mplayer-gif.patch,
+  -files/mplayer-odml.patch, -files/mplayer-x11.patch,
+  -files/real_demux.patch, -files/str_undefined.patch, -files/strl.c,
+  -files/vuln02-fix.diff, -mplayer-1.0_pre5-r5.ebuild:
+  removed old vulnerable version and unneeded patches.
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mplayer-1.0_pre7-gcc4.patch,
+  +files/mplayer-1.0_pre7-gcc_detection.patch, mplayer-1.0_pre7.ebuild:
+  Fix building with gcc4. Patch from Genady Okrain (Mafteah) 's overlay (plus
+  some added fixes to libvo/aclib_template.c that whoever seemed to have
+  missed).
+
+  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> mplayer-1.0_pre7.ebuild:
+  Same amd64 cleanup, new version.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> mplayer-1.0_pre6-r6.ebuild:
+  minor amd64-specific cleanup
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  mplayer-1.0_pre6-r4.ebuild:
+  Stable on alpha, bug 89277.
+
+  17 Apr 2005; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre6-r4.ebuild:
+  Stable on SPARC wrt security bug #89277.
+
+  18 Apr 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Minor polishing, thanks to Gurgh <gurgh@gurga.com> for the suggestions
+
+  17 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre5-alsa-gcc34.patch,
+  +files/mplayer-1.0_pre5-help_mp-ro.h.patch, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Fixed pre5 patchset
+
+  17 Apr 2005; Markus Rothe <corsair@gentoo.org> mplayer-1.0_pre6-r4.ebuild:
+  Stable on ppc64; bug #89277
+
+*mplayer-1.0_pre7 (17 Apr 2005)
+
+  17 Apr 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
+  +mplayer-1.0_pre7.ebuild:
+  New experimental ebuild and minor fix
+
+  16 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mplayer-1.0_pre6-r4.ebuild:
+  Stable on ppc.
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre6-r4.ebuild:
+  stable on amd64 and x86 wrt #89277
+
+*mplayer-1.0_pre6-r4 (16 Apr 2005)
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -mplayer-1.0_pre6-r1.ebuild, -mplayer-1.0_pre6-r2.ebuild,
+  -mplayer-1.0_pre6-r3.ebuild, +mplayer-1.0_pre6-r4.ebuild,
+  +mplayer-1.0_pre6-r5.ebuild, +mplayer-1.0_pre6-r6.ebuild:
+  updated revisions for security bug #89277
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  +files/mmst_fix_20050415.diff, +files/rtsp_fix_20050415.diff,
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild,
+  mplayer-1.0_pre6-r3.ebuild:
+  added 2 security related patches to the _pre6 ebuilds. see #89277. also
+  updated metadata.xml, chriswhite is retired.
+
+  16 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/mplayer-1.0_pre4-alsa-gcc34.patch,
+  -files/mplayer-1.0_pre4-altivec-gcc34.patch,
+  -files/mplayer-1.0_pre4-help_mp-ro.h.patch,
+  -files/mplayer-1.0_pre4-mpst.patch, -mplayer-1.0_pre4-r7.ebuild,
+  -mplayer-1.0_pre5-r2.ebuild, -mplayer-1.0_pre5-r3.ebuild,
+  -mplayer-1.0_pre5-r4.ebuild, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild,
+  mplayer-1.0_pre6-r3.ebuild:
+  useflag move 3dnowex -> 3dnowext, global cleanup
+
+*mplayer-1.0_pre6-r3 (12 Apr 2005)
+
+  12 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +mplayer-1.0_pre6-r3.ebuild:
+  New p.masked ebuild, cpudetection and custom-cflags added.
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild:
+  added support for blinkenlights, fixes #86776. we also dont install useless
+  menu entries any longer if use -gtk, fixes bug #86399
+
+  07 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre6-r1.ebuild, mplayer-1.0_pre6-r2.ebuild:
+  MAKEOPTS -jN has to be -j1 for successful compilation. fixes #86245
+
+  02 Apr 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre6-r2.ebuild:
+  Removed april fools segment.
+
+  01 Apr 2005; Chris White <chriswhite@gentoo.org>
+  files/mplayer-gcc_detection.patch, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6-r2.ebuild:
+  Fixed gcc detection patch. Converted avi USE flag to win32codecs USE flag to
+  get rid of ugly arch conditional nestings.
+
+  22 Mar 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre6-r2.ebuild:
+  Fixing bug #85861 as well as changing over to 3dnowext to match the cpu flag
+  in mplayer-1.0_pre6-r2.
+
+  22 Mar 2005; Chris White <chriswhite@gentoo.org>
+  files/mplayer-1.0_pre6-pic.patch:
+  Fixing the pic patch for reals this time.
+
+  21 Mar 2005; Chris White <chriswhite@gentoo.org>
+  files/mplayer-1.0_pre6-pic.patch:
+  Fix 3dnow conditional for idcmt 3dnow unresolved errors.
+
+*mplayer-1.0_pre6-r2 (21 Mar 2005)
+
+  21 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre6-pic.patch, +mplayer-1.0_pre6-r2.ebuild:
+  The big closer. Bug #51853 goes bye bye. MPlayer will now compile with pic
+  and x86 without filtration.
+
+  20 Mar 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre6-r1.ebuild:
+  Fix bug #85945 (no longer need the alsa-gui patch for pre6).
+
+  20 Mar 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild:
+  Fixed bad if logic (must be getting good at this :|) for real codecs.
+
+  19 Mar 2005; Guy Martin <gmsoft@gentoo.org> mplayer-1.0_pre6-r1.ebuild:
+  Stable on hppa.
+
+  19 Mar 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre6-r1.ebuild:
+  Forgot the mmxext params in ecpu_check for pre6-r1.
+
+*mplayer-1.0_pre6-r1 (19 Mar 2005)
+
+  19 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre6-codecs.patch, mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r3.ebuild, mplayer-1.0_pre5-r4.ebuild,
+  mplayer-1.0_pre5-r5.ebuild, +mplayer-1.0_pre6-r1.ebuild,
+  -mplayer-1.0_pre6.ebuild:
+  Fixed bugs #85642 #85534 #83609 #83546. Pre6 gets a revbump because it uses
+  RealPlayer's codecs instead of win32codecs and because of new 3gp codec
+  support. Old pre6 goes bye bye. mmx2->mmxext.
+
+  16 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre5-gcc_detection.patch, mplayer-1.0_pre5-r3.ebuild:
+  Fixed optimization logics for mips, hopefully solving bug #83633. Added gcc
+  detection patch to make mplayer actually compile.
+
+  16 Mar 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre5-r3.ebuild:
+  Fixed mplayer-1.0_pre5-r3's message about not using custom CFLAGS. Put in
+  the strip-flags which is supposed to be in there.
+
+  24 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Re-added x86 only USE flag logic for win32codecs.  Fixes #82535.
+
+  19 Feb 2005; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-gcc_detection.patch, +files/mplayer-jack.patch,
+  mplayer-1.0_pre6.ebuild:
+  Fixed endianess issues with jack output.  Fixed gcc being detected improperly.
+
+  07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild:
+  use_enable avi should only be possible on x86. fixed #81149
+
+  07 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Repoman fix trailing white space.
+
+  07 Feb 2005; Chris White <chriswhite@gentoo.org> files/mplayer.desktop,
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed bug #65914 (desktop file) bug #79207 (real libs logic) bug #78481 (avi
+  USE flag for win32codecs).
+
+  07 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Added dga logic to fix bug #80861.
+
+  06 Feb 2005; Chris White <chriswhite@gentoo.org> files/mplayer-x11.patch:
+  Fixing the patch to work with 71478's issue as well.
+
+  06 Feb 2005; Chris White <chriswhite@gentoo.org> +files/mplayer-x11.patch,
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed bug #80564 with a patch by nickc and removed uneeded deps on portage and
+  nasm.
+
+  06 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Apparently mmx2 shows up in /proc/cpuinfo as mmxext, so disabling mmx2 cpu
+  checking until I can rework ecpu_check to handle this properly.
+
+  05 Feb 2005; Chris White <chriswhite@gentoo.org> +files/mplayer-gif.patch,
+  mplayer-1.0_pre5-r5.ebuild:
+  Fixed giflib support by backing mplayer pre6 giflib detection.
+
+  04 Feb 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Re-enabled sse2 as people with x86's say it works ok. Enabled new
+  ecpu_check-ing functionality.
+
+  30 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-avi_crash.patch, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Fixed bugs #79243 and 78337.
+
+  30 Jan 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  altivec fix for #76559.
+
+  30 Jan 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed real being force enabled (instead of USE flag configured..) and
+  RESTRICT=nostrip to hopefully fix bug #71672.
+
+  24 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> mplayer-1.0_pre6.ebuild:
+  added dv to IUSE, it was already used by the ebuild. fixes bug #79319
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  applied patch to make distcc compiling possible. fixes bug #77235
+
+  23 Jan 2005; Chris White <chriswhite@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed bug #78209. Also removed the gif lib logic in pre6 as it's no longer
+  required (fixed upstream) and now gif is a true enable/disable style flag.
+
+  23 Jan 2005; Chris White <chriswhite@gentoo.org> +files/mplayer-nl.patch,
+  mplayer-1.0_pre6.ebuild:
+  Fixed bug #76429.  Added mplayer-nl.patch to solve.
+
+  23 Jan 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild,
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Fixed dk from Swedish to Danish.
+
+  14 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  Added missing ? in *DEPEND.
+
+  14 Jan 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Re-fixing gif logic (someone messed with it :|) to fix #77463.
+
+  11 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> mplayer-1.0_pre6.ebuild:
+  mplayer now contains SIMD assembler code for AMD64. The AMD64 Team decided
+  to hard-enable SIMD assembler for all users.
+
+  11 Jan 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Adding anti-sse2 until someone tells me it doesn't create strange code.
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre5-r4.ebuild, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  made some trivial changes to the alsa related warning in pkg_postinst. fixes
+  bug #76469.
+
+  07 Jan 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre6.ebuild:
+  Re-adding pic logic in (bad chris) and also getting strip-flags added to
+  pre5-r5.
+
+  06 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Fixed unpack problem (bug #76854)
+
+  06 Jan 2005; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  MPlayer pre6 was missing docs upstream, adding an 'a' prefix to get the latest
+  alpha version that contains the docs. Note that none of the actual code was
+  changed.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Dec 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Fixed dts -> libdts configure option as per bug #75762.
+
+  27 Dec 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Added dts support back per bug #75669. Also fixed libdv being forced
+  required as per bug #72146.
+
+  27 Dec 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  Fixed bio2jack dep issues as per bug #75720. Also force enabled networking
+  support as it causes more issues then solves them.
+
+  27 Dec 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre6.ebuild:
+  tossing in -frename-registers as per bug #75690. Tested it to make sure it
+  wouldn't make hardened gcc cry with BREG errors.
+
+*mplayer-1.0_pre6 (26 Dec 2004)
+
+  26 Dec 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre6-configure.patch,
+  +files/mplayer-1.0_pre6-ppc64.patch, +mplayer-1.0_pre6.ebuild:
+  Infamous 1.0_pre6 bump.
+
+  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild:
+  Stable on alpha, bug 74473.
+
+  18 Dec 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre5-r5.ebuild:
+  Stable on sparc wrt security bug #74473.
+
+  19 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild:
+  Stable on ppc.
+
+  18 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild:
+  Stable on amd64.
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> mplayer-1.0_pre5-r5.ebuild:
+  Stable on ppc64; bug #74473
+
+  19 Dec 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r5.ebuild:
+  Arrg, forgot to bump down ppc64 keywords :|.
+
+*mplayer-1.0_pre5-r5 (19 Dec 2004)
+
+  19 Dec 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre5-r5-configure.patch, mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r3.ebuild,
+  +mplayer-1.0_pre5-r5.ebuild:
+  Bumping to pre5-r5 as per bug #74473. Tested on 20 randomly encoded .avis,
+  mp3s, and even streaming video/audio. Marked x86 stable.
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Stable on ppc64
+
+  02 Dec 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  vo -> ao in alsa warning.
+
+  14 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  +files/mplayer-1.0_pre5-r4-ppc64.patch, mplayer-1.0_pre5-r4.ebuild:
+  Marked ~ppc64 (bug #68112) and added ppc64 patch.
+
+  11 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Copied midentify to /usr/bin for emovix for bug #58580.
+
+  11 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Removed mga buiding in MPlayer due to reasons in bug #28846.
+
+  10 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Lots of fancy bash scripting to make MPlayer deal with the normal (and proper)
+  LINGUAS format. Closes bug #49710.
+
+  10 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Added a message about the alsa -ao format to postinstall.  Closes bug #57256.
+
+  10 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r3.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Fixed tdfxvid output logic as per bug #64218.
+
+  06 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Added a real USE flag warning to -pre5-r4.
+
+  06 Nov 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Fixed optimization filtering per bug #70175.
+
+  31 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r4.ebuild:
+  Added filtering for -falign-functions. Thanks to jstubbs for pointing that
+  out.
+
+  24 Oct 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre5-r3.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Minor cleanup
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Converted to kernel-mod eclass. Thanks to Stefan Schweizer
+  <sschweizer@gmail.com> for helping out with that in bug #68444.
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
+  Bad bash logic... [ v. ).
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Added some minor font functionality as per bug #48440.
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Finished off Bug #61451 and closed bug #68552.
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
+  Alpha stable marked live, so changing the dep/patch logic for it. Only amd64
+  left and this ebuild will look ok again.
+
+  24 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
+  Fixed Live issues in Bug #68649 and half solved configure issues in Bug #61451
+  regarding real directories.
+
+  23 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
+  Fixed epatch issues.
+
+  22 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
+  Fixed some more filtering that needed to be done for pic stuff to work.
+
+  20 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Fixed some xvidix logic as per bug #28865.
+
+  19 Oct 2004; Chris White <chriswhite@gentoo.org> :
+  Did filter flags on a few problematic flags as per Bug #67903.
+
+  17 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  mplayer-1.0_pre5-r3.ebuild:
+  alpha happiness, bug 66571.
+
+  17 Oct 2004; Chris White <chriswhite@gentoo.org> :
+  Fixed digest issues :|. Removed ia64 keyword per Bug #67836.
+
+  16 Oct 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild, mplayer-1.0_pre5-r3.ebuild,
+  mplayer-1.0_pre5-r4.ebuild:
+  Removed sse2 as it's broken. Custom CFLAGS now holds. Ncurses as default
+  terminal lib as per bug #64212.
+
+  15 Oct 2004; Seemant Kulleen <seemant@gentoo.org>
+  files/mplayer-1.0_pre5-yuv2rgb_fix.patch:
+  fix the yuv2rgb patch to work properly on altivec enabled ppc's
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre5-r3.ebuild, mplayer-1.0_pre5-r4.ebuild:
+  get_libdir fixes.
+
+  07 Oct 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre5-r3.ebuild:
+  Backport yuv2rgb_fix
+
+  05 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  -files/mplayer-1.0_pre5-yuv2rbg_fix.patch,
+  -files/mplayer-1.0_pre5-yuv2rbg_kludge.patch,
+  +files/mplayer-1.0_pre5-yuv2rgb_fix.patch, mplayer-1.0_pre5-r4.ebuild:
+  Hopefully the latest fix to that part
+
+  04 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre5-yuv2rbg_fix.patch, mplayer-1.0_pre5-r4.ebuild:
+  Eventually I fixed the yuv2rgb_altivec for vo_x11, the other scalers could
+  have wrong colours
+
+  05 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  -files/mplayer-1.0_pre5-yuv2rbg_kludge.patch,
+  +files/mplayer-1.0_pre5-yuv2rgb_fix.patch, mplayer-1.0_pre5-r4.ebuild:
+  Hopefully the latest fix to that part
+
+  03 Oct 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre5-r4.ebuild:
+  Eventually I fixed the yuv2rgb_altivec for vo_x11, the other scalers could
+  have wrong colours
+
+  27 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre5-r3.ebuild:
+  Moved jack support back to -r3 to fix compilation on systems with jack
+  installed.
+
+  22 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  mplayer-1.0_pre5-r4.ebuild:
+  dev-libs/bio2jack -> media-libs/bio2jack
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  mplayer-1.0_pre4-r7.ebuild, mplayer-1.0_pre5-r2.ebuild,
+  mplayer-1.0_pre5-r3.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  29 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre5-bio2jack.patch, mplayer-1.0_pre5-r4.ebuild:
+  Jack support
+
+  25 Aug 2004; Hardave Riar <hardave@gentoo.org> mplayer-1.0_pre5-r3.ebuild:
+  Added ~mips keyword.
+
+  25 Aug 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre5-mips64.patch, mplayer-1.0_pre5-r3.ebuild:
+  Added mips64 patch.  Closes bug #61466.
+
+*mplayer-1.0_pre5-r4 (22 Aug 2004)
+
+  22 Aug 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre5-configure.patch, +mplayer-1.0_pre5-r4.ebuild:
+  Added MPlayer ebuild with custom CFLAGS.
+
+*mplayer-1.0_pre5-r3 (20 Aug 2004)
+
+  20 Aug 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild,
+  mplayer-1.0_pre5-r3.ebuild:
+  Fixed 3dnowex logic in -r3.  Fixed some bad patch logic as well.
+
+  18 Aug 2004; Chris White <chriswhite@gentoo.org> :
+  I added some xvmc related USE flags. Fixed matroska and live versions. Added a
+  doc USE flag in -r3. Fixed an mspt issue in pre4-r7. Anything else I can't
+  remember too.
+
+  14 Aug 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild:
+  Fixed some live version issues.  Thanks to Merlin for reporting.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org>
+  -files/amd64_fix_the_blue_love.patch, -files/default-skin.diff,
+  -files/mencoder-segfault.patch, -files/mplayer-0.90-divx.patch,
+  -files/mplayer-0.90-ppc-benh-2.patch, -files/mplayer-0.90_rc4-gtk2.patch,
+  -files/mplayer-1.0_pre3-alsa-gcc34.patch,
+  -files/mplayer-1.0_pre3-libavcodec-gcc34.patch,
+  -files/mplayer-1.0_pre3-libmatroska063.diff,
+  -files/mplayer-1.0_pre3-xmms.patch,
+  -files/mplayer-1.0_pre4-gcc34-mtune.patch, -files/noenca.patch,
+  -files/ppc750FX-fix.patch, -files/vuln01-fix.diff, -mplayer-0.92-r1.ebuild,
+  -mplayer-1.0_pre2-r1.ebuild, -mplayer-1.0_pre3-r3.ebuild,
+  -mplayer-1.0_pre3-r4.ebuild, -mplayer-1.0_pre3-r5.ebuild,
+  -mplayer-1.0_pre4-r1.ebuild, -mplayer-1.0_pre4-r2.ebuild,
+  -mplayer-1.0_pre4-r3.ebuild, -mplayer-1.0_pre4-r4.ebuild,
+  -mplayer-1.0_pre4.ebuild:
+  Cleaned out old unsupported mplayers and old patches.
+
+  12 Aug 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
+  Corrected an issue with USE="gtk -png".  bug #60136.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
+  Added tdfxfb support.
+
+  11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> mplayer-1.0_pre5-r2.ebuild, 
+  files/mplayer-1.0_pre5-alsa-gui.patch:
+  Make the alsa patch work with dxr3. Fixes #59200. Caused by #58619.
+
+  03 Aug 2004; Chris White <chriswhite@gentoo.org> :
+  Fixed digest issues.
+
+  01 Aug 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild:
+  Should have been marked stable.
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
+  Ensure proper LIVE version for live fix patch.
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild:
+  Fixed some use logic with live and network.
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
+  Took pre5-r2 down to unstable.  See Bug #55456 for more information.
+
+  30 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  mplayer-1.0_pre4-r7.ebuild:
+  Stable on alpha, see bug #55456.
+
+  30 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  mplayer-1.0_pre5-r2.ebuild:
+  Stable on sparc wrt #55456
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
+  Took pre5-r2 down to unstable.  See Bug #55456 for more information.
+
+  30 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5-r2.ebuild:
+  Added einfo about the network USE flag. This enables/disables streaming and is
+  not set by default in most users' make.conf/package.use. After recieving
+  duplicate issues on this, I've decided to add the einfo in.
+
+  30 Jul 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre5-live.patch, mplayer-1.0_pre5-r2.ebuild:
+  Added fix for latest live-2004-07* for live USE flag.  Fixes Bug #58807.
+
+  29 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild:
+  Fixed live dependancy issue that was causing world update downgrades.
+
+  29 Jul 2004; Chris White <chriswhite@gentoo.org> :
+  Re-added(?) myself as maintainer.  Fixed alsa gui bug in #58619.
+
+  27 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild:
+  Added -fPIC to kill register clobbering.
+
+  27 Jul 2004; Daniel Ostrow <dostrow@gentoo.org> mplayer-1.0_pre4-r7.ebuild:
+  Stable on ppc.
+
+  27 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
+  mplayer-1.0_pre5-r2.ebuild:
+  Corrected USE="v4l2" configuring.
+
+  25 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre4-r7.ebuild, mplayer-1.0_pre5-r2.ebuild:
+  Changed amd64 stable to pre4 because of some problems in gmplayer. A patch to
+  pre5 will be put in soon.
+
+  24 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre5-r2.ebuild:
+  Tested and marked stable for amd64 and x86.
+
+*mplayer-1.0_pre5-r2 mplayer-1.0_pre4-r7 (24 Jul 2004)
+
+  24 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre4-r7.ebuild, mplayer-1.0_pre5-r2.ebuild:
+  As it stands, these ebuilds should now be the targets for stabling. Mplayer
+  1.0_pre4-r7 and 1.0_pre5-r2 are *not* to be fooled with, compilation fixes
+  are the only thing that should be added to these ebuilds- anything else
+  belongs in another unstable revbump. This fixes compilation issues w/
+  USE="-gtk png", USE="-gtk" and any of xv X xinerama, 
+  USE="gif" (compilation failure), USE="-gif" (unconditionally linking in 
+  libgif broken in previous fix for #58086), DOCS/TOOLS not being installed, 
+  removed dep on X for gif (it was caused by said fix), USE="dvdread -dvd" 
+  bring in dvdread and not using it, etc.  Pretty large amount of fixes.  
+  Versions 1.0_pre4-r6 and 1.0_pre5-r1 are removed from the tree, no user 
+  should be using them (borked badly).
+  These ebuilds ought to end up as the targets for stabling for the gui 
+  vulnerablity issues, thus they shouldn't be fooled w/ for anything but
+  needed fixes.
+
+  24 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/cachefill.patch:
+  Typo in the patch was in the conf file, not the source... fixing.
+
+  24 Jul 2004; Chris White <chriswhite@gentoo.org> files/cachefill.patch,
+  +files/mplayer-1.0_pre5-r1-conf_locale.patch, mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Moved x11 support/xv driver to X USE flag. Fixed gif needing deps on X11.
+  Fixed small typo in the cachefill patch. Address issues mentioned in Bug
+  #58086.  Also adds locale fix patch for Bug #58082.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre5-r1.ebuild:
+  Added kernel-2.6 fix on sparc (removes old workaround).
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Fixes some strange issue with the .20 live plugins being pulled in, despite
+  .27 being coded in. Re-Removed dvdread stuff.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre5-r1.ebuild:
+  Making USE=xvid work on all archs.
+
+  23 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Fixed broken deps for media-plugins/live and media-libs/libtheora for ia64
+
+  23 Jul 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild, files/cachefill.patch:
+  Slipping eradicators cachefill patch in, bug #55936
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r6.ebuild,
+  mplayer-1.0_pre5-r1.ebuild:
+  Fixed an ia64 dependancy error.
+
+*mplayer-1.0_pre5-r1 (23 Jul 2004)
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-mythtv.patch, +files/mplayer-odml.patch,
+  -mplayer-1.0_pre4-r5.ebuild, +mplayer-1.0_pre4-r6.ebuild,
+  +mplayer-1.0_pre5-r1.ebuild, -mplayer-1.0_pre5.ebuild:
+  Cleaned up with the help of Mr_Bones_, solar, and ferringb. Added in mythtv
+  patch to fix bug #23544. Stable version for Bug #55456.
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r5.ebuild:
+  Helps if you commit the gui vulnerability patch when you're fixing a
+  vulnerability bug.
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Fixed live dependancies.  Fixes Bug #57963.
+
+  23 Jul 2004; Chris White <chriswhite@gentoo.org>
+  -files/mga-kernel-2.6.patch, +files/mplayer-1.0_pre4-mga-kernel2.6.patch,
+  mplayer-1.0_pre4-r5.ebuild, mplayer-1.0_pre5.ebuild:
+  Cleaned up the ebuilds for pre4-r5 and pre5.
+
+  19 Jul 2004; Travis Tilley <lv@gentoo.org> mplayer-1.0_pre4-r5.ebuild:
+  stable on amd64
+
+  19 Jul 2004; Chris White <chriswhite@gentoo.org> +files/gui_vuln_code.patch,
+  +files/str_undefined.patch, +files/strl.c, mplayer-1.0_pre4-r5.ebuild:
+  Fixed mplayer pre4-r5 compiling issues with undefined str* references and
+  re-stabilized for gui vuln bug for amd64. Added fullscreen patch as well.
+
+  16 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Stable on alpha, see bug #55456.
+
+*mplayer-1.0_pre4-r5 (18 Jul 2004)
+
+  18 Jul 2004; Chris White <chriswhite@gentoo.org>
+  +files/amd64_fix_the_blue_love.patch, +files/real_demux.patch,
+  mplayer-1.0_pre4-r4.ebuild, +mplayer-1.0_pre4-r5.ebuild:
+  Fixes Bug #53634 and Bug #55456 for amd64.
+
+  15 Jul 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Stable on sparc wrt bug #55456.
+
+  16 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Weeve gave the heads up to mark this stable on sparc.  Doing so.
+
+  16 Jul 2004; Daniel Ostrow <dostrow@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Stable on ppc.
+
+  15 Jul 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre5-yuv2rbg_kludge.patch, mplayer-1.0_pre5.ebuild:
+  Fixed the altivec scaler
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org>
+  +files/mplayer-1.0_pre5-mga-kernel-2.6.patch, mplayer-1.0_pre5.ebuild:
+  Re-added the mga_vid.c patch to pre5. Thanks to Norman Yarvin for the heads
+  up. This fixes Bug #57138
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Yay, more fun, they replaced the test ebuild which needed the noenca patch
+  with the final release.. (finally) so now I have to remove the patch :|
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre5.ebuild:
+  Fixed the weird md5-ness with the tarballs
+
+*mplayer-1.0_pre5 (15 Jul 2004)
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> +files/noenca.patch,
+  +mplayer-1.0_pre5.ebuild:
+  Adding to the tree for stable marking on Bug #55456
+
+  10 Jul 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre4.ebuild:
+  Stable on sparc.
+
+  29 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild,
+  mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild,
+  mplayer-1.0_pre4-r4.ebuild, files/mplayer-1.0_pre4-gcc34-mtune.patch, 
+  files/mplayer-1.0_pre4-help_mp-ro.h:
+  Closing out bugs #49669 (help/help_mp-ro.h having completely broken syntax),
+  gcc3.4 s:-mcpu:-mtune: (bug #49488).
+
+  17 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
+  mplayer-1.0_pre4-r4.ebuild:
+  added two variables: BLUV and SVGV to hold the version numbers of the tarballs
+  for BLUE and svga_helper, respectively. Now, version bumping those two things
+  shouldn't break mplayer's emerge processes.
+
+  17 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
+  mplayer-1.0_pre4-r4.ebuild:
+  change the occurrence of Blue-1.0 to Blue-1.4 to correspond to the recent
+  version bump
+
+  17 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre4-altivec-gcc34.patch, mplayer-1.0_pre4-r4.ebuild:
+  gcc-3.4 altivec fix
+
+  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
+  mplayer-1.0_pre4-r4.ebuild:
+  Update Blue skin to version 1.4
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
+  mplayer-1.0_pre3-r4.ebuild, mplayer-1.0_pre3-r5.ebuild,
+  mplayer-1.0_pre4-r1.ebuild, mplayer-1.0_pre4-r2.ebuild,
+  mplayer-1.0_pre4-r3.ebuild, mplayer-1.0_pre4-r4.ebuild,
+  mplayer-1.0_pre4.ebuild:
+  Fix use invocation
+
+  08 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mplayer-1.0_pre4-r3.ebuild, mplayer-1.0_pre4-r4.ebuild:
+  Doing matrox related stuff only when matrox is in USE, see bug #53222
+
+  02 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild,
+  mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild,
+  mplayer-1.0_pre4-r4.ebuild, mplayer-1.0_pre4.ebuild:
+  Missing IUSE for nas, nls. Added live use flag to pre4, removed the inline
+  autodetect of live, making it a use flag controlled dep. moved all IUSE
+  statements below inherit, where they should stay. Closed bugs #49481 and 
+  #36815.
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> mplayer-1.0_pre4-r4.ebuild:
+  stable on amd64
+
+  01 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild,
+  mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild,
+  mplayer-1.0_pre4-r4.ebuild, mplayer-1.0_pre4.ebuild:
+  Added necessary --internal-(matroska|faad) for matroska (bug #50533) and mpeg.
+  MPlayer uses external libs when those flags are specified, otherwise,
+  internal. Also fixed missing IUSE flags.  Fixed use dvb syntax error in pre4-r2.
+
+  01 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r4.ebuild,
+  mplayer-1.0_pre4.ebuild:
+  Added use flags for libcaca since mplayer autodetects it already (bug #49369),
+  and missing xinerama IUSE (bug #51509)
+
+  28 May 2004; Guy Martin <gmsoft@gentoo.org> mplayer-1.0_pre4-r4.ebuild:
+  Added ~hppa to KEYWORDS. Little build fix.
+
+*mplayer-1.0_pre4-r4 (28 May 2004)
+
+  28 May 2004; Luca Barbato <lu_zero@gentoo.org> +mplayer-1.0_pre4-r4.ebuild:
+  Upstream requested change to the ebuild
+
+  28 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mplayer-1.0_pre4-r3.ebuild:
+  The sandbox fixes were fine for 2.6.6, but failed with 2.6.5. Fixed that, see
+  bug #40616 again.
+
+  27 May 2004; Daniel Ostrow <dostrow@gentoo.org> mplayer-1.0_pre4-r3.ebuild:
+  Stable on ppc.
+
+  27 May 2004; Jon Portnoy <avenj@gentoo.org> mplayer-1.0_pre4-r3.ebuild :
+  Stable on AMD64
+
+  27 May 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild,
+  mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild,
+  mplayer-1.0_pre4.ebuild:
+  Adding xvid, divx4linux use flags (bug #30242), bidi (bug #41482), and mad
+  (bug #32606). Bit of cleanup of myconf, moved IUSE after inherit for
+  1.0_pre4-r3 (portage 2.0.51_pre9 doesn't play nice w/ IUSE above inherit, see
+  bug #52160).
+
+*mplayer-1.0_pre4-r3 (26 May 2004)
+
+  26 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mplayer-1.0_pre4-r3.ebuild:
+  Sandbox problems (like bug #52058) should be history now.
+  Using kmod.eclass instead of check-kernel now (bug #51903)
+
+*mplayer-1.0_pre4-r2 (19 May 2004)
+
+  19 May 2004; Patrick Kursawe <phosphan@gentoo.org>
+  mplayer-1.0_pre4-r2.ebuild, files/mga-kernel-2.6.patch:
+  Fixing bug #40616 (mga driver), little cleanups for the patch section.
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> mplayer-1.0_pre3-r5.ebuild,
+  mplayer-1.0_pre4-r1.ebuild, mplayer-1.0_pre4.ebuild:
+  added new hardened PIE SSP switches
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
+  mplayer-1.0_pre3-r4.ebuild:
+  removed hardened-gcc logic, added filter-flags fPIC logic
+
+  02 May 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre4-r1.ebuild:
+  Changed -sparc keyword back to ~sparc.
+
+  30 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
+  mplayer-1.0_pre4-r1.ebuild:
+  Stable on alpha.
+
+*mplayer-1.0_pre4-r1 (30 Apr 2004)
+
+  30 Apr 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre4-r1.ebuild:
+  live is now a local use flag.
+
+  30 Apr 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre4.ebuild:
+  fixing live depend. closes 49481
+
+  29 Apr 2004; Brandon Hale <tseng@gentoo.org> mplayer-1.0_pre4.ebuild:
+  Stable on x86 for multiple vulnerabilities, bug #49387.
+
+*mplayer-1.0_pre4 (28 Apr 2004)
+
+  28 Apr 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre4.ebuild:
+  Version bumped.
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/mplayer-1.0_pre3-alsa-gcc34.patch,
+  +files/mplayer-1.0_pre3-libavcodec-gcc34.patch, mplayer-1.0_pre3-r5.ebuild:
+  added a fix for compiling with gcc 3.4. yaaay! =)
+
+  19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
+  mplayer-1.0_pre3-r4.ebuild, mplayer-1.0_pre3-r5.ebuild:
+  Removed broken gtk2 patch from all versions still in portage and closing bug
+  #15786.
+
+  13 Apr 2004; Scott W Taylor <swtaylor@gentoo.org>
+  mplayer-1.0_pre3-r5.ebuild:
+  update -fPIC handling for post-hardened-gcc
+
+  08 Apr 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre3-r5.ebuild:
+  Added useflags for v4l and v4l2
+
+  06 Apr 2004; Brandon Hale <tseng@gentoo.org> mplayer-1.0_pre3-r5.ebuild:
+  Update -fPIC filtering magic for post hardened-gcc.
+
+  04 Apr 2004; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre3-r5.ebuild,
+  files/ppc750FX-fix.patch:
+  Minor fix to extend the G3 cpu supported, thanks to Simon Strandman
+  <simon.strandman@telia.com>, bug #44276
+
+  31 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r5.ebuild:
+  adding ipv6 configure. closes 42940
+
+*mplayer-1.0_pre3-r3 (31 Mar 2004)
+*mplayer-1.0_pre3-r5 (31 Mar 2004)
+*mplayer-1.0_pre3-r4 (31 Mar 2004)
+*mplayer-1.0_pre2-r1 (31 Mar 2004)
+*mplayer-0.92-r1 (31 Mar 2004)
+
+  31 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> mplayer-0.92-r1.ebuild,
+  mplayer-0.92.ebuild, mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre2.ebuild,
+  mplayer-1.0_pre3-r1.ebuild, mplayer-1.0_pre3-r2.ebuild,
+  mplayer-1.0_pre3-r3.ebuild, mplayer-1.0_pre3-r4.ebuild,
+  mplayer-1.0_pre3-r5.ebuild, mplayer-1.0_pre3.ebuild, files/vuln02-fix.diff:
+  Revision bumped all currently available ebuilds and added a patch for a
+  security problem, see bug #46246.
+  Because of different keywordings for 1.0_pre3 they were bumped like follows:
+  1.0_pre3 -> 1.0_pre3-r3
+  1.0_pre3-r1 -> 1.0_pre3-r4
+  1.0_pre3-r2 -> 1.0_pre3-r5
+
+  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; mplayer-0.92.ebuild,
+  mplayer-1.0_pre2.ebuild, mplayer-1.0_pre3-r1.ebuild,
+  mplayer-1.0_pre3-r2.ebuild, mplayer-1.0_pre3.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r2.ebuild,
+  files/mplayer-1.0_pre3-xmms.patch:
+  added patch to disable xmms. closes 45356
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre3-r2.ebuild:
+  Added ~sparc keyword.
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre3-r2.ebuild:
+  Marked -sparc until libtheora builds on sparc.
+
+*mplayer-1.0_pre3-r2 (21 Mar 2004)
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r2.ebuild:
+  adding libtheora support.
+
+  18 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r1.ebuild,
+  files/mplayer-1.0_pre3-libmatroska063.diff:
+  adding patch to compile with latest libmatroska
+
+  16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> mplayer-1.0_pre3.ebuild:
+  Added ~mips keyword.
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> mplayer-0.92.ebuild:
+  Marked stable on sparc.
+
+*mplayer-1.0_pre3-r1 (11 Mar 2004)
+
+  11 Mar 2004; <kanaka@gentoo.org> mplayer-1.0_pre3-r1.ebuild:
+  Updated to NOT install libpostproc libraries (bug 43640). Now provided by
+  >=ffmpeg-0.4.8.20040222.
+
+  27 Feb 2004; Jason Wever <weeve@gentoo.org> mplayer-1.0_pre3.ebuild:
+  Nothing but ~sparc.
+
+  26 Feb 2004; Guy Martin <gmsoft@gentoo.org> :
+  Keyworded ~hppa.
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> mplayer-1.0_pre3.ebuild:
+  set ppc in keywords
+
+  25 Dec 2003; Seemant Kulleen <seemant@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild,
+  mplayer-1.0_pre3.ebuild:
+  changed SRC_URI to use mirror://mplayer instead
+
+  14 Dec 2003; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3.ebuild:
+  Changing matroska version. Closes #35787
+
+  12 Dec 2003; Seemant Kulleen <seemant@gentoo.org> mplayer-1.0_pre3.ebuild:
+  --disable-css is a deprecated configure option now. Closes bug #35644 by
+  butters@opengames.net and its duplicates
+
+*mplayer-1.0_pre3 (11 Dec 2003)
+
+  20 Dec 2003; Guy Martin <gmsoft@gentoo.org> mplayer-1.0_pre3.ebuild :
+  Fixed detection of hppa boxes.
+
+  11 Dec 2003; Seemant Kulleen <seemant@gentoo.org> mplayer-1.0_pre3.ebuild,
+  files/mplayer-1.0-gtk2.patch:
+  version bump to newest release -- includes updated gtk2 patch
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  fix the gtk/gtk2 USE flag syntax, closing bug #34567 by Spider
+  <spider@gentoo.org>
+
+  16 Nov 2003; Brad House <brad_mssw@gentoo.org> mplayer-1.0_pre2.ebuild:
+  mark stable on amd64
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre2.ebuild:
+  Adding joystick support. Closes #31470.
+
+  26 Oct 2003; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre2.ebuild:
+  Added debug useflag, minor fixes. Closes #31978 and #31996.
+  thanks to Andrew Kirilenko <icedank@gmx.net> and Juri Haberland 
+  <juri@koschikode.com>.
+
+  20 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre1-r1.ebuild,
+  mplayer-1.0_pre2.ebuild:
+  added matroska support. Closes #28636.
+
+  14 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  RDEPEND error fixed. Closes #30624.
+
+  14 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  adding lirc IUSE flag. Closes #31031.
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  fixed Doc permissions. Closes #30724.
+
+  09 Oct 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  Add a note about us using MPlayer set C[XX]FLAGS to avoid confusion.
+
+  09 Oct 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
+  Get fonts to install properly again, fixing bug #30213.
+
+  08 Oct 2003; Luca Barbato<lu_zero@gentoo.org> mplayer-1.0_pre2.ebuild:
+  ppc related fix.
+
+*mplayer-1.0_pre2 (07 Oct 2003)
+
+  07 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre2.ebuild:
+  Version bumped. Closes #30415.
+
+  06 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.92.ebuild,
+  mplayer-1.0_pre1-r1.ebuild:
+  Adding aalib configure strings. Closes #21984.
+
+  29 Sep 2003; Martin Holzer <mholzer@gentoo.org> :
+  Fixing digest.
+
+*mplayer-1.0_pre1-r1 (27 Sep 2003)
+
+  27 Sep 2003; <solar@gentoo.org> mplayer-1.0_pre1-r1.ebuild,
+  files/vuln01-fix.diff:
+  security fix for devel branch
+
+*mplayer-0.92 (28 Sep 2003)
+
+  28 Sep 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.92.ebuild:
+  Version bumped. Closes a security Problem.
+
+  23 Sep 2003; Martin Holzer <mholzer@gentoo.org> :
+  digest update. closes #29363
+
+  12 Sep 2003; heinrich Wendel <lanius@gentoo.org> mplayer-1.0_pre1.ebuild,
+  mplayer-0.91.ebuild:
+  fixed samba dep to version 2.2.8a
+
+  07 Sep 2003; Alexander Gabert <pappy@gentoo.org> mplayer-0.91.ebuild:
+  added hardened-gcc excludes
+
+  06 Sep 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-1.0_pre1.ebuild:
+  Cleanup libpostproc stuff a bit. Last time I checked, we should not need to
+  install the static version of the library.
+
+  04 Sep 2003; Heinrich Wendel <lanius@gentoo.org> mplayer-0.90-r2.ebuild,
+  mplayer-0.90-r5.ebuild, mplayer-0.90_rc4.ebuild, mplayer-0.91.ebuild,
+  mplayer-1.0_pre1.ebuild, files/mplayer-0.90-fix-version.patch:
+  - removed old ebuilds
+  - fixed samba bug #25912
+  - fixed fs bug #12751
+  - marked 0.91 stable on x86 and ppc
+
+*mplayer-1.0_pre1 (04 Sep 2003)
+
+  04 Sep 2003; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre1.ebuild:
+  Version bumped.
+
+  24 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r2.ebuild,
+  mplayer-0.90-r5.ebuild, mplayer-0.90_rc4.ebuild, mplayer-0.91.ebuild,
+  files/mencoder-segfault.patch:
+  Fix mencoder segfault when used improperly, bug #23611
+
+*mplayer-0.91 (20 Aug 2003)
+
+  20 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.91.ebuild:
+  New version.
+
+*mplayer-0.90-r5 (10 Aug 2003)
+
+  10 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r5.ebuild:
+  Some cleanups - do not try to autodetect video/audio settings, as MPlayer does
+  it by itself these days. Change a few things as suggested by Gabucino
+  (--enable-3dfx is broken, and --enable-dynamic-plugins could have issues).
+  Eventually add the new default Skin of MPlayer (Blue).
+
+  04 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r4.ebuild,
+  files/mplayer-0.90-ppc-benh-2.patch:
+  Fix ppc-benh.patch to play nicely with coreutils-fixup.patch, bug #25833
+
+*mplayer-0.90-r4 (03 Aug 2003)
+
+  03 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r4.ebuild,
+  files/mplayer-0.90-coreutils-fixup.patch:
+  Remove building of svgalib kernel module.  Should fix bug #25062.
+
+  18 Jul 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90-r3.ebuild:
+  Final fix.
+
+  16 Jul 2003; Luca Barbato<lu_zero@gentoo.org> mplayer-0.90-r2.ebuild,
+  mplayer-0.90-r3.ebuild:
+  Make it install every documentation file. Closes #20662.
+  
+  16 Jul 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90-r2.ebuild,
+  mplayer-0.90-r3.ebuild, mplayer-0.90_rc4.ebuild, mplayer-0.90_rc5.ebuild:
+  Added IUSE flag for xmms. Closes #20090.
+
+  16 Jul 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90-r2.ebuild:
+  Marked x86 stable.
+
+*mplayer-0.90-r3 (16 Jul 2003)
+
+  16 Jul 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90-r3.ebuild:
+  Added vidix support. Submitted by phoen][x <fisi.tilman.klar@gmx.de> in #20114.
+
+*mplayer-0.90-r2 (01 Jul 2003)
+
+  01 Jul 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90-r2.ebuild,
+  files/mplayer-0.90-divx.patch:
+  Adding logic to detect newer DivX Api and patching. Closes #23795.
+
+  11 Jun 2003; Jason Wever <weeve@gentoo.org> mplayer-0.90-r1.ebuild:
+  Added ~sparc to keywords.
+
+*mplayer-0.90-r1 (27 Apr 2003)
+
+  27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r1.ebulid,
+  mplayer-0.90-fix-version.patch :
+  - Fix version (still displayed as rc5), bug #19691.
+  - Change DEPEND to only depend and enable faad2 support if 'mpeg' in USE,
+    closing bug #19119.
+  - Add SMB (Samba) support, closing bug #16395.
+
+*mplayer-0.90 (09 Apr 2003)
+
+  20 Apr 2003; Seemant Kulleen <seemant@gentoo.org> mplayer-0.90.ebuild :
+  Added faad2 and enabling faad in econf -- satisies many requests to be able to
+  play the Matrix trailers.
+
+  16 Apr 2003; Lars Weiler <pylon@gentoo.org> mplayer-0.90.ebuild,
+  files/mplayer-0.90-ppc-benh.patch:
+  No big change.
+  Added the mentioned patch in bug #18511 for the right order of the
+  ppc-processor-switch and some more ppc-related einfo-lines about the altivec
+  issue with DivX.
+
+  09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90.ebuild :
+  New version:
+  - Add 'dvb' use flag (bug #13809), thanks to Juri Haberland <juri@koschikode.com>
+  - Fix MPlayer to detect/use altivec on benh kernels (bug #18511), thanks to
+    Stephan van Maris <svmaris@e-village.nl> and Lars Weiler <pylon@gentoo.org>.
+  - Remove dvdnav support as its broken anyhow.  According to lists, no effort
+    will be made soon to get it fixed.
+  This should also close bug #18879.
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc5.ebuild :
+  Mark stable for x86.  Fix bug #18211, thanks to Philippe Lafoucri?re
+  <lafou@wanadoo.fr>.
+
+*mplayer-0.90_rc5 (18 Mar 2003)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90_rc5.ebuild:
+  Forcing to use old libdvdnav.
+
+  18 Mar 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc5.ebuild :
+  New version.
+
+  13 mar 2003; Olivier Reisch <doctomoe@gentoo.org> mplayer-0.90_rc4.ebuild :
+  Marked ppc stable
+
+*mplayer-0.90_rc4 (16 Feb 2003)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.90_rc4.ebuild:
+  Forcing to use old libdvdnav.
+
+  06 March 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc4.ebuild :
+
+  - Fix esound not disabled if 'esd' not in USE, bug #16758.
+  - Remove --enable-shared-pp from ./configure, as it breaks mplayer with
+    gcc-2.95.3,bug #14479.
+  - Mark stable for x86.
+
+  16 Feb 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc4.ebuild :
+
+  Update version.
+  Add LIVE.COM support, thanks to J Robert Ray <jrray@gentoo.org>, bug #14766.
+
+  02 Feb 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_*.ebuild :
+
+  Fix SRC_URI for fonts, closing bug #14770.
+
+  21 Jan 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc3.ebuild :
+
+  Add --with-x11incdir=/usr/X11R6/include as a temporary fix for bug #14311.
+
+*mplayer-0.90_rc3 (20 Jan 2003)
+
+  20 Jan 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc3.ebuild :
+
+  New version.
+
+  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc2.ebuild :
+
+  Only enable devfs support if /dev/.devfsd exists, bug #13613.
+
+  07 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc2.ebuild :
+
+  Add lirc support, thanks to Jarkko Haapalainen <johaapa@student.oulu.fi>,
+  bug #12244.  Mark stable for x86, and fix to depend on xfree-4.2.1-r2, fixing
+  problems with gtk2 support and freetype.
+
+*mplayer-0.90_rc2 (26 Dec 2002)
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc2.ebuild :
+
+  New version.
+
+*mplayer-0.90_rc1-r1 (13 Dec 2002)
+
+  13 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc1-r1.ebuild :
+
+  Fix the xvid bork.  Add gtk2 support :D
+
+*mplayer-0.90_rc1 (8 Dec 2002)
+
+  08 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_rc1.ebuild :
+
+  New version, closing bug #11775.
+
+  01 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre10.ebuild :
+
+  Mark as stable.
+
+  24 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre10.ebuild :
+
+  Add arts support, closing bug #11122.
+
+*mplayer-0.90_pre10 (11 Nov 2002)
+
+  11 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Nev version.
+
+  5 Nov 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre9.ebuild :
+
+  Add realplayer support, closing bug #6286.
+
+*mplayer-0.90_pre9 (27 Oct 2002)
+
+  27 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  New version.
+
+*mplayer-0.90_pre8-r1 (12 Oct 2002)
+
+  12 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Add patch for build failure without oss if "TV" is enabled by
+  configure.  Thanks goes to  Chad Netzer <chad.netzer@stanfordalumni.org>.
+  This closes bug #8604.
+
+*mplayer-0.90_pre8 (26 Sep 2002)
+
+  26 Sep 2002; Kevyn Shortell<trance@gentoo.org> mplayer-0.90_pre8.ebuild :
+  PPC keyword added, tested on ibook 300mhz, worked well.
+
+*mplayer-0.90_pre8 (19 Sep 2002)
+
+  19 Sep 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre8.ebuild :
+  New bugfix release.
+
+*mplayer-0.90_pre7 (16 Sep 2002)
+
+  16 Sep 2002; Olivier Reisch <doctomoe@gentoo.org> mplayer-0.90_pre7.ebuild :
+  Removed ppc keyword. Audio does not work at all on PPC.
+
+  15 Sep 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre7.ebuild :
+  Update version.
+
+*mplayer-0.90_pre6-r3 (12 Aug 2002)
+
+  16 Sep 2002; Olivier Reisch <doctomoe@gentoo.org> mplayer-0.90_pre6-r3.ebuild :
+  Removed ppc keyword. Audio does not work at all on PPC.
+
+  Sep 11 2002; Mark Guertin <gerk@gentoo.org> mplayer-0.90_pre6-63.ebuild :
+  Adjusted divx4linux as x86 only dep (it supplies x86 binary libs), goes along
+  with bug #7796
+
+  Sep 10 2002, Mark Guertin <gerk@gentoo.org> :
+  adjusted nasm and win32codes to use x86 USE flags (they don't work on 
+  anything except x86)
+
+  12 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre6-r3.ebuild :
+
+  Add patch to support libdvdnav-0.1.3.
+
+  Fix screwup with new patch.
+
+*mplayer-0.90_pre6-r2 (07 Aug 2002)
+
+  07 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre6-r2.ebuild :
+
+  Update DEPEND to block libdvdnav-0.1.3.  Change "emake" to "make", as
+  'make -j' fails in some cases.
+
+*mplayer-0.90_pre6-r1 (07 Aug 2002)
+
+  07 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre6-r1.ebuild :
+
+  Fix compile problems if "dvd" not in USE.  Added two patches for this:
+  
+    mplayer-0.90_pre6-no-dvd.patch
+    mplayer-0.90_pre6-stream-include.patch
+
+*mplayer-0.90_pre6 (06 Aug 2002)
+
+  06 Aug 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre6.ebuild :
+
+  New version.  Patch vidix's Makefile not to fail if it cannot install
+  any drivers.  This should resolve bug #5246.
+
+*mplayer-0.90_pre5-r1 (13 Jun 2002)
+
+  13 Jun 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre5-r1.ebuild :
+
+  Fix missing subtitles for region 4 DVD's, bug #3679, thanks to report
+  from Bernardo S. A. Silva.
+
+*mplayer-0.90_pre5 (10 Jun 2002)
+
+  10 Jun 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre5.ebuild :
+
+  Version update with a few fixes (vidix install location, #include errors,
+  etc).
+
+*mplayer-0.90_pre4 (21 May 2002)
+
+  21 May 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre4.ebuild :
+
+  Add new version. Resolves bug #2891.  This version seems to fix many
+  of the bugs with previous 0.90_pre versions.
+
+*mplayer-0.90_pre3-r1 (5 May 2002)
+
+  8 May 2002; Jon Nelson <jnelson@gentoo.org> mplayer-0.90_pre3-r1.ebuild :
+ 
+  Use new check_KV from portage 1.9.10
+ 
+  5 May 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre3-r1.ebuild :
+
+  Fix some compile problems for Gui, thanks to Gwenn Gueguen.
+
+*mplayer-0.90_pre3 (5 May 2002)
+
+*mplayer-0.90_pre2-r2 (5 May 2002)
+
+  5 May 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre2-r2.ebuild :
+
+  Resolve bug #2386 (hopefully); also fix a vidix problem I and other users
+  on gentoo-user experienced.
+
+*mplayer-0.90_pre2-r1 (1 May 2002)
+
+  1 May 2002; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90_pre2-r1.ebuild :
+
+  Resolve bug #2284.
+
+*mplayer-0.90_pre2 (30 Apr 2002)
+
+  26 Apr 2002; William McArthur <sandymac@gentoo.org> mplayer-0.90_pre1.ebuild :
+
+  Commented out a matrox specific patch that seems to be aready in the upstream
+  package.
+
+*mplayer-0.90_pre1 (23 Apr 2002)
+
+*mplayer-0.60-r6 (22 Apr 2002)
+
+  22 Apr 2002; Seemant Kulleen <seemant@gentoo.org> mplayer-0.60-r6.ebuild :
+
+  Removed directfb flag for now, until next mplayer release.  Also, added
+  --disable-runtime-cpudetection for increased performance.  First one thanks
+  to naz in #gentoo, second one thanks to 
+  dwright@beached.dyndns.org (Darrell Wright) in bug #1967
+  
+
+  18 Apr 2002; Seemant Kulleen <seemant@gentoo.org>
+  fixed a small typo I made in the matrox section
+
+  17 Apr 2002; Seemant Kulleen <seemant@gentoo.org> mplayer-0.60-r6.ebuild
+  files/digest-mplayer-0.60-r6 :
+
+  Removed -- the old source tarball will be mirrored on ibilio instead.
+
+*mplayer-0.60-r6 (17 Apr 2002)
+
+  17 Apr 2002; Seemant Kulleen <seemant@gentoo.org> mplayer-0.60-r6.ebuild
+  files/digest-mplayer-0.60-r6 :
+
+  This is an upgrade in a way, because it is now fetching the cvs snapshot
+  from the site.  The actual 0.60 sources have been removed from the
+  SRC_URI, and they are replaced with a weekly snapshot.  This is fine
+  because it offers much better performance than the old "stable" version.
+
+*mplayer-0.60-r5 (14 Apr 2002)
+
+  14 Apr 2002; Seemant Kulleen <seemant@gentoo.org> mplayer-0.60-r5.ebuild :
+
+  Cleaned up some of the USE flag checking, and made it more consistent, so
+  that there are no if then fi constructs for USE flags.
+
+*mplayer-0.60-r5 (12 Apr 2002)
+
+  14 Apr 2002; M.Schlemmer <azarah@gentoo.org> mplayer-0.60-r5 :
+
+  Remove the png USE flag, as the gui depends on libpng.  Take --enable-dvdread
+  out of the main ./configure part, as its now done with the dvd use flag.
+  Clean the mmx and X USE flag selection parts up.
+
+*mplayer-0.60-r4 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> mplayer-0.60-r4.ebuild :
+
+  Added png USE flag and removed css USE flag for dvd flag instead. And, 
+  compile against newest libpng
+
+*mplayer-0.60-r3 (28 Mar 2002)
+
+  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> mplayer-0.60-r3.ebuild :
+
+  ogg and vorbis USE flags combined to have oggvorbis USE flag instead.
+
+*mplayer-0.60-r3 (3 March 2002)
+
+  3 March 2002; M.Schlemmer <azarah@gentoo.org> mplayer-0.60-r3.ebuild :
+
+  Add the DXR3 patch. Update the DEPEND to include libpng if gtk is in USE.
+
+  25 Feb 2002; M.Schlemmer <azarah@gentoo.org> mplayer-0.60-r2.ebuild :
+
+  Fix the 'fbcon' USE to actually enable fbdev support.
+
+  17 Feb 2002; M.Schlemmer <azarah@gentoo.org> mplayer-0.60-r2.ebuild :
+
+  Make DVD support default.  Changed the USE flag for DVD decription from
+  'decss' to 'css'.  Added 3DFX support with the '3dfx' use variable. Fixed
+  a problem where if 'sse' or '3dnow' was in USE, but now MMX, sound would be
+  distorted .. this should resolve bug #536.
 
 *mplayer-0.60-r1 (1 Feb 2002)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a95444b34d2b..42448636dd49 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,11 +1,12 @@
-MD5 041667b9cf66050e0ec5e6c0e9728653 ChangeLog 10412
-MD5 a1260612ba235946c280a3246dea6fe6 mplayer-0.90_rc4.ebuild 10300
-MD5 7d94393a9b67209b509c5911864ca18b mplayer-0.90.ebuild 10632
-MD5 676d43208bb9911548794530901a8f1d mplayer-0.90_rc5.ebuild 10301
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 90fa0ca844e1347126c9f63454b65c8f files/mplayer-0.90-ppc-benh.patch 2029
-MD5 c2d1a4c1e84abf704a7b9686ea9309ae files/digest-mplayer-0.90 283
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 5acc0011a4730f2f9b83777d607d655b files/digest-mplayer-0.90_rc4 286
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 c85d870e468ad99ad402ce4716827af7 files/digest-mplayer-0.90_rc5 286
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b4ae569a508d2078007f8eb2e0f8fea9 mplayer-1.0_pre7-r1.ebuild 16018
+MD5 07a692e8625d9a1cb9b70bab429d6e6a ChangeLog 61518
+MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
+MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412
+MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
+MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432
+MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
+MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre7-ppc64.patch 353
diff --git a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch b/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch
index 147df8580431..d5a7a30505ca 100644
--- a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch
+++ b/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch
@@ -1,166 +1,166 @@
-diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure

---- MPlayer-20050413-orig/configure	2005-04-06 14:57:08.000000000 +0300

-+++ MPlayer-20050413/configure	2005-04-14 16:20:41.000000000 +0300

-@@ -604,7 +604,7 @@

-       cc_version="v. ?.??, bad"

-       cc_verc_fail=yes

-       ;;

--    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])

-+    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)

-       _cc_major=`echo $cc_version | cut -d '.' -f 1`

-       _cc_minor=`echo $cc_version | cut -d '.' -f 2`

-       _cc_mini=`echo $cc_version | cut -d '.' -f 3`

-diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c

---- MPlayer-20050413-orig/liba52/imdct.c	2005-03-23 01:27:18.000000000 +0200

-+++ MPlayer-20050413/liba52/imdct.c	2005-04-14 16:48:54.000000000 +0300

-@@ -937,7 +937,8 @@

-     /* 4-7. iterations */

-     for (m=3; m < 7; m++) {

- 	two_m = (1 << m);

--	two_m_plus_one = two_m<<1;

-+	int two_m_plus_four=two_m<<4;

-+	complex_t* buf_plus_128=buf+128;

- 	asm volatile(

- 		"movl %0, %%esi				\n\t"

- 		".balign 16				\n\t"

-@@ -963,7 +964,7 @@

- 		"addl %2, %%esi				\n\t"

- 		"cmpl %1, %%esi				\n\t"

- 		" jb 1b					\n\t"

--		:: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3),

-+		:: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3),

- 		   "r" (sseW[m])

- 		: "%esi", "%edi", "%edx"

- 	);

-diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c

---- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c	2005-02-27 10:56:26.000000000 +0200

-+++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c	2005-04-14 16:35:07.000000000 +0300

-@@ -2648,6 +2648,8 @@

- static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){

- 	int64_t dc_mask, eq_mask;

- 	int64_t sums[10*8*2];

-+	int64_t dc_and_eq_mask;

-+

- 	src+= step*3; // src points to begin of the 8x8 Block

- //START_TIMER

- asm volatile(

-@@ -2754,8 +2756,9 @@

- 		: "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold)

- 		: "%"REG_a

- 		);

-+	dc_and_eq_mask=dc_mask & eq_mask;

- 

--	if(dc_mask & eq_mask){

-+	if(dc_and_eq_mask){

- 		long offset= -8*step;

- 		int64_t *temp_sums= sums;

- 

-@@ -2930,7 +2933,7 @@

- 		" js 1b						\n\t"

- 

- 		: "+r"(offset), "+r"(temp_sums)

--		: "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)

-+		: "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask)

- 		);

- 	}else

- 		src+= step; // src points to begin of the 8x8 Block

-diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h

---- MPlayer-20050413-orig/libmpdemux/frequencies.h	2001-11-17 00:06:48.000000000 +0200

-+++ MPlayer-20050413/libmpdemux/frequencies.h	2005-04-14 16:36:51.000000000 +0300

-@@ -104,7 +104,7 @@

- /* --------------------------------------------------------------------- */

- 

- extern struct CHANLISTS   chanlists[];

--extern struct STRTAB chanlist_names[];

-+/* extern struct STRTAB chanlist_names[]; */

- 

- extern int                chantab;

- extern struct CHANLIST   *chanlist;

-diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h

---- MPlayer-20050413-orig/mmx.h	2001-10-28 13:47:21.000000000 +0200

-+++ MPlayer-20050413/mmx.h	2005-04-14 16:22:54.000000000 +0300

-@@ -353,11 +353,11 @@

- #define	mmx_m2r(op, mem, reg) \

- 	__asm__ __volatile__ (#op " %0, %%" #reg \

- 			      : /* nothing */ \

--			      : "X" (mem))

-+			      : "m" (mem))

- 

- #define	mmx_r2m(op, reg, mem) \

- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \

--			      : "=X" (mem) \

-+			      : "=m" (mem) \

- 			      : /* nothing */ )

- 

- #define	mmx_r2r(op, regs, regd) \

-@@ -367,8 +367,8 @@

- 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \

- 			      #op " %1, %%mm0\n\t" \

- 			      "movq %%mm0, %0" \

--			      : "=X" (memd) \

--			      : "X" (mems))

-+			      : "=m" (memd) \

-+			      : "m" (mems))

- 

- #endif

- 

-diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c

---- MPlayer-20050413-orig/postproc/swscale_template.c	2005-02-17 01:47:00.000000000 +0200

-+++ MPlayer-20050413/postproc/swscale_template.c	2005-04-14 16:46:12.000000000 +0300

-@@ -2136,6 +2136,7 @@

- 	else

- 	{

- 		long counter= -2*dstW;

-+		uint8_t* ptr=src+filterSize;

- //		filter-= counter*filterSize/2;

- 		filterPos-= counter/2;

- 		dst-= counter/2;

-@@ -2177,7 +2178,7 @@

- 			" jnc 1b			\n\t"

- 

- 			: "+r" (counter), "+r" (filter)

--			: "m" (filterPos), "m" (dst), "m"(src+filterSize),

-+			: "m" (filterPos), "m" (dst), "m"(ptr),

- 			  "m" (src), "r" ((long)filterSize*2)

- 			: "%"REG_b, "%"REG_a, "%"REG_c

- 		);

-@@ -2320,6 +2321,8 @@

- 	{

- #endif

- 	//NO MMX just normal asm ...

-+	  int xInc_hi=xInc>>16;

-+	  int xInc_lo=xInc&0xffff;

- 	asm volatile(

- 		"xor %%"REG_a", %%"REG_a"	\n\t" // i

- 		"xor %%"REG_b", %%"REG_b"	\n\t" // xx

-@@ -2356,7 +2359,7 @@

- 		" jb 1b				\n\t"

- 

- 

--		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF)

-+		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo)

- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"

- 		);

- #ifdef HAVE_MMX2

-@@ -2515,6 +2518,8 @@

- 	else

- 	{

- #endif

-+	  int xInc_hi=xInc>>16;

-+	  int xInc_lo=xInc&0xffff;

- 	asm volatile(

- 		"xor %%"REG_a", %%"REG_a"	\n\t" // i

- 		"xor %%"REG_b", %%"REG_b"		\n\t" // xx

-@@ -2548,7 +2553,7 @@

- 		"cmp %2, %%"REG_a"		\n\t"

- 		" jb 1b				\n\t"

- 

--		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)),

-+		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),

- 		"r" (src2)

- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"

- 		);

-

+diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure
+--- MPlayer-20050413-orig/configure	2005-04-06 14:57:08.000000000 +0300
++++ MPlayer-20050413/configure	2005-04-14 16:20:41.000000000 +0300
+@@ -604,7 +604,7 @@
+       cc_version="v. ?.??, bad"
+       cc_verc_fail=yes
+       ;;
+-    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
++    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)
+       _cc_major=`echo $cc_version | cut -d '.' -f 1`
+       _cc_minor=`echo $cc_version | cut -d '.' -f 2`
+       _cc_mini=`echo $cc_version | cut -d '.' -f 3`
+diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c
+--- MPlayer-20050413-orig/liba52/imdct.c	2005-03-23 01:27:18.000000000 +0200
++++ MPlayer-20050413/liba52/imdct.c	2005-04-14 16:48:54.000000000 +0300
+@@ -937,7 +937,8 @@
+     /* 4-7. iterations */
+     for (m=3; m < 7; m++) {
+ 	two_m = (1 << m);
+-	two_m_plus_one = two_m<<1;
++	int two_m_plus_four=two_m<<4;
++	complex_t* buf_plus_128=buf+128;
+ 	asm volatile(
+ 		"movl %0, %%esi				\n\t"
+ 		".balign 16				\n\t"
+@@ -963,7 +964,7 @@
+ 		"addl %2, %%esi				\n\t"
+ 		"cmpl %1, %%esi				\n\t"
+ 		" jb 1b					\n\t"
+-		:: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3),
++		:: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3),
+ 		   "r" (sseW[m])
+ 		: "%esi", "%edi", "%edx"
+ 	);
+diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c
+--- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c	2005-02-27 10:56:26.000000000 +0200
++++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c	2005-04-14 16:35:07.000000000 +0300
+@@ -2648,6 +2648,8 @@
+ static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
+ 	int64_t dc_mask, eq_mask;
+ 	int64_t sums[10*8*2];
++	int64_t dc_and_eq_mask;
++
+ 	src+= step*3; // src points to begin of the 8x8 Block
+ //START_TIMER
+ asm volatile(
+@@ -2754,8 +2756,9 @@
+ 		: "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold)
+ 		: "%"REG_a
+ 		);
++	dc_and_eq_mask=dc_mask & eq_mask;
+ 
+-	if(dc_mask & eq_mask){
++	if(dc_and_eq_mask){
+ 		long offset= -8*step;
+ 		int64_t *temp_sums= sums;
+ 
+@@ -2930,7 +2933,7 @@
+ 		" js 1b						\n\t"
+ 
+ 		: "+r"(offset), "+r"(temp_sums)
+-		: "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
++		: "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask)
+ 		);
+ 	}else
+ 		src+= step; // src points to begin of the 8x8 Block
+diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h
+--- MPlayer-20050413-orig/libmpdemux/frequencies.h	2001-11-17 00:06:48.000000000 +0200
++++ MPlayer-20050413/libmpdemux/frequencies.h	2005-04-14 16:36:51.000000000 +0300
+@@ -104,7 +104,7 @@
+ /* --------------------------------------------------------------------- */
+ 
+ extern struct CHANLISTS   chanlists[];
+-extern struct STRTAB chanlist_names[];
++/* extern struct STRTAB chanlist_names[]; */
+ 
+ extern int                chantab;
+ extern struct CHANLIST   *chanlist;
+diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h
+--- MPlayer-20050413-orig/mmx.h	2001-10-28 13:47:21.000000000 +0200
++++ MPlayer-20050413/mmx.h	2005-04-14 16:22:54.000000000 +0300
+@@ -353,11 +353,11 @@
+ #define	mmx_m2r(op, mem, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (mem))
++			      : "m" (mem))
+ 
+ #define	mmx_r2m(op, reg, mem) \
+ 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
+-			      : "=X" (mem) \
++			      : "=m" (mem) \
+ 			      : /* nothing */ )
+ 
+ #define	mmx_r2r(op, regs, regd) \
+@@ -367,8 +367,8 @@
+ 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+ 			      #op " %1, %%mm0\n\t" \
+ 			      "movq %%mm0, %0" \
+-			      : "=X" (memd) \
+-			      : "X" (mems))
++			      : "=m" (memd) \
++			      : "m" (mems))
+ 
+ #endif
+ 
+diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c
+--- MPlayer-20050413-orig/postproc/swscale_template.c	2005-02-17 01:47:00.000000000 +0200
++++ MPlayer-20050413/postproc/swscale_template.c	2005-04-14 16:46:12.000000000 +0300
+@@ -2136,6 +2136,7 @@
+ 	else
+ 	{
+ 		long counter= -2*dstW;
++		uint8_t* ptr=src+filterSize;
+ //		filter-= counter*filterSize/2;
+ 		filterPos-= counter/2;
+ 		dst-= counter/2;
+@@ -2177,7 +2178,7 @@
+ 			" jnc 1b			\n\t"
+ 
+ 			: "+r" (counter), "+r" (filter)
+-			: "m" (filterPos), "m" (dst), "m"(src+filterSize),
++			: "m" (filterPos), "m" (dst), "m"(ptr),
+ 			  "m" (src), "r" ((long)filterSize*2)
+ 			: "%"REG_b, "%"REG_a, "%"REG_c
+ 		);
+@@ -2320,6 +2321,8 @@
+ 	{
+ #endif
+ 	//NO MMX just normal asm ...
++	  int xInc_hi=xInc>>16;
++	  int xInc_lo=xInc&0xffff;
+ 	asm volatile(
+ 		"xor %%"REG_a", %%"REG_a"	\n\t" // i
+ 		"xor %%"REG_b", %%"REG_b"	\n\t" // xx
+@@ -2356,7 +2359,7 @@
+ 		" jb 1b				\n\t"
+ 
+ 
+-		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF)
++		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo)
+ 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
+ 		);
+ #ifdef HAVE_MMX2
+@@ -2515,6 +2518,8 @@
+ 	else
+ 	{
+ #endif
++	  int xInc_hi=xInc>>16;
++	  int xInc_lo=xInc&0xffff;
+ 	asm volatile(
+ 		"xor %%"REG_a", %%"REG_a"	\n\t" // i
+ 		"xor %%"REG_b", %%"REG_b"		\n\t" // xx
+@@ -2548,7 +2553,7 @@
+ 		"cmp %2, %%"REG_a"		\n\t"
+ 		" jb 1b				\n\t"
+ 
+-		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)),
++		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),
+ 		"r" (src2)
+ 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
+ 		);
+
 --- MPlayer-1.0pre7/libvo/aclib_template.c	2005-04-25 08:26:11.000000000 +0000
 +++ MPlayer-1.0pre7.az/libvo/aclib_template.c	2005-04-25 08:26:17.000000000 +0000
 @@ -249,8 +249,8 @@
@@ -169,8 +169,8 @@ diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/po
  		:: "r" (from), "r" (to) : "memory");
 -		((const unsigned char *)from)+=64;
 -		((unsigned char *)to)+=64;
-+		from+=64;
-+		to+=64;
++		from=((const unsigned char *)from)+64;
++		to=((unsigned char *)to)+64;
  	}
  
  //	printf(" %d %d\n", (int)from&1023, (int)to&1023);
@@ -180,8 +180,8 @@ diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/po
  		:: "r" (from), "r" (to) : "memory");
 -		((const unsigned char *)from)+=64;
 -		((unsigned char *)to)+=64;
-+		from+=64;
-+		to+=64;
++		from=((const unsigned char *)from)+64;
++		to=((unsigned char *)to)+64;
  	}
  
  #endif /* Have SSE */
diff --git a/media-video/mplayer/files/mplayer.desktop b/media-video/mplayer/files/mplayer.desktop
index 99d351e49398..3e2e7b30effb 100644
--- a/media-video/mplayer/files/mplayer.desktop
+++ b/media-video/mplayer/files/mplayer.desktop
@@ -1,7 +1,13 @@
 [Desktop Entry]
+Type=Application
+Encoding=UTF-8
+StartupNotify=false
 Name=MPlayer
-Comment=Media Player for Linux
-Exec=mplayer -gui
-Icon=mplayer.xpm
-Terminal=0
+Comment=Media Player For Linux
+GenericName=Video Player
+Exec=gmplayer
+Terminal=false
 Type=Application
+Icon=mplayer.xpm
+Categories=Application;Multimedia;AudioVideo;Player;
+MimeType=video/quicktime;video/x-quicktime;image/x-quicktime;application/x-quicktimeplayer;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;video/x-ms-wm;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;audio/x-ms-wax;audio/x-ms-wma;application/x-drm-v2;audio/wav;audio/x-wav;video/mpeg;audio/mpeg;video/x-mpeg;video/x-mpeg2;audio/mpeg;audio/x-mpeg;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/x-mp3;audio/mp3;video/mp4;video/fli;video/x-fli;video/vnd.vivo;application/x-ogg;application/ogg
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 47ec49344c32..d9df1878d8e2 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/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>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index 5c9f41b2ffbc..c3b2a24ca52f 100644
--- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7-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/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.1 2005/08/27 01:57:48 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:34 chriswhite Exp $
 
-inherit eutils flag-o-matic kernel-mod
+inherit eutils flag-o-matic
 
 RESTRICT="nostrip"
 IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
-custom-cflags debug dga divx4linux doc dts dvb cdparanoia directfb dvd dv
+custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
 lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl
 oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2
@@ -32,7 +32,6 @@ HOMEPAGE="http://www.mplayerhq.hu/"
 
 # 'encode' in USE for MEncoder.
 RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	divx4linux? (  >=media-libs/divx4linux-20030428 )
 	win32codecs? ( >=media-libs/win32codecs-20040916 )
 	x86? ( real? ( >=media-video/realplayer-10.0.3 ) )
 	aalib? ( media-libs/aalib )
@@ -84,51 +83,7 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# ecpu_check
-# Usage:
-#
-# ecpu_check array_of_cpu_flags
-#
-# array_of_cpu_flags - An array of cpu flags to check against USE flags
-#
-# Checks user USE related cpu flags against /proc/cpuinfo.  If user enables a
-# cpu flag that is not supported in their processor flags, it will warn the
-# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
-# obviously using different cpu flags than their own cpu ).  Examples:
-#
-# CPU_FLAGS=(mmx mmx2 sse sse2)
-# ecpu_check CPU_FLAGS
-# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
-
-ecpu_check() {
-	# Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
-	# and dropping the else if you do not plan on adding anything to that
-	# empty block ....
-	# PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
-	if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
-	then
-		CPU_FLAGS=${1}
-		USER_CPU=`grep "flags" /proc/cpuinfo`
-
-		for flags in `seq 1 ${#CPU_FLAGS[@]}`
-		do
-			if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
-			then
-				ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
-				ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
-			fi
-
-			if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU}  && has ${CPU_FLAGS[${flags} -1]} ${USE}
-			then
-				ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
-				ewarn "Seem to support it!  You might be cross compiling or do not have /proc filesystem"
-				ewarn "enabled.  If either is the case, set CROSSCOMPILE to 1 to disable this warning."
-			fi
-		done
-	fi
-}
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 pkg_setup() {
 	if use real && use x86; then
@@ -168,10 +123,11 @@ src_unpack() {
 	# Remove kernel-2.6 workaround as the problem it works around is
 	# fixed, and the workaround breaks sparc
 	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
-	epatch ${FILESDIR}/${PN}-1.0_pre6-ppc64.patch
+	epatch ${FILESDIR}/${P}-ppc64.patch
 
 	# Fix building with gcc4
 	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-gcc4-amd64.patch
 
 	# fixes mplayer not seeing gcc 3.4-blahetc type
 	# gcc versions.  Half stolen from toolchain-funcs
@@ -242,14 +198,6 @@ src_compile() {
 		export LINGUAS="en ${LINGUAS}"
 	fi
 
-
-	# check cpu flags
-	if use x86 && use !cpudetection
-	then
-		CPU_FLAGS=(3dnow 3dnowext mmx sse sse2 mmxext)
-		ecpu_check CPU_FLAGS
-	fi
-
 	if use custom-cflags ; then
 	# let's play the filtration game!  MPlayer hates on all!
 	strip-flags
@@ -263,8 +211,8 @@ src_compile() {
 	else
 	unset CFLAGS CXXFLAGS
 	fi
-
-	local myconf=
+	#FIXME make it work in the snapshot
+	local myconf="--disable-x264"
 	################
 	#Optional features#
 	###############
@@ -320,7 +268,6 @@ src_compile() {
 	#########
 	# Codecs #
 	########
-	myconf="${myconf} $(use_enable divx4linux)"
 	myconf="${myconf} $(use_enable gif)"
 	myconf="${myconf} $(use_enable jpeg)"
 	#myconf="${myconf} $(use_enable ladspa)"
diff --git a/media-video/mtxdrivers-pro/ChangeLog b/media-video/mtxdrivers-pro/ChangeLog
index bdec308c1ffa..fa55912c80bb 100644
--- a/media-video/mtxdrivers-pro/ChangeLog
+++ b/media-video/mtxdrivers-pro/ChangeLog
@@ -1,8 +1,84 @@
-# ChangeLog for media-video/mtxdrivers
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers-pro/ChangeLog,v 1.1 2003/06/06 15:29:40 prez Exp $
+# ChangeLog for media-video/mtxdrivers-pro
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers-pro/ChangeLog,v 1.1.1.1 2005/11/30 09:57:41 chriswhite Exp $
 
-*mtxdrives-pro-1.0_beta4 (19 Apr 2003)
+*mtxdrivers-pro-1.1.0_beta-r3 (03 Sep 2005)
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +mtxdrivers-pro-1.1.0_beta-r3.ebuild:
+  Use eselect instead of opengl-update.
+
+  27 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Add myself as maintainer so I don't have to be on the alias.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  13 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/mtxdrivers-pro-1.1.0_beta-r2-kernel-2.6-will1-20041013.patch,
+  mtxdrivers-pro-1.1.0_beta-r2.ebuild:
+  Fix to reflect upstream's change from a tarball to a .run makeself archive.
+  Also fix the compile on 2.6 kernels by adding
+  mtxdrivers-pro-1.1.0_beta-r2-kernel-2.6-will1-20041013.patch. Thanks to
+  Matthew Cerha <matthew.cerha@gmail.com> for giving me the incentive to do this
+  and letting me know about the .run issue.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -mtxdrivers-pro-1.1.0_beta-r1.ebuild, -mtxdrivers-pro-1.1.0_beta.ebuild:
+  Drop old versions.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta-r2.ebuild:
+  x86.
+
+  03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta-r2.ebuild:
+  Update info on how to get this. Matrox no longer requires an email -- they're
+  downloadable after registration (Thanks to Daniel Armyr
+  <daniel.armyr@home.se> on #60643).
+
+  25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta-r2.ebuild:
+  Provide virtual/opengl (#30107).
+
+*mtxdrivers-pro-1.1.0_beta-r2 (11 Apr 2004)
+
+  11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta-r2.ebuild:
+  xorg-x11 compatibility update.
+
+*mtxdrivers-pro-1.1.0_beta-r1 (21 Mar 2004)
+
+  21 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta-r1.ebuild:
+  Changing absolute symlinks to relative to close #44969.
+
+  12 Mar 2004; Seemant Kulleen <seemant@gentoo.org>
+  mtxdrivers-pro-1.0_beta4.ebuild:
+  removed old version
+
+  12 Mar 2004; Seemant Kulleen <seemant@gentoo.org>
+  mtxdrivers-pro-1.0_beta4.ebuild, files/glext.h:
+  moved file to mirrors instead, closing QA bug by spider (#24366)
+
+  15 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta.ebuild:
+  Stable on x86.
+
+  29 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Initial commit. Adding this to xfree herd, since it's a video driver package.
+  Prez is free to add himself as an additional maintainer.
+
+*mtxdrivers-pro-1.1.0_beta (29 Dec 2003)
+
+  29 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-pro-1.1.0_beta.ebuild:
+  Version bump. Large rewrite, based on rewrite of mtxdrivers ebuild, as well as
+  the ati-drivers ebuild and the old form of mtxdrivers-pro. The primary
+  end-user differences are 1) using the package's glext.h instead of some
+  apparently random one, and 2) not auto-running opengl-update.
+
+*mtxdrivers-pro-1.0_beta4 (19 Apr 2003)
 
   6 Jun 2003; Preston A. Elder <prez@gentoo.org> mtxdrivers-pro-1.0_beta4.ebuild
   files/digest-mtxdrivers-pro-1.0_beta4 files/glext.h :
diff --git a/media-video/mtxdrivers-pro/Manifest b/media-video/mtxdrivers-pro/Manifest
index 3ea57dce0619..186e47c4a9a1 100644
--- a/media-video/mtxdrivers-pro/Manifest
+++ b/media-video/mtxdrivers-pro/Manifest
@@ -1,2 +1,17 @@
-MD5 951289fe7f91b364552204f047c451f3 mtxdrivers-pro-1.0_beta4.ebuild 2095
-MD5 167169dc7cf54e2872436a73b7e5f3f1 files/digest-mtxdrivers-pro-1.0_beta4 79
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a3f26e0f830c72818ecbe40d04c1b5f9 ChangeLog 3411
+MD5 1a99c92c9a037a25087f3b1d1d1a8fd0 metadata.xml 260
+MD5 50608a856eb09174fea50fcfde933b9a mtxdrivers-pro-1.1.0_beta-r2.ebuild 2260
+MD5 235f01ebbdd260c6e5b8a844e7c1bfef mtxdrivers-pro-1.1.0_beta-r3.ebuild 2304
+MD5 d4d9b7ac51ee44b940c5432cf290b565 files/digest-mtxdrivers-pro-1.1.0_beta-r2 82
+MD5 8117b3258097c083df35b2a39e267bd2 files/mtxdrivers-pro-1.1.0_beta-r2-kernel-2.6-will1-20041013.patch 16754
+MD5 d4d9b7ac51ee44b940c5432cf290b565 files/digest-mtxdrivers-pro-1.1.0_beta-r3 82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGib9ArHZZzCEUG0RAqzqAJsFxsUgtBxBuJM91cpL0BHLs6jaiwCgiKT5
+6MnVQpsVt1gNkaJG1BsFDT8=
+=p5SK
+-----END PGP SIGNATURE-----
diff --git a/media-video/mtxdrivers-pro/files/digest-mtxdrivers-pro-1.1.0_beta-r2 b/media-video/mtxdrivers-pro/files/digest-mtxdrivers-pro-1.1.0_beta-r2
index 3ec4bba8c835..697ed6cec084 100644
--- a/media-video/mtxdrivers-pro/files/digest-mtxdrivers-pro-1.1.0_beta-r2
+++ b/media-video/mtxdrivers-pro/files/digest-mtxdrivers-pro-1.1.0_beta-r2
@@ -1 +1 @@
-MD5 f6a0889f98df944b6d0e6b1d68dc3de5 mtxdrivers-rh9.0-v1.1.0-pro-beta.tar.gz 2658433
+MD5 adeda36e10fe63e13542a586e3a82dd1 mtxdrivers-rh9.0-v1.1.0-pro-beta.run 2668657
diff --git a/media-video/mtxdrivers-pro/metadata.xml b/media-video/mtxdrivers-pro/metadata.xml
index d458318e80ba..2765ab78cc8c 100644
--- a/media-video/mtxdrivers-pro/metadata.xml
+++ b/media-video/mtxdrivers-pro/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>xfree</herd>
+<herd>X11-drivers</herd>
+<maintainer>
+  <email>spyderous@gentoo.org</email>
+  <name>Donnie Berkholz</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r2.ebuild b/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r2.ebuild
index bb32a11fe728..4b6d4123a8e4 100644
--- a/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r2.ebuild
+++ b/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r2.ebuild,v 1.1 2004/04/12 02:10:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:41 chriswhite Exp $
 
 inherit matrox
 
@@ -11,21 +11,32 @@ GL_V="1.3.0"
 MY_PV="${PV/_/-pro-}"
 MY_PN="${PN/-pro}"
 MY_P="${MY_PN}-rh9.0-v${MY_PV}"
-S="${WORKDIR}/${MY_PN}"
+
 DESCRIPTION="Drivers for the Matrox Parhelia and Millenium P650/P750 cards with OpenGL support."
-SRC_URI="${MY_P}.tar.gz"
+SRC_URI="${MY_P}.run"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 RDEPEND="x11-base/opengl-update
 	!media-video/mtxdrivers"
+PROVIDE="virtual/opengl"
+
+S="${WORKDIR}"
 
 pkg_nofetch() {
-	einfo "Matrox requires you e-mail them for the 'pro' version of their drivers"
-	einfo "(i.e., the ones with OpenGL support).  If you do not need OpenGL, please"
-	einfo "emerge mtxdrivers. Otherwise, e-mail cad-support@matrox.com and request"
-	einfo "the Matrox Parhelia drivers with OpenGL support.  Please remember to"
-	einfo "download the RH9.0 driver once you are given the site address."
+	einfo "You must go to:"
+	einfo "http://www.matrox.com/mga/registration/driverhub.cfm?aid=103&dtype=3&osid=7&prodid=40"
+	einfo "(for the RH9.0 drivers) and log in (or create an account) to download the"
+	einfo "Matrox Parhelia drivers. Remember to right-click and use Save Link As when"
+	einfo "downloading the driver."
+}
+
+src_unpack() {
+	unpack_makeself ${A}
+	# Patch from http://sowerbutts.com/matrox/
+	# found on matrox forums at forum.matrox.com
+	epatch ${FILESDIR}/${PF}-kernel-2.6-will1-20041013.patch
 }
 
 src_install() {
diff --git a/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r3.ebuild b/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r3.ebuild
index 4440d5bcf46c..1d31af8a4a7f 100644
--- a/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r3.ebuild
+++ b/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-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-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r3.ebuild,v 1.1 2005/09/03 22:42:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers-pro/mtxdrivers-pro-1.1.0_beta-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:41 chriswhite Exp $
 
 inherit matrox
 
diff --git a/media-video/mvc/ChangeLog b/media-video/mvc/ChangeLog
index f34992083933..218992d7b59a 100644
--- a/media-video/mvc/ChangeLog
+++ b/media-video/mvc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mvc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mvc/ChangeLog,v 1.1 2005/03/28 03:15:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mvc/ChangeLog,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> mvc-0.8.7.ebuild:
+  Added to ~ppc.
 
 *mvc-0.8.7 (28 Mar 2005)
 
diff --git a/media-video/mvc/Manifest b/media-video/mvc/Manifest
index 31d463bc4987..9ef546529985 100644
--- a/media-video/mvc/Manifest
+++ b/media-video/mvc/Manifest
@@ -1,2 +1,4 @@
-MD5 776d9f3d7b19babe1cc387340fb85c41 mvc-0.8.7.ebuild 586
+MD5 179cf5df65b0f8ffed532f45cc4be495 ChangeLog 454
+MD5 c70f746ff6a8a29c10b05cf82325cf70 metadata.xml 381
+MD5 5828ba83c6d8f98cba1fb7c04c3b3bf2 mvc-0.8.7.ebuild 785
 MD5 14c54a64123849dbc25f63f1b4ad0491 files/digest-mvc-0.8.7 60
diff --git a/media-video/mvc/mvc-0.8.7.ebuild b/media-video/mvc/mvc-0.8.7.ebuild
index 64bad1196dda..ebd381d46e26 100644
--- a/media-video/mvc/mvc-0.8.7.ebuild
+++ b/media-video/mvc/mvc-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mvc/mvc-0.8.7.ebuild,v 1.1 2005/03/28 03:15:28 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mvc/mvc-0.8.7.ebuild,v 1.1.1.1 2005/11/30 09:57:36 chriswhite Exp $
 
 DESCRIPTION="Motion Video Capture, text mode v4l video capture program with motion detection feature"
 HOMEPAGE="http://modesto.sourceforge.net/piave/index.html"
@@ -10,7 +10,7 @@ SRC_URI="http://www.turbolinux.com.cn/~merlin/mvc/${MY_P}.tar.gz"
 IUSE="nls"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND="virtual/x11"
 
diff --git a/media-video/mvideo/ChangeLog b/media-video/mvideo/ChangeLog
index ff70042a8731..8da51253181b 100644
--- a/media-video/mvideo/ChangeLog
+++ b/media-video/mvideo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mvideo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mvideo/ChangeLog,v 1.1 2005/02/08 15:19:31 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mvideo/ChangeLog,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> mvideo-0.89.99.ebuild:
+  mono moved from dev-dotnet -> dev-lang
 
 *mvideo-0.89.99 (08 Feb 2005)
 
diff --git a/media-video/mvideo/Manifest b/media-video/mvideo/Manifest
index 13683e2108de..0ae38c1f8b2e 100644
--- a/media-video/mvideo/Manifest
+++ b/media-video/mvideo/Manifest
@@ -1,3 +1,5 @@
-MD5 bacfba8219763be5ca99d99960cb93ba .mvideo-0.89.99.ebuild.swp 12288
-MD5 a4c46be3d5fda339d50c3ab360f636f8 mvideo-0.89.99.ebuild 521
+MD5 be0418c284a290447036f8cfeb63479b mvideo-0.89.99.ebuild 1874
+MD5 f9a77cd744a66e1dbdef591cd54406a3 ChangeLog 535
+MD5 a741469ea595fb76ba3553cb2f3f9b9a metadata.xml 222
 MD5 a6194ab44907d1486aab86b2e1a7a3f2 files/digest-mvideo-0.89.99 67
+MD5 7635e616281cf4fa8eb023d44d53af6d files/mvideo-0.89.99-menu.patch 572
diff --git a/media-video/mvideo/mvideo-0.89.99.ebuild b/media-video/mvideo/mvideo-0.89.99.ebuild
index c1b19c2a6b55..5d78377efe1a 100644
--- a/media-video/mvideo/mvideo-0.89.99.ebuild
+++ b/media-video/mvideo/mvideo-0.89.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-video/mvideo/mvideo-0.89.99.ebuild,v 1.1 2005/02/08 15:19:31 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mvideo/mvideo-0.89.99.ebuild,v 1.1.1.1 2005/11/30 09:57:35 chriswhite Exp $
 
 inherit eutils mono
 
@@ -18,7 +18,7 @@ RDEPEND=">=x11-libs/gtk+-2.4.0
 	>=sys-libs/glibc-2
 	>=media-libs/gstreamer-0.8
 	>=gnome-extra/libgtkhtml-3.0.10
-	>=dev-dotnet/mono-0.96
+	>=dev-lang/mono-0.96
 	>=dev-dotnet/gtk-sharp-0.98
 	>=dev-dotnet/gtkhtml-sharp-0.98
 	>=dev-dotnet/gconf-sharp-0.98
diff --git a/media-video/nemesi/ChangeLog b/media-video/nemesi/ChangeLog
index 92e2ea8f6d06..22aa95554791 100644
--- a/media-video/nemesi/ChangeLog
+++ b/media-video/nemesi/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for media-video/nemesi
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/ChangeLog,v 1.1 2004/12/17 06:26:10 lu_zero Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/ChangeLog,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
+
+  02 Nov 2005; Stefan Schweizer <genstef@gentoo.org> nemesi-0.5.0.ebuild,
+  nemesi-0.5.1.ebuild, nemesi-0.5.2.ebuild, nemesi-0.5.3.ebuild:
+  app-text/ghostscript -> virtual/ghostscript
+
+*nemesi-0.5.3 (03 Aug 2005)
+
+  03 Aug 2005; Luca Barbato <lu_zero@gentoo.org> +nemesi-0.5.3.ebuild:
+  New version
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> nemesi-0.5.0.ebuild,
+  nemesi-0.5.1.ebuild, nemesi-0.5.2.ebuild:
+  Use virtual/libc instead of sys-libs/glibc, it builds fine on fbsd at least.
+
+*nemesi-0.5.2 (04 Apr 2005)
+
+  04 Apr 2005; Luca Barbato <lu_zero@gentoo.org> nemesi-0.5.1.ebuild,
+  +nemesi-0.5.2.ebuild:
+  New version and fixed the configure
+
+*nemesi-0.5.1 (07 Mar 2005)
+
+  07 Mar 2005; Luca Barbato <lu_zero@gentoo.org> +nemesi-0.5.1.ebuild:
+  New version
+
+*nemesi-0.5.0 (08 Feb 2005)
+
+  08 Feb 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
+  +nemesi-0.5.0.ebuild:
+  New version
+
+  18 Dec 2004; Luca Barbato <lu_zero@gentoo.org> nemesi-0.4.0.ebuild:
+  Made sure it doesn't overwrite CFLAGS
 
 *nemesi-0.4.0 (17 Dec 2004)
 
diff --git a/media-video/nemesi/Manifest b/media-video/nemesi/Manifest
index c4203685c742..d9dc03f12318 100644
--- a/media-video/nemesi/Manifest
+++ b/media-video/nemesi/Manifest
@@ -1,4 +1,12 @@
-MD5 328b20f35fa94c5b5bcd006c4568c491 ChangeLog 252
-MD5 796b77a5fc455f342ded060e2d3b8ed8 nemesi-0.4.0.ebuild 668
-MD5 b4ec6674fd04f155fed8467e3206d1a7 metadata.xml 279
+MD5 a0fe0d2bce41632228c7b6887c72b4ab ChangeLog 1361
 MD5 ed761eea8c40fb945b3cb0caecc91a51 files/digest-nemesi-0.4.0 65
+MD5 958d7fb86bd6c139da00edd2febc3cfa files/digest-nemesi-0.5.0 65
+MD5 5dfcde6546e6d22593890039de5cd968 files/digest-nemesi-0.5.1 65
+MD5 23d2b5ee803efb09a6dea547d37ce6b9 files/digest-nemesi-0.5.2 65
+MD5 d9b8ca7c49e5ddc40894a5b6dad89986 files/digest-nemesi-0.5.3 65
+MD5 d16e565ab65aaf8e10e9ca3f156d5de6 metadata.xml 287
+MD5 b0cc58988be1397c6e99c5e5bae2a284 nemesi-0.4.0.ebuild 850
+MD5 52f5804e1c5df8c30f32f40f651acc66 nemesi-0.5.0.ebuild 870
+MD5 8593c01b41b9afcdece456cfed120be5 nemesi-0.5.1.ebuild 892
+MD5 29ba1f988d41f8c19f643cc77e1b6059 nemesi-0.5.2.ebuild 892
+MD5 c46f9a83c8136eff0f6213b397d50d3c nemesi-0.5.3.ebuild 892
diff --git a/media-video/nemesi/metadata.xml b/media-video/nemesi/metadata.xml
index c89898d93c45..3dfbd0a1f20b 100644
--- a/media-video/nemesi/metadata.xml
+++ b/media-video/nemesi/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>media-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>lu_zero@gentoo.org</email>
 </maintainer>
-<longdescription>Tiny RTSP client</longdescription>
+<longdescription>Standard compliant RTSP client</longdescription>
 </pkgmetadata>
diff --git a/media-video/nemesi/nemesi-0.4.0.ebuild b/media-video/nemesi/nemesi-0.4.0.ebuild
index 236ec4c33c7d..5dac264f4035 100644
--- a/media-video/nemesi/nemesi-0.4.0.ebuild
+++ b/media-video/nemesi/nemesi-0.4.0.ebuild
@@ -1,19 +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-video/nemesi/nemesi-0.4.0.ebuild,v 1.1 2004/12/17 06:26:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 DESCRIPTION="Tiny rtsp client"
-
 HOMEPAGE="http://streaming.polito.it/"
-
 SRC_URI="http://streaming.polito.it/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~x86 ~ppc"
-
 IUSE="gtk sdl"
 
 DEPEND="sys-libs/glibc
@@ -26,12 +21,15 @@ export WANT_AUTOMAKE="1.6"
 src_unpack(){
 	unpack ${A}
 	cd ${S}
-	./autogen.sh
+	#./autogen.sh
+	 sed -i -e"s:-mcpu=i486::g" configure
 }
 
 src_compile() {
-	econf `use_enable sdl` \
-		  `use_enable gtk gui`	|| die
+	econf `use_enable sdl`			\
+		  `use_enable gtk gui`		\
+		  --enable-optimize=none 	\
+		  || die "econf failed"
 	emake || die "emake failed"
 }
 
diff --git a/media-video/nemesi/nemesi-0.5.0.ebuild b/media-video/nemesi/nemesi-0.5.0.ebuild
index 914e9bde1c9e..f77b29535f61 100644
--- a/media-video/nemesi/nemesi-0.5.0.ebuild
+++ b/media-video/nemesi/nemesi-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-video/nemesi/nemesi-0.5.0.ebuild,v 1.1 2005/02/08 11:40:19 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.5.0.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 DESCRIPTION="Tiny rtsp client"
 HOMEPAGE="http://streaming.polito.it/"
@@ -11,11 +11,11 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="gtk sdl"
 
-DEPEND="sys-libs/glibc
+DEPEND="virtual/libc
 		gtk? ( >=x11-libs/gtk+-2.4 )
 		sdl? ( media-libs/libsdl )
 		media-video/ffmpeg
-		app-text/ghostscript"
+		virtual/ghostscript"
 
 export WANT_AUTOMAKE="1.6"
 
diff --git a/media-video/nemesi/nemesi-0.5.1.ebuild b/media-video/nemesi/nemesi-0.5.1.ebuild
index bc6bd3e25aa9..a9e02eb3b2bb 100644
--- a/media-video/nemesi/nemesi-0.5.1.ebuild
+++ b/media-video/nemesi/nemesi-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/media-video/nemesi/nemesi-0.5.1.ebuild,v 1.1 2005/03/07 12:36:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 DESCRIPTION="Tiny rtsp client"
 HOMEPAGE="http://streaming.polito.it/"
@@ -11,11 +11,11 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="gtk sdl"
 
-DEPEND="sys-libs/glibc
+DEPEND="virtual/libc
 		gtk? ( >=x11-libs/gtk+-2.4 )
 		sdl? ( media-libs/libsdl )
 		media-video/ffmpeg
-		app-text/ghostscript"
+		virtual/ghostscript"
 
 export WANT_AUTOMAKE="1.6"
 
@@ -23,7 +23,7 @@ src_unpack(){
 	unpack ${A}
 	cd ${S}
 	#./autogen.sh
-	 sed -i -e"s:-mcpu=i486::g" configure
+	 sed -i -e"s:-mcpu=i486::g" -e "s:-march=i386::g" configure
 }
 
 src_compile() {
diff --git a/media-video/nemesi/nemesi-0.5.2.ebuild b/media-video/nemesi/nemesi-0.5.2.ebuild
index 627d18e88f77..c790d58bc82f 100644
--- a/media-video/nemesi/nemesi-0.5.2.ebuild
+++ b/media-video/nemesi/nemesi-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.5.2.ebuild,v 1.1 2005/04/04 09:25:14 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.5.2.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 DESCRIPTION="Tiny rtsp client"
 HOMEPAGE="http://streaming.polito.it/"
@@ -11,11 +11,11 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="gtk sdl"
 
-DEPEND="sys-libs/glibc
+DEPEND="virtual/libc
 		gtk? ( >=x11-libs/gtk+-2.4 )
 		sdl? ( media-libs/libsdl )
 		media-video/ffmpeg
-		app-text/ghostscript"
+		virtual/ghostscript"
 
 export WANT_AUTOMAKE="1.6"
 
diff --git a/media-video/nemesi/nemesi-0.5.3.ebuild b/media-video/nemesi/nemesi-0.5.3.ebuild
index 73fd99c9cb3d..b295d7c195bb 100644
--- a/media-video/nemesi/nemesi-0.5.3.ebuild
+++ b/media-video/nemesi/nemesi-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.5.3.ebuild,v 1.1 2005/08/03 12:14:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nemesi/nemesi-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 DESCRIPTION="Tiny rtsp client"
 HOMEPAGE="http://streaming.polito.it/"
@@ -15,7 +15,7 @@ DEPEND="virtual/libc
 		gtk? ( >=x11-libs/gtk+-2.4 )
 		sdl? ( media-libs/libsdl )
 		media-video/ffmpeg
-		app-text/ghostscript"
+		virtual/ghostscript"
 
 export WANT_AUTOMAKE="1.6"
 
diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog
index 34fe01c12c77..b4feaa559ac7 100644
--- a/media-video/nvclock/ChangeLog
+++ b/media-video/nvclock/ChangeLog
@@ -1,11 +1,60 @@
 # ChangeLog for media-video/nvclock
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/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-video/nvclock/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  31 Aug 2005; <malverian@gentoo.org> nvclock-0.8b.ebuild:
+  Explicitly disable qt support unless use flag is set
+
+*nvclock-0.8b (30 Aug 2005)
+
+  30 Aug 2005; <malverian@gentoo.org> +nvclock-0.8b.ebuild:
+  Version bump, bug #104281. Works on amd64 and x86.
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +files/callbacks.patch,
+  nvclock-0.7-r1.ebuild:
+  Adding fix from bug #38251. Thanks!
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  nvclock-0.7-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Dec 2003; <spider@gentoo.org> nvclock-0.7-r1.ebuild:
+  Removed gtk2 IUSE statement
+
+*nvclock-0.7-r1 (05 Nov 2003)
+
+  05 Nov 2003; Philip Walls <malverian@gentoo.org> nvclock-0.7-r1.ebuild
+  files/configure.in.diff files/nvclock_initd files/nvclock_confd :
+  Fix QT detection support, closes bug #32339. Add rc scripts for 
+  nvclock (#19365)
+
+*nvclock-0.7 (30 Oct 2003)
+
+  30 Oct 2003; Philip Walls <malverian@gentoo.org> nvclock-0.7.ebuild :
+  Version bump, closes bug #25779; Ebuild cleanups, no more GTK1 frontend
+
+*nvclock-0.6.2-r1 (15 Apr 2003)
+
+  15 Apr 2003; Philip Walls <malverian@gentoo.org> nvclock-0.6.2-r1.ebuild :
+  Moved into stable, removed 0.5 ebuild: see #19394
+  Thanks to Trans13nt for fixed ebuild/testing
+
+*nvclock-0.6.2 (10 Feb 2003)
+
+  10 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + configure fixes #15123.
+
+*nvclock-0.5 (2 Jun 2002)
+
+  9 Apr 2003; Martin Holzer <mholzer@gentoo.org> nvclock-0.5.ebuild:
+  Adding /usr to make install. Closes #19060.
+
+  2 Jun 2002; Joachim Blaabjerg <styx@SuxOS.org> nvclock-0.5.ebuild:
+  Version bump to 0.5, QT GUI support, minor cleanup.
 
 *nvclock-0.4.2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/media-video/nvclock/Manifest b/media-video/nvclock/Manifest
index 75bb7823ffa7..06c202524748 100644
--- a/media-video/nvclock/Manifest
+++ b/media-video/nvclock/Manifest
@@ -1,5 +1,10 @@
-MD5 7c7f6df7f585a5753a769ceb36632d6b ChangeLog 1280
-MD5 624b1b2ad847f53732aa504523e80d76 nvclock-0.6.2-r1.ebuild 1245
-MD5 f67b707dada0b65403208150063ae2c8 files/0.6.2-configure.in.patch 1169
-MD5 4cb45c458284815823717e4a8dbd0e60 files/0.6.2-qt-version-check.patch 516
-MD5 97349e83a1718eab21d4b1959b7e6bed files/digest-nvclock-0.6.2-r1 63
+MD5 4383822568e9c99d400a8d1f68488c48 ChangeLog 2311
+MD5 18e357d8033ba8530d4c6b8a2c6e0a57 metadata.xml 324
+MD5 a9819b4119978f1e454c52814c312203 nvclock-0.7-r1.ebuild 1287
+MD5 27668b6907cee9a9ab5756599a558eb0 nvclock-0.8b.ebuild 1183
+MD5 0afb58d7f073145f86d31cee842bfb10 files/configure.in.diff 348
+MD5 fd8ac9ae1a4d86f822f0b84ce8f5723a files/digest-nvclock-0.7-r1 61
+MD5 f935ebffac8b81708d875e0bef2fe7ab files/nvclock_confd 360
+MD5 c61383e40bda1679161b03f78e577609 files/nvclock_initd 146
+MD5 80f3f5a3e09142270f16873fddfb5d7d files/callbacks.patch 837
+MD5 8e95c31db3c96d2c5be730c986ffac2c files/digest-nvclock-0.8b 63
diff --git a/media-video/nvclock/files/configure.in.diff b/media-video/nvclock/files/configure.in.diff
index 1a9c59dcbd37..ca4c569ae02d 100644
--- a/media-video/nvclock/files/configure.in.diff
+++ b/media-video/nvclock/files/configure.in.diff
@@ -6,8 +6,8 @@
      elif test -r $QTDIR/include/qt.h; then
 -	QT_LIBS=-L$(QTDIR)/lib -L$QTDIR
 -	QT_CFLAGS=-I$(QTDIR)/include
-+	QT_LIBS="${QTDIR}/lib -L$QTDIR"
-+	QT_CFLAGS="${QTDIR}/include"
++	QT_LIBS=-L${QTDIR}/lib
++	QT_CFLAGS=-I${QTDIR}/include
          HAVE_QT=yes
  	
      else
diff --git a/media-video/nvclock/nvclock-0.7-r1.ebuild b/media-video/nvclock/nvclock-0.7-r1.ebuild
index cecbd51110b7..e1fed016b8b0 100644
--- a/media-video/nvclock/nvclock-0.7-r1.ebuild
+++ b/media-video/nvclock/nvclock-0.7-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/media-video/nvclock/nvclock-0.7-r1.ebuild,v 1.1 2003/11/05 17:06:38 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 inherit eutils
 
@@ -13,15 +13,22 @@ SRC_URI="http://www.linuxhardware.org/nvclock/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="gtk gtk2 qt"
+IUSE="gtk qt"
 
-DEPEND="virtual/glibc
-	sys-devel/autoconf
+RDEPEND="virtual/libc
 	gtk? ( =x11-libs/gtk+-2* )
-	qt? ( x11-libs/qt )"
+	qt? ( =x11-libs/qt-3* )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/configure.in.diff
+	epatch ${FILESDIR}/callbacks.patch
+}
 
 src_compile() {
-	epatch ${FILESDIR}/configure.in.diff || die
 	mv configure.in configure.ac
 	./autogen.sh || die
 
@@ -37,15 +44,12 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/bin /etc/init.d /etc/conf.d
+	dodir /usr/bin
 	einstall || die
+	dodoc AUTHORS README
 
-	cp ${FILESDIR}/nvclock_initd ${D}/etc/init.d/nvclock
-	cp ${FILESDIR}/nvclock_confd ${D}/etc/conf.d/nvclock
-
-	chmod u+x ${D}/etc/init.d/nvclock
-
-	dodoc AUTHORS COPYING README
+	newinitd ${FILESDIR}/nvclock_initd nvclock
+	newconfd ${FILESDIR}/nvclock_confd nvclock
 }
 
 pkg_postinst() {
diff --git a/media-video/nvclock/nvclock-0.8b.ebuild b/media-video/nvclock/nvclock-0.8b.ebuild
index cbf84c5bdfd4..f7a6a55193e1 100644
--- a/media-video/nvclock/nvclock-0.8b.ebuild
+++ b/media-video/nvclock/nvclock-0.8b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8b.ebuild,v 1.1 2005/08/30 22:53:45 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8b.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ src_compile() {
 	local myconf
 
 	use gtk || myconf="${myconf} --disable-gtk"
-	use qt && myconf="${myconf} --enable-qt"
+	use qt || myconf="${myconf} --disable-qt"
 
 	./configure ${myconf} || die
 	make || die
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index a65d0a76c0b8..918b5e7e8718 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,588 @@
-# ChangeLog for media-video/nvidia-glx 
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.1 2002/02/11 04:43:00 drobbins Exp $
+# ChangeLog for media-video/nvidia-glx
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $
+
+*nvidia-glx-1.0.7676-r2 (11 Nov 2005)
+
+  11 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-glx-1.0.7676-r2.ebuild:
+  Use $IMAGE in pkg_preinst() if $D not set.  Possible fix for bug #82595.
+
+  28 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  nvidia-glx-1.0.7676-r1.ebuild:
+  Added support for FreeBSD drivers as per bug #102274.
+
+  05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6111-r3.ebuild, nvidia-glx-1.0.6629-r7.ebuild,
+  nvidia-glx-1.0.7167-r3.ebuild, nvidia-glx-1.0.7174-r5.ebuild,
+  nvidia-glx-1.0.7667-r1.ebuild, nvidia-glx-1.0.7676-r1.ebuild:
+  Cleaned up for modular X. Pushed the install directory choice from
+  src_install to pkg_preinst since it will depend on the system being
+  installed on rather than the system building the package.
+
+*nvidia-glx-1.0.7676-r1 (23 Aug 2005)
+*nvidia-glx-1.0.7667-r1 (23 Aug 2005)
+*nvidia-glx-1.0.7174-r5 (23 Aug 2005)
+*nvidia-glx-1.0.7167-r3 (23 Aug 2005)
+*nvidia-glx-1.0.6629-r7 (23 Aug 2005)
+*nvidia-glx-1.0.6111-r3 (23 Aug 2005)
+
+  23 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +nvidia-glx-1.0.6111-r3.ebuild, +nvidia-glx-1.0.6629-r7.ebuild,
+  +nvidia-glx-1.0.7167-r3.ebuild, -nvidia-glx-1.0.7174-r4.ebuild,
+  +nvidia-glx-1.0.7174-r5.ebuild, -nvidia-glx-1.0.7667.ebuild,
+  +nvidia-glx-1.0.7667-r1.ebuild, -nvidia-glx-1.0.7676.ebuild,
+  +nvidia-glx-1.0.7676-r1.ebuild:
+  Revbumps to use the new opengl eselect module instead of opengl-update.
+
+*nvidia-glx-1.0.7676 (15 Aug 2005)
+
+  15 Aug 2005; <augustus@gentoo.org> +nvidia-glx-1.0.7676.ebuild:
+  NVIDIA version bump.
+
+  20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la,
+  -nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6111-r2.ebuild,
+  -nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629-r5.ebuild,
+  nvidia-glx-1.0.6629-r6.ebuild, nvidia-glx-1.0.7167-r2.ebuild,
+  nvidia-glx-1.0.7174-r4.ebuild, -nvidia-glx-1.0.7664.ebuild,
+  nvidia-glx-1.0.7667.ebuild:
+  Removing old versions. Fixing want_tls to work with 2.3.5 on CHOST=i486 and
+  i586.
+
+*nvidia-glx-1.0.7667 (07 Jul 2005)
+
+  07 Jul 2005; <augustus@gentoo.org> nvidia-glx-1.0.7664.ebuild,
+  +nvidia-glx-1.0.7667.ebuild:
+  Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768.
+  The fixes to these have been added to version 1.0.7664 and 1.0.7667 of the
+  driver.
+
+*nvidia-glx-1.0.7664 (03 Jun 2005)
+
+  03 Jun 2005; <augustus@gentoo.org> +nvidia-glx-1.0.7664.ebuild:
+  Initial checkin of NVIDIA 7664 release.  Not complete but this should work for
+  those on the bleeding edge.
+
+  16 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6629-r6.ebuild:
+  Stable amd64, x86.
+
+*nvidia-glx-1.0.6111-r2 (05 May 2005)
+
+  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +nvidia-glx-1.0.6111-r2.ebuild:
+  Added an opengl-update-2.2 version of nvidia-glx-1.0.6111 by request.
+
+*nvidia-glx-1.0.7167-r2 (04 May 2005)
+*nvidia-glx-1.0.6629-r6 (04 May 2005)
+
+  04 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6629-r1.ebuild,
+  nvidia-glx-1.0.6629-r5.ebuild, +nvidia-glx-1.0.6629-r6.ebuild,
+  -nvidia-glx-1.0.7167-r1.ebuild, +nvidia-glx-1.0.7167-r2.ebuild,
+  -nvidia-glx-1.0.7174-r1.ebuild:
+  Added opengl-update-2.2 versions of 6629 and 7167. Fixed opengl-update
+  dependencies for older ebuilds to close bug #90922.
+
+*nvidia-glx-1.0.7174-r4 (02 May 2005)
+
+  02 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-glx-1.0.7174-r3.ebuild, +nvidia-glx-1.0.7174-r4.ebuild:
+  Don't use tls enabled lib when the user has CHOST=i386 USE=nptl since they
+  really DON'T have nptl. Bug #91137.
+
+*nvidia-glx-1.0.7174-r3 (27 Apr 2005)
+
+  27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-glx-1.0.7174-r2.ebuild, +nvidia-glx-1.0.7174-r3.ebuild:
+  Fix for bug #90047. We check if glibc was built with --with-tls and install
+  the correct libnvidia-tls.so.
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.7174-r2.ebuild:
+  Make sure we have a valid opengl implementation when uninstalling. Closes
+  bug #55142.
+
+*nvidia-glx-1.0.7174-r2 (26 Apr 2005)
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +nvidia-glx-1.0.7174-r2.ebuild:
+  Hopefully solve bug #90047 which causes havoc with different
+  nptl/linuxthreads/tls configurations.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update maintainer to x11-drivers.
+
+  02 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.7174-r1.ebuild:
+  Revert x86 to pkg0 to not use two packages for x86, and the smaller one at
+  that, to stop getting bug reports on that.
+
+*nvidia-glx-1.0.7174-r1 (02 Apr 2005)
+
+  02 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-glx-1.0.7174.ebuild, +nvidia-glx-1.0.7174-r1.ebuild:
+  Go back to the proper packages so we get the 32bit libs on amd64.
+
+  01 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6629-r5.ebuild:
+  Stable amd64 for multilib fixups in 2005.0.
+
+*nvidia-glx-1.0.7174 (01 Apr 2005)
+
+  01 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-glx-1.0.7174.ebuild:
+  Update version.
+
+*nvidia-glx-1.0.7167-r1 (11 Mar 2005)
+
+  11 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +nvidia-glx-1.0.7167-r1.ebuild, nvidia-glx-1.0.7167.ebuild:
+  Fix installation on amd64 2005.0.
+
+*nvidia-glx-1.0.7167 (11 Mar 2005)
+
+  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-glx-1.0.7167.ebuild:
+  Update version.  Add new dlloader module for supported Xorg.
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la-r1,
+  files/libGL.la-r2, nvidia-glx-1.0.6629-r5.ebuild:
+  Remove X11R6 in .la so dependency_libs just uses /usr/lib.
+
+*nvidia-glx-1.0.6629-r5 (09 Feb 2005)
+
+  09 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +files/libGL.la-r2,
+  +nvidia-glx-1.0.6629-r5.ebuild:
+  Fix libGL.la borkage (wrong paths in dependency_libs).
+
+*nvidia-glx-1.0.6111-r1 (29 Jan 2005)
+
+  29 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
+  +nvidia-glx-1.0.6111-r1.ebuild, -nvidia-glx-1.0.6111.ebuild:
+  Updating 6111 to work with >=xorg-x11-6.8.0-r4
+
+  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6629-r4.ebuild:
+  Add some testing so error messages (which were safe to ignore) don't display
+  and confuse the user.
+
+*nvidia-glx-1.0.6629-r4 (24 Jan 2005)
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> files/libGL.la-r1,
+  -nvidia-glx-1.0.6629-r3.ebuild, +nvidia-glx-1.0.6629-r4.ebuild:
+  Fix the proper libdir in the .la.  Cleaning out older versions.
+
+  21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/libGL.la-r1,
+  nvidia-glx-1.0.6629-r3.ebuild:
+  Install .la file for each ABI.
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6629-r3.ebuild:
+  Added a keepdir /usr/<libdir>/tls since some opengl-updates don't make it.
+
+*nvidia-glx-1.0.6629-r3 (20 Jan 2005)
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-glx-1.0.6629-r2.ebuild, +nvidia-glx-1.0.6629-r3.ebuild:
+  Make new revision install both 32bit and 64bit versions on 2004.3 to make 
+  games herd QA hapy.  Forcing revbump to make sure 2004.3 users get updated
+  correctly.
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.6629-r2.ebuild:
+  Stable amd64 for 2005.0.
+
+*nvidia-glx-1.0.6629-r2 (17 Jan 2005)
+
+  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +nvidia-glx-1.0.6629-r2.ebuild:
+  Revision bumping to support amd64's 2005.0. Now installs both 32bit and
+  64bit libs on that profile.
+
+  17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629.ebuild:
+  Marking 6629 stable across archs
+
+  10 Jan 2005; Jason Huebel <jhuebel@gentoo.org>
+  nvidia-glx-1.0.6629-r1.ebuild:
+  stable on amd64
+
+*nvidia-glx-1.0.6629-r1 (31 Dec 2004)
+
+  31 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  +nvidia-glx-1.0.6629-r1.ebuild:
+  Changing driver and lib install location to be detected depending on
+  xorg-x11 version.
+
+  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> -files/README.gentoo,
+  +files/libGL.la, -files/libGL.la.2,
+  -files/nvidia-glx-1.0.4363-defines.patch,
+  -files/nvidia-glx-1.0.4496-defines.patch,
+  -files/nvidia-glx-1.0.4499-defines.patch,
+  -files/nvidia-glx-1.0.5328-defines.patch,
+  -files/nvidia-glx-1.0.5328-glheader.patch,
+  -files/nvidia-glx-1.0.5332-glheader.patch,
+  -files/nvidia-glx-1.0.5336-glheader.patch,
+  -files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch,
+  -files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch,
+  -files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch,
+  -nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4496-r2.ebuild,
+  -nvidia-glx-1.0.4499-r1.ebuild, -nvidia-glx-1.0.5328-r2.ebuild,
+  -nvidia-glx-1.0.5332-r2.ebuild, -nvidia-glx-1.0.5336-r2.ebuild,
+  -nvidia-glx-1.0.6106-r3.ebuild, nvidia-glx-1.0.6111.ebuild,
+  nvidia-glx-1.0.6629.ebuild:
+  Removing all masked (deprecated) versions to match the nvidia-kernel removal.
+
+  10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  +files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch,
+  +files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch,
+  +files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch,
+  nvidia-glx-1.0.6629.ebuild:
+  Porting across GL patches for consistency, it was necessary in the end.
+
+  10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6629.ebuild:
+  Changing to error on xfree install, as opposed to dieing
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-glx-1.0.4363-r1.ebuild, nvidia-glx-1.0.4496-r2.ebuild,
+  nvidia-glx-1.0.4499-r1.ebuild, nvidia-glx-1.0.5328-r2.ebuild,
+  nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild,
+  nvidia-glx-1.0.6106-r3.ebuild:
+  Keywords masking as driver/glx being deprecated.
+
+*nvidia-glx-1.0.6629 (07 Nov 2004)
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6111.ebuild,
+  +nvidia-glx-1.0.6629.ebuild:
+  New version 1.0.6629! Also marking 1.0.6111-r3 stable to bring things up to
+  speed with nvidia-kernel.
+
+  05 Sep 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6111.ebuild:
+  stable on amd64
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  30 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch:
+  Update for proper glext.h inclusion
+
+  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-glx-1.0.5328-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild:
+  Marking up to and including 5336 stable to support newer nvidia cards, eg
+  FX5700.
+
+*nvidia-glx-1.0.6111 (06 Aug 2004)
+
+  06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch,
+  +files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch,
+  +files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch,
+  +nvidia-glx-1.0.6111.ebuild:
+  Version bump for 6111; nVidia haven't changed their GL headers in this release
+  so still applying the patches
+
+*nvidia-glx-1.0.4499-r1 (19 Jul 2004)
+
+  19 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/libGL.la.1,
+  +nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4363.ebuild,
+  -nvidia-glx-1.0.4496-r1.ebuild, +nvidia-glx-1.0.4496-r2.ebuild,
+  -nvidia-glx-1.0.4496.ebuild, +nvidia-glx-1.0.4499-r1.ebuild,
+  -nvidia-glx-1.0.4499.ebuild, -nvidia-glx-1.0.5328-r1.ebuild,
+  +nvidia-glx-1.0.5328-r2.ebuild:
+  Moving all versions over to use proper libGL.la file, removing all versions
+  that do not use the correct file, and removing the incorrect file; this should
+  fix pygtk et al bugs.
+
+  18 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106-r3.ebuild:
+  marking stable since our last stable nvidia-glx was just deleted
+
+*nvidia-glx-1.0.6106-r3 (18 Jul 2004)
+
+  18 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  -nvidia-glx-1.0.6106-r1.ebuild, -nvidia-glx-1.0.6106-r2.ebuild,
+  +nvidia-glx-1.0.6106-r3.ebuild, -nvidia-glx-1.0.6106.ebuild:
+  Taking Azarahs' advice, making /usr/lib/tls into a directory and creating
+  symlinks under it.. Changing opengl-update-1.8.1 to account for this thank
+  fully links are easier to remove than directories, this will be a transparent
+  update
+
+*nvidia-glx-1.0.6106-r2 (18 Jul 2004)
+
+  18 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-glx-1.0.6106-r2.ebuild:
+  The /usr/lib/tls dir changed to a symlink - handle it carefully. Personally I
+  think it would have been better to leave it a dir, and manage the specific
+  opengl libs as symlinks, as you never know what future may bring ...
+
+*nvidia-glx-1.0.6106-r1 (17 Jul 2004)
+
+  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch,
+  +nvidia-glx-1.0.6106-r1.ebuild:
+  See bug #54984 -- Changing TLS, glext.h, patching gl.h
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106.ebuild:
+  the previous amd64 nvidia drivers arent exactly what i would call stable, but
+  this release seems to be rock solid. marking stable on amd64
+
+*nvidia-glx-1.0.6106 (02 Jul 2004)
+
+  02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml,
+  +files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch,
+  +files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch,
+  +nvidia-glx-1.0.6106.ebuild:
+  Version bumping to 6106. Thanks to everyone on bug #55714 for testing and
+  suggesting improvements. Please note the new
+  app-emulation/emul-linux-x86-nvidia package for 32 bit compatibility on amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-glx-1.0.4363.ebuild, nvidia-glx-1.0.4496-r1.ebuild,
+  nvidia-glx-1.0.4496.ebuild, nvidia-glx-1.0.4499.ebuild,
+  nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
+  nvidia-glx-1.0.5336-r2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  -nvidia-glx-1.0.5332-r1.ebuild:
+  Removing a duplicate build version
+
+  06 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/nvidia-glx-1.0.4363-defines.patch, nvidia-glx-1.0.4363.ebuild:
+  Reintroducing patchset for 4363 which was removed a while ago because of
+  version name conflicts.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nvidia-glx-1.0.4363.ebuild,
+  nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild,
+  nvidia-glx-1.0.4499.ebuild, nvidia-glx-1.0.5328-r1.ebuild,
+  nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
+  nvidia-glx-1.0.5336-r2.ebuild:
+  Add inherit eutils
+
+  19 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild:
+  marking stable on amd64 to close bug #48409
+
+  15 Apr 2004; <spider@gentoo.org> nvidia-glx-1.0.4363.ebuild,
+  nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild,
+  nvidia-glx-1.0.4499.ebuild, nvidia-glx-1.0.5328-r1.ebuild,
+  nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
+  nvidia-glx-1.0.5336-r2.ebuild:
+  added export _POSIX2_VERSION="199209" to all ebuilds to work around broken
+  chown syntax in upstream release. This is a workaround until nvidia fixes
+  things.
+
+*nvidia-glx-1.0.4496-r1 (15 Apr 2004)
+
+  15 Apr 2004; <spider@gentoo.org> +nvidia-glx-1.0.4496-r1.ebuild:
+  adding the changes necessary to make 4496 versions interact with xorg-x11
+  implementation.
+
+  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
+  nvidia-glx-1.0.5336-r2.ebuild, files/nvidia-glx-1.0.4180-defines.patch,
+  files/nvidia-glx-1.0.4191-defines.patch,
+  files/nvidia-glx-1.0.5328-glheader.patch,
+  files/nvidia-glx-1.0.5332-glheader.patch,
+  files/nvidia-glx-1.0.5336-glheader.patch:
+  Adding patchset that fixes api breakage as mentioned in bug #37517
+
+  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild:
+  We are letting virtual/x11 provide glext.h, removing its install, see bug
+  #37517
+
+  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>; nvidia-glx-1.0.2880.ebuild,
+  nvidia-glx-1.0.2960-r1.ebuild, nvidia-glx-1.0.3123.ebuild,
+  nvidia-glx-1.0.4180.ebuild, nvidia-glx-1.0.4191-r1.ebuild,
+  nvidia-glx-1.0.4191.ebuild, nvidia-glx-1.0.4349.ebuild,
+  nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.5328.ebuild,
+  nvidia-glx-1.0.5332.ebuild, nvidia-glx-1.0.5336-r1.ebuild,
+  nvidia-glx-1.0.5336.ebuild, files/libGL.la:
+  Removing several of the old nvidia glx ebuilds, leaving nvidia kernel
+  corresponding versions and up to two for each profile.
+
+*nvidia-glx-1.0.5332-r2 (08 Apr 2004)
+
+  08 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild:
+  added amd64-specific ebuild with Donnie Berkholz's xorg-x11 compatibility
+  update
+
+*nvidia-glx-1.0.5336-r2 (08 Apr 2004)
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-glx-1.0.5336-r2.ebuild:
+  Update for xorg-x11 compatibility.
+
+*nvidia-glx-1.0.5336-r1 (14 Feb 2004)
+*nvidia-glx-1.0.5332-r1 (14 Feb 2004)
+
+  14 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5336-r1.ebuild,
+  files/libGL.la.2:
+  Updating libGL.la to correctly link the location of the opengl libraries, for
+  nvidia problems on bug
+
+  07 Feb 2004; Brad House <brad_mssw@gentoo.org> nvidia-glx-1.0.5332.ebuild:
+  stable on amd64
+
+*nvidia-glx-1.0.5336 (01 Feb 2004)
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5336.ebuild:
+  Update version
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5332.ebuild,
+  files/nvidia-glx-1.0.5332-defines.patch:
+  Remove dup patch.
+
+  25 Jan 2004; Caleb Tennis <caleb@gentoo.org> nvidia-glx-1.0.5332.ebuild:
+  Add a warning for Qt users that GL linkage may be broken after emerging this.
+
+*nvidia-glx-1.0.5332 (23 Jan 2004)
+
+  23 Jan 2004; <augustus@gentoo.org> nvidia-glx-1.0.5332.ebuild,
+  files/nvidia-glx-1.0.5332-defines.patch:
+  New NVIDIA driver 5332 released to public. See NVIDIA's page for full details:
+  http://www.nvidia.com/object/linux_display_amd64_1.0-5332.html
+
+*nvidia-glx-1.0.5328-r1 (05 Jan 2004)
+
+  05 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-glx-1.0.5328-r1.ebuild:
+  Fixing TLS test for bug #36551. Thanks to Ronald Hummelink
+  <gentoo-bugzilla@hummelink.xs4all.nl> for the patch.
+
+  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Adding metadata.xml.
+
+*nvidia-glx-1.0.5328 (26 Dec 2003)
+
+  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-glx-1.0.5328.ebuild, files/nvidia-glx-1.0.5328-defines.patch:
+  Version bump.
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.4496-r1.ebuild:
+  Add PKG_V to make sure updating the package used will not break things again.
+
+*nvidia-glx-1.0.4496-r1 (02 Nov 2003)
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.4496-r1.ebuild:
+  Update nVidia package to latest (pkg2), bug #32430.
+
+*nvidia-glx-1.0.4499 (15 Oct 2003)
+
+  15 Oct 2003; Daniel Robbins <drobbins@gentoo.org>:
+  nvidia-glx-1.0.4499.ebuild: New version of the ebuild for AMD64 systems.
+  Thanks to Kris Kersey, James Jones and others for working on this. See bug
+  #30799. This ebuild does need some testing; adding it so that it can be
+  tested.
+
+  20 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.4496.ebuild:
+  Mark stable (bug #28330).
+
+*nvidia-glx-1.0.4496 (29 Jul 2003)
+
+  29 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.4496.ebuild, files/nvidia-glx-1.0.4496-defines.patch:
+  New version.
+
+*nvidia-glx-1.0.4180 (18 Jul 2003)
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> nvidia-glx-1.0.4180.ebuild,
+  files/nvidia-glx-1.0.4180-defines.patch:
+  Added amd64 version of the driver
+
+  22 Jun 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.4363.ebuild:
+  Mark stable for x86.
+
+*nvidia-glx-1.0.4363 (26 Apr 2003)
+
+  26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4363.ebuild :
+  Update version.
+
+*nvidia-glx-1.0.4349 (21 Apr 2003)
+
+  21 Apr 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-glx-1.0.4349.ebuild :
+  Moved from ~x86 to stable.
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4349.ebuild :
+  New version, closing bug #18541.
+
+*nvidia-glx-1.0.4191-r1 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*nvidia-glx-1.0.4191 (31 Jan 2003)
+
+  31 Jan 2003; foser <foser@gentoo.org> nvidia-glx-1.0.4191.ebuild :
+  Added 2 header file patches
+
+  11 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4191.ebuild :
+  Add '-alpha' to KEYWORDS.
+
+*nvidia-glx-1.0.4191 (11 Dec 2002)
+
+  11 Dec 2002; Brandon Low <lostlogic@gentoo.org>:
+  New version thanks Nvidia. :)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
+  Changed sparc ~sparc keywords
+ 
+  14 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Remove ftp from SRC_URI, as it seems to give problems to some people.
+
+*nvidia-glx-1.0.3123 (12 Sep 2002)
+
+  12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Update version.
+
+  8 Sep 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild :
+  
+  Add opengl-update to DEPEND.
+
+*nvidia-glx-1.0.2960-r1 (26 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild :
+
+  Install the new dynamic XvMC library "libXvMCNVIDIA_dynamic.so" as well.
+
+*nvidia-glx-1.0.2960 (26 May 2002)
+
+*nvidia-glx-1.0.2313-r2 (12 Apr 2002) 
+
+  12 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: New rev of an older
+  ebuild to fix stripping problems.
+
+  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild :
+
+  Nuke /etc/env.d/09nvidia if it exists, else we get problems.
+
+*nvidia-glx-1.0.2880 (7 Apr 2002)
+
+  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild :
+
+  Moved back to /usr to fix various problems we had.  Update for dinamic
+  OpenGL switching.
+
+*nvidia-glx-1.0.2802-r2 (07 Mar 2002)
+
+  14 Mar 2002; Grant Goodyear  <g2boojum@gentoo.org>:
+  
+  Make sure symbols aren't stripped.
+
+*nvidia-glx-1.0.2802 (07 Mar 2002)
+
+  07 Mar 2002; Arcady Genkin  <agenkin@thpoon.com>:
+  Adds libXvMCNVIDIA.a, plus a minor rewrite.
+
+  07 Mar 2002; Daniel Robbins <drobbins@gentoo.org>: new release and a new NV_V
+  variable to hold the NVIDIA-style version number (simplifies rolling new
+  releases.)
 
 *nvidia-glx-1.0.2313-r1 (10 Feb 2002)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index d8f0364c7fdc..75c86a5a90f3 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,18 +1,40 @@
-MD5 6fb16aeff7ad833f3ac2027cd268221b nvidia-glx-1.0.4349.ebuild 3162
-MD5 bf9e94e04d62c167baface9cbd58be34 nvidia-glx-1.0.4191-r1.ebuild 2801
-MD5 234657b19a6d19a6981c4aab1ad09fcf nvidia-glx-1.0.3123.ebuild 2658
-MD5 e38d931344afe435a5c06b419d1a64c8 nvidia-glx-1.0.2960-r1.ebuild 2721
-MD5 8b0b8ebf993ec078f34e39fb0a0cfbba nvidia-glx-1.0.4191.ebuild 2665
-MD5 df731a6e32dcbdc8ba416add3d11c15b nvidia-glx-1.0.2880.ebuild 2679
-MD5 feeb34c86d3ef64d45d767daea1c05cb ChangeLog 2766
-MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 d95d0e66acb41538e6faace158d2ac21 files/digest-nvidia-glx-1.0.2960-r1 72
-MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72
-MD5 fe071363bf9a87e17f14273a23a2192d files/digest-nvidia-glx-1.0.3123 72
-MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191 72
-MD5 8b34536317191f4059bebe95beabe1a4 files/digest-nvidia-glx-1.0.4349 72
-MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191-r1 72
-MD5 cac348587b9f365512957ab034c2eed2 files/libGL.la 740
-MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 289c3b593d8454bf260834f8d1124b54 ChangeLog 22540
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
+MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
+MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
+MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
+MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r2 163
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r3 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r6 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r7 163
+MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r2 163
+MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r3 163
+MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r5 163
+MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-glx-1.0.7667-r1 163
+MD5 b23efa632026470bcf33c50fdef740ae files/digest-nvidia-glx-1.0.7676-r1 243
+MD5 b23efa632026470bcf33c50fdef740ae files/digest-nvidia-glx-1.0.7676-r2 243
+MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
+MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
+MD5 84d76e7e47009583e937b217a139924a nvidia-glx-1.0.6111-r2.ebuild 7643
+MD5 0dcb2c58ba0b70572910592479733275 nvidia-glx-1.0.6111-r3.ebuild 8284
+MD5 d146a360883f212b328c4f0f0922d310 nvidia-glx-1.0.6629-r6.ebuild 7643
+MD5 ba8fa1cac9d24046dc6384ad2882356b nvidia-glx-1.0.6629-r7.ebuild 8284
+MD5 6ca7c051a89c2afafcef2bf3befa6b44 nvidia-glx-1.0.7167-r2.ebuild 7863
+MD5 18ddb38a7595329ad585c74ee979ffaf nvidia-glx-1.0.7167-r3.ebuild 8284
+MD5 630dc45be727342243d06af61e06d6dd nvidia-glx-1.0.7174-r5.ebuild 8446
+MD5 413c2a51514bb61b54b1c9f3ae2e6463 nvidia-glx-1.0.7667-r1.ebuild 8446
+MD5 226c3e5fe5d6e5be93b0a3937e563c06 nvidia-glx-1.0.7676-r1.ebuild 9204
+MD5 a41f37198145f27b1bd3f674d191e0d2 nvidia-glx-1.0.7676-r2.ebuild 9287
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdVx91ZcsMnZjRyIRAppXAJ9yxSG65Ld6bitwnirD1MxOeNmJZACfR08i
+bf/YlCD9e6UelHfes2zhsOM=
+=BAyr
+-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch b/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch
index de1c49632c58..e0393e1b9ab0 100644
--- a/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch
+++ b/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch
@@ -1,14 +1,13 @@
 --- usr/include/GL/gl.g.orig	2004-07-17 19:56:59.789410584 +1000
 +++ usr/include/GL/gl.h	2004-07-17 19:59:08.844791184 +1000
-@@ -66,6 +66,11 @@
+@@ -66,6 +66,10 @@
  typedef double GLclampd;
  typedef void GLvoid;
  
 +/* Patching for some better defines in the global system */
-+#define GL_VERSION_1_2
-+#define GL_VERSION_1_3
-+#define GL_VERSION_1_4
++#ifndef GL_GLEXT_LEGACY
 +#include <GL/glext.h>
++#endif
  
  /*************************************************************/
  
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1
index 14f9d0f6c87b..42e8231cd30c 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1
@@ -1,2 +1,3 @@
+MD5 6a5b99cfb2cca7b424cefc27fb6a30ce NVIDIA-FreeBSD-x86-1.0-7676.tar.gz 8455397
 MD5 2474c5513006668b0fba401e042dc009 NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274
 MD5 df2081504b609aaa95ccc8e95aebfb97 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
diff --git a/media-video/nvidia-glx/files/libGL.la-r2 b/media-video/nvidia-glx/files/libGL.la-r2
index 21b6562f5335..ef8d5cc56e0a 100644
--- a/media-video/nvidia-glx/files/libGL.la-r2
+++ b/media-video/nvidia-glx/files/libGL.la-r2
@@ -14,7 +14,7 @@ library_names='libGL.so.${PV} libGL.so.1 libGL.so'
 old_library=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/${xlibdir} -lm -lX11 -lXext -ldl     '
+dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
 
 # Version information for libGL.
 current=${ver1}
@@ -29,4 +29,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='${libdir}'
+libdir='/usr/${libdir}/opengl/nvidia/lib'
diff --git a/media-video/nvidia-glx/metadata.xml b/media-video/nvidia-glx/metadata.xml
index d458318e80ba..fe629a37dbd2 100644
--- a/media-video/nvidia-glx/metadata.xml
+++ b/media-video/nvidia-glx/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>xfree</herd>
+<herd>X11-drivers</herd>
+<maintainer>
+  <email>X11-drivers@gentoo.org</email>
+</maintainer>
+<longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
 </pkgmetadata>
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild
index b8c69a141005..143cb2473ff4 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-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-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild,v 1.1 2005/05/05 23:29:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -13,12 +13,12 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 LICENSE="NVIDIA"
 SLOT="0"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
@@ -240,6 +240,13 @@ want_tls() {
 	# If we've got nptl, we've got tls
 	built_with_use sys-libs/glibc nptl && return 0
 
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
 	# These versions built linuxthreads version to support tls, too
 	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild
index df3a89fdd964..97b7039b180c 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-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-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -23,11 +23,11 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -59,17 +59,19 @@ pkg_setup() {
 }
 
 src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
+
 	cd ${WORKDIR}
 	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
 
 	# Patchs go below here, add breif description
 	cd ${S}
 	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
 	# 16 July 2004, opengl-update is now supplying glext.h for system wide
@@ -80,14 +82,15 @@ src_unpack() {
 
 src_install() {
 	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
 		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
+		for ABI in $(get_install_abis) ; do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif use amd64; then
+	elif use amd64 ; then
 		src_install-libs lib32 $(get_multilibdir)
 		src_install-libs lib $(get_libdir)
 
@@ -112,14 +115,17 @@ src_install-libs() {
 	local pkglibdir=lib
 	local inslibdir=$(get_libdir)
 
-	if [ ${#} -eq 2 ]; then
+	if [[ ${#} -eq 2 ]] ; then
 		pkglibdir=${1}
 		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "x86" ]; then
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
 		pkglibdir=lib32
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -130,14 +136,12 @@ src_install-libs() {
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
 
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
 	dodir ${NO_TLS_ROOT}
 	exeinto ${NO_TLS_ROOT}
 	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
 
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
 	dodir ${TLS_ROOT}
 	exeinto ${TLS_ROOT}
 	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
@@ -166,24 +170,22 @@ src_install-libs() {
 	    -e "s:\${libdir}:${inslibdir}:" \
 	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
 
 	insinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ] && doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
+		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
 	exeinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ] && doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
 
 	exeinto ${NV_ROOT}/extensions
-	[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ] && newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
+	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
+		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
 
 	# Includes
 	insinto ${NV_ROOT}/include
@@ -191,22 +193,40 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-	then
+	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
 		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
 	fi
 	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e ${ROOT}/etc/env.d/09nvidia ]
-	then
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
 		rm -f ${ROOT}/etc/env.d/09nvidia
 	fi
 }
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -251,5 +271,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild
index 11d2856e7e58..045961282605 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-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-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild,v 1.1 2005/05/04 21:32:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -13,12 +13,12 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 LICENSE="NVIDIA"
 SLOT="0"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
@@ -240,6 +240,13 @@ want_tls() {
 	# If we've got nptl, we've got tls
 	built_with_use sys-libs/glibc nptl && return 0
 
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
 	# These versions built linuxthreads version to support tls, too
 	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild
index 2abe2697a7a6..2078e182e75a 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-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/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -23,11 +23,11 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -59,17 +59,19 @@ pkg_setup() {
 }
 
 src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
+
 	cd ${WORKDIR}
 	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
 
 	# Patchs go below here, add breif description
 	cd ${S}
 	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
 	# 16 July 2004, opengl-update is now supplying glext.h for system wide
@@ -80,14 +82,15 @@ src_unpack() {
 
 src_install() {
 	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
 		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
+		for ABI in $(get_install_abis) ; do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif use amd64; then
+	elif use amd64 ; then
 		src_install-libs lib32 $(get_multilibdir)
 		src_install-libs lib $(get_libdir)
 
@@ -112,14 +115,17 @@ src_install-libs() {
 	local pkglibdir=lib
 	local inslibdir=$(get_libdir)
 
-	if [ ${#} -eq 2 ]; then
+	if [[ ${#} -eq 2 ]] ; then
 		pkglibdir=${1}
 		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "x86" ]; then
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
 		pkglibdir=lib32
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -130,14 +136,12 @@ src_install-libs() {
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
 
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
 	dodir ${NO_TLS_ROOT}
 	exeinto ${NO_TLS_ROOT}
 	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
 
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
 	dodir ${TLS_ROOT}
 	exeinto ${TLS_ROOT}
 	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
@@ -166,24 +170,22 @@ src_install-libs() {
 	    -e "s:\${libdir}:${inslibdir}:" \
 	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
 
 	insinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ] && doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
+		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
 	exeinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ] && doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
 
 	exeinto ${NV_ROOT}/extensions
-	[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ] && newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
+	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
+		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
 
 	# Includes
 	insinto ${NV_ROOT}/include
@@ -191,22 +193,40 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-	then
+	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
 		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
 	fi
 	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e ${ROOT}/etc/env.d/09nvidia ]
-	then
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
 		rm -f ${ROOT}/etc/env.d/09nvidia
 	fi
 }
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -251,5 +271,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild
index d79240c5c6ae..da9cf487a95f 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-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-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild,v 1.1 2005/05/04 21:32:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -13,7 +13,7 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 LICENSE="NVIDIA"
 SLOT="0"
@@ -246,6 +246,13 @@ want_tls() {
 	# If we've got nptl, we've got tls
 	built_with_use sys-libs/glibc nptl && return 0
 
+	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
+		case ${CHOST/-*} in
+			i486|i586) return 1 ;;
+		esac
+	fi
+
 	# These versions built linuxthreads version to support tls, too
 	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild
index b9a95701d096..394f8778e54b 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-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-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -23,11 +23,11 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
-	eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -67,11 +67,11 @@ src_unpack() {
 	# Patchs go below here, add breif description
 	cd ${S}
 	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${NV_PATCH_PREFIX//7167/6629}-makefile.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//7167/6629}-defines.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//7167/6629}-glheader.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
 	# 16 July 2004, opengl-update is now supplying glext.h for system wide
@@ -123,6 +123,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -133,14 +136,12 @@ src_install-libs() {
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
 
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
 	dodir ${NO_TLS_ROOT}
 	exeinto ${NO_TLS_ROOT}
 	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
 
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
 	dodir ${TLS_ROOT}
 	exeinto ${TLS_ROOT}
 	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
@@ -169,14 +170,6 @@ src_install-libs() {
 	    -e "s:\${libdir}:${inslibdir}:" \
 	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
 	exeinto ${X11_LIB_DIR}/modules/drivers
 	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
 		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
@@ -200,6 +193,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -213,7 +226,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -258,5 +271,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild
index a4665ab7ecaa..78744b053f34 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7174-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-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -25,15 +25,11 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-RDEPEND="virtual/libc
-	virtual/x11
-	eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-#	!<sys-libs/glibc-2.3.4.20040619-r2"
-# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
-# support if we are atleast CHOST=i486.
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -129,6 +125,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -139,14 +138,12 @@ src_install-libs() {
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
 
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
 	dodir ${NO_TLS_ROOT}
 	exeinto ${NO_TLS_ROOT}
 	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
 
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
 	dodir ${TLS_ROOT}
 	exeinto ${TLS_ROOT}
 	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
@@ -175,14 +172,6 @@ src_install-libs() {
 	    -e "s:\${libdir}:${inslibdir}:" \
 	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
 	exeinto ${X11_LIB_DIR}/modules/drivers
 	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
 		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
@@ -206,6 +195,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -219,7 +228,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -264,5 +273,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild
index cbddc8a9a1b2..ecb33dd6738f 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -18,20 +18,18 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 LICENSE="NVIDIA"
 SLOT="0"
 
+# Support for some older cards was removed from newer versions, so don't delete
+# this package unless a "legacy" update has been released by nVidia -- eradicator
 KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
-IUSE="dlloader"
+IUSE=""
 
-RDEPEND="virtual/libc
-	virtual/x11
-	eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-#	!<sys-libs/glibc-2.3.4.20040619-r2"
-# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
-# support if we are atleast CHOST=i486.
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -127,6 +125,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -137,14 +138,12 @@ src_install-libs() {
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
 	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
 
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
 	dodir ${NO_TLS_ROOT}
 	exeinto ${NO_TLS_ROOT}
 	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
 
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
 	dodir ${TLS_ROOT}
 	exeinto ${TLS_ROOT}
 	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
@@ -173,23 +172,11 @@ src_install-libs() {
 	    -e "s:\${libdir}:${inslibdir}:" \
 	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	# The below section was changed to fix bug #96514 and bug #91101.
-	if use dlloader; then
-		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
-			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
-	else
-		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
-			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-	fi
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
+		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
 
 	insinto ${X11_LIB_DIR}
 	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
@@ -208,6 +195,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -221,7 +228,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -266,5 +273,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
index ce92479d30b8..ced1cfc279af 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -9,11 +9,13 @@ AMD64_PKG_V="pkg2"
 NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
 
 DESCRIPTION="NVIDIA X11 driver and GLX libraries"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
+	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )
+	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
@@ -23,28 +25,33 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE="dlloader"
 
-RDEPEND="virtual/libc
-	virtual/x11
-	eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-#	!<sys-libs/glibc-2.3.4.20040619-r2"
-# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
-# support if we are atleast CHOST=i486.
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 kernel_linux? ( ~media-video/nvidia-kernel-${PV} )
+	 !app-emulation/emul-linux-x86-nvidia"
+# This should be added to have full dependencies for Gentoo FreeBSD
+# but can't be added until the profiles are in main portage (for repoman)
+# kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} )
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
 
 if use x86; then
-	PKG_V="${X86_PKG_V}"
+	PKG_V="-${X86_PKG_V}"
 	NV_PACKAGE="${X86_NV_PACKAGE}"
 elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
+	PKG_V="-${AMD64_PKG_V}"
 	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+elif use x86-fbsd; then
+	PKG_V=""
+	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
 fi
 
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
+S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+
+# On BSD userland it wants real make command
+MAKE="make"
 
 check_xfree() {
 	# This isn't necessary, true. But its about time people got the idea.
@@ -65,13 +72,21 @@ pkg_setup() {
 src_unpack() {
 	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
 
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+	if ! use x86-fbsd; then
+		cd ${WORKDIR}
+		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
+	else
+		unpack ${A}
+	fi
 
 	# Patchs go below here, add breif description
 	cd ${S}
-	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
+	if ! use x86-fbsd; then
+		# nVidia wants us to use nvidia-installer, removing warning.
+		epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
+	else
+		cd ${S}/doc
+	fi
 	# Use the correct defines to make gtkglext build work
 	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
@@ -106,15 +121,35 @@ src_install() {
 
 	is_final_abi || return 0
 
-	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-	rm -f usr/share/doc/nvidia-settings*
-	dodoc usr/share/doc/*
+	if ! use x86-fbsd; then
+		# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+		rm -f usr/share/doc/nvidia-settings*
+		dodoc usr/share/doc/*
+	else
+		dodoc doc/README doc/README.Linux doc/XF86Config.sample
+	fi
 
 	# nVidia want bug reports using this script
 	exeinto /usr/bin
 	doexe usr/bin/nvidia-bug-report.sh
 }
 
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second paramis the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
+
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
 src_install-libs() {
 	local pkglibdir=lib
 	local inslibdir=$(get_libdir)
@@ -126,88 +161,114 @@ src_install-libs() {
 		pkglibdir=lib32
 	fi
 
+	local usrpkglibdir=usr/${pkglibdir}
+	local libdir=usr/X11R6/${pkglibdir}
+	local drvdir=${libdir}/modules/drivers
+	local extdir=${libdir}/modules/extensions
+	local incdir=usr/include/GL
+	local sover=${PV}
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
+
+	if use x86-fbsd; then
+		# on FreeBSD everything is on obj/
+		pkglibdir=obj
+		usrpkglibdir=obj
+		x11pkglibdir=obj
+		drvdir=obj
+		extdir=obj
+
+		# don't ask me why the headers are there.. glxext.h is missing
+		incdir=doc
+
+		# on FreeBSD it has just .1 suffix
+		sover=1
+	fi
 
 	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV}
-	doexe usr/${pkglibdir}/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
+
 	dodir ${NO_TLS_ROOT}
-	exeinto ${NO_TLS_ROOT}
-	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
-
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
-	dodir ${TLS_ROOT}
-	exeinto ${TLS_ROOT}
-	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
+	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
+
+	if ! use x86-fbsd; then
+		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
+	fi
 
 	if want_tls ; then
 		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
 		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
 	else
 		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
 		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
 	fi
 
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1=$(get_version_component_range 1)
-	local ver2=$(get_version_component_range 2)
-	local ver3=$(get_version_component_range 3)
-	sed -e "s:\${PV}:${PV}:"     \
-	    -e "s:\${ver1}:${ver1}:" \
-	    -e "s:\${ver2}:${ver2}:" \
-	    -e "s:\${ver3}:${ver3}:" \
-	    -e "s:\${libdir}:${inslibdir}:" \
-	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
-
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
+	if ! use x86-fbsd; then
+		# Not sure whether installing the .la file is neccessary;
+		# this is adopted from the `nvidia' ebuild
+		local ver1=$(get_version_component_range 1)
+		local ver2=$(get_version_component_range 2)
+		local ver3=$(get_version_component_range 3)
+		sed -e "s:\${PV}:${PV}:"     \
+			-e "s:\${ver1}:${ver1}:" \
+			-e "s:\${ver2}:${ver2}:" \
+			-e "s:\${ver3}:${ver3}:" \
+			-e "s:\${libdir}:${inslibdir}:" \
+			${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
 	fi
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	# The below section was changed to fix bug #96514 and bug #91101.
+
 	if use dlloader; then
-		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
-			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
+		[[ -f ${drvdir}/nvidia_drv.so ]] && \
+			doexe ${drvdir}/nvidia_drv.so
 	else
-		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
-			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+		[[ -f ${drvdir}/nvidia_drv.o ]] && \
+			doexe ${drvdir}/nvidia_drv.o
 	fi
 
 	insinto ${X11_LIB_DIR}
-	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
-		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
+	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
+		doins ${libdir}/libXvMCNVIDIA.a
 	exeinto ${X11_LIB_DIR}
-	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
+	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe ${libdir}/libXvMCNVIDIA.so.${PV}
 
 	exeinto ${NV_ROOT}/extensions
-	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
-		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
+	[[ -f ${extdir}/libglx.so.${sover} ]] && \
+		newexe ${extdir}/libglx.so.${sover} libglx.so
 
 	# Includes
 	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
+	doins ${incdir}/*.h
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -221,7 +282,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -266,5 +327,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
index 5d347a3b5af6..f6facd61cde5 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-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-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.1 2005/11/11 18:41:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $
 
 inherit eutils multilib versionator
 
@@ -250,13 +250,13 @@ src_install-libs() {
 
 pkg_preinst() {
 	# Can we make up our minds ?!?!?
-	[[ -n ${IMAGE} ]] && D=${IMAGE}
+	local NV_D=${IMAGE:-${D}}
 
 	if ! has_version x11-base/xorg-server ; then
 		for dir in lib lib32 lib64 ; do
-			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
-				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
-				rmdir ${D}/usr/${dir}/xorg
+			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
+				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
+				rmdir ${NV_D}/usr/${dir}/xorg
 			fi
 		done
 	fi
@@ -265,9 +265,9 @@ pkg_preinst() {
 	# Since we moved away from libs in /usr/X11R6 need to check this
 	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
 	   has_version "x11-base/xfree86" ; then
-		mkdir -p ${D}/usr/X11R6
+		mkdir -p ${NV_D}/usr/X11R6
 		for dir in lib lib32 lib64 ; do
-			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+			[[ -d ${NV_D}/usr/${dir} ]] && mv ${NV_D}/usr/${dir} ${NV_D}/usr/X11R6
 		done
 	fi
 
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 1a322a05f617..744a9151909f 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,9 +1,751 @@
 # ChangeLog for media-video/nvidia-kernel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.1 2002/04/07 05:43:58 azarah Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.1.1.1 2005/11/30 09:58:00 chriswhite Exp $
+
+  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-kernel-1.0.6111-r3.ebuild, nvidia-kernel-1.0.6629-r4.ebuild,
+  nvidia-kernel-1.0.7167-r1.ebuild, nvidia-kernel-1.0.7174.ebuild,
+  nvidia-kernel-1.0.7667.ebuild, nvidia-kernel-1.0.7676.ebuild,
+  nvidia-kernel-1.0.7676-r1.ebuild:
+  Added RDEPEND on virtual/modutils for bug #84969.
+
+*nvidia-kernel-1.0.7676-r1 (28 Oct 2005)
+
+  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff,
+  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff,
+  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff,
+  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff,
+  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff,
+  +nvidia-kernel-1.0.7676-r1.ebuild:
+  Patches for some amd64 issues from upstream.
+
+*nvidia-kernel-1.0.7676 (15 Aug 2005)
+
+  15 Aug 2005; <augustus@gentoo.org> +nvidia-kernel-1.0.7676.ebuild:
+  NVIDIA version bump.
+
+  20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-kernel-1.0.6629-r1.ebuild, -nvidia-kernel-1.0.7664.ebuild:
+  Removing old versions.
+
+  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch,
+  nvidia-kernel-1.0.7667.ebuild:
+  Add support for latest kernels that no longer define KERNEL_VERSION in
+  version.h. Cleanup warnings users do not need to see.
+
+*nvidia-kernel-1.0.7667 (07 Jul 2005)
+
+  07 Jul 2005; <augustus@gentoo.org> nvidia-kernel-1.0.7664.ebuild,
+  +nvidia-kernel-1.0.7667.ebuild:
+  Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768.
+  The fixes to these have been added to version 1.0.7664 and 1.0.7667 of the
+  driver.
+
+*nvidia-kernel-1.0.7664 (03 Jun 2005)
+
+  03 Jun 2005; <augustus@gentoo.org> +nvidia-kernel-1.0.7664.ebuild:
+  Initial checkin of NVIDIA 7664 release.  Not complete but this should work for
+  those on the bleeding edge.
+
+  01 Jun 2005; Daniel Drake <dsd@gentoo.org> nvidia-kernel-1.0.7174.ebuild:
+  Work with portage-cvs
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update maintainer to x11-drivers.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  nvidia-kernel-1.0.6629-r4.ebuild:
+  stable on amd64
+
+  04 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.6629-r4.ebuild:
+  Stable x86.
+
+*nvidia-kernel-1.0.7174 (01 Apr 2005)
+
+  01 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-kernel-1.0.7174.ebuild:
+  Update version.
+
+*nvidia-kernel-1.0.7167-r1 (12 Mar 2005)
+
+  12 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch,
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch,
+  +nvidia-kernel-1.0.7167-r1.ebuild:
+  Add latest patches from Zander (thanks Chris Gianelloni for spotting them,
+  bug #84896).
+
+*nvidia-kernel-1.0.7167 (11 Mar 2005)
+
+  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch,
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch,
+  +files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id
+  .patch, +files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch,
+  +nvidia-kernel-1.0.7167.ebuild:
+  Update version.
+
+*nvidia-kernel-1.0.6629-r4 (05 Mar 2005)
+
+  05 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch,
+  +nvidia-kernel-1.0.6629-r4.ebuild:
+  Add support for multi-agp with newer -mm kernels.
+
+*nvidia-kernel-1.0.6629-r3 (25 Jan 2005)
+
+  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff,
+  +nvidia-kernel-1.0.6629-r3.ebuild:
+  Revbump to fix bug #77994.  Now works with 2.6.11 kernel rcs.
+
+*nvidia-kernel-1.0.6629-r2 (17 Jan 2005)
+
+  17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch,
+  nvidia-kernel-1.0.6629-r1.ebuild, +nvidia-kernel-1.0.6629-r2.ebuild:
+  Marking 6629 stable across archs
+
+  27 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch,
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch,
+  -files/1.0.6629/nv-disable-preempt-on-smp_processor_id-2.patch,
+  files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch,
+  nvidia-kernel-1.0.6629-r1.ebuild, -nvidia-kernel-1.0.6629.ebuild:
+  Some more patches from Zander
+
+  21 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.6629-r1.ebuild:
+  Removing use of nv-disable-preempt-on-smp_processor_id-2.patch, reverting to
+  old version, see bug #74950
+
+*nvidia-kernel-1.0.6629-r1 (19 Dec 2004)
+
+  19 Dec 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch,
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch,
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch,
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch,
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch,
+  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch,
+  +files/1.0.6629/nv-disable-preempt-on-smp_processor_id-2.patch,
+  +nvidia-kernel-1.0.6629-r1.ebuild:
+  Update with patches from Zander (http://www.minion.de/files/1.0-6629/)
+
+  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> +files/nvidia,
+  -files/nvidia-1.1, nvidia-kernel-1.0.6111-r3.ebuild,
+  nvidia-kernel-1.0.6629.ebuild:
+  Porting 6111 to use linux-* eclasses, fixing bug #71833 (apply 2.6 patches
+  on 2.6 only), change to install the proper README file.
+
+  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  -files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff,
+  -files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff,
+  -files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff,
+  -files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-pci_name-20030905.diff,
+  -files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff,
+  -files/1.0.5328/NVIDIA_kernel-1.0-5328-2.4-via-chipset-fix.patch,
+  -files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20031226.diff,
+  -files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff,
+  -files/1.0.5332/NVIDIA-Linux-x86_64-1.0-5332-2.6.diff,
+  -files/1.0.5336/Makefile,
+  -files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch,
+  -files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch,
+  -files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch,
+  -files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch,
+  -files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch,
+  -files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch,
+  -nvidia-kernel-1.0.4363-r3.ebuild, -nvidia-kernel-1.0.4496-r3.ebuild,
+  -nvidia-kernel-1.0.4499.ebuild, -nvidia-kernel-1.0.5328-r1.ebuild,
+  -nvidia-kernel-1.0.5332-r1.ebuild, -nvidia-kernel-1.0.5336-r4.ebuild,
+  -nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6111-r2.ebuild:
+  Removing all the masked (deprecated) versions.
+
+  28 Nov 2004; John Mylchreest <johnm@gentoo.org> :
+  Forgot to update this so doing so now. after adding support for
+  KBUILD_OUTPUT into the eclass, I updated the nvidia-kernel ebuild to also
+  honour this
+
+  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  +files/1.0.6629/nv-fix-memory-limit.patch, nvidia-kernel-1.0.6629.ebuild:
+  Fixing bug #71684 which relates to video memory limits
+
+  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.6629.ebuild:
+  Changes to use the new linux-* eclasses, doing this in ~arch for now just to
+  make sure of the eclasses functionality being totally correct :).
+
+  14 Nov 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.6629/nv-pgprot-speedup.patch,
+  +files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch,
+  nvidia-kernel-1.0.6629.ebuild:
+  Add two patches from http://www.nvnews.net/vbulletin/showthread.php?t=40106.
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/1.0.6629/nv-amd64-shutup-warnings.patch,
+  nvidia-kernel-1.0.6629.ebuild:
+  Fixed installation on amd64.
+
+  09 Nov 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch,
+  +files/1.0.6629/nv-pgd_offset.patch,
+  +files/1.0.6629/nv-shutup-warnings.patch:
+  Update to work with 2.6.10-rc1-mm3+ (basically add support for the new pml4
+  stuff from Andi Kleen ... with a bit of help from him). Fix 'using
+  smp_processor_id() in preemptible code' traces. Remove -Wpointer-arith to
+  quiet down build (should really be a flag that they enable for internal
+  debugging).  Note that the 2.6.10-rc1-mm3+ support is only valid if you fixed
+  the EXPORT_SYMBOL_GPL() issue ...
+
+  08 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.6111-r3.ebuild, nvidia-kernel-1.0.6629.ebuild:
+  Changing to unset ARCH irrespective of kernel version.
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
+  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r4.ebuild,
+  nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6111-r1.ebuild,
+  -nvidia-kernel-1.0.6111.ebuild, nvidia-kernel-1.0.6111-r2:
+  Keywords masking as driver/glx being deprecated.
+
+*nvidia-kernel-1.0.6111-r3 (07 Nov 2004)
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  +files/1.0.6111/conftest_koutput_includes.patch,
+  +files/1.0.6629/conftest_koutput_includes.patch,
+  +nvidia-kernel-1.0.6111-r3.ebuild, +nvidia-kernel-1.0.6629.ebuild:
+  New version 1.0.6629! Also marking 1.0.6111 stable in -r3 (others to be
+  keyword masked in following commit).
+
+  06 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  files/1.0.6111/power-suspend-2.6.9-changes.patch:
+  Adding fixes for STANDBY power state to 6111 power suspend patch
+
+*nvidia-kernel-1.0.6111-r2 (04 Oct 2004)
+
+  04 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  files/1.0.6111/nv-pci_find_class.patch,
+  +files/1.0.6111/nv-remap-range.patch, +files/1.0.6111/vmalloc-reserve.patch,
+  +nvidia-kernel-1.0.6111-r2.ebuild:
+  Multiple patch updates. Namely those for __VMALLOC_RESERVE, pci_get_class()
+  and remap_pfn_range()
+
+  21 Sep 2004; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.6111-r1.ebuild:
+  Ok, so we need a 2.6.9 or later kernel for nv-pci_find_class.patch. Reported
+  by Markus Layr <tuxian@yahoo.de>.
+
+*nvidia-kernel-1.0.6111-r1 (20 Sep 2004)
+
+  20 Sep 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.6111/nv-pci_find_class.patch, +nvidia-kernel-1.0.6111-r1.ebuild:
+  Latest -mm kernels removed pci_find_class; replace this with pci_get_class. It
+  should work fine on earlier kernels, but I have not tested this ...
+
+  05 Sep 2004; Travis Tilley <lv@gentoo.org> nvidia-kernel-1.0.6111.ebuild:
+  stable on amd64
+
+  30 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/1.0.6111/nv_enable_pci.patch, nvidia-kernel-1.0.6111.ebuild:
+  Updating patch to work with the new irqroutes changes in kernels 2.6.8 and on
+
+  28 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/1.0.6111/power-suspend-2.6.9-changes.patch,
+  nvidia-kernel-1.0.6111.ebuild:
+  Patching to provide support for PM_SUSPEND in 2.6.9 kernels over PM_SAVE_STATE.
+
+  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.5328-r1.ebuild, nvidia-kernel-1.0.5336-r4.ebuild:
+  Marking up to and including 5336 stable for newer cards, eg FX5700
+
+*nvidia-kernel-1.0.6111 (06 Aug 2004)
+
+  06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +nvidia-kernel-1.0.6111.ebuild:
+  NEW Version 6111; This version has koutput support working properly so not
+  bringing the patch over.
+
+  02 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6106.ebuild:
+  Fixing bug #59072 and removing 6106 from tree.
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
+  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild,
+  nvidia-kernel-1.0.5336-r3.ebuild:
+  /usr/src/linux needs ${ROOT}. Also bring back digest-nvidia-kernel-1.0.6106,
+  as the ebuild's still in the tree.
+
+*nvidia-kernel-1.0.6106-r1 (26 Jul 2004)
+
+  26 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch,
+  +nvidia-kernel-1.0.6106-r1.ebuild:
+  Thanks very much goes to Georgi for providing a solution to the udev + nvidia
+  thing on bug #58294 .. udev will now correctly create the devices for the
+  module.
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-kernel-1.0.6106.ebuild:
+  the previous amd64 nvidia drivers arent exactly what i would call stable, but
+  this release seems to be rock solid. marking stable on amd64
+
+*nvidia-kernel-1.0.6106 (02 Jul 2004)
+
+  02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml,
+  +files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch,
+  +nvidia-kernel-1.0.6106.ebuild:
+  Commiting 6106 to CVS. Thanks to Kris Kersey (augustus) for getting this
+  version off the ground, and thanks to all the testers from bug #55714. This
+  version has 4K stacks support, includes SYSFS support and has the kernel
+  module and glx combined into one package.
+
+  30 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch,
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
+  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild,
+  nvidia-kernel-1.0.5336-r3.ebuild, nvidia-kernel-1.0.5336-r4.ebuild:
+  Adding IUSE to ebuilds; Introducing
+  NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch for 5336-r4, which allows
+  koutput based kernels to work properly with nVidias' Makefile.kbuild
+
+*nvidia-kernel-1.0.5336-r4 (15 Jun 2004)
+
+  15 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch,
+  +files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch,
+  +files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch,
+  +nvidia-kernel-1.0.5336-r4.ebuild:
+  Add latest patch from minion.de (-2.6-20040521.patch) - should fix issues with
+  gcc-3.4 and kill some warnings for gcc-3.3.x, bug #50820. Update my sysfs
+  patch to actually work. The problem was that for the conftest.sh test we
+  needed to also add $(SYSSRC)/include/asm/mach-generic to KERNEL_HEADERS, else
+  the tests silently failed. This should close bug #51715. Also add a third
+  patch (-fix-makefile-for-2.6.patch) that should handle later 2.6 kernels
+  transparently, and allows us to add some nice cleanups to the ebuild.
+
+  16 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.5336-r3.ebuild:
+  Adding message to stop userpriv bugs
+
+*nvidia-kernel-1.0.5336-r3 (11 May 2004)
+
+  11 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +nvidia-kernel-1.0.5336-r3.ebuild:
+  Changing ebuild style to use the new kmod.eclass and fix the problem of the
+  __this-modpost.patch being incorporated into the new 2.6.6 kernel tree. This
+  has a trade off that all kernels <2.6.6_rc1 will have to use addwrite to
+  /usr/src/linux for the time being, nvidia should fix this for the next
+  release. Also adding warning about 4K Stacks to stem bug reports.
+
+  01 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
+  nvidia-kernel-1.0.5332-r1.ebuild:
+  Fixing all the cruft that got messed up with some recent commits. Also
+  standardised the use of is_kernel() in all of the ebuilds.
+
+*nvidia-kernel-1.0.4363-r3 (30 Apr 2004)
+
+  30 Apr 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +nvidia-kernel-1.0.4363-r3.ebuild:
+  Putting 4363 back in the tree, 4496 doesnt work for everyone so we need
+  another x86 one for now.
+
+  29 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild:
+  Fix is_kernel syntax bugs
+
+  28 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild,
+  nvidia-kernel-1.0.4496-r3.ebuild, nvidia-kernel-1.0.4499.ebuild:
+  Fix is_kernel thing.
+
+  16 Apr 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild:
+  Adding support for .ko modules to 4363 and 4496 see bug #45560
+
+*nvidia-kernel-1.0.5336-r2 (13 May 2004)
+
+  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.5336-r2.ebuild:
+  Fixing bug #45469
+
+  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.2880-r1.ebuild, nvidia-kernel-1.0.2960-r1.ebuild,
+  nvidia-kernel-1.0.3123-r2.ebuild, nvidia-kernel-1.0.4180.ebuild,
+  nvidia-kernel-1.0.4191-r2.ebuild, nvidia-kernel-1.0.4349-r2.ebuild,
+  nvidia-kernel-1.0.4496-r4.ebuild, nvidia-kernel-1.0.5328.ebuild,
+  nvidia-kernel-1.0.5332.ebuild, nvidia-kernel-1.0.5336-r1.ebuild,
+  nvidia-kernel-1.0.5336.ebuild, files/NVIDIA_kernel-1.0-3123-2.5-module.diff,
+  files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff,
+  files/NVIDIA_kernel-1.0-3123-2.5-tl.diff,
+  files/NVIDIA_kernel-1.0-3123-2.5.54.diff,
+  files/NVIDIA_kernel-1.0-3123-pa.diff,
+  files/NVIDIA_kernel-1.0-4191-2.5-tl.diff,
+  files/NVIDIA_kernel-1.0-4191-2.5.54.diff,
+  files/NVIDIA_kernel-1.0-4191-2.5.63.diff:
+  Removing many of the old nvidia-kernel ebuilds, have left two from each
+  profile which appear to still be used by some people.
+
+*nvidia-kernel-1.0.5332-r1 (07 May 2004)
+
+  07 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild:
+  Updated ebuilds to stop devices being created if using udev on top of devfsd
+
+  07 Feb 2004; Brad House <brad_mssw@gentoo.org>
+  nvidia-kernel-1.0.5332.ebuild:
+  people apparently don't know how to use ~amd64 ebuilds, setting this stable as
+  this is the #1 asked for ebuild
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.5336-r1.ebuild, files/1.0.5336/Makefile,
+  files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch:
+  Fix class_simple patch to actually not compile in sysfs support if
+  class_simple support is missing, bug #40107. Add sed to fix version of module
+  build. Fix Makefile to actually honour KERNDIR.
+
+  01 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-kernel-1.0.5336-r1.ebuild:
+  Fix for bug #40050. Doing make module for 2.4 Makefile and make nvidia.o for
+  2.6 Makefile.
+
+*nvidia-kernel-1.0.5336-r1 (01 Feb 2004)
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.5336-r1.ebuild,
+  files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch,
+  files/1.0.5336/Makefile:
+  Add basic sysfs support for 2.6 and udev.  Patch donated by myself.
+
+*nvidia-kernel-1.0.5336 (01 Feb 2004)
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.5336.ebuild:
+  Update version.
+
+*nvidia-kernel-1.0.5332 (23 Jan 2004)
+
+  23 Jan 2004; <augustus@gentoo.org> nvidia-kernel-1.0.5332.ebuild,
+  files/1.0.5332/NVIDIA-Linux-x86_64-1.0-5332-2.6.diff:
+  New NVIDIA driver 5332 released to public. See NVIDIA's page for full details:
+  http://www.nvidia.com/object/linux_display_amd64_1.0-5332.html
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org>
+  nvidia-kernel-1.0.3123-r2.ebuild, nvidia-kernel-1.0.4180.ebuild,
+  nvidia-kernel-1.0.4191-r2.ebuild, nvidia-kernel-1.0.4349-r2.ebuild,
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4496-r4.ebuild, nvidia-kernel-1.0.4499.ebuild,
+  nvidia-kernel-1.0.5328-r1.ebuild, nvidia-kernel-1.0.5328.ebuild:
+  fixing typo
+
+*nvidia-kernel-1.0.5328-r1 (05 Jan 2004)
+
+  05 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-kernel-1.0.5328-r1.ebuild,
+  files/1.0.5328/NVIDIA_kernel-1.0-5328-2.4-via-chipset-fix.patch,
+  files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff:
+  Fix for bug #36551, applying via chipset bugfix. Updating minion.de patch to
+  20040105 also.
+
+  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Adding metadata.xml.
+
+*nvidia-kernel-1.0.5328 (26 Dec 2003)
+
+  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-kernel-1.0.5328.ebuild,
+  files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20031226.diff:
+  Version bump.
+
+  08 Dec 2003; <spider@gentoo.org> nvidia-kernel-1.0.2880-r1.ebuild,
+  nvidia-kernel-1.0.2960-r1.ebuild, nvidia-kernel-1.0.3123-r2.ebuild,
+  nvidia-kernel-1.0.4180.ebuild, nvidia-kernel-1.0.4191-r2.ebuild,
+  nvidia-kernel-1.0.4349-r2.ebuild, nvidia-kernel-1.0.4363-r3.ebuild,
+  nvidia-kernel-1.0.4496-r3.ebuild, nvidia-kernel-1.0.4496-r4.ebuild,
+  nvidia-kernel-1.0.4499.ebuild:
+  exporting _POSIX2_VERSION in the ebuilds to work around weird scripts that use
+  chown foo.foo instead of foo:foo.
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r4.ebuild:
+  Add PKG_V to make sure updating the package used will not break things again.
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  nvidia-kernel-1.0.4496-r4.ebuild:
+  minor fix. Closes #32534
+
+*nvidia-kernel-1.0.4496-r4 (02 Nov 2003)
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r4.ebuild,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff:
+  Update nVidia package to latest (pkg2), bug #32430. Also update patch from
+  http://www.minion.de/.
+
+*nvidia-kernel-1.0.4499 (15 Oct 2003)
+
+  15 Oct 2003; Daniel Robbins <drobbins@gentoo.org>:
+  nvidia-kernel-1.0.4499.ebuild: New version of the ebuild for AMD64 systems.
+  Thanks to Kris Kersey, James Jones and others for working on this. See bug
+  #30799. This ebuild does need some testing; adding it so that it can be
+  tested.
+
+20 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r3.ebuild:
+  Mark stable (bug #28330).
+
+*nvidia-kernel-1.0.4496-r3 (07 Sep 2003)
+
+  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r3.ebuild,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-pci_name-20030905.diff:
+  Update patches to 20030905 (bug #28061).
+
+*nvidia-kernel-1.0.4496-r2 (07 Sep 2003)
+
+  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r2.ebuild,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-bk8.diff:
+  Add a patch to support kdev_t changes in 2.6.0-test4-bk8 and later.
+
+*nvidia-kernel-1.0.4496-r1 (21 Aug 2003)
+
+  21 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496-r1.ebuild,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.5-20030818.diff,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030818.diff:
+  Add update patches from minion.de, as well as add patch for pci changes in
+  latest 2.6.  I did a small change to last mentioned patch to try and make
+  it more generic.
+
+  04 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-Makefile.diff:
+  Fix NVIDIA_kernel-1.0-4496-Makefile.diff to not revert the tail fixes for
+  coreutils.
+
+*nvidia-kernel-1.0.4496 (29 Jul 2003)
+
+  29 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4496.ebuild,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.5-20030728.diff,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-Makefile.diff,
+  files/1.0.4496/NVIDIA_kernel-1.0-4496-tail.diff:
+  New version.
+
+*nvidia-kernel-1.0.4180 (18 Jul 2003)
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org>
+  nvidia-kernel-1.0.4180.ebuild:
+  Added amd64 version of the driver
+
+  14 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4363-r3.ebuild,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff:
+  Update 2.5 patch once again for 2.6.0 kernel.
+
+*nvidia-kernel-1.0.4363-r3 (14 Jul 2003)
+
+  14 Jul 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030713.diff,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff:
+  Update the 2.5 patch.  Fixup highpmd stuff, as it could be a problem in the
+  way the patch does it (according to AKPM);  currently it maps an offset,
+  copy the struct over, then unmap it again, and then try to use it ?!?!
+
+  12 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff:
+  Cleanup patch a bit more, and fix a type-o that caused the driver to fail
+  initializing DMA.
+
+  23 Jun 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4363-r2.ebuild:
+  Do not write a symlink that is invalid over Makefile for 2.4 kernel.
+  Bug #23304.
+
+  22 Jun 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030614.diff:
+  Update 2.5 patch from minion.de. Some cleanups for the kernel version stuff.
+  Mark stable for x86.
+
+*nvidia-kernel-1.0.4363-r2 (26 May 2003)
+
+  08 Jul 2003; ,,, <root@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff:
+  Add patch for 2.5.74-mm2, original patch thanks to Thomas Schlichter
+  <schlicht@uni-mannheim.de> and some fixups thanks to Andrew Morton
+  <akpm@osdl.org>.
+
+  26 May 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-kernel-1.0.4363-r2.ebuild,
+  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5.69-agp.diff:
+  Another patch for 2.5 kernels.
+
+*nvidia-kernel-1.0.4363-r1 (13 May 2003)
+
+  13 May 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r1.ebuild,
+  NVIDIA_kernel-1.0-4363-2.5.69.diff :
+  Get it to compile with latest devfs changes in linux-2.5.69-bk8 or later.
+
+*nvidia-kernel-1.0.4363 (26 Apr 2003)
+
+  26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363.ebuild :
+  New version; updated patches for this version; fix kernel version checking code
+  to actually check the version of the kernel in /usr/src/linux, and NOT that of
+  the running one ...
+
+  23 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349-r2.ebuild :
+  Fix the 2.5.68 patch to only apply if 'irqreturn_t' is defined in
+  linux/interrupt.h.
+
+*nvidia-kernel-1.0.4349-r2 (22 Apr 2003)
+
+  22 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349-r2.ebuild :
+  - Add a patch from myself to handle devfs/irq changes in 2.5.68+.  It works for
+    me at least ....
+  - Update the 2.5 patch to fix a memory leak.
+
+*nvidia-kernel-1.0.4349-r1 (21 Apr 2003)
+
+  21 Apr 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-kernel-1.0.4349-r1.ebuild :
+  Moved from ~x86 to stable.
+  
+  01 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349-r1.ebuild :
+  Update 2.5 patch to resolve issues with 2.5.66? and up.
+
+*nvidia-kernel-1.0.4349 (30 Mar 2003)
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349.ebuild :
+  New version, closing bug #18541.
+
+  04 Mar 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-kernel-1.0.4191-r2.ebuild :
+
+  New ebuild to help solve rmap issue in bug #15722.
+
+  17 Feb 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
+
+  Patch to handle changed include location in 2.5.61+, bug #15846.
+
+  20 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.3123-r2.ebuild :
+
+  Update modules for kernel 2.5.54 or later, closing bug #13915.
+
+  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
+
+  Add a patch for kernel 2.5.54 or later's module loader not handling common
+  sections.
+
+  12 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
+
+  Fix it for 2.5.53 or later kernel, and 2.5 in general.
+
+  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
+
+  Add tasklet patch for 2.5 kernels in again.
+
+*nvidia-kernel-1.0.4191-r2 (16 Mar 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*nvidia-kernel-1.0.4191-1 (18 Dec 2002)
+
+  16 Feb 2003; Spider <spider@gentoo.org> :
+  Fixed a typo in chiset  / chipset
+
+  18 Dec 2002; Joachim Blaabjerg <styx@gentoo.org>
+  nvidia-kernel-1.0.4191-1.ebuild :
+
+  Adding ${FILESDIR}/${NV_PACKAGE}-rmap.diff, so it works with rmap kernels as
+  well. It's all #ifdef'ed, so it shouldn't interfere with other AA kernels.
+  Bumping anyway, per vapier's instructions ;)
+
+  14 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191.ebuild :
+  As it seems this version need MTRR support for most chipsets, die if its not
+  detected with a suited message ...  This should close bug #12015.
+
+  11 Dec 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Just move $FILESDIR/nvidia-$PV to nvidia-1.1 for easier maintaining.
+  Add a ewarn in pkg_postinst() about the driver name changing.  Add
+  '-alpha' to KEYWORDS.
+
+*nvidia-kernel-1.0.4191 (11 Dec 2002)
+
+  13 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  nvidia-kernel-1.0.4191-r2.ebuild, nvidia-kernel-1.0.4191.ebuild:
+  fixed typo in pkg_setup.
+
+  11 Dec 2002; Brandon Low <lostlogic@gentoo.org>:
+  Update to latest version, the patches that we'd been applying are
+  no longer needed as they should now be in the mainstream of the 
+  package from nvidia.  Update the modules.d file for new module
+  name.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
+  Changed sparc ~sparc keywords
+ 
+*nvidia-kernel-1.0.3123-r2 (8 Dec 2002)
+
+  8 Dec 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Update kernel 2.5 patches, closing bugs #11191 and #11701.
+
+*nvidia-kernel-1.0.3123-r1 (3 Nov 2002)
+
+  3 Nov 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Add page_alloc and linux-2.5 kernel patches.  Closes bug #9704.
+
+  14 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Remove ftp in SRC_URI, as it seems to give some people problems.
+
+*nvidia-kernel-1.0.3123 (12 Sep 2002)
+
+  12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
+  Update version.
+
+*nvidia-kernel-1.0.2960-r1 (16 Aug 2002)
+
+  17 Aug 2002; Gustavo Felisberto <gustavo@felisberto.net>: Changed a small
+  line in the ebuild so that the kernel module gets installed in
+  /lib/modules/${KV}/video this way a "make modules_install" in /usr/src/linux
+  will not erase the nvidia module. (added by drobbins) This closes bug #5572.
+  
+  16 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: set SLOT to $KV, removed
+  module removal and modprobing from pkg_postinst(). The module stuff had to be
+  removed because NVdriver compiles for the kernel in /usr/src/linux, not
+  necessarily the currently-running kernel. It's also a violation of Gentoo
+  Linux policy to automatically mess with someone's modules. SLOT being set to
+  $KV allows multiple sets of NVdriver modules to be installed for differing
+  kernel versions. Doesn't work 100% yet because we don't yet support differing
+  SLOTs for the exact same version of a package, but will soon.
+  
+  16 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: Added the
+  IGNORE_CC_MISMATCH make flag; in some cases, the NVIDIA build process tries
+  to be too smart and intentionally aborts when it shouldn't. This is a
+  build-related change, so no version bump (still 1.0.2960)
+
+*nvidia-kernel-1.0.2960 (26 May 2002)
+
+*nvidia-kernel-1.0.2880-r1 (29 Apr 2002)
+
+  08 May 2002; Jon Nelson <jnelson@gentoo.org> nvidia-kernel-1.0.2880-r1.ebuild:
+  Make sure to usr KERNDIR=/usr/src/linux /usr/src/linux should be a symlink
+  pointing to the real sources, which may lie outside /usr/src.  KV is set
+  appropriately in any case by more recent versions of portage.
+
+  03 May 2002; Arcady Genkin <agenkin@thpoon.com>
+  nvidia-kernel-1.0.2800-r1.ebuild: Make sure that Portage *does* set KV to
+  something; bail out otherwise. ;^)
+	
+  29 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: Changed NV_KV to KV and
+  added a Portage dependency to ensure that KV is available.  Should fix some
+  build problems.
 
 *nvidia-kernel-1.0.2880 (7 Apr 2002)
 
   7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.2880.ebuild
-
   Fixed all the spaces.
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 84cb065d0356..ca86511c5c88 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,25 +1,63 @@
-MD5 10e07a6ec08e11dab21341ae06788e78 nvidia-kernel-1.0.4349.ebuild 4201
-MD5 04b1f361d40708ab81631bea5e46a632 nvidia-kernel-1.0.2880-r1.ebuild 1970
-MD5 5177ed76121fb4bc1aa220c62319d196 nvidia-kernel-1.0.2960-r1.ebuild 2081
-MD5 16a9003f79bea31eeec6f03ae64cd8ef nvidia-kernel-1.0.3123-r2.ebuild 3229
-MD5 4fc62b5769bfcbb15e69c27860bc27e7 nvidia-kernel-1.0.4191-r2.ebuild 3870
-MD5 7ca1e6fc896e6c56546d3afb0cd1d085 nvidia-kernel-1.0.4349-r1.ebuild 4218
-MD5 2ad995da05202beb1064222409d00027 ChangeLog 5624
-MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614
-MD5 57f69061f52fd98e20c7d62882af2757 files/NVIDIA_kernel-1.0-4191-2.5.54.diff 1228
-MD5 441b29e8f10b6620c4dd4fc01528f172 files/NVIDIA_kernel-1.0-3123-2.5-module.diff 5569
-MD5 6d8e159e5bdeb520091874050594b706 files/NVIDIA_kernel-1.0-4191-2.5.63.diff 814
-MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349 74
-MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30
-MD5 7f987ae6384103d87f323d834bba87a1 files/NVIDIA_kernel-1.0-4191-2.5-tl.diff 39065
-MD5 10b4f13c2bcadeb688057dd9c80e60e7 files/NVIDIA_kernel-1.0-4349-2.5.diff 70087
-MD5 ef31d4cc1ef62e1c3b2336d984cf6496 files/digest-nvidia-kernel-1.0.2880-r1 74
-MD5 15c10778db607715e60a461e09d9f54c files/digest-nvidia-kernel-1.0.2960-r1 1122
-MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858
-MD5 5ba2848379bbce2f85d8442c01c0291d files/digest-nvidia-kernel-1.0.3123-r2 74
-MD5 2533aa51a645ec25c96a389110230298 files/NVIDIA_kernel-1.0-3123-2.5.54.diff 858
-MD5 854b5c292ec300d7105dbd54385840f6 files/digest-nvidia-kernel-1.0.4191-r2 74
-MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r1 74
-MD5 f38a4afc671446ad293a46b0046c0aec files/NVIDIA_kernel-1.0-3123-pa.diff 10825
-MD5 b6a9c4bdd3961980af4a70f57485d708 files/nvidia-1.1 441
-MD5 c2b76deee2403fc2b92ef4af7294ac27 files/1.0.4349/NVIDIA_kernel-1.0-4349-2.5-20030401.diff 69423
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ca19cb0c7613d2c6dfb298520ce3f0c9 ChangeLog 31887
+MD5 b5b7f947ffb9e6c19f7457ff7c14d0db files/1.0.6111/conftest_koutput_includes.patch 1082
+MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
+MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
+MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
+MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
+MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
+MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518
+MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch 18398
+MD5 5a17c3fa427b4d0ff8e38f82e57cd817 files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417
+MD5 ada7d22def202e56c01c1e72c8000d45 files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch 581
+MD5 f1a5a01593ef996b38fe70bc93fa7440 files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160
+MD5 59c5fa8340585303cd18362bbeb0086f files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1877
+MD5 d4e8ffdb0cc67c56884e6055d2045e51 files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch 2608
+MD5 e210d99cae87c3f60120ea474b97fca7 files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch 8072
+MD5 da7644fcc801d40c26fb22b570a88835 files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff 9445
+MD5 bca6ad85efa6071a949bdcb24fce1733 files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch 7860
+MD5 dbf80a2cbaf69a10521429e1b2a7e10c files/1.0.6629/conftest_koutput_includes.patch 1082
+MD5 5aef5c6a394896bbb8392816f6795147 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
+MD5 c039797780f78262baa02ff488e822ff files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch 435
+MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/nv-fix-memory-limit.patch 18398
+MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
+MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
+MD5 64d76075a90dedc83f1dc971389c910e files/1.0.6629/nv-shutup-warnings.patch 712
+MD5 7c9db721d244f6ca709e2b8003ce4e0d files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
+MD5 70bb10b2da2423a6be2a4c2bce38d807 files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch 490
+MD5 e2625e9e0a6679c38783b5d8985fdaf6 files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100
+MD5 82d99e72fddbc1b0447708afd84dc8c5 files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770
+MD5 7ae487fba8a81fb91d53f35b9066512f files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082
+MD5 9df3fbed7af6fcb4ad13b1b5c3851381 files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch 419
+MD5 6c6bd7d2e4589cf3f4725082bb413a43 files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742
+MD5 e1718c0414288a04c27b70a124947613 files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch 1764
+MD5 99b630e5a1d4b732e930781f25187194 files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff 1047
+MD5 c0495ec827a938afcb807dd618e03945 files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff 3294
+MD5 5125c6d55ae72122144771ef1697db53 files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff 2989
+MD5 196649a84a2396a6588f27457a39d1fa files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff 2491
+MD5 5eaf8c4597d2f0b2670caa1303b2a4bc files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff 2359
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-kernel-1.0.6111-r3 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-kernel-1.0.6629-r4 163
+MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-kernel-1.0.7167-r1 163
+MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-kernel-1.0.7174 163
+MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-kernel-1.0.7667 163
+MD5 4ea42a34abde5c81fe828b09afab7651 files/digest-nvidia-kernel-1.0.7676 163
+MD5 4ea42a34abde5c81fe828b09afab7651 files/digest-nvidia-kernel-1.0.7676-r1 163
+MD5 d8fcf2021aa68584d4a4d9e96b671da0 files/nvidia 501
+MD5 075fe48a4f1fc90d2c3814e7bcd1d1ab metadata.xml 313
+MD5 6912838fee04de491aa184c309e274a9 nvidia-kernel-1.0.6111-r3.ebuild 4523
+MD5 29777a7a6934d750d1f2743d384267d2 nvidia-kernel-1.0.6629-r4.ebuild 4600
+MD5 b44523732e779c46cebed035eb62cbfc nvidia-kernel-1.0.7167-r1.ebuild 3982
+MD5 2e12cd6f21aaabd1424b51b10d2c0c34 nvidia-kernel-1.0.7174.ebuild 4025
+MD5 0da986517ab8d7beb13c5d1fe5a4c1c6 nvidia-kernel-1.0.7667.ebuild 4538
+MD5 6e28642fae4a75a66584dd04910cbac4 nvidia-kernel-1.0.7676-r1.ebuild 4669
+MD5 044c61105ab94548ebf0d98a8482eec6 nvidia-kernel-1.0.7676.ebuild 4549
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYdfpOpjtAl+gMRURAhALAJ49ls0Ars8+YI9c75peokeg2yGo4QCghypO
+r/uNW/el2lWy3kJdiTTX1M8=
+=g5tU
+-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch b/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch
index 97c46827d1f4..b76a1231b461 100644
--- a/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch
+++ b/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch
@@ -1,35 +1,110 @@
---- NVIDIA-Linux-x86-1.0-6111-pkg1/usr/src/nv/nv.c	2004-09-20 23:29:14.953986656 +0200
-+++ NVIDIA-Linux-x86-1.0-6111-pkg1.az/usr/src/nv/nv.c	2004-09-20 23:29:36.414724128 +0200
-@@ -639,7 +639,7 @@
+--- conftest.sh.old	2004-09-15 10:57:44.000000000 +1000
++++ conftest.sh	2004-09-15 11:48:52.561314384 +1000
+@@ -23,6 +23,30 @@
+ fi
+ 
+ case "$4" in
++    check_pci_class)
++        #
++        # Determine if the current kernel uses pci_find_class or pci_get_class
++        #
++
++        echo "#include <linux/pci.h>
++        int do_test_pci_class(void) {
++          struct pci_dev *get_dev;
++          get_dev = pci_get_class(0,NULL);
++        }" > conftest$$.c
++
++        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
++        rm -f conftest$$.c
++
++        if [ -f conftest$$.o ]; then
++          echo "get"
++          rm -f conftest$$.o
++          exit 0
++        else
++          echo "find"
++          exit 0
++        fi
++    ;;
++
+     remap_page_range)
+         #
+         # Determine the number of arguments expected by remap_page_range.
+--- nv.c.old	2004-09-15 11:40:05.079503808 +1000
++++ nv.c	2004-09-15 11:47:40.042338944 +1000
+@@ -639,7 +639,11 @@
      u8     cap_ptr;
      int    func, slot;
  
--    dev = pci_find_class(class << 8, NULL);
++#ifdef HAVE_PCI_GET_CLASS
 +    dev = pci_get_class(class << 8, NULL);
++#else
+     dev = pci_find_class(class << 8, NULL);
++#endif
      do {
          for (func = 0; func < 8; func++) {
              slot = PCI_SLOT(dev->devfn);
-@@ -650,7 +650,7 @@
+@@ -650,7 +654,11 @@
              if (cap_ptr)
                  return fn;
          }
--        dev = pci_find_class(class << 8, dev);
++#ifdef HAVE_PCI_GET_CLASS
 +        dev = pci_get_class(class << 8, dev);
++#else
+         dev = pci_find_class(class << 8, dev);
++#endif
      } while (dev);
  
      return NULL;
-@@ -3484,12 +3484,12 @@
+@@ -3484,12 +3492,20 @@
      struct pci_dev *dev = NULL;
      int count = 0;
  
--    dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
++#ifdef HAVE_PCI_GET_CLASS
 +    dev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
++#else
+     dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
++#endif
      while (dev)
      {
          if ((dev->vendor == 0x10de) && (dev->device >= 0x20))
              count++;
--        dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
++#ifdef HAVE_PCI_GET_CLASS
 +        dev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
++#else
+         dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
++#endif
      }
      return count;
  }
+--- Makefile.kbuild.old	2004-09-15 10:57:52.000000000 +1000
++++ Makefile.kbuild	2004-09-15 11:39:30.153813320 +1000
+@@ -185,6 +185,12 @@
+   endif
+ endif
+ 
++ifeq ($(shell $(CONFTEST) check_pci_class), get)
++  EXTRA_CFLAGS += -DHAVE_PCI_GET_CLASS
++else
++  EXTRA_CFLAGS += -DHAVE_PCI_FIND_CLASS
++endif
++
+ #
+ # Miscellaneous NVIDIA kernel module build support targets. They are needed
+ # to satisfy KBUILD requirements and to support NVIDIA specifics.
+--- Makefile.nvidia.old	2004-09-15 11:44:30.980080776 +1000
++++ Makefile.nvidia	2004-09-15 11:45:37.209012448 +1000
+@@ -73,6 +73,12 @@
+   DEFINES += -DNV_CHANGE_PAGE_ATTR_PRESENT
+ endif
+ 
++ifeq ($(shell $(CONFTEST) check_pci_class), get)
++  DEFINES += -DHAVE_PCI_GET_CLASS
++else
++  DEFINES += -DHAVE_PCI_FIND_CLASS
++endif
++
+ DEFINES+=$(EXTRA_DEFINES)
+ 
+ # allow build parameters to be passed in through the environment
diff --git a/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch b/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
index 8519a47ab15d..ffdfaf0aae3f 100644
--- a/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
+++ b/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
@@ -18,3 +18,15 @@
              nv_printf(NV_DBG_INFO, "NVRM: ACPI: received standby event\n");
              status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
              break;
+--- usr/src/nv/nv.c.orig	2004-10-14 13:48:52.673241000 -0400
++++ usr/src/nv/nv.c	2004-10-14 14:00:05.168006416 -0400
+@@ -3745,7 +3745,7 @@
+     u32 state
+ )
+ {
+-    return nv_acpi_event(dev, state);
++    return nv_acpi_event(dev, PM_TMP);
+ }
+ 
+ int
+
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch
index 1c6ca8c804ba..461e80003895 100644
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch
+++ b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch
@@ -1,6 +1,6 @@
 diff -ru usr/src/nv/nv-linux.h usr/src/nv.1175225/nv-linux.h
 --- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1175225/nv-linux.h	2004-12-08 22:13:42.000000000 +0100
++++ usr/src/nv.1175225/nv-linux.h	2004-12-21 21:03:33.000000000 +0100
 @@ -533,6 +533,7 @@
   */
  #if defined(CONFIG_SWIOTLB)
@@ -9,7 +9,7 @@ diff -ru usr/src/nv/nv-linux.h usr/src/nv.1175225/nv-linux.h
  extern int nv_swiotlb;
  #endif
  
-@@ -950,10 +951,40 @@
+@@ -950,10 +951,48 @@
      sg_ptr->offset = (unsigned long)base & ~PAGE_MASK;
      sg_ptr->length  = num_pages * PAGE_SIZE;
  
@@ -47,6 +47,14 @@ diff -ru usr/src/nv/nv-linux.h usr/src/nv.1175225/nv-linux.h
          return 1;
      }
 +#endif
++
++    if (sg_ptr->dma_address & ~PAGE_MASK)
++    {
++        nv_printf(NV_DBG_ERRORS,
++            "NVRM: VM: nv_sg_map_buffer: failed to obtain aligned mapping\n");
++        pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
++        return 1;
++    }
  
      NV_FIXUP_SWIOTLB_VIRT_ADDR_BUG(sg_ptr->dma_address);
  
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch
index 3ec45c97101b..ea40fa14f4e3 100644
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch
+++ b/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch
@@ -1,20 +1,18 @@
---- 1/nv/nv.c	2004-11-07 16:11:33.593487328 +0200
-+++ 2/nv/nv.c	2004-11-07 16:12:12.473576656 +0200
-@@ -3156,6 +3156,8 @@ void NV_API_CALL nv_lock_rm(
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     NO_COMPILER_WARNINGS(nvl);
+--- usr/src/nv/nv.c.orig	2004-12-27 11:38:13.298374416 +1100
++++ usr/src/nv/nv.c	2004-12-27 11:42:48.876480176 +1100
+@@ -2814,6 +2814,7 @@
+     int cpu;
  
+     nvl = NV_GET_NVL_FROM_NV_STATE(nv);
 +    preempt_disable();
-+
-     if (nvl->rm_lock_cpu == smp_processor_id())
-     {
-         nvl->rm_lock_count++;
-@@ -3167,6 +3169,8 @@ void NV_API_CALL nv_lock_rm(
+     cpu = get_cpu();
  
-    nvl->rm_lock_cpu = smp_processor_id();
-    nvl->rm_lock_count = 1;
-+
-+   preempt_enable();
+     if (nvl->rm_lock_cpu == cpu)
+@@ -2829,6 +2830,7 @@
+ 
+     nvl->rm_lock_cpu = smp_processor_id();
+     nvl->rm_lock_count = 1;
++    preempt_enable();
  }
  
  void NV_API_CALL nv_unlock_rm(
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174
index daa436fd9305..c09b689e40ca 100644
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174
@@ -1,2 +1,2 @@
 MD5 71e56aa82021c5b0c1e34944f88c6432 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-MD5 2165d56426b198f3e942739a90d99aec NVIDIA-Linux-x86_64-1.0-7174-pkg1.run 6247976
+MD5 125ec3ecc64202c6c27ef762a438d0f0 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
diff --git a/media-video/nvidia-kernel/files/nvidia b/media-video/nvidia-kernel/files/nvidia
index cfc44a60a7d9..30f610dd0b18 100644
--- a/media-video/nvidia-kernel/files/nvidia
+++ b/media-video/nvidia-kernel/files/nvidia
@@ -1 +1,16 @@
-alias char-major-195 NVdriver
+# Nvidia drivers support
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+
+# To tweak the driver the following options can be used, note that
+# you should be careful, as it could cause instability!! For more 
+# option see /usr/share/doc/${PACKAGE}/README.gz 
+#
+#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
+#
+#   To enable Fast Writes: NVreg_EnableAGPFW=1
+#
+# To enable both for instance, uncomment following line:
+#
+#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
+
diff --git a/media-video/nvidia-kernel/metadata.xml b/media-video/nvidia-kernel/metadata.xml
index d458318e80ba..765155b16c4a 100644
--- a/media-video/nvidia-kernel/metadata.xml
+++ b/media-video/nvidia-kernel/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>xfree</herd>
+<herd>X11-drivers</herd>
+<maintainer>
+  <email>X11-drivers@gentoo.org</email>
+</maintainer>
+<longdescription>Linux kernel module for then NVIDIA X11 driver</longdescription>
 </pkgmetadata>
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild
index 762ff0f1ed18..ded47c5e2320 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild,v 1.1 2004/11/07 01:52:46 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
-inherit eutils kernel-mod
+inherit eutils linux-mod
 
 X86_PKG_V="pkg1"
 AMD64_PKG_V="pkg2"
@@ -12,8 +12,8 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 
 DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 if use x86; then
 	PKG_V="${X86_PKG_V}"
@@ -25,26 +25,31 @@ fi
 
 S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 
-# The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
-SLOT="${KV}"
+SLOT="0"
 KEYWORDS="-* x86 amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
-KMOD_SOURCES="none"
+MODULE_NAMES="nvidia(video:${S})"
+BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
 
-# Check for mtrr and react appropriately
 mtrr_check() {
-	if [ ! -f /proc/mtrr ]
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [ "$?" != 0 ]
 	then
 		eerror "This version needs MTRR support for most chipsets!"
 		eerror "Please enable MTRR support in your kernel config, found at:"
 		eerror
-		eerror "  Processor type and features -> [*] MTRR (Memory Type Range Register) support"
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
 		eerror
 		eerror "and recompile your kernel ..."
 		die "MTRR support not detected!"
@@ -52,31 +57,21 @@ mtrr_check() {
 }
 
 pkg_setup() {
-	mtrr_check
+	linux-mod_pkg_setup
+	mtrr_check;
 }
 
 src_unpack() {
-	# setup the environment
-	kernel-mod_getversion
-	if [ ${KV_MINOR} -ge 5 ]
-	then
-		KV_OBJ="ko"
-	else
-		KV_OBJ="o"
-	fi
-
 	# 2.6.10_rc1-mm{1,2,3} all EXPORT_SYMBOL_GPL the udev functions, this breaks loading
-	CS="$(grep -c EXPORT_SYMBOL\(class_simple_create\)\; ${KERNEL_DIR}/drivers/base/class_simple.c)"
+	CS="$(grep -c EXPORT_SYMBOL\(class_simple_create\)\; ${KV_DIR}/drivers/base/class_simple.c)"
 	if [ "${CS}" == "0" ]
 	then
-		ewarn "Your current kernel uses EXPORT_SYMBOL_GPL() on some methods required by nvidia-kernel"
-		ewarn "This probably means 2.6.10_rc1-mm*, please change away from mm-sources until this is"
-		ewarn "revised and a solution released in the mm branch, development-sources will work."
+		ewarn "Your current kernel uses EXPORT_SYMBOL_GPL() on some methods required by nvidia-kernel."
+		ewarn "This probably means you are using 2.6.10_rc1-mm*. Please change away from mm-sources until this is"
+		ewarn "revised and a solution released into the mm branch, development-sources will work."
 		die "Incompatible kernel export."
 	fi
 
-	# Right, we are officially not supporting < 2.6.7 in the 2.6 kernel tree
-	# In fact as this warning states its highly likely you CANNOT use those kernels
 	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -lt 7 ]
 	then
 		echo
@@ -92,79 +87,45 @@ src_unpack() {
 	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
 
 	# Add patches below, with a breif description.
-	# 1) SYSFS supported by nvidia
-	# 2) minion.de patches not released yet
-
 	cd ${S}
+	# Any general patches should go here
+	# none at the moment
 
-	# Fix up the removal of PM_SAVE_STATE in kernels > 2.6.8
-	epatch ${FILESDIR}/${PV}/power-suspend-2.6.9-changes.patch
-	# Update pci stuff to work with irqroutes being changed in kernels
-	epatch ${FILESDIR}/${PV}/nv_enable_pci.patch
-	# Fix VMALLOC_RESERVE issues with the new 2.6.9 release candidates
-	epatch ${FILESDIR}/${PV}/vmalloc-reserve.patch
-	# Port pci_find_class() -> pci_get_class() for >= 2.6.9-rc2
-	epatch ${FILESDIR}/${PV}/nv-pci_find_class.patch
-	# Fix remap_page_range() -> remap_pfn_range() for >= 2.6.9-rc2
-	epatch ${FILESDIR}/${PV}/nv-remap-range.patch
-	# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-	epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-}
-
-src_compile() {
-	# Right as kmod was deprecated there is little room for kbuild but lets 
-	# at least have some sembalance of support for those who are forcing
-	# a non-standard build directory.
-	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -ge 7 ]
-	then
-		# Is this really needed?
-		unset ARCH
-
-		if [ -n "${KBUILD_OUTPUT_PREFIX}" ]
-		then
-			einfo "Determining kernel output location"
-			OUTPUT="${KBUILD_OUTPUT_PREFIX}/${KV_VERSION_FULL}"
-		fi
-	fi
-	[ -z "${OUTPUT}" ] && OUTPUT=${KERNEL_DIR}
-	einfo "Using ${OUTPUT} as kernel output location"
-	echo
-	# Now its possible that we might be here without using a KBUILD kernel
-	# (ie the variable is set, but using non-kbuild kernel or different path)
-	if [ ! -d ${OUTPUT} ]
+	# Now any patches specific to the 2.6 kernel should go here
+	if kernel_is 2 6
 	then
-		ewarn "Your system global KBUILD_OUTPUT is set to ${KBUILD_OUTPUT_PREFIX}"
-		ewarn "However your kernels output path ${OUTPUT} does not exist."
-		echo
-		ewarn "Using ${KERNEL_DIR} as your kernel output location."
-		echo
-		OUTPUT=${KERNEL_DIR}
+		einfo "Applying 2.6 kernel patches"
+		# Fix up the removal of PM_SAVE_STATE in kernels > 2.6.8
+		epatch ${FILESDIR}/${PV}/power-suspend-2.6.9-changes.patch
+		# Update pci stuff to work with irqroutes being changed in kernels
+		epatch ${FILESDIR}/${PV}/nv_enable_pci.patch
+		# Fix VMALLOC_RESERVE issues with the new 2.6.9 release candidates
+		epatch ${FILESDIR}/${PV}/vmalloc-reserve.patch
+		# Port pci_find_class() -> pci_get_class() for >= 2.6.9-rc2
+		epatch ${FILESDIR}/${PV}/nv-pci_find_class.patch
+		# Fix remap_page_range() -> remap_pfn_range() for >= 2.6.9-rc2
+		epatch ${FILESDIR}/${PV}/nv-remap-range.patch
+		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
+		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
 	fi
 
-	# IGNORE_CC_MISMATCH disables a sanity check that's needed when gcc has been
-	# updated but the running kernel is still compiled with an older gcc.  This is
-	# needed for chrooted building, where the sanity check detects the gcc of the
-	# kernel outside the chroot rather than within.
-	make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" SYSOUT="${OUTPUT}"  \
-		clean module V=1 || die "Failed to build module"
+	# if you set this then it's your own fault when stuff breaks :)
+	[ -n "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
+
+	# if greater than 2.6.5 use M= instead of SUBDIR=
+	convert_to_m ${S}/Makefile.kbuild
 }
 
 src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/video
-
-	# Insert the module 
-	doins nvidia.${KV_OBJ}
+	linux-mod_src_install
 
 	# Add the aliases
+	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
 	insinto /etc/modules.d
-	newins ${FILESDIR}/nvidia-1.1 nvidia
+	newins ${WORKDIR}/nvidia nvidia
 
 	# Docs
-	dodoc ${S}/README
+	dodoc ${S}/../../share/doc/README
 
 	# The device creation script
 	into /
@@ -172,23 +133,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
+	if [ "${ROOT}" = "/" ] && \
+		[ ! -e /dev/.devfsd ] && \
+		[ ! -e /dev/.udev ] && \
+		[ -x /sbin/NVmakedevices.sh ]
 	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
+		/sbin/NVmakedevices.sh >/dev/null 2>&1
 	fi
 
-	echo
-	einfo "If you need to load the module automatically on boot up you need"
-	einfo "to add \"nvidia\" to /etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-	echo
-	einfo "Please note that the driver name is \"nvidia\", not \"NVdriver\""
-	echo
-	einfo "This module will now work correctly under udev, you do not need to"
-	einfo "manually create the devices anymore."
-	echo
+	linux-mod_pkg_postinst
 }
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r4.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r4.ebuild
index 0df21bcf1ba1..7171d0488136 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r4.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-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-video/nvidia-kernel/nvidia-kernel-1.0.6629-r4.ebuild,v 1.1 2005/03/05 10:43:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -12,8 +12,8 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 
 DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 if use x86; then
 	PKG_V="${X86_PKG_V}"
@@ -27,10 +27,11 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
index af3ccda3373a..d31f287a57a7 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild,v 1.1 2005/03/11 23:41:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:00 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -12,8 +12,8 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 
 DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 if use x86; then
 	PKG_V="${X86_PKG_V}"
@@ -31,6 +31,7 @@ KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174.ebuild
index 7e07e4000222..2d40de96fbb0 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174.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/media-video/nvidia-kernel/nvidia-kernel-1.0.7174.ebuild,v 1.1 2005/04/01 12:14:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7174.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
 inherit eutils linux-mod
 
 X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg1"
+AMD64_PKG_V="pkg2"
 NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 
 DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
 HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
-	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
+	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 if use x86; then
 	PKG_V="${X86_PKG_V}"
@@ -31,12 +31,10 @@ KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
 mtrr_check() {
 	ebegin "Checking for MTRR support"
 	linux_chkconfig_present MTRR
@@ -56,7 +54,9 @@ mtrr_check() {
 
 pkg_setup() {
 	linux-mod_pkg_setup
-	mtrr_check;
+	MODULE_NAMES="nvidia(video:${S})"
+	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
+	mtrr_check
 }
 
 src_unpack() {
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
index 6178c4906e56..6ff4d1350c5e 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.1 2005/07/07 14:33:32 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.1.1.1 2005/11/30 09:57:59 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -31,6 +31,7 @@ KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
@@ -94,9 +95,16 @@ src_unpack() {
 		# epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch
 		# Fix calling of smp_processor_id() when preempt is enabled
 		epatch ${NV_PATCH_PREFIX//7667/7167}-disable-preempt-on-smp_processor_id.patch
+		epatch ${NV_PATCH_PREFIX}-KERNEL_VERSION-moved.patch
 	fi
 
-	# if you set this then it's your own fault when stuff breaks :)
+	# Quiet down warnings the user do not need to see
+	sed -i \
+		-e 's:-Wpointer-arith::g' \
+		-e 's:-Wsign-compare::g' \
+		${S}/Makefile.kbuild
+
+	# If you set this then it's your own fault when stuff breaks :)
 	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
 
 	# If greater than 2.6.5 use M= instead of SUBDIR=
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
index c7b500f6d1b3..7de621d40077 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild,v 1.1 2005/10/28 07:13:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild,v 1.1.1.1 2005/11/30 09:58:00 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -31,6 +31,7 @@ KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676.ebuild
index 398d7baa765a..e8db3655ff54 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676.ebuild,v 1.1 2005/08/15 03:50:09 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676.ebuild,v 1.1.1.1 2005/11/30 09:58:01 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -31,6 +31,7 @@ KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="nostrip"
 IUSE=""
 
+RDEPEND="virtual/modutils"
 DEPEND="virtual/linux-sources"
 export _POSIX2_VERSION="199209"
 
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 78fc14b6a590..9242614cdddc 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for media-video/nvidia-settings
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.1 2004/07/02 06:03:58 cyfred Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+*nvidia-settings-1.0.20050729 (24 Aug 2005)
+
+  24 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-settings-1.0.20050729.ebuild:
+  Update version.
+
+*nvidia-settings-1.0.20050525 (21 Jun 2005)
+
+  21 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-settings-1.0.20050525.ebuild:
+  Update version. Change version scheme to make updates easier. Include NVCtrl
+  lib and headers, bug #80427.
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  nvidia-settings-1.0.6111.ebuild, nvidia-settings-1.0.6629.ebuild,
+  nvidia-settings-1.0.7167.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update maintainer to x11-drivers.
+
+*nvidia-settings-1.0.7167 (12 Mar 2005)
+
+  12 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-settings-1.0.7167.ebuild:
+  Update to latest version, thanks Zander. Fixup libXNVCtrl.a build, so that
+  it is done native (no need for tarball on 64bit machines, etc).
+
+  17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-settings-1.0.6629.ebuild:
+  Marking 6629 stable across archs
+
+*nvidia-settings-1.0.6629 (07 Nov 2004)
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-settings-1.0.6106.ebuild, nvidia-settings-1.0.6111.ebuild,
+  +nvidia-settings-1.0.6629.ebuild:
+  Changes to reflect new nvidia drivers
+
+  17 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; :
+  Fixing digests
+
+*nvidia-settings-1.0.6106 (16 Aug 2004)
+
+  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +nvidia-settings-1.0.6106.ebuild, -nvidia-settings-1.0.ebuild:
+  Moving versions to match nvidia module versions
+
+*nvidia-settings-1.0.6111 (06 Aug 2004)
+
+  06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +nvidia-settings-1.0.6111.ebuild:
+  Manually mirroring nvidia-settings for the new 6111 driver as nvidia didnt do
+  a version change.
+
+  26 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; nvidia-settings-1.0.ebuild:
+  Depending on the 6106 drivers and closing bug 57449
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  nvidia-settings-1.0.ebuild:
+  virtual/glibc -> virtual/libc
 
 *nvidia-settings-1.0 (02 Jul 2004)
 
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 2f2d97e7437d..c8fec56b7357 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,4 +1,23 @@
-MD5 b763461b92f98d679f860abf06f7c2c9 nvidia-settings-1.0.ebuild 901
-MD5 9039fc83c6b6691d1e2bf14f10329cce metadata.xml 288
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6a85441f269b195cfa3f1a8a6422120c nvidia-settings-1.0.20050525.ebuild 1539
+MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128
+MD5 bddb42d228072e703415f15a25ffca0a ChangeLog 2686
+MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128
+MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322
+MD5 7bbeebd18631e196cdf02e30c2008310 nvidia-settings-1.0.20050729.ebuild 1607
+MD5 b48738468061c96675a782947951d3d8 metadata.xml 300
+MD5 0a39b5babdda1f3d78fee4db5b053b0a files/digest-nvidia-settings-1.0.6629 76
+MD5 ce276d6edd87a8f9f2bfc81f2d4fcfed files/digest-nvidia-settings-1.0.7167 76
+MD5 47ecc5e991834fd43188034d76fbbc96 files/digest-nvidia-settings-1.0.20050729 81
 MD5 92faa535f9924a7ef5a2578d13d43fb3 files/libXNVCtrl.a.bz2 2797
-MD5 d33e0cdae06c398ded66a3a7de7855b0 files/digest-nvidia-settings-1.0 71
+MD5 ba114bf17302ecdb08e065953295cc03 files/digest-nvidia-settings-1.0.20050525 81
+MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDDG4O1ZcsMnZjRyIRAmmGAJjyHPIqfRdBvamUhoes3s2lFgi3AKCBPrxc
+GigX8EQx7no8E8x1v3ejBw==
+=bWkk
+-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml
index 7671f0d7b3be..730f4a965ef1 100644
--- a/media-video/nvidia-settings/metadata.xml
+++ b/media-video/nvidia-settings/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>xfree</herd>
+<herd>X11-drivers</herd>
 <maintainer>
-  <email>xfree@gentoo.org</email>
+  <email>X11-drivers@gentoo.org</email>
 </maintainer>
 <longdescription>NVIDIA Linux X11 Settings Utility</longdescription>
 </pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild
index 12e093ea9f71..970b62e2220c 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild,v 1.1 2005/06/21 08:15:45 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20050525.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20050729.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20050729.ebuild
index 6c2b0e251243..bffa514f6e0e 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.20050729.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.20050729.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20050729.ebuild,v 1.1 2005/08/24 12:52:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20050729.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild
index e0cae79bffac..37566f20f823 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild,v 1.1 2004/08/06 01:38:46 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.6111.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
 inherit eutils
 
@@ -12,13 +12,13 @@ S="${WORKDIR}/${PN}-1.0"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 RESTRICT=""
 IUSE=""
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/gtk+-2*
+	>=x11-libs/gtk+-2
 	amd64? ( app-arch/bzip2 )"
 RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
 	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild
index b97b5a4543cf..e6752187ecdf 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild,v 1.1 2004/11/07 07:25:08 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.6629.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils
 
@@ -12,13 +12,13 @@ S="${WORKDIR}/${PN}-1.0"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 amd64"
 RESTRICT=""
 IUSE=""
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/gtk+-2*
+	>=x11-libs/gtk+-2
 	amd64? ( app-arch/bzip2 )"
 RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
 	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.7167.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.7167.ebuild
index f823f556bb17..914344948761 100644
--- a/media-video/nvidia-settings/nvidia-settings-1.0.7167.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-1.0.7167.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.7167.ebuild,v 1.1 2005/03/12 19:31:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.7167.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -17,7 +17,7 @@ IUSE=
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-libs/gtk+-2*"
+	>=x11-libs/gtk+-2"
 RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION}
 	>=media-video/nvidia-kernel-${NVIDIA_VERSION}"
 
diff --git a/media-video/nvoption/ChangeLog b/media-video/nvoption/ChangeLog
index 846211dfb608..fc66a135bbb4 100644
--- a/media-video/nvoption/ChangeLog
+++ b/media-video/nvoption/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-video/nvoption
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvoption/ChangeLog,v 1.1 2002/10/30 08:07:07 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvoption/ChangeLog,v 1.1.1.1 2005/11/30 09:57:34 chriswhite Exp $
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> nvoption-0_alpha-r1.ebuild:
+  Add die following econf for bug 48950
+
+*nvoption-0_alpha-r1 (10 Nov 2002)
+
+  10 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added png to fix 'Cannot load image' for nvidiaok.pix per #5467.
 
 *nvoption-0_alpha (30 Oct 2002)
 
diff --git a/media-video/nvoption/Manifest b/media-video/nvoption/Manifest
index e69de29bb2d1..b31c904f4803 100644
--- a/media-video/nvoption/Manifest
+++ b/media-video/nvoption/Manifest
@@ -0,0 +1,5 @@
+MD5 f83641da2e9d4a15d93561c8fb9fab16 ChangeLog 827
+MD5 d5f37e2cde5f2a095cc69f18b1ab617f metadata.xml 250
+MD5 744a4ed525b1064e7b720fd5f99cdb2e nvoption-0_alpha-r1.ebuild 1070
+MD5 77c43ceb65a64499a874b9f7f262b38d files/digest-nvoption-0_alpha-r1 66
+MD5 133c82bfe0a6e1d7400fc5c2616b3256 files/nvidiaok.png 5513
diff --git a/media-video/nvoption/metadata.xml b/media-video/nvoption/metadata.xml
index d8a9f4d39e4f..c33f399a2f39 100644
--- a/media-video/nvoption/metadata.xml
+++ b/media-video/nvoption/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-video</herd>
-<herd>xfree</herd>
+<herd>video</herd>
+<herd>X11-drivers</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/nvoption/nvoption-0_alpha-r1.ebuild b/media-video/nvoption/nvoption-0_alpha-r1.ebuild
index 4077b150ea13..e852232cbee2 100644
--- a/media-video/nvoption/nvoption-0_alpha-r1.ebuild
+++ b/media-video/nvoption/nvoption-0_alpha-r1.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-video/nvoption/nvoption-0_alpha-r1.ebuild,v 1.1 2002/11/10 22:03:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvoption/nvoption-0_alpha-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:34 chriswhite Exp $
 
 MY_P="${P/-0/}"
 DESCRIPTION="grapich front-end to change NVIDIA options in X mode"
@@ -9,11 +9,11 @@ SRC_URI="http://www.sorgonet.com/linux/nvoption/${MY_P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="nls"
 
 DEPEND="gnome-base/gnome-libs
-	gnome-base/ORBit
+	=gnome-base/orbit-0*
 	=x11-libs/gtk+-1.2*"
 RDEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}/${PN}"
@@ -24,7 +24,7 @@ src_compile() {
 		&& myconf="${myconf} --disable-nls" \
 		|| myconf="${myconf} --enable-nls"
 	rm -rf config.cache
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 
 	cp Makefile Makefile.old
 	sed -e 's:intl po macros src:src:' Makefile.old > Makefile
diff --git a/media-video/ogle-gui/ChangeLog b/media-video/ogle-gui/ChangeLog
index d2bbd9ffcec9..42d47142502d 100644
--- a/media-video/ogle-gui/ChangeLog
+++ b/media-video/ogle-gui/ChangeLog
@@ -1,13 +1,98 @@
 # ChangeLog for media-video/ogle-gui
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle-gui/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-video/ogle-gui/ChangeLog,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
-*ogle-gui-0.8.2 (1 Feb 2002)
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> ogle-gui-0.9.1.ebuild,
+  ogle-gui-0.9.2.ebuild:
+  Don't use ${HOMEPAGE} in SRC_URI.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  11 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> ogle-gui-0.9.2.ebuild:
+  Stable on sparc
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> ogle-gui-0.9.2.ebuild:
+  Mark 0.9.2 stable on alpha
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ogle-gui-0.9.1.ebuild,
+  ogle-gui-0.9.2.ebuild:
+  Don't install ABOUT-nLS file.
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ogle-gui-0.9.1.ebuild,
+  ogle-gui-0.9.2.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> ogle-gui-0.9.2.ebuild:
+  stable on ia64
+
+  20 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> ogle-gui-0.9.1.ebuild:
+  Fix invalid ${DEPEND}.
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ogle-gui-0.9.2.ebuild:
+  Stable on ppc.
+
+  03 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> ogle-gui-0.9.2.ebuild:
+  stable on amd64
+
+  27 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> ogle-gui-0.9.2.ebuild:
+  0.9.2 now stable on x86. fixes #61041.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> ogle-gui-0.9.2.ebuild:
+  Added ~sparc keyword.
+
+  12 May 2004; Patrick Kursawe <phosphan@gentoo.org> ogle-gui-0.9.2.ebuild:
+  -gtk2 didn't work correctly
+
+*ogle-gui-0.9.2 (13 Dec 2003)
+
+  13 Dec 2003; Seemant Kulleen <seemant@gentoo.org> ogle-gui-0.8.4.ebuild,
+  ogle-gui-0.8.5.ebuild, ogle-gui-0.9.0.ebuild, ogle-gui-0.9.1.ebuild,
+  ogle-gui-0.9.2.ebuild:
+  version bump, to one which supports a gtk2 interface
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> ogle-gui-0.9.1.ebuild:
+  mark stable on amd64
+
+*ogle-gui-0.9.1 (24 Mar 2003)
+
+  24 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump (thanks to Matt Taylor <liverbugg@juno.com>).
+
+*ogle-gui-0.9.0 (04 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump (thanks to Bernardo S. A. Silva <bsaslinux@globo.com>).
+
+*ogle-gui-0.8.5 (21 Sep 2002)
+
+  21 Sep 2002; Arcady Genkin <agenkin@gentoo.org> ogle-gui-0.8.5.ebuild :
+
+  Version bump.
+
+*ogle-gui-0.8.4 (1 Jul 2002)
+
+  1 Jul 2002; Seemant Kulleen <seemant@gentoo.org> ogle-gui-0.8.4.ebuild
+  files/digest-ogle-gui-0.8.4 :
+
+  Version bump.
+
+*ogle-gui-0.8.3-r1 (21 Jun 2002)
+
+  21 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ogle-gui-0.8.3-r1.ebuild
   
-  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.
+  Previous versions were failing to build because of gtk+2 and libglade-2 being
+  unmasked. This is now fixed. 
+
+*ogle-gui-0.8.3 (14 Jun 2002)
+
+  14 Jun 2002; Seemant Kulleen <seemant@gentoo.org> ogle-gui-0.8.3.ebuild
+  files/digest-ogle-gui-0.8.3 :
+
+  Version bump thanks to bsaslinux@globo.com (Bernardo S. A. Silva) in bug #
+  3676
+
+*ogle-gui-0.8.2-r3 (26 Mar 2002)
+
+  26 Mar 2002; Bruce A. Locke <blocke@shivan.org> ogle-gui-0.8.2-r3.ebuild:
+
+  Minor ebuild cleanups
+
+
diff --git a/media-video/ogle-gui/Manifest b/media-video/ogle-gui/Manifest
index e69de29bb2d1..d9110ae91cc6 100644
--- a/media-video/ogle-gui/Manifest
+++ b/media-video/ogle-gui/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e2dbe4c6d4f4a2f4195895e9ea530f08 ChangeLog 3052
+MD5 9818a741e3f477c9b2fe6aa2320196a4 files/digest-ogle-gui-0.9.1 66
+MD5 80217a38b8b29d30b601752e68b22ec5 files/digest-ogle-gui-0.9.2 66
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 c6fbfdca59326b93505e32c5e97d5adb ogle-gui-0.9.1.ebuild 948
+MD5 efccf68fbeb5f52549a27c3b03997c71 ogle-gui-0.9.2.ebuild 1142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbygtj5H05b2HAEkRAjgWAJ44fl55LNUkth+xGsnsqz3hXyC3hgCfYbdu
+M9OAwpEmBagE/CL3Jo9Cwko=
+=idA/
+-----END PGP SIGNATURE-----
diff --git a/media-video/ogle-gui/ogle-gui-0.9.1.ebuild b/media-video/ogle-gui/ogle-gui-0.9.1.ebuild
index 6231bb68ca2f..4789584fca48 100644
--- a/media-video/ogle-gui/ogle-gui-0.9.1.ebuild
+++ b/media-video/ogle-gui/ogle-gui-0.9.1.ebuild
@@ -1,28 +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-video/ogle-gui/ogle-gui-0.9.1.ebuild,v 1.1 2003/03/24 15:54:10 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle-gui/ogle-gui-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 IUSE="nls"
 
+MY_P=${P/-/_}
+
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="GUI interface for the Ogle DVD player."
-HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
+HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd"
+SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${MY_P}.tar.gz"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa amd64 ~ia64"
 
 DEPEND=">=media-video/ogle-${PV}
 	=x11-libs/gtk+-1.2*
 	dev-libs/libxml2
 	sys-devel/bison
-	( >=gnome-base/libglade-0.17-r6
-	<gnome-base/libglade-2.0.0 )"
+	=gnome-base/libglade-0*"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P/-/_}.tar.gz"
-S=${WORKDIR}/${P/-/_}
-
 src_compile() {
 
 	local myconf
@@ -30,17 +30,16 @@ src_compile() {
 	use nls || myconf="--disable-nls"
 
 	libtoolize --copy --force
-	
+
 	# libxml2 hack
 	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
 
 	econf ${myconf} || die
-	emake || die	
+	emake || die
 
 }
 
 src_install() {
-	
 	einstall || die
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL NEWS README
+	dodoc AUTHORS NEWS README
 }
diff --git a/media-video/ogle-gui/ogle-gui-0.9.2.ebuild b/media-video/ogle-gui/ogle-gui-0.9.2.ebuild
index 3e75e2c68134..a46fb08d2027 100644
--- a/media-video/ogle-gui/ogle-gui-0.9.2.ebuild
+++ b/media-video/ogle-gui/ogle-gui-0.9.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-video/ogle-gui/ogle-gui-0.9.2.ebuild,v 1.1 2003/12/13 21:28:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle-gui/ogle-gui-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 inherit libtool
 
@@ -10,21 +10,26 @@ MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="GUI interface for the Ogle DVD player."
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
-SRC_URI="${HOMEPAGE}/dist/${MY_P}.tar.gz"
+SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 LICENSE="GPL-2"
 
-DEPEND=">=media-video/ogle-${PV}
+RDEPEND="
+	>=media-video/ogle-${PV}
 	!gtk2? ( =x11-libs/gtk+-1.2*
 		=gnome-base/libglade-0* )
 	gtk2? ( =x11-libs/gtk+-2*
 		=gnome-base/libglade-2* )
 	dev-libs/libxml2
-	sys-devel/bison"
+	nls? ( sys-devel/gettext )"
+
+DEPEND="
+	dev-util/pkgconfig
+	sys-devel/bison
+	${RDEPEND}"
 
-RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 
@@ -33,15 +38,18 @@ src_compile() {
 	# libxml2 hack
 	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml"
 
+	local myconf
+	# braindead configure does not treat --disable-gtk2 correctly
+	use gtk2 && myconf="--enable-gtk2"
+
 	econf \
-		`use_enable nls` \
-		`use_enable gtk2` || die
+		$(use_enable nls) \
+		${myconf} || die
 	emake || die
 
 }
 
 src_install() {
-
 	einstall || die
-	dodoc ABOUT-NLS AUTHORS COPYING INSTALL NEWS README
+	dodoc ABOUT-NLS NEWS README
 }
diff --git a/media-video/ogle/ChangeLog b/media-video/ogle/ChangeLog
index 104bcd00725f..19b3e5421e02 100644
--- a/media-video/ogle/ChangeLog
+++ b/media-video/ogle/ChangeLog
@@ -1,13 +1,140 @@
 # ChangeLog for media-video/ogle
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/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-video/ogle/ChangeLog,v 1.1.1.1 2005/11/30 09:57:24 chriswhite Exp $
 
-*ogle-0.8.2-r2 (1 Feb 2002)
+  11 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> ogle-0.9.2.ebuild:
+  Stable on sparc
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Don't install COPYING and INSTALL files.
+
+*ogle-0.9.2-r1 (09 May 2005)
+
+  09 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ogle-gcc4-fix.patch, +ogle-0.9.2-r1.ebuild:
+  Cleaned up ebuild, added altivec useflag instead of checking for 
+  -maltivec in CFLAGS. Added patch to compile on GCC4, fixes #91855.
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ogle-0.9.2.ebuild:
+  Stable on ppc.
+
+  05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ogle-0.9.2.ebuild:
+  renamed ifo_dump binary to ifo_dump_ogle to avoid collision with the
+  libdvdread one. see #80837
+
+  27 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> ogle-0.9.2.ebuild:
+  0.9.2 now stable on x86.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> ogle-0.9.1.ebuild:
+  now version 0.9.1 also applies the ogle-gcc34-fix.patch. fixes #79193.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> ogle-0.9.2.ebuild:
+  Added ~sparc keyword.
+
+  07 Jun 2004; Travis Tilley <lv@gentoo.org> +files/ogle-gcc34-fix.patch,
+  ogle-0.9.2.ebuild:
+  added fix for gcc 3.4
+
+  01 Jun 2004; Brian Harring <ferringb@gentoo.org> ogle-0.9.1.ebuild,
+  ogle-0.9.2.ebuild files/ogle-configure-alsa-fix.patch:
+  Adding alsalib-1.0 configure fix (bug #48836), courtesy of rodgling.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> ogle-0.9.1.ebuild,
+  ogle-0.9.2.ebuild:
+  Changing mad dep to madplay.
+
+  29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; ogle-0.9.1.ebuild,
+  ogle-0.9.2.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  23 Mar 2004; root <root@gentoo.org> ogle-0.9.1.ebuild:
+  removed ~mips from KEYWORDS
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> ogle-0.9.2.ebuild:
+  stable on alpha and ia64
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> ogle-0.9.2.ebuild:
+  mark stable on amd64
+
+*ogle-0.9.2 (08 Nov 2003)
+
+  08 Nov 2003; Seemant Kulleen <seemant@gentoo.org> ogle-0.8.4.ebuild,
+  ogle-0.9.0.ebuild, ogle-0.9.2.ebuild:
+  version bump, thanks to: Jim Faulkner <dogshu@sdf.lonestar.org> for notifying
+  us in bug #33026
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> ogle-0.9.0.ebuild:
+  x86 stabl.e
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> ogle-0.9.1.ebuild:
+  Added xv config with IUSE. Closes #20393.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Removed -r1 as it is not needed.
+
+*ogle-0.9.1-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> ogle-0.9.1-r1.ebuild:
+  Now depends on media-libs/{libmad,libid3tag} instead of 
+  media-sound/mad
+
+*ogle-0.9.1 (13 Mar 2003)
+
+  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> ogle-0.9.1.ebuild:
+  version bump
+
+*ogle-0.9.0 (04 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump (thanks to Bernardo S. A. Silva <bsaslinux@globo.com>).
+
+*ogle-0.8.5 (21 Sep 2002)
+
+  01 Feb 2003; Jon Nall <nall@gentoo.org> ogle-0.8.5.ebuild :
+  don't compile in alitvec support for those who don't want it
+  (!G4s). Fixes gentoo bug #14939
+
+  31 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> ogle-0.8.5.ebuild :
+  Added ppc keyword
+
+  21 Sep 2002; Arcady Genkin <agenkin@gentoo.org> ogle-0.8.5.ebuild :
+
+  Version bump.  Added dependency on media-sound/mad.
+
+*ogle-0.8.4 (1 Jul 2002)
+
+  1 Jul 2002; Seemant Kulleen <seemant@gentoo.org> ogle-0.8.4.ebuild
+  files/digest-ogle-0.8.4 :
+
+  Version bump.
+
+  15 Jun 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Correct a52dec dep to >=0.7.3 for this new ogle version, closes bug #3761
+
+*ogle-0.8.3 (14 Jun 2002)
+
+  14 Jun 2002; Seemant Kulleen <seemant@gentoo.org> ogle-0.8.3.ebuild
+  files/digest-ogle-0.8.3 :
+
+  Version bump, thanks to Bernardo Silva bsaslinux@globo.com in bug #3676,
+  but several things had to be done -- the elibtoolize in particular.
+
+  27 Apr 2002; Thilo Bangert <bangert at gentoo dot org> ogle-0.8.2-r6.euild :
+  
+  fixed depandency for a52dec-0.7.2 (latest is 0.7.3)
+  
+
+*ogle-0.8.2-r6 (27 Mar 2002)
+
+  27 Mar 2002; Bruce A. Locke <blocke@shivan.org> ogle-0.8.2-r6.ebuild :
+
+  libxml2 version specified in dependency and restored CFLAGS fix
   
-  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.
+*ogle-0.8.2-r5 (26 Mar 2002)
+
+  26 Mar 2002; Bruce A. Locke <blocke@shivan.org> ogle-0.8.2-r5.ebuild :
+
+  libtool and libxml2 fixes should make this ebuild usable again
+
+
diff --git a/media-video/ogle/Manifest b/media-video/ogle/Manifest
index 57db34e39450..4cea0f0e98d5 100644
--- a/media-video/ogle/Manifest
+++ b/media-video/ogle/Manifest
@@ -1,9 +1,21 @@
-MD5 ba74d68a9a9f0c759b1bbaa4526369a0 ChangeLog 1922
-MD5 4b5db47abf159111b5ef29b7294fac2e ogle-0.8.4.ebuild 1303
-MD5 a95ebbd1e235099b0a3ed86092e5e563 ogle-0.8.5.ebuild 1671
-MD5 db293ae3d19343fede54e9f2c36b80fe ogle-0.9.0.ebuild 1690
-MD5 7a994dadd565a0a322823bfb3b21e662 ogle-0.9.1.ebuild 1690
-MD5 a9913cfa78533d985bda1f20df7b157d files/digest-ogle-0.8.4 62
-MD5 072cf7eae5df5158d463a4daf99f820d files/digest-ogle-0.8.5 62
-MD5 5665fbb3f89c43abfebf16ad5382d57b files/digest-ogle-0.9.0 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 429e23ffa47ffd63bd090fd322b2bf75 ChangeLog 4554
 MD5 69fb0f18b0f74a88453cf989a0515f08 files/digest-ogle-0.9.1 62
+MD5 9e5be8c6673243e1604cfbec495081d5 files/digest-ogle-0.9.2 62
+MD5 9e5be8c6673243e1604cfbec495081d5 files/digest-ogle-0.9.2-r1 62
+MD5 d928c8bc3c69f3128bda1f74f0424f52 files/ogle-configure-alsa-fix.patch 726
+MD5 7034a848ff2f633d14ed0465e8a07a63 files/ogle-gcc34-fix.patch 228
+MD5 2944cd6510b7709a7c2068ae91d7bf1e files/ogle-gcc4-fix.patch 279
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 48eb1335e280252c79162cf4a877afc3 ogle-0.9.1.ebuild 1951
+MD5 a675efc13c32c81dd51df68a2275084a ogle-0.9.2-r1.ebuild 1684
+MD5 06e259d193deb6588b6ef89a19f45d32 ogle-0.9.2.ebuild 2046
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDS8m1KRy60XGEcJIRAkc6AJ0QFhGrGDd204atHxljQUAyX8Yg4ACfQp5X
+8dc+AOuUjTbpqrGF4JqQn6o=
+=axVv
+-----END PGP SIGNATURE-----
diff --git a/media-video/ogle/metadata.xml b/media-video/ogle/metadata.xml
index ab2e21eea39f..d9df1878d8e2 100644
--- a/media-video/ogle/metadata.xml
+++ b/media-video/ogle/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-video</herd>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/ogle/ogle-0.9.1.ebuild b/media-video/ogle/ogle-0.9.1.ebuild
index 170af6a96d58..15fbb47f749f 100644
--- a/media-video/ogle/ogle-0.9.1.ebuild
+++ b/media-video/ogle/ogle-0.9.1.ebuild
@@ -1,27 +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-video/ogle/ogle-0.9.1.ebuild,v 1.1 2003/03/14 05:47:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
-inherit libtool
+inherit eutils libtool
+
+IUSE="oss mmx alsa xv"
 
 DESCRIPTION="Full featured DVD player that supports DVD menus."
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
 SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 LICENSE="GPL-2"
-IUSE="oss mmx alsa"
 
 DEPEND=">=media-libs/libdvdcss-1.2.2
-	media-libs/jpeg 
-	>=media-libs/libdvdread-0.9.4 
-	media-sound/mad
-	x11-base/xfree
+	media-libs/jpeg
+	>=media-libs/libdvdread-0.9.4
+	media-sound/madplay
+	virtual/x11
 	>=dev-libs/libxml2-2.4.19
 	>=media-libs/a52dec-0.7.3
 	alsa? ( media-libs/alsa-lib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ogle-configure-alsa-fix.patch || die "failed applying alsa-fix"
+	epatch ${FILESDIR}/ogle-gcc34-fix.patch
+}
+
 src_compile() {
 	# STOP!  If you make any changes, make sure to unmerge all copies
 	# of ogle and ogle-gui from your system and merge ogle-gui using your
@@ -30,6 +38,8 @@ src_compile() {
 
 	local myconf="`use_enable mmx` `use_enable oss` `use_enable alsa`"
 
+	use xv && myconf="${myconf} --enable-xv" || myconf="${myconf} --disable-xv"
+
 	if [ "${ARCH}" = "ppc" ] ; then
 		# if this user doesn't want altivec, don't compile it in
 		# fixes #14939
@@ -54,6 +64,6 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO 
+	dodoc AUTHORS ChangeLog HISTORY NEWS README TODO
 	dodoc doc/liba52.txt
 }
diff --git a/media-video/ogle/ogle-0.9.2-r1.ebuild b/media-video/ogle/ogle-0.9.2-r1.ebuild
index 65a328196346..43994ab03e17 100644
--- a/media-video/ogle/ogle-0.9.2-r1.ebuild
+++ b/media-video/ogle/ogle-0.9.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-video/ogle/ogle-0.9.2-r1.ebuild,v 1.1 2005/05/09 18:50:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils libtool
 
@@ -28,6 +28,8 @@ src_unpack() {
 	epatch ${FILESDIR}/ogle-configure-alsa-fix.patch
 	epatch ${FILESDIR}/ogle-gcc34-fix.patch
 	epatch ${FILESDIR}/ogle-gcc4-fix.patch
+
+	elibtoolize
 }
 
 src_compile() {
@@ -36,8 +38,6 @@ src_compile() {
 	# new version of ogle... Changes in this package can break ogle-gui
 	# very very easily -- blocke
 
-	elibtoolize
-
 	# configure needs access to the updated CFLAGS
 	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml -I/usr/include/libxml2"
 
@@ -57,5 +57,5 @@ src_install() {
 	cd ${D}usr/bin/
 	mv ./ifo_dump ./ifo_dump_ogle
 
-	dodoc AUTHORS ChangeLog HISTORY INSTALL NEWS README TODO doc/liba52.txt
+	dodoc AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt
 }
diff --git a/media-video/ogle/ogle-0.9.2.ebuild b/media-video/ogle/ogle-0.9.2.ebuild
index 6360457c2ad6..ad3491aaea02 100644
--- a/media-video/ogle/ogle-0.9.2.ebuild
+++ b/media-video/ogle/ogle-0.9.2.ebuild
@@ -1,27 +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-video/ogle/ogle-0.9.2.ebuild,v 1.1 2003/11/09 03:13:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
-inherit libtool
+inherit eutils libtool
 
 DESCRIPTION="Full featured DVD player that supports DVD menus."
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
 SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64 alpha ia64 sparc"
 LICENSE="GPL-2"
 IUSE="oss mmx alsa xv"
 
 DEPEND=">=media-libs/libdvdcss-1.2.2
 	media-libs/jpeg
 	>=media-libs/libdvdread-0.9.4
-	media-sound/mad
-	x11-base/xfree
+	media-sound/madplay
+	virtual/x11
 	>=dev-libs/libxml2-2.4.19
 	>=media-libs/a52dec-0.7.3
 	alsa? ( media-libs/alsa-lib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ogle-configure-alsa-fix.patch || die "applying alsa-fix failed"
+	epatch ${FILESDIR}/ogle-gcc34-fix.patch
+}
+
 src_compile() {
 	# STOP!  If you make any changes, make sure to unmerge all copies
 	# of ogle and ogle-gui from your system and merge ogle-gui using your
@@ -50,12 +57,16 @@ src_compile() {
 	# configure needs access to the updated CFLAGS
 	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml -I/usr/include/libxml2"
 
-	econf ${myconf} || die
-	emake CFLAGS="${CFLAGS}" || die
+	econf ${myconf} || die "./configure failed"
+	emake CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO
+	einstall || die "make install failed"
+
+	cd ${D}usr/bin/
+	mv ./ifo_dump ./ifo_dump_ogle
+
+	dodoc AUTHORS ChangeLog HISTORY NEWS README TODO
 	dodoc doc/liba52.txt
 }
diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 21c389dcf88a..9b22adc40e34 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-cdr/ogmrip
+# ChangeLog for media-video/ogmrip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.1 2005/09/17 15:11:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
   17 Sep 2005; Luis Medinas <metalgod@gentoo.org>
   +files/ogmrip-0.9.0-gcc4.patch, +files/ogmrip-0.9.0-lang.patch,
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 24909daa4734..4a176b55b6ef 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,10 +1,20 @@
-MD5 94b4e5f90569e534c0b63fcd4ec34b89 ChangeLog 1103
-MD5 f6ae03147b33c97f5bb09d5de8690601 metadata.xml 227
-MD5 e9e0fe8f55d0b1473e3b88a15cdfca18 ogmrip-0.6.2.ebuild 1766
-MD5 3b0e56fe697e3f3ea90c291a02fa9c40 ogmrip-0.8.2.ebuild 1855
-MD5 69c1a7d5b3166fc4f20646c9f10ead3a ogmrip-0.9.0.ebuild 1965
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0204dd3ce4791c1f566b8c5529d18c06 ChangeLog 1364
 MD5 aa7f34882cf21f05139524a800cb1ccb files/digest-ogmrip-0.6.2 64
 MD5 605be9978689669c27e4a0d5fbcd57d9 files/digest-ogmrip-0.8.2 64
-MD5 d3c45dfbfd5046c58d6a1e774471e280 files/ogmrip-0.9.0-lang.patch 450
-MD5 0b8ceac327eb68f927a2fbb841bfb53a files/ogmrip-0.9.0-gcc4.patch 5279
 MD5 87e11fb2b44c544d59834a678e353021 files/digest-ogmrip-0.9.0 64
+MD5 0b8ceac327eb68f927a2fbb841bfb53a files/ogmrip-0.9.0-gcc4.patch 5279
+MD5 d3c45dfbfd5046c58d6a1e774471e280 files/ogmrip-0.9.0-lang.patch 450
+MD5 f6ae03147b33c97f5bb09d5de8690601 metadata.xml 227
+MD5 7a59f2d062b22745c800381e382c118b ogmrip-0.6.2.ebuild 1770
+MD5 2dc95dfe1db0913608eb8b4b100b5957 ogmrip-0.8.2.ebuild 1859
+MD5 d5df55549fb701989c1c159b2c7696d8 ogmrip-0.9.0.ebuild 1969
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLEU2I1lqEGTUzyQRAqOmAJ9OopK4aidQluM8oW92Zj7vEcLEkwCfTJl1
+ujWLQEuzb9ZE88AQqhBLwog=
+=X6JJ
+-----END PGP SIGNATURE-----
diff --git a/media-video/ogmrip/ogmrip-0.6.2.ebuild b/media-video/ogmrip/ogmrip-0.6.2.ebuild
index a58b7cfd6ece..d90ad0bc031f 100644
--- a/media-video/ogmrip/ogmrip-0.6.2.ebuild
+++ b/media-video/ogmrip/ogmrip-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/media-video/ogmrip/ogmrip-0.6.2.ebuild,v 1.1 2005/09/17 15:11:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/media-video/ogmrip/ogmrip-0.8.2.ebuild b/media-video/ogmrip/ogmrip-0.8.2.ebuild
index 43c35a85069c..bf5c883ef2f4 100644
--- a/media-video/ogmrip/ogmrip-0.8.2.ebuild
+++ b/media-video/ogmrip/ogmrip-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/media-video/ogmrip/ogmrip-0.8.2.ebuild,v 1.1 2005/09/17 15:11:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/media-video/ogmrip/ogmrip-0.9.0.ebuild b/media-video/ogmrip/ogmrip-0.9.0.ebuild
index cee280978fb8..e501a6458eff 100644
--- a/media-video/ogmrip/ogmrip-0.9.0.ebuild
+++ b/media-video/ogmrip/ogmrip-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.9.0.ebuild,v 1.1 2005/09/17 15:11:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.9.0.ebuild,v 1.1.1.1 2005/11/30 09:57:48 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/media-video/okle/ChangeLog b/media-video/okle/ChangeLog
index 311f6c20bfbb..deb7a1c14fb8 100644
--- a/media-video/okle/ChangeLog
+++ b/media-video/okle/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for media-video/okle
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/okle/ChangeLog,v 1.1 2004/04/08 22:01:17 centic Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/okle/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  19 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> okle-0.4.ebuild:
+  Marked ~amd64.
+
+  29 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/okle-0.4-configure-arts.patch, okle-0.4.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #72786.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> okle-0.4.ebuild:
+  QA: need-kde after R/DEPEND
+
+  28 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> okle-0.4.ebuild:
+  kde-base is deprecated
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> okle-0.4.ebuild:
+  Added to ~ppc.
 
 *okle-0.4 (08 Apr 2004)
 
diff --git a/media-video/okle/Manifest b/media-video/okle/Manifest
index 2b049d815bd6..55d483c7ce98 100644
--- a/media-video/okle/Manifest
+++ b/media-video/okle/Manifest
@@ -1,4 +1,15 @@
-MD5 bec57c86834b467e98d7be4d084f7457 okle-0.3.ebuild 493
-MD5 69435ae6033d70a15e60de2bbad377b8 okle-0.4.ebuild 493
-MD5 b4990108fb8c0d6d669291af589ec48b files/digest-okle-0.3 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7dd5d2810d4af56411d79df2932070db ChangeLog 934
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 c7ac0169471634c03f2b25ae0401871d okle-0.4.ebuild 587
 MD5 ddb8f00ae2c33de8bc330973437f5961 files/digest-okle-0.4 60
+MD5 05d7b669aba3bbebf5f98561d2e096da files/okle-0.4-configure-arts.patch 3567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtbzK5mJXAu5GbtIRAmapAJwOwoeOf/UeVZclUy18fnS84ZXVywCfYdrf
+qr0DSTaKMK5v/BAcAf7bnoU=
+=tTRh
+-----END PGP SIGNATURE-----
diff --git a/media-video/okle/metadata.xml b/media-video/okle/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/media-video/okle/metadata.xml
+++ b/media-video/okle/metadata.xml
@@ -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-video/okle/okle-0.4.ebuild b/media-video/okle/okle-0.4.ebuild
index 9a53466a9ab0..f2f5dd065fc3 100644
--- a/media-video/okle/okle-0.4.ebuild
+++ b/media-video/okle/okle-0.4.ebuild
@@ -1,19 +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-video/okle/okle-0.4.ebuild,v 1.1 2004/04/08 22:01:17 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/okle/okle-0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
-inherit kde-base
-
-need-kde 3
+inherit kde eutils
 
 DESCRIPTION="oKle is a KDE frontend to the Ogle DVD player."
 HOMEPAGE="http://okle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/okle/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
 DEPEND=">=media-video/ogle-0.9.2"
-SLOT="0"
-IUSE=""
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
 
+	use arts || epatch ${FILESDIR}/${P}-configure-arts.patch
+}
\ No newline at end of file
diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index 089be5c5143b..c780f5338787 100644
--- a/media-video/oxine/ChangeLog
+++ b/media-video/oxine/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for media-video/oxine
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.1 2003/03/14 19:19:57 agenkin Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> oxine-0.1.ebuild,
+  oxine-0.2.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> oxine-0.2.ebuild:
+  Stable on ppc.
+
+  08 May 2005; Diego Pettenò <flameeyes@gentoo.org> oxine-0.2.ebuild:
+  Added missing dep on popt. Fixes #70477. Removed COPYING from dodoc.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  25 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/oxine-0.2-gcc34.patch, +files/oxine-0.2-xtst.patch,
+  oxine-0.2.ebuild:
+  Fixed gcc-3.4 compile issues, bug #70381 and added to ~amd64, bug #72139
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.  Taking over as maintainer.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> oxine-0.2.ebuild:
+  Added to ~ppc.
+
+*oxine-0.2 (06 May 2003)
+
+  06 May 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
 
 *oxine-0.1 (14 Mar 2003)
 
diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
index e69de29bb2d1..cae7fdfb993c 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c907dd7ab5bd1d1e04a2e21a496d5b16 ChangeLog 1368
+MD5 ca4775ba00b233f1b0be3623b448661f oxine-0.2.ebuild 999
+MD5 a65173b46e297dec5ecf34340af08b4e oxine-0.1.ebuild 842
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 f9b749ab60b5a8684925d6a457352b92 files/digest-oxine-0.1 61
+MD5 e668a8d14c492a155a090b1d1723ea74 files/oxine-0.2-xtst.patch 406
+MD5 a8f4b0ba961236d5de5b57a6271cc333 files/digest-oxine-0.2 61
+MD5 9ab0e63d2e2f9d4695a1771a4def9e97 files/oxine-0.2-gcc34.patch 252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIujHj5H05b2HAEkRAtVJAJ9IN3EM0iAZHRzbFVuhMGdAOjDruwCeJnNn
+uCanYvqq5UXRd3/6Fx5bEIU=
+=0bKU
+-----END PGP SIGNATURE-----
diff --git a/media-video/oxine/metadata.xml b/media-video/oxine/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/oxine/metadata.xml
+++ b/media-video/oxine/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/oxine/oxine-0.1.ebuild b/media-video/oxine/oxine-0.1.ebuild
index 9e3263a76e51..966927b48345 100644
--- a/media-video/oxine/oxine-0.1.ebuild
+++ b/media-video/oxine/oxine-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2003 Fridtjof Busse <fridtjof@fbunet.de>.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.1.ebuild,v 1.1 2003/03/14 19:19:57 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.1.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
 DESCRIPTION="OSD frontend for xine"
 HOMEPAGE="http://oxine.sourceforge.net/"
@@ -14,9 +14,8 @@ DEPEND=">=media-libs/xine-lib-1_beta8
 IUSE="nls lirc"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/oxine/${P}.tar.gz"
 
 src_compile() {
@@ -24,17 +23,17 @@ src_compile() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 	use lirc || myconf="${myconf} --disable-lirc"
-  
+
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-	
+
 	make DESTDIR=${D} \
 		docdir=/usr/share/doc/${PF} \
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-video/oxine/oxine-0.2.ebuild b/media-video/oxine/oxine-0.2.ebuild
index 370baaa7513a..a78aa5a3bad6 100644
--- a/media-video/oxine/oxine-0.2.ebuild
+++ b/media-video/oxine/oxine-0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 2003 Fridtjof Busse <fridtjof@fbunet.de>.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.2.ebuild,v 1.1 2003/05/06 19:52:52 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.2.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="OSD frontend for xine"
 HOMEPAGE="http://oxine.sourceforge.net/"
@@ -9,32 +11,40 @@ LICENSE="GPL-2"
 DEPEND=">=media-libs/xine-lib-1_beta8
 	lirc? ( app-misc/lirc )
 	nls? ( sys-devel/gettext )
+	dev-libs/popt
 	virtual/x11"
 
 IUSE="nls lirc"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc x86"
 
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/oxine/${P}.tar.gz"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-xtst.patch
+}
+
 src_compile() {
 
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 	use lirc || myconf="${myconf} --disable-lirc"
-  
+
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-	
+
 	make DESTDIR=${D} \
 		docdir=/usr/share/doc/${PF} \
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-video/pgmfindclip/ChangeLog b/media-video/pgmfindclip/ChangeLog
index b5538a98eda3..0c031ab5f401 100644
--- a/media-video/pgmfindclip/ChangeLog
+++ b/media-video/pgmfindclip/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for media-sound/chaplin
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pgmfindclip/ChangeLog,v 1.1 2004/10/06 20:36:02 trapni Exp $
+# ChangeLog for media-video/pgmfindclip
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/pgmfindclip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> pgmfindclip-1.13.ebuild:
+  Added to ~ppc.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pgmfindclip-1.13.ebuild:
+  Added to ~amd64.  Fixed LICENSE.
 
 *pgmfindclip-1.13 (06 Oct 2004)
 
diff --git a/media-video/pgmfindclip/Manifest b/media-video/pgmfindclip/Manifest
index 99764b3ed57b..3c476d957620 100644
--- a/media-video/pgmfindclip/Manifest
+++ b/media-video/pgmfindclip/Manifest
@@ -1,3 +1,4 @@
-MD5 2658212db8ca65dc054262af330eaa7c .pgmfindclip-1.13.ebuild.swp 4096
-MD5 2efa002d76bae8c78ef52289920d377d pgmfindclip-1.13.ebuild 367
+MD5 3098747a97ee8c9835c386a52c17e9b0 ChangeLog 635
+MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
+MD5 64289fd189a18608b55775ca6aaa4079 pgmfindclip-1.13.ebuild 588
 MD5 0351f6c53e368be0a0435311d7102767 files/digest-pgmfindclip-1.13 63
diff --git a/media-video/pgmfindclip/pgmfindclip-1.13.ebuild b/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
index 278b5e77b443..cf39a4af46c4 100644
--- a/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
+++ b/media-video/pgmfindclip/pgmfindclip-1.13.ebuild
@@ -1,24 +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-video/pgmfindclip/pgmfindclip-1.13.ebuild,v 1.1 2004/10/06 20:36:02 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pgmfindclip/pgmfindclip-1.13.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
+
+IUSE=""
+
+S="${WORKDIR}"
 
 DESCRIPTION="automatically find a clipping border for a sequence of pgm images"
-SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
 HOMEPAGE="http://www.lallafa.de/bp/pgmfindclip.html"
-DEPEND="virtual/glibc"
-KEYWORDS="~x86"
-LICENSE="GPL-1"
+SRC_URI="http://www.lallafa.de/bp/files/${P}.tgz"
+
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
-MY_S=${WORKDIR}
+DEPEND="virtual/libc"
 
 src_compile () {
-	cd ${MY_S} || die
 	emake || die
 }
 
 src_install () {
-	cd ${MY_S} || die
 	dobin ${PN} || die
 }
diff --git a/media-video/piave/ChangeLog b/media-video/piave/ChangeLog
index 1003410be16f..d840abad4173 100644
--- a/media-video/piave/ChangeLog
+++ b/media-video/piave/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for media-video/piave
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/piave/ChangeLog,v 1.1 2004/03/18 22:06:48 zypher Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/ChangeLog,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> piave-0.2.4-r1.ebuild:
+  Cleaned up ebuild to not use gcc eclass. Moved patches in src_unpack. Moved
+  pkgconfig to DEPEND.
+
+  03 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> piave-0.2.4-r1.ebuild:
+  added missing dependency and updates libdv dependency. fixed #82661
+
+  26 Oct 2004; Malcolm Lashley <malc@gentoo.org> piave-0.2.4-r1.ebuild:
+  ~amd64 - closes bug #59343
+
+  18 Oct 2004; Marc Hildebrand <zypher@gentoo.org> piave-0.2.4-r1.ebuild:
+  Added gcc-3.4 patch. Thanks to Mathijs Mohlmann for the patch.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> piave-0.2.4-r1.ebuild:
+  Add inherit eutils
+
+*piave-0.2.4-r1 (25 Mar 2004)
+
+  25 Mar 2004; Marc Hildebrand <zypher@gentoo.org> piave-0.2.4-r1.ebuild:
+  fixes bug #45202. Thanks to Dominik Stadler for the fix.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> piave-0.2.4.ebuild:
+  Added digest for piave-0.2.4 ebuild.
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> piave-0.2.4.ebuild:
+  Added to ~ppc.
 
 *piave-0.2.4 (07 Mar 2004)
 
diff --git a/media-video/piave/Manifest b/media-video/piave/Manifest
index 1e0f1740a821..36ad9f51de08 100644
--- a/media-video/piave/Manifest
+++ b/media-video/piave/Manifest
@@ -1,3 +1,8 @@
-MD5 80ae9d5230777832066b20be69d78a6f piave-0.2.4.ebuild 1087
-MD5 e597c3c7633ad2ceeef72dda098e0f01 ChangeLog 333
+MD5 60768555ed60e0732c8747ad97245b9c ChangeLog 1343
 MD5 b930e21bf22fd73f984ae65f871fdc2d metadata.xml 253
+MD5 9b6e8f0463ec36a5e20f5b74d484bef8 piave-0.2.4-r1.ebuild 1167
+MD5 fab7e989e9e16e9167d7a6c1abba0240 piave-0.2.4.ebuild 1093
+MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4 63
+MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4-r1 63
+MD5 b39211483360995059bfb6eb8e23fd30 files/piave-0.2.4-gcc34.patch 671
+MD5 b3f256c82b671e109307527c6d78a51a files/piave-0.2.4-include-arts.diff 1216
diff --git a/media-video/piave/piave-0.2.4-r1.ebuild b/media-video/piave/piave-0.2.4-r1.ebuild
index c32cadbdd3c2..97f62480ab3d 100644
--- a/media-video/piave/piave-0.2.4-r1.ebuild
+++ b/media-video/piave/piave-0.2.4-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-video/piave/piave-0.2.4-r1.ebuild,v 1.1 2004/03/25 09:10:15 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/piave-0.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="PIAVE - Piave Is A Video Editor"
 HOMEPAGE="http://modesto.sourceforge.net/piave/index.html"
@@ -9,28 +11,37 @@ SRC_URI="mirror://sourceforge/modesto/${P}.tar.gz"
 IUSE="nls"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
-DEPEND="virtual/x11
-	>=dev-util/pkgconfig-0.15.0
+RDEPEND="virtual/x11
 	>=dev-libs/libxml2-2.5.11
 	>=dev-cpp/libxmlpp-0.21.0
 	>=media-libs/gdk-pixbuf-0.22.0
 	>=media-libs/libsdl-1.2.6-r2
 	>=media-libs/sdl-image-1.2.3
-	>=media-libs/libdv-0.99-r1
+	<=media-libs/libdv-0.102
 	>=media-libs/libsndfile-1.0.5
 	>=media-libs/libvorbis-1.0.1
 	>=sys-libs/libraw1394-0.9.0
-	>=sys-libs/libavc1394-0.4.1"
+	>=sys-libs/libavc1394-0.4.1
+	media-libs/nas"
 
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.15.0"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	cd ${S}
+
 	epatch ${FILESDIR}/piave-0.2.4-include-arts.diff
-	`use_enable nls` \
-	myconf=${myconf}" --with-gnu-ld"
-	econf ${myconf} || die "configure failed"
+	epatch ${FILESDIR}/piave-0.2.4-gcc34.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		|| die "configure failed"
+
 	emake || die
 }
 
diff --git a/media-video/piave/piave-0.2.4.ebuild b/media-video/piave/piave-0.2.4.ebuild
index 5f808c980144..48fbdaba1ad0 100644
--- a/media-video/piave/piave-0.2.4.ebuild
+++ b/media-video/piave/piave-0.2.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-video/piave/piave-0.2.4.ebuild,v 1.1 2004/03/18 22:06:48 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/piave-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:57:58 chriswhite Exp $
 
 DESCRIPTION="PIAVE - Piave Is A Video Editor"
 HOMEPAGE="http://modesto.sourceforge.net/piave/index.html"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/modesto/${P}.tar.gz"
 IUSE="nls"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND="virtual/x11
 	>=dev-util/pkgconfig-0.15.0
diff --git a/media-video/qc-usb/ChangeLog b/media-video/qc-usb/ChangeLog
index 781b57a2e42f..c0d43eefa122 100644
--- a/media-video/qc-usb/ChangeLog
+++ b/media-video/qc-usb/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for media-video/qc-usb
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.1 2003/07/06 18:04:15 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  09 May 2005; Herbie Hopkins <herbs@gentoo.org> qc-usb-0.6.3.ebuild:
+  Marked ~amd64 wrt bug #91892.
+
+  21 Apr 2005; Alastair Tse <liquidx@gentoo.org> qc-usb-0.6.2.ebuild,
+  qc-usb-0.6.3.ebuild:
+  replace KERNEL_DIR with LINUX_DIR for make options (#89909)
+
+*qc-usb-0.6.3 (18 Apr 2005)
+
+  18 Apr 2005; Alastair Tse <liquidx@gentoo.org> +qc-usb-0.6.3.ebuild:
+  version bump (#89228)
+
+  09 Mar 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/0.6.2-linux-2.6.11.patch, qc-usb-0.6.2.ebuild:
+  patch for 2.6.11+ compatibility (#83299) migrated to use linux-mod.
+
+  28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qc-usb-0.6.2.ebuild:
+  Added to ~ppc, bug 79238.
+
+  13 Jan 2005; Alastair Tse <liquidx@gentoo.org> qc-usb-0.6.0.ebuild,
+  qc-usb-0.6.2.ebuild:
+  fix installation of qcset. (#73823)
+
+*qc-usb-0.6.2 (11 Nov 2004)
+
+  11 Nov 2004; Alastair Tse <liquidx@gentoo.org> +qc-usb-0.6.2.ebuild:
+  version bump - compat with new kernel
+
+  06 Oct 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/qc-usb-0.6.0-gcc34.patch, qc-usb-0.6.0.ebuild:
+  Fixed gcc-3.4 compile issue. Bug #62340
+
+*qc-usb-0.6.0 (24 Jul 2004)
+
+  24 Jul 2004; Alastair Tse <liquidx@gentoo.org> +qc-usb-0.6.0.ebuild:
+  version bump (finally). now supports 2.6 kernel (#38312)
+
+  24 Sep 2003; Alastair Tse <liquidx@gentoo.org> qc-usb-0.5.1.ebuild:
+  add IUSE
 
 *qc-usb-0.5.1 (06 Jul 2003)
 
diff --git a/media-video/qc-usb/Manifest b/media-video/qc-usb/Manifest
index d993a7a84811..12824d4fac64 100644
--- a/media-video/qc-usb/Manifest
+++ b/media-video/qc-usb/Manifest
@@ -1,2 +1,16 @@
-MD5 8166cd1a868201a2346b6aa662e4a059 qc-usb-0.5.1.ebuild 933
-MD5 5e9ae5fc1d46670c449484a27578bbf9 files/digest-qc-usb-0.5.1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d5e90dfdcd781d1cce15b7a76f2f2682 qc-usb-0.6.3.ebuild 779
+MD5 f528b3c432e850d7d6ec7533c6af4581 ChangeLog 1693
+MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 f1526160a71fa39056d7442f73383a2e files/digest-qc-usb-0.6.3 64
+MD5 97aa1789cc24610ba63d6d7a95ed8f15 files/qc-usb-0.6.0-gcc34.patch 343
+MD5 1c7efb40ca2cfa4fec86da82641851cb files/0.6.2-linux-2.6.11.patch 495
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCfqnM2G5bA0cA/ScRAgUDAKDriv9DZhhwDzndiiCL3XYhNGMN6ACeLTYb
+mTBQRKA1FgStUPVhespQyZE=
+=/GEj
+-----END PGP SIGNATURE-----
diff --git a/media-video/qc-usb/qc-usb-0.6.3.ebuild b/media-video/qc-usb/qc-usb-0.6.3.ebuild
index ad158828c566..f60787ff2f37 100644
--- a/media-video/qc-usb/qc-usb-0.6.3.ebuild
+++ b/media-video/qc-usb/qc-usb-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-video/qc-usb/qc-usb-0.6.3.ebuild,v 1.1 2005/04/18 09:08:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb/qc-usb-0.6.3.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 inherit linux-mod eutils
 
@@ -11,12 +11,12 @@ SRC_URI="mirror://sourceforge/qce-ga/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 
 DEPEND="virtual/linux-sources"
 
 src_compile() {
-	emake KERNEL_DIR=${KERNEL_DIR} all || die
+	emake LINUX_DIR=${KERNEL_DIR} all || die
 }
 
 src_install() {
diff --git a/media-video/qdvdauthor/ChangeLog b/media-video/qdvdauthor/ChangeLog
index 6a233f288701..b0fbff31c5f7 100644
--- a/media-video/qdvdauthor/ChangeLog
+++ b/media-video/qdvdauthor/ChangeLog
@@ -1,9 +1,22 @@
 # ChangeLog for media-video/qdvdauthor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.1 2005/02/13 13:33:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/ChangeLog,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/qdvdauthor-0.0.9-nointeractive.patch, qdvdauthor-0.0.9.ebuild:
+  interactivity removed - bug #104793 thanks to Patrick Lauer
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> qdvdauthor-0.0.9.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> qdvdauthor-0.0.9.ebuild:
+  Fix qmake dir per bug #97535
+
+  20 Apr 2005; Simon Stelling <blubb@gentoo.org> qdvdauthor-0.0.9.ebuild:
+  added ~amd64
 
 *qdvdauthor-0.0.9 (13 Feb 2005)
 
   13 Feb 2005; Daniel Black <dragonheart@gentoo.org> +qdvdauthor-0.0.9.ebuild:
-  Initial ebuild as per bug #81826 thanks to Marco Morales <soulse@gmail.com>
+  Initial ebuild as per bug #55824 thanks to Marco Morales <soulse@gmail.com>
 
diff --git a/media-video/qdvdauthor/Manifest b/media-video/qdvdauthor/Manifest
index 53d1ab577252..81672cf0ede0 100644
--- a/media-video/qdvdauthor/Manifest
+++ b/media-video/qdvdauthor/Manifest
@@ -1,4 +1,15 @@
-MD5 a8f156864180de09a9bce4e897eb1c41 qdvdauthor-0.0.9.ebuild 2002
-MD5 670f8ee68d87b77afc83f1d7cc451249 metadata.xml 346
-MD5 0e0844b9dba3eaa4da49e6c5ad814001 ChangeLog 314
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ecc498b8f2fa01025433ba881c3bff2e ChangeLog 883
+MD5 59aae5dcb06a68bd02cec60c627dbe53 metadata.xml 253
+MD5 c49cafa5baf1d161ec92186f6b7e6519 qdvdauthor-0.0.9.ebuild 2267
 MD5 6d09c05eb5f5caa3cd56c0a70a2fc21d files/digest-qdvdauthor-0.0.9 68
+MD5 cce352b8695bcf9ae6b0d8f5afcbfadd files/qdvdauthor-0.0.9-nointeractive.patch 632
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGu7OmdTrptrqvGERAqTiAJ4zz7BlBOQ3w2f8hvWdbcEyiClC0gCeK5CB
+s/BCPTP0FPDf0wNXSLBPI8U=
+=Rpym
+-----END PGP SIGNATURE-----
diff --git a/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild b/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
index 364e0c04d3f2..33599efa8607 100644
--- a/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild
+++ b/media-video/qdvdauthor/qdvdauthor-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/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild,v 1.1 2005/02/13 13:33:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qdvdauthor/qdvdauthor-0.0.9.ebuild,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
 
-inherit kde-functions
+inherit qt3 eutils
 
 DESCRIPTION="QDVDAuthor, the GUI frontend for dvdauthor and other related tools."
 HOMEPAGE="http://qdvdauthor.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qdvdauthor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=">=media-video/dvdauthor-0.6.10
 	>=media-gfx/imagemagick-5.5.7.11
@@ -19,14 +19,19 @@ DEPEND=">=media-video/dvdauthor-0.6.10
 	>=media-video/dvd-slideshow-0.6.0
 	media-sound/sox
 	media-sound/lame
-	media-libs/libogg"
+	media-libs/libogg
+	$(qt_min_version 3.2)"
 
 # xine-libs or mplayer libs or media-video/vlc - mplayer use flags?
 
-need-qt 3.2
-
 # >=media-video/dvd-slideshow-0.6.0 -> optional
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-nointeractive.patch
+}
+
 src_compile() {
 
 	./configure --with-xine-support || die "config fault"
@@ -36,14 +41,14 @@ src_compile() {
 	#export QT_LIB="$QTDIR"
 	sed -i "s|/usr/local/bin|/usr/bin|g" qdvdauthor/qdvdauthor.cpp qdvdauthor/dialogexecute.cpp doc/sound.txt
 	cd qdvdauthor
-	qmake qdvdauthor.pro
+	${QTDIR}/bin/qmake qdvdauthor.pro || die 'qmake failed'
 
 	# fixing Makefile, so that we can use our CFLAGS
 	sed -i -e "s|^CFLAGS.*-O2|CFLAGS = ${CFLAGS} |g" -e "s|^CXXFLAGS.*-O2|CXXFLAGS = ${CXXFLAGS} |g" Makefile
 	emake || die "emake qdvdauthor failed"
 
 	cd qslideshow
-	qmake qslideshow.pro
+	${QTDIR}/bin/qmake qslideshow.pro
 	# fixing Makefile, so that we can use our CFLAGS
 	sed -i -e "s|^CFLAGS.*-O2|CFLAGS   = ${CFLAGS} |g" -e "s|^CXXFLAGS.*-O2|CXXFLAGS = ${CXXFLAGS} |g" Makefile
 	emake || die "emake qslideshow failed"
diff --git a/media-video/quickrip/ChangeLog b/media-video/quickrip/ChangeLog
index 8d7fd9577d20..14e65ff0a631 100644
--- a/media-video/quickrip/ChangeLog
+++ b/media-video/quickrip/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for media-video/quickrip
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/quickrip/ChangeLog,v 1.1 2003/04/16 15:43:55 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/quickrip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> quickrip-0.8-r1.ebuild:
+  Change qt dep per bug #100235
+
+  29 Jun 2005; Carsten Lohrke <carlo@gentoo.org> quickrip-0.8-r1.ebuild:
+  stable on x86
+
+*quickrip-0.8-r1 (22 Feb 2005)
+
+  22 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/quickrip-sizetype.patch, +quickrip-0.8-r1.ebuild:
+  Pyqt 3.14 compatibility patch
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> quickrip-0.7.ebuild,
+  quickrip-0.8.ebuild:
+  Marked stable x86
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> quickrip-0.6.ebuild,
+  quickrip-0.7.ebuild, quickrip-0.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> quickrip-0.8.ebuild:
+  Marked ~amd64.
+
+  17 May 2004; Patrick Kursawe <phosphan@gentoo.org> quickrip-0.4.ebuild,
+  quickrip-0.5.ebuild:
+  Cleanup
+
+  11 May 2004; Patrick Kursawe <phosphan@gentoo.org> quickrip-0.6.ebuild:
+  Adjusted HOMEPAGE for latest stable
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> quickrip-0.4.ebuild,
+  quickrip-0.5.ebuild, quickrip-0.6.ebuild, quickrip-0.7.ebuild:
+  Add missing IUSE.
+
+*quickrip-0.8 (14 Oct 2003)
+
+  14 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> quickrip-0.8.ebuild:
+  Version bump, added man pages. (bug #25648) Thanks Tom Chance <tomchance@gmx.net>
+
+*quickrip-0.7 (04 Jul 2003)
+  
+  04 Jul 2003; Michele Balistreri <brain@gentoo.org> quickrip-0.7:
+  Version bump, thanks to Carlo <current@myrealbox.com>
+
+  12 Jun 2003; <msterret@gentoo.org> quickrip-0.4.ebuild, quickrip-0.5.ebuild,
+  quickrip-0.6.ebuild:
+  add Header
+
+*quickrip-0.6 (05 May 2003)
+
+  05 May 2003; Alastair Tse <liquidx@gentoo.org> quickrip-0.6.ebuild:
+  version bump
+
+*quickrip-0.5 (21 Apr 2003)
+
+  21 Apr 2003; Alastair Tse <liquidx@gentoo.org> quickrip-0.5.ebuild:
+  version bump
 
 *quickrip-0.4 (16 Apr 2003)
 
diff --git a/media-video/quickrip/Manifest b/media-video/quickrip/Manifest
index d29cc502c453..bf4d87c2cffb 100644
--- a/media-video/quickrip/Manifest
+++ b/media-video/quickrip/Manifest
@@ -1,3 +1,5 @@
-MD5 76c0451ff9261a0c7e6c6ec203e74619 quickrip-0.4.ebuild 754
-MD5 9a2815b15654e6e34d94bc92a749f103 ChangeLog 387
-MD5 92025d483fe0f9f3e3a262f08abb0698 files/digest-quickrip-0.4 63
+MD5 05b56a8e01c77cf63c6f3937d0bda238 quickrip-0.8-r1.ebuild 957
+MD5 598d742089791f3bdd3832d3dd818d1e ChangeLog 2283
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 adc39b64a6ce931acf1e03e094697a4b files/quickrip-sizetype.patch 16923
+MD5 73afca4a7de3128d8d917e91692b64d0 files/digest-quickrip-0.8-r1 64
diff --git a/media-video/quickrip/quickrip-0.8-r1.ebuild b/media-video/quickrip/quickrip-0.8-r1.ebuild
index c6025f81e5ca..95ea2d1a48b0 100644
--- a/media-video/quickrip/quickrip-0.8-r1.ebuild
+++ b/media-video/quickrip/quickrip-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-video/quickrip/quickrip-0.8-r1.ebuild,v 1.1 2005/02/22 20:59:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/quickrip/quickrip-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
-inherit eutils
+inherit eutils qt3
 
 S="${WORKDIR}/quickrip"
 DESCRIPTION="Basic DVD ripper written in Python with Qt and command line interfaces."
@@ -10,11 +10,11 @@ HOMEPAGE="http://quickrip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/quickrip/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -ppc -mips ~amd64"
+KEYWORDS="~amd64 -mips -ppc x86"
 IUSE=""
 DEPEND="virtual/libc
 	>=dev-lang/python-2.2
-	>=x11-libs/qt-3.1
+	$(qt_min_version 3.1)
 	>=dev-python/PyQt-3.5-r1
 	media-video/mplayer
 	media-video/transcode"
diff --git a/media-video/realplayer/ChangeLog b/media-video/realplayer/ChangeLog
index b69597b221bf..a844db2d2957 100644
--- a/media-video/realplayer/ChangeLog
+++ b/media-video/realplayer/ChangeLog
@@ -1,11 +1,195 @@
 # ChangeLog for media-video/realplayer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/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-video/realplayer/ChangeLog,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
+
+  20 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> -files/mimeinfo,
+  -files/realplayer.desktop, -realplayer-8-r6.ebuild,
+  -realplayer-8-r7.ebuild, -realplayer-10.0.2.ebuild,
+  -realplayer-10.0.3.ebuild, -realplayer-10.0.3-r1.ebuild,
+  -realplayer-10.0.4.ebuild, -realplayer-10.0.5.ebuild:
+  Remove old versions.
+
+  07 Oct 2005; Simon Stelling <blubb@gentoo.org> realplayer-10.0.6.ebuild:
+  stable on amd64 wrt bug 107309
+
+  04 Oct 2005; Paul Varner <fuzzyray@gentoo.org> realplayer-10.0.6.ebuild:
+  stable on x86. Bug# 107309
+
+  02 Oct 2005; Marc Hildebrand <zypher@gentoo.org> realplayer-10.0.6.ebuild:
+  Version bump.
+
+  25 Sep 2005; Carsten Lohrke <carlo@gentoo.org> realplayer-10.0.5.ebuild:
+  Fixed url.
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  realplayer-10.0.3.ebuild, realplayer-10.0.3-r1.ebuild,
+  realplayer-10.0.4.ebuild, realplayer-10.0.5.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
+
+  12 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  realplayer-10.0.2.ebuild, realplayer-10.0.3.ebuild,
+  realplayer-10.0.3-r1.ebuild, realplayer-10.0.4.ebuild,
+  realplayer-10.0.5.ebuild:
+  Rename mozilla useflag into nsplugin.
+
+  11 Jul 2005; Herbie Hopkins <herbs@gentoo.org> realplayer-10.0.5.ebuild:
+  Stable on amd64 wrt bug #89951.
+
+  06 Jul 2005; <brix@gentoo.org> realplayer-10.0.5.ebuild:
+  Stable on x86, bug #96923.
+
+*realplayer-10.0.5 (24 Jun 2005)
+
+  24 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +realplayer-10.0.5.ebuild:
+  New upstream version, fixes installation of icons to hicolor theme.
+
+  26 May 2005; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Herd name is 'video' not 'media-video'
+
+  21 Apr 2005; Olivier Crête <tester@gentoo.org> realplayer-10.0.4.ebuild:
+  Stable on x86 per security bug #89862
+
+*realplayer-10.0.4 (21 Apr 2005)
+
+  21 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +realplayer-10.0.4.ebuild:
+  Added new upstream version.
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  realplayer-10.0.2.ebuild, realplayer-10.0.3-r1.ebuild,
+  realplayer-10.0.3.ebuild:
+  updated maintainer information in metadata.xml according to comment #1 in bug
+  #86285, chriswhite is retired. also fixed the depend.
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> realplayer-10.0.3.ebuild:
+  digest fixes
+
+*realplayer-10.0.3-r1 (29 Mar 2005)
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +realplayer-10.0.3-r1.ebuild:
+  corrected src_uri, fixes #86564
+
+  19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> realplayer-10.0.3.ebuild:
+  added ~amd64 to KEYWORDS, fixes #85080
+
+  15 Mar 2005; Chris White <chriswhite@gentoo.org> realplayer-10.0.3.ebuild:
+  Fixed bug #85246.
+
+*realplayer-10.0.3 (13 Mar 2005)
+
+  13 Mar 2005; Chris White <chriswhite@gentoo.org> +realplayer-10.0.3.ebuild:
+  Fixing bug #40469, which also fixes an (unreported?) security bug. Stable on
+  x86.
+
+  08 Feb 2005; Chris White <chriswhite@gentoo.org> realplayer-10.0.2.ebuild:
+  Fixing all the 'bump realplayer' bugs.  Also added the language pack logic.
+
+*realplayer-10.0.2 (09 Jan 2005)
+
+  09 Jan 2005; Chris White <chriswhite@gentoo.org> +realplayer-10.0.2.ebuild:
+  Putting this out finally. This fixes so many bugs and forum posts, I'm not
+  going to list them all :).
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  realplayer-8-r6.ebuild, realplayer-8-r7.ebuild:
+  virtual/glibc -> virtual/libc
+
+  15 Mar 2004; Seemant Kulleen <seemant@gentoo.org> realplayer-8-r5.ebuild:
+  remove -r5 as it was unstable on all arches, which -r7 will be, plus it
+  violated bug 44712 by Michael Sterret <mr_bones_@gentoo.org>
+
+  28 Feb 2004; Alastair Tse <liquidx@gentoo.org> realplayer-8-r7.ebuild:
+  add mention about artsdsp (#30699)
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> realplayer-8-r6.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> realplayer-8-r6.ebuild:
+  set ppc in keywords
+
+*realplayer-8-r7 (02 Nov 2003)
+
+  02 Nov 2003; Alastair Tse <liquidx@gentoo.org> realplayer-8-r6.ebuild,
+  realplayer-8-r7.ebuild:
+  split rv9 codecs to media-plugins/realvideo-codecs, switched to pkg_nofetch()
+  and cleaned up src_unpack()
+
+  09 Sep 2003; Alastair Tse <liquidx@gentoo.org> realplayer-8-r2.ebuild,
+  realplayer-8-r3.ebuild, realplayer-8-r4.ebuild, realplayer-8-r6.ebuild:
+  cleanup and bumping -r6 to stable x86
+
+  07 Sep 2003; Jason Wever <weeve@gentoo.org> realplayer-8-r6.ebuild:
+  Added fix for bug #15314.
+
+  05 Sep 2003; Alastair Tse <liquidx@gentoo.org> realplayer-8-r6.ebuild:
+  un-redefine ${A}
+
+*realplayer-8-r6 (19 Jul 2003)
+
+  19 Jul 2003; lanius@gentoo.org realplayer-8-r6.ebuild:
+  fixed bug #24801 use /usr/share/applnk instead of ${KDEDIR/share/applnnk to
+  remove dep on kde-env
+
+  13 Jul 2003; Seemant Kulleen <seemant@gentoo.org> realplayer-8-r5.ebuild:
+  CJ Kucera's patch to add the digests for the different realplayers.  See
+  bug #24391.
+
+*realplayer-8-r5 (09 Feb 2003)
+
+  16 Mar 2003; Alastair Tse <liquidx@gentoo.org> realplayer-8-r5.ebuild,
+  files/realplayer.desktop:
+  tested and gnome2-ified menu entry. changed pixmap installation dir
+  and fixed icon in menu entry.
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> realplayer-8-r5.ebuild
+  files/digest-realplayer-8-r5 :
+
+  Inherits kde eclass so that kde menu entries go into the right place, and
+  also fixes for gnome menu entries (needs a bit of verification). Thanks
+  to: Matt Caesar <deegle2003@yahoo.com> and Alastair Tse
+  <gentoo@liquidx.net> in bug #15295
+
+*realplayer-8-r4 (08 Jan 2003)
+
+  14 Jan 2003; Martin Holzer <mholzer@gentoo.org> realplayer-8-r4.ebuild :
+  Latest update, this should fix all problems.
+
+  12 Jan 2003; Seemant Kulleen <seemant@gentoo.org> realplayer-8-r4.ebuild :
+
+  Removed ${MY_P} from SRC_URI, so the ebuild doesn't break after it tries
+  to fetch the fetch restricted stuffs.  Thanks to: moixa@gmx.ch <Tobias
+  Sager> in bug #10066.
+
+  12 Jan 2003; Martin Holzer <mholzer@gentoo.org> realplayer-8-r4.ebuild :
+  Fixed script, now display's how it should do 
+
+  08 Jan 2003; Seemant Kulleen <seemant@gentoo.org> realplayer-8-r4.ebuild
+  files/realplayer.desktop files/mimeinfo files/digest-realplayer-8-r4 :
+
+  This is a new multi-architecture capable ebuild.  Currently, it will
+  install for ppc, sparc, alpha and x86 .  This ebuild
+  courtesy of the brilliance of: danny@ricin.com (Danny Pansters) in bug
+  #10066
+
+*realplayer-8-r3 (21 Nov 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  21 Nov 2002; phoen][x <phoenix@gentoo.org> realplayer-8-r3.ebuild,
+  files/digest-realplayer-8-r3 :
+  Switched to the new nsplugins layout.
+
+*realplayer-8-r2 (2 Mar 2002)
+
+  2 Mar 2002; William McArthur <sandymac@gentoo.org> realplayer-8-r2.ebuild :
+  Updated ebuild for Mozilla and added LICENSE. I also changed the files in
+  /opt/netscape/plugins/* to be symlinks.
 
 *realplayer-8-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-video/realplayer/Manifest b/media-video/realplayer/Manifest
index e69de29bb2d1..c8b4ceabb933 100644
--- a/media-video/realplayer/Manifest
+++ b/media-video/realplayer/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 235f80bcbd6e73997daed48729db130d ChangeLog 7550
+MD5 5770afeac4496095cec26d13745be3b4 files/10realplayer 48
+MD5 fe07b99482f4666466b84e33f7dcb94f files/digest-realplayer-10.0.6 85
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 1ca8d0c2b8d96b34153677b9f1c17561 realplayer-10.0.6.ebuild 1982
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgG9UAiZjviIA2XgRAuMjAJ0bIXPcXqHUEFvrA/U+AfeioFjGhgCg4TkN
+7j4c1v25/G8dn0I02s0F1iE=
+=mX90
+-----END PGP SIGNATURE-----
diff --git a/media-video/realplayer/files/10realplayer b/media-video/realplayer/files/10realplayer
index 358746d3f247..500fb3236e43 100644
--- a/media-video/realplayer/files/10realplayer
+++ b/media-video/realplayer/files/10realplayer
@@ -1 +1,2 @@
 PATH=/opt/RealPlayer8
+ROOTPATH=/opt/RealPlayer8
diff --git a/media-video/realplayer/metadata.xml b/media-video/realplayer/metadata.xml
index 76b9f6f406d5..d9df1878d8e2 100644
--- a/media-video/realplayer/metadata.xml
+++ b/media-video/realplayer/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>liquidx@gentoo.org</email></maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/realplayer/realplayer-10.0.6.ebuild b/media-video/realplayer/realplayer-10.0.6.ebuild
index 4ad7bf806bbd..baf4893b2e9f 100644
--- a/media-video/realplayer/realplayer-10.0.6.ebuild
+++ b/media-video/realplayer/realplayer-10.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-video/realplayer/realplayer-10.0.6.ebuild,v 1.1 2005/10/03 14:49:48 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/realplayer/realplayer-10.0.6.ebuild,v 1.1.1.1 2005/11/30 09:57:57 chriswhite Exp $
 
 inherit nsplugins eutils rpm
 
@@ -10,7 +10,7 @@ HOMEPAGE="https://player.helixcommunity.org/2005/downloads/"
 SRC_URI="https://helixcommunity.org/download.php/1589/${MY_PN}-${PV}.776-20050915.i586.rpm"
 LICENSE="HBRL"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nsplugin"
 
 # take this out until I get the realplayer source
diff --git a/media-video/recmpeg/ChangeLog b/media-video/recmpeg/ChangeLog
index c2e7b2fc429f..3f8893b9ff02 100644
--- a/media-video/recmpeg/ChangeLog
+++ b/media-video/recmpeg/ChangeLog
@@ -1,8 +1,20 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/recmpeg/ChangeLog,v 1.1 2002/11/20 21:01:01 phoenix Exp $
+# ChangeLog for media-video/recmpeg
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/recmpeg/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
-*media-video/recmpeg (20 Nov 2002)
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> recmpeg-1.0.5.ebuild:
+  Don't install INSTALL file.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> recmpeg-1.0.5.ebuild:
+  Added to ~ppc.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> recmpeg-1.0.5.ebuild:
+  virtual/glibc -> virtual/libc
+
+*recmpeg-1.0.5 (20 Nov 2002)
 
   20 Nov 2002; phoen][x <phoenix@gentoo.org> recmpeg-1.0.5.ebuild,
   files/digest-recmpeg-1.0.5, ChangeLog :
diff --git a/media-video/recmpeg/Manifest b/media-video/recmpeg/Manifest
index e69de29bb2d1..dd3e098d8c65 100644
--- a/media-video/recmpeg/Manifest
+++ b/media-video/recmpeg/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b277064523f5489b49ee27ec74737c13 ChangeLog 834
+MD5 d0dbcd5d7cfd35d5d7392f1e2833f3f1 recmpeg-1.0.5.ebuild 822
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 b8fd974d42d5f9451db54b08e9685eeb files/digest-recmpeg-1.0.5 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv8Sj5H05b2HAEkRAjyrAKCFgC3jsZWXxvcTy90f2DBTbdTwWQCdEH6q
+NHVFpzGqjwlSIwayF3fb60U=
+=O4Fg
+-----END PGP SIGNATURE-----
diff --git a/media-video/recmpeg/metadata.xml b/media-video/recmpeg/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/recmpeg/metadata.xml
+++ b/media-video/recmpeg/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/recmpeg/recmpeg-1.0.5.ebuild b/media-video/recmpeg/recmpeg-1.0.5.ebuild
index ad8be179600a..a56c7ab3cbc5 100644
--- a/media-video/recmpeg/recmpeg-1.0.5.ebuild
+++ b/media-video/recmpeg/recmpeg-1.0.5.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/recmpeg/recmpeg-1.0.5.ebuild,v 1.1 2002/11/20 21:01:01 phoenix Exp $
-
-IUSE=""
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/recmpeg/recmpeg-1.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 DESCRIPTION="recmpeg is a simple video encoder, based on libfame, which compresses raw video sequences to MPEG video"
+HOMEPAGE="http://fame.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fame/${P}.tar.gz"
-HOMEPAGE="http://fame.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE="mmx sse"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=media-libs/libfame-0.9.0"
 
 src_compile() {
@@ -27,5 +26,5 @@ src_compile() {
 
 src_install() {
 	einstall install || die "einstall died"
-	dodoc CHANGES README INSTALL NEWS
+	dodoc CHANGES README NEWS
 }
diff --git a/media-video/replex/ChangeLog b/media-video/replex/ChangeLog
index a7788e5d74df..91d458f14046 100644
--- a/media-video/replex/ChangeLog
+++ b/media-video/replex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/replex
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/replex/ChangeLog,v 1.1 2005/03/29 02:34:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/replex/ChangeLog,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> replex-0.1.4.ebuild:
+  Added to ~ppc.
 
 *replex-0.1.4 (29 Mar 2005)
 
diff --git a/media-video/replex/Manifest b/media-video/replex/Manifest
index 77f4fb67a116..de91506b322a 100644
--- a/media-video/replex/Manifest
+++ b/media-video/replex/Manifest
@@ -1,4 +1,4 @@
-MD5 398a30e7cd0f610a9f34f4f17e7d7678 ChangeLog 374
+MD5 3755b3761d7d0bd83cf69ad288e5e205 ChangeLog 547
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 62b861b9f26eef5b2854ec49c198e819 replex-0.1.4.ebuild 557
+MD5 76b9aead6a9ab5c2b577322acb6a551e replex-0.1.4.ebuild 661
 MD5 0429847bf769f333776f71856db1302b files/digest-replex-0.1.4 63
diff --git a/media-video/replex/replex-0.1.4.ebuild b/media-video/replex/replex-0.1.4.ebuild
index 43235f7c7d10..17fe8a85bb01 100644
--- a/media-video/replex/replex-0.1.4.ebuild
+++ b/media-video/replex/replex-0.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/replex/replex-0.1.4.ebuild,v 1.1 2005/03/29 02:34:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/replex/replex-0.1.4.ebuild,v 1.1.1.1 2005/11/30 09:57:42 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 src_compile() {
diff --git a/media-video/ripmake/ChangeLog b/media-video/ripmake/ChangeLog
index c6c611cd00f8..16d58b6b3c0c 100644
--- a/media-video/ripmake/ChangeLog
+++ b/media-video/ripmake/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for media-sound/chaplin
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ripmake/ChangeLog,v 1.1 2004/10/06 20:39:15 trapni Exp $
+# ChangeLog for media-video/ripmake
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ripmake/ChangeLog,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> ripmake-1.39.ebuild:
+  Added to ~ppc.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> ripmake-1.39.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ripmake-1.39.ebuild:
+  Added to ~amd64.  Fixed LICENSE.
 
 *chaplin-1.10 (21 Aug 2004)
 
diff --git a/media-video/ripmake/Manifest b/media-video/ripmake/Manifest
index 894143ed10c7..adeed54a2574 100644
--- a/media-video/ripmake/Manifest
+++ b/media-video/ripmake/Manifest
@@ -1,3 +1,4 @@
-MD5 2d5a4eabae0c709bcfc7aa4ccadc48f6 .ripmake-1.39.ebuild.swp 12288
-MD5 6db4ed5a725fbbf189d5c6bee29de3dd ripmake-1.39.ebuild 748
+MD5 9d204c6c5cce68493a91f23dc7e1b67e ChangeLog 726
+MD5 446c2ccebfd17f0cf3aa8e8d8b815635 metadata.xml 233
+MD5 27a08229a0d7f8a84006493a45dfd663 ripmake-1.39.ebuild 1021
 MD5 65f652a6b4ba77918181890d8f0bd582 files/digest-ripmake-1.39 59
diff --git a/media-video/ripmake/ripmake-1.39.ebuild b/media-video/ripmake/ripmake-1.39.ebuild
index c171c5e40e9d..2480be0e67b7 100644
--- a/media-video/ripmake/ripmake-1.39.ebuild
+++ b/media-video/ripmake/ripmake-1.39.ebuild
@@ -1,30 +1,34 @@
-# Copyright 1999-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-video/ripmake/ripmake-1.39.ebuild,v 1.1 2004/10/06 20:39:15 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ripmake/ripmake-1.39.ebuild,v 1.1.1.1 2005/11/30 09:57:56 chriswhite Exp $
+
+IUSE="dvd"
+
+S="${WORKDIR}"
 
 DESCRIPTION="This is a program to rip dvd to AVI/VCD/SVCD automagically using with optional use of cpdvd to copy a dvd to harddrive before transcoding"
-HOMEPAGE="http://www.lallafa.de/bp/ripmake.html"
 SRC_URI="http://www.lallafa.de/bp/files/${P}.gz"
+HOMEPAGE="http://www.lallafa.de/bp/ripmake.html"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="dvd"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6.1-r1
+	>=media-video/transcode-0.6.10
+	>=media-video/pgmfindclip-1.13
+	>=media-video/chaplin-1.10
+	>=media-sound/ogmtools-1.0.1
+	>=media-video/mjpegtools-1.6.0-r7
+	>=media-sound/toolame-02l
+	>=media-sound/sox-12.17.3-r3
+	>=media-video/mpglen-0.1
+	>=media-video/mkvtoolnix-0.7.1
+	dvd? ( >=media-video/cpvts-1.2
+	       >=media-video/dvdbackup-0.1.1
+	       >=media-video/cpdvd-1.10 )"
 
-DEPEND="
-	>=perl-5.6.1-r1
-	>=transcode-0.6.10
-	>=pgmfindclip-1.13
-	>=chaplin-1.10
-	>=ogmtools-1.0.1
-	>=mjpegtools-1.6.0-r7
-	>=toolame-02l
-	>=sox-12.17.3-r3
-	>=mpglen-0.1
-	>=mkvtoolnix-0.7.1
-	dvd? ( >=cpvts-1.2 )
-	dvd? ( >=dvdbackup-0.1.1 )
-	dvd? ( >=cpdvd-1.10 )
-"
 src_install() {
-	dobin $S || die
+	newbin ${P} ${PN} || die
 }
diff --git a/media-video/sampeg3/ChangeLog b/media-video/sampeg3/ChangeLog
index 630e0115d4d9..e347d1fef6a5 100644
--- a/media-video/sampeg3/ChangeLog
+++ b/media-video/sampeg3/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for media-video/sampeg3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/ChangeLog,v 1.1 2003/06/27 12:43:15 pylon Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> sampeg3-0.0.3.ebuild:
+  Don't install INSTALL file.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sampeg3-0.0.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; sampeg3-0.0.3.ebuild:
+  Change x11-base/xfree dependency to virtual/x11 (#52153).
+
+  18 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> sampeg3-0.0.3.ebuild:
+  IUSE was not really used, setting to "" - removing superfluous or even
+  forbidden variable settings, see bug #44517
+
+*sampeg3-0.0.3 (27 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
 
   27 Jun 2003; Lars Weiler <pylon@gentoo.org> :
   Initial import.
diff --git a/media-video/sampeg3/Manifest b/media-video/sampeg3/Manifest
index ad633e8960e5..50a7ceef53b7 100644
--- a/media-video/sampeg3/Manifest
+++ b/media-video/sampeg3/Manifest
@@ -1,2 +1,14 @@
-MD5 a3a91645b059b8072880481f46dd4ab5 sampeg3-0.0.3.ebuild 859
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 be885ffbb476e85a2dedd219df2f911d ChangeLog 1102
+MD5 a32d491a57ef80b73d2373082b31a2e4 sampeg3-0.0.3.ebuild 897
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 17672dee1b88259a5f93ee1a17086396 files/digest-sampeg3-0.0.3 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv8uj5H05b2HAEkRAsCKAJoChotE+98EN/od5Z+lbmt3OcBHJgCgo2Yo
+Zw9R3ELXdHRKcgJufpBdsy8=
+=BsUw
+-----END PGP SIGNATURE-----
diff --git a/media-video/sampeg3/metadata.xml b/media-video/sampeg3/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/sampeg3/metadata.xml
+++ b/media-video/sampeg3/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/sampeg3/sampeg3-0.0.3.ebuild b/media-video/sampeg3/sampeg3-0.0.3.ebuild
index 092ad5e01f45..bc6bbd08e438 100644
--- a/media-video/sampeg3/sampeg3-0.0.3.ebuild
+++ b/media-video/sampeg3/sampeg3-0.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/sampeg3-0.0.3.ebuild,v 1.1 2003/06/27 12:43:15 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/sampeg3-0.0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 DESCRIPTION="MPEG video encoder targeted for optimum picture quality"
 HOMEPAGE="http://rachmaninoff.informatik.uni-mannheim.de/sampeg/"
@@ -11,34 +11,25 @@ SLOT="1.0"
 
 KEYWORDS="~x86 ~ppc"
 
-IUSE="mpeg"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 		sys-libs/zlib
 		>=media-libs/libvideogfx-1.0
 		media-libs/libpng
 		media-libs/jpeg
-		x11-base/xfree"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}
+		virtual/x11"
 
 src_compile() {
-
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man || die "./configure failed"
-
 	emake || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
-
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
-
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/media-video/setpwc/ChangeLog b/media-video/setpwc/ChangeLog
index 5f99ed6bc5d0..92b397fbb9f5 100644
--- a/media-video/setpwc/ChangeLog
+++ b/media-video/setpwc/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-video/setpwc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/setpwc/ChangeLog,v 1.1 2005/01/21 08:09:15 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/setpwc/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> setpwc-0.9.ebuild:
+  Added to ~ppc.
+
+  27 Jul 2005; Patrick Kursawe <phosphan@gentoo.org> setpwc-0.9.ebuild:
+  Latest stable for x86
+
+*setpwc-0.9 (27 Apr 2005)
+
+  27 Apr 2005; Patrick Kursawe <phosphan@gentoo.org> setpwc-0.8.ebuild,
+  +setpwc-0.9.ebuild:
+  Version bump
+
+  06 Feb 2005; Simon Stelling <blubb@gentoo.org> setpwc-0.8.ebuild:
+  added ~amd64
+
+  27 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> :
+  Tarball changed upstream -> updated digest
 
 *setpwc-0.8 (21 Jan 2005)
 
diff --git a/media-video/setpwc/Manifest b/media-video/setpwc/Manifest
index f6cfff7d6a48..635852a84383 100644
--- a/media-video/setpwc/Manifest
+++ b/media-video/setpwc/Manifest
@@ -1,3 +1,6 @@
-MD5 73cbb69604c125e511818a971f364015 setpwc-0.8.ebuild 479
+MD5 759f5409151eb7d628e30abad8167926 ChangeLog 869
 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
-MD5 41046926c9873d54aefa7ba6bf4a6ff8 files/digest-setpwc-0.8 57
+MD5 75f4f036ad1e4173508583ea3f9fab6a setpwc-0.8.ebuild 687
+MD5 dcaf53530bf5a1298f9fa808be7dfd46 setpwc-0.9.ebuild 711
+MD5 1f2c5d3816ec73d07d910eb9c0c761ce files/digest-setpwc-0.8 57
+MD5 eb4f2336c4d75eafc987a5859d031a6f files/digest-setpwc-0.9 57
diff --git a/media-video/setpwc/files/digest-setpwc-0.8 b/media-video/setpwc/files/digest-setpwc-0.8
index a84eb0542617..6b24898d9271 100644
--- a/media-video/setpwc/files/digest-setpwc-0.8
+++ b/media-video/setpwc/files/digest-setpwc-0.8
@@ -1 +1 @@
-MD5 4d6ec49cb97a2865afe40aef618f9a6b setpwc-0.8.tgz 7705
+MD5 57d9790ec06b219785c6ba34c0623860 setpwc-0.8.tgz 8127
diff --git a/media-video/setpwc/setpwc-0.8.ebuild b/media-video/setpwc/setpwc-0.8.ebuild
index d894dc71e238..72720ccc805e 100644
--- a/media-video/setpwc/setpwc-0.8.ebuild
+++ b/media-video/setpwc/setpwc-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-video/setpwc/setpwc-0.8.ebuild,v 1.1 2005/01/21 08:09:15 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/setpwc/setpwc-0.8.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 DESCRIPTION="Control various aspects of Philips (and compatible) webcams"
 HOMEPAGE="http://www.vanheusden.com/setpwc/"
@@ -8,12 +8,12 @@ SRC_URI="http://www.vanheusden.com/setpwc/${P}.tgz"
 LICENSE="GPL-1 GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 IUSE=""
 
 DEPEND="virtual/libc
-	virtual/linux-sources"
+	sys-kernel/linux-headers"
 
 src_compile() {
 	emake CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
diff --git a/media-video/setpwc/setpwc-0.9.ebuild b/media-video/setpwc/setpwc-0.9.ebuild
index fa6706572e9f..79b255f12323 100644
--- a/media-video/setpwc/setpwc-0.9.ebuild
+++ b/media-video/setpwc/setpwc-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-video/setpwc/setpwc-0.9.ebuild,v 1.1 2005/04/27 07:22:04 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/setpwc/setpwc-0.9.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 DESCRIPTION="Control various aspects of Philips (and compatible) webcams"
 HOMEPAGE="http://www.vanheusden.com/setpwc/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.vanheusden.com/setpwc/${P}.tgz"
 LICENSE="GPL-1 GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 
diff --git a/media-video/sonic-snap/ChangeLog b/media-video/sonic-snap/ChangeLog
index 365366f6eff6..0692de3d1f60 100644
--- a/media-video/sonic-snap/ChangeLog
+++ b/media-video/sonic-snap/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/sonic-snap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/ChangeLog,v 1.1 2005/05/15 00:17:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/ChangeLog,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 *sonic-snap-1.5 (15 May 2005)
 
diff --git a/media-video/sonic-snap/Manifest b/media-video/sonic-snap/Manifest
index eac9092a0bf4..ea14096f3b09 100644
--- a/media-video/sonic-snap/Manifest
+++ b/media-video/sonic-snap/Manifest
@@ -1,4 +1,14 @@
-MD5 cfd31d9720e9bc2a3ad6d285c7affe72 metadata.xml 383
-MD5 7e06c2f7697a79572c8889bf7edbf9f0 sonic-snap-1.5.ebuild 1597
-MD5 4dbc2c3bdf452f71b05a071e8c7c8d5b ChangeLog 417
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4a07265129c209f42270b15d5c2557b ChangeLog 509
 MD5 d092e71ce6c3033f3c98eb4a6b1e313a files/digest-sonic-snap-1.5 65
+MD5 cfd31d9720e9bc2a3ad6d285c7affe72 metadata.xml 383
+MD5 31d91be7539b7b3b48d679c7ffca05ac sonic-snap-1.5.ebuild 1676
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0B7hI1lqEGTUzyQRAgmXAJ0Y8EKPSjfHmdZYPU2rpZHpdh0/AACghB40
+BS/V5Z5ryBJm76YKumozexE=
+=UYjI
+-----END PGP SIGNATURE-----
diff --git a/media-video/sonic-snap/sonic-snap-1.5.ebuild b/media-video/sonic-snap/sonic-snap-1.5.ebuild
index d530c68d8eb2..3894ac7c8153 100644
--- a/media-video/sonic-snap/sonic-snap-1.5.ebuild
+++ b/media-video/sonic-snap/sonic-snap-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-video/sonic-snap/sonic-snap-1.5.ebuild,v 1.1 2005/05/15 00:17:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sonic-snap/sonic-snap-1.5.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 inherit eutils linux-info
 
@@ -45,14 +45,14 @@ src_install() {
 
 pkg_postinst() {
 
-	ewarn ""
+	ewarn
 	einfo "This application has found the sn9c10x driver (sn9c102.ko)"
 	einfo "enabled in the USB section of your kernel config.  Also,"
 	einfo "this driver is V4L v2 only, so V4L v1 apps will not work."
 	einfo "Finally, only a few image sensors are supported, eg, PAS106B"
 	einfo "so (check dmesg or /var/log/messages for USB device info when"
 	einfo "you plug the cam in)."
-	einfo ""
+	einfo
 	einfo "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)."
-	ewarn ""
+	ewarn
 }
diff --git a/media-video/spca5xx/ChangeLog b/media-video/spca5xx/ChangeLog
index 9a30954d761d..879e363cbbe3 100644
--- a/media-video/spca5xx/ChangeLog
+++ b/media-video/spca5xx/ChangeLog
@@ -1,7 +1,50 @@
 # ChangeLog for media-video/spca5xx
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.1 2004/12/26 01:05:07 kingtaco Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/ChangeLog,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
-  25 Dec 2004; Mike Doty <kingtaco@gentoo.org> :
-  Initial import
+  02 Oct 2005; Mike Doty <mike@gentoo.org> spca5xx-20050903.ebuild:
+  fixed $HOMEPAGE, bug 106643
+
+  05 Sep 2005; Mike Doty <kingtaco@gentoo.org> spca5xx-20050701.ebuild:
+  stable on amd64
+
+  05 Sep 2005; Mike Doty <kingtaco@gentoo.org> spca5xx-20050903.ebuild:
+  bump to 20050903
+
+  10 Jul 2005; David Holm <dholm@gentoo.org> spca5xx-20050701.ebuild:
+  Added to ~ppc.
+
+*spca5xx-20050701 (09 Jul 2005)
+
+  09 Jul 2005; Mike Doty <kingtaco@gentoo.org> +spca5xx-20050701.ebuild:
+  version bump to 20050701
+
+*spca5xx-20050501 (19 May 2005)
+
+  19 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +spca5xx-20050501.ebuild:
+  new upstream version
+
+*spca5xx-20050328 (30 Mar 2005)
+
+  30 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +spca5xx-20050328.ebuild:
+  new upstream version, fixes #87250
+
+  12 Mar 2005; Mike Doty <kingtaco@gentoo.org> spca5xx-20050301.ebuild:
+  removed src_compile, as it's provided by linux-mod.eclass
+
+*spca5xx-20050301 (10 Mar 2005)
+
+  10 Mar 2005; Mike Doty <kingtaco@gentoo.org> +spca5xx-20050301.ebuild:
+  version bump
+
+*spca5xx-20050206 (14 Feb 2005)
+
+  14 Feb 2005; Mike Doty <kingtaco@gentoo.org> +spca5xx-20050206.ebuild:
+  version bump.  bug 81873
+
+*spca5xx-20050116 (05 Feb 2005)
+
+  05 Feb 2005; Mike Doty <kingtaco@gentoo.org> +spca5xx-20050116.ebuild:
+  version bump
 
diff --git a/media-video/spca5xx/Manifest b/media-video/spca5xx/Manifest
index 0edb27c6df99..e88f0ecdab3f 100644
--- a/media-video/spca5xx/Manifest
+++ b/media-video/spca5xx/Manifest
@@ -1,2 +1,30 @@
-MD5 c7e179364d3248195945d580d532ae17 spca5xx-20041224.ebuild 6933
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ae0d4329363540bf3701319a3fbd75f spca5xx-20041224.ebuild 761
+MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
+MD5 54dda228ae4bf3a2cfb1aee26cb421e5 ChangeLog 1515
+MD5 d4a581acddc51b917c11ce364888e0dc spca5xx-20050109.ebuild 763
+MD5 2e9751c7875ff7f98e98b587462dfe73 spca5xx-20050116.ebuild 763
+MD5 91dc9297c041b0330a7213c94805cba1 spca5xx-20050206.ebuild 763
+MD5 47d695b0309768e005b78ebb4026771f spca5xx-20050301.ebuild 843
+MD5 05a0d4416ffdd5c395cc39fee24eb667 spca5xx-20050328.ebuild 845
+MD5 872daf43fc24a9bdadeaf9fdb6d35e95 spca5xx-20050501.ebuild 845
+MD5 e79fa515a694bd255107cbc74acdc479 spca5xx-20050903.ebuild 787
+MD5 60e1e234ec108f6915dbf4c3d0bbdbfb spca5xx-20050701.ebuild 803
 MD5 c4d8ea87a30b78a071254dd874d04354 files/digest-spca5xx-20041224 68
+MD5 692a0c62302943113f33304348af5118 files/digest-spca5xx-20050109 68
+MD5 ffa5b654bbfb968b689205dd9821b76a files/digest-spca5xx-20050116 68
+MD5 301ec7b211bcc85fdbd984e299f49a9e files/digest-spca5xx-20050206 68
+MD5 72ed2cd33f5c0b745cbb7cfd30aa7326 files/digest-spca5xx-20050301 68
+MD5 32836e8b6146b52bb1ec11dfa233ea50 files/digest-spca5xx-20050328 68
+MD5 d960648f0c0d606b020c5a34950cc8e0 files/digest-spca5xx-20050501 68
+MD5 248ffb8a7c2515878b94920a587704a5 files/digest-spca5xx-20050701 68
+MD5 3a8194eb01a1084675989f75a2d93bfc files/digest-spca5xx-20050903 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDQBED0K3RJaeXx6cRAowcAKDPpYZm+1gH/NlQyNH25YF/QrRlAACeID1X
+HygZMNaIg9ML/Cvh52wntGE=
+=Q5a8
+-----END PGP SIGNATURE-----
diff --git a/media-video/spca5xx/spca5xx-20041224.ebuild b/media-video/spca5xx/spca5xx-20041224.ebuild
index 2dcc6ba4057c..ad8d708a2acf 100644
--- a/media-video/spca5xx/spca5xx-20041224.ebuild
+++ b/media-video/spca5xx/spca5xx-20041224.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-video/spca5xx/spca5xx-20041224.ebuild,v 1.1 2004/12/26 01:05:07 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20041224.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://spca50x.sourceforge.net/spca50x.php"
 SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 RESTRICT=""
 DEPEND=""
diff --git a/media-video/spca5xx/spca5xx-20050109.ebuild b/media-video/spca5xx/spca5xx-20050109.ebuild
index f8fc344851c5..378b0d62ab98 100644
--- a/media-video/spca5xx/spca5xx-20050109.ebuild
+++ b/media-video/spca5xx/spca5xx-20050109.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050109.ebuild,v 1.1 2005/02/05 02:23:31 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050109.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/media-video/spca5xx/spca5xx-20050116.ebuild b/media-video/spca5xx/spca5xx-20050116.ebuild
index 2e3b8e29cdeb..1c074e197b27 100644
--- a/media-video/spca5xx/spca5xx-20050116.ebuild
+++ b/media-video/spca5xx/spca5xx-20050116.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050116.ebuild,v 1.1 2005/02/05 19:39:01 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050116.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/media-video/spca5xx/spca5xx-20050206.ebuild b/media-video/spca5xx/spca5xx-20050206.ebuild
index e5236af8e7b1..51361f581b76 100644
--- a/media-video/spca5xx/spca5xx-20050206.ebuild
+++ b/media-video/spca5xx/spca5xx-20050206.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050206.ebuild,v 1.1 2005/02/14 14:43:31 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050206.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/media-video/spca5xx/spca5xx-20050301.ebuild b/media-video/spca5xx/spca5xx-20050301.ebuild
index dac25cd38161..e919e0615dbe 100644
--- a/media-video/spca5xx/spca5xx-20050301.ebuild
+++ b/media-video/spca5xx/spca5xx-20050301.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050301.ebuild,v 1.1 2005/03/10 14:59:19 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050301.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
@@ -24,9 +24,9 @@ src_unpack() {
 	convert_to_m ${S}/Makefile
 }
 
-src_compile() {
-	linux-mod_src_compile
-}
+#src_compile() {
+#	linux-mod_src_compile
+#}
 
 src_install() {
 	dodoc CHANGELOG INSTALL README
diff --git a/media-video/spca5xx/spca5xx-20050328.ebuild b/media-video/spca5xx/spca5xx-20050328.ebuild
index 533529f9032a..67e1abde45a7 100644
--- a/media-video/spca5xx/spca5xx-20050328.ebuild
+++ b/media-video/spca5xx/spca5xx-20050328.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050328.ebuild,v 1.1 2005/03/30 13:43:46 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050328.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/media-video/spca5xx/spca5xx-20050501.ebuild b/media-video/spca5xx/spca5xx-20050501.ebuild
index 2e08adcb6ac5..2c8cf4d860b4 100644
--- a/media-video/spca5xx/spca5xx-20050501.ebuild
+++ b/media-video/spca5xx/spca5xx-20050501.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050501.ebuild,v 1.1 2005/05/19 16:10:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050501.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/media-video/spca5xx/spca5xx-20050701.ebuild b/media-video/spca5xx/spca5xx-20050701.ebuild
index 4915e04aa847..226c46c04ded 100644
--- a/media-video/spca5xx/spca5xx-20050701.ebuild
+++ b/media-video/spca5xx/spca5xx-20050701.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050701.ebuild,v 1.1 2005/07/09 17:52:11 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050701.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://spca50x.sourceforge.net/spca50x.php"
 SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 RESTRICT=""
 DEPEND=""
diff --git a/media-video/spca5xx/spca5xx-20050903.ebuild b/media-video/spca5xx/spca5xx-20050903.ebuild
index e31767bb7ef2..ace225e1c12c 100644
--- a/media-video/spca5xx/spca5xx-20050903.ebuild
+++ b/media-video/spca5xx/spca5xx-20050903.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-video/spca5xx/spca5xx-20050903.ebuild,v 1.1 2005/09/05 18:29:39 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spca5xx/spca5xx-20050903.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 inherit linux-mod
 
 DESCRIPTION="spca5xx driver for webcams."
-HOMEPAGE="http://spca50x.sourceforge.net/spca50x.php"
+HOMEPAGE="http://mxhaard.free.fr/spca5xx.html"
 SRC_URI="http://mxhaard.free.fr/spca50x/Download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-video/spcaview/ChangeLog b/media-video/spcaview/ChangeLog
index 644662ccad61..92e3adb46440 100644
--- a/media-video/spcaview/ChangeLog
+++ b/media-video/spcaview/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/spcaview
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/ChangeLog,v 1.1 2005/09/05 19:25:29 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/ChangeLog,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
+
+  05 Sep 2005; Mike Doty <kingtaco@gentoo.org> spcaview-20050701.ebuild:
+  added docs
 
 *spcaview-20050701 (05 Sep 2005)
 
diff --git a/media-video/spcaview/Manifest b/media-video/spcaview/Manifest
index 09099c335052..a150b6556269 100644
--- a/media-video/spcaview/Manifest
+++ b/media-video/spcaview/Manifest
@@ -1,4 +1,14 @@
-MD5 f967ba55132dbf0da82bac1fb4b9d1c3 spcaview-20050701.ebuild 544
-MD5 ec6b9ee4dce8441e8e7eff2fd64bda52 ChangeLog 120
-MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 17c161d3169ce20b4a0c11cb7442adf2 ChangeLog 445
 MD5 b5cb51b68d2db2eca60dcac2e05d9970 files/digest-spcaview-20050701 68
+MD5 334e4f71306cef3c0456b8ba59bbbfe8 metadata.xml 224
+MD5 8f02bbc8bc62ea5ad4f2ac414af0a894 spcaview-20050701.ebuild 606
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHKrKI1lqEGTUzyQRAnZeAJ9E/zUAkq13YK1gXEFKs7Qap4GGJwCdGTQX
+J+e+fbzf1AMChMjcmVdPqjY=
+=AFZF
+-----END PGP SIGNATURE-----
diff --git a/media-video/spcaview/spcaview-20050701.ebuild b/media-video/spcaview/spcaview-20050701.ebuild
index 2a5a7a2c58f4..aaea8555b31c 100644
--- a/media-video/spcaview/spcaview-20050701.ebuild
+++ b/media-video/spcaview/spcaview-20050701.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-video/spcaview/spcaview-20050701.ebuild,v 1.1 2005/09/05 19:25:29 kingtaco Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/spcaview/spcaview-20050701.ebuild,v 1.1.1.1 2005/11/30 09:57:54 chriswhite Exp $
 
 DESCRIPTION="A webcam viewer for the spca5xx driver."
 HOMEPAGE="http://mxhaard.free.fr/sview.html"
@@ -12,14 +10,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 DEPEND="media-libs/libsdl"
-RDEPEND="media-video/spca5xx"
-S=${WORKDIR}/${P}
-
-src_compile() {
-	emake || die "emake failed"
-}
+RDEPEND="${DEPEND}
+	media-video/spca5xx"
 
 src_install() {
 	dodir usr/bin
 	make BIN=${D}/usr/bin install || die
+	dodoc README Changelog
 }
diff --git a/media-video/sswf/ChangeLog b/media-video/sswf/ChangeLog
index f205c3311603..39a6f6ff6ef7 100644
--- a/media-video/sswf/ChangeLog
+++ b/media-video/sswf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/sswf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/ChangeLog,v 1.1 2005/01/28 05:56:27 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/ChangeLog,v 1.1.1.1 2005/11/30 09:57:23 chriswhite Exp $
+
+  23 Mar 2005; <blubb@gentoo.org> +files/bitsize.patch,
+  +files/sound_wave_t.patch, sswf-1.7.1.ebuild:
+  added Adam Polkosnik's patches to fix bug #83996
 
 *sswf-1.7.1 (28 Jan 2005)
 
diff --git a/media-video/sswf/Manifest b/media-video/sswf/Manifest
index 5c656ebab573..6e86ee30d817 100644
--- a/media-video/sswf/Manifest
+++ b/media-video/sswf/Manifest
@@ -1,2 +1,6 @@
-MD5 cbe5335e36fb53bbb0babf80f094b26c sswf-1.7.1.ebuild 694
+MD5 879e979979ffbf65d9e9f83de468e842 sswf-1.7.1.ebuild 926
+MD5 2e81f831b4e538f1a38b746690ccc4f4 ChangeLog 588
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 c392e1bf9a9d255e7ee4063fdd0a94f4 files/digest-sswf-1.7.1 135
+MD5 2f1d64349330efef29feb4f3488fbedb files/sound_wave_t.patch 927
+MD5 58facf820044cbb63f8205e5623b251a files/bitsize.patch 820
diff --git a/media-video/sswf/sswf-1.7.1.ebuild b/media-video/sswf/sswf-1.7.1.ebuild
index cc0ba159a01d..93a6e519eb82 100644
--- a/media-video/sswf/sswf-1.7.1.ebuild
+++ b/media-video/sswf/sswf-1.7.1.ebuild
@@ -1,16 +1,17 @@
-# 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-video/sswf/sswf-1.7.1.ebuild,v 1.1 2005/01/28 05:56:27 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sswf/sswf-1.7.1.ebuild,v 1.1.1.1 2005/11/30 09:57:23 chriswhite Exp $
 
+inherit eutils
 
 DESCRIPTION="A C++ Library and a script language tool to create Flash (SWF) movies up to version 6."
 HOMEPAGE="http://sswf.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2
-doc? ( mirror://sourceforge/${PN}/${P}-doc.tar.bz2 )"
+	doc? ( mirror://sourceforge/${PN}/${P}-doc.tar.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc debug"
 DEPEND="sys-libs/zlib
 	media-libs/jpeg
@@ -18,10 +19,17 @@ DEPEND="sys-libs/zlib
 	sys-devel/flex
 	sys-devel/bison"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/bitsize.patch
+	epatch ${FILESDIR}/sound_wave_t.patch
+}
+
 src_compile() {
 	econf \
-	$(use_enable debug) \
-	|| die "Configuration Failed!"
+		$(use_enable debug) \
+		|| die "Configuration Failed!"
 
 	emake || die "Make Failed"
 }
diff --git a/media-video/stan/ChangeLog b/media-video/stan/ChangeLog
index b0371b7901e7..b3c3f762869a 100644
--- a/media-video/stan/ChangeLog
+++ b/media-video/stan/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for media-video/stan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/stan/ChangeLog,v 1.1 2005/01/17 18:12:44 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/stan/ChangeLog,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 *stan-0.4.1 (17 Jan 2005)
 
diff --git a/media-video/stan/Manifest b/media-video/stan/Manifest
index 5d38bbc4de18..4830d9b68bc2 100644
--- a/media-video/stan/Manifest
+++ b/media-video/stan/Manifest
@@ -1,2 +1,4 @@
-MD5 ee9922f0b0ab60e32bec0e5c71e363f9 stan-0.4.1.ebuild 490
+MD5 5637adb90156b57ed21a30ac3005423c stan-0.4.1.ebuild 511
+MD5 6cf6a3da1ceafa23a34ca09e5225d7ed ChangeLog 406
+MD5 a741469ea595fb76ba3553cb2f3f9b9a metadata.xml 222
 MD5 b9f1671a1734aa05394e2bfc85152e6b files/digest-stan-0.4.1 61
diff --git a/media-video/stan/stan-0.4.1.ebuild b/media-video/stan/stan-0.4.1.ebuild
index 571d39dba201..445dbbe4593d 100644
--- a/media-video/stan/stan-0.4.1.ebuild
+++ b/media-video/stan/stan-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-video/stan/stan-0.4.1.ebuild,v 1.1 2005/01/17 18:12:44 kzimmerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/stan/stan-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
 
 DESCRIPTION="Stan is a console application that analyzes binary streams and calculates statistical information."
 HOMEPAGE="http://www.roqe.org/stan/"
diff --git a/media-video/streamdvd/ChangeLog b/media-video/streamdvd/ChangeLog
index a9c95038ddb9..64de729bcb11 100644
--- a/media-video/streamdvd/ChangeLog
+++ b/media-video/streamdvd/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for media-video/streamdvd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/ChangeLog,v 1.1 2004/02/25 00:13:06 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  streamdvd-0.4-r1.ebuild:
+  Added missing lsdvd dependency as per bug #104375.
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  streamdvd-0.4-r1.ebuild:
+  Don't install COPYING file.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> streamdvd-0.4-r1.ebuild:
+  replaced gui useflag with X useflag.
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> streamdvd-0.4-r1.ebuild:
+  added missing dependency and missing gui in IUSE. fixes #69664
+
+  15 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> streamdvd-0.4-r1.ebuild:
+  changed app-cdr/cdrtools dependency to virtual/cdrtools. see bug #77817.
+
+  18 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> streamdvd-0.4-r1.ebuild:
+  Marked ~amd64.
+
+  31 Jul 2004; Chris White <chriswhite@gentoo.org> streamdvd-0.4-r1.ebuild:
+  Missing IUSE.
+
+  26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  streamdvd-0.4-r1.ebuild:
+  fix use invocation
+
+  23 Jul 2004; Michael Imhof <tantive@gentoo.org> streamdvd-0.4-r1.ebuild:
+  Version bumped. Closes #52452, #47807.
+
+  28 Mar 2004; David Holm <dholm@gentoo.org> streamdvd-0.4.ebuild:
+  Added to ~ppc.
+
+*streamdvd-0.4 (28 Mar 2004)
+
+  28 Mar 2004; Martin Holzer <mholzer@gentoo.org> streamdvd-0.4.ebuild:
+  Version bumped. Closes 45557
 
 *streamdvd-0.3 (24 Feb 2004)
 
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index 615f0a710991..556d717d9c01 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -1,6 +1,19 @@
-MD5 bc250c09d5ad2f7d5ecbb30116d33f85 ChangeLog 349
-MD5 c99fa2eacdf23926912f2371d8c23fc1 metadata.xml 506
-MD5 421520430d89cd673f85d53aa08ffa1d streamdvd-0.3.ebuild 662
-MD5 421520430d89cd673f85d53aa08ffa1d streamdvd-0.4.ebuild 662
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 94ff569ff45451ee902f64f59e3cee15 ChangeLog 1630
 MD5 f8506076391ff39bc982421f72dbf114 files/digest-streamdvd-0.3 64
 MD5 d3bf0c2181a72f666e9524bc2a5614cb files/digest-streamdvd-0.4 65
+MD5 d3bf0c2181a72f666e9524bc2a5614cb files/digest-streamdvd-0.4-r1 65
+MD5 b397001453999b86439ac26574ba6bf8 files/streamdvd-0.4.patch 787
+MD5 b5117ee28e59b284a1cb9e2bb38dbbdd metadata.xml 500
+MD5 b70d0487b85037776a3d1d95d2c34085 streamdvd-0.3.ebuild 664
+MD5 40051e36f36f22892a83cc6d0b3b5579 streamdvd-0.4-r1.ebuild 1428
+MD5 b4cb32f160a974e8b83883d2c790478b streamdvd-0.4.ebuild 669
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZVYej5H05b2HAEkRAsK6AJ9gDgTfDpAy7/3jlEBmARsbnb70/QCglXy8
+SAgCLE23Q/nYEJFgZ5qJg0g=
+=ePgu
+-----END PGP SIGNATURE-----
diff --git a/media-video/streamdvd/metadata.xml b/media-video/streamdvd/metadata.xml
index 9ebd17a10b62..fadc78533a60 100644
--- a/media-video/streamdvd/metadata.xml
+++ b/media-video/streamdvd/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-video</herd>
+<herd>video</herd>
 <longdescription>
 StreamDVD is a fast tool to backup Video DVDs 'on the fly', there will 
 be no ripping, demultiplexing, recoding, remultiplexing .... You can 
diff --git a/media-video/streamdvd/streamdvd-0.3.ebuild b/media-video/streamdvd/streamdvd-0.3.ebuild
index b05aeb8b8011..1bde1869b7c3 100644
--- a/media-video/streamdvd/streamdvd-0.3.ebuild
+++ b/media-video/streamdvd/streamdvd-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.3.ebuild,v 1.1 2004/02/25 00:13:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 DESCRIPTION="fast tool to backup Video DVDs 'on the fly'"
 HOMEPAGE="http://www.badabum.de/streamdvd.html"
@@ -9,6 +9,7 @@ SRC_URI="http://www.badabum.de/down/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 DEPEND="media-libs/libdvdread"
 
diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
index 8d339b83a8ff..4348efa8b7aa 100644
--- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4-r1.ebuild,v 1.1 2004/07/23 15:27:54 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 DESCRIPTION="fast tool to backup Video DVDs 'on the fly'"
 HOMEPAGE="http://www.badabum.de/streamdvd.html"
@@ -8,14 +8,17 @@ SRC_URI="http://www.badabum.de/down/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="gui"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE="X"
 
 DEPEND="media-libs/libdvdread
-	gui? ( dev-perl/perl-tk
-	    app-cdr/cdrtools
-	    >=media-video/dvdauthor-0.6.5
-	    >=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
+	media-video/lsdvd
+	X? ( dev-perl/perl-tk
+	dev-perl/Tk-JPEG-Lite
+	virtual/cdrtools
+	>=media-video/dvdauthor-0.6.5
+	>=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
 
 S="${WORKDIR}/StreamDVD-${PV}"
 
@@ -23,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S} || die
 	sed -i "s: -g -Wall : ${CFLAGS} :" Makefile
-	use gui && epatch "${FILESDIR}/${P}.patch"
+	use X && epatch "${FILESDIR}/${P}.patch"
 }
 
 src_compile() {
@@ -33,11 +36,11 @@ src_compile() {
 src_install() {
 	dobin streamdvd streamanalyze
 	newbin lsdvd lsdvd-streamdvd  # patched lsdvd, rename to avoid conflict with media-video/lsdvd
-	dodoc COPYING README
+	dodoc README
 	newdoc contrib/lsdvd/AUTHORS AUTHORS.lsdvd
 	newdoc contrib/lsdvd/README README.lsdvd
 	newdoc contrib/StreamAnalyze/README README.streamanalyze
-	if [ `use gui` ]
+	if use X
 	then
 		eval `perl '-V:installvendorlib'`
 		insinto "$installvendorlib/StreamDVD"
diff --git a/media-video/streamdvd/streamdvd-0.4.ebuild b/media-video/streamdvd/streamdvd-0.4.ebuild
index 08c91c2181c5..3670127267fb 100644
--- a/media-video/streamdvd/streamdvd-0.4.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4.ebuild,v 1.1 2004/03/28 11:20:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:49 chriswhite Exp $
 
 DESCRIPTION="fast tool to backup Video DVDs 'on the fly'"
 HOMEPAGE="http://www.badabum.de/streamdvd.html"
@@ -8,7 +8,8 @@ SRC_URI="http://www.badabum.de/down/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND="media-libs/libdvdread"
 
diff --git a/media-video/sub2srt/ChangeLog b/media-video/sub2srt/ChangeLog
index 3432d3355367..0675293233a5 100644
--- a/media-video/sub2srt/ChangeLog
+++ b/media-video/sub2srt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/sub2srt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sub2srt/ChangeLog,v 1.1 2005/03/22 18:39:28 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sub2srt/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  19 Nov 2005; Joseph Jezak <josejx@gentoo.org> sub2srt-0.5.3.ebuild:
+  Marked ppc stable for bug #95214.
+
+  31 Oct 2005; Mark Loeser <halcy0n@gentoo.org> sub2srt-0.5.3.ebuild:
+  Stable on x86; bug #95214
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> sub2srt-0.5.3.ebuild:
+  Don't install COPYING file.
 
 *sub2srt-0.5.3 (22 Mar 2005)
 
diff --git a/media-video/sub2srt/Manifest b/media-video/sub2srt/Manifest
index 067e4ce3edd2..94388d243c01 100644
--- a/media-video/sub2srt/Manifest
+++ b/media-video/sub2srt/Manifest
@@ -1,2 +1,14 @@
-MD5 d61d6fc4cd3c0c59e313067fa79f2e31 sub2srt-0.5.3.ebuild 482
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4a5ed6cb9b87834ab16830efed9ee000 ChangeLog 800
 MD5 6de78660587399a7b85d59c632c2e67f files/digest-sub2srt-0.5.3 64
+MD5 9d4874084aa6769df917a01037fe241c metadata.xml 160
+MD5 050a380ce2e46753da6dec514d1b2f57 sub2srt-0.5.3.ebuild 535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf1UAcsIHjyDViGQRApozAKC3evi5kqgrgPLUNBk1Su0ZXkwytwCfW51J
+pmnIPp8cP3x6zpkstjy9TjI=
+=tTTz
+-----END PGP SIGNATURE-----
diff --git a/media-video/sub2srt/sub2srt-0.5.3.ebuild b/media-video/sub2srt/sub2srt-0.5.3.ebuild
index d7166a1a5de9..e8b4aea40e08 100644
--- a/media-video/sub2srt/sub2srt-0.5.3.ebuild
+++ b/media-video/sub2srt/sub2srt-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/sub2srt/sub2srt-0.5.3.ebuild,v 1.1 2005/03/22 18:39:28 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/sub2srt/sub2srt-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 DESCRIPTION="Tool to convert several subtitle formats into subviewer srt"
 HOMEPAGE="http://www.robelix.com/sub2srt/"
@@ -8,12 +8,12 @@ SRC_URI="http://www.robelix.com/sub2srt/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 
 IUSE=""
 RDEPEND="dev-lang/perl"
 
 src_install() {
 	dobin sub2srt
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/media-video/submux-dvd/ChangeLog b/media-video/submux-dvd/ChangeLog
index ea913a3481db..388a6492010a 100644
--- a/media-video/submux-dvd/ChangeLog
+++ b/media-video/submux-dvd/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/submux-dvd/ChangeLog,v 1.1 2004/05/27 13:31:25 lordvan Exp $
+# ChangeLog for media-video/submux-dvd
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/submux-dvd/ChangeLog,v 1.1.1.1 2005/11/30 09:58:03 chriswhite Exp $
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> submux-dvd-0.5.ebuild:
+  Added to ~ppc.
+
+  30 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  submux-dvd-0.5.ebuild:
+  toolchain love for bug #69014.
+
+  05 Sep 2004; <blubb@gentoo.org> :
+  added ~amd64 keyword
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> submux-dvd-0.5.ebuild:
+  Marked ~amd64, resolves bug 59088.
+
+  09 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org> submux-dvd-0.5.ebuild:
+  fixes bug #52405, thanks to Stefan Briesenick <sbriesen@gmx.de>
 
 *submux-dvd-0.5 (27 May 2004)
 
diff --git a/media-video/submux-dvd/Manifest b/media-video/submux-dvd/Manifest
index 171adeb5bdbc..da820887b26a 100644
--- a/media-video/submux-dvd/Manifest
+++ b/media-video/submux-dvd/Manifest
@@ -1,5 +1,5 @@
-MD5 98ac981e48f90938d004267c6d6a1755 submux-dvd-0.5.ebuild~ 472
-MD5 24e6cab74fad2b2ea874ecdbaddd907e submux-dvd-0.5.ebuild 470
-MD5 4083d4fa099c30891582885d734b73dd ChangeLog 134
+MD5 374f7c67213cb9e54a2b1fe6f73326bb ChangeLog 904
 MD5 3ba625acf04e8d0d32263c38d31a715f metadata.xml 221
+MD5 6014b03de76584e73ce1b241f519a65f submux-dvd-0.5.ebuild 840
 MD5 d998aa0b57ed5c6a402f4a9d9d8a6c28 files/digest-submux-dvd-0.5 62
+MD5 52fd9d363499583243fa51164bd848aa files/submux-dvd-0.5.patch 302
diff --git a/media-video/submux-dvd/submux-dvd-0.5.ebuild b/media-video/submux-dvd/submux-dvd-0.5.ebuild
index 3ba8eac7e8f0..abfb190f2ba3 100644
--- a/media-video/submux-dvd/submux-dvd-0.5.ebuild
+++ b/media-video/submux-dvd/submux-dvd-0.5.ebuild
@@ -1,33 +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-video/submux-dvd/submux-dvd-0.5.ebuild,v 1.1 2004/05/27 13:31:25 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/submux-dvd/submux-dvd-0.5.ebuild,v 1.1.1.1 2005/11/30 09:58:03 chriswhite Exp $
+
+IUSE=""
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A subtitle multiplexer, muxes subtitles into .vob"
 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=""
-DEPEND=""
-#RDEPEND=""
+KEYWORDS="~amd64 ~ppc ~x86"
 
-S=${WORKDIR}/${P}
+DEPEND=""
 
 src_unpack() {
-	unpack ${P}.tgz
+	unpack ${A}
+
 	# fix missing '\' 
-	cd ${S}; epatch ${FILESDIR}/${P}.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}.patch
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
 	# just 2 files not worth a makefile patch
 	dobin submux-dvd vob2sub
-	dodoc CHANGES FORMAT INSTALL LICENSE README submux-dvd-0.5.lsm
+	dodoc CHANGES FORMAT INSTALL LICENSE README submux-dvd-0.5.lsm submux-dvd.man
 	dohtml spu.html
-	doman submux-dvd.man
 }
diff --git a/media-video/subtitler-yuv/ChangeLog b/media-video/subtitler-yuv/ChangeLog
index de45d018977a..e94d2f4f11a4 100644
--- a/media-video/subtitler-yuv/ChangeLog
+++ b/media-video/subtitler-yuv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/subtitler-yuv
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.1 2004/06/09 12:34:11 lordvan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/ChangeLog,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
+
+  10 Jun 2004; David Holm <dholm@gentoo.org> subtitler-yuv-0.6.4.2.ebuild:
+  Added to ~ppc.
 
 *subtitler-yuv-0.6.4.2 (09 Jun 2004)
 
diff --git a/media-video/subtitler-yuv/Manifest b/media-video/subtitler-yuv/Manifest
index 4dfa77846380..114035a46c86 100644
--- a/media-video/subtitler-yuv/Manifest
+++ b/media-video/subtitler-yuv/Manifest
@@ -1,5 +1,5 @@
-MD5 7977ba6044ae6f097b7affb1d67891b5 subtitler-yuv-0.6.4.2.ebuild 782
-MD5 a3ad86e1a10beaf4043c0415b4c5db11 ChangeLog 484
+MD5 05c61fbff9a101fbc4b5480c85531221 subtitler-yuv-0.6.4.2.ebuild 906
+MD5 a82d8cf3d9e19683044f6e3e235f321f ChangeLog 573
 MD5 3ba625acf04e8d0d32263c38d31a715f metadata.xml 221
 MD5 d983c11affc106eda8b1fc4c427fa9a7 files/digest-subtitler-yuv-0.6.4.2 70
 MD5 5611c5bf3200b1e8f89714c267a73005 files/subtitler-yuv-0.6.4.2.patch 780
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild
index 76c27db5e24d..d1fc898937bd 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild
@@ -1,13 +1,15 @@
-# 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-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild,v 1.1 2004/06/09 12:34:11 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitler-yuv/subtitler-yuv-0.6.4.2.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="for mjpegtools for adding subtitles, pictures, and effects embedded in the picture"
 HOMEPAGE="http://home.zonnet.nl/panteltje/subtitles/"
 SRC_URI="http://home.zonnet.nl/panteltje/subtitles/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND="virtual/x11"
 
@@ -24,6 +26,6 @@ src_compile() {
 src_install() {
 	dobin subtitler-yuv
 	dodoc CHANGES HOWTO_USE_THIS LICENSE README README.COLOR.PROCESSOR README.PPML
-    insinto /usr/share/${PN}
-    doins demo-yuv.ppml rose.ppm sun.ppm mp-arial-iso-8859-1.zip
+	insinto /usr/share/${PN}
+	doins demo-yuv.ppml rose.ppm sun.ppm mp-arial-iso-8859-1.zip
 }
diff --git a/media-video/subtitleripper/ChangeLog b/media-video/subtitleripper/ChangeLog
index a40dc5a077c9..77721ca83332 100644
--- a/media-video/subtitleripper/ChangeLog
+++ b/media-video/subtitleripper/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/subtitleripper
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.1 2005/04/08 16:16:37 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.1.1.1 2005/11/30 09:57:28 chriswhite Exp $
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  subtitleripper-0.3.4.ebuild:
+  Stable on ppc64
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  subtitleripper-0.3.4.ebuild:
+  Stable on ppc64
+
+  24 May 2005; Markus Rothe <corsair@gentoo.org>
+  subtitleripper-0.3.4.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  15 May 2005; Joseph Jezak <josejx@gentoo.org> subtitleripper-0.3.4.ebuild:
+  Marked ~ppc for bug #90101.
 
 *subtitleripper-0.3.4 (08 Apr 2005)
 
diff --git a/media-video/subtitleripper/Manifest b/media-video/subtitleripper/Manifest
index 6306266dd12c..18053c94fdd1 100644
--- a/media-video/subtitleripper/Manifest
+++ b/media-video/subtitleripper/Manifest
@@ -1,4 +1,4 @@
-MD5 8d8a9032817e6095bd23b658c9a18c49 subtitleripper-0.3.4.ebuild 738
-MD5 8c6ed09b8396ef8aea9772009e06ab09 ChangeLog 321
+MD5 21e27c00b0574ccd953109026c8f4348 ChangeLog 834
 MD5 71d5fd4d13e0c7036447e796c292131d metadata.xml 228
+MD5 801e72f2e970f4d42d05a6fc5d037f22 subtitleripper-0.3.4.ebuild 763
 MD5 f31d83714c7ad3ac1a2e44c4f96fc2f3 files/digest-subtitleripper-0.3.4 68
diff --git a/media-video/subtitleripper/subtitleripper-0.3.4.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4.ebuild
index 0bfd3ece5f9e..df1cbddbc2af 100644
--- a/media-video/subtitleripper/subtitleripper-0.3.4.ebuild
+++ b/media-video/subtitleripper/subtitleripper-0.3.4.ebuild
@@ -1,15 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4.ebuild,v 1.1 2005/04/08 16:16:37 trapni Exp $
-
-# ebuild submitted by Florian E.J. Fruth <fejf@gmx.de>
-
-# This ebuild was generated by Ebuilder v0.4.
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 DESCRIPTION="DVD Subtitle Ripper for Linux"
 HOMEPAGE="http://subtitleripper.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ppc64 ~x86"
 SRC_URI="mirror://sourceforge/subtitleripper/subtitleripper-0.3-4.tgz"
 SLOT="0"
 IUSE=""
diff --git a/media-video/tcmplex-panteltje/ChangeLog b/media-video/tcmplex-panteltje/ChangeLog
index e4eb50310401..44c17335f885 100644
--- a/media-video/tcmplex-panteltje/ChangeLog
+++ b/media-video/tcmplex-panteltje/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/tcmplex-panteltje
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tcmplex-panteltje/ChangeLog,v 1.1 2004/06/09 12:57:58 lordvan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tcmplex-panteltje/ChangeLog,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $
+
+  10 Jun 2004; David Holm <dholm@gentoo.org> tcmplex-panteltje-0.3.ebuild:
+  Added to ~ppc.
 
 *tcmplex-panteltje-0.3 (09 Jun 2004)
 
diff --git a/media-video/tcmplex-panteltje/Manifest b/media-video/tcmplex-panteltje/Manifest
index 53a2760924ec..12d1cc557768 100644
--- a/media-video/tcmplex-panteltje/Manifest
+++ b/media-video/tcmplex-panteltje/Manifest
@@ -1,5 +1,5 @@
-MD5 0dc2260b8ffb2d7c26e0c352e7c921d5 tcmplex-panteltje-0.3.ebuild 635
-MD5 a9c47e92163521814af571d7fa9a251d ChangeLog 487
+MD5 82366dd2aca4cfed2095f40202473504 tcmplex-panteltje-0.3.ebuild 780
+MD5 b477d13626f69cab38f853d4277d5a59 ChangeLog 581
 MD5 3ba625acf04e8d0d32263c38d31a715f metadata.xml 221
 MD5 01743fd9d244f9d91416990e27f2fbd0 files/digest-tcmplex-panteltje-0.3 69
 MD5 756b3fcdeaa3f83bd28532561dae5701 files/tcmplex-panteltje-0.3.patch 706
diff --git a/media-video/tcmplex-panteltje/tcmplex-panteltje-0.3.ebuild b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.3.ebuild
index e45713a2c0f3..db780ab126cb 100644
--- a/media-video/tcmplex-panteltje/tcmplex-panteltje-0.3.ebuild
+++ b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.3.ebuild
@@ -1,13 +1,15 @@
-# 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-video/tcmplex-panteltje/tcmplex-panteltje-0.3.ebuild,v 1.1 2004/06/09 12:57:58 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tcmplex-panteltje/tcmplex-panteltje-0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="audio video multiplexer for 8 audio channels"
 HOMEPAGE="http://home.zonnet.nl/panteltje/dvd/"
 SRC_URI="http://home.zonnet.nl/panteltje/dvd/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND=""
 
@@ -23,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin tcmplex-panteltje 
-	dodoc CHANGES COPYRIGHT LICENSE README 
+	dobin tcmplex-panteltje
+	dodoc CHANGES COPYRIGHT LICENSE README
 }
diff --git a/media-video/tcvp/ChangeLog b/media-video/tcvp/ChangeLog
index 45ad6bc2dfa7..bf2a4c7ec9bd 100644
--- a/media-video/tcvp/ChangeLog
+++ b/media-video/tcvp/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for media-video/tcvp
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tcvp/ChangeLog,v 1.1 2004/06/04 10:39:12 zypher Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tcvp/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> tcvp-0.2.0.ebuild:
+  Don't install COPYING file.
+
+  27 May 2005; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
+  oggvorbis -> vorbis useflag change
+
+  14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> tcvp-0.2.0.ebuild:
+  Changed USE flag to aac.
+
+  10 Jun 2004; David Holm <dholm@gentoo.org> tcvp-0.2.0.ebuild:
+  New ebuild submitted by author.
+
+  09 Jun 2004; David Holm <dholm@gentoo.org> tcvp-0.2.0.ebuild:
+  Fixed incorrect license as per authors request.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> tcvp-0.2.0.ebuild:
+  Added to ~ppc.
 
 *tcvp-0.2.0 (31 May 2004)
 
diff --git a/media-video/tcvp/Manifest b/media-video/tcvp/Manifest
index 574935584afd..12143b37c508 100644
--- a/media-video/tcvp/Manifest
+++ b/media-video/tcvp/Manifest
@@ -1,4 +1,14 @@
-MD5 233d77d3514274b28cd4e2f2584017d8 tcvp-0.2.0.ebuild 1415
-MD5 2c9d7b22bf2dad42aad1f5bf6ef371a6 ChangeLog 223
-MD5 eba326432d26a3e8eb926c52124bbb9c metadata.xml 257
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 93dea96758ec3efc6831b91023abdbfa ChangeLog 907
+MD5 9d4698c52f04ca589ac4cf6ff9d1ad2f tcvp-0.2.0.ebuild 1733
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 f0f7a5d05e5be4ecf1f0a478b739f10a files/digest-tcvp-0.2.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGi+cj5H05b2HAEkRAjCbAJ0ZIqzyagEsrjue7Q+igr4J8Ik1+QCZAZbu
+qG/kpLaSN27lCWQtM9DrWio=
+=V5qD
+-----END PGP SIGNATURE-----
diff --git a/media-video/tcvp/metadata.xml b/media-video/tcvp/metadata.xml
index 7e2267698e35..210f2b0d5ddb 100644
--- a/media-video/tcvp/metadata.xml
+++ b/media-video/tcvp/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>zypher@gentoo.org</email>
   <name>Marc Hildebrand</name>
diff --git a/media-video/tcvp/tcvp-0.2.0.ebuild b/media-video/tcvp/tcvp-0.2.0.ebuild
index b60b9008a1bb..f0afe267d49f 100644
--- a/media-video/tcvp/tcvp-0.2.0.ebuild
+++ b/media-video/tcvp/tcvp-0.2.0.ebuild
@@ -1,42 +1,48 @@
-# Copyright 1999-2004 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-video/tcvp/tcvp-0.2.0.ebuild,v 1.1 2004/06/04 10:39:12 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tcvp/tcvp-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
-DESCRIPTION="TCVP is a modular player and encoder/transcoder for music and video."
-HOMEPAGE="http://tcvp.sourceforge.net"
+DESCRIPTION="A modular player and encoder/transcoder for music and video."
+HOMEPAGE="http://tcvp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-LICENSE="OpenSoftware"
-KEYWORDS="~x86"
+LICENSE="MIT"
+KEYWORDS="~x86 ~ppc"
 
-IUSE="alsa cdr dvd encode ffmpeg oggvorbis oss static"
+IUSE="aac mpeg mad alsa dvd encode ffmpeg ogg vorbis oss"
 
-RDEPEND="virtual/x11
-	>=media-libs/freetype-2.1.5-r1
-	>=media-libs/audiofile-0.2.5
-	>=media-libs/libmpeg2-0.4.0b
-	>=media-sound/madplay-0.15.2b
-	>=dev-libs/libtc-1.1.0
+DEPEND=">=dev-libs/libtc-1.1.0
 	>=dev-libs/tc2-0.6.0
 	>=dev-libs/tc2-modules-0.6.0
-	>=media-libs/faac-1.23.5
+	>=media-libs/a52dec-0.7.4
+	>=media-sound/cdparanoia-3.9.8-r1
+	>=sys-apps/file-4.0
+	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	encode? ( >=media-sound/lame-3.96 )
-	oggvorbis? ( >=media-libs/libogg-1.1
-		    >=media-libs/libvorbis-1.0.1-r2 )
+	dvd? ( >=media-libs/libdvdnav-0.1.9 )
+	encode? ( >=media-libs/faac-1.23.5
+		>=media-sound/lame-3.96 )
 	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
-	cdr? ( >=media-sound/cdparanoia-3.9.8-r1 )
-	dvd? ( >=media-libs/libdvdread-0.9.4
-		>=media-libs/a52dec-0.7.4 )"
+	mad? ( >=media-sound/madplay-0.15.2b )
+	mpeg? ( >=media-libs/libmpeg2-0.4.0b )
+	ogg?  ( >=media-libs/libogg-1.1 )
+	vorbis? ( >=media-libs/libvorbis-1.0.1-r2 )"
 
 src_compile() {
 	local myconf
 	myconf="--with-gnu-ld"
-	use static && myconf="${myconf} --enable-static"
 	use alsa || myconf="${myconf} --disable-alsa"
-	use encode || myconf="${myconf} --disable-lame"
-	use dvd || myconf="${myconf} --disable-dvd --disable-a52"
+	use dvd || myconf="${myconf} --disable-dvd"
+	use encode || myconf="${myconf} --disable-lame --disable-aac_enc"
+	use ffmpeg || myconf="${myconf} --disable-avcodec --disable-avformat --disable-avimage --disable-scale"
+	use mad || myconf="${myconf} --disable-mad"
+	use mpeg || myconf="${myconf} --disable-mpeg2"
+	if ! use vorbis
+	then
+	myconf="${myconf} --disable-vorbis"
+	use ogg || myconf="${myconf} --disable-ogg"
+	fi
 	use oss || myconf="${myconf} --disable-oss"
 	econf ${myconf} || die "configure failed"
 	make || die
@@ -44,7 +50,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING
+	dodoc AUTHORS ChangeLog
 }
-
-
diff --git a/media-video/thoggen/ChangeLog b/media-video/thoggen/ChangeLog
index 439f73e896b1..16f238abbb62 100644
--- a/media-video/thoggen/ChangeLog
+++ b/media-video/thoggen/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/thoggen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/thoggen/ChangeLog,v 1.1 2005/07/25 20:57:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/thoggen/ChangeLog,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
+
+  09 Sep 2005; Joseph Jezak <josejx@gentoo.org> thoggen-0.3.ebuild,
+  thoggen-0.4.ebuild:
+  Marked ~ppc for bug #105206.
+
+*thoggen-0.4 (06 Sep 2005)
+
+  06 Sep 2005; Hanno Boeck <hanno@gentoo.org> +thoggen-0.4.ebuild:
+  Version bump, removed patch, support for new hal/dbus-API.
+
+  06 Sep 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> thoggen-0.3.ebuild:
+  fix dbus and hal deps
+
+  01 Aug 2005; Herbie Hopkins <herbs@gentoo.org> thoggen-0.3.ebuild:
+  Marked ~amd64 wrt bug #100896.
 
 *thoggen-0.3 (25 Jul 2005)
 
diff --git a/media-video/thoggen/Manifest b/media-video/thoggen/Manifest
index 9dbb03f58d9a..ab688a6732a5 100644
--- a/media-video/thoggen/Manifest
+++ b/media-video/thoggen/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4cd8ac501c567bd918189967b4b21001 thoggen-0.3.ebuild 1323
+MD5 1dfe55416936d4c8426641df5f1446d1 ChangeLog 864
+MD5 d911edb12f8c882b2f169b4e09a2dc6b thoggen-0.4.ebuild 1245
 MD5 d9885b371cf444e9a26ef0f8a0418d9b metadata.xml 219
-MD5 81bffc76e633adf63a632ff11db7b9f9 ChangeLog 380
-MD5 db202d22d4b7d54cd9a6789312803f07 files/digest-thoggen-0.3 63
+MD5 43099fc021488b80d94b660c6d15318e thoggen-0.3.ebuild 1334
 MD5 214c2419992cfee26543fedc1e4711ea files/thoggen-0.3-new-dbus-hal.patch 13464
+MD5 db202d22d4b7d54cd9a6789312803f07 files/digest-thoggen-0.3 63
+MD5 3a84e2ada235ed3faf87addeab62a248 files/digest-thoggen-0.4 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC5VKcr2QksT29OyARAqvVAJ0cZiYmdTTy7w+KPHo1Hdj26IRhEgCfe4t9
-USN8u4XRkeCZWFw0UZ112yY=
-=LWW6
+iD8DBQFDIQwYcsIHjyDViGQRAv8PAKCFWuory2PRNUoMvHlLXFBoNdw1/gCgqL4j
+S0Y7OziX5+ewmOJDePjhYmc=
+=uKlz
 -----END PGP SIGNATURE-----
diff --git a/media-video/thoggen/thoggen-0.3.ebuild b/media-video/thoggen/thoggen-0.3.ebuild
index 72f3a369bb56..8058aaeb641f 100644
--- a/media-video/thoggen/thoggen-0.3.ebuild
+++ b/media-video/thoggen/thoggen-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-video/thoggen/thoggen-0.3.ebuild,v 1.1 2005/07/25 20:57:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/thoggen/thoggen-0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dts"
 
 DEPEND=">=dev-libs/glib-2.6.0
@@ -25,8 +25,8 @@ DEPEND=">=dev-libs/glib-2.6.0
 	>=media-plugins/gst-plugins-vorbis-0.8.8
 	>=media-plugins/gst-plugins-ogg-0.8.8
 	dts? ( >=media-plugins/gst-plugins-dts-0.8.8 )
-	>=sys-apps/dbus-0.22
-	>=sys-apps/hal-0.4.0
+	=sys-apps/dbus-0.23*
+	=sys-apps/hal-0.4*
 	>=media-libs/libdvdread-0.9.4"
 
 pkg_setup() {
diff --git a/media-video/thoggen/thoggen-0.4.ebuild b/media-video/thoggen/thoggen-0.4.ebuild
index 196be3b14663..4d4429765dd5 100644
--- a/media-video/thoggen/thoggen-0.4.ebuild
+++ b/media-video/thoggen/thoggen-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-video/thoggen/thoggen-0.4.ebuild,v 1.1 2005/09/06 21:56:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/thoggen/thoggen-0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:51 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dts"
 
 DEPEND=">=dev-libs/glib-2.6.0
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index fd00f825f69c..454bf9d7582b 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,369 @@
 # ChangeLog for media-video/totem
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.1 2002/08/13 19:12:02 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
+
+  19 Nov 2005; Joseph Jezak <josejx@gentoo.org> totem-1.2.0-r1.ebuild:
+  Marked ~ppc for bug #108789.
+
+*totem-1.2.0-r2 (02 Nov 2005)
+
+  02 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/totem-1.2.0-gmoduledep.patch, +totem-1.2.0-r2.ebuild:
+  Add gmodule depend.  Fixup autoconf stuff, and move omf stuff to last.
+
+  11 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-1.2.0-r1.ebuild:
+  Back to ~sparc hand-masking dvd here since gst-plugins-dvdnav is b0rked for us
+
+  11 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  totem-1.2.0-r1.ebuild:
+  remove support for alpha, hppa, ia64, sparc, ppc, ppc64, filed bugs
+
+*totem-1.2.0-r1 (08 Oct 2005)
+
+  08 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -files/totem-1.1.5-idl.patch, -files/totem-1.1.5-nsi.patch,
+  +files/totem-1.2.0-gecko-sdk.patch, -totem-1.2.0.ebuild,
+  +totem-1.2.0-r1.ebuild:
+  Use gecko-sdk to build browser plugin. Dropped 'mozilla' and 'firefox' USE
+  flags and added 'nsplugin'. Updated dependencies.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> totem-1.0.4.ebuild:
+  Mark 1.0.4 stable on ia64
+
+  16 Sep 2005; <dang@gentoo.org> totem-1.2.0.ebuild:
+  mozilla/firefox browser plugin depends on dbus. Bug #106162
+
+  16 Sep 2005; <dang@gentoo.org> +files/totem-1.2.0-lang_it_fix.patch,
+  totem-1.2.0.ebuild:
+  Fix Italian translation formatting issue.  Bug #106070
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> totem-1.0.4.ebuild:
+  Mark 1.0.4 stable on alpha
+
+*totem-1.2.0 (05 Sep 2005)
+
+  05 Sep 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> +totem-1.2.0.ebuild:
+  version bump
+
+  05 Sep 2005; John N. Laliberte <allanonjl@gentoo.org> totem-1.1.5.ebuild:
+  fix mozilla/firefox dep, thanks to TGL for fix, fixes #104764
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> totem-1.0.4.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> totem-1.0.4.ebuild:
+  Stable on ppc.
+
+  01 Sep 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> totem-1.1.5.ebuild:
+  add musicbrainz dep
+
+  31 Aug 2005; Herbie Hopkins <herbs@gentoo.org> totem-1.0.4.ebuild:
+  Stable on amd64.
+
+*totem-1.1.5 (30 Aug 2005)
+
+  30 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/totem-1.1.5-idl.patch, +files/totem-1.1.5-nsi.patch,
+  +totem-1.1.5.ebuild:
+  new version, apply patch to fix paths for idl directories, and another patch
+  to fix includes in the mozilla plugin cpp file for finding the headers.
+
+  29 Aug 2005; Guy Martin <gmsoft@gentoo.org> totem-1.0.4.ebuild:
+  Stable on hppa.
+
+  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-1.0.4.ebuild:
+  Stable on sparc
+
+  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> totem-1.0.4.ebuild:
+  Stable on x86.
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-1.0.2-r1.ebuild,
+  totem-1.0.4.ebuild:
+  Back to normal backend behaviour for sparc
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/totem-1.0.4-fbsd.patch, totem-1.0.4.ebuild:
+  Added patch for FreeBSD support.
+
+*totem-1.0.4 (14 Jul 2005)
+
+  14 Jul 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> +totem-1.0.4.ebuild:
+  version bump
+
+  04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-1.0.2-r1.ebuild,
+  totem-1.0.3.ebuild:
+  Force gst in sparc, for real this time
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> totem-1.0.2-r1.ebuild:
+  Stable on alpha.
+
+  26 Jun 2005; Guy Martin <gmsoft@gentoo.org> totem-1.0.2-r1.ebuild,
+  totem-1.0.3.ebuild:
+  Stable on hppa.
+
+*totem-1.0.3 (15 Jun 2005)
+
+  15 Jun 2005; <dang@gentoo.org> totem-1.0.2-r1.ebuild, +totem-1.0.3.ebuild:
+  Added 1.0.3, added xv USE flag to 1.0.3 and 1.0.2-r1 to protect
+  gst-plugins-xvideo re bug #96048
+
+  13 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> totem-1.0.2-r1.ebuild:
+  Add ~alpha keyword.
+
+  12 Jun 2005; Olivier Crête <tester@gentoo.org> totem-1.0.2-r1.ebuild:
+  Stable on amd64
+
+  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  totem-1.0.2-r1.ebuild:
+  Stable on ppc.
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-1.0.2-r1.ebuild:
+  Stable on sparc
+
+  09 Jun 2005; Markus Rothe <corsair@gentoo.org> totem-1.0.2-r1.ebuild:
+  Stable on ppc64
+
+  06 May 2005; Markus Rothe <corsair@gentoo.org> totem-1.0.2-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*totem-1.0.2-r1 (02 May 2005)
+
+  02 May 2005; foser <foser@gentoo.org> totem-1.0.2-r1.ebuild :
+  Add patch to fix xine xvmc issue (#91168)
+  Thanks to ghepeu@virgilio.it for tracking this down
+
+  02 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> totem-0.100-r2.ebuild,
+  totem-0.100-r3.ebuild, totem-1.0.ebuild, totem-1.0.1.ebuild,
+  totem-1.0.2.ebuild:
+  We really want gst for backend on sparc since newer xines are broken, so
+  adjusting accordingly
+
+*totem-1.0.2 (30 Apr 2005)
+
+  30 Apr 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> +totem-1.0.2.ebuild:
+  new version
+
+  26 Apr 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> totem-0.100-r3.ebuild:
+  Make stable on x86
+
+*totem-0.100-r3 (26 Apr 2005)
+
+  26 Apr 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/totem-0.100-xine_backend-nocdrom.patch, +totem-0.100-r3.ebuild:
+  add fix for cdrom-less machines to use xine-backend (fixes #90362)
+
+  25 Apr 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> totem-1.0.1.ebuild:
+  Added win32codecs USE flag so gstreamer users can play win32 codecs
+
+  19 Apr 2005; <zaheerm@gentoo.org> totem-1.0.1.ebuild, totem-1.0.ebuild:
+  Replaced deprecated oggvorbis use flag with vorbis use flag and made 
+  sure use flags of +theora -ogg will still let you play theora video 
+  streams
+
+*totem-1.0.1 (18 Apr 2005)
+
+  18 Apr 2005; foser <foser@gentoo.org> totem-1.0.1.ebuild :
+  New release (#86902)
+  Remove the sparc specific bits
+
+  11 Mar 2005; Heinrich Wendel <lanius@gentoo.org> totem-0.100-r2.ebuild:
+  fix gst-plugins-ffmpeg dep
+
+*totem-1.0 (10 Mar 2005)
+
+  10 Mar 2005; foser <foser@gentoo.org> totem-1.0.ebuild :
+  Gnome 2.10 release, switched default backend over to GST to confirm with upstream
+  Added a whole bunch of useless USE flags because public opinion is that it's right
+
+  30 Jan 2005; lanius@gentoo.org totem-0.100-r2.ebuild:
+  mark amd64
+
+*totem-0.100-r2 (12 Jan 2005)
+
+  12 Jan 2005; foser <foser@gentoo.org> totem-0.100-r2.ebuild :
+  Redo the kernel 2.4 cdrom/header fix (#68087)
+  Add scrollkeeper dep (#77631)
+  Add a patch with minor speed fixes for gst
+
+*totem-0.100-r1 (09 Jan 2005)
+
+  09 Jan 2005; foser <foser@gentoo.org> totem-0.100-r1.ebuild :
+  Add fix for #68087 & #77204
+
+*totem-0.100 (09 Jan 2005)
+
+  09 Jan 2005; foser <foser@gentoo.org> totem-0.100.ebuild :
+  New release, dep fixes
+
+  29 Nov 2004; foser <foser@gentoo.org> totem-0.99.{19,22-r1}.ebuild :
+  Do the compile fix right #71960 -> #72124, thanks the Ed Catmur for the patch
+
+*totem-0.99.22-r1 (22 Nov 2004)
+
+  22 Nov 2004; foser <foser@gentoo.org> totem-0.99.22-r1.ebuild :
+  Add patch to fix gst backend for released gst-plugins versions 
+  http://bugzilla.gnome.org/show_bug.cgi?id=159049
+
+*totem-0.99.22 (22 Nov 2004)
+
+  22 Nov 2004; foser <foser@gentoo.org> totem-0.99.22.ebuild :
+  Updated xine dep, added real USE=debug
+  Added compile fix from (#71960)
+
+  23 Oct 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Corrected herd in metadata.xml. (media-video -> video)
+
+*totem-0.99.19 (22 Oct 2004)
+
+  22 Oct 2004; foser <foser@gentoo.org> totem-0.99.19.ebuild :
+  New release, improved gstreamer support (#64434)
+  Disable gtk only build, its broken
+  Add media-video & gstreamer herds to metadata
+
+  20 Aug 2004; Mike Gardiner <obz@gentoo.org> totem-0.99.15.1.ebuild:
+  Added omf_fix for totem-0.99.15.1, thanks to bug #48800
+
+*totem-0.99.15.1 (19 Aug 2004)
+
+  19 Aug 2004; foser <foser@gentoo.org> totem-0.99.{5,8-r2,15.1}.ebuild :
+  New release, update deps (#48800)
+  Remove curl, add gnome USE flags
+  .5 & .8* : Fix compilation issues (#51864)
+
+  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  totem-0.99.8-r2.ebuild:
+  Adding to ~sparc but forcing xine backend.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> totem-0.99.8-r2.ebuild:
+  Add inherit eutils
+
+  03 Apr 2004; foser <foser@gentoo.org> totem-0.99.*.ebuild :
+  Fix gst deps to 0.6
+
+*totem-0.99.8-r2 (08 Dec 2003)
+
+  08 Dec 2003; <spider@gentoo.org> totem-0.99.8-r2.ebuild,
+  files/totem-0.99.8-nvidia.patch:
+  Added a patch to make video output work by disabling some drivers.
+
+*totem-0.99.8-r1 (07 Dec 2003)
+
+  07 Dec 2003; <spider@gentoo.org> totem-0.99.8-r1.ebuild,
+  files/totem-0.99.8-curl.patch:
+  Added a patch to actually disable curl
+
+*totem-0.99.8 (25 Nov 2003)
+
+  25 Nov 2003; foser <foser@gentoo.org> totem-0.99.8.ebuild :
+  New release with omf sandbox fix as requested in #34299
+
+*totem-0.99.7 (21 Oct 2003)
+
+  21 Oct 2003; foser <foser@gentoo.org> totem-0.99.7.ebuild :
+  New version
+
+*totem-0.99.6 (13 Oct 2003)
+
+  14 Oct 2003; foser <foser@gentoo.org> totem-0.99.6.ebuild :
+  Fix xine-lib and gst deps
+
+  13 Oct 2003; Mike Gardiner <obz@gentoo.org> totem-0.99.6.ebuild:
+  New version
+
+*totem-0.99.5 (17 Sep 2003)
+
+  17 Sep 2003; Mike Gardiner <obz@gentoo.org> totem-0.99.5.ebuild:
+  New version, updated deps for gst-plugins, and added curl to USE
+
+*totem-0.99.4 (04 Sep 2003)
+
+  04 Sep 2003; <spider@gentoo.org> totem-0.99.4.ebuild:
+  Versionbump. this one seems far better than the previous one, that is now
+  being removed from the tree. (its p.masked too)
+
+*totem-0.99.3 (01 Sep 2003)
+
+  01 Sep 2003; Spider <spider@gentoo.org> totem-0.99.3.ebuild:
+  Versionbump
+
+*totem-0.99.2 (26 Jul 2003)
+
+  19 Aug 2003; foser <foser@gentoo.org> totem-0.99.2.ebuild :
+  Added lirc USE flag (#24127) thanks to matt <matt@schick.mine.nu>
+
+  26 Jul 2003; foser <foser@gentoo.org> totem-0.99.2.ebuild, manifest.xml :
+  New version, fixed gtk+ dep so xfree-4.3 is needed (#24194,#21336)
+  added longdescription in manifest.xml adapted from propesed description in #24194
+
+*totem-0.99.1 (23 Jun 2003)
+
+  23 Jun 2003; foser <foser@gentoo.org> totem-0.99.1.ebuild :
+  New version, upped xine-lib dep
+
+*totem-0.99.0 (05 Jun 2003)
+
+  05 Jun 2003; foser <foser@gentoo.org> totem-0.99.0.ebuild :
+  New version, added gstreamer local USE flag
+
+*totem-0.98.0 (13 May 2003)
+
+  13 May 2003; foser <foser@gentoo.org> totem-0.98.0.ebuild :
+  New version
+
+*totem-0.97.0 (30 Apr 2003)
+
+  30 Apr 2003; foser <foser@gentoo.org> totem-0.97.0.ebuild :
+  New version
+
+*totem-0.96.0 (10 Apr 2003)
+
+  14 Apr 2003; foser <foser@gentoo.org> totem-0.96.0.ebuild :
+  Added small patch, which should fix the video thumbnailing
+
+  10 Apr 2003; foser <foser@gentoo.org> totem-0.96.0.ebuild :
+  New version
+
+*totem-0.95.1 (03 Mar 2003)
+
+  09 Mar 2003; foser <foser@gentoo.org> totem-0.95.1.ebuild :
+  Fixed gnome-vfs dep as noted in #17157
+
+  03 Mar 2003; foser <foser@gentoo.org> totem-0.95.1.ebuild :
+  New version
+
+*totem-0.90.0 (04 Feb 2003)
+
+  08 Feb 2003; foser <foser@gentoo.org> totem-0.90.0.ebuild :
+  Fixed deps (#15204)
+
+  04 Feb 2003; Spider <spider@gentoo.org> totem-0.90.0.ebuild : 
+  Clean out the dep-if since the new requires beta3 or higher
+  new version ;)
+
+  16 Jan 2003; foser <foser@gentoo.org> totem-0.13.1.ebuild :
+  Added big if statement to not compile with certain buggy xine-lib releases
+  not very clean, but the least bad way to do it (#13742)
+
+*totem-0.13.1 (17 Dec 2002)
+
+  17 Dec 2002; foser <foser@gentoo.org> totem-0.13.1.ebuild :
+  New version
+
+*totem-0.11.0 (28 Oct 2002)
+
+  28 Oct 2002; foser <foser@gentoo.org> totem-0.11.0.ebuild :
+  New version
+
+*totem-0.10.0.ebuild (08 Sep 2002)
+
+  15 Sep 2002; Seemant Kulleen <seemant@gentoo.org> totem-0.10.0.ebuild :
+
+  added libgnomeui to DEPEND.  thanks to ska-fan (markus below).
+
+  08 Sep 2002; Sascha Schwabbauer <cybersystem@gentoo.org> totem-0.10.0.ebuild :
+
+  Version bump..
+  Ebuild by  Markus Bertheau <twanger@bluetwanger.de>..
 
 *totem-0.8.ebuild (13 Aug 2002)
 
@@ -9,4 +372,4 @@
   New package.  
   Ebuild initially written by Markus Bertheau <twanger@bluetwanger.de>
   Changed description and corrected deps.
-  
\ No newline at end of file
+  
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e69de29bb2d1..3eab74f3cec5 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 94e6b70ceaf3432cd00a38c84b2e133f ChangeLog 12156
+MD5 ac8a4cf594e065c2ddc00dc70c8d2170 files/digest-totem-1.0.4 65
+MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r1 65
+MD5 e7c829d2432b645ddb68128a4bead344 files/digest-totem-1.2.0-r2 65
+MD5 cccfa415897f1198d6cb702e258b85a9 files/totem-1.0.4-fbsd.patch 1190
+MD5 d8432eb528995986645e6e70fdccba48 files/totem-1.2.0-gecko-sdk.patch 1178
+MD5 faed9bfdf2ea1835a17c9e56e7738ac1 files/totem-1.2.0-gmoduledep.patch 1535
+MD5 d64b50de60d0223b68b67b7788086b5b files/totem-1.2.0-lang_it_fix.patch 834
+MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
+MD5 06d52fc007ef24fa66f1a352be6f3ee3 totem-1.0.4.ebuild 2682
+MD5 9842da2ee27ad4ce46de82d7549f8b8c totem-1.2.0-r1.ebuild 3137
+MD5 61db78dc45c1fecc7d8a052d09be0ab0 totem-1.2.0-r2.ebuild 3038
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf2q/csIHjyDViGQRAnpNAKDgFR9LgvQHfdAHziqafoAEq/ULhACeOzVP
+san94A59o68Fe1DlQs83xtE=
+=q2Un
+-----END PGP SIGNATURE-----
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index da6fd63d0085..78283f80471c 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<herd>video</herd>
+<herd>gstreamer</herd>
+<longdescription>
+Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
+</longdescription>
 </pkgmetadata>
diff --git a/media-video/totem/totem-1.0.4.ebuild b/media-video/totem/totem-1.0.4.ebuild
index ebb93fcd2d84..509a4534f30e 100644
--- a/media-video/totem/totem-1.0.4.ebuild
+++ b/media-video/totem/totem-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/media-video/totem/totem-1.0.4.ebuild,v 1.1 2005/07/14 09:46:16 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gnome.org/projects/totem/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="gnome xine lirc mad mpeg ogg vorbis a52 flac theora dvd debug win32codecs xv"
 
 RDEPEND=">=dev-libs/glib-2.6.3
@@ -21,8 +21,8 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	>=gnome-base/libgnomeui-2.4
 	gnome? ( >=gnome-base/nautilus-2.10 )
 	lirc? ( app-misc/lirc )
-	!sparc? ( xine? ( >=media-libs/xine-lib-1
-		>=gnome-base/gconf-2 ) )
+	xine? ( >=media-libs/xine-lib-1
+		>=gnome-base/gconf-2 )
 	!xine? ( >=media-libs/gstreamer-0.8.9-r3
 		>=media-libs/gst-plugins-0.8.8
 		>=media-plugins/gst-plugins-gnomevfs-0.8.8
@@ -55,7 +55,6 @@ DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
 
 # gstreamer is default backend
 use xine || G2CONF="${G2CONF} --enable-gstreamer"
-use sparc && G2CONF="${G2CONF} --enable-gstreamer"
 
 # gtk only support broken
 #use gnome \
@@ -77,6 +76,8 @@ src_unpack() {
 	# use the omf_fix for scrollkeeper sandbox
 	# violations, see bug #48800 <obz@gentoo.org>
 	gnome2_omf_fix
+
+	epatch ${FILESDIR}/${P}-fbsd.patch
 }
 
 pkg_postinst() {
diff --git a/media-video/totem/totem-1.2.0-r1.ebuild b/media-video/totem/totem-1.2.0-r1.ebuild
index 92b83a51c30b..ced232392d61 100644
--- a/media-video/totem/totem-1.2.0-r1.ebuild
+++ b/media-video/totem/totem-1.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-video/totem/totem-1.2.0-r1.ebuild,v 1.1 2005/10/08 12:26:19 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit eutils multilib gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gnome.org/projects/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="a52 dvd flac gnome lirc mad mpeg nsplugin ogg theora vorbis win32codecs xine xv"
 
 RDEPEND=">=dev-libs/glib-2.6.3
@@ -45,11 +45,11 @@ RDEPEND=">=dev-libs/glib-2.6.3
 			>=media-plugins/gst-plugins-ogg-0.8.10
 			>=media-plugins/gst-plugins-theora-0.8.10 )
 		mad? ( >=media-plugins/gst-plugins-mad-0.8.10 )
-		dvd? (
+		!sparc? ( dvd? (
 			>=media-plugins/gst-plugins-a52dec-0.8.10
 			>=media-plugins/gst-plugins-dvdread-0.8.10
 			>=media-plugins/gst-plugins-mpeg2dec-0.8.10
-			>=media-plugins/gst-plugins-dvdnav-0.8.11 )
+			>=media-plugins/gst-plugins-dvdnav-0.8.11 ) )
 		win32codecs? ( >=media-plugins/gst-plugins-pitfdll-0.8.1 ) )
 	nsplugin? (
 		>=net-libs/gecko-sdk-1.7
diff --git a/media-video/totem/totem-1.2.0-r2.ebuild b/media-video/totem/totem-1.2.0-r2.ebuild
index e0791b72381d..d707804ca23a 100644
--- a/media-video/totem/totem-1.2.0-r2.ebuild
+++ b/media-video/totem/totem-1.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/media-video/totem/totem-1.2.0-r2.ebuild,v 1.1 2005/11/02 12:30:21 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-1.2.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit autotools eutils multilib gnome2
 
diff --git a/media-video/toxine/ChangeLog b/media-video/toxine/ChangeLog
index 33ce25b650ac..3e195e0ff272 100644
--- a/media-video/toxine/ChangeLog
+++ b/media-video/toxine/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/toxine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/ChangeLog,v 1.1 2005/08/18 22:12:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/ChangeLog,v 1.1.1.1 2005/11/30 09:58:03 chriswhite Exp $
+
+  03 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> toxine-0.6.3.ebuild:
+  Fix DEPEND/RDEPEND that got wrong.
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> toxine-0.6.3.ebuild:
+  use autotools eclass. Added missing dependency over libtool.
+
+  19 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/toxine-0.6.3-nox.patch, toxine-0.6.3.ebuild:
+  Added patch to build fine without X at all.
 
 *toxine-0.6.3 (18 Aug 2005)
 
diff --git a/media-video/toxine/Manifest b/media-video/toxine/Manifest
index 7eb651affe4e..ca940b3e9126 100644
--- a/media-video/toxine/Manifest
+++ b/media-video/toxine/Manifest
@@ -1,4 +1,17 @@
-MD5 e573a69f3708206dfa1b921bf03fdac1 toxine-0.6.3.ebuild 1008
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fd86df19c31234d2f0fb63aa08dc66fc ChangeLog 869
 MD5 73614b82fc7fd731d3501c21f541311e files/digest-toxine-0.6.3 64
-MD5 c315b05d556478d8627abf11ce33eb90 files/toxine-0.6.3-configure.patch 2279
+MD5 84d6bad99dfaa6bca6e774afe297a3ba files/toxine-0.6.3-configure.patch 2505
+MD5 add3f1d4c9ff4a333b42042658cb8521 files/toxine-0.6.3-gcc4.patch 533
+MD5 5650d3830b5b67954a7927180e784d76 files/toxine-0.6.3-nox.patch 1236
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 54dabac5937349ee283d7decd0c46c17 toxine-0.6.3.ebuild 1224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDagEij5H05b2HAEkRAo/nAJ9o6reUyvvTqv0uxGzFJqZCTxuz9QCglMgo
+gAJSKBzWOAwYiRLEo6H7Kp8=
+=ZWvk
+-----END PGP SIGNATURE-----
diff --git a/media-video/toxine/toxine-0.6.3.ebuild b/media-video/toxine/toxine-0.6.3.ebuild
index ff7c95206909..dec0b62282b5 100644
--- a/media-video/toxine/toxine-0.6.3.ebuild
+++ b/media-video/toxine/toxine-0.6.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/media-video/toxine/toxine-0.6.3.ebuild,v 1.1 2005/08/18 22:12:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/toxine/toxine-0.6.3.ebuild,v 1.1.1.1 2005/11/30 09:58:04 chriswhite Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Text user interface to xine media player"
 HOMEPAGE="http://toxine.sourceforge.net/"
@@ -13,15 +13,16 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="X ncurses aalib libcaca"
 
-DEPEND="sys-libs/readline
+RDEPEND="sys-libs/readline
 	>=media-libs/xine-lib-1_rc3
 	aalib? ( media-libs/aalib )
 	libcaca? ( media-libs/libcaca )
 	ncurses? ( sys-libs/ncurses )
 	X? ( virtual/x11 )"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	sys-devel/autoconf
-	sys-devel/automake"
+	sys-devel/automake
+	sys-devel/libtool"
 
 src_unpack() {
 	unpack ${A}
@@ -29,11 +30,9 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-configure.patch
 	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-nox.patch
 
-	aclocal -I m4 || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-	libtoolize --copy --force || die "libtoolize failed"
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index bf7feee9d973..92ec8f837714 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,594 @@
-# ChangeLog for media-video/avifile
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.1 2002/04/02 22:31:39 danarmak Exp $
+# ChangeLog for media-video/transcode
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
+
+*transcode-1.0.2 (11 Nov 2005)
+
+  11 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +transcode-1.0.2.ebuild:
+  Bump to 1.0.2.
+
+  03 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.14-r2.ebuild, transcode-0.6.14-r3.ebuild,
+  transcode-1.0.1.ebuild:
+  Update SRC_URI to use transcode mirrors (and remove dead mirror).
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.14-r2.ebuild:
+  Remove divx4linux useflag.
+
+*transcode-0.6.14-r3 (15 Oct 2005)
+
+  15 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/transcode-0.6.11-no-mmx.patch,
+  -files/transcode-0.6.12-gcc-3.4.patch,
+  -files/transcode-0.6.12-r2-dvdmenu.patch,
+  -files/transcode-0.6.12-r2-gcc34.patch, -files/transcode-gcc34.patch,
+  -files/transcode-0.6.13-r1-bitstream.patch, +transcode-0.6.14-r3.ebuild:
+  Removed outdated patches. Added new revision that builds with latest ffmpeg.
+  Also, remove divx4linux and avifile support.
+
+  15 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -transcode-0.6.11.ebuild, -transcode-0.6.12-r1.ebuild,
+  -transcode-0.6.12-r2.ebuild, -transcode-0.6.13-r1.ebuild,
+  -transcode-0.6.14.ebuild:
+  Clean up of older versions.
+
+  15 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> transcode-1.0.1.ebuild:
+  Remove avifile support, use autotools eclass, don't force -j1 as it seems
+  fixed in newer versions.
+
+*transcode-1.0.1 (14 Oct 2005)
+
+  14 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -transcode-1.0.0.ebuild, +transcode-1.0.1.ebuild:
+  Updated to latest upstream version. Dropped divx4linux dependency entirely.
+
+  13 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
+  transcode-0.6.14-r2.ebuild, transcode-1.0.0.ebuild:
+  Made error message about missing xv for xorg-x11 a bit more useful.
+
+  27 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> transcode-1.0.0.ebuild:
+  Removed gcc-3 dependency from 1.0 series. Closes #100495.
+
+*transcode-1.0.0 (13 Jul 2005)
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/transcode-1.0.0_rc1-gcc4.patch, -transcode-1.0.0_rc1.ebuild,
+  +transcode-1.0.0.ebuild:
+  Update to latest upstream stable version (still in package.mask).
+
+*transcode-1.0.0_rc1 (09 Jul 2005)
+
+  09 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/transcode-1.0.0_rc1-gcc4.patch, -transcode-1.0.0_beta3.ebuild,
+  +transcode-1.0.0_rc1.ebuild:
+  Added latest version upstream (works with GCC4). Removed 1.0.0_beta3. Fixed
+  docs installation path.
+
+  24 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-1.0.0_beta3.ebuild:
+  Added dependency over libmpeg2 as per bug #93436. Reported by Gustavo Michels.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.11.ebuild, transcode-0.6.12-r1.ebuild,
+  transcode-0.6.12-r2.ebuild:
+  Moved to use toolchain-functs eclass.
+
+  10 May 2005; Luca Barbato <lu_zero@gentoo.org> transcode-0.6.14-r2.ebuild:
+  Marked x86
+
+  10 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  transcode-0.6.14-r2.ebuild:
+  Stable on PPC, #92137
+
+  10 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.14-r2.ebuild:
+  Marked stable on amd64 as per bug #92137.
+
+  10 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.11.ebuild:
+  Made transcode 0.6.11 depend directly on libquicktime-0.9.2. Fixes #91061.
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.11.ebuild:
+  Reverted last change
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.11.ebuild:
+  Make transcode 0.6.11 depend on libquicktime-0.9.2. Fixes #91061.
+
+  07 May 2005; Herbie Hopkins <herbs@gentoo.org>
+  transcode-1.0.0_beta3.ebuild:
+  Enable SIMD extensions on amd64, bug #79990
+
+  29 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.14-r2.ebuild, transcode-1.0.0_beta3.ebuild:
+  Fixed patchset urls.
+
+*transcode-1.0.0_beta3 (27 Apr 2005)
+*transcode-0.6.14-r2 (27 Apr 2005)
+
+  27 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/transcode-0.6.14-amd64_mmx.patch,
+  -files/transcode-0.6.14-gcc4.patch,
+  -files/transcode-0.6.14-libquicktime094.patch,
+  -transcode-0.6.14-r1.ebuild, +transcode-0.6.14-r2.ebuild,
+  +transcode-1.0.0_beta3.ebuild:
+  Removed gcc4 patch as it screw up logic both with old and new gcc, bumped to
+  0.6.14-r2 so that all the users who compiled with that patch will recompile
+  without it. The new -r2 also uses a patch tarball instead of having the
+  patches in files/.
+  
+  Added the latest upstream version (1.0.0_beta3) but still p.masked as it's
+  beta-quality software which needs testing.
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/transcode-0.6.14-gcc4.patch, transcode-0.6.14-r1.ebuild:
+  Fix building with gcc4.
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.14-r1.ebuild:
+  Added pkg_setup() to check for xv support in xorg-x11 as it's needed to
+  build transcode. Fixes #76661. Moved gcc and nasm out of DEPEND, removed
+  check for x86 on divx4linux. Splitted oggvorbis useflag in ogg and vorbis.
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.11.ebuild:
+  Made transcode-0.6.11 use append-flags instead of passing CFLAGS to econf.
+  Fixes #84362
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  transcode-0.6.14-r1.ebuild:
+  Moved libtoolize/autoreconf in src_unpack, and added -i switch to autoreconf
+  to fix #89619.
+
+  17 Apr 2005; Jason Wever <weeve@gentoo.org> transcode-0.6.14-r1.ebuild:
+  Fixed pvm configure pathing logic for sparc.
+
+*transcode-0.6.14-r1 (13 Apr 2005)
+
+  13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/transcode-0.6.14-amd64_mmx.patch,
+  +files/transcode-0.6.14-libquicktime094.patch, +transcode-0.6.14-r1.ebuild:
+  added patch to fix compilation with libquicktime >= 0.9.4, fixes #85865
+
+  05 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -transcode-0.6.10.ebuild, -transcode-0.6.12.ebuild,
+  -transcode-0.6.13.ebuild, transcode-0.6.14.ebuild:
+  Added to ~sparc.  Removed old versions.  Always build shared and static
+  libs.
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> transcode-0.6.14.ebuild:
+  updated gtk dependency, fixes #84253
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> transcode-0.6.10.ebuild,
+  transcode-0.6.11.ebuild, transcode-0.6.12-r1.ebuild,
+  transcode-0.6.12-r2.ebuild, transcode-0.6.12.ebuild,
+  transcode-0.6.13-r1.ebuild, transcode-0.6.13.ebuild,
+  transcode-0.6.14.ebuild:
+  updated HOMEPAGE, fixes #84327
+
+  20 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> transcode-0.6.11.ebuild,
+  transcode-0.6.12-r1.ebuild, transcode-0.6.12-r2.ebuild,
+  transcode-0.6.12.ebuild:
+  divx4linux dependency should be controlled by the respective useflag. fixes
+  #82028
+
+  24 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> transcode-0.6.11.ebuild:
+  updated libdv dependency to fix 77672.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> transcode-0.6.14.ebuild:
+  cleanups and some enhancements, fixes #74806 and #74007. Thanks to Diego
+  Pettenò <dgp85@users.sourceforge.net>
+
+  21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  transcode-0.6.14.ebuild:
+  Multilib fix
+
+  17 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> transcode-0.6.11.ebuild,
+  transcode-0.6.14.ebuild:
+  changed useflag freetype to truetype. fixes bug #75757.
+
+  09 Jan 2005; <augustus@gentoo.org> transcode-0.6.14.ebuild:
+  Added ~amd64.
+
+  08 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  transcode-0.6.14.ebuild:
+  Fix bug #75488 not filtering out some CFLAGS.
+
+  28 Dec 2004; Luca Barbato <lu_zero@gentoo.org> transcode-0.6.11.ebuild:
+  Backport fix from the .14
+
+  06 Dec 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.14.ebuild:
+  Added Keyword ~ppc
+  
+*transcode-0.6.14 (15 Nov 2004)
+
+  03 Dec 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.14.ebuild:
+  Added -momit-leaf-frame-pointer to the list of filtered flags.
+  Removed mmx USE-flag. Apparently it won't compile without mmx.
+  Should satisfy bugs #72876, #72923 and #72121.
+   
+  29 Nov 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.14.ebuild:
+  Version bump. Added new local USE-flags a52, dv, dvdread, freetype, lzo,
+  mjpeg, network and v4l. Should fix bugs #69108, #72044, #72140 and 72633.
+
+  08 Nov 2004; Luca Barbato <lu_zero@gentoo.org> transcode-0.6.13-r1.ebuild:
+  Minor workaround
+
+  05 Nov 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.13-r1.ebuild:
+  Added patch to fix dvd::rip issues. Patch and ebuild submitted by folken 
+  see bug #70092
+
+  28 Oct 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.13.ebuild:
+  Configure cleanups, changed virtual/quicktime to media-libs/libquicktime as
+  quicktime-support wouldn't work otherwise.
+
+*transcode-0.6.13 (27 Oct 2004)
+
+  27 Oct 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.13.ebuild:
+  Version bump.
+
+  20 Oct 2004; Chris White <chriswhite@gentoo.org> transcode-0.6.12-r2.ebuild:
+  Fixed some filter-flag stuff with regards to Bug #48699.
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  transcode-0.6.12-r1.ebuild, transcode-0.6.12-r2.ebuild:
+  get_libdir fixes
+
+*transcode-0.6.12-r2 (29 Sep 2004)
+
+  29 Sep 2004; Daniel Goller <morfic@gentoo.org>
+  +files/transcode-0.6.12-r2-dvdmenu.patch,
+  +files/transcode-0.6.12-r2-gcc34.patch, +transcode-0.6.12-r2.ebuild:
+  ebuild cleanup + fixes for bug #43907, bug #57513, bug #56535, bug #39386
+  Special thanks to autovoicer Bret Towe
+
+  08 Aug 2004; Patrick Dawson <pkdawson@gentoo.org> transcode-0.6.11.ebuild:
+  Added another gcc-3.4 fix. Closes bug #54046.
+  Thanks to Michael Guterl <squeegy@cinci.rr.com>
+
+  25 Jun 2004; Daniel Goller <morfic@gentoo.org> transcode-0.6.12-r1.ebuild:
+  Applying 2nd patch to allow compilation on gcc-3.4.0
+  Added patch Thanks to  ecco@piggy.demon.nl
+  Fixes Bug #49457
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> transcode-0.6.10.ebuild,
+  transcode-0.6.11.ebuild, transcode-0.6.12-r1.ebuild,
+  transcode-0.6.12.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> transcode-0.6.12-r1.ebuild:
+  stable on amd64
+
+  25 May 2004; Danny van Dyk <kugelfang@gentoo.org>
+  transcode-0.6.12-r1.ebuild:
+  Fixed BUG #52023. -fPIC necessary on amd64, so we don't filter-flags it
+  anymore.
+
+  11 May 2004; Scott W Taylor <swtaylor@gentoo.org>
+  transcode-0.6.12-r1.ebuild:
+  cflags=-fPIC yields asm BREG error
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/transcode-gcc34.patch,
+  transcode-0.6.12-r1.ebuild:
+  added fix for gcc 3.4
+
+  28 Feb 2004; Marc Hildebrand <zypher@gentoo.org> transcode-0.6.12-r1.ebuild:
+  added two filter-flags, removed use_enable mmx
+  See bug #38570
+
+  27 Feb 2004; Seemant Kulleen <seemant@gentoo.org> transcode-0.6.10.ebuild,
+  transcode-0.6.11.ebuild, transcode-0.6.12-r1.ebuild:
+  move the filter-flags statement into src_compile
+
+  27 Feb 2004; Seemant Kulleen <seemant@gentoo.org> transcode-0.6.10.ebuild,
+  transcode-0.6.11.ebuild:
+  move the filter-flags statement into src_compile
+
+  25 Feb 2004; Jason Wever <weeve@gentoo.org> transcode-0.6.12-r1.ebuild:
+  Masked on sparc because revision bump introduced broken dependencies which
+  cannot be met at this time.
+
+*transcode-0.6.12-r1 (24 Feb 2004)
+
+  24 Feb 2004; Martin Holzer <mholzer@gentoo.org> transcode-0.6.12-r1.ebuild:
+  adding libtheora support.
+
+*transcode-0.6.12 (17 Jan 2004)
+
+  17 Jan 2004; Martin Holzer <mholzer@gentoo.org> transcode-0.6.12.ebuild:
+  Version bumped. Compiles only with gcc3 at this time.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> transcode-0.6.10.ebuild:
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> transcode-0.6.10.ebuild:
+  set ppc in keywords
+
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> transcode-0.6.11.ebuild:
+  Added ~sparc to keywords.
+
+  26 Dec 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.11.ebuild:
+  x86 stable. Closes 36444.
+
+*transcode-0.6.11 (06 Nov 2003)
+
+  06 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  transcode-0.6.10-r1.ebuild, transcode-0.6.11.ebuild,
+  files/transcode-0.6.10-no-mmx.patch, files/transcode-0.6.11-no-mmx.patch:
+  Update version.  Also fix bug #30877 properly.
+
+  06 Nov 2003; Martin Schlemmer <azarah@gentoo.org> transcode-0.6.10.ebuild:
+  Leave setting configure options if mmx,sse and 3dnow in USE alone for now, as
+  the upstream sources do not set/use the defines (HAVE_MMX,HAVE_MMX_TRUE)
+  correctly, bug #30877.
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> transcode-0.6.9.ebuild:
+  stable bump on x86, cause of avifile compile fix
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> transcode-0.6.10.ebuild,
+  transcode-0.6.3.ebuild, transcode-0.6.6.ebuild, transcode-0.6.7.ebuild,
+  transcode-0.6.8.ebuild, transcode-0.6.9.ebuild:
+  bug #30196 quicktime dep
+
+*transcode-0.6.10 (26 Sep 2003)
+
+  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.10.ebuild:
+  Version bumped.
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.8.ebuild,
+  files/transcode-0.6.8-soxfunc.patch:
+  Added soxfunc patch. Closes #26940
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.6.ebuild:
+  Added 2pass patch. closes #25829
+
+*transcode-0.6.9 (29 Aug 2003)
+
+  29 Aug 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.9.ebuild,
+  files/transcode-0.6.9-makefile.patch:
+  Version bumped. Ebuild submitted by José Romildo Malaquias
+  <romildo@uber.com.br> in #26462.
+
+  05 Aug 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.ebuild,
+  transcode-0.6.6.ebuild, transcode-0.6.7.ebuild, transcode-0.6.8.ebuild:
+  Changed quicktime to virtual/quicktime
+
+  22 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> transcode-*.ebuild :
+  Changed flags alteration.
+
+  11 Jul 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.6.ebuild:
+  Marked stable on x86.
+
+*transcode-0.6.8 (11 Jul 2003)
+
+  11 Jul 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.8.ebuild:
+  Version bumped.
+
+*transcode-0.6.6 (29 Jun 2003)
+
+  29 Jun 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.6.ebuild:
+  Version bumped. Closes #21771.
+
+*transcode-0.6.7 (29 Jun 2003)
+
+  04 Jul 2003; Stefan Jones <cretin@gentoo.org> transcode-0.6.7.ebuild,
+  Added clone_close patch so transcode works with nptl!
+
+  29 Jun 2003; Stefan Jones <cretin@gentoo.org> transcode-0.6.7.ebuild,
+  New version, also updated libdv dep
+ 
+*transcode-0.6.4 (05 May 2003)
+
+  12 May 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.ebuild,
+  transcode-0.6.4.ebuild, transcode-0.6.4_pre20030409.ebuild:
+  Updated -fPic -> -fPIC
+
+  05 May 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.4.ebuild:
+  Version bumped. Closes #20307.
+
+*transcode-0.6.4_pre20030311 (04 May 2003)
+
+  04 May 2003; Martin Holzer <mholzer@gentoo.org>
+  transcode-0.6.4_pre20030311.ebuild, transcode-0.6.4_pre20030409.ebuild:
+  Fixing path to mplayer libpostproc. Closes #16896.
+  Removed mplayer from depend. Closes #20062.
+
+*transcode-0.6.4.20030409 (16 Apr 2003)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.4.20030311.ebuild,
+  transcode-0.6.4.20030409.ebuild:
+  updating ffmpeg dependency. version bumped.
+
+*transcode-0.6.4.20030311 (24 Feb 2003)
+
+  16 Mar 2003; Luca Barbato <lu_zero@gentoo.org> transcode-0.6.4.20030311.ebuild :
+  That works on ppc, thanks to Strubie from the ppc forum
+
+  05 Mar 2003; Martin Schlemmer <azarah@gentoo.org> transcode-0.6.3.ebuild :
+  Get to work with latest netpbm (10.*0).
+
+*transcode-0.6.3 (24 Feb 2003)
+
+  05 Mar 2003; Martin Schlemmer <azarah@gentoo.org> transcode-0.6.3.ebuild :
+  Get to work with latest netpbm (10.*0).
+
+  02 Mar 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.ebuild :
+  Marked as stable.
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> transcode-0.6.3.ebuild,
+  files/digest-transcode-0.6.3 :
+  Version bump. This closes bug #14833.
+
+*transcode-0.6.3.20030116-r1 (13 Feb 2003)
+
+  12 Mar 2003; root <root@gentoo.org> transcode-0.6.2.20021114.ebuild,
+  transcode-0.6.2.20021114.ebuild, transcode-0.6.3.20021205-r1.ebuild,
+  transcode-0.6.3.20021205-r1.ebuild, transcode-0.6.3.20021219.ebuild,
+  transcode-0.6.3.20021219.ebuild, transcode-0.6.3.20030116-r1.ebuild,
+  transcode-0.6.3.20030116-r1.ebuild, transcode-0.6.3.20030116.ebuild,
+  transcode-0.6.3.20030116.ebuild:
+  cleanup
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> :
+  Ebuild has been masked (it'll be deleted later) to avoid
+  downgrade problems (in portage, 0.6.3.* > 0.6.3).
+
+  13 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  transcode-0.6.3.20030116-r1.ebuild,
+  files/digest-transcode-0.6.3.20030116-r1 :
+  Completed library support.  Please note that libpostproc
+  doesn't appear to be detected with mplayer-0.90_rc2 but is
+  with _rc3...
+
+  13 Feb 2003; Nick Hadaway <raker@gentoo.org>
+  transcode-0.6.3.20030116-r1.ebuild,
+  files/digest-transcode-0.6.3.20030116-re :
+  Library support appears now to complete. :)  Depending on the
+  hopefully soon to be marked stable series 10 of netpbm.
+
+  13 Feb 2003; Mark Guertin <gerk@gentoo.org> transcode-0.6.0.ebuild transcode-0.6.1-r1.ebuild
+  transcode-0.6.2.20021114.ebuild transcode-0.6.2.ebuild transcode-0.6.3.20021205-r1.ebuild
+  transcode-0.6.3.20021219.ebuild transcode-0.6.3.20030116.ebuild :
+  Set -ppc in keywords, very x86 specific code.
+
+*transcode-0.6.3.20030116 (13 Feb 2003)
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> :
+  Ebuild has been masked (it'll be deleted later) to avoid
+  downgrade problems (in portage, 0.6.3.* > 0.6.3).
+
+  19 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.20030116.ebuild files/digest-transcode-0.6.3.20030116 ChangeLog :
+  Version bumped. Closes #14066.
+
+*transcode-0.6.3.20021219 (19 Jan 2003)
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> :
+  Ebuild has been masked (it'll be deleted later) to avoid
+  downgrade problems (in portage, 0.6.3.* > 0.6.3).
+
+  19 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.20021219.ebuild files/digest-transcode-0.6.3.20021219 ChangeLog :
+  Version bumped. Now works without avifile !!!. Closes #12471.
+
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> 
+  Big commit cause avifile.0.7.25 breaks all transcode packages
+
+*transcode-0.6.3.20021205-r1 (19 Jan 2003)
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> :
+  Ebuild has been masked (it'll be deleted later) to avoid
+  downgrade problems (in portage, 0.6.3.* > 0.6.3).
+
+  19 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.3.20021205-r1.ebuild files/digest-transcode-0.6.3.20021205-r1 ChangeLog :
+  Now works without avifile !!! and supports subtitles. Closes #12452. 
+
+*transcode-0.6.3.20021205 (11 Dec 2002)
+
+  24 Feb 2003; phoen][x <phoenix@gentoo.org> :
+  Version is not in portage anymore. cvs log shows that mholzer deleted this version
+  on Jan 19 2003.
+
+  11 Dec 2002; B.Lauwers <blauwers@gentoo.org> Changelog, transcode-0.6.3.20021205.ebuild :
+  Bumped to new version per Bug#11114
+
+*transcode-0.6.2 (11 Dec 2002)
+
+  15 Feb 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.2.ebuild :
+  Marking as stable.
+
+  11 Dec 2002; B.Lauwers <blauwers@gentoo.org> Changelog, transcode-0.6.2.ebuild :
+  Bumped to new version per Bug#11114
+
+*transcode-0.6.2.20021114 (17 Nov 2002)
+
+  17 Nov 2002; phoen][x <phoenix@gentoo.org> ChangeLog, transcode-0.6.2.20021114.ebuild,
+  files/digest-transcode-0.6.2.20021114 :
+  Bumped to new version and made it DEPEND on the newest mplayer - this should
+  fix the GET_PP_QUALITY_MAX issue. Thanks to Tony Clark <tclark@telia.com>
+  for the contribution.
+
+*transcode-0.6.1-r1 (29 Oct 2002)
+
+  15 Feb 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.1-r1.ebuild :
+  Marking as stable
+
+  29 Oct 2002; phoen][x <phoenix@gentoo.org> ChangeLog, transcode-0.6.1-r1.ebuild,
+  files/digest-transcode-0.6.1-r1, transcode-0.6.1-PP_QUALITY_MAX.patch :
+  Added a workaround for the GET_PP_QUALITY_MAX compile problem. This fixes bugs
+  #9351, #10788 and #10790. Thanks for your help, guys.
+
+*transcode-0.6.1 (29 Oct 2002)
+
+  29 Oct 2002; phoen][x <phoenix@gentoo.org> ChangeLog, transcode-0.6.1.ebuild,
+  files/digest-transcode-0.6.1 :
+  Bumped to new version and put it in the unstable profile. This closes bug #9351. 
+  Thanks to Tony Clark <tclark@telia.com> for the submission.
+
+*transcode-0.6.0 (28 Aug 2002)
+
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.0.ebuild
+  transcode-0.6.0-PP_QUALITY_MAX.patch :
+  Added mplayer dependency, downported PP_QUALITY_MAX patch
+
+  11 Sep 2002; Mark Guertin <gerk@gentoo.org> :
+  set nasm as x86 only dependancy
+
+  28 Aug 2002; phoen][x <phoenix@gentoo.org> transcode-0.6.0.ebuild :
+  Made libsdl an optional dependency.
+  This closes bug 7000.
+
+  28 Aug 2002; phoen][x <phoenix@gentoo.org> transcode-0.6.0.ebuild :
+  Deleted the gtk+ dependency - transcode doesnt need gtk+ while building.
+
+  12 Aug 2002; Martin Schlemmer <azarah@gentoo.org> transcode-0.6.0.ebuild :
+  Add support for MPlayer's libpostproc.a.
+
+  11 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Updated version.
+
+*transcode-0.6.0_pre5-r2 (29 May 2002)
+
+  11 Aug 2002; phoen][x <phoenix@gentoo.org> transcode-0.6.0_pre5-r2.ebuild :
+  Made transcode depend on libdv-0.9.5*. The new libdv doesnt come with libdv.so.1.
+  This fixes bug 6271.
+
+  29 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Seems as if to not want to build without avifile and dvdread
+  currently.
+
+*transcode-0.6.0_pre5-r1 (26 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Libtoolize to fix invalid paths in plugin .la's.  Add more configure
+  options according to USE flags.
+
+*transcode-0.6.0_pre5 (16 May 2002)
+
+  16 May 2002; Dan Armak <danarmak@gentoo.org>
+  New upstream version, lots of fixes. Fixes infamous bug #2583 (and many duplicates)
+  - dv_init() being called without parameters.
+
+*transcode-0.6.0_pre4-r2 (3 May 2002)
+
+  3 May 2002; J.Hudson <jhhudso@gentoo.org>
+  transcode-0.6.0_pre4-r2.ebuild,
+  files/digest-transcode-0.6.0_pre4-r1, Changelog :
+  Added a patch that fixes gcc3 compiles with this package.
+	
+*transcode-0.6.0_pre4-r1 (21 Apr 2002)
+
+  21 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  transcode-0.6.0_pre4-r1.ebuild,
+  files/digest-transcode-0.6.0_pre4-r1, ChangeLog :
+  Added missing dependency media-libs/a52dec. Corrected ChangeLog header.
+
+*transcode-0.6.0_pre4 (15 Apr 2002)
+
+  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> transcode-0.6.0_pre4.ebuild
+  files/digest-transcode-0.6.0_pre4 :
+  Version bump submitted by doug_shea@alumni.ucsd.edu (Doug Shea) in bug #1740
 
 *transcode-0.5.3 (2 Apr 2002)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 86fd53ebb814..9f26a2ef3025 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,10 +1,20 @@
-MD5 9106a26fad8b43bbb8b56ed3864819dd ChangeLog 7875
-MD5 df648b9270825d3e3a34a1837dc21306 transcode-0.6.2.ebuild 3120
-MD5 eabc6fdcc13ab5dd87dd216176efd525 transcode-0.6.4_pre20030409.ebuild 3328
-MD5 d5980a6ab3d57f2dbbd6d3fdc4bbac73 transcode-0.6.3.ebuild 3060
-MD5 eabc6fdcc13ab5dd87dd216176efd525 transcode-0.6.4_pre20030311.ebuild 3328
-MD5 03629a858586307611c7d7c2a2dc1505 files/digest-transcode-0.6.2 68
-MD5 225a843999c440c3060e96b9fe6fca35 files/digest-transcode-0.6.3 68
-MD5 1df31254b872ebb1740a8b5cbcd67dab files/ogg.patch 338
-MD5 c2dff7b39f16d159e834446e72cb5b6e files/digest-transcode-0.6.4_pre20030409 77
-MD5 107162eef77c28d7b42d423cb68060b0 files/digest-transcode-0.6.4_pre20030311 77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c8609c62283ab6d0e13e75a87c519cf5 ChangeLog 22632
+MD5 8e1251c76b508dfdfe0e4f0c0b166540 files/digest-transcode-0.6.14-r2 144
+MD5 03b7d892f34025e0c5854e0977b5fb49 files/digest-transcode-0.6.14-r3 144
+MD5 790de38f84754a5a010ba5823d8b9770 files/digest-transcode-1.0.1 68
+MD5 2ee1936ab9b228cc4350881352426bd8 files/digest-transcode-1.0.2 68
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 4c8fb6591a1611204df2915302b515f2 transcode-0.6.14-r2.ebuild 4055
+MD5 57eb8aa402eee3e3e839e6a3d59c66af transcode-0.6.14-r3.ebuild 3922
+MD5 c2d85d10e0ef5dd12f67a0ffd3275043 transcode-1.0.1.ebuild 3829
+MD5 beafd94910063a9ee9ee313790639eac transcode-1.0.2.ebuild 3816
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDc+bzAiZjviIA2XgRAtXJAKDacQvcE9iA/zga5XLvIxNdfHQMrgCcCwua
+q2gOErTsPAzex8rlbNtTpUw=
+=vwiN
+-----END PGP SIGNATURE-----
diff --git a/media-video/transcode/metadata.xml b/media-video/transcode/metadata.xml
index 47ec49344c32..d9df1878d8e2 100644
--- a/media-video/transcode/metadata.xml
+++ b/media-video/transcode/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>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/transcode/transcode-0.6.14-r2.ebuild b/media-video/transcode/transcode-0.6.14-r2.ebuild
index 1b4640e0dbd6..366c005ada64 100644
--- a/media-video/transcode/transcode-0.6.14-r2.ebuild
+++ b/media-video/transcode/transcode-0.6.14-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-video/transcode/transcode-0.6.14-r2.ebuild,v 1.1 2005/04/27 11:14:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils multilib
 
@@ -10,17 +10,15 @@ MY_P="${P/_pre/.}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="video stream processing tool"
 HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode"
-SRC_URI="http://www.jakemsr.com/transcode/${P}.tar.gz
-	http://www.ligo.caltech.edu/~pehrens/${P}.tar.gz
-	http://www.kraymer.de/mirroring/${P}.tar.gz
+SRC_URI="mirror://transcode/${P}.tar.gz
 	http://rebels.plukwa.net/linux-video/${PN}/${P}.tar.gz
 
-	http://dev.gentoo.org/~flameeyes/distfiles/${PN}-patches-${PATCH_VER}.tbz2"
+	mirror://gentoo/${PN}-patches-${PATCH_VER}.tbz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="X 3dnow a52 avi altivec divx4linux dv dvdread encode fame truetype \
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="X 3dnow a52 avi altivec dv dvdread encode fame truetype \
 	gtk imagemagick jpeg lzo mjpeg mpeg mmx network ogg vorbis pvm quicktime \
 	sdl sse sse2 theora v4l xvid xml2"
 
@@ -37,7 +35,6 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	media-libs/libexif
 	X? ( virtual/x11 )
 	avi? ( >=media-video/avifile-0.7.41.20041001 )
-	divx4linux? ( >=media-libs/divx4linux-20030428 )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.93 )
 	sdl? ( media-libs/libsdl )
@@ -55,8 +52,8 @@ DEPEND="${RDEPEND}
 	=sys-devel/gcc-3*"
 
 pkg_setup() {
-	if has_version xorg-x11 && ! built_with_use xorg-x11 xv; then
-		die "You need xv support to compile transcode."
+	if has_version x11-base/xorg-x11 && ! built_with_use x11-base/xorg-x11 xv; then
+		die "You need xorg-x11 emerged with xv support to compile transcode."
 	fi
 }
 
diff --git a/media-video/transcode/transcode-0.6.14-r3.ebuild b/media-video/transcode/transcode-0.6.14-r3.ebuild
index ca1cb4b97fe5..b85d6bcb8815 100644
--- a/media-video/transcode/transcode-0.6.14-r3.ebuild
+++ b/media-video/transcode/transcode-0.6.14-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-video/transcode/transcode-0.6.14-r3.ebuild,v 1.1 2005/10/15 18:52:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
@@ -10,9 +10,7 @@ MY_P="${P/_pre/.}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="video stream processing tool"
 HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode"
-SRC_URI="http://www.jakemsr.com/transcode/${P}.tar.gz
-	http://www.ligo.caltech.edu/~pehrens/${P}.tar.gz
-	http://www.kraymer.de/mirroring/${P}.tar.gz
+SRC_URI="mirror://transcode/${P}.tar.gz
 	http://rebels.plukwa.net/linux-video/${PN}/${P}.tar.gz
 
 	mirror://gentoo/${PN}-patches-${PATCH_VER}.tbz2"
diff --git a/media-video/transcode/transcode-1.0.1.ebuild b/media-video/transcode/transcode-1.0.1.ebuild
index fde94f65f9b8..244319424459 100644
--- a/media-video/transcode/transcode-1.0.1.ebuild
+++ b/media-video/transcode/transcode-1.0.1.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.1.ebuild,v 1.1 2005/10/14 13:28:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
 
-inherit libtool flag-o-matic eutils multilib
+inherit libtool flag-o-matic eutils multilib autotools
 
 MY_P="${P/_/}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="video stream processing tool"
 HOMEPAGE="http://www.transcoding.org/cgi-bin/transcode"
-SRC_URI="http://www.jakemsr.com/transcode/${MY_P}.tar.gz"
+SRC_URI="mirror://transcode/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="X 3dnow a52 avi altivec dv dvdread mp3 fame truetype \
+IUSE="X 3dnow a52 altivec dv dvdread mp3 fame truetype \
 	gtk imagemagick jpeg lzo mjpeg mpeg mmx network ogg vorbis pvm quicktime \
 	sdl sse sse2 theora v4l xvid xml2 ffmpeg"
 
 RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	dv? ( >=media-libs/libdv-0.99 )
 	dvdread? ( >=media-libs/libdvdread-0.9.0 )
-	>=media-video/ffmpeg-0.4.9_pre1
 	xvid? ( >=media-libs/xvid-1.0.2 )
 	mjpeg? ( >=media-video/mjpegtools-1.6.2-r3 )
 	lzo? ( >=dev-libs/lzo-1.08 )
@@ -29,7 +28,6 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	media-libs/netpbm
 	media-libs/libexif
 	X? ( virtual/x11 )
-	avi? ( >=media-video/avifile-0.7.41.20041001 )
 	mpeg? ( media-libs/libmpeg3 )
 	mp3? ( >=media-sound/lame-3.93 )
 	sdl? ( media-libs/libsdl )
@@ -58,9 +56,7 @@ src_unpack() {
 	sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
 		${S}/docs/Makefile.am ${S}/docs/html/Makefile.am
 
-	libtoolize --copy --force || die "libtoolize failed"
-	autoreconf -i || die "autoreconf failed"
-
+	eautoreconf
 	elibtoolize	# fix invalid paths in .la files of plugins
 }
 
@@ -100,7 +96,6 @@ src_compile() {
 		$(use_enable network netstream) \
 		$(use_enable truetype freetype2) \
 		$(use_enable v4l) \
-		$(use_enable avi avifile) \
 		$(use_enable mp3 lame) \
 		$(use_enable ogg) \
 		$(use_enable vorbis) \
@@ -122,9 +117,10 @@ src_compile() {
 		$(use_with X x) \
 		$(use_with ffmpeg libpostproc-builddir "${ROOT}/usr/$(get_libdir)") \
 		${myconf} \
+		--disable-avifile \
 		|| die
 
-	emake -j1 all || die
+	emake all || die
 
 	if use pvm; then
 		sed -i -e "s:\${exec_prefix}/bin/pvmgs:\$(DESTDIR)/\${exec_prefix}/bin/pvmgs:" ${S}/pvm3/Makefile || die
diff --git a/media-video/transcode/transcode-1.0.2.ebuild b/media-video/transcode/transcode-1.0.2.ebuild
index a7a657e35b74..166fb88b4d29 100644
--- a/media-video/transcode/transcode-1.0.2.ebuild
+++ b/media-video/transcode/transcode-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-video/transcode/transcode-1.0.2.ebuild,v 1.1 2005/11/11 00:33:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:57:27 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils multilib autotools
 
diff --git a/media-video/tuxzap-programs/ChangeLog b/media-video/tuxzap-programs/ChangeLog
index b7855c5cfe04..ac4b05198027 100644
--- a/media-video/tuxzap-programs/ChangeLog
+++ b/media-video/tuxzap-programs/ChangeLog
@@ -1,14 +1,34 @@
 # ChangeLog for media-video/tuxzap-programs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/ChangeLog,v 1.1 2003/06/18 12:48:29 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/ChangeLog,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
-*tuxzap-programs-0.2.3 (18 Jun 2003)
+*tuxzap-programs-0.5.4 (25 Sep 2005)
+
+  25 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +tuxzap-programs-0.5.4.ebuild:
+  Version bump to fix #35919.
+
+  04 Sep 2005; Matthias Schwarzott <zzam@gentoo.org>
+  tuxzap-programs-0.2.3.ebuild, tuxzap-programs-0.2.5.ebuild:
+  Changed dvb dependency according to bug #98672 comment #4.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml. Taking over as maintainer.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  tuxzap-programs-0.2.3.ebuild:
+  Add die following econf for bug 48950
+
+*tuxzap-programs-0.2.5 (18 Jun 2003)
 
   18 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
   tuxzap-programs-0.2.3.ebuild, tuxzap-programs-0.2.5.ebuild:
   renamed to comply with naming policy
 
-*tuxzap_programs-0.2.3 (21 Mar 2003)
+*tuxzap-programs-0.2.3 (21 Mar 2003)
 
   05 Apr 2003; Martin Holzer <mholzer@gentoo.org>
   tuxzap_programs-0.2.3.ebuild, tuxzap_programs-0.2.5.ebuild:
diff --git a/media-video/tuxzap-programs/Manifest b/media-video/tuxzap-programs/Manifest
index 403915b980bc..2386a4ea2484 100644
--- a/media-video/tuxzap-programs/Manifest
+++ b/media-video/tuxzap-programs/Manifest
@@ -1,7 +1,18 @@
-MD5 424a2eb341d6e42465d397fb50f9e5c9 tuxzap-programs-0.2.3.ebuild 1156
-MD5 e6444be4de3fe20af79e0e3617d49c1a tuxzap-programs-0.2.5.ebuild 1166
-MD5 319c85ca35bb953f92858daa299d91bc ChangeLog 959
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 49cd2504885325b2b4a648aad0d74cc2 tuxzap-programs-0.2.3.ebuild 1165
+MD5 fc7e8d5c9300e902b995f921fd5973c0 tuxzap-programs-0.5.4.ebuild 1052
+MD5 9dc3571201aa71fcd6485baec9849fad tuxzap-programs-0.2.5.ebuild 1157
+MD5 ca1868066473f6edba331105e7d3e1e4 ChangeLog 1832
 MD5 0891de6f156d6359fa93b062689f68b0 files/digest-tuxzap-programs-0.2.3 73
+MD5 696157bae4b75290c36601559e107ce8 files/digest-tuxzap-programs-0.5.4 73
 MD5 275c443eecaafa17b2d4750320d45e26 files/digest-tuxzap-programs-0.2.5 73
-MD5 24c91fab0747b986bfc8d8da04564377 files/digest-tuxzap_programs-0.2.3 145
-MD5 abb9d0ee7a4fad195cd1567738549e39 files/digest-tuxzap_programs-0.2.5 145
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNolBgIKl8Uu19MoRAng3AJ4rx3SVVXnG1NjHTsL9qiI1dItmPQCePXdX
+f03trESS95xkblEgNTsbSbY=
+=T0Or
+-----END PGP SIGNATURE-----
diff --git a/media-video/tuxzap-programs/metadata.xml b/media-video/tuxzap-programs/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/tuxzap-programs/metadata.xml
+++ b/media-video/tuxzap-programs/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/tuxzap-programs/tuxzap-programs-0.2.3.ebuild b/media-video/tuxzap-programs/tuxzap-programs-0.2.3.ebuild
index e2432f7b55d5..422e6b42e37a 100644
--- a/media-video/tuxzap-programs/tuxzap-programs-0.2.3.ebuild
+++ b/media-video/tuxzap-programs/tuxzap-programs-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.2.3.ebuild,v 1.1 2003/06/18 12:48:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 IUSE="gtk"
 
@@ -15,31 +15,32 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4
-	>=media-tv/linuxtv-dvb-1.0.0_pre2
+	|| (
+		>=sys-kernel/linux-headers-2.6.11-r2
+		media-tv/linuxtv-dvb
+	)
 	>=media-libs/libdvb-0.2.1
 	dev-libs/cdk
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
-
 src_compile() {
-    MYCONF='--with-dvb-path=/usr/lib'
-    # not using X use var because gtk is needed too anyway
-    use gtk || MYCONF=${MYCONF}' --without-x'
-    econf ${MYCONF}
+	MYCONF='--with-dvb-path=/usr/lib'
+	# not using X use var because gtk is needed too anyway
+	use gtk || MYCONF=${MYCONF}' --without-x'
+	econf ${MYCONF} || die "econf failed"
 
-    # still assumes to be in the DVB dir 
-    sed -i \
+	# still assumes to be in the DVB dir
+	sed -i \
 		-e s%../../../libdvb%/usr/include/libdvb%g  \
 		-e s%../../../include%/usr/include%g \
 		${S}/src/Makefile
 
-    emake || die 'compile failed'
+	emake || die 'compile failed'
 }
 
 src_install() {
-    make DESTDIR=${D} install || die
-    
-    # docs
-    dodoc ${S}/README ${S}/AUTHORS ${S}/NEWS ${S}/ChangeLog
-}
+	make DESTDIR=${D} install || die
 
+	# docs
+	dodoc ${S}/README ${S}/AUTHORS ${S}/NEWS ${S}/ChangeLog
+}
diff --git a/media-video/tuxzap-programs/tuxzap-programs-0.2.5.ebuild b/media-video/tuxzap-programs/tuxzap-programs-0.2.5.ebuild
index b757649e266a..4764faaae777 100644
--- a/media-video/tuxzap-programs/tuxzap-programs-0.2.5.ebuild
+++ b/media-video/tuxzap-programs/tuxzap-programs-0.2.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/media-video/tuxzap-programs/tuxzap-programs-0.2.5.ebuild,v 1.1 2003/06/18 12:48:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.2.5.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 IUSE="gtk"
 
@@ -15,29 +15,31 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4
-	>=media-tv/linuxtv-dvb-1.0.0_pre2
+	|| (
+		>=sys-kernel/linux-headers-2.6.11-r2
+		media-tv/linuxtv-dvb
+	)
 	>=media-libs/libdvb-0.2.1
 	dev-libs/cdk
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
-
 src_compile() {
-    myconf='--with-dvb-path=/usr/lib'
-    # not using X use var because gtk is needed too anyway
-    use gtk || myconf=${myconf}' --without-x'
-    econf ${myconf} || die
+	myconf='--with-dvb-path=/usr/lib'
+	# not using X use var because gtk is needed too anyway
+	use gtk || myconf=${myconf}' --without-x'
+	econf ${myconf} || die
 
-    # still assumes to be in the DVB dir 
-    sed -i \
+	# still assumes to be in the DVB dir
+	sed -i \
 		-e s%../../../libdvb%/usr/include/libdvb%g  \
 		-e s%../../../include%/usr/include%g \
 		${S}/src/Makefile
 
-    emake || die 'compile failed'
+	emake || die 'compile failed'
 }
 
 src_install() {
-    make DESTDIR=${D} install || die
-    
-    dodoc ${S}/README ${S}/AUTHORS ${S}/NEWS ${S}/ChangeLog
+	make DESTDIR=${D} install || die
+
+	dodoc ${S}/README ${S}/AUTHORS ${S}/NEWS ${S}/ChangeLog
 }
diff --git a/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild b/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
index 851ab493d229..5dc7bdd42352 100644
--- a/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
+++ b/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild,v 1.1 2005/09/25 11:24:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild,v 1.1.1.1 2005/11/30 09:57:14 chriswhite Exp $
 
 inherit multilib
 
diff --git a/media-video/usb-pwc-re/ChangeLog b/media-video/usb-pwc-re/ChangeLog
index 67acb271dfd3..b4879239919a 100644
--- a/media-video/usb-pwc-re/ChangeLog
+++ b/media-video/usb-pwc-re/ChangeLog
@@ -1,6 +1,66 @@
 # ChangeLog for media-video/usb-pwc-re
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.1 2004/12/07 14:27:40 phosphan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/ChangeLog,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
+
+*usb-pwc-re-10.0.9_rc1 (31 Oct 2005)
+
+  31 Oct 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +usb-pwc-re-10.0.9_rc1.ebuild:
+  Version bump
+
+  10 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> usb-pwc-re-10.0.7.ebuild,
+  usb-pwc-re-10.0.7a.ebuild:
+  Fails now if the driver is already built in (see bug #101944).
+
+*usb-pwc-re-10.0.7a (05 Aug 2005)
+
+  05 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +usb-pwc-re-10.0.7a.ebuild:
+  Version bump (uses v4l2)
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> usb-pwc-re-10.0.7.ebuild:
+  Added to ~ppc.
+
+  27 Jul 2005; Patrick Kursawe <phosphan@gentoo.org>
+  -usb-pwc-re-10.0.6a.ebuild:
+  Cleanup
+
+  26 Jul 2005; Simon Stelling <blubb@gentoo.org> usb-pwc-re-10.0.7.ebuild:
+  stable on amd64
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> usb-pwc-re-10.0.7.ebuild:
+  Stable on ppc64
+
+  02 May 2005; Patrick Kursawe <phosphan@gentoo.org> usb-pwc-re-10.0.7.ebuild:
+  Getting kernel source detection from linux-info.eclass, overriding detection
+  in the Makefile (bug #90869)
+
+*usb-pwc-re-10.0.7 (26 Apr 2005)
+
+  26 Apr 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +usb-pwc-re-10.0.7.ebuild:
+  Version bump (bug #90383)
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> usb-pwc-re-10.0.6a.ebuild:
+  Stable on ppc64
+
+  17 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  usb-pwc-re-10.0.6a.ebuild:
+  No longer using set_arch_to_kernel (bug #85341)
+
+  16 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  usb-pwc-re-10.0.6a.ebuild:
+  My last fix broke the module installation path (bug #85238)
+
+  14 Mar 2005; <hparker@gentoo.org> usb-pwc-re-10.0.6a.ebuild:
+  Added ~amd64. Fixes #78734
+
+  09 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  usb-pwc-re-10.0.6a.ebuild:
+  Declaring stable for x86. Replacing check-kernel with linux-info.
+
+  20 Feb 2005; Markus Rothe <corsair@gentoo.org> usb-pwc-re-10.0.6a.ebuild:
+  Added ~ppc64 to KEYWORDS
 
 *usb-pwc-re-10.0.6a (07 Dec 2004)
 
diff --git a/media-video/usb-pwc-re/Manifest b/media-video/usb-pwc-re/Manifest
index 1be1aee4085b..232c49134a86 100644
--- a/media-video/usb-pwc-re/Manifest
+++ b/media-video/usb-pwc-re/Manifest
@@ -1,2 +1,8 @@
-MD5 af362d34bc41624d47c27b4740feac6c usb-pwc-re-10.0.6a.ebuild 1080
-MD5 0f0e28dc65e476d4794110d268caced2 files/digest-usb-pwc-re-10.0.6a 63
+MD5 74e1a8fa9a07c79c0ce30734d54dbfad usb-pwc-re-10.0.9_rc1.ebuild 1448
+MD5 b6a1c82065234c1a7100de5f414475f4 usb-pwc-re-10.0.7a.ebuild 1421
+MD5 7f69b2814bb7838f5829dad6a9647e2a usb-pwc-re-10.0.7.ebuild 1418
+MD5 e05fe639ad6134ebd3fcdc1c3be38d43 ChangeLog 2274
+MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
+MD5 3808ae386cedb8841b70ea447cf94a4e files/digest-usb-pwc-re-10.0.7 62
+MD5 ea1ff464d19a6150ba089e93eb49f9f1 files/digest-usb-pwc-re-10.0.7a 63
+MD5 b953aca8bbf15ae5fff07e6deb5fb9b3 files/digest-usb-pwc-re-10.0.9_rc1 66
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
index 3ea91c344a2b..a12114b6bae7 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.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-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild,v 1.1 2005/04/26 06:21:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -11,14 +11,17 @@ SRC_URI="http://www.saillard.org/pwc/files/pwc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc64 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
-DEPEND=""
+DEPEND="sys-kernel/linux-headers"
+RDEPEND=""
+
 S=${WORKDIR}/pwc-${PV}
 
 src_compile() {
 	export ARCH="$(tc-arch-kernel)"
-	emake || die "make failed"
+	emake KSRC="${KERNEL_DIR}" || die "make failed"
+	test -f pwc.ko || die "You can't have both at once - a builtin driver and a module."
 }
 
 src_install() {
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild
index cfecd7888807..c97d8dfea18e 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild,v 1.1 2005/08/05 11:56:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.7a.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 
 inherit linux-info toolchain-funcs eutils
@@ -22,6 +22,7 @@ S=${WORKDIR}/pwc-${PV}
 src_compile() {
 	export ARCH="$(tc-arch-kernel)"
 	emake KSRC="${KERNEL_DIR}" || die "make failed"
+	test -f pwc.ko || die "You can't have both at once - a builtin driver and a module."
 }
 
 src_install() {
diff --git a/media-video/usb-pwc-re/usb-pwc-re-10.0.9_rc1.ebuild b/media-video/usb-pwc-re/usb-pwc-re-10.0.9_rc1.ebuild
index f677dc6e3fa0..eb1bec2af1af 100644
--- a/media-video/usb-pwc-re/usb-pwc-re-10.0.9_rc1.ebuild
+++ b/media-video/usb-pwc-re/usb-pwc-re-10.0.9_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.9_rc1.ebuild,v 1.1 2005/10/31 11:26:46 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwc-re/usb-pwc-re-10.0.9_rc1.ebuild,v 1.1.1.1 2005/11/30 09:57:22 chriswhite Exp $
 
 
 inherit linux-info toolchain-funcs eutils
diff --git a/media-video/usb-pwcx/ChangeLog b/media-video/usb-pwcx/ChangeLog
index 1451109718d8..09567d38dde0 100644
--- a/media-video/usb-pwcx/ChangeLog
+++ b/media-video/usb-pwcx/ChangeLog
@@ -1,7 +1,37 @@
-# ChangeLog for media-video/w3cam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/ChangeLog,v 1.1 2002/10/23 09:29:03 zwelch Exp $
+# ChangeLog for media-video/usb-pwcx
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
+  09 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> usb-pwcx-8.2.2.ebuild,
+  usb-pwcx-8.4.ebuild:
+  Switching from check-kernel to linux-info eclass for version information.
+
+  31 Jan 2005; Simon Stelling <blubb@gentoo.org> usb-pwcx-8.2.2.ebuild,
+  usb-pwcx-8.4.ebuild:
+  set keywords -* exept x86
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> usb-pwcx-8.2.2.ebuild:
+  Typo in DESCRIPTION: resoltions -> resolutions. Bug 59717.
+
+  07 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> usb-pwcx-8.2.2.ebuild:
+  Bails out for 2.6 kernels now.
+
+  18 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> usb-pwcx-8.4.ebuild:
+  Now _really_ using check-kernel
+
+  18 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> usb-pwcx-8.4.ebuild:
+  Uses check-kernel eclass now
+
+  11 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> :
+  Added metadata - video herd.
+
+*usb-pwcx-8.4 (11 Feb 2004)
+
+  11 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> usb-pwcx-8.4.ebuild:
+  Version bump, ebuild from bug #39560 - thanks!
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *usb-pwcx-8.2.2 (25 Aug 2002)
 
   25 Aug 2002; Burton Samograd <kruhft@kruhft.dyndns.org> ChangeLog,
diff --git a/media-video/usb-pwcx/Manifest b/media-video/usb-pwcx/Manifest
index e69de29bb2d1..b86163fe72f9 100644
--- a/media-video/usb-pwcx/Manifest
+++ b/media-video/usb-pwcx/Manifest
@@ -0,0 +1,7 @@
+MD5 a3ecf86c64ea1ca037f3ed58b24d0ece usb-pwcx-8.2.2.ebuild 1002
+MD5 66ed2f626d623bd8517e3c68faeee5ba ChangeLog 1583
+MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
+MD5 3de6b8445ffe89ba5c7ea9f947a613a0 usb-pwcx-8.4.ebuild 1315
+MD5 607e5a7c043cc677f885658c4b750baa files/usb-pwcx 144
+MD5 19b8836cde7ecb9a02db58728d2c292b files/digest-usb-pwcx-8.4 59
+MD5 65e1b1430f7765ebd7f41b6e53585d6a files/digest-usb-pwcx-8.2.2 65
diff --git a/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild b/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild
index 21ccdfbe1e7d..6074a4016734 100644
--- a/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild
+++ b/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild
@@ -1,23 +1,34 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild,v 1.1 2002/10/23 09:29:03 zwelch Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.2.2.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Optional closed source drivers for phillips webcams to allow for higher resoltions and framerates "
-SRC_URI="http://www.smcc.demon.nl/webcam/usb-pwcx-8.2.2.tar.gz"
+inherit linux-info
+
+DESCRIPTION="Optional closed source drivers for phillips webcams to allow for higher resolutions and framerates "
 HOMEPAGE="http://www.smcc.demon.nl/webcam/"
-SLOT="0"
+SRC_URI="http://www.smcc.demon.nl/webcam/usb-pwcx-8.2.2.tar.gz"
+
 LICENSE="freedist"
-KEYWORDS="~x86 -ppc -sparc -sparc64 -alpha"
+SLOT="0"
+KEYWORDS="x86 -*"
+IUSE=""
+
 DEPEND=""
 
+pkg_setup() {
+	if ! kernel_is 2 4; then
+		eerror "You need a newer version (or usb-pwc-re) for 2.6 kernels!"
+		die "This works only for 2.4 kernels"
+	fi
+}
+
 src_install() {
 	insinto "/lib/modules/usb"
 	doins pwcx-i386.o
 
 	insinto /etc/modules.d
 	doins "${FILESDIR}"/usb-pwcx
-    
+
 	dodoc install.html readme.html webcam.css
 }
 
@@ -28,4 +39,3 @@ pkg_postinst() {
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
 	fi
 }
-
diff --git a/media-video/usb-pwcx/usb-pwcx-8.4.ebuild b/media-video/usb-pwcx/usb-pwcx-8.4.ebuild
index ec34d5cddfe7..96d9ff41a76e 100644
--- a/media-video/usb-pwcx/usb-pwcx-8.4.ebuild
+++ b/media-video/usb-pwcx/usb-pwcx-8.4.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-video/usb-pwcx/usb-pwcx-8.4.ebuild,v 1.1 2004/02/11 10:23:51 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/usb-pwcx/usb-pwcx-8.4.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+
+inherit linux-info
 
 DESCRIPTION="Optional binary only drivers for phillips (and many other) webcams giving higher resolutions and framerates"
 HOMEPAGE="http://www.smcc.demon.nl/webcam/"
@@ -8,22 +11,25 @@ SRC_URI="http://www.smcc.demon.nl/webcam/pwcx-${PV}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
+KEYWORDS="~x86 -*"
+IUSE=""
 DEPEND=""
 S=${WORKDIR}/pwcx-${PV}
 
 src_install() {
 
-	if [ "$(echo $(uname -r) | cut -c-3)" = "2.6" ]; then
-		einfo "Kernel 2.6 detected!"
-		insinto "/lib/modules/$(uname -r)/video/"
+	if kernel_is 2 6; then
+		einfo "Kernel ${KV_FULL} detected!"
+		insinto "/lib/modules/${KV_FULL}/video/"
 		doins 2.6.0/gcc-3.2/pwcx.ko
 		echo "post-install pwc /sbin/modprobe --force pwcx >& /dev/null 2>&1 || :" > usb-pwcx
-	else
-		einfo "Kernel 2.4 detected!"
+	elif kernel_is 2 4; then
+		einfo "Kernel ${KV_FULL} detected!"
 		insinto "/lib/modules/usb"
 		doins 2.4.23/gcc-3.2/pwcx.o
 		echo "post-install pwc /sbin/insmod --force /lib/modules/usb/pwcx.o >& /dev/null 2>&1 || :" > usb-pwcx
+	else
+		eerror "No supported kernel version (2.4/2.6) detected."
 	fi
 
 	insinto /etc/modules.d
diff --git a/media-video/vamps/ChangeLog b/media-video/vamps/ChangeLog
index bb9941445a69..cc9393b8c9b3 100644
--- a/media-video/vamps/ChangeLog
+++ b/media-video/vamps/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for media-video/vamps
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/ChangeLog,v 1.1 2004/07/23 15:08:02 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/ChangeLog,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> vamps-0.95.ebuild,
+  vamps-0.97.ebuild:
+  Don't install INSTALL file.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> vamps-0.95.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  22 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> vamps-0.95.ebuild,
+  vamps-0.97.ebuild:
+  0.95 stable on amd64 and x86
+
+*vamps-0.97 (28 Mar 2005)
+
+  28 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/vamps-0.97-amd64.patch, +vamps-0.97.ebuild:
+  new upstream version. fixes #83059
+
+  26 Oct 2004; Chris White <chriswhite@gentoo.org> vamps-0.95.ebuild:
+  Switch over to toolchain getCC from CC.
+
+  05 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> vamps-0.95.ebuild:
+  Added amd64 keyword, closing #58517.
 
 *vamps-0.95 (23 Jul 2004)
 
diff --git a/media-video/vamps/Manifest b/media-video/vamps/Manifest
index c1cb184db401..e5e1911fbb99 100644
--- a/media-video/vamps/Manifest
+++ b/media-video/vamps/Manifest
@@ -1,2 +1,18 @@
-MD5 a3b5816e08ce5963678c0485c8118a46 vamps-0.95.ebuild 810
-MD5 016bf3c6dbdba715c0fa44da8cdc0652 files/digest-vamps-0.95 57
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 509a9af461af46380725f8f645776c00 ChangeLog 1120
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 8e31ffe916e5385b9baa0544572c3489 vamps-0.97.ebuild 769
+MD5 221bfe4b9f168f9fd03d1c8c9cbcdaa2 vamps-0.95.ebuild 1020
+MD5 631c0372bf5202d455e8a5a181722f30 files/digest-vamps-0.95 62
+MD5 b532e6287e57b9915b1e2b9a0bf74efb files/digest-vamps-0.97 61
+MD5 49b7850d2043759367f52d8594d8d69b files/vamps-0.95-amd64.patch 398
+MD5 b08ef3771051017031df6fc8d4061db1 files/vamps-0.97-amd64.patch 340
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPmDTflZ8QqxhrsMRAjunAJ46T5NAHj8rZ3SiKPjnFVwLGwQLdQCgsOT7
+K7O0tbmb6QMDtNv70CzxZys=
+=Vb9j
+-----END PGP SIGNATURE-----
diff --git a/media-video/vamps/files/digest-vamps-0.95 b/media-video/vamps/files/digest-vamps-0.95
index 7972069bea66..224aca71b200 100644
--- a/media-video/vamps/files/digest-vamps-0.95
+++ b/media-video/vamps/files/digest-vamps-0.95
@@ -1 +1 @@
-MD5 993a6e5ca5097d2f9f3591372637f2c6 0401-094.tgz 243035
+MD5 60696f34dd3bc98330df76dcc0242a50 vamps-0.95.tar.gz 242908
diff --git a/media-video/vamps/vamps-0.95.ebuild b/media-video/vamps/vamps-0.95.ebuild
index c47d1e1b06e7..2b2169be521f 100644
--- a/media-video/vamps/vamps-0.95.ebuild
+++ b/media-video/vamps/vamps-0.95.ebuild
@@ -1,29 +1,36 @@
-# Copyright 1999-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-video/vamps/vamps-0.95.ebuild,v 1.1 2004/07/23 15:08:02 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/vamps-0.95.ebuild,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Very fast requantisizing tool for backup DVDs"
-HOMEPAGE="http://www.heise.de/ct/ftp/04/01/094/"
-SRC_URI="ftp://ftp.heise.de/pub/ct/listings/0401-094.tgz"
+HOMEPAGE="http://sourceforge.net/projects/vamps/"
+SRC_URI="mirror://sourceforge/vamps/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 IUSE=""
 DEPEND="dev-perl/GD
-	dev-perl/Getopt-Long
+	perl-core/Getopt-Long
 	dev-perl/Config-IniFiles
 	>=media-libs/libdvdread-0.9.4
 	>=media-video/dvdauthor-0.6.10"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
+}
+
 src_compile() {
-	emake CC="$CC" CFLAGS="$CFLAGS" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="$CFLAGS" || die "emake failed"
 	mv -fv lsdvd lsdvd-vamps # rename to avoid conflict with media-video/lsdvd
 }
 
 src_install() {
 	dobin vamps lsdvd-vamps vamps-play_title dvdgm.pl
-	dodoc COPYING INSTALL README
+	dodoc README
 	insinto /usr/share/vamps
 	doins ct-dvd.xml dvdgm.cfg palette.yuv penguin.jpg silence.mp2
 }
diff --git a/media-video/vamps/vamps-0.97.ebuild b/media-video/vamps/vamps-0.97.ebuild
index 05dc1a9a5c3d..9847bb8317de 100644
--- a/media-video/vamps/vamps-0.97.ebuild
+++ b/media-video/vamps/vamps-0.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/vamps-0.97.ebuild,v 1.1 2005/03/28 03:41:46 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/vamps-0.97.ebuild,v 1.1.1.1 2005/11/30 09:57:20 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,5 +27,4 @@ src_compile() {
 
 src_install() {
 	dobin vamps play_cell
-	dodoc COPYING INSTALL
 }
diff --git a/media-video/vcdgear/ChangeLog b/media-video/vcdgear/ChangeLog
index 7b8d63547a13..d74c2f1ead74 100644
--- a/media-video/vcdgear/ChangeLog
+++ b/media-video/vcdgear/ChangeLog
@@ -1,8 +1,33 @@
 # ChangeLog for media-video/vcdgear
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/ChangeLog,v 1.1 2002/10/23 14:04:59 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/ChangeLog,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
+
+*vcdgear-1.76-r1 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org> -vcdgear-1.76.ebuild,
+  +vcdgear-1.76-r1.ebuild:
+  Dont use wrapper script cause that breaks vcdgear usage.
+
+*vcdgear-1.76 (25 Sep 2005)
+
+  25 Sep 2005; Mike Frysinger <vapier@gentoo.org> +vcdgear-1.76.ebuild:
+  Version bump #77250.
+
+  06 Aug 2005; Danny van Dyk <kugelfang@gentoo.org> vcdgear-1.6e.ebuild:
+  Marked stable on amd64.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  03 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> vcdgear-1.6e.ebuild:
+  Marked ~amd64.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> vcdgear-1.6e.ebuild:
+  virtual/glibc -> virtual/libc
 
 *vcdgear-1.6e (23 Oct 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
   Initial import. Ebuild submitted by me.
diff --git a/media-video/vcdgear/Manifest b/media-video/vcdgear/Manifest
index e69de29bb2d1..25371308550a 100644
--- a/media-video/vcdgear/Manifest
+++ b/media-video/vcdgear/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aa2fcdbc7df7547033b54785dfc9d120 ChangeLog 1131
+MD5 341f3a6cb742e39ed0b4e349c14d4c98 files/digest-vcdgear-1.6e 132
+MD5 6c76b8a4188d39fc62f3eebec7191db2 files/digest-vcdgear-1.76-r1 75
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 6d66344d2ea7c7cb5ba5312cea1acfed vcdgear-1.6e.ebuild 828
+MD5 37ee9ebb0438231d9a3ece2b40f817e9 vcdgear-1.76-r1.ebuild 723
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUsHwgIKl8Uu19MoRAl7gAJ9PuCNzNdoe0RQ8d39Q/vgBmUGiGACfW+Cu
+bP1Ac9Sb955IQznoCJVXRuQ=
+=5/Ob
+-----END PGP SIGNATURE-----
diff --git a/media-video/vcdgear/metadata.xml b/media-video/vcdgear/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/vcdgear/metadata.xml
+++ b/media-video/vcdgear/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/vcdgear/vcdgear-1.6e.ebuild b/media-video/vcdgear/vcdgear-1.6e.ebuild
index 4e1db6fb17b3..02c6d6d8add5 100644
--- a/media-video/vcdgear/vcdgear-1.6e.ebuild
+++ b/media-video/vcdgear/vcdgear-1.6e.ebuild
@@ -1,34 +1,32 @@
-# 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-video/vcdgear/vcdgear-1.6e.ebuild,v 1.1 2002/10/23 14:04:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/vcdgear-1.6e.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
+MY_V="16"
+MY_VR="e"
 DESCRIPTION="extract MPEG streams from CD images, convert VCD files to MPEG, correct MPEG errors, and more"
 HOMEPAGE="http://www.vcdgear.com/"
-
-STC_P="vcdgear16_static-e"
-DYN_P="vcdgear16-e"
-
-[ `use static` ] \
-	&& SRC_URI="http://www.vcdgear.com/files/${STC_P}.tar.gz" \
-	|| SRC_URI="http://www.vcdgear.com/files/${DYN_P}.tar.gz"
-S="${WORKDIR}/vcdgear"
+SRC_URI="!static? ( http://www.vcdgear.com/files/vcdgear${MY_V}_static-${MY_VR}.tar.gz )
+	static? ( http://www.vcdgear.com/files/vcdgear${MY_V}-${MY_VR}.tar.gz )"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 -ppc -sparc -sparc64 -alpha"
+KEYWORDS="-* amd64 x86"
 IUSE="static"
 
 DEPEND=""
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
-	mv `ls` vcdgear
+	mv `ls` ${PN}
 }
 
 src_install() {
 	dodoc CREDITS FAQ HISTORY MANUAL WHATSNEW
 	into /opt
-	dobin vcdgear16
+	dobin vcdgear16 || die
 }
diff --git a/media-video/vcdgear/vcdgear-1.76-r1.ebuild b/media-video/vcdgear/vcdgear-1.76-r1.ebuild
index d4f6c06db624..dcd03a5ea1ea 100644
--- a/media-video/vcdgear/vcdgear-1.76-r1.ebuild
+++ b/media-video/vcdgear/vcdgear-1.76-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/vcdgear-1.76-r1.ebuild,v 1.1 2005/10/16 21:08:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdgear/vcdgear-1.76-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:47 chriswhite Exp $
 
 STAMP=040415
 DESCRIPTION="extract MPEG streams from CD images, convert VCD files to MPEG, correct MPEG errors, and more"
diff --git a/media-video/vcdimager/ChangeLog b/media-video/vcdimager/ChangeLog
index e601f90ced06..4c68366245a2 100644
--- a/media-video/vcdimager/ChangeLog
+++ b/media-video/vcdimager/ChangeLog
@@ -1,9 +1,160 @@
 # ChangeLog for media-video/vcdimager
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/ChangeLog,v 1.1 2002/05/20 00:01:43 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/ChangeLog,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+*vcdimager-0.7.23 (20 Jul 2005)
+
+  20 Nov 2005; Marc Hildebrand <zypher@gentoo.org> vcdimager-0.7.23.ebuild:
+  version bump.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> vcdimager-0.7.21.ebuild:
+  Mark 0.7.21 stable on alpha
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  vcdimager-0.7.21.ebuild:
+  Stable on ppc.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> vcdimager-0.7.21.ebuild:
+  Stable on ppc64
+
+  27 May 2005; Jason Wever <weeve@gentoo.org> vcdimager-0.7.21.ebuild:
+  Stable on SPARC.
+
+*vcdimager-0.7.22 (26 May 2005)
+
+  26 May 2005; Jan Brinkmann <luckyduck@gentoo.org> vcdimager-0.7.21.ebuild,
+  +vcdimager-0.7.22.ebuild:
+  new upstream version, fixes #94067. 0.7.21 stable on amd64 and x86, fixes
+  #94066
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> vcdimager-0.7.20-r2.ebuild:
+  Stable on SPARC.
+
+*vcdimager-0.7.21 (20 Apr 2005)
+
+  20 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  vcdimager-0.7.20.ebuild, vcdimager-0.7.20-r1.ebuild,
+  vcdimager-0.7.20-r2.ebuild, +vcdimager-0.7.21.ebuild:
+  Added new upstream version (0.7.21) which can be used with latest 
+  libcdio (0.73). Fixed dependencies for 0.7.20 revisions to require a 
+  version previous to 0.71 (and added popt needed for cli programs).
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> vcdimager-0.7.20-r2.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  vcdimager-0.7.20-r2.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  vcdimager-0.7.20-r2.ebuild:
+  pkgconfig not any longer in RDEPEND, fixes #87400
+
+  21 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -vcdimager-0.7.17.ebuild,
+  vcdimager-0.7.19.ebuild, vcdimager-0.7.20-r1.ebuild,
+  vcdimager-0.7.20-r2.ebuild, vcdimager-0.7.20.ebuild:
+  removed old version, also added dummy src_test to fix #72439
+
+  07 Feb 2005; Markus Rothe <corsair@gentoo.org> vcdimager-0.7.20-r1.ebuild,
+  vcdimager-0.7.20-r2.ebuild:
+  Stable on ppc64/added ~ppc64 to KEYWORDS
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  vcdimager-0.7.20-r1.ebuild, vcdimager-0.7.20-r2.ebuild,
+  vcdimager-0.7.20.ebuild:
+  updated SRC_URI. fixes bug #65292.
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  vcdimager-0.7.20-r2.ebuild:
+  Stable on alpha.
+
+  24 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vcdimager-0.7.20-r2.ebuild:
+  Stable amd64, sparc, x86.
+
+  29 Sep 2004; Bart Lauwers <blauwers@gentoo.org> vcdimager-0.7.19.ebuild, vcdimager-0.7.20.ebuild:
+  inherit eutils for $(get_libdir) support on new portage.
+
+*vcdimager-0.7.20-r2 (24 Sep 2004)
+
+  24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/vcdimager-0.7.20-libvcd.patch, -vcdimager-0.7.14.ebuild,
+  -vcdimager-0.7.15.ebuild, -vcdimager-0.7.16.ebuild,
+  +vcdimager-0.7.20-r2.ebuild:
+  Removing old versions.
+  Revision bump to install libvcd.so and libvcd.pc. This is needed for libcdio.
+
+  23 Sep 2004; Tom Gall <tgall@gentoo.org> vcdimager-0.7.20-r1.ebuild:
+  added ~ppc64
+
+  22 Sep 2004; Travis Tilley <lv@gentoo.org> vcdimager-0.7.19.ebuild,
+  vcdimager-0.7.20-r1.ebuild, vcdimager-0.7.20.ebuild:
+  added a libdir sandbox fix
+
+*vcdimager-0.7.20-r1 (15 Jul 2004)
+
+  15 Jul 2004; Martin Holzer <mholzer@gentoo.org> +files/cdio.patch,
+  +vcdimager-0.7.20-r1.ebuild:
+  fixing compile problem. closes 56176
+
+  12 May 2004; Patrick Kursawe <phosphan@gentoo.org> vcdimager-0.7.19.ebuild:
+  Does not work with libcdio-0.66, fixing dependencies
+
+  13 Mar 2004; Jason Wever <weeve@gentoo.org> vcdimager-0.7.20.ebuild:
+  Added ~sparc keyword.
+
+*vcdimager-0.7.20 (24 Feb 2004)
+
+  24 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> vcdimager-0.7.20.ebuild:
+  Version bump, changed download URL
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> vcdimager-0.7.19.ebuild:
+  x86 stable
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> vcdimager-0.7.14.ebuild,
+  vcdimager-0.7.15.ebuild, vcdimager-0.7.16.ebuild, vcdimager-0.7.17.ebuild,
+  vcdimager-0.7.19.ebuild:
+  stable on alpha and ia64
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> vcdimager-0.7.19.ebuild:
+  set ppc in keywords
+
+*vcdimager-0.7.19 (22 Oct 2003)
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> vcdimager-0.7.19.ebuild:
+  Versionb umped.
+
+*vcdimager-0.7.17 (18 Oct 2003)
+
+  18 Oct 2003; Martin Holzer <mholzer@gentoo.org> vcdimager-0.7.17.ebuild:
+  Version bumped. Closes #22438.
+
+*vcdimager-0.7.16 (15 Oct 2003)
+
+  15 Oct 2003; Martin Holzer <mholzer@gentoo.org> vcdimager-0.7.16.ebuild:
+  Version bumped.
+
+*vcdimager-0.7.15 (11 Oct 2003)
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> vcdimager-0.7.15.ebuild:
+  Version bumped.
+
+*vcdimager-0.7.14 (11 Apr 2003)
+
+  11 Apr 2003; Daniel Ahlbegr <aliz@gentoo.org> vcdimager-0.7.14.ebuild :
+  Version bump.
+
+*vcdimager-0.7.13 (24 Feb 2003)
+
+  24 Feb 2003; Daniel Ahlbegr <aliz@gentoo.org> :
+
+  Version bump.
 
 *vcdimager-0.7.12 (19 May 2002)
 
+  17 Aug 2002; Daniel Ahlbegr <aliz@gentoo.org> vcdimager-0.7.12.ebuild:
+  Closes #5912, also cleaned up ebuild a bit.
+
   19 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index e69de29bb2d1..8b5054b909c9 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f560b8a79d1ba1189857ac6786f40176 ChangeLog 5635
+MD5 e82176935b2c91da5a4bc00977928d5c files/cdio.patch 301
+MD5 bc5affe96540d5d15693b7cb5b0e16ea files/digest-vcdimager-0.7.19 73
+MD5 5e0c78969e48bd4c779ccda811e163e3 files/digest-vcdimager-0.7.20 68
+MD5 5e0c78969e48bd4c779ccda811e163e3 files/digest-vcdimager-0.7.20-r1 68
+MD5 5e0c78969e48bd4c779ccda811e163e3 files/digest-vcdimager-0.7.20-r2 68
+MD5 f531d6a52d5bb5f4ad438b1043ec185c files/digest-vcdimager-0.7.21 68
+MD5 2b159f73e6895b6015cc50e47993e6f1 files/digest-vcdimager-0.7.22 68
+MD5 63e5303645c63d19cc3465679fe1b1ec files/digest-vcdimager-0.7.23 69
+MD5 c048409383703da86edcf956543bf4a7 files/vcdimager-0.7.20-libvcd.patch 3981
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 ef8fe2d47f9624d2c9bb0d3065c4120a vcdimager-0.7.19.ebuild 1138
+MD5 40088185559b0adcb34784c80187328c vcdimager-0.7.20-r1.ebuild 1248
+MD5 6463f36c7b061098c188898be1e99ba6 vcdimager-0.7.20-r2.ebuild 1240
+MD5 cc511d5252df214ed0e6946785fb87d6 vcdimager-0.7.20.ebuild 1169
+MD5 ef5f4f1df55b8264d4e9f45db8022c0a vcdimager-0.7.21.ebuild 1167
+MD5 1cf18f5f5f5adaf9b9d74d18b33eb398 vcdimager-0.7.22.ebuild 1234
+MD5 e48bfaf541db77c76a8f3993e93f04ca vcdimager-0.7.23.ebuild 1199
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgMjnK6zgPxRBWYQRAnKhAJ90pOZyOmEt8lsLFJfo4SuwBkv6JACgmMFT
+yO49LLaqrLh46nuqD66zMNU=
+=VNIG
+-----END PGP SIGNATURE-----
diff --git a/media-video/vcdimager/vcdimager-0.7.19.ebuild b/media-video/vcdimager/vcdimager-0.7.19.ebuild
index 60867d92af46..ae21d4daf8ed 100644
--- a/media-video/vcdimager/vcdimager-0.7.19.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.19.ebuild
@@ -1,38 +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-video/vcdimager/vcdimager-0.7.19.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
-IUSE="xml2"
+inherit eutils
 
 DESCRIPTION="GNU VCDimager"
-S=${WORKDIR}/${PN}-${PV}-cdio
-SRC_URI="mirror://sourceforge/xine/${P}-cdio.tar.gz"
 HOMEPAGE="http://www.vcdimager.org/"
+SRC_URI="mirror://sourceforge/xine/${P}-cdio.tar.gz"
+RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ppc amd64 alpha ia64"
+IUSE="xml2"
 
-# Ideally this would also include help2man, but it's not yet in portage.
-DEPEND=">=dev-libs/libcdio-0.64
+DEPEND="~dev-libs/libcdio-0.64
 	xml2? ( >=dev-libs/libxml2-2.5.11 )"
 
+S=${WORKDIR}/${P}-cdio
+
 src_compile() {
 	local myopts
-
 	# We disable the xmltest because the configure script includes differently
 	# than the actual XML-frontend C files.
-
 	use xml2 \
-	&& myopts="${myopts} --with-xml-prefix=/usr --disable-xmltest" \
-	|| myopts="${myopts} --without-xml-frontend"
+		&& myopts="${myopts} --with-xml-prefix=/usr --disable-xmltest" \
+		|| myopts="${myopts} --without-xml-frontend"
 
 	econf ${myopts} || die
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make \
 		prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
@@ -40,3 +42,5 @@ src_install () {
 	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HACKING INSTALL
 	dodoc NEWS README THANKS TODO
 }
+
+src_test() { :; }
diff --git a/media-video/vcdimager/vcdimager-0.7.20-r1.ebuild b/media-video/vcdimager/vcdimager-0.7.20-r1.ebuild
index bbf7969f2bc6..bfd3c311353d 100644
--- a/media-video/vcdimager/vcdimager-0.7.20-r1.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.20-r1.ebuild
@@ -1,19 +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-video/vcdimager/vcdimager-0.7.20-r1.ebuild,v 1.1 2004/07/15 13:30:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.20-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="GNU VCDimager"
 HOMEPAGE="http://www.vcdimager.org/"
-SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/${P}.tar.gz"
+SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~sparc"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~sparc ppc64"
 IUSE="xml2"
 
 DEPEND=">=dev-libs/libcdio-0.66
+	<=dev-libs/libcdio-0.70
+	dev-libs/popt
 	xml2? ( >=dev-libs/libxml2-2.5.11 )"
 
 src_unpack() {
@@ -37,6 +39,7 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
@@ -44,3 +47,5 @@ src_install() {
 	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HACKING INSTALL
 	dodoc NEWS README THANKS TODO
 }
+
+src_test() { :; }
diff --git a/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild b/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild
index 6df2269192e3..4fd3d50c18dd 100644
--- a/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.20-r2.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/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild,v 1.1 2004/09/24 09:35:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="GNU VCDimager"
 HOMEPAGE="http://www.vcdimager.org/"
-SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/${P}.tar.gz"
+SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~sparc"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="xml2"
 
-DEPEND=">=dev-libs/libcdio-0.66
-	dev-util/pkgconfig
+RDEPEND=">=dev-libs/libcdio-0.66
+	<=dev-libs/libcdio-0.70
+	dev-libs/popt
 	xml2? ( >=dev-libs/libxml2-2.5.11 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
@@ -43,3 +46,5 @@ src_install() {
 
 	dodoc AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO
 }
+
+src_test() { :; }
diff --git a/media-video/vcdimager/vcdimager-0.7.20.ebuild b/media-video/vcdimager/vcdimager-0.7.20.ebuild
index 181fba647322..b2ec7771542b 100644
--- a/media-video/vcdimager/vcdimager-0.7.20.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.20.ebuild
@@ -1,21 +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-video/vcdimager/vcdimager-0.7.20.ebuild,v 1.1 2004/02/24 15:41:57 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.20.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="GNU VCDimager"
 HOMEPAGE="http://www.vcdimager.org/"
-SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/${P}.tar.gz"
+SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~sparc"
 IUSE="xml2"
 
 DEPEND=">=dev-libs/libcdio-0.66
+	<=dev-libs/libcdio-0.70
+	dev-libs/popt
 	xml2? ( >=dev-libs/libxml2-2.5.11 )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myopts
 	# We disable the xmltest because the configure script includes differently
@@ -31,6 +33,7 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
+		libdir=${D}/usr/$(get_libdir) \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
@@ -38,3 +41,5 @@ src_install() {
 	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HACKING INSTALL
 	dodoc NEWS README THANKS TODO
 }
+
+src_test() { :; }
diff --git a/media-video/vcdimager/vcdimager-0.7.21.ebuild b/media-video/vcdimager/vcdimager-0.7.21.ebuild
index aec6d4cd7f74..814b36d73710 100644
--- a/media-video/vcdimager/vcdimager-0.7.21.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.21.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-video/vcdimager/vcdimager-0.7.21.ebuild,v 1.1 2005/04/20 12:14:03 flameeyes Exp $
-
-IUSE="xml2 minimal"
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.21.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils libtool
 
@@ -12,7 +10,8 @@ SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+IUSE="xml2 minimal"
 
 RDEPEND=">=dev-libs/libcdio-0.71
 	!minimal? ( dev-libs/popt )
diff --git a/media-video/vcdimager/vcdimager-0.7.22.ebuild b/media-video/vcdimager/vcdimager-0.7.22.ebuild
index 2f37bbc70506..cdbf59ddb6ec 100644
--- a/media-video/vcdimager/vcdimager-0.7.22.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.22.ebuild,v 1.1 2005/05/26 23:39:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.22.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils libtool
 
diff --git a/media-video/vcdimager/vcdimager-0.7.23.ebuild b/media-video/vcdimager/vcdimager-0.7.23.ebuild
index ceebaea5bad0..04ff3527fee1 100644
--- a/media-video/vcdimager/vcdimager-0.7.23.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.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/media-video/vcdimager/vcdimager-0.7.23.ebuild,v 1.1 2005/11/20 19:04:47 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.23.ebuild,v 1.1.1.1 2005/11/30 09:57:25 chriswhite Exp $
 
 inherit eutils libtool
 
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 7f2abe9f7b3b..066ff14f34c8 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,109 @@
-# ChangeLog for media-video/lumiere
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.1 2003/04/13 20:57:16 mholzer Exp $
+# ChangeLog for media-video/vdr
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
+
+*vdr-1.3.36 (09 Nov 2005)
+
+  09 Nov 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-1.3.36-SourceCaps.patch,
+  +files/vdr-1.3.36-SourceCaps-for-lnb-sharing.patch, +vdr-1.3.36.ebuild:
+  Version bumped. This version includes some bugfixes.
+
+*vdr-1.3.34-r2 (24 Oct 2005)
+
+  24 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-1.3.32-daemon.patch, +vdr-1.3.34-r2.ebuild:
+  Added patch for better daemonization.
+
+  22 Oct 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.34-r1.ebuild:
+  Better source installation for debugging
+
+  18 Oct 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.27.ebuild,
+  vdr-1.3.34.ebuild, vdr-1.3.34-r1.ebuild:
+  Added installation of missing header files, needed for some plugins.
+
+*vdr-1.3.34-r1 (12 Oct 2005)
+
+  12 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/1.3.34/vdr-1.3.34-shutdown-retry.diff, +vdr-1.3.34-r1.ebuild:
+  Changed shutdown-behaviour, and corrected a bug in shutdown. Cosmetic
+  changes to ebuild.
+
+  11 Oct 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.2.6-r1.ebuild,
+  vdr-1.3.27.ebuild, vdr-1.3.34.ebuild:
+  changed DESCRIPTION to contain DVB
+
+*vdr-1.3.34 (08 Oct 2005)
+
+  08 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/1.3.34/SourceCaps-1.3.33-lnb-sharing.patch,
+  +files/1.3.34/SourceCaps-1.3.33.patch, +vdr-1.3.34.ebuild:
+  Version bumped.
+
+  09 Sep 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.27.ebuild:
+  Creating default video directory
+
+  21 Aug 2005; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
+  Set myself and herd media-tv as maintainer.
+
+  21 Aug 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.27.ebuild:
+  changed ownership of config-files and renamed some variables
+
+  14 Aug 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.27.ebuild:
+  add keyword ~amd64
+
+  13 Aug 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.27.ebuild:
+  create user and group vdr
+
+  13 Aug 2005; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.27.ebuild:
+  sorted dependencies and added vdr script package and plugin reemerge package
+
+*vdr-1.3.27 (23 Jul 2005)
+
+  23 Jul 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/1.3.27/vdr-1.3.27-SourceCaps.diff,
+  +files/1.3.27/vdr-1.3.27-SourceCaps-lnb-sharing.diff, +vdr-1.3.27.ebuild:
+  new version with completely new ebuild, but without init and other
+  additional scripts
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> vdr-1.2.6-r1.ebuild:
+  added ~amd64 keyword
+
+  19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  files/vdr-1.2.6-gentoo.diff, vdr-1.2.6-r1.ebuild:
+  modified patch to fix #85915
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/vdr-1.1.27-gentoo.diff, -vdr-1.1.27.ebuild, -vdr-1.2.6.ebuild:
+  removed old versions, cleanup
+
+*vdr-1.2.6-r1 (27 Jan 2005)
+
+  27 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +vdr-1.2.6-r1.ebuild:
+  new revision to point up the patch for people who have vdr installed. see
+  #78230
+
+  25 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> vdr-1.2.6.ebuild:
+  stable on x86
+
+  25 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/vdr-1.2.6_CAN-2005-0071.patch, vdr-1.2.6.ebuild:
+  added security patch to fix CAN-2005-0071. also see bug #78230
+
+  27 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  files/vdr-1.2.6-gentoo.diff, vdr-1.2.6.ebuild:
+  Modified patch for gcc 3.4, removed dvb dependency (native for 2.6 kernels).
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> vdr-1.2.6.ebuild:
+  Added to ~ppc.
+
+*vdr-1.2.6 (12 Dec 2003)
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> vdr-1.1.27.ebuild:
+  Version bump.
 
 *vdr-1.1.27 (13 Apr 2003)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 4673b1dae675..c739dda27c30 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,3 +1,24 @@
-MD5 96fc273f19008838e7c829d2b05ac3b8 vdr-1.1.27.ebuild 851
-MD5 ba8d55fa3c89f6743f01007e67529e37 files/digest-vdr-1.1.27 63
-MD5 c83ab35c3973b06f5c72e1efc4c37c31 files/vdr-1.1.27-gentoo.diff 1015
+MD5 85028e3cc03f1ac1ba27a5ee0391e96d vdr-1.2.6-r1.ebuild 1433
+MD5 3157799f6d2dea384d8db6a8673e8325 vdr-1.3.34-r1.ebuild 4491
+MD5 076f2745aa3aa1d66aee58e18c5a2ae3 vdr-1.3.36.ebuild 4792
+MD5 27cbd03c0fde4fcddf379f306ea8e981 vdr-1.3.27.ebuild 4236
+MD5 8554f7d2baba12e38b4c15115f4e2f20 vdr-1.3.34-r2.ebuild 4537
+MD5 89ada8f5b245228a85f2c9c1abf8d1bf ChangeLog 4047
+MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
+MD5 4d3ece4e7bb6ec5913f33dd5952e658e vdr-1.3.34.ebuild 4225
+MD5 aa18122fb081cdc19d419d53ad1f63de files/vdr-1.2.6_CAN-2005-0071.patch 893
+MD5 4e0e788481ae4a07c9260bcdbaab3465 files/digest-vdr-1.3.27 370
+MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34 366
+MD5 6608205ec103c06aea6c3532edf13e30 files/digest-vdr-1.3.36 366
+MD5 4e70ea0094c7bccffbdd3ac93f3010af files/vdr-1.3.36-SourceCaps-for-lnb-sharing.patch 7957
+MD5 472e23b8b78fd88b22e140386af74b3d files/vdr-1.3.32-daemon.patch 794
+MD5 d43cfe3b33e25f0d6b9fe2e7a05ae082 files/vdr-1.3.36-SourceCaps.patch 7729
+MD5 5df3de1f888e3fc8f8ba27623a19f40b files/digest-vdr-1.2.6-r1 62
+MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995
+MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34-r1 366
+MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34-r2 366
+MD5 0d386d3861b6fc42122c42da4bef26f8 files/1.3.27/vdr-1.3.27-SourceCaps-lnb-sharing.diff 7138
+MD5 f45571c5192376c05c3acc204fbdfef8 files/1.3.27/vdr-1.3.27-SourceCaps.diff 7152
+MD5 05d546888439560f03f1857d32af2062 files/1.3.34/SourceCaps-1.3.33-lnb-sharing.patch 7959
+MD5 76f2aa394b7d17866bc8ea63fe22864a files/1.3.34/vdr-1.3.34-shutdown-retry.diff 1346
+MD5 9b94d2f03c586e9c4dcf2b300af9fd45 files/1.3.34/SourceCaps-1.3.33.patch 7731
diff --git a/media-video/vdr/files/vdr-1.2.6-gentoo.diff b/media-video/vdr/files/vdr-1.2.6-gentoo.diff
index 3ffcb9972a70..a5462331e97d 100644
--- a/media-video/vdr/files/vdr-1.2.6-gentoo.diff
+++ b/media-video/vdr/files/vdr-1.2.6-gentoo.diff
@@ -1,6 +1,19 @@
---- Makefile.org	2003-03-11 21:30:41.000000000 +0000
-+++ Makefile	2003-03-11 21:47:14.000000000 +0000
-@@ -16,8 +16,8 @@
+diff -uprN vdr-1.2.6.orig/config.h vdr-1.2.6/config.h
+--- vdr-1.2.6.orig/config.h	2005-03-19 18:34:22.799245568 +0100
++++ vdr-1.2.6/config.h	2005-03-19 18:34:27.120588624 +0100
+@@ -137,7 +137,7 @@ public:
+   bool Save(void)
+   {
+     bool result = true;
+-    T *l = (T *)First();
++    T *l = (T *)cList<T>::First();
+     cSafeFile f(fileName);
+     if (f.Open()) {
+        while (l) {
+diff -uprN vdr-1.2.6.orig/Makefile vdr-1.2.6/Makefile
+--- vdr-1.2.6.orig/Makefile	2005-03-19 18:34:22.796246024 +0100
++++ vdr-1.2.6/Makefile	2005-03-19 18:52:32.140640504 +0100
+@@ -16,8 +16,8 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-vi
  
  DVBDIR   = ../DVB
  DTVDIR   = ./libdtv
@@ -10,8 +23,8 @@
 +BINDIR   = /usr/bin
  
  PLUGINDIR= ./PLUGINS
- 
-@@ -117,12 +117,18 @@
+ PLUGINLIBDIR= $(PLUGINDIR)/lib
+@@ -121,12 +121,15 @@ plugins-clean:
  # Install the files:
  
  install:
@@ -19,12 +32,9 @@
 -	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
 -	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
 +	@mkdir -p $(DESTDIR)$(BINDIR)
-+	@mkdir -p $(BINDIR)
 +	@cp vdr runvdr $(DESTDIR)$(BINDIR)
 +	@mkdir -p $(DESTDIR)$(MANDIR)/man1
 +	@mkdir -p $(DESTDIR)$(MANDIR)/man5
-+	@mkdir -p $(MANDIR)/man1
-+	@mkdir -p $(MANDIR)/man5
 +	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
 +	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
  	@if [ ! -d $(VIDEODIR) ]; then\
@@ -35,3 +45,15 @@
              fi
  
  # Source documentation:
+diff -uprN vdr-1.2.6.orig/plugin.c vdr-1.2.6/plugin.c
+--- vdr-1.2.6.orig/plugin.c	2005-03-19 18:34:22.810243896 +0100
++++ vdr-1.2.6/plugin.c	2005-03-19 18:34:27.120588624 +0100
+@@ -162,7 +162,7 @@ bool cDll::Load(bool Log)
+   const char *error = dlerror();
+   if (!error) {
+      void *(*creator)(void);
+-     (void *)creator = dlsym(handle, "VDRPluginCreator");
++     creator = (void *(*)())dlsym(handle, "VDRPluginCreator");
+      if (!(error = dlerror()))
+         plugin = (cPlugin *)creator();
+      }
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index ecd91f76579c..fb84c475836b 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/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>media-video</herd>
-<maintainer>
-  <email>media-video@gentoo.org</email>
-</maintainer>
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>zzam@gentoo.org</email>
+		<name>Matthias Schwarzott</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-video/vdr/vdr-1.2.6-r1.ebuild b/media-video/vdr/vdr-1.2.6-r1.ebuild
index 42ab82a8b8b8..1a801f9868c6 100644
--- a/media-video/vdr/vdr-1.2.6-r1.ebuild
+++ b/media-video/vdr/vdr-1.2.6-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/media-video/vdr/vdr-1.2.6-r1.ebuild,v 1.1 2005/01/27 15:08:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.2.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit eutils check-kernel
 
-DESCRIPTION="Klaus Schmidingers Video Disk Recorder"
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.cadsoft.de/people/kls/vdr"
 SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="lirc"
 
 # media-tv/linuxtv-dvb removed since dvb support is included in 2.6 kernels 		
diff --git a/media-video/vdr/vdr-1.3.27.ebuild b/media-video/vdr/vdr-1.3.27.ebuild
index 9009fe56ee9b..2b1d2291c1a0 100644
--- a/media-video/vdr/vdr-1.3.27.ebuild
+++ b/media-video/vdr/vdr-1.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/media-video/vdr/vdr-1.3.27.ebuild,v 1.1 2005/07/23 16:50:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.27.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ FNAME_LNBSHARING="BETA-configurableLNBshare-VDR_1.3.26.patch"
 FNAME_SOURCECAPS_NORMAL="vdr-1.3.27-SourceCaps.diff"
 FNAME_SOURCECAPS_LNBSHARING="vdr-1.3.27-SourceCaps-lnb-sharing.diff"
 
-DESCRIPTION="The Video Disk Recorder"
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.cadsoft.de/vdr/"
 SRC_URI="ftp://ftp.cadsoft.de/vdr/Developer/${P}.tar.bz2
 	lnbsharing? ( http://xn--ltzke-jua.de/dvb/VDR_LNB_sharing_patch/${FNAME_LNBSHARING} )
@@ -23,27 +23,39 @@ SRC_URI="ftp://ftp.cadsoft.de/vdr/Developer/${P}.tar.bz2
 	bigpatch? ( http://bigpatch.vdr-developer.org/1.3.27/BETA/${FNAME_BIGPATCH}.bz2 )
 	jumpplay? ( http://www.toms-cafe.de/vdr/download/${FNAME_JUMPPLAY} )"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
 
-RDEPEND="media-libs/jpeg
+_DEPEND="media-libs/jpeg
 	lirc? ( app-misc/lirc )
-	dev-lang/perl"
+	sys-apps/gawk"
+
+RDEPEND="${_DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	media-tv/gentoo-vdr-scripts"
 
-DEPEND="${RDEPEND}
+DEPEND="${_DEPEND}
 	|| (
 		>=sys-kernel/linux-headers-2.6.11-r2
 		media-tv/linuxtv-dvb
-	)
-	sys-apps/gawk"
+	)"
 
 # Relevant Pathes for vdr on gentoo
-DVBDIR=/usr/include
-VDRDIR=/usr/include/vdr
-PLUGINDIR=/usr/lib/vdr/plugins
-CONFDIR=/etc/vdr
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_DIR=/usr/lib/vdr/plugins
+CONF_DIR=/etc/vdr
+RC_DIR=/usr/lib/vdr/rcscript
+CAP_FILE=${S}/vdr-capabilities.sh
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+	enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video
+}
 
 src_unpack() {
 	unpack ${A}
@@ -60,9 +72,9 @@ src_unpack() {
 		#
 		# Generated by ebuild ${PF}
 		#
-		DVBDIR       = ${DVBDIR}
-		PLUGINLIBDIR = ${PLUGINDIR}
-		CONFIGDIR    = ${CONFDIR}
+		DVBDIR       = ${DVB_DIR}
+		PLUGINLIBDIR = ${PLUGIN_DIR}
+		CONFIGDIR    = ${CONF_DIR}
 
 		DEFINES     += -DCONFIGDIR=\"\$(CONFIGDIR)\"
 	EOT
@@ -126,6 +138,8 @@ src_compile() {
 
 	test -n "${myconf}" && einfo "Compiling with: ${myconf}"
 	emake ${myconf} || die "compilation failed"
+
+	touch ${CAP_FILE}
 }
 
 src_install() {
@@ -133,17 +147,34 @@ src_install() {
 	doexe vdr
 	doexe svdrpsend.pl
 
-	insinto /usr/include/vdr
+	insinto ${VDR_INCLUDE_DIR}
 	doins *.h
 	doins Make.config
 
-	insinto /etc/vdr
+	insinto ${VDR_INCLUDE_DIR}/libsi
+	doins libsi/*.h
+
+	diropts -m755 -ovdr -gvdr
+	keepdir ${CONF_DIR}
+	keepdir ${CONF_DIR}/plugins
+	keepdir ${VDR_HOME}
+	keepdir ${VDR_HOME}/video
+
+	insinto ${CONF_DIR}
+	insopts -m0644 -ovdr -gvdr
 	doins *.conf channels.conf.*
+	insopts -m0644
+	diropts -m755
+
+
+	keepdir "${PLUGIN_DIR}"
 
 	doman vdr.1 vdr.5
+
+	insinto ${RC_DIR}
+	doins ${CAP_FILE}
 }
 
 pkg_postinst() {
-	einfo "Up to now this ebuild does not contain any scripts needed for use"
-	einfo "of vdr as a STB (no scripts for init, shutdown, automatic wakeup, ...)."
+	einfo "It is a good idea to run vdrplugin-rebuild now"
 }
diff --git a/media-video/vdr/vdr-1.3.34-r1.ebuild b/media-video/vdr/vdr-1.3.34-r1.ebuild
index 180de8ebd4f3..6bb28c56c8f3 100644
--- a/media-video/vdr/vdr-1.3.34-r1.ebuild
+++ b/media-video/vdr/vdr-1.3.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.34-r1.ebuild,v 1.1 2005/10/12 10:18:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.34-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit eutils
 
@@ -153,6 +153,9 @@ src_install() {
 	doins *.h
 	doins Make.config
 
+	insinto ${VDR_INCLUDE_DIR}/libsi
+	doins libsi/*.h
+
 	diropts -m755 -ovdr -gvdr
 	keepdir ${CONF_DIR}
 	keepdir ${CONF_DIR}/plugins
@@ -175,8 +178,9 @@ src_install() {
 
 	if [[ -n "${VDRSOURCE_DIR}" ]]; then
 		einfo "Installing sources"
-		insinto ${VDRSOURCE_DIR}
-		cp -rl ${T}/source-tree ${D}/${VDRSOURCE_DIR}/${P}
+		insinto ${VDRSOURCE_DIR}/${P}
+		doins -r ${T}/source-tree/*
+		keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
 	fi
 }
 
diff --git a/media-video/vdr/vdr-1.3.34-r2.ebuild b/media-video/vdr/vdr-1.3.34-r2.ebuild
index 495c68f89bd4..86634785bcdd 100644
--- a/media-video/vdr/vdr-1.3.34-r2.ebuild
+++ b/media-video/vdr/vdr-1.3.34-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.34-r2.ebuild,v 1.1 2005/10/24 11:30:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.34-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/vdr/vdr-1.3.34.ebuild b/media-video/vdr/vdr-1.3.34.ebuild
index 1bcc756cbc87..e704eb0aa22d 100644
--- a/media-video/vdr/vdr-1.3.34.ebuild
+++ b/media-video/vdr/vdr-1.3.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/media-video/vdr/vdr-1.3.34.ebuild,v 1.1 2005/10/08 21:48:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.34.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ FNAME_LNBSHARING="configurableLNBshare-VDR_1.3.33.patch"
 FNAME_SOURCECAPS_NORMAL="SourceCaps-1.3.33.patch"
 FNAME_SOURCECAPS_LNBSHARING="SourceCaps-1.3.33-lnb-sharing.patch"
 
-DESCRIPTION="The Video Disk Recorder"
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.cadsoft.de/vdr/"
 SRC_URI="ftp://ftp.cadsoft.de/vdr/Developer/${P}.tar.bz2
 	lnbsharing? ( http://xn--ltzke-jua.de/dvb/VDR_LNB_sharing_patch/${FNAME_LNBSHARING} )
@@ -151,6 +151,9 @@ src_install() {
 	doins *.h
 	doins Make.config
 
+	insinto ${VDR_INCLUDE_DIR}/libsi
+	doins libsi/*.h
+
 	diropts -m755 -ovdr -gvdr
 	keepdir ${CONF_DIR}
 	keepdir ${CONF_DIR}/plugins
diff --git a/media-video/vdr/vdr-1.3.36.ebuild b/media-video/vdr/vdr-1.3.36.ebuild
index d79f4ee7f72c..489f422ab001 100644
--- a/media-video/vdr/vdr-1.3.36.ebuild
+++ b/media-video/vdr/vdr-1.3.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-video/vdr/vdr-1.3.36.ebuild,v 1.1 2005/11/09 21:28:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.36.ebuild,v 1.1.1.1 2005/11/30 09:57:37 chriswhite Exp $
 
 inherit eutils
 
diff --git a/media-video/video-entropyd/ChangeLog b/media-video/video-entropyd/ChangeLog
index 63d29d6307a5..52db64a18437 100644
--- a/media-video/video-entropyd/ChangeLog
+++ b/media-video/video-entropyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/video-entropyd
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/video-entropyd/ChangeLog,v 1.1 2004/11/21 02:30:07 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/video-entropyd/ChangeLog,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  video-entropyd-0.7.ebuild:
+  Stable on x86, 310 days in ~x86.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> video-entropyd-0.7.ebuild:
+  Added to ~ppc.
 
 *video-entropyd-0.7 (20 Nov 2004)
 
diff --git a/media-video/video-entropyd/Manifest b/media-video/video-entropyd/Manifest
index f00fc026da94..542651c8e654 100644
--- a/media-video/video-entropyd/Manifest
+++ b/media-video/video-entropyd/Manifest
@@ -1,2 +1,4 @@
-MD5 d52c6219a0272a6a54a47a1d7599a0f1 video-entropyd-0.7.ebuild 859
+MD5 16013a8e8b8f9ca63f45b32a7f4fc67c video-entropyd-0.7.ebuild 857
+MD5 22a2b6d5489a67c9bdeaf63fafda6160 ChangeLog 626
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 fac71a46004abf5f42c8410c35507dd4 files/digest-video-entropyd-0.7 65
diff --git a/media-video/video-entropyd/video-entropyd-0.7.ebuild b/media-video/video-entropyd/video-entropyd-0.7.ebuild
index d63bc639ee22..cf05e851f5a0 100644
--- a/media-video/video-entropyd/video-entropyd-0.7.ebuild
+++ b/media-video/video-entropyd/video-entropyd-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-video/video-entropyd/video-entropyd-0.7.ebuild,v 1.1 2004/11/21 02:30:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/video-entropyd/video-entropyd-0.7.ebuild,v 1.1.1.1 2005/11/30 09:57:26 chriswhite Exp $
 
 MY_PN="${PN/-/_}"
 MY_P="${MY_PN}-${PV}"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.vanheusden.com/ved/"
 SRC_URI="http://www.vanheusden.com/ved/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 DEPEND="virtual/libc"
 S="${WORKDIR}/${MY_P}"
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 9247ee6e671a..aa0c89335572 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,11 +1,597 @@
 # ChangeLog for media-video/vlc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/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-video/vlc/ChangeLog,v 1.1.1.1 2005/11/30 09:57:24 chriswhite Exp $
+
+  28 Nov 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1-r1.ebuild:
+  Re-fixed bug #77153.
+
+*vlc-0.8.4-r1 (27 Nov 2005)
+
+  27 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.4-r1.ebuild:
+  Added new testing version (not yet stable candidate). This version uses
+  ffmpeg as a plugin instead of builtin, reducing the linking on vlc binary.
+  Also backports HAL changes from upstream to allow using HAL 0.5 with it.
+
+*vlc-0.8.4 (27 Nov 2005)
+
+  27 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -vlc-0.8.4_beta3.ebuild, +vlc-0.8.4.ebuild:
+  New version, 0.8.4 final: closed bug #113590; applied formats patch by
+  solar; transformed sed lines in patches; fixed tests for avahi and hal to
+  avoid misunderstanding if someone tries to enable them; build DTS support as
+  plugin instead of builtin; removed comments inside the code as the
+  maintainer's guide carry all the needed informations; old for deprecated
+  interfaces are removed from upstream's package.
+
+  27 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4_beta3.ebuild:
+  Remove bonjour support or vlc would fail if avahi 0.6 is installed. See bug
+  #113665.
+
+  24 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild, vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta3.ebuild:
+  Remove comments about missing useflags as they are now reported on the
+  maintainer's guide.
+
+*vlc-0.8.4_beta3 (23 Nov 2005)
+
+  23 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -vlc-0.8.4_beta1.ebuild, -vlc-0.8.4_beta2.ebuild, +vlc-0.8.4_beta3.ebuild:
+  Update to latest test version before final release.
+
+  22 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild, vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild,
+  vlc-0.8.4_beta2.ebuild:
+  Use mirror://gentoo/ for patchsets.
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild, vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild,
+  vlc-0.8.4_beta2.ebuild:
+  Forcefully disable x264 support, so that installed x264 library does not get
+  detected and the build does not fail. See bug #112670.
+
+*vlc-0.8.4_beta2 (05 Nov 2005)
+
+  05 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +vlc-0.8.4_beta2.ebuild:
+  Added last beta version. Requires testing.
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild:
+  Don't allow to enable hal, as it anyways does not work fine and has bad
+  behavior when hal 0.5 is being used.
+
+  30 Oct 2005; Mark Loeser <halcy0n@gentoo.org> vlc-0.8.2-r1.ebuild,
+  vlc-0.8.2-r2.ebuild, vlc-0.8.4_beta1.ebuild:
+  Add back logic to strip -fomit-frame-pointer only when using gcc-2; fixes bug
+  #99813
+
+  14 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4_beta1.ebuild:
+  Remove comments that are no more needed here as they are on the project page
+  documentation.
+
+  12 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.2-r2.ebuild:
+  Remove gtk1 support from latest 0.8.2 version as wxGTK 2.6 nos just supports
+  GTK2.
+
+*vlc-0.8.2-r2 (03 Oct 2005)
+
+  03 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.2-r2.ebuild:
+  Added new revision for vlc 0.8.2 with hal disabled, as it seems not to be so
+  reliable.
+
+*vlc-0.8.4_beta1 (03 Oct 2005)
+
+  03 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +vlc-0.8.4_beta1.ebuild:
+  Added 0.8.4-test1 version. Most of the patches are applied upstream for now.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> vlc-0.8.1-r1.ebuild:
+  Mark 0.8.1-r1 stable on alpha
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.2-r1.ebuild:
+  Don't install ABOUT-NLS file.
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.2-r1.ebuild:
+  Added patch to compile with samba 3.0.20 (and also previous versions).
+
+  30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> -vlc-0.8.1-r2.ebuild,
+  -vlc-0.8.1-r3.ebuild, -vlc-0.8.2.ebuild:
+  Removed old versions.
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild:
+  Disabled threads from stable version as it's for 0.8.1-r2 and following.
+  Threads support isn't safe with some external libraries.
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.2-r1.ebuild:
+  Add patch to build vlc fine when +debug is enabled in wxGTK. Closes #97169.
+
+  12 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mpeg2dec-20030612-configure.in-fpic.patch,
+  -files/0.6.2-mozilla-fix.patch, -files/glide.patch, -vlc-0.6.2.ebuild,
+  -vlc-0.6.2-r1.ebuild, -vlc-0.7.2.ebuild, vlc-0.8.1-r1.ebuild,
+  vlc-0.8.1-r2.ebuild, vlc-0.8.1-r3.ebuild, vlc-0.8.2.ebuild:
+  Rename mozilla useflag into nsplugin. Removed old (bugged) versions.
+
+*vlc-0.8.2-r1 (11 Jul 2005)
+
+  11 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.2-r1.ebuild:
+  Added nsplugin flag to build the mozilla-compatible plugin (depends on
+  gecko-sdk).
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> vlc-0.8.2.ebuild:
+  Added ~sparc keyword wrt bug #95625.
+
+  27 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.2.ebuild:
+  Disabled also slp support as upstream still uses an older API which breaks
+  with current version. See bug #97169.
+
+  27 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -vlc-0.8.2_beta2.ebuild, vlc-0.8.2.ebuild:
+  Removed vlc-0.8.2_beta2. Disabled mozilla support waiting for new gecko-sdk,
+  see bug #97164.
+
+*vlc-0.8.2 (26 Jun 2005)
+
+  26 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.2.ebuild:
+  New upstream version, missing ~sparc keyword until daap dependency is fixed.
+  Uses the same patches as 0.8.2_beta2 minus the sap one.
+
+  10 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r3.ebuild,
+  vlc-0.8.2_beta2.ebuild:
+  Fixed mp3/mad params for 0.8.1 and 0.8.2_beta2. Added patch to compile clean
+  with latest GCC 4.0.1 for 0.8.2_beta2.
+
+  08 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.2_beta2.ebuild:
+  Fixed checks for ffmpeg features.
+
+*vlc-0.8.2_beta2 (08 Jun 2005)
+
+  08 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +vlc-0.8.2_beta2.ebuild:
+  New version (test version from upstream's snapshots. Cleaned up useflags,
+  added new dependencies, fixed dependencies which changed with latest
+  version, removed a few useflag. Now vcd and cdda enables also the extended
+  versions (requiring libcdio).
+
+  26 May 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r3.ebuild:
+  Renamed mad flag into mp3 for latest version.
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> vlc-0.8.1-r1.ebuild:
+  Stable on SPARC.
+
+  18 May 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r3.ebuild:
+  Added new patches to make vlc work with wxGTK 2.6. Need more testing before
+  unmasking.
+
+  17 May 2005; Fernando J. Pereda <ferdy@gentoo.org> vlc-0.8.1-r1.ebuild:
+  keyworded ~alpha, wrt #90506
+
+*vlc-0.8.1-r3 (14 May 2005)
+
+  14 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/vlc-0.8.1-bool.patch, -files/vlc-0.8.1-matroska-shared.patch,
+  -files/vlc-0.8.1-time.patch, vlc-0.6.2.ebuild, vlc-0.6.2-r1.ebuild,
+  vlc-0.7.2.ebuild, vlc-0.8.1-r1.ebuild, vlc-0.8.1-r2.ebuild,
+  +vlc-0.8.1-r3.ebuild:
+  New revision which now uses wxGTK 2.6 instead of 2.4. Added patch to disable
+  hal support in configure (just for -r3 for now). Moved patches into patchset
+  tarball and removed from files. Converted from gcc to toolchain-funcs
+  eclass.
+
+  09 May 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild,
+  vlc-0.8.1-r2.ebuild:
+  Fixed hal dependency to 0.4, fixes bug #91913. Removed !amd64 check on 3dfx
+  (use.masked).
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/vlc-0.8.1-bool.patch, vlc-0.8.1-r1.ebuild, vlc-0.8.1-r2.ebuild:
+  Added patch to compile ncurses support on -r2. Fixes #91603. Removed ncurses
+  useflag and disabled it on -r1 as it's stable and better not add patches to
+  it.
+
+  02 May 2005; Diego Pettenò <flameeyes@gentoo.org> -files/vlc.desktop,
+  -vlc-0.8.1.ebuild, vlc-0.8.1-r1.ebuild:
+  Marked 0.8.1-r1 stable on amd64 and x86, and removed the old 0.8.1 with its
+  files.
+
+  25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r2.ebuild:
+  Added build-time dependencies on autotools, pkgconfig, gettext and cvs
+  (needed by gettext's autopoint). Fixes #90321.
+
+*vlc-0.8.1-r2 (24 Apr 2005)
+
+  24 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/vlc-0.8.1-matroska-shared.patch, vlc-0.8.1-r1.ebuild,
+  +vlc-0.8.1-r2.ebuild:
+  Removed portaudio useflag, vlc needs portaudio v19 (development branch) 
+  which is not in portage.
+  Added 0.8.1-r2 version which depends in a recent libmatroska (0.7.3-r1 
+  at least) which builds .so version of the library, so to build a dynamic 
+  plugin instead of a static module (with the newly added patch to 
+  configure).
+  Disabled threads useflag from 0.8.1-r2 as it seems not mess up vlc with
+  at least latest ffmpeg and libmatroska.
+
+  20 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.6.2.ebuild,
+  vlc-0.6.2-r1.ebuild, vlc-0.7.2.ebuild, vlc-0.8.1.ebuild,
+  vlc-0.8.1-r1.ebuild:
+  Removed deprecated oggvorbis useflag. Made vlc-0.8.1-r1 install all the docs
+  by dodoc instead of installing it on /usr/share/doc/vlc.
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  -vlc-0.6.0-r1.ebuild, -vlc-0.6.1.ebuild, vlc-0.6.2.ebuild,
+  -vlc-0.7.1.ebuild, -vlc-0.7.1-r1.ebuild, -vlc-0.7.2-r1.ebuild,
+  -vlc-0.8.0.ebuild:
+  Pruned old ebuilds, as many bugs are fixed in recent ~arch ebuilds, and 
+  0.8.1-r1 is the wannabe-stable. Fixed dependency on libmpeg2-0.3* 
+  for vlc-0.6.2 (fixes #60696). Updated metadata, ChrisWhite is retired :/
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.6.0-r1.ebuild,
+  vlc-0.6.1.ebuild, vlc-0.6.2.ebuild, vlc-0.6.2-r1.ebuild:
+  VLC 0.6.x needs xvid .9.x, can't build with 1.0.
+
+  17 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.1-r1.ebuild:
+  Add check for wxwindows before request it (fixex #89436).
+
+  13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/vlc-0.8.1-time.patch, vlc-0.8.1-r1.ebuild:
+  added patch to include missing time.h, fixes #88378. patch grabbed from
+  upstream cvs.
+
+  04 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> vlc-0.8.1-r1.ebuild:
+  introduced support for several useflags, implemented enhancement suggestions
+  which were made by Diego Pettenò <dgp85@users.sourceforge.net>. Fixes #87289
+
+*vlc-0.8.1-r1 (28 Mar 2005)
+
+  28 Mar 2005; Chris White <chriswhite@gentoo.org> +vlc-0.8.1-r1.ebuild:
+  Revbump to -r1. Fixes detailed in bug #86419. Thanks to Diego Pettenò for
+  the ebuild cleanup.
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> vlc-0.6.0-r1.ebuild,
+  vlc-0.6.1.ebuild, vlc-0.6.2.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.7.1.ebuild,
+  vlc-0.7.1-r1.ebuild, vlc-0.7.2.ebuild, vlc-0.7.2-r1.ebuild,
+  vlc-0.8.0.ebuild, vlc-0.8.1.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+  10 Mar 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1.ebuild:
+  Fixed bug #77611.
+
+  03 Mar 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1.ebuild:
+  Fixed bug #83880.
+
+  27 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> vlc-0.8.1.ebuild:
+  Back to using oggvorbis in IUSE.
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> vlc-0.8.1.ebuild:
+  removed unnecessary line from DEPEND, see #78830
+
+  09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> vlc-0.8.1.ebuild:
+  added missing faad? dependency. fixes #77200.
+
+  09 Jan 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1.ebuild:
+  Fixed mozilla plugin not working because it was looking in the wrong place
+  for a file :).
+
+  08 Jan 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1.ebuild:
+  Fixed #77119.  Also fixed 2 syntax errors located in #60696.
+
+  08 Jan 2005; Chris White <chriswhite@gentoo.org> vlc-0.8.1.ebuild:
+  Fixing MOZILLA_CONFIG errors that I'll surely be getting in about 30 minutes.
+
+  08 Jan 2005; Chris White <chriswhite@gentoo.org> +files/vlc.desktop,
+  vlc-0.8.1.ebuild:
+  Fixing bug #39213.  Thanks to Keith Lea for providing the vlc.desktop file.
+
+*vlc-0.8.1 (08 Jan 2005)
+
+  08 Jan 2005; Chris White <chriswhite@gentoo.org> +vlc-0.8.1.ebuild:
+  Bump to version 0.8.1. This is a nice cleanup of the ebuild for deps and
+  all. Should run alot better than previous versions. Fixes bug #72338.
+
+  14 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> vlc-0.6.1.ebuild,
+  vlc-0.6.2-r1.ebuild, vlc-0.6.2.ebuild, vlc-0.7.1-r1.ebuild,
+  vlc-0.7.1.ebuild, vlc-0.7.2-r1.ebuild, vlc-0.7.2.ebuild, vlc-0.8.0.ebuild:
+  Changed USE flag to aac.
+
+  11 Nov 2004; Luca Barbato <lu_zero@gentoo.org> vlc-0.8.0.ebuild:
+  Temporary removed slp
+
+*vlc-0.8.0 (09 Nov 2004)
+
+  09 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +vlc-0.8.0.ebuild:
+  New release
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> vlc-0.7.2-r1.ebuild:
+  Added ~sparc keyword.
+
+  01 Sep 2004; Martin Holzer <mholzer@gentoo.org> vlc-0.7.2-r1.ebuild,
+  vlc-0.7.2.ebuild:
+  adding theora support through IUSE. closes 41383
+
+  20 Aug 2004; Chris White <chriswhite@gentoo.org> vlc-0.7.2-r1.ebuild:
+  Fixed LIVE version.
+
+*vlc-0.7.2-r1 (10 Aug 2004)
+
+  10 Aug 2004; Chris White <chriswhite@gentoo.org> metadata.xml,
+  +files/vlc-0.7.2-live.patch, vlc-0.7.2-r1.ebuild:
+  Removed CFLAGS unsetting, disabled broken interfaces, added myself as
+  maintainer, and stopped the live downgrading issue.
+
+  01 Jul 2004; Joel Martin <kanaka@gentoo.org> :
+  Add dts use flag, update dependancy version requirements to more closely match
+  official requirements, integrate some ebuild changes from ebuild included in
+  the source tree, fix default font file location.
+
+  25 Jun 2004; Joel Martin <kanaka@gentoo.org> vlc-0.7.2.ebuild:
+  Add depend on automake 1.7.9 to close bug 54498. No version bump necessary,
+  this is a getting it to build type fix
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> vlc-0.6.0-r1.ebuild,
+  vlc-0.6.1.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.6.2.ebuild, vlc-0.7.1.ebuild:
+  Fix use invocation
+
+*vlc-0.7.2 (07 Jun 2004)
+
+  07 Jun 2004; Travis Tilley <lv@gentoo.org> +vlc-0.7.2.ebuild:
+  version bump. this version contains improved interfaces with support for
+  embedded video outputs, new formats support, an improved DVB input, subtitles
+  improvements, major stream output improvements, a VideoLAN manager to manage
+  several streams with only one instance of VLC, and (most importantly, at least
+  here) numerous fixes for compiling with gcc 3.4.
+
+  07 Jun 2004; Travis Tilley <lv@gentoo.org> vlc-0.7.1-r1.ebuild:
+  stable on amd64
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> vlc-0.6.0-r1.ebuild,
+  vlc-0.6.1.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.6.2.ebuild:
+  Changing mad dep to madplay.
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> vlc-0.7.1-r1.ebuild:
+  added ~amd64 keyword
+
+*vlc-0.7.1-r1 (26 Mar 2004)
+
+  26 Mar 2004; David Holm <dholm@gentoo.org> vlc-0.7.1-r1.ebuild:
+  Added to ~ppc. AltiVec is broken in 0.7.1, disabled.
+
+  20 Mar 2004; Joel Martin <kanaka@gentoo.org> :
+  Changed to live.com ebuild rather than importing source. Disabled qt and kde
+  interfaces and xvid since they are deprecated, added libdvdnav dependency,
+  restructured configuration of dvd and dvb features, synchronized the format
+  of the ebuild with the one by Derk-Jan Hartman.
+
+  17 Mar 2004; Joel Martin <kanaka@gentoo.org> vlc-0.6.2-r1.ebuild,
+  vlc-0.7.1.ebuild:
+  Fix svga dep in 0.7.1, remove ~ia64 from 0.6.2-r1 because of bad deps
+
+  15 Mar 2004; Luca Barbato <lu_zero@gentoo.org> vlc-0.7.1.ebuild:
+  Marked -ppc the ffmpeg req has issues
+
+*vlc-0.7.1 (11 Mar 2004)
+
+  11 Mar 2004; Joel Martin <kanaka@gentoo.org> vlc-0.7.1.ebuild,
+  files/live-gcc3-3.patch:
+  Merged latest unstable vlc-0.6.2-r1, and vlc provided ebuild by Derk-Jan
+  Hartman. Depend on new ffmpeg ebuild instead of pulling down ffmpeg directly.
+  Add LiveMedia, libcaca support. No implicit mplayer dependency. Bump faad2
+  requirement. General cleanup. Removed other arches because or arch dependency
+  issues.
+
+  23 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> vlc-0.6.0-r1.ebuild,
+  vlc-0.6.1.ebuild, vlc-0.6.2-r1.ebuild, vlc-0.6.2.ebuild:
+  fix KEYWORDS to match available deps
+
+  07 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> vlc-0.6.2-r1.ebuild,
+  files/mpeg2dec-20030612-configure.in-fpic.patch:
+  Patch configure.in instead of configure
+
+*vlc-0.6.2-r1 (13 Dec 2003)
+
+  13 Dec 2003; Seemant Kulleen <seemant@gentoo.org> vlc-0.6.2-r1.ebuild:
+  Switch to using internal ffmpeg and mpeg2dec becausethat means that mplayer
+  does not have to be a dependency any more. Thanks to the ebuild enclosed
+  within the tarball for the clues
+
+  12 Dec 2003; Seemant Kulleen <seemant@gentoo.org> metadata.xml,
+  vlc-0.4.4.ebuild, vlc-0.4.5.ebuild, vlc-0.5.2-r1.ebuild, vlc-0.5.2.ebuild,
+  vlc-0.6.0.ebuild, vlc-0.6.2.ebuild:
+  remove crufty ebuilds and move to use_enable syntax for configure options
+
+  22 Nov 2003; Luca Barbato <lu_zero@gentoo.org> vlc-0.6.2.ebuild,
+  files/0.6.2-mozilla-fix.patch:
+  Patch to build mozilla plugin on mozilla-1.5*
+
+  21 Nov 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
+  The Mozilla plugin only works with Mozilla 1.4 currently.
+
+  19 Oct 2003; Max Kalika <max@gentoo.org> vlc-0.6.2.ebuild:
+  Revert location of libdvd, it belongs in media-libs but was only 
+  partly moved there previously.
+
+  17 Oct 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
+  Fixed portage location of libdvb.  Marked stable for x86.
+
+  17 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
+  Made minor change as suggested by brandy@gentoo.org on bug #24119
+
+  16 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild,
+  files/glide.patch:
+  Glide works now possibly.  See bug #24119.  Also added the touch stuff
+  from the videolan cvs ebuild.
+
+  15 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
+  Stripping -fomit-frame-pointer if gcc-major-version -eq 2.  See bug
+  #24678.
+
+*vlc-0.6.2 (13 Aug 2003)
+
+  13 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
+  Version bump.  Removed 0.6.1 related workarounds.  Added support
+  for the altivec USE variable.  Up to 34 USE variables now. :)
+
+*vlc-0.6.1 (01 Aug 2003)
+
+  01 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.1.ebuild,
+  files/buildorder.patch:
+  The "elusive math equation" release.
+  Version bump.  Re-organized the ebuild to coincide with the listing
+  of configure options outputted by ./configure --help.  Added support
+  for USE variables faad, xosd, and matroska.  Added a patch based on
+  upstream cvs which allows the mozilla plugin to compile properly.
+  I have updated the dependancies to the new ebuilds of libdvdcss-1.2.8
+  and libdvbpsi-0.1.3 as upstream authors suggest these versions.
+  We are now weighing in at 33 use variables folks. :)  Presently, 
+  perhaps the most prolific package in Portage. :)
+
+  21 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
+  Removed the matrox use variable and forced disable-mga as the
+  module is known not to work, slower than other rendering, and will
+  not be updated upstream anymore.
+
+  20 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
+  Added support for the debug USE variable.  Added the matroska
+  local USE variable.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
+  Added the dvb USE variable.  Added a comment re: truetype for 0.6.1
+  Now showing the whole list of IUSE variables.  Updated
+  wxwindows dependancy to >=wxGTK-2.4.1 as 2.4.0 has problems.
+  Added -i to kde-related sed statements.  Re-worded some comments.
+  General ebuild beautification.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Removed unneeded vlc-0.6.0-r2.ebuild.
+
+*vlc-0.6.0-r2 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r2.ebuild:
+  Changed "mad" depends to the new libmad/libid3tag
+
+*vlc-0.6.0-r1 (16 Jul 2003)
+
+  16 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild,
+  files/mozplugin.patch:
+  Now utilizes the mozilla USE variable to install a way cool
+  mozilla plugin.  The code has been tested with mozilla 1.4
+  and may work with 1.3.
+
+  16 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0.ebuild:
+  Adding mplayer as a dependancy until the libpostproc issue is
+  figured out.  See bug #22811
+
+  09 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0.ebuild:
+  A little sed to change glide location from /usr/include/glide to
+  /usr/include/glide3
+
+  06 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0.ebuild:
+  Marked stable for x86
+
+*vlc-0.6.0 (25 Jun 2003)
+
+  25 Jun 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0.ebuild:
+  Lots more IUSE madness.  More proper enabling/disabling of configure
+  options.  Some portions of this ebuild were inspired from the 
+  videolan.org official ebuild.
+
+*vlc-0.5.2-r1 (29 Mar 2003)
+
+  29 Mar 2003; Martin Holzer <mholzer@gentoo.org> vlc-0.5.2-r1.ebuild:
+  Added some IUSE vars and option flags. Closes #18321.
+
+*vlc-0.5.2 (13 Mar 2003)
+
+  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> vlc-0.5.2.ebuild:
+  version bump
+
+*vlc-0.4.5 (09 Nov 2002)
+
+  22 Dec 2002; Martin Holzer <mholzer@gentoo.org> vlc-0.4.4.ebuild files/digest-vlc-0.4.4 Changelog :
+  Changed .tar.gz to .tar.bz2, removed --disable-a52
+
+  09 Nov 2002; Seemant Kulleen <seemant@gentoo.org>  vlc-0.4.5.ebuild
+  files/digest-vlc-0.4.5 :
+
+  Version bump, thanks to: mholzer@gentoo.org (Martin Holzer) in bug #10426
+
+*vlc-0.4.4 (13 Aug 2002)
+
+  22 Dec 2002; Martin Holzer <mholzer@gentoo.org> vlc-0.4.4.ebuild files/digest-vlc-0.4.4 Changelog :
+  Changed .tar.gz to .tar.bz2, removed --disable-a52
+
+  28 Sep 2002; Nick Hadaway <raker@gentoo.org> vlc-0.4.4.ebuild :
+  Removed redundant configure options.  Changed to einstall.
+
+  17 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+  Use kde-functions.eclass to determine kdelibs, arts locations.
+
+  15 Aug 2002; Mark Guertin <gerk@gentoo.org> vlc-0.4.4.ebuild :
+  Added ppc to keywords
+
+  13 Aug 2002; Seemant Kulleen <seemant@gentoo.org> vlc-0.4.4.ebuild :
+  Version bump.
+
+*vlc-0.4.3 (25 Jul 2002)
+
+  02 Aug 2002; Nick Hadaway <raker@gentoo.org> vlc-0.4.3.ebuild :
+  Added support for libdvbpsi.
+
+  29 Jul 2002; Nick Hadaway <raker@gentoo.org> :
+  Added support for a52dec by default as it is marked as enabled by
+  default in vlc's configure options and the a52dec author says we
+  should give it a try.  :)  I have it set to depend on
+  >=media-libs/a52dec-0.7.4 as previous versions were not thread
+  safe.
+
+  25 Jul 2002; Seemant Kulleen <seemant@gentoo.org>  vlc-0.4.3.ebuild :
+  Version bump.
+
+*vlc-0.4.2 (13 Jul 2002)
+
+  13 Jul 2002; Nick Hadaway <raker@gentoo.org> 
+  vlc-0.4.2.ebuild files/digest-vlc-0.4.2:
+  Version bump.
+
+*vlc-0.4.1 (09 Jul 2002)
+
+  09 Jul 2002; Nick Hadaway <raker@gentoo.org> vlc-0.4.1.ebuild
+  files/digest-vlc-0.4.1
+  Version bump.  Added required dependancy for mad (MPEG audio library)
+  which allows vlc to read divx files.  Updated configure options.
+  Special thanks to to the vlc support team for the quick response
+  to my inquiry.
+
+*vlc-0.4.0 (17 Jun 2002)
+
+  17 Jun 2002; Seemant Kulleen <seemant@gentoo.org> vlc-0.4.0-r1.ebuild
+  files/digest-vlc-0.4.0-r1 :
+  This now works with Qt2 and Qt3, depending on which is reflected in
+  $QTDIR.  Thanks to BradPritt@gmx.de (Markus Mohr) in bug #3678 for
+  providing this fix.
+
+*vlc-0.4.0 (24 May 2002)
+
+  24 May 2002; Seemant Kulleen <seemant@gentoo.org> vlc-0.4.0.ebuild
+  files/digest-vlc-0.4.0 :
+  Version bump.
+
+*vlc-0.3.1-r1 (19 May 2002)
+
+  19 May 2002; Seemant Kulleen <seemant@gentoo.org> vlc-0.3.1-r1.ebuild
+  files/digest-vlc-0.3.1-r1 :
+  Added USE dependent ALSA support, since gentoo now defaults to alsa-0.9
+
+*vlc-0.3.1 (07 May 2002)
+
+  07 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> vlc-0.3.1.ebuild files/digest-vlc-0.3.1 :
+  New upstream version.
+
 
 *vlc-0.2.91 (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-video/vlc/Manifest b/media-video/vlc/Manifest
index e69de29bb2d1..ad9516bd072b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 34c899e9870f05ff49336006f2a0ab92 vlc-0.8.2-r1.ebuild 7576
+MD5 06b1c25d0b8b20d67db5a61f4c8078f5 vlc-0.8.2-r2.ebuild 7458
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 2645273efbef9b24561d36e1cad85ac5 ChangeLog 24317
+MD5 c7260ce34328b0bb07e6c71813959374 vlc-0.8.4.ebuild 7045
+MD5 53d31638607ad4bdb22ccefb6ffd21a1 vlc-0.8.4-r1.ebuild 6923
+MD5 b591b42c362967ecb4666f426314c737 vlc-0.8.1-r1.ebuild 6701
+MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r1 127
+MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
+MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
+MD5 e7f91e71a2b7c89a96d477ac21852415 files/digest-vlc-0.8.4-r1 127
+MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDitrDFdQwWVoAgN4RAkl0AKC7HgCkaUXFIpGLgHLhMBIhkn7EYQCg8YCx
+/i6aERQeMPbe4H4NTgIRKBc=
+=YNwS
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.1-r1 b/media-video/vlc/files/digest-vlc-0.8.1-r1
index ebd3c42b8d90..7bf5ab8b833c 100644
--- a/media-video/vlc/files/digest-vlc-0.8.1-r1
+++ b/media-video/vlc/files/digest-vlc-0.8.1-r1
@@ -1 +1,2 @@
 MD5 9cdf6d70d51dad30d198edfa96047529 vlc-0.8.1.tar.bz2 4877791
+MD5 2c417872741c9eefc3987b461100a12c vlc-patches-1.tar.bz2 2149
diff --git a/media-video/vlc/files/digest-vlc-0.8.2-r1 b/media-video/vlc/files/digest-vlc-0.8.2-r1
index 841b8ba9cb87..f4899c1db596 100644
--- a/media-video/vlc/files/digest-vlc-0.8.2-r1
+++ b/media-video/vlc/files/digest-vlc-0.8.2-r1
@@ -1,2 +1,2 @@
 MD5 c9d07ee1c41766bf56a27b47bdba2ad0 vlc-0.8.2.tar.bz2 5785680
-MD5 c31aad08ab659b07fc6295b46e9f8ea2 vlc-patches-5.tar.bz2 4059
+MD5 46cf14ce7547add1f85634831b32e8b5 vlc-patches-7.tar.bz2 4696
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index b27218d48158..d9df1878d8e2 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/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>raker@gentoo.org</email>
-    <name>Nick Hadaway</name>
-  </maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-0.8.1-r1.ebuild b/media-video/vlc/vlc-0.8.1-r1.ebuild
index 9264fc3a1abe..fb126bc10981 100644
--- a/media-video/vlc/vlc-0.8.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.1-r1.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.1 2005/03/28 03:04:25 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:24 chriswhite Exp $
 
-# Missing support for...
-#	tarkin - package not in portage yet - experimental
-#	tremor - package not in portage yet - experimental
-
-inherit libtool gcc eutils wxwidgets
+inherit libtool toolchain-funcs eutils wxwidgets
 
+PATCHLEVEL="1"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
-SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg oggvorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick mozilla hal stream mad xv bidi gtk2"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
+IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdio cddb cdda ogg matroska dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga oss aalib ggi libcaca esd arts alsa wxwindows xosd lirc joystick nsplugin stream mad xv bidi gtk2 sdl ssl"
 
-DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
-		cdio? ( >=dev-libs/libcdio-0.70 )
+DEPEND="cdio? ( >=dev-libs/libcdio-0.70 )
 		cddb? ( >=media-libs/libcddb-0.9.4 )
 		live? ( >=media-plugins/live-2005.01.29 )
 		dvd? (  media-libs/libdvdread
@@ -34,7 +31,7 @@ DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		dts? ( media-libs/libdts )
 		flac? ( media-libs/flac )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		oggvorbis? ( media-libs/libvorbis )
+		vorbis? ( media-libs/libvorbis )
 		theora? ( media-libs/libtheora )
 		X? ( virtual/x11 )
 		xv? ( virtual/x11 )
@@ -47,29 +44,32 @@ DEPEND="hal? ( >=sys-apps/hal-0.2.97 )
 		arts? ( kde-base/arts )
 		alsa? ( virtual/alsa )
 		wxwindows? ( =x11-libs/wxGTK-2.4* )
-		ncurses? ( sys-libs/ncurses )
 		xosd? ( x11-libs/xosd )
 		lirc? ( app-misc/lirc )
-		mozilla? ( www-client/mozilla )
-		3dfx? ( !amd64? ( media-libs/glide-v3 ) )
+		nsplugin? ( www-client/mozilla )
+		3dfx? ( media-libs/glide-v3 )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		gnutls? ( >=net-libs/gnutls-1.0.0 )
 		opengl? ( virtual/opengl )
 		sys-libs/zlib
 		media-libs/libpng
 		media-libs/libdvbpsi
-		aac?( >=media-libs/faad2-2.0-r2 )"
+		aac? ( >=media-libs/faad2-2.0-r2 )
+		sdl? ( >=media-libs/libsdl-1.2.8 )
+		ssl? ( net-libs/gnutls )"
 
 pkg_setup() {
-	WX_GTK_VER="2.4"
-	if use gtk2; then
-		if use unicode; then
-			need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+	if use wxwindows; then
+		WX_GTK_VER="2.4"
+		if use gtk2; then
+			if use unicode; then
+				need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+			else
+				need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
+			fi
 		else
-			need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
+			need-wxwidgets gtk || die "You need to install wxGTK with gtk support."
 		fi
-	else
-		need-wxwidgets gtk || die "You need to install wxGTK with gtk support."
 	fi
 }
 
@@ -86,10 +86,8 @@ src_unpack() {
 	# Fix the default font
 	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf:" modules/misc/freetype.c
 
-	cd ${S}/modules/video_output
-	epatch ${FILESDIR}/glide.patch
-	cd ${S}
-
+	EPATCH_EXCLUDE="01_all_nohal.patch 00_all_bool.patch 00_all_matroska-shared.patch"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 }
 
 src_compile () {
@@ -118,12 +116,14 @@ src_compile () {
 	# mozilla-config is not in ${PATH}
 	# so the configure script won't find it
 	# unless we setup the proper variable
-	if use mozilla ; then
+	if use nsplugin ; then
 		myconf="${myconf} --enable-mozilla MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config"
 	else
 		myconf="${myconf} --disable-mozilla"
 	fi
 
+	# Portaudio support needs at least v19
+
 	econf \
 		$(use_enable altivec) \
 		$(use_enable unicode utf8) \
@@ -139,12 +139,11 @@ src_compile () {
 		$(use_enable ogg) \
 		$(use_enable matroska mkv) \
 		$(use_enable flac) \
-		$(use_enable oggvorbis vorbis) \
+		$(use_enable vorbis) \
 		$(use_enable theora) \
 		$(use_enable X x11) \
 		$(use_enable xv xvideo) \
-		$(use_enable opengl glx) \
-		$(use_enable opengl) \
+		$(use_enable opengl glx) $(use_enable opengl) \
 		$(use_enable freetype) \
 		$(use_enable bidi fribidi) \
 		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
@@ -158,7 +157,6 @@ src_compile () {
 		$(use_enable arts) \
 		$(use_enable alsa) \
 		$(use_enable wxwindows) \
-		$(use_enable ncurses) \
 		$(use_enable xosd) \
 		$(use_enable lirc) \
 		$(use_enable joystick) \
@@ -171,17 +169,20 @@ src_compile () {
 		$(use_enable mpeg libmpeg2) \
 		$(use_enable ggi) \
 		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable ssl gnutls) \
+		--disable-ncurses --disable-portaudio --disable-pth --disable-hal \
+		--disable-x264 \
 		${myconf} || die "configuration failed"
 
 	if [[ $(gcc-major-version) == 2 ]]; then
 		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
 	fi
 
-	# reason why:
-	# looks for xpidl in /usr/lib/mozilla/xpidl
-	# and doesn't find it there because it's
-	# in /usr/bin! - ChrisWhite
-	if use mozilla; then
+	# upstream fixed the previously lacking logic
+	# check for /usr/bin/xpidl and sed, otherwise
+	# assume the default. - ChrisWhite
+	if use nsplugin && [ -e /usr/bin/xpidl ] ; then
 		sed -e "s:^XPIDL = .*:XPIDL = /usr/bin/xpidl:" -i mozilla/Makefile \
 		|| die "could not fix XPIDL path"
 	fi
@@ -193,13 +194,15 @@ src_compile () {
 src_install() {
 	make DESTDIR="${D}" install || die "Installation failed!"
 
-	dodoc ABOUT-NLS AUTHORS MAINTAINERS INSTALL HACKING THANKS TODO NEWS README
+	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
 
 	rm -r ${D}/usr/share/vlc/vlc*.png ${D}/usr/share/vlc/vlc*.xpm ${D}/usr/share/vlc/vlc*.ico \
 		${D}/usr/share/vlc/kvlc*.png ${D}/usr/share/vlc/kvlc*.xpm ${D}/usr/share/vlc/qvlc*.png \
 		${D}/usr/share/vlc/qvlc*.xpm ${D}/usr/share/vlc/gvlc*.png ${D}/usr/share/vlc/gvlc*.xpm \
 		${D}/usr/share/vlc/gvlc*.ico ${D}/usr/share/vlc/gnome-vlc*.png \
-		${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2
+		${D}/usr/share/vlc/gnome-vlc*.xpm ${D}/usr/share/vlc/skins2 \
+		${D}/usr/share/doc/vlc
 
 	for res in 16 32 48; do
 		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
diff --git a/media-video/vlc/vlc-0.8.2-r1.ebuild b/media-video/vlc/vlc-0.8.2-r1.ebuild
index 4930638f4dee..2981924ee6d1 100644
--- a/media-video/vlc/vlc-0.8.2-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r1.ebuild
@@ -1,22 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.1 2005/07/11 23:39:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:23 chriswhite Exp $
 
-# Missing USE-flags due to missing deps:
-# media-vidoe/vlc:tremor - Enables Tremor decoder support
-# media-video/vlc:tarkin - Enables experimental tarkin codec
-# media-video/vlc:h264 - Enables H264 encoding support with libx264
+inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
-# Missing USE-flags due to needed testing
-# media-video/vlc:dirac - Enables experimental dirac codec
-
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib
-
-PATCHLEVEL="5"
+PATCHLEVEL="7"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
-	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,11 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
-oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick hal stream
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
 mp3 xv bidi gtk2 sdl png xml2 samba daap corba screen mod speex nsplugin"
 
-RDEPEND="hal? ( =sys-apps/hal-0.4* )
-		cdda? ( >=dev-libs/libcdio-0.71
+RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 			>=media-libs/libcddb-0.9.5 )
 		live? ( >=media-plugins/live-2005.01.29 )
 		dvd? (  media-libs/libdvdread
@@ -113,11 +104,9 @@ src_unpack() {
 	# We only have glide v3 in portage
 	cd ${S}
 
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 
-	aclocal -I m4 || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
+	AT_M4DIR="m4" eautoreconf
 
 	sed -i -e \
 		"s:/usr/include/glide:/usr/include/glide3:;s:glide2x:glide3:" \
@@ -128,13 +117,6 @@ src_unpack() {
 }
 
 src_compile () {
-	# Avoid timestamp skews with autotools
-	touch configure.ac
-	touch aclocal.m4
-	touch configure
-	touch config.h.in
-	find . -name Makefile.in | xargs touch
-
 	# reason why:
 	# skins2 interface is horribly broken for some reason.
 	# Therefore it's being disabled for the standard wxwindows
@@ -212,7 +194,6 @@ src_compile () {
 		$(use_enable ggi) \
 		$(use_enable 3dfx glide) \
 		$(use_enable sdl) \
-		$(use_enable hal) \
 		$(use_enable png) \
 		$(use_enable xml2 libxml2) \
 		$(use_enable samba smb) \
@@ -224,9 +205,13 @@ src_compile () {
 		--disable-pth \
 		--disable-portaudio \
 		--disable-slp \
+		--disable-hal \
+		--disable-x264 \
 		${myconf} || die "configuration failed"
 
-	sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
 
 	emake -j1 || die "make of VLC failed"
 }
@@ -234,7 +219,7 @@ src_compile () {
 src_install() {
 	make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!"
 
-	dodoc ABOUT-NLS AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
+	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
 		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
 
 	rm -r ${D}/usr/share/vlc/vlc*.png ${D}/usr/share/vlc/vlc*.xpm ${D}/usr/share/vlc/vlc*.ico \
diff --git a/media-video/vlc/vlc-0.8.2-r2.ebuild b/media-video/vlc/vlc-0.8.2-r2.ebuild
index 306400c94220..3711ecb119bb 100644
--- a/media-video/vlc/vlc-0.8.2-r2.ebuild
+++ b/media-video/vlc/vlc-0.8.2-r2.ebuild
@@ -1,22 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r2.ebuild,v 1.1 2005/10/03 09:42:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:23 chriswhite Exp $
 
-# Missing USE-flags due to missing deps:
-# media-vidoe/vlc:tremor - Enables Tremor decoder support
-# media-video/vlc:tarkin - Enables experimental tarkin codec
-# media-video/vlc:h264 - Enables H264 encoding support with libx264
-
-# Missing USE-flags due to needed testing
-# media-video/vlc:dirac - Enables experimental dirac codec
-
-inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools
+inherit libtool eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
 PATCHLEVEL="7"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
-	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="a52 3dfx nls unicode debug altivec httpd vlm gnutls live v4l cdda ogg matroska
 dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl freetype svg fbcon svga
 oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
-mp3 xv bidi gtk2 sdl png xml2 samba daap corba screen mod speex nsplugin"
+mp3 xv bidi sdl png xml2 samba daap corba screen mod speex nsplugin"
 
 RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
 			>=media-libs/libcddb-0.9.5 )
@@ -94,14 +86,10 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	if use wxwindows; then
 		WX_GTK_VER="2.6"
-		if use gtk2; then
-			if use unicode; then
-				need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-			else
-				need-wxwidgets gtk2 || die "You need to install wxGTK with gtk2 support."
-			fi
+		if use unicode; then
+			need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
 		else
-			need-wxwidgets gtk || die "You need to install wxGTK with gtk support."
+			need-wxwidgets gtk2 || die "You need to install wxGTK with gtk support."
 		fi
 	fi
 }
@@ -214,9 +202,12 @@ src_compile () {
 		--disable-portaudio \
 		--disable-slp \
 		--disable-hal \
+		--disable-x264 \
 		${myconf} || die "configuration failed"
 
-	sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
 
 	emake -j1 || die "make of VLC failed"
 }
diff --git a/media-video/vlc/vlc-0.8.4-r1.ebuild b/media-video/vlc/vlc-0.8.4-r1.ebuild
index 242eda74e613..8ac8d9dd638e 100644
--- a/media-video/vlc/vlc-0.8.4-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.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-video/vlc/vlc-0.8.4-r1.ebuild,v 1.1 2005/11/27 21:43:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:24 chriswhite Exp $
 
 inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
diff --git a/media-video/vlc/vlc-0.8.4.ebuild b/media-video/vlc/vlc-0.8.4.ebuild
index 513a442cba8d..a131870facce 100644
--- a/media-video/vlc/vlc-0.8.4.ebuild
+++ b/media-video/vlc/vlc-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-video/vlc/vlc-0.8.4.ebuild,v 1.1 2005/11/27 15:00:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4.ebuild,v 1.1.1.1 2005/11/30 09:57:24 chriswhite Exp $
 
 inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
 
diff --git a/media-video/vlms/ChangeLog b/media-video/vlms/ChangeLog
index 4e353218b59a..fbc8650b39e4 100644
--- a/media-video/vlms/ChangeLog
+++ b/media-video/vlms/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for media-video/vlms
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlms/ChangeLog,v 1.1 2002/08/02 19:29:29 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlms/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
-vlms-0.2.2 (02 Aug 2002)
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  28 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/0.2.2-vlf-cr-fix.patch, vlms-0.2.2.ebuild:
+  Fixes bug #41496.  Thanks to swegner for the patch.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml. Taking over as maintainer.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*vlms-0.2.2 (02 Aug 2002)
 
   02 Aug 2002; Nick Hadaway <raker@gentoo.org>
   vlms-0.2.2.ebuild, files/digest-vlms-0.2.2 :
diff --git a/media-video/vlms/Manifest b/media-video/vlms/Manifest
index e69de29bb2d1..a3e8acb2c08f 100644
--- a/media-video/vlms/Manifest
+++ b/media-video/vlms/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6a975f7f1275ef1db31dd3d871e62b13 vlms-0.2.2.ebuild 813
+MD5 c0a083da5d4d475825a0bd8360fab47f ChangeLog 843
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 d721233a6b3031aec0aae03ee169a349 files/0.2.2-vlf-cr-fix.patch 523
+MD5 4b2e25eb6b6aad18af4d68e4cad32d1a files/digest-vlms-0.2.2 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZNA+Kf2g/qXtneoRAkwzAJ4miKCjjRCX7d8fv40WjqjWzO/tmQCfeEjy
+UiQzA1uWJetxIpUKSbWdaYQ=
+=3xDT
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlms/metadata.xml b/media-video/vlms/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/vlms/metadata.xml
+++ b/media-video/vlms/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/vlms/vlms-0.2.2.ebuild b/media-video/vlms/vlms-0.2.2.ebuild
index b9efa17953f5..61d731f2349b 100644
--- a/media-video/vlms/vlms-0.2.2.ebuild
+++ b/media-video/vlms/vlms-0.2.2.ebuild
@@ -1,21 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlms/vlms-0.2.2.ebuild,v 1.1 2002/08/02 19:29:29 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlms/vlms-0.2.2.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="The VideoLAN mini-server"
-HOMEPAGE="http://www.videolan.org/vlms"
+HOMEPAGE="http://www.videolan.org/vlms/"
 SRC_URI="http://www.videolan.org/pub/videolan/vlms/0.2.2/${P}.tar.bz2"
 
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -ppc -sparc -sparc64"
+KEYWORDS="x86 -ppc -sparc "
+IUSE=""
 
 DEPEND=">=media-libs/libdvdread-0.9.3
 	>=media-libs/libdvdcss-1.2.1
 	>=media-libs/libdvbpsi-0.1.1"
 #RDEPEND=""
 
-S=${WORKDIR}/${P}
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-vlf-cr-fix.patch
+
+}
 
 src_compile() {
 
@@ -27,5 +37,6 @@ src_install () {
 
 	dodir /usr/bin
 	make prefix=${D}/usr install || die "einstall failed"
+	dobin vlf
 
 }
diff --git a/media-video/vls/ChangeLog b/media-video/vls/ChangeLog
index df61dfa165e8..1ed300baca77 100644
--- a/media-video/vls/ChangeLog
+++ b/media-video/vls/ChangeLog
@@ -1,7 +1,67 @@
 # ChangeLog for media-video/vls
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.1 2002/08/02 18:47:14 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/ChangeLog,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
+  03 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> vls-0.5.5.ebuild,
+  vls-0.5.5-r1.ebuild, vls-0.5.6-r1.ebuild, vls-0.5.6-r2.ebuild:
+  Don't install INSTALL file.
+
+  02 Sep 2005; Matthias Schwarzott <zzam@gentoo.org> vls-0.5.6-r1.ebuild,
+  vls-0.5.6-r2.ebuild:
+  added include path for newer libdvb ebuild
+
+  19 Jun 2005; Jason Wever <weeve@gentoo.org> vls-0.5.6-r2.ebuild:
+  Changed -sparc keyword to ~sparc.
+
+  31 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/vls-0.5.6-gcc34.patch, vls-0.5.6-r2.ebuild:
+  added a patch to enable gcc3.4.x compilation. fixes bug #64575.
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> vls-0.5.6-r1.ebuild:
+  restructered DEPEND to fix #48087.
+
+*vls-0.5.6-r2 (02 May 2004)
+
+  02 May 2004; Martin Holzer <mholzer@gentoo.org> vls-0.5.6-r2.ebuild:
+  moving to use_enable. Fixing depend closes 49559
+
+*vls-0.5.6-r1 (18 Feb 2004)
+*vls-0.5.5-r1 (18 Feb 2004)
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> vls-0.5.5-r1.ebuild,
+  vls-0.5.6-r1.ebuild, vls-0.5.6.ebuild:
+  Adding dvd and dvb IUSE.
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> vls-0.5.5.ebuild:
+  x86 stable.
+
+*vls-0.5.6 (18 Feb 2004)
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> vls-0.5.6.ebuild:
+  Version bumped.
+
+*vls-0.5.5 (14 Jan 2004)
+
+  14 Jan 2004; Martin Holzer <mholzer@gentoo.org> vls-0.5.5.ebuild:
+  Version bumped.
+
+*vls-0.5.4 (13 Jan 2004)
+
+  13 Jan 2004; Martin Holzer <mholzer@gentoo.org> vls-0.5.4.ebuild:
+  Verison bumped.
+
+*vls-0.5.3 (07 Jul 2003)
+
+  07 Jul 2003; Nick Hadaway <raker@gentoo.org> vls-0.5.3.ebuild:
+  Version bump.  Added IUSE for debug.  Marked stable for x86.
+
+*vls-0.5.0 (13 Mar 2003)
+
+  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> vls-0.5.0.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *vls-0.3.3 (02 Aug 2002) 
 
   02 Aug 2002; Nick Hadaway <raker@gentoo.org>
diff --git a/media-video/vls/Manifest b/media-video/vls/Manifest
index e69de29bb2d1..cb9a700dea59 100644
--- a/media-video/vls/Manifest
+++ b/media-video/vls/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a345078cbfdf62f4d81db89dae17052 ChangeLog 2171
+MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5 61
+MD5 c02a9033fcb3db177a39b972ffb0cc6d files/digest-vls-0.5.5-r1 61
+MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r1 61
+MD5 17bf9416e2bf4aca59217e79371eb8ac files/digest-vls-0.5.6-r2 61
+MD5 8f73d513b104c15745ca3a2b60cdd64d files/vls-0.5.6-gcc34.patch 2553
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 52744eb89fffd04d8138ae5c00d6cc0c vls-0.5.5-r1.ebuild 881
+MD5 48e1a9390b117c0525b135c88ccfd0f4 vls-0.5.5.ebuild 760
+MD5 60fa4a8e9faf3a00dc2a8df953e3c5c3 vls-0.5.6-r1.ebuild 1039
+MD5 00d30ef01924a34bccc75f10c2a65b6d vls-0.5.6-r2.ebuild 1109
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaf9wj5H05b2HAEkRArS7AJ9s5NC9IrW4lJPVRdZtnju24sXEVACfUlxi
+D0Y/NcWTqdpYsxPKjk0a3lY=
+=97lh
+-----END PGP SIGNATURE-----
diff --git a/media-video/vls/vls-0.5.5-r1.ebuild b/media-video/vls/vls-0.5.5-r1.ebuild
index ff3c533d8315..a4c137d4fef4 100644
--- a/media-video/vls/vls-0.5.5-r1.ebuild
+++ b/media-video/vls/vls-0.5.5-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-video/vls/vls-0.5.5-r1.ebuild,v 1.1 2004/02/18 16:35:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 IUSE="debug dvd dvb"
 
@@ -10,14 +10,12 @@ SRC_URI="http://www.videolan.org/pub/videolan/vls/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8 )
 	dvb? ( >=media-libs/libdvbpsi-0.1.3 )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf
 	use debug || myconf="--disable-debug"
@@ -34,5 +32,5 @@ src_compile() {
 src_install () {
 	einstall || die "einstall failed"
 
-	dodoc AUTHORS INSTALL README TODO
+	dodoc AUTHORS README TODO
 }
diff --git a/media-video/vls/vls-0.5.5.ebuild b/media-video/vls/vls-0.5.5.ebuild
index 6729006572ef..543185e494af 100644
--- a/media-video/vls/vls-0.5.5.ebuild
+++ b/media-video/vls/vls-0.5.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-video/vls/vls-0.5.5.ebuild,v 1.1 2004/01/14 18:46:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.5.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 IUSE="debug"
 
@@ -10,14 +10,12 @@ SRC_URI="http://www.videolan.org/pub/videolan/vls/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND=">=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8
 	>=media-libs/libdvbpsi-0.1.3"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf
 	use debug || myconf="--disable-debug"
@@ -30,5 +28,5 @@ src_compile() {
 src_install () {
 	einstall || die "einstall failed"
 
-	dodoc AUTHORS INSTALL README TODO
+	dodoc AUTHORS README TODO
 }
diff --git a/media-video/vls/vls-0.5.6-r1.ebuild b/media-video/vls/vls-0.5.6-r1.ebuild
index 5e70ef04c6a1..5e0ad34ff69b 100644
--- a/media-video/vls/vls-0.5.6-r1.ebuild
+++ b/media-video/vls/vls-0.5.6-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-video/vls/vls-0.5.6-r1.ebuild,v 1.1 2004/02/18 16:35:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
 
 IUSE="debug dvd dvb"
 
@@ -10,13 +10,12 @@ SRC_URI="http://www.videolan.org/pub/videolan/vls/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8 )
-	dvb? ( >=media-libs/libdvbpsi-0.1.3 )"
-
-S=${WORKDIR}/${P}
+	dvb? ( >=media-libs/libdvb-0.5.0 )
+	>=media-libs/libdvbpsi-0.1.3"
 
 src_compile() {
 	local myconf
@@ -24,7 +23,11 @@ src_compile() {
 
 	use dvd || myconf="${myconf} --disable-dvd"
 
-	use dvb && myconf="${myconf} --enable-dvb"
+	if use dvb; then
+		export CCFLAGS="-I/usr/include/libdvb"
+		export CPPFLAGS="${CPPFLAGS} -I/usr/include/libdvb"
+		myconf="${myconf} --enable-dvb --with-libdvb=/usr/lib/"
+	fi
 
 	econf ${myconf} || die "econf failed"
 
@@ -34,5 +37,5 @@ src_compile() {
 src_install () {
 	einstall || die "einstall failed"
 
-	dodoc AUTHORS INSTALL README TODO
+	dodoc AUTHORS README TODO
 }
diff --git a/media-video/vls/vls-0.5.6-r2.ebuild b/media-video/vls/vls-0.5.6-r2.ebuild
index 3c982969ae1b..6c8877c1d5e0 100644
--- a/media-video/vls/vls-0.5.6-r2.ebuild
+++ b/media-video/vls/vls-0.5.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-video/vls/vls-0.5.6-r2.ebuild,v 1.1 2004/05/02 09:18:12 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vls/vls-0.5.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:40 chriswhite Exp $
+
+inherit eutils
 
 IUSE="debug dvd dvb"
 
@@ -10,20 +12,31 @@ SRC_URI="http://www.videolan.org/pub/videolan/vls/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc ~alpha"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
 
 DEPEND="dvd? ( >=media-libs/libdvdread-0.9.4
 	>=media-libs/libdvdcss-1.2.8 )
 	dvb? ( >=media-libs/libdvb-0.5.0 )
 	>=media-libs/libdvbpsi-0.1.3"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile() {
 	local myconf
 	use debug || myconf="--disable-debug"
 
-	use dvb && myconf="${myconf} --enable-dvb --with-libdvb=/usr/lib/"
+	if use dvb; then
+		export CCFLAGS="-I/usr/include/libdvb"
+		export CPPFLAGS="${CPPFLAGS} -I/usr/include/libdvb"
+		myconf="${myconf} --enable-dvb --with-libdvb=/usr/lib/"
+	fi
 
-	econf `use_enable dvd` \
+	econf $(use_enable dvd) \
 		${myconf} || die "econf failed"
 
 	emake || die "emake failed"
@@ -32,5 +45,5 @@ src_compile() {
 src_install () {
 	einstall || die "einstall failed"
 
-	dodoc AUTHORS INSTALL README TODO
+	dodoc AUTHORS README TODO
 }
diff --git a/media-video/vmaid/ChangeLog b/media-video/vmaid/ChangeLog
index a3d66d6cb9bb..321da170a554 100644
--- a/media-video/vmaid/ChangeLog
+++ b/media-video/vmaid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vmaid
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/ChangeLog,v 1.1 2004/03/01 16:12:00 matsuu Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/ChangeLog,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> vmaid-1.8.15.ebuild:
+  Added to ~ppc.
 
 *vmaid-1.8.15 (02 Mar 2004)
 
diff --git a/media-video/vmaid/Manifest b/media-video/vmaid/Manifest
index 44b091d07f6f..b0b3ddbe98de 100644
--- a/media-video/vmaid/Manifest
+++ b/media-video/vmaid/Manifest
@@ -1,2 +1,4 @@
-MD5 6ca7674ca37c626d56b83b28e2afae0f vmaid-1.8.15.ebuild 439
+MD5 d2bbaa69f833166fd2be7230dbbaafdf ChangeLog 394
+MD5 ebdc909725848fc237d5963bb6a2262f metadata.xml 504
+MD5 cd3b42c016a082305229dfee857cf7de vmaid-1.8.15.ebuild 534
 MD5 b4b0237094b9b391d32cb523c5334838 files/digest-vmaid-1.8.15 64
diff --git a/media-video/vmaid/vmaid-1.8.15.ebuild b/media-video/vmaid/vmaid-1.8.15.ebuild
index aab89d03f4ea..45dc18f84eb1 100644
--- a/media-video/vmaid/vmaid-1.8.15.ebuild
+++ b/media-video/vmaid/vmaid-1.8.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/vmaid-1.8.15.ebuild,v 1.1 2004/03/01 16:12:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vmaid/vmaid-1.8.15.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge.jp/vmaid/8438/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2"
diff --git a/media-video/vobcopy/ChangeLog b/media-video/vobcopy/ChangeLog
index 25119ac4e3ca..922199b781c8 100644
--- a/media-video/vobcopy/ChangeLog
+++ b/media-video/vobcopy/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for media-video/vobcopy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vobcopy/ChangeLog,v 1.1 2003/04/16 19:53:04 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vobcopy/ChangeLog,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> vobcopy-0.5.14.ebuild:
+  Stable on ppc64
+
+  24 May 2005; Markus Rothe <corsair@gentoo.org> vobcopy-0.5.14.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*vobcopy-0.5.14 (21 Nov 2004)
+
+  21 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  vobcopy-0.5.13.ebuild, +vobcopy-0.5.14.ebuild:
+  Version bump.  0.5.13 stabld amd64.
+
+  02 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> vobcopy-0.5.13.ebuild:
+  Marked ~amd64.
+
+  14 Apr 2004; Jason Wever <weeve@gentoo.org> vobcopy-0.5.13.ebuild:
+  Added ~sparc keyword.
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> vobcopy-0.5.13.ebuild:
+  x86 stable
+
+  28 Mar 2004; David Holm <dholm@gentoo.org> vobcopy-0.5.13.ebuild:
+  Added to ~ppc.
+
+*vobcopy-0.5.13 (28 Mar 2004)
+
+  28 Mar 2004; Martin Holzer <mholzer@gentoo.org> vobcopy-0.5.13.ebuild:
+  Version bumped.
+
+*vobcopy-0.5.11 (26 Feb 2004)
+
+  26 Feb 2004; Martin Holzer <mholzer@gentoo.org> vobcopy-0.5.11.ebuild:
+  Version bumped.
+
+*vobcopy-0.5.10 (26 Jan 2004)
+
+  26 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> vobcopy-0.5.10.ebuild:
+  version bump
+
+*vobcopy-0.5.9 (25 Jan 2004)
+
+  25 Jan 2004; Martin Holzer <mholzer@gentoo.org> vobcopy-0.5.9.ebuild:
+  Version bumped.
+
+*vobcopy-0.5.8 (06 Sep 2003)
+
+  06 Sep 2003; Martin Holzer <mholzer@gentoo.org> vobcopy-0.5.8.ebuild:
+  Version bumped.
 
 *vobcopy-0.5.7 (16 Apr 2003)
 
diff --git a/media-video/vobcopy/Manifest b/media-video/vobcopy/Manifest
index 533d42469fef..2be0c7626e4f 100644
--- a/media-video/vobcopy/Manifest
+++ b/media-video/vobcopy/Manifest
@@ -1,3 +1,6 @@
-MD5 82556b1e6a2f561accf520581b50044f ChangeLog 416
-MD5 db5d764e84ae135eaa7b509e600c2028 vobcopy-0.5.7.ebuild 634
-MD5 ea95d3472987c5f15a2ffb5598df9bbf files/digest-vobcopy-0.5.7 65
+MD5 84f8236ba5c339464424a0d1c8452006 ChangeLog 1748
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 dc75fd81a8858eec3133d25fa35175ab vobcopy-0.5.13.ebuild 735
+MD5 69d2550e591621fc7d93585f075bcd56 vobcopy-0.5.14.ebuild 740
+MD5 0ceae4ae8683c53a91d58b2d9ddb1463 files/digest-vobcopy-0.5.13 66
+MD5 3f53fa0ec520b896e93f77072314982e files/digest-vobcopy-0.5.14 66
diff --git a/media-video/vobcopy/vobcopy-0.5.13.ebuild b/media-video/vobcopy/vobcopy-0.5.13.ebuild
index 04c6ff0e9835..f43be7058deb 100644
--- a/media-video/vobcopy/vobcopy-0.5.13.ebuild
+++ b/media-video/vobcopy/vobcopy-0.5.13.ebuild
@@ -1,15 +1,16 @@
-# 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-video/vobcopy/vobcopy-0.5.13.ebuild,v 1.1 2004/03/28 10:38:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vobcopy/vobcopy-0.5.13.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="copies DVD .vob files to harddisk, decrypting them on the way"
 HOMEPAGE="http://lpn.rnbhq.org/"
 SRC_URI="http://lpn.rnbhq.org/download/${P}.tar.bz2"
 
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 DEPEND=">=media-libs/libdvdread-0.9.4"
 
diff --git a/media-video/vobcopy/vobcopy-0.5.14.ebuild b/media-video/vobcopy/vobcopy-0.5.14.ebuild
index 5732e65a3240..5ae974744611 100644
--- a/media-video/vobcopy/vobcopy-0.5.14.ebuild
+++ b/media-video/vobcopy/vobcopy-0.5.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/media-video/vobcopy/vobcopy-0.5.14.ebuild,v 1.1 2004/11/22 06:55:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vobcopy/vobcopy-0.5.14.ebuild,v 1.1.1.1 2005/11/30 09:57:31 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://lpn.rnbhq.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 
 DEPEND=">=media-libs/libdvdread-0.9.4"
 
diff --git a/media-video/vstrip/ChangeLog b/media-video/vstrip/ChangeLog
index fa569d645842..453afa66d161 100644
--- a/media-video/vstrip/ChangeLog
+++ b/media-video/vstrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vstrip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/ChangeLog,v 1.1 2005/03/28 00:01:53 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/ChangeLog,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
+
+  16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> vstrip-0.8f.ebuild:
+  needs app-arch/unzip; tidy
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> vstrip-0.8f.ebuild:
+  Added to ~ppc.
 
 *vstrip-0.8f (28 Mar 2005)
 
diff --git a/media-video/vstrip/Manifest b/media-video/vstrip/Manifest
index 78fb200f4a61..80866c6c567b 100644
--- a/media-video/vstrip/Manifest
+++ b/media-video/vstrip/Manifest
@@ -1,3 +1,5 @@
-MD5 346564a9abe421cffeac776de0a50d21 vstrip-0.8f.ebuild 681
-MD5 e678826f20d61477c6f3387201a5668f files/vstrip-0.8f-gentoo.patch 2023
+MD5 b17a6cf6781d80c556e5d84f3327ddc5 metadata.xml 336
+MD5 8a820d0f758bdfd74cbb1c8aeb6f82c0 vstrip-0.8f.ebuild 828
+MD5 6252949e4d36d422632a3c81360d5a45 ChangeLog 638
 MD5 1f3d4d7b3589e5de8e4bb357eb9a0f63 files/digest-vstrip-0.8f 59
+MD5 5e8b0123e4210ad51352ae95aca5832e files/vstrip-0.8f-gentoo.patch 2027
diff --git a/media-video/vstrip/vstrip-0.8f.ebuild b/media-video/vstrip/vstrip-0.8f.ebuild
index ef210d82076e..8004fa339a00 100644
--- a/media-video/vstrip/vstrip-0.8f.ebuild
+++ b/media-video/vstrip/vstrip-0.8f.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/vstrip-0.8f.ebuild,v 1.1 2005/03/28 00:01:53 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vstrip/vstrip-0.8f.ebuild,v 1.1.1.1 2005/11/30 09:57:52 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A program to split non-css dvd vobs into individual chapters"
 HOMEPAGE="http://www.maven.de/code"
 SRC_URI="http://files.digital-digest.com/downloads/files/encode/vStrip_${PV/./}.zip"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
-DEPEND="app-text/dos2unix"
-RDEPEND="virtual/libc"
+
+DEPEND="app-text/dos2unix
+	app-arch/unzip"
+RDEPEND=""
+
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch ${FILESDIR}/vstrip-0.8f-gentoo.patch
 	dos2unix -q -o *.c *.h
@@ -28,9 +32,9 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	dobin vstrip
+	dobin vstrip || die "dobin failed"
 }
diff --git a/media-video/w3cam/ChangeLog b/media-video/w3cam/ChangeLog
index defa360d81db..3d331011f25f 100644
--- a/media-video/w3cam/ChangeLog
+++ b/media-video/w3cam/ChangeLog
@@ -1,9 +1,24 @@
 # ChangeLog for media-video/w3cam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/ChangeLog,v 1.1 2002/10/24 07:10:09 zwelch Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> w3cam-0.7.2.ebuild:
+  Don't install COPYING file.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> w3cam-0.7.2.ebuild:
+  Added to ~ppc.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> w3cam-0.7.2.ebuild:
+  virtual/glibc -> virtual/libc
 
 *w3cam-0.7.2-r1 (23 Oct 2002)
   
+  25 Oct 2002; Zach Welch <zwelch@gentoo.org> :
+  fix use flags, add IUSE
+
   24 Oct 2002; Zach Welch <zwelch@gentoo.org> :
   minor cleanup of ebuild and commit to CVS
 
diff --git a/media-video/w3cam/Manifest b/media-video/w3cam/Manifest
index e69de29bb2d1..32f12ddc10e7 100644
--- a/media-video/w3cam/Manifest
+++ b/media-video/w3cam/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c95cb34df96d26f3a7521ed18ad33561 ChangeLog 1370
+MD5 2d6fdef0c212ddff8fcf3da3fd49738c w3cam-0.7.2.ebuild 1385
+MD5 284a70da1011bec7eafebb5d5e4b0fb5 metadata.xml 247
+MD5 78d3e407e8601f67e1646356420ec594 files/digest-w3cam-0.7.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGi+Ij5H05b2HAEkRArn1AJ49NGSwdG1MMIv0ueZoyLF1jNNo0wCfVj/D
+0EdHH60x5Iz4socGm4Bl6g0=
+=Gbe2
+-----END PGP SIGNATURE-----
diff --git a/media-video/w3cam/metadata.xml b/media-video/w3cam/metadata.xml
index 9150541c31b4..5dd37336ce32 100644
--- a/media-video/w3cam/metadata.xml
+++ b/media-video/w3cam/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-video</herd>
+<herd>video</herd>
 <herd>media-tv</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
diff --git a/media-video/w3cam/w3cam-0.7.2.ebuild b/media-video/w3cam/w3cam-0.7.2.ebuild
index f4045e0dd934..afec482e9c5c 100644
--- a/media-video/w3cam/w3cam-0.7.2.ebuild
+++ b/media-video/w3cam/w3cam-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 
-# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/w3cam-0.7.2.ebuild,v 1.1 2002/10/24 07:10:09 zwelch Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/w3cam/w3cam-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 #
 # You can set the default device that vidcat and w3camd use by setting
@@ -10,28 +10,30 @@
 # W3CAM_DEVICE="/dev/video0" emerge w3cam
 #
 
-S=${WORKDIR}/${P}
-DESCRIPTION="w3cam - a set of small programs to grab images and videos from video4linux devices"
+DESCRIPTION="set of small programs to grab images and videos from video4linux devices"
 HOMEPAGE="http://mpx.freeshell.org/"
 SRC_URI="http://mpx.freeshell.org/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-DEPEND="virtual/glibc \
-		zlib? sys-libs/zlib \
-		jpeg? media-libs/jpeg \
-		png? media-libs/libpng \
-		truetype? media-libs/freetype"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE="truetype"
+
+DEPEND="virtual/libc
+	sys-libs/zlib
+	media-libs/jpeg
+	media-libs/libpng
+	truetype? ( media-libs/freetype )"
 
 src_compile() {
 	local myconf
 
-	test -z ${W3CAM_DEVICE} \
-	    || myconf="${myconf} --with-device=${W3CAM_DEVICE}"
+	test -n "${W3CAM_DEVICE}" && \
+		myconf="${myconf} --with-device=${W3CAM_DEVICE}"
+
+	use truetype && \
+		myconf="${myconf} --with-ttf-inc=/usr/include/freetype"
 
-	use truetype \
-	    || myconf="${myconf} --with-ttf-inc=/usr/include/freetype"
-	
 	./configure \
 	    --host=${CHOST} \
 	    --prefix=/usr \
@@ -43,11 +45,10 @@ src_compile() {
 src_install() {
 	dobin vidcat w3camd/w3camd
 	doman vidcat.1
-	dodoc COPYING.txt ChangeLog.txt FAQ.txt README SAMPLES TODO.txt \
+	dodoc ChangeLog.txt FAQ.txt README SAMPLES TODO.txt \
 	    index.html w3cam.css w3cam.cgi w3cam.cgi.scf
 	docinto samples
 	dodoc samples/*
 	docinto w3camd
 	dodoc w3camd/README w3camd/index.html w3camd/test.html w3camd/w3camd.fig
 }
-
diff --git a/media-video/winki/ChangeLog b/media-video/winki/ChangeLog
index 91e4013bf225..2171320470f5 100644
--- a/media-video/winki/ChangeLog
+++ b/media-video/winki/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/winki
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/winki/ChangeLog,v 1.1 2004/10/23 01:43:10 chriswhite Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/winki/ChangeLog,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> winki-0.3.2.ebuild:
+  Add eutils inherit for epatch, for safety.
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> winki-0.3.2.ebuild:
+  Added to ~ppc.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Fixed herd in metadata.xml.
 
 *winki-0.3.2 (23 Oct 2004)
 
diff --git a/media-video/winki/Manifest b/media-video/winki/Manifest
index faddb033a123..358dade3dffe 100644
--- a/media-video/winki/Manifest
+++ b/media-video/winki/Manifest
@@ -1,3 +1,8 @@
-MD5 9fddbb10835e4ff448592e6ca6f960cb winki-0.3.2.ebuild 1144
+MD5 06cb44ab05d65f7eceb69b053527bc99 ChangeLog 973
+MD5 172b982c1fb2060a02e360c059e619b1 files/digest-winki-0.3.11 64
 MD5 f6f98eafb0ce381e16d7e1ce00d35505 files/digest-winki-0.3.2 63
 MD5 21ee3b43023ecd3b693b409550874e56 files/winki-0.3.2.patch 1263
+MD5 6890afb11f388303010957791d91eea3 files/winki-0.3.8.patch 582
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 d9172e93db86067cb434d1f0e4c09c44 winki-0.3.11.ebuild 1747
+MD5 e1e914551238ac26d01f6ec6db3bb718 winki-0.3.2.ebuild 1256
diff --git a/media-video/winki/metadata.xml b/media-video/winki/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/winki/metadata.xml
+++ b/media-video/winki/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/winki/winki-0.3.2.ebuild b/media-video/winki/winki-0.3.2.ebuild
index dd297cdc3eba..faa69037164c 100644
--- a/media-video/winki/winki-0.3.2.ebuild
+++ b/media-video/winki/winki-0.3.2.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-video/winki/winki-0.3.2.ebuild,v 1.1 2004/10/23 01:43:10 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/winki/winki-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:57:32 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="A Python frontend to many popular encoding programs."
 HOMEPAGE="http://www.informatik.hu-berlin.de/~hristov/projects/winki/index.html"
 SRC_URI="http://www.informatik.hu-berlin.de/~hristov/projects/winki/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE="vcd css"
 DEPEND=">=dev-lang/python-2.3
 		>=dev-python/gnome-python-2
diff --git a/media-video/xanim-export/ChangeLog b/media-video/xanim-export/ChangeLog
index 062ad7ae78b6..64f590e212e1 100644
--- a/media-video/xanim-export/ChangeLog
+++ b/media-video/xanim-export/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for media-video/xanim-export
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/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-video/xanim-export/ChangeLog,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml."
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  xanim-export-2.80.1-r3.ebuild:
+  Add inherit eutils
+
+*xanim-export-2.80.1-r3 (27 Apr 2002)
+
+  03 Mar 2003; Brandon Low <lostlogic@gentoo.org>
+  xanim-export-2.80.1-r3.ebuild:
+  strip some problematic flags
+
+  27 Apr 2002; pvdabeel <pvdabeel@gentoo.org>
+  Sparc && ppc fix
+
+*xanim-export-2.80.1-r2 (11 Apr 2002)
+  11 Apr 2002; Spider <spider@gentoo.org>
+  Updating libpng dependency
 
 *xanim-export-2.80.1-r1 (1 Feb 2002)
 
diff --git a/media-video/xanim-export/Manifest b/media-video/xanim-export/Manifest
index e69de29bb2d1..4204ed89ea70 100644
--- a/media-video/xanim-export/Manifest
+++ b/media-video/xanim-export/Manifest
@@ -0,0 +1,5 @@
+MD5 df990c37b735d275f37186059d4ed717 xanim-export-2.80.1-r3.ebuild 3068
+MD5 fd47eaa6cac5114f4cd51c8934d53ab9 ChangeLog 1229
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 619a8b8f93e2addf6df259ec59340d1d files/2.80.1-makefile.patch 1099
+MD5 b6a69a73a8448ca48f9c764140b27831 files/digest-xanim-export-2.80.1-r3 684
diff --git a/media-video/xanim-export/metadata.xml b/media-video/xanim-export/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/xanim-export/metadata.xml
+++ b/media-video/xanim-export/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild
index bbf23f65b04f..7cba5d68f388 100644
--- a/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild
@@ -1,7 +1,10 @@
-# 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>
-# $Id: xanim-export-2.80.1-r3.ebuild,v 1.1 2002/04/27 11:40:49 pvdabeel Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:53 chriswhite Exp $
+
+inherit flag-o-matic eutils
+strip-flags -finline-functions
+replace-flags -O3 -O2
 
 _XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
 _XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
@@ -19,104 +22,97 @@ _XA_IV32_PPC=xa2.0_iv32_linuxPPC.o
 _XA_PPC_EXT=.Z
 
 case $ARCH in
-	sparc*)
-			_XA_CYUV=$_XA_CYUV_SPARC
-			_XA_CVID=$_XA_CVID_SPARC
-			_XA_IV32=$_XA_IV32_SPARC
-			_XA_EXT=$_XA_SPARC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
+	sparc)
+		_XA_CYUV=$_XA_CYUV_SPARC
+		_XA_CVID=$_XA_CVID_SPARC
+		_XA_IV32=$_XA_IV32_SPARC
+		_XA_EXT=$_XA_SPARC_EXT
+		_XA_UNCOMPRESS=uncompress
+		;;
 	ppc)
-			_XA_CYUV=$_XA_CYUV_PPC
-			_XA_CVID=$_XA_CVID_PPC
-			_XA_IV32=$_XA_IV32_PPC
-			_XA_EXT=$_XA_PPC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	*)
-			_XA_CYUV=$_XA_CYUV_I386
-			_XA_CVID=$_XA_CVID_I386
-			_XA_IV32=$_XA_IV32_I386
-			_XA_EXT=$_XA_I386_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
+		_XA_CYUV=$_XA_CYUV_PPC
+		_XA_CVID=$_XA_CVID_PPC
+		_XA_IV32=$_XA_IV32_PPC
+		_XA_EXT=$_XA_PPC_EXT
+		_XA_UNCOMPRESS=uncompress
+		;;
+	x86)
+		_XA_CYUV=$_XA_CYUV_I386
+		_XA_CVID=$_XA_CVID_I386
+		_XA_IV32=$_XA_IV32_I386
+		_XA_EXT=$_XA_I386_EXT
+		_XA_UNCOMPRESS=gunzip
+		;;
 esac
 
-A="xanim_exporting_edition.tar.gz \
-	${_XA_CYUV_SPARC}${_XA_SPARC_EXT} ${_XA_CVID_SPARC}${_XA_SPARC_EXT} \
-	${_XA_IV32_SPARC}${_XA_SPARC_EXT} \
-	${_XA_CYUV_I386}${_XA_I386_EXT} ${_XA_CVID_I386}${_XA_I386_EXT} \
-	${_XA_IV32_I386}${_XA_I386_EXT} \
-	${_XA_CYUV_PPC}${_XA_PPC_EXT} ${_XA_CVID_PPC}${_XA_PPC_EXT} \
-	${_XA_IV32_PPC}${_XA_PPC_EXT}"
-S=${WORKDIR}/xanim_exporting_edition
 DESCRIPTION="XAnim with Quicktime and RAW Audio export functions"
-SRC_URI="http://heroine.linuxave.net/xanim_exporting_edition.tar.gz \
-     ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_SPARC}${_XA_SPARC_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_SPARC}${_XA_SPARC_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_SPARC}${_XA_SPARC_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_PPC}${_XA_PPC_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_PPC}${_XA_PPC_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_PPC}${_XA_PPC_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_I386}${_XA_I386_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_I386}${_XA_I386_EXT} 
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_I386}${_XA_I386_EXT}"
-
 HOMEPAGE="http://heroin.linuxave.net/toys.html"
+SRC_URI="http://heroine.linuxave.net/xanim_exporting_edition.tar.gz
+	sparc? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
+	)
+	ppc? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_PPC}${_XA_PPC_EXT}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_PPC}${_XA_PPC_EXT}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_PPC}${_XA_PPC_EXT}
+	)
+	x86? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_I386}${_XA_I386_EXT}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_I386}${_XA_I386_EXT}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_I386}${_XA_I386_EXT}
+	)"
+
+LICENSE="XAnim"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.1
 	virtual/x11"
+RDEPEND="app-arch/ncompress"
+
+S=${WORKDIR}/xanim_exporting_edition
 
-case $ARCH in 
-  sparc)
-	RDEPEND="app-arch/ncompress"
-	;;
-  sparc64)
-	RDEPEND="app-arch/ncompress"
-	;;
-  ppc)
-	RDEPEND="app-arch/ncompress"
-	;;
-esac
- 
 src_unpack() {
-  unpack xanim_exporting_edition.tar.gz
-  mkdir ${S}/mods
-  cd ${S}/mods
-  cp ${DISTDIR}/${_XA_CYUV}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_CYUV}${_XA_EXT}
-  cp ${DISTDIR}/${_XA_CVID}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_CVID}${_XA_EXT}
-  cp ${DISTDIR}/${_XA_IV32}${_XA_EXT} .
-  $_XA_UNCOMPRESS ${_XA_IV32}${_XA_EXT}
-  cd ${S}
-  rm xanim
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
+	unpack xanim_exporting_edition.tar.gz
+
+	cd ${S}/mods
+	cp ${DISTDIR}/${_XA_CYUV}${_XA_EXT} .
+	$_XA_UNCOMPRESS ${_XA_CYUV}${_XA_EXT}
+	cp ${DISTDIR}/${_XA_CVID}${_XA_EXT} .
+	$_XA_UNCOMPRESS ${_XA_CVID}${_XA_EXT}
+	cp ${DISTDIR}/${_XA_IV32}${_XA_EXT} .
+	$_XA_UNCOMPRESS ${_XA_IV32}${_XA_EXT}
+
+	cd ${S}
+	rm xanim
+	epatch ${FILESDIR}/${PV}-makefile.patch
 }
-src_compile() {
-
 
-
-    cd ${S}/quicktime
-    try make XA_IV32_LIB=mods/${_XA_CYUV} XA_CVID_LIB=mods/${_XA_CVID} \
-			XA_CYUV_LIB=mods/${_XA_IV32}
+src_compile() {
+	cd ${S}/quicktime
+	make \
+		XA_IV32_LIB=mods/${_XA_CYUV} \
+		XA_CVID_LIB=mods/${_XA_CVID} \
+		XA_CYUV_LIB=mods/${_XA_IV32} \
+		|| die "make quicktime failed"
 	cd ..
-	try make XA_IV32_LIB=mods/${_XA_CYUV} XA_CVID_LIB=mods/${_XA_CVID} \
-			XA_CYUV_LIB=mods/${_XA_IV32}
-
+	make \
+		XA_IV32_LIB=mods/${_XA_CYUV} \
+		XA_CVID_LIB=mods/${_XA_CVID} \
+		XA_CYUV_LIB=mods/${_XA_IV32} \
+		OPTIMIZE="${CFLAGS}" \
+		|| die "main make failed"
 }
 
-src_install () {
-
-    into /usr
-    newbin xanim xanim-export
-    insinto /usr/lib/xanim/mods-export
-    doins mods/*
-    dodoc README*
-    dodoc docs/README.* docs/*.readme docs/*.doc
+src_install() {
+	newbin xanim xanim-export
+	insinto /usr/lib/xanim/mods-export
+	doins mods/*
+	dodoc README*
+	dodoc docs/README.* docs/*.readme docs/*.doc
 }
-
-
-
diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index ae1d900da52c..1fd3e6c72539 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for media-video/xanim
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/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-video/xanim/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Updated homepage as per bug #100878.
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org> -files/Makefile,
+  -files/Makefile.amd64, xanim-2.80.1-r4.ebuild:
+  Moved using toolchain-funcs instead of gcc. Removed the two makefiles which
+  aren't needed anymore.
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Stable on ppc64
+
+  14 Nov 2004; Markus Rothe <corsair@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Marked ~ppc64; bug #68112
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Added ~mips keyword.
+
+  03 Mar 2004; <agriffis@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Minor fix to src_install and mark stable on hppa
+
+  02 Mar 2004; <agriffis@gentoo.org> xanim-2.80.1-r4.ebuild:
+  Do a cleanup of the arch support in this ebuild so that ia64 can build. These
+  changes obviate files/Makefile and files/Makefile.amd64 and might even allow
+  hppa and mips to build without changes to the ebuild. I don't think I broke
+  anything
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> xanim-2.80.1-r4.ebuild:
+  mark stable on amd64
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> xanim-2.80.1-r4.ebuild:
+  add ~amd64 to flags
+
+  28 Sep 2003; Markus Nigbur <pyrania@gentoo.org> xanim-2.80.1-r4.ebuild,
+  files/Makefile.amd64:
+  Added amd64 support. ebuild by brad@mainstreetsoftworks.com in bug #29802.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*xanim-2.80.1-r4 (3 June 2002)
+
+  03 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xanim-2.80.1-r4.ebuild:
+  some minor tweaks of ebuild
+
+  04 Mar 2003; Alastair Tse <liquidx@gentoo.org> xanim-2.80.1-r4.ebuild :
+  Filter out -finline-functions from CFLAGS. Resolves #16782.
+ 
+  04 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xanim-2.80.1-r4.ebuild :
+
+  Fixed the DEPEND syntax.  The case $ARCH stuff for adding ncompress to the
+  DEPEND list was not working.  Thanks to [DJ]Hack in #gentoo-sparc for
+  pointing out the failure.
+ 
+  3 June 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  xanim-2.80.1-r4.ebuild, files/digest-xanim-2.80.1-r4 :
+
+  Pin to -O2. Anything higher breaks GCC3.1 for some -march/cpu
+  combinations.
+
+*xanim-2.80.1-r3 (27 Apr 2002)
+  
+  27 Apr 2002; pvdabeel <pvdabeel@gentoo.org> :
+
+  Adding PPC support
+
+*xanim-2.80.1-r2 (22 Apr 2002)
+
+  22 Apr 2002; M.Thibaut <murphy@gentoo.org> :
+
+  Adding SPARC support.
 
 *xanim-2.80.1-r1 (1 Feb 2002)
 
diff --git a/media-video/xanim/Manifest b/media-video/xanim/Manifest
index e69de29bb2d1..1122f1741f7c 100644
--- a/media-video/xanim/Manifest
+++ b/media-video/xanim/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6d126b36a7a178651e109c80d5d3aa22 ChangeLog 3227
+MD5 a04e6bf35b1c142eb7bbccfdc6c5280b files/digest-xanim-2.80.1-r4 878
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 f3dbc806f6470bbd81937cbf9fa4df05 xanim-2.80.1-r4.ebuild 3168
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZVBij5H05b2HAEkRAhuCAJ9I3UFu55IFwUhKWm5J4s3HmYWNgACeKPLB
+bf7ZzMo+Ud5/Px+Jx4QGKm0=
+=p3d4
+-----END PGP SIGNATURE-----
diff --git a/media-video/xanim/files/digest-xanim-2.80.1-r4 b/media-video/xanim/files/digest-xanim-2.80.1-r4
index 1bdd42c49b25..58d90144ebd8 100644
--- a/media-video/xanim/files/digest-xanim-2.80.1-r4
+++ b/media-video/xanim/files/digest-xanim-2.80.1-r4
@@ -2,6 +2,9 @@ MD5 e2ecd086c160f18dd7cc3cac438758c2 xanim2801.tar.gz 441250
 MD5 a61c6cfdf34d395de2d7b747bfedebed xa1.0_cyuv_sparcELF.o.Z 1277
 MD5 2648138325bfacdfc2c35b5954422c3b xa2.0_cvid_sparcELF.o.Z 4730
 MD5 0f7db79cc5d8605e70c79e2c633e5a99 xa2.0_iv32_sparcELF.o.Z 48813
+MD5 9339c6d7e920233e5f63267f626a03d8 xa1.0_cyuv_linuxAlpha.o.gz 2053
+MD5 f158c55fcd39f2b2665cd65d5e2457df xa2.0_cvid_linuxAlpha.o.gz 5096
+MD5 c589ff8ef37efc557797068da3d30fc7 xa2.0_iv32_linuxAlpha.o.gz 33172
 MD5 45b318b6598b29c3477e14976b14bab6 xa1.0_cyuv_linuxPPC.o.Z 1513
 MD5 066b6934377ae2bd1225a924c430240c xa2.0_cvid_linuxPPC.o.Z 5192
 MD5 043341640efe45455f7d5c997b0fb55e xa2.0_iv32_linuxPPC.o.Z 56163
diff --git a/media-video/xanim/metadata.xml b/media-video/xanim/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/xanim/metadata.xml
+++ b/media-video/xanim/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index 77030124930a..3ed30ded806f 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,115 +1,113 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Revision: 1.1 $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="program for playing a wide variety of animation, audio and video formats"
+HOMEPAGE="http://xanim.polter.net/"
 
 LICENSE="XAnim"
-SLOT=""
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ppc64"
+IUSE=""
 
-_XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
-_XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
-_XA_IV32_SPARC=xa2.0_iv32_sparcELF.o
-_XA_SPARC_EXT=.Z
+RDEPEND="virtual/x11
+	>=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4.0.5"
+
+MY_P=${PN}${PV//.}
+S=${WORKDIR}/${MY_P}
 
-_XA_CYUV_I386=xa1.0_cyuv_linuxELFg21.o
-_XA_CVID_I386=xa2.0_cvid_linuxELFg21.o
-_XA_IV32_I386=xa2.1_iv32_linuxELFg21.o
-_XA_I386_EXT=.gz
+_XA_CYUV_ALPHA=xa1.0_cyuv_linuxAlpha.o
+_XA_CVID_ALPHA=xa2.0_cvid_linuxAlpha.o
+_XA_IV32_ALPHA=xa2.0_iv32_linuxAlpha.o
+_XA_ALPHA_EXT=.gz
 
 _XA_CYUV_PPC=xa1.0_cyuv_linuxPPC.o
 _XA_CVID_PPC=xa2.0_cvid_linuxPPC.o
 _XA_IV32_PPC=xa2.0_iv32_linuxPPC.o
 _XA_PPC_EXT=.Z
 
-case $ARCH in
-	sparc*)
-			_XA_CYUV=$_XA_CYUV_SPARC
-			_XA_CVID=$_XA_CVID_SPARC
-			_XA_IV32=$_XA_IV32_SPARC
-			_XA_EXT=$_XA_SPARC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	ppc)
-			_XA_CYUV=$_XA_CYUV_PPC
-			_XA_CVID=$_XA_CVID_PPC
-			_XA_IV32=$_XA_IV32_PPC
-			_XA_EXT=$_XA_PPC_EXT
-			_XA_UNCOMPRESS=uncompress
-			;;
-	*)
-			_XA_CYUV=$_XA_CYUV_I386
-			_XA_CVID=$_XA_CVID_I386
-			_XA_IV32=$_XA_IV32_I386
-			_XA_EXT=$_XA_I386_EXT
-			_XA_UNCOMPRESS=gunzip
-			;;
-esac
-			
-A="xanim2801.tar.gz \
-	${_XA_CYUV_SPARC}${_XA_SPARC_EXT} ${_XA_CVID_SPARC}${_XA_SPARC_EXT} \
-	${_XA_IV32_SPARC}${_XA_SPARC_EXT} \
-	${_XA_CYUV_I386}${_XA_I386_EXT} ${_XA_CVID_I386}${_XA_I386_EXT} \
-	${_XA_IV32_I386}${_XA_I386_EXT} \
-	${_XA_CYUV_PPC}${_XA_PPC_EXT} ${_XA_CVID_PPC}${_XA_PPC_EXT} \
-	${_XA_IV32_PPC}${_XA_PPC_EXT}"
-S=${WORKDIR}/xanim2801
-DESCRIPTION="XAnim"
-SRC_URI="ftp://xanim.va.pubnix.com/xanim2801.tar.gz
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_PPC}${_XA_PPC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_PPC}${_XA_PPC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_PPC}${_XA_PPC_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_I386}${_XA_I386_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_CVID_I386}${_XA_I386_EXT}
-	 ftp://xanim.va.pubnix.com/modules/${_XA_IV32_I386}${_XA_I386_EXT}"
-HOMEPAGE="http://xanim.va.pubnix.com"
-
-case $ARCH in 
-	sparc)
-		ARCHDEPS="app-arch/ncompress"
-	;;
-	sparc64)
-		ARCHDEPS="app-arch/ncompress"
-	;;
-	ppc)
-		ARCHDEPS="app-arch/ncompress"
-	;;
-	*)
-		ARCHDEPS=""
-	;;
-esac
-
-DEPEND="virtual/glibc virtual/x11 >=sys-libs/zlib-1.1.3 ${ARCHDEPS}"
-
-RDEPEND="${DEPEND}"
-  	
+_XA_CYUV_SPARC=xa1.0_cyuv_sparcELF.o
+_XA_CVID_SPARC=xa2.0_cvid_sparcELF.o
+_XA_IV32_SPARC=xa2.0_iv32_sparcELF.o
+_XA_SPARC_EXT=.Z
+
+_XA_CYUV_X86=xa1.0_cyuv_linuxELFg21.o
+_XA_CVID_X86=xa2.0_cvid_linuxELFg21.o
+_XA_IV32_X86=xa2.1_iv32_linuxELFg21.o
+_XA_X86_EXT=.gz
+
+# This might leave _XA_EXT empty and that's fine, just indicates no
+# particular support for a given arch
+eval _XA_EXT=\$_XA_`echo $ARCH | tr a-z A-Z`_EXT
+eval _XA_CVID=\$_XA_CVID_`echo $ARCH | tr a-z A-Z`
+eval _XA_CYUV=\$_XA_CYUV_`echo $ARCH | tr a-z A-Z`
+eval _XA_IV32=\$_XA_IV32_`echo $ARCH | tr a-z A-Z`
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	sparc? (
+		mirror://gentoo/${_XA_CVID_SPARC}${_XA_SPARC_EXT}
+		mirror://gentoo/${_XA_CYUV_SPARC}${_XA_SPARC_EXT}
+		mirror://gentoo/${_XA_IV32_SPARC}${_XA_SPARC_EXT}
+	)
+	alpha? (
+		mirror://gentoo/${_XA_CVID_ALPHA}${_XA_ALPHA_EXT}
+		mirror://gentoo/${_XA_CYUV_ALPHA}${_XA_ALPHA_EXT}
+		mirror://gentoo/${_XA_IV32_ALPHA}${_XA_ALPHA_EXT}
+	)
+	ppc? (
+		mirror://gentoo/${_XA_CVID_PPC}${_XA_PPC_EXT}
+		mirror://gentoo/${_XA_CYUV_PPC}${_XA_PPC_EXT}
+		mirror://gentoo/${_XA_IV32_PPC}${_XA_PPC_EXT}
+	)
+	x86? (
+		mirror://gentoo/${_XA_CVID_X86}${_XA_X86_EXT}
+		mirror://gentoo/${_XA_CYUV_X86}${_XA_X86_EXT}
+		mirror://gentoo/${_XA_IV32_X86}${_XA_X86_EXT}
+	)"
+
+
 src_unpack() {
-	unpack xanim2801.tar.gz
-	mkdir ${S}/mods
-	cd ${S}/mods
-	cp ${DISTDIR}/${_XA_CYUV}${_XA_EXT} .
-	$_XA_UNCOMPRESS ${_XA_CYUV}${_XA_EXT}
-	cp ${DISTDIR}/${_XA_CVID}${_XA_EXT} .
-	$_XA_UNCOMPRESS ${_XA_CVID}${_XA_EXT}
-	cp ${DISTDIR}/${_XA_IV32}${_XA_EXT} .
-	$_XA_UNCOMPRESS ${_XA_IV32}${_XA_EXT}
-	# -O higher than -O2 breaks for GCC3.1
-	CFLAGS=${CFLAGS//-O[0-9]/-O2}
-	sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
+	unpack ${MY_P}.tar.gz
+	if [[ -n ${_XA_EXT} ]]; then
+		mkdir ${S}/mods || die
+		cd ${S}/mods || die
+		unpack ${_XA_CVID}${_XA_EXT}
+		unpack ${_XA_CYUV}${_XA_EXT}
+		unpack ${_XA_IV32}${_XA_EXT}
+	fi
 }
 
 src_compile() {
-	make XA_IV32_LIB=mods/${_XA_CYUV} XA_CVID_LIB=mods/${_XA_CVID} \
-		XA_CYUV_LIB=mods/${_XA_IV32} || die
+	# -O higher than -O2 breaks for GCC3.1
+	replace-flags -O3 -O2
+	filter-flags -finline-functions
+
+	# Set XA_DLL_PATH even though we statically link the mods, I guess
+	# this provides extensibility
+	make CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" \
+		XA_DLL_DEF="-DXA_DLL -DXA_PRINT" XA_DLL_PATH=/usr/lib/xanim/mods \
+		${_XA_EXT:+ \
+			XA_IV32_LIB="mods/${_XA_CVID}" \
+			XA_CYUV_LIB="mods/${_XA_CYUV}" \
+			XA_CVID_LIB="mods/${_XA_IV32}" }
 }
 
-src_install () {
-	into /usr
-	dobin xanim
+src_install() {
+	dobin xanim || die
 	newman docs/xanim.man xanim.1
-	insinto /usr/lib/xanim/mods
-	doins mods/*
 	dodoc README
 	dodoc docs/README.* docs/*.readme docs/*.doc
+
+	# I don't know why we're installing these modules when they're
+	# statically linked, but whatever...
+	if [[ -n ${_XA_EXT} ]]; then
+		insinto /usr/lib/xanim/mods
+		doins mods/${_XA_CVID}
+		doins mods/${_XA_CYUV}
+		doins mods/${_XA_IV32}
+	fi
 }
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 635d78e0ae5a..602420c480de 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,467 @@
 # ChangeLog for media-video/xine-ui
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/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-video/xine-ui/ChangeLog,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
+
+  05 Nov 2005; Mark Loeser <halcy0n@gentoo.org> xine-ui-0.99.3-r1.ebuild:
+  Stable on x86; bug #111563
+
+*xine-ui-0.99.4-r3 (14 Sep 2005)
+
+  14 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -xine-ui-0.99.4-r1.ebuild, -xine-ui-0.99.4-r2.ebuild,
+  +xine-ui-0.99.4-r3.ebuild:
+  Added patch to disable xinerama (and xinerama useflag), removed old versions.
+
+  14 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.4-r2.ebuild:
+  Fix dependencies for modular Xorg.
+
+  14 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.4-r2.ebuild:
+  Use autotools eclass.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xine-ui-0.99.3.ebuild,
+  xine-ui-0.99.3-r1.ebuild, xine-ui-0.99.4-r1.ebuild,
+  xine-ui-0.99.4-r2.ebuild:
+  Don't install INSTALL file.
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> xine-ui-0.99.3-r1.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -xine-ui-0.9.23-r2.ebuild:
+  Remove old 0.9.23 version, as alpha keyworded a newer version.
+
+  30 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  xine-ui-0.99.4-r2.ebuild:
+  Marked ~alpha. Test requested by Flameeyes
+
+  30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> -xine-ui-0.99.2.ebuild:
+  Remove 0.99.2 as sparc marked a newer version stable.
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  xine-ui-0.99.3-r1.ebuild:
+  Stable on sparc wrt #98805 and others
+
+*xine-ui-0.99.4-r2 (19 Aug 2005)
+
+  19 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-ui-0.99.4-r2.ebuild:
+  Added three patches from freshrpms, little fix to UI and replaces sprintf()
+  calls with strcat().
+
+*xine-ui-0.99.4-r1 (01 Aug 2005)
+
+  01 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> -xine-ui-0.99.4.ebuild,
+  +xine-ui-0.99.4-r1.ebuild:
+  Apply patch to avoid non-literal printf() calls.
+
+  31 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.3-r1.ebuild:
+  Stable on amd64.
+
+  30 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  xine-ui-0.99.3-r1.ebuild:
+  ppc stable
+
+  30 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/xine-ui-desktop-fixes.patch, -xine-ui-0.99.1.ebuild,
+  -xine-ui-0.99.3_pre20041022.ebuild, -xine-ui-0.99.3_pre20041022-r1.ebuild,
+  -xine-ui-0.99.3-r2.ebuild:
+  Removed old versions. 0.99.3-r2 was a fix for GCC4, just use 0.99.4 that is
+  already fixed.
+
+  30 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> xine-ui-0.99.4.ebuild:
+  Added patches to build on Gentoo/FreeBSD.
+
+*xine-ui-0.99.4 (27 Jul 2005)
+
+  27 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> +xine-ui-0.99.4.ebuild:
+  Updated to latest xine-ui version upstream. Install xpm file in
+  /usr/share/pixmaps for *box compatibility.
+
+*xine-ui-0.99.3-r2 (20 Jul 2005)
+
+  20 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-ui-0.99.3-r2.ebuild:
+  Added patch for crashes when right clicking, thanks to Michael Lothian to
+  letting us know. Patch from RpmForge.
+
+  31 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.3-r1.ebuild:
+  Added patch to test for execinfo.h before using it and not depending on just
+  Linux for that (GLIBC on other systems for example). Closes #94572.
+
+  11 May 2005; Jason Wever <weeve@gentoo.org> xine-ui-0.99.2.ebuild:
+  Stable on SPARC wrt bug #91092.
+
+  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xine-ui-0.99.3-r1.ebuild:
+  Added to ~hppa.
+
+  03 May 2005; Jan Brinkmann <luckyduck@gentoo.org> xine-ui-0.99.3.ebuild:
+  stable on amd64 and x86
+
+  02 May 2005; David Holm <dholm@gentoo.org> xine-ui-0.99.3-r1.ebuild:
+  Added to ~ppc.
+
+  01 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/preserve-CFLAGS-0.9.23.diff, -files/preserve-CFLAGS-0.99.1.diff,
+  -files/preserve-CFLAGS-0.99.2.diff, -files/implicit-config.patch,
+  -files/preserve-CFLAGS.diff, -files/symlink-bug.patch,
+  -files/true-false.patch, -files/xine.desktop,
+  -files/xine-ui-configure.patch, -files/xine-ui-configure-checks.patch,
+  -files/xine-ui-gcc4.patch, -files/xine-ui-gentoo.diff,
+  -xine-ui-0.9.21-r1.ebuild, -xine-ui-0.9.22-r1.ebuild,
+  -xine-ui-0.9.22-r2.ebuild, -xine-ui-0.9.23-r1.ebuild,
+  xine-ui-0.9.23-r2.ebuild, xine-ui-0.99.1.ebuild, xine-ui-0.99.2.ebuild,
+  xine-ui-0.99.3_pre20041022.ebuild, xine-ui-0.99.3_pre20041022-r1.ebuild,
+  xine-ui-0.99.3.ebuild, xine-ui-0.99.3-r1.ebuild:
+  Removed old versions and orphan files. Moved all the patches into patch
+  tarballs.
+
+  22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xine-ui-gcc4.patch, xine-ui-0.99.3-r1.ebuild:
+  Added patch to compile on gcc4, fixes #89936.
+
+  16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xine-ui-0.99.3-r1.ebuild:
+  modified autotool usage, fixes #88750
+
+*xine-ui-0.99.3-r1 (11 Apr 2005)
+
+  11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  +xine-ui-0.99.3-r1.ebuild:
+  Applied the cleanup patch from Diego Pettenò <dgp85@users.sourceforge.net> to
+  0.99.3, fixes #87439. updated maintainer information, chriswhite is retired.
+  :(
+
+*xine-ui-0.99.3_pre20041022-r1 (29 Mar 2005)
+
+  29 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/xine-ui-configure-checks.patch, +files/xine-ui-desktop-fixes.patch,
+  +xine-ui-0.99.3_pre20041022-r1.ebuild:
+  Fixed bug #58157 (xine-ui desktop / depend fixes). Thanks to Diego for the
+  ebuild.
+
+  29 Mar 2005; Chris White <chriswhite@gentoo.org> xine-ui-0.9.23-r2.ebuild,
+  xine-ui-0.99.3_pre20041022.ebuild:
+  Fixed bug #54273 with bad aalib DEPEND atom.
+
+  27 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/xine.desktop, xine-ui-0.99.3.ebuild:
+  Fix menu item in gnome2.
+
+  17 Feb 2005; Markus Rothe <corsair@gentoo.org> xine-ui-0.99.3.ebuild:
+  Stable on ppc64
+
+  04 Jan 2005; Hardave Riar <hardave@gentoo.org> xine-ui-0.99.3.ebuild:
+  Added ~mips keyword.
+
+*xine-ui-0.99.3 (27 Dec 2004)
+
+  27 Dec 2004; Chris White <chriswhite@gentoo.org> +xine-ui-0.99.3.ebuild:
+  Bump to version 0.99.3. This closes bug #75359. Thanks to James Stockton for
+  the ebuild submission.
+
+*xine-ui-0.99.3_pre20041022 (23 Oct 2004)
+
+  23 Oct 2004; Chris White <chriswhite@gentoo.org>
+  +xine-ui-0.99.3_pre20041022.ebuild:
+  Created a cvs snapshot ebuild as per bug #64693. This should help fix a few
+  bugs hanging around xine-ui until 0.99.3 gets out.
+
+  05 Oct 2004; Jason Wever <weeve@gentoo.org> xine-ui-0.99.2.ebuild:
+  Added ~sparc keyword.
+
+  01 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  -xine-ui-0.9.13-r1.ebuild:
+  Removing because xline-lib-0.9.13 is outdated.
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> xine-ui-0.99.2.ebuild:
+  stable (ish) on ppc64, bug #55076
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> :
+  Version bump to 0.99.2.  Added Diego Pettenò's updated CFLAGS preserve patch.
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Changing herd to media-video.  Added myself as mantainer.
+
+  29 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> xine-ui-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xine-ui-0.99.1 (07 Jun 2004)
+
+  07 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> xine-ui-0.99.1.ebuild,
+  files/preserve-CFLAGS-0.99.1.diff:
+  Version bump, had to adjust the preserve-cflags patch and remove the
+  implicit-config and symlink-bug patches (should be included upstream).
+
+  07 May 2004; Josh Grebe <squash@gentoo.org> xine-ui-0.9.23-r2.ebuild:
+  Stable on sparc
+
+  26 Apr 2004; Brandon Hale <tseng@gentoo.org> xine-ui-0.9.23-r2.ebuild:
+  Stable on x86.
+
+  26 Apr 2004; David Holm <dholm@gentoo.org> xine-ui-0.9.23-r2.ebuild:
+  Stable on ppc.
+
+  19 Apr 2004; Travis Tilley <lv@gentoo.org> xine-ui-0.9.23-r2.ebuild:
+  marked stable on amd64
+
+*xine-ui-0.9.23-r2 (19 Apr 2004)
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> xine-ui-0.9.23-r2.ebuild,
+  files/implicit-config.patch:
+  Adding the security patch from bug #48108 and making the aalib dependency
+  optional (bug #38979).
+
+  14 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> xine-ui-0.9.23-r1.ebuild:
+  purging xine-bugreport from .23 as well
+
+*xine-ui-0.9.22-r2 (14 Apr 2004)
+
+  14 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> +xine-ui-0.9.22-r2.ebuild:
+  More fixes for that same bug, the original file was distributed with bogus
+  timestamps and included a file that should not have been in there as it gets
+  created via symlink in the build process.
+
+  14 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> files/symlink-bug.patch:
+  Bug 45448 - symlink-bug.patch tried to patch a file as well as the symlink to
+  itself
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.13-r1.ebuild,
+  xine-ui-0.9.21-r1.ebuild, xine-ui-0.9.23-r1.ebuild, files/symlink-bug.patch:
+  now it should install correctly.
+
+  13 Apr 2004; <tester@gentoo.org> xine-ui-0.9.22-r1.ebuild:
+  Fixed net-misc/curl dependency
+
+*xine-ui-0.9.23-r1 (13 Apr 2004)
+*xine-ui-0.9.21-r1 (13 Apr 2004)
+
+  13 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> xine-ui-0.9.13-r1.ebuild,
+  xine-ui-0.9.13.ebuild, xine-ui-0.9.21-r1.ebuild, xine-ui-0.9.21.ebuild,
+  xine-ui-0.9.22-r1.ebuild, xine-ui-0.9.22.ebuild, xine-ui-0.9.23-r1.ebuild,
+  xine-ui-0.9.23.ebuild, files/symlink-bug.patch:
+  Adding the patch for bug #45448 to every version in portage (symlink/tmpfile
+  bug). Bumped revisions, removed unpatched versions.
+
+  07 Apr 2004; Aron Griffis <agriffis@gentoo.org> xine-ui-0.9.23.ebuild:
+  Add ~alpha per bug 46903
+
+  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add true/false patch #40809 by Sven Wegener.
+
+  14 Jan 2004; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.23.ebuild:
+  need xine-lib-1_rc3
+
+  29 Dec 2003; Jason Wever <weeve@gentoo.org> xine-ui-0.9.23.ebuild:
+  So I was sitting there one day, when a ~sparc keyword fell out of the sky and
+  into my ebuild.
+
+*xine-ui-0.9.23 (29 Dec 2003)
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.23.ebuild,
+  files/preserve-CFLAGS-0.9.23.diff:
+  Version bumped.
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.22.ebuild:
+  marking x86 stable
+
+  01 Nov 2003; Daniel Robbins <drobbins@gentoo.org> xine-ui-0.9.22.ebuild:
+  Added fix to preserve CFLAGS set by user on x86, rather than force (somewhat
+  outdated/non-optimal) hard-coded CFLAGS.
+  
+  31 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.21.ebuild,
+  xine-ui-0.9.22.ebuild: doesn't work without aalib.
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.13.ebuild,
+  xine-ui-0.9.21.ebuild, xine-ui-0.9.22.ebuild:
+  added RESTRICT="nomirror"
+
+  11 Aug 2003; Jason Wever <weeve@gentoo.org> xine-ui-0.9.21.ebuild:
+  Added ~sparc to keywords.
+
+  29 Jun 2003; Luca Barbato <lu_zero@gentoo.org> xine-ui-0.9.21.ebuild:
+  unmasked in order to follow xine-ui
+  
+  29 Apr 2003; Brandon Low <lostlogic@gentoo.org> xine-ui-0.9.10-r1.ebuild,
+  xine-ui-0.9.10-r1.ebuild, xine-ui-0.9.12-r1.ebuild,
+  xine-ui-0.9.12-r1.ebuild:
+  Remove unneeded cruft
+
+*xine-ui-0.9.22 (07 Aug 2003)
+
+  07 Aug 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*xine-ui-0.9.21 (18 May 2003)
+
+  18 May 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*xine-ui-0.9.20 (25 Mar 2003)
+
+  15 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Marking stable on x86.
+
+  25 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.
+
+*xine-ui-0.9.19 (09 Mar 2003)
+
+  12 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Making use of the new "lirc" USE flag.
+
+  09 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  New version.
+
+*xine-ui-0.9.18 (30 Jan 2003)
+
+  12 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Making use of the new "lirc" USE flag.
+
+  30 Jan 2003; Arcady Genkin <agenkin@gentoo.org> :
+  New version.
+
+*xine-ui-0.9.17 (03 Jan 2003)
+
+  12 Mar 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Making use of the new "lirc" USE flag.
+
+  03 Jan 2003; Arcady Genkin <agenkin@gentoo.org> :
+  New version.
+  Added app-misc/lirc to dependencies.
+
+*xine-ui-0.9.16 (24 Dec 2002)
+
+  24 Dec 2002; Arcady Genkin <agenkin@gentoo.org> :
+  New version.
+
+*xine-ui-0.9.15 (28 Nov 2002)
+
+  28 Nov 2002; Arcady Genkin <agenkin@gentoo.org> xine-ui-0.9.15.ebuild :
+  New version.
+	
+*xine-ui-0.9.10-r1 (06 Aug 2002)
+
+  06 Aug 2002; Seemant Kulleen <seemant@gentoo.org> xine-ui-0.9.10-r1.ebuild:
+
+  Resurrected because it is the only ppc compatible version atm.
+
+*xine-ui-0.9.13 (06 Aug 2002)
+
+  17 Dec 2002; Arcady Genkin <agenkin@gentoo.org> xine-ui-0.9.13.ebuild :
+  Dependency fixed for xine-lib-0.9.13.
+
+  01 Dec 2002; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.13.ebuild :
+  Updated SRC_URI to pull from SF mirrors. 
+
+  12 Aug 2002; mark Guertin <gerk@gentoo.org> xine-ui-0.9.13.ebuild :
+  Added ppc to keywords
+
+  06 Aug 2002; Brandon Low <lostlogic@gentoo.org> xine-ui-0.9.13.ebuild:
+
+  New xine version, enjoy.
+
+*xine-ui-0.9.12-r1 (31 Jul 2002)
+
+  31 Jul 2002; Brandon Low <lostlogic@gentoo.org> xine-ui-0.9.12-r1.ebuild:
+
+  Remove the configure script mangling of -march and -mcpu.
+
+*xine-ui-0.9.12 (23 Jun 2002)
+
+  23 Jun 2002; Brandon Low <lostlogic@gentoo.org> xine-ui-0.9.12.ebuild:
+
+  Another new release from our friendly release crazy xine people.
+  According to the xine people here is the changelog, enjoy:
+
+  * demux_ts fixes for ATSC streams
+  * configurable size of avi subtitles
+  * fixed bug in libsputext that caused subtitle flashing
+  * update win32 codec loading code
+  * use directshow filter to decode msmpeg4 v1/v2
+  * fixed logo file name extension
+  * fixed german i18n files
+
+*xine-ui-0.9.11 (21 Jun 2002)
+
+  21 Jun 2002; Seemant Kulleen <seemant@gentoo.org> xine-ui-0.9.11.ebuild :
+
+  Added aalib as an optional dependency -- no revision bump.
+
+*xine-ui-0.9.11 (20 Jun 2002)
+
+  20 Jun 2002; Arcady Genkin <agenkin@thpoon.com> xine-ui-0.9.11.ebuld :
+
+  Update to version 0.9.11.
+
+*xine-ui-0.9.10-r1 (16 Jun 2002)
+
+  16 Jun 2002; Brandon Low <lostlogic@gentoo.org> xine-ui-0.9.10-r1.ebuild
+
+  Added gcc-3.1 support, ensure that DirectFB really gets diabled, again,
+  gcc-3.1 users will not be able to use DirectFB.
+
+*xine-ui-0.9.9-r2 (16 Jun 2002)
+
+  16 Jun 2002; Brandon Low <lostlogic@gentoo.org> xine-ui-0.9.9-r2.ebuild
+
+  Turn off directfb for real if it isn't in use, and also patch this
+  punk a little bit so that it works with gcc-3.1 (LDFLAGS issue)
+
+  gcc-3.1 users at this time will not be able to use directfb with xine, 
+  hopefully this will be resolved in the near future...
+
+*xine-ui-0.9.9-r1 (31 May 2002)
+
+  31 May 2002; Seemant Kulleen <seemant@gentoo.org>
+  xine-ui-gentoo-extra.tar.bz2 (distfiles) :
+
+  Updated the directfb stuff from xine's cvs, so it will now compile with
+  DirectFB-0.9.10
+
+*xine-ui-0.9.10 (26 May 2002)
+
+  26 May 2002; Arcady Genkin <agenkin@thpoon.com> xine-ui-0.9.10.ebuld :
+
+  Update to version 0.9.10.
+
+*xine-ui-0.9.9-r1 (1 May 2002)
+
+  1 May 2002; Seemant Kulleen <seemant@gentoo.org> xine-ui-0.9.9-r1.ebuild
+  files/digest-xine-ui-0.9.9-r1 xine-ui-gentoo-extra.tar.bz2 (distfiles) :
+
+  For some reason, upstream forgot to package all the necessary files for
+  DirectFB support.  This would have been one thing if we could have 
+  configured to disable that support, but DirectFB is autodetected.  So, the
+  tarball on the ibiblio mirror contains those files as grabbed from xine-ui's
+  cvs repository (where they have not been altered in months).
+
+*xine-ui-0.9.9 (29 Apr 2002)
+
+*xine-ui-0.9.7-r3 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> xine-ui-0.9.7-r3.ebuild :
+  
+  Compile against latest libpng
+
+
+*xine-ui-0.9.7-r2 (12 Mar 2002)
+  
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog :
+	
+  Added checking of nls in USE toggles.  Also added checking of gnome in 
+  USE toggles to have xine-ui use ORBit.  However, I had initially done
+  use gnome || enable ORBit instead of &&.  Found it thanks to supox.
+  OK no this still does not work.  ORBit support in xine seems questionable, at
+  best.  I am commenting that stuff out in the ebuild until I can find some
+  answers about it.
+
+  19 Feb 2002; M.Schlemmer <azarah@gentoo.org> xine-ui-0.9.8-r1.ebuild :
+
+  Fix docs not installing in /usr/share/doc/${PF}.
 
 *xine-ui-0.9.7 (1 Feb 2002)
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index d0859f2b948a..2fa229376d41 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,13 +1,18 @@
-MD5 129b5fc538b71cca1c96f6548ca32409 xine-ui-0.9.19.ebuild 1527
-MD5 6d7a6e402df823b6b12329209c9f60ef xine-ui-0.9.20.ebuild 1525
-MD5 660619e1f7df13e6a6202da3c6f13ce5 xine-ui-0.9.18.ebuild 1527
-MD5 855f49338d1e52624f7172851b794f49 xine-ui-0.9.13.ebuild 1648
-MD5 e6e1d1b5358ac05326abdca9e4bb55b6 xine-ui-0.9.17.ebuild 1600
-MD5 bb13edb4965627ae6a8105090697aa88 ChangeLog 5832
-MD5 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13 67
-MD5 d97c3a1afdae19b431b39cbe2cef68a2 files/digest-xine-ui-0.9.17 67
-MD5 94a5ff9dfcf29a33ead73ed93c88f379 files/digest-xine-ui-0.9.18 67
-MD5 fb4046f995f89e17ad6a5f09210509c8 files/digest-xine-ui-0.9.19 67
-MD5 bfbeeeb439fc717534686e390b84b9d3 files/digest-xine-ui-0.9.20 67
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
-MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d02cfab58e1e82eae7347914ec9dc750 ChangeLog 16567
+MD5 609a90c35f25d57077d7e7eaf94aa509 files/digest-xine-ui-0.99.3 135
+MD5 21319eb55b4549ab5e5cc6aeb2f51649 files/digest-xine-ui-0.99.3-r1 135
+MD5 39002a0b13bd6e79fb6b863e93a3bcc6 files/digest-xine-ui-0.99.4-r3 136
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 c6ef18074784a9f95fdd05a782e19a0c xine-ui-0.99.3-r1.ebuild 1828
+MD5 20edf818b8dafe82c8aad59ecb3156cf xine-ui-0.99.3.ebuild 1596
+MD5 3aae3388cab7a00a6da5a1f63ce6061d xine-ui-0.99.4-r3.ebuild 2168
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbQ/0CRZPokWLroQRApHUAKDIUvweqCJQOffIMLMJI+kqZFvCcQCeJbfa
+2x/xFjnxz5d5LLR0TIyjWTE=
+=l6WJ
+-----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.3 b/media-video/xine-ui/files/digest-xine-ui-0.99.3
index 72b1cde75355..05af54e0eb17 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.99.3
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.3
@@ -1 +1,2 @@
 MD5 aa7805a93e511e3d67dc1bf09a71fcdd xine-ui-0.99.3.tar.gz 2610080
+MD5 831cc89e82107cf5289726e827d9a091 xine-ui-patches-1.tar.bz2 2323
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1 b/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1
index 72b1cde75355..d9408411559f 100644
--- a/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.3-r1
@@ -1 +1,2 @@
 MD5 aa7805a93e511e3d67dc1bf09a71fcdd xine-ui-0.99.3.tar.gz 2610080
+MD5 bd4b8d497ae56c968d1efedbacbf565f xine-ui-patches-2.tar.bz2 2670
diff --git a/media-video/xine-ui/metadata.xml b/media-video/xine-ui/metadata.xml
index 1cadc2e4ec21..d9df1878d8e2 100644
--- a/media-video/xine-ui/metadata.xml
+++ b/media-video/xine-ui/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>video</herd>
-<maintainer>
-  <email>media-video@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild b/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild
index 815d335a2045..b3a7f1be6ed8 100644
--- a/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild,v 1.1 2005/04/11 14:53:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 inherit eutils
 
+PATCHLEVEL="2"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="X nls lirc aalib libcaca readline curl ncurses"
 
 DEPEND="media-libs/libpng
@@ -27,15 +29,17 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Detects CFLAGS set in make.conf without this patch
-	#epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}
 
-	epatch ${FILESDIR}/true-false.patch
-	epatch ${FILESDIR}/${PN}-configure-checks.patch
-	epatch ${FILESDIR}/${PN}-desktop-fixes.patch
-	./autogen.sh
+	export WANT_AUTOCONF=2.5
+	export WANT_AUTOMAKE=1.7
+	aclocal -I m4 || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake -afc || die "automake failed"
+	autoconf || die "autoconf failed"
+	libtoolize --copy --force
 
-	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib :" src/xitk/Makefile.in
+	sed -i -e "s:LDFLAGS =:LDFLAGS = -L/lib :" src/xitk/Makefile.in
 }
 
 src_compile() {
@@ -58,7 +62,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} docdir=/usr/share/doc/${PF} docsdir=/usr/share/doc/${PF} install || die
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 
 	for res in 16 22 32 48; do
 		insinto /usr/share/icons/hicolor/${res}x${res}/apps
diff --git a/media-video/xine-ui/xine-ui-0.99.3.ebuild b/media-video/xine-ui/xine-ui-0.99.3.ebuild
index 33a295518626..38e3f1768a2d 100644
--- a/media-video/xine-ui/xine-ui-0.99.3.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.3.ebuild
@@ -1,16 +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-video/xine-ui/xine-ui-0.99.3.ebuild,v 1.1 2004/12/27 04:51:21 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.3.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 inherit eutils
 
+PATCHLEVEL="1"
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc"
+KEYWORDS="x86 amd64 ppc64 ~sparc ~mips"
 IUSE="X nls directfb lirc aalib"
 
 DEPEND="media-libs/libpng
@@ -26,10 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Detects CFLAGS set in make.conf without this patch
-	#epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
-
-	epatch ${FILESDIR}/true-false.patch
+	epatch ${WORKDIR}/${PV}/01_all_true-false.patch
 	use directfb || sed -i "s:dfb::" src/Makefile.in
 	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib :" src/xitk/Makefile.in
 }
@@ -51,6 +50,10 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} docdir=/usr/share/doc/${PF} docsdir=/usr/share/doc/${PF} install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	rm ${D}/usr/share/xine/desktop/xine.desktop
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	insinto /usr/share/applications
+	doins ${WORKDIR}/${PV}/xine.desktop
 }
diff --git a/media-video/xine-ui/xine-ui-0.99.4-r3.ebuild b/media-video/xine-ui/xine-ui-0.99.4-r3.ebuild
index 15453df429e2..b42eb92e14af 100644
--- a/media-video/xine-ui/xine-ui-0.99.4-r3.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r3.ebuild,v 1.1 2005/09/14 11:06:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:30 chriswhite Exp $
 
 inherit eutils autotools
 
diff --git a/media-video/xiron/ChangeLog b/media-video/xiron/ChangeLog
index 879cffdda151..c74390b05f0f 100644
--- a/media-video/xiron/ChangeLog
+++ b/media-video/xiron/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/xiron
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xiron/ChangeLog,v 1.1 2004/07/28 16:41:48 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xiron/ChangeLog,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xiron-0.1.1.ebuild:
+  Don't install COPYING and INSTALL files.
+
+  19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.  Taking over as maintainer.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> xiron-0.1.1.ebuild:
+  Added to ~ppc.
 
 *xiron-0.1.1 (28 Jul 2004)
 
diff --git a/media-video/xiron/Manifest b/media-video/xiron/Manifest
index a7dd81a4884f..7fc10984908a 100644
--- a/media-video/xiron/Manifest
+++ b/media-video/xiron/Manifest
@@ -1,2 +1,14 @@
-MD5 a2650b0fbd9f35c112b470e0efe6d76d xiron-0.1.1.ebuild 865
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c61149908d6a510c7c2f407b05175b1 xiron-0.1.1.ebuild 856
+MD5 a9f14f2bcc972922e6c9940e7cbc0a87 ChangeLog 768
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 6fbc44ae5130435f224c3cce9433ec0b files/digest-xiron-0.1.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGi6ij5H05b2HAEkRAnyWAJ4lGvF0AQ8lEoYwn/Fd3pPapl2LeACcDZCU
+uJaHb6p9t4ilN8AQ3jVPAdg=
+=5AYu
+-----END PGP SIGNATURE-----
diff --git a/media-video/xiron/metadata.xml b/media-video/xiron/metadata.xml
index 6fb162be6d97..d9df1878d8e2 100644
--- a/media-video/xiron/metadata.xml
+++ b/media-video/xiron/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-video</herd>
-<maintainer>
-  <email>chriswhite@gentoo.org</email>
-</maintainer>
+<herd>video</herd>
 </pkgmetadata>
diff --git a/media-video/xiron/xiron-0.1.1.ebuild b/media-video/xiron/xiron-0.1.1.ebuild
index 6bb661776041..3de93f35cee9 100644
--- a/media-video/xiron/xiron-0.1.1.ebuild
+++ b/media-video/xiron/xiron-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xiron/xiron-0.1.1.ebuild,v 1.1.1.1 2005/11/30 09:57:29 chriswhite Exp $
 
 DESCRIPTION="xiron is a rapid development framework to build multimedia frontends for the xine media playing library"
 HOMEPAGE="http://xiron.sourceforge.net/"
@@ -13,7 +13,7 @@ DEPEND=">=media-libs/xine-lib-1_beta8
 IUSE=" lirc"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 SRC_URI="mirror://sourceforge/xiron/${P}.tar.gz"
 
@@ -33,5 +33,5 @@ src_install() {
 		docsdir=/usr/share/doc/${PF} \
 		install || die
 
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-video/xmovie/ChangeLog b/media-video/xmovie/ChangeLog
index b7023590d997..006e65a84680 100644
--- a/media-video/xmovie/ChangeLog
+++ b/media-video/xmovie/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for media-video/xmovie
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/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-video/xmovie/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  15 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/xmovie-gcc3-gentoo.patch, -files/xmovie-1.8-gcc3.3.patch,
+  xmovie-1.8-r4.ebuild:
+  Moved using toolchain-funcs. Removed the two patches and uploaded on a site
+  so to avoid having 60KB worth of patches in cvs.
+
+*xmovie-1.9.12 (17 Mar 2004)
+
+  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> xmovie-1.9.12.ebuild:
+  New version
+
+  17 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> xmovie-1.8-r3.ebuild,
+  xmovie-1.8-r4.ebuild, files/xmovie-1.8-gcc3.3.patch:
+  Fixing compile error with gcc 3.3, patch by brandy in bug #32965
+
+*xmovie-1.8-r4 (21 Oct 2002)
+
+  09 Feb 2003; Matthew Kennedy <mkennedy@gentoo.org> xmovie-1.8-r4.ebuild,
+  ChangeLog :
+
+  Conditionally apply the gcc3 patch. resolves bug 13580.
+
+  21 Oct 2002; Matthew Kennedy <mkennedy@gentoo.org> xmovie-1.8-r4,
+  ChangeLog, files/digest-xmovie-1.8-r4, files/xmovie-gcc3-gentoo.patch :
+
+  Patch to compilation under GCC3.2. Thanks to Joshua Gentry of Bug
+  #7227.
+
+*xmovie-1.8-r3 (13 Feb 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*xmovie-1.8-r2 (11 Apr 2002)
+  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
+  Update libpng dependencies    
+
+*xmovie-1.8-r2 (27 Mar 2002)
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xmovie-1.8-r2.ebuild :
+
+  HTML documentation is not gzipped.
 
 *xmovie-1.8-r1 (1 Feb 2002)
 
diff --git a/media-video/xmovie/Manifest b/media-video/xmovie/Manifest
index e69de29bb2d1..515a1749cc22 100644
--- a/media-video/xmovie/Manifest
+++ b/media-video/xmovie/Manifest
@@ -0,0 +1,6 @@
+MD5 dd85361ddb8dac7b321997f8311a3dac ChangeLog 2131
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 fc8de7742c929a2cc9127c8479aa45eb xmovie-1.8-r4.ebuild 1158
+MD5 3d334ce14fefb2997fb626bb6067133b xmovie-1.9.12.ebuild 680
+MD5 2699627543904ffef29d8faa3df102e7 files/digest-xmovie-1.8-r4 198
+MD5 c4f9c1cb5cbeafdb4d6af7329eab26a9 files/digest-xmovie-1.9.12 71
diff --git a/media-video/xmovie/files/digest-xmovie-1.8-r4 b/media-video/xmovie/files/digest-xmovie-1.8-r4
index 169bced7bd86..49eecb371c71 100644
--- a/media-video/xmovie/files/digest-xmovie-1.8-r4
+++ b/media-video/xmovie/files/digest-xmovie-1.8-r4
@@ -1 +1,3 @@
 MD5 cffbbc1ed8031375a91dce43759c5c65 xmovie-1.8.tar.gz 4692906
+MD5 512cf8d4e2a29820295f602c0289683e xmovie-gcc3-gentoo.patch 35110
+MD5 401c10db71e32a6ff3ec7d5718624d6a xmovie-1.8-gcc3.3.patch 18050
diff --git a/media-video/xmovie/xmovie-1.8-r4.ebuild b/media-video/xmovie/xmovie-1.8-r4.ebuild
index 0c2be49d2c32..85ce066b6397 100644
--- a/media-video/xmovie/xmovie-1.8-r4.ebuild
+++ b/media-video/xmovie/xmovie-1.8-r4.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r4.ebuild,v 1.1 2002/10/21 08:56:21 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.8-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+inherit toolchain-funcs eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A Player for MPEG and Quicktime movies"
-SRC_URI="http://heroinewarrior.com/${P}.tar.gz"
+SRC_URI="http://heroinewarrior.com/${P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/xmovie-gcc3-gentoo.patch
+	http://digilander.libero.it/dgp85/gentoo/xmovie-1.8-gcc3.3.patch"
 HOMEPAGE="http://heroines.sourceforge.net/"
 
 RDEPEND="virtual/x11
@@ -13,6 +16,7 @@ RDEPEND="virtual/x11
 
 DEPEND="${RDEPEND}
 	>=dev-lang/nasm-0.98"
+IUSE="mmx"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,14 +24,20 @@ KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
-	# gcc3.2 fix (from bug #7227)
-	cd ${S} && patch -p1 <${FILESDIR}/xmovie-gcc3-gentoo.patch || die 
+	cd ${S}
+	if [ `gcc-major-version` = '3' ] ;
+	then
+		# gcc3.2 fix (from bug #7227)
+		epatch ${DISTDIR}/xmovie-gcc3-gentoo.patch
+		# gcc 3.3 fix from bug #32965
+		epatch ${DISTDIR}/xmovie-1.8-gcc3.3.patch
+	fi
 }
 
 src_compile() {
 	local myconf
 	use mmx || myconf="${myconf} --no-mmx"
-    
+
 	./configure ${myconf} || die
 	emake || die
 
@@ -35,9 +45,9 @@ src_compile() {
 
 src_install () {
 
-    into /usr
-    dobin xmovie/`uname -m`/xmovie
-    dodoc README
-    dohtml docs/*.html
+	into /usr
+	dobin xmovie/`uname -m`/xmovie
+	dodoc README
+	dohtml docs/*.html
 
 }
diff --git a/media-video/xmovie/xmovie-1.9.12.ebuild b/media-video/xmovie/xmovie-1.9.12.ebuild
index 41900240fd1f..ee511785f0f4 100644
--- a/media-video/xmovie/xmovie-1.9.12.ebuild
+++ b/media-video/xmovie/xmovie-1.9.12.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-video/xmovie/xmovie-1.9.12.ebuild,v 1.1 2004/03/17 16:04:39 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.9.12.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 DESCRIPTION="A Player for MPEG and Quicktime movies"
 SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2"
diff --git a/media-video/xmps/ChangeLog b/media-video/xmps/ChangeLog
index e42512d1eef1..5d68de1dadd7 100644
--- a/media-video/xmps/ChangeLog
+++ b/media-video/xmps/ChangeLog
@@ -1,9 +1,43 @@
 # ChangeLog for media-video/xmps
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/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-video/xmps/ChangeLog,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+  03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmps-0.2.0-r1.ebuild,
+  xmps-0.2.0-r2.ebuild, xmps-0.2.0-r3.ebuild:
+  Don't install COPYING file.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  09 Jun 2003; <msterret@gentoo.org> xmps-0.2.0-r2.ebuild,
+  xmps-0.2.0-r3.ebuild:
+  DEPEND on sed >= 4
+
+*xmps-0.2.0-r3 (04 Mar 2003)
+
+  19 Apr 2003; Brandon Low <lostlogic@gentoo.org> Manifest,
+  xmps-0.2.0-r2.ebuild, xmps-0.2.0-r3.ebuild:
+  Switch to sed -i -e, and mark -r2 and -r3 stable
+
+  04 Mar 2003; Jay Pfeifer <pfeifer@gentoo.org> xmps-0.2.0-r3.ebuild :
+
+  Fixed compile issue in motion_comp.c.
+  
+  Created patch xmps-0.2.0_motion_comp.c.gentoo.diff
+  
+  Closed bug #2822.
+
+*xmps-0.2.0-r2 (23 Oct 2002)
+
+  23 Oct 2002; Brandon Low <lostlogic@gentoo.org> xmps-0.2.0-r2.ebuild:
+
+  Make it come closer to compiling with gcc-3.2, also make it work with db4 only systems.
 
 *xmps-0.2.0-r1 (1 Feb 2002)
 
+  11 Sep 2002; Mark Guertin <gerk@gentoo.org> :
+  set nasm as x86 only dependancy
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/media-video/xmps/Manifest b/media-video/xmps/Manifest
index e47a50bd4c1d..4b452f0103f1 100644
--- a/media-video/xmps/Manifest
+++ b/media-video/xmps/Manifest
@@ -1,8 +1,19 @@
-MD5 b2041eaf11dd033d02e3195e9d1e6419 xmps-0.2.0-r1.ebuild 1012
-MD5 a86115c0266fe928e6c41bbd145ed84b xmps-0.2.0-r3.ebuild 1539
-MD5 0e35d4e5b1e941fd5889db544e33b9a9 ChangeLog 1175
-MD5 01260d1b3c54c9bd212df91ffb93fb52 xmps-0.2.0-r2.ebuild 1374
-MD5 66c622a0dcace048c0f920687025d405 files/xmps-0.2.0_motion_comp.c.gentoo.diff 746
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b55f1f69b089cd8b0aceecdbe6e10f2 ChangeLog 1682
+MD5 65d501eb04f67348063c27b48e7a9fea xmps-0.2.0-r1.ebuild 980
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 cd90f8ffab3db9f07b5863741640036d xmps-0.2.0-r2.ebuild 1267
+MD5 45830156a0274fdf35c5e925c74eab4c xmps-0.2.0-r3.ebuild 1431
+MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r3 62
 MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r1 62
+MD5 66c622a0dcace048c0f920687025d405 files/xmps-0.2.0_motion_comp.c.gentoo.diff 746
 MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r2 62
-MD5 f78b95ebeddd946ba1f7f1447e6560ca files/digest-xmps-0.2.0-r3 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGjDfj5H05b2HAEkRArVSAKCVwNenUVLxakN2XV299hKpci7swwCfTPCf
+yBp0FGNJ6P+70VLJWNg4b5U=
+=hwAY
+-----END PGP SIGNATURE-----
diff --git a/media-video/xmps/files/digest-xmps-0.2.0-r1 b/media-video/xmps/files/digest-xmps-0.2.0-r1
index d82edf0616c6..c1b94a8b8fac 100644
--- a/media-video/xmps/files/digest-xmps-0.2.0-r1
+++ b/media-video/xmps/files/digest-xmps-0.2.0-r1
@@ -1 +1 @@
-MD5 87937db0d26e599003f0e8db4284e16b xmps-0.2.0.tar.gz
+MD5 87937db0d26e599003f0e8db4284e16b xmps-0.2.0.tar.gz 809839
diff --git a/media-video/xmps/metadata.xml b/media-video/xmps/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/xmps/metadata.xml
+++ b/media-video/xmps/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xmps/xmps-0.2.0-r1.ebuild b/media-video/xmps/xmps-0.2.0-r1.ebuild
index 4f2e1f77ccb7..fd117739b66a 100644
--- a/media-video/xmps/xmps-0.2.0-r1.ebuild
+++ b/media-video/xmps/xmps-0.2.0-r1.ebuild
@@ -1,49 +1,47 @@
-# 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-video/xmps/xmps-0.2.0-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
+
+IUSE="nls gnome"
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="X Movie Player System"
-SRC_URI="http://xmps.sourceforge.net/sources/${A}"
+SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
 HOMEPAGE="http://xmps.sourceforge.net"
 
-DEPEND=">=media-libs/smpeg-0.4.1 nls? ( sys-devel/gettext )
-	>=dev-lang/nasm-0.98
-        >=dev-libs/popt-1.5
-        >=x11-libs/gtk+-1.2.10-r4
-	gnome? ( >=gnome-base/gnome-libs-1.4.0.4-r1 )"
+DEPEND="=x11-libs/gtk+-1.2*
+	x86? ( >=dev-lang/nasm-0.98 )
+	>=dev-libs/popt-1.5
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+
+RDEPEND=">=media-libs/smpeg-0.4.4-r1
+	nls? ( sys-devel/gettext )"
 
-RDEPEND=">=media-libs/smpeg-0.4.1
-        >=x11-libs/gtk+-1.2.10-r4
-        >=dev-libs/popt-1.5
-	gnome? ( >=gnome-base/gnome-libs-1.4.0.4-r1 )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 
-    local myopts
-    if [ -n "`use gnome`" ] ; then
-	myopts="--enable-gnome"
-    fi
-    if [ -z "`use nls`" ] ; then
-        myopts="$myopts --disable-nls"
-    fi
-    try ./configure ${myopts} --host=${CHOST} --prefix=/usr
-    cp Makefile Makefile.orig
-    sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
-	Makefile.orig > Makefile
-    try make
+	local myconf
 
-}
+	use gnome && myconf="--enable-gnome"
 
-src_install () {
+	use nls || myconf="${myconf} --disable-nls"
 
-    try make prefix=${D}/usr install
+	econf ${myconf} || die
 
-    dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	cp Makefile Makefile.orig
+	sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
+		Makefile.orig > Makefile
+
+	make || die
 
 }
 
+src_install () {
+
+	einstall || die
 
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
+}
diff --git a/media-video/xmps/xmps-0.2.0-r2.ebuild b/media-video/xmps/xmps-0.2.0-r2.ebuild
index b85b1af027ec..2ecfc9a90e50 100644
--- a/media-video/xmps/xmps-0.2.0-r2.ebuild
+++ b/media-video/xmps/xmps-0.2.0-r2.ebuild
@@ -1,15 +1,15 @@
-# 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-video/xmps/xmps-0.2.0-r2.ebuild,v 1.1 2002/10/23 19:36:19 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 IUSE="nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="X Movie Player System"
 SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
 HOMEPAGE="http://xmps.sourceforge.net"
 
 DEPEND="=x11-libs/gtk+-1.2*
+	>=sys-apps/sed-4
 	x86? ( >=dev-lang/nasm-0.98 )
 	>=dev-libs/popt-1.5
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
@@ -19,7 +19,7 @@ RDEPEND=">=media-libs/smpeg-0.4.4-r1
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_compile() {
 
@@ -32,18 +32,15 @@ src_compile() {
 	econf ${myconf} || die "econf failed"
 
 	for file in `find . -iname "Makefile"`;do
-		mv ${file} ${file}.orig
-		sed -e "s:-Werror::g;s:-ldb1:-ldb:g" \
-			${file}.orig > ${file} || die "sed-fu failed"
+		sed -i -e "s:-Werror::g;s:-ldb1:-ldb:g" \
+			${file} || die "sed-fu failed"
 	done
 
-	mv intl/l10nflist.c intl/l10nflist.c.orig
-	sed -e "s:\(#ifdef HAVE_CONFIG_H\):#define _LIBC 1\n\1:" \
-		intl/l10nflist.c.orig > intl/l10nflist.c
+	sed -i -e "s:\(#ifdef HAVE_CONFIG_H\):#define _LIBC 1\n\1:" \
+		intl/l10nflist.c || die "sed-fu 2 failed"
 
-	mv Makefile Makefile.orig
-	sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
-		Makefile.orig > Makefile
+	sed -i -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
+		Makefile || die "sed-fu 3 failed"
 
 	emake || die "emake failed"
 
@@ -53,6 +50,6 @@ src_install () {
 
 	einstall || die "einstall failed"
 
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 }
diff --git a/media-video/xmps/xmps-0.2.0-r3.ebuild b/media-video/xmps/xmps-0.2.0-r3.ebuild
index f5e0d003ae53..cb6e3905034b 100644
--- a/media-video/xmps/xmps-0.2.0-r3.ebuild
+++ b/media-video/xmps/xmps-0.2.0-r3.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-video/xmps/xmps-0.2.0-r3.ebuild,v 1.1 2003/03/05 01:34:21 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:50 chriswhite Exp $
 
 IUSE="nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="X Movie Player System"
 SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
 HOMEPAGE="http://xmps.sourceforge.net"
 
 DEPEND="=x11-libs/gtk+-1.2*
+	>=sys-apps/sed-4
 	x86? ( >=dev-lang/nasm-0.98 )
 	>=dev-libs/popt-1.5
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
@@ -19,7 +19,7 @@ RDEPEND=">=media-libs/smpeg-0.4.4-r1
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 
 src_unpack() {
@@ -41,18 +41,15 @@ src_compile() {
 	econf ${myconf} || die "econf failed"
 
 	for file in `find . -iname "Makefile"`;do
-		mv ${file} ${file}.orig
-		sed -e "s:-Werror::g;s:-ldb1:-ldb:g" \
-			${file}.orig > ${file} || die "sed-fu failed"
+		sed -i -e "s:-Werror::g;s:-ldb1:-ldb:g" \
+			${file} || die "sed-fu failed"
 	done
 
-	mv intl/l10nflist.c intl/l10nflist.c.orig
-	sed -e "s:\(#ifdef HAVE_CONFIG_H\):#define _LIBC 1\n\1:" \
-		intl/l10nflist.c.orig > intl/l10nflist.c
+	sed -i -e "s:\(#ifdef HAVE_CONFIG_H\):#define _LIBC 1\n\1:" \
+		intl/l10nflist.c || die "sed-fu 2 failed"
 
-	mv Makefile Makefile.orig
-	sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
-		Makefile.orig > Makefile
+	sed -i -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
+		Makefile || die "sed-fu 3 failed"
 
 	emake || die "emake failed"
 
@@ -62,6 +59,6 @@ src_install () {
 
 	einstall || die "einstall failed"
 
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 }
diff --git a/media-video/xvattr/ChangeLog b/media-video/xvattr/ChangeLog
index f06300152ab5..53105d9b7925 100644
--- a/media-video/xvattr/ChangeLog
+++ b/media-video/xvattr/ChangeLog
@@ -1,9 +1,44 @@
 # ChangeLog for media-video/xvattr
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.1 2003/04/24 07:41:15 utx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  28 Jul 2005; David Holm <dholm@gentoo.org> xvattr-1.3-r1.ebuild:
+  Added to ~ppc.
+
+  21 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> xvattr-1.3-r1.ebuild:
+  Marked ~amd64.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+  13 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> xvattr-1.3-r1.ebuild:
+  don't assign depend to rdepend; use generic src_compile; tidy
+
+  13 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> -xvattr-1.3.ebuild:
+  clean older version
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> xvattr-1.3-r1.ebuild,
+  xvattr-1.3.ebuild:
+  Fix use invocation
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xvattr-1.3-r1.ebuild,
+  xvattr-1.3.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+*xvattr-1.3-r1 (27 Aug 2003)
+
+  27 Aug 2003; Stanislav Brabec <utx@gentoo.org> xvattr-1.3-r1.ebuild:
+  Merged with ebuild from Sami Näätänen <sami.naatanen@cs.helsinki.fi> - gtk USE
+  flag (bug #13110).
 
 *xvattr-1.3 (24 Apr 2003)
 
+  25 Apr 2003; Alastair Tse <liquidx@gentoo.org> xvattr-1.3.ebuild:
+  minor touchups
+
   24 Apr 2003; Stanislav Brabec <utx@gentoo.org> xvattr-1.3.ebuild:
   Initial ebuild.
 
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index b44268ee0bcd..756b30c9acc5 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,3 +1,14 @@
-MD5 bbd2eb8cfd9ad4e61864909080b22d54 ChangeLog 419
-MD5 77d4d9b8c35d3025b41728df66212d5c xvattr-1.3.ebuild 641
-MD5 fd84f844012dd8c0aca7748aeaf2797f files/digest-xvattr-1.3 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a87640d6ea0155b9bdb83b53ea7eb1b6 xvattr-1.3-r1.ebuild 1322
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 0c9aceb6a697eeca592d5ae657e99701 ChangeLog 1508
+MD5 fd84f844012dd8c0aca7748aeaf2797f files/digest-xvattr-1.3-r1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1DKLLFUmVNQ7rkRAoQWAKDDPJNxkWiI+MgYoCm2QHqhsnK5oACgjC6h
++/BzfP0bK1Z+MUdjJJSSloI=
+=b/61
+-----END PGP SIGNATURE-----
diff --git a/media-video/xvattr/metadata.xml b/media-video/xvattr/metadata.xml
index ecd91f76579c..1cadc2e4ec21 100644
--- a/media-video/xvattr/metadata.xml
+++ b/media-video/xvattr/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-video</herd>
+<herd>video</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/xvattr/xvattr-1.3-r1.ebuild b/media-video/xvattr/xvattr-1.3-r1.ebuild
index 7b1793a4a605..07c291c93ef7 100644
--- a/media-video/xvattr/xvattr-1.3-r1.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r1.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/media-video/xvattr/xvattr-1.3-r1.ebuild,v 1.1 2003/08/27 16:45:45 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:39 chriswhite Exp $
 
 DESCRIPTION="X11 XVideo Querying/Setting Tool from Ogle project"
-SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
-SLOT=0
+SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
+SLOT=0
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gtk"
-DEPEND="x11-base/xfree
+
+DEPEND="virtual/x11
 	gtk? ( =x11-libs/gtk+-1.2*
-               =dev-libs/glib-1.2* )"
-RDEPEND="${DEPEND}"
+	=dev-libs/glib-1.2* )"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	# If no gtk then modify the necessary parts so that gtk isn't needed anymore
-	if [ -z `use gtk` ]
+	if ! use gtk
 	then
 	    cd ${S}
 	    rm Makefile.in
@@ -30,11 +32,9 @@ src_compile() {
 	    automake
 	    autoconf
 	fi
-	econf || die
-	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING NEWS README
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/media-video/xvid4conf/ChangeLog b/media-video/xvid4conf/ChangeLog
index fd5259ff8d8b..d663416be901 100644
--- a/media-video/xvid4conf/ChangeLog
+++ b/media-video/xvid4conf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/xvid4conf
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvid4conf/ChangeLog,v 1.1 2004/03/31 19:33:10 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvid4conf/ChangeLog,v 1.1.1.1 2005/11/30 09:57:23 chriswhite Exp $
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xvid4conf-1.12.ebuild:
+  Don't install INSTALL file.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> xvid4conf-1.12.ebuild:
+  Trimmed trailing whitespace.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xvid4conf-1.12.ebuild:
+  virtual/glibc -> virtual/libc
 
 *xvid4conf-1.12 (31 Mar 2004)
 
diff --git a/media-video/xvid4conf/Manifest b/media-video/xvid4conf/Manifest
index 7a4123643f29..1f26e23d32c5 100644
--- a/media-video/xvid4conf/Manifest
+++ b/media-video/xvid4conf/Manifest
@@ -1,3 +1,14 @@
-MD5 abdd30f4c5c04ff90cf7e14c86bb6c6a xvid4conf-1.12.ebuild 745
-MD5 f7662db1de75623906ffa6b4aaff362f files/digest-xvid4conf-1.11 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9dbfcd1ad566007075d648287d05022a ChangeLog 726
+MD5 858a6d53921dec0efe222f3652120c6d xvid4conf-1.12.ebuild 643
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 MD5 e61317a49a5ebc5be630a39411601239 files/digest-xvid4conf-1.12 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIv7Uj5H05b2HAEkRAoOeAJ99aQVnicWnl3zrUQVOMEMEyvlo4gCfaJCp
+mFeBIMfRthn0I1J6F16SsCI=
+=LMgr
+-----END PGP SIGNATURE-----
diff --git a/media-video/xvid4conf/xvid4conf-1.12.ebuild b/media-video/xvid4conf/xvid4conf-1.12.ebuild
index 0fb7f6045ef7..59cbf0b99b27 100644
--- a/media-video/xvid4conf/xvid4conf-1.12.ebuild
+++ b/media-video/xvid4conf/xvid4conf-1.12.ebuild
@@ -1,28 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xvid4conf/xvid4conf-1.12.ebuild,v 1.1 2004/03/31 19:33:10 mholzer Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvid4conf/xvid4conf-1.12.ebuild,v 1.1.1.1 2005/11/30 09:57:23 chriswhite Exp $
 
-DESCRIPTION="XviD4conf, a GTK2-configuration dialog for xvid4"
-SRC_URI="http://zebra.fh-weingarten.de/~transcode/xvid4conf/${P}.tar.gz"
+DESCRIPTION="GTK2-configuration dialog for xvid4"
 HOMEPAGE="http://zebra.fh-weingarten.de/~transcode/xvid4conf"
+SRC_URI="http://zebra.fh-weingarten.de/~transcode/xvid4conf/${P}.tar.gz"
 
-DEPEND="virtual/glibc
-	>=x11-libs/gtk+-2.2.4"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa ~ia64"
-
-src_compile() {
-	[ -z "${CC}" ] && export CC="gcc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE=""
 
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc
+	>=x11-libs/gtk+-2.2.4"
 
 src_install() {
 	dodir /usr/{include,lib}
 	einstall || die
 
-	dodoc AUTHORS ChangeLog INSTALL README
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-video/yanc/ChangeLog b/media-video/yanc/ChangeLog
index 4c5f4335cd32..1dae3271d61d 100644
--- a/media-video/yanc/ChangeLog
+++ b/media-video/yanc/ChangeLog
@@ -1,10 +1,33 @@
 # ChangeLog for media-video/yanc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/ChangeLog,v 1.1 2003/06/15 05:58:25 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/ChangeLog,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; :
+  Restore the rest of the ChangeLog. I apparently deleted it in revision 1.4.
+
+  13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
+  Adding missing metadata.xml.
+
+*yanc-0.2.1-r1 (13 Jun 2004)
+
+  13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/yanc-0.2.1-xorg-x11-compat.patch, +yanc-0.2.1-r1.ebuild:
+  Look for /etc/X11/xorg.conf (#47632).
+
+  21 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; yanc-0.2.0.ebuild,
+  yanc-0.2.1.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+*yanc-0.2.1 (12 Oct 2003)
+
+  12 Oct 2003; Bart Lauwers <blauwers@gentoo.org> :
+  Version bump.
 
 *yanc-0.2.0 (14 Jun 2003)
 
   14 Jun 2003; Seemant Kulleen <seemant@gentoo.org> yanc-0.2.0.ebuild:
   Yet Another Nv Configurator. Ebuild submission by: Baptiste SIMON
   <beta@e-glop.net> in bug #14226
-
diff --git a/media-video/yanc/Manifest b/media-video/yanc/Manifest
index 495a1b5a4c44..c2bd67d3e440 100644
--- a/media-video/yanc/Manifest
+++ b/media-video/yanc/Manifest
@@ -1,2 +1,9 @@
-MD5 035cc42c5aaedb6e88611502f1e2c87e yanc-0.2.0.ebuild 1358
+MD5 0fb624ad84eb2547ca29b3342ef64534 ChangeLog 1177
+MD5 d5f37e2cde5f2a095cc69f18b1ab617f metadata.xml 250
+MD5 586e382350b9ea693607db53dbb8d42d yanc-0.2.0.ebuild 1425
+MD5 ef719f9a33d4a94d1c13757239236f97 yanc-0.2.1-r1.ebuild 1505
+MD5 e2df397aa0b71ecbe42cb54610816192 yanc-0.2.1.ebuild 1422
 MD5 47b5f3091491bba33f121b7ffe96eb43 files/digest-yanc-0.2.0 63
+MD5 86918baa28386ca82bfb73e27ba42651 files/digest-yanc-0.2.1 63
+MD5 86918baa28386ca82bfb73e27ba42651 files/digest-yanc-0.2.1-r1 63
+MD5 beb2a52f3d303ba15086a907bf941abd files/yanc-0.2.1-xorg-x11-compat.patch 1669
diff --git a/media-video/yanc/metadata.xml b/media-video/yanc/metadata.xml
index d8a9f4d39e4f..c33f399a2f39 100644
--- a/media-video/yanc/metadata.xml
+++ b/media-video/yanc/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-video</herd>
-<herd>xfree</herd>
+<herd>video</herd>
+<herd>X11-drivers</herd>
 <maintainer>
   <email>media-video@gentoo.org</email>
 </maintainer>
diff --git a/media-video/yanc/yanc-0.2.0.ebuild b/media-video/yanc/yanc-0.2.0.ebuild
index f7b9695b962c..bfbf9d7aee45 100644
--- a/media-video/yanc/yanc-0.2.0.ebuild
+++ b/media-video/yanc/yanc-0.2.0.ebuild
@@ -1,31 +1,27 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/yanc-0.2.0.ebuild,v 1.1 2003/06/15 05:58:25 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/yanc-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
-
-S=${WORKDIR}/${P}
 DESCRIPTION="YanC is a GUI configuration tool for the NVIDIA Accelerated Linux Driver Set."
 HOMEPAGE="http://yanc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/yanc/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="-* ~x86"
+IUSE=""
 
-#
 # As the downloaded package seems to be pre-compiled,
 # the dependances are not clear.
 # TODO: Emerge the real compilable yanc's code
-#
 DEPEND=">=sys-apps/sed-4"
-RDEPEND="x11-base/xfree"
-
+RDEPEND="virtual/x11"
 
 src_compile() {
 	einfo "nothing to compile"
 }
 
-src_install () {
+src_install() {
 	dodir /usr/share/yanc
 	dodir /usr/lib
 	dodir /usr/bin
@@ -42,7 +38,7 @@ src_install () {
 	exeinto /usr/share/yanc
 	doexe yanc
 
-	
+
 	into /usr
 	dobin script/yanc
 	dosed "s:local:share:" /usr/bin/yanc
@@ -52,12 +48,7 @@ src_install () {
 }
 
 pkg_postinst() {
-	einfo ''
-	einfo 'WARNING:'
-	einfo '========'
 	einfo '-> Please create a copy of your XF86Config before you use YanC for the'
 	einfo 'first time, because it is possible that your XF86Config is damaged because of'
 	einfo 'the use of YanC. Then a restart of XFree would be impossible.'
-	einfo ''
-	echo  ''
 }
diff --git a/media-video/yanc/yanc-0.2.1-r1.ebuild b/media-video/yanc/yanc-0.2.1-r1.ebuild
index 333609d75e5f..6f7d3a9145f8 100644
--- a/media-video/yanc/yanc-0.2.1-r1.ebuild
+++ b/media-video/yanc/yanc-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/yanc-0.2.1-r1.ebuild,v 1.1 2004/06/14 00:37:35 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/yanc-0.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/yanc/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 # As the downloaded package seems to be pre-compiled,
 # the dependances are not clear.
diff --git a/media-video/yanc/yanc-0.2.1.ebuild b/media-video/yanc/yanc-0.2.1.ebuild
index 9d6b1a850dc4..82a95cbc49a9 100644
--- a/media-video/yanc/yanc-0.2.1.ebuild
+++ b/media-video/yanc/yanc-0.2.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/media-video/yanc/yanc-0.2.1.ebuild,v 1.1 2003/10/11 23:13:06 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/yanc/yanc-0.2.1.ebuild,v 1.1.1.1 2005/11/30 09:57:43 chriswhite Exp $
 
 DESCRIPTION="YanC is a GUI configuration tool for the NVIDIA Accelerated Linux Driver Set."
 HOMEPAGE="http://yanc.sourceforge.net/"
@@ -9,12 +9,13 @@ SRC_URI="mirror://sourceforge/yanc/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 # As the downloaded package seems to be pre-compiled,
 # the dependances are not clear.
 # TODO: Emerge the real compilable yanc's code
 DEPEND=">=sys-apps/sed-4"
-RDEPEND="x11-base/xfree"
+RDEPEND="virtual/x11"
 
 src_compile() {
 	einfo "nothing to compile"
diff --git a/net-misc/6tunnel/6tunnel-0.10.ebuild b/net-misc/6tunnel/6tunnel-0.10.ebuild
index a1bf9ff5443a..e08df054f362 100644
--- a/net-misc/6tunnel/6tunnel-0.10.ebuild
+++ b/net-misc/6tunnel/6tunnel-0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/6tunnel/6tunnel-0.10.ebuild,v 1.1 2004/11/21 21:04:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/6tunnel/6tunnel-0.10.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="TCP proxy for applications that don't speak IPv6"
@@ -12,17 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~s390"
 DEPEND="virtual/libc"
 
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	dobin 6tunnel
 	doman 6tunnel.1
-	dodoc README CHANGELOG
 }
-
-
-
diff --git a/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild b/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild
index b4cb06c2a0a0..94781de28e3f 100644
--- a/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild
+++ b/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/6tunnel/6tunnel-0.11_rc1.ebuild,v 1.1 2004/11/22 09:18:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/6tunnel/6tunnel-0.11_rc1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="TCP proxy for applications that don't speak IPv6"
@@ -13,15 +13,7 @@ KEYWORDS="~x86 ~s390"
 DEPEND="virtual/libc"
 S=${WORKDIR}/6tunnel-0.11
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	dobin 6tunnel
 	doman 6tunnel.1
 }
-
-
-
diff --git a/net-misc/6tunnel/ChangeLog b/net-misc/6tunnel/ChangeLog
index f1c994ee76e4..3991f4b29b07 100644
--- a/net-misc/6tunnel/ChangeLog
+++ b/net-misc/6tunnel/ChangeLog
@@ -1,9 +1,31 @@
 # ChangeLog for net-misc/6tunnel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/6tunnel/ChangeLog,v 1.1 2002/10/25 18:13:28 hannes Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/6tunnel/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
+
+*6tunnel-0.11_rc1 (22 Nov 2004)
+
+  22 Nov 2004; Daniel Black <dragonheart@gentoo.org> 6tunnel-0.10.ebuild,
+  +6tunnel-0.11_rc1.ebuild:
+  QA fix to the prev version. Version bump too
+
+*6tunnel-0.10 (22 Nov 2004)
+
+  22 Nov 2004; Daniel Black <dragonheart@gentoo.org> -6tunnel-0.09.ebuild,
+  +6tunnel-0.10.ebuild:
+  version bump with lots of fixes. Removed old version cause it is so broken.
+  Bug #71951 refers. Thanks to Grzegorz Kubok <thorgal@rasalom.tl.pl>
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> 6tunnel-0.09.ebuild:
+  change virtual/glibc to virtual/libc
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> 6tunnel-0.09.ebuild:
+  adding s390 keyword
+
+  02 Nov 2002; Hannes Mehnert <hannes@gentoo.org> 6tunnel-0.09.ebuild:
+  marked stable for x86
 
 *6tunnel-0.09 (25 Oct 2002)
 
-  25 Oct 2002; Hannes Mehnert <hannes@gentoo.org> .ebuild,
+  25 Oct 2002; Hannes Mehnert <hannes@gentoo.org> 6tunnel-0.09.ebuild,
   ChangeLog: Initial ebuild. Thanks to kevin@aptbasilicata.it (Maurizio
   Disimino) for submission (#7952).
diff --git a/net-misc/6tunnel/Manifest b/net-misc/6tunnel/Manifest
index e69de29bb2d1..377e79c7c969 100644
--- a/net-misc/6tunnel/Manifest
+++ b/net-misc/6tunnel/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d6f4d74afc8c909f59cd9581684251c9 6tunnel-0.10.ebuild 499
+MD5 f9a558f6e0e08188ca9d562453293c77 6tunnel-0.11_rc1.ebuild 533
+MD5 78bd53078c0f7d64c866fccf6e9d7807 ChangeLog 1175
+MD5 44eb384b283c07b3a4336dd2d3ace579 files/digest-6tunnel-0.10 63
+MD5 4a05bf43a8529501279f1b3afc45e835 files/digest-6tunnel-0.11_rc1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC671AI1lqEGTUzyQRAhdHAJ4rg+PP2rC5SmyzsjvuJye+5plL2QCcCGwI
+0swJe73feENjgPYBs7+Au2Y=
+=6jiW
+-----END PGP SIGNATURE-----
diff --git a/net-misc/LinNeighborhood/ChangeLog b/net-misc/LinNeighborhood/ChangeLog
index 14f39337c162..0571c11b76ad 100644
--- a/net-misc/LinNeighborhood/ChangeLog
+++ b/net-misc/LinNeighborhood/ChangeLog
@@ -1,13 +1,36 @@
 # ChangeLog for net-misc/LinNeighborhood
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
-
-*LinNeighborhood-0.6.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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/ChangeLog,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  LinNeighborhood-0.6.5.ebuild:
+  Stable on ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  LinNeighborhood-0.6.5.ebuild:
+  Add inherit eutils
+
+  29 Dec 2003; Chuck Short <zul@gentoo.org> LinNeighborhood-0.6.5.ebuild,
+  files/linneighborhood-0.6.5-samba301.patch:
+  Added patch so that LinNeighborhood can work with samba-3.0.1. Closes 
+  #36617.
+
+  13 Dec 2003; Chuck Short <zul@gentoo.org> LinNeighborhood-0.6.5.ebuild:
+  Added amd64 keyword.
+  Closes bug #35692
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*LinNeighborhood-0.6.5 (21 Jul 2002)
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> LinNeighborhood-0.6.5.ebuild :
+  set ~ppc in keywords
+
+  21 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  New version, closes bug #5212.
+
+*LinNeighborhood-0.6.4 (01 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> LinNeigborhood-0.6.4.ebuild:
+  Added KEYWORDS, LICENSE, SLOT.
diff --git a/net-misc/LinNeighborhood/LinNeighborhood-0.6.4.ebuild b/net-misc/LinNeighborhood/LinNeighborhood-0.6.4.ebuild
index a0f40b4deb72..356713c447b1 100644
--- a/net-misc/LinNeighborhood/LinNeighborhood-0.6.4.ebuild
+++ b/net-misc/LinNeighborhood/LinNeighborhood-0.6.4.ebuild
@@ -1,37 +1,31 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Joao Schim <joao@schim.net>
-# $HEADER $ 
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/LinNeighborhood-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
+
+IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="LinNeighborhood is a easy to use frontend to samba/NETBios."
 SRC_URI="http://www.bnro.de/~schmidjo/download/${P}.tar.gz"
 HOMEPAGE="http://www.bnro.de/~schmidjo/index.html"
+KEYWORDS="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
 
-DEPEND="	>=x11-libs/gtk+-1.2 net-fs/samba
+DEPEND="	=x11-libs/gtk+-1.2* net-fs/samba
 		nls? ( sys-devel/gettext ) "
 
-RDEPEND="${DEPEND}"
 
 src_compile() {
 
-	local mylibs myopts
+	local myopts
 
 	use nls || myopts="--disable-nls"
 
-	if [ "`use python`" ]
-	then
-		mylibs=`/usr/bin/python-config`
-
-		cp configure configure.orig
-		sed -e 's:PY_LIBS=".*":PY_LIBS="'"$mylibs"'":' configure.orig > configure || die
-	fi
-	
 	./configure --prefix=/usr \
 		--host=${CHOST} \
 		--enable-ipv6 \
 		${myopts} || die
-	
+
 	emake || die
 }
 
diff --git a/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild b/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild
index bb0cf98450f5..4106ff84322c 100644
--- a/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild
+++ b/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild
@@ -1,29 +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/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild,v 1.1 2002/07/21 18:29:01 blizzy Exp $ 
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/LinNeighborhood/LinNeighborhood-0.6.5.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
+
+inherit eutils
+
+IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="LinNeighborhood is a easy to use frontend to samba/NETBios."
 SRC_URI="http://www.bnro.de/~schmidjo/download/${P}.tar.gz"
 HOMEPAGE="http://www.bnro.de/~schmidjo/index.html"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ppc amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="=x11-libs/gtk+-1.2* net-fs/samba
 	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
 
 src_compile() {
 	local myopts
 
+	epatch ${FILESDIR}/linneighborhood-0.6.5-samba301.patch
 	use nls || myopts="--disable-nls"
 
 	./configure --prefix=/usr \
 		--host=${CHOST} \
 		--enable-ipv6 \
 		${myopts} || die
-	
+
 	emake || die
 }
 
diff --git a/net-misc/LinNeighborhood/Manifest b/net-misc/LinNeighborhood/Manifest
index e69de29bb2d1..33271058fd2c 100644
--- a/net-misc/LinNeighborhood/Manifest
+++ b/net-misc/LinNeighborhood/Manifest
@@ -0,0 +1,7 @@
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 2b16adbe21c899c49be1dbfbf04aa4fc ChangeLog 1204
+MD5 46156292a95dde1bda6f4e53eeac52d2 LinNeighborhood-0.6.5.ebuild 923
+MD5 33dca44dcca864e9ea3b0f3228842e27 LinNeighborhood-0.6.4.ebuild 849
+MD5 fd801489fc0ef6d6512116d64f3c0a92 files/linneighborhood-0.6.5-samba301.patch 2593
+MD5 4c3348378d254fdba52a66ba206df4d0 files/digest-LinNeighborhood-0.6.5 73
+MD5 f25e2bd670406bee53f4190151665cb6 files/digest-LinNeighborhood-0.6.4 73
diff --git a/net-misc/LinNeighborhood/files/digest-LinNeighborhood-0.6.4 b/net-misc/LinNeighborhood/files/digest-LinNeighborhood-0.6.4
index 1cef679ecb13..3780459b487d 100644
--- a/net-misc/LinNeighborhood/files/digest-LinNeighborhood-0.6.4
+++ b/net-misc/LinNeighborhood/files/digest-LinNeighborhood-0.6.4
@@ -1 +1 @@
-MD5 6a3379ec90ed261d048c1e89376d3368 LinNeighborhood-0.6.4.tar.gz 389120
+MD5 6a3379ec90ed261d048c1e89376d3368 LinNeighborhood-0.6.4.tar.gz 386582
diff --git a/net-misc/adjtimex/ChangeLog b/net-misc/adjtimex/ChangeLog
index 825d6c412269..c3ff81fedf49 100644
--- a/net-misc/adjtimex/ChangeLog
+++ b/net-misc/adjtimex/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-misc/adjtimex
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.1 2004/01/06 04:13:02 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> adjtimex-1.16-r1.ebuild:
+  Mark 1.16-r1 stable on alpha
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  adjtimex-1.16-r1.ebuild:
+  Stable on x86, 431 days in ~x86.
+
+  19 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> adjtimex-1.16-r1.ebuild:
+  added ~amd64 to KEYWORDS.
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/adjtimex-1.16-pic.patch:
+  bug #70342, patch by solar for hardened to work right.
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  adjtimex-1.16-r1.ebuild:
+  ~alpha keyword, bug 73267.
+
+  01 Aug 2004; David Holm <dholm@gentoo.org> adjtimex-1.16-r1.ebuild:
+  Added to ~ppc.
+
+*adjtimex-1.16-r1 (22 Jul 2004)
+
+  22 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> adjtimex-1.16-r1.ebuild:
+  fix #57952.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> adjtimex-1.16.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> adjtimex-1.16.ebuild:
+  Add inherit eutils
 
 *adjtimex-1.16 (05 Jan 2004)
 
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index 91d09f04a7ba..c235a85476d6 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,2 +1,18 @@
-MD5 ec2eb2d1c1a51e129c96e61ddce1d093 adjtimex-1.16.ebuild 745
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 89628cad98b31ff9c3d6e9b718c28667 ChangeLog 1405
+MD5 d2831b58771c94ba5c8472346576af42 adjtimex-1.16-r1.ebuild 1410
+MD5 b4005173a2d5d68d4a04503503663674 adjtimex-1.16.ebuild 1205
+MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16-r1 136
 MD5 f740d2ecd7c08cc4dee2578c3c0c2557 files/digest-adjtimex-1.16 136
+MD5 644aa729406bc03a2df4f6dc23da298f files/adjtimex.init 687
+MD5 a7a3b52817fb5f425852e1cbc523b485 files/adjtimex-1.16-pic.patch 315
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVG0bJrHF4yAQTrARAugxAKDJePE1Vuru0V+/kWtnhMX4JmJ/TQCdHR6t
+yIxwNeeC4cLB6XS7/OPrsIk=
+=PX2e
+-----END PGP SIGNATURE-----
diff --git a/net-misc/adjtimex/adjtimex-1.16-r1.ebuild b/net-misc/adjtimex/adjtimex-1.16-r1.ebuild
index cf8458744839..27aed8e7bdc9 100644
--- a/net-misc/adjtimex/adjtimex-1.16-r1.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.16-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-misc/adjtimex/adjtimex-1.16-r1.ebuild,v 1.1 2004/07/22 23:39:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 inherit fixheadtails eutils
 
@@ -9,13 +9,14 @@ MY_P="${P/-/_}"
 DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
 DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.diff.gz"
 DEBIAN_SRC="${MY_P}.orig.tar.gz"
-DESCRIPTION="adjtimex - display or set the kernel time variables"
+DESCRIPTION="display or set the kernel time variables"
 HOMEPAGE="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
 SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH}
-		 ${DEBIAN_URI}/${DEBIAN_SRC}"
+	${DEBIAN_URI}/${DEBIAN_SRC}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha ~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
@@ -31,15 +32,11 @@ src_unpack() {
 	done
 	ht_fix_file debian/adjtimexconfig
 	sed -e '/CFLAGS = -Wall -t/,/endif/d' -i Makefile.in
-}
-
-src_compile() {
-	econf || die
-	emake || die
+	epatch ${FILESDIR}/${PN}-1.16-pic.patch
 }
 
 src_install() {
-	dodoc README* COPYING COPYRIGHT ChangeLog
+	dodoc README* ChangeLog
 	doman adjtimex.8 debian/adjtimexconfig.8
 	dosbin adjtimex debian/adjtimexconfig
 	exeinto /etc/init.d
diff --git a/net-misc/adjtimex/adjtimex-1.16.ebuild b/net-misc/adjtimex/adjtimex-1.16.ebuild
index 38870b74521b..cefc9bd9aef6 100644
--- a/net-misc/adjtimex/adjtimex-1.16.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.16.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/net-misc/adjtimex/adjtimex-1.16.ebuild,v 1.1 2004/01/06 04:13:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/adjtimex-1.16.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
-inherit fixheadtails
+inherit fixheadtails eutils
 
 DEBIAN_PV="1"
-DESCRIPTION="adjtimex - display or set the kernel time variables"
+DESCRIPTION="display or set the kernel time variables"
 HOMEPAGE="http://www.ibiblio.org/linsearch/lsms/adjtimex.html"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-${DEBIAN_PV}.diff.gz
-		 mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
-
-S="${WORKDIR}/${P}"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${P/-/_}.orig.tar.gz
@@ -29,13 +28,8 @@ src_unpack() {
 	sed -e '/CFLAGS = -Wall -t/,/endif/d' -i Makefile.in
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	dodoc README* COPYING COPYRIGHT ChangeLog
+	dodoc README* ChangeLog
 	doman adjtimex.8 debian/adjtimexconfig.8
 	dosbin adjtimex debian/adjtimexconfig
 	exeinto /etc/init.d
diff --git a/net-misc/adjtimex/files/adjtimex.init b/net-misc/adjtimex/files/adjtimex.init
index c58ab04e60a6..26ee7d851b41 100644
--- a/net-misc/adjtimex/files/adjtimex.init
+++ b/net-misc/adjtimex/files/adjtimex.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/files/adjtimex.init,v 1.1 2004/01/06 04:13:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/adjtimex/files/adjtimex.init,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DAEMON=adjtimex
 OPTS="--tick ${TICK} --frequency ${FREQ}"
diff --git a/net-misc/aesop/ChangeLog b/net-misc/aesop/ChangeLog
index 45f23eef7aec..1b213023c5ce 100644
--- a/net-misc/aesop/ChangeLog
+++ b/net-misc/aesop/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/aesop
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aesop/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aesop/ChangeLog,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
+
+
+*aesop-0.4 (1 Feb 2002)
+
+  03 Mar 2003; <vladimir@gentoo.org> aesop-0.4.ebuild:
+  Fixed minor problem in KEYWORDS
+
+  6 Jul 2002; Owen Stampflee <owen@gentoo.org> ChangeLog :
+  Added PPC To the KEYWORDS. Fixed headers on ebuild and ChangeLog
+
+*aesop-0.4 (1 Feb 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog :
+  Added LICENSE, KEYWORDS, SLOT.
+ 
 
 *aesop-0.4 (1 Feb 2002)
 
diff --git a/net-misc/aesop/Manifest b/net-misc/aesop/Manifest
index e69de29bb2d1..3d2f5eb7ee2c 100644
--- a/net-misc/aesop/Manifest
+++ b/net-misc/aesop/Manifest
@@ -0,0 +1,3 @@
+MD5 fc000f43fa6130d0cf09d95629b0a827 aesop-0.4.ebuild 1091
+MD5 57ef4499ab33d205068b1e3328182e60 ChangeLog 1020
+MD5 9cec60ee30019d5955468c574a0cfae9 files/digest-aesop-0.4 60
diff --git a/net-misc/aesop/aesop-0.4.ebuild b/net-misc/aesop/aesop-0.4.ebuild
index 1b77e532e82f..b29c055431e2 100644
--- a/net-misc/aesop/aesop-0.4.ebuild
+++ b/net-misc/aesop/aesop-0.4.ebuild
@@ -1,39 +1,37 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aesop/aesop-0.4.ebuild,v 1.1 2002/01/16 01:07:13 blocke Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aesop/aesop-0.4.ebuild,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
+
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Aesop is a TCP-proxy which supports many advanced and powerful features.  Uses encryption and provides a wrapper library for BSD socket API."
 SRC_URI="http://kryptology.org/aesop/download/${P}.tar.gz"
 HOMEPAGE="http://kryptology.org/aesop"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="sys-devel/gcc"
 
 src_compile() {
+	./configure --enable-ipv6 --enable-libaesop --prefix=/usr
 
-  ./configure --enable-ipv6 --enable-libaesop --prefix=/usr
-
-  mv ${S}/src/Rules.make ${S}/src/Rules.make.old
-  sed "s/CFLAG=-O2/CFLAG=${CFLAGS}/" ${S}/src/Rules.make.old > ${S}/src/Rules.make 
-  cat ${S}/src/Rules.make
+	mv ${S}/src/Rules.make ${S}/src/Rules.make.old
+	sed "s/CFLAG=-O2/CFLAG=${CFLAGS}/" ${S}/src/Rules.make.old > ${S}/src/Rules.make
+	cat ${S}/src/Rules.make
 
-  make aesopd aesoptunnel libaesop keygen  || die
-	
+	make aesopd aesoptunnel libaesop keygen  || die
 }
 
 src_install() {
+	# name is too generic... might be used by a more common package
+	mv ${S}/keygen ${S}/aesopkeygen
 
-  # name is too generic... might be used by a more common package
-  mv ${S}/keygen ${S}/aesopkeygen
-
-  dobin aesopd
-  dobin aesoptunnel
-  dobin aesopkeygen
+	dobin aesopd
+	dobin aesoptunnel
+	dobin aesopkeygen
 
-  dolib libaesop.so.0
-
-  dodoc BUILDING Changelog LICENSE README routes.example runaesop.sh
+	dolib libaesop.so.0
 
+	dodoc BUILDING Changelog LICENSE README routes.example runaesop.sh
 }
-
diff --git a/net-misc/aesop/files/digest-aesop-0.4 b/net-misc/aesop/files/digest-aesop-0.4
index 169500d03883..2325fa2117c5 100644
--- a/net-misc/aesop/files/digest-aesop-0.4
+++ b/net-misc/aesop/files/digest-aesop-0.4
@@ -1 +1 @@
-MD5 2ba86c1b838c647702746732ed6e97b5 aesop-0.4.tar.gz 81920
+MD5 2ba86c1b838c647702746732ed6e97b5 aesop-0.4.tar.gz 81060
diff --git a/net-misc/aggregate-flim/ChangeLog b/net-misc/aggregate-flim/ChangeLog
index 230543bb0432..5870d9384950 100644
--- a/net-misc/aggregate-flim/ChangeLog
+++ b/net-misc/aggregate-flim/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/aggregate-flim
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate-flim/ChangeLog,v 1.1 2003/09/13 07:07:49 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate-flim/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  aggregate-flim-1.0.2.ebuild:
+  Stable on alpha.
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  aggregate-flim-1.0.2.ebuild:
+  move to x86, add other arches that it should work on
+
+  13 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  aggregate-flim-1.0.2.ebuild:
+  rename binaries
 
 *aggregate-flim-1.0.2 (13 Sep 2003)
 
diff --git a/net-misc/aggregate-flim/Manifest b/net-misc/aggregate-flim/Manifest
index 3bb9e5a28953..9b1304cfb43f 100644
--- a/net-misc/aggregate-flim/Manifest
+++ b/net-misc/aggregate-flim/Manifest
@@ -1,4 +1,14 @@
-MD5 4b488b846cb617089ff049d179433c12 aggregate-flim-1.0.2.ebuild 1535
-MD5 92d8fd1f387889be45ea86a2852174b1 aggregate-flim-1.0.2.ebuild~ 1488
-MD5 9f1abaa78635fdee2ccf7afa628037ad metadata.xml 575
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e22b107bdfbe1649bbc40c7c47cfb579 ChangeLog 825
+MD5 0eb6758eedd6d7104c62096e5f9ad4ec aggregate-flim-1.0.2.ebuild 715
 MD5 f7968529bdc607f874c4888574e80bf9 files/digest-aggregate-flim-1.0.2 66
+MD5 9f1abaa78635fdee2ccf7afa628037ad metadata.xml 575
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC676pI1lqEGTUzyQRAoWmAJ40T6Yyk2YvGeCS1BLaiAGr9ZwCPACfWHoH
+12QdyWbv5O95BSSlfS1cCqI=
+=HQ4x
+-----END PGP SIGNATURE-----
diff --git a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild b/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
index 9613f58c1fb6..fc0eaf3c9077 100644
--- a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
+++ b/net-misc/aggregate-flim/aggregate-flim-1.0.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/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild,v 1.1 2003/09/13 07:07:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 MY_PN="${PN/-flim}"
 MY_P="${MY_PN}-${PV}"
@@ -9,18 +9,14 @@ HOMEPAGE="http://www.vergenet.net/linux/${MY_PN}/"
 SRC_URI="${HOMEPAGE}/download/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 alpha ia64"
 IUSE=""
 DEPEND="dev-libs/vanessa-logger"
 #RDEPEND=""
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	newbin aggregate aggregate-flim
+	newman aggregate.8 aggregate-flim.8
 	dodoc AUTHORS COPYING COPYING ChangeLog INSTALL NEWS README
 }
diff --git a/net-misc/aiccu/ChangeLog b/net-misc/aiccu/ChangeLog
index f7cc6a925034..6d751f068bb2 100644
--- a/net-misc/aiccu/ChangeLog
+++ b/net-misc/aiccu/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for sys-boot/palo
+# ChangeLog for net-misc/aiccu
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.1 2005/03/27 17:34:09 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> aiccu-2005.01.31.ebuild:
+  added ~amd64
 
 *aiccu-2005.01.31 (27 Mar 2005)
 
diff --git a/net-misc/aiccu/Manifest b/net-misc/aiccu/Manifest
index b32f4c1e205d..b984153ea913 100644
--- a/net-misc/aiccu/Manifest
+++ b/net-misc/aiccu/Manifest
@@ -1,4 +1,14 @@
-MD5 5ec6bd168741ae0e8f152bc762a6f91b aiccu-2005.01.31.ebuild 894
-MD5 f3f1ddd905ad2858cc2b280695597465 ChangeLog 360
-MD5 0b8679426c285c845af6e3878e007ba9 metadata.xml 242
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bdc693b3e44ffe7991e7810cb436761e ChangeLog 450
+MD5 c70eed849cf25b746be14e7f798fb323 aiccu-2005.01.31.ebuild 964
 MD5 9660dc0f8e9a9022cdcce8b424230519 files/digest-aiccu-2005.01.31 67
+MD5 0b8679426c285c845af6e3878e007ba9 metadata.xml 242
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC674dI1lqEGTUzyQRAuAeAJ4skJ9z74HOfhCpTSLfw1kw/R9WHgCfcYG+
+yRZijnYgR3qb+oR3cPccbbM=
+=XEfU
+-----END PGP SIGNATURE-----
diff --git a/net-misc/aiccu/aiccu-2005.01.31.ebuild b/net-misc/aiccu/aiccu-2005.01.31.ebuild
index 5ca20c75e2a9..2e75155f6421 100644
--- a/net-misc/aiccu/aiccu-2005.01.31.ebuild
+++ b/net-misc/aiccu/aiccu-2005.01.31.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2005.01.31.ebuild,v 1.1 2005/03/27 17:34:09 gmsoft Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aiccu/aiccu-2005.01.31.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS."
 HOMEPAGE="http://www.sixxs.net/"
@@ -9,16 +8,13 @@ SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/aiccu_${PV}.tar.gz"
 
 LICENSE="AICCU"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND=""
 S=${WORKDIR}/aiccu
 
-
 src_compile() {
-	cd ${S}
-	export RPM_OPT_FLAGS=${CFLAGS}
-	make  || die "Build Failed"
+	emake  RPM_OPT_FLAGS="${CFLAGS}" || die "Build Failed"
 }
 
 src_install() {
@@ -27,10 +23,7 @@ src_install() {
 	insinto /etc
 	doins doc/aiccu.conf
 	dodoc doc/{HOWTO,LICENSE,README,changelog}
-	exeinto /etc/init.d
-	newexe doc/aiccu.init.gentoo aiccu
-
-
+	newinitd doc/aiccu.init.gentoo aiccu
 }
 
 pkg_postinst() {
@@ -38,6 +31,4 @@ pkg_postinst() {
 	einfo "To add support for a SixXS connection at startup, do"
 	einfo "edit your /etc/aiccu.conf and do"
 	einfo "# rc-update add aiccu default"
-
 }
-
diff --git a/net-misc/aria/ChangeLog b/net-misc/aria/ChangeLog
index 4bac15cb3b40..bfcf1531f072 100644
--- a/net-misc/aria/ChangeLog
+++ b/net-misc/aria/ChangeLog
@@ -1,9 +1,58 @@
 # ChangeLog for net-misc/aria
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/ChangeLog,v 1.1 2002/07/04 18:20:18 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/ChangeLog,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+  05 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> aria-1.0.0.ebuild:
+  Sparc stable for real
+
+  04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/aria-1.0.0-bigendian.diff, aria-0.10.0.ebuild,
+  aria-0.10.2_beta7.ebuild, aria-1.0.0.ebuild:
+  Fixed 1.0.0 bigendian build problems and sparc stable, others gone the
+  -sparc path
+
+  03 Feb 2005; Jared Hudson <jhhudso@gentoo.org> aria-1.0.0.ebuild:
+  Marked aria-1.0.0 as stable on x86 and amd64
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> aria-1.0.0.ebuild:
+  Add inherit eutils
+
+  17 Mar 2004; Seemant Kulleen <seemant@gentoo.org> aria-0.10.0.ebuild,
+  aria-0.10.2_beta7.ebuild, aria-1.0.0.ebuild:
+  fix for bug #44712 by Michael Sterret <mr_bones_@gentoo.org> and also switch
+  to econf and einstall and actually USE the USE flags
+
+  09 Feb 2004; root <root@gentoo.org> aria-0.10.0.ebuild,
+  aria-0.10.2_beta7.ebuild, aria-1.0.0.ebuild, metadata.xml,
+  files/aria-1.0.0-savefiles-gentoo.diff,
+  files/aria-1.0.0-xgettext-gentoo.diff:
+  Fixed bug #39317 and #39342 and updated the copyright headers on the other
+  ebuilds. The first bug was that aria would not start without some specific
+  startup files in your homedir; they are now provided and setup automatically.
+  The second bug was that aria would not compile because it could not create
+  internationalization file aria.po. I also fixed the NLS useflag so it
+  actually does something now.
+
+*aria-1.0.0 (15 May 2003)
+
+  15 May 2003; Jared Hudson <jhhudso@gentoo.org> : Updated ebuild to version
+  1.0.0. Credit goes to Nicolas Grandclaude <ngclaude@netcourrier.com>. Bug
+  ID: 20784
+	
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-*aria-0.10.0.ebuild (04 Jul 2002)
+*aria-0.10.2_beta7 (02 Oct 2002)
   
+  02 Oct 2002; Jared H. Hudson <jhhudso@gentoo.org> aria-0.10.2_beta7.ebuild :
+
+  Updated aria to work with gcc3.x and be up to date in response to bug id 6835
+	
+*aria-0.10.0 (04 July 2002)
+  
+  06 Jul 2002; phoen][x <phoenix@gentoo.org> aria-0.10.0.ebuild : 
+
+  Added KEYWORDS.
+
   04 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> aria-0.10.0.ebuild : 
   
   Initial CVS import. Aria is a download manager with a GTK+ GUI.
diff --git a/net-misc/aria/Manifest b/net-misc/aria/Manifest
index e69de29bb2d1..e6a6fca117fe 100644
--- a/net-misc/aria/Manifest
+++ b/net-misc/aria/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d8998cc649683ff1cd49df55d91918f9 aria-0.10.0.ebuild 804
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 16373e087b195f970cebf5f8e42df7ad aria-0.10.2_beta7.ebuild 857
+MD5 088190d2cd342fb32e3e88848cca6951 ChangeLog 2359
+MD5 54a72f8b909ed172d4d9b3dfbbbd8a0d aria-1.0.0.ebuild 1176
+MD5 e49bd8fb946e7f696225f4fb9d6b7bca files/digest-aria-0.10.2_beta7 69
+MD5 650691427e963c1e71e93aca6c62f0f4 files/digest-aria-1.0.0 63
+MD5 6cf5cba54a93af546dd72d878553cf0d files/aria-1.0.0-bigendian.diff 684
+MD5 65d1ace3b41fe91a14721c69547c930b files/digest-aria-0.10.0 64
+MD5 81f59c682ea25291338ad529d3e25472 files/aria-1.0.0-savefiles-gentoo.diff 1005
+MD5 eecc0279096e5be08069f7e6e6d95665 files/aria-1.0.0-xgettext-gentoo.diff 956
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFCyoHQKRy60XGEcJIRAklaAJ9QqPYOixV8a3SIBWwyjAQAf4cE8QCfak83
+rToDqt+zVHXaH51R0nhEzn8=
+=kNd6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/aria/aria-0.10.0.ebuild b/net-misc/aria/aria-0.10.0.ebuild
index 52b8e3f1179b..c619257f5a5a 100644
--- a/net-misc/aria/aria-0.10.0.ebuild
+++ b/net-misc/aria/aria-0.10.0.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.0.ebuild,v 1.1 2002/07/04 18:20:18 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.0.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE="nls"
 
 DESCRIPTION="Aria is a download manager with a GTK+ GUI, it downloads files from Internet via HTTP/HTTPS or FTP."
-SRC_URI="http://aria.rednoah.com/storage/sources/${P}.tar.bz2"
 HOMEPAGE="http://aria.rednoah.com"
-LICENSE="GPL-2"
+SRC_URI="http://aria.rednoah.com/storage/sources/${P}.tar.bz2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 -sparc"
 
 RDEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
@@ -18,23 +20,14 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext
 		>=dev-util/intltool-0.11 )"
 
-
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf \
+		`use_enable nls` || die
 	emake || die
 }
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+	einstall || die
 
-	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING 
+	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING
 }
-
diff --git a/net-misc/aria/aria-0.10.2_beta7.ebuild b/net-misc/aria/aria-0.10.2_beta7.ebuild
index 3af53ce50df9..ea3f8848cd57 100644
--- a/net-misc/aria/aria-0.10.2_beta7.ebuild
+++ b/net-misc/aria/aria-0.10.2_beta7.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.2_beta7.ebuild,v 1.1 2002/10/02 05:12:35 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.2_beta7.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
-P=`echo ${P} | sed s/_beta/test/g`
-S=${WORKDIR}/${P}
-#A=`echo ${P}.tar.bz2 | sed s/_beta/test/g`
+IUSE="nls"
+
+MY_P=${P/_beta/test}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Aria is a download manager with a GTK+ GUI, it downloads files from Internet via HTTP/HTTPS or FTP."
-SRC_URI="http://aria.rednoah.com/storage/sources/${P}.tar.bz2"
 HOMEPAGE="http://aria.rednoah.com"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
+SRC_URI="http://aria.rednoah.com/storage/sources/${MY_P}.tar.bz2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 -sparc"
 
 RDEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
@@ -23,21 +25,13 @@ DEPEND="${RDEPEND}
 
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf \
+		`use_enable nls` || die
 	emake || die
 }
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+	einstall || die
 
-	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING 
+	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING
 }
-
diff --git a/net-misc/aria/aria-1.0.0.ebuild b/net-misc/aria/aria-1.0.0.ebuild
index 914da49a1ddb..ea7dd4bf3bca 100644
--- a/net-misc/aria/aria-1.0.0.ebuild
+++ b/net-misc/aria/aria-1.0.0.ebuild
@@ -1,23 +1,45 @@
-# Copyright 1999-2003 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-misc/aria/aria-1.0.0.ebuild,v 1.1 2003/05/15 20:47:36 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+inherit eutils
+
+IUSE="nls"
 
 DESCRIPTION="Aria is a download manager with a GTK+ GUI, it downloads files from the Internet via HTTP/HTTPS or FTP."
 HOMEPAGE="http://aria.rednoah.com"
 SRC_URI="http://aria.rednoah.com/storage/sources/${P}.tar.bz2"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="nls"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc amd64"
 
 DEPEND="nls? ( sys-devel/gettext dev-util/intltool )
 	dev-libs/glib
 	x11-libs/gtk+"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/aria-1.0.0-xgettext-gentoo.diff
+	epatch ${FILESDIR}/aria-1.0.0-savefiles-gentoo.diff
+	epatch ${FILESDIR}/aria-1.0.0-bigendian.diff
+}
+
+src_compile() {
+	econf `use_enable nls` || die "econf failed"
+
+	# This fixes an infinite loop bug
+	touch Makefile
+
+	emake || die "emake failed"
+}
 
 src_install() {
 	einstall || die
 
 	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING
+	touch ${D}/usr/share/aria/ftp_proxy.aria
+	touch ${D}/usr/share/aria/gui.aria
+	touch ${D}/usr/share/aria/history.aria
+	touch ${D}/usr/share/aria/http_proxy.aria
 }
diff --git a/net-misc/aria/metadata.xml b/net-misc/aria/metadata.xml
index c5d67a611520..20ce219711a2 100644
--- a/net-misc/aria/metadata.xml
+++ b/net-misc/aria/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>jhhudso@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-misc/arpd/ChangeLog b/net-misc/arpd/ChangeLog
index af2fd9660d2e..45af5896a3e5 100644
--- a/net-misc/arpd/ChangeLog
+++ b/net-misc/arpd/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-misc/arpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/ChangeLog,v 1.1 2002/12/20 09:27:36 jrray Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+  18 May 2005; Sven Wegener <swegener@gentoo.org> arpd-0.2.ebuild:
+  Moved inherit to the top to stop eclasses from overwriting the DESCRIPTION.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> arpd-0.2.ebuild:
+  Stable on ppc.
+
+  27 Apr 2005; Brian Jackson <iggy@gentoo.org> +files/arpd.c.patch,
+  arpd-0.2.ebuild:
+  patch from bug #76833, thanks to those guys, also works on amd64
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> arpd-0.2.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+*arpd-0.2 (14 Sep 2003)
+
+  14 Sep 2003; <iggy@gentoo.org> arpd-0.2.ebuild:
+  version bump thanks to hillster
+
+  07 Jan 2003; J Robert Ray <jrray@gentoo.org> : Unmasked for x86.
 
 *arpd-0.1 (20 Dec 2002)
 
diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest
index e69de29bb2d1..59e140d57451 100644
--- a/net-misc/arpd/Manifest
+++ b/net-misc/arpd/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9d4bc94c4a0c82afb2e8ba98bc4a3e20 arpd-0.2.ebuild 1116
+MD5 231833163c584486bb973d1f08ca536d ChangeLog 1055
+MD5 24084c279daf0f876446c530a64ff287 files/digest-arpd-0.2 59
+MD5 cef41ba111aec61fe276ef665e51e03b files/arpd.c.patch 1477
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCi6FrI1lqEGTUzyQRAvWZAJ9aC+VjNrYWNkBBXOx33Lq5MlFkYQCgkaFP
+nvPzioU5c2wzRldPsFswAm4=
+=ROcR
+-----END PGP SIGNATURE-----
diff --git a/net-misc/arpd/arpd-0.2.ebuild b/net-misc/arpd/arpd-0.2.ebuild
index 4526aa93a192..73ec9d9e7246 100644
--- a/net-misc/arpd/arpd-0.2.ebuild
+++ b/net-misc/arpd/arpd-0.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/net-misc/arpd/arpd-0.2.ebuild,v 1.1 2003/09/14 16:24:20 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/arpd-0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ARP reply daemon enables a single host to claim all unassigned addresses on a LAN for network monitoring or simulation"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
@@ -8,24 +10,25 @@ SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~amd64"
-
+KEYWORDS="x86 ~sparc ppc hppa ~amd64"
 IUSE=""
-DEPEND=">=libdnet-1.4
-	>=libevent-0.6
-	>=libpcap-0.7.1"
 
-S="${WORKDIR}/${PN}"
+DEPEND=">=dev-libs/libdnet-1.4
+	>=dev-libs/libevent-0.6
+	virtual/libpcap"
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	mv configure configure.orig || die
-	sed -e 's|$withval/lib/libevent.a; then||' \
+	epatch ${FILESDIR}/arpd.c.patch || die "epatch failed"
+
+	sed -i \
+		-e 's|$withval/lib/libevent.a; then||' \
 		-e 's|if test -f $withval/include/event.h -a -f|if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then|' \
-		configure.orig > configure || die
-	chmod +x configure
+		configure || die "sed failed"
 }
 
 src_compile() {
@@ -34,6 +37,6 @@ src_compile() {
 }
 
 src_install() {
-	dosbin arpd
+	dosbin arpd || die
 	doman arpd.8
 }
diff --git a/net-misc/arpstar/ChangeLog b/net-misc/arpstar/ChangeLog
index 9fa7c2876c31..9981f7c990f0 100644
--- a/net-misc/arpstar/ChangeLog
+++ b/net-misc/arpstar/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/arpstar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arpstar/ChangeLog,v 1.1 2005/03/04 13:32:32 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpstar/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+*arpstar-0.5.5 (06 Mar 2005)
+
+  06 Mar 2005; Stefan Schweizer <genstef@gentoo.org> -arpstar-0.5.0.ebuild,
+  +arpstar-0.5.5.ebuild:
+  Version bump, bug 82757
+
+  04 Mar 2005; Stefan Schweizer <genstef@gentoo.org> arpstar-0.5.0.ebuild:
+  Updated to depend on CONFIG_NETFILTER, added docs and also let it compile on
+  2.6.11 thanks to John Shaw <jtshaw@jtshaw.com> in bug 82757
 
 *arpstar-0.5.0 (04 Mar 2005)
 
diff --git a/net-misc/arpstar/Manifest b/net-misc/arpstar/Manifest
index 906e0bcad32e..093358c956ac 100644
--- a/net-misc/arpstar/Manifest
+++ b/net-misc/arpstar/Manifest
@@ -1,4 +1,4 @@
-MD5 4b965966f479f0f6fede767e8624096d arpstar-0.5.0.ebuild 636
-MD5 9865cca24c361bb786bf64e73f90e305 ChangeLog 393
+MD5 ee4f809f6a5f8287c78a80caedcc0dc4 arpstar-0.5.5.ebuild 638
+MD5 416cdbd6ceb0af49fedddb8993a25edc ChangeLog 857
 MD5 6d924ebdbe12162835ab1c1ea584636e metadata.xml 161
-MD5 aabd6314c7518cb58e68734d01d4bc0f files/digest-arpstar-0.5.0 63
+MD5 d15c2068ae2d2111b00eb30f2a3d5328 files/digest-arpstar-0.5.5 63
diff --git a/net-misc/arpstar/arpstar-0.5.5.ebuild b/net-misc/arpstar/arpstar-0.5.5.ebuild
index fa1c9ae8c03b..3515d43a770d 100644
--- a/net-misc/arpstar/arpstar-0.5.5.ebuild
+++ b/net-misc/arpstar/arpstar-0.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/net-misc/arpstar/arpstar-0.5.5.ebuild,v 1.1 2005/03/06 18:44:20 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpstar/arpstar-0.5.5.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/net-misc/asterisk-addons/ChangeLog b/net-misc/asterisk-addons/ChangeLog
index c4f9b1d05aa9..43e11e7787a6 100644
--- a/net-misc/asterisk-addons/ChangeLog
+++ b/net-misc/asterisk-addons/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/asterisk-addons
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.1 2005/08/27 18:19:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/ChangeLog,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 *asterisk-addons-1.2.0_beta1 (27 Aug 2005)
 
diff --git a/net-misc/asterisk-addons/Manifest b/net-misc/asterisk-addons/Manifest
index 2f26603303f6..4dd0367e493f 100644
--- a/net-misc/asterisk-addons/Manifest
+++ b/net-misc/asterisk-addons/Manifest
@@ -1,23 +1,7 @@
-MD5 fb5ae89cfba9c348383c607c75a891d2 asterisk-addons-1.2.0_pre20050801.ebuild 1407
-MD5 cdd3a976bb3dd8ebdb1f267ff79eab44 asterisk-addons-1.2.0_pre20050804.ebuild 2255
-MD5 cdd3a976bb3dd8ebdb1f267ff79eab44 asterisk-addons-1.2.0_pre20050813.ebuild 2255
-MD5 18c8caeadeac118aef9e7cd2764ed895 asterisk-addons-1.2.0_pre20050818.ebuild 2686
-MD5 25393d06abb2d1b44cc8f4a7e3b42470 asterisk-addons-1.2.0_beta1.ebuild 3232
-MD5 cdd3a976bb3dd8ebdb1f267ff79eab44 asterisk-addons-1.2.0_pre20050815.ebuild 2255
-MD5 cdd3a976bb3dd8ebdb1f267ff79eab44 asterisk-addons-1.2.0_pre20050805.ebuild 2255
-MD5 18c8caeadeac118aef9e7cd2764ed895 asterisk-addons-1.2.0_pre20050824.ebuild 2686
-MD5 6a83190d8df2f1737365745788b3a585 files/digest-asterisk-addons-1.2.0_pre20050824 151
-MD5 67d6be912d6a4cbc6250339885e778a0 files/asterisk-addons-1.2.0-gentoo-res_sqlite3.diff 1930
-MD5 472508b893570a1992a9d2d2e8562948 files/digest-asterisk-addons-1.2.0_pre20050813 151
-MD5 46cefa8dc3aa8a97c973f54cd08f0ace files/sqlite-3.2.1-data-corruption.patch 6529
-MD5 727a0a2296bb763d31542e624c6ca224 files/asterisk-addons-1.2.0-gentoo-ooh323c.diff 1282
-MD5 61212477cac9d226aa20dfb0df6850b1 files/digest-asterisk-addons-1.2.0_pre20050815 151
-MD5 82cd782757d15694641089e2ee112123 files/digest-asterisk-addons-1.2.0_pre20050818 151
-MD5 999471dfb8a0862eb3fe7f88bd8162e4 files/digest-asterisk-addons-1.2.0_pre20050804 151
-MD5 065a00cb69d2751c33d0f569c8768b24 files/digest-asterisk-addons-1.2.0_pre20050805 151
-MD5 d9614f6289a7b8edda8045241187e138 files/asterisk-addons-1.2.0-gentoo-base.diff 1852
-MD5 67d6be912d6a4cbc6250339885e778a0 files/asterisk-addons-1.2.0_beta1-gentoo-res_sqlite3.diff 1930
-MD5 727a0a2296bb763d31542e624c6ca224 files/asterisk-addons-1.2.0_beta1-gentoo-ooh323c.diff 1282
+MD5 d2645797f0e8dba6b3d9ce97069449de asterisk-addons-1.2.0_beta1.ebuild 3289
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+MD5 b0cad4bcd307955165d180155132414f ChangeLog 640
 MD5 d9614f6289a7b8edda8045241187e138 files/asterisk-addons-1.2.0_beta1-gentoo-base.diff 1852
 MD5 00cfba5fc6217bd223624a267cd55a13 files/digest-asterisk-addons-1.2.0_beta1 144
-MD5 9ddf63d75f608d76eb325d5c6a6488c7 files/digest-asterisk-addons-1.2.0_pre20050801 86
+MD5 727a0a2296bb763d31542e624c6ca224 files/asterisk-addons-1.2.0_beta1-gentoo-ooh323c.diff 1282
+MD5 67d6be912d6a4cbc6250339885e778a0 files/asterisk-addons-1.2.0_beta1-gentoo-res_sqlite3.diff 1930
diff --git a/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild b/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild
index 26f7543d3bdd..3bd20a69b947 100644
--- a/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild
+++ b/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild,v 1.1 2005/08/27 18:19:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-addons/asterisk-addons-1.2.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 IUSE="mysql sqlite h323"
 
diff --git a/net-misc/asterisk-app_authenticate_ldap/ChangeLog b/net-misc/asterisk-app_authenticate_ldap/ChangeLog
index 6651b9417218..df03de9579fb 100644
--- a/net-misc/asterisk-app_authenticate_ldap/ChangeLog
+++ b/net-misc/asterisk-app_authenticate_ldap/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/asterisk-app_authenticate_ldap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_authenticate_ldap/ChangeLog,v 1.1 2005/08/27 22:25:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_authenticate_ldap/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 *asterisk-app_authenticate_ldap-0.1.3 (28 Aug 2005)
 
diff --git a/net-misc/asterisk-app_authenticate_ldap/Manifest b/net-misc/asterisk-app_authenticate_ldap/Manifest
index 37bda7a357e1..31ba92808cae 100644
--- a/net-misc/asterisk-app_authenticate_ldap/Manifest
+++ b/net-misc/asterisk-app_authenticate_ldap/Manifest
@@ -1,5 +1,5 @@
-MD5 54514e3351dedbaf91c63689b711c9fc ChangeLog 823
-MD5 2759f272612a4b18f6caa0e9503c8f89 asterisk-app_authenticate_ldap-0.1.3.ebuild 903
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 2e328a08142aaf854bc82cd7dcfa4134 ChangeLog 483
+MD5 b0d754405e1ce8015f192bc00acab12e asterisk-app_authenticate_ldap-0.1.3.ebuild 929
 MD5 c9076cee173573fe658a9609d0393d17 files/app_authenticate_ldap-0.1.3-astcfg.diff 664
 MD5 47a5d7381d6197fabb4b49eafdaad2a9 files/digest-asterisk-app_authenticate_ldap-0.1.3 77
diff --git a/net-misc/asterisk-app_authenticate_ldap/asterisk-app_authenticate_ldap-0.1.3.ebuild b/net-misc/asterisk-app_authenticate_ldap/asterisk-app_authenticate_ldap-0.1.3.ebuild
index 384ccef6cf96..9fd2dda0adda 100644
--- a/net-misc/asterisk-app_authenticate_ldap/asterisk-app_authenticate_ldap-0.1.3.ebuild
+++ b/net-misc/asterisk-app_authenticate_ldap/asterisk-app_authenticate_ldap-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/net-misc/asterisk-app_authenticate_ldap/asterisk-app_authenticate_ldap-0.1.3.ebuild,v 1.1 2005/08/27 22:25:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_authenticate_ldap/asterisk-app_authenticate_ldap-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-app_event/ChangeLog b/net-misc/asterisk-app_event/ChangeLog
index 1b3b83ec1525..9e3058467cdd 100644
--- a/net-misc/asterisk-app_event/ChangeLog
+++ b/net-misc/asterisk-app_event/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-app_event
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_event/ChangeLog,v 1.1 2005/07/01 21:03:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_event/ChangeLog,v 1.1.1.1 2005/11/30 09:55:33 chriswhite Exp $
+
+  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_event-20050627.ebuild:
+  Stable on x86.
+
+  02 Jul 2005; David Holm <dholm@gentoo.org>
+  asterisk-app_event-20050627.ebuild:
+  Added to ~ppc.
 
 *asterisk-app_event-20050627 (01 Jul 2005)
 
diff --git a/net-misc/asterisk-app_event/Manifest b/net-misc/asterisk-app_event/Manifest
index 5c0a780a01df..f341c2de3de5 100644
--- a/net-misc/asterisk-app_event/Manifest
+++ b/net-misc/asterisk-app_event/Manifest
@@ -1,3 +1,5 @@
-MD5 d68ac63088659ec2dce22acb94628431 asterisk-app_event-20050627.ebuild 631
+MD5 599a065b59ee4391527b86c03ea4d0e8 asterisk-app_event-20050627.ebuild 758
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 b0d675be26d0ac5dca9ed1bee33ee302 ChangeLog 621
 MD5 6398a986be929e46ee45a43cd18be378 files/digest-asterisk-app_event-20050627 78
 MD5 c53af72e2e4bfc3b055dd8a91082dded files/app_event-20050627-astcfg.diff 697
diff --git a/net-misc/asterisk-app_event/asterisk-app_event-20050627.ebuild b/net-misc/asterisk-app_event/asterisk-app_event-20050627.ebuild
index ae16c260518d..fa65a085dca0 100644
--- a/net-misc/asterisk-app_event/asterisk-app_event-20050627.ebuild
+++ b/net-misc/asterisk-app_event/asterisk-app_event-20050627.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_event/asterisk-app_event-20050627.ebuild,v 1.1 2005/07/01 21:03:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_event/asterisk-app_event-20050627.ebuild,v 1.1.1.1 2005/11/30 09:55:33 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 DEPEND=">=net-misc/asterisk-1.0.7-r1"
 
diff --git a/net-misc/asterisk-app_icd/ChangeLog b/net-misc/asterisk-app_icd/ChangeLog
index 4088761e36fa..8e086dfbe3d2 100644
--- a/net-misc/asterisk-app_icd/ChangeLog
+++ b/net-misc/asterisk-app_icd/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-misc/asterisk-app_icd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/ChangeLog,v 1.1 2005/06/15 23:42:46 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_icd-1.0.0.ebuild:
+  Stable on x86.
+
+  16 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_icd-1.0.0.ebuild:
+  Block >=asterisk-1.1.0, because 1.2.0(_pre) is not supported at the moment.
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> asterisk-app_icd-1.0.0.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/asterisk-app_icd-1.0.0-configsegv.diff,
+  asterisk-app_icd-1.0.0.ebuild:
+  Fixed segmentation fault in config parser (thanks to Danny van Dyk
+  <Kugelfang@gentoo.org> for finding this), keywording ~x86 and ~amd64
+  (patch sent upstream).
+
+  17 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_icd-1.0.0.ebuild:
+  fixed sqlite configure failure, works on x86 now
 
 *asterisk-app_icd-1.0.0 (16 Jun 2005)
 
diff --git a/net-misc/asterisk-app_icd/Manifest b/net-misc/asterisk-app_icd/Manifest
index 27a9affebe99..c42c040f59a0 100644
--- a/net-misc/asterisk-app_icd/Manifest
+++ b/net-misc/asterisk-app_icd/Manifest
@@ -1,6 +1,7 @@
-MD5 40210369a0d47f82d9bdb4654475304c asterisk-app_icd-1.0.0.ebuild 1414
+MD5 5436386130d351b4e7e6fbb6812816eb asterisk-app_icd-1.0.0.ebuild 1619
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 7e567ba2e359357c0acf6e7b00993cb5 ChangeLog 518
-MD5 2e6e3622140afef8d13d3022cdb206b8 files/digest-asterisk-app_icd-1.0.0 62
-MD5 142035f777abdfae08ca7cb332e6a4b1 files/asterisk-app_icd-1.0.0-bristuff.diff 457
+MD5 40d01ff225fb60da529405a94936834b ChangeLog 1304
 MD5 f91da9ee448dfc5a3b9528f7752d0657 files/asterisk-app_icd-1.0.0-gentoo.diff 4863
+MD5 142035f777abdfae08ca7cb332e6a4b1 files/asterisk-app_icd-1.0.0-bristuff.diff 457
+MD5 2e6e3622140afef8d13d3022cdb206b8 files/digest-asterisk-app_icd-1.0.0 62
+MD5 ca50446dbd8f5a351f341a467a7afd33 files/asterisk-app_icd-1.0.0-configsegv.diff 1684
diff --git a/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild b/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild
index d5bcf7be3e1d..31a63acf40b2 100644
--- a/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild
+++ b/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild,v 1.1 2005/06/15 23:42:46 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_icd/asterisk-app_icd-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils
 
@@ -14,10 +14,11 @@ IUSE="debug"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="sys-libs/glibc
 	>=net-misc/asterisk-1.0.7-r1
+	!>=net-misc/asterisk-1.1.0
 	>=net-misc/zaptel-1.0.7-r1"
 
 S=${WORKDIR}/${MY_PN}-${PV}
@@ -32,6 +33,9 @@ src_unpack() {
 	if built_with_use net-misc/asterisk bri; then
 		epatch ${FILESDIR}/${P}-bristuff.diff
 	fi
+
+	# fix segfault in config parser (patch sent upstream)
+	epatch ${FILESDIR}/${P}-configsegv.diff
 }
 
 src_compile() {
@@ -40,7 +44,10 @@ src_compile() {
 	use debug && \
 		myconf="${myconf} DEBUG=1"
 
-	emake -j1 \
+	emake CFLAGS="${CFLAGS}" \
+		.sqlite || die "Building sqlite failed"
+
+	emake \
 		${myconf} || die "emake failed"
 }
 
diff --git a/net-misc/asterisk-app_iconv/ChangeLog b/net-misc/asterisk-app_iconv/ChangeLog
index dd50c8a4fbce..d0d2757109e2 100644
--- a/net-misc/asterisk-app_iconv/ChangeLog
+++ b/net-misc/asterisk-app_iconv/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-misc/asterisk-app_iconv
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/ChangeLog,v 1.1 2005/02/15 20:15:56 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
+
+  27 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/app_iconv-0.9.1-astcfg.diff:
+  Fix use of install in patch.
+
+  27 Aug 2005; <stkn@gentoo.org> -asterisk-app_iconv-0.8.ebuild:
+  Removing old version.
+
+  27 Aug 2005; <stkn@gentoo.org> asterisk-app_iconv-0.9.ebuild:
+  Stable on x86.
+
+*asterisk-app_iconv-0.9.1 (27 Aug 2005)
+
+  27 Aug 2005; <stkn@gentoo.org> +files/app_iconv-0.9.1-astcfg.diff,
+  +asterisk-app_iconv-0.9.1.ebuild:
+  Version bump.
+
+*asterisk-app_iconv-0.9 (17 Jun 2005)
+
+  17 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-app_iconv-0.9.ebuild:
+  Version bump.
+
+  10 May 2005; David Holm <dholm@gentoo.org> asterisk-app_iconv-0.8.ebuild:
+  Added to ~ppc.
+
+  15 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/app_iconv-0.8-astcfg.diff:
+  Fixed astcfg patch
 
 *asterisk-app_iconv-0.8 (15 Feb 2005)
 
diff --git a/net-misc/asterisk-app_iconv/Manifest b/net-misc/asterisk-app_iconv/Manifest
index e2bd7bf89bef..7cd4806cf484 100644
--- a/net-misc/asterisk-app_iconv/Manifest
+++ b/net-misc/asterisk-app_iconv/Manifest
@@ -1,5 +1,8 @@
+MD5 9c5e425d178d16ad099cc5138c9d8025 asterisk-app_iconv-0.9.ebuild 849
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 6e13d1189d4116fa8a7009fd85530e1c asterisk-app_iconv-0.8.ebuild 839
-MD5 00b91e224db3e544a2038a0f6b92867f ChangeLog 415
-MD5 788d896fcbb023126d45bfc59037c97a files/app_iconv-0.8-astcfg.diff 714
-MD5 9f6ac556f86bdaf7b54d9e022a542eeb files/digest-asterisk-app_iconv-0.8 60
+MD5 da454eaa004f7e6f5884bb6de2fc01e4 ChangeLog 1207
+MD5 adffab823dcc3bcbca825dde9588d0b5 asterisk-app_iconv-0.9.1.ebuild 882
+MD5 1d9290f7bf08909942aec614e4b8d2a8 files/app_iconv-0.8-astcfg.diff 717
+MD5 672a2a6e59ee633b14106e0c70c03086 files/digest-asterisk-app_iconv-0.9.1 62
+MD5 3ddff38ac2c0b6083278ceef48ee2d29 files/app_iconv-0.9.1-astcfg.diff 877
+MD5 875e728c24166472794e5a14e410c0ab files/digest-asterisk-app_iconv-0.9 60
diff --git a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild
index 38527fd6a0ce..60b624e83103 100644
--- a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild
+++ b/net-misc/asterisk-app_iconv/asterisk-app_iconv-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/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild,v 1.1 2005/08/27 20:58:57 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild
index 25b02abaf2cd..438dcf5710d8 100644
--- a/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild
+++ b/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild,v 1.1 2005/06/17 19:46:10 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_iconv/asterisk-app_iconv-0.9.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.mezzo.net/asterisk/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 IUSE=""
 
diff --git a/net-misc/asterisk-app_iconv/files/app_iconv-0.8-astcfg.diff b/net-misc/asterisk-app_iconv/files/app_iconv-0.8-astcfg.diff
index 3b3957c91a8d..c9604607cc17 100644
--- a/net-misc/asterisk-app_iconv/files/app_iconv-0.8-astcfg.diff
+++ b/net-misc/asterisk-app_iconv/files/app_iconv-0.8-astcfg.diff
@@ -21,7 +21,7 @@
 +	$(CC) -c $(CFLAGS) -o $@ $<
 +
 +app_iconv.so: app_iconv.o
-+	$(CC) $(SOLINK) $(LIBS) -o $@
++	$(CC) $(SOLINK) -o $@ $< $(LIBS)
 +
 +install:
 +	if [ ! -d $(DESTDIR)$(ASTMODDIR) ]; then mkdir -p $(DESTDIR)$(ASTMODDIR); fi
diff --git a/net-misc/asterisk-app_iconv/files/app_iconv-0.9.1-astcfg.diff b/net-misc/asterisk-app_iconv/files/app_iconv-0.9.1-astcfg.diff
index 569612d0620c..a181ec8dcced 100644
--- a/net-misc/asterisk-app_iconv/files/app_iconv-0.9.1-astcfg.diff
+++ b/net-misc/asterisk-app_iconv/files/app_iconv-0.9.1-astcfg.diff
@@ -29,7 +29,7 @@
 -		install -m 755 $(NAME).so $(MODULES_DIR) ; \
 -	fi
 +install:
-+	install -D -m 755 $(NAME).so $(DESTDIR)$(MODULES_DIR)
++	install -D -m 755 $(NAME).so $(DESTDIR)$(MODULES_DIR)/$(NAME).so
  
  reload: install
  	asterisk -rx "unload ${RES}"
diff --git a/net-misc/asterisk-app_intercept/ChangeLog b/net-misc/asterisk-app_intercept/ChangeLog
index 876e220daafd..0707f1b924d2 100644
--- a/net-misc/asterisk-app_intercept/ChangeLog
+++ b/net-misc/asterisk-app_intercept/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/asterisk-app_intercept
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_intercept/ChangeLog,v 1.1 2005/07/01 21:06:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_intercept/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+*asterisk-app_intercept-20050828 (29 Aug 2005)
+
+  29 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-app_intercept-20050828.ebuild:
+  Version bump.
+
+  02 Jul 2005; David Holm <dholm@gentoo.org>
+  asterisk-app_intercept-20050623.ebuild:
+  Added to ~ppc.
 
 *asterisk-app_intercept-20050623 (01 Jul 2005)
 
diff --git a/net-misc/asterisk-app_intercept/Manifest b/net-misc/asterisk-app_intercept/Manifest
index a0f7d3b9d1b3..5ada997c54ed 100644
--- a/net-misc/asterisk-app_intercept/Manifest
+++ b/net-misc/asterisk-app_intercept/Manifest
@@ -1,3 +1,7 @@
-MD5 8e4ad8a286f8a689ff1e1e7077c259d7 asterisk-app_intercept-20050623.ebuild 635
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 6b8e0b7a67a58f0709232c7c23ed3093 asterisk-app_intercept-20050828.ebuild 818
+MD5 36ee334f23268ad6fdbe130f57d01cba ChangeLog 714
+MD5 1c0d03d30338d91119c46bd1274fd17b asterisk-app_intercept-20050623.ebuild 759
+MD5 74136cf972399fafdb09065608b5aa99 files/digest-asterisk-app_intercept-20050828 82
 MD5 386a10c3d32e5ef111ad0147804181c2 files/digest-asterisk-app_intercept-20050623 82
 MD5 190301c3bb28a31fde5e48dd67eaa298 files/app_intercept-20050623-astcfg.diff 713
diff --git a/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050623.ebuild b/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050623.ebuild
index bb2eb3f8b561..d2d9856ba155 100644
--- a/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050623.ebuild
+++ b/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050623.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050623.ebuild,v 1.1 2005/07/01 21:06:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050623.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND=">=net-misc/asterisk-1.0.7-r1"
 
diff --git a/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild b/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild
index 98b15aae59f4..303d122755c7 100644
--- a/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild
+++ b/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild,v 1.1 2005/08/29 02:31:35 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_intercept/asterisk-app_intercept-20050828.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-app_ldap/ChangeLog b/net-misc/asterisk-app_ldap/ChangeLog
index b3b3ac5b1564..c7900af42142 100644
--- a/net-misc/asterisk-app_ldap/ChangeLog
+++ b/net-misc/asterisk-app_ldap/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for net-misc/asterisk-app_ldap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/ChangeLog,v 1.1 2005/02/15 20:30:35 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/ChangeLog,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/app_ldap-0.9.3-astcfg.diff, -asterisk-app_ldap-0.9.5.ebuild:
+  Removed old ebuild.
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_ldap-0.9.9_p2.ebuild:
+  Stable on x86.
+
+*asterisk-app_ldap-1.0_rc1 (30 Sep 2005)
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-app_ldap-1.0_rc1.ebuild:
+  Version bump.
+
+*asterisk-app_ldap-0.9.9_p2 (29 Aug 2005)
+
+  29 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  -asterisk-app_ldap-0.9.9.ebuild, +asterisk-app_ldap-0.9.9_p2.ebuild:
+  0.9.9 has a memleak, the new version has that fixed. Removing
+  the broken version.
+
+  27 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/app_ldap-0.9.9-astcfg.diff:
+  Fix use of install in patch.
+
+  27 Aug 2005; <stkn@gentoo.org> -asterisk-app_ldap-0.9.3.ebuild:
+  Removing old version.
+
+  27 Aug 2005; <stkn@gentoo.org> asterisk-app_ldap-0.9.5.ebuild:
+  Stable on x86.
+
+*asterisk-app_ldap-0.9.9 (27 Aug 2005)
+
+  27 Aug 2005; <stkn@gentoo.org> +files/app_ldap-0.9.9-astcfg.diff,
+  +asterisk-app_ldap-0.9.9.ebuild:
+  Version bump.
+
+  27 Aug 2005; <stkn@gentoo.org> asterisk-app_ldap-0.9.3.ebuild,
+  asterisk-app_ldap-0.9.5.ebuild:
+  Added blocker for >=1.1.0 (does not work with 1.2.0 at the moment)
+
+*asterisk-app_ldap-0.9.5 (02 Jul 2005)
+
+  02 Jul 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_ldap-0.9.3.ebuild, +asterisk-app_ldap-0.9.5.ebuild:
+  Version bump and added permission fixup code.
+
+  10 May 2005; David Holm <dholm@gentoo.org> asterisk-app_ldap-0.9.3.ebuild:
+  Added to ~ppc.
+
+  15 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/app_ldap-0.9.3-astcfg.diff:
+  Fixed astcfg patch
 
 *asterisk-app_ldap-0.9.3 (15 Feb 2005)
 
diff --git a/net-misc/asterisk-app_ldap/Manifest b/net-misc/asterisk-app_ldap/Manifest
index df49e764f602..774c6a638251 100644
--- a/net-misc/asterisk-app_ldap/Manifest
+++ b/net-misc/asterisk-app_ldap/Manifest
@@ -1,5 +1,7 @@
+MD5 667ba3547905295d4de1d09c4358a106 asterisk-app_ldap-0.9.9_p2.ebuild 1067
+MD5 0b2539de55defd1ec8f7c719dc04ae38 asterisk-app_ldap-1.0_rc1.ebuild 1065
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 77d034e261e7399eee2814abdb420947 asterisk-app_ldap-0.9.3.ebuild 875
-MD5 e3e2acb59ce3d8551589523388baf122 ChangeLog 416
-MD5 da5efba979b764c22cbab1818e68dfe8 files/app_ldap-0.9.3-astcfg.diff 938
-MD5 f82fd8387708115040b7e9150ac8e645 files/digest-asterisk-app_ldap-0.9.3 61
+MD5 5c9d7b8433cceccddd38ea854c449b94 ChangeLog 2085
+MD5 f2c8f978f335d6a1685ca0613b7fd2f5 files/digest-asterisk-app_ldap-0.9.9_p2 64
+MD5 b04db881b7de10671c3c524accaf2185 files/digest-asterisk-app_ldap-1.0_rc1 62
+MD5 c03b7aacfa063473f9f352484ecf034a files/app_ldap-0.9.9-astcfg.diff 1268
diff --git a/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild b/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild
index d1599933e6e5..58d4ca19de47 100644
--- a/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild
+++ b/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild,v 1.1 2005/08/29 00:45:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 # depends on iconv support
 DEPEND="sys-libs/glibc
diff --git a/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild b/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild
index 7c1adb0bbda0..8f230c2dbe63 100644
--- a/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild
+++ b/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.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/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild,v 1.1 2005/09/29 23:52:02 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-app_ldap/files/app_ldap-0.9.9-astcfg.diff b/net-misc/asterisk-app_ldap/files/app_ldap-0.9.9-astcfg.diff
index efe4d8b5dbf2..ea1de16aeb48 100644
--- a/net-misc/asterisk-app_ldap/files/app_ldap-0.9.9-astcfg.diff
+++ b/net-misc/asterisk-app_ldap/files/app_ldap-0.9.9-astcfg.diff
@@ -39,7 +39,7 @@
 -	fi
 +install:
 +	install -D -m 644 $(CONF).sample $(DESTDIR)/etc/asterisk/$(CONF)
-+	install -D -m 755 $(NAME).so $(DESTDIR)$(MODULES_DIR)
++	install -D -m 755 $(NAME).so $(DESTDIR)$(MODULES_DIR)/$(NAME).so
  
  reload: install
  	asterisk -rx "unload ${RES}"
diff --git a/net-misc/asterisk-app_notify/ChangeLog b/net-misc/asterisk-app_notify/ChangeLog
index f438b8da6faf..29a6195993ed 100644
--- a/net-misc/asterisk-app_notify/ChangeLog
+++ b/net-misc/asterisk-app_notify/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/asterisk-app_notify
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_notify/ChangeLog,v 1.1 2005/08/27 21:50:26 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_notify/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 *asterisk-app_notify-0.9 (27 Aug 2005)
 
diff --git a/net-misc/asterisk-app_notify/Manifest b/net-misc/asterisk-app_notify/Manifest
index 4a7ecf933dcc..c53bd9f55a34 100644
--- a/net-misc/asterisk-app_notify/Manifest
+++ b/net-misc/asterisk-app_notify/Manifest
@@ -1,3 +1,5 @@
-MD5 7e4a6bc7852f5c3401a1953f076c3d4a asterisk-app_notify-0.9.ebuild 846
-MD5 23f907476297db3a183a156b1b391c40 files/digest-asterisk-app_notify-0.9 61
+MD5 4353179a97dffc2f70406d97d1363066 asterisk-app_notify-0.9.ebuild 795
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 19f6ce649aeca18b32a5628502fbc172 ChangeLog 422
 MD5 e9feeca2b8769b6a47354d06f0598ede files/app_notify-0.9-astcfg.diff 853
+MD5 23f907476297db3a183a156b1b391c40 files/digest-asterisk-app_notify-0.9 61
diff --git a/net-misc/asterisk-app_notify/asterisk-app_notify-0.9.ebuild b/net-misc/asterisk-app_notify/asterisk-app_notify-0.9.ebuild
index bb652982ede2..0da753ff899d 100644
--- a/net-misc/asterisk-app_notify/asterisk-app_notify-0.9.ebuild
+++ b/net-misc/asterisk-app_notify/asterisk-app_notify-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_notify/asterisk-app_notify-0.9.ebuild,v 1.1 2005/08/27 21:50:26 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_notify/asterisk-app_notify-0.9.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-app_nv_faxdetect/ChangeLog b/net-misc/asterisk-app_nv_faxdetect/ChangeLog
index f649df1e9107..d7cc3bedf602 100644
--- a/net-misc/asterisk-app_nv_faxdetect/ChangeLog
+++ b/net-misc/asterisk-app_nv_faxdetect/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-misc/asterisk-app_nv_faxdetect
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/ChangeLog,v 1.1 2005/05/31 13:39:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/ChangeLog,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_nv_faxdetect-1.0.6.ebuild:
+  Stable on x86.
+
+  16 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-app_nv_faxdetect-1.0.6.ebuild:
+  Made ebuild ready for asterisk-1.2.0(_pre).
+
+  08 Jul 2005; David Holm <dholm@gentoo.org>
+  asterisk-app_nv_faxdetect-1.0.6.ebuild:
+  Added to ~ppc.
+
+  29 Jun 2005; Stefan Knoblich <stkn@gentoo.org> :
+  Modified DESCRIPTION, making it more clear this ebuild contains both detect
+  apps
 
 *asterisk-app_nv_faxdetect-1.0.6 (31 May 2005)
 
diff --git a/net-misc/asterisk-app_nv_faxdetect/Manifest b/net-misc/asterisk-app_nv_faxdetect/Manifest
index 16181ce0efe3..f6c5df35639b 100644
--- a/net-misc/asterisk-app_nv_faxdetect/Manifest
+++ b/net-misc/asterisk-app_nv_faxdetect/Manifest
@@ -1,6 +1,6 @@
-MD5 cb8dc255b3747f5dc66081de906fefb5 asterisk-app_nv_faxdetect-1.0.6.ebuild 1150
 MD5 56f78a41386fa9e15d7ec06b20cf00c3 metadata.xml 407
-MD5 6ab439ae75518b65a0284f64cea180e4 ChangeLog 583
+MD5 54e86df334d2c0b47e7135e1ccd245f9 ChangeLog 1072
+MD5 2648636aa63c49f58d57e129f949f1fa asterisk-app_nv_faxdetect-1.0.6.ebuild 1304
+MD5 46236880a0a0dab5f08b8708bfbf08a5 files/digest-asterisk-app_nv_faxdetect-1.0.6 73
 MD5 2c6790a54c98bb042028e5ed2a6a4ad0 files/app_nv_faxdetect-1.0.6-astcfg.diff 988
 MD5 bff6abdbd28ddbb349dacdd62f346851 files/app_nv_faxdetect-1.0.6-aststable.diff 1000
-MD5 46236880a0a0dab5f08b8708bfbf08a5 files/digest-asterisk-app_nv_faxdetect-1.0.6 73
diff --git a/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild b/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild
index b01911247f76..f69f253bd9b5 100644
--- a/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild
+++ b/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild,v 1.1 2005/05/31 13:39:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_nv_faxdetect/asterisk-app_nv_faxdetect-1.0.6.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
 inherit eutils
 
 MY_PN="app_nv_faxdetect"
 
-DESCRIPTION="Asterisk application plugins to detect incoming faxes, dtfm and voice"
+DESCRIPTION="Asterisk plugins to detect faxes, dtfm and voice (faxdetect and backgrounddetect)"
 HOMEPAGE="http://www.newmantelecom.com/asterisk/faxdetect/"
 SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.bz2"
 
@@ -14,7 +14,7 @@ IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="sys-libs/glibc
 	>=net-misc/asterisk-1.0.5-r1"
@@ -27,8 +27,14 @@ src_unpack() {
 	cd ${S}
 	# use asterisk-config...
 	epatch ${FILESDIR}/app_nv_faxdetect-${PV}-astcfg.diff
-	# change callerid to asterisk stable
-	epatch ${FILESDIR}/app_nv_faxdetect-${PV}-aststable.diff
+
+	if has_version "<net-misc/asterisk-1.1.0"; then
+		einfo "Building for Asterisk-1.0.x"
+		# change callerid to asterisk stable
+		epatch ${FILESDIR}/app_nv_faxdetect-${PV}-aststable.diff
+	else
+		einfo "Building for Asterisk-1.2.x"
+	fi
 }
 
 src_compile() {
diff --git a/net-misc/asterisk-cdr_shell/ChangeLog b/net-misc/asterisk-cdr_shell/ChangeLog
index fca3eb4886b0..e3203e100027 100644
--- a/net-misc/asterisk-cdr_shell/ChangeLog
+++ b/net-misc/asterisk-cdr_shell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-cdr_shell
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/ChangeLog,v 1.1 2005/07/01 21:09:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
+
+  16 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/cdr_shell-20050626-ast1.2.diff, asterisk-cdr_shell-20050626.ebuild:
+  Modified ebuild and patch for asterisk-1.2.0(_pre).
+
+  02 Jul 2005; David Holm <dholm@gentoo.org>
+  asterisk-cdr_shell-20050626.ebuild:
+  Added to ~ppc.
 
 *asterisk-cdr_shell-20050626 (01 Jul 2005)
 
diff --git a/net-misc/asterisk-cdr_shell/Manifest b/net-misc/asterisk-cdr_shell/Manifest
index f59b55da6150..221de5d0bf2d 100644
--- a/net-misc/asterisk-cdr_shell/Manifest
+++ b/net-misc/asterisk-cdr_shell/Manifest
@@ -1,4 +1,8 @@
-MD5 42598ddb2a55fddd4adfd452e25585d7 asterisk-cdr_shell-20050626.ebuild 708
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 33a759f34b2d548a9322330dd24d72f3 ChangeLog 770
+MD5 cbf6d188d3c7db7c818a9d217b898cef asterisk-cdr_shell-20050626.ebuild 1208
+MD5 10662cb4837ffa9e0632299fdb67c2c3 files/cdr.conf 150
+MD5 8edb3d1311c424a62b5a17a02c22541a files/cdr_shell-20050626-ast1.2.diff 302
 MD5 a259df19a6815f1d560ef5128719df41 files/cdr_shell-20050626-stable.diff 746
 MD5 c7f98ec712b829b32b590ea718a8ea8d files/digest-asterisk-cdr_shell-20050626 78
 MD5 45326ecd0899ea3dfdabea2a556934d8 files/cdr_shell-20050626-astcfg.diff 697
diff --git a/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild b/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild
index 21f447cb2549..abd817ee4c2a 100644
--- a/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild
+++ b/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild,v 1.1 2005/07/01 21:09:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-cdr_shell/asterisk-cdr_shell-20050626.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND=">=net-misc/asterisk-1.0.7-r1"
 
@@ -25,8 +25,15 @@ src_unpack() {
 	# use asterisk-config...
 	epatch ${FILESDIR}/${MY_PN}-${PV}-astcfg.diff
 
-	# patch for asterisk stable
-	epatch ${FILESDIR}/${MY_PN}-${PV}-stable.diff
+	if has_version "<net-misc/asterisk-1.1.0"; then
+		einfo "Building for Asterisk-1.0.x"
+		# patch for asterisk stable
+		epatch ${FILESDIR}/${MY_PN}-${PV}-stable.diff
+	else
+		einfo "Building for Asterisk-1.2.x"
+		# patch for asterisk 1.2
+		epatch ${FILESDIR}/${MY_PN}-${PV}-ast1.2.diff
+	fi
 }
 
 src_compile() {
diff --git a/net-misc/asterisk-chan_bluetooth/ChangeLog b/net-misc/asterisk-chan_bluetooth/ChangeLog
index bfd51a3b956e..e55bd7b8d6b3 100644
--- a/net-misc/asterisk-chan_bluetooth/ChangeLog
+++ b/net-misc/asterisk-chan_bluetooth/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-chan_bluetooth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_bluetooth/ChangeLog,v 1.1 2005/02/15 20:41:28 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_bluetooth/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+  27 Aug 2005; <stkn@gentoo.org>
+  asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild:
+  Added blocker for >=1.1.0 (does not work with 1.2.0 at the moment)
+
+  10 May 2005; David Holm <dholm@gentoo.org>
+  asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild:
+  Added to ~ppc.
 
 *asterisk-chan_bluetooth-0.0.1_pre20050212 (15 Feb 2005)
 
diff --git a/net-misc/asterisk-chan_bluetooth/Manifest b/net-misc/asterisk-chan_bluetooth/Manifest
index 46150025cf8e..3e32428edf21 100644
--- a/net-misc/asterisk-chan_bluetooth/Manifest
+++ b/net-misc/asterisk-chan_bluetooth/Manifest
@@ -1,5 +1,5 @@
+MD5 11c6ffea8d341429c0828dea768d4b0c asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild 914
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 0f9da451ecdb4461004b42a13412ad49 asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild 881
-MD5 403610975a6d59d50fafb53601a56867 ChangeLog 472
-MD5 74a9205a1d0d13c253a51177665cfed7 files/chan_bluetooth-0.0.0-astcfg.diff 1519
+MD5 d5395c014553638ac540b6d8eb23526f ChangeLog 742
 MD5 bf915f67847a33d3217b9c3c65291a1b files/digest-asterisk-chan_bluetooth-0.0.1_pre20050212 83
+MD5 74a9205a1d0d13c253a51177665cfed7 files/chan_bluetooth-0.0.0-astcfg.diff 1519
diff --git a/net-misc/asterisk-chan_bluetooth/asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild b/net-misc/asterisk-chan_bluetooth/asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild
index f4f581708c3e..e3e1e729d4b8 100644
--- a/net-misc/asterisk-chan_bluetooth/asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild
+++ b/net-misc/asterisk-chan_bluetooth/asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_bluetooth/asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild,v 1.1 2005/02/15 20:41:28 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_bluetooth/asterisk-chan_bluetooth-0.0.1_pre20050212.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 inherit eutils
 
@@ -12,12 +12,13 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
 DEPEND=">=net-wireless/bluez-libs-2.10
-	>=net-misc/asterisk-1.0.5-r1"
+	>=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.1.0"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/net-misc/asterisk-chan_capi/ChangeLog b/net-misc/asterisk-chan_capi/ChangeLog
index c017436817c5..5c8e9b9b14a5 100644
--- a/net-misc/asterisk-chan_capi/ChangeLog
+++ b/net-misc/asterisk-chan_capi/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-misc/asterisk-chan_capi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/ChangeLog,v 1.1 2005/02/21 01:32:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+  16 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-chan_capi-0.3.5.ebuild, asterisk-chan_capi-0.4.0_pre1.ebuild:
+  Block >=asterisk-1.1.0, because 1.2.0(_pre) is not supported at the moment.
+
+  10 May 2005; David Holm <dholm@gentoo.org>
+  asterisk-chan_capi-0.4.0_pre1.ebuild:
+  Added to ~ppc.
+
+*asterisk-chan_capi-0.4.0_pre1 (07 May 2005)
+
+  07 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/chan_capi-0.4.0_pre1-fixstable.diff,
+  +asterisk-chan_capi-0.4.0_pre1.ebuild:
+  Version bump (w/o fax patch).
+
+  29 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-chan_capi-0.3.5.ebuild:
+  Added chan_capi fax patch from http://mlkj.net/asterisk/.
 
 *asterisk-chan_capi-0.3.5 (21 Feb 2005)
 
diff --git a/net-misc/asterisk-chan_capi/Manifest b/net-misc/asterisk-chan_capi/Manifest
index 874c0c2e4b61..6dd5382e0e0a 100644
--- a/net-misc/asterisk-chan_capi/Manifest
+++ b/net-misc/asterisk-chan_capi/Manifest
@@ -1,3 +1,8 @@
-MD5 4373d0f64378ebf6ee928840981d97fe asterisk-chan_capi-0.3.5.ebuild 521
-MD5 638b29011d5aa2a04c9ae5a706d16b89 files/digest-chan_capi-0.3.5 66
-MD5 638b29011d5aa2a04c9ae5a706d16b89 files/digest-asterisk-chan_capi-0.3.5 66
+MD5 7bf09a9535cbb46b2eab2c1fadf26ff0 asterisk-chan_capi-0.3.5.ebuild 1361
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 633e7fbee428216d108a124d9b73640c ChangeLog 1085
+MD5 b9a7eaa0a80f661af9d28d444ae32a42 asterisk-chan_capi-0.4.0_pre1.ebuild 1510
+MD5 5fb008e4edf8bc00ef1dc2d54d7e3f82 files/digest-asterisk-chan_capi-0.4.0_pre1 71
+MD5 e5aae4f4a5d2ebec655dcab65ef0fac4 files/chan_capi-0.4.0_pre1-fixstable.diff 500
+MD5 20866dceae16bdac07ffa8b6f8aa2986 files/chan_capi-0.3.5-gentoo.diff 1113
+MD5 1e4bba4e8f386ad925da084174d4a5e2 files/digest-asterisk-chan_capi-0.3.5 138
diff --git a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild
index 476bdc50537e..a7eb063546d2 100644
--- a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild
+++ b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild,v 1.1 2005/02/21 01:32:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.3.5.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+IUSE="fax"
 
 inherit eutils
 
@@ -8,15 +10,15 @@ MY_PN="chan_capi"
 
 DESCRIPTION="CAPI2.0 channel module for Asterisk"
 HOMEPAGE="http://www.junghanns.net/asterisk/"
-SRC_URI="http://www.junghanns.net/asterisk/downloads/${MY_PN}.${PV}.tar.gz"
+SRC_URI="http://www.junghanns.net/asterisk/downloads/${MY_PN}.${PV}.tar.gz
+	 fax? ( http://mlkj.net/asterisk/${MY_PN}-${PV}-patch.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-IUSE=""
-
 DEPEND=">=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.1.0
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/${MY_PN}-${PV}
@@ -26,6 +28,12 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${MY_PN}-${PV}-gentoo.diff
+
+	if use fax; then
+		einfo "Enabling fax support"
+		epatch ${WORKDIR}/chan_capi.diff
+		cp ${WORKDIR}/app_capiFax.c ${S}
+	fi
 }
 
 src_compile() {
diff --git a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild
index 91eaae5fc700..9076b6c72caf 100644
--- a/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild
+++ b/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.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-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild,v 1.1 2005/05/07 18:01:08 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_capi/asterisk-chan_capi-0.4.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
-IUSE="fax"
+IUSE=""
 
 inherit eutils
 
@@ -15,9 +15,10 @@ SRC_URI="http://www.junghanns.net/asterisk/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.1.0
 	net-dialup/capi4k-utils"
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-misc/asterisk-chan_capi/files/digest-asterisk-chan_capi-0.3.5 b/net-misc/asterisk-chan_capi/files/digest-asterisk-chan_capi-0.3.5
index 93626395ab32..0a3b563d3bc5 100644
--- a/net-misc/asterisk-chan_capi/files/digest-asterisk-chan_capi-0.3.5
+++ b/net-misc/asterisk-chan_capi/files/digest-asterisk-chan_capi-0.3.5
@@ -1 +1,2 @@
 MD5 516a053b9c49204da8fa625866e9e1c3 chan_capi.0.3.5.tar.gz 40825
+MD5 fb2dcbb4c80e8800fabcafac3b115675 chan_capi-0.3.5-patch.tar.bz2 4263
diff --git a/net-misc/asterisk-chan_sccp/ChangeLog b/net-misc/asterisk-chan_sccp/ChangeLog
index 6d590d694de4..ea9e5d296bc7 100644
--- a/net-misc/asterisk-chan_sccp/ChangeLog
+++ b/net-misc/asterisk-chan_sccp/ChangeLog
@@ -1,6 +1,70 @@
 # ChangeLog for net-misc/asterisk-chan_sccp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/ChangeLog,v 1.1 2005/07/29 03:03:25 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/ChangeLog,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
+
+*asterisk-chan_sccp-0.0.20051118 (20 Nov 2005)
+
+  20 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/chan_sccp-20051118-gentoo.diff,
+  +asterisk-chan_sccp-0.0.20051118.ebuild:
+  Version bump.
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-chan_sccp-0.0.20050826.ebuild:
+  Stable on x86.
+
+*asterisk-chan_sccp-0.0.20050922 (22 Sep 2005)
+
+  22 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-chan_sccp-0.0.20050922.ebuild:
+  Version bump.
+
+*asterisk-chan_sccp-0.0.20050913 (15 Sep 2005)
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-chan_sccp-0.0.20050913.ebuild:
+  Version bump.
+
+*asterisk-chan_sccp-0.0.20050906 (08 Sep 2005)
+
+  08 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-chan_sccp-0.0.20050906.ebuild:
+  Version bump. Fixes two potential crashes and a one-way audio problem with
+  older cisco phones.
+
+  02 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-chan_sccp-0.0.20050807.ebuild:
+  Stable on x86.
+
+*asterisk-chan_sccp-0.0.20050902 (02 Sep 2005)
+
+  02 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/chan_sccp-20050902-gentoo.diff,
+  +asterisk-chan_sccp-0.0.20050902.ebuild:
+  Version bump.
+
+  27 Aug 2005; <stkn@gentoo.org> -asterisk-chan_sccp-0.0.20050725.ebuild,
+  -asterisk-chan_sccp-0.0.20050730.ebuild:
+  Removed old versions.
+
+*asterisk-chan_sccp-0.0.20050826 (27 Aug 2005)
+
+  27 Aug 2005; <stkn@gentoo.org> +asterisk-chan_sccp-0.0.20050826.ebuild:
+  Version bump.
+
+*asterisk-chan_sccp-0.0.20050807 (18 Aug 2005)
+
+  18 Aug 2005; <stkn@gentoo.org> +asterisk-chan_sccp-0.0.20050807.ebuild:
+  Version bump.
+
+*asterisk-chan_sccp-0.0.20050730 (30 Jul 2005)
+
+  30 Jul 2005; <stkn@gentoo.org> +asterisk-chan_sccp-0.0.20050730.ebuild:
+  Version bump.
+
+  29 Jul 2005; David Holm <dholm@gentoo.org>
+  asterisk-chan_sccp-0.0.20050725.ebuild:
+  Added to ~ppc.
 
 *asterisk-chan_sccp-0.0.20050725 (29 Jul 2005)
 
diff --git a/net-misc/asterisk-chan_sccp/Manifest b/net-misc/asterisk-chan_sccp/Manifest
index 67ac6f505b45..925709d0bbb2 100644
--- a/net-misc/asterisk-chan_sccp/Manifest
+++ b/net-misc/asterisk-chan_sccp/Manifest
@@ -1,5 +1,19 @@
-MD5 d6968bb202225c5b36876f79a4d9f213 asterisk-chan_sccp-0.0.20050725.ebuild 1205
+MD5 626d8d51787cc82f04f789ef7bce6e60 asterisk-chan_sccp-0.0.20050826.ebuild 1220
+MD5 85a3b9ce289dc8e6b9f8c21f86c74260 asterisk-chan_sccp-0.0.20050913.ebuild 1221
+MD5 a74c3fb974de450705cbbfa61ea59f0d asterisk-chan_sccp-0.0.20050902.ebuild 1221
+MD5 ea7d05044e9fd969f20575c1eb28831f asterisk-chan_sccp-0.0.20050807.ebuild 1220
+MD5 a9c007ccad69028c5657307f7bec6b6d asterisk-chan_sccp-0.0.20051118.ebuild 1221
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 8629a322029057019e7550065c9dcec8 ChangeLog 506
-MD5 2ccb3003ec5b468439b526f619d78a31 files/digest-asterisk-chan_sccp-0.0.20050725 70
+MD5 cc4edfe1c504fbc862350e79762f3ebc ChangeLog 2339
+MD5 47e629b670190e58d8a5c9bc69987c48 asterisk-chan_sccp-0.0.20050922.ebuild 1221
+MD5 fa358f255e2c823b7d384ec8331e1f62 asterisk-chan_sccp-0.0.20050906.ebuild 1221
+MD5 e7ee89da9be491c3bc8d35ec082fb77d files/chan_sccp-20050902-gentoo.diff 2219
+MD5 1d84bf73ca6681166fd5b99c041781a7 files/digest-asterisk-chan_sccp-0.0.20051118 70
+MD5 698d7cb54349753768338e8fc98c866b files/digest-asterisk-chan_sccp-0.0.20050906 70
+MD5 2c7f8a1aaaa9c1dfe69c5555e7293d49 files/digest-asterisk-chan_sccp-0.0.20050913 70
+MD5 d50a8faf83a31d88aa12161bcdd8baa3 files/digest-asterisk-chan_sccp-0.0.20050922 70
+MD5 04446492f50aeda790ef899c4f9c7968 files/digest-asterisk-chan_sccp-0.0.20050826 70
+MD5 30eb666962717f702efb95d918c19b51 files/digest-asterisk-chan_sccp-0.0.20050807 70
+MD5 a6ef07a48ddcfd2c436dd35c561f3689 files/chan_sccp-20051118-gentoo.diff 3029
+MD5 e6fb198665c63dffdae3e3c41a281f7a files/digest-asterisk-chan_sccp-0.0.20050902 70
 MD5 16f7563f69269ec845f0278beee36014 files/chan_sccp-20050725-gentoo.diff 2677
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild
index 168f7699b3c7..421f72fab2f2 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild,v 1.1 2005/08/18 18:27:16 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050807.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/chan-sccp/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 LICENSE="GPL-2"
 
 DEPEND=">=net-misc/asterisk-1.0.5-r2"
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild
index 1ae6d3af9932..25786424f3aa 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild,v 1.1 2005/08/27 21:11:24 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050826.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/chan-sccp/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 LICENSE="GPL-2"
 
 DEPEND=">=net-misc/asterisk-1.0.5-r2"
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild
index a48216766c6e..0e8a4f34ee89 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild,v 1.1 2005/09/02 20:15:56 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050902.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild
index bf316ba6af31..842c831a0999 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild,v 1.1 2005/09/07 23:51:33 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050906.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild
index ed6e8a7dffb9..849e2cc795aa 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild,v 1.1 2005/09/15 02:49:12 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050913.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050922.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050922.ebuild
index cce6f7b21f05..e8a9dee2c313 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050922.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.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/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050922.ebuild,v 1.1 2005/09/22 21:19:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20050922.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051118.ebuild b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051118.ebuild
index 0d03c4962f7e..357229dac3ca 100644
--- a/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051118.ebuild
+++ b/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051118.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051118.ebuild,v 1.1 2005/11/20 21:29:56 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_sccp/asterisk-chan_sccp-0.0.20051118.ebuild,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-chan_unistim/ChangeLog b/net-misc/asterisk-chan_unistim/ChangeLog
index de8828660e68..4bc2dbbc696b 100644
--- a/net-misc/asterisk-chan_unistim/ChangeLog
+++ b/net-misc/asterisk-chan_unistim/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/asterisk-chan_unistim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/ChangeLog,v 1.1 2005/03/29 15:09:44 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/ChangeLog,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
+
+  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-chan_unistim-0.9.2.ebuild:
+  Added code to fix permissions of config files and marked stable on x86.
+
+  27 Aug 2005; <stkn@gentoo.org> asterisk-chan_unistim-0.9.2.ebuild:
+  Added blocker for >=1.1.0 (does not work with 1.2.0 at the moment)
+
+  10 May 2005; David Holm <dholm@gentoo.org>
+  asterisk-chan_unistim-0.9.2.ebuild:
+  Added to ~ppc.
 
 *asterisk-chan_unistim-0.9.2 (29 Mar 2005)
 
diff --git a/net-misc/asterisk-chan_unistim/Manifest b/net-misc/asterisk-chan_unistim/Manifest
index 627509983876..9d96a90de629 100644
--- a/net-misc/asterisk-chan_unistim/Manifest
+++ b/net-misc/asterisk-chan_unistim/Manifest
@@ -1,5 +1,5 @@
-MD5 84e387ba3f6782565d4872f22cd8d24a asterisk-chan_unistim-0.9.2.ebuild 1007
+MD5 917f0f4d1ea3db95d5c2da7ef53af2b9 asterisk-chan_unistim-0.9.2.ebuild 1226
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 9e6c9b5a27b87c707a4d97db9ae1a40d ChangeLog 436
+MD5 d182b91f1f7be0407a58e75ee2e0d6d4 ChangeLog 838
 MD5 f0678d1843ce2d23377a81330b2e16d4 files/digest-asterisk-chan_unistim-0.9.2 70
 MD5 9ae3094eb04050f9e75039f3b326bac8 files/chan_unistim-0.9.2-gentoo.diff 1367
diff --git a/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.2.ebuild b/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.2.ebuild
index c8f7babe32e4..4fc385b3a026 100644
--- a/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.2.ebuild
+++ b/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.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/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.2.ebuild,v 1.1 2005/03/29 15:09:44 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit eutils
 
@@ -12,11 +12,12 @@ SRC_URI="http://mlkj.net/asterisk/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 
 IUSE=""
 
-DEPEND=">=net-misc/asterisk-1.0.5-r1"
+DEPEND=">=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.1.0"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
@@ -35,6 +36,13 @@ src_install() {
 	make INSTALL_PREFIX=${D} install config || die "make install failed"
 
 	dodoc README unistim.conf
+
+	# fix permissions
+	if [[ -n "$(egetent group asterisk)" ]]; then
+		einfo "Fixing permissions..."
+		chown -R root:asterisk ${D}etc/asterisk
+		chmod -R u=rwX,g=rX,o= ${D}etc/asterisk
+	fi
 }
 
 pkg_postinst() {
diff --git a/net-misc/asterisk-rate_engine/ChangeLog b/net-misc/asterisk-rate_engine/ChangeLog
index 20e9badf63c6..194997a35128 100644
--- a/net-misc/asterisk-rate_engine/ChangeLog
+++ b/net-misc/asterisk-rate_engine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/asterisk-rate_engine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-rate_engine/ChangeLog,v 1.1 2005/02/20 21:16:08 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-rate_engine/ChangeLog,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
+
+  27 Aug 2005; <stkn@gentoo.org> asterisk-rate_engine-0.5.4.ebuild:
+  Added blocker for >=1.1.0 (does not work with 1.2.0 at the moment)
+
+  10 May 2005; David Holm <dholm@gentoo.org>
+  asterisk-rate_engine-0.5.4.ebuild:
+  Added to ~ppc.
 
 *asterisk-rate_engine-0.5.4 (20 Feb 2005)
 
diff --git a/net-misc/asterisk-rate_engine/Manifest b/net-misc/asterisk-rate_engine/Manifest
index bf1aea9fbd88..5e4f496901ac 100644
--- a/net-misc/asterisk-rate_engine/Manifest
+++ b/net-misc/asterisk-rate_engine/Manifest
@@ -1,2 +1,5 @@
-MD5 d555e101d92937736b1acbe53d311cbd asterisk-rate_engine-0.5.4.ebuild 605
+MD5 bfdaecc9b181d055fd7d7723beadfea9 asterisk-rate_engine-0.5.4.ebuild 1008
+MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 c0716695b4cffa4509b05d01dfbbf145 ChangeLog 669
+MD5 69a586545e29354383ac6475195f2702 files/rate-engine-0.5.4-astcfg.diff 1307
 MD5 0be620940cf5640a17daa830d0c9da2f files/digest-asterisk-rate_engine-0.5.4 68
diff --git a/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild b/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
index 09278f6b7346..458a623bb529 100644
--- a/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
+++ b/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild,v 1.1 2005/02/20 21:16:08 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
 inherit eutils
 
@@ -14,11 +14,12 @@ IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="dev-libs/libpcre
 	dev-db/mysql
-	>=net-misc/asterisk-1.0.5-r1"
+	>=net-misc/asterisk-1.0.5-r1
+	!>=net-misc/asterisk-1.1.0"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
diff --git a/net-misc/asterisk-sounds/ChangeLog b/net-misc/asterisk-sounds/ChangeLog
index 99374cfe8a2d..88761392a422 100644
--- a/net-misc/asterisk-sounds/ChangeLog
+++ b/net-misc/asterisk-sounds/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-misc/asterisk-sounds
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/ChangeLog,v 1.1 2005/03/10 00:56:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-sounds-1.0.8.ebuild:
+  Stable on x86.
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-sounds-1.0.6.ebuild, asterisk-sounds-1.0.7.ebuild,
+  asterisk-sounds-1.0.8.ebuild:
+  Fixed SRC_URI.
+
+*asterisk-sounds-1.2.0_beta1 (09 Sep 2005)
+
+  09 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/asterisk-sounds-1.2.0_beta1-description.diff,
+  +asterisk-sounds-1.2.0_beta1.ebuild:
+  Version bump.
+
+*asterisk-sounds-1.0.8 (25 Jun 2005)
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-sounds-1.0.8.ebuild, asterisk-sounds-1.0.6.ebuild,
+  asterisk-sounds-1.0.7.ebuild:
+  Version bump. Added non-root permission fixes.
+
+  10 May 2005; David Holm <dholm@gentoo.org> asterisk-sounds-1.0.7.ebuild:
+  Added to ~ppc.
+
+*asterisk-sounds-1.0.7 (21 Mar 2005)
+
+  21 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +asterisk-sounds-1.0.7.ebuild:
+  Version bump.
 
 *asterisk-sounds-1.0.6 (10 Mar 2005)
 
diff --git a/net-misc/asterisk-sounds/Manifest b/net-misc/asterisk-sounds/Manifest
index 588649c6a78e..b21072013a11 100644
--- a/net-misc/asterisk-sounds/Manifest
+++ b/net-misc/asterisk-sounds/Manifest
@@ -1,2 +1,11 @@
-MD5 923904202bdcfa008420dfdae215cf54 asterisk-sounds-1.0.6.ebuild 672
+MD5 1c79a235d896b61288cf13481034b94f asterisk-sounds-1.0.6.ebuild 788
+MD5 fdb31630ec361c9078cff81c9d9f81ae asterisk-sounds-1.0.7.ebuild 788
+MD5 cc4f91235bede396459af021c964dedc asterisk-sounds-1.2.0_beta1.ebuild 1016
+MD5 f82a8bd1aa130d76aad035e3fe971abe asterisk-sounds-1.0.8.ebuild 787
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+MD5 2080297bb37d817cf5bf74563b88d8d9 ChangeLog 1333
+MD5 52b41306e47aa47d6c7825684c715017 files/digest-asterisk-sounds-1.0.7 74
+MD5 c54e61bcd73f8f35aaa96d23ecdd8403 files/asterisk-sounds-1.2.0_beta1-description.diff 1455
+MD5 be8b1e0161c87c766857daadd1f606b9 files/digest-asterisk-sounds-1.2.0_beta1 80
 MD5 08e0799d2792b7833b850ee29bcb5bea files/digest-asterisk-sounds-1.0.6 74
+MD5 0e381530d5433423afd7cea188ce8043 files/digest-asterisk-sounds-1.0.8 74
diff --git a/net-misc/asterisk-sounds/asterisk-sounds-1.0.6.ebuild b/net-misc/asterisk-sounds/asterisk-sounds-1.0.6.ebuild
index 5bc6dde6523e..a68edec9e5e6 100644
--- a/net-misc/asterisk-sounds/asterisk-sounds-1.0.6.ebuild
+++ b/net-misc/asterisk-sounds/asterisk-sounds-1.0.6.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.0.6.ebuild,v 1.1 2005/03/10 00:56:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.0.6.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="Additional sounds for Asterisk"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/asterisk/${P}.tar.gz"
-
-S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.digium.com/pub/telephony/asterisk/old-releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,4 +18,10 @@ src_install() {
 	emake -j1 DESTDIR=${D} install || die "Make install failed"
 
 	dodoc README.txt sounds-extra.txt
+
+	# fix permissions
+	if has_version ">=net-misc/asterisk-1.0.5-r2"; then
+		chown -R asterisk:asterisk ${D}/var/lib/asterisk
+		chmod -R u=rwX,g=rX,o=     ${D}/var/lib/asterisk
+	fi
 }
diff --git a/net-misc/asterisk-sounds/asterisk-sounds-1.0.7.ebuild b/net-misc/asterisk-sounds/asterisk-sounds-1.0.7.ebuild
index 79b164fd0712..1bd548043289 100644
--- a/net-misc/asterisk-sounds/asterisk-sounds-1.0.7.ebuild
+++ b/net-misc/asterisk-sounds/asterisk-sounds-1.0.7.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.0.7.ebuild,v 1.1 2005/03/21 00:52:30 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="Additional sounds for Asterisk"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/asterisk/${P}.tar.gz"
-
-S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.digium.com/pub/telephony/asterisk/old-releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~amd64"
+KEYWORDS="~x86 ~sparc ~hppa ~amd64 ~ppc"
 
 DEPEND="net-misc/asterisk"
 
 src_install() {
-	emake -j1 DESTDIR=${D} install || die "Make install failed"
+	make DESTDIR=${D} install || die "Make install failed"
 
 	dodoc README.txt sounds-extra.txt
+
+	# fix permissions
+	if has_version ">=net-misc/asterisk-1.0.5-r2"; then
+		chown -R asterisk:asterisk ${D}/var/lib/asterisk
+		chmod -R u=rwX,g=rX,o=     ${D}/var/lib/asterisk
+	fi
 }
diff --git a/net-misc/asterisk-sounds/asterisk-sounds-1.0.8.ebuild b/net-misc/asterisk-sounds/asterisk-sounds-1.0.8.ebuild
index d74d079b1fd7..c17e9ec86a99 100644
--- a/net-misc/asterisk-sounds/asterisk-sounds-1.0.8.ebuild
+++ b/net-misc/asterisk-sounds/asterisk-sounds-1.0.8.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.0.8.ebuild,v 1.1 2005/06/25 09:53:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="Additional sounds for Asterisk"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/asterisk/${P}.tar.gz"
-
-S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.digium.com/pub/telephony/asterisk/old-releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~hppa ~amd64 ~ppc"
 
 DEPEND="net-misc/asterisk"
 
diff --git a/net-misc/asterisk-sounds/asterisk-sounds-1.2.0_beta1.ebuild b/net-misc/asterisk-sounds/asterisk-sounds-1.2.0_beta1.ebuild
index 4ae0481dd7db..499602a7599c 100644
--- a/net-misc/asterisk-sounds/asterisk-sounds-1.2.0_beta1.ebuild
+++ b/net-misc/asterisk-sounds/asterisk-sounds-1.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.2.0_beta1.ebuild,v 1.1 2005/09/09 18:58:28 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-sounds/asterisk-sounds-1.2.0_beta1.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index d9ba8643869f..11e8dfa83ca0 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,9 +1,451 @@
 # ChangeLog for net-misc/asterisk
-# 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/net-misc/asterisk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:23 chriswhite Exp $
+
+  20 Nov 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.2.0.ebuild:
+  Re-enabled bri support.
+
+  18 Nov 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.9-r2.ebuild:
+  Fix #112733, typo in the version check.
+
+*asterisk-1.2.0 (18 Nov 2005)
+
+  18 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.2.0/asterisk-1.2.0_beta-ukcid.patch,
+  -asterisk-1.2.0_beta1-r1.ebuild, +asterisk-1.2.0.ebuild:
+  Version bumped and removed old beta ebuild
+
+*asterisk-1.2.0_beta1-r1 (08 Nov 2005)
+*asterisk-1.0.9-r2 (08 Nov 2005)
+*asterisk-1.0.8-r1 (08 Nov 2005)
+*asterisk-1.0.7-r2 (08 Nov 2005)
+*asterisk-1.0.6-r2 (08 Nov 2005)
+*asterisk-1.0.5-r3 (08 Nov 2005)
+
+  08 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.9-vmail.cgi.patch, -asterisk-1.0.5-r2.ebuild,
+  +asterisk-1.0.5-r3.ebuild, -asterisk-1.0.6-r1.ebuild,
+  +asterisk-1.0.6-r2.ebuild, -asterisk-1.0.7-r1.ebuild,
+  +asterisk-1.0.7-r2.ebuild, -asterisk-1.0.8.ebuild,
+  +asterisk-1.0.8-r1.ebuild, -asterisk-1.0.9.ebuild,
+  -asterisk-1.0.9-r1.ebuild, +asterisk-1.0.9-r2.ebuild,
+  -asterisk-1.2.0_beta1.ebuild, +asterisk-1.2.0_beta1-r1.ebuild:
+  Security revbump, fixes #11836. Removed old insecure versions. Thanks to
+  Rajiv Manglani <rajiv@gentoo.org> for reporting this one.
+
+  29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/1.0.0/asterisk-1.0.9-freetds.diff:
+  tds_free_connect has been renamed too, update patch
+
+  29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.9-freetds.diff, asterisk-1.0.9-r1.ebuild:
+  Fixed cdr_tds module compilation with >=freetds-0.6.3, reported by
+  Widyachacra Rajapaksha.
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,
+  asterisk-1.0.9.ebuild, asterisk-1.0.9-r1.ebuild:
+  Fixed SRC_URI.
+
+  13 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.8-ptr64fix.diff, asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,
+  asterisk-1.0.9.ebuild, asterisk-1.0.9-r1.ebuild:
+  Fix segfault on amd64 caused by wrong data-type in pointer arithmetic
+  (#105762), thanks to Joseph for reporting this.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  asterisk-1.2.0_beta1.ebuild:
+  Mark 1.2.0_beta1 ~alpha
+
+  08 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.5-lpc10flags.diff, asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,
+  asterisk-1.0.9-r1.ebuild, asterisk-1.0.9.ebuild:
+  Removed the CFLAGS+=-march=$(PROC) (where $(PROC) = uname -m) part from the
+  lpc10 Makefile, this fixes the illegal instruction error message on
+  non-nehemiah Via C3 CPUs (bug #84939). Thanks to
+  Christian Zoffoli <xmerlin@gentoo.org> for providing the neccessary
+  information to fix this bug.
+
+  02 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-1.2.0_beta1.ebuild:
+  Changed /bin/false to -1 for Gentoo/*BSD (bug #103421).
+
+  29 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-1.2.0_beta1.ebuild:
+  Tarball has been fixed, updated digest and removed workaround.
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-1.2.0_beta1.ebuild:
+  Added a workaround for the missing version information (thanks to DBoone on
+  IRC for pointing this out). Make all would do a clean run because of a
+  left-over .cleancount file in the tarball, killing the .version file. We
+  simply remove .cleancount now if it does exist.
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-1.2.0_beta1.ebuild:
+  Small cleanup.
+
+*asterisk-1.2.0_beta1 (27 Aug 2005)
+
+  27 Aug 2005; <stkn@gentoo.org> +asterisk-1.2.0_beta1.ebuild:
+  Added new 1.2.0 beta ebuild.
+
+  24 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  files/1.0.0/asterisk.rc6.sec:
+  made init script "use mysql and postgresql" as per bug #101798. Thanks to
+  Chris Gaffney for the bug report
+
+  23 Aug 2005; <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,
+  asterisk-1.0.9.ebuild, asterisk-1.0.9-r1.ebuild:
+  Use -1 instead of /bin/false with enewuser.
+
+*asterisk-1.0.9-r1 (18 Aug 2005)
+
+  18 Aug 2005; <stkn@gentoo.org> asterisk-1.0.6-r1.ebuild,
+  asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild, asterisk-1.0.9.ebuild,
+  +asterisk-1.0.9-r1.ebuild:
+  Revision bump (bristuff update) and fixed bristuff part of SRC_URI (after
+  site redesign).
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> asterisk-1.0.8.ebuild:
+  Stable on sparc
+
+  29 Jul 2005; <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.9-weak-references.diff, asterisk-1.0.9.ebuild,
+  asterisk-1.0.8.ebuild:
+  Added patch to mark adsi_* functions as weak references, this fixes loading
+  of res_features.so (= asterisk startup) on ssp enabled systems. Many thanks
+  to Uberlord (Roy Marples <uberlord@gentoo.org>) for examining the problem
+  and providing a patch. Closing #100697 and #85655.
+
+*asterisk-1.0.9 (29 Jul 2005)
+
+  29 Jul 2005; <stkn@gentoo.org> +asterisk-1.0.9.ebuild:
+  Version bump.
+
+  26 Jul 2005; <stkn@gentoo.org> asterisk-1.0.8.ebuild:
+  Stable on x86 and fixed SRC_URI.
+
+  26 Jul 2005; <stkn@gentoo.org> -files/0.9.0/asterisk.confd,
+  -files/0.9.0/asterisk.rc6, -asterisk-0.9.0.ebuild:
+  Removing old version.
+
+  26 Jul 2005; <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild:
+  Added openssl to dependencies (thanks jaervosz).
+
+  21 Jul 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild:
+  Moved user+group creation to pkg_preinst() as suggested by Gabe in bug #99466,
+  permissions and ownerships are changed in pkg_postinst() now.
+
+  28 Jun 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7-r1.ebuild:
+  Marking stable on x86, closing #88732 and #96826.
+
+  26 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.8-callerid.patch, asterisk-1.0.8.ebuild:
+  Added dialplan callerid matching fix.
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild:
+  Fixed SRC_URI and a typo.
+
+  25 Jun 2005; David Holm <dholm@gentoo.org> asterisk-1.0.7-r1.ebuild:
+  Added to ~ppc.
+
+  25 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  asterisk-1.0.8.ebuild:
+  Added to ~ppc.
+
+*asterisk-1.0.8 (25 Jun 2005)
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.8-hppa.patch,
+  +files/1.0.0/asterisk-1.0.8-initgroups.diff, +asterisk-1.0.8.ebuild:
+  Version bump.
+
+  24 Jun 2005; Stefan Knoblich <stkn@gentoo.org> -asterisk-1.0.5-r1.ebuild,
+  -asterisk-1.0.5.ebuild, -asterisk-1.0.6.ebuild, -asterisk-1.0.7.ebuild:
+  Removing old ebuilds without security update.
+
+  24 Jun 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild:
+  Added 1.0.7 security fix to backported non-root ebuilds, restoring ~* keywords.
+
+  23 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch,
+  asterisk-1.0.7-r1.ebuild:
+  Added security fix for
+  http://www.portcullis-security.com/advisory/advisory-05-013.txt (bug #96826)
+  (taken from asterisk-1.0.8), non-root changes and cleanups, astconf.h is
+  installed into /usr/include/asterisk, because several external modules need
+  it. Tested and marking ~* again.
+
+  01 Jun 2005; Stefan Knoblich <stkn@gentoo.org> -asterisk-1.0.0.ebuild,
+  -asterisk-1.0.1.ebuild, -asterisk-1.0.2.ebuild, -asterisk-1.0.3-r1.ebuild,
+  -asterisk-1.0.3.ebuild:
+  Removed old ebuilds.
+
+*asterisk-1.0.5-r2 (01 Jun 2005)
+
+  01 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/1.0.0/asterisk-1.0.7-scripts.diff, files/1.0.0/asterisk.confd.sec,
+  files/1.0.0/asterisk.rc6.sec, +asterisk-1.0.5-r2.ebuild,
+  +asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild:
+  Minor fixes, non-root changes backported to 1.0.5 and 1.0.6 (still in use)
+  and bristuff update (1.0.7-r1).
+
+  29 May 2005; <solar@gentoo.org> asterisk-1.0.1.ebuild,
+  asterisk-1.0.2.ebuild, asterisk-1.0.3-r1.ebuild, asterisk-1.0.3.ebuild,
+  asterisk-1.0.5-r1.ebuild, asterisk-1.0.5.ebuild, asterisk-1.0.6.ebuild,
+  asterisk-1.0.7-r1.ebuild, asterisk-1.0.7.ebuild:
+  - update asterisk to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
+
+  15 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.7-initgroups.diff, files/1.0.0/asterisk.confd.sec,
+  files/1.0.0/asterisk.rc6.sec, asterisk-1.0.7-r1.ebuild:
+  Added initgroups support to asterisk instead of using start-stop-daemon's
+  --chguid because that one broke running asterisk with realtime priority (-p).
+  Fixed init script for initgroups. Users will have to use ebuild config after
+  updating asterisk to fix permissions on the filesystem, warning messages have
+  been added.
+
+  12 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.7-scripts.diff, asterisk-1.0.7-r1.ebuild:
+  Added non-root changes to addmailbox and astgenkey, fixed warning
+  countdown and bristuff update.
+
+  11 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  files/1.0.0/asterisk.confd.sec:
+  Fixed asterisk.confd.sec
+
+  11 May 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7-r1.ebuild:
+  Changed ebuild to fix permissions on live-filesystem during pkg_postinst,
+  not the nicest way to do this but the best one to force sane defaults.
+
+  10 May 2005; David Holm <dholm@gentoo.org> asterisk-1.0.7.ebuild:
+  Added to ~ppc.
+
+  09 May 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7-r1.ebuild:
+  Added warning messages, some minor tweaks
+
+*asterisk-1.0.7-r1 (07 May 2005)
+
+  07 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk.confd.sec, +files/1.0.0/asterisk.rc6.sec,
+  +asterisk-1.0.7-r1.ebuild:
+  Fixes bug #88732, adding asterisk user and group, changing
+  permissions of files in /var/{lib,spool,run,log}/asterisk
+  to asterisk:asterisk rwxr-x---. Updated to bristuff-0.2.0-RC8a.
+  Masked for testing.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> asterisk-1.0.6.ebuild,
+  asterisk-1.0.7.ebuild:
+  Added missing parentheses to SRC_URI.
+
+  20 Apr 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7.ebuild:
+  Fixed #89648, api and some other additional docs get installed now.
+
+  29 Mar 2005; Stefan Knoblich <stkn@gentoo.org> -digest-asterisk-1.0.7,
+  asterisk-1.0.7.ebuild:
+  Added additional built_with_use checks for perl and libperl, because res_perl
+  requires both to have ithreads support. Removed duplicate digest file in wrong
+  directory.
+
+  28 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff, asterisk-1.0.7.ebuild:
+  Added fix for compiling res_perl with bri enabled.
+
+  27 Mar 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.7.ebuild:
+  Fixed and re-enabled res_perl support, perl modules are now installed into
+  /usr/lib/perl/..., applications and htdocs are in /var/lib/asterisk/perl.
+  Now everything is where it belongs.
+
+  22 Mar 2005; Stefan Knoblich <stkn@gentoo.org> files/0.9.0/asterisk.rc6,
+  files/1.0.0/asterisk.rc6:
+  Fix asterisk's initscript to run after zaptel's (thanks gustavoz).
+
+*asterisk-1.0.7 (21 Mar 2005)
+
+  21 Mar 2005; Stefan Knoblich <stkn@gentoo.org> +asterisk-1.0.7.ebuild:
+  Version bump.
+
+  11 Mar 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.6.ebuild:
+  Fixed hardened workaround for gsm codec (closes #84767).
+
+*asterisk-1.0.6 (10 Mar 2005)
+
+  10 Mar 2005; Stefan Knoblich <stkn@gentoo.org> +asterisk-1.0.6.ebuild:
+  New version. Adds speex use-flag and bristuff support; disables res_perl for
+  now. Sounds add-on has been split from the main package, they're now in
+  asterisk-sounds if you need them.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> asterisk-1.0.5-r1.ebuild
+  added ~amd64
+
+  20 Feb 2005; Guy Martin <gmsoft@gentoo.org>
+  +files/1.0.0/asterisk-1.0.5-hppa.patch, asterisk-1.0.5-r1.ebuild:
+  Added some hppa love.
+
+*asterisk-1.0.5-r1 (14 Feb 2005)
+
+  14 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff,
+  +files/1.0.0/asterisk-1.0.5-speex.diff,
+  +files/1.0.0/asterisk-1.0.5-uclibc-dns.diff, +asterisk-1.0.5-r1.ebuild:
+  Fix detection problems w/ >=speex-1.1.0. Except for codec_gsm.so (needs some
+  more investigation), all plugins use -fPIC and are free from TEXT_RELocations.
+  Fixed uclibc patch (thanks to Ned Ludd <solar@gentoo.org>, closes #72984).
+  Added postgres use-flag and fixed postgres detection. Added use-flags and
+  sed-foo for voicemail database support (thx to Gustavo Zacarias
+  <gustavoz@gentoo.org> for pointing this out). Added experimental patch for
+  asterisk-config config script that should ease development / use of external
+  modules and extensions.
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> asterisk-1.0.5.ebuild:
+  Keyworded ~sparc
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  asterisk-1.0.3-r1.ebuild, asterisk-1.0.3.ebuild:
+  Keyworded ~sparc again, thanks to chrb
+
+*asterisk-1.0.5 (28 Jan 2005)
+
+  28 Jan 2005; Chris Bainbridge <chrb@gentoo.org> +asterisk-1.0.5.ebuild:
+  Version bump and CFLAGS fixes.
+
+*asterisk-1.0.3-r1 (28 Jan 2005)
+
+  28 Jan 2005; Chris Bainbridge <chrb@gentoo.org> +asterisk-1.0.3-r1.ebuild:
+  Add sox (required for Record app, and probably others)
+
+  27 Jan 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/0.5.0/asterisk-0.5.0-Makefile-samples.patch,
+  -files/0.5.0/asterisk-0.5.0-makefile-fix.diff, -files/0.5.0/asterisk.confd,
+  -files/0.5.0/asterisk.rc6, -asterisk-0.2.0.ebuild, -asterisk-0.5.0.ebuild:
+  removing old versions
+
+  24 Jan 2005; Brian Jackson <iggy@gentoo.org> asterisk-1.0.1.ebuild,
+  asterisk-1.0.2.ebuild, asterisk-1.0.3.ebuild:
+  few more uclibc move changes
+
+  27 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> asterisk-1.0.3.ebuild:
+  Keyworded ~sparc
+
+*asterisk-1.0.3 (19 Dec 2004)
+
+  19 Dec 2004; Stefan Knoblich <stkn@gentoo.org> +asterisk-1.0.3.ebuild:
+  new version
+
+  18 Dec 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.0.ebuild, asterisk-1.0.1.ebuild, asterisk-1.0.2.ebuild:
+  zapata isn't used by asterisk anymore, dependency removed
+
+  26 Nov 2004; <stkn@gentoo.org> asterisk-1.0.1.ebuild, asterisk-1.0.2.ebuild:
+  uclibc dependency had wrong category (closes #72478)
+
+*asterisk-1.0.2 (10 Nov 2004)
+
+  10 Nov 2004; <stkn@gentoo.org> +asterisk-1.0.2.ebuild:
+  version bump.
+
+*asterisk-1.0.1 (30 Oct 2004)
+
+  30 Oct 2004; <stkn@gentoo.org> +files/1.0.0/asterisk-1.0.1-linux26.diff,
+  +files/1.0.0/asterisk-uclibc-dns.diff, +asterisk-1.0.1.ebuild:
+  new version, pri and zaptel use-flags flipped (now default disabled), fixes:
+  #66557 (thx to REdOG <bugzilla@opelousas.org>), #66720 (webapp stuff
+  removed...), a workaround for #65195 (fixed for newer versions of linux?).
+
+*asterisk-1.0.0 (24 Sep 2004)
+
+  24 Sep 2004; <stkn@gentoo.org> +files/1.0.0/asterisk.confd,
+  +files/1.0.0/asterisk.rc6, +asterisk-1.0.0.ebuild:
+  version bump, init script uses start-stop-daemon now
+
+  27 Jul 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.9.0.ebuild:
+  stable on x86, removed obsolete iax dependency
+
+  05 Jul 2004; <stkn@gentoo.org> asterisk-0.9.0.ebuild:
+  SRC_URI has changed
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> asterisk-0.2.0.ebuild,
+  asterisk-0.5.0.ebuild, asterisk-0.9.0.ebuild:
+  change virtual/glibc to virtual/libc
+
+  26 Jun 2004; <stkn@gentoo.org> files/0.7.2/asterisk-0.7.2-makefile-fix.diff,
+  files/0.7.2/asterisk.confd, files/0.7.2/asterisk.rc6:
+  Removed asterisk-0.7.2, see http://www.securityfocus.com/bid/10569 for more
+  information
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> asterisk-0.5.0.ebuild,
+  asterisk-0.7.2.ebuild, asterisk-0.9.0.ebuild:
+  Fix use invocation
+
+*asterisk-0.9.0 (10 May 2004)
+
+  10 May 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.9.0.ebuild,
+  files/0.9.0/asterisk.confd, files/0.9.0/asterisk.rc6:
+  version bump.
+
+  17 Apr 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.7.2.ebuild:
+  Fix broken voicemail webapp (#46182)
+
+  16 Mar 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.7.2.ebuild:
+  asterisk-0.7.2 depends on zaptel/zapata >=0.8.1 now
+
+  19 Feb 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.2.0.ebuild,
+  asterisk-0.5.0.ebuild, asterisk-0.7.2.ebuild:
+  fixed SRC_URI
+
+  15 Feb 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.7.2.ebuild,
+  files/0.7.2/asterisk-0.7.2-makefile-fix.diff:
+  install makefile fix re-added
+
+  13 Feb 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.5.0.ebuild,
+  asterisk-0.7.2.ebuild:
+  asterisk-0.7.2 hard-masked until new zaptel drivers arrive,
+  corrected header error in 0.5.0 and 0.7.2 ebuild,
+  0.7.2 now uses webapp eclass instead of webapp-apache
+
+*asterisk-0.7.2 (13 Feb 2004)
+
+  13 Feb 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.7.2.ebuild,
+  files/0.7.2/asterisk.confd, files/0.7.2/asterisk.rc6:
+  added asterisk-0.7.2 ebuild
+
+  09 Jan 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.5.0.ebuild,
+  files/0.5.0/asterisk-0.5.0-makefile-fix.diff:
+  fixed bug #37212, fixed broken DEPEND use handling
+
+*asterisk-0.5.0 (04 Jan 2004)
+
+  04 Jan 2004; Stefan Knoblich <stkn@gentoo.org> asterisk-0.2.0.ebuild,
+  asterisk-0.5.0.ebuild, metadata.xml,
+  files/0.5.0/asterisk-0.5.0-Makefile-samples.patch,
+  files/0.5.0/asterisk-0.5.0-makefile-fix.diff, files/0.5.0/asterisk.confd,
+  files/0.5.0/asterisk.rc6:
+  new ebuild asterisk-0.5.0, copyright header updates
+
+  30 Nov 2003; Brandy Westcott brandy@gentoo.org asterisk-0.2.0.ebuild:
+  Pinned emake to -j1. Closes bug #34642.
+
+  03 Oct 2003; Seemant Kulleen <seemant@gentoo.org> asterisk-0.2.0.ebuild:
+  from an email from the asterisk upstream authors, this package is actually
+  GPL-2, and NOT BSD. Apologies to them for this oversight. Thanks, in
+  particular, to: Malcolm Davenport <malcolmd@digium.com> for pointing this out
+
+  12 Jun 2003; <msterret@gentoo.org> asterisk-0.2.0.ebuild:
+  fix Header
 
 *asterisk-0.2.0 (28 Nov 2002)
-  
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> asterisk-0.2.0.ebuild:
+  Change supersed dependencies
+
   28 Nov 2002; Matt Keadle <mkeadle@gentoo.org> asterisk-0.2.0.ebuild
   files/digest-asterisk-0.2.0:
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e69de29bb2d1..1fc92ad3ca67 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -0,0 +1,37 @@
+MD5 5c1538698e815baf526a47c2e0708962 asterisk-1.0.7-r2.ebuild 13675
+MD5 4efc9a44ca6dd277e13fafbe0965d759 asterisk-1.0.8-r1.ebuild 13798
+MD5 e6a6e09e3a4074c7eb81a173b182cda0 asterisk-1.0.5-r3.ebuild 12290
+MD5 5e8e6634d9536fa7e7c83e500204aeea asterisk-1.0.9-r2.ebuild 13815
+MD5 7f0f66b9fdad604ce8a945bc560ab97c asterisk-1.0.6-r2.ebuild 14062
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+MD5 24d7a53ec19f300eddb37d3fff2f5757 ChangeLog 18557
+MD5 1bf616022cc96b91842354c40b942cf2 asterisk-1.2.0.ebuild 8455
+MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r2 210
+MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r2 210
+MD5 53b837a5288c895f13fa7f5da5d9b19d files/digest-asterisk-1.2.0 217
+MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r3 139
+MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8-r1 210
+MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r2 210
+MD5 3932983fb155e026eb10533425174f59 files/1.2.0/asterisk-1.2.0_beta-ukcid.patch 5787
+MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
+MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
+MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
+MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
+MD5 ed3f8c9cd712391f76700827322a7aeb files/1.0.0/asterisk-1.0.5-lpc10flags.diff 1254
+MD5 df56abd9d0dcf307c17c1e1d68b05dfd files/1.0.0/asterisk.rc6.sec 1232
+MD5 b2446878d3b46ea595a7994ae8de0499 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
+MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
+MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
+MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
+MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+MD5 e993bfc45e54507214329e00b3a66966 files/1.0.0/asterisk-1.0.9-freetds.diff 854
+MD5 c25cdb98ebd69a740014cd45bea1c9ba files/1.0.0/asterisk-1.0.9-vmail.cgi.patch 770
+MD5 517587756c674978b1b24891c34564fc files/1.0.0/asterisk-1.0.8-ptr64fix.diff 485
+MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
+MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
+MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
+MD5 8929203070b56a9d9204423cc5b3349a files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
+MD5 18fb1b2e1fbf2f19e8a9a600eab4c5c8 files/1.0.0/asterisk-1.0.8-callerid.patch 631
+MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
+MD5 38064faca1838d7c57bb26293741f31b files/1.0.0/asterisk-1.0.8-hppa.patch 1274
diff --git a/net-misc/asterisk/asterisk-1.0.5-r3.ebuild b/net-misc/asterisk/asterisk-1.0.5-r3.ebuild
index ee13e673a879..a4d2869bddb6 100644
--- a/net-misc/asterisk/asterisk-1.0.5-r3.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.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/net-misc/asterisk/asterisk-1.0.5-r3.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:24 chriswhite Exp $
 
 inherit eutils perl-module
 
diff --git a/net-misc/asterisk/asterisk-1.0.6-r2.ebuild b/net-misc/asterisk/asterisk-1.0.6-r2.ebuild
index 83a61ea61b95..7e4426bd9076 100644
--- a/net-misc/asterisk/asterisk-1.0.6-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.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/net-misc/asterisk/asterisk-1.0.6-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:24 chriswhite Exp $
 
 inherit eutils perl-module
 
diff --git a/net-misc/asterisk/asterisk-1.0.7-r2.ebuild b/net-misc/asterisk/asterisk-1.0.7-r2.ebuild
index 480572676f13..4372446a0445 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.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/net-misc/asterisk/asterisk-1.0.7-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 inherit eutils perl-module
 
diff --git a/net-misc/asterisk/asterisk-1.0.8-r1.ebuild b/net-misc/asterisk/asterisk-1.0.8-r1.ebuild
index 416657a8d497..8b907794e1eb 100644
--- a/net-misc/asterisk/asterisk-1.0.8-r1.ebuild
+++ b/net-misc/asterisk/asterisk-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/net-misc/asterisk/asterisk-1.0.8-r1.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:24 chriswhite Exp $
 
 inherit eutils perl-module
 
diff --git a/net-misc/asterisk/asterisk-1.0.9-r2.ebuild b/net-misc/asterisk/asterisk-1.0.9-r2.ebuild
index ae3b717fdce6..63a67513bac5 100644
--- a/net-misc/asterisk/asterisk-1.0.9-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.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/net-misc/asterisk/asterisk-1.0.9-r2.ebuild,v 1.1 2005/11/08 15:35:21 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:23 chriswhite Exp $
 
 inherit eutils perl-module
 
@@ -277,8 +277,8 @@ src_unpack() {
 	# fix segfault on amd64 and possibly other 64bit systems (#105762)
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
 
-	# needed for >=freetds-0.6.3
-	if has_version ">=dev-db/freetds-0.6.3"; then
+	# needed for >=freetds-0.63
+	if has_version ">=dev-db/freetds-0.63"; then
 		epatch ${FILESDIR}/1.0.0/${P}-freetds.diff
 	fi
 
diff --git a/net-misc/asterisk/asterisk-1.2.0.ebuild b/net-misc/asterisk/asterisk-1.2.0.ebuild
index 2c5722d1dc18..52521d5ba35d 100644
--- a/net-misc/asterisk/asterisk-1.2.0.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.0.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0.ebuild,v 1.1 2005/11/18 16:42:20 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:24 chriswhite Exp $
 
 inherit eutils
 
-IUSE="alsa curl debug doc gtk h323 hardened lowmem mmx mysql \
+IUSE="alsa bri curl debug doc gtk h323 hardened lowmem mmx mysql \
 	nosamples odbc postgres pri speex sqlite ssl ukcid zaptel"
 
-#BRI_VERSION="0.2.0-RC8f-CVS"
+BRI_VERSION="0.3.0-PRE-1"
 AST_PATCHES="1.2.0-patches-1.0"
 
 ## TODO:
 #
 # - uclibc patch still needed? (still applies)
-# - bristuff (waiting...)
 # - test nosamples
 # - add some more use flags...
 #	recent additions: osp, lowmem, curl, ukcid
 # - cleanup
-#
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
 SRC_URI="http://ftp.digium.com/pub/asterisk/${MY_P}.tar.gz
-	 http://www.netdomination.org/pub/asterisk/${PN}-${AST_PATCHES}.tar.bz2"
-#	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+	 http://www.netdomination.org/pub/asterisk/${PN}-${AST_PATCHES}.tar.bz2
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
+
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -49,12 +49,12 @@ RDEPEND="dev-libs/newt
 	speex? ( media-libs/speex )
 	sqlite? ( <dev-db/sqlite-3.0.0 )
 	zaptel? ( >=net-misc/zaptel-1.1.0 )
-	postgres? ( dev-db/postgresql )"
+	postgres? ( dev-db/postgresql )
+	bri? (  >=net-libs/libpri-1.1.0
+		>=net-misc/zaptel-1.1.0 )"
 
 #	osp? ( >=net-libs/osptoolkit-3.3.4 )
 
-#	bri? ( >=net-libs/libpri-1.1.0
-#		>=net-misc/zaptel-1.1.0 )
 
 DEPEND="${RDEPEND}
 	sys-devel/flex
@@ -85,17 +85,17 @@ pkg_setup() {
 	einfo "Running some pre-flight checks..."
 
 	# check if zaptel and libpri have been built with bri enabled
-#	if use bri; then
-#		if ! built_with_use net-misc/zaptel bri; then
-#			eerror "Re-emerge zaptel with bri use-flag enabled!"
-#			die "Zaptel without bri support detected"
-#		fi
-#
-#		if ! built_with_use net-libs/libpri bri; then
-#			eerror "Re-emerge libpri with bri use-flag enabled!"
-#			die "Libpri without bri support detected"
-#		fi
-#	fi
+	if use bri; then
+		if ! built_with_use net-misc/zaptel bri; then
+			eerror "Re-emerge zaptel with bri use-flag enabled!"
+			die "Zaptel without bri support detected"
+		fi
+
+		if ! built_with_use net-libs/libpri bri; then
+			eerror "Re-emerge libpri with bri use-flag enabled!"
+			die "Libpri without bri support detected"
+		fi
+	fi
 
 }
 
@@ -151,11 +151,10 @@ src_unpack() {
 	#
 	# BRI patches
 	#
-#	if use bri; then
-#		cd ${S}
-#		einfo "Patching asterisk w/ BRI stuff"
-#		epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
-#	fi
+	if use bri; then
+		einfo "Patching asterisk w/ BRI stuff"
+		epatch ${S_BRI}/patches/asterisk.patch
+	fi
 }
 
 src_compile() {
@@ -184,6 +183,10 @@ src_compile() {
 	# create api docs
 	use doc && \
 		make progdocs
+
+	# build bristuff's ISDNguard
+	use bri && \
+		make -C ${S_BRI}/ISDNguard
 }
 
 src_install() {
@@ -263,6 +266,17 @@ src_install() {
 		doins doc/api/html/*
 	fi
 
+	# install ISDNguard
+	if use bri; then
+		cd ${S_BRI}/ISDNguard
+		dosbin ISDNguard
+
+		docinto ISDNguard
+		dodoc INSTALL.ISDNguard
+
+		cd ${S}
+	fi
+
 	insinto /usr/share/doc/${PF}/cgi
 	doins contrib/scripts/vmail.cgi
 	doins images/*.gif
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff
index c002294c0e6b..3eb1e15bdb7c 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.7-scripts.diff
@@ -23,7 +23,7 @@
  cat ${SNDHOME}/vm-isunavail.gsm >> ${VMHOME}/${context}/${mailbox}/unavail.gsm
  cat ${SNDHOME}/vm-isonphone.gsm >> ${VMHOME}/${context}/${mailbox}/busy.gsm
 +echo "Changing permissions..."
-+chmod -R asterisk:asterisk ${VMHOME}/${context}
++chown -R asterisk:asterisk ${VMHOME}/${context}
 +chmod    u=rwX,g=rX,o=     ${VMHOME}/${context}/${mailbox}/*.gsm
  echo "Complete."
  
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff
index c8e9b130eba9..811067dda3c5 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff
@@ -9,3 +9,19 @@
  	char query[128];
  
  	/* Connect to M$SQL Server */
+--- asterisk-1.0.9/cdr/cdr_tds.c.orig	2005-10-29 04:54:16.000000000 +0000
++++ asterisk-1.0.9/cdr/cdr_tds.c	2005-10-29 04:54:36.000000000 +0000
+@@ -457,11 +457,11 @@
+ 	{
+ 		ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n");
+ 		tds = NULL;	/* freed by tds_connect() on error */
+-		tds_free_connect(connection);
++		tds_free_connection(connection);
+ 		connection = NULL;
+ 		goto connect_fail;
+ 	}
+-	tds_free_connect(connection);
++	tds_free_connection(connection);
+ 	connection = NULL;
+ 
+ 	sprintf(query, "USE %s", dbname);
diff --git a/net-misc/asterisk/files/1.0.0/asterisk.confd b/net-misc/asterisk/files/1.0.0/asterisk.confd
index c025d64f3f0c..a996cab0b21a 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk.confd
+++ b/net-misc/asterisk/files/1.0.0/asterisk.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-misc/asterisk/files/1.0.0/asterisk.confd,v 1.1 2004/09/24 00:01:57 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.confd,v 1.1.1.1 2005/11/30 09:55:25 chriswhite Exp $
 
 #
 # see "asterisk -h" for a list of options
diff --git a/net-misc/asterisk/files/1.0.0/asterisk.confd.sec b/net-misc/asterisk/files/1.0.0/asterisk.confd.sec
index 7fc2a3413b85..3665d2594d04 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk.confd.sec
+++ b/net-misc/asterisk/files/1.0.0/asterisk.confd.sec
@@ -1,28 +1,26 @@
-#!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.confd.sec,v 1.1 2005/05/07 18:35:35 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.confd.sec,v 1.1.1.1 2005/11/30 09:55:25 chriswhite Exp $
 
-depend() {
-	need net logger
-	after zaptel
-}
+#
+# see "asterisk -h" for a list of options
+#
+ASTERISK_OPTS=""
 
-start() {
-	if [[ -n "${ASTERISK_USER}" ]]; then
-		ebegin "Starting asterisk PBX (as ${ASTERISK_USER})"
-		start-stop-daemon --start --exec /usr/sbin/asterisk \
-			--chuid ${ASTERISK_USER} -- ${ASTERISK_OPTS}
-	else
-		ebegin "Starting asterisk PBX (as root)"
-		start-stop-daemon --start --exec /usr/sbin/asterisk -- \
-			${ASTERISK_OPTS}
-	fi
-	eend $?
-}
+#
+# User to run asterisk as
+#
+# Examples:
+#    "user:group" 
+#    "user"
+#    "" or unset = root:root
+#
+ASTERISK_USER="asterisk:asterisk"
 
-stop() {
-	ebegin "Stopping asterisk PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Range: -19..20
+#ASTERISK_NICE=""
diff --git a/net-misc/asterisk/files/1.0.0/asterisk.rc6 b/net-misc/asterisk/files/1.0.0/asterisk.rc6
index 758c81241032..efb6ab5f83aa 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk.rc6
+++ b/net-misc/asterisk/files/1.0.0/asterisk.rc6
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.rc6,v 1.1 2004/09/24 00:01:57 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.rc6,v 1.1.1.1 2005/11/30 09:55:24 chriswhite Exp $
 
 depend() {
 	need net logger
+	after zaptel
 }
 
 start() {
diff --git a/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec b/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec
index 6ab451443ac9..9729d2256463 100644
--- a/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec
+++ b/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec
@@ -1,23 +1,41 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec,v 1.1 2005/05/07 18:35:35 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/files/1.0.0/asterisk.rc6.sec,v 1.1.1.1 2005/11/30 09:55:25 chriswhite Exp $
 
 depend() {
-	need net logger
-	after zaptel
+	need net
+	use zaptel mysql postgresql
 }
 
 start() {
+	local OPTS USER GROUP
+
+	if [[ -n "${ASTERISK_NICE}" ]]; then
+		if [[ ${ASTERISK_NICE} -ge -20 ]] && \
+		   [[ ${ASTERISK_NICE} -le  19 ]]; then 
+			OPTS="--nicelevel ${ASTERISK_NICE}"
+		else
+			eerror "Nice value must be between -20 and 19"
+		fi
+	fi
+
 	if [[ -n "${ASTERISK_USER}" ]]; then
-		ebegin "Starting asterisk PBX (as ${ASTERISK_USER})"
-		start-stop-daemon --start --exec /usr/sbin/asterisk \
-			--chuid ${ASTERISK_USER} -- ${ASTERISK_OPTS}
+		USER=${ASTERISK_USER/:*/}
+		GROUP=$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')
+		if [[ -n "${USER}" ]]; then
+			ASTERISK_OPTS="${ASTERISK_OPTS} -U ${USER}"
+		fi
+		if [[ -n "${GROUP}" ]]; then
+			ASTERISK_OPTS="${ASTERISK_OPTS} -G ${GROUP}"
+			GROUP=":${GROUP}"	# make it look nice...
+		fi
+		ebegin "Starting asterisk PBX (as ${USER}${GROUP})"
 	else
 		ebegin "Starting asterisk PBX (as root)"
-		start-stop-daemon --start --exec /usr/sbin/asterisk -- \
-			${ASTERISK_OPTS}
 	fi
+		start-stop-daemon --start --exec /usr/sbin/asterisk \
+			${OPTS} -- ${ASTERISK_OPTS}
 	eend $?
 }
 
diff --git a/net-misc/asterisk/files/digest-asterisk-1.2.0 b/net-misc/asterisk/files/digest-asterisk-1.2.0
index 8990081faf68..6fc674b8b454 100644
--- a/net-misc/asterisk/files/digest-asterisk-1.2.0
+++ b/net-misc/asterisk/files/digest-asterisk-1.2.0
@@ -1,2 +1,3 @@
-MD5 61d7f29b586ba9b9b5fbb67f952fd3ca asterisk-1.2.0.tar.gz 10464039
 MD5 0eeb5317bde267141c33ee5051e3b494 asterisk-1.2.0-patches-1.0.tar.bz2 7197
+MD5 61d7f29b586ba9b9b5fbb67f952fd3ca asterisk-1.2.0.tar.gz 10464039
+MD5 884979fbfb75e6cdf7d8bdb66841e728 bristuff-0.3.0-PRE-1.tar.gz 159742
diff --git a/net-misc/astmanproxy/ChangeLog b/net-misc/astmanproxy/ChangeLog
index d22b4b60ab73..6d8c2750aa5c 100644
--- a/net-misc/astmanproxy/ChangeLog
+++ b/net-misc/astmanproxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/astmanproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/astmanproxy/ChangeLog,v 1.1 2005/07/13 02:47:55 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/astmanproxy/ChangeLog,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+  13 Jul 2005; Sven Wegener <swegener@gentoo.org> astmanproxy-1.1.ebuild:
+  QA: Don't assign default to S; Default src_compile is fine because we have
+  no configure script
+
+  13 Jul 2005; David Holm <dholm@gentoo.org> astmanproxy-1.1.ebuild:
+  Added to ~ppc.
 
 *astmanproxy-1.1 (13 Jul 2005)
 
diff --git a/net-misc/astmanproxy/Manifest b/net-misc/astmanproxy/Manifest
index 42245f9b5d4c..98994597dcf3 100644
--- a/net-misc/astmanproxy/Manifest
+++ b/net-misc/astmanproxy/Manifest
@@ -1,6 +1,16 @@
-MD5 17b4952fd69968e1475aa558d252950a astmanproxy-1.1.ebuild 783
-MD5 fa85b0a43a5888b385f789182fd1dc9f ChangeLog 121
-MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 5bbca9db1db666ffad0f311a8e144f3a files/digest-astmanproxy-1.1 77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5212a9bd42d2d6e16886a133dc8146e9 ChangeLog 679
+MD5 2b78ddf922db447f37f62bf7f3996a13 astmanproxy-1.1.ebuild 873
 MD5 4670d4323365e584a57d8bfb44139d9b files/astmanproxy-1.1-gentoo.diff 1051
-MD5 a7b39422c5a73cc33f4ba24a5c9ce130 files/astmanproxy.rc6 378
+MD5 f368b0dbbb0802aed2ce900086e5982a files/astmanproxy.rc6 480
+MD5 5bbca9db1db666ffad0f311a8e144f3a files/digest-astmanproxy-1.1 77
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1PVLI1lqEGTUzyQRAt/AAJ9ZTskTLXNRpsMTex0sXip0sslNYQCfa5y1
+sfmopJcY4A2aR8/pkbzP3Uo=
+=LLnc
+-----END PGP SIGNATURE-----
diff --git a/net-misc/astmanproxy/astmanproxy-1.1.ebuild b/net-misc/astmanproxy/astmanproxy-1.1.ebuild
index c0456fc43b60..8419119caed3 100644
--- a/net-misc/astmanproxy/astmanproxy-1.1.ebuild
+++ b/net-misc/astmanproxy/astmanproxy-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-misc/astmanproxy/astmanproxy-1.1.ebuild,v 1.1 2005/07/13 02:47:55 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/astmanproxy/astmanproxy-1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 inherit eutils
 
@@ -12,26 +12,20 @@ IUSE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND="virtual/libc"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
 	# small patch for cflags and path changes
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	emake || die "emake failed"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc README README.* VERSIONS astmanproxy.conf
 
@@ -39,7 +33,7 @@ src_install() {
 	dodoc samples/*
 
 	# fix permissions on config file
-	chmod 0640 ${D}/etc/astmanproxy.conf
+	fperms 0640 /etc/astmanproxy.conf
 
-	newinitd ${FILESDIR}/astmanproxy.rc6 astmanproxy
+	newinitd "${FILESDIR}"/astmanproxy.rc6 astmanproxy
 }
diff --git a/net-misc/astmanproxy/files/astmanproxy.rc6 b/net-misc/astmanproxy/files/astmanproxy.rc6
index 4a50b815ce7f..7de3a4982bcb 100755
--- a/net-misc/astmanproxy/files/astmanproxy.rc6
+++ b/net-misc/astmanproxy/files/astmanproxy.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/net-misc/astmanproxy/files/astmanproxy.rc6,v 1.1 2005/07/13 02:47:55 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/astmanproxy/files/astmanproxy.rc6,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/autossh/ChangeLog b/net-misc/autossh/ChangeLog
index 3b5f63e3d9ba..4c2871bd349f 100644
--- a/net-misc/autossh/ChangeLog
+++ b/net-misc/autossh/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for net-misc/autossh
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/ChangeLog,v 1.1 2003/02/13 10:19:02 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/ChangeLog,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> autossh-1.2g.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*autossh-1.2g (01 Sep 2004)
+
+  01 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> autossh-1.2g.ebuild:
+  Version bump, closing #62329.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> autossh-1.2f.ebuild:
+  Stable on alpha.
+
+  19 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> autossh-1.2c.ebuild,
+  autossh-1.2d.ebuild, autossh-1.2f.ebuild, files/autossh-1.2d-reuse.patch:
+  Unmask and cleanup.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> autossh-1.2c.ebuild,
+  autossh-1.2d.ebuild, autossh-1.2e.ebuild, autossh-1.2f.ebuild:
+  change virtual/glibc to virtual/libc
+
+  14 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> autossh-1.2d.ebuild,
+  autossh-1.2e.ebuild, autossh-1.2f.ebuild:
+  Unmasked on x86, added IUSE and removed S=.
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> autossh-1.2e.ebuild:
+  Stable on alpha.
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> autossh-1.2f.ebuild:
+  Added to ~ppc.
+
+*autossh-1.2f (30 May 2004)
+
+  30 May 2004; Daniel Ahlberg <aliz@gentoo.org> autossh-1.2f.ebuild,
+  metadata.xml:
+  Version bump, found by Daniel Webert <daniel_webert@web.de> in #52351.
+
+  11 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> autossh-1.2e.ebuild:
+  Removing patch. Closing #40468.
+
+*autossh-1.2e (27 Jan 2004)
+
+  27 Jan 2004; Aron Griffis <agriffis@gentoo.org> autossh-1.2e.ebuild:
+  Version bump
+
+*autossh-1.2d (10 Mar 2003)
+
+  14 Apr 2003; Jason Wever <weeve@gentoo.org> autossh-1.2d.ebuild:
+  Added ~sparc to keywords.
+
+  10 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild contributed by Jedi/Sector One <gentoo@pureftpd.org> in #16560.
 
 *autossh-1.2c (13 Feb 2003)
 
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index e69de29bb2d1..32ceadeb1e38 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -0,0 +1,8 @@
+MD5 337b84c1957eee228e72c1a7c0d6f312 autossh-1.2f.ebuild 790
+MD5 65c2560e03f945ef44219ddc598e7677 autossh-1.2e.ebuild 785
+MD5 bbbf7f259f2990ef1c7a01d58737b180 autossh-1.2g.ebuild 789
+MD5 4f75d2337639e601b7d5dddb73a9a69f ChangeLog 2142
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 004cbe8cc3f991a050441535b96d9aed files/digest-autossh-1.2e 60
+MD5 da4ae36942c254c0c54fca64dafa89f5 files/digest-autossh-1.2f 60
+MD5 8c65d0b238acda1ecd9130506760f689 files/digest-autossh-1.2g 60
diff --git a/net-misc/autossh/autossh-1.2e.ebuild b/net-misc/autossh/autossh-1.2e.ebuild
index 66ffcf9d64bd..7d8ac975ece0 100644
--- a/net-misc/autossh/autossh-1.2e.ebuild
+++ b/net-misc/autossh/autossh-1.2e.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/net-misc/autossh/autossh-1.2e.ebuild,v 1.1 2004/01/27 15:26:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2e.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
 HOMEPAGE="http://www.harding.motd.ca/autossh/"
 LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~alpha ~ia64"
+KEYWORDS="x86 ~sparc alpha ~ia64 amd64"
 SRC_URI="http://www.harding.motd.ca/autossh/${P}.tgz"
 SLOT="0"
+IUSE=""
 
-DEPEND="virtual/glibc sys-apps/sed"
-RDEPEND="virtual/glibc net-misc/openssh"
+DEPEND="virtual/libc sys-apps/sed"
+RDEPEND="virtual/libc net-misc/openssh"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die
-	patch -p0 -l < ${FILESDIR}/${P}-reuse.patch || die
-	sed -i "s|CFLAGS=|CFLAGS=${CFLAGS}|g" Makefile.linux || die
+	unpack ${A} && cd ${S}
+	sed -i "s|CFLAGS=|CFLAGS=${CFLAGS}|g" Makefile.linux
 }
 
 src_compile() {
@@ -28,4 +27,3 @@ src_install() {
 	dodoc CHANGES README autossh.host rscreen
 	doman autossh.1
 }
-
diff --git a/net-misc/autossh/autossh-1.2f.ebuild b/net-misc/autossh/autossh-1.2f.ebuild
index f9f0a1cb80e8..44acfe584372 100644
--- a/net-misc/autossh/autossh-1.2f.ebuild
+++ b/net-misc/autossh/autossh-1.2f.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2f.ebuild,v 1.1 2004/05/30 20:30:14 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2f.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
 HOMEPAGE="http://www.harding.motd.ca/autossh/"
 LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~alpha ~ia64 amd64"
+KEYWORDS="x86 ~sparc alpha ~ia64 amd64 ~ppc"
 SRC_URI="http://www.harding.motd.ca/autossh/${P}.tgz"
 SLOT="0"
+IUSE=""
 
-DEPEND="virtual/glibc sys-apps/sed"
-RDEPEND="virtual/glibc net-misc/openssh"
+DEPEND="virtual/libc sys-apps/sed"
+RDEPEND="virtual/libc net-misc/openssh"
 
 src_unpack() {
 	unpack ${A} && cd ${S}
@@ -27,4 +27,3 @@ src_install() {
 	dodoc CHANGES README autossh.host rscreen
 	doman autossh.1
 }
-
diff --git a/net-misc/autossh/autossh-1.2g.ebuild b/net-misc/autossh/autossh-1.2g.ebuild
index 54729fe39668..a52c8fa4ed9f 100644
--- a/net-misc/autossh/autossh-1.2g.ebuild
+++ b/net-misc/autossh/autossh-1.2g.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2g.ebuild,v 1.1 2004/09/01 10:19:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2g.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
 HOMEPAGE="http://www.harding.motd.ca/autossh/"
 LICENSE="BSD"
-KEYWORDS="~x86 ~sparc alpha ~ia64 ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc alpha ia64 amd64 ~ppc"
 SRC_URI="http://www.harding.motd.ca/autossh/${P}.tgz"
 SLOT="0"
 IUSE=""
diff --git a/net-misc/axel/ChangeLog b/net-misc/axel/ChangeLog
index ddc63491fddb..28bf8f578e80 100644
--- a/net-misc/axel/ChangeLog
+++ b/net-misc/axel/ChangeLog
@@ -1,8 +1,60 @@
 # ChangeLog for net-misc/axel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/ChangeLog,v 1.1 2002/06/01 02:24:09 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/ChangeLog,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
+
+  10 Jul 2005; Lina Pezzella <j4rg0n@gentoo.org> axel-1.0b.ebuild:
+  Stable ppc-macos. Bug #88264. Submitted on behalf of Fabian Groffen.
+
+  10 May 2005; Tavis Ormandy <taviso@gentoo.org> axel-1.0b.ebuild:
+  portage should handle the stripping so as not to override nostrip.
+
+  11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> axel-1.0b.ebuild:
+  Stable on sparc wrt #88264
+
+  11 Apr 2005; Markus Rothe <corsair@gentoo.org> axel-1.0b.ebuild:
+  Stable on ppc64; bug #88264
+
+  11 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> axel-1.0b.ebuild:
+  Stable on ppc.
+
+*axel-1.0b (11 Apr 2005)
+
+  11 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +axel-1.0b.ebuild:
+  Version bump for security bug 88264.
+
+  06 Mar 2005; Daniel Black <dragonheart@gentoo.org> axel-1.0a.ebuild:
+  Homepage update as per bug #84123 thanks to Nicholas McGovern
+  <hydroxides@yahoo.co.uk>
+
+  17 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> axel-1.0a.ebuild:
+  fix typo (bug #82319); tidy
+
+  16 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> axel-1.0a.ebuild:
+  Marked ~amd64, closes bug 82236.
+
+  29 Aug 2004; Tom Gall <tgall@gentoo.org> axel-1.0a.ebuild:
+  stable on ppc64, bug #61409
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed CVS Header.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> axel-1.0a.ebuild:
+  change virtual/glibc to virtual/libc
+
+  26 Jun 2004; David Holm <dholm@gentoo.org> axel-1.0a.ebuild:
+  Added to ~ppc.
+
+  11 Jun 2004; Aron Griffis <agriffis@gentoo.org> axel-1.0a.ebuild:
+  Fix use invocation
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 
 *axel-1.0a (1 June 2002)
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> axel-1.0a.ebuild :
+
+  Added KEYWORDS.
+
   13 May 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
 
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index e69de29bb2d1..f0d4cee9cefd 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -0,0 +1,5 @@
+MD5 98141543351647ef5c2e2d04b542c480 ChangeLog 2346
+MD5 0fb45b4a07f2ea0680ba9d70c8456ab4 axel-1.0a.ebuild 767
+MD5 70c33b00362c325cf7c28072bd656077 axel-1.0b.ebuild 784
+MD5 c22097decf3dd805e61a9c46bba96f9b files/digest-axel-1.0a 60
+MD5 4a8f92e800f30719912ed195bd9168d7 files/digest-axel-1.0b 60
diff --git a/net-misc/axel/axel-1.0a.ebuild b/net-misc/axel/axel-1.0a.ebuild
index cd1a4380a4b3..52d030f2d793 100644
--- a/net-misc/axel/axel-1.0a.ebuild
+++ b/net-misc/axel/axel-1.0a.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/axel-1.0a.ebuild,v 1.1 2002/06/01 02:24:09 stroke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/axel-1.0a.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
+
+DESCRIPTION="light Unix download accelerator"
+HOMEPAGE="http://wilmer.gaast.net/main.php/axel.html"
+SRC_URI="http://wilmer.gaast.net/downloads/${P}.tar.gz"
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Axel: A light Unix download accelerator"
-HOMEPAGE="http://www.lintux.cx/axel.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 ppc-macos sparc x86"
+IUSE="debug"
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
 src_compile() {
-	local mconf
-	cd work/${P}
-	( [ -n "$DEBUG" ] || [ -n "$DEBUGBUILD" ] ) && \
-		myconf="${myconf} --debug=1 --strip=0"
-	./configure --prefix=/usr \
+	local myconf
+
+	use debug && myconf="--debug=1 --strip=0"
+	econf \
 		--etcdir=/etc \
-		--mandir=/usr/share/man $myconf || die
-	emake || die
+		${myconf} \
+		|| die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc API CHANGES COPYING CREDITS README axelrc.example
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc API CHANGES CREDITS README axelrc.example
 }
diff --git a/net-misc/axel/axel-1.0b.ebuild b/net-misc/axel/axel-1.0b.ebuild
index 81d26d5283c3..0410aa54d3e4 100644
--- a/net-misc/axel/axel-1.0b.ebuild
+++ b/net-misc/axel/axel-1.0b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/axel-1.0b.ebuild,v 1.1 2005/04/11 17:19:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/axel/axel-1.0b.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 DESCRIPTION="light Unix download accelerator"
 HOMEPAGE="http://wilmer.gaast.net/main.php/axel.html"
@@ -8,7 +8,7 @@ SRC_URI="http://wilmer.gaast.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~ppc-macos ~sparc x86"
+KEYWORDS="~amd64 ppc ppc-macos ppc64 sparc x86"
 IUSE="debug"
 
 DEPEND="virtual/libc"
@@ -16,8 +16,9 @@ DEPEND="virtual/libc"
 src_compile() {
 	local myconf
 
-	use debug && myconf="--debug=1 --strip=0"
+	use debug && myconf="--debug=1"
 	econf \
+		--strip=0 \
 		--etcdir=/etc \
 		${myconf} \
 		|| die
diff --git a/net-misc/balance/ChangeLog b/net-misc/balance/ChangeLog
index 6f12bfd8adae..2968745f9fd1 100644
--- a/net-misc/balance/ChangeLog
+++ b/net-misc/balance/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-misc/balance
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/balance/ChangeLog,v 1.1 2003/12/25 20:20:44 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/balance/ChangeLog,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
+
+  02 Nov 2005; Stefan Schweizer <genstef@gentoo.org> balance-3.24.ebuild,
+  balance-3.26.ebuild:
+  app-text/ghostscript -> virtual/ghostscript
+
+*balance-3.26 (03 Sep 2005)
+
+  03 Sep 2005; Daniel Black <dragonheart@gentoo.org> +balance-3.26.ebuild:
+  version bump
+
+*balance-3.24 (06 Jul 2005)
+
+  06 Jul 2005; Mike Frysinger <vapier@gentoo.org> +balance-3.24.ebuild:
+  Version bump #97948 by wolf3d.
+
+*balance-3.19 (05 Dec 2004)
+
+  05 Dec 2004; Mike Frysinger <vapier@gentoo.org> +balance-3.19.ebuild:
+  Version bump #73374 by werner maier.
 
 *balance-3.11 (25 Dec 2003)
 
diff --git a/net-misc/balance/Manifest b/net-misc/balance/Manifest
index 7d6066145e79..f2e872e28878 100644
--- a/net-misc/balance/Manifest
+++ b/net-misc/balance/Manifest
@@ -1,3 +1,7 @@
-MD5 7fd344ba0b7c4b46ffaba29cf6c7cb3f balance-3.11.ebuild 571
-MD5 170195cb27c52086df9d6a7d22ae001e files/digest-balance-3.11 63
-MD5 6f71a6b01f48949b919cef4be8c12444 ChangeLog 371
+MD5 897b9f88ad279c491351f5cfb1fab8ce ChangeLog 903
+MD5 d0bf3b5ac6c9f85ab572801f481da471 balance-3.19.ebuild 572
+MD5 9be19bbb85bd872a76639dbef983ea13 balance-3.24.ebuild 709
+MD5 ecdf471e2d5e946e0e0d2716a0af82da balance-3.26.ebuild 729
+MD5 1d240110decb7e81c75494407a26d6bb files/digest-balance-3.19 63
+MD5 85ccbebb4e4992ee1b77f80ae2270ec2 files/digest-balance-3.24 63
+MD5 7078b91e1d2983b6515ea5bca1ec068b files/digest-balance-3.26 63
diff --git a/net-misc/balance/balance-3.19.ebuild b/net-misc/balance/balance-3.19.ebuild
index f997899574d9..80ef7f0dace9 100644
--- a/net-misc/balance/balance-3.19.ebuild
+++ b/net-misc/balance/balance-3.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-misc/balance/balance-3.19.ebuild,v 1.1 2004/12/05 08:49:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/balance/balance-3.19.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
 
 DESCRIPTION="TCP Load Balancing Port Forwarder"
 HOMEPAGE="http://www.inlab.de/balance.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.inlab.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 src_compile() {
diff --git a/net-misc/balance/balance-3.24.ebuild b/net-misc/balance/balance-3.24.ebuild
index 933ea48a0b74..e440f830f7be 100644
--- a/net-misc/balance/balance-3.24.ebuild
+++ b/net-misc/balance/balance-3.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-misc/balance/balance-3.24.ebuild,v 1.1 2005/07/06 00:11:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/balance/balance-3.24.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
 
 DESCRIPTION="TCP Load Balancing Port Forwarder"
 HOMEPAGE="http://www.inlab.de/balance.html"
@@ -8,16 +8,21 @@ SRC_URI="http://www.inlab.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="~ppc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( virtual/ghostscript )"
+RDEPEND=""
 
 src_compile() {
+	use doc || touch balance.pdf balance.ps
 	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
 	dosbin balance || die
 	doman balance.1
+	use doc && dodoc balance.pdf balance.ps
 	dodir /var/run/balance
 	fperms 1755 /var/run/balance
 }
diff --git a/net-misc/balance/balance-3.26.ebuild b/net-misc/balance/balance-3.26.ebuild
index 6647802faad5..94c91abfbb87 100644
--- a/net-misc/balance/balance-3.26.ebuild
+++ b/net-misc/balance/balance-3.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-misc/balance/balance-3.26.ebuild,v 1.1 2005/09/03 08:52:01 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/balance/balance-3.26.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="doc"
 
-DEPEND="doc? ( app-text/ghostscript )"
+DEPEND="doc? ( virtual/ghostscript )"
 RDEPEND=""
 
 src_compile() {
diff --git a/net-misc/bcm4400/ChangeLog b/net-misc/bcm4400/ChangeLog
index 33c61fc37b22..37501c37e3f9 100644
--- a/net-misc/bcm4400/ChangeLog
+++ b/net-misc/bcm4400/ChangeLog
@@ -1,8 +1,51 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/ChangeLog,v 1.1 2003/01/19 03:56:37 sethbc Exp $
+# ChangeLog for net-misc/bcm4400
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
-* net-misc/bcm4400-1.0.1 (Jan 18 2003)
+  27 Aug 2005; Stefan Schweizer <genstef@gentoo.org> +bcm4400-3.0.13.ebuild:
+  version bump
+
+  21 Jun 2005; David Holm <dholm@gentoo.org> bcm4400-3.0.8-r1.ebuild:
+  Added to ~ppc.
+
+*bcm4400-3.0.8-r1 (20 Jun 2005)
+
+  20 Jun 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/bcm4400-3.0.8-pci_name.patch, +bcm4400-3.0.8-r1.ebuild:
+  Fix compiling with kernel 2.6.12, thanks to Philip Kovacs
+  <kovacsp3@comcast.net> in bug 96559
+
+  31 Jan 2005; Stefan Schweizer <genstef@gentoo.org> -bcm4400-3.0.7.ebuild,
+  bcm4400-3.0.8.ebuild:
+  x86 stable thanks to Philip Kovacs <kovacsp3@comcast.net> in bug 74250, old
+  ebuilds clean-out
+
+*bcm4400-3.0.8 (01 Jan 2005)
+
+  01 Jan 2005; Stefan Schweizer <genstef@gentoo.org> +metadata.xml,
+  -files/bcm4400-1.0.1-gcc33-fix.patch, -bcm4400-1.0.1.ebuild,
+  +bcm4400-3.0.8.ebuild:
+  Version Bump thanks to John Dangler <jdangler@atlantic.net> for reporting in
+  bug 74250 and to Philip Kovacs <kovacsp3@comcast.net> for ebuild/testing.
+  Cleaned out old version, added metadata.xml with kernel herd.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> bcm4400-1.0.1.ebuild:
+  Add inherit eutils
+
+  23 Dec 2003; Marius Mauch <genone@gentoo.org> bcm4400-3.0.7.ebuild:
+  added missing app-arch/unzip dependency, thanks to Arto Kuiri for
+  reporting it (bug #36354)
+
+*bcm4400-3.0.7 (07 Dec 2003)
+
+  07 Dec 2003; <plasmaroo@gentoo.org> bcm4400-3.0.7.ebuild:
+  Version bump, thanks to Andy Wang for sending bug #35227 along.
+
+*bcm4400-1.0.1 (Jan 18 2003)
+
+  02 Oct 2003; Joshua Kinard <kumba@gentoo.org> bcm4400-1.0.1.ebuild,
+  files/bcm4400-1.0.1-gcc33-fix.patch:
+  Added a patch to the ebuild that fixes a gcc-3.3 issue.  Closes Bug #28614.
 
   18 Jan 2003; Seth Chandler <sethbc@gentoo.org> bcm4400-1.0.1.ebuild :
   initial import into portage
diff --git a/net-misc/bcm4400/Manifest b/net-misc/bcm4400/Manifest
index e69de29bb2d1..fd1ebad9c2c5 100644
--- a/net-misc/bcm4400/Manifest
+++ b/net-misc/bcm4400/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 04c01b40a115565d0c6b43f74cb31ba8 ChangeLog 1981
+MD5 875341ec6b00ff86551710292aa748f7 bcm4400-3.0.13.ebuild 1042
+MD5 5af1a5a9b2d0b46ea201edd20d5e7725 bcm4400-3.0.8-r1.ebuild 1113
+MD5 10ff612188803f5f72355a773d23102a bcm4400-3.0.8.ebuild 873
+MD5 288fbafdd2ac71876274fa149b542857 files/bcm4400-3.0.8-pci_name.patch 415
+MD5 06042d2a38ba9754db500a967fb81ce4 files/digest-bcm4400-3.0.13 61
+MD5 273fd9c421c93d6658ceab1c40080579 files/digest-bcm4400-3.0.8 60
+MD5 273fd9c421c93d6658ceab1c40080579 files/digest-bcm4400-3.0.8-r1 60
+MD5 6d924ebdbe12162835ab1c1ea584636e metadata.xml 161
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEhgkI1lqEGTUzyQRAm9rAJ9fvNeZaQRiZ04OJLe8UwhnP7/6vgCg0DkX
+0WxlBBOgQN1UZjmzLXQ/3Bw=
+=4mdr
+-----END PGP SIGNATURE-----
diff --git a/net-misc/bcm4400/bcm4400-3.0.13.ebuild b/net-misc/bcm4400/bcm4400-3.0.13.ebuild
index a1262ba62086..ab554aef3cbb 100644
--- a/net-misc/bcm4400/bcm4400-3.0.13.ebuild
+++ b/net-misc/bcm4400/bcm4400-3.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-3.0.13.ebuild,v 1.1 2005/08/27 21:29:08 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-3.0.13.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild b/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild
index bdda9278f574..06d8b2d78caa 100644
--- a/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild
+++ b/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild,v 1.1 2005/06/20 11:58:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-3.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -8,7 +8,7 @@ SRC_URI="http://www.broadcom.com/docs/driver_download/440x/linux-${PV}.zip"
 DESCRIPTION="Driver for the bcm4400 10/100 network card (in the form of kernel modules)."
 HOMEPAGE="http://www.broadcom.com"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND="app-arch/unzip"
 S=${WORKDIR}/linux/${P}/src
diff --git a/net-misc/bcm4400/bcm4400-3.0.8.ebuild b/net-misc/bcm4400/bcm4400-3.0.8.ebuild
index 0a725cb3b36e..92e07f613836 100644
--- a/net-misc/bcm4400/bcm4400-3.0.8.ebuild
+++ b/net-misc/bcm4400/bcm4400-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/net-misc/bcm4400/bcm4400-3.0.8.ebuild,v 1.1 2005/01/01 22:39:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-3.0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 inherit linux-mod
 
@@ -8,7 +8,7 @@ SRC_URI="http://www.broadcom.com/docs/driver_download/440x/linux-${PV}.zip"
 DESCRIPTION="Driver for the bcm4400 10/100 network card (in the form of kernel modules)."
 HOMEPAGE="http://www.broadcom.com"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="app-arch/unzip"
 S=${WORKDIR}/linux/${P}/src
diff --git a/net-misc/bcm570x/ChangeLog b/net-misc/bcm570x/ChangeLog
index 775075119ccf..9f70e2aecb9b 100644
--- a/net-misc/bcm570x/ChangeLog
+++ b/net-misc/bcm570x/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-misc/bcm570x
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/ChangeLog,v 1.1 2004/04/09 03:33:05 steel300 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+*bcm570x-8.1.55 (06 May 2005)
+
+  06 May 2005; Stefan Schweizer <genstef@gentoo.org> +bcm570x-8.1.55.ebuild:
+  Version bump thanks to steve <steve@lostforest.net> for reporting and
+  testing, bug 91655
+
+*bcm570x-7.3.5 (21 Jan 2005)
+
+  21 Jan 2005; Stefan Schweizer <genstef@gentoo.org> bcm570x-7.3.5.ebuild:
+  Conversion to linux-mod, /usr/src/linux as kernel for building, thanks to
+  Marko Djukic <marko@oblo.com>, Zachary J. Medico <zmedico@yahoo.com> and
+  Markus Wagner <mwagner@wagner-wds.de> in bug 60465
+
+  29 Sep 2004; Joel Martin <kanaka@gentoo.org> :
+  Added version 7.3.5 and fixed to work with kernel 2.6. Removed fetch
+  restriction.
 
 *bcm570x-7.1.22 (08 Apr 2004)
 
diff --git a/net-misc/bcm570x/Manifest b/net-misc/bcm570x/Manifest
index a7c23cf0c029..98b0195d6520 100644
--- a/net-misc/bcm570x/Manifest
+++ b/net-misc/bcm570x/Manifest
@@ -1,3 +1,10 @@
-MD5 e8f1b256e63b2c35708bbb436e43bb84 bcm570x-7.1.22.ebuild 1180
-MD5 67386c6d74f0fac56347fd50cad1eda6 ChangeLog 216
+MD5 e87041ed4428abc340840dd9f988cab0 bcm570x-7.3.5.ebuild 1076
+MD5 434bcd4fa6f0d6cb9c837cd042b1d266 bcm570x-8.1.55.ebuild 1443
+MD5 3c53a6cf844bd82aad7b3aac079e3716 bcm570x-7.1.22.ebuild 1213
+MD5 8eb761d003e6190b8aa6e8ea5b4fe2d7 bcm570x-8.2.18.ebuild 1478
+MD5 cdd00b68600522209a557899b295b836 ChangeLog 997
+MD5 e31850eaea026d25a876d92edad633c5 metadata.xml 432
+MD5 44885101781a4107275d223357034d59 files/digest-bcm570x-7.3.5 60
 MD5 e6eee42d87d02c24aaf191bb75376589 files/digest-bcm570x-7.1.22 66
+MD5 51694895250b73ea9c3b2de6dd42b2d3 files/digest-bcm570x-8.1.55 61
+MD5 c6d8124e7c8a8bcef35f1bbef251607b files/digest-bcm570x-8.2.18 61
diff --git a/net-misc/bcm570x/bcm570x-7.1.22.ebuild b/net-misc/bcm570x/bcm570x-7.1.22.ebuild
index b1e1745348ab..bbd67abcb580 100644
--- a/net-misc/bcm570x/bcm570x-7.1.22.ebuild
+++ b/net-misc/bcm570x/bcm570x-7.1.22.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-misc/bcm570x/bcm570x-7.1.22.ebuild,v 1.1 2004/04/09 03:33:05 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-7.1.22.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 MY_P=${P/570x/5700}
 SRC_URI="http://www.broadcom.com/docs/driver_download/570x/${MY_P}.tar.gz"
@@ -10,6 +10,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
+IUSE=""
 
 S=${WORKDIR}/${PN/570x/5700}-${PV}/src
 
diff --git a/net-misc/bcm570x/bcm570x-7.3.5.ebuild b/net-misc/bcm570x/bcm570x-7.3.5.ebuild
index 30a933b1dbb9..1f7c7e60239a 100644
--- a/net-misc/bcm570x/bcm570x-7.3.5.ebuild
+++ b/net-misc/bcm570x/bcm570x-7.3.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/net-misc/bcm570x/bcm570x-7.3.5.ebuild,v 1.1 2004/09/29 20:28:57 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-7.3.5.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+inherit linux-mod
 
 MY_P=${P/570x/5700}
 SRC_URI="http://www.broadcom.com/docs/driver_download/570x/linux-${PV}.zip"
@@ -8,53 +10,34 @@ DESCRIPTION="Driver for the Broadcom 570x-based gigabit cards (found on many mai
 HOMEPAGE="http://www.broadcom.com/docs/driver-sla.php?driver=570x-Linux"
 LICENSE="GPL-2"
 
-SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
-DEPEND="app-arch/unzip
-	virtual/linux-sources"
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
+MODULE_NAMES="bcm5700(net:${S}/src)"
+BUILD_TARGETS="default"
+BUILD_PARAMS="LINUX=${KV_DIR}"
+
 src_unpack() {
 	unpack ${A}
-	tar -xvzpf ${WORKDIR}/Server/Linux/Driver/${MY_P}.tar.gz &> /dev/null ||
+	tar xzpf ${WORKDIR}/Server/Linux/Driver/${MY_P}.tar.gz || \
 		die "could not extract second level archive"
 }
 
-src_compile() {
-	check_KV
-
-	cd ${S}/src
-	if [[ ARCH=x86 ]]; then
-		my_arch=i386
-	elif [[ ARCH=amd64 ]]; then
-		my_arch=x86_64
-	fi
-	make ARCH=${my_arch} LINUX=/usr/src/linux-${KV} || die "compile failed"
-}
-
 src_install() {
-	cd ${S}/src
-	make ARCH=${my_arch} PREFIX=${D} install || die
+	linux-mod_src_install
 
-	doman bcm5700.4.gz
-	cd ${S}
 	dodoc DISTRIB.TXT LICENSE README.TXT RELEASE.TXT
+
+	cd ${S}/src
+	doman bcm5700.4
 }
 
 pkg_postinst() {
-	echo ">>> Updating module dependencies..."
-	[ -x /sbin/update-modules ] && /sbin/update-modules
-	einfo ""
-	einfo "${P}.tar.gz also contains a kernel-patch to integrate this driver directly."
-	einfo ""
-	einfo "To load the module at boot up, add bcm5700 to /etc/modules.autoload.d/KERN_VERSION"
-	einfo ""
-	einfo "To load the module now without rebooting, use the following command:"
-	einfo "modprobe bcm5700"
-	einfo ""
+	linux-mod_pkg_postinst
+
 	einfo "For more detailed information about this driver:"
 	einfo "man 4 bcm5700"
-	einfo ""
 }
diff --git a/net-misc/bcm570x/bcm570x-8.1.55.ebuild b/net-misc/bcm570x/bcm570x-8.1.55.ebuild
index d3bf9868d196..addf95c64ad1 100644
--- a/net-misc/bcm570x/bcm570x-8.1.55.ebuild
+++ b/net-misc/bcm570x/bcm570x-8.1.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-8.1.55.ebuild,v 1.1 2005/05/06 12:04:17 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-8.1.55.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/net-misc/bcm570x/bcm570x-8.2.18.ebuild b/net-misc/bcm570x/bcm570x-8.2.18.ebuild
index c8227ba72a4a..a75a21289364 100644
--- a/net-misc/bcm570x/bcm570x-8.2.18.ebuild
+++ b/net-misc/bcm570x/bcm570x-8.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-misc/bcm570x/bcm570x-8.2.18.ebuild,v 1.1 2005/08/27 21:30:24 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm570x/bcm570x-8.2.18.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/net-misc/bcm570x/metadata.xml b/net-misc/bcm570x/metadata.xml
index 19d32c55a7b8..53caa9bf6041 100644
--- a/net-misc/bcm570x/metadata.xml
+++ b/net-misc/bcm570x/metadata.xml
@@ -3,13 +3,12 @@
 <pkgmetadata>
     <herd>x86-kernel</herd>
     <maintainer>
-        <email>steel300@gentoo.org</email>
-        <name>Jason Cox</name>
+        <email>kanaka@gentoo.org</email>
+        <name>Joel Martin</name>
     </maintainer>
 
     <longdescription>
         Support for the Broadcom 570x series of gigabit network cards.
-        This requires previous fetching of the driver in order to work. It's licensed 
-        under the GPL-2.
+        It's licensed under the GPL-2.
     </longdescription>
 </pkgmetadata>
diff --git a/net-misc/bidwatcher/ChangeLog b/net-misc/bidwatcher/ChangeLog
index 2b202df7d44e..2bd6830731f6 100644
--- a/net-misc/bidwatcher/ChangeLog
+++ b/net-misc/bidwatcher/ChangeLog
@@ -1,8 +1,114 @@
 # ChangeLog for net-misc/bidwatcher
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bidwatcher/ChangeLog,v 1.1 2002/05/28 16:47:30 spider Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bidwatcher/ChangeLog,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+  28 Feb 2005; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.17.ebuild:
+  Adding curl to depend. closes 83381
+
+*bidwatcher-1.3.17 (20 Feb 2005)
+
+  20 Feb 2005; Martin Holzer <mholzer@gentoo.org> +bidwatcher-1.3.17.ebuild:
+  Version bumped.
+
+*bidwatcher-1.3.16 (12 Sep 2004)
+
+  12 Sep 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.16.ebuild:
+  Version bumped.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bidwatcher-1.3.15.ebuild:
+  change virtual/glibc to virtual/libc
+
+  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -bidwatcher-1.3.13.ebuild, -bidwatcher-1.3.14.ebuild:
+  clean older broken versions
+
+  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  bidwatcher-1.3.15.ebuild:
+  stablize (bug #55595)
+
+  06 May 2004; Josh Grebe <squash@gentoo.org> bidwatcher-1.3.15.ebuild:
+  Added sparc, bug 50284
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> bidwatcher-1.3.15.ebuild:
+  Added to ~ppc.
+
+*bidwatcher-1.3.15 (24 Apr 2004)
+
+  24 Apr 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.15.ebuild:
+  Version bumped.
+
+*bidwatcher-1.3.14 (24 Apr 2004)
+
+  24 Apr 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.14.ebuild:
+  Version bumped.
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.13.ebuild:
+  stable as needed to work.
+
+*bidwatcher-1.3.13 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.13.ebuild:
+  Version bumped.
+
+*bidwatcher-1.3.12 (29 Feb 2004)
+
+  29 Feb 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.12.ebuild:
+  Version bumped. Closes 43249
+
+  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.11.ebuild:
+  Stable since 1.3.10 is brokne
+
+*bidwatcher-1.3.11 (17 Dec 2003)
+
+  17 Dec 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.11.ebuild:
+  Version bumped.
+
+*bidwatcher-1.3.11_rc1 (12 Dec 2003)
+
+  12 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  bidwatcher-1.3.11_rc1.ebuild:
+  Version bumped.
+
+*bidwatcher-1.3.10 (28 Jul 2003)
+
+  28 Jul 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.10.ebuild:
+  Version bumped.
+
+*bidwatcher-1.3.9 (14 Jul 2003)
+
+  14 Jul 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.9.ebuild:
+  Version bumped. closes #24464
+
+*bidwatcher-1.3.8 (18 Jun 2003)
+
+  18 Jun 2003; <msterret@gentoo.org> bidwatcher-1.3.8.ebuild:
+  version bump
+
+  18 Jun 2003; <msterret@gentoo.org> bidwatcher-1.3.7.ebuild:
+  use dohtml for html file (bug 23048); simplify ebuild, use einstall
+
+*bidwatcher-1.3.7 (25 Dec 2002)
+
+  02 Jan 2003; Martin Holzer <mholzer@gentoo.org bidwatcher-1.3.7.ebuild :
+  Makred as stable
+
+  25 Dec 2002; Martin Holzer <mholzer@gentoo.org bidwatcher-1.3.7.ebuild files/digest-bidwatcher-1.3.7 ChangeLog :
+  Version Bumped. Closees #12697.
+ 
+*bidwatcher-1.3.6 (28 May 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  15 Nov 2002; phoen][x <phoenix@gentoo.org> bidwatcher-1.3.6.ebuild,
+  files/digest-bidwatcher-1.3.6 ChangeLog :
+  Bumped bidwatcher to the newest version. This closes bug #7705.
 
 *bidwatcher-1.3.3 (28 May 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> bidwatcher-1.3.3.ebuild :
+  Added KEYWORDS.
+
   28 May 2002; Spider <spider@gentoo.org> ChangeLog bidwatcher-1.3.3.ebuild :
   Initial release from bugzilla bug. modified and updated version
   This ebuild is free target, Feel free to take over maintainance
+
diff --git a/net-misc/bidwatcher/Manifest b/net-misc/bidwatcher/Manifest
index e69de29bb2d1..68051802a0ca 100644
--- a/net-misc/bidwatcher/Manifest
+++ b/net-misc/bidwatcher/Manifest
@@ -0,0 +1,3 @@
+MD5 8c78b44e12cd8cc552355dae7e4c444d bidwatcher-1.3.17.ebuild 681
+MD5 a516a65322221b4309deaf8a3d98ea1f ChangeLog 3568
+MD5 272e5c1ddb5fcd46fb42c7f6d3177156 files/digest-bidwatcher-1.3.17 69
diff --git a/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild b/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild
index 6011f33c9420..147e110c4694 100644
--- a/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild
+++ b/net-misc/bidwatcher/bidwatcher-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/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild,v 1.1 2005/02/20 09:24:08 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 
 MY_P=${P/_rc/-rc}
@@ -15,7 +15,8 @@ IUSE=""
 
 DEPEND="virtual/libc
 	=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*"
+	=dev-libs/glib-1.2*
+	>=net-misc/curl-7.11.1"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/blogtk/ChangeLog b/net-misc/blogtk/ChangeLog
index 17ae1afd8de1..935ce0081d28 100644
--- a/net-misc/blogtk/ChangeLog
+++ b/net-misc/blogtk/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for net-misc/blogtk
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/ChangeLog,v 1.1 2004/02/17 22:04:48 humpback Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> blogtk-1.0.ebuild:
+  Stable on ppc.
+
+  02 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; blogtk-1.1.ebuild:
+  Adding amd64 dep reported in #82245 thanks to Vermyndax
+  <vermyndax@red-abstract.com>
+
+  14 Feb 2005; Simon Stelling <blubb@gentoo.org> blogtk-1.1.ebuild:
+  added ~amd64
+
+*blogtk-1.1 (16 Jan 2005)
+
+  16 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>; metadata.xml,
+  -blogtk-0.8.ebuild, -blogtk-0.9.ebuild, blogtk-1.0.ebuild,
+  +blogtk-1.1.ebuild:
+  Marked 1.0 x86, removed older versions, fixed date on 1.0 and added 1.1 that
+  closes bug 78166, thanks to Jason Oliveira for bringing this to our attention.
+  also added myself as maintainer in metadata.xml
+
+  14 Oct 2004; David Holm <dholm@gentoo.org> blogtk-1.0.ebuild:
+  Added to ~ppc.
+
+*blogtk-1.0 (26 Sep 2004)
+
+  26 Sep 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/blogtk-1.0-destdir.patch, +blogtk-1.0.ebuild:
+  fixed makefile to work with DESTDIR to avoid sandbox violations. version bump
+  (#50938)
+
+  24 Mar 2004; Martin Holzer <mholzer@gentoo.org> blogtk-0.8.ebuild,
+  blogtk-0.9.ebuild:
+  fixing depend. closes 45110.
+
+*blogtk-0.9 (24 Feb 2004)
+
+  24 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; blogtk-0.8.ebuild,
+  blogtk-0.9.ebuild, metadata.xml:
+  Marking 0.8 stable and version bumping 0.9
 
 *blogtk-0.8 (17 Feb 2004)
 
diff --git a/net-misc/blogtk/Manifest b/net-misc/blogtk/Manifest
index 762c88b7b1bc..c216144370b4 100644
--- a/net-misc/blogtk/Manifest
+++ b/net-misc/blogtk/Manifest
@@ -1,2 +1,7 @@
-MD5 a36059582803c170a51415546bdc2ea3 blogtk-0.8.ebuild 711
-MD5 43c6f624366818bbedf10aab206fdd58 files/digest-blogtk-0.8 64
+MD5 a129ec6f7f282474ba994a29ced6e536 blogtk-1.0.ebuild 816
+MD5 0720c622dd5394c4d8aceb8a44435e82 metadata.xml 224
+MD5 d7081531ff8454e7bdd40770e2f8f48f ChangeLog 1727
+MD5 2aff7e248c7dcac422725fe5a0d55a59 blogtk-1.1.ebuild 877
+MD5 f96e3cc6ede69196d19c7bf411d84065 files/digest-blogtk-1.0 62
+MD5 9c6d63937d69fd3b3cb659ff7f11f70e files/blogtk-1.0-destdir.patch 1029
+MD5 f594344e6d09e0e48b2525de5808cc9f files/digest-blogtk-1.1 62
diff --git a/net-misc/blogtk/blogtk-1.0.ebuild b/net-misc/blogtk/blogtk-1.0.ebuild
index aee8166e87d0..f8027d3762aa 100644
--- a/net-misc/blogtk/blogtk-1.0.ebuild
+++ b/net-misc/blogtk/blogtk-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.0.ebuild,v 1.1 2004/09/26 18:43:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.0.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/BloGTK-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygtk-2.0.0
diff --git a/net-misc/blogtk/blogtk-1.1.ebuild b/net-misc/blogtk/blogtk-1.1.ebuild
index c23cb33485f4..4f8a698db97b 100644
--- a/net-misc/blogtk/blogtk-1.1.ebuild
+++ b/net-misc/blogtk/blogtk-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-misc/blogtk/blogtk-1.1.ebuild,v 1.1 2005/01/16 19:46:15 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 inherit eutils
 
@@ -12,12 +12,13 @@ S="${WORKDIR}/BloGTK-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 RDEPEND=">=dev-python/pygtk-2.0.0
 	>=gnome-base/gconf-2.2.0
-	>=dev-python/gnome-python-2"
+	>=dev-python/gnome-python-2
+	amd64? ( >=dev-python/gnome-python-2.6.1 )"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
 
diff --git a/net-misc/blogtk/metadata.xml b/net-misc/blogtk/metadata.xml
index 66aef9c02acb..6b244e0f3f51 100644
--- a/net-misc/blogtk/metadata.xml
+++ b/net-misc/blogtk/metadata.xml
@@ -1,6 +1,8 @@
-<?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>gnome</herd>
+<maintainer>
+  <email>humpback@gentoo.org</email>
+</maintainer>  
 </pkgmetadata>
-
diff --git a/net-misc/bo2k_console/ChangeLog b/net-misc/bo2k_console/ChangeLog
index e0b377c05795..dc0ce801bcdd 100644
--- a/net-misc/bo2k_console/ChangeLog
+++ b/net-misc/bo2k_console/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for net-misc/bo2k_console
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bo2k_console/ChangeLog,v 1.1 2003/09/11 12:33:44 lordvan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bo2k_console/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
-*libbo2k-0.1.5pre (11 Sep 2003)
+  14 Oct 2004; David Holm <dholm@gentoo.org> bo2k_console-0.0.2_pre.ebuild:
+  Added to ~ppc.
+
+*bo2k_console-0.0.2_pre (11 Sep 2003)
     11 Sep 2003; Thomas Raschbacher <lordvan@gentoo.org>: bo2k_console-0.0.2_pre, ChangeLog, metadata.xml:
-    initial release
\ No newline at end of file
+    initial release
diff --git a/net-misc/bo2k_console/Manifest b/net-misc/bo2k_console/Manifest
index 29c2c4ad1ac3..d4884b693deb 100644
--- a/net-misc/bo2k_console/Manifest
+++ b/net-misc/bo2k_console/Manifest
@@ -1,4 +1,4 @@
-MD5 99d2546d4aa3ca72e4843e39677854ae bo2k_console-0.0.2_pre.ebuild 683
-MD5 80589c02d42643e0798e69a29ebe2256 ChangeLog 368
-MD5 f76c9d12df67882110dd661562837477 metadata.xml 328
+MD5 c31245432d5df3de9f61fc98a5b6edc2 ChangeLog 473
+MD5 4cceb3039d6785f6fbd063bc5b3cd291 bo2k_console-0.0.2_pre.ebuild 685
+MD5 99aa6083aba75ff41257d5f402d02bad metadata.xml 332
 MD5 57458f2fa9c9dbdd8368741fe99d8198 files/digest-bo2k_console-0.0.2_pre 72
diff --git a/net-misc/bo2k_console/bo2k_console-0.0.2_pre.ebuild b/net-misc/bo2k_console/bo2k_console-0.0.2_pre.ebuild
index 5c6150c28438..443677e89eab 100644
--- a/net-misc/bo2k_console/bo2k_console-0.0.2_pre.ebuild
+++ b/net-misc/bo2k_console/bo2k_console-0.0.2_pre.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bo2k_console/bo2k_console-0.0.2_pre.ebuild,v 1.1 2003/09/11 12:33:44 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bo2k_console/bo2k_console-0.0.2_pre.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 MY_PV="0.0.2pre"
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="Command-line client based on LibBO2K."
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.bo2k.com/"
 SRC_URI="mirror://sourceforge/bo2k/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND=">=net-libs/libbo2k-0.1.5_pre"
 #RDEPEND=""
diff --git a/net-misc/bopm/ChangeLog b/net-misc/bopm/ChangeLog
index 522f7d57dc55..551290f794f5 100644
--- a/net-misc/bopm/ChangeLog
+++ b/net-misc/bopm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/bopm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/ChangeLog,v 1.1 2004/02/18 00:43:58 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+  10 May 2005; David Holm <dholm@gentoo.org> bopm-3.1.2.ebuild:
+  Added to ~ppc.
+
+  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> bopm-3.1.2.ebuild:
+  ~alpha keyword, bug 74784.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bopm-3.1.2.ebuild:
+  change virtual/glibc to virtual/libc
 
 *bopm-3.1.2 (17 Feb 2004)
 
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 1f8397cb23e5..bb63e120962d 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -1,2 +1,6 @@
-MD5 8c0204917e53cc25af65e09c3c3f2a03 bopm-3.1.2.ebuild 1434
+MD5 cc605c81837a3ccbe27174500daae6f0 ChangeLog 673
+MD5 61eca8c85b4594170c51e900f298fc76 bopm-3.1.2.ebuild 1529
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 e334c2d6c57447e4f29405c29d30534f files/bopm.conf.d 266
+MD5 e10e245bd3f7f06551943ff5bf2a51dd files/bopm.init.d 557
 MD5 36f48b28d0fc536e21e69aa648526fee files/digest-bopm-3.1.2 62
diff --git a/net-misc/bopm/bopm-3.1.2.ebuild b/net-misc/bopm/bopm-3.1.2.ebuild
index ddf5022e16c8..3d364961e797 100644
--- a/net-misc/bopm/bopm-3.1.2.ebuild
+++ b/net-misc/bopm/bopm-3.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/bopm-3.1.2.ebuild,v 1.1 2004/02/18 00:43:59 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/bopm-3.1.2.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit eutils
 
@@ -9,10 +9,10 @@ HOMEPAGE="http://www.blitzed.org/bopm/"
 SRC_URI="http://static.blitzed.org/www.blitzed.org/${PN}/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~alpha ~ppc"
 IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
diff --git a/net-misc/bopm/files/bopm.conf.d b/net-misc/bopm/files/bopm.conf.d
index ac8dd87d8dc1..431a0ad744fb 100644
--- a/net-misc/bopm/files/bopm.conf.d
+++ b/net-misc/bopm/files/bopm.conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/files/bopm.conf.d,v 1.1 2004/02/18 00:43:59 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/files/bopm.conf.d,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 # Config file for /etc/init.d/bopm
 
diff --git a/net-misc/bopm/files/bopm.init.d b/net-misc/bopm/files/bopm.init.d
index 54a15c00b7e1..a9a35518e33d 100644
--- a/net-misc/bopm/files/bopm.init.d
+++ b/net-misc/bopm/files/bopm.init.d
@@ -1,7 +1,7 @@
 #!/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/net-misc/bopm/files/bopm.init.d,v 1.1 2004/02/18 00:43:59 zul Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bopm/files/bopm.init.d,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 opts="depend start stop"
 
diff --git a/net-misc/br2684ctl/ChangeLog b/net-misc/br2684ctl/ChangeLog
index 4f480c371cdd..13fd4c3a6410 100644
--- a/net-misc/br2684ctl/ChangeLog
+++ b/net-misc/br2684ctl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/br2684ctl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/br2684ctl/ChangeLog,v 1.1 2005/04/04 19:07:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/br2684ctl/ChangeLog,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
+
+  16 May 2005; Alin Nastac <mrness@gentoo.org> br2684ctl-20040226.ebuild:
+  Replace usage of obsolete gcc.eclass with toolchains-funcs.eclass (#92745).
+  Stable on x86.
+
+  10 May 2005; David Holm <dholm@gentoo.org> br2684ctl-20040226.ebuild:
+  Added to ~ppc.
 
 *br2684ctl-20040226 (04 Apr 2005)
 
diff --git a/net-misc/br2684ctl/Manifest b/net-misc/br2684ctl/Manifest
index 54edd7e552ae..dd1544fffae4 100644
--- a/net-misc/br2684ctl/Manifest
+++ b/net-misc/br2684ctl/Manifest
@@ -1,2 +1,14 @@
-MD5 2ad698c5cfe9bbd0835f109df3aa3ac2 br2684ctl-20040226.ebuild 2086
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 40fd6947e553c291a00ac77d16b1cfde ChangeLog 687
+MD5 eb842f7343763ea17f3b3a68cc6f8e26 br2684ctl-20040226.ebuild 2091
+MD5 28b878e1053bd4bcaa65232f7ad5df2a metadata.xml 355
 MD5 e21700859a4e2c94f0641e6c31677b91 files/digest-br2684ctl-20040226 145
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCiNNUjiC39V7gKu0RAqfdAJ49z8XAImP2TYWNNTgMsuT8Oi6A8ACeMxzF
+Nrx3yNSIxy8uuGN81PxPqsU=
+=DW9K
+-----END PGP SIGNATURE-----
diff --git a/net-misc/br2684ctl/br2684ctl-20040226.ebuild b/net-misc/br2684ctl/br2684ctl-20040226.ebuild
index a7c3a35777c0..339ae62feb3d 100644
--- a/net-misc/br2684ctl/br2684ctl-20040226.ebuild
+++ b/net-misc/br2684ctl/br2684ctl-20040226.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/br2684ctl/br2684ctl-20040226.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
-inherit gcc eutils
+inherit eutils toolchain-funcs
 
 DEBIANPKG_TARBALL="${PN}_${PV}.orig.tar.gz"
 DEBIANPKG_PATCH="${PN}_${PV}-1.diff.gz"
@@ -15,7 +15,7 @@ SRC_URI="${DEBIANPKG_BASE}/${DEBIANPKG_TARBALL}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 RDEPEND=">=net-dialup/linux-atm-2.4.1"
@@ -31,8 +31,9 @@ src_unpack() {
 }
 
 src_compile() {
-	echo $(gcc-getCC) ${CFLAGS} -latm ${PN}.c -o ${PN}
-	$(gcc-getCC) ${CFLAGS} -latm ${PN}.c -o ${PN} || die "Failed to compile!"
+	local MY_CC=$(tc-getCC)
+	echo ${MY_CC} ${CFLAGS} -latm ${PN}.c -o ${PN}
+	${MY_CC} ${CFLAGS} -latm ${PN}.c -o ${PN} || die "Failed to compile!"
 }
 
 src_install() {
diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index 3cebe7068eb9..4a32a762adb8 100644
--- a/net-misc/bridge-utils/ChangeLog
+++ b/net-misc/bridge-utils/ChangeLog
@@ -1,6 +1,125 @@
 # ChangeLog for net-misc/bridge-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
+
+  15 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  bridge-utils-1.0.6-r3.ebuild:
+  1.0.6-r3 to stable x86, so that it works for 2.4 users, and also throw in a
+  bit more error checking (bug #102588).
+
+*bridge-utils-1.0.6-r3 (05 Aug 2005)
+
+  05 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/bridge-utils-1.0.6-allow-without-sysfs.patch,
+  +bridge-utils-1.0.6-r3.ebuild:
+  Bug #69292: Make it possible to compile without sysfs, so the new versions
+  work well for 2.4 users.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  bridge-utils-1.0.6-r2.ebuild:
+  stable on amd64
+
+*bridge-utils-1.0.6-r2 (12 Jul 2005)
+
+  12 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  -bridge-utils-1.0.6-r1.ebuild, +bridge-utils-1.0.6-r2.ebuild:
+  epatch requires eutils
+  rev bumped as r1 still compiled - but without the patch!
+
+*bridge-utils-1.0.6-r1 (12 Jul 2005)
+
+  12 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/bridge-utils-1.0.6-dont-error-on-no-ports.patch,
+  +bridge-utils-1.0.6-r1.ebuild:
+  Bug #98005: Ensure correct behavior when there are no ports on the bridge.
+
+  04 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  bridge-utils-1.0.6.ebuild:
+  Stable 1.0.6 on x86.
+
+  03 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -bridge-utils-0.9.6.ebuild, -bridge-utils-0.9.6-r1.ebuild:
+  Remove some old ebuilds.
+
+*bridge-utils-0.9.6-r2 (03 Jul 2005)
+
+  03 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +bridge-utils-0.9.6-r2.ebuild:
+  Add bridge-utils-0.9.6-r2 that uses the bridge support in the new
+  baselayout, instead of the old init scripts.
+
+  02 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  bridge-utils-1.0.6.ebuild:
+  Add ~amd64 to newest ebuild since it seems to exist on an old one only.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> bridge-utils-1.0.6.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*bridge-utils-1.0.6 (29 Apr 2005)
+
+  29 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +bridge-utils-1.0.6.ebuild:
+  Version bump - now uses baselayout's bridge stuff.
+
+  28 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  bridge-utils-1.0.4.ebuild:
+  Fix bug #69292, missing dep.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bridge-utils-0.9.6-r1.ebuild,
+  bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> bridge-utils-1.0.4.ebuild:
+  Added to ~ppc.
+
+  17 Jun 2004; Jared Hudson <jhhudso@gentoo.org> bridge-utils-0.9.6-r1.ebuild,
+  bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild:
+  Fixed SRC_URI to point to sourceforge's new bridge util location, set 0.9.6
+  to x86 and bumped bridge-utils to 1.0.4 (~x86)
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  bridge-utils-0.9.6-r1.ebuild, bridge-utils-0.9.6.ebuild:
+  Add die following econf for bug 48950
+
+  02 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> bridge-utils-0.9.6-r1.ebuild:
+  Adding amd64 keyword, closing #46552.
+
+*bridge-utils-0.9.6-r1 (18 Mar 2004)
+
+  18 Mar 2004; Jared Hudson <jhhudso@gentoo.org> bridge-utils-0.9.6-r1.ebuild,
+  bridge-utils-0.9.6.ebuild, metadata.xml, files/bridge.conf, files/bridge.rc:
+  Added an init script to the bridge port thanks to Gustavo Felisberto
+  <humpback@gentoo.org> and Denis Knauf <deac@linux-ist-pleite.de>
+
+  25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  bridge-utils-0.9.3-r1.ebuild, bridge-utils-0.9.6.ebuild:
+  Cleanup
+
+  25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  bridge-utils-0.9.6.ebuild:
+  Added additional check for build success because of bug #42548
+
+  24 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> bridge-utils-0.9.6.ebuild :
+  Considered stable for x86
+
+*bridge-utils-0.9.6 (02 Apr 2003)
+
+  02 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> bridge-utils-0.9.6.ebuild,
+  files/digest-bridge-utils-0.9.6 :
+  New version, moved binaries to /sbin since they can be necessary for
+  bringing the network up.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*bridge-utils-0.9.3-r1 (3 May 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> :
+ 
+  Added KEYWORDS.
+    
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  
+  Added LICENSE, SLOT.
 
 *bridge-utils-0.9.3 (1 Feb 2002)
 
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 9c419a320bf9..607e1bc1ed51 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,5 +1,16 @@
-MD5 8e4364df50efec36746d13d6368d7b76 bridge-utils-0.9.6.ebuild 1008
-MD5 e65e73fc5496f38506d1a32e77183525 bridge-utils-0.9.3-r1.ebuild 922
-MD5 ffa4a20e303caa16899c8ca4ed9aacc3 ChangeLog 1319
-MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6 69
-MD5 89f245132e7e7300013ccd25d8739b03 files/digest-bridge-utils-0.9.3-r1 69
+MD5 0d6d3f3c84b9fd514a08af08ba76ad0f bridge-utils-1.0.4.ebuild 1169
+MD5 cc3eb091df9ed82c98ec18b221b951a9 bridge-utils-1.0.6-r2.ebuild 1395
+MD5 b9d5cf5a4a11a82972f20d974423c918 bridge-utils-0.9.6-r2.ebuild 1104
+MD5 2c6ca210a0063810c357673b36d2eac0 bridge-utils-1.0.6.ebuild 1268
+MD5 dd26bc077760d833b694e947565a03c3 bridge-utils-1.0.6-r3.ebuild 1635
+MD5 d8fc0f4c2052b3eceff85c6786253b4d ChangeLog 4870
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6-r2 69
+MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6-r3 69
+MD5 be13eee50cb73dfb7574dc9d439e247e files/digest-bridge-utils-1.0.4 70
+MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6 69
+MD5 bccc629ec82d45006faa7d2e7cfe900f files/bridge.conf 106
+MD5 dad9b29868d4bf5b8fe41be9fef393be files/bridge-utils-1.0.6-dont-error-on-no-ports.patch 330
+MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6-r2 69
+MD5 2247ac780a2897505fa460ba9b322d86 files/bridge.rc 939
+MD5 b66b10664a696ad5234f798c99fac2fa files/bridge-utils-1.0.6-allow-without-sysfs.patch 1013
diff --git a/net-misc/bridge-utils/bridge-utils-0.9.6-r2.ebuild b/net-misc/bridge-utils/bridge-utils-0.9.6-r2.ebuild
index 669c40205928..4454711a6ca2 100644
--- a/net-misc/bridge-utils/bridge-utils-0.9.6-r2.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-0.9.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/net-misc/bridge-utils/bridge-utils-0.9.6-r2.ebuild,v 1.1 2005/07/03 01:28:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild
index c9a65fe6eedb..67d9ae3456dd 100644
--- a/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild,v 1.1 2004/06/17 06:32:33 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -9,10 +9,12 @@ HOMEPAGE="http://bridge.sourceforge.net/"
 
 SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
 
-DEPEND="virtual/glibc"
+IUSE=""
+DEPEND="virtual/libc
+		>=sys-fs/sysfsutils-1.0"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 src_compile() {
 	econf --prefix=/ --libdir=/usr/lib --includedir=/usr/include || die "econf failed"
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.6-r2.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.6-r2.ebuild
index 8080835b4262..5d5ba08412f5 100644
--- a/net-misc/bridge-utils/bridge-utils-1.0.6-r2.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.0.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/net-misc/bridge-utils/bridge-utils-1.0.6-r2.ebuild,v 1.1 2005/07/12 05:51:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND} virtual/os-headers"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild
index c2db8fb6edcb..f76285da2e6b 100644
--- a/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.0.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/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild,v 1.1 2005/08/05 19:30:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 src_unpack() {
 	unpack ${A}
@@ -44,7 +44,7 @@ src_compile() {
 }
 
 src_install () {
-	emake install DESTDIR="${D}"
+	emake install DESTDIR="${D}" || die "make install failed"
 	#einstall prefix=${D} libdir=${D}/usr/lib includedir=${D}/usr/include
 	dodoc AUTHORS ChangeLog README THANKS TODO
 	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild
index c3db2b52d1d7..fff946b9ff72 100644
--- a/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-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/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild,v 1.1 2005/04/29 23:00:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://bridge.sourceforge.net/"
 SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
 
 IUSE=""
-RDEPEND="virtual/libc 
+RDEPEND="virtual/libc
 	>=sys-fs/sysfsutils-1.0
-	>=sys-apps/baselayout-1.11.6*"
+	>=sys-apps/baselayout-1.11.6"
 DEPEND="${RDEPEND} virtual/os-headers"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 
 src_compile() {
 	# use santitized headers and not headers from /usr/src
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index c5d67a611520..5d9f5be9d49d 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>jhhudso@gentoo.org</email>
+  <email>robbat2@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/bwwhois/ChangeLog b/net-misc/bwwhois/ChangeLog
index 780b96ff0aa9..0741c9c9df57 100644
--- a/net-misc/bwwhois/ChangeLog
+++ b/net-misc/bwwhois/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for net-misc/bwwhois
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/ChangeLog,v 1.1 2002/12/22 16:58:17 mcummings Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/ChangeLog,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> bwwhois-3.4.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> bwwhois-3.4.ebuild:
+  Stable on alpha.
+
+  28 Mar 2004; Jon Portnoy <avenj@gentoo.org> bwwhois-3.4.ebuild :
+  AMD64 keywords.
+
+  16 Nov 2003; Brandy Westcott <brandy@gentoo.org> bwwhois-3.4.ebuild:
+  Removed binary symlink to avoid conflict with net-misc/whois. Thanks to Chris
+  Case <ccase@divinia.com> for reporting this (bug #32930)
+
+  11 Aug 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> bwwhois-3.4.ebuild:
+  stable on x86.
+
+*bwwhois-3.4 (25 Jul 2003)
+
+  25 Jul 2003; Martin Holzer <mholzer@gentoo.org> bwwhois-3.4.ebuild:
+  Version bumped. closes #25037
+
+  30 May 2003; Seemant Kulleen <seemant@gentoo.org> bwwhois-3.2.ebuild:
+  ebuild cleanup and inherit perl-module instead of perl-pod
 
 *bwwhois-3.2 (22 Dec 2002)
 
diff --git a/net-misc/bwwhois/Manifest b/net-misc/bwwhois/Manifest
index e69de29bb2d1..ab452044bb0c 100644
--- a/net-misc/bwwhois/Manifest
+++ b/net-misc/bwwhois/Manifest
@@ -0,0 +1,5 @@
+MD5 750798a20011737ac818a40d5ae5df55 ChangeLog 1338
+MD5 f8c2ae49e8176193c5446e224ed26d94 bwwhois-3.2.ebuild 878
+MD5 5fa5bc767ccb340505a5c1a8fff9aed0 bwwhois-3.4.ebuild 872
+MD5 9dc1faf1d404599ebc8420b99d288fec files/digest-bwwhois-3.4 57
+MD5 ff6a82dfde2579397ea8c617e1a30c22 files/digest-bwwhois-3.2 57
diff --git a/net-misc/bwwhois/bwwhois-3.2.ebuild b/net-misc/bwwhois/bwwhois-3.2.ebuild
index 2197695c3bbc..19707f2f3fad 100644
--- a/net-misc/bwwhois/bwwhois-3.2.ebuild
+++ b/net-misc/bwwhois/bwwhois-3.2.ebuild
@@ -1,21 +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/net-misc/bwwhois/bwwhois-3.2.ebuild,v 1.1 2002/12/22 16:58:17 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/bwwhois-3.2.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
-inherit perl-post
+inherit perl-module
 
-P=whois-3.2
-S=${WORKDIR}/${P}
-A=${P}.tgz
+MY_P=${P/bw/}
+
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Perl-based whois client designed to work with the new Shared Registration System"
-SRC_URI="http://whois.bw.org/dist/${A}"
+SRC_URI="http://whois.bw.org/dist/${MY_P}.tgz"
 HOMEPAGE="http://whois.bw.org/"
 
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
+IUSE=""
 
-DEPEND="sys-devel/perl"
+DEPEND="dev-lang/perl"
 
 src_unpack() {
 
@@ -23,6 +24,10 @@ src_unpack() {
 	cd ${S}
 }
 
+src_compile() {
+	einfo "no compilation necessary"
+}
+
 src_install () {
 
 	exeinto usr/bin
@@ -34,8 +39,8 @@ src_install () {
 	insinto etc/whois
 	doins whois.conf tld.conf sd.conf
 
-	perl-post_perlinfo
+	perlinfo
 	insinto ${SITE_LIB}
 	doins bwInclude.pm
-	perl-post_updatepod
+	updatepod
 }
diff --git a/net-misc/bwwhois/bwwhois-3.4.ebuild b/net-misc/bwwhois/bwwhois-3.4.ebuild
index dc26781c6a94..0b9879df2a16 100644
--- a/net-misc/bwwhois/bwwhois-3.4.ebuild
+++ b/net-misc/bwwhois/bwwhois-3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/bwwhois-3.4.ebuild,v 1.1 2003/07/24 17:59:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bwwhois/bwwhois-3.4.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 inherit perl-module
 
@@ -11,9 +11,10 @@ DESCRIPTION="Perl-based whois client designed to work with the new Shared Regist
 SRC_URI="http://whois.bw.org/dist/${MY_P}.tgz"
 HOMEPAGE="http://whois.bw.org/"
 
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
+IUSE=""
 
 DEPEND="dev-lang/perl"
 
@@ -29,9 +30,9 @@ src_compile() {
 src_install () {
 	exeinto usr/bin
 	newexe whois bwwhois
-	dosym bwwhois /usr/bin/whois
 
-	doman whois.1
+	mv whois.1 bwwhois.1
+	doman bwwhois.1
 
 	insinto etc/whois
 	doins whois.conf tld.conf sd.conf
diff --git a/net-misc/cadaver/ChangeLog b/net-misc/cadaver/ChangeLog
index 204adcd74a66..5b4d13676a0f 100644
--- a/net-misc/cadaver/ChangeLog
+++ b/net-misc/cadaver/ChangeLog
@@ -1,8 +1,49 @@
-# ChangeLog for net-im/gaim-cvs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/ChangeLog,v 1.1 2003/02/10 17:27:48 sethbc Exp $
+# ChangeLog for net-misc/cadaver
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+  26 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> cadaver-0.22.2.ebuild:
+  Bug #81815, force depend on neon so that the bundled version isn't used.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> cadaver-0.22.2.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> cadaver-0.22.2.ebuild:
+  Marked ~ppc64; bug #66755
+
+  01 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> cadaver-0.22.2.ebuild:
+  Added to ~ppc-macos.
+
+  15 Sep 2004; Tom Gall <tgall@gentoo.org> cadaver-0.22.2.ebuild:
+  stable on ppc64
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> cadaver-0.22.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+*cadaver-0.22.2 (19 May 2004)
+
+  19 May 2004; <plasmaroo@gentoo.org> +cadaver-0.22.2.ebuild:
+  Another version bump for the CAN-2004-0398 security issue; please see bug
+  #51461 for more details. Older vulnerable version removed.
+
+  17 Apr 2004; Jason Wever <weeve@gentoo.org> cadaver-0.22.1.ebuild:
+  Added ~sparc keyword.
+
+  15 Apr 2004; David Holm <dholm@gentoo.org> cadaver-0.22.1.ebuild:
+  Added to ~ppc.
+
+*cadaver-0.22.1 (14 Apr 2004)
+
+  14 Apr 2004; <plasmaroo@gentoo.org> -cadaver-0.20.5.ebuild,
+  -cadaver-0.21.0.ebuild, +cadaver-0.22.1.ebuild:
+  Version bump for bug #47799; old vulnerable versions removed.
+
+*cadaver-0.21.0 (16 Mar 2003)
+
+  16 Mar 2003; Seth Chandler <sethbc@gentoo.org>; cadaver-0.21.0.ebuild:
+  Version bump.
 
 *cadaver-0.20.5 (10 Feb 2003)
 
   10 Feb 2003; Seth Chandler <sethbc@gentoo.org>: cadaver-0.20.5.ebuild
-  added cadaver to portage courtesy of Jacob Smullyan <smulloni@smullyan.org>
+  Added cadaver to Portage courtesy of Jacob Smullyan <smulloni@smullyan.org>.
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index e69de29bb2d1..b0fab50d158c 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 841cea2a9a37f4bb3f478dd483ff74ad cadaver-0.22.2.ebuild 695
+MD5 b9216490a70211e019e96b0afb4b83a1 ChangeLog 1764
+MD5 25df207628326afd1425d1364434fa46 files/digest-cadaver-0.22.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFCIE4usnuUTjSIToURAh4hAKCC+VVGqibj0QdeadEQEUByez3GkQCgp8m1
+Ob/rQoCNBiuZRN0NXXkTsXY=
+=gkyP
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cadaver/cadaver-0.22.2.ebuild b/net-misc/cadaver/cadaver-0.22.2.ebuild
index e8b492703306..7b4435e93bfd 100644
--- a/net-misc/cadaver/cadaver-0.22.2.ebuild
+++ b/net-misc/cadaver/cadaver-0.22.2.ebuild
@@ -1,32 +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/net-misc/cadaver/cadaver-0.22.2.ebuild,v 1.1 2004/05/19 21:45:17 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/cadaver-0.22.2.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="a command-line WebDAV client."
-SRC_URI="http://www.webdav.org/cadaver/${P}.tar.gz"
 HOMEPAGE="http://www.webdav.org/cadaver"
+SRC_URI="http://www.webdav.org/cadaver/${P}.tar.gz"
+
 LICENSE="GPL-2"
-#DEPEND=">=net-misc/neon-0.23.5"
-DEPEND="virtual/glibc"
-KEYWORDS="x86 ~ppc ~sparc"
 SLOT="0"
-IUSE=""
+KEYWORDS="x86 ~ppc ~sparc ppc64 ~ppc-macos ~amd64"
+IUSE="ssl"
 
-src_compile() {
+DEPEND="virtual/libc
+	net-misc/neon
+	ssl? ( dev-libs/openssl )"
 
-	myconf=" --host=${CHOST} --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man"
-	use ssl && myconf="${myconf} --with-ssl"
-	./configure ${myconf} || die "./configure failed"
+src_compile() {
+	econf $(use_with ssl) || die "econf failed"
 	emake || die
 }
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+	einstall || die
 	dodoc BUGS ChangeLog COPYING FAQ INSTALL NEWS README THANKS TODO
 }
 
diff --git a/net-misc/capi4hylafax/ChangeLog b/net-misc/capi4hylafax/ChangeLog
index c497f04f9bb0..daed9e0b8776 100644
--- a/net-misc/capi4hylafax/ChangeLog
+++ b/net-misc/capi4hylafax/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for net-misc/capi4hylafax
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/ChangeLog,v 1.1 2003/10/04 02:11:53 nerdboy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+  13 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  capi4hylafax-01.02.03.ebuild:
+  fixed dependencies, see bug #112445.
+
+*capi4hylafax-01.03.00.3 (02 Oct 2005)
+
+  02 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/capi4hylafax.confd, +files/capi4hylafax.initd, metadata.xml,
+  +capi4hylafax-01.03.00.3.ebuild:
+  version bump, ebuild and init-scripts enhancements, adding ~amd64 to keywords.
+
+*capi4hylafax-01.02.03.13 (11 Aug 2005)
+
+  11 Aug 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +capi4hylafax-01.02.03.13.ebuild:
+  bumping to new debian release.
+
+  19 Jun 2005; David Holm <dholm@gentoo.org>
+  capi4hylafax-01.02.03.11.ebuild:
+  Added to ~ppc.
+
+*capi4hylafax-01.02.03.11 (18 Jun 2005)
+
+  18 Jun 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +capi4hylafax-01.02.03.11.ebuild:
+  changing version to debian patch level, removing hylafax dependency (because
+  it's optional), adding tiff dependency, ebuild code cleanup.
+
+  13 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
+  -capi4hylafax-01.02.02.ebuild, capi4hylafax-01.02.03.ebuild:
+  Version 01.02.03 x86 stable, libtoolize fix thanks to Hans-Christian
+  Armingeon <mog.johnny@gmx.net> in bug 80873
+
+*capi4hylafax-01.02.03 (02 Dec 2004)
+
+  02 Dec 2004; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  files/capi4hylafax, +capi4hylafax-01.02.03.ebuild:
+  Version Bump. Changing maintainer to myself. Ebuild thanks to Stefan
+  Briesenick <sbriesen@gmx.de> in bug 72131
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> capi4hylafax-01.02.02.ebuild:
+  Typo in DESCRIPTION: recieve -> receive. Bug 59717.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> capi4hylafax-01.02.02.ebuild:
+  change virtual/glibc to virtual/libc
+
+  25 Apr 2004; Steve Arnold <nerdboy@gentoo.org> capi4hylafax-01.02.02.ebuild:
+  removed ?IUSE stuff
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  capi4hylafax-01.02.02.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
 
 *capi4hylafax-01.02.02 (02 Oct 2003)
 
diff --git a/net-misc/capi4hylafax/Manifest b/net-misc/capi4hylafax/Manifest
index 558e2d62faa7..cfa558a7f78b 100644
--- a/net-misc/capi4hylafax/Manifest
+++ b/net-misc/capi4hylafax/Manifest
@@ -1,2 +1,13 @@
-MD5 9733ce85c79f376d127984dff8999612 capi4hylafax-01.02.02.ebuild 1121
-MD5 7033ac371b28b9db979167f182afd52c files/digest-capi4hylafax-01.02.02 73
+MD5 9f0096a586a88148b29a9f7aeeb2beee ChangeLog 2328
+MD5 49f02a498ca351b1bc02bdbc5b4eb787 capi4hylafax-01.02.03.11.ebuild 2908
+MD5 81ea5a7f3e7ab1705c153ac8d76d7a0c capi4hylafax-01.02.03.13.ebuild 3104
+MD5 2f374f23251603ec610fde235b15474d capi4hylafax-01.02.03.ebuild 2678
+MD5 c472cf791d6fc0f8ac848a5a1415f8fa capi4hylafax-01.03.00.3.ebuild 4251
+MD5 8faea3a1fc9f96eb051503848e502360 files/capi4hylafax 1088
+MD5 6fefb76ecf87f585bb2144297b7c28d6 files/capi4hylafax.confd 555
+MD5 c08db6e5447f4a7dcff6d9af93a07932 files/capi4hylafax.initd 1943
+MD5 a5d7419bab56161ad563178c1d6dbe9d files/digest-capi4hylafax-01.02.03 154
+MD5 73fe13d43a9fb6e02eb50f0951b224ee files/digest-capi4hylafax-01.02.03.11 155
+MD5 757537dac1b1d35bd5d164eebd62df5a files/digest-capi4hylafax-01.02.03.13 155
+MD5 bceab9f12bad33f29eb8bc6a47714e7d files/digest-capi4hylafax-01.03.00.3 153
+MD5 ecbd611a0f7853fdece0bc56afc0710a metadata.xml 471
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.02.03.11.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.02.03.11.ebuild
index 3f345332d737..bc78e1c6b7f4 100644
--- a/net-misc/capi4hylafax/capi4hylafax-01.02.03.11.ebuild
+++ b/net-misc/capi4hylafax/capi4hylafax-01.02.03.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.02.03.11.ebuild,v 1.1 2005/06/18 22:21:31 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.02.03.11.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils versionator
 
@@ -19,7 +19,7 @@ IUSE="unicode"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND="net-dialup/capi4k-utils
 	media-libs/tiff"
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.02.03.13.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.02.03.13.ebuild
index 6cea5817a370..306f1a0594b3 100644
--- a/net-misc/capi4hylafax/capi4hylafax-01.02.03.13.ebuild
+++ b/net-misc/capi4hylafax/capi4hylafax-01.02.03.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.02.03.13.ebuild,v 1.1 2005/08/11 19:48:28 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.02.03.13.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils versionator
 
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild
index 5df8af7686df..bb1fb2c4ba54 100644
--- a/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild
+++ b/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild,v 1.1 2004/12/02 21:26:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.02.03.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils
 
@@ -13,10 +13,14 @@ IUSE="unicode"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="net-dialup/capi4k-utils
-		net-misc/hylafax"
+	net-misc/hylafax
+	media-libs/tiff"
+
+RDEPEND="${DEPEND}
+	dev-util/dialog"
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
@@ -48,6 +52,7 @@ src_unpack() {
 
 src_compile() {
 	econf --with-hylafax-spooldir=/var/spool/fax || die "econf failed"
+	libtoolize --copy --force
 	emake || die "emake failed"
 }
 
diff --git a/net-misc/capi4hylafax/capi4hylafax-01.03.00.3.ebuild b/net-misc/capi4hylafax/capi4hylafax-01.03.00.3.ebuild
index 1199df911452..debb22a2f8a2 100644
--- a/net-misc/capi4hylafax/capi4hylafax-01.03.00.3.ebuild
+++ b/net-misc/capi4hylafax/capi4hylafax-01.03.00.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.03.00.3.ebuild,v 1.1 2005/10/02 23:07:41 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/capi4hylafax-01.03.00.3.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils versionator
 
diff --git a/net-misc/capi4hylafax/files/capi4hylafax b/net-misc/capi4hylafax/files/capi4hylafax
index 43693f2e4efd..c6e0515d25c4 100644
--- a/net-misc/capi4hylafax/files/capi4hylafax
+++ b/net-misc/capi4hylafax/files/capi4hylafax
@@ -1,20 +1,37 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/files/capi4hylafax,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+# symlink this script to capi4hylafax.<device>
+# if you want to use more than one config-file.
 
 depend() {
 	need capi
 }
 
 start() {
-	ebegin "Starting CAPI4HylaFAX"
-	start-stop-daemon -b -m --quiet --start --exec /usr/bin/c2faxrecv \
-		--pidfile /var/run/c2faxrecv.pid
-	eend $?
+	local DEVICE="${myservice#*.}"
+	[ "${DEVICE}" = "${myservice}" ] && DEVICE="faxCAPI"
+	local CONFIG="/var/spool/fax/etc/config.${DEVICE}"
+
+	if [ ! -f "$CONFIG" ]; then
+		eerror "You're missing ${CONFIG}"
+		return 1
+	fi
 
+	ebegin "Starting CAPI4HylaFAX for ${DEVICE}"
+	start-stop-daemon -b -m --quiet --start --pidfile "/var/run/c2faxrecv.${DEVICE}.pid" \
+		--exec /usr/bin/c2faxrecv ${DEVICE}
+	eend $?
 }
 
 stop() {
-	ebegin "Stopping CAPI4HylaFAX"
-	start-stop-daemon -o --quiet --stop --pidfile /var/run/c2faxrecv.pid
-        eend $?
+	local DEVICE="${myservice#*.}"
+	[ "${DEVICE}" = "${myservice}" ] && DEVICE="faxCAPI"
 
+	ebegin "Stopping CAPI4HylaFAX for ${DEVICE}"
+	start-stop-daemon >/dev/null --quiet --stop --pidfile "/var/run/c2faxrecv.${DEVICE}.pid" --retry 10 && \
+	/bin/rm -f /var/run/c2faxrecv.${DEVICE}.pid
+        eend $?
 }
diff --git a/net-misc/capi4hylafax/files/capi4hylafax.initd b/net-misc/capi4hylafax/files/capi4hylafax.initd
index a1815887e9cf..be95c8025886 100644
--- a/net-misc/capi4hylafax/files/capi4hylafax.initd
+++ b/net-misc/capi4hylafax/files/capi4hylafax.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/files/capi4hylafax.initd,v 1.1 2005/10/02 23:07:42 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capi4hylafax/files/capi4hylafax.initd,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 depend() {
 	need capi
diff --git a/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03 b/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03
index 110a29e2f1e8..bcd88a4010dc 100644
--- a/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03
+++ b/net-misc/capi4hylafax/files/digest-capi4hylafax-01.02.03
@@ -1,2 +1,2 @@
-MD5 8236290d6b880ee7d5e2fe970648ad6f capi4hylafax_01.02.03.orig.tar.gz 400508
 MD5 9a1d502bcc23282237cbc8a8a64699ce capi4hylafax_01.02.03-7.diff.gz 230581
+MD5 8236290d6b880ee7d5e2fe970648ad6f capi4hylafax_01.02.03.orig.tar.gz 400508
diff --git a/net-misc/capi4hylafax/metadata.xml b/net-misc/capi4hylafax/metadata.xml
index ba31d6a2c376..def2073316e8 100644
--- a/net-misc/capi4hylafax/metadata.xml
+++ b/net-misc/capi4hylafax/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>comm-fax</herd>
-<maintainer>
-  <email>nerdboy@gentoo.org</email>
-  <name>Steve Arnold</name>
-  <description>Primary Maintainer</description>
-</maintainer>
-<longdescription>Fax package for ISDN cards with CAPI capabilities.</longdescription>
+	<herd>comm-fax</herd>
+	<maintainer>
+		<email>sbriesen@gentoo.org</email>
+		<name>Stefan Briesenick</name>
+	</maintainer>
+	<longdescription lang="en">
+		capi4hylafax adds a faxcapi modem to the hylafax enviroment. So you can
+		send and receive FAX documents with CAPI 2.0 fax controllers via a
+		hylafax server.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/capiisdnmon/ChangeLog b/net-misc/capiisdnmon/ChangeLog
index 44a386cb9c79..503f9217c047 100644
--- a/net-misc/capiisdnmon/ChangeLog
+++ b/net-misc/capiisdnmon/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/capiisdnmon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/ChangeLog,v 1.1 2005/08/06 12:43:00 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/ChangeLog,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
+
+  08 Sep 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  capiisdnmon-0.42-r1.ebuild:
+  Correct description text.
+
+*capiisdnmon-0.42-r1 (18 Aug 2005)
+
+  18 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
+  -capiisdnmon-0.42.ebuild, +capiisdnmon-0.42-r1.ebuild:
+  Add autogenerated .desktop file, revision bump
+
+  08 Aug 2005; David Holm <dholm@gentoo.org> capiisdnmon-0.42.ebuild:
+  Added to ~ppc.
 
 *capiisdnmon-0.42 (06 Aug 2005)
 
diff --git a/net-misc/capiisdnmon/Manifest b/net-misc/capiisdnmon/Manifest
index 24e9a8359f1f..6a73fcfabf6d 100644
--- a/net-misc/capiisdnmon/Manifest
+++ b/net-misc/capiisdnmon/Manifest
@@ -1,5 +1,15 @@
-MD5 13d82239c3450df175562e62309c1974 capiisdnmon-0.42.ebuild 786
-MD5 bb20de00b2c8719b5307b437104d121e ChangeLog 311
-MD5 7a29ec1d2a322b4000a4576ab44f94ee metadata.xml 252
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e3b5ab26fcce5782b78ac635461065ca capiisdnmon-0.42-r1.ebuild 933
+MD5 3a75b96d72db83706b5f2779ab702de6 ChangeLog 807
+MD5 c8cf0d31d953401f2f89982d770a0c98 metadata.xml 253
 MD5 b8b732a1363522e6bc85adc6cda09066 files/capiisdnmon-0.42-capiv3.patch 776
-MD5 324b3abc4eb33f3854006ea47554c115 files/digest-capiisdnmon-0.42 67
+MD5 324b3abc4eb33f3854006ea47554c115 files/digest-capiisdnmon-0.42-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDH9BrNSP4Vda7IdsRAig+AJ45fgpai4a3ncS1WCfcx4jSrTZoYQCcDQeb
+X3C9sfMN9NV5+enh+/qE/ck=
+=D3Rg
+-----END PGP SIGNATURE-----
diff --git a/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild b/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild
index e2c3ef36b3f1..f3ab99c7b96d 100644
--- a/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild
+++ b/net-misc/capiisdnmon/capiisdnmon-0.42-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/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild,v 1.1 2005/08/18 21:35:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/capiisdnmon/capiisdnmon-0.42-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="A Capi 2.0 Isdn CallMonitor with ldap name resolution"
+DESCRIPTION="a CAPI 2.0 ISDN call monitor with LDAP name resolution"
 HOMEPAGE="http://capiisdnmon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/capiisdnmon/${P}.tar.gz"
 
diff --git a/net-misc/capiisdnmon/metadata.xml b/net-misc/capiisdnmon/metadata.xml
index ffd82e320fbe..284947263917 100644
--- a/net-misc/capiisdnmon/metadata.xml
+++ b/net-misc/capiisdnmon/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-dialup</herd>
-<longdescription>A Capi 2.0 Isdn CallMonitor with ldap name resolution</longdescription>
+<longdescription>A CAPI 2.0 ISDN call monitor with LDAP name resolution</longdescription>
 </pkgmetadata>
diff --git a/net-misc/cbqinit/ChangeLog b/net-misc/cbqinit/ChangeLog
index dfdf07489307..44f1799ee359 100644
--- a/net-misc/cbqinit/ChangeLog
+++ b/net-misc/cbqinit/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for net-misc/cbqinit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.1 2002/07/12 00:57:11 blizzy Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+*cbqinit-0.7.3-r1 (15 Nov 2005)
+
+  15 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/cbqinit-0.7.3-gentoo.patch, files/rc_cbqinit-r1,
+  +cbqinit-0.7.3-r1.ebuild:
+  Clean up ebuild, add a patch from Fedora, and add back in missing KEYWORDS
+  along with arm love.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> cbqinit-0.7.2.ebuild,
+  cbqinit-0.7.3.ebuild:
+  marked 0.7.2 as stable on mips, and 0.7.3 as ~mips for testing
+
+*cbqinit-0.7.3 (29 Jul 2004)
+
+  29 Jul 2004; Patrick Kursawe <phosphan@gentoo.org> +files/rc_cbqinit-r1,
+  +cbqinit-0.7.3.ebuild:
+  Version bump, stopping the init script does not fail any more (as it always
+  did before)
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> cbqinit-0.7.2.ebuild:
+  Stable on alpha.
+
+  23 Jan 2004; <gustavoz@gentoo.org> cbqinit-0.7.2.ebuild:
+  stable on sparc
+
+  15 May 2003; Patrick Kursawe <phosphan@gentoo.org> cbqinit-0.7.2.ebuild,
+  cbqinit-0.7.ebuild:
+  ip and tc were moved from /usr/sbin to /sbin - the ebuilds changed the path to
+  the old place.
+
+*cbqinit-0.7.2 (10 Feb 2003)
+
+  05 Aug 2003; Guy Martin <gmsoft@gentoo.org> cbqinit-0.7.2.ebuild :
+  Added hppa to KEYWORDS.
+
+  10 Feb 2002; Seth Chandler <sethbc@gentoo.org> cbqinit-0.7.2.ebuild :
+  version bump, ~arch masked for all archs rather than a KEYWORDS="*"
 
 *cbqinit-0.7 (12 Jul 2002)
 
diff --git a/net-misc/cbqinit/Manifest b/net-misc/cbqinit/Manifest
index d8cf1a8d1f4d..b4343a231548 100644
--- a/net-misc/cbqinit/Manifest
+++ b/net-misc/cbqinit/Manifest
@@ -1,7 +1,23 @@
-MD5 ff40837bc7996e4dfa0e87d31b8f13df cbqinit-0.7.2.ebuild 1229
-MD5 7ef9eccf21d7a1c85206bba5e1c7c072 cbqinit-0.7.ebuild 1106
-MD5 581c1622284f403b11a4ff23feb233aa ChangeLog 744
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee6a465dd210fd74fefff067e01ddb1c ChangeLog 1758
+MD5 b3eef38201071f9bcfc3064ba27e4278 cbqinit-0.7.2.ebuild 1211
+MD5 e2f8861d1a792b0dedc714105fa79538 cbqinit-0.7.3-r1.ebuild 860
+MD5 d83f5d9ad43d6404ddf47dcf18064a46 cbqinit-0.7.3.ebuild 1199
+MD5 1a2c2ee6175e52dfc28806551ed83926 cbqinit-0.7.ebuild 1104
 MD5 36312b31d2218761e171ebcaf2db04e8 files/cbq-1280.My_first_shaper.sample 79
+MD5 ed9e439af4639ccb33d22aa3be1e6dcf files/cbqinit-0.7.3-gentoo.patch 1904
 MD5 20829547e7a1bb95dcbe6b56119650dd files/digest-cbqinit-0.7 57
 MD5 fa0a999eda33e423e9f27ad78dc8208e files/digest-cbqinit-0.7.2 59
+MD5 1e272f674fd1bd74d9508f4a50b74ab5 files/digest-cbqinit-0.7.3 59
+MD5 1e272f674fd1bd74d9508f4a50b74ab5 files/digest-cbqinit-0.7.3-r1 59
 MD5 bf58f1ad519fe89dc6c6b90eabb3c860 files/rc_cbqinit 188
+MD5 2325b9a2bb95d33fe41ee40a511ec8bf files/rc_cbqinit-r1 504
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeTBsgIKl8Uu19MoRAqCJAJ9vN02d0FYAfM9vR3NhiiE7AgqmqgCbB9Qc
+mNXUlvPZYthrMhu/kSB0Q/M=
+=As3l
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cbqinit/cbqinit-0.7.2.ebuild b/net-misc/cbqinit/cbqinit-0.7.2.ebuild
index 18111aef0848..4b11b7fe2395 100644
--- a/net-misc/cbqinit/cbqinit-0.7.2.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.2.ebuild
@@ -1,18 +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/net-misc/cbqinit/cbqinit-0.7.2.ebuild,v 1.1 2003/02/10 14:24:17 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
 HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/cbqinit/cbq.init-v${PV}"
+SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha hppa mips"
+IUSE=""
 
-RDEPEND="sys-apps/iproute"
+RDEPEND="sys-apps/iproute2"
 DEPEND=""
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_unpack() {
 	cp ${DISTDIR}/cbq.init-v${PV} ${S}
@@ -22,8 +24,7 @@ src_compile() {
 	mv cbq.init-v${PV} cbq.init-v${PV}.orig
 	sed <cbq.init-v${PV}.orig >cbq.init-v${PV} \
 		-e 's|CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}|CBQ_PATH=/etc/cbqinit|' \
-		-e 's|CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}|CBQ_CACHE=/var/cache/cbqinit|' \
-		-e 's|-x /sbin/tc -a -x /sbin/ip|-x /usr/sbin/tc -a -x /usr/sbin/ip|'
+		-e 's|CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}|CBQ_CACHE=/var/cache/cbqinit|'
 }
 
 src_install() {
diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild
index 6b9a9729868c..64dad8dadc10 100644
--- a/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.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-misc/cbqinit/cbqinit-0.7.3-r1.ebuild,v 1.1 2005/11/15 00:47:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/cbqinit/cbqinit-0.7.3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3.ebuild
index c88c1fcc2d01..948c6fbb06f1 100644
--- a/net-misc/cbqinit/cbqinit-0.7.3.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.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/net-misc/cbqinit/cbqinit-0.7.3.ebuild,v 1.1 2004/07/29 14:42:11 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.3.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
 HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~mips"
 IUSE=""
 
 RDEPEND="sys-apps/iproute2"
diff --git a/net-misc/cbqinit/cbqinit-0.7.ebuild b/net-misc/cbqinit/cbqinit-0.7.ebuild
index fae313fb6ce4..1c48e6ddff80 100644
--- a/net-misc/cbqinit/cbqinit-0.7.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.ebuild
@@ -1,36 +1,35 @@
-# 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-misc/cbqinit/cbqinit-0.7.ebuild,v 1.1 2002/07/12 00:57:11 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
+S=${WORKDIR}
 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
 HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/cbqinit/cbq.init-v${PV}"
+SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="*"
+KEYWORDS="x86 ppc sparc alpha mips hppa "
+IUSE=""
 
-RDEPEND="sys-apps/iproute2"
-DEPEND=""
+DEPEND=">=sys-apps/sed-4.0.5"
 
-S="${WORKDIR}"
+RDEPEND="sys-apps/iproute2"
 
 src_unpack() {
 	cp ${DISTDIR}/cbq.init-v${PV} ${S}
 }
 
 src_compile() {
-	mv cbq.init-v${PV} cbq.init-v${PV}.orig
-	sed <cbq.init-v${PV}.orig >cbq.init-v${PV} \
-		-e 's|CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}|CBQ_PATH=/etc/cbqinit|' \
-		-e 's|CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}|CBQ_CACHE=/var/cache/cbqinit|' \
-		-e 's|-x /sbin/tc -a -x /sbin/ip|-x /usr/sbin/tc -a -x /usr/sbin/ip|'
+	sed -i \
+		-e 's|^CBQ_PATH=.*|CBQ_PATH=/etc/cbqinit|' \
+		-e 's|CBQ_CACHE=.*|CBQ_CACHE=/var/cache/cbqinit|' \
+		cbq.init-v${PV}
 }
 
 src_install() {
-	mv cbq.init-v${PV} cbqinit
-
 	exeinto /usr/sbin
-	doexe cbqinit
+	newexe cbq.init-v${PV} cbqinit
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/rc_cbqinit cbqinit
diff --git a/net-misc/cbqinit/files/rc_cbqinit-r1 b/net-misc/cbqinit/files/rc_cbqinit-r1
index 2887db5162bc..b6ffad898e87 100644
--- a/net-misc/cbqinit/files/rc_cbqinit-r1
+++ b/net-misc/cbqinit/files/rc_cbqinit-r1
@@ -1,10 +1,23 @@
 #!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	if [ ! -d /etc/cbqinit ] ; then
+		eerror "You need to create some config files in /etc/cbqinit first"
+		eerror "Please read the README file"
+		return 1
+	fi
+
+	return 0
+}
+
 start() {
+	checkconfig || return 1
 	ebegin "Starting cbqinit"
 	/usr/sbin/cbqinit start
 	eend $?
diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 5cb34617bf39..7be572d0bf27 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,11 +1,293 @@
 # ChangeLog for net-misc/cfengine
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
+
+*cfengine-2.1.17 (20 Nov 2005)
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  -cfengine-2.1.14-r1.ebuild, cfengine-2.1.16.ebuild,
+  +cfengine-2.1.17.ebuild:
+  * Version bump
+  * Stable on x86
+  * Clean out old ebuild
+
+*cfengine-2.1.16 (02 Oct 2005)
+
+  02 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/cfengine-2.1.10-setnetgrent.patch, metadata.xml,
+  -cfengine-2.1.13.ebuild, -cfengine-2.1.14.ebuild, +cfengine-2.1.16.ebuild:
+  * Rev bump for 2.1.16
+  * Ebuild cleanup
+  * Fix wordwrap in metadata.xml
+  * Removed unused patch
+
+  20 Aug 2005; Jason Wever <weeve@gentoo.org> cfengine-2.1.15-r1.ebuild:
+  Stable on SPARC.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  cfengine-2.1.15-r1.ebuild:
+  Stable on ppc.
+
+  17 Aug 2005; Lance Albertson <ramereth@gentoo.org>
+  cfengine-2.1.14-r1.ebuild, -cfengine-2.1.15.ebuild,
+  cfengine-2.1.15-r1.ebuild:
+  * Stable on x86/amd64
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  cfengine-2.1.14.ebuild:
+  Stable on ppc.
+
+  07 Aug 2005; Jason Wever <weeve@gentoo.org> cfengine-2.1.14.ebuild:
+  Stable on SPARC.
+
+*cfengine-2.1.15-r1 (02 Jul 2005)
+*cfengine-2.1.14-r1 (02 Jul 2005)
+
+  02 Jul 2005; Lance Albertson <ramereth@gentoo.org>
+  +cfengine-2.1.14-r1.ebuild, +cfengine-2.1.15-r1.ebuild:
+  * Fixed openssl dep to match upstream's suggestion
+  * Fixed the contrib, inputs, & doc installation issue
+    (It would put it in the wrong place)
+  * Fixed a few doc locations
+  * Added manpages
+
+*cfengine-2.1.15 (25 Jun 2005)
+
+  25 Jun 2005; Lance Albertson <ramereth@gentoo.org> cfengine-2.1.14.ebuild,
+  +cfengine-2.1.15.ebuild:
+  * Bumped 2.1.14 stable on x86
+  * Added 2.1.15 ~arch
+
+*cfengine-2.1.14 (30 Apr 2005)
+
+  30 Apr 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  -cfengine-2.1.7.ebuild, -cfengine-2.1.9.ebuild,
+  -cfengine-2.1.10-r2.ebuild, -cfengine-2.1.11-r1.ebuild,
+  -cfengine-2.1.11-r2.ebuild, +cfengine-2.1.14.ebuild:
+  version bump, cleaning out old ebuilds
+
+  25 Apr 2005; Jason Wever <weeve@gentoo.org> cfengine-2.1.13.ebuild:
+  Stable on SPARC.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  cfengine-2.1.13.ebuild:
+  Stable on ppc.
+
+  23 Mar 2005; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.13.ebuild:
+  marked stable on x86
+
+*cfengine-2.1.13 (27 Jan 2005)
+
+  27 Jan 2005; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.13.ebuild:
+  version bumpage
+
+*cfengine-2.1.11-r2 (14 Nov 2004)
+
+  14 Nov 2004; Kurt Lieber <klieber@gentoo.org> +files/cfservd.rc6,
+  +cfengine-2.1.11-r2.ebuild:
+  added init script, changed perms for module:cfportage. thanks to jaervosz for
+  the changes
+
+  09 Nov 2004; Jason Wever <weeve@gentoo.org> cfengine-2.1.11-r1.ebuild:
+  Stable on sparc.
+
+  04 Nov 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.11-r1.ebuild:
+  unmasking on x86
+
+*cfengine-2.1.11-r1 (01 Nov 2004)
+
+  01 Nov 2004; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.11-r1.ebuild,
+  -cfengine-2.1.11.ebuild:
+  oops, forgot to inherit gnuconfig
+
+*cfengine-2.1.11 (01 Nov 2004)
+
+  01 Nov 2004; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.11.ebuild:
+  version bump to 2.1.11
+
+*cfengine-2.1.10-r2 (01 Nov 2004)
+
+  01 Nov 2004; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.10-r2.ebuild:
+  Add inherit eutils
+
+  30 Oct 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.10-r1.ebuild:
+  marking stable on x86 and ppc
+
+*cfengine-2.1.10-r1 (25 Oct 2004)
+
+  25 Oct 2004; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.10-r1.ebuild:
+  bumpage to fix 68709 and 64411
+
+  06 Oct 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.10.ebuild:
+  added ~amd64 to ebuild
+
+*cfengine-2.1.10 (18 Sep 2004)
+
+  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> cfengine-*.ebuild:
+  Masking stable on ppc
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> cfengine-2.1.10.ebuild:
+  Stable on sparc.
+
+  18 Aug 2004; Kurt Lieber <klieber@gentoo.org> :
+  version bump to 2.1.10
+
+*cfengine-2.1.9 (10 Aug 2004)
+
+  10 Aug 2004; Jason Wever <weeve@gentoo.org> cfengine-2.1.9.ebuild:
+  Stable on sparc wrt security bug #59895.
+
+  10 Aug 2004; Kurt Lieber <klieber@gentoo.org> :
+  version bump to 2.1.9
+
+  14 Jul 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.7.ebuild:
+  mark stable on x86
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> cfengine-2.1.1.ebuild,
+  cfengine-2.1.3.ebuild, cfengine-2.1.5.ebuild, cfengine-2.1.6.ebuild,
+  cfengine-2.1.7.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE, fix headers
+
+*cfengine-2.1.7 (29 Jun 2004)
+
+  29 Jun 2004; Kurt Lieber <klieber@gentoo.org> +cfengine-2.1.7.ebuild:
+  version bump to 2.1.7
+
+  23 Jun 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.6.ebuild:
+  marked 2.1.6 stable on x86
+
+*cfengine-2.1.6 (13 May 2004)
+
+  13 May 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.6.ebuild:
+  cfengine version bump
+
+*cfengine-2.1.5 (13 Apr 2004)
+
+  13 Apr 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.5.ebuild:
+  bump to 2.1.5 to fix a minor bug.
+
+*cfengine-2.1.4 (06 Apr 2004)
+
+  06 Apr 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.4.ebuild:
+  2.1.4 committed ~masked
+
+  19 Mar 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.0.8_p1-r3.ebuild,
+  cfengine-2.1.3.ebuild:
+  removed 2.0.8, marked 2.1.3 stable on x86
+
+  08 Mar 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.1.ebuild,
+  cfengine-2.1.3.ebuild:
+  marked cfengine 2.1.1 stable on x86, removed DOCUMENTATION from dodoc on 2.1.3
+  ebuild
+
+*cfengine-2.1.3 (06 Mar 2004)
+
+  06 Mar 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.1.3.ebuild:
+  2.1.3 version bump
+
+*cfengine-2.1.1 (31 Jan 2004)
+
+  31 Jan 2004; Kurt Lieber <klieber@gentoo.org> cfengine-2.0.8_p1-r2.ebuild,
+  cfengine-2.1.1.ebuild:
+  added new 2.1.1 build
+
+*cfengine-2.0.8_p1-r3 (17 Dec 2003)
+
+  17 Dec 2003; rob holland <tigger@gentoo.org> cfengine-2.0.8_p1-r3.ebuild,
+  files/cfportage.README, files/module:cfportage:
+  Added a cfengine module to test for installed software using portage.
+  Removed silly mkdir which did nothing
+
+*cfengine-2.1.0_p1 (05 Nov 2003)
+
+  05 Nov 2003; Kurt Lieber,,, <kurtl@gentoo.org> cfengine-2.1.0_p1.ebuild:
+  2.1.0_p1 ebuild
+
+  04 Nov 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.0.3.ebuild,
+  cfengine-2.1.0.ebuild, cfengine-2.1.0_beta5.ebuild:
+  bumping 2.1.0 to stable on x86, removing 2.1.0b5 and 2.0.3 from portage.
+
+*cfengine-2.1.0 (29 Oct 2003)
+
+  29 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.1.0.ebuild:
+  final version of cfengine-2.1.0
+
+  12 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.0.8_p1-r1.ebuild,
+  cfengine-2.0.8_p1-r2.ebuild:
+  removing -r1, marking -r2 as stable.  minor cleanups.  no major changes
+
+*cfengine-2.1.0_beta5 (11 Oct 2003)
+
+  11 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.1.0_beta4.ebuild,
+  cfengine-2.1.0_beta5.ebuild:
+  bumped to beta 5.  no other changes
+
+  04 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.1.0_beta4.ebuild:
+  initial version of 2.1.0b4 for testing.
+
+*cfengine-2.0.8_p1-r2 (04 Oct 2003)
+
+  04 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.0.8_p1-r2.ebuild:
+  changed ln -sf to cp to maintain consistency with how cfengine does things.
+
+  04 Oct 2003; Kurt Lieber,,, <klieber@gentoo.org> cfengine-2.0.8_p1-r1.ebuild:
+  bumped to stable -- tested and running on multiple Gentoo infrastructure
+  servers
+
+  03 Oct 2003; Kurt Lieber <klieber@gentoo.org>;
+  cfengine-2.0.8_p1-r1.ebuild:
+  Misc. fixes regarding #28910.  Thanks to rladams@kelsey-seybold.com
+  for the submission.
+
+*cfengine-2.0.8_p1 (29 Sep 2003)
+
+  30 Sep 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  cfengine-2.0.8_p1.ebuild:
+  Ebuild cleanup.
+
+*cfengine-2.0.8_p1 (29 Sep 2003)
+
+  29 Sep 2003; <solar@gentoo.org> cfengine-2.0.8_p1.ebuild:
+  security version bump. 2.0.8_p1 ebuild submission by Russell Adams
+
+*cfengine-2.0.6-r1 (01 Aug 2003)
+
+  01 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> cfengine-2.0.6-r1.ebuild,
+  files/cfengine-2.0.6-db4.diff:
+  Add a hack to make configure work with versioned symbols in db4. Unfortunately
+  autoconf does not work easilly so I had to hack configure itself
+
+*cfengine-2.0.6 (30 Apr 2003)
+
+  30 Apr 2003; Kurt Lieber <klieber@gentoo.org> cfengine-2.0.6.ebuild:
+  Version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*cfengine-2.0.3 (1 Jul 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog cfengine-2.0.3.ebuild:
+  
+  Added KEYWORDS.
+
+  1 Jul 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog cfengine-2.0.3.ebuild:
+  
+  Update ebuild closes #2915
+  Note that this revision still does not contain an init.d file,
+  nor a sample config file, because at this time I (jnelson) haven't
+  fully set up a cfengine installation.
 
 *cfengine-1.6.3 (1 Feb 2002)
 
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog cfengine-1.6.3.ebuild:
+  
+  Added KEYWORDS, LICENSE, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
+  Ebuild Author Prakash Shetty (Crux) <ps@gnuos.org>
+
+  
   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-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index e69de29bb2d1..5749d06cf2f7 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -0,0 +1,11 @@
+MD5 c2921fde66bcd0ae1353ab879fc213d2 ChangeLog 9492
+MD5 f2aae77792dd34ca5a98cf94326e2ba0 cfengine-2.1.16.ebuild 2253
+MD5 78ca953228396511baf3f7ccef97fe27 metadata.xml 984
+MD5 0c8e75c7a7a3c91cc51725baaeb5b428 cfengine-2.1.17.ebuild 2254
+MD5 55b5cd09421554e49815035eda48164c cfengine-2.1.15-r1.ebuild 2250
+MD5 e663ecd3739926ae43f89577216d85d7 files/digest-cfengine-2.1.17 68
+MD5 f4fe82c710efac73c0895ad268c54196 files/cfportage.README 2294
+MD5 ade9e66709bdb04df3f0beba72f3a008 files/module-cfportage.tbz2 3099
+MD5 d07b5988a1635858506b57b2350b5f02 files/digest-cfengine-2.1.16 68
+MD5 f1a9344587920c108d487766f61e90cf files/cfservd.rc6 259
+MD5 1781d04ce20330f0e9b266753eff4c91 files/digest-cfengine-2.1.15-r1 68
diff --git a/net-misc/cfengine/cfengine-2.1.15-r1.ebuild b/net-misc/cfengine/cfengine-2.1.15-r1.ebuild
index a102c6f70ddc..b84c33e1a148 100644
--- a/net-misc/cfengine/cfengine-2.1.15-r1.ebuild
+++ b/net-misc/cfengine/cfengine-2.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/net-misc/cfengine/cfengine-2.1.15-r1.ebuild,v 1.1 2005/07/02 19:16:50 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ppc sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/db-3.2
diff --git a/net-misc/cfengine/cfengine-2.1.16.ebuild b/net-misc/cfengine/cfengine-2.1.16.ebuild
index 0ebcd8b1dcf5..ca0cd0d41738 100644
--- a/net-misc/cfengine/cfengine-2.1.16.ebuild
+++ b/net-misc/cfengine/cfengine-2.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/net-misc/cfengine/cfengine-2.1.16.ebuild,v 1.1 2005/10/02 18:26:20 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.16.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/db-3.2
diff --git a/net-misc/cfengine/cfengine-2.1.17.ebuild b/net-misc/cfengine/cfengine-2.1.17.ebuild
index 779c3122836b..919dd7340441 100644
--- a/net-misc/cfengine/cfengine-2.1.17.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.17.ebuild,v 1.1 2005/11/20 03:05:15 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.1.17.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/cfengine/files/module-cfportage.tbz2 b/net-misc/cfengine/files/module-cfportage.tbz2
index 3463a9c8b1d3..df25be27d293 100644
--- a/net-misc/cfengine/files/module-cfportage.tbz2
+++ b/net-misc/cfengine/files/module-cfportage.tbz2
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index ee9609e840d0..38d856591691 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -1,11 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>klieber@gentoo.org</email>
-</maintainer>
-<longdescription>
-Cfengine, or the configuration engine is an autonomous agent and a middle to high level policy language for building expert systems which administrate and configure large computer networks. Cfengine uses the idea of classes and a primitive intelligence to define and automate the configuration and maintenance of system state, for small to huge configurations. Cfengine is designed to be a part of a computer immune system, and can be thought of as a gaming agent. It is ideal for cluster management and has been adopted for use all over the world in small and huge organizations alike.
-</longdescription>
+<herd>sysadmin</herd>
+	<maintainer>
+		<email>klieber@gentoo.org</email>
+		<name>Kurt Lieber</name>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription>
+	Cfengine, or the configuration engine is an autonomous agent and a middle to
+	high level policy language for building expert systems which administrate
+	and configure large computer networks. Cfengine uses the idea of classes and
+	a primitive intelligence to define and automate the configuration and
+	maintenance of system state, for small to huge configurations. Cfengine is
+	designed to be a part of a computer immune system, and can be thought of as
+	a gaming agent. It is ideal for cluster management and has been adopted for
+	use all over the world in small and huge organizations alike.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/cgterm/ChangeLog b/net-misc/cgterm/ChangeLog
index acb1295e7862..339374a1375f 100644
--- a/net-misc/cgterm/ChangeLog
+++ b/net-misc/cgterm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/cgterm
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/ChangeLog,v 1.1 2004/12/11 18:07:46 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+  10 May 2005; David Holm <dholm@gentoo.org> cgterm-1.6.ebuild:
+  Added to ~ppc.
 
 *cgterm-1.6 (11 Dec 2004)
 
diff --git a/net-misc/cgterm/Manifest b/net-misc/cgterm/Manifest
index ba53233c98a0..de70171f6411 100644
--- a/net-misc/cgterm/Manifest
+++ b/net-misc/cgterm/Manifest
@@ -1,2 +1,4 @@
-MD5 e5b55969c204019acf9b0cc03f930673 cgterm-1.6.ebuild 603
+MD5 36913c2ff9098740deaa8f37a91d196a ChangeLog 439
+MD5 2b912c44aa346be7e160f416ae334ef1 cgterm-1.6.ebuild 702
+MD5 e2197bbca51952701bf182a7c4740f74 metadata.xml 218
 MD5 72f130f1f8a86de3f6f10ec6807189ef files/digest-cgterm-1.6 61
diff --git a/net-misc/cgterm/cgterm-1.6.ebuild b/net-misc/cgterm/cgterm-1.6.ebuild
index 96ce53dc57e6..121d2dcc66e0 100644
--- a/net-misc/cgterm/cgterm-1.6.ebuild
+++ b/net-misc/cgterm/cgterm-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/net-misc/cgterm/cgterm-1.6.ebuild,v 1.1 2004/12/11 18:07:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/cgterm-1.6.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 DESCRIPTION="Connect to C64 telnet BBS's with the correct colours and font"
 HOMEPAGE="http://www.paradroid.net/cgterm/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.paradroid.net/cgterm/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 
 DEPEND=">=media-libs/libsdl-1.2.5"
 
diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 9c4c26e6ef3f..ec530e3e1f2f 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,15 +1,72 @@
-# ChangeLog for net-misc/Chrony
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header:
+# ChangeLog for net-misc/chrony
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
-*chrony-1.18 (12 May 2002)
+  15 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> chrony-1.20-r1.ebuild:
+  Stable on hppa.
 
-  06 Jul 2002; phoen][x <phoenix@gentoo.org> chrony-1.18.ebuild:
-  Added KEYWORDS="x86".
+  05 May 2005; Michael Hanselmann <hansmi@gentoo.org> chrony-1.20-r1.ebuild:
+  Added to ~hppa.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> chrony-1.20.ebuild:
+  Stable on ppc.
+
+  23 Oct 2004; Wout Mertens <wmertens@gentoo.org> chrony-1.20-r1.ebuild:
+  Depend on dns if available (#61700)
+
+  23 Oct 2004; Wout Mertens <wmertens@gentoo.org> chrony-1.20-r1.ebuild:
+  Include Alexander Papaspyrou's patch for CONFIG_HZ=200 support. (#21058)
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> chrony-1.19.ebuild,
+  chrony-1.20.ebuild:
+  change virtual/glibc to virtual/libc
+
+  07 Jun 2004; Wout Mertens <wmertens@gentoo.org> chrony-1.20.ebuild,
+  chrony-1.19.99.2.ebuild:
+  1.20 marked stable for x86, 1.19.99.2 removed.
+  
+  02 Jun 2004; David Holm <dholm@gentoo.org> chrony-1.20.ebuild:
+  Added to ~ppc.
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  chrony-1.19.99.2.ebuild, chrony-1.19.ebuild, chrony-1.20.ebuild:
+  fix depend (bug #45110)
+
+  20 Feb 2004; Ilya Volynets <ilya@total-knowledge.com> chrony-1.20.ebuild:
+  Add ~mips to keywords
 
+*chrony-1.20 (26 Nov 2003)
 
+  26 Nov 2003; Wout Mertens <wmertens@gentoo.org> :
+  version bump. Should fix #33934 and #21058.
+  Some better RTC configuration thanks to Rob Davies, #28040.
+  
+  06 Oct 2003; Jason Wever <weeve@gentoo.org> chrony-1.19.99.2.ebuild,
+  chrony-1.19.ebuild:
+  Marked 1.19.99.2 to stable and masked 1.19 to fix bug #30499.
+
+*chrony-1.19.99.2 (07 Aug 2003)
+
+  07 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Update to work with newer kernels #25347.
+
+*chrony-1.19 (18 Mar 2003)
+
+  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  init.d/conf.d fixes #22436.
+
+  18 Mar 2003; Wout Mertens <wmertens@gentoo.org> :
+  Version bump, no changes to the ebuild needed.
+  Still wondering whether the drift and rtc files shouldn't go in
+  /var somewhere.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *chrony-1.18 (12 May 2002)
 
+  06 Jul 2002; phoen][x <phoenix@gentoo.org> chrony-1.18.ebuild:
+  Added KEYWORDS.
+
   12 May 2002; Wout Mertens <wmertens@gentoo.org> chrony-1.18.ebuild:
   Changed default config file to /etc/chrony/chrony.conf
   Put reasonable defaults in example config
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e69de29bb2d1..d0f8bcb3edca 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 565f5d4296870313099305a298cffc43 chrony-1.20.ebuild 1192
+MD5 984f0954ec16c0c10aca58c0329dd971 chrony-1.20-r1.ebuild 1312
+MD5 25e4a0383f6d77b8790b4aaa5030b502 ChangeLog 2658
+MD5 548e9ab8a2b35c85165c67105a5bbbe6 metadata.xml 600
+MD5 da92a35b9c34b8be089136c81c770d16 chrony-1.19.ebuild 1186
+MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.20-chrony.conf.example-gentoo.diff 1592
+MD5 c0e426c615798b7c75afc3b1aadcd727 files/digest-chrony-1.19 63
+MD5 530b19caa6b14e1501530401f8cdc986 files/digest-chrony-1.20 63
+MD5 f671c412f74ccf0da928e81b2806fe0c files/chronyd.rc 1618
+MD5 d364a3eb5fa42974f0676a61433cca10 files/chronyd.conf 786
+MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19-conf.c-gentoo.diff 342
+MD5 19fc6632603680a145092ca56fe9aaa1 files/chrony-1.20-sys_linux.c-gentoo.diff 797
+MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.19-chrony.conf.example-gentoo.diff 1592
+MD5 530b19caa6b14e1501530401f8cdc986 files/digest-chrony-1.20-r1 63
+MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.20-conf.c-gentoo.diff 342
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLb/TV3J2n04EauwRAhRnAKC//2Y1Oo2r5oh3PKtKPpfMCIUP1gCcDQeH
+lL6DgSdgVBs+K+HVTf7ku4s=
+=0jo5
+-----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.19.ebuild b/net-misc/chrony/chrony-1.19.ebuild
index 4b5d3e9f3fa5..939bb957ec4d 100644
--- a/net-misc/chrony/chrony-1.19.ebuild
+++ b/net-misc/chrony/chrony-1.19.ebuild
@@ -1,68 +1,45 @@
-# 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-misc/chrony/chrony-1.19.ebuild,v 1.1 2003/03/18 10:27:05 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.19.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
-IUSE="readline"
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="NTP client and server programs"
 SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
-HOMEPAGE="http://chrony.sunsite.dk"
+HOMEPAGE="http://chrony.sunsite.dk/"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 -sparc"
+IUSE="readline"
 
-DEPEND="virtual/glibc
-		readline? ( >=readline-4.1-r4 )"
-RDEPEND=$DEPEND
+DEPEND="virtual/libc
+	readline? ( >=sys-libs/readline-4.1-r4 )"
 
-# Patch the distribution so that it puts stuff in /etc/chrony/ by default
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp conf.c conf.c.orig
-	patch -p0 < ${FILESDIR}/${P}-conf.c-gentoo.diff
-	cd examples
-	cp chrony.conf.example chrony.conf.example.orig
-	patch -p0 < ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-conf.c-gentoo.diff
+	epatch ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
 }
 
 src_compile() {
-
-	local myconf
-
-	use readline || myconf="--disable-readline"
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$myconf || die "./configure failed"
-		
+	econf `use_enable readline` || die
 	emake all docs || die
 }
 
-src_install () {
-	# the chrony install is brain-dead so we'll
-	# just do it ourselves.
-
+src_install() {
+	# the chrony install is brain-dead so we'll just do it ourselves
 	dobin chronyc
 	dosbin chronyd
-	
-	# documentation
-	dodoc chrony.txt chrony.html COPYING README
-
-	# man pages
-	doman *.{1,5,8}	
 
-	# info files
+	dodoc chrony.txt README examples/chrony.{conf,keys}.example
+	dohtml chrony.html
+	doman *.{1,5,8}
 	doinfo chrony.info*
 
-	# example configuration files
-	dodoc examples/chrony.conf.example
-	dodoc examples/chrony.keys.example
-
-	# system configuration
-	exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
 	dodir /etc/chrony
+	exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
+	insinto /etc/conf.d ; newins ${FILESDIR}/chronyd.conf chronyd
+	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
 }
diff --git a/net-misc/chrony/chrony-1.20-r1.ebuild b/net-misc/chrony/chrony-1.20-r1.ebuild
index 580d5ade1352..bc72e3f120a4 100644
--- a/net-misc/chrony/chrony-1.20-r1.ebuild
+++ b/net-misc/chrony/chrony-1.20-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-misc/chrony/chrony-1.20-r1.ebuild,v 1.1 2004/10/23 12:01:42 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~mips sparc ~ppc"
+KEYWORDS="hppa ~mips ~ppc ~sparc ~x86"
 IUSE="readline"
 
 DEPEND="virtual/libc
diff --git a/net-misc/chrony/chrony-1.20.ebuild b/net-misc/chrony/chrony-1.20.ebuild
index 57340923ac26..eba922afb41c 100644
--- a/net-misc/chrony/chrony-1.20.ebuild
+++ b/net-misc/chrony/chrony-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/net-misc/chrony/chrony-1.20.ebuild,v 1.1 2003/11/26 01:43:56 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
 inherit eutils
 
@@ -10,11 +10,11 @@ SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 sparc"
+KEYWORDS="x86 ~mips sparc ppc"
 IUSE="readline"
 
-DEPEND="virtual/glibc
-	readline? ( >=readline-4.1-r4 )"
+DEPEND="virtual/libc
+	readline? ( >=sys-libs/readline-4.1-r4 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff b/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff
index 2194109efeb9..7f1f2c9cccfc 100644
--- a/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff
+++ b/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff
@@ -1,34 +1,27 @@
---- chrony.conf.example.orig	Sun May 12 18:16:30 2002
-+++ chrony.conf.example	Sun May 12 18:17:12 2002
-@@ -2,7 +2,7 @@
- # $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff,v 1.1 2003/03/18 10:27:05 wmertens Exp $
+--- examples/chrony.conf.example.orig	2003-06-16 11:59:01.000000000 -0400
++++ examples/chrony.conf.example	2003-06-16 12:00:13.000000000 -0400
+@@ -3,5 +3,5 @@
  #
  # This is an example chrony configuration file.  You should copy it to
 -# /etc/chrony.conf after uncommenting and editing the options that you
 +# /etc/chrony/chrony.conf after uncommenting and editing the options that you
  # want to enable.  I have not included the more obscure options.  Refer
  # to the documentation for these.
- #
-@@ -90,7 +90,7 @@
- # immediately so that it doesn't gain or lose any more time.  You
+@@ -91,5 +91,5 @@
  # generally want this, so it is uncommented.
  
 -driftfile /etc/chrony.drift
 +driftfile /etc/chrony/chrony.drift
  
  # If you want to use the program called chronyc to configure aspects of
- # chronyd's operation once it is running (e.g. tell it the Internet link
-@@ -99,7 +99,7 @@
- # exchanges between cooperating machines.)  Again, this option is
+@@ -100,5 +100,5 @@
  # assumed by default.
  
 -keyfile /etc/chrony.keys
 +keyfile /etc/chrony/chrony.keys
  
  # Tell chronyd which numbered key in the file is used as the password
- # for chronyc. (You can pick any integer up to 2**32-1.  '1' is just a
-@@ -157,8 +157,8 @@
- ! logdir /var/log/chrony
+@@ -158,6 +158,6 @@
  ! log measurements statistics tracking
  
 -If you have real time clock support enabled (see below), you might want
@@ -37,18 +30,14 @@
 +# this line instead:
  
  ! log measurements statistics tracking rtc
- 
-@@ -268,7 +268,7 @@
- # You need to have 'enhanced RTC support' compiled into your Linux
+@@ -269,5 +269,5 @@
  # kernel.  (Note, these options apply only to Linux.)
  
 -! rtcfile /etc/chrony.rtc
 +! rtcfile /etc/chrony/chrony.rtc
  
  # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
- # time.  (Local time means UTC +/- the effect of your timezone.)  If you
-@@ -284,6 +284,6 @@
- # /dev/rtc.  If it's accessed somewhere else on your system (e.g. you're
+@@ -285,5 +285,5 @@
  # using devfs), uncomment and edit the following line.
  
 -! rtcdevice /dev/misc/rtc
diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
index 8a33f59366f2..4c506c047c3b 100644
--- a/net-misc/chrony/files/chronyd.conf
+++ b/net-misc/chrony/files/chronyd.conf
@@ -1,5 +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/net-misc/chrony/files/chronyd.conf,v 1.1 2003/06/16 16:08:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.conf,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
 CFGFILE=/etc/chrony/chrony.conf
+
+# 
+# Configuration dependant options : 
+#      -s - Set system time from RTC if rtcfile directive present 
+#      -r - Reload sample histories if dumponexit directive present 
+# 
+# The combination of "-s -r" allows chronyd to perform long term averaging of 
+# the gain or loss rate across system reboots and shutdowns. 
+# 
+ARGS="" 
+# 
+# devfs creates the device for RTC if it's compiled into kernel 
+test -c /dev/rtc && { 
+       grep -q '^rtcfile' $CFGFILE && ARGS="$ARGS -s" 
+} 
+grep -q '^dumponexit$' $CFGFILE && ARGS="$ARGS -r" 
+
diff --git a/net-misc/chrony/files/chronyd.rc b/net-misc/chrony/files/chronyd.rc
index 21d00ae949ca..aba92e1df42c 100644
--- a/net-misc/chrony/files/chronyd.rc
+++ b/net-misc/chrony/files/chronyd.rc
@@ -1,23 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc6,v 1.3 2002/03/24 14:25:31 azarah Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
 depend() {
 	need net
+	use dns
 }
 
-CFGFILE=/etc/chrony/chrony.conf
-
 checkconfig() {
-
 	# Note that /etc/chrony.keys is *NOT* checked. This
 	# is because the user may have specified another key
 	# file, and we don't want to force the user to use that
 	# exact name for the key file.
-	if [ ! -f $CFGFILE ]
-	then
-		eerror "Please create $cfgfile and the"
+	if [ ! -f $CFGFILE ] ; then
+		eerror "Please create $CFGFILE and the"
 		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
 		eerror "by using the"
 		eerror ""
@@ -45,7 +42,7 @@ start() {
 	start-stop-daemon --start --quiet \
 		--exec /usr/sbin/chronyd \
 	        --pidfile $PIDFILE \
-                -- -f $CFGFILE
+                -- -f $CFGFILE $ARGS
 	eend $? "Failed to start chronyd"
 }
 
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 036f9cf848a0..931e6aa5b6f1 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-misc</herd>
+<herd>no-herd</herd>
 <maintainer>
-  <email>wmertens@gentoo.org</email>
+	<email>tove@gentoo.org</email>
 </maintainer>
+<longdescription>
+Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
+the accuracy of the system clock on a computer. chronyd has been specifically
+written to work well for systems which have only an intermittent (e.g. dial-up)
+connection to the network where the NTP servers are. It still works well
+in a "permanently connected" mode.
+</longdescription>
 </pkgmetadata>
diff --git a/net-misc/cidr/ChangeLog b/net-misc/cidr/ChangeLog
index d9580d02d268..f7ea8dd4a8c0 100644
--- a/net-misc/cidr/ChangeLog
+++ b/net-misc/cidr/ChangeLog
@@ -1,11 +1,32 @@
 # ChangeLog for net-misc/cidr
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cidr/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cidr/ChangeLog,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
+  26 May 2005; Jan Brinkmann <luckyduck@gentoo.org> cidr-2.3.1-r1.ebuild:
+  added ~amd64 to KEYWORDS, fixes #94025
+
+  10 May 2005; David Holm <dholm@gentoo.org> cidr-2.3.1-r1.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> cidr-2.3.1-r1.ebuild:
+  Add inherit eutils
+
+*cidr-2.3.1-r1 (03 Sep 2003)
+
+  03 Sep 2003; Patrick Kursawe <phosphan@gentoo.org> cidr-2.3.1-r1.ebuild,
+  files/cidr-2.3.1.patch:
+  Fixing bug 27848. Fix was provided by edi <xerox@trmz.org>. 
+  Did a few other cleanups in the ebuild (no need to
+  keep another copy of the GPL, you can get rfc 1878 by using rfcutil).
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *cidr-2.3.1 (1 Feb 2002)
 
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog cidr-2.3.1.ebuild:
+  Added KEYWORDS, SLOT, LICENSE.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   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-misc/cidr/Manifest b/net-misc/cidr/Manifest
index e69de29bb2d1..546ca75032d8 100644
--- a/net-misc/cidr/Manifest
+++ b/net-misc/cidr/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 015081595120e2ff50ce6d23c2384844 cidr-2.3.1-r1.ebuild 700
+MD5 1cc2462f4d88f803e83a4da881b40989 ChangeLog 1461
+MD5 9b40c019a40f162c064b5d51eb73dd85 files/digest-cidr-2.3.1-r1 63
+MD5 0214de5ab88bfffe5c4759a5600b8e3b files/cidr-2.3.1.patch 841
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClaW306ebR+OMO78RAv6wAJ9wBGNDdbqrja17cTdKhsiEs4mHWgCcD4vT
+/MVUmBCY9rLkwCTEhKYcwq8=
+=MYYo
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cidr/cidr-2.3.1-r1.ebuild b/net-misc/cidr/cidr-2.3.1-r1.ebuild
index 3a4da57d011c..775e2b4b81f0 100644
--- a/net-misc/cidr/cidr-2.3.1-r1.ebuild
+++ b/net-misc/cidr/cidr-2.3.1-r1.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cidr/cidr-2.3.1-r1.ebuild,v 1.1 2003/09/03 09:27:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cidr/cidr-2.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
-TARBALL="cidr-current.tar.gz"
-S=${WORKDIR}/${PN}-2.3
-DESCRIPTION="command line util to assist in calculating subnets."
-SRC_URI="http://home.netcom.com/~naym/cidr/${TARBALL}"
+inherit eutils
+
+DESCRIPTION="command line util to assist in calculating subnets"
 HOMEPAGE="http://home.netcom.com/~naym/cidr/"
-DEPEND=""
-KEYWORDS="x86 sparc "
+SRC_URI="http://home.netcom.com/~naym/cidr/cidr-current.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc ~ppc ~amd64"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}-2.3
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}.patch || die "patch failed"
-}	
+	epatch ${FILESDIR}/${P}.patch
+}
 
 src_compile() {
 	emake || die "make failed"
 }
 
-src_install () {
-
-	 dobin cidr	
-	 dodoc README ChangeLog 
-	 doman cidr.1
+src_install() {
+	dobin cidr
+	dodoc README ChangeLog
+	doman cidr.1
 }
-
diff --git a/net-misc/cipe/ChangeLog b/net-misc/cipe/ChangeLog
index f0988de65e1e..fa6f71695f84 100644
--- a/net-misc/cipe/ChangeLog
+++ b/net-misc/cipe/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for net-misc/cipe
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cipe/ChangeLog,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
 
-*cipe-1.54 (27 Nov 2003)
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> cipe-1.5.4.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> cipe-1.5.4.ebuild:
+  Add inherit eutils
+
+*cipe-1.5.4 (27 Nov 2003)
   
   27 Nov 2003; Jay Pfeifer <pfeifer@gentoo.org> cipe-1.54.ebuild :
 
diff --git a/net-misc/cipe/Manifest b/net-misc/cipe/Manifest
index 902493688052..cc633372bfbf 100644
--- a/net-misc/cipe/Manifest
+++ b/net-misc/cipe/Manifest
@@ -1,6 +1,16 @@
-MD5 2b769eff5f245f0f71c5398ea19cebfb cipe-1.5.4.ebuild 1573
-MD5 bb3e3c43dda3ed166b0d543c22d84b83 ChangeLog 464
-MD5 a8f64fc69346292f297dba6b2d575346 metadata.xml 332
-MD5 3606a508beaa02106e20f68ec0d00fb1 files/init.d-ciped 1130
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3caa49356242e80fb5b87d674ecfd6cd ChangeLog 744
+MD5 43cf9c9ae91e0437f54fa3cf22361eb2 cipe-1.5.4.ebuild 1651
+MD5 5b2673b980666a233f3b15dd3ce3e886 files/cipe-1.5.4-gentoo.patch 4391
 MD5 b476a9ee4e52c7f58d642bf6ccc503e8 files/digest-cipe-1.5.4 124
-MD5 2f01c05d2b653cd54d03c7f9f8ebfabd files/cipe-1.5.4-gentoo.patch 4375
+MD5 3606a508beaa02106e20f68ec0d00fb1 files/init.d-ciped 1130
+MD5 a8f64fc69346292f297dba6b2d575346 metadata.xml 332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0BKQI1lqEGTUzyQRAlBRAKCE6l11q8WM9E9CqYUF2dsoolK84gCfQjLQ
+v7d0HYBWVL+Al9WS7Gh2ouk=
+=H896
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cipe/cipe-1.5.4.ebuild b/net-misc/cipe/cipe-1.5.4.ebuild
index 9b16490ae28f..1d1ac9f5e853 100644
--- a/net-misc/cipe/cipe-1.5.4.ebuild
+++ b/net-misc/cipe/cipe-1.5.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cipe/cipe-1.5.4.ebuild,v 1.1 2003/11/28 04:43:23 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cipe/cipe-1.5.4.ebuild,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
+
+inherit eutils
 
 CIPE_TEXINFO="${PN}-1.5.1.texinfo"
 
@@ -14,14 +16,12 @@ SLOT="0"
 KEYWORDS="-* ~x86"
 IUSE="ssl"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 DEPEND="${RDEPEND}
 	virtual/linux-sources"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 
@@ -73,6 +73,6 @@ pkg_postinst() {
 	update-modules
 	depmod -a
 
-	echo  " "
+	echo
 	einfo "For info on configuring cipe, do 'info cipe'"
 }
diff --git a/net-misc/cipe/files/cipe-1.5.4-gentoo.patch b/net-misc/cipe/files/cipe-1.5.4-gentoo.patch
index 44af64cb1f5f..1feacc3acddb 100644
--- a/net-misc/cipe/files/cipe-1.5.4-gentoo.patch
+++ b/net-misc/cipe/files/cipe-1.5.4-gentoo.patch
@@ -16,7 +16,7 @@ diff -Naur cipe-1.5.4.orig/conf/Makefile-obj.in cipe-1.5.4/conf/Makefile-obj.in
 +++ cipe-1.5.4/conf/Makefile-obj.in	2003-08-13 13:30:14.000000000 +0900
 @@ -9,7 +9,9 @@
  
- # $Id: cipe-1.5.4-gentoo.patch,v 1.1 2003/11/28 04:43:23 pfeifer Exp $
+ # $Id: cipe-1.5.4-gentoo.patch,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
  
 -BINDIR:=/usr/local/sbin
 +DESTDIR:=
@@ -44,7 +44,7 @@ diff -Naur cipe-1.5.4.orig/conf/Makefile-top.in cipe-1.5.4/conf/Makefile-top.in
 +++ cipe-1.5.4/conf/Makefile-top.in	2003-08-13 13:30:14.000000000 +0900
 @@ -9,7 +9,9 @@
  
- # $Id: cipe-1.5.4-gentoo.patch,v 1.1 2003/11/28 04:43:23 pfeifer Exp $
+ # $Id: cipe-1.5.4-gentoo.patch,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
  
 -INFODIR:=/usr/local/info
 +DESTDIR:=
diff --git a/net-misc/cisco-aironet-client-utils/ChangeLog b/net-misc/cisco-aironet-client-utils/ChangeLog
index eced3d6766b4..f7cbfa94fd22 100644
--- a/net-misc/cisco-aironet-client-utils/ChangeLog
+++ b/net-misc/cisco-aironet-client-utils/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-misc/cisco-aironet-client-utils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/ChangeLog,v 1.1 2003/12/13 00:05:42 wolf31o2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
+
+  10 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-aironet-client-utils-2.0.ebuild,
+  cisco-aironet-client-utils-2.1.ebuild:
+  Added pcmcia to IUSE and closing bug #78714.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org>
+  cisco-aironet-client-utils-2.0.ebuild,
+  cisco-aironet-client-utils-2.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  02 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-aironet-client-utils-2.1.ebuild:
+  Fixing broken uncompress/S location and closing bug #52731.
+
+  01 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-aironet-client-utils-2.1.ebuild:
+  Fixing problem with S and closing bug #52731.
+
+*cisco-aironet-client-utils-2.1 (01 Jun 2004)
+
+  01 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +cisco-aironet-client-utils-2.1.ebuild:
+  Version bumping to 2.1 and closing bug #52214.
+
+  12 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-aironet-client-utils-2.0.ebuild:
+  Adding empty IUSE.
 
 *cisco-aironet-client-utils-2.0 (12 Dec 2003)
 
diff --git a/net-misc/cisco-aironet-client-utils/Manifest b/net-misc/cisco-aironet-client-utils/Manifest
index b54d5d70f733..762a8e5d7222 100644
--- a/net-misc/cisco-aironet-client-utils/Manifest
+++ b/net-misc/cisco-aironet-client-utils/Manifest
@@ -1,2 +1,7 @@
-MD5 1207acd022d27e44b22691d11940df82 cisco-aironet-client-utils-2.0.ebuild 1461
+MD5 3f7c7fb8d8544efb0dc71ddd552a65d0 cisco-aironet-client-utils-2.0.ebuild 1127
+MD5 fdc67bd867b85e82195b935e0f529f56 cisco-aironet-client-utils-2.1.ebuild 1263
+MD5 82aa8b55c1d7bdbe6a8d705a310068f9 ChangeLog 1406
+MD5 9064d8240c7226834b86c4e84b34a343 metadata.xml 434
+MD5 366a70339e8bde9b5f98c82de54e7ee1 files/90cisco 20
 MD5 873c008583c916c4c822dea9098cf21c files/digest-cisco-aironet-client-utils-2.0 74
+MD5 79427c4123e412b44c2d612e612865ed files/digest-cisco-aironet-client-utils-2.1 72
diff --git a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild
index 6f72d5d42ed0..3f00d84b142f 100644
--- a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild
+++ b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-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/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild,v 1.1 2003/12/13 00:05:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 DESCRIPTION="Cisco Aironet Client Utilities"
 HOMEPAGE="http://www.cisco.com/pcgi-bin/tablebuild.pl/aironet-utils-linux"
@@ -10,9 +10,10 @@ LICENSE="cisco"
 SLOT=0
 KEYWORDS="-* x86"
 RESTRICT="fetch"
+IUSE="pcmcia"
 
-DEPEND="virtual/glibc
-	sys-apps/pcmcia-cs"
+DEPEND="virtual/libc
+	pcmcia? ( sys-apps/pcmcia-cs )"
 
 RDEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
diff --git a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild
index 6fa118c4d394..40f534827e5c 100644
--- a/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild
+++ b/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-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/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild,v 1.1 2004/06/01 19:07:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-aironet-client-utils/cisco-aironet-client-utils-2.1.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 DESCRIPTION="Cisco Aironet Client Utilities"
 HOMEPAGE="http://www.cisco.com/pcgi-bin/tablebuild.pl/aironet-utils-linux"
@@ -10,16 +10,16 @@ LICENSE="cisco"
 SLOT=0
 KEYWORDS="-* x86"
 RESTRICT="fetch"
-IUSE=""
+IUSE="pcmcia"
 
-DEPEND="virtual/glibc
-	sys-apps/pcmcia-cs"
+DEPEND="virtual/libc
+	pcmcia? ( sys-apps/pcmcia-cs )"
 
 RDEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*
 	<=dev-cpp/gtkmm-2.0"
 
-S=${WORKDIR}/linux
+S=${WORKDIR}
 
 
 pkg_nofetch() {
@@ -37,14 +37,16 @@ src_unpack() {
 }
 
 src_install() {
+	pwd
 	exeinto /opt/cisco/bin
-	doexe utilities/redhat90/{acu,bcard,leap{set,script,login}}
+	doexe linux/utilities/redhat90/{acu,bcard,leap{set,script,login}} \
+		|| die "Copying binaries"
 
 	insinto /opt/cisco
-	doins ACU.PRFS
-	chmod a+rw ${D}/opt/cisco/ACU.PRFS
+	doins linux/ACU.PRFS || die "Copying defaults"
+	chmod a+rw ${D}/opt/cisco/ACU.PRFS || die "Making defaults writable"
 
-	doins helpml.tar.gz
+	doins linux/helpml.tar.gz
 	pushd ${D}/opt/cisco > /dev/null
 	tar zxf helpml.tar.gz
 	rm -f helpml.tar.gz
diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 2c440b1a6c3d..0f30d71bf85e 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,8 +1,207 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.1 2003/07/05 12:42:36 blauwers Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
+
+  20 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  cisco-vpnclient-3des-4.6.02.0030.ebuild,
+  cisco-vpnclient-3des-4.6.03.0190.ebuild,
+  cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  0->KV for bug #112817.
+
+  15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  KV_MINOR->KV_PATCH
+
+  14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  cisco-vpnclient-3des-4.6.02.0030.ebuild,
+  cisco-vpnclient-3des-4.6.03.0190.ebuild,
+  cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  Fixing my overzealous sed call earlier.
+
+  14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  Changed conditions to match all kernels from 2.6.14 up.
+
+  14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  cisco-vpnclient-3des-4.6.02.0030.ebuild,
+  cisco-vpnclient-3des-4.6.03.0190.ebuild,
+  cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  Changed SLOT to 0.
+
+  13 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  Forcing to stable since 2.6.14 has gone stable in the tree and this patch is
+  required to compile against 2.6.14 successfully.
+
+*cisco-vpnclient-3des-4.6.03.0190-r1 (13 Nov 2005)
+
+  13 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.6.03.0190-2.6.14.patch,
+  +cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  Added patch to resolve bug #107208.
+
+  29 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  cisco-vpnclient-3des-4.6.02.0030.ebuild:
+  kernel-mod -> linux-info for kernel team.
+
+  06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.03.0190.ebuild:
+  Fix bug #98070.
+
+  28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.03.0190.ebuild:
+  Changed dolib.so to doins to fix problems loading library on amd64. Closing
+  bug #97269.
+
+*cisco-vpnclient-3des-4.6.03.0190 (02 Jun 2005)
+
+  02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.02.0030.ebuild,
+  +cisco-vpnclient-3des-4.6.03.0190.ebuild:
+  Added information about rp_filter for bug #90693. Version bumped to version
+  4.5.03.0190, and closing bug #94755.
+
+*cisco-vpnclient-3des-4.6.02.0030 (14 Apr 2005)
+
+  14 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.6.00.0045-supported_device.patch,
+  +files/4.6.02.0030-supported_device.patch, -files/supported_device.patch,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  +cisco-vpnclient-3des-4.6.02.0030.ebuild:
+  Renamed supported_device.patch to 4.6.00.0045-supported_device.patch. Added
+  4.6.02.0030 ebuild provided by Stefan Skotte <sfs@steflo.dk> and closing bug
+  #88408.
+
+  08 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild:
+  Marking stable on x86 and removing amd64 KEYWORDS, which were accidentally
+  added by me in testing and were never removed.
+
+*cisco-vpnclient-3des-4.6.00.0045-r1 (09 Nov 2004)
+
+  09 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/supported_device.patch,
+  +cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  -cisco-vpnclient-3des-4.6.00.0045.ebuild:
+  Added supported device patch from James Ward <jennyandjamesward@yahoo.com>
+  and closing bugs #68738, #70365, and #70374.
+
+*cisco-vpnclient-3des-4.6.00.0045 (03 Nov 2004)
+
+  03 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild,
+  +cisco-vpnclient-3des-4.6.00.0045.ebuild:
+  Version bumped to latest version and updated all ebuilds to use the
+  kernel-mod eclass rather than kmod eclass. This should resolve bugs #68738,
+  #68449, and #69870.
+
+  24 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/vpnclient.rc,
+  cisco-vpnclient-3des-4.0.5.ebuild:
+  Rewrite the vpnclient script to make it flow better (eerror/exit is not the
+  way to go; eend/return is).
+
+*cisco-vpnclient-3des-4.0.5 (11 Aug 2004)
+
+  11 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +cisco-vpnclient-3des-4.0.5.ebuild:
+  Bumped to latest version.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild:
+  change virtual/glibc to virtual/libc
+
+  26 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -cisco-vpnclient-3des-4.0.3b-r3.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r4.ebuild:
+  Removing old ebuild and changing HOMEPAGE.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild:
+  Add inherit eutils
+
+*cisco-vpnclient-3des-4.0.3b-r4 (24 Apr 2004)
+
+  24 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> +files/atheros.patch,
+  +cisco-vpnclient-3des-4.0.3b-r4.ebuild:
+  Adding atheros patch, submitted by Dominic Battre and closing bug #48680.
+
+  12 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r2.ebuild,
+  cisco-vpnclient-3des-4.0.3b-r3.ebuild:
+  Adding empty IUSE, removing old 4.0.3b-r2 ebuild, and marking 4.0.3b-r3 stable
+  on x86.
+
+  16 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r2.ebuild:
+  Added inherit eutils since we use epatch.
+
+*cisco-vpnclient-3des-4.0.3b-r3 (25 Feb 2004)
+
+  25 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r3.ebuild, files/register_netdevice.patch:
+  Adding patch to allow cisco_ipsec module to work with kernel 2.6.x, submitted
+  by Kent Skaar <skaar@aol.net> to bugzilla and originally submitted to LMKL by
+  by Gertjan van Wingerde <gwingerde@home.nl>. Closing bug #40730.
+
+  14 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc:
+  Removing -qs from insmod line to allow proper support with newer
+  module-init-tools. Closing bug #37678.
+
+  13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r1.ebuild, cisco-vpnclient-3des-4.0.3b.ebuild:
+  Removing older revisions.
+
+*cisco-vpnclient-3des-4.0.3b-r2 (13 Jan 2004)
+
+  13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r2.ebuild, files/vpnclient.rc:
+  Updated vpnclient init script for proper 2.6 kernel handling and also to
+  remove console messages at boot. Closing Bug #37678.
+
+*cisco-vpnclient-3des-4.0.3b-r1 (08 Jan 2004)
+
+  08 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r1.ebuild, files/vpnclient.rc:
+  Updated init script to make it compatible with /sbin/runscript.sh. The script
+  was provided by Lars Corzilius (gentoo@flowsterritory.de) and updated by me.
+  Closing bug #36419.
+
+*cisco-vpnclient-3des-4.0.3b (12 Dec 2003)
+
+  12 Dec 2003; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.1a-r1.ebuild, cisco-vpnclient-3des-4.0.1a.ebuild,
+  cisco-vpnclient-3des-4.0.3b.ebuild, metadata.xml,
+  files/4.0.1a-linux26-gentoo.patch, files/4.0.1a-linux26.patch,
+  files/driver_build_CC.patch:
+  Added driver_build_CC.patch by Jesse Becker (jbecker@speakeasy.net) and
+  version bumped to newest version. Closing bugs #33488 and #35617.
+
+*cisco-vpnclient-3des-4.0.1a-r1 (19 Nov 2003)
+
+  19 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix typo in patch #33848.
 
 *cisco-vpnclient-3des-4.0.1a (05 JUL 2003)
 
+  27 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Small patch so it'll work in linux-2.6.x.
+
+  09 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up ebuild, made it use $KV properly.
+
   05 JUL 2003; Bart Lauwers <blauwers@gentoo.org> :
   Initial import.
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 923c0af965ea..c3dfd10e2501 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,2 +1,24 @@
-MD5 5a4e117d24b6bfda33e0803900c66406 cisco-vpnclient-3des-4.0.1a.ebuild 618
-MD5 e87a2dcccbebe59023e70bb5fa5fbca3 files/digest-cisco-vpnclient-3des-4.0.1a 79
+MD5 39611034a5823e4fd0d8f6b898ca93d6 ChangeLog 8271
+MD5 a691310df68035551cd68c4ef6c7763a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1781
+MD5 b565bd30a204dcc6c4eca0a443e2e3bc cisco-vpnclient-3des-4.0.3b-r4.ebuild 2161
+MD5 73d867d50b97300dc21f4205863600b5 cisco-vpnclient-3des-4.0.5.ebuild 1774
+MD5 ff48cc35afdc04584fe99de699b2ae54 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2154
+MD5 6e5b6dbe6edcd6d4686d3f9c3e99f467 cisco-vpnclient-3des-4.6.02.0030.ebuild 2350
+MD5 39b4f8f9ef79c3af48a6a914e45698e0 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 1999
+MD5 48fed1d9a24613ce6fbfd7e2cb4a5ade cisco-vpnclient-3des-4.6.03.0190.ebuild 1788
+MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
+MD5 5250e93732649bfbea046a13e84ff4a8 files/4.6.00.0045-supported_device.patch 826
+MD5 e9039147fbc74c136f4cc34f1b8baaf1 files/4.6.02.0030-supported_device.patch 807
+MD5 85b413dbfb35dc1d790002409df1bb1f files/4.6.03.0190-2.6.14.patch 584
+MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
+MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
+MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
+MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
+MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
+MD5 1f75a65b37e5ade3cab77a4ff0d8a368 files/digest-cisco-vpnclient-3des-4.6.02.0030 83
+MD5 45d0931857a18acabe4efde1aec8aa0c files/digest-cisco-vpnclient-3des-4.6.03.0190 90
+MD5 45d0931857a18acabe4efde1aec8aa0c files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 90
+MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
+MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
+MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
+MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
index b97ebfe1af0e..5816282bf88f 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild,v 1.1 2003/11/19 20:18:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
+
+inherit eutils linux-info
 
 MY_PV=${PV/a/.A-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -8,11 +10,12 @@ HOMEPAGE="http://www.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
+SLOT="0"
 KEYWORDS="-* x86"
 RESTRICT="fetch"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/linux-sources
 	>=sys-apps/sed-4"
 
@@ -31,11 +34,18 @@ pkg_nofetch() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	[ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26.patch
+	if kernel_is 2 6; then
+		epatch ${FILESDIR}/${PV}-linux26-gentoo.patch
+	fi
+
+	# Patch to allow use of alternate CC.  Patch submitted to bug #33488 by
+	# Jesse Becker (jbecker@speakeasy.net)
+	epatch ${FILESDIR}/driver_build_CC.patch
+
 }
 
 src_compile () {
-	check_KV
+	unset ARCH
 	sh ./driver_build.sh /lib/modules/${KV}/build
 	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
 	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
@@ -66,3 +76,4 @@ src_install() {
 pkg_postinst() {
 	einfo  "You must run \`/etc/init.d/vpnclient start\` before using the client."
 }
+
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
index 14dfa59ad3df..fcc0fa5d8c73 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild,v 1.1 2004/04/24 15:22:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
-inherit eutils
+inherit eutils linux-info
 
 MY_PV=${PV/b/.B-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
-HOMEPAGE="http://www.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
+HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
+SLOT="0"
 KEYWORDS="-* x86"
 RESTRICT="fetch"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/linux-sources
 	>=sys-apps/sed-4"
 
@@ -48,7 +48,7 @@ src_unpack() {
 }
 
 src_compile () {
-	check_KV
+	unset ARCH
 	sh ./driver_build.sh /lib/modules/${KV}/build
 	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
 	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild
index d0e32f86b179..a4c493571624 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.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/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild,v 1.1 2004/08/11 16:03:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
-inherit eutils kmod
+inherit eutils linux-info
 
 MY_PV=${PV}.Rel-k9
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -10,10 +10,10 @@ HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch"
+SLOT="0"
+KEYWORDS="-* x86"
 IUSE=""
+RESTRICT="fetch"
 
 DEPEND="virtual/libc
 	virtual/linux-sources
@@ -24,11 +24,9 @@ S=${WORKDIR}/vpnclient
 VPNDIR="/etc/CiscoSystemsVPNClient"
 
 pkg_nofetch() {
-	eerror "Please goto:"
-	eerror " ${HOMEPAGE}"
-	eerror "and download"
-	eerror " ${A}"
-	eerror "to ${DISTDIR}"
+	einfo "Please visit:"
+	einfo " ${HOMEPAGE}"
+	einfo "and download ${A} to ${DISTDIR}"
 }
 
 src_unpack() {
@@ -41,12 +39,9 @@ src_unpack() {
 }
 
 src_compile () {
-	check_KV
-	if is_kernel 2 5 || is_kernel 2 6 ; then
-		unset ARCH
-	fi
+	unset ARCH
 	sh ./driver_build.sh /lib/modules/${KV}/build
-	[ [ ! -f ./cisco_ipsec ] || [ ! -f ./cisco_ipsec.ko ] ] \
+	[ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \
 		&& die "Failed to make module 'cisco_ipsec'"
 	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
 	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini.in
@@ -64,10 +59,8 @@ src_install() {
 	dobin ipseclog cisco_cert_mgr
 
 	insinto /lib/modules/${KV}/CiscoVPN
-	if is_kernel 2 5 || is_kernel 2 6 ; then
+	if kernel_is 2 6 ; then
 		doins cisco_ipsec.ko
-		dosed 's/VPNMOD="cisco_ipsec"/VPNMOD="cisco_ipsec.ko"/' \
-			/etc/init.d/vpnclient
 	else
 		doins cisco_ipsec
 	fi
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
index 464ab4c83d2b..b8b243eee9ef 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-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/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,v 1.1 2004/11/09 20:24:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
-inherit eutils kernel-mod
+inherit eutils linux-info
 
 MY_PV=${PV}-k9
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -10,8 +10,8 @@ HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
-KEYWORDS="-* ~x86 ~amd64"
+SLOT="0"
+KEYWORDS="-* x86"
 IUSE=""
 RESTRICT="fetch"
 
@@ -37,7 +37,7 @@ src_unpack() {
 	# Jesse Becker <jbecker@speakeasy.net>
 	epatch ${FILESDIR}/driver_build_CC.patch
 	# Patch submitted to bug #69870 by James Ward <jennyandjamesward@yahoo.com>
-	epatch ${FILESDIR}/supported_device.patch
+	epatch ${FILESDIR}/${PV}-supported_device.patch
 }
 
 src_compile () {
@@ -67,7 +67,7 @@ src_install() {
 	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
 
 	insinto /lib/modules/${KV}/CiscoVPN
-	if kernel-mod_is_2_6_kernel; then
+	if kernel_is 2 6; then
 		doins cisco_ipsec.ko
 	else
 		doins cisco_ipsec
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
index 7fc3e58e56cc..0a8c08db59c8 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.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-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild,v 1.1 2005/04/14 12:45:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
-inherit eutils kernel-mod
+inherit eutils linux-info
 
 MY_PV=${PV}-k9
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -10,7 +10,7 @@ HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
+SLOT="0"
 KEYWORDS="-* x86"
 IUSE=""
 RESTRICT="fetch"
@@ -68,7 +68,7 @@ src_install() {
 	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
 
 	insinto /lib/modules/${KV}/CiscoVPN
-	if kernel-mod_is_2_6_kernel; then
+	if kernel_is 2 6; then
 		doins cisco_ipsec.ko
 	else
 		doins cisco_ipsec
@@ -83,7 +83,10 @@ src_install() {
 
 pkg_postinst() {
 	einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
-	echo ""
+	echo
 	ewarn "Configuration directory has moved to ${VPNDIR}!"
-	echo ""
+	echo
+	ewarn "If you are experiencing problems keeping a connection alive, please"
+	ewarn "check bug #90693 for more information about disabling rp_filter."
+	echo
 }
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
index e9b460a7dd1c..da2e8d45fa38 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild,v 1.1 2005/11/13 22:08:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
 inherit eutils linux-info
 
@@ -10,8 +10,8 @@ HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
-KEYWORDS="~x86 ~amd64"
+SLOT="0"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="fetch"
 
@@ -33,8 +33,11 @@ src_unpack () {
 	unpack ${A}
 	cd ${S}
 
-	#Fix problems with the linux 2.6.14 kernel.
-	kernel_is 2 6 14 && epatch ${FILESDIR}/${PV}-2.6.14.patch
+	#Fix problems with the linux >=2.6.14 kernel.
+	if kernel_is 2 6 && [ ${KV_PATCH} -ge 14 ]
+	then
+		epatch ${FILESDIR}/${PV}-2.6.14.patch
+	fi
 }
 
 src_compile () {
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild
index 1f4c91ec16eb..487d090ebd72 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild,v 1.1 2005/06/02 14:32:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
 MY_PV=${PV}-k9
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -8,7 +8,7 @@ HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
 SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
-SLOT="${KV}"
+SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 RESTRICT="fetch"
@@ -47,7 +47,8 @@ src_install() {
 	doexe cvpnd
 	into /opt/cisco-vpnclient/
 	dobin ipseclog cisco_cert_mgr
-	dolib.so libvpnapi.so
+	insinto /opt/cisco-vpnclient/lib
+	doins libvpnapi.so
 	insinto /opt/cisco-vpnclient/include
 	doins vpnapi.h
 	dodir /usr/bin
diff --git a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
index d16759afe633..80b2a7d9e5ff 100644
--- a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
+++ b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
@@ -1,113 +1,115 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/files/vpnclient.rc,v 1.1.1.1 2005/11/30 09:55:41 chriswhite Exp $
 
 opts="start stop status"
 
 VPNCLIENT="/usr/bin/vpnclient"
 VPNDEV="cipsec0"
-VPNMOD="cisco_ipsec"
-if [ -x /usr/bin/id ]; then
-    ID="/usr/bin/id"
-elif [ -x /bin/id ]; then
-    ID="/bin/id"
-else
-    echo "Unable to determine access level"
-    exit 1
-fi
-WHOAMI=`$ID|sed -e 's/(.*//'`
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	export KV="$(uname -r)"
+
+	export VPNMOD="cisco_ipsec"
+	case "${KV}" in
+		2.6.*|2.5.*)		VPNMOD_FILE="${VPNMOD}.ko";;
+		2.4.*|2.2.*|2.0.*)	VPNMOD_FILE="${VPNMOD}.o";;
+		*)
+			eerror "Kernel version '${KV}' is not supported"
+			return 1;;
+	esac
+	export VPNMOD_FILE
+	return 0
+}
+
 start() {
-	ebegin "Starting Cisco VPN Client: "
+	checkconfig || return 1
+
+	local PC=""
+
+	ebegin "Starting Cisco VPN Client"
 
 	if [ -f /etc/resolv.conf.vpnbackup ]; then
-		echo "restoring /etc/resolv.conf"
+		einfo "restoring /etc/resolv.conf"
 		mv /etc/resolv.conf.vpnbackup /etc/resolv.conf
 	fi
+
 	if [ -d /lib/modules/preferred ]; then
-		PC=/lib/modules/preferred/CiscoVPN
+		PC="/lib/modules/preferred/CiscoVPN"
 	else
-		PC=/lib/modules/`uname -r`/CiscoVPN
+		PC="/lib/modules/${KV}/CiscoVPN"
 	fi
-	if [ -d $PC ] ; then
-		/sbin/modprobe -q ${PC}/${VPNMOD}
+
+	if [ -d "${PC}" ] ; then
+		/sbin/insmod ${PC}/${VPNMOD_FILE} >/dev/null 2>&1
 		if [ "$?" != "0" ] ; then
-			echo "Failed to load module ${VPNMOD}"
-			exit 1
+			eend 1 "Failed to load module '${VPNMOD}'"
+			return 1
 		fi
 	else
-		echo "module directory $PC not found."
-		exit 1
+		eend 1 "module directory '$PC' not found"
+		return 1
 	fi
-	case "`uname -r`" in
-		2.6.*)
-		;;
-		2.5.*)
-		;;
-		2.4.*)
-		;;
-		2.2.*)
-		;;
-		2.0.*)
-			#
-			# This is only needed due to a bug in 2.0.x kernels that affects
-			# arp lookups.
-			#
-			ifconfig $VPNDEV 222.222.222.222 ;
-			if [ "$?" != "0" ] ; then
-				echo "Failed (ifconfig)"
-				/sbin/modprobe -qr ${VPNMOD}
-				exit 1
-			fi
-		;;
-		*)
-			echo "Failed (unsupported Linux version)"
-			/sbin/modprobe -qr ${VPNMOD}
+
+	if [ "${KV:0:3}" == "2.0" ] ; then
+		# This is only needed due to a bug in 2.0.x kernels that affects
+		# arp lookups.
+		ifconfig $VPNDEV 222.222.222.222 ;
+		if [ "$?" != "0" ] ; then
+			eerror "Failed (ifconfig)"
+			/sbin/rmmod ${VPNMOD}
 			exit 1
-		;;
-	esac
-	eend $? 
+		fi
+	fi
+
+	eend 0
 }
 
 stop() {
-	ebegin "Stopping Cisco VPN Client: "
+	checkconfig || return 1
+
+	ebegin "Stopping Cisco VPN Client"
+
 	if [ -x $VPNCLIENT ]; then
 		$VPNCLIENT disconnect > /dev/null 2>&1
 	fi
 	/sbin/lsmod | grep -q "${VPNMOD}"
 	if [ "$?" != "0" ] ; then 
-		echo "module ${VPNMOD} is not running."
-		exit 1
+		eend 1 "Failed: module ${VPNMOD} is not running"
+		return 1
 	fi
 	/sbin/ifconfig $VPNDEV down
 	if [ "$?" != "0" ] ; then
-		echo "Failed (ifconfig)"
-		exit 1
+		eend 1 "Failed (ifconfig)"
+		return 1
 	fi
-	/sbin/modprobe -qr ${VPNMOD}
+	/sbin/rmmod ${VPNMOD}
 	if [ "$?" != "0" ] ; then
-		echo "Failed (rmmod)"
-		exit 1
+		eend 1 "Failed (rmmod)"
+		return 1
 	fi
-	eend $?
+
+	eend 0
 }
 
 status() {
-	/sbin/lsmod | egrep 'Module'
+	checkconfig || return 1
+
 	/sbin/lsmod | egrep "${VPNMOD}"
 	if [ "$?" != "0" ] ; then
-		echo
-		echo "Status Failed (lsmod ${VPNMOD}) - The VPN module is not loaded."
+		eerror "Failed (lsmod ${VPNMOD}): the VPN module is not loaded"
+		return 1
 	fi
 	echo
 	/sbin/ifconfig $VPNDEV
 	if [ "$?" != "0" ] ; then
 		echo
-		echo "Status Failed (ifconfig ${VPNDEV}) - The virtual interface is not present."
-		exit 1
+		eerror "Failed (ifconfig ${VPNDEV}): the virtual interface is not present"
+		return 1
 	fi
 }
diff --git a/net-misc/clockspeed-conf/ChangeLog b/net-misc/clockspeed-conf/ChangeLog
index d3b6eddf8f26..0a26405f9904 100644
--- a/net-misc/clockspeed-conf/ChangeLog
+++ b/net-misc/clockspeed-conf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/clockspeed-conf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed-conf/ChangeLog,v 1.1 2005/04/19 22:22:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed-conf/ChangeLog,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+*clockspeed-conf-0.4.5-r1 (22 Apr 2005)
+
+  22 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/clockspeed-conf-0.4.5-gentoo.patch,
+  +clockspeed-conf-0.4.5-r1.ebuild:
+  Use Gentoo-specific paths #90073 by Thilo Bangert.
 
 *clockspeed-conf (19 Apr 2005)
 
diff --git a/net-misc/clockspeed-conf/Manifest b/net-misc/clockspeed-conf/Manifest
index 43fca1b2cf87..928dc215b17e 100644
--- a/net-misc/clockspeed-conf/Manifest
+++ b/net-misc/clockspeed-conf/Manifest
@@ -1,2 +1,4 @@
-MD5 adf611ef86e8559479baf6c4ba583e57 clockspeed-conf-0.4.5.ebuild 743
-MD5 fcff2d4f599d8921bf32f06e71cf1860 files/digest-clockspeed-conf-0.4.5 71
+MD5 61836cee91d55bb2625cbaeebb8a0252 ChangeLog 592
+MD5 d41701b14b08b67884275965b79d3b5e clockspeed-conf-0.4.5-r1.ebuild 764
+MD5 fcff2d4f599d8921bf32f06e71cf1860 files/digest-clockspeed-conf-0.4.5-r1 71
+MD5 d7846d884b197274ba50d50473217534 files/clockspeed-conf-0.4.5-gentoo.patch 674
diff --git a/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild b/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild
index 712ea371d81f..00d2be666179 100644
--- a/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild
+++ b/net-misc/clockspeed-conf/clockspeed-conf-0.4.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-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild,v 1.1 2005/04/22 21:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed-conf/clockspeed-conf-0.4.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/clockspeed/ChangeLog b/net-misc/clockspeed/ChangeLog
index ee9960c1f398..feb0c90891d8 100644
--- a/net-misc/clockspeed/ChangeLog
+++ b/net-misc/clockspeed/ChangeLog
@@ -1,11 +1,58 @@
 # ChangeLog for net-misc/clockspeed
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+  01 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  clockspeed-0.62-r3.ebuild:
+  Add ~mips for my mips32 hardware.
+
+  27 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  clockspeed-0.62-r3.ebuild:
+  Fixed missing INSTALL, thanks to Yassen Damyanov
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  clockspeed-0.62-r3.ebuild:
+  Keyworded -sparc, uses hires timer methods not present for us, also bug #63346
+
+  08 Sep 2004; <blubb@gentoo.org> clockspeed-0.62-r3.ebuild:
+  added ~amd64 keyword
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org> clockspeed-0.62-r3.ebuild:
+  added selinux policy to rdepend
+
+*clockspeed-0.62-r3 (11 Dec 2003)
+
+  11 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix state file install locations #34708.
+
+*clockspeed-0.62-r2 (09 Jan 2003)
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Inherit eutils to use epatch instead, and also changed sed expression
+  delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  09 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a patch to support static in USE #12978
 
 *clockspeed-0.62-r1 (1 Feb 2002)
+ 
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> clockspeed-0.62-r1.ebuild :
+  Added ppc to KEYWORDS.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> clockspeed-0.62-r1.ebuild
+  Added KEYWORDS, LICENSE, SLOT.
+
+  21 Jun 2002; Thilo Bangert <bangert@gentoo.org> :  
+  minor bugfix - make sure ntpclockset is installed correctly
+
+  16 Apr 2002; Thilo Bangert <bangert@gentoo.org> clockspeed-0.62-r1.ebuild :
+  - Added INSTALL to dodoc
+  - Major code cleanup
+  - Added notice about ntpclockset at the end of install
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  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-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
index e69de29bb2d1..97a8c8a46751 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -0,0 +1,5 @@
+MD5 7fb088e9eb72607a826d4f9b2a57e2ce ChangeLog 2316
+MD5 e9d4493e81f1c804b3577ad804bb78fb clockspeed-0.62-r3.ebuild 1102
+MD5 bd5f134502d1578af69ff3dc01cd0591 files/digest-clockspeed-0.62-r3 66
+MD5 26a8d476ec6b18688879f86d442a0ced files/ntpclockset 1165
+MD5 985d529011edd94342583ca3a5e0fc09 files/clockspeed-0.62-gentoo.patch 6605
diff --git a/net-misc/clockspeed/clockspeed-0.62-r3.ebuild b/net-misc/clockspeed/clockspeed-0.62-r3.ebuild
index 47e4f94c529a..81d7a0658066 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r3.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r3.ebuild,v 1.1 2003/12/12 00:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r3.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A simple Network Time Protocol (NTP) client"
 HOMEPAGE="http://cr.yp.to/clockspeed.html"
@@ -10,30 +10,27 @@ SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="static"
+KEYWORDS="~amd64 ~mips x86"
+IUSE="static selinux"
 
 DEPEND="sys-apps/groff"
+RDEPEND=" selinux? ( sec-policy/selinux-clockspeed )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo.patch
-	sed -i "s:@CFLAGS@:${CFLAGS}:" conf-cc
-	use static && LDFLAGS="${LDFLAGS} -static"
-	sed -i "s:@LDFLAGS@:${LDFLAGS}:" conf-ld
-}
-
-src_compile() {
-	emake || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 }
 
 src_install() {
-	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
-	dosbin ${FILESDIR}/ntpclockset
+	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd || die "dobin"
+	dosbin "${FILESDIR}"/ntpclockset || die "dosbin"
 
 	doman clockspeed.1 clockadd.1 clockview.1 sntpclock.1 taiclock.1 taiclockd.1
-	dodoc BLURB CHANGES README THANKS TODO
+	dodoc BLURB CHANGES INSTALL README THANKS TODO
 
 	insinto /var/lib/clockspeed
 	doins leapsecs.dat
diff --git a/net-misc/clockspeed/files/ntpclockset b/net-misc/clockspeed/files/ntpclockset
index 6657da712b33..4f6e89fcc3c0 100644
--- a/net-misc/clockspeed/files/ntpclockset
+++ b/net-misc/clockspeed/files/ntpclockset
@@ -1,31 +1,56 @@
 #!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/files/ntpclockset,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
-if [ -z "${1}" ]
-then
-    NTPSERVER=132.163.135.130
-else
-    NTPSERVER="${1}"
-fi
+# Updates by Sascha Silbe
+
+usage() {
+	cat << EOF
+Usage: ntpclockset [options] <NTP server>
+Example: ntpclockset -q 192.168.0.1
+
+Options:
+	--quiet (-q)	be quiet (only show errors)
+	--help  (-h)	show this text and exit
+EOF
+	exit 1
+}
+
+quiet=0
+NTPSERVER="pool.ntp.org"
 
-#display how much your clock is off by
-sntpclock $NTPSERVER > /tmp/sntpclock
+for curArg in "$@" ; do
+	case "${curArg}" in
+	-q|--quiet) quiet=1;;
+	-h|--help) 	usage;;
+	-*)			echo "Invalid option '${curArg}'"
+				usage;;
+	*)			NTPSERVER="${curArg}";;
+	esac
+done
 
-if [ "${?}" != "0" ]
-then
-    echo ">>> Could not contact NTP server: $NTPSERVER" >&2
-    exit 1
+tmpfile="`mktemp`"
+# display how much your clock is off by
+if ! sntpclock $NTPSERVER > ${tmpfile} ; then
+	echo "!!! Could not contact NTP server: $NTPSERVER" >&2
+	exit 2
 fi
 
-echo ">>> Current clock sync:"
-cat /tmp/sntpclock | clockview
-echo
-echo -n ">>> Now setting clock..."
-cat /tmp/sntpclock | clockadd
-echo " done."
-#wite data to the hardware clock so it survives a reboot
-echo -n ">>> Writing time to hardware clock..."
-hwclock --systohc
-echo " done."
-echo
-echo ">>> New clock sync:"
-sntpclock $NTPSERVER | clockview
+if [ ${quiet} -eq 0 ] ; then
+	echo ">>> Current clock sync:"
+	cat ${tmpfile} | clockview
+	echo
+	echo -n ">>> Now setting clock ..."
+fi
+cat ${tmpfile} | clockadd
+if [ ${quiet} -eq 0 ] ; then
+	echo "   [ok]"
+	echo -n ">>> Writing time to hardware clock ..."
+fi
+/sbin/hwclock --systohc
+if [ ${quiet} -eq 0 ] ; then
+	echo "   [ok]"
+	echo
+	echo ">>> New clock sync:"
+	sntpclock $NTPSERVER | clockview
+fi
+rm -f ${tmpfile}
diff --git a/net-misc/connect/ChangeLog b/net-misc/connect/ChangeLog
index 81f86fcc1edf..108b532d58c3 100644
--- a/net-misc/connect/ChangeLog
+++ b/net-misc/connect/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/connect
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connect/ChangeLog,v 1.1 2005/09/19 18:02:42 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connect/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 *connect-1.95 (19 Sep 2005)
 
diff --git a/net-misc/connect/Manifest b/net-misc/connect/Manifest
index 3387ac7e7b4d..fa107dc4afe6 100644
--- a/net-misc/connect/Manifest
+++ b/net-misc/connect/Manifest
@@ -1,4 +1,4 @@
 MD5 38b80aafb495695853b80786f9ccc976 metadata.xml 492
-MD5 40dd67775587964e3021a435156553d2 connect-1.95.ebuild 751
-MD5 efec3370a5c25d860a50211c253720af ChangeLog 256
+MD5 722d9f0f44b86e7402fb2ca3bacba87f connect-1.95.ebuild 753
+MD5 793a6555848cd2cb8c189d3174722759 ChangeLog 346
 MD5 4996e5d08218c9ed01d4e5b27f30a35e files/digest-connect-1.95 64
diff --git a/net-misc/connect/connect-1.95.ebuild b/net-misc/connect/connect-1.95.ebuild
index 7a4b1c1aef00..3a67fae74b82 100644
--- a/net-misc/connect/connect-1.95.ebuild
+++ b/net-misc/connect/connect-1.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/connect/connect-1.95.ebuild,v 1.1 2005/09/19 18:02:42 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/connect/connect-1.95.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 DESCRIPTION="network connection relaying command"
 HOMEPAGE="http://zippo.taiyo.co.jp/~gotoh/ssh/connect.html"
diff --git a/net-misc/corkscrew/ChangeLog b/net-misc/corkscrew/ChangeLog
index 222f4ee3747f..f34e978a10c7 100644
--- a/net-misc/corkscrew/ChangeLog
+++ b/net-misc/corkscrew/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/corkscrew
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/ChangeLog,v 1.1 2004/09/01 11:01:48 klieber Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
+
+  17 Feb 2005; Jason Wever <weeve@gentoo.org> corkscrew-2.0.ebuild:
+  Added ~sparc keyword.
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> corkscrew-2.0.ebuild:
+  Added to ~ppc.
 
 *corkscrew-2.0 (01 Sep 2004)
 
diff --git a/net-misc/corkscrew/Manifest b/net-misc/corkscrew/Manifest
index 991e48d83e94..85aaf83ed2ea 100644
--- a/net-misc/corkscrew/Manifest
+++ b/net-misc/corkscrew/Manifest
@@ -1,2 +1,4 @@
-MD5 1f449763b73e0c75bfb615ff22063b45 corkscrew-2.0.ebuild 440
+MD5 c133f5810571eb105b87e928ce1331dd ChangeLog 526
+MD5 1a6ce8fdadeeb7126d0657725253ffb7 corkscrew-2.0.ebuild 560
+MD5 12295cb4bdc7f2abb1edbd2269071ef0 metadata.xml 346
 MD5 f331c3776d1be067d47223c196e75d6e files/digest-corkscrew-2.0 64
diff --git a/net-misc/corkscrew/corkscrew-2.0.ebuild b/net-misc/corkscrew/corkscrew-2.0.ebuild
index ba4e51db57b1..21d433db007b 100644
--- a/net-misc/corkscrew/corkscrew-2.0.ebuild
+++ b/net-misc/corkscrew/corkscrew-2.0.ebuild
@@ -1,32 +1,21 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/corkscrew-2.0.ebuild,v 1.1 2002/10/21 16:31:06 mjc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/corkscrew/corkscrew-2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
-# comprehensive list of any and all USE flags leveraged in the build, 
-# with the exception of any ARCH specific flags, i.e. ppc sparc sparc64
-# x86 alpha - this is a required variable
+DESCRIPTION="Corkscrew is a tool for tunneling SSH through HTTP proxies."
+HOMEPAGE="http://www.agroman.net/corkscrew/"
+LICENSE="GPL-2"
+DEPEND=""
+KEYWORDS="~x86 ~ppc ~sparc"
 IUSE=""
-DESCRIPTION="Cantus is an easy to use tool for tagging and renaming MP3 and OGG/Vorbis files. It has many features including mass tagging and renaming of MP3s, the ability to generate a tag out of the filename, filter definitions for renaming, recursive actions, CDDB (Freedb) lookup (no CD needed), copy between ID3V1 and ID3V2 tags, and a lot more."
-HOMEPAGE="http://www.agroman.net/corkscrew"
-SRC_URI="http://www.agroman.net/corkscrew/${P}.tar.gz"
-LICENSE="gpl"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND="net-misc/openssh"
-RDEPEND="$DEPEND"
-S="${WORKDIR}/${P}"
+SRC_URI="http://www.agroman.net/corkscrew/${P}.tar.gz"
 
 src_compile() {
-	cd ${S}	
-	econf || die "configure failed"
-	make || die "make failed"
+	econf
+	emake || die
 }
 
-src_install() {
-	einstall || die "Install failed"
-	dodoc README
-	dodoc INSTALL
-	dodoc COPYING
-	dodoc AUTHORS
-	dodoc ChangeLog
+src_install () {
+	make DESTDIR=${D} install || die
 }
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 81141cb92540..e1111a9f5ea0 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,199 @@
-# ChangeLog for net-ftp/curl
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.1 2004/03/29 00:30:33 vapier Exp $
+# ChangeLog for net-misc/curl
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
+
+  20 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/curl-7.15.0-versionnumber.patch, curl-7.15.0.ebuild:
+  fix for curl-config --vernum - bug #112759 thanks to Tupone Alfredo
+
+  22 Oct 2005; Fabian Groffen <grobian@gentoo.org> curl-7.15.0.ebuild:
+  Marked ~ppc-macos (bug #109097)
+
+  22 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> curl-7.15.0.ebuild:
+  Stable on mips for bug #109097.
+
+  21 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> curl-7.15.0.ebuild:
+  ~ia64 keyword.
+
+  20 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> curl-7.15.0.ebuild:
+  Added ~mips.
+
+  20 Oct 2005; Luis Medinas <metalgod@gentoo.org> curl-7.15.0.ebuild:
+  Marked Stable on amd64. Bug #109097.
+
+  19 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org> curl-7.15.0.ebuild:
+  Stable on alpha wrt security bug #109097
+
+  19 Oct 2005; Daniel Black <dragonheart@gentoo.org> curl-7.15.0.ebuild:
+  removed dual KEYWORD line
+
+  19 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> curl-7.15.0.ebuild:
+  Stable on sparc wrt #109097
+
+  19 Oct 2005; Brent Baude <ranger@gentoo.org> curl-7.15.0.ebuild:
+  Marking curl-7.15.0 ppc64 stable for bug 109097
+
+  19 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> curl-7.15.0.ebuild:
+  Moved all keywords which are missing on c-ares to a new line. Stable on hppa.
+  Thanks to KillerFox for testing.
+
+  19 Oct 2005; Andrej Kacian <ticho@gentoo.org> curl-7.15.0.ebuild:
+  Stable on x86, security bug #109097.
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> curl-7.15.0.ebuild:
+  libcurl.pc installed as per bug #104110 by Christoph Gysin
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/curl-7.10.8-transfer-segv.patch, -files/7.12.0-no-fputc.patch,
+  -files/curl-7.10.5-badssl.patch, -curl-7.14.0.ebuild, curl-7.15.0.ebuild:
+  more cleanups. old ebuild/patches removed
+
+*curl-7.15.0 (15 Oct 2005)
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> +curl-7.15.0.ebuild:
+  version bump - security bug #109097
+
+  27 Aug 2005; Karol Wojtaszek <sekretarz@gentoo.org> curl-7.14.0.ebuild:
+  Added libidn support, thanks Marcin Kryczek <aye@gentoo.pl> in bug #103745
+
+  17 Aug 2005; Malcolm Lashley <malc@gentoo.org> curl-7.13.2.ebuild:
+  Stable on amd64
+
+  05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> curl-7.13.2.ebuild:
+  Stable on hppa.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> curl-7.13.2.ebuild:
+  Stable on alpha.
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> curl-7.13.2.ebuild:
+  Marked ppc stable.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> curl-7.13.2.ebuild:
+  Stable on ppc64
+
+  25 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> curl-7.14.0.ebuild:
+  Added ~s390 as of BUG #95052.
+
+  25 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> curl-7.13.2.ebuild:
+  Stable on sparc
+
+*curl-7.14.0 (25 Jun 2005)
+
+  25 Jun 2005; Alastair Tse <liquidx@gentoo.org> -curl-7.10.8-r1.ebuild,
+  -curl-7.11.0.ebuild, -curl-7.11.1.ebuild, -curl-7.12.0-r2.ebuild,
+  -curl-7.12.3.ebuild, curl-7.13.1.ebuild, curl-7.13.2.ebuild,
+  +curl-7.14.0.ebuild:
+  version bump. added gnutls support (#95052)
+
+  14 May 2005; Bryan Østergaard <kloeri@gentoo.org> curl-7.13.1.ebuild:
+  Stable on ia64.
+
+*curl-7.13.2 (27 Apr 2005)
+
+  27 Apr 2005; Alastair Tse <liquidx@gentoo.org> +curl-7.13.2.ebuild:
+  version bump. added c-ares support. added old library if we detect it on
+  compile, which stops broken dependencies on major lib upgrades from 7.11.x
+  to 7.12.x.
+
+  23 Apr 2005; Kito <kito@gentoo.org> curl-7.13.1.ebuild:
+  ~ppc-macos keyword
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> curl-7.13.1.ebuild:
+  Add ~ia64 keyword.
+
+  16 Mar 2005; Alastair Tse <liquidx@gentoo.org> curl-7.13.1.ebuild:
+  disabling src_test (#85403)
+
+  13 Mar 2005; Hardave Riar <hardave@gentoo.org> curl-7.13.1.ebuild:
+  Stable on mips, bug #82534.
+
+  12 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> curl-7.13.1.ebuild:
+  Stable on alpha, bug 82534.
+
+  10 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> curl-7.13.1.ebuild:
+  Stable on sparc wrt #82534
+
+  10 Mar 2005; Markus Rothe <corsair@gentoo.org> curl-7.13.1.ebuild:
+  Stable on ppc64; bug #82534
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> curl-7.13.1.ebuild:
+  stable on amd64 wrt to #82534
+
+  09 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> curl-7.13.1.ebuild:
+  Stable on ppc.
+
+*curl-7.13.1 (08 Mar 2005)
+
+  08 Mar 2005; Alastair Tse <liquidx@gentoo.org> +curl-7.13.1.ebuild:
+  version bump
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> curl-7.12.0-r2.ebuild:
+  Stable on ppc.
+
+  12 Jan 2005; Guy Martin <gmsoft@gentoo.org> curl-7.12.0-r2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> curl-7.12.0-r2.ebuild:
+  Stable on amd64.
+
+  03 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> curl-7.12.0-r2.ebuild:
+  Stable on sparc
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> curl-7.12.0-r2.ebuild:
+  Stable on alpha.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> curl-7.11.1.ebuild:
+  Stable on amd64.
+
+  29 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  curl-7.12.0-r2.ebuild:
+  get_libdir love.
+
+  01 Sep 2004; Mike Frysinger <vapier@gentoo.org> curl-7.12.0-r2.ebuild:
+  Dont define the fputc() prototype since the header files from our libc do it
+  for us (triggers build failure on uclibc).
+
+*curl-7.12.0-r2 (28 Jul 2004)
+
+  28 Jul 2004; Alastair Tse <liquidx@gentoo.org> curl-7.12.0-r1.ebuild,
+  +curl-7.12.0-r2.ebuild:
+  third time lucky. this time i have the symlinks properly fixed. sorry :(
+
+*curl-7.12.0-r1 (27 Jul 2004)
+
+  27 Jul 2004; Alastair Tse <liquidx@gentoo.org> +curl-7.12.0-r1.ebuild:
+  fix stupid symlink mistake by me. add comment about bumping pycurl
+
+*curl-7.12.0 (25 Jul 2004)
+
+  25 Jul 2004; Alastair Tse <liquidx@gentoo.org> curl-7.12.0.ebuild:
+  added backward compat symlink to curl 7.12 (#58317)
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> curl-7.11.1.ebuild:
+  Stable on alpha.
+
+  14 May 2004; Stephen P. Becker <geoman@gentoo.org> curl-7.11.0.ebuild:
+  Stable on mips.
+
+  13 May 2004; Michael McCabe <randy@gentoo.org> curl-7.11.1.ebuild:
+  Added s390 keywords
+
+  29 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> curl-7.11.0.ebuild:
+  Stable on sparc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> curl-7.10.5-r1.ebuild,
+  curl-7.10.8-r1.ebuild:
+  Add inherit eutils
+
+*curl-7.11.1 (26 Apr 2004)
+
+  26 Apr 2004; Alastair Tse <liquidx@gentoo.org> curl-7.11.0.ebuild,
+  +curl-7.11.1.ebuild:
+  version bump (#48792). added --enable-manual and --enable-largefile for
+  safety, even those both are enabled by default.
 
   30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> curl-7.11.0.ebuild:
   Stable on hppa.
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index a1516ba1d8ee..43cf00b17a3a 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,12 +1,19 @@
-MD5 4f871c5c96c8e34bcb33dd4f249f51e3 curl-7.10.5-r1.ebuild 1047
-MD5 96e8e87a6bf74b28ae45ba1c2478d393 curl-7.10.7.ebuild 981
-MD5 d995a24d1db38d144f2ff1b78b646076 curl-7.10.8-r1.ebuild 1077
-MD5 772dd0435e447832e7bd46255ad82d39 curl-7.11.0.ebuild 984
-MD5 7dc06829718d09d5b957edbdd0ba36af ChangeLog 4916
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9e6527c50d25641df7f79d5b925720a2 ChangeLog 11548
+MD5 79b7fd0dcd4776ca1851d30a45275e78 curl-7.13.1.ebuild 1140
+MD5 c6b9b093ceb98fd1efbc9ca3700888ec curl-7.13.2.ebuild 2392
+MD5 89d2021f8afb5ff760a8ff36d99a8c39 curl-7.15.0.ebuild 2484
+MD5 3f45a8aa13637f8147adfe79b8cd522b files/curl-7.15.0-versionnumber.patch 550
+MD5 159b437588320b2a3f726d3aa55890e5 files/digest-curl-7.13.1 65
+MD5 71c346cc704727e0bdaef7333521adeb files/digest-curl-7.13.2 130
+MD5 7bcded56c13b85b72508c00b8d3d7e73 files/digest-curl-7.15.0 65
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 046f849780318802575c450ed113fc9f files/digest-curl-7.10.5-r1 64
-MD5 4bc4b19a5cd9b1bb8be92330189dbecb files/digest-curl-7.10.8-r1 65
-MD5 93b049be221be3a9ce4a61ebd645c6ef files/digest-curl-7.10.7 64
-MD5 3d8968398ac9406fdf47efe23004dcdc files/digest-curl-7.11.0 65
-MD5 e2795c792b9a04fd73ca556ce257f39f files/curl-7.10.5-badssl.patch 343
-MD5 05e37478314d224f2ce5840f2e1f31c9 files/curl-7.10.8-transfer-segv.patch 744
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDf8cpmdTrptrqvGERAmW1AJ9irLMjfTOolCyZxDHv0tjJHRRwVACfW7vV
+sEeNfU23z7n6cklK6Mj/okc=
+=VpYF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.13.1.ebuild b/net-misc/curl/curl-7.13.1.ebuild
index 4c2f5c8d9cdf..2c4c9a2070be 100644
--- a/net-misc/curl/curl-7.13.1.ebuild
+++ b/net-misc/curl/curl-7.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.13.1.ebuild,v 1.1 2005/03/08 13:24:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.13.1.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -12,19 +12,17 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT X11"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sparc x86"
 IUSE="ssl ipv6 ldap"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
 	ldap? ( net-nds/openldap )"
 
-RESTRICT="maketest"
-
 src_compile() {
 	econf \
-		`use_enable ipv6` \
-		`use_enable ldap` \
-		`use_with ssl` \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_with ssl) \
 		--enable-http \
 		--enable-ftp \
 		--enable-gopher \
@@ -37,11 +35,13 @@ src_compile() {
 		|| die
 	emake || die
 }
+src_test() {
+	return
+}
 
 src_install() {
 	make install DESTDIR="${D}" || die
-	dodoc LEGAL CHANGES README
+	dodoc CHANGES README
 	dodoc docs/FEATURES docs/INSTALL docs/INTERNALS docs/LIBCURL
 	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
-
 }
diff --git a/net-misc/curl/curl-7.13.2.ebuild b/net-misc/curl/curl-7.13.2.ebuild
index 09200def544a..31cd4d2f9fde 100644
--- a/net-misc/curl/curl-7.13.2.ebuild
+++ b/net-misc/curl/curl-7.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.13.2.ebuild,v 1.1 2005/04/27 14:45:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.13.2.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -20,7 +20,7 @@ http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT X11"
 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="ssl ipv6 ldap ares"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6a )
@@ -35,6 +35,11 @@ _curl_has_old_ver() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epunt_cxx
+}
+
 src_compile() {
 
 	myconf="$(use_enable ldap)
diff --git a/net-misc/curl/curl-7.15.0.ebuild b/net-misc/curl/curl-7.15.0.ebuild
index cb791fb4fcae..71a8362217bd 100644
--- a/net-misc/curl/curl-7.15.0.ebuild
+++ b/net-misc/curl/curl-7.15.0.ebuild
@@ -1,26 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.0.ebuild,v 1.1 2005/10/15 12:10:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.15.0.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
 inherit eutils
 
-# NOTE: To prevent breakages when upgrading, we compile all the prev
-#       versions we know. We can't slot them because only the libraries
-#       have versioning, all the binaries, manpages don't have versions. 
-
-OLD_PV=7.11.2
-OLD_PV_LIB=libcurl.so.2
-
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${PN}-${OLD_PV}.tar.bz2
-		http://curl.haxx.se/download/${P}.tar.bz2"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT X11"
 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"
+# Original keywords (net-dns/c-ares needs to be keyworded!)
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc-macos ~ppc64 ~s390 sparc x86"
 IUSE="ssl ipv6 ldap ares gnutls idn kerberos krb4 test"
 
 RDEPEND="gnutls? ( net-libs/gnutls )
@@ -33,21 +27,14 @@ RDEPEND="gnutls? ( net-libs/gnutls )
 
 DEPEND="${RDEPEND}
 	test? (
-		net-misc/stunnel
 		sys-apps/diffutils
 		dev-lang/perl
 	)"
-
-_curl_has_old_ver() {
-	if test -s ${ROOT}/usr/$(get_libdir)/${OLD_PV_LIB}; then
-		return 0 # /bin/true
-	else
-		return 1
-	fi
-}
+# used - but can do without in self test: net-misc/stunnel
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-versionnumber.patch
 	epunt_cxx
 }
 
@@ -55,7 +42,6 @@ src_compile() {
 
 	myconf="$(use_enable ldap)
 		$(use_with idn libidn)
-		$(use_with krb4)
 		$(use_enable kerberos gssapi)
 		$(use_enable ipv6)
 		--enable-http
@@ -70,7 +56,6 @@ src_compile() {
 
 	if use ipv6 && use ares; then
 		ewarn "c-ares support disabled because it is incompatible with ipv6."
-		ewarn "To enable ares support, emerge with USE='-ipv6'."
 		myconf="${myconf} --disable-ares"
 	else
 		myconf="${myconf} $(use_enable ares)"
@@ -91,30 +76,19 @@ src_compile() {
 		myconf="${myconf} --without-gnutls --without-ssl"
 	fi
 
-	if _curl_has_old_ver; then
-		einfo "Detected old version of curl - installing compat libs"
-		cd ${WORKDIR}/${PN}-${OLD_PV}
-		econf ${myconf}
-		emake || die "make for old version failed"
-	fi
-
-	cd ${S}
-	econf ${myconf}
+	econf ${myconf} || die 'configure failed'
 	emake || die "install failed for current version"
 }
 
 src_install() {
-	if _curl_has_old_ver; then
-		cd ${WORKDIR}/${PN}-${OLD_PV}/lib
-		make DESTDIR=${D} install-libLTLIBRARIES || die "install failed for old version"
-	fi
-
-	cd ${S}
 	make DESTDIR="${D}" install || die "installed failed for current version"
 
 	insinto /usr/share/aclocal
 	doins docs/libcurl/libcurl.m4
 
+	insinto /usr/lib/pkgconfig
+	doins libcurl.pc
+
 	dodoc CHANGES README
 	dodoc docs/FEATURES docs/INTERNALS docs/LIBCURL
 	dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
diff --git a/net-misc/curl/files/digest-curl-7.15.0 b/net-misc/curl/files/digest-curl-7.15.0
index 1b244772c1e4..711cdc3ee81c 100644
--- a/net-misc/curl/files/digest-curl-7.15.0
+++ b/net-misc/curl/files/digest-curl-7.15.0
@@ -1,2 +1 @@
-MD5 542fbdafd2fb051477fa544770b566de curl-7.11.2.tar.bz2 1141204
 MD5 e3b130320d3704af375c097606f49c01 curl-7.15.0.tar.bz2 1426714
diff --git a/net-misc/d4x/ChangeLog b/net-misc/d4x/ChangeLog
index e918f86fbe18..1667e8aa3ab8 100644
--- a/net-misc/d4x/ChangeLog
+++ b/net-misc/d4x/ChangeLog
@@ -1,8 +1,176 @@
 # ChangeLog for net-misc/d4x
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.1 2002/08/31 22:59:34 blizzy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/ChangeLog,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
-*d4x-2.03 (01 Sep 2002)
+  31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> -d4x-2.5.1.ebuild:
+  Removed old 2.5.1.
 
-  01 Sep 2002; Maik Schreiber <blizzy@gentoo.org> : Initial import.
-  ebuild submitted by Christopher Sharp <csharp@freeshell.org>
+*d4x-2.5.6 (31 Oct 2005)
+
+  31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> +d4x-2.5.6.ebuild:
+  Version bump.
+
+  27 Sep 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/d4x-2.5.5-stdint.patch, d4x-2.5.5.ebuild:
+  Fix bug 107297.
+
+*d4x-2.5.5 (25 Sep 2005)
+
+  25 Sep 2005; Krzysiek Pawlik <nelchael@gentoo.org> +d4x-2.5.5.ebuild:
+  New version: 2.5.5.
+
+  20 Aug 2005; Jonathan Smith <smithj@gentoo.org> d4x-2.5.1.ebuild:
+  #103058: fixed dependency problem
+
+  20 Aug 2005; Jonathan Smith <smithj@gentoo.org> -d4x-2.03.ebuild,
+  -d4x-2.5.0_rc2.ebuild, -d4x-2.5.0_rc4.ebuild, -d4x-2.5.0.ebuild,
+  d4x-2.5.0-r1.ebuild:
+  2.5.0-r1 stable on x86, old ebuild cleanout
+
+  18 Aug 2005; Jonathan Smith <smithj@gentoo.org> d4x-2.5.1.ebuild:
+  #103008: ebuild path fix
+
+*d4x-2.5.1 (18 Aug 2005)
+
+  18 Aug 2005; Jonathan Smith <smithj@gentoo.org> +d4x-2.5.1.ebuild:
+  #102235: version bump
+
+  18 Aug 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml:
+  maintainer update (again)
+
+*d4x-2.5.0-r1 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/d4x-2.5.0-fix-compile-gtk26.patch, +d4x-2.5.0-r1.ebuild:
+  Add gtk-2.6 compat patch. thanks to Fyodor Kupchick and Felix Riemann
+  (#79204)
+
+  13 Jan 2005; Alastair Tse <liquidx@gentoo.org> d4x-2.5.0.ebuild:
+  add flags to enable downloads of greater than 2G (#73784)
+
+*d4x-2.5.0 (05 Dec 2004)
+
+  05 Dec 2004; Markus Nigbur <pyrania@gentoo.org> +d4x-2.5.0.ebuild:
+  Version bump.
+
+  05 Oct 2004; Malcolm Lashley <malc@gentoo.org> d4x-2.5.0_rc4.ebuild:
+  ~amd64 - bug #66462
+
+  03 Jul 2004; <pyrania@gentoo.org> d4x-2.5.0_rc4.ebuild:
+  Marked stable.
+
+  16 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/d4x-2.5.0_rc4-fix-cast.patch, d4x-2.5.0_rc4.ebuild:
+  Fix missing cast that is fatal with newer gcc.
+
+*d4x-2.5.0_rc4 (04 Feb 2004)
+
+  15 Jun 2004; Alastair Tse <liquidx@gentoo.org> :
+  version bump, fixes industrial crash bug (#35865), should work on gtk2.4
+
+  11 Jun 2004; Aron Griffis <agriffis@gentoo.org> d4x-2.03.ebuild,
+  d4x-2.4.1-r1.ebuild, d4x-2.5.0_rc2.ebuild:
+  Fix use invocation
+
+  29 Apr 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/d4x-2.5.0_rc2-gtk24.patch, d4x-2.5.0_rc2.ebuild:
+  add patch for gtk2.4 compatibility (#47984)
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> d4x-2.4.1-r1.ebuild:
+  Add die following econf for bug 48950
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> d4x-2.5.0_rc2.ebuild:
+  Marked stable.
+
+  04 Apr 2004; Jason Wever <weeve@gentoo.org> d4x-2.4.1-r1.ebuild:
+  Marked stable on sparc.
+
+  28 Mar 2004; Jason Wever <weeve@gentoo.org> d4x-2.4.1-r1.ebuild,
+  files/d4x-sndserv-bigendian.patch:
+  Added big endian patch and ~sparc keyword to 2.4.1-r1.
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1-r1.ebuild:
+  workaround deprecated gtk_ calls in 2.4.1 (#32202)
+
+*d4x-2.5.0_rc2 (04 Feb 2004)
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild,
+  d4x-2.5.0_beta2.ebuild, d4x-2.5.0_rc2.ebuild, metadata.xml:
+  version bump and cleanup (#37018)
+
+*d4x-2.5.0_beta2 (31 Aug 2003)
+
+  31 Aug 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.5.0_beta2.ebuild :
+  version bump. fixed some old compile probs (#24504). thanks to Nicolas Kaiser
+  <nikai@nikai.net>
+
+*d4x-2.4.1-r1 (30 Mar 2003)
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> d4x-2.4.1-r1.ebuild :
+  Fix a miscompile for me with gcc-3.2.2 and CFLAGS="-O2".  Fix indentation
+  of KDE menu stuff.
+
+*d4x-2.4.1 (08 Mar 2003)
+
+  09 Mar 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild :
+  Installs KDE menu entry. Cleaned deps.
+
+  08 Mar 2003; Alastair Tse <liquidx@gentoo.org> d4x-2.4.1.ebuild :
+  Version Bump. Marked as unstable. Fixes #17023.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nt-2.4_beta (19 Oct 2002)
+
+  19 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add beta to portage.
+
+  1 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Move the whole shebang to net-misc/d4x, as it seems not all know
+  that it was named nt (cannot expect it really), and I think our
+  current nt-2.03 ebuild is much more complete than the newly added
+  one.
+
+*d4x-2.03 (1 Sep 2002)
+
+  1 Sep 2002; Martin Schlemmer <azarah@gentoo.org> nt-2.03.ebuild :
+  New version.
+
+*nt-2.0.2 (23 Jul 2002)
+
+  18 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> nt-2.02.ebuild :
+  New version that should fix GCC 3.1 compile problems. Ebuild
+  submitted by Daniel Mettler <mettlerd@icu.unizh.ch>.
+
+*nt-2.01 (7 Jun 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> nt-2.01.ebuild :
+  Added KEYWORDS, LICENSE.
+
+  7 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Bump to latest version.
+
+*nt-2.0 (30 Apr 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> nt-2.0.ebuild :
+  Added KEYWORDS, LICENSE.
+
+  3 Jun 2002: Preston A. Elder <prez@gentoo.org> files/nt-2.0-gcc31.patch :
+  Added patch to make compile with gcc 3.1
+
+*nt-2.0_rc2 (28 Apr 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> nt-2.0_rc2.ebuild :
+  Added KEYWORDS, LICENSE.
+
+*nt-1.30 (1 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> nt-1.30.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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/net-misc/d4x/Manifest b/net-misc/d4x/Manifest
index e69de29bb2d1..daafb1f667a0 100644
--- a/net-misc/d4x/Manifest
+++ b/net-misc/d4x/Manifest
@@ -0,0 +1,16 @@
+MD5 a13546409a8e93b7fad5e2cb2b86ef0b ChangeLog 5820
+MD5 c1d99567166886bdb3e9f215fca712c0 d4x-2.4.1-r1.ebuild 1982
+MD5 1a5d0162ab11f8382fbf615f00a4ae24 d4x-2.5.0-r1.ebuild 1868
+MD5 d199408639e90aa9fa3679b7468ae35b d4x-2.5.5.ebuild 1862
+MD5 4e590ab8e27b84c91e45b86067629587 d4x-2.5.6.ebuild 1816
+MD5 07dde74dfe302bab95327f285a5a16ba files/d4x-2.4.1-fix-statusbar-crash.patch 772
+MD5 512e25cdcccd73401a82518c6e49ae8c files/d4x-2.5.0-fix-compile-gtk26.patch 2957
+MD5 5b49dbe10d588970e6f766cfdb310e67 files/d4x-2.5.0_rc2-gtk24.patch 279
+MD5 7025e0ce352893c55b23ffeea8f87d1c files/d4x-2.5.0_rc4-fix-cast.patch 317
+MD5 6d5c6288586182443c6dd1bb19ab86e8 files/d4x-2.5.5-stdint.patch 403
+MD5 a9d346bf4f3d64d906935b663747e434 files/d4x-sndserv-bigendian.patch 502
+MD5 3e8783cc051415a9ee4f756fcc45c925 files/digest-d4x-2.4.1-r1 62
+MD5 4f038da47df5648c8799469e62ec03b6 files/digest-d4x-2.5.0-r1 67
+MD5 dafd14e65c89813ec81820ab77ded45a files/digest-d4x-2.5.5 62
+MD5 b485d3a23665f8bb13ab2c645726f9b6 files/digest-d4x-2.5.6 62
+MD5 3f142d03f332a3f7047929a1b476c14f metadata.xml 301
diff --git a/net-misc/d4x/d4x-2.4.1-r1.ebuild b/net-misc/d4x/d4x-2.4.1-r1.ebuild
index c006a18ae797..47b1e3d206c6 100644
--- a/net-misc/d4x/d4x-2.4.1-r1.ebuild
+++ b/net-misc/d4x/d4x-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4.1-r1.ebuild,v 1.1 2003/03/30 17:46:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -11,13 +11,13 @@ DESCRIPTION="GTK based download manager for X."
 SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P/_}.tar.gz"
 HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="Artistic"
 
 DEPEND=">=x11-libs/gtk+-2.0.6
 	>=dev-libs/glib-2.0.6
-	>=sys-devel/gettext-0.11.2    
+	>=sys-devel/gettext-0.11.2
 	esd? ( >=media-sound/esound-0.2.7 )"
 
 src_unpack() {
@@ -33,27 +33,22 @@ src_unpack() {
 	# Fix a miscompile with gcc-3.2.2 and CFLAGS="-O2"
 	# <azarah@gentoo.org> (30 Mar 2003)
 	epatch ${FILESDIR}/${P}-fix-statusbar-crash.patch
+
+	# Fix bad #elif directives in sndserv.cc for big endian machines
+	# <weeve@gentoo.org> (28 Mar 2004)
+	use sparc && epatch ${FILESDIR}/${PN}-sndserv-bigendian.patch
 }
 
 src_compile() {
 
-	myconf=""
-	
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-	
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd"
-	
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
 	econf --enable-release \
-		${myconf} || die
-		
+		$(use_enable oss) \
+		$(use_enable esd) \
+		$(use_enable nls) || die "econf failed"
+
+	# workaround unsupported gtk_ calls for >=x11-libs/gtk+-2.2.4
+	sed -e 's:.*GTK_DISABLE_DEPRECATED.*::' -i ${S}/config.h
+
 	emake || die
 }
 
@@ -67,15 +62,15 @@ src_install () {
 	insinto /usr/share/pixmaps
 	doins share/*.png share/*.xpm
 
-	if [ -n "`use kde`" ]
+	if use kde
 	then
 		insinto /usr/share/applnk/Internet
 		newins share/nt.desktop d4x.desktop
 	fi
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
-        echo "Categories=Application;Network;" >> ${S}/share/nt.desktop
+		echo "Categories=Application;Network;" >> ${S}/share/nt.desktop
 		insinto /usr/share/applications
 		newins share/nt.desktop d4x.desktop
 	fi
@@ -84,4 +79,3 @@ src_install () {
 	dodoc AUTHORS COPYING ChangeLog* NEWS PLANS TODO \
 		DOC/{FAQ*,LICENSE,NAMES,README*,TROUBLES,THANKS}
 }
-
diff --git a/net-misc/d4x/d4x-2.5.0-r1.ebuild b/net-misc/d4x/d4x-2.5.0-r1.ebuild
index 2a2b375ee891..dc4cdd577d1a 100644
--- a/net-misc/d4x/d4x-2.5.0-r1.ebuild
+++ b/net-misc/d4x/d4x-2.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0-r1.ebuild,v 1.1 2005/06/24 14:00:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -11,7 +11,7 @@ DESCRIPTION="GTK based download manager for X."
 SRC_URI="http://www.krasu.ru/soft/chuchelo/files/${P}final.tar.gz"
 HOMEPAGE="http://www.krasu.ru/soft/chuchelo/"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 SLOT="0"
 LICENSE="Artistic"
 
diff --git a/net-misc/d4x/d4x-2.5.5.ebuild b/net-misc/d4x/d4x-2.5.5.ebuild
index efda24f7d85c..7ae69dff1684 100644
--- a/net-misc/d4x/d4x-2.5.5.ebuild
+++ b/net-misc/d4x/d4x-2.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/net-misc/d4x/d4x-2.5.5.ebuild,v 1.1 2005/09/25 22:26:15 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.5.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 IUSE="nls esd gnome oss kde"
 
@@ -28,6 +28,8 @@ src_unpack() {
 	cp configure configure.orig
 	sed -e "s:CXXFLAGS=\"-O2\":CXXFLAGS=\"${CXXFLAGS}\":g;s:OPTFLAGS=\"-O2\":OPTFLAGS=\"\":g" \
 		configure.orig >configure
+
+	epatch "${FILESDIR}/d4x-${PV}-stdint.patch"
 }
 
 src_compile() {
diff --git a/net-misc/d4x/d4x-2.5.6.ebuild b/net-misc/d4x/d4x-2.5.6.ebuild
index 6568c06bb722..7e5e7a70eab0 100644
--- a/net-misc/d4x/d4x-2.5.6.ebuild
+++ b/net-misc/d4x/d4x-2.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.6.ebuild,v 1.1 2005/10/31 15:00:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/d4x/d4x-2.5.6.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 IUSE="nls esd gnome oss kde"
 
diff --git a/net-misc/d4x/metadata.xml b/net-misc/d4x/metadata.xml
index 76b9f6f406d5..6f4a27a52180 100644
--- a/net-misc/d4x/metadata.xml
+++ b/net-misc/d4x/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>desktop-misc</herd>
+
+<!-- smithj says that liquidx isn't actively maintaining this anymore
 <maintainer><email>liquidx@gentoo.org</email></maintainer>
+
+-->
+
 </pkgmetadata>
diff --git a/net-misc/datapipe/ChangeLog b/net-misc/datapipe/ChangeLog
index c6203b1407b3..3339ea010055 100644
--- a/net-misc/datapipe/ChangeLog
+++ b/net-misc/datapipe/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/datapipe
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/datapipe/ChangeLog,v 1.1 2003/11/17 21:23:44 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/datapipe/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+  30 May 2005; Danny van Dyk <kugelfang@gentoo.org> datapipe-1.0.ebuild:
+  Fixed deprecated usage of gcc.eclass. (BUG #92745)
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> datapipe-1.0.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> datapipe-1.0.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
 
 *datapipe-1.0 (17 Nov 2003)
 
diff --git a/net-misc/datapipe/Manifest b/net-misc/datapipe/Manifest
index 5767bd6be1ab..69e9bd6e96f1 100644
--- a/net-misc/datapipe/Manifest
+++ b/net-misc/datapipe/Manifest
@@ -1,3 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cedd0312a322fdcda6bbd7b43c2d082f ChangeLog 716
+MD5 34bc8eaaffc9fa8be81acca5353c1404 datapipe-1.0.ebuild 711
 MD5 3f69b400f9989e1c1af8f8b59a510daa files/digest-datapipe-1.0 62
-MD5 8a9bb5c1fba1a90f82d638bba5fe1b93 ChangeLog 393
-MD5 5dd9b02be63f7824da1fdb63aeae0a8c datapipe-1.0.ebuild 694
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCm1/Q5mJXAu5GbtIRAgVSAJ41+Wf/GJOpeyNrwJn/8CNIBosTQQCdHMiF
+tdtChXN6enxim4QKzj7VjCI=
+=fPhJ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/datapipe/datapipe-1.0.ebuild b/net-misc/datapipe/datapipe-1.0.ebuild
index 2f467c662d58..2683c4024f3a 100644
--- a/net-misc/datapipe/datapipe-1.0.ebuild
+++ b/net-misc/datapipe/datapipe-1.0.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-misc/datapipe/datapipe-1.0.ebuild,v 1.1 2003/11/17 21:23:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/datapipe/datapipe-1.0.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
+IUSE=""
 DESCRIPTION="bind a local port and connect it to a remote socket"
 HOMEPAGE="http://http.distributed.net/pub/dcti/unsupported/"
 SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz http://http.distributed.net/pub/dcti/unsupported/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-	$(gcc-getCC) ${CFLAGS} -o datapipe datapipe.c
+	$(tc-getCC) ${CFLAGS} -o datapipe datapipe.c
 }
 
 src_install() {
diff --git a/net-misc/dcetest/ChangeLog b/net-misc/dcetest/ChangeLog
index 8611c54bc2af..414ba71b2a4b 100644
--- a/net-misc/dcetest/ChangeLog
+++ b/net-misc/dcetest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dcetest
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dcetest/ChangeLog,v 1.1 2003/12/02 02:53:08 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dcetest/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+  10 May 2005; David Holm <dholm@gentoo.org> dcetest-2.0.ebuild:
+  Added to ~ppc.
+
+  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> dcetest-2.0.ebuild:
+  cleanup update, stable on x86.
 
 *dcetest-2.0 (01 Dec 2003)
 
diff --git a/net-misc/dcetest/Manifest b/net-misc/dcetest/Manifest
index 497eec0aad6a..534d3b4ed5c3 100644
--- a/net-misc/dcetest/Manifest
+++ b/net-misc/dcetest/Manifest
@@ -1,3 +1,4 @@
-MD5 673a87f950b2b7876ff45d9d93961a04 dcetest-2.0.ebuild 751
+MD5 279a2452b0f269ed343678eac9b1491a ChangeLog 559
+MD5 1203b11fc28bf30267c8ff0cb9a48c2b dcetest-2.0.ebuild 868
 MD5 5c046bff4023d3cee12496e0821e498a metadata.xml 627
 MD5 edceb6041bb82334c3cd14c6de484ec2 files/digest-dcetest-2.0 56
diff --git a/net-misc/dcetest/dcetest-2.0.ebuild b/net-misc/dcetest/dcetest-2.0.ebuild
index 6ccb06b1383c..0d0d634fa197 100644
--- a/net-misc/dcetest/dcetest-2.0.ebuild
+++ b/net-misc/dcetest/dcetest-2.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dcetest/dcetest-2.0.ebuild,v 1.1 2003/12/02 02:53:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dcetest/dcetest-2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 DESCRIPTION="dcetest is a clone of the Windows rpcinfo"
 HOMEPAGE="http://www.atstake.com/research/tools/info_gathering/"
 SRC_URI="http://www.atstake.com/research/tools/info_gathering/dcetest.tar"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
-DEPEND="sys-apps/sed"
-RDEPEND=""
+DEPEND="sys-apps/sed virtual/libc"
+RDEPEND="virtual/libc"
 S=${WORKDIR}/${PN}
 
 src_unpack() {
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 4e737899d71a..e4f4924a46bf 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,257 @@
 # ChangeLog for net-misc/dhcp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
+
+*dhcp-3.0.3 (12 Oct 2005)
+
+  12 Oct 2005; Roy Marples <uberlord@gentoo.org> +files/dhcp-3.0.3-tr.patch,
+  +files/dhclient-ntp.patch, +dhcp-3.0.3.ebuild:
+  Version bump
+  Includes fixes for #102473 (tr.c not compiling, patch by Ed Catmur)
+  and dhclient ntp support #63868
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> dhcp-3.0.1-r1.ebuild:
+  Mark 3.0.1-r1 stable on alpha
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/dhcp-3.0.2-gmake.patch, dhcp-3.0.2.ebuild:
+  Added patch to fix wrong 'make' calls on Gentoo/FreeBSD.
+
+  04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> dhcp-3.0.2.ebuild:
+  Remove -Werror cflag that is passed when building on FreeBSD to fix
+  Gentoo/FreeBSD.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> dhcp-3.0.1-r1.ebuild:
+  Stable on ppc.
+
+  20 May 2005; Rene Nussbaumer <killerfox@gentoo.org> dhcp-3.0.1-r1.ebuild:
+  Stable on hppa
+
+  19 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0.1-r1.ebuild:
+  Stable on sparc
+
+  17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> dhcp-3.0.1-r1.ebuild:
+  stable on amd64
+
+*dhcp-3.0.2 (16 May 2005)
+
+  16 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/dhcp-3.0.1-fix-invalid-attribute.patch,
+  -files/dhcp-3.0+paranoia.patch, -files/dhcp-3.0pl2-fix-perms.patch,
+  dhcp-3.0.1.ebuild, dhcp-3.0.1-r1.ebuild, +dhcp-3.0.2.ebuild:
+  Version bump thanks to: Bjarke Istrup Pedersen <Bjarke.ip@tekpunkt.dk> in
+  bug #88630. Additionally, moved the patches to a tarball on the mirrors.
+  Configs will probably follow
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; <max@gentoo.org> files/dhcrelay.conf, files/dhcrelay.rc6:
+  Fix dhcrelay startup script for proper commandline arguments and proper
+  shutdown pidfile. Fixes bug #48207.
+
+*dhcp-3.0.1-r1 (20 Dec 2004)
+
+  20 Dec 2004; <max@gentoo.org> -files/conf.dhcpd, files/dhcp.conf,
+  files/dhcp.rc6, +dhcp-3.0.1-r1.ebuild:
+  Removed unused conf.dhcpd file. Move the -q option out of rc6 script into
+  conf.d file for easier debugging. Add localtime to the chroot setup. Add
+  commented LD_PRELOAD variable for proper name resoluting inside chroot. Fixes
+  bug #41217.
+
+  10 Nov 2004; Travis Tilley <lv@gentoo.org>
+  +files/dhcp-3.0.1-fix-invalid-attribute.patch, dhcp-3.0.1.ebuild:
+  fixed some invalid attributes in includes/dhcpd.h so that dhcp compiles
+  using gcc 3.4 again. closes bug 69555
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> dhcp-3.0.1.ebuild:
+  keywords ~amd64.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> dhcp-3.0.1.ebuild:
+  Keyword ~alpha, bug 65840.
+
+  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0.1.ebuild:
+  Stable on sparc
+
+*dhcp-3.0.1 (18 Jul 2004)
+
+  18 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/dhcp-3.0+paranoia.patch, +dhcp-3.0.1.ebuild, dhcp-3.0_p2-r5.ebuild,
+  dhcp-3.0_p2-r6.ebuild:
+  Version bump #57347 by Martin Jackson. Also move paranoia patch out of
+  $DISTDIR and into $FILESDIR.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> dhcp-3.0_p2-r4.ebuild,
+  dhcp-3.0_p2-r5.ebuild, dhcp-3.0_p2-r6.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> dhcp-3.0_p2-r4.ebuild:
+  Add inherit eutils
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org> dhcp-3.0_p2-r4.ebuild,
+  dhcp-3.0_p2-r5.ebuild, dhcp-3.0_p2-r6.ebuild:
+  added selinux policy to rdepend
+
+*dhcp-3.0_p2-r6 (08 Mar 2004)
+*dhcp-3.0_p2-r5 (08 Mar 2004)
+*dhcp-3.0_p2-r4 (08 Mar 2004)
+
+  08 Mar 2004; Seemant Kulleen <seemant@gentoo.org> dhcp-3.0_p2-r2.ebuild,
+  dhcp-3.0_p2-r3.ebuild, dhcp-3.0_p2-r4.ebuild, dhcp-3.0_p2-r5.ebuild,
+  dhcp-3.0_p2-r6.ebuild, dhcp-3.0_p2.ebuild:
+  Forced a version bump on these ebuilds. Basically -r0 is now -r4, -r2 is now
+  -r5 and -r3 is now -r6. The reason for the revision bump was to make this
+  package PROVIDE virtual/dhcp. Closes a long-standing bloat-reduction request
+  made on gentoo-dev mailing list by: William Hubbs <kc5eiv@kc5eiv.homeip.net>
+  at http://article.gmane.org/gmane.linux.gentoo.devel/11579
+
+  09 Mar 2004; Bartosch Pixa <darkspecter@gentoo.org> dhcp-3.0_p2-r2.ebuild:
+  set ppc in keywords
+
+  04 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> dhcp-3.0_p2-r3.ebuild:
+  stable on sparc
+
+  24 Feb 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild:
+  Bump to stable x86.
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild,
+  files/dhcp.rc6, files/dhcrelay.rc6:
+  Use proper pid file and directory. Fixes bug #35751.
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild,
+  files/dhcp.conf, files/dhcp.rc6, files/dhcrelay.conf, files/dhcrelay.rc6:
+  Add dhcrelay startup script. Contributed by Martin Jackson on bug #33895.
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild:
+  Readd the ebuild and chown patch to address bugs #27079 and #36869.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> dhcp-3.0_p2-r2.ebuild:
+  Marked stable on sparc.
+
+  31 Dec 2003; Guy Martin <gmsoft@gentoo.org> dhcp-3.0_p2-r2.ebuild:
+  Marked stable on hppa.
+
+  18 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild:
+  Some fixes from bug 31840.
+
+  07 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild,
+  files/dhcp-3.0pl2-fix-perms.patch:
+  Remove experimental version. The current stable works correctly.
+  Finally fixes bug 31840.
+
+*dhcp-3.0_p2-r3 (05 Nov 2003)
+
+  05 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r3.ebuild,
+  files/dhcp-3.0pl2-fix-perms.patch:
+  Experimental attempt to fix 31840.
+
+  05 Nov 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild,
+  files/dhcp.rc6:
+  Use a PID file for startup/shutdown.
+
+  24 Oct 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild:
+  Fix ownership as part of pkg_postinst(). Fixes bug 31840.
+
+  22 Oct 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r2.ebuild:
+  Use enewuser() from eutils.eclass.
+
+  21 Oct 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild,
+  dhcp-3.0_p2-r2.ebuild:
+  Bump latest to stable x86.
+
+*dhcp-3.0_p2-r2 (02 Oct 2003)
+
+  02 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to fix user options to dhclient #30049 and add USE=static
+  support #30026.
+
+  16 Sep 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild:
+  Set proper ownership on /var/lib/dhcp.
+
+  13 Aug 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild,
+  files/dhcp.rc6:
+  Move dhcpd.leases file creation to the startup script. Change "use named" to
+  "use dns". Other cleanups.
+
+  25 Jul 2003; lanius@gentoo.org files/dhcp.rc6, files/dhcp.rc7:
+  added "use named" to rc scripts (bug #25239)
+
+*dhcp-3.0_p2-r1 (23 Jul 2003)
+
+  23 Jul 2003; Max Kalika <max@gentoo.org> dhcp-3.0_p2-r1.ebuild,
+  files/dhcp.conf, files/dhcp.rc5, files/dhcp.rc6:
+  Add support for the dhcp-paranoia patch which allows to run the server
+  chrooted and under a different user/group id. Remove unused dhcp.rc5 file.
+  Create a new startup script and dub it dhcp.rc6 as that file isn't currently
+  used by anything. Other various cleanups.
+
+  17 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> dhcp-3.0_p2.ebuild :
+  Unmasked, security update.
+
+*dhcp-3.0_p2 (15 Jan 2003)
+
+  01 Mar 2003; Jason Wever <weeve@gentoo.org> dhcp-3.0_p2.ebuild:
+  Applied fix for bug #11960 to omit -O flags so dhcp will no longer bus error
+  on sbus sparcs.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcp-3.0_p2.ebuild :
+  Added testing mips keyword to the ebuild.
+
+  15 Jan 2003; Brandon Low <lostlogic@gentoo.org> dhcp-3.0_p2.ebuild:
+  Version update, and update the ebuild to automatically assign
+  it's source name.
+
+*dhcp-3.0_p1 (29 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcp-3.0_p1.ebuild :
+  Added testing mips keyword to the ebuild.
+
+  29 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: Renamed from 3.0-r4 to
+  reflect the version (3.0_pl1) of the sources being used.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*dhcp-3.0-r4 (21 Sep 2002)
+
+  21 Sep 2002; Mike Frysinger <vapier@gentoo.org> dhcp-3.0-r4.ebuild, dhclient.c-3.0-dw-cli-fix.patch, digest-dhcp-3.0-r4
+
+  Added a small patch per #8088 to fix the -nw bug (patch comes from upstream)
+
+*dhcp-3.0-r3 (16 Jun 2002)
+
+  03 Sep  2002; Brandon Low <lostlogic@gentoo.org> dhcp-3.0-r3.ebuild, files/conf.dhcp,
+						   files/dhcp.rc7, digest-dhcp-3.0-r3:
+
+  Update ebuild to touch dhcp.leases, fix config and init.d files
+  to work more sanely.
+
+*dhcp-3.0-r2 (16 Jun 2002)
+
+  21 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Added PPC to KEYWORDS.
+
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org>: dhcp-3.0-r2.ebuild:
+  Added KEYWORDS.
+  
+  16 Jun 2002; Brandon Low <lostlogic@gentoo.org>: dhcp-3.0-r2.ebuild:
+
+  This moves the definition of which ethernet ports to listen on to
+  /etc/conf.d where it should be this is prettier now thank TrAns13nT
+  for making fix this bug.
+
+*dhcp-3.0-r1 (6 July 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org>: dhcp-3.0-r1.ebuild:
+  Added KEYWORDS.
+
+*dhcp-3.0 (14 Feb 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org>: dhcp-3.0.ebuild:
+  Added KEYWORDS, SLOTS.
+
+  14 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: New 3.0 release.
 
 *dhcp-3.0_rc12-r6 (1 Feb 2002)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index e69de29bb2d1..4e7f4ffb4e87 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -0,0 +1,15 @@
+MD5 71e122d4e37182a63828d1fcae80b2e0 dhcp-3.0.1-r1.ebuild 3993
+MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
+MD5 a612354e29f84a1b49e804c8f0868913 ChangeLog 9804
+MD5 a01c944994028d0ae8f238d38f72b608 dhcp-3.0.3.ebuild 4403
+MD5 fd2864f5391129944f46c46c99fd1560 dhcp-3.0.2.ebuild 4135
+MD5 6c69efa2b41915ec59e53bb065ac3d0c files/dhcrelay.conf 502
+MD5 fed4fe3fa59701ea010193e45aa907be files/digest-dhcp-3.0.3 128
+MD5 2421c68dfdeec65048f1a97cbee1f4ca files/dhclient-ntp.patch 168
+MD5 81b9256728a5daab31f0513ab55e8354 files/dhcp.rc6 1092
+MD5 ce6d18eef914ac8a39b0cb1bc4d63de2 files/dhcp-3.0.3-tr.patch 377
+MD5 5cde0a8fdf363490c4212726dfd06a38 files/dhcp.conf 769
+MD5 323228061719fcac86be97a1a25d23b6 files/digest-dhcp-3.0.1-r1 128
+MD5 b060506f226297b90435f270b7345496 files/digest-dhcp-3.0.2 128
+MD5 d0f61288e81ce020573f3f6965af8489 files/dhcp-3.0.2-gmake.patch 1872
+MD5 8a19dd005c33231e02c03659f0c658df files/dhcrelay.rc6 626
diff --git a/net-misc/dhcp/dhcp-3.0.1-r1.ebuild b/net-misc/dhcp/dhcp-3.0.1-r1.ebuild
index 31a4ad018d0f..7a44636e2070 100644
--- a/net-misc/dhcp/dhcp-3.0.1-r1.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.1-r1.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.1-r1.ebuild,v 1.1 2004/12/20 18:54:23 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
+PATCHVER=1
+
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz
+	mirror://gentoo/${PN}-3-gentoo-${PATCHVER}.tar.bz2"
 
 LICENSE="isc-dhcp"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ~ppc64 sparc x86"
 IUSE="static selinux"
 
 RDEPEND="virtual/libc
 	selinux? ( sec-policy/selinux-dhcp )"
+
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
+
 PROVIDE="virtual/dhcpc"
 
+PATCHDIR=${WORKDIR}/patch
+
 src_unpack() {
 	unpack ${A} && cd "${S}"
 
-	epatch "${FILESDIR}/dhcp-3.0+paranoia.patch"
-	epatch "${FILESDIR}/dhcp-3.0pl2-fix-perms.patch"
-	epatch "${FILESDIR}/dhcp-3.0.1-fix-invalid-attribute.patch"
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
 	has noman ${FEATURES} && sed -i 's:nroff:echo:' */Makefile.dist
 }
 
@@ -90,7 +95,7 @@ src_install() {
 
 pkg_preinst() {
 	enewgroup dhcp
-	enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 }
 
 pkg_postinst() {
diff --git a/net-misc/dhcp/dhcp-3.0.2.ebuild b/net-misc/dhcp/dhcp-3.0.2.ebuild
index 2c19c44cf0a2..118a4e08f49a 100644
--- a/net-misc/dhcp/dhcp-3.0.2.ebuild
+++ b/net-misc/dhcp/dhcp-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/net-misc/dhcp/dhcp-3.0.2.ebuild,v 1.1 2005/05/16 14:23:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -9,8 +9,8 @@ PATCHVER=1
 DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz
-	mirror://gentoo/${PN}-3-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${PN}-3-gentoo-${PATCHVER}.tar.bz2"
+	mirror://gentoo/${PN}-3-gentoo-${PATCHVER}.tar.bz2"
+
 
 LICENSE="isc-dhcp"
 SLOT="0"
@@ -34,6 +34,11 @@ src_unpack() {
 	epatch ${PATCHDIR}
 
 	has noman ${FEATURES} && sed -i 's:nroff:echo:' */Makefile.dist
+
+	# FreeBSD doesn't like -Werror that is forced on
+	sed -i -e 's:-Werror::' Makefile.conf
+
+	epatch ${FILESDIR}/${P}-gmake.patch
 }
 
 src_compile() {
@@ -98,7 +103,7 @@ src_install() {
 
 pkg_preinst() {
 	enewgroup dhcp
-	enewuser dhcp -1 /bin/false /var/lib/dhcp dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
 }
 
 pkg_postinst() {
diff --git a/net-misc/dhcp/dhcp-3.0.3.ebuild b/net-misc/dhcp/dhcp-3.0.3.ebuild
index 0d878c76c774..67758206dcbd 100644
--- a/net-misc/dhcp/dhcp-3.0.3.ebuild
+++ b/net-misc/dhcp/dhcp-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3.ebuild,v 1.1 2005/10/12 16:53:02 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/net-misc/dhcp/files/dhcp.conf b/net-misc/dhcp/files/dhcp.conf
index 5b4830fddb9b..3594f55d2942 100644
--- a/net-misc/dhcp/files/dhcp.conf
+++ b/net-misc/dhcp/files/dhcp.conf
@@ -1,16 +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/net-misc/dhcp/files/dhcp.conf,v 1.1 2003/07/23 17:18:30 max Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
-#configure which interface or interfaces to for dhcp to listen on
-#list all interfaces space separated.
+# Configure which interface or interfaces to for dhcp to listen on
+# list all interfaces space separated.
 IFACE="eth0"
 
 # Insert any other options needed
-DHCPD_OPTS=""
+DHCPD_OPTS="-q"
 
 # If you wish to run dhcp in a chroot, run:
 # ebuild /var/db/pkg/net-misc/<dhcp version>/<dhcp-version>.ebuild config
 # and un-comment the following line.
 # You can specify a different chroot directory but MAKE SURE it's empty.
 #CHROOT="/chroot/dhcp"
+
+# If you need name resolution under a chroot, uncomment the following:
+#export LD_PRELOAD="/usr/lib/libresolv.so /usr/lib/libnss_dns.so"
diff --git a/net-misc/dhcp/files/dhcp.rc6 b/net-misc/dhcp/files/dhcp.rc6
index 6ca4fc057f3a..d9eb3f7cc098 100644
--- a/net-misc/dhcp/files/dhcp.rc6
+++ b/net-misc/dhcp/files/dhcp.rc6
@@ -1,26 +1,44 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 depend() {
-    need net
+	need net
+	use logger dns
 }
 
 checkconfig() {
-    if [ ! -e /etc/dhcp/dhcpd.conf ] ; then
-	eerror "You need an /etc/dhcp/dhcpd.conf file to run dhcpd"
-	eerror "There is a sample conf file in /usr/share/doc/dhcp"
-	return 1
-    fi
+	if [ ! -f "${CHROOT}/etc/dhcp/dhcpd.conf" ] ; then
+		eerror "No ${CHROOT}/etc/dhcp/dhcpd.conf file exists!"
+		return 1
+	fi
+
+	if [ ! -f "${CHROOT}/var/lib/dhcp/dhcpd.leases" ] ; then
+		ebegin "Creating dhcpd.leases"
+		touch "${CHROOT}/var/lib/dhcp/dhcpd.leases" || return 1
+		eend $?
+	fi
+
+	ebegin "Setting ownership on dhcpd.leases"
+	chown dhcp:dhcp "${CHROOT}/var/lib/dhcp/dhcpd.leases" || return 1
+	eend $?
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting dhcpd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd -- eth0
-    eend $?
+	checkconfig || return 1
+
+	ebegin "Starting ${CHROOT:+chrooted }dhcpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd \
+		-- -pf /var/run/dhcp/dhcpd.pid \
+		-user dhcp -group dhcp ${DHCPD_OPTS} \
+		${CHROOT:+-chroot ${CHROOT}} ${IFACE}
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping dhcpd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/dhcpd
-    eend $?
+	ebegin "Stopping dhcpd"
+	start-stop-daemon --stop --quiet --pidfile \
+		"${CHROOT}/var/run/dhcp/dhcpd.pid"
+	eend $?
 }
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
index 38c2d860d3cc..b4c31b65cd5d 100644
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.1 2004/01/15 01:04:51 max Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
 # list all interfaces space separated.
 IFACE="eth0"
 
 # Insert any other options needed.  See dhcrelay(8) for details.
-DHCRELAY_OPTS=""
+DHCRELAY_OPTS="-q"
 
 # Space separated list of IPs to forward BOOTP/DHCP packets to.
 DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.rc6 b/net-misc/dhcp/files/dhcrelay.rc6
index 76e129c29c99..643767df6205 100644
--- a/net-misc/dhcp/files/dhcrelay.rc6
+++ b/net-misc/dhcp/files/dhcrelay.rc6
@@ -1,7 +1,7 @@
 #!/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/net-misc/dhcp/files/dhcrelay.rc6,v 1.1 2004/01/15 01:04:51 max Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.1.1.1 2005/11/30 09:55:22 chriswhite Exp $
 
 depend() {
 	need net
@@ -9,12 +9,15 @@ depend() {
 }
 
 start() {
+	local IFACES=""
+	for i in ${IFACE} ; do
+		IFACES="${IFACES} -i ${i}"
+	done
+
 	ebegin "Starting dhcrelay"
-	start-stop-daemon --start --quiet \
-	--pidfile /var/run/dhcrelay.pid  \
-	--exec /usr/sbin/dhcrelay \
-		-- -q -i ${IFACE} ${DHCRELAY_OPTS} \
-        	${DHCRELAY_SERVERS}
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcrelay \
+		-- ${IFACES} ${DHCRELAY_OPTS} \
+		${DHCRELAY_SERVERS}
 	eend $?
 }
 
diff --git a/net-misc/dhcp/files/digest-dhcp-3.0.1-r1 b/net-misc/dhcp/files/digest-dhcp-3.0.1-r1
index 161149e2312c..bc4ece56e94c 100644
--- a/net-misc/dhcp/files/digest-dhcp-3.0.1-r1
+++ b/net-misc/dhcp/files/digest-dhcp-3.0.1-r1
@@ -1 +1,2 @@
 MD5 44f72d16a12acc3fbe09703157aa42d2 dhcp-3.0.1.tar.gz 848296
+MD5 d5f2610cff1207633770035b126aea8f dhcp-3-gentoo-1.tar.bz2 2825
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index 4d202e7918d2..6e39c61f0369 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,13 +1,298 @@
 # ChangeLog for net-misc/dhcpcd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.1 2002/02/01 21:53:34 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
-*dhcpcd-1.3.20_p0-r1 (1 Feb 2002)
+  17 Sep 2005; Roy Marples <uberlord@gentoo.org>
+  -files/dhcpcd-1.3.22_p4-gcc2.patch,
+  -files/dhcpcd-1.3.22_p4-gentoo-config.patch,
+  -files/dhcpcd-1.3.22_p4-man.patch,
+  -files/dhcpcd-1.3.22_p4-no-iface-down.diff,
+  -files/dhcpcd-1.3.22_p4-optionFQDN.patch,
+  -files/dhcpcd-1.3.22_p4-routemetric.patch,
+  -files/dhcpcd-1.3.22_p4-security.patch, -dhcpcd-1.3.22_p4-r11.ebuild,
+  -dhcpcd-1.3.22_p4-r12.ebuild:
+  Punted old versions - no more -z "release lease but keep cache" option :)
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Mark 2.0.0 stable on alpha
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Stable on mips.
+
+  06 Sep 2005; Roy Marples <uberlord@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Warn that the debug USE flag enables good debug output but does
+  not actually configure the interface or setup /etc/resolv.conf
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Stable on ppc64
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Stable on ppc.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  31 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Stable on sparc
+
+  31 Aug 2005; Roy Marples <uberlord@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Stable on amd64 and x86
   
+  Added ~arm ~hppa ~390 due to invalid keyword drop
+
+  15 Aug 2005; Aron Griffis <agriffis@gentoo.org> dhcpcd-2.0.0.ebuild:
+  add ~alpha ~ia64
+
+  14 Aug 2005; Markus Rothe <corsair@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Added ~ppc64
+
+  12 Aug 2005; David Holm <dholm@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+  08 Aug 2005; Jason Wever <weeve@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Added ~sparc keyword as it was dropped against policy.
+
+  31 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> dhcpcd-2.0.0.ebuild:
+  Added ~mips.
+
+*dhcpcd-2.0.0 (28 Jul 2005)
+
+  28 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-2.0.0-gcc2.patch, +dhcpcd-2.0.0.ebuild:
+  New upstream version.
+
+  24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/dhcpcd-1.3.22_p4-gcc2.patch, dhcpcd-1.3.22_p4-r12.ebuild:
+  Fix building with gcc2.
+
+  12 Jul 2005; Stephen Bennett <spb@gentoo.org> dhcpcd-1.3.22_p4-r11.ebuild:
+  mips stable for #98394
+
+  11 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  dhcpcd-1.3.22_p4-r11.ebuild:
+  Stable on alpha + ia64, bug 98394.
+
+  11 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  dhcpcd-1.3.22_p4-r11.ebuild:
+  Stable on ppc64 (bug #98394)
+
+  10 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  dhcpcd-1.3.22_p4-r11.ebuild:
+  ppc stable, bug #98394
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> dhcpcd-1.3.22_p4-r11.ebuild:
+  Stable on SPARC wrt bug #98394.
+
+  10 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  dhcpcd-1.3.22_p4-r11.ebuild:
+  Stable on hppa. bug #98394
+
+*dhcpcd-1.3.22_p4-r11 (10 Jul 2005)
+
+  10 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-1.3.22_p4-security.patch, 
+  +dhcpcd-1.3.22_p4-r12.ebuild, -dhcpcd-1.3.22_p4-r7.ebuild,
+  -dhcpcd-1.3.22_p4-r9.ebuild, -dhcpcd-1.3.22_p4-r10.ebuild,
+  +dhcpcd-1.3.22_p4-r11.ebuild:
+  Fixed a potential security hole #98394
+  Taken from the Debian patchset by Simon Kelly
+  Punted old ebuilds. r5 becomes r11, r10 becomes r12 - both have fix
+
+  Stable on x86 and amd64
+
+*dhcpcd-1.3.22_p4-r10 (03 Jun 2005)
+
+  03 Jun 2005; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-1.3.22_p4-gentoo-config.patch, +dhcpcd-1.3.22_p4-r10.ebuild:
+  dhcpcd now writes a more sane /etc/{resolv,ntp,yp}.conf
+  It also doesn't clobber those files anymore if there is no need to based on
+  the DHCP response.
+  dhcpcd now supports the -e option to change where it stores
+  {resolv,ntp,yp}.conf - default is /etc.
+  dhcpcd now inserts the interface name into the .sv files incase dhcpcd runs on
+  more than one interface.
+
+*dhcpcd-1.3.22_p4-r9 (01 Jun 2005)
+
+  01 Jun 2005; Roy Marples <uberlord@gentoo.org>
+  files/dhcpcd-1.3.22_p4-optionFQDN.patch,
+  files/dhcpcd-1.3.22_p4-routemetric.patch, -dhcpcd-1.3.22_p4-r8.ebuild,
+  +dhcpcd-1.3.22_p4-r9.ebuild:
+  Made routemetric and FQDN patches work together
+
+*dhcpcd-1.3.22_p4-r8 (01 Jun 2005)
+
+  01 Jun 2005; Roy Marples <uberlord@gentoo.org>
+  +files/dhcpcd-1.3.22_p4-man.patch,
+  +files/dhcpcd-1.3.22_p4-optionFQDN.patch,
+  +files/dhcpcd-1.3.22_p4-routemetric.patch, +metadata.xml,
+  +dhcpcd-1.3.22_p4-r8.ebuild:
+  Add route metric option -m - fixes #76694 thanks to Andy Dustman
+  man page buglet caused by drobbins patch - fixes #78839
+  Allow dhcpcd to use the FQDN option - fixes #64307 thanks to Kevin F. Quinn
+
+*dhcpcd-1.3.22_p4-r7 (04 Nov 2004)
+
+  04 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  -dhcpcd-1.3.22_p4-r6.ebuild, +dhcpcd-1.3.22_p4-r7.ebuild:
+  Version bump to move dhcpcd back to /sbin.
+
+*dhcpcd-1.3.22_p4-r6 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  dhcpcd-1.3.22_p4-r5.ebuild, +dhcpcd-1.3.22_p4-r6.ebuild:
+  Switch to using econf / make install destdir.
+
+  01 Nov 2004; Joshua Kinard <kumba@gentoo.org> dhcpcd-1.3.22_p4-r5.ebuild:
+  Marked stable on mips.
+
+  15 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  dhcpcd-1.3.22_p4-r5.ebuild:
+  Stable on sparc
+
+  14 Sep 2004; Guy Martin <gmsoft@gentoo.org> dhcpcd-1.3.22_p4-r5.ebuild:
+  Stable on x86.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> dhcpcd-1.3.22_p4-r5.ebuild:
+  stable on alpha and ia64
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> dhcpcd-1.3.22_p4-r4.ebuild,
+  dhcpcd-1.3.22_p4-r5.ebuild:
+  change virtual/glibc to virtual/libc
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> dhcpcd-1.3.22_p4-r5.ebuild:
+  stable on amd64
+
+*dhcpcd-1.3.22_p4-r5 (08 Mar 2004)
+*dhcpcd-1.3.22_p4-r4 (08 Mar 2004)
+
+  08 Mar 2004; Seemant Kulleen <seemant@gentoo.org>
+  dhcpcd-1.3.22_p4-r2.ebuild, dhcpcd-1.3.22_p4-r3.ebuild,
+  dhcpcd-1.3.22_p4-r4.ebuild, dhcpcd-1.3.22_p4-r5.ebuild:
+  Forced a version bump on these ebuilds. Basically, -r2 is now -r4 and -r3 is
+  now -r5. The reason for the revision bump was to make this package PROVIDE
+  virtual/dhcp. Closes a long-standing bloat-reduction request made on
+  gentoo-dev mailing list by: William Hubbs <kc5eiv@kc5eiv.homeip.net> at
+  http://article.gmane.org/gmane.linux.gentoo.devel/11579
+
+  01 Mar 2004; Tom Gall <tgall@gentoo.org> dhcpcd-1.3.22_p4-r3.ebuild;
+  for ppc64 call gnuconfig_update
+
+  10 Feb 2004; Brandon Low <lostlogic@gentoo.org> dhcpcd-1.3.22_p4-r3.ebuild:
+  Nonfunctional change to close bug 29235
+
+*dhcpcd-1.3.22_p4-r3 (18 Nov 2003)
+
+  18 Nov 2003; Guy Martin <gmsoft@gentoo.org> dhcpcd-1.3.22_p4-r3.ebuild:
+  Added the -o options which prevents dhcpcd to bring the interface down
+  on exit.
+
+*dhcpcd-1.3.22_p4-r2 (03 Nov 2003)
+
+  03 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix ntp drift file location (for now) #32490.
+
+*dhcpcd-1.3.22_p4-r1 (06 Sep 2003)
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> dhcpcd-1.3.22_p4-r1.ebuild:
+  adding DEPEND="virtual/glibc" Closes #31478.
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> dhcpcd-1.3.22_p4-r1.ebuild:
+  removed hardened-gcc -lc
+
+  03 Oct 2003; Alexander Gabert <pappy@gentoo.org> dhcpcd-1.3.22_p4-r1.ebuild:
+  added -static -lc for propolice
+
+  02 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  USE=static support #29207.
+
+  17 Sep 2003; Tavis Ormandy <taviso@gentoo.org> dhcpcd-1.3.22_p4-r1.ebuild:
+  stable on alpha
+
+  06 Sep 2003; Daniel Robbins <drobbins@gentoo.org> dhcpcd-1.3.22_p4-r1.ebuild:
+  added bug 23428 patch from Alwyn Schoeman <alwyn@smart.com.ph>, which is a
+  great little patch. Also made dhcpcd FHS compliant using an LFS patch, which
+  allows us to address the dhcpcd issues on the 1.4 release LiveCD runtime.
+
+*dhcpcd-1.3.22_p4 (04 Jan 2003)
+
+  16 Apr 2003; Guy Martin <gmsoft@gentoo.org> dhcpcd-1.3.22_p4.ebuild :
+  Readded stuff to workaround the ./configure error.
+  Marked stable on hppa.
+
+  02 Apr 2003; Christian Birchinger <joker@gentoo.org>
+  dhcpcd-1.3.22_p4.ebuild:
+  Added stable sparc keyword
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcpcd-1.3.22_p4.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump
+
+*dhcpcd-1.3.22_p3-r3 (04 Jan 2003)
+
+  26 Feb 2003; Guy Martin <gmsoft@gentoo.org> dhcpcd-1.3.22_p3-3.ebuild :
+  Added CBUILD=$CHOST for hppa due to a ./configure error.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> dhcpcd-1.3.22_p3-r3.ebuild :
+  Added hppa to keywords.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcpcd-1.3.22_p3-r3.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> dhcpcd-1.3.22_p3-r3.ebuild :
+  Removed installation of pcmcia network files. Marked stable becuse of security update.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*dhcpcd-1.3.22_p3-r2 (04 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcpcd-1.3.22_p3-r2.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  04 Dec 2002; Donny Davies <woodchip@gentoo.org> dhcpcd-1.3.22_p3-r1.ebuild :
+  Added a fix to force the pidfile into /var/run.
+
+*dhcpcd-1.3.22_p3-r1 (31 Oct 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcpcd-1.3.22_p3-r1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  12 Nov 2002; Will Woods <wwoods@gentoo.org> dhcpcd-1.3.22_p3-r1.ebuild :
+  Added "inherit gnuconfig" and src_unpack to fix build problems on alphaev67
+
+  31 Oct 2002; Brandon Low <lostlogic@gentoo.org> dhcpcd-1.3.22_p3-r1.ebuild :
+
+  The installation of dhcpcd binary got in the wrong place somehow, fixed.
+
+*dhcpcd-1.3.22_p3 (29 Oct 2002)
+
+  30 Oct 2002; Brandon Low <lostlogic@gentoo.org> dhcpcd-1.3.20_p13.ebuild dhcpcd-1.3.22_p3.ebuild:
+
+  Fix package version and various ebuild fixes.
+
+  29 Oct 2002; Brandon Low <lostlogic@gentoo.org> dhcpcd-1.3.20_p13.ebuild :
+
+  Version bump, apparently many upstream bugfixes.
+
+*dhcpcd-1.3.20_p0-r1 (1 Feb 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dhcpcd-1.3.20_p0-r1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  18 Sept 2002; SpanKY <vapier@gentoo.org> ChangeLog dhcpcd-1.3.20_p0-r1.ebuild :
+  Fixed HOMEPAGE.
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog dhcpcd-1.3.20_p0-r1.ebuild :
+  Added KEYWORDS, SLOT, LICENSE.
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   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.
+
+*dhcpcd-1.3.20_p0 (6 July 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog dhcpcd-1.3.20_p0.ebuild:
+  Added KEYWORDS, SLOT, LICENSE.
+
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index e69de29bb2d1..494026cbec0d 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 55daa6329db1827217b02c45d0a978cc ChangeLog 10986
+MD5 0b8b0543807996684c88f7f67415e051 dhcpcd-2.0.0.ebuild 1272
+MD5 766b1f15f697d5f05d0991c2765f3ff8 files/dhcpcd-2.0.0-gcc2.patch 2873
+MD5 fe6d79bf7b6253ca5a55ce4692064518 files/digest-dhcpcd-2.0.0 65
+MD5 8f5546891831502f0667f11299937b8f metadata.xml 308
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK3/uI1lqEGTUzyQRAj5mAKCjA1hYmi1/Gl7nLDeR6THRjMwtfACgtkmc
+wBxfUE4AQ7YuY8a1WlVbLcA=
+=HpR0
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild b/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild
index 917e22372563..5f25914a3cd6 100644
--- a/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild,v 1.1 2005/07/28 11:40:09 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,14 +10,22 @@ SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="build debug static"
 
 DEPEND=""
 PROVIDE="virtual/dhcpc"
 
+pkg_setup() {
+	if use debug ; then
+		ewarn "WARNING: dhcpcd will provide good debugging output with the"
+		ewarn "debug USE flag enabled but will not actually configure the"
+		ewarn "interface or setup /etc/resolv.conf"
+	fi
+}
+
 src_unpack() {
-	unpack ${A}
+	unpack "${A}"
 	cd "${S}"
 
 	# Fix compiling on gcc2
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 659da0ca93c2..1fa9090f886b 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<maintainer>
+		<email>uberlord@gentoo.org</email>
+		<name>Roy Marples</name>
+	</maintainer>
+	<longdescription>A DHCP client</longdescription>
 </pkgmetadata>
diff --git a/net-misc/directvnc/ChangeLog b/net-misc/directvnc/ChangeLog
index 60f1b223fb08..09cec126d3f3 100644
--- a/net-misc/directvnc/ChangeLog
+++ b/net-misc/directvnc/ChangeLog
@@ -1,6 +1,46 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/ChangeLog,v 1.1 2002/05/31 15:00:49 g2boojum Exp $
+# ChangeLog for net-misc/directvnc
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
+
+  16 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> directvnc-0.7.5.ebuild:
+  aded ~amd64 to KEYWORDS. fixes #77599.
+
+*directvnc-0.7.5 (01 Jun 2004)
+
+  01 Jun 2004; Mike Frysinger <vapier@gentoo.org> +directvnc-0.7.5.ebuild:
+  Version bump #46802 by Malte S. Stretz.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> directvnc-0.6.1.ebuild,
+  directvnc-0.7.ebuild:
+  Masked on sparc as DirectFB doesn't work on sparc.
+
+*directvnc-0.7 (17 Jan 2003)
+
+  17 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a small patch to fix dfb.c.
+
+  07 Nov 2002; Seemant Kulleen <seemant@gentoo.org> directvnc-0.7.ebuild
+  files/digest-directvnc-0.7 :
+  Version bump, thanks to: andreh@lddd.org (Andre Heidemann) in bug #9521.
+
+*directvnc-0.6.1 (06 Jul 2002)
+
+  17 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a small patch to fix dfb.c.
+
+  08 Aug 2002; Seemant Kulleen <seemant@gentoo.org> directvnc-0.6.1.ebuild :
+  FHS compliance.
+
+  06 Jul 2002; Seemant Kulleen <seemant@gentoo.org> directvnc-0.6.1.ebuild
+  files/digest-directvnc-0.6.1 files/dfb.c :
+  Version bump, and the dfb.c from directvnc's CVS, where the API changes
+  for DirectFB since 0.9.10 have been implemented.  Now, this will compile
+  against portage's version of DirectFB.
+
+*directvnc-0.6-r1 (03 Jul 2002)
+
+  03 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+  Fixed DirectFB dep to be ~0.9.10
 
 *directvnc-0.6 (31 May 2002)
 
@@ -8,20 +48,3 @@
   New import.  Note that the stuff in src_unpack (and the automake/
   autoconf dependencies) should go away in the next release, since
   they're only there to fix the author's mistake.
- 
--- Explanation of ChangeLog format:
- 
-  Every new version or revision of the package should be marked by a '*'
-  seperator line as above. Changes since the last revision 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.
-  
-  This means that you start with header line that has the following format,
-  indented two spaces:
-  
-  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.
diff --git a/net-misc/directvnc/Manifest b/net-misc/directvnc/Manifest
index e69de29bb2d1..5bb74d1a2d4d 100644
--- a/net-misc/directvnc/Manifest
+++ b/net-misc/directvnc/Manifest
@@ -0,0 +1,3 @@
+MD5 6f3d6a05e0bcb5bc4b2a1cc47d6e7ba3 directvnc-0.7.5.ebuild 739
+MD5 53ab195404c2aef93edb07edaa31e51f ChangeLog 1858
+MD5 a1b7ab72c34387a69358b4581f994406 files/digest-directvnc-0.7.5 67
diff --git a/net-misc/directvnc/directvnc-0.7.5.ebuild b/net-misc/directvnc/directvnc-0.7.5.ebuild
index 85f0d07d47f7..4f9ac5e6057e 100644
--- a/net-misc/directvnc/directvnc-0.7.5.ebuild
+++ b/net-misc/directvnc/directvnc-0.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5.ebuild,v 1.1 2004/06/01 05:43:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/directvnc/directvnc-0.7.5.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 inherit eutils
 
@@ -10,10 +10,11 @@ SRC_URI="http://www.adam-lilienthal.de/directvnc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 DEPEND="dev-libs/DirectFB
+	virtual/x11
 	dev-util/pkgconfig"
 
 src_compile() {
diff --git a/net-misc/drivel/ChangeLog b/net-misc/drivel/ChangeLog
index 4a9fa20ae918..15212eebe6f1 100644
--- a/net-misc/drivel/ChangeLog
+++ b/net-misc/drivel/ChangeLog
@@ -1,8 +1,87 @@
 # ChangeLog for net-misc/drivel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/ChangeLog,v 1.1 2002/11/30 14:23:41 nall Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/ChangeLog,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
-*net-misc/drivel-0.8.0 (30 Nov 2002)
+*drivel-2.0.2 (14 Sep 2005)
+
+  14 Sep 2005; Mike Gardiner <obz@gentoo.org> +drivel-2.0.2.ebuild:
+  New major version, including support for more than just LiveJournal. Thanks
+  to Sourav and Peter on bug #95737
+
+*drivel-1.2.4-r1 (29 Jun 2005)
+
+  29 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -drivel-1.2.3.ebuild, -drivel-1.2.4.ebuild, +drivel-1.2.4-r1.ebuild:
+  fix for access violation due to gnome2 eclass change, see bug #92920,
+  cleanup old builds
+
+  18 May 2005; Jason Wever <weeve@gentoo.org> drivel-1.2.4.ebuild:
+  Added ~sparc keyword.
+
+  26 Mar 2005; Mike Gardiner <obz@gentoo.org> drivel-1.2.1.ebuild,
+  drivel-1.2.3.ebuild, drivel-1.2.4.ebuild:
+  Added scrollkeeper DEPEND, see bug #86643
+
+*drivel-1.2.4 (02 Feb 2005)
+
+  02 Feb 2005; Joe McCann <joem@gentoo.org> +drivel-1.2.4.ebuild:
+  Version bump. I have added the local useflag rhythmbox, which lets drivel
+  grab the currently playing song from rhythmbox.
+
+  06 Dec 2004; Joe McCann <joem@gentoo.org> drivel-1.0.2.ebuild,
+  drivel-1.2.1.ebuild, drivel-1.2.3.ebuild:
+  Changing to real homepage instead of sourceforge project page. Thanks to
+  spyderous for the correct link
+
+  06 Dec 2004; Joe McCann <joem@gentoo.org> drivel-1.2.1.ebuild:
+  marking x86 stable
+
+*drivel-1.2.3 (06 Dec 2004)
+
+  06 Dec 2004; Joe McCann <joem@gentoo.org> +drivel-1.2.3.ebuild:
+  Bugfix release. Added spell useflag for optional gtkspell support
+
+  23 Oct 2004; Alastair Tse <liquidx@gentoo.org> drivel-1.0.2.ebuild,
+  drivel-1.2.1.ebuild:
+  remove intltool (#68514)
+
+  18 Oct 2004; Alastair Tse <liquidx@gentoo.org> drivel-1.2.1.ebuild:
+  updated curl dep
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org> drivel-1.2.1.ebuild:
+  add missing deps like libxml and gtksourceview
+
+*drivel-1.2.1 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org> +drivel-1.2.1.ebuild:
+  version bump (#62287)
+
+*drivel-1.0.2 (13 Jul 2004)
+
+  13 Jul 2004; Mike Gardiner <obz@gentoo.org> +drivel-1.0.2.ebuild:
+  New version, as requested in bug #53265. Updated dependencies inline with
+  GTK/Glib 2.4
+
+  10 May 2004; Yi Qiang <khai@gentoo.org> drivel-0.9.3.ebuild:
+  Removed -DGTK_DISABLE_DEPRECATED and -DGNOME_DISABLE_DEPRECATED
+
+*drivel-0.9.3 (25 Jan 2004)
+
+  25 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> drivel-0.9.3.ebuild:
+  version bump. We depend on intltool so we can re-intltoolize since this
+  package was created with a bad version of intltool.  Closes bug #37911.
+
+*drivel-0.9.1 (20 May 2003)
+
+  20 May 2003; Alastair Tse <liquidx@gentoo.org> drivel-0.9.1.ebuild:
+  version bump and ebuild cleanup
+
+*drivel-0.9.0 (28 Jan 2003)
+
+  28 Jan 2003; Jon Nall <nall@gentoo.org> drivel-0.9.0.ebuild :
+  new version
+
+*drivel-0.8.0 (30 Nov 2002)
 
   30 Nov 2002; Jon Nall <nall@gentoo.org> drivel-0.8.0.ebuild,
   ChangeLog, files/digest-drivel-0.8.0 :
diff --git a/net-misc/drivel/Manifest b/net-misc/drivel/Manifest
index 1e1317a8da5f..0a292b1062d6 100644
--- a/net-misc/drivel/Manifest
+++ b/net-misc/drivel/Manifest
@@ -1,7 +1,8 @@
-MD5 e03812df3f3f38a6519d7aa929f742e2 ChangeLog 607
-MD5 8e7d5be335c66fb5232c2620c5012b0a drivel-0.8.0.ebuild 603
-MD5 52cd62e2a30199db878ee773857f9c94 drivel-0.9.0.ebuild 668
-MD5 c923b19b244fc8f0cabf3102badb51e6 drivel-0.9.1.ebuild 684
-MD5 8a74a73919b3fee285f33ba9e0fc6df8 files/digest-drivel-0.8.0 64
-MD5 fad70558081e99ee41a1936e060630c6 files/digest-drivel-0.9.0 64
-MD5 e7e4f9689c5dd0fe79e8bff906f80b71 files/digest-drivel-0.9.1 64
+MD5 8db4d6af2bd7902271e769f6d522b48e ChangeLog 3030
+MD5 a455d53be4f0f47a07f031c0c8e72c06 drivel-1.2.1.ebuild 1115
+MD5 da9a33242c6d5ddb5b9a4609f4dfaec1 drivel-1.2.4-r1.ebuild 1303
+MD5 53749654d0b7332ae9a5f4b6128db636 drivel-2.0.2.ebuild 1169
+MD5 57c3ea5b48e01746bae0f8954c3843bf files/digest-drivel-1.2.1 65
+MD5 9a54a32765f3300a6f4dd6bb6437ae3a files/digest-drivel-1.2.4-r1 65
+MD5 b427956a63e4c09428828e866f1cd07f files/digest-drivel-2.0.2 65
+MD5 9c0302fa12fbac815057f362c2a6e9b3 metadata.xml 244
diff --git a/net-misc/drivel/drivel-1.2.1.ebuild b/net-misc/drivel/drivel-1.2.1.ebuild
index 5d64699c341c..b55b438882d8 100644
--- a/net-misc/drivel/drivel-1.2.1.ebuild
+++ b/net-misc/drivel/drivel-1.2.1.ebuild
@@ -1,35 +1,43 @@
-# Copyright 1999-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-misc/drivel/drivel-1.2.1.ebuild,v 1.1 2004/10/16 20:17:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/drivel-1.2.1.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
 inherit gnome2
 
 DESCRIPTION="Drivel is a LiveJournal client for the GNOME desktop."
-HOMEPAGE="http://sourceforge.net/project/drivel/"
+HOMEPAGE="http://www.dropline.net/drivel/"
 SRC_URI="mirror://sourceforge/drivel/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
+
+# note: there's also an optional rhythmbox dependency
 
 RDEPEND=">=dev-libs/glib-2.4
 	>=x11-libs/gtk+-2.4
 	>=gnome-base/gconf-2
 	>=gnome-base/gnome-vfs-2.6
 	>=gnome-base/libgnomeui-2.0.3
+	>=gnome-base/libbonobo-2
 	>=gnome-base/libglade-2
-	>=net-misc/curl-7.10"
+	>=dev-libs/libxml2-2
+	>=x11-libs/gtksourceview-1
+	>=net-misc/curl-7.12.0"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool"
+	dev-util/intltool
+	>=app-text/scrollkeeper-0.3.5"
 
 DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
+G2CONF="${G2CONF} --without-rhythmbox"
+
 src_unpack() {
 	unpack ${A}
 
-	sed -e 's/-DGTK_DISABLE_DEPRECATED//g' -i ${S}/src/Makefile.in
-	sed -e 's/-DGNOME_DISABLE_DEPRECATED//g' -i ${S}/src/Makefile.in
+#	sed -e 's/-DGTK_DISABLE_DEPRECATED//g' -i ${S}/src/Makefile.in
+#	sed -e 's/-DGNOME_DISABLE_DEPRECATED//g' -i ${S}/src/Makefile.in
 }
diff --git a/net-misc/drivel/drivel-1.2.4-r1.ebuild b/net-misc/drivel/drivel-1.2.4-r1.ebuild
index b75fca312e1b..5cf8be4ef1a6 100644
--- a/net-misc/drivel/drivel-1.2.4-r1.ebuild
+++ b/net-misc/drivel/drivel-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/drivel-1.2.4-r1.ebuild,v 1.1 2005/06/29 00:05:54 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/drivel-1.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-misc/drivel/drivel-2.0.2.ebuild b/net-misc/drivel/drivel-2.0.2.ebuild
index 2e77bc756b14..f4471938d9bf 100644
--- a/net-misc/drivel/drivel-2.0.2.ebuild
+++ b/net-misc/drivel/drivel-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/net-misc/drivel/drivel-2.0.2.ebuild,v 1.1 2005/09/14 00:08:05 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/drivel-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-misc/drivel/metadata.xml b/net-misc/drivel/metadata.xml
index da6fd63d0085..00bb8f783a87 100644
--- a/net-misc/drivel/metadata.xml
+++ b/net-misc/drivel/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer>
+	<email>obz@gentoo.org</email>
+	<name>Mike Gardiner</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 88a71ceec2b8..3d0512b21302 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,91 @@
 # ChangeLog for net-misc/dropbear
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.1 2003/04/30 00:03:45 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> dropbear-0.46.ebuild:
+  Mark 0.46 stable on alpha
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> dropbear-0.45.ebuild:
+  Stable on ppc.
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> dropbear-0.45.ebuild:
+  Stable on sparc
+
+*dropbear-0.46 (17 Jul 2005)
+
+  17 Jul 2005; <solar.@gentoo.org> +files/dropbear-0.46-dbscp.patch,
+  dropbear-0.45.ebuild, +dropbear-0.46.ebuild:
+  - version bump. fixed dbscp so that it actually works when using +multicall
+
+*dropbear-0.45 (08 Mar 2005)
+
+  08 Mar 2005; <solar@gentoo.org> +files/dropbear-0.45-urandom.patch,
+  +dropbear-0.45.ebuild:
+  - Version bump. Adds support for pam and minimal support
+
+*dropbear-0.44 (11 Jan 2005)
+
+  11 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +dropbear-0.44.ebuild:
+  Version bump.
+
+  11 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> dropbear-0.43.ebuild:
+  Keyworded sparc directly, it'll be required soon
+
+  23 Sep 2004; Mike Frysinger <vapier@gentoo.org> dropbear-0.43.ebuild,
+  dropbear-0.44_alpha4.ebuild:
+  Add support for USE=static #65108 by Frank Benkstein.
+
+*dropbear-0.44_alpha4 (22 Sep 2004)
+
+  22 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/0.44_alpha4-install.patch, +dropbear-0.44_alpha4.ebuild:
+  Version bump to test-release.
+
+*dropbear-0.43 (15 Aug 2004)
+
+  15 Aug 2004; Mike Frysinger <vapier@gentoo.org> -dropbear-0.42.ebuild,
+  +dropbear-0.43.ebuild:
+  Version bump.
+
+  09 Jul 2004; Mike Frysinger <vapier@gentoo.org> dropbear-0.42.ebuild:
+  Add support for multibinary functionality (multicall) and static.
+
+*dropbear-0.42 (21 Jun 2004)
+
+  21 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/dropbear.conf.d,
+  +files/dropbear.init.d, +dropbear-0.42.ebuild:
+  Version bump #54599 by Priit Laes.  Also add some init.d scripts.
+
+*dropbear-0.41 (10 Mar 2004)
+
+  10 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #43859 by Thomas Eckert.
+
+*dropbear-0.39 (25 Dec 2003)
+
+  25 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #35951.
+
+*dropbear-0.38 (11 Oct 2003)
+
+  11 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*dropbear-0.37 (06 Oct 2003)
+
+  06 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*dropbear-0.36 (20 Aug 2003)
+
+  20 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + change install script to use make install + add zlib USE.
+
+*dropbear-0.32 (12 Jun 2003)
+
+  12 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + ppc stable.
 
 *dropbear-0.30 (30 Apr 2003)
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 8daaa38155f4..ed64bd885a84 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,3 +1,22 @@
-MD5 8c6332ba6b94661801adc32b3ed6396a ChangeLog 251
-MD5 f453b6e0045235b39404fb1a3ace3c49 dropbear-0.30.ebuild 463
-MD5 d8445c8edb9a21d58d05f543c163f29f files/digest-dropbear-0.30 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7f21b5c13f3c9c1f5bbe297147664af5 ChangeLog 2836
+MD5 eca949c2fcf358c97cbf8071bf15e3ae dropbear-0.43.ebuild 1685
+MD5 68c50009dd00b23b70f2c214457a75cf dropbear-0.45.ebuild 1946
+MD5 fedaf2e941ea367e2c77384009098892 dropbear-0.46.ebuild 2034
+MD5 c3634543250cd9f910161b351bb15ccc files/digest-dropbear-0.43 67
+MD5 c9381e8354263ae69eda6efabca753ad files/digest-dropbear-0.45 67
+MD5 8ae09936c352dfd5a8ddb95182b1afc6 files/digest-dropbear-0.46 67
+MD5 2f5c2ef2e357aa5225c9044f33fa2512 files/dropbear-0.45-urandom.patch 1887
+MD5 c7d976a23e72e6dce3c022e588def172 files/dropbear-0.46-dbscp.patch 500
+MD5 64abc6b82756a97391c12d730c8da084 files/dropbear.conf.d 352
+MD5 34fea1c967596ebcd6d10d38444f2b92 files/dropbear.init.d 913
+MD5 ef25f543b5438ee7595e2ae0f98a5093 metadata.xml 671
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYx1bgIKl8Uu19MoRAlKCAJ4sv/HUOZcsDSvAYGrSVmUGpS6NoQCfTcaU
+R2lRNIuxYX4U5ktalJsjkI4=
+=QijB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dropbear/dropbear-0.43.ebuild b/net-misc/dropbear/dropbear-0.43.ebuild
index 4301b7a24359..cc2f7344e55b 100644
--- a/net-misc/dropbear/dropbear-0.43.ebuild
+++ b/net-misc/dropbear/dropbear-0.43.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/dropbear/dropbear-0.43.ebuild,v 1.1 2004/08/15 17:43:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.43.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 ppc mips arm amd64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc sh x86"
 IUSE="zlib multicall static"
 
 DEPEND="zlib? ( sys-libs/zlib )"
@@ -24,19 +24,19 @@ src_unpack() {
 src_compile() {
 	econf `use_enable zlib` || die
 
+	local maketarget=""
 	if use multicall ; then
 		sed -i \
 			-e '/define DROPBEAR_MULTI/s:/\* *::' \
 			-e '/define DROPBEAR_MULTI/s:\*/::' \
 			options.h
-		if use static ; then
-			emake dropbearmultistatic || die "multi static failed"
-		else
-			emake dropbearmulti || die "multi failed"
-		fi
+		use static \
+			&& maketarget="dropbearmultistatic" \
+			|| maketarget="dropbearmulti"
 	else
-		emake || die "make failed"
+		use static && maketarget="static"
 	fi
+	emake ${maketarget} || die "make ${maketarget} failed"
 }
 
 src_install() {
@@ -49,7 +49,9 @@ src_install() {
 		dosym ${multibin} /usr/bin/dropbearconvert || die
 		dosym ../bin/${multibin} /usr/sbin/dropbear || die
 	else
-		make install DESTDIR=${D} || die
+		local maketarget="install"
+		use static && maketarget="install-static"
+		make ${maketarget} DESTDIR=${D} || die "make ${maketarget} failed"
 	fi
 	exeinto /etc/init.d ; newexe ${FILESDIR}/dropbear.init.d dropbear
 	insinto /etc/conf.d ; newins ${FILESDIR}/dropbear.conf.d dropbear
diff --git a/net-misc/dropbear/dropbear-0.45.ebuild b/net-misc/dropbear/dropbear-0.45.ebuild
index ca1a85e53ced..cde119535daf 100644
--- a/net-misc/dropbear/dropbear-0.45.ebuild
+++ b/net-misc/dropbear/dropbear-0.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.45.ebuild,v 1.1 2005/03/08 21:10:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.45.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~sh ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc sh sparc x86"
 IUSE="minimal multicall pam static zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
@@ -27,9 +27,15 @@ set_options() {
 	use static && makeopts="${makeopts} STATIC=1"
 }
 
+pkg_setup() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/dropbear-0.45-urandom.patch || die
+	cd "${S}"
+	epatch "${FILESDIR}"/dropbear-0.45-urandom.patch
 }
 
 src_compile() {
@@ -44,8 +50,9 @@ src_compile() {
 src_install() {
 	set_options
 	make install DESTDIR="${D}" ${makeopts} PROGRAMS="${progs}" || die "make install failed"
-	newinitd ${FILESDIR}/dropbear.init.d dropbear
-	newconfd ${FILESDIR}/dropbear.conf.d dropbear
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
 	dodoc CHANGES README TODO SMALL MULTI
 
 	# The multi install target does not install the links
@@ -60,4 +67,6 @@ src_install() {
 		dosym ../bin/dropbearmulti /usr/sbin/dropbear
 		cd "${S}"
 	fi
+
+	mv "${D}"/usr/bin/{,db}scp
 }
diff --git a/net-misc/dropbear/dropbear-0.46.ebuild b/net-misc/dropbear/dropbear-0.46.ebuild
index 9dc6a8db5859..7b76666c3d98 100644
--- a/net-misc/dropbear/dropbear-0.46.ebuild
+++ b/net-misc/dropbear/dropbear-0.46.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.46.ebuild,v 1.1 2005/07/17 11:19:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.46.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="http://matt.ucc.asn.au/dropbear/"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
 SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 	http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~sh ~x86"
+KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc sh ~sparc ~x86"
 IUSE="minimal multicall pam static zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51"
+PROVIDE="virtual/ssh"
 
 set_options() {
 	use minimal \
@@ -27,9 +28,14 @@ set_options() {
 	use static && makeopts="${makeopts} STATIC=1"
 }
 
+pkg_setup() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}"/dropbear-0.45-urandom.patch
 	epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
 }
diff --git a/net-misc/dropbear/files/dropbear.conf.d b/net-misc/dropbear/files/dropbear.conf.d
index 758a03187de3..98b2c13f67ad 100644
--- a/net-misc/dropbear/files/dropbear.conf.d
+++ b/net-misc/dropbear/files/dropbear.conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/files/dropbear.conf.d,v 1.1 2004/06/21 13:32:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/files/dropbear.conf.d,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 # see `dropbear -h` for more information
 # -w disables root logins
diff --git a/net-misc/dropbear/files/dropbear.init.d b/net-misc/dropbear/files/dropbear.init.d
index cbd04a176c16..5d5dfdfc80b0 100644
--- a/net-misc/dropbear/files/dropbear.init.d
+++ b/net-misc/dropbear/files/dropbear.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/files/dropbear.init.d,v 1.1 2004/06/21 13:32:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/files/dropbear.init.d,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 depend() {
 	use logger dns
diff --git a/net-misc/e100/ChangeLog b/net-misc/e100/ChangeLog
index 430c04509b1e..deff6e41667a 100644
--- a/net-misc/e100/ChangeLog
+++ b/net-misc/e100/ChangeLog
@@ -1,9 +1,103 @@
 # ChangeLog for net-misc/e100
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/ChangeLog,v 1.1 2002/08/21 01:17:19 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/ChangeLog,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
-*e100-2.1.6 (19 Aug 2002)
+*e100-3.4.8 (30 Apr 2005)
 
-  20 Aug 2002; Arcady Genkin <agenkin@thpoon.com> e100-2.1.6.ebuild :
+  30 Apr 2005; Martin Holzer <mholzer@gentoo.org> +e100-3.4.8.ebuild:
+  Version bumped.
+
+*e100-3.3.6 (30 Apr 2005)
+
+  30 Apr 2005; Martin Holzer <mholzer@gentoo.org> +e100-3.3.6.ebuild:
+  Version bumped.
+
+  24 Dec 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.43.ebuild:
+  x86 stable
+
+*e100-3.2.3 (23 Oct 2004)
+
+  23 Oct 2004; Martin Holzer <mholzer@gentoo.org> +e100-3.2.3.ebuild:
+  Version bumped.
+
+*e100-3.1.4 (02 Oct 2004)
+
+  02 Oct 2004; Martin Holzer <mholzer@gentoo.org> +e100-3.0.27.ebuild,
+  +e100-3.1.4.ebuild:
+  two ned stable ebuilds
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> e100-2.3.43.ebuild:
+  Added to ~ppc.
+
+*e100-2.3.43 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.43.ebuild:
+  Version bumped.
+
+*e100-2.3.40 (13 Apr 2004)
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.40.ebuild:
+  Version bumped.
+
+  03 Feb 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.33.ebuild:
+  x86 stable.
+
+*e100-2.3.38 (03 Feb 2004)
+
+  03 Feb 2004; Martin Holzer <mholzer@gentoo.org> e100-2.3.38.ebuild:
+  Version bumped.
+
+*e100-2.3.33 (04 Dec 2003)
+
+  04 Dec 2003; Martin Holzer <mholzer@gentoo.org> e100-2.3.33.ebuild:
+  Version bumped.
 
+*e100-2.3.30 (30 Oct 2003)
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> e100-2.3.13.ebuild,
+  e100-2.3.18.ebuild, e100-2.3.27.ebuild, e100-2.3.30.ebuild:
+  Version bumped.
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> e100-2.3.13.ebuild,
+  e100-2.3.18.ebuild, e100-2.3.27.ebuild:
+  adding restrict nomirror.
+
+*e100-2.3.27 (10 Oct 2003)
+
+  10 Oct 2003; Martin Holzer <mholzer@gentoo.org> e100-2.3.27.ebuild:
+  Version bumped.
+
+*e100-2.3.18 (23 Jul 2003)
+
+  23 Jul 2003; Martin Holzer <mholzer@gentoo.org> e100-2.3.18.ebuild:
+  Version bumped.
+
+*e100-2.3.13 (26 Jun 2003)
+
+  26 Jun 2003; Martin Holzer <mholzer@gentoo.org> e100-2.3.13.ebuild:
+  Version bumped.
+
+*e100-2.2.21 (28 Apr 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*e100-2.1.29 (04 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@thpoon.com> :
+  Version update by Garen <garen@garen.net>.
+
+*e100-2.1.24 (16 Dec 2002)
+
+  16 Dec 2002; Arcady Genkin <agenkin@thpoon.com> e100-2.1.24.ebuild :
+  Update to 2.1.24.
+
+*e100-2.1.15 (2 Oct 2002)
+
+  2 Oct 2002; Arcady Genkin <agenkin@thpoon.com> e100-2.1.15.ebuild :
+  Update to 2.1.15.
+
+*e100-2.1.6 (20 Aug 2002)
+
+  20 Aug 2002; Arcady Genkin <agenkin@thpoon.com> e100-2.1.6.ebuild :
   Initial revision, submitted by Kris Verbeeck <airborne@advalvas.be>.
diff --git a/net-misc/e100/Manifest b/net-misc/e100/Manifest
index e69de29bb2d1..8cc12bb17055 100644
--- a/net-misc/e100/Manifest
+++ b/net-misc/e100/Manifest
@@ -0,0 +1,16 @@
+MD5 6efc0f3eb9e13809f47ca9b0f5ea24da ChangeLog 2731
+MD5 6c41043e392e43ec4d4ad063e599e570 e100-2.3.40.ebuild 1316
+MD5 ee6eb0c5bf2ba038ac85e0039149781d e100-2.3.43.ebuild 1321
+MD5 4d37df0832d07c4ee3abfccb8cce9d95 e100-3.0.27.ebuild 1322
+MD5 cffcd838785e01b8b88ac8ed698abb1a e100-3.1.4.ebuild 1321
+MD5 f1b62ff76937174068a8d4869175a0a6 e100-3.2.3.ebuild 1321
+MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+MD5 bc1f7cf80e7baae67f6c3831083f7160 e100-3.3.6.ebuild 1321
+MD5 56741cda6ee992d77997c1f587fa747a e100-3.4.8.ebuild 1321
+MD5 030ad45e9b529643af0e9373951c8585 files/digest-e100-2.3.40 62
+MD5 4f0dd6379b1822a15c1a045f9ab3bdbb files/digest-e100-2.3.43 62
+MD5 7109598eaf156258c3d57464c7db076b files/digest-e100-3.0.27 62
+MD5 9836bcc64e3aeed83ba061c5cc260676 files/digest-e100-3.1.4 61
+MD5 19b3a0d51da791c30318cf1246c3561c files/digest-e100-3.2.3 61
+MD5 943629344d72e7d7d32e30f0dd7df308 files/digest-e100-3.3.6 61
+MD5 f7176845a573f6d426d98ebf3223754b files/digest-e100-3.4.8 61
diff --git a/net-misc/e100/e100-2.3.40.ebuild b/net-misc/e100/e100-2.3.40.ebuild
index 91051c87287e..3595329cb4a5 100644
--- a/net-misc/e100/e100-2.3.40.ebuild
+++ b/net-misc/e100/e100-2.3.40.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-misc/e100/e100-2.3.40.ebuild,v 1.1 2004/04/13 20:59:19 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-2.3.40.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
@@ -8,10 +8,9 @@ LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 
 SRC_URI="mirror://sourceforge/e1000/${P}.tar.gz"
-RESTRICT="nomirror"
-S="${WORKDIR}/${P}"
 SLOT="${KV}"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 src_compile() {
 	check_KV
diff --git a/net-misc/e100/e100-2.3.43.ebuild b/net-misc/e100/e100-2.3.43.ebuild
index 9fec5e885a22..2481697bbd9a 100644
--- a/net-misc/e100/e100-2.3.43.ebuild
+++ b/net-misc/e100/e100-2.3.43.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-misc/e100/e100-2.3.43.ebuild,v 1.1 2004/06/01 20:30:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-2.3.43.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
@@ -8,9 +8,9 @@ LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 
 SRC_URI="mirror://sourceforge/e1000/${P}.tar.gz"
-S="${WORKDIR}/${P}"
 SLOT="${KV}"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 src_compile() {
 	check_KV
diff --git a/net-misc/e100/e100-3.0.27.ebuild b/net-misc/e100/e100-3.0.27.ebuild
index a08d485f11ea..b4a08c29665c 100644
--- a/net-misc/e100/e100-3.0.27.ebuild
+++ b/net-misc/e100/e100-3.0.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/e100/e100-3.0.27.ebuild,v 1.1 2004/10/02 10:28:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.0.27.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
diff --git a/net-misc/e100/e100-3.1.4.ebuild b/net-misc/e100/e100-3.1.4.ebuild
index ebfb2dae6356..e88e8d8a63bd 100644
--- a/net-misc/e100/e100-3.1.4.ebuild
+++ b/net-misc/e100/e100-3.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.1.4.ebuild,v 1.1 2004/10/02 10:28:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.1.4.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
diff --git a/net-misc/e100/e100-3.2.3.ebuild b/net-misc/e100/e100-3.2.3.ebuild
index 84ca2dd13d04..bd5be946b041 100644
--- a/net-misc/e100/e100-3.2.3.ebuild
+++ b/net-misc/e100/e100-3.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.2.3.ebuild,v 1.1 2004/10/23 15:53:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.2.3.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
diff --git a/net-misc/e100/e100-3.3.6.ebuild b/net-misc/e100/e100-3.3.6.ebuild
index 64c74068ca76..b717b963c3f1 100644
--- a/net-misc/e100/e100-3.3.6.ebuild
+++ b/net-misc/e100/e100-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/net-misc/e100/e100-3.3.6.ebuild,v 1.1 2005/04/30 09:57:20 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.3.6.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
diff --git a/net-misc/e100/e100-3.4.8.ebuild b/net-misc/e100/e100-3.4.8.ebuild
index 79f60dc63b56..f17472c45ba6 100644
--- a/net-misc/e100/e100-3.4.8.ebuild
+++ b/net-misc/e100/e100-3.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/net-misc/e100/e100-3.4.8.ebuild,v 1.1 2005/04/30 10:39:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e100/e100-3.4.8.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 DESCRIPTION="Linux base driver for the Intel(R) PRO/100 family of adapters"
 HOMEPAGE="http://support.intel.com/support/network/adapter/index.htm"
diff --git a/net-misc/e1000/ChangeLog b/net-misc/e1000/ChangeLog
index 9a0d1bbc52dc..bd513809800d 100644
--- a/net-misc/e1000/ChangeLog
+++ b/net-misc/e1000/ChangeLog
@@ -1,9 +1,86 @@
 # ChangeLog for net-misc/e1000
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/ChangeLog,v 1.1 2002/08/16 01:15:31 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/ChangeLog,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> e1000-5.2.52.ebuild:
+  Added to ~ppc.
+
+*e1000-5.2.52 (01 Jun 2004)
+
+  01 Jun 2004; Martin Holzer <mholzer@gentoo.org> e1000-5.2.39.ebuild,
+  e1000-5.2.52.ebuild:
+  Version bumped.
+
+*e1000-5.2.39 (13 Apr 2004)
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> e1000-5.2.39.ebuild,
+  Version bumped.
+
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> e1000-5.2.30.1.ebuild,
+  files/README.Gentoo:
+  improved low-end switches compatiblity. Submitted by 
+  Dennis Nienhüser <fragfred@gmx.de> in 43306.
+
+*e1000-5.2.30.1 (03 Feb 2004)
+
+  03 Feb 2004; Martin Holzer <mholzer@gentoo.org> e1000-5.2.30.1.ebuild:
+  Version bumped.
+
+*e1000-5.2.22 (04 Dec 2003)
+
+  04 Dec 2003; Martin Holzer <mholzer@gentoo.org> e1000-5.2.22.ebuild:
+  Version bumped.
+
+*e1000-5.2.20 (30 Oct 2003)
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> e1000-5.2.16.ebuild,
+  e1000-5.2.20.ebuild:
+  Version bumpe.
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> e1000-5.2.16.ebuild:
+  x86 stable.
+
+*e1000-5.2.16 (19 Oct 2003)
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> e1000-5.2.16.ebuild:
+  Version bumped.
+
+*e1000-5.1.13 (23 Jul 2003)
+
+  23 Jul 2003; Martin Holzer <mholzer@gentoo.org> e1000-5.1.13.ebuild:
+  Version bumped.
+
+*e1000-5.1.11 (26 Jun 2003)
+
+  26 Jun 2003; Martin Holzer <mholzer@gentoo.org> e1000-5.1.11.ebuild:
+  Version bumped.
+
+*e1000-5.0.43 (08 Apr 2003)
+
+  08 Apr 2003; Arcady Genkin <agenkin@gentoo.com> :
+  Version bump.
+
+*e1000-4.4.12 (16 Dec 2002)
+
+  16 Dec 2002; Arcady Genkin <agenkin@gentoo.com> e1000-4.4.12.ebuild :
+  Version bump.
+
+*e1000-4.3.15 (23 Sep 2002)
+
+  16 Dec 2002; Arcady Genkin <agenkin@gentoo.com> e1000-4.3.15.ebuild :
+  Ebuild facelift.
+
+  16 Dec 2002; Martin Holzer <mholzer@gentoo.com> e1000-4.3.15.ebuild Changelog :
+  Fixed sandbox access violation (#9437).
+
+  23 Sep 2002; Arcady Genkin <agenkin@thpoon.com> e1000-4.3.15.ebuild :
+  Version bump.
 
 *e1000-4.3.2 (15 Aug 2002)
 
   15 Aug 2002; Arcady Genkin <agenkin@thpoon.com> e1000-4.3.2.ebuild :
-
-  Initial version.
\ No newline at end of file
+  Initial version.
diff --git a/net-misc/e1000/Manifest b/net-misc/e1000/Manifest
index e69de29bb2d1..0b6df233c59b 100644
--- a/net-misc/e1000/Manifest
+++ b/net-misc/e1000/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 17ce4bc3ebe6a12d43a7c12b679872a2 e1000-5.2.39.ebuild 1422
+MD5 c24404e27843241b0706daf4e2d61ae3 e1000-5.2.30.1.ebuild 1443
+MD5 47a6500b288c6970669090caf1a6925b e1000-5.2.52.ebuild 1427
+MD5 77ba2e35f71b3ebfc63529fe00465433 ChangeLog 2355
+MD5 0b6de6b5497b7f4ed7f2469565a3e28e files/README.Gentoo 1002
+MD5 7d18fc184ab546d0c4037f5a502a30b1 files/digest-e1000-5.2.52 64
+MD5 77270d006917b099ca5e4684c80abf0f files/digest-e1000-5.2.30.1 66
+MD5 d7dddb8c37956959f088a675676950c1 files/digest-e1000-5.2.39 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1T5LLFUmVNQ7rkRAq6oAKCXFoX+47PfcwxHR5qkbmbMh/j3AQCfapJv
+VXPOQoY9eLoUWwI1B+7Rn4g=
+=X8kB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/e1000/e1000-5.2.30.1.ebuild b/net-misc/e1000/e1000-5.2.30.1.ebuild
index f043f2e90ce5..b8dac6184b41 100644
--- a/net-misc/e1000/e1000-5.2.30.1.ebuild
+++ b/net-misc/e1000/e1000-5.2.30.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.30.1.ebuild,v 1.1 2004/02/03 12:15:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.30.1.ebuild,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
 DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
 HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
@@ -10,8 +10,8 @@ DEPEND="virtual/linux-sources"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 SLOT="${KV}"
-KEYWORDS="~x86"
-S="${WORKDIR}/${P}"
+KEYWORDS="x86"
+IUSE=""
 
 
 src_unpack() {
@@ -26,7 +26,14 @@ src_unpack() {
 src_compile() {
 	check_KV
 	cd "${S}/src"
-	make KSRC=/usr/src/linux clean e1000.o
+
+	# workaround needed for some ethernet controllers to work with low end switches
+	if [[ ${USE_INCOMPATIBLE_SWITCH} ]]
+		then CFLAGS_EXTRA="CFLAGS_EXTRA=-DE_1000_MASTER_SLAVE=1"
+		else CFLAGS_EXTRA=""
+	fi
+
+	make ${CFLAGS_EXTRA} KSRC=/usr/src/linux clean e1000.o
 }
 
 
@@ -34,8 +41,11 @@ src_install() {
 	insinto "/lib/modules/${KV}/kernel/drivers/net"
 	doins "${S}/src/e1000.o"
 	doman e1000.7
-	dodoc LICENSE README SUMS e1000.spec ldistrib.txt
+	dodoc LICENSE README SUMS e1000.spec ldistrib.txt ${FILESDIR}/README.Gentoo
 	einfo ""
 	einfo "In case you have problems, loading the module, try to run depmod -A"
 	einfo ""
+	einfo "If you experience problems with low-end switches, read"
+	einfo "/usr/share/doc/${PF}/README.Gentoo.gz for a possible workaround"
+	einfo ""
 }
diff --git a/net-misc/e1000/e1000-5.2.39.ebuild b/net-misc/e1000/e1000-5.2.39.ebuild
index baf5d5256756..533f0a3ff35d 100644
--- a/net-misc/e1000/e1000-5.2.39.ebuild
+++ b/net-misc/e1000/e1000-5.2.39.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-misc/e1000/e1000-5.2.39.ebuild,v 1.1 2004/04/13 21:02:49 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.39.ebuild,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
 DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
 HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
@@ -8,10 +8,9 @@ LICENSE="GPL-2"
 DEPEND="virtual/linux-sources"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 SLOT="${KV}"
 KEYWORDS="~x86"
-S="${WORKDIR}/${P}"
+IUSE=""
 
 
 src_unpack() {
diff --git a/net-misc/e1000/e1000-5.2.52.ebuild b/net-misc/e1000/e1000-5.2.52.ebuild
index 700023ff18db..ee0c89507ae0 100644
--- a/net-misc/e1000/e1000-5.2.52.ebuild
+++ b/net-misc/e1000/e1000-5.2.52.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-misc/e1000/e1000-5.2.52.ebuild,v 1.1 2004/06/01 20:38:06 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/e1000/e1000-5.2.52.ebuild,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
 DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
 HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
@@ -9,8 +9,8 @@ DEPEND="virtual/linux-sources"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SLOT="${KV}"
-KEYWORDS="~x86"
-S="${WORKDIR}/${P}"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 
 src_unpack() {
diff --git a/net-misc/ebayagent/ChangeLog b/net-misc/ebayagent/ChangeLog
index 3bb67924fec3..ed368d689144 100644
--- a/net-misc/ebayagent/ChangeLog
+++ b/net-misc/ebayagent/ChangeLog
@@ -1,10 +1,27 @@
 # ChangeLog for net-misc/ebayagent
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ChangeLog,v 1.1 2005/05/14 17:17:35 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ChangeLog,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+*ebayagent-0.9.11-r2 (12 Jun 2005)
+
+  12 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  files/ebayagent.patch, -ebayagent-0.9.11.ebuild,
+  -ebayagent-0.9.11-r1.ebuild, +ebayagent-0.9.11-r2.ebuild:
+  bug 95144
+
+  05 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/ebayagent.patch, ebayagent-0.9.11-r1.ebuild:
+  Bug 95144 - with patch
+
+*ebayagent-0.9.11-r1 (05 Jun 2005)
+
+  05 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  +ebayagent-0.9.11-r1.ebuild:
+  Bug 95144 - optional dep on perl-tk
 
 *ebayagent-0.9.11 (14 May 2005)
 
   14 May 2005; Michael Cummings <mcummings@gentoo.org> +metadata.xml,
   +ebayagent-0.9.11.ebuild:
-  bug 88118, ebuild submitted by Bertrand Jacquin <beber.gentoo@gmail.com>
+  bug 90948, ebuild submitted by Bertrand Jacquin <beber.gentoo@gmail.com>
 
diff --git a/net-misc/ebayagent/Manifest b/net-misc/ebayagent/Manifest
index f74a4600ba7e..34094e97ad10 100644
--- a/net-misc/ebayagent/Manifest
+++ b/net-misc/ebayagent/Manifest
@@ -1,3 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 73028f26ea8e8ab5c602fd50c3901724 ChangeLog 930
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 0ee99822b440f51603c8f6ebc6a3e703 ebayagent-0.9.11.ebuild 1867
-MD5 d91da69fc3c98bcf2692e807f7a3f071 files/digest-ebayagent-0.9.11 68
+MD5 24bcff594d71a6963f9724f46649e547 ebayagent-0.9.11-r2.ebuild 1655
+MD5 000972706fe20a16eedd74ec08296c7a files/ebayagent.patch 3838
+MD5 d91da69fc3c98bcf2692e807f7a3f071 files/digest-ebayagent-0.9.11-r2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrJkMtG5z4I8BtQoRAifeAKCJkC6ciE6Epptqd30PztN3i6vRIgCggoPc
+hUQq2fxs/k0GFVyBqTC1vDY=
+=sD9b
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild b/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild
index 3a264a4ba8b3..4dc485792369 100644
--- a/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild
+++ b/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild,v 1.1 2005/06/12 20:20:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/ebayagent/files/ebayagent.patch b/net-misc/ebayagent/files/ebayagent.patch
index 38862b0c8e6a..c9f2bfe1852e 100644
--- a/net-misc/ebayagent/files/ebayagent.patch
+++ b/net-misc/ebayagent/files/ebayagent.patch
@@ -1,21 +1,18 @@
---- XeBayAgent.pl.old	2005-06-05 18:50:42.000000000 -0400
-+++ XeBayAgent.pl	2005-06-05 18:49:22.000000000 -0400
-@@ -240,7 +240,7 @@ my %user_conf = (
-                  X_terminal => "",
-                  X_inanotherterm => 0,
-                  X_indialogbox => 0,
--                 X_eBayAgentLocation => "",
-+                 X_eBayAgentLocation => "/usr/bin/eBayAgent",
-                 );
- 
- my %tconf = %user_conf;
---- Tools/eBayAgent_Skript.old	2005-04-28 01:55:48.000000000 -0400
-+++ Tools/eBayAgent_Skript	2005-06-05 18:07:09.000000000 -0400
-@@ -35,12 +35,13 @@ ITEMS="2534478656 2533973254 2534483715 
+--- Tools/eBayAgent_Skript.orig	2005-06-12 14:41:53.000000000 -0400
++++ Tools/eBayAgent_Skript	2005-06-12 14:47:57.000000000 -0400
+@@ -35,12 +35,21 @@ ITEMS="2534478656 2533973254 2534483715 
  # along with this program; if not, write to the Free Software Foundation,
  # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
-+# Patched to read the settings from $HOME/.eBayAgent_Skript.confign# This will check if a config file exists. If not -> createnif [ ! -e $HOME/.eBayAgent_Skript.config ];thenntsed -n '/^# This is a simple/,/^ITEMS=/p' /bin/eBayAgent_Skript > $HOME/.eBayAgent_Skript.confignecho "Please adjust $HOME/.eBayAgent_Skript.config to your needs first!"nexitnfinsource $HOME/.eBayAgent_Skript.confign
++# Patched to read the settings from $HOME/.eBayAgent_Skript.conf
++# This will check if a config file exists. If not -> create
++if [ ! -e $HOME/.eBayAgent_Skript.conf ];then
++	sed -n '/^# This is a simple/,/^ITEMS=/p' /bin/eBayAgent_Skript > $HOME/.eBayAgent_Skript.conf
++	echo "Please adjust $HOME/.eBayAgent_Skript.conf to your needs first!"
++	exit	
++fi
++source $HOME/.eBayAgent_Skript.conf
++
  # fetching the data and sorting takes about 2-3 secs per article
  (
  for ITEM in $ITEMS ; do 
@@ -27,7 +24,7 @@
  		sed -n 's/Bid End time.*: \(.*\) (GMT)$/\1/p')
  	# convert to seconds since 1.1.1970
  	SECS=$(date +%s --date "$DATE")
-@@ -53,7 +54,7 @@ sort -n -k1 |
+@@ -53,7 +62,7 @@ sort -n -k1 |
  # and then bid one after the other. 
  while read SECS ITEM ; do 
  	echo 
@@ -36,3 +33,50 @@
  	# if not successful, continue
  	test $? -ne 99 && continue
          # ok, it's 99, so we won. so exit. 
+--- Tools/repebay.old	2005-06-12 14:48:38.000000000 -0400
++++ Tools/repebay	2005-06-12 14:48:43.000000000 -0400
+@@ -19,13 +19,13 @@ elif [ ! "$1" ] && [ ! "$2" ]; then
+ fi
+ 
+ if [ "$RCFILE" = "" ]; then
+- until [ $(ebayagent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
++ until [ $(eBayAgent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
+   do
+-   ebayagent -i $AUCTION -b $MAXBID
++   eBayAgent -i $AUCTION -b $MAXBID
+   done && echo Auction $AUCTION has already ended
+ else
+- until [ $(ebayagent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
++ until [ $(eBayAgent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
+   do
+-   ebayagent -i $AUCTION -b $MAXBID -r $RCFILE
++   eBayAgent -i $AUCTION -b $MAXBID -r $RCFILE
+   done && echo Auction $AUCTION has already ended
+ fi
+--- Tools/runrepebay.old	2005-06-12 14:48:23.000000000 -0400
++++ Tools/runrepebay	2005-06-12 14:48:32.000000000 -0400
+@@ -57,21 +57,21 @@ if [ -d $HOME/.eBay ]; then
+      cd $HOME/.eBay
+      for AUCTIONNR in $(ls | grep -E [0-9]{10} | grep -v done)
+        do
+-        if [ $(ebayagent -i $AUCTIONNR | grep -c "Auction has ended") -gt "0" ]; then
++        if [ $(eBayAgent -i $AUCTIONNR | grep -c "Auction has ended") -gt "0" ]; then
+            mv $HOME/.eBay/$AUCTIONNR $HOME/.eBay/$AUCTIONNR-done
+            echo "Auction for article number $AUCTIONNR has already ended."
+            echo "$(grep ^\# $AUCTIONNR-done)"
+            echo ""
+         else
+           if [ "$(grep ^[0-9]*\.[0-9]*$ $HOME/.eBay/$AUCTIONNR)" ]; then
+-             if [ ! $(ps ux | grep -v grep | grep -c "ebayagent -i $AUCTIONNR") -gt "0" ]; then
++             if [ ! $(ps ux | grep -v grep | grep -c "eBayAgent -i $AUCTIONNR") -gt "0" ]; then
+                 screen -S "$SCREENID" -X screen "$RUNCLIENT" "$AUCTIONNR" $(grep -v ^\# $HOME/.eBay/"$AUCTIONNR")
+                 echo "Bidding for article number $AUCTIONNR:"
+                 echo "$(grep ^\# $AUCTIONNR)"
+                 echo ""
+              else
+                 echo "Already bidding for article number $AUCTIONNR:"
+-                echo "$(ps ux | grep -v grep | grep "ebayagent -i $AUCTIONNR")"
++                echo "$(ps ux | grep -v grep | grep "eBayAgent -i $AUCTIONNR")"
+                 echo "$(grep ^\# $AUCTIONNR)"
+                 echo ""
+              fi
diff --git a/net-misc/efax/ChangeLog b/net-misc/efax/ChangeLog
index fdde6c4027b3..a1f7bb7541e4 100644
--- a/net-misc/efax/ChangeLog
+++ b/net-misc/efax/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for net-misc/efac
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/ChangeLog,v 1.1 2003/05/26 01:29:03 avenj Exp $
+# ChangeLog for net-misc/efax
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> efax-0.9a.ebuild:
+  added ~amd64 to KEYWORDS, fixes #82877
 
 *efax-0.9a (25 May 2003)
 
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 3e3f9b84014c..bc8894c49998 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -1,2 +1,13 @@
-MD5 3719e227a0fef96b7abad8abb11437b5 efax-0.9a.ebuild 605
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 75aa5a9df6794401e98b50e6c9f39438 efax-0.9a.ebuild 705
+MD5 296bca23f4981c7ba1e9752a27649b75 ChangeLog 501
 MD5 c2f8bbf4bc4c515277e9266bf7b5b0a8 files/digest-efax-0.9a 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCSXG606ebR+OMO78RAs44AJwPfWex+51uLgLTJ6qj3a7jY+HAOwCfXuaP
+GgFsVYj7hiRACpgPwsdgCBE=
+=4Elc
+-----END PGP SIGNATURE-----
diff --git a/net-misc/efax/efax-0.9a.ebuild b/net-misc/efax/efax-0.9a.ebuild
index d6fe4141960d..59ae987cdb5b 100644
--- a/net-misc/efax/efax-0.9a.ebuild
+++ b/net-misc/efax/efax-0.9a.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a.ebuild,v 1.1 2003/05/26 01:29:03 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 S=${WORKDIR}/${P}-001114
 DESCRIPTION="A simple fax program for single-user systems"
 SRC_URI="http://www.cce.com/efax/download/${P}-001114.tar.gz"
 HOMEPAGE="http://www.cce.com/efax/"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64"
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-misc/emirror/ChangeLog b/net-misc/emirror/ChangeLog
index 200c8848458a..c5ad94756028 100644
--- a/net-misc/emirror/ChangeLog
+++ b/net-misc/emirror/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for net-misc/e100
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/emirror/ChangeLog,v 1.1 2003/05/19 18:22:41 mholzer Exp $
+# ChangeLog for net-misc/emirror
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/emirror/ChangeLog,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
+
+  10 May 2005; David Holm <dholm@gentoo.org> emirror-2.1.21.ebuild:
+  Added to ~ppc.
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> emirror-2.1.21.ebuild:
+  fix depend (bug #45110); tidy
 
 *emirror-2.1.21 (19 May 2003)
 
diff --git a/net-misc/emirror/Manifest b/net-misc/emirror/Manifest
index 1d13159f0e4b..b9a020fbe97e 100644
--- a/net-misc/emirror/Manifest
+++ b/net-misc/emirror/Manifest
@@ -1,2 +1,3 @@
-MD5 f2fdd7e65fab567dd37bad2c6e23f50f emirror-2.1.21.ebuild 647
+MD5 f796f071507b72271eb541863982df94 ChangeLog 604
+MD5 7c1ff8c7603e6bfafd6e2c51aadaa423 emirror-2.1.21.ebuild 763
 MD5 f1b667dfb72b10a6920f50caba7c725d files/digest-emirror-2.1.21 66
diff --git a/net-misc/emirror/emirror-2.1.21.ebuild b/net-misc/emirror/emirror-2.1.21.ebuild
index 67a08fe27603..a72d494d840a 100644
--- a/net-misc/emirror/emirror-2.1.21.ebuild
+++ b/net-misc/emirror/emirror-2.1.21.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/emirror/emirror-2.1.21.ebuild,v 1.1 2003/05/19 18:22:42 mholzer Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/net-misc/emirror/emirror-2.1.21.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
 DESCRIPTION="ECLiPt FTP mirroring tool"
 HOMEPAGE="http://eclipt.uni-klu.ac.at/emirror.php"
@@ -10,9 +8,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
-DEPEND=">=python-1.5"
+DEPEND=">=dev-lang/python-1.5"
 
 
 src_compile() {
diff --git a/net-misc/emphetamine/ChangeLog b/net-misc/emphetamine/ChangeLog
index 25e792a2a016..f93e44f3f7c9 100644
--- a/net-misc/emphetamine/ChangeLog
+++ b/net-misc/emphetamine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/emphetamine
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/emphetamine/ChangeLog,v 1.1 2003/04/30 23:57:33 bass Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/emphetamine/ChangeLog,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+  10 May 2005; David Holm <dholm@gentoo.org> emphetamine-0.99.6.ebuild:
+  Added to ~ppc.
 
 *emphetamine-0.99.6 (01 May 2003)
 
diff --git a/net-misc/emphetamine/Manifest b/net-misc/emphetamine/Manifest
index e69de29bb2d1..96d79aa7ef8e 100644
--- a/net-misc/emphetamine/Manifest
+++ b/net-misc/emphetamine/Manifest
@@ -0,0 +1,4 @@
+MD5 db62e44f5c4057460b3cd29c40e34ac8 ChangeLog 440
+MD5 43dd7a7cb4d9fe6bc08981254b72da6a emphetamine-0.99.6.ebuild 509
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 4f8704a95f9f008a6c49664ea943fef5 files/digest-emphetamine-0.99.6 70
diff --git a/net-misc/emphetamine/emphetamine-0.99.6.ebuild b/net-misc/emphetamine/emphetamine-0.99.6.ebuild
index 19b7d4f84607..86991c199ad2 100644
--- a/net-misc/emphetamine/emphetamine-0.99.6.ebuild
+++ b/net-misc/emphetamine/emphetamine-0.99.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/emphetamine/emphetamine-0.99.6.ebuild,v 1.1 2003/04/30 23:57:33 bass Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/emphetamine/emphetamine-0.99.6.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,10 +9,10 @@ SRC_URI="mirror://sourceforge/emphetamine/${P}.tar.gz"
 HOMEPAGE="http://emphetamine.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND="x11-libs/libelysium
 		x11-libs/libelysiumui"
 
 #RDEPEND=""
-S=${WORKDIR}/${P}
diff --git a/net-misc/etherwake/ChangeLog b/net-misc/etherwake/ChangeLog
index 5ff5834e7923..f4172635fd60 100644
--- a/net-misc/etherwake/ChangeLog
+++ b/net-misc/etherwake/ChangeLog
@@ -1,9 +1,31 @@
 # ChangeLog for net-misc/etherwake
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/etherwake/ChangeLog,v 1.1 2003/04/26 19:26:41 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/etherwake/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+  30 May 2005; Danny van Dyk <kugelfang@gentoo.org> etherwake-1.09.ebuild:
+  Fixed deprecated usage of gcc.eclass. (BUG #92745)
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> etherwake-1.09.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> etherwake-1.09.ebuild:
+  Adding amd64 keyword. Closing #45588.
+
+*etherwake-1.09 (12 Mar 2004)
+
+  12 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to close #43721.  Also roll a tarball so we dont put
+  plain text files onto mirrors and to make version tracking easier.
 
 *etherwake-1.08 (26 Apr 2003)
 
+  22 Dec 2003; Chuck Short <zul@gentoo.org> etherwake-1.08.ebuild:
+  Added die if compile fails, closes #36501.
+
+  07 Sep 2003; <iggy@gentoo.org> etherwake-1.08.ebuild:
+  changed the ebuild around a little, fixes some compile errors and bug #24270,
+  thanks to kloeri for the updated ebuild
+
   26 Apr 2003; Martin Holzer <mholzer@gentoo.org> etherwake-1.08.ebuild
   files/readme:
   Initial ebuild submitted by Alexander Holler <aholler@gentoo.de> in #20012
diff --git a/net-misc/etherwake/Manifest b/net-misc/etherwake/Manifest
index 706cea4f33ea..666560063eb8 100644
--- a/net-misc/etherwake/Manifest
+++ b/net-misc/etherwake/Manifest
@@ -1,4 +1,14 @@
-MD5 be7cc3721accecb5c8bd7c187be23900 ChangeLog 415
-MD5 28611680c27467eea61255e3ae6ac48e etherwake-1.08.ebuild 791
-MD5 461d7957de8d488c83e8064169f92858 files/readme 1386
-MD5 10d0c2648c8e6cce51b16933e63232ca files/digest-etherwake-1.08 110
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02c9ee20009db4031c546f3c4d6d3601 ChangeLog 1282
+MD5 26efd4550db51cd9ae8bf41e9e9efe74 etherwake-1.09.ebuild 856
+MD5 3b738e9a58dc4ea9b754effd1f4f9adf files/digest-etherwake-1.09 65
+MD5 4a3712748a1463fbce64673d13fca2b5 files/readme 1389
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCm13x5mJXAu5GbtIRAgUEAJ9U13UtoEbiZvUHdcbWKc0aJZEUxACbBe/N
+U1/L/uDW0Njfc1YMEXAFCnk=
+=OEbh
+-----END PGP SIGNATURE-----
diff --git a/net-misc/etherwake/etherwake-1.09.ebuild b/net-misc/etherwake/etherwake-1.09.ebuild
index b5a08a53ec6d..31e0719bb65d 100644
--- a/net-misc/etherwake/etherwake-1.09.ebuild
+++ b/net-misc/etherwake/etherwake-1.09.ebuild
@@ -1,9 +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-misc/etherwake/etherwake-1.09.ebuild,v 1.1 2004/03/12 23:57:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/etherwake/etherwake-1.09.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
+IUSE=""
 DESCRIPTION="This program generates and transmits a Wake-On-LAN (WOL) \"Magic Packet\", used for restarting machines that have been soft-powered-down (ACPI D3-warm state)."
 HOMEPAGE="http://www.scyld.com/expert/wake-on-lan.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
@@ -12,12 +13,12 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha ~amd64"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-	$(gcc-getCC) ${CFLAGS} -o etherwake ether-wake.c || die "Compile failed"
+	$(tc-getCC) ${CFLAGS} -o etherwake ether-wake.c || die "Compile failed"
 }
 
 src_install() {
diff --git a/net-misc/etherwake/files/readme b/net-misc/etherwake/files/readme
index 20ebaeb39ea6..55730b55d3e5 100644
--- a/net-misc/etherwake/files/readme
+++ b/net-misc/etherwake/files/readme
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/etherwake/files/readme,v 1.1 2003/04/26 16:27:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/etherwake/files/readme,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 	This program generates and transmits a Wake-On-LAN (WOL) "Magic Packet",
 	used for restarting machines that have been soft-powered-down
diff --git a/net-misc/fakeidentd/ChangeLog b/net-misc/fakeidentd/ChangeLog
index d6e414c6fcf1..2399dc315715 100644
--- a/net-misc/fakeidentd/ChangeLog
+++ b/net-misc/fakeidentd/ChangeLog
@@ -1,11 +1,70 @@
 # ChangeLog for net-misc/fakeidentd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+*fakeidentd-2.2-r1 (12 Mar 2005)
+
+  12 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/fakeidentd-2.2-ident-unix.patch, +fakeidentd-2.2-r1.ebuild:
+  Add patch to identify as UNIX instead of OTHER #82675 by Steven Hay.
+
+*fakeidentd-2.2 (19 Sep 2004)
+
+  19 Sep 2004; Mike Frysinger <vapier@gentoo.org> files/fakeidentd.rc,
+  +fakeidentd-2.2.ebuild:
+  Version bump #64285 by Christian Schlotter.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> fakeidentd-2.0-r1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> fakeidentd-2.0-r1.ebuild:
+  Add inherit eutils
+
+  13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> fakeidentd-2.0-r1.ebuild:
+  marked ~amd64
+
+*fakeidentd-2.0-r1 (05 Sep 2003)
+
+  05 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to make sure memory is zeroed out.
+
+*fakeidentd-2.0 (17 Jun 2003)
+
+  17 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + created custom tbz2 to hold source files.
+
+*fakeidentd-1.7-r1 (03 Feb 2003)
+
+  10 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fixed the filename of the pid the script writes to.
+
+  03 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix init.d script #14703.
+
+*fakeidentd-1.7 (23 Oct 2002)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Saved from the Attic ;)  (fakeidentd-1.5 and previous have root exploits)
+
+*fakeidentd-1.4-r8 (3 May 2002)
+
+  6 Jul 2002; phoen][x <phoenixp@gentoo.org> fakeidentd-1.4-r8.ebuild :
+  Added KEYWORDS.
+
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :  
+  Added LICENSE, SLOT, $Headers.
+
+*fakeidentd-1.4-r7 (1 Apr 2002)
+
+  1 Apr 2002; Donny Davies <woodchip@gentoo.org> fakeidentd-1.4-r7,
+  files/fakeidentd.confd files/fakeidentd.rc6 :
+  Added an /etc/conf.d/fakeidentd file for those who want to easily change
+  what it replies with ;)  Patched the source to write its PID to fakeidentd.pid
+  instead of identd.pid.  Tweaked the initscript accordingly.
 
 *fakeidentd-1.4-r6 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  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-misc/fakeidentd/Manifest b/net-misc/fakeidentd/Manifest
index e69de29bb2d1..3fa9d8dd733d 100644
--- a/net-misc/fakeidentd/Manifest
+++ b/net-misc/fakeidentd/Manifest
@@ -0,0 +1,7 @@
+MD5 27ce108a07eb8c67d97cca71be120e73 ChangeLog 2636
+MD5 727d0c5985da0066a60f21b3bbcdd1ae fakeidentd-2.2-r1.ebuild 931
+MD5 d679afc0c9c81b7e99c93482626fc7f6 files/2.0-memset.patch 327
+MD5 1f4869ca57a631819594bf1304d10c43 files/digest-fakeidentd-2.2-r1 65
+MD5 4c55675bab1ae95b2d6a8b521eba3983 files/fakeidentd.confd 399
+MD5 b1186abff99f7c0f7b48a5ab11f5b71c files/fakeidentd.rc 505
+MD5 79c3aa65f6d45c7238024526379e5820 files/fakeidentd-2.2-ident-unix.patch 129
diff --git a/net-misc/fakeidentd/fakeidentd-2.2-r1.ebuild b/net-misc/fakeidentd/fakeidentd-2.2-r1.ebuild
index 7da2dbdb2b64..8ecf8956dbca 100644
--- a/net-misc/fakeidentd/fakeidentd-2.2-r1.ebuild
+++ b/net-misc/fakeidentd/fakeidentd-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/net-misc/fakeidentd/fakeidentd-2.2-r1.ebuild,v 1.1 2005/03/12 20:50:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/fakeidentd-2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-misc/fakeidentd/files/fakeidentd.confd b/net-misc/fakeidentd/files/fakeidentd.confd
index 6f957ebf1168..5a1793df5901 100644
--- a/net-misc/fakeidentd/files/fakeidentd.confd
+++ b/net-misc/fakeidentd/files/fakeidentd.confd
@@ -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/net-misc/fakeidentd/files/fakeidentd.confd,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
 # Config file for /etc/init.d/fakeidentd
 
 # Change this to whatever you want the daemon to reply with.
-# By default it answers with "nobody" anyway..
+# The daemon will default to 'nobody' ...
 
 #FAKEIDENTD_OPTS="nobody"
diff --git a/net-misc/fakeidentd/files/fakeidentd.rc b/net-misc/fakeidentd/files/fakeidentd.rc
index 218ae35ef817..44fa22315ad2 100644
--- a/net-misc/fakeidentd/files/fakeidentd.rc
+++ b/net-misc/fakeidentd/files/fakeidentd.rc
@@ -1,21 +1,22 @@
 #!/sbin/runscript
-# 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-misc/fakeidentd/files/fakeidentd.rc,v 1.1 2002/10/23 14:37:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fakeidentd/files/fakeidentd.rc,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
 	ebegin "Starting fakeidentd"
-	start-stop-daemon --start --quiet --startas /usr/sbin/fakeidentd \
-		--pidfile /var/run/fakeidentd.pid -- ${FAKEIDENTD_OPTS}
+	fakeidentd ${FAKEIDENTD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping fakeidentd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/fakeidentd.pid
-	eend $?
+	start-stop-daemon --stop --pidfile /var/run/fakeidentd.pid
+	local ret=$?
+	rm -f /var/run/fakeidentd.pid
+	eend ${ret}
 }
diff --git a/net-misc/ferm/ChangeLog b/net-misc/ferm/ChangeLog
index 36c81adc36d8..defd82a1addc 100644
--- a/net-misc/ferm/ChangeLog
+++ b/net-misc/ferm/ChangeLog
@@ -1,9 +1,29 @@
 # ChangeLog for net-misc/ferm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ChangeLog,v 1.1 2002/05/26 22:37:15 lamer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
+  02 Nov 2005; Carsten Lohrke <carlo@gentoo.org> ferm-1.1.ebuild:
+  updated urls, #111263
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> ferm-1.1.ebuild:
+  Stable on ppc.
+
+  27 Jan 2005; lanius@gentoo.org ferm-1.1.ebuild:
+  mark 1.1 stable
+
+*ferm-1.1 (13 Oct 2003)
+
+  13 Oct 2003; Heinrich Wendel <lanius@gentoo.org> :
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ferm-1.1_pre7 (26 May 2002)
 
+  06 Jul 2002; phoen][x <phoenix@gentoo.org> ChangeLog, ferm-1.1_pre7.ebuild
+  Added KEYWORDS.
+
   25 May 2002; Ben Lutgens <lamer@gentoo.org> ChangeLog, ferm-1.1_pre7.ebuild
-  files/digest-ferm-1.1_pre7: Initial commit to portage. 
+  files/digest-ferm-1.1_pre7: 
+  Initial commit to portage. 
  
diff --git a/net-misc/ferm/Manifest b/net-misc/ferm/Manifest
index e69de29bb2d1..3f4a582e6a19 100644
--- a/net-misc/ferm/Manifest
+++ b/net-misc/ferm/Manifest
@@ -0,0 +1,3 @@
+MD5 63c56dd0c71f8e7b800ab219e770e10a ChangeLog 890
+MD5 02895495caf24121cab0cce026656605 ferm-1.1.ebuild 682
+MD5 dd0943f63b53183454881350f5d4990c files/digest-ferm-1.1 59
diff --git a/net-misc/ferm/ferm-1.1.ebuild b/net-misc/ferm/ferm-1.1.ebuild
index bcf8c2aa0d00..cfc53b486896 100644
--- a/net-misc/ferm/ferm-1.1.ebuild
+++ b/net-misc/ferm/ferm-1.1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ferm-1.1.ebuild,v 1.1 2003/10/13 11:01:39 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ferm-1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 DESCRIPTION="Command line util for managing firewall rules"
-HOMEPAGE="http://ferm.sf.net"
+HOMEPAGE="http://ferm.foo-projects.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ppc"
+IUSE=""
 SLOT="0"
 DEPEND=""
 RDEPEND="dev-lang/perl
 	|| ( net-firewall/iptables net-firewall/ipchains )"
-SRC_URI="http://ferm.sourceforge.net/${P}.tar.gz"
+SRC_URI="http://ferm.foo-projects.org/download/${P}.tar.gz"
 
 src_install () {
 	make PREFIX=${D}/usr DOCDIR="${D}/usr/share/doc/${PF}" install
diff --git a/net-misc/fsh/ChangeLog b/net-misc/fsh/ChangeLog
index 3058c84ee80c..fd655b45ebc0 100644
--- a/net-misc/fsh/ChangeLog
+++ b/net-misc/fsh/ChangeLog
@@ -1,7 +1,29 @@
-# ChangeLog for net-misc/fsh 
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/ChangeLog,v 1.1 2002/10/02 03:46:02 drobbins Exp $
+# ChangeLog for net-misc/fsh
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
+*fsh-1.2-r2 (09 Jun 2005)
+
+  09 Jun 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/fsh-1.2-gentoo-fcntl.patch, fsh-1.2-r1.ebuild, +fsh-1.2-r2.ebuild:
+  Fixed FCNTL problem with Python 2.4 bug# 95533
+
+  16 Sep 2004; <blubb@gentoo.org> fsh-1.2-r1.ebuild:
+  added ~amd64
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  13 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> fsh-1.2-r1.ebuild,
+  -fsh-1.2.ebuild:
+  don't set rdepend==depend; tidy
+
+*fsh-1.2-r1 (23 Apr 2003)
+
+  23 Apr 2003; Wout Mertens <wmertens@gentoo.org>
+  	fsh-1.2-r1.ebuild files/fsh-1.2-fcpwrap.patch:
+  Fixed bug where fcp user@host would fail. Reported upstream.
+  
 *fsh-1.2 (01 Oct 2002)
 
   01 Oct 2002; Daniel Robbins <drobbins@gentoo.org>: Initial package.
diff --git a/net-misc/fsh/Manifest b/net-misc/fsh/Manifest
index e69de29bb2d1..41caeba402b3 100644
--- a/net-misc/fsh/Manifest
+++ b/net-misc/fsh/Manifest
@@ -0,0 +1,7 @@
+MD5 a7c36b9bf564165c3b8f03195e1a2db9 ChangeLog 970
+MD5 9e68c6c5f6569227db760ed87c70ef4b fsh-1.2-r1.ebuild 841
+MD5 3e381af6a53567fde6bd0564ced968e8 fsh-1.2-r2.ebuild 910
+MD5 300b043054e7206e2a05f8e11653b65a files/fsh-1.2-gentoo-fcntl.patch 1198
+MD5 b784b126706d26f48759c60d6b2a5c45 files/digest-fsh-1.2-r1 59
+MD5 2822dfff6a02066868da8c3ab1ccc775 files/fsh-1.2-fcpwrap.patch 460
+MD5 b784b126706d26f48759c60d6b2a5c45 files/digest-fsh-1.2-r2 59
diff --git a/net-misc/fsh/fsh-1.2-r1.ebuild b/net-misc/fsh/fsh-1.2-r1.ebuild
index cc9fa6c729db..e3cdd68fa20a 100644
--- a/net-misc/fsh/fsh-1.2-r1.ebuild
+++ b/net-misc/fsh/fsh-1.2-r1.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/fsh-1.2-r1.ebuild,v 1.1 2003/04/23 13:19:57 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/fsh-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="System to allow fast-reuse of a ssh secure tunnel to avoid connection lag"
 HOMEPAGE="http://www.lysator.liu.se/fsh/"
 SRC_URI="http://www.lysator.liu.se/fsh/${P}.tar.gz"
-KEYWORDS="x86"
-SLOT="0"
+
 LICENSE="GPL-2"
-DEPEND="net-misc/openssh dev-lang/python"
-RDEPEND="$DEPEND"
+SLOT="0"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
+DEPEND="net-misc/openssh
+	<dev-lang/python-2.4"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/net-misc/fsh/fsh-1.2-r2.ebuild b/net-misc/fsh/fsh-1.2-r2.ebuild
index cc369714569c..fbc39028d21a 100644
--- a/net-misc/fsh/fsh-1.2-r2.ebuild
+++ b/net-misc/fsh/fsh-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/net-misc/fsh/fsh-1.2-r2.ebuild,v 1.1 2005/06/09 16:22:50 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/fsh/fsh-1.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/geekcredit/ChangeLog b/net-misc/geekcredit/ChangeLog
index 65d981de9a4f..e281ea36ef11 100644
--- a/net-misc/geekcredit/ChangeLog
+++ b/net-misc/geekcredit/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-misc/geekcredit
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/geekcredit/ChangeLog,v 1.1 2004/03/28 16:41:24 zul Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/geekcredit/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+  06 Nov 2004; <pyrania@gentoo.org> geekcredit-0.019.ebuild:
+  Marked stable on x86.
+
+  21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  geekcredit-0.016.ebuild:
+  tidy
+
+  21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -geekcredit-0.015.ebuild:
+  clean older ebuild
+
+  18 Jul 2004; Chuck Short <zul@gentoo.org> geekcredit-0.015.ebuild,
+  geekcredit-0.016.ebuild, geekcredit-0.019.ebuild:
+  Changed DESCRIPTION to somehting more approriate closes. #56578.
+
+*geekcredit-0.019 (26 Jun 2004)
+
+  26 Jun 2004; Chuck Short <zul@gentoo.org> geekcredit-0.019.ebuild:
+  Version bump.
+
+  26 Jun 2004; Chuck Short <zul@gentoo.org> geekcredit-0.016.ebuild:
+  Marked stable for x86.
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> geekcredit-0.016.ebuild:
+  Added to ~ppc.
+
+*geekcredit-0.016 (09 Apr 2004)
+
+  09 Apr 2004; Chuck Short <zul@gentoo.org> geekcredit-0.016.ebuild:
+  Version bump, closes #46318.
+
+  09 Apr 2004; Chuck Short <zul@gentoo.org> geekcredit-0.015.ebuild:
+  Marked stable for x86.
+
+  28 Mar 2004; Chuck Short <zul@gentoo.org> geekcredit-0.015.ebuild:
+  Fix for python version detection, closes #46029.
 
 *geekcredit-0.015 (28 Mar 2004)
 
diff --git a/net-misc/geekcredit/Manifest b/net-misc/geekcredit/Manifest
index 9a4a27601cf9..f300dd575402 100644
--- a/net-misc/geekcredit/Manifest
+++ b/net-misc/geekcredit/Manifest
@@ -1,3 +1,15 @@
-MD5 edbe011eee0b954240a0455770ef2501 geekcredit-0.015.ebuild 799
-MD5 63f9e5ed97ce62077f0dc7a01447b00f ChangeLog 347
-MD5 b09af4129fc6bc270d9d12396940a2d0 files/digest-geekcredit-0.015 56
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 021dd35ac984a3f039fab4ed590c49d1 ChangeLog 1554
+MD5 ff0a404bf089b8ea5030a1db714da3ae geekcredit-0.019.ebuild 906
+MD5 df5e2da74d359c296b5c444dd2bc0db3 geekcredit-0.016.ebuild 912
+MD5 3df3152b954075ec3f7e2363caef687d files/digest-geekcredit-0.019 56
+MD5 c0fb9e1d5c28f53fb7de46b2095ae577 files/digest-geekcredit-0.016 56
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjPebI7fK2cqeyXkRApf8AKCb4SB9jtnTx6NWs5Rw4k8SEbt2fwCg5UMS
+eAJS+/cedvpp7hakPMx82BM=
+=Bw7r
+-----END PGP SIGNATURE-----
diff --git a/net-misc/geekcredit/geekcredit-0.016.ebuild b/net-misc/geekcredit/geekcredit-0.016.ebuild
index 9b2edd737554..2b1853b1865b 100644
--- a/net-misc/geekcredit/geekcredit-0.016.ebuild
+++ b/net-misc/geekcredit/geekcredit-0.016.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/geekcredit/geekcredit-0.016.ebuild,v 1.1 2004/04/09 16:04:46 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/geekcredit/geekcredit-0.016.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 inherit python
 
 MY_P=${P/geekcredit/gc}
-IUSE=""
-DESCRIPTION="Rawdog - RSS Aggregator Without Delusions Of Grandeur"
-SRC_URI="http://download.gna.org/geekcredit/${MY_P}.tgz"
+DESCRIPTION="Digital complementary currency for internet."
 HOMEPAGE="http://www.geekcredit.org/"
-SLOT="0"
+SRC_URI="http://download.gna.org/geekcredit/${MY_P}.tgz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
+
 DEPEND="virtual/python
 		app-crypt/gnupg"
-RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	einfo "There is nothing to compile."
diff --git a/net-misc/geekcredit/geekcredit-0.019.ebuild b/net-misc/geekcredit/geekcredit-0.019.ebuild
index d627e1bc7899..7902037fc0a2 100644
--- a/net-misc/geekcredit/geekcredit-0.019.ebuild
+++ b/net-misc/geekcredit/geekcredit-0.019.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/geekcredit/geekcredit-0.019.ebuild,v 1.1 2004/06/26 15:29:16 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/geekcredit/geekcredit-0.019.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 inherit python
 
 MY_P=${P/geekcredit/gc}
 IUSE=""
-DESCRIPTION="Rawdog - RSS Aggregator Without Delusions Of Grandeur"
+DESCRIPTION="Digital complementary currency for internet."
 SRC_URI="http://download.gna.org/geekcredit/${MY_P}.tgz"
 HOMEPAGE="http://www.geekcredit.org/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 DEPEND="virtual/python
 		app-crypt/gnupg"
-RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-misc/getdate/ChangeLog b/net-misc/getdate/ChangeLog
index bb323dbeb6f0..f7b66f1d4ce6 100644
--- a/net-misc/getdate/ChangeLog
+++ b/net-misc/getdate/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-misc/getdate
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/getdate/ChangeLog,v 1.1 2003/12/06 15:39:46 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/getdate/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> getdate-1.2.ebuild:
+  Stable on ppc.
+
+  17 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> getdate-1.2.ebuild:
+  Added to ~ppc, bug 82045.
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> getdate-1.2.ebuild:
+  Add ~mips for my XXS1500 hardware.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> getdate-1.2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org> getdate-1.2.ebuild:
+  fixing homepage closes 37093
+
+  11 Dec 2003; Chuck Short <zul@gentoo.org> getdate-1.2.ebuild:
+  Added -DHAVE_ADJTIME closes #35597.
 
 *getdate-1.2 (06 Dec 2003)
 
diff --git a/net-misc/getdate/Manifest b/net-misc/getdate/Manifest
index 95958f7ad6b5..5cbcfea637ae 100644
--- a/net-misc/getdate/Manifest
+++ b/net-misc/getdate/Manifest
@@ -1,2 +1,14 @@
-MD5 872eca81a53d885f088994cf9c207ba7 getdate-1.2.ebuild 663
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f91ba078a1f5f0b0097ecb497a1e798d ChangeLog 1049
 MD5 d2ce55fde628cfd4d7493625da97c22e files/digest-getdate-1.2 68
+MD5 c73958bf8452f120e072f78bffbb0dd0 getdate-1.2.ebuild 787
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC67+rI1lqEGTUzyQRAvgRAJwIR9hihgyavssCo2pnoGy0rVq8GgCdHAq/
+KNpNDr5ig/9y1LXr6Er6JJ0=
+=BrQQ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/getdate/getdate-1.2.ebuild b/net-misc/getdate/getdate-1.2.ebuild
index 0959812054c7..7c647961ca9d 100644
--- a/net-misc/getdate/getdate-1.2.ebuild
+++ b/net-misc/getdate/getdate-1.2.ebuild
@@ -1,33 +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/net-misc/getdate/getdate-1.2.ebuild,v 1.1 2003/12/06 15:39:46 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/getdate/getdate-1.2.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+inherit toolchain-funcs
 
 MY_PN=${PN}_rfc868
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_P}
 
+IUSE=""
 DESCRIPTION="Network Date/Time Query and Set Local Date/Time Utility"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/netowrk/misc/"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/network/misc/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/system/network/misc/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~mips ppc"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-}
-
 src_compile() {
-	gcc ${CFLAGS} -s -o getdate getdate.c || die
+	$(tc-getCC) ${CFLAGS} -DHAVE_ADJTIME -s -o getdate getdate.c || die
 }
 
 src_install() {
-	doman getdate.8
 	dobin getdate
+	doman getdate.8
 	dodoc README getdate-cron
 }
-
diff --git a/net-misc/gfax/ChangeLog b/net-misc/gfax/ChangeLog
index adbdb3957758..d159126feb08 100644
--- a/net-misc/gfax/ChangeLog
+++ b/net-misc/gfax/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-misc/gfax
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gfax/ChangeLog,v 1.1 2004/11/27 14:26:49 genstef Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gfax/ChangeLog,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
+
+  24 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/gfax.Makefile.fix, -gfax-0.6.4.ebuild:
+  Remove old version, bug 86328
+
+  24 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/gfax.Makefile.fix, -gfax-0.6.4.ebuild:
+  Remove old version, bug 86328
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> gfax-0.6.4.ebuild,
+  gfax-0.7.2.ebuild, gfax-0.7.3.ebuild:
+  mono moved from dev-dotnet -> dev-lang
+
+*gfax-0.7.3 (01 Mar 2005)
+
+  01 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/gfax-0.7.3-sandbox.diff, +gfax-0.7.3.ebuild:
+  Version bump.
+
+*gfax-0.7.2 (27 Feb 2005)
+
+  27 Feb 2005; Stefan Schweizer <genstef@gentoo.org> +gfax-0.7.2.ebuild:
+  Version bump thanks to ramses on freenode and Yaakov S
+  <yselkowitz@hotmail.com> in bug 83124
+
+  13 Dec 2004; Stefan Schweizer <genstef@gentoo.org> gfax-0.6.4.ebuild:
+  Fix up the sandbox violation (inherit mono), depend on new gtk-sharp, remove
+  standard src_compile
 
 *gfax-0.6.4 (27 Nov 2004)
 
diff --git a/net-misc/gfax/Manifest b/net-misc/gfax/Manifest
index d0aab98dbab7..479f5c599e0a 100644
--- a/net-misc/gfax/Manifest
+++ b/net-misc/gfax/Manifest
@@ -1,4 +1,17 @@
-MD5 1f84404bd3b3c86e5aa8b167c5bae337 gfax-0.6.4.ebuild 1097
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a64f9f011488bf936f4e6bb34e07b531 gfax-0.7.3.ebuild 907
+MD5 32b902cc32b603267fb83db662f258e1 gfax-0.7.2.ebuild 1042
+MD5 4800854ac25d81ab970ca81efca3ddef ChangeLog 1319
 MD5 c53eee9a4a730fba7506b48bf7f2ab65 metadata.xml 266
-MD5 7545276372ae90ca163db2d8b085504f files/digest-gfax-0.6.4 62
-MD5 22016d3e713e7071754daf80c1f1547c files/gfax.Makefile.fix 1600
+MD5 6e2fdfadf79ed929912a994520275152 files/digest-gfax-0.7.2 64
+MD5 e119c81dd1130aed1e0fb01e7e41c5bd files/digest-gfax-0.7.3 64
+MD5 36c102163f847ff2cad2fb2d1dd17b10 files/gfax-0.7.3-sandbox.diff 1812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1w5aBXaUFmZvwyMRArUyAJ0c01JhUwDX/S0RtQQjmRU6kqk0fQCguuBY
+BYJRoj7j0Hco4RAcKH6Gmy8=
+=ly8z
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gfax/gfax-0.7.2.ebuild b/net-misc/gfax/gfax-0.7.2.ebuild
index 6ab69eba8f9d..e3dca51ae0ec 100644
--- a/net-misc/gfax/gfax-0.7.2.ebuild
+++ b/net-misc/gfax/gfax-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gfax/gfax-0.7.2.ebuild,v 1.1 2005/02/27 07:06:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gfax/gfax-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
 inherit gnome2 mono
 
@@ -11,9 +11,9 @@ SRC_URI="http://gfax.cowlug.org/${P}-2.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="${IUSE}"
+IUSE=""
 
-RDEPEND=">=dev-dotnet/mono-0.93
+RDEPEND=">=dev-lang/mono-0.93
 	=dev-dotnet/gtk-sharp-1.0*
 	=dev-dotnet/gconf-sharp-1.0*
 	=dev-dotnet/glade-sharp-1.0*
diff --git a/net-misc/gfax/gfax-0.7.3.ebuild b/net-misc/gfax/gfax-0.7.3.ebuild
index 09e982b89227..c082c48755af 100644
--- a/net-misc/gfax/gfax-0.7.3.ebuild
+++ b/net-misc/gfax/gfax-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gfax/gfax-0.7.3.ebuild,v 1.1 2005/03/01 15:52:01 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gfax/gfax-0.7.3.ebuild,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
 inherit gnome2 mono eutils
 
@@ -11,9 +11,9 @@ SRC_URI="http://gfax.cowlug.org/${P}-1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="${IUSE}"
+IUSE=""
 
-RDEPEND=">=dev-dotnet/mono-0.93
+RDEPEND=">=dev-lang/mono-0.93
 	=dev-dotnet/gtk-sharp-1.0*
 	=dev-dotnet/gconf-sharp-1.0*
 	=dev-dotnet/glade-sharp-1.0*
diff --git a/net-misc/gip/ChangeLog b/net-misc/gip/ChangeLog
index 8432a24b5c53..2721c9e12720 100644
--- a/net-misc/gip/ChangeLog
+++ b/net-misc/gip/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-misc/gip
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/ChangeLog,v 1.1 2004/06/25 02:15:51 jmglov Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
+
+*gip-1.6.0.1 (03 Sep 2005)
+
+  03 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> gip-1.0.0.1.ebuild,
+  gip-1.1.0.1.ebuild, gip-1.2.0.1.ebuild, +gip-1.6.0.1.ebuild:
+  Update HOMEPAGE, use versionator eclass and other misc fixes. Version bump.
+  Also fix dependencies for bug 80540. Thanks to Yaakov S
+  <yselkowitz@hotmail.com>.
+
+*gip-1.2.0.1 (20 Jul 2004)
+
+  20 Jul 2004; Josh Glover <jmglov@gentoo.org> gip-1.2.0.1.ebuild:
+  Version bump
+
+*gip-1.1.0.1 (08 Jul 2004)
+
+  08 Jul 2004; Josh Glover <jmglov@gentoo.org> gip-1.1.0.1.ebuild:
+  Version bump; submitted by Josh Glover in bug #55055
+
+  26 Jun 2004; Josh Glover <jmglov@gentoo.org> gip-1.0.0.1.ebuild:
+  Incorporates fix to Bug #55186 submitted solar@gentoo.org
 
 *gip-1.0.0.1 (24 Jun 2004)
 
diff --git a/net-misc/gip/Manifest b/net-misc/gip/Manifest
index 302805834cb0..e7444a2ca284 100644
--- a/net-misc/gip/Manifest
+++ b/net-misc/gip/Manifest
@@ -1,3 +1,10 @@
-MD5 1754fc782962f4e36a516be27d374176 gip-1.0.0.1.ebuild 750
+MD5 8a53eb39ad42b55721197efc729a0108 gip-1.6.0.1.ebuild 826
+MD5 81d9a12b54b9683f35b17f0329ef654f gip-1.0.0.1.ebuild 910
+MD5 d732b5b3dae45e9796cafc225ebd6db2 gip-1.1.0.1.ebuild 826
+MD5 6606f19aed1b7083fac48c13085c937c ChangeLog 1089
 MD5 bd88a65c4405e658c75071358df012d4 metadata.xml 453
+MD5 5a9ebee29a770b6fb5e53c002f79ff42 gip-1.2.0.1.ebuild 826
 MD5 f60b5b5a5df13f2d18b926622b6fa5d3 files/digest-gip-1.0.0.1 62
+MD5 50552573e797b6ba0f31cb67a9cc72dc files/digest-gip-1.1.0.1 62
+MD5 2bdd73299a67c8f6fd0bff4794e8aa25 files/digest-gip-1.2.0.1 62
+MD5 0f3ca45005bdd0128c00c5d715164d3c files/digest-gip-1.6.0.1 62
diff --git a/net-misc/gip/gip-1.0.0.1.ebuild b/net-misc/gip/gip-1.0.0.1.ebuild
index d85a5fe28f6e..e28c0155c5d4 100644
--- a/net-misc/gip/gip-1.0.0.1.ebuild
+++ b/net-misc/gip/gip-1.0.0.1.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/net-misc/gip/gip-1.0.0.1.ebuild,v 1.1 2004/06/25 02:15:51 jmglov Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.0.0.1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
-MY_PV=`echo ${PV} | sed -e 's/.\([0-9]\+\)$/-\1/' 2>/dev/null`
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="a nice GNOME GUI for making IP address based calculations"
-HOMEPAGE="http://www.debain.org/?session=&site=2&project=19&cat=56"
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+DESCRIPTION="A nice GNOME GUI for making IP address based calculations"
+HOMEPAGE="http://www.debain.org/software/gip/"
 SRC_URI="http://web222.mis02.de/releases/gip/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,17 +14,22 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND="dev-cpp/gtkmm
-	>=dev-libs/glib-2.2.3"
-#RDEPEND=""
+DEPEND="=dev-cpp/gtkmm-2.2*
+	>=dev-libs/glib-2.2.3
+	=dev-libs/libsigc++-1.2*"
+
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+src_unpack() {
+	unpack ${A}
+	sed -i -e s/"*matches\["/"*matches\[1+"/g ${S}/src/lib_ipv4.c
+}
 
 src_compile() {
 	./build.sh --prefix ${D}/usr || die "./build failed"
 }
 
 src_install() {
-	dodoc AUTHORS COPYING INSTALL README
+	dodoc AUTHORS INSTALL README
 	./build.sh --install --prefix ${D}/usr || die "./build --install failed"
 }
diff --git a/net-misc/gip/gip-1.1.0.1.ebuild b/net-misc/gip/gip-1.1.0.1.ebuild
index 769396d17713..e091af50c30c 100644
--- a/net-misc/gip/gip-1.1.0.1.ebuild
+++ b/net-misc/gip/gip-1.1.0.1.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/net-misc/gip/gip-1.1.0.1.ebuild,v 1.1 2004/07/08 11:23:22 jmglov Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
-MY_PV=`echo ${PV} | sed -e 's/.\([0-9]\+\)$/-\1/' 2>/dev/null`
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="a nice GNOME GUI for making IP address based calculations"
-HOMEPAGE="http://www.debain.org/?session=&site=2&project=19&cat=56"
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+DESCRIPTION="A nice GNOME GUI for making IP address based calculations"
+HOMEPAGE="http://www.debain.org/software/gip/"
 SRC_URI="http://web222.mis02.de/releases/gip/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,17 +14,17 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND="dev-cpp/gtkmm
-	>=dev-libs/glib-2.2.3"
-#RDEPEND=""
+DEPEND="=dev-cpp/gtkmm-2.2*
+	>=dev-libs/glib-2.2.3
+	=dev-libs/libsigc++-1.2*"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	./build.sh --prefix ${D}/usr || die "./build failed"
 }
 
 src_install() {
-	dodoc AUTHORS COPYING INSTALL README
+	dodoc AUTHORS CHANGELOG INSTALL README
 	./build.sh --install --prefix ${D}/usr || die "./build --install failed"
 }
diff --git a/net-misc/gip/gip-1.2.0.1.ebuild b/net-misc/gip/gip-1.2.0.1.ebuild
index 8ae267d4a348..f730cac4fd72 100644
--- a/net-misc/gip/gip-1.2.0.1.ebuild
+++ b/net-misc/gip/gip-1.2.0.1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.2.0.1.ebuild,v 1.1 2004/07/20 12:29:46 jmglov Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
-MY_PV=`echo ${PV} | sed -e 's/.\([0-9]\+\)$/-\1/' 2>/dev/null`
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="a nice GNOME GUI for making IP address based calculations"
-HOMEPAGE="http://www.debain.org/?session=&site=2&project=19&cat=56"
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+DESCRIPTION="A nice GNOME GUI for making IP address based calculations"
+HOMEPAGE="http://www.debain.org/software/gip/"
 SRC_URI="http://web222.mis02.de/releases/gip/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,17 +14,17 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND="dev-cpp/gtkmm
-	>=dev-libs/glib-2.2.3"
-#RDEPEND=""
+DEPEND="=dev-cpp/gtkmm-2.2*
+	>=dev-libs/glib-2.2.3
+	=dev-libs/libsigc++-1.2*"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	./build.sh --prefix ${D}/usr || die "./build failed"
 }
 
 src_install() {
-	dodoc AUTHORS COPYING INSTALL README
+	dodoc AUTHORS CHANGELOG INSTALL README
 	./build.sh --install --prefix ${D}/usr || die "./build --install failed"
 }
diff --git a/net-misc/gip/gip-1.6.0.1.ebuild b/net-misc/gip/gip-1.6.0.1.ebuild
index 922c4bf88b50..46005824a90f 100644
--- a/net-misc/gip/gip-1.6.0.1.ebuild
+++ b/net-misc/gip/gip-1.6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.6.0.1.ebuild,v 1.1 2005/09/03 20:55:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gip/gip-1.6.0.1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 inherit versionator
 
diff --git a/net-misc/gnomba/ChangeLog b/net-misc/gnomba/ChangeLog
index cf364282f15e..efea8d0068fb 100644
--- a/net-misc/gnomba/ChangeLog
+++ b/net-misc/gnomba/ChangeLog
@@ -1,11 +1,41 @@
 # ChangeLog for net-misc/gnomba
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/ChangeLog,v 1.1 2002/06/14 18:44:05 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+  27 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnomba-0.6.2-r1.ebuild:
+  Stable on sparc
+
+  23 May 2005; John N. Laliberte <allanonjl@gentoo.org>
+  gnomba-0.6.2-r1.ebuild:
+  stabilize 0.6.2-r1, fixes #81811
+
+*gnomba-0.6.2-r1 (17 Oct 2004)
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org> +metadata.xml,
+  +gnomba-0.6.2-r1.ebuild:
+  ebuild overhaul from Sven Wegener <swegener@gentoo.org> (#38279)
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> gnomba-0.6.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+  08 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gnomba-0.6.2.ebuild:
+  add nls to IUSE; error messages; tidy
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gnomba-0.6.2.ebuild:
+  fix depend (bug #45110); tidy
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  27 Nov 2002; foser <foser@gentoo.org> gnomba-0.6.2.ebuild :
+  Fix .desktop file (bug #11199)
 
 *gnomba-0.6.2 (14 June 2002)
 
-  14 June 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
-  
+  14 June 2002; phoen][x <phoenix@gentoo.org> gnomba-0.6.2.ebuild :  
+  Added KEYWORDS, LICENSE, SLOT.
+	
+  14 June 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-misc/gnomba/Manifest b/net-misc/gnomba/Manifest
index e69de29bb2d1..f1e3735fc4fb 100644
--- a/net-misc/gnomba/Manifest
+++ b/net-misc/gnomba/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 974c2cf1abaef0c2912ef48576664529 gnomba-0.6.2-r1.ebuild 1048
+MD5 2172ae164f492fe0967e80b58927c768 gnomba-0.6.2.ebuild 897
+MD5 99ff8251cd23deb3b613ae87793fc82e ChangeLog 1702
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 900ccd7d2abcc3d34cc0858830561440 files/digest-gnomba-0.6.2-r1 64
+MD5 900ccd7d2abcc3d34cc0858830561440 files/digest-gnomba-0.6.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1w+3BXaUFmZvwyMRAqPjAKCBnOoJstUJhx7kE25qQzwrCJ4iGgCfQ8VN
+/4RhthIPohyedQKn4cCiOkc=
+=qSnM
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gnomba/gnomba-0.6.2-r1.ebuild b/net-misc/gnomba/gnomba-0.6.2-r1.ebuild
index 9f809cdce785..ec51eb0a91d1 100644
--- a/net-misc/gnomba/gnomba-0.6.2-r1.ebuild
+++ b/net-misc/gnomba/gnomba-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/gnomba-0.6.2-r1.ebuild,v 1.1 2004/10/17 18:37:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/gnomba-0.6.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils
 
@@ -8,15 +8,15 @@ DESCRIPTION="Gnome Samba Browser"
 SRC_URI="http://gnomba.sourceforge.net/src/${P}.tar.gz"
 HOMEPAGE="http://gnomba.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc"
 SLOT="0"
 
-IUSE="debug nls"
+IUSE="debug"
 DEPEND="gnome-base/gnome-libs"
 
 src_compile() {
 	econf `use_enable debug` || die "econf failed"
-	# We touch the Makefile here, because the configure script 
+	# We touch the Makefile here, because the configure script
 	# touches Makefile.in and we want to avoid the recreation
 	touch Makefile
 	emake \
diff --git a/net-misc/gnomba/gnomba-0.6.2.ebuild b/net-misc/gnomba/gnomba-0.6.2.ebuild
index 631f06acb1c4..1c05d649c2a4 100644
--- a/net-misc/gnomba/gnomba-0.6.2.ebuild
+++ b/net-misc/gnomba/gnomba-0.6.2.ebuild
@@ -1,32 +1,35 @@
-# 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-misc/gnomba/gnomba-0.6.2.ebuild,v 1.1 2002/06/14 18:44:05 rphillips Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/gnomba-0.6.2.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Samba Browser"
-SRC_URI="http://gnomba.sourceforge.net/src/${P}.tar.gz"
 HOMEPAGE="http://gnomba.sourceforge.net"
+SRC_URI="http://gnomba.sourceforge.net/src/${P}.tar.gz"
 
-DEPEND="virtual/glibc
-		gnome-libs"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE="nls"
 
-RDEPEND="gnome-libs"
+RDEPEND="gnome-base/gnome-libs"
+DEPEND="${RDEPEND}
+	virtual/libc"
 
-src_unpack () 
-{
-	unpack ${A}
-	cd ${S}
+src_compile() {
+	./configure \
+		$(use_enable nls) \
+		--prefix=/usr \
+		--host=${CHOST} \
+		--mandir=/usr/share/man || die "configure failed"
+	emake || die "emake failed"
 }
 
-src_compile ()
-{
-	./configure --prefix=/usr --host=${CHOST} --mandir=/usr/share/man || die
-	emake || die
-}
-
-src_install ()
-{
+src_install() {
+	#remove control chars from desktop file
+	mv gnomba.desktop gnomba.desktop.bad
+	tr -d '\015' < gnomba.desktop.bad > gnomba.desktop
 	make prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
-		install || die
+		install || die "make install failed"
+
 }
diff --git a/net-misc/gnome-blog/ChangeLog b/net-misc/gnome-blog/ChangeLog
index 0dfe7237d95e..22d52068bcdc 100644
--- a/net-misc/gnome-blog/ChangeLog
+++ b/net-misc/gnome-blog/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for net-misc/gnome-blog
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-blog/ChangeLog,v 1.1 2003/10/31 10:28:34 leonardop Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-blog/ChangeLog,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
+
+  04 Aug 2005; Simon Stelling <blubb@gentoo.org> gnome-blog-0.9.ebuild:
+  stable on amd64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gnome-blog-0.9.ebuild:
+  ppc stable
+
+  28 Jun 2005; Leonardo Boshell <leonardop@gentoo.org> gnome-blog-0.9.ebuild:
+  Stable on x86.
+
+  27 Jun 2005; Leonardo Boshell <leonardop@gentoo.org> gnome-blog-0.9.ebuild:
+  Make sure that GNOME_BlogApplet.server.in is re-created, resolves bug
+  #93612.
+
+*gnome-blog-0.9 (22 May 2005)
+
+  22 May 2005; Leonardo Boshell <leonardop@gentoo.org> gnome-blog-0.9.ebuild:
+  New release.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gnome-blog-0.8.ebuild:
+  Stable on ppc.
+
+  27 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> gnome-blog-0.8.ebuild:
+  Marked stable on x86.
+
+*gnome-blog-0.8 (12 Feb 2005)
+
+  12 Feb 2005; Leonardo Boshell <leonardop@gentoo.org> gnome-blog-0.8.ebuild:
+  New release. Dropped obsolete patch and reworked dependencies. Resolves
+  bug #78070.
+
+  07 May 2004; Danny van Dyk <kugelfang@gentoo.org> gnome-blog-0.7-r1.ebuild:
+  Marked ~amd64.
+
+*gnome-blog-0.7-r1 (16 Mar 2004)
+
+  16 Mar 2004; L. Boshell <leonardop@gentoo.org> gnome-blog-0.7-r1.ebuild,
+  files/gnome-blog-0.7-blogger_fix.patch:
+  Fix for blogger.com. Closes bug #44785.
+
+  10 Mar 2004; L. Boshell <leonardop@gentoo.org> gnome-blog-0.7.ebuild:
+  Added gnome-python dependency. Closes bug #44191. It is not mentioned in
+  the software configure script, so it has been marked as a runtime dep
+  only.
+
+  10 Dec 2003; L. Boshell <leonardop@gentoo.org> gnome-blog-0.7.ebuild:
+  Marked as stable on x86.
 
 *gnome-blog-0.7 (31 Oct 2003)
 
diff --git a/net-misc/gnome-blog/Manifest b/net-misc/gnome-blog/Manifest
index 35bbe0b9ab98..1e367456750b 100644
--- a/net-misc/gnome-blog/Manifest
+++ b/net-misc/gnome-blog/Manifest
@@ -1,3 +1,6 @@
-MD5 ab6c3b6868381d9cf45bb6aad5ac6cd0 ChangeLog 394
-MD5 049503d504dc653953b5f46ce6094c43 gnome-blog-0.7.ebuild 402
-MD5 58d0ecf26c50ab8dd00ee905a4b77436 files/digest-gnome-blog-0.7 67
+MD5 4aa527f19661e5f8d62330ea89d8a4b9 ChangeLog 1966
+MD5 464721b35e07c4086852550676fcc209 gnome-blog-0.8.ebuild 602
+MD5 3dc99ae5ed4c54e787dd9d43c197f098 metadata.xml 464
+MD5 dcb4e137f3dee8cbc0889a410f178c08 gnome-blog-0.9.ebuild 774
+MD5 ef61ff66a3a9aef1573d83163b7f988c files/digest-gnome-blog-0.9 67
+MD5 55e7d8be0e27af7fde153d1e13eb6962 files/digest-gnome-blog-0.8 67
diff --git a/net-misc/gnome-blog/gnome-blog-0.8.ebuild b/net-misc/gnome-blog/gnome-blog-0.8.ebuild
index 944abfd91289..c68cd8d66e73 100644
--- a/net-misc/gnome-blog/gnome-blog-0.8.ebuild
+++ b/net-misc/gnome-blog/gnome-blog-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-blog/gnome-blog-0.8.ebuild,v 1.1 2005/02/12 07:18:58 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-blog/gnome-blog-0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/~seth/gnome-blog/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ppc"
 IUSE=""
 
 RDEPEND=">=dev-python/pygtk-2
diff --git a/net-misc/gnome-blog/gnome-blog-0.9.ebuild b/net-misc/gnome-blog/gnome-blog-0.9.ebuild
index ac212c843b7b..019cea621089 100644
--- a/net-misc/gnome-blog/gnome-blog-0.9.ebuild
+++ b/net-misc/gnome-blog/gnome-blog-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-blog/gnome-blog-0.9.ebuild,v 1.1 2005/05/23 00:29:21 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-blog/gnome-blog-0.9.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/~seth/gnome-blog/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygtk-2
@@ -22,3 +22,11 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog README TODO"
 
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+
+	# Let this file be re-created so the path in the <oaf_server> element is
+	# correct. See bug #93612.
+	rm GNOME_BlogApplet.server.in
+}
diff --git a/net-misc/gnome-blog/metadata.xml b/net-misc/gnome-blog/metadata.xml
index da6fd63d0085..5080c9126bb3 100644
--- a/net-misc/gnome-blog/metadata.xml
+++ b/net-misc/gnome-blog/metadata.xml
@@ -1,5 +1,14 @@
 <?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>
+    Blogger software that features a clean interface, support for many
+    different kinds of blogs, spell checking, drag and drop
+    capabilities and more.
+  </longdescription>
 </pkgmetadata>
diff --git a/net-misc/gnugk/ChangeLog b/net-misc/gnugk/ChangeLog
index 8c7bf2be0e90..4f50c0db979c 100644
--- a/net-misc/gnugk/ChangeLog
+++ b/net-misc/gnugk/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-misc/gnugk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/ChangeLog,v 1.1 2003/10/26 19:45:46 stkn Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+*gnugk-2.2.3_p2 (05 Sep 2005)
+
+  05 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +gnugk-2.2.3_p2.ebuild:
+  Version bump.
+
+  30 Jul 2005; <stkn@gentoo.org> -files/gnugk-2.0.6-gentoo.diff,
+  -gnugk-2.0.6.ebuild:
+  Removing old version.
+
+*gnugk-2.2.2 (30 Jul 2005)
+
+  30 Jul 2005; <stkn@gentoo.org> gnugk-2.2.1.ebuild, +gnugk-2.2.2.ebuild:
+  Version bump, cleanups, gnugk-2.2.x doesn't support ldap at the moment, ldap
+  flag removed. Fixes bug #48565 and #92976. Readded ~x86 flag.
+
+*gnukg-2.2.1 (24 Mar 2005)
+
+  24 Mar 2005; Pieter Van den Abeele <pvdabeel@gentoo.org> gnugk-2.2.1.ebuild:
+  Version bump.
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> gnugk-2.0.6.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnugk-2.0.6.ebuild:
+  Fix use invocation
 
 *gnugk-2.0.6 (26 Oct 2003)
 
diff --git a/net-misc/gnugk/Manifest b/net-misc/gnugk/Manifest
index a3dd6b58716f..9c9bb919f300 100644
--- a/net-misc/gnugk/Manifest
+++ b/net-misc/gnugk/Manifest
@@ -1,7 +1,10 @@
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 c003ba05f7fecfcb5b0ebf9a7bf82f07 gnugk-2.0.6.ebuild 2494
-MD5 07109080ee834f3906186070ba6afcaa ChangeLog 409
-MD5 77873cbff07e8b3b0dbc12ea5d4f0060 files/gnugk.rc6 538
-MD5 bde2e8379cf391b3ffffa57c618f5e40 files/digest-gnugk-2.0.6 60
-MD5 7c2af84d098f7e49f119f6eb3694b0e7 files/gnugk-2.0.6-gentoo.diff 972
-MD5 97a9cd44c630d1ff61d3b0f2b8e4b61e files/gnugk.confd 397
+MD5 847bd7064bf9956d87a5c5abf7babb83 gnugk-2.2.3_p2.ebuild 1157
+MD5 4c68f91f6939b42f4a8fe00c22a44d6f gnugk-2.2.1.ebuild 997
+MD5 24634d78b82a3b164d839411174f6af0 ChangeLog 1214
+MD5 5533867679175d6cb5494add87a531e4 gnugk-2.2.2.ebuild 1107
+MD5 42137c405962cc93f05c5118e80716c8 files/digest-gnugk-2.2.3_p2 65
+MD5 9f2ca508d9b81c519d1b31697da11dba files/digest-gnugk-2.2.2 63
+MD5 c37fb62222da3f3e2e9f090f4dbd5c8c files/digest-gnugk-2.2.1 60
+MD5 2e2883db5d62010d2cf65ad1f6ef62a6 files/gnugk.confd 382
+MD5 35b105cf2bdba978762fe60d44d51cac files/gnugk.rc6 523
diff --git a/net-misc/gnugk/files/gnugk.confd b/net-misc/gnugk/files/gnugk.confd
index 32d3164ffab2..fb307063728d 100644
--- a/net-misc/gnugk/files/gnugk.confd
+++ b/net-misc/gnugk/files/gnugk.confd
@@ -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-misc/gnugk/files/gnugk.confd,v 1.1 2003/10/26 19:45:46 stkn Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.confd,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 #
 # see gnugk --help for a complete list of options
diff --git a/net-misc/gnugk/files/gnugk.rc6 b/net-misc/gnugk/files/gnugk.rc6
index e5e127ed9988..64b3ccb2177d 100644
--- a/net-misc/gnugk/files/gnugk.rc6
+++ b/net-misc/gnugk/files/gnugk.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.rc6,v 1.1 2003/10/26 19:45:46 stkn Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/files/gnugk.rc6,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/gnugk/gnugk-2.2.1.ebuild b/net-misc/gnugk/gnugk-2.2.1.ebuild
index f6625e3f0227..e4aa5d16d05f 100644
--- a/net-misc/gnugk/gnugk-2.2.1.ebuild
+++ b/net-misc/gnugk/gnugk-2.2.1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/gnugk-2.2.1.ebuild,v 1.1 2005/03/24 22:14:03 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/gnugk-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
-inherit eutils
-
-IUSE="mysql postgres ldap radius"
+IUSE="mysql postgres radius"
 
 DESCRIPTION="GNU H.323 gatekeeper"
 HOMEPAGE="http://www.gnugk.org/"
@@ -12,48 +10,36 @@ SRC_URI="mirror://sourceforge/openh323gk/gnugk-${PV}.tgz"
 
 S=${WORKDIR}/openh323gk
 
-MY_OS="`uname -s | tr [:upper:] [:lower:]`"
-
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 
 DEPEND="net-libs/openh323
 	mysql? ( dev-db/mysql++ )
-	postgres? ( dev-db/postgresql )
-	ldap?  ( net-nds/openldap )"
+	postgres? ( dev-db/postgresql )"
 
 src_compile() {
 	econf \
 	        `use_enable mysql` \
-			`use_enable ldap` \
-			`use_enable postgres sql` \
-			`use_enable radius` || die
-	emake optdepend opt || die
+		`use_enable postgres sql` \
+		`use_enable radius` || die
+
+	emake optdepend opt addpasswd || die
 }
 
 src_install() {
-	dodir /usr/sbin /etc/gnugk
-	dosbin obj_${MY_OS}_${ARCH}_r/gnugk
+	dosbin obj_*_*_r/gnugk
+	dosbin obj_*_*_r/addpasswd
 
 	insinto /etc/gnugk
 	doins etc/*
 
-	if use ldap && [ -d /etc/openldap/schema ]; then
-		insinto /etc/openldap/schema
-		doins etc/voip.schema
-		rm -f ${D}/etc/gnugk/voip.schema
-	fi
-
 	dodoc changes.txt readme.txt copying docs/*
 	mv ${D}/etc/gnugk/*.pl ${D}/usr/share/doc/${PF}
 
 	docinto old
 	dodoc docs/old/*
 
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/gnugk.rc6 gnugk
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/gnugk.confd gnugk
+	newinitd ${FILESDIR}/gnugk.rc6 gnugk
+	newconfd ${FILESDIR}/gnugk.confd gnugk
 }
diff --git a/net-misc/gnugk/gnugk-2.2.2.ebuild b/net-misc/gnugk/gnugk-2.2.2.ebuild
index 6be90200e6da..8b912a4d4aae 100644
--- a/net-misc/gnugk/gnugk-2.2.2.ebuild
+++ b/net-misc/gnugk/gnugk-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/net-misc/gnugk/gnugk-2.2.2.ebuild,v 1.1 2005/07/30 00:33:14 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/gnugk-2.2.2.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 IUSE="mysql postgres radius"
 
diff --git a/net-misc/gnugk/gnugk-2.2.3_p2.ebuild b/net-misc/gnugk/gnugk-2.2.3_p2.ebuild
index 0930d0266b16..26a34cd59087 100644
--- a/net-misc/gnugk/gnugk-2.2.3_p2.ebuild
+++ b/net-misc/gnugk/gnugk-2.2.3_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/gnugk-2.2.3_p2.ebuild,v 1.1 2005/09/04 22:23:51 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnugk/gnugk-2.2.3_p2.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 IUSE="mysql postgres radius"
 
diff --git a/net-misc/gsasl/ChangeLog b/net-misc/gsasl/ChangeLog
index 7966bb2b2037..8736c126891d 100644
--- a/net-misc/gsasl/ChangeLog
+++ b/net-misc/gsasl/ChangeLog
@@ -1,9 +1,81 @@
 # ChangeLog for net-misc/gsasl
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.1 2004/07/06 00:50:24 langthang Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> gsasl-0.2.4.ebuild:
+  Mark 0.2.4 stable on ia64
+
+  05 Jul 2005; Tom Martin <slarti@gentoo.org> gsasl-0.2.4.ebuild:
+  Marked ~ia64.
+
+  02 May 2005; Michael Hanselmann <hansmi@gentoo.org> gsasl-0.2.4.ebuild:
+  Stable on ppc.
+
+  02 May 2005; Elfyn McBratney <beu@gentoo.org> gsasl-0.2.4.ebuild:
+  Stable on x86.
+
+  02 May 2005; Tom Martin <slarti@gentoo.org> gsasl-0.2.4.ebuild:
+  Fix a typing error, preventing the ebuild from installing anything but docs.
+
+  19 Apr 2005; Tom Martin <slarti@gentoo.org> gsasl-0.2.4.ebuild:
+  Stable on amd64 and sparc.
+
+  10 Mar 2005; Tom Martin <slarti@gentoo.org> gsasl-0.2.4.ebuild:
+  Marked ~sparc.
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> -gsasl-0.1.1.ebuild,
+  -gsasl-0.1.4.ebuild, -gsasl-0.2.0.ebuild:
+  Purge old versions.
+
+  22 Jan 2005; Andrej Kacian <ticho@gentoo.org> gsasl-0.2.3.ebuild:
+  Stable on x86.
+
+  22 Jan 2005; Lars Weiler <pylon@gentoo.org> gsasl-0.2.3.ebuild:
+  Stable on ppc.
+
+*gsasl-0.2.4 (22 Jan 2005)
+
+  22 Jan 2005; Tom Martin <slarti@gentoo.org> gsasl-0.2.3.ebuild,
+  +gsasl-0.2.4.ebuild:
+  Version bump, 0.2.3 stable on amd64.
+
+  25 Dec 2004; Andrej Kacian <ticho@gentoo.org> gsasl-0.2.0.ebuild:
+  Stable on x86.
+
+*gsasl-0.2.3 (25 Dec 2004)
+
+  25 Dec 2004; Tom Martin <slarti@gentoo.org> gsasl-0.2.0.ebuild,
+  +gsasl-0.2.3.ebuild:
+  Version bump, stabilise 0.2.0 on amd64.
+
+  13 Nov 2004; Tom Martin <slarti@gentoo.org> gsasl-0.2.0.ebuild:
+  I'd left gssapi out of use_enable kerberos, adding it back in.
+
+*gsasl-0.2.0 (13 Nov 2004)
+
+  13 Nov 2004; Tom Martin <slarti@gentoo.org> +gsasl-0.2.0.ebuild,
+  gsasl-0.1.4.ebuild,  metadata.xml:
+  Version bump to 0.2.0; Removed unnecessary variables (myconf,
+  UPST_SRC); added doc USE flag to install extra API documentation. Taking
+  over as maintainer. Stabilised 0.1.4 on amd64.
+
+*gsasl-0.1.4 (11 Oct 2004)
+
+  11 Oct 2004; Tom Martin <slarti@gentoo.org> gsasl-0.1.1.ebuild,
+  +gsasl-0.1.4.ebuild:
+  Marked 0.1.1 stable on amd64, version bumped -> 0.1.4.
+
+  09 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> gsasl-0.1.1.ebuild:
+  Added to ~ppc.
+
+  07 Jul 2004; Tom Martin <slarti@gentoo.org> gsasl-0.1.1.ebuild:
+  Added to ~amd64.
+
+  06 Jul 2004; <langthang@gentoo.org> gsasl-0.1.1.ebuild:
+  added PROVIDE virtual/gsasl, changed description, re-keyword.
 
 *gsasl-0.1.1 (05 Jul 2004)
 
-  05 Jul 2004; <tvan@gentoo.org> +metadata.xml, +gsasl-0.1.1.ebuild:
+  05 Jul 2004; <langthang@gentoo.org> +metadata.xml, +gsasl-0.1.1.ebuild:
   New ebuild, bug #56015
 
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 9e04fd470e68..dcd5ed9f3bd3 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,2 +1,6 @@
-MD5 f6e4296c469efe78b738a47f5da31033 gsasl-0.1.1.ebuild 1032
-MD5 6f459b6dcf5ae7b72eeab7e098d7ce95 files/digest-gsasl-0.1.1 64
+MD5 9a3024665c04c1eb6ef0f20c66b451dc metadata.xml 252
+MD5 4cf55c2682837ce3f6e99964567de9f9 ChangeLog 2654
+MD5 555cb92e840eb6f3fc724a84c231278b gsasl-0.2.3.ebuild 1219
+MD5 cec526d8275c503c0a033fd4e0b9ca2b gsasl-0.2.4.ebuild 1178
+MD5 7d929a6a9bbfc8e1f94fa474c704dc17 files/digest-gsasl-0.2.3 64
+MD5 c46f0baf4b7dac55f6b07f6dca4d3637 files/digest-gsasl-0.2.4 64
diff --git a/net-misc/gsasl/gsasl-0.2.3.ebuild b/net-misc/gsasl/gsasl-0.2.3.ebuild
index 1b6c11d24e8b..3f6a3e95e11a 100644
--- a/net-misc/gsasl/gsasl-0.2.3.ebuild
+++ b/net-misc/gsasl/gsasl-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-0.2.3.ebuild,v 1.1 2004/12/25 13:06:21 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-0.2.3.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -10,7 +10,7 @@ SLOT="0"
 # TODO: check http://www.gnu.org/software/gsasl/#dependencies for more
 # 	optional external libraries.
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc"
 IUSE="kerberos nls static doc"
 PROVIDE="virtual/gsasl"
 DEPEND="virtual/libc
diff --git a/net-misc/gsasl/gsasl-0.2.4.ebuild b/net-misc/gsasl/gsasl-0.2.4.ebuild
index 5026a1ee53cd..3a950ad5f6f5 100644
--- a/net-misc/gsasl/gsasl-0.2.4.ebuild
+++ b/net-misc/gsasl/gsasl-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/net-misc/gsasl/gsasl-0.2.4.ebuild,v 1.1 2005/01/22 16:15:42 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="http://www.gnu.org/software/gsasl/"
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # TODO: check http://www.gnu.org/software/gsasl/#dependencies for more
 # 	optional external libraries.
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ia64 ppc sparc x86"
 IUSE="kerberos nls static doc"
 PROVIDE="virtual/gsasl"
 DEPEND="virtual/libc
@@ -30,13 +30,13 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} || die "einstall failed"
+	make DESTDIR=${D} install || die "einstall failed"
 	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README README-alpha THANKS
 	doman doc/gsasl.1
 
 	if use doc; then
 		dodoc doc/*.{eps,ps,pdf}
-		dohtml doc/*
+		dohtml doc/*.html
 		docinto examples
 		dodoc examples/*.c
 	fi
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 72d13b3fbb02..a4fb47854028 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<maintainer>
-		<email>langthang@gentoo.org</email>
-		<name>Tuan Van</name>
+		<email>slarti@gentoo.org</email>
+		<name>Tom Martin</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/gtk2-ssh-askpass/ChangeLog b/net-misc/gtk2-ssh-askpass/ChangeLog
index 4e4320f2b816..f144cd3c3ec7 100644
--- a/net-misc/gtk2-ssh-askpass/ChangeLog
+++ b/net-misc/gtk2-ssh-askpass/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-misc/gtk2-ssh-askpass
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gtk2-ssh-askpass/ChangeLog,v 1.1 2003/04/13 23:33:02 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtk2-ssh-askpass/ChangeLog,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
+
+  06 Nov 2005; <dang@gentoo.org> gtk2-ssh-askpass-0.3.ebuild:
+  Don't need an explicit dep on x11, gtk's dep is sufficient
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  gtk2-ssh-askpass-0.3.ebuild:
+  Mark 0.3 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  gtk2-ssh-askpass-0.3.ebuild:
+  stable on ia64
+
+  09 May 2005; Olivier Crête <tester@gentoo.org>
+  gtk2-ssh-askpass-0.3.ebuild:
+  Stable on amd64
+
+  08 Oct 2004; Alastair Tse <liquidx@gentoo.org> gtk2-ssh-askpass-0.3.ebuild:
+  change download location because of upstream renaming of package to conform
+  with debian. (#58747)
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> gtk2-ssh-askpass-0.3.ebuild:
+  Adding amd64 keyword. Closing #44159.
+
+  27 Jan 2004; Aron Griffis <agriffis@gentoo.org> gtk2-ssh-askpass-0.3.ebuild:
+  add ~alpha and ~ia64
+
+  07 Jan 2004; Jason Wever <weeve@gentoo.org> gtk2-ssh-askpass-0.3.ebuild:
+  Added ~sparc keyword.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> gtk2-ssh-askpass-0.3.ebuild:
+  Make stable on ppc 
+  Thanks to Florian Daniel for the testing
 
 *gtk2-ssh-askpass-0.3 (14 Apr 2003)
 
diff --git a/net-misc/gtk2-ssh-askpass/Manifest b/net-misc/gtk2-ssh-askpass/Manifest
index e896aed72105..89c53803c69c 100644
--- a/net-misc/gtk2-ssh-askpass/Manifest
+++ b/net-misc/gtk2-ssh-askpass/Manifest
@@ -1,3 +1,15 @@
-MD5 621ce19486e7e16aedd394853c6b44b0 gtk2-ssh-askpass-0.3.ebuild 594
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cf0694711f6a206df9f27eabf3141971 ChangeLog 1512
 MD5 0cbe43e4a20d50f8b1cbcbe522a242c0 files/99ssh_askpass 38
 MD5 af95000e5cda99ca351864f8e03ed95c files/digest-gtk2-ssh-askpass-0.3 71
+MD5 5fe362149bda2a2fd437d3e4c411a630 gtk2-ssh-askpass-0.3.ebuild 734
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDboUUomPajV0RnrERAvrIAJ0Qch/uJ2MVCd8uMzJAkVQPh244SACffk/t
+RNiFFjF6VYMh13HZvux1dy8=
+=cFx4
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gtk2-ssh-askpass/gtk2-ssh-askpass-0.3.ebuild b/net-misc/gtk2-ssh-askpass/gtk2-ssh-askpass-0.3.ebuild
index dfd563519ac6..5a24359a9bce 100644
--- a/net-misc/gtk2-ssh-askpass/gtk2-ssh-askpass-0.3.ebuild
+++ b/net-misc/gtk2-ssh-askpass/gtk2-ssh-askpass-0.3.ebuild
@@ -1,17 +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/net-misc/gtk2-ssh-askpass/gtk2-ssh-askpass-0.3.ebuild,v 1.1 2003/04/13 23:33:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtk2-ssh-askpass/gtk2-ssh-askpass-0.3.ebuild,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
 
 DESCRIPTION="A small SSH Askpass replacement written with GTK2."
 HOMEPAGE="http://www.cgabriel.org/sw/gtk2-ssh-askpass/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://www.cgabriel.org/sw/ssh-askpass-fullscreen/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE=""
-DEPEND="virtual/x11
-		>=x11-libs/gtk+-2.0"
-S=${WORKDIR}/${P}
+DEPEND=">=x11-libs/gtk+-2.0"
 
 src_compile() {
 		make || die "compile failed"
diff --git a/net-misc/gtm/ChangeLog b/net-misc/gtm/ChangeLog
index 4032d0c16c6d..3cd42d0be2c7 100644
--- a/net-misc/gtm/ChangeLog
+++ b/net-misc/gtm/ChangeLog
@@ -1,11 +1,49 @@
 # ChangeLog for net-misc/gtm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gtm/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtm/ChangeLog,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
 
+  15 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> gtm-0.4.11.ebuild,
+  gtm-0.4.11-r2.ebuild:
+  Removed sparc keyword, from the initial port era
+
+  02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> gtm-0.4.11-r2.ebuild:
+  hooray for epatch!
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> gtm-0.4.11-r2.ebuild,
+  gtm-0.4.11.ebuild:
+  change virtual/glibc to virtual/libc
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gtm-0.4.12 (19 Aug 2002)
+
+  19 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> gtm-0.4.12.ebuild:
+  New version, fixed dependencies list, removed patch wget-log.c.patch
+  which is no longer actual. 
+  Closes bug #6497
+
+*gtm-0.4.11-r2 (28 Jun 2002)
+
+  06 Jul 2002; phoen][x <phoenix@gentoo.org> gtm-0.4.11-r2.ebuild:
+  Added KEYWORDS.
+
+  28 Jun 2002; Spider <spider@gentoo.org> gtm-0.4.11-r2.ebuild:
+  make it use gnome-panel instead of gnome-core
+
+*gtm-0.4.11-r1 (28 May 2002)
+
+  06 Jul 2002; phoen][x <phoenix@gentoo.org> gtm-0.4.11-r1.ebuild:
+  Added KEYWORDS.
+
+  28 May 20012 Spider <spider@gentoo.org> gtm-0.4.11-r1.ebuild:
+  Added a patch for gtm to support wget 1.8
+ 
 *gtm-0.4.11 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  06 Jul 2002; phoen][x <phoenix@gentoo.org> gtm-0.4.11.ebuild:
+  Added KEYWORDS, LICENSE, SLOT.  
+
+  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-misc/gtm/Manifest b/net-misc/gtm/Manifest
index e69de29bb2d1..7a03c64c9317 100644
--- a/net-misc/gtm/Manifest
+++ b/net-misc/gtm/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eaf3c24891b64ff3ddbeb7ff1f40ac17 gtm-0.4.11-r2.ebuild 1609
+MD5 b310817689db9c8d5fdc39af7d0b67cd gtm-0.4.12.ebuild 1438
+MD5 5721925acb16e563c52f9a867a6e4a7d gtm-0.4.11.ebuild 1492
+MD5 4a95e21d1bafffc86cd3c991ee57e20d ChangeLog 1887
+MD5 2dd8ed956bb1eac7203e6506674db146 files/wget-log.c.patch 910
+MD5 4659d59d9d2514161c37eac39675c7de files/digest-gtm-0.4.11-r2 62
+MD5 4659d59d9d2514161c37eac39675c7de files/digest-gtm-0.4.11 62
+MD5 6f6c2e437c995a0a947df5ca097ca8a4 files/digest-gtm-0.4.12 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDefDsKRy60XGEcJIRAq6xAJ90octNrZvjKJDPV5GcKnWUXyl2ZQCeMKGD
+Uw+GUQ67OK9A8VOozajZu3w=
+=Go/l
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gtm/files/digest-gtm-0.4.11 b/net-misc/gtm/files/digest-gtm-0.4.11
index c79e064a7f07..7010d67c87ea 100644
--- a/net-misc/gtm/files/digest-gtm-0.4.11
+++ b/net-misc/gtm/files/digest-gtm-0.4.11
@@ -1 +1 @@
-MD5 30507d4c767c6a88534e3a57bbe7fef0 gtm-0.4.11.tar.gz 581632
+MD5 30507d4c767c6a88534e3a57bbe7fef0 gtm-0.4.11.tar.gz 575067
diff --git a/net-misc/gtm/gtm-0.4.11-r2.ebuild b/net-misc/gtm/gtm-0.4.11-r2.ebuild
index badf47d997eb..46dd80efc35d 100644
--- a/net-misc/gtm/gtm-0.4.11-r2.ebuild
+++ b/net-misc/gtm/gtm-0.4.11-r2.ebuild
@@ -1,15 +1,19 @@
-# 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-misc/gtm/gtm-0.4.11-r2.ebuild,v 1.1 2002/06/28 03:10:38 spider Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtm/gtm-0.4.11-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
+
+inherit eutils
+
+IUSE="ssl nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GTM - a transfer manager"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gtm.sourceforge.net/"
 SLOT="0"
-LICENSE="GPL-"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
 	x11-libs/gtk+
 	gnome-base/oaf
@@ -19,11 +23,11 @@ DEPEND="virtual/glibc
 	gnome? ( gnome-base/gnome-applets )
 	ssl?   ( dev-libs/openssl )"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	virtual/x11
 	net-misc/wget
 	>=gnome-base/gnome-libs-1.4.0.2
-	>=gnome-base/ORBit-0.5.11"
+	=gnome-base/orbit-0*"
 
 
 src_unpack() {
@@ -38,11 +42,11 @@ src_unpack() {
 			>${S}/doc/${lang}/Makefile.in
 	done
 
-	patch -p0 < ${FILESDIR}/wget-log.c.patch						
+	epatch ${FILESDIR}/wget-log.c.patch || die "epatch failed."
 }
 
 src_compile() {
-        
+
 	local myconf
 	use nls   || myconf="--disable-nls"
 	use gnome || myconf="${myconf} --disable-applet"
@@ -58,12 +62,11 @@ src_compile() {
 		--sysconfdir=/etc \
 		--without-debug \
 		$myconf || die
-			
+
 	emake || die
 }
 
 src_install() {
-	
+
 	make DESTDIR=${D} install || die
 }
-
diff --git a/net-misc/gtm/gtm-0.4.11.ebuild b/net-misc/gtm/gtm-0.4.11.ebuild
index 5e0325ce3511..bc8c4ce5c137 100644
--- a/net-misc/gtm/gtm-0.4.11.ebuild
+++ b/net-misc/gtm/gtm-0.4.11.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer:  Desktop Team <desktop@cvs.gentoo.org>
-# Author:  Martin Schlemmer <azarah@gentoo.org>
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtm/gtm-0.4.11.ebuild,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
+
+IUSE="ssl nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GTM - a transfer manager"
 SRC_URI="http://download.sourceforge.net/gtm/${P}.tar.gz"
 HOMEPAGE="http://gtm.sourceforge.net/"
+KEYWORDS="x86"
+LICENSE="GPL-2"
+SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
 	x11-libs/gtk+
 	gnome-base/oaf
@@ -17,11 +20,11 @@ DEPEND="virtual/glibc
 	gnome? ( gnome-base/gnome-applets )
 	ssl?   ( dev-libs/openssl )"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	virtual/x11
 	net-misc/wget
 	>=gnome-base/gnome-libs-1.4.0.2
-	>=gnome-base/ORBit-0.5.11"
+	=gnome-base/orbit-0*"
 
 
 src_unpack() {
@@ -32,14 +35,14 @@ src_unpack() {
 	do
 		cp ${S}/doc/${lang}/Makefile.in ${S}/doc/${lang}/Makefile.in.orig
 		sed -e 's: \$(gtm_helpdir): \$(DESTDIR)$(gtm_helpdir):g' \
-			${S}/doc/${lang}/Makefile.in.orig	\
+			${S}/doc/${lang}/Makefile.in.orig \
 			>${S}/doc/${lang}/Makefile.in
 	done
-						
+
 }
 
 src_compile() {
-        
+
 	local myconf
 	use nls   || myconf="--disable-nls"
 	use gnome || myconf="${myconf} --disable-applet"
@@ -47,20 +50,19 @@ src_compile() {
 	use ssl   || myconf="${myconf} --disable-ssl"
 	use ssl   && myconf="${myconf} --enable-ssl"
 
-	./configure --host=${CHOST}				\
-		--prefix=/usr			  		\
-		--mandir=/usr/share/man 			\
-		--infodir=/usr/share/info			\
-		--localstatedir=/var/lib 			\
-		--sysconfdir=/etc				\
-		--without-debug					\
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var/lib \
+		--sysconfdir=/etc \
+		--without-debug \
 		$myconf || die
-			
+
 	emake || die
 }
 
 src_install() {
-	
+
 	make DESTDIR=${D} install || die
 }
-
diff --git a/net-misc/gtm/gtm-0.4.12.ebuild b/net-misc/gtm/gtm-0.4.12.ebuild
index 39316eba11fe..6bae6abab702 100644
--- a/net-misc/gtm/gtm-0.4.12.ebuild
+++ b/net-misc/gtm/gtm-0.4.12.ebuild
@@ -1,8 +1,9 @@
-# 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-misc/gtm/gtm-0.4.12.ebuild,v 1.1 2002/08/19 16:49:11 stroke Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gtm/gtm-0.4.12.ebuild,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
+
+IUSE="ssl nls gnome"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GTM - a transfer manager"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gtm.sourceforge.net/"
@@ -15,7 +16,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	=gnome-base/gnome-panel-1.4*
 	>=gnome-base/gnome-libs-1.4.1.7
 	>=gnome-base/oaf-0.6.8
-	>=gnome-base/ORBit-0.5.11
+	=gnome-base/orbit-0*
 	gnome? ( =gnome-base/gnome-applets-1.4* )
 	ssl?   ( dev-libs/openssl )"
 
@@ -33,11 +34,11 @@ src_unpack() {
 		sed -e 's: \$(gtm_helpdir): \$(DESTDIR)$(gtm_helpdir):g' \
 			${S}/doc/${lang}/Makefile.in.orig \
 			>${S}/doc/${lang}/Makefile.in
-	done			
+	done
 }
 
 src_compile() {
-        
+
 	local myconf
 	use nls   || myconf="--disable-nls"
 	use gnome || myconf="${myconf} --disable-applet"
@@ -53,11 +54,11 @@ src_compile() {
 		--sysconfdir=/etc \
 		--without-debug \
 		$myconf || die
-			
+
 	emake || die
 }
 
 src_install() {
-	
+
 	make DESTDIR=${D} install || die
 }
diff --git a/net-misc/gwhois/ChangeLog b/net-misc/gwhois/ChangeLog
index 2721c4d119e4..0048b1b68044 100644
--- a/net-misc/gwhois/ChangeLog
+++ b/net-misc/gwhois/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-misc/gwhois
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwhois/ChangeLog,v 1.1 2005/01/16 00:46:43 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwhois/ChangeLog,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
+
+  29 Sep 2005; Jose Luis Rivero <yoswink@gentoo.org> gwhois-20050115.ebuild:
+  Stable on alpha due to #93820
+
+  28 Sep 2005; Simon Stelling <blubb@gentoo.org> gwhois-20050115.ebuild:
+  stable on amd64
+
+*gwhois-20050925 (26 Sep 2005)
+
+  26 Sep 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +gwhois-20050925.ebuild:
+  version bump
+
+  24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gwhois-20050115.ebuild:
+  Stable on ppc.
+
+  22 Sep 2005; Wolfram Schlich <wschlich@gentoo.org> gwhois-20050115.ebuild:
+  cleanup, mark stable on x86
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gwhois-20050115.ebuild:
+  Dependency update: net-www/lynx -> www-client/lynx.
+
+  17 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> gwhois-20050115.ebuild:
+  fix installation of xinetd example config
+
+  16 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> gwhois-20050115.ebuild:
+  add more KEYWORDS
 
 *gwhois-20050115 (16 Jan 2005)
 
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 224f3b910830..93c8d1112e99 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,5 +1,17 @@
-MD5 7d1424b6a2c002b9b19ed32061d2480b gwhois-20050115.ebuild 775
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 14aa08bce781b3501b997a6c6ae17b76 gwhois-20050925.ebuild 934
+MD5 cc7ffdb1f377c040c32c7b6eabf37613 gwhois-20050115.ebuild 845
+MD5 5a5b054935cbd8194cd9b81725aa58ce ChangeLog 1258
 MD5 47337a45894d983bd90d7378029cc898 metadata.xml 461
-MD5 70bbcec54141bf60c00c53fc4de1d6c0 ChangeLog 283
-MD5 9850f759ea3fb3a769ec1165c6a5ca3c files/gwhois.xinetd 305
 MD5 f7291cd41f4ce2bd1e3731680509ce36 files/digest-gwhois-20050115 66
+MD5 7a069bc33264b10bb31ae139729501e4 files/digest-gwhois-20050925 66
+MD5 9850f759ea3fb3a769ec1165c6a5ca3c files/gwhois.xinetd 305
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDOzjB3og80iZgVQgRAhWTAKCvaKIgMHsk9rdE/2SPkJsK//OjNwCfaXeZ
+9HTeb58H7ODg2px6qdFikZU=
+=OFaB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/gwhois/gwhois-20050115.ebuild b/net-misc/gwhois/gwhois-20050115.ebuild
index ada0543ab2aa..cb65cef82d71 100644
--- a/net-misc/gwhois/gwhois-20050115.ebuild
+++ b/net-misc/gwhois/gwhois-20050115.ebuild
@@ -1,33 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwhois/gwhois-20050115.ebuild,v 1.1 2005/01/16 00:46:43 wschlich Exp $
-
-inherit eutils flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwhois/gwhois-20050115.ebuild,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
 
 DESCRIPTION="generic whois"
 HOMEPAGE="http://gwhois.de/"
 SRC_URI="http://gwhois.de/gwhois/${P/-/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
 IUSE=""
-RDEPEND="net-www/lynx
+RDEPEND="www-client/lynx
 	net-misc/curl
 	dev-lang/perl
 	dev-perl/libwww-perl"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
 src_install() {
 	dodir /etc/gwhois
 	insinto /etc/gwhois
 	doins pattern
 	dobin gwhois
 	doman gwhois.1
-	dodoc TODO gwhois.xinetd
+	dodoc TODO "${FILESDIR}/gwhois.xinetd"
 	einfo ""
 	einfo "See included gwhois.xinetd for an example on how to"
 	einfo "use gwhois as a whois proxy using xinetd."
diff --git a/net-misc/gwhois/gwhois-20050925.ebuild b/net-misc/gwhois/gwhois-20050925.ebuild
index b19c82409380..e074602452b2 100644
--- a/net-misc/gwhois/gwhois-20050925.ebuild
+++ b/net-misc/gwhois/gwhois-20050925.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gwhois/gwhois-20050925.ebuild,v 1.1 2005/09/26 08:02:05 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gwhois/gwhois-20050925.ebuild,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
 
 DESCRIPTION="generic whois"
 HOMEPAGE="http://gwhois.de/"
diff --git a/net-misc/hashcash/ChangeLog b/net-misc/hashcash/ChangeLog
index 57a5b7ae3885..69170488450a 100644
--- a/net-misc/hashcash/ChangeLog
+++ b/net-misc/hashcash/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for net-misc/hashcash
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/ChangeLog,v 1.1 2003/09/12 00:42:23 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+*hashcash-1.16-r1 (02 Mar 2005)
+
+  02 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/hashcash-1.16-format-string.diff, +hashcash-1.16-r1.ebuild:
+  Security bump, bug 83541.
+
+  05 Feb 2005; Simon Stelling <blubb@gentoo.org> hashcash-1.16.ebuild:
+  added ~amd64
+
+*hashcash-1.16 (05 Feb 2005)
+
+  05 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> +hashcash-1.16.ebuild:
+  Version bump, bug 79184.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*hashcash-1.13 (30 Nov 2004)
+
+  30 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
+  +hashcash-1.13.ebuild:
+  Version bump, bug 71217.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> hashcash-1.02.ebuild:
+  Move binary to /usr/bin and bump to stable.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> hashcash-1.02.ebuild:
+  Added to ~ppc.
+
+*hashcash-1.02 (18 Aug 2004)
+
+  18 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> +hashcash-1.02.ebuild:
+  Bump version.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> hashcash-0.27.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+*hashcash-0.27 (11 Sep 2003)
 
   11 Sep 2003; Chuck Short <zul@gentoo.org> :
   Initial version, ebuild submitted by <bdonlan@bd-home-comp.no-ip.org> with
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
index a2ef5c818aae..aa202d8262d5 100644
--- a/net-misc/hashcash/Manifest
+++ b/net-misc/hashcash/Manifest
@@ -1,2 +1,23 @@
-MD5 ac61c2e428563b9e73fdb7715682e8b8 hashcash-0.27.ebuild 699
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95faf4e56c277fdee8a648e0bcaa8180 hashcash-1.16-r1.ebuild 851
+MD5 b17309ace87f4689d784066b93ee93e9 ChangeLog 1514
+MD5 3d4ff62a799a78821c08196a1581cf55 hashcash-1.02.ebuild 750
+MD5 ae5592e9a022e6beab44a52a4f23c3f0 metadata.xml 221
+MD5 dce3c44b192e5b062dec4cedd1dbe0f5 hashcash-0.27.ebuild 772
+MD5 d2f9388d5d5b31fd96de828a5c0a87d1 hashcash-1.16.ebuild 757
+MD5 3e535ae2e91ba63f40454ea02f6458f3 hashcash-1.13.ebuild 751
+MD5 b8945440c5d5fc363304c85279d43771 files/digest-hashcash-1.13 62
+MD5 bbbb9afa01623d57687863a50253f858 files/hashcash-1.16-format-string.diff 382
+MD5 7feef9e0dbfa8622b9c284116e4bbbc6 files/digest-hashcash-1.16-r1 62
+MD5 574981d65f92a3870bb9b254ebcf31d5 files/digest-hashcash-1.02 62
 MD5 16b3bf4afa6be029dcb2f921e988f698 files/digest-hashcash-0.27 61
+MD5 7feef9e0dbfa8622b9c284116e4bbbc6 files/digest-hashcash-1.16 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCJhXyugEuf3OQ0akRAsb8AJ9tjB6dCJbXPn2NG+vRxSwHAzeQkQCfbk29
+UfyVRC3/Eo9i1gD1UzAyHaI=
+=t3sB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/hashcash/hashcash-0.27.ebuild b/net-misc/hashcash/hashcash-0.27.ebuild
index aabfeeb8559a..d45aaaebcf67 100644
--- a/net-misc/hashcash/hashcash-0.27.ebuild
+++ b/net-misc/hashcash/hashcash-0.27.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/hashcash-0.27.ebuild,v 1.1 2003/09/12 00:42:24 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/hashcash-0.27.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Utility to generate hashcash tokens"
 HOMEPAGE="http://www.cypherspace.org/hashcash/"
 SRC_URI="http://www.cypherspace.org/hashcash/source/${P}.tgz"
 
-LICENSE="CPL"
+LICENSE="CPL-1.0"
 SLOT="0"
-
 KEYWORDS="~x86"
 
-IUSE=""
-
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
-S=${WORKDIR}/${P}
 
 src_compile() {
-
-	sed -e "s|^CFLAGS.*\$|CFLAGS = ${CFLAGS}|" \
-	  -e "s|^INSTALL_PATH.*\$|INSTALL_PATH = \$(PREFIX)/bin|" \
-	  -e "s|^MAN_INSTALL_PATH.*\$|MAN_INSTALL_PATH = \$(PREFIX)/share/man/man1|" \
-	  -i Makefile || die
+	sed -i \
+		-e "s|^CFLAGS.*\$|CFLAGS = ${CFLAGS}|" \
+		-e "s|^INSTALL_PATH.*\$|INSTALL_PATH = \$(PREFIX)/bin|" \
+		-e "s|^MAN_INSTALL_PATH.*\$|MAN_INSTALL_PATH = \$(PREFIX)/share/man/man1|" \
+		Makefile || die
 
 	emake || die
-	
 }
 
 src_install() {
diff --git a/net-misc/hashcash/hashcash-1.02.ebuild b/net-misc/hashcash/hashcash-1.02.ebuild
index c7e940b78071..47de420c74b9 100644
--- a/net-misc/hashcash/hashcash-1.02.ebuild
+++ b/net-misc/hashcash/hashcash-1.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/net-misc/hashcash/hashcash-1.02.ebuild,v 1.1 2004/08/18 16:55:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/hashcash-1.02.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Utility to generate hashcash tokens"
@@ -9,7 +9,7 @@ SRC_URI="http://www.hashcash.org/source/${P}.tgz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/libc"
 RDEPEND=""
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	dosbin hashcash
+	dobin hashcash
 	doman hashcash.1 sha1.1
 }
diff --git a/net-misc/hashcash/hashcash-1.13.ebuild b/net-misc/hashcash/hashcash-1.13.ebuild
index e22a76c4585b..54fd5141a8b3 100644
--- a/net-misc/hashcash/hashcash-1.13.ebuild
+++ b/net-misc/hashcash/hashcash-1.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-misc/hashcash/hashcash-1.13.ebuild,v 1.1 2004/11/30 04:55:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/hashcash-1.13.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Utility to generate hashcash tokens"
diff --git a/net-misc/hashcash/hashcash-1.16-r1.ebuild b/net-misc/hashcash/hashcash-1.16-r1.ebuild
index 295e29dedfc2..a86986f68e43 100644
--- a/net-misc/hashcash/hashcash-1.16-r1.ebuild
+++ b/net-misc/hashcash/hashcash-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/net-misc/hashcash/hashcash-1.16-r1.ebuild,v 1.1 2005/03/02 19:37:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/hashcash-1.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/hashcash/hashcash-1.16.ebuild b/net-misc/hashcash/hashcash-1.16.ebuild
index 16aff86b0310..67bde637486d 100644
--- a/net-misc/hashcash/hashcash-1.16.ebuild
+++ b/net-misc/hashcash/hashcash-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/net-misc/hashcash/hashcash-1.16.ebuild,v 1.1 2005/02/04 23:13:45 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hashcash/hashcash-1.16.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Utility to generate hashcash tokens"
@@ -9,7 +9,7 @@ SRC_URI="http://www.hashcash.org/source/${P}.tgz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/libc"
 RDEPEND=""
diff --git a/net-misc/hlfl/ChangeLog b/net-misc/hlfl/ChangeLog
index d2b061773dff..19136b4eaec0 100644
--- a/net-misc/hlfl/ChangeLog
+++ b/net-misc/hlfl/ChangeLog
@@ -1,9 +1,34 @@
 # ChangeLog for net-misc/hlfl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hlfl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> hlfl-0.60.0.ebuild,
+  hlfl-0.60.1.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  26 Jun 2004; David Holm <dholm@gentoo.org> hlfl-0.60.1.ebuild:
+  Added to ~ppc.
+
+  26 Oct 2003; Heinrich Wendel <lanius@gentoo.org> hlfl-0.60.1.ebuild:
+  fixed datadir
+
+  25 Oct 2003; Heinrich Wendel <lanius@gentoo.org> hlfl-0.60.1.ebuild:
+  added additionaly docs
+
+  24 Oct 2003; Heinrich Wendel <lanius@gentoo.org> hlfl-0.60.1.ebuild:
+  fixed too many cleanups ;D
+
+*hlfl-0.60.1 (11 Oct 2003)
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> hlfl-0.60.1.ebuild:
+  version bump, ebuild cleanups
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *hlfl-0.60.0 (17 Jun 2002)
 
-  17 Jun 2002 ; Thilo Bangert <bangert@gentoo.org> :
-  
-  initial commit - ebuild by Arnaud Launay <asl@launay.org>
\ No newline at end of file
+  06 Jul 2002 ; phoen][ <phoenix@gentoo.org> hlfl-0.60.0.ebuild :  
+  Added KEYWORDS, SLOT.
+
+  17 Jun 2002 ; Thilo Bangert <bangert@gentoo.org> :  
+  initial commit - ebuild by Arnaud Launay <asl@launay.org>
diff --git a/net-misc/hlfl/Manifest b/net-misc/hlfl/Manifest
index e69de29bb2d1..03f2f2450ace 100644
--- a/net-misc/hlfl/Manifest
+++ b/net-misc/hlfl/Manifest
@@ -0,0 +1,5 @@
+MD5 edadf84f703a7b159105625dc18fc870 hlfl-0.60.0.ebuild 978
+MD5 7034f826ed983d5772aa18e5d0f497a9 ChangeLog 1160
+MD5 d8af86eed619273c23605f6e4ed7fba0 hlfl-0.60.1.ebuild 868
+MD5 85c7bdf892da0766dbbd2a8dbbfd3441 files/digest-hlfl-0.60.0 62
+MD5 ea807ce19430965d2608a6b01cbbe3b4 files/digest-hlfl-0.60.1 63
diff --git a/net-misc/hlfl/hlfl-0.60.0.ebuild b/net-misc/hlfl/hlfl-0.60.0.ebuild
index 0201c086fdf9..f182f8bac647 100644
--- a/net-misc/hlfl/hlfl-0.60.0.ebuild
+++ b/net-misc/hlfl/hlfl-0.60.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Arnaud Launay <asl@launay.org>
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.5 2002/04/29 22:56:53 sandymac Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hlfl/hlfl-0.60.0.ebuild,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="High Level Firewall Language"
 SRC_URI="ftp://ftp.hlfl.org/pub/hlfl/${P}.tar.gz"
 HOMEPAGE="http://www.hlfl.org"
 LICENSE="GPL-2"
+KEYWORDS="x86 sparc "
+SLOT="0"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 
@@ -23,7 +24,7 @@ src_compile() {
 }
 
 src_install () {
-	
+
 	install -d ${D}/usr/bin
 	install -d ${D}/usr/man/man1
 	install -d ${D}/usr/share/doc/${P}
diff --git a/net-misc/hlfl/hlfl-0.60.1.ebuild b/net-misc/hlfl/hlfl-0.60.1.ebuild
index 78b57e82019d..acc78008f12a 100644
--- a/net-misc/hlfl/hlfl-0.60.1.ebuild
+++ b/net-misc/hlfl/hlfl-0.60.1.ebuild
@@ -1,23 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hlfl/hlfl-0.60.1.ebuild,v 1.1 2003/10/11 15:52:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hlfl/hlfl-0.60.1.ebuild,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="High Level Firewall Language"
 SRC_URI="ftp://ftp.hlfl.org/pub/hlfl/${P}.tar.gz"
 HOMEPAGE="http://www.hlfl.org"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc"
 SLOT="0"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+src_compile() {
+	sed -i -e 's:${datadir}/hlfl:${datadir}:' configure
+	econf --datadir=/usr/share/doc/${P} || die "./configure failed"
+	emake || die
+}
 
 src_install () {
-	einstall
+	dobin src/hlfl
+	doman doc/hlfl.1
+	insinto /usr/share/doc/${P}
+	doins doc/services.hlfl
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-	cd doc
-	dodoc CodingStyle sample_1.hlfl sample_2.hlfl sample_3.hlfl \
-		services.hlfl syntax.txt test.hlfl RoadMap TODO
-	rm -f ${D}/usr/share/*
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
+	TODO doc/RoadMap doc/sample_1.hlfl doc/sample_2.hlfl \
+	doc/test.hlfl doc/syntax.txt doc/sample_3.hlfl doc/CodingStyle
 }
diff --git a/net-misc/hsc/ChangeLog b/net-misc/hsc/ChangeLog
index a2496b3dda46..d45917ac4e45 100644
--- a/net-misc/hsc/ChangeLog
+++ b/net-misc/hsc/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for <CATEGORY>/hsc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hsc/ChangeLog,v 1.1 2003/06/21 08:22:36 george Exp $
+# ChangeLog for net-misc/hsc
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hsc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
+
+*hsc-0.999 (22 Sep 2005)
+
+  22 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> -hsc-0.931.ebuild,
+  hsc-0.935.ebuild, +hsc-0.999.ebuild:
+  Add latest version, mark 935 stable on x86, remove unused version.
+
+  25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> hsc-0.935.ebuild:
+  Marked ~amd64.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> hsc-0.935.ebuild:
+  Added to ~ppc.
+
+*hsc-0.935 (18 Aug 2004)
+
+  18 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> hsc-0.935.ebuild:
+  Add hsc-0.935, thanks to Daniel Armyr <daniel.armyr@home.se> for the ebuild
+  (bug #59861)
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> hsc-0.929.ebuild,
+  hsc-0.931.ebuild:
+  change virtual/glibc to virtual/libc
+
+*hsc-0.931 (11 Dec 2003)
+
+  11 Dec 2003; George Shapovalov <george@gentoo.org> hsc-931.ebuild, files/Makefile.hsc-0.931.patch.bz2 :
+  new version
 
 *hsc-0.929 (20 Jun 2003)
 
diff --git a/net-misc/hsc/Manifest b/net-misc/hsc/Manifest
index 7d22b30ccccf..8bf36fd4f561 100644
--- a/net-misc/hsc/Manifest
+++ b/net-misc/hsc/Manifest
@@ -1,2 +1,10 @@
-MD5 4c4648a863053eaa032182f27ef8c3e1 hsc-0.929.ebuild 1332
+MD5 098410dc31789dd9bd4fb030f96148b1 hsc-0.999.ebuild 883
+MD5 b6e4912cd17dd5bfe1460280587cde5e hsc-0.929.ebuild 948
+MD5 f85dd82adfb4ee4005a57a0769907963 hsc-0.935.ebuild 796
+MD5 2359307c6c619ab55bc75f609c2b3f3e ChangeLog 1612
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 13a8398dc37427ed00147e630652fb0e files/Makefile.hsc-0.929.patch.gz 629
+MD5 216b1a2fbc023fbb42ba08e5a33571e9 files/Makefile.hsc-0.931.patch.bz2 791
 MD5 91d17721a179d561b59ff20245d03077 files/digest-hsc-0.929 62
+MD5 fe32a6823ac1404e688790987990ebb0 files/digest-hsc-0.935 62
+MD5 1f2aa1a529bbcb71e35c77d0f82de0ee files/digest-hsc-0.999 62
diff --git a/net-misc/hsc/hsc-0.929.ebuild b/net-misc/hsc/hsc-0.929.ebuild
index dc71ed354943..654330d52b92 100644
--- a/net-misc/hsc/hsc-0.929.ebuild
+++ b/net-misc/hsc/hsc-0.929.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-misc/hsc/hsc-0.929.ebuild,v 1.1 2003/06/21 08:22:41 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hsc/hsc-0.929.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 DESCRIPTION="An HTML preprocessor using ML syntax"
 HOMEPAGE="http://www.linguistik.uni-erlangen.de/~msbethke/software.html"
@@ -8,11 +8,11 @@ SRC_URI="http://www.linguistik.uni-erlangen.de/~msbethke/binaries/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/hsc/hsc-0.935.ebuild b/net-misc/hsc/hsc-0.935.ebuild
index d7c9bf5fcccf..0b26bae4f245 100644
--- a/net-misc/hsc/hsc-0.935.ebuild
+++ b/net-misc/hsc/hsc-0.935.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/hsc/hsc-0.935.ebuild,v 1.1 2004/08/18 11:42:58 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hsc/hsc-0.935.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 DESCRIPTION="An HTML preprocessor using ML syntax"
 HOMEPAGE="http://www.linguistik.uni-erlangen.de/~msbethke/software.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.linguistik.uni-erlangen.de/~msbethke/binaries/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 
 IUSE=""
 
diff --git a/net-misc/hsc/hsc-0.999.ebuild b/net-misc/hsc/hsc-0.999.ebuild
index e58962bcc421..de6ec0c9f131 100644
--- a/net-misc/hsc/hsc-0.999.ebuild
+++ b/net-misc/hsc/hsc-0.999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hsc/hsc-0.999.ebuild,v 1.1 2005/09/22 10:11:32 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hsc/hsc-0.999.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 DESCRIPTION="An HTML preprocessor using ML syntax"
 HOMEPAGE="http://www.linguistik.uni-erlangen.de/~msbethke/software.html"
diff --git a/net-misc/htpdate/ChangeLog b/net-misc/htpdate/ChangeLog
index b928e7d96dfe..92b9e64d22aa 100644
--- a/net-misc/htpdate/ChangeLog
+++ b/net-misc/htpdate/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for net-misc/htpdate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/ChangeLog,v 1.1 2005/06/22 13:58:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/ChangeLog,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
+
+  17 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  htpdate-0.8.7.ebuild:
+  Added ~hppa Keyword
+
+  15 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  htpdate-0.8.2.ebuild, htpdate-0.8.7.ebuild:
+  Re-added ~ppc keyword for 0.8.7, marked 0.8.2 stable on all archs.
+
+*htpdate-0.8.7 (07 Sep 2005)
+
+  07 Sep 2005; Markus Nigbur <pyrania@gentoo.org> +htpdate-0.8.7.ebuild:
+  Version bump.
+
+  30 Jul 2005; Sven Wegener <swegener@gentoo.org> htpdate-0.8.2.ebuild:
+  Modified to apply patches in src_unpack()
+
+  02 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  htpdate-0.8.2.ebuild:
+  Added to ~amd64.
+
+  01 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> +files/ppc.patch,
+  htpdate-0.8.2.ebuild:
+  Fixed endianess problem. Thanks to Danny van Dyk
+  <kugelfang@gentoo.org>.
+  Marked ~ppc.
+
+  23 Jun 2005; Sven Wegener <swegener@gentoo.org> htpdate-0.8.2.ebuild:
+  Added cross-compile support. Trim whitespace. Pass CFLAGS in a better way.
+
+  22 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  htpdate-0.8.2.ebuild:
+  Was keyworded ppc by a mistake. Removed the keyword.
+  It is currently known to be broken on ppc machines.
 
 *htpdate-0.8.2 (22 Jun 2005)
 
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 39b6c2563f28..b15bc916b243 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,2 +1,7 @@
-MD5 23ba2643b79d134facdf00b677384a1a htpdate-0.8.2.ebuild 691
+MD5 71646e1e3c37e2d6e38c1fc718cceb06 htpdate-0.8.7.ebuild 743
+MD5 4e9e22bee0560930aec77a469440d7e9 htpdate-0.8.2.ebuild 767
+MD5 288031057c0b5ad750490dbfefa21ebb ChangeLog 1536
+MD5 ff2b63df63e17d0b2714390e4c9ff1e1 metadata.xml 256
+MD5 ec81f587e402abf72a7e9e7f7f35e31b files/ppc.patch 474
 MD5 86ea7c47156ba3ab7bd460ad939b1d57 files/digest-htpdate-0.8.2 64
+MD5 04f4c6fdd660e39f608b45bb648846db files/digest-htpdate-0.8.7 64
diff --git a/net-misc/htpdate/htpdate-0.8.2.ebuild b/net-misc/htpdate/htpdate-0.8.2.ebuild
index 6bccb7485b92..1e9ea629e963 100644
--- a/net-misc/htpdate/htpdate-0.8.2.ebuild
+++ b/net-misc/htpdate/htpdate-0.8.2.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-misc/htpdate/htpdate-0.8.2.ebuild,v 1.1 2005/06/22 13:58:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
-DESCRIPTION="Synchronize local workstation with time offered by remote web
-servers"
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
 HOMEPAGE="http://www.clevervest.com/htp/"
 SRC_URI="http://www.clevervest.com/htp/archive/c/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=""
@@ -20,19 +20,15 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	sed -i \
-		-e 's:CFLAGS =:#CFLAGS =:' \
-		Makefile || die "sed failed"
+	epatch "${FILESDIR}"/ppc.patch
 }
 
 src_compile() {
-	emake || die
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
 }
 
 src_install () {
-	into /usr
 	dosbin htpdate || die
 	doman htpdate.8.gz || die
 	dodoc README CHANGES || die
 }
-
diff --git a/net-misc/htpdate/htpdate-0.8.7.ebuild b/net-misc/htpdate/htpdate-0.8.7.ebuild
index 0f150bcc6833..871b13829c66 100644
--- a/net-misc/htpdate/htpdate-0.8.7.ebuild
+++ b/net-misc/htpdate/htpdate-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-0.8.7.ebuild,v 1.1 2005/09/07 10:16:11 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htpdate/htpdate-0.8.7.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.clevervest.com/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-misc/httptunnel/ChangeLog b/net-misc/httptunnel/ChangeLog
index 9685abfd1eae..942a793b33c7 100644
--- a/net-misc/httptunnel/ChangeLog
+++ b/net-misc/httptunnel/ChangeLog
@@ -1,11 +1,33 @@
 # ChangeLog for net-misc/httptunnel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/ChangeLog,v 1.1 2002/05/27 23:30:23 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/ChangeLog,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
-* httptunnel-3.0.5 (24 May 2002)
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> httptunnel-3.3.ebuild:
+  Stable on ppc.
 
-  24 May 2002; A.Bennee <alex@bennee.com> ChangeLog : 
+  15 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> httptunnel-3.3.ebuild:
+  Stable on sparc
+
+*httptunnel-3.3 (21 May 2005)
+
+  21 May 2005; Thomas Matthijs <axxo@gentoo.org> +httptunnel-3.3.ebuild:
+  version bump, closes 92949
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  httptunnel-3.0.5.ebuild:
+  Stable on ppc.
 
+  26 Jun 2004; David Holm <dholm@gentoo.org> httptunnel-3.0.5.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*httptunnel-3.0.5 (24 May 2002)
+
+  07 Jul 2002; phoen][x <phoenix@gentoo.org> httptunnel-3.0.5.ebuild :
+  Added KEYWORDS, SLOT. 
+
+  24 May 2002; A.Bennee <alex@bennee.com> 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-misc/httptunnel/Manifest b/net-misc/httptunnel/Manifest
index e69de29bb2d1..3c4e4fef0532 100644
--- a/net-misc/httptunnel/Manifest
+++ b/net-misc/httptunnel/Manifest
@@ -0,0 +1,5 @@
+MD5 602a6a2297a983a3248699f021b0af2e httptunnel-3.0.5.ebuild 749
+MD5 5a7094c2e8057145efce5a3f1e1a2e68 httptunnel-3.3.ebuild 735
+MD5 380be11c1cdb3b669d98f9ec2e073658 ChangeLog 1365
+MD5 f1a39229044644910108b779c98a81f2 files/digest-httptunnel-3.0.5 68
+MD5 aa050c974c4bacc83bda01106e79aa81 files/digest-httptunnel-3.3 66
diff --git a/net-misc/httptunnel/httptunnel-3.0.5.ebuild b/net-misc/httptunnel/httptunnel-3.0.5.ebuild
index 970c73f1f8f5..416fdc9f6502 100644
--- a/net-misc/httptunnel/httptunnel-3.0.5.ebuild
+++ b/net-misc/httptunnel/httptunnel-3.0.5.ebuild
@@ -1,12 +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/net-misc/httptunnel/httptunnel-3.0.5.ebuild,v 1.1 2002/05/27 23:30:23 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
-LICENSE="GPL"
+LICENSE="GPL-2"
 DEPEND=""
+KEYWORDS="x86 sparc ppc"
+IUSE=""
+SLOT="0"
 #RDEPEND=""
 SRC_URI="http://www.nocrew.org/software/httptunnel/httptunnel-3.0.5.tar.gz"
 
diff --git a/net-misc/httptunnel/httptunnel-3.3.ebuild b/net-misc/httptunnel/httptunnel-3.3.ebuild
index 2e7cd34e30b9..14276de09177 100644
--- a/net-misc/httptunnel/httptunnel-3.3.ebuild
+++ b/net-misc/httptunnel/httptunnel-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/net-misc/httptunnel/httptunnel-3.3.ebuild,v 1.1 2005/05/21 08:40:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptunnel/httptunnel-3.3.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
 HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
 LICENSE="GPL-2"
 DEPEND=""
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="ppc sparc x86"
 IUSE=""
 SLOT="0"
 #RDEPEND=""
diff --git a/net-misc/httptype/ChangeLog b/net-misc/httptype/ChangeLog
index cb8435df9933..9f850c64eec9 100644
--- a/net-misc/httptype/ChangeLog
+++ b/net-misc/httptype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/httptype
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httptype/ChangeLog,v 1.1 2004/08/02 21:32:44 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptype/ChangeLog,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
+
+  27 Aug 2004; Tom Gall <tgall@gentoo.org> httptype-1.3.9.ebuild:
+  stable on ppc64, bug #59350
+
+  04 Aug 2004; David Holm <dholm@gentoo.org> httptype-1.3.9.ebuild:
+  Added to ~ppc.
 
 *httptype-1.3.9 (02 Aug 2004)
 
diff --git a/net-misc/httptype/Manifest b/net-misc/httptype/Manifest
index d09d7b1d42a9..e953e78e73fc 100644
--- a/net-misc/httptype/Manifest
+++ b/net-misc/httptype/Manifest
@@ -1,2 +1,4 @@
-MD5 72fb2be858fce018872bb196c1fb0822 httptype-1.3.9.ebuild 491
+MD5 329236b49531fa36465bec85c89ab0c6 httptype-1.3.9.ebuild 701
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 b9551d252fe624d0ee38b94119192bd3 ChangeLog 521
 MD5 ce953a5b4c43cb5688f5f7d85f7c14b0 files/digest-httptype-1.3.9 65
diff --git a/net-misc/httptype/httptype-1.3.9.ebuild b/net-misc/httptype/httptype-1.3.9.ebuild
index 1d690e86d22d..258b0b7d7008 100644
--- a/net-misc/httptype/httptype-1.3.9.ebuild
+++ b/net-misc/httptype/httptype-1.3.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/net-misc/httptype/httptype-1.3.9.ebuild,v 1.1 2004/08/02 21:32:44 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httptype/httptype-1.3.9.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 DESCRIPTION="httptype is a program that returns the http host software of a website."
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-1"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ppc64"
 IUSE=""
 DEPEND="dev-lang/perl"
 #RDEPEND=""
diff --git a/net-misc/httptype/metadata.xml b/net-misc/httptype/metadata.xml
index 73d3c0910ad4..20ce219711a2 100644
--- a/net-misc/httptype/metadata.xml
+++ b/net-misc/httptype/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>rizzo@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-misc/htun/ChangeLog b/net-misc/htun/ChangeLog
index 221fab1b9620..76a6c90353ae 100644
--- a/net-misc/htun/ChangeLog
+++ b/net-misc/htun/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/htun
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/ChangeLog,v 1.1 2003/12/30 22:29:50 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> htun-0.9.5.ebuild:
+  Add dev-util/yacc to DEPEND for bug 100755. Thanks to Stefan Briesenick
+  <sbriesen@gentoo.org>.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> htun-0.9.5.ebuild:
+  change virtual/glibc to virtual/libc
 
 *htun-0.9.5 (30 Dec 2003)
 
diff --git a/net-misc/htun/Manifest b/net-misc/htun/Manifest
index 1cbdb4c67abe..ddd5aa5c4221 100644
--- a/net-misc/htun/Manifest
+++ b/net-misc/htun/Manifest
@@ -1,2 +1,4 @@
-MD5 419ce2c384b73dace576c07219b1d58f htun-0.9.5.ebuild 1474
+MD5 986a9787904222e08303c984d5a00926 htun-0.9.5.ebuild 1117
+MD5 a549ec2184cb84cec3edcf35bd7f3871 ChangeLog 664
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
 MD5 a536aeb2ea0c271d803435285969652c files/digest-htun-0.9.5 61
diff --git a/net-misc/htun/htun-0.9.5.ebuild b/net-misc/htun/htun-0.9.5.ebuild
index a8c2975b59f8..e4360e7678c1 100644
--- a/net-misc/htun/htun-0.9.5.ebuild
+++ b/net-misc/htun/htun-0.9.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/net-misc/htun/htun-0.9.5.ebuild,v 1.1 2003/12/30 22:29:50 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htun/htun-0.9.5.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 DESCRIPTION="Project to tunnel IP traffic over HTTP"
 HOMEPAGE="http://htun.runslinux.net/"
@@ -12,11 +12,10 @@ KEYWORDS="~x86"
 
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc
+	dev-util/yacc"
 RDEPEND=""
 
-S=${WORKDIR}/${P}
-
 
 src_compile() {
 
@@ -31,19 +30,17 @@ src_install() {
 	doins ${S}/doc/htund.conf
 	dodoc doc/*
 
-	einfo "                                                  "
-	einfo "                                                  "
-	einfo "NOTE: HTun requires the Universal TUN/TAP module  "
+	einfo
+	einfo "NOTE: HTun requires the Universal TUN/TAP module"
 	einfo "available in the Linux kernel.  Make sure you have"
-	einfo "compiled the tun.o driver as a module!            "
-	einfo "                                                  "
-	einfo "It can be found in the kernel configuration under "
-	einfo "Network Device Support --> Universal TUN/TAP      "
-	einfo "                                                  "
-	einfo "To configure HTun, run the following commands as root:       "
-	einfo "  # mknod /dev/net/tun c 10 200                              "
+	einfo "compiled the tun.o driver as a module!"
+	einfo
+	einfo "It can be found in the kernel configuration under"
+	einfo "Network Device Support --> Universal TUN/TAP"
+	einfo
+	einfo "To configure HTun, run the following commands as root:"
+	einfo "  # mknod /dev/net/tun c 10 200"
 	einfo "  # echo \"alias char-major-10-200 tun\" >> /etc/modules.conf"
-	einfo "  # depmod -e                                                "
-	einfo "                                                  "
-	einfo "                                                  "
+	einfo "  # depmod -e"
+	einfo
 }
diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index ca1e4d6347f5..ccdb9a15d850 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,10 +1,97 @@
 # ChangeLog for net-misc/icaclient
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.1 2002/06/09 04:05:30 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  26 Aug 2005; Jason Wever <weeve@gentoo.org> icaclient-9.0.ebuild:
+  Added fix for bug #103706.
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  icaclient-8.0-r3.ebuild, icaclient-9.0.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
+
+  30 Jun 2005; Aron Griffis <agriffis@gentoo.org> icaclient-8.0-r3.ebuild:
+  Fix use invocation: [ use gnome ] will never work
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org> icaclient-9.0.ebuild:
+  Fix use invocation
+
+*icaclient-9.0 (18 May 2005)
+
+  18 May 2005; Jason Wever <weeve@gentoo.org> icaclient-8.0-r3.ebuild,
+  +icaclient-9.0.ebuild:
+  Marked 8.0-r3 stable on x86 and added a version bump (resolves bug #92538).
+
+  20 Apr 2005; Herbie Hopkins <herbs@gentoo.org> icaclient-8.0-r3.ebuild:
+  Multilib fixes, add ~amd64 keyword - Bug #89057
+
+*icaclient-8.0-r3 (12 Dec 2004)
+
+  12 Dec 2004; Jason Wever <weeve@gentoo.org> -icaclient-8.0-r1.ebuild,
+  +icaclient-8.0-r3.ebuild, -icaclient-8.0.ebuild:
+  Added fix for bug #70601 and cleaned up old versions of package.
+
+  24 Nov 2004; Sven Wegener <swegener@gentoo.org> icaclient-6.30-r1.ebuild:
+  Fixed SRC_URI to match real file name.
+
+*icaclient-8.0-r2 (30 Oct 2004)
+
+  30 Oct 2004; Jason Wever <weeve@gentoo.org> +icaclient-8.0-r2.ebuild:
+  Added NLS fixes wrt bug #69171, thanks to Rob Henderson
+  <robh@cs.indiana.edu> for the patch.
+
+*icaclient-8.0-r1 (04 Oct 2004)
+
+  04 Oct 2004; Jason Wever <weeve@gentoo.org> files/10ICAClient,
+  +icaclient-8.0-r1.ebuild:
+  Added fixes for bugs #65732 and #66036. Thanks to Andy Wang
+  <dopey@moonteeth.com> and Nico Baggus <mlspamcb@noci.xs4all.nl> for the
+  work.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> icaclient-7.0.ebuild,
+  icaclient-8.0.ebuild:
+  Cleaned up comments.
+
+*icaclient-8.0 (28 Aug 2004)
+
+  28 Aug 2004; Jason Wever <weeve@gentoo.org> +metadata.xml,
+  +icaclient-8.0.ebuild:
+  Added ebuild for version 8.0, take over ownership of package.
+
+  01 Aug 2004; Jason Wever <weeve@gentoo.org> icaclient-6.30-r1.ebuild,
+  icaclient-7.0.ebuild:
+  Masked on sparc as only Solaris/SPARC binaries exist.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> icaclient-6.30-r1.ebuild,
+  icaclient-7.0.ebuild:
+  change virtual/glibc to virtual/libc
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  icaclient-6.30-r1.ebuild, icaclient-7.0.ebuild:
+  dyn_fetch() -> pkg_nofetch(); tidy
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> icaclient-6.30.ebuild:
+  clean older ebuild
+
+*icaclient-7.0 (11 Oct 2003)
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> icaclient-7.0.ebuild:
+  Version bumped. Closes #26471
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*icaclient-6.30-r1 (04 Nov 2002)
+
+  04 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Fixed installation issue per #10196
 
 *icaclient-6.30 (8 Jun 2002)
 
-  8 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+  07 Jun 2002; phoen][x <phoenix@gentoo.org> icaclient-6.30.ebuild:
+  Added KEYWORDS.
 
-  New port submitted bu Fr�d�ric Mangeant <frederic.mangeant@free.fr>.
+  08 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+  New port submitted bu Frédéric Mangeant <frederic.mangeant@free.fr>.
   Bug #2440.
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index e69de29bb2d1..20e42f4993a2 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6ac9af87c588be5c2b27c8814e421600 icaclient-8.0-r2.ebuild 2043
+MD5 53bd814649d90e7fabf654aabe9a6261 icaclient-6.30-r1.ebuild 1799
+MD5 16822b22c610eff7152d5d719449321f icaclient-9.0.ebuild 2510
+MD5 c279042f1104a38650f13e93422bea02 icaclient-8.0-r3.ebuild 2356
+MD5 8f493eb1f4a1e8c1c6e7c3d63f32a440 icaclient-7.0.ebuild 1792
+MD5 d81ef8a7082707d12d1cf8977e79acbb metadata.xml 344
+MD5 75a16c142af70c5969a260fa235d0105 ChangeLog 3384
+MD5 dc673ffc614ac414129b92d79d6893ea files/digest-icaclient-8.0-r2 70
+MD5 acdf869e56609fbdc8963ae79e838bb8 files/digest-icaclient-9.0 70
+MD5 6d6282b0502b9927e5d77a1ed6751722 files/digest-icaclient-7.0 71
+MD5 8c3ecc1c3852bbc576833ea8c4cc90c0 files/digest-icaclient-6.30-r1 71
+MD5 38e451023d1aed7c8c1351167d4c53b7 files/10ICAClient 67
+MD5 dc673ffc614ac414129b92d79d6893ea files/digest-icaclient-8.0-r3 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1VALLFUmVNQ7rkRAlMYAKChhv62X4H0H0k3x2/1e2mOiNND9gCg0G7F
+cIKRp3vdMy/QNowAmUPxAoM=
+=yvX2
+-----END PGP SIGNATURE-----
diff --git a/net-misc/icaclient/files/10ICAClient b/net-misc/icaclient/files/10ICAClient
index e58189707bb7..ef963c3f0efb 100644
--- a/net-misc/icaclient/files/10ICAClient
+++ b/net-misc/icaclient/files/10ICAClient
@@ -1,2 +1,3 @@
 PATH=/opt/ICAClient
 ROOTPATH=/opt/ICAClient
+ICAROOT=/opt/ICAClient
diff --git a/net-misc/icaclient/icaclient-6.30-r1.ebuild b/net-misc/icaclient/icaclient-6.30-r1.ebuild
index 286bdf6120b3..58ee66de01d2 100644
--- a/net-misc/icaclient/icaclient-6.30-r1.ebuild
+++ b/net-misc/icaclient/icaclient-6.30-r1.ebuild
@@ -1,28 +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/net-misc/icaclient/icaclient-6.30-r1.ebuild,v 1.1 2002/11/04 14:51:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-6.30-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
-S=${WORKDIR}/usr
 DESCRIPTION="ICA Client"
-SRC_URI="ICAClient-6.30-1.i386.rpm"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
-RDEPEND="virtual/glibc virtual/x11"
-DEPEND="${RDEPEND} >=app-arch/rpm-3.0.6"
+SRC_URI="ICAClient-6.30-1.i386.rpm"
+
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="~x86 -sparc"
+IUSE=""
 RESTRICT="fetch"
-KEYWORDS="x86 sparc sparc64"
 
-dyn_fetch() {
-	for y in ${A} 
-	do
-		digest_check ${y}
-			if [ $? -ne 0 ]; then
-				einfo "Please download this yourself from www.citrix.com"
-				einfo "and place it in ${DISTDIR}"
-				exit 1
-			fi
-	done
+RDEPEND="virtual/libc
+	virtual/x11"
+DEPEND="${RDEPEND}
+	>=app-arch/rpm-3.0.6"
+
+S="${WORKDIR}/usr"
+
+pkg_nofetch() {
+	einfo "Please download ${A} yourself from www.citrix.com"
+	einfo "and place it in ${DISTDIR}"
 }
 
 src_unpack() {
@@ -64,5 +63,5 @@ src_install() {
 	doexe lib/ICAClient/wfcmgr.bin
 	doexe lib/ICAClient/wfica
 	insinto /etc/env.d
-	doins ${FILESDIR}/10ICAClient	
+	doins ${FILESDIR}/10ICAClient
 }
diff --git a/net-misc/icaclient/icaclient-7.0.ebuild b/net-misc/icaclient/icaclient-7.0.ebuild
index d3108f35de16..75a5b902242e 100644
--- a/net-misc/icaclient/icaclient-7.0.ebuild
+++ b/net-misc/icaclient/icaclient-7.0.ebuild
@@ -1,32 +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/net-misc/icaclient/icaclient-7.0.ebuild,v 1.1 2003/10/10 18:16:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-7.0.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
-S=${WORKDIR}/usr
 DESCRIPTION="ICA Client"
-SRC_URI="ICAClient-7.00-1.i386.rpm"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
-RDEPEND="virtual/glibc virtual/x11"
-DEPEND="${RDEPEND} >=app-arch/rpm-3.0.6"
+SRC_URI="ICAClient-7.00-1.i386.rpm"
+
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="~x86 -sparc"
+IUSE=""
 RESTRICT="fetch"
-KEYWORDS="~x86 ~sparc"
 
-dyn_fetch() {
-	for y in ${A}
-	do
-		digest_check ${y}
-			if [ $? -ne 0 ]; then
-				einfo "Please download this yourself from www.citrix.com"
-				einfo "and place it in ${DISTDIR}"
-				exit 1
-			fi
-	done
+RDEPEND="virtual/libc
+	virtual/x11"
+DEPEND="${RDEPEND}
+	>=app-arch/rpm-3.0.6"
+
+S="${WORKDIR}/usr"
+
+pkg_nofetch() {
+	einfo "Please download ${A} yourself from www.citrix.com"
+	einfo "and place it in ${DISTDIR}"
 }
 
 src_unpack() {
-	# You must download ICAClient-6.30-1.i386.rpm
+	# You must download ICAClient-7.00-1.i386.rpm
 	# from www.citrix.com and put it in ${DISTDIR}
 	rpm2cpio ${DISTDIR}/${A} | cpio -i --make-directories
 }
diff --git a/net-misc/icaclient/icaclient-8.0-r2.ebuild b/net-misc/icaclient/icaclient-8.0-r2.ebuild
index c47e5c92232b..9fcf39c6c2f7 100644
--- a/net-misc/icaclient/icaclient-8.0-r2.ebuild
+++ b/net-misc/icaclient/icaclient-8.0-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-misc/icaclient/icaclient-8.0-r2.ebuild,v 1.1 2004/10/30 17:23:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-8.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
 DESCRIPTION="ICA Client"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
diff --git a/net-misc/icaclient/icaclient-8.0-r3.ebuild b/net-misc/icaclient/icaclient-8.0-r3.ebuild
index 52ee98f667ff..87063340c5c4 100644
--- a/net-misc/icaclient/icaclient-8.0-r3.ebuild
+++ b/net-misc/icaclient/icaclient-8.0-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-8.0-r3.ebuild,v 1.1 2004/12/12 16:36:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-8.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
+
+inherit multilib
 
 DESCRIPTION="ICA Client"
 HOMEPAGE="http://www.citrix.com/download/unix-downloads.asp"
@@ -8,17 +10,23 @@ SRC_URI="ICAClient-8.0-1.i386.rpm"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="gnome"
 RESTRICT="fetch"
 
 RDEPEND="virtual/libc
-	virtual/x11"
+	virtual/x11
+	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 DEPEND="${RDEPEND}
 	>=app-arch/rpm-3.0.6"
 
 S="${WORKDIR}/usr"
 
+pkg_setup() {
+	# Binary x86 package
+	has_multilib_profile && ABI="x86"
+}
+
 pkg_nofetch() {
 	einfo "Please download ${A} yourself from www.citrix.com"
 	einfo "and place it in ${DISTDIR}"
@@ -70,11 +78,11 @@ src_install() {
 	doexe lib/ICAClient/wfica
 	insinto /etc/env.d
 	doins ${FILESDIR}/10ICAClient
-	insinto /usr/lib/nsbrowser/plugins
-	dosym /opt/ICAClient/npica.so /usr/lib/nsbrowser/plugins/npica.so
+	insinto /usr/$(get_libdir)/nsbrowser/plugins
+	dosym /opt/ICAClient/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
 
-	if [ use gnome ]; then
+	if use gnome; then
 		insinto /usr/share/applications
 		doins lib/ICAClient/desktop/*.desktop
-	fi	
+	fi
 }
diff --git a/net-misc/icaclient/icaclient-9.0.ebuild b/net-misc/icaclient/icaclient-9.0.ebuild
index 70bb7934154b..6ea2a31d2a19 100644
--- a/net-misc/icaclient/icaclient-9.0.ebuild
+++ b/net-misc/icaclient/icaclient-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-9.0.ebuild,v 1.1 2005/05/18 02:15:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-9.0.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
 inherit multilib
 
@@ -16,14 +16,17 @@ RESTRICT="fetch"
 
 RDEPEND="virtual/libc
 	virtual/x11
+	>=x11-libs/openmotif-2.2.2
 	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )"
 DEPEND="${RDEPEND}
 	>=app-arch/rpm-3.0.6"
 
 S="${WORKDIR}/usr"
 
-# Binary x86 package
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# Binary x86 package
+	has_multilib_profile && ABI="x86"
+}
 
 pkg_nofetch() {
 	einfo "Please download ${A} yourself from www.citrix.com"
@@ -78,7 +81,7 @@ src_install() {
 	insinto /usr/$(get_libdir)/nsbrowser/plugins
 	dosym /opt/ICAClient/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
 
-	if [ `use gnome` ]; then
+	if use gnome; then
 		insinto /usr/share/applications
 		doins lib/ICAClient/desktop/*.desktop
 	fi
diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index 018a6c0e1b71..9aad1589bdde 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,13 +1,204 @@
 # ChangeLog for net-misc/icecast
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
-*icecast-1.3.11 (1 Feb 2002)
+  01 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> icecast-2.2.0.ebuild:
+  Remove doc useflag, always install user docs, fixes #95653. Install man page
+  from debian, close #95655. Use newinitd.
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> icecast-2.2.0.ebuild:
+  epatch does not need die.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> icecast-2.1.0.ebuild:
+  Stable on ppc.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> icecast-2.1.0.ebuild:
+  Stable on alpha.
+
+  26 Feb 2005; Eric Shattow <jnc@gentoo.org> icecast-2.0.1-r1.ebuild,
+  icecast-2.0.2.ebuild, icecast-2.1.0.ebuild, icecast-2.2.0.ebuild:
+  Update SRC_URI
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> icecast-2.2.0.ebuild:
+  readded arches to KEYWORDS.
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/2.2.0-gentoo.patch,
+  icecast-2.2.0.ebuild:
+  2.2.0 now applies a patch to fix #79199
+
+*icecast-2.2.0 (22 Jan 2005)
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +icecast-2.2.0.ebuild:
+  new upstream version. fixes #76193
+
+  01 Jan 2005; Markus Rothe <corsair@gentoo.org> icecast-2.1.0.ebuild:
+  Stable on ppc64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icecast-2.1.0.ebuild:
+  Stable amd64, sparc, x86.
+
+  14 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> icecast-2.1.0.ebuild:
+  ~alpha keyword.
+
+  22 Nov 2004; Markus Rothe <corsair@gentoo.org> icecast-2.1.0.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #70096
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/icecast-1.3.12-variables-gentoo.diff.bz2, -icecast-2.0.0.ebuild,
+  -icecast-2.0.1.ebuild:
+  Cleanup old versions.
+
+  06 Nov 2004; Simon Stelling <blubb@gentoo.org> icecast-2.1.0.ebuild:
+  added ~amd64
+
+  06 Nov 2004; Daniel Black <dragonheart@gentoo.org> icecast-2.1.0.ebuild:
+  ~ppc keyworded as per bug #70096. Thanks Warren Dukes
+  <shank@mercury.chem.pitt.edu>
+
+  06 Nov 2004; Ferris McCormick <fmccor@gentoo.org> icecast-2.1.0.ebuild:
+  Add ~sparc keyword, as requested in Bug 70096.  Package builds, and the
+  daemon starts up and seems to run.
+
+*icecast-2.1.0 (06 Nov 2004)
+
+  06 Nov 2004; Chris White <chriswhite@gentoo.org> icecast-2.0.2.ebuild,
+  +icecast-2.1.0.ebuild:
+  Fixed illegal eutils inherit in 2.0.2 version. Updated to version 2.1.0 and
+  setup for arch marking per bug #70096.
+
+  10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icecast-2.0.2.ebuild:
+  Fixed perms of icecast.xml.
+
+  10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icecast-2.0.2.ebuild:
+  Added more documentation.
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> icecast-2.0.1-r1.ebuild:
+  Stable on alpha.
+
+*icecast-2.0.2 (30 Sep 2004)
+
+  30 Sep 2004; Chris White <chriswhite@gentoo.org> +icecast-2.0.2.ebuild:
+  Bump to version 2.0.2 to be safe regarding upstream security annoucement, even
+  though it appears to only effect win32 systems.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  icecast-2.0.1-r1.ebuild:
+  Stable amd64, sparc, x86.
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> icecase-2.0.1-r1.ebuild:
+  stable on ppc64, bug #58553
+
+  25 Aug 2004; Chris White <chriswhite@gentoo.org> -icecast-1.3.12-r1.ebuild:
+  Removed icecast 1.3.12-r1 from the tree as per security bug #61495.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> icecast-1.3.12-r1.ebuild,
+  icecast-2.0.0.ebuild, icecast-2.0.1-r1.ebuild, icecast-2.0.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+*icecast-2.0.1-r1 (16 Jun 2004)
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/init.d.icecast, +icecast-2.0.1-r1.ebuild:
+  Added init script to close bug #52414.
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> icecast-2.0.1.ebuild:
+  Stable on alpha.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+*icecast-2.0.1 (13 May 2004)
+
+  13 May 2004; Martin Holzer <mholzer@gentoo.org> icecast-2.0.1.ebuild:
+  This is a Security Release. See 50935
+
+  22 Apr 2004; Dylan Carlson <absinthe@gentoo.org> icecast-2.0.0.ebuild:
+  Marked stable on amd64.
+
+  06 Apr 2004; Nick Hadaway <raker@gentoo.org> icecast-2.0.0.ebuild:
+  oggvorbis is a requirement, not an optional dependancy.  See
+  the icecast docs and bug #46963.
+
+  05 Apr 2004; Jason Wever <weeve@gentoo.org> icecast-2.0.0.ebuild:
+  Marked stable on sparc.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> icecast-2.0.0.ebuild:
+  Stable on x86.
+
+  16 Mar 2004; Dylan Carlson <absinthe@gentoo.org> icecast-2.0.0.ebuild:
+  Added amd64 to KEYWORDS.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> icecast-2.0.0.ebuild:
+  add ~alpha
+
+*icecast-2.0.0 (13 Jan 2004)
+
+  13 Jan 2004; Martin Holzer <mholzer@gentoo.org> icecast-2.0.0.ebuild:
+  Version bumped. Closes 37690.
+
+*icecast-2.0_beta3 (29 Dec 2003)
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> icecast-2.0_beta3.ebuild:
+  Version bumped. Closes 36203.
+
+*icecast-2.0_beta2 (11 Dec 2003)
+
+  11 Dec 2003; Martin Holzer <mholzer@gentoo.org> icecast-2.0_beta2.ebuild:
+  Version bumped. Closes #35126.
+
+*icecast-2.0_pre20030929 (30 Sep 2003)
+
+  30 Sep 2003; jje <jje@gentoo.org> icecast-2.0_pre20030929.ebuild:
+  New snapshot ebuild, SRC_URI on distfiles. Fixes curl issues.
   
+  Thanks to: Blake Watters <sbw@ibiblio.org> and Brandy.
+
+*icecast-2.0_alpha2 (15 Aug 2003)
+
+  15 Aug 2003; Nick Hadaway <raker@gentoo.org> icecast-2.0_alpha2.ebuild:
+  Icecast is back. :)  Development is obviously not complete but icecast1
+  is really ancient.
+
+*icecast-1.3.12-r1 (23 Jul 2002)
+
+  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patch to fix new glibc errno issues #16370 (#16267).
+
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  icecast-1.3.12-r1.ebuild files/variables.diff
+  files/icecast-1.3.12-variables-gentoo.diff.bz2 :
+
+  Compressed the patch, and used epatch from eutils instead.
+
+  23 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  icecast-1.3.12-r1.ebuild, files/digest-icecast-1.3.12-r1,
+  files/variables.diff :
+
+  Fixed ebuild so that it installs files in an FHS compliant manner.
+  Also adjust icecast.conf.dist so that by default it is pointing to
+  the proper static, templates, and logging directories.
+
+*icecast-1.3.12 (25 Apr 2002)
+
+  07 Jul 2002; phoen][x <phoenix@gentoo.org> icecast-1.3.12.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  25 Apr 2002: M.Jones <ashmodai@gentoo.org> icecast-1.3.12.ebuild :
+  This is the latest version of Icecast. It contains security updates
+  and network fixes for streams over 160kbps.
+
+*icecast-1.3.11 (1 Feb 2002)
+
+  07 Jul 2002: phoen][x <phoenix@gentoo.org> icecast-1.3.11.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index e69de29bb2d1..f347252c526f 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 20d5786603be2710b8e75bc3409ee7fe ChangeLog 7231
+MD5 2c2b3c9ebae24f5549c6bf6b7b71a3db icecast-2.2.0.ebuild 1152
+MD5 f0d6c4a492be7ed7ef6f3ee6a49cb2e0 icecast-2.1.0.ebuild 1068
+MD5 f21d4be19306962df91c96bc5cfd7f8c icecast-2.0.2.ebuild 1113
+MD5 5eff8bd7d69f53898b122ef0ce6d4019 icecast-2.0.1-r1.ebuild 1047
+MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 473c7b8b865ecfdfd794414c980fe659 files/digest-icecast-2.0.1-r1 65
+MD5 222ea172a59c3efde7c67585f4b08939 files/digest-icecast-2.0.2 65
+MD5 a5f4b4836da859fb3b50704c437e2ba9 files/1.3.12-errno.patch 1732
+MD5 31957ee65102675eaa5950f85de03a3f files/digest-icecast-2.2.0 65
+MD5 7fea29ea3b0c1cd4cda72553db01dfa9 files/2.2.0-gentoo.patch 15011
+MD5 0d1040986ca91ef513c0666a47161be0 files/digest-icecast-2.1.0 65
+MD5 294ad1abe0a9f4abc496f53e158695be files/init.d.icecast 357
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDF5Vgj5H05b2HAEkRAj3gAKCixm6u96rfj8nJ+ARgWFH8M5rV/QCeOmsB
+VH0J4pZMYsGgXOQpKI3NhWM=
+=7BoR
+-----END PGP SIGNATURE-----
diff --git a/net-misc/icecast/icecast-2.0.1-r1.ebuild b/net-misc/icecast/icecast-2.0.1-r1.ebuild
index ba918e028fc9..cfb08ed5a9bf 100644
--- a/net-misc/icecast/icecast-2.0.1-r1.ebuild
+++ b/net-misc/icecast/icecast-2.0.1-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.0.1-r1.ebuild,v 1.1 2004/06/16 09:32:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.0.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
 HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://www.icecast.org/files/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc sparc alpha amd64 ppc64"
 IUSE="curl"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=media-libs/libvorbis-1.0
diff --git a/net-misc/icecast/icecast-2.0.2.ebuild b/net-misc/icecast/icecast-2.0.2.ebuild
index 56596d2894d3..48a368ffa592 100644
--- a/net-misc/icecast/icecast-2.0.2.ebuild
+++ b/net-misc/icecast/icecast-2.0.2.ebuild
@@ -1,23 +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/net-misc/icecast/icecast-2.0.2.ebuild,v 1.1 2004/09/30 04:23:41 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 inherit eutils
 
+IUSE="curl doc"
 DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
 HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://svn.xiph.org/releases/icecast/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
-IUSE="curl"
 
-DEPEND="virtual/libc
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=media-libs/libvorbis-1.0
-	>=media-libs/libogg-1.0
+DEPEND="dev-libs/libxslt
+	media-libs/libogg
+	media-libs/libvorbis
 	curl? ( net-misc/curl )"
 
 src_compile() {
@@ -31,11 +29,14 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS README TODO HACKING NEWS
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+	use doc && dohtml -A chm,hhc,hhp doc/*
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/init.d.icecast icecast
 
-	rm -rf ${D}usr/share/doc/icecast
+	fperms 600 /etc/icecast2/icecast.xml
+
+	rm -rf ${D}/usr/share/doc/icecast
 }
diff --git a/net-misc/icecast/icecast-2.1.0.ebuild b/net-misc/icecast/icecast-2.1.0.ebuild
index dda6a4675fef..e26b76d0605f 100644
--- a/net-misc/icecast/icecast-2.1.0.ebuild
+++ b/net-misc/icecast/icecast-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.1.0.ebuild,v 1.1 2004/11/05 23:38:04 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.1.0.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 IUSE="doc yp"
 
@@ -8,11 +8,11 @@ inherit eutils
 
 DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
 HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://svn.xiph.org/releases/icecast/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 DEPEND="dev-libs/libxslt
 	media-libs/libogg
diff --git a/net-misc/icecast/icecast-2.2.0.ebuild b/net-misc/icecast/icecast-2.2.0.ebuild
index 92615f21795a..465cb401c645 100644
--- a/net-misc/icecast/icecast-2.2.0.ebuild
+++ b/net-misc/icecast/icecast-2.2.0.ebuild
@@ -1,24 +1,31 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.2.0.ebuild,v 1.1 2005/01/22 21:21:31 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
-IUSE="doc yp"
+IUSE="yp"
 
 inherit eutils
 
 DESCRIPTION="An opensource alternative to shoutcast that supports mp3 and ogg streaming"
 HOMEPAGE="http://www.icecast.org/"
-SRC_URI="http://svn.xiph.org/releases/icecast/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-libs/libxslt
 	media-libs/libogg
 	media-libs/libvorbis
 	yp? ( net-misc/curl )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-gentoo.patch
+}
+
 src_compile() {
 
 	econf \
@@ -32,10 +39,10 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
-	use doc && dohtml -A chm,hhc,hhp doc/*
+	dohtml -A chm,hhc,hhp doc/*
+	doman ${S}/debian/icecast2.1
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.icecast icecast
+	newinitd ${FILESDIR}/init.d.icecast icecast
 
 	fperms 600 /etc/icecast2/icecast.xml
 
diff --git a/net-misc/ices/ChangeLog b/net-misc/ices/ChangeLog
index 39ee13800eed..8aa171e6f034 100644
--- a/net-misc/ices/ChangeLog
+++ b/net-misc/ices/ChangeLog
@@ -1,11 +1,74 @@
 # ChangeLog for net-misc/ices
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.1 2002/07/25 20:41:39 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ChangeLog,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
+  26 Feb 2005; Eric Shattow <jnc@gentoo.org> ices-2.0.0.ebuild:
+  update SRC_URI
+
+*ices-2.0.1 (06 Feb 2005)
+
+  06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ices-2.0.0.ebuild,
+  ices-2.0.1.ebuild:
+  changed description, fixes #80988
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  new upstream release. fixes #80374
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -files/docdir.diff,
+  -ices-0.2.3.ebuild, -ices-0.3.ebuild, -ices-0.4.ebuild:
+  Removed old versions.  Fixed SRC_URI for bug #69744.
+
+  31 Aug 2004; <pyrania@gentoo.org> ices-0.4.ebuild:
+  IUSE fixup.
+
+*ices-0.4 (30 Aug 2004)
+
+  30 Aug 2004; <pyrania@gentoo.org> +ices-0.4.ebuild:
+  Version bump.
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> ices-2.0.0.ebuild:
+  stable on ppc64, bug #58552
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> ices-2.0.0.ebuild:
+  Stable on sparc.
+
+  22 Apr 2004; Dylan Carlson <absinthe@gentoo.org> ices-2.0.0.ebuild:
+  Marked stable for amd64.
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ices-2.0.0.ebuild:
+  Stable x86.
+
+  07 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> ices-2.0.0.ebuild,
+  ices-2.0_beta4.ebuild:
+  2.0 requires ogg now.  Bug #47034.
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ices-0.2.3.ebuild:
+  Made aliz's QA script happy.
+
+*ices-2.0.0 (16 Mar 2004)
+
+  16 Mar 2004; Dylan Carlson <absinthe@gentoo.org> ices-2.0.0.ebuild:
+  Version bump. Added ~amd64 to KEYWORDS.
+
+*ices-2.0_beta4 (21 Jan 2004)
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> ices-2.0_beta4.ebuild:
+  Version bump.  Almost ready for primetime. :)  The python and perl
+  modules are now separate packages.  Those ebuilds will be coming
+  shortly.
+
+*ices-0.3 (15 Aug 2003)
+
+  15 Aug 2003; Nick Hadaway <raker@gentoo.org> ices-0.3.ebuild:
+  Version bump.  Should now support bigendian platforms.  Finally added
+  the python module support.  Removed the dependancy on icecast and 
+  added depends on libxml2 and >=libshout-2.0.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ices-0.2.3 (25 Jul 2002)
 
   25 Jul 2002; Nick Hadaway <raker@gentoo.org>
-  ices-0.2.3.ebuild, files/digset-ices-0.2.3, files/docdir.diff :
-
+  ices-0.2.3.ebuild, files/digest-ices-0.2.3, files/docdir.diff:
   Initial adding of ebuild to portage.  Leaving masked until I know the
   status of the shared python library.
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index e69de29bb2d1..4513b2e73596 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 758287e1a334addcd405805369192699 ChangeLog 2494
+MD5 78c238ff78ce41a0e5115cab1adc765c ices-2.0.0.ebuild 1282
+MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+MD5 c29f1b4dd4f220a4a9fe1c8e5e7aa545 ices-2.0.1.ebuild 1259
+MD5 ace2a441b6354b065c6be58e9056ec82 files/digest-ices-2.0.0 62
+MD5 c7d359105932f01bde2469d5f75591b1 files/digest-ices-2.0.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCIPDK+uC/ViVka/0RAmA9AJ9Utd1x8j0YxHx8MRATOIjY6ngbhQCgpTyn
+8Hop9MJgNkPFXQa2laI18xE=
+=XAIE
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ices/ices-2.0.0.ebuild b/net-misc/ices/ices-2.0.0.ebuild
index 75e5116ffbaa..69ffdc9c9bae 100644
--- a/net-misc/ices/ices-2.0.0.ebuild
+++ b/net-misc/ices/ices-2.0.0.ebuild
@@ -1,35 +1,25 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.0.ebuild,v 1.1 2004/03/17 04:22:09 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
-IUSE="oggvorbis"
+IUSE=""
 
-DESCRIPTION="icecast MP3 streaming client. supports on the fly re-encoding"
-SRC_URI="http://www.icecast.org/files/${P}.tar.gz"
+DESCRIPTION="icecast OGG streaming client. supports on the fly re-encoding"
+SRC_URI="http://downloads.xiph.org/releases/ices/${P}.tar.gz"
 HOMEPAGE="http://www.icecast.org/ices.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 sparc amd64 ppc64"
 
 DEPEND="dev-libs/libxml2
 	dev-util/pkgconfig
 	>=media-libs/libshout-2.0
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
-
-S=${WORKDIR}/${P}
+	>=media-libs/libvorbis-1.0"
 
 src_compile ()
 {
-	local myconf=""
-
-	use oggvorbis || \
-		myconf="${myconf} --with-vorbis=no --with-ogg=no"
-
-	econf \
-		--sysconfdir=/etc/ices2 \
-		${myconf} || die "configure failed"
+	econf --sysconfdir=/etc/ices2 || die "configure failed"
 
 	emake || die "make failed"
 }
diff --git a/net-misc/ices/ices-2.0.1.ebuild b/net-misc/ices/ices-2.0.1.ebuild
index a4963eb0282f..8c0998d217de 100644
--- a/net-misc/ices/ices-2.0.1.ebuild
+++ b/net-misc/ices/ices-2.0.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/net-misc/ices/ices-2.0.1.ebuild,v 1.1 2005/02/03 19:48:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ices/ices-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
 IUSE=""
 
-DESCRIPTION="icecast MP3 streaming client. supports on the fly re-encoding"
+DESCRIPTION="icecast OGG streaming client. supports on the fly re-encoding"
 SRC_URI="http://downloads.xiph.org/releases/ices/${P}.tar.bz2"
 HOMEPAGE="http://www.icecast.org/ices.php"
 
diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index d8a61f2a7b79..3b276cc8a0c0 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,7 +1,52 @@
+# ChangeLog for net-misc/iperf
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
+
+*iperf-2.0.2 (11 Aug 2005)
+
+  11 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> +iperf-2.0.2.ebuild:
+  Version bump for bug 101960.
+
+  09 Aug 2005; Brent Baude <ranger@gentoo.org> iperf-1.7.0.ebuild:
+  Adding ~ppc64 keyword to the 1.70 iperf ebuild. This is the "stable" version
+  according to their website.
+
+  10 May 2005; Herbie Hopkins <herbs@gentoo.org> iperf-2.0.1.ebuild:
+  Marked ~amd64 wrt bug #92149.
+
+  06 May 2005; Omkhar Arasaratnam <omkhar@gentoo.org> iperf-2.0.1.ebuild:
+  Added ~ppc64 wrt #91738
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> iperf-2.0.1.ebuild:
+  Marked stable on x86.
+
+*iperf-2.0.1 (23 Jan 2005)
+
+  23 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/iperf.confd,
+  files/iperf.initd, +iperf-2.0.1.ebuild:
+  Version bump for bug 77616; added conf.d file as well.
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/iperf.initd,
+  iperf-1.7.0.ebuild:
+  Added init.d script for running iperf in server mode; fixes bug 69609.
+
+  25 Sep 2004; David Holm <dholm@gentoo.org> iperf-1.7.0.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> iperf-1.7.0.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+*iperf-1.7.0 (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> iperf-1.7.0.ebuild:
+  Version bumped.
+
+  28 Jul 2003; Martin Holzer <mholzer@gentoo.org> iperf-1.6.3.ebuild:
+  Fixing install dir.
+
 *iperf-1.6.3 (14 Nov 2002)
 
   14 Nov 2002; Martin Holzer <mholzer@gentoo.org> iperf-1.6.3.ebuild 
   ChangeLog files/digest-iperf-1.6.3  files/iperf-1.6.3-Makefile-gentoo.diff :
 
   Iperf is a tool to measure IP bandwidth using UDP or TCP.
-
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index e69de29bb2d1..39be3f377393 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b1383a0b0061257658c30b808affb071 iperf-2.0.2.ebuild 964
+MD5 a9e9a89e537ceb528712d9bffe0f111f iperf-2.0.1.ebuild 961
+MD5 d86d58b1bf956b911e93a1eb419d6d8c iperf-1.7.0.ebuild 945
+MD5 80a0f794af6f6b499eef300099940fc5 ChangeLog 1817
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 fb3cd54b7325d842e3118e6d41503ac0 files/iperf.confd 308
+MD5 670817398ac2d9dc91ce1ae301e62ee1 files/iperf.initd 521
+MD5 8d7742f71fada23db6fa1398664a3c2e files/digest-iperf-1.7.0 70
+MD5 99a03cce31fe2b9ff92f82359c48eae5 files/digest-iperf-2.0.1 63
+MD5 d0b327d4891d45777215270af6210cf1 files/digest-iperf-2.0.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+sHUEZCkKN40op4RAghJAKCsDkWPK8b3VqtZsobGdTPzS4rzbwCfRh7z
+/A2lDR4Cxz6xZZ1nQMEtSKI=
+=670U
+-----END PGP SIGNATURE-----
diff --git a/net-misc/iperf/files/iperf.confd b/net-misc/iperf/files/iperf.confd
index adf238910ae6..9a9afbefb5a8 100644
--- a/net-misc/iperf/files/iperf.confd
+++ b/net-misc/iperf/files/iperf.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.confd,v 1.1 2005/01/23 10:52:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.confd,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 # extra options (run iperf -h for a list of supported options)
 IPERF_OPTS="--format Mbytes"
diff --git a/net-misc/iperf/files/iperf.initd b/net-misc/iperf/files/iperf.initd
index ed6e407bd6b4..39a4d5c092a2 100644
--- a/net-misc/iperf/files/iperf.initd
+++ b/net-misc/iperf/files/iperf.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.1 2005/01/21 23:47:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting iperf server"
 	start-stop-daemon --start --quiet \
-		--exec /usr/bin/iperf -- -s -D >/dev/null
+		--exec /usr/bin/iperf -- -s -D ${IPERF_OPTS} &>/dev/null
 	eend $?
 }
 
diff --git a/net-misc/iperf/iperf-1.7.0.ebuild b/net-misc/iperf/iperf-1.7.0.ebuild
index 76c63fe63e7b..1e97055c66f1 100644
--- a/net-misc/iperf/iperf-1.7.0.ebuild
+++ b/net-misc/iperf/iperf-1.7.0.ebuild
@@ -1,32 +1,40 @@
-# 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-misc/iperf/iperf-1.7.0.ebuild,v 1.1 2003/07/29 19:31:34 mholzer Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-1.7.0.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Iperf is a tool to measure IP bandwidth using UDP or TCP. It allows for tuning various parameters, and reports bandwidth, delay jitter, and packet loss. It supports IPv6 and multicast."
-SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}-source.tar.gz"
+IUSE=""
+DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-DEPEND="virtual/glibc"
+SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}-source.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 x86"
+
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i 's:@read  INSTALL_DIR;::' Makefile
+	sed -i 's:@read  INSTALL_DIR;::' Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
 	cd cfg
-	econf || die
+	econf || die "econf failed"
 	cd ..
-	emake || die
+	emake || die "emake failed"
 }
 
-src_install () {
-	make INSTALL_DIR=${D}/usr/bin install || die
+src_install() {
+	make INSTALL_DIR=${D}/usr/bin install || die "make install failed"
 	dodoc INSTALL README VERSION
+	newinitd ${FILESDIR}/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	echo
+	einfo "To run iperf in server mode, run:"
+	einfo "  /etc/init.d/iperf start"
+	echo
 }
diff --git a/net-misc/iperf/iperf-2.0.1.ebuild b/net-misc/iperf/iperf-2.0.1.ebuild
index ee3c452df90f..0b94d3f73b79 100644
--- a/net-misc/iperf/iperf-2.0.1.ebuild
+++ b/net-misc/iperf/iperf-2.0.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/net-misc/iperf/iperf-2.0.1.ebuild,v 1.1 2005/01/23 10:52:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}.tar.gz"
+SRC_URI="http://dast.nlanr.net/Projects/Iperf2.0/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~ppc64 ~amd64"
 IUSE="ipv6 threads debug"
 
 DEPEND="virtual/libc"
diff --git a/net-misc/iperf/iperf-2.0.2.ebuild b/net-misc/iperf/iperf-2.0.2.ebuild
index 63a38f7e7fa0..f533b1360109 100644
--- a/net-misc/iperf/iperf-2.0.2.ebuild
+++ b/net-misc/iperf/iperf-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/net-misc/iperf/iperf-2.0.2.ebuild,v 1.1 2005/08/11 03:10:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
diff --git a/net-misc/ipsorcery/ChangeLog b/net-misc/ipsorcery/ChangeLog
index c42e528af328..078b11b1505b 100644
--- a/net-misc/ipsorcery/ChangeLog
+++ b/net-misc/ipsorcery/ChangeLog
@@ -1,11 +1,32 @@
-# ChangeLog for net-analyzers/ipsorcery
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ChangeLog,v 1.1 2002/04/22 00:20:31 rphillips Exp $
+# ChangeLog for net-misc/ipsorcery
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ChangeLog,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+  31 Jul 2005; David Holm <dholm@gentoo.org> ipsorcery-2.0.9.ebuild:
+  Added to ~ppc.
+
+*ipsorcery-2.0.9 (30 Jul 2005)
+
+  30 Jul 2005; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  +ipsorcery-2.0.9.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ipsorcery-1.6 (18 Jun 2002)
+
+  07 Jul 2002; phoen][x <phoenix@gentoo.org> ipsorcery-1.6.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  18 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ipsorcery-1.6.ebuild :
+  Version rev
 
 *ipsorcery-1.5 (21 Apr 2002)
 
-  21 Apr 2002; Justin Lambert <jlambert@eml.cc> Changelog, ipsorcery-1.5.ebuild
+  07 Jul 2002; phoen][x <phoenix@gentoo.org> ipsorcery-1.5.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
 
+  21 Apr 2002; Justin Lambert <jlambert@eml.cc> Changelog, ipsorcery-1.5.ebuild
   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-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest
index e69de29bb2d1..2978a5b09e47 100644
--- a/net-misc/ipsorcery/Manifest
+++ b/net-misc/ipsorcery/Manifest
@@ -0,0 +1,8 @@
+MD5 279446014d69e1730ed2d04be7a771b1 ChangeLog 1329
+MD5 9d9c902333ddd5f3b90bc9b874fdf5b1 ipsorcery-1.5.ebuild 724
+MD5 3cde1faff1816b0ad472957dd7bfdbd9 ipsorcery-1.6.ebuild 724
+MD5 c7b56adaa2e7a838074840dbd0e7ecaa ipsorcery-2.0.9.ebuild 825
+MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
+MD5 0ffd8c88864f9f333664963239beb0b2 files/digest-ipsorcery-1.5 61
+MD5 be8d49bd5c18316dd424981be66f3c1a files/digest-ipsorcery-1.6 61
+MD5 a6106adff3cf07fe3b50520a915414ac files/digest-ipsorcery-2.0.9 63
diff --git a/net-misc/ipsorcery/ipsorcery-1.5.ebuild b/net-misc/ipsorcery/ipsorcery-1.5.ebuild
index 210701a4b0fb..203fb2902b85 100644
--- a/net-misc/ipsorcery/ipsorcery-1.5.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-1.5.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Justin Lambert <jlambert@eml.cc>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ipsorcery-1.5.ebuild,v 1.1 2002/04/22 00:20:31 rphillips Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ipsorcery-1.5.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+IUSE="gtk"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets."
 SRC_URI="http://www.legions.org/~phric/ipsorc-${PV}.tar.gz"
 HOMEPAGE="http://www.legions.org/~phric/ipsorcery.html"
+KEYWORDS="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
 
-DEPEND="gtk?	( >=x11-libs/gtk+-1.2.10 )"
+DEPEND="gtk?	( =x11-libs/gtk+-1.2* )"
 
 src_unpack() {
 	unpack ipsorc-${PV}.tar.gz
diff --git a/net-misc/ipsorcery/ipsorcery-1.6.ebuild b/net-misc/ipsorcery/ipsorcery-1.6.ebuild
index 7497923b6d96..cc70c68b1982 100644
--- a/net-misc/ipsorcery/ipsorcery-1.6.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-1.6.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Justin Lambert <jlambert@eml.cc>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ipsorcery-1.6.ebuild,v 1.1 2002/06/18 20:42:28 rphillips Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ipsorcery-1.6.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+IUSE="gtk"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets."
 SRC_URI="http://www.legions.org/~phric/ipsorc-${PV}.tar.gz"
 HOMEPAGE="http://www.legions.org/~phric/ipsorcery.html"
+KEYWORDS="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
 
 DEPEND="gtk?	( =x11-libs/gtk+-1.2* )"
 
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9.ebuild
index 1dd64c1d41de..a58670bb08a7 100644
--- a/net-misc/ipsorcery/ipsorcery-2.0.9.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ipsorcery-2.0.9.ebuild,v 1.1 2005/07/30 09:19:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipsorcery/ipsorcery-2.0.9.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 
 DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets."
 SRC_URI="http://www.legions.org/~phric/ipsorc-${PV}.tar.gz"
 HOMEPAGE="http://www.legions.org/~phric/ipsorcery.html"
-KEYWORDS="~x86 ~sparc "
+KEYWORDS="~ppc ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="gtk"
diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 2892fbea5363..f84d7b403b1b 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,9 +1,159 @@
 # ChangeLog for net-misc/iputils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.1 2002/07/16 18:01:45 g2boojum Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.1.1.1 2005/11/30 09:54:53 chriswhite Exp $
+
+  29 May 2005; <solar@gentoo.org> iputils-021109-r3.ebuild:
+  echangelog - update package to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+  02 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iputils-021109-bindnow.patch, -files/021109-gcc34.patch,
+  +files/iputils-021109-gcc34.patch, iputils-021109-r3.ebuild:
+  Update the gcc-inline patch by Dave Stahl #80969 and fix lazy bindings for
+  setuid apps #77526.
+
+  18 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/iputils-021109-pfkey.patch, iputils-021109-r3.ebuild:
+  Punt setkey since ipsec-tools exists now to handle it #78588.
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
+  Restore USE=doc with an extra check in case we're in the middle of a
+  bootstrap #23156.
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
+  Make sure linux/ipsec.h is usuable before building ipsec stuff #67569.
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/021109-ipg-linux-2.6.patch, iputils-021109-r3.ebuild:
+  Add support to ipg for newer kernels #71756 by Christoph M.
+
+  06 Oct 2004; Travis Tilley <lv@gentoo.org>
+  +files/iputils-021109-linux-udp-header.patch, iputils-021109-r3.ebuild:
+  fix compiling iputils using newer glibc snapshots
+
+  04 Aug 2004; Jon Portnoy <avenj@gentoo.org> iputils-021109-r3.ebuild :
+  Fix bison sed line. Bugs 59414 and 59191.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> iputils-020927.ebuild,
+  iputils-021109-r3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  28 Jun 2004; Brandon Hale <tseng@gentoo.org> iputils-021109-r3.ebuild:
+  Stable on x86.
+
+  15 Jun 2004; <solar@gentoo.org> iputils-021109-r3.ebuild,
+  files/iputils-20020927-no-ether_ntohost.patch:
+  added patch to allow iputils to compile with uclibc
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> iputils-020927.ebuild:
+  Fix use invocation
+
+*iputils-021109-r3 (24 Apr 2004)
+
+  24 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Remove racoon since (1) net-firewall/ipsec-tools installs this and
+  (2) the packaged racoon has a nice remote DoS #48847.
+
+*iputils-021109-r2 (07 Apr 2004)
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> iputils-021109-r1.ebuild:
+  marked stable on amd64
+
+  08 Apr 2004; Joshua Kinard <kumba@gentoo.org> iputils-020927.ebuild:
+  Typo fix
+
+  07 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Clean up src_unpack and src_compile steps and add flex/openssl to DEPEND #38774.
+
+  23 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> iputils-021109-r1.ebuild:
+  Closing #44555.
+
+  01 Mar 2004; Tom Gall <tgall@gentoo.org> iputils-021109-r1.ebuild:
+  make sure ppc64 has yacc dependancy
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  set ppc in keywords
+
+  13 Jan 2004; Ned Ludd <solar@gentoo.org> iputils-021109-r1.ebuild:
+  Make ipv6 traceroute6, tracepath6 and ping6 made optional based on 
+  ipv6 use flag. Prepare for x86 stable in the next day to two for
+  GRP release.
+
+*iputils-021109-r1 (13 Jan 2004)
+
+  12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> iputils-021109.ebuild:
+  Marked ppc to match the linux-headers changes
+
+  08 Jan 2004; <plasmaroo@gentoo.org> iputils-021109.ebuild:
+  Added 2.6 support; this now installs setkey and racoon if you have 2.6
+  headers.
+
+*iputils-021109 (16 Nov 2003)
+
+  16 Nov 2003; Joshua Kinard <kumba@gentoo.org> iputils-021109.ebuild:
+  Version bump to a package that appears to be beta. It builds against 2.4.22+
+  linux-headers, however, so worth testing.
+
+*iputils-020927 (03 Jan 2003)
+
+  21 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add static support #29202.
+
+  12 Aug 2003; Jason Wever <weeve@gentoo.org> iputils-020927.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  07 Jul 2003; Jan Seidel <tuxus@gentoo.org> iputils-020927.ebuild:
+  Mark stable on mips
+
+  01 Jul 2003; Luca Barbato <lu_zero@gentoo.org> iputils-020927.ebuild:
+  Mark stable on ppc
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> iputils-020927.ebuild:
+  Mark stable on alpha
+
+  20 Jun 2003; Jon Portnoy <avenj@gentoo.org> iputils-020927.ebuild :
+  Temporarily yanked out all of the USE="doc" stuff until a more
+  permanent fix can be implemented. Was breaking emerge system for 
+  users with doc in USE.
+
+  06 Apr 2003; Guy Martin <gmsoft@gentoo.org> iputils-020927.ebuild :
+  Marked stable on hppa. Changed depend sys-kernel/linux-headers to virtual/os-headers.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> iputils-020927.ebuild :
+  Added testing mips keyword to the ebuild.
+
+  03 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> iputils-020927.ebuild :
+  Version bump, found by Torgeir Hansen <torgeir@trenger.ro> in #13052.
+  Made use of "doc" use variable to decide whetever to depend on openjade to
+  compile and install documentation.
+
+  03 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> iputils-020124-r1.ebuild :
+  Changed where the bins are installed. Also made ping and traceroute tools setuid.
+  Closes #10090.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*iputils-020124-r1 (16 Aug 2002)
+
+  06 Apr 2003; Guy Martin <gmsoft@gentoo.org> iputils-020124-r1.ebuild :
+  Changed depend sys-kernel/linux-headers to virtual/os-headers.
+
+  12 Feb 2003; Guy Martin <gmsoft@gentoo.org> iputils-020124-r1.ebuild :
+  Added hppa to keywords.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> iputils-020124-r1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  16 Aug 2002; Matthew Turk <satai@gentoo.org> ChangeLog:
+
+  Updated by enabling documentation; recent changes in DocBook ebuilds have
+  fixed the outstanding issues.
 
 *iputils-020124 (16 Jul 2002)
 
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> iputils-020124.ebuild :
+  Added stable mips keyword to the ebuild.
+
   16 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
 
   new package
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index e69de29bb2d1..b4927e335ce4 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3bfebd60ecb08e7156e071bce841adec iputils-021109-r3.ebuild 2333
+MD5 fe420c820281335c5ef55d86d987d2ce ChangeLog 5998
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c9986b4299c200260da8f025c5e4b0ea files/021109-ipg-linux-2.6.patch 981
+MD5 66a524e27160410a2dbaef8d2eed5365 files/digest-iputils-021109-r3 73
+MD5 b4615612d4514f12b35fbaf27d3e04fe files/021109-uclibc-no-ether_ntohost.patch 635
+MD5 79de65b9da536090d0560ba51520fd9d files/iputils-021109-linux-udp-header.patch 418
+MD5 744f2999dcf0fc5fd25ffcfeedd574d9 files/iputils-021109-gcc34.patch 2313
+MD5 d85216426f34d4e768ab8f9f48c66e4f files/021109-syserror.patch 324
+MD5 c11c8762616b29e6d556a147aaa9374a files/021109-no-pfkey-search.patch 307
+MD5 e5bfab718c4dbfe351c8220e20b6052d files/iputils-021109-bindnow.patch 511
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpp76p4WFLgrx1GWAQINUQP+NefBy79y3vmn9aFDx9jvseW/bLIkvHUq
+QQ+h1pRtbhKALJ9MpAJscRPRlvu0BuSwD2ANsdyQnwQov41ZjmDk22C9BgM4J8iF
+KvL7h4TkQ91Ml3OSQH4KpRDGBmn70WFLspCdahnf+SaUV4eS2JKWsCUZWrb9G8+m
+3QasZwd7tOc=
+=LU53
+-----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild
index fc8a4b454a8e..5e24ea501763 100644
--- a/net-misc/iputils/iputils-021109-r3.ebuild
+++ b/net-misc/iputils/iputils-021109-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.1 2004/04/24 06:20:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.1.1.1 2005/11/30 09:54:53 chriswhite Exp $
 
-inherit flag-o-matic gcc gnuconfig eutils
+inherit flag-o-matic eutils toolchain-funcs
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="ftp://ftp.inr.ac.ru/ip-routing"
@@ -11,88 +11,75 @@ SRC_URI="ftp://ftp.inr.ac.ru/ip-routing/${PN}-ss${PV}-try.tar.bz2
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~hppa ~mips amd64 ~ia64 ppc64 s390"
-IUSE="static ipv6" #doc
-
-DEPEND="virtual/glibc
-	virtual/os-headers
-	dev-util/yacc
-	sys-devel/flex
-	dev-libs/openssl
-	sys-devel/autoconf"
-# docs are broken #23156
-#	doc? ( app-text/openjade
-#		dev-perl/SGMLSpm
-#		app-text/docbook-sgml-dtd
-#		app-text/docbook-sgml-utils )
-RDEPEND="virtual/glibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="static ipv6 doc"
+
+DEPEND="virtual/os-headers
+	doc? (
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	)"
+RDEPEND=""
 
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${PV}-no-pfkey-search.patch
+	epatch "${FILESDIR}"/${PV}-ipg-linux-2.6.patch #71756
+	epatch "${FILESDIR}"/${PV}-syserror.patch
+	epatch "${FILESDIR}"/${PV}-uclibc-no-ether_ntohost.patch
+	epatch "${FILESDIR}"/${P}-bindnow.patch #77526
+	# make iputils work with newer glibc snapshots
+	epatch "${FILESDIR}"/${P}-linux-udp-header.patch
 
-	cp ${FILESDIR}/iputils-021109-pfkey.patch include-glibc/net/pfkeyv2.h
 	use static && append-ldflags -static
-
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-	epatch ${FILESDIR}/${PV}-no-pfkey-search.patch
 	sed -i \
 		-e "/^CCOPT=/s:-O2:${CFLAGS}:" \
-		-e "/^CC=/s:gcc:$(gcc-getCC):" \
+		-e "/^CC=/s:.*::" \
+		-e '/^all:/s:check-kernel::' \
+		-e 's:-I$(KERNEL_INCLUDE)::' \
+		-e 's:-I/usr/src/linux/include::' \
 		Makefile \
-		|| die "sed Makefile opts failed"
-	sed -i \
-		-e "s:/usr/src/linux/include:${ROOT}/usr/include:" \
-		Makefile libipsec/Makefile setkey/Makefile \
-		|| die "sed /usr/include failed"
+		|| die "sed Makefile failed"
 	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-
-	sed -i "s:-ll:-lfl ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
 }
 
 src_compile() {
-	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
-		cd ${S}/libipsec
-		emake || die "libipsec failed"
-
-		cd ${S}/setkey
-		emake || die "setkey failed"
-	fi
-
-	cd ${S}
+	tc-export CC AR
 	emake || die "make main failed"
 
-	#if use doc ; then
-	#	make html || die
-	#fi
-	make man || die "make man failed"
+	# We include the extra check for docbook2html 
+	# because when we emerge from a stage1/stage2, 
+	# it may not exist #23156
+	if use doc && type -p docbook2html ; then
+		emake -j1 html || die
+	fi
+	emake -j1 man || die "make man failed"
 }
 
 src_install() {
-	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
-		into /usr
-		dobin ${S}/setkey/setkey
-	fi
-
-	cd ${S}
 	into /
-	dobin ping
+	dobin ping || die "ping"
 	use ipv6 && dobin ping6
-	dosbin arping
+	dosbin arping || die "arping"
 	into /usr
-	dobin tracepath
-	use ipv6 && dobin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd
+	dosbin tracepath || die "tracepath"
+	use ipv6 && dosbin trace{path,route}6
+	dosbin clockdiff rarpd rdisc ipg tftpd || die "misc sbin"
 
-	fperms 4711 /bin/ping /usr/bin/tracepath
-	use ipv6 && fperms 4711 /bin/ping6 /usr/bin/trace{path,route}6
+	fperms 4711 /bin/ping
+	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
 
 	dodoc INSTALL RELNOTES
 
-	use ipv6 || rm doc/*6.8
+	rm -f doc/setkey.8
+	use ipv6 || rm -f doc/*6.8
 	doman doc/*.8
 
-	#use doc && dohtml doc/*.html
+	use doc && dohtml doc/*.html
 }
diff --git a/net-misc/ipv6calc/ChangeLog b/net-misc/ipv6calc/ChangeLog
index dda5fa11fcb5..722343442265 100644
--- a/net-misc/ipv6calc/ChangeLog
+++ b/net-misc/ipv6calc/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for sys-apps/palo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.1 2003/03/20 04:44:06 gmsoft Exp $
+# ChangeLog for net-misc/ipv6calc
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> ipv6calc-0.50.ebuild:
+  Fix head -1 warning, bug #110259.
+
+*ipv6calc-0.50 (23 Oct 2005)
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> +metadata.xml,
+  +ipv6calc-0.50.ebuild:
+  Version bump, bug #100377.
+
+  06 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> ipv6calc-0.45.ebuild:
+  Stable on ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ipv6calc-0.45.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> ipv6calc-0.45.ebuild:
+  Add die following econf for bug 48950
+
+  20 Apr 2004; David Holm <dholm@gentoo.org> ipv6calc-0.45.ebuild:
+  Added to ~ppc.
 
 *ipv6calc-0.45 (06 Mar 2003)
 
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index e69de29bb2d1..08d4bf43b2d2 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -0,0 +1,6 @@
+MD5 cbf4bd87b261382edcd8bcff71adc97b ipv6calc-0.50.ebuild 742
+MD5 63ec861cbf52bfbd80a3d13ad1e4868a ChangeLog 1062
+MD5 0cfca467e84241c868c54b1740b5d1e3 metadata.xml 220
+MD5 d47d5c17ff31ab8156b7627a931d991f ipv6calc-0.45.ebuild 720
+MD5 389e8590f0f6a4d170256fbf2d9c6e29 files/digest-ipv6calc-0.45 65
+MD5 988a6afec624745df5882167c7310b36 files/digest-ipv6calc-0.50 65
diff --git a/net-misc/ipv6calc/ipv6calc-0.45.ebuild b/net-misc/ipv6calc/ipv6calc-0.45.ebuild
index ce0c09b0e4f7..9bc98a6d9678 100644
--- a/net-misc/ipv6calc/ipv6calc-0.45.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.45.ebuild
@@ -1,21 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.45.ebuild,v 1.1 2003/03/20 04:44:06 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.45.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="ipv6calc convert a given IPv6 address to the compressed format or to the format used by /proc/net/if_inet6."
 HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-KEYWORDS="~x86"
-SRC_URI="ftp://ftp.deepspace6.net/pub/sources/ipv6calc/${P}.tar.gz" 
+KEYWORDS="x86 ppc"
+SRC_URI="ftp://ftp.deepspace6.net/pub/sources/ipv6calc/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc"
-
-src_compile() {
-	econf
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install () {
 	# Using installonly to skip the tests scripts which are really broken
diff --git a/net-misc/ipv6calc/ipv6calc-0.50.ebuild b/net-misc/ipv6calc/ipv6calc-0.50.ebuild
index 5be15d95ee22..c585fa8d9bb0 100644
--- a/net-misc/ipv6calc/ipv6calc-0.50.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.50.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.50.ebuild,v 1.1 2005/10/23 15:26:05 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipv6calc/ipv6calc-0.50.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
+
+inherit fixheadtails
 
 DESCRIPTION="IPv6 address calculator"
 HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
@@ -14,6 +16,12 @@ IUSE=""
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+
+	ht_fix_file ${S}/configure
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
diff --git a/net-misc/ipx-utils/ChangeLog b/net-misc/ipx-utils/ChangeLog
index f1d41539c676..726b89bbe2e2 100644
--- a/net-misc/ipx-utils/ChangeLog
+++ b/net-misc/ipx-utils/ChangeLog
@@ -1,8 +1,31 @@
 # ChangeLog for net-misc/ipx-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.1 2002/07/22 00:24:51 azarah Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
-*net-misc/ipx-utils-1.1 (22 Jul 2002)
+  28 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  files/ipx-utils-1.1-proc.patch:
+  Fix a typo in the proc patch #67642.
+
+*ipx-utils-1.1-r1 (16 Oct 2004)
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/ipx-utils-1.1-gentoo.diff, +files/ipx-utils-1.1-makefile.patch,
+  +files/ipx-utils-1.1-proc.patch, +ipx-utils-1.1-r1.ebuild,
+  -ipx-utils-1.1.ebuild:
+  Clean up and fix /proc updates #67642 by Josef Kovacs.
+
+  02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> ipx-utils-1.1.ebuild:
+  hooray for epatch!
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ipx-utils-1.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> ipx-utils-1.1.ebuild:
+  Adding s390 keywords
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ipx-utils-1.1 (22 Jul 2002)
 
   22 Jul 2002; Martin Schlemmer <azarah@gentoo.org> ipx-utils-1.1.ebuild, ipx.init, ipx.confd :
   Initial import. Ebuild submitted by myself.
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
index e69de29bb2d1..e0ef8f18b5be 100644
--- a/net-misc/ipx-utils/Manifest
+++ b/net-misc/ipx-utils/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ecf67256a60bc2f873b72d7081a02769 ChangeLog 1187
+MD5 eb61c891bee68bbaa1bb90ed5856d627 ipx-utils-1.1-r2.ebuild 924
+MD5 621ddf456883c9bb8ff0f2a516c47c0d files/ipx-utils-1.1-makefile.patch 822
+MD5 1f41f7a629f0b3a35e27d4c4173e0641 files/ipx-utils-1.1-proc.patch 426
+MD5 09ac2581b478d6ca4fb33002ecd34a2a files/ipx.confd 663
+MD5 12d5c69423f199bf025dfc6be9233d7a files/ipx.init 950
+MD5 78845a00cf7ab6edd46bd2e705fd55ea files/digest-ipx-utils-1.1-r2 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBgZFEHTu7gpaalycRAhdbAKDZ6GLuWOul3KuiKFLTNDRpRjP3iACfaiSd
+sAp8RJa4Vewscu4+FQwUF0c=
+=JYG9
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
index 4c9a5986cf00..d82d228ff139 100644
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
+++ b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
@@ -5,7 +5,7 @@
  	}
  
 -	fp = fopen("/proc/net/ipx_interface", "r");
-+	fp = fopen("/proc/net/ipx/ipx_interface", "r");
++	fp = fopen("/proc/net/ipx/interface", "r");
 +	if (fp == NULL)
 +		fp = fopen("/proc/net/ipx_interface", "r");
  	if (fp == NULL) {
diff --git a/net-misc/ipx-utils/files/ipx.confd b/net-misc/ipx-utils/files/ipx.confd
index ebe98d6460ec..aa648b6240ff 100644
--- a/net-misc/ipx-utils/files/ipx.confd
+++ b/net-misc/ipx-utils/files/ipx.confd
@@ -1,42 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.confd,v 1.1 2002/07/22 00:24:51 azarah Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.confd,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 # Config file for /etc/init.d/ipx
 
-
 # Automatically selecting a primary interface.
-
 IPX_AUTO_PRIMARY=on
 
-
 # Automatically creating interfaces.
-
 IPX_AUTO_INTERFACE=on
 
-
 # Interface to which IPX sockets are bound.
-
 IPX_DEVICE=eth0
 
-
 # The IPX frame type to use
-
 IPX_FRAME=802.2
 
-
 # Create a special kind of IPX interface that does not
 # have a physical device or frame type.
-
 IPX_INTERNAL_NET=no
 
-
 # Network number
-
 IPX_NETNUM=1
 
-
 # Node number
-
 IPX_NODENUM=1
-
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
index 3af5e8e02d31..73410c5b12b1 100644
--- a/net-misc/ipx-utils/files/ipx.init
+++ b/net-misc/ipx-utils/files/ipx.init
@@ -1,11 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.1 2002/07/22 00:24:51 azarah Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 #NB: Config is in /etc/conf.d/ipx
 
-
 depend() {
 	use net
 }
@@ -41,4 +40,3 @@ stop() {
 	retval=$(( $retval + $? ))
 	eend ${retval} "Failed to down IPX"
 }
-
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
index 761d4826a371..2f82e70b4854 100644
--- a/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild
+++ b/net-misc/ipx-utils/ipx-utils-1.1-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-misc/ipx-utils/ipx-utils-1.1-r2.ebuild,v 1.1 2004/10/29 00:38:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/ipx-utils-1.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/java-wakeonlan/ChangeLog b/net-misc/java-wakeonlan/ChangeLog
index e14f476012c1..0b602fae0eac 100644
--- a/net-misc/java-wakeonlan/ChangeLog
+++ b/net-misc/java-wakeonlan/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/java-wakeonlan
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/ChangeLog,v 1.1 2004/02/15 05:23:26 zx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/ChangeLog,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
+
+  17 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  java-wakeonlan-0.3.0.ebuild:
+  added missing unzip dependency. see #69831
+
+  16 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  java-wakeonlan-0.3.0.ebuild:
+  use java-pkg_dohtml instead of dohtml to also install the package-list in
+  case of api docs: #50740
+
+  30 Aug 2004; Chris Aniszczyk <zx@gentoo.org> java-wakeonlan-0.3.0.ebuild:
+  Marking x86
+
+  18 Feb 2004; Chris Aniszczyk <zx@gentoo.org> java-wakeonlan-0.3.0.ebuild:
+  Bug Fix #41663
 
 *java-wakeonlan-0.3.0 (15 Feb 2004)
 
diff --git a/net-misc/java-wakeonlan/Manifest b/net-misc/java-wakeonlan/Manifest
index a8341aa38a59..88a5b869b5ea 100644
--- a/net-misc/java-wakeonlan/Manifest
+++ b/net-misc/java-wakeonlan/Manifest
@@ -1,2 +1,14 @@
-MD5 99b384ce1504b7d4906209a2f8f5ed0a java-wakeonlan-0.3.0.ebuild 1081
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cba6992f0036d8a0c91c2efe46c0ed20 java-wakeonlan-0.3.0.ebuild 1204
+MD5 d15fff6718b66570403494ed08bfb610 ChangeLog 934
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 1bd00f96eeec73cd7015b5d6563291a1 files/digest-java-wakeonlan-0.3.0 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2WvM/rLF9B432nYRApaeAJwLaoNAWuVfVzrYakFEcQXTn7u6UACeK4k2
+xjzSUcELpB2/TJU0b+rEZE8=
+=4lgl
+-----END PGP SIGNATURE-----
diff --git a/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild b/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild
index 70063582fbc4..5e0344127165 100644
--- a/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild
+++ b/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild
@@ -1,48 +1,48 @@
-# Copyright 1999-2004 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-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild,v 1.1 2004/02/15 05:23:26 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/java-wakeonlan/java-wakeonlan-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 inherit java-pkg
 
 DESCRIPTION="A wakeonlan commandline tool and Java library"
 SRC_URI="http://www.moldaner.de/wakeonlan/download/${P/java-/}-src.zip"
 HOMEPAGE="http://www.moldaner.de/wakeonlan/"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="doc"
 
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
+RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-logging-1.0.2
-	 >=dev-java/commons-cli-1.0"
-RDEPEND=">=virtual/jdk-1.3"
+	>=dev-java/commons-cli-1.0"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core
+	app-arch/unzip"
 
 S=${WORKDIR}/wakeonlan
 
-src_compile() {
-	rm lib/commons-cli-1.0.jar
-	rm lib/commons-logging.jar
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	rm *.jar
+	java-pkg_jarfrom commons-logging
+	java-pkg_jarfrom commons-cli-1
+}
 
-	CLASSPATH=`java-config --classpath=commons-logging`
-	CLASSPATH=${CLASSPATH}:`java-config --classpath=commons-cli
-	ant -Dbuild.classpath=${CLASSPATH} deploy || die
-	use doc && ant -Dbuild.classpath=${CLASSPATH} javadoc || die
+src_compile() {
+	local antflags="deploy"
+	use doc && antflags="${antflags} javadoc"
+	ant ${antflags} || die
 }
 
 src_install() {
 	java-pkg_dojar deploy/wakeonlan.jar
 
-	local my_cp
-	my_cp=`java-config --classpath=commons-logging
-	my_cp=${my_cp}:`java-config --classpath=commons-cli`
-	my_cp=${my_cp}:`java-config --classpath=java-wakeonlan`
-
 	echo "#!/bin/sh" > ${PN}
-	echo '${JAVA_HOME}'/bin/java -cp ${my_cp} wol.WakeOnLan '$*' >> ${PN}
+	echo '${JAVA_HOME}'/bin/java -cp '$(java-config -p commons-logging,commons-cli-1,java-wakeonlan)' wol.WakeOnLan '$*' >> ${PN}
 	dobin ${PN}
 
 	dodoc doc/README
-	use doc && dohtml -r deploy/doc/javadoc/*
+	use doc && java-pkg_dohtml -r deploy/doc/javadoc/*
 }
diff --git a/net-misc/jigdo/ChangeLog b/net-misc/jigdo/ChangeLog
index 9ed6996a42f5..445858968163 100644
--- a/net-misc/jigdo/ChangeLog
+++ b/net-misc/jigdo/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-misc/jigdo
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/ChangeLog,v 1.1 2003/07/30 00:08:25 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+  21 Aug 2005; Jason Wever <weeve@gentoo.org> files/jigdo-0.7.2-64bit.patch:
+  Fixed patch to resolve bug #103238.
+
+*jigdo-0.7.2 (20 Aug 2005)
+
+  20 Aug 2005; Jason Wever <weeve@gentoo.org>
+  +files/jigdo-0.7.2-64bit.patch, +jigdo-0.7.2.ebuild:
+  Version bump, resolves bug #99847.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> jigdo-0.7.0.ebuild,
+  jigdo-0.7.1.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  13 Oct 2004; Jason Wever <weeve@gentoo.org> jigdo-0.7.1.ebuild:
+  Stable on sparc and x86.
+
+  01 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> jigdo-0.7.1.ebuild:
+  Marked ~amd64.
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> jigdo-0.7.0.ebuild:
+  Fixed the HOMEPAGE and SRC_URI values in 0.7.0 to reflect new homepage.
+
+*jigdo-0.7.1 (14 Sep 2004)
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> +jigdo-0.7.1.ebuild:
+  Version bump, resolves bug #62705. Thanks to Maxim Reznik <reznikmm@front.ru>
+  for the ebuild.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> jigdo-0.7.0.ebuild:
+  Fix use invocation
+
+  31 Oct 2003; Jason Wever <weeve@gentoo.org> jigdo-0.7.0.ebuild,
+  files/jigdo-gentoo-db3.patch:
+  Added fix for bug #32029.  Thanks to robbat2 :)
 
 *jigdo-0.7.0 (29 Jul 2003)
 
diff --git a/net-misc/jigdo/Manifest b/net-misc/jigdo/Manifest
index 80f000a3f746..1ffc618468a8 100644
--- a/net-misc/jigdo/Manifest
+++ b/net-misc/jigdo/Manifest
@@ -1,2 +1,11 @@
-MD5 c328e22f7d9db273e429ef19b86d98be jigdo-0.7.0.ebuild 914
+MD5 b51798450575d7709d81b2e604343515 ChangeLog 1543
+MD5 a6db676983b2ff5f36483a96475231c0 jigdo-0.7.0.ebuild 1439
+MD5 e23c19eb37af8edfc2cf88d7c9c6ae1a jigdo-0.7.1.ebuild 1352
+MD5 de7df99d5dcb2fa3a99617144a7e6257 metadata.xml 637
+MD5 cf01feac807374bf1170701ad392a896 jigdo-0.7.2.ebuild 1428
 MD5 ba134b43460d2b9a0378c9ccbfc4fc6e files/digest-jigdo-0.7.0 64
+MD5 8c21d38829a146b462aa547977fabab8 files/digest-jigdo-0.7.1 64
+MD5 11774b7665bf0dab10a58d268dcd8b9e files/jigdo-gentoo-db3.patch 311
+MD5 c49b767331699f22f72518da29438c56 files/makefile.patch 524
+MD5 708dab9fb59548276467adae778f5e2b files/digest-jigdo-0.7.2 64
+MD5 23afc10b4f65bf3a851acb1a3acd83d6 files/jigdo-0.7.2-64bit.patch 1259
diff --git a/net-misc/jigdo/files/jigdo-0.7.2-64bit.patch b/net-misc/jigdo/files/jigdo-0.7.2-64bit.patch
index aa2b997b5894..0560f18549c6 100644
--- a/net-misc/jigdo/files/jigdo-0.7.2-64bit.patch
+++ b/net-misc/jigdo/files/jigdo-0.7.2-64bit.patch
@@ -1,12 +1,6 @@
 diff -Nrua jigdo-0.7.2.orig/src/cachefile.cc jigdo-0.7.2/src/cachefile.cc
 --- jigdo-0.7.2.orig/src/cachefile.cc	2005-08-20 12:43:57.000000000 -0600
 +++ jigdo-0.7.2/src/cachefile.cc	2005-08-20 12:45:54.000000000 -0600
-@@ -1,4 +1,4 @@
--/* $Id: jigdo-0.7.2-64bit.patch,v 1.1 2005/08/20 19:22:38 weeve Exp $ -*- C++ -*-
-+/* $Id: jigdo-0.7.2-64bit.patch,v 1.1 2005/08/20 19:22:38 weeve Exp $ -*- C++ -*-
-   __   _
-   |_) /|  Copyright (C) 2001-2003  |  richard@
-   | \/�|  Richard Atterer          |  atterer.net
 @@ -131,7 +131,7 @@
  //________________________________________
  
@@ -19,12 +13,6 @@ diff -Nrua jigdo-0.7.2.orig/src/cachefile.cc jigdo-0.7.2/src/cachefile.cc
 diff -Nrua jigdo-0.7.2.orig/src/cachefile.hh jigdo-0.7.2/src/cachefile.hh
 --- jigdo-0.7.2.orig/src/cachefile.hh	2005-08-20 12:43:57.000000000 -0600
 +++ jigdo-0.7.2/src/cachefile.hh	2005-08-20 12:45:54.000000000 -0600
-@@ -1,4 +1,4 @@
--/* $Id: jigdo-0.7.2-64bit.patch,v 1.1 2005/08/20 19:22:38 weeve Exp $ -*- C++ -*-
-+/* $Id: jigdo-0.7.2-64bit.patch,v 1.1 2005/08/20 19:22:38 weeve Exp $ -*- C++ -*-
-   __   _
-   |_) /|  Copyright (C) 2001-2002  |  richard@
-   | \/�|  Richard Atterer          |  atterer.net
 @@ -94,7 +94,7 @@
        only valid until the next database operation. */
    Status findName(const byte*& resultData, size_t& resultSize,
diff --git a/net-misc/jigdo/jigdo-0.7.0.ebuild b/net-misc/jigdo/jigdo-0.7.0.ebuild
index ea3754938b8b..fc6a957b28aa 100644
--- a/net-misc/jigdo/jigdo-0.7.0.ebuild
+++ b/net-misc/jigdo/jigdo-0.7.0.ebuild
@@ -1,34 +1,42 @@
-# 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-misc/jigdo/jigdo-0.7.0.ebuild,v 1.1 2003/07/30 00:08:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.0.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images."
-HOMEPAGE="http://home.in.tum.de/~atterer/jigdo/"
-SRC_URI="http://home.in.tum.de/~atterer/jigdo/${P}.tar.bz2"
+HOMEPAGE="http://atterer.net/jigdo/"
+SRC_URI="http://atterer.net/jigdo/jigdo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc"
 
-IUSE="gtk nls"
+IUSE="gtk nls berkdb"
 
-DEPEND="gtk? ( >=gtk+-2.0.6 )
+DEPEND="gtk? ( >=x11-libs/gtk+-2.0.6 )
 	nls? ( sys-devel/gettext )
-	>=libwww-5.3.2"
+	berkdb? ( =sys-libs/db-3* )
+	>=net-libs/libwww-5.3.2"
 
 src_compile() {
-local myconf
+	local myconf
 
-	use nls || myconf="--disable-nls"
-	use gtk || myconf="--without-libdb --without-gui"	
+	# Fix for bug #32029.
+	if use berkdb; then
+		cd ${S}
+		epatch ${FILESDIR}/jigdo-gentoo-db3.patch
+	fi
+
+	use nls || myconf="${myconf} --disable-nls"
+	use gtk || myconf="${myconf} --without-libdb --without-gui"
+	use berkdb || myconf="${myconf} --without-libdb"
 
 	./configure \
-                --host=${CHOST} \
-                --prefix=/usr \
-                --infodir=/usr/share/info \
-                --mandir=/usr/share/man $myconf \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man ${myconf} \
 		--datadir=/usr/share || die "./configure failed"
 
 	# Patch the Makefile so that when jidgo is installed, jigdo-lite has
diff --git a/net-misc/jigdo/jigdo-0.7.1.ebuild b/net-misc/jigdo/jigdo-0.7.1.ebuild
index 784a5af529f4..5f4fbf378bae 100644
--- a/net-misc/jigdo/jigdo-0.7.1.ebuild
+++ b/net-misc/jigdo/jigdo-0.7.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-misc/jigdo/jigdo-0.7.1.ebuild,v 1.1 2004/09/15 02:26:59 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ SRC_URI="http://atterer.net/jigdo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 
 IUSE="gtk nls berkdb libwww"
 
-DEPEND="gtk? ( >=gtk+-2.0.6 )
+DEPEND="gtk? ( >=x11-libs/gtk+-2.0.6 )
 	nls? ( sys-devel/gettext )
-	berkdb? ( =sys-libs/db* )
-	libwww? ( >=libwww-5.3.2 )"
+	berkdb? ( =sys-libs/db-3* )
+	libwww? ( >=net-libs/libwww-5.3.2 )"
 
 src_compile() {
 	local myconf
diff --git a/net-misc/jigdo/jigdo-0.7.2.ebuild b/net-misc/jigdo/jigdo-0.7.2.ebuild
index c09daf27f757..92adf503f657 100644
--- a/net-misc/jigdo/jigdo-0.7.2.ebuild
+++ b/net-misc/jigdo/jigdo-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.2.ebuild,v 1.1 2005/08/20 19:22:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/jlj/ChangeLog b/net-misc/jlj/ChangeLog
index c1315f970612..5ad685efd4d1 100644
--- a/net-misc/jlj/ChangeLog
+++ b/net-misc/jlj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/jlj
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jlj/ChangeLog,v 1.1 2004/08/01 17:37:06 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jlj/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+*jlj-2.7 (14 jun 2005)
+
+  01 Aug 2004; bass@gentoo.org +jlj-2.7.ebuild:
+  Bump verion, thanks to Luke Macken <lewk@csh.rit.edu>
 
 *jlj-2.5 (01 Aug 2004)
 
diff --git a/net-misc/jlj/Manifest b/net-misc/jlj/Manifest
index 2413470318c1..6fb45d5d61d3 100644
--- a/net-misc/jlj/Manifest
+++ b/net-misc/jlj/Manifest
@@ -1,2 +1,6 @@
-MD5 6d7e310b0bdf4bfa1e320afdb2955c14 jlj-2.5.ebuild 741
+MD5 188d02c80a338b5b502dcf0c99d51766 jlj-2.5.ebuild 825
+MD5 206b584206fc16b6fee90c1be5154dd9 jlj-2.7.ebuild 723
+MD5 9a46c7e49bc7c55410f3933a214feb01 ChangeLog 455
+MD5 fc26ed717570ad800500c5dd12ffe1c9 files/jlj.1 14724
 MD5 d87e00ac7252bceb3373c57aa67128b4 files/digest-jlj-2.5 58
+MD5 d6b3378f7030860cf7eeb4b26531b835 files/digest-jlj-2.7 58
diff --git a/net-misc/jlj/jlj-2.5.ebuild b/net-misc/jlj/jlj-2.5.ebuild
index 1aefc2945192..de3a0934a7b8 100644
--- a/net-misc/jlj/jlj-2.5.ebuild
+++ b/net-misc/jlj/jlj-2.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/net-misc/jlj/jlj-2.5.ebuild,v 1.1 2004/08/01 17:34:00 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jlj/jlj-2.5.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 DESCRIPTION="A simple console LiveJournal entry system."
 HOMEPAGE="http://www.cis.rit.edu/~sdlpci/Software/perl/#jlj"
diff --git a/net-misc/jlj/jlj-2.7.ebuild b/net-misc/jlj/jlj-2.7.ebuild
index cde268817338..ea1bc8419002 100644
--- a/net-misc/jlj/jlj-2.7.ebuild
+++ b/net-misc/jlj/jlj-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jlj/jlj-2.7.ebuild,v 1.1 2005/06/14 13:24:37 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jlj/jlj-2.7.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 DESCRIPTION="A simple console LiveJournal entry system."
 HOMEPAGE="http://www.cis.rit.edu/~sdlpci/Software/perl/#jlj"
diff --git a/net-misc/jwhois/ChangeLog b/net-misc/jwhois/ChangeLog
index 0c2c850ddbc5..9ac5c3ee1197 100644
--- a/net-misc/jwhois/ChangeLog
+++ b/net-misc/jwhois/ChangeLog
@@ -1,11 +1,75 @@
 # ChangeLog for net-misc/jwhois
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/ChangeLog,v 1.1 2002/06/06 21:13:40 stroke Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> jwhois-3.2.3.ebuild:
+  Stable on ppc.
+
+  01 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> jwhois-3.2.3.ebuild:
+  Stable on sparc
+
+*jwhois-3.2.3 (30 Aug 2005)
+
+  30 Aug 2005; Mike Frysinger <vapier@gentoo.org> +jwhois-3.2.3.ebuild:
+  Version bump.
+
+  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> jwhois-3.2.2.ebuild:
+  Marked stable on mips.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> jwhois-3.2.2.ebuild:
+  ppc64 stable restored, don't mask arches without talking to the arch lead
+
+  31 Jul 2004; Daniel Black <dragonheart@gentoo.org> jwhois-3.2.0.ebuild,
+  jwhois-3.2.1.ebuild, jwhois-3.2.2.ebuild, +metadata.xml:
+  Changed SRC_URI to mirror://gnu/ and RESTRICT=nomirror. ppc64 removed 
+  from jwhois-3.2.2 as no stable glibc exists.
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> jwhois-3.2.2.ebuild:
+  stable on ppc64, bug #55521
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> jwhois-3.2.0.ebuild,
+  jwhois-3.2.1.ebuild, jwhois-3.2.2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  06 Jun 2004; Jason Wever <weeve@gentoo.org> jwhois-3.2.2.ebuild:
+  Stable on sparc.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> jwhois-3.2.1.ebuild,
+  jwhois-3.2.2.ebuild:
+  Add die following econf for bug 48950
+
+  01 Mar 2004; Jason Wever <weeve@gentoo.org> jwhois-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  23 Feb 2004; Aron Griffis <agriffis@gentoo.org> jwhois-3.2.2.ebuild:
+  stable on alpha and ia64
+
+*jwhois-3.2.2 (27 Jul 2003)
+
+  27 Jul 2003; Martin Holzer <mholzer@gentoo.org> jwhois-3.2.2.ebuild:
+  Version bumped
+
+*jwhois-3.2.1 (23 May 2003)
+
+  23 May 2003; Martin Holzer <mholzer@gentoo.org> jwhois-3.2.1.ebuild:
+  Version bumped. Ebuild submitted by Nick Fish <ennui@alcatraz.triton.net> in
+  #16040.
+
+  11 Feb 2003; Rajiv Manglani <rajiv@gentoo.org> : jwhois-3.2.0.ebuild :
+
+  fixed home page url.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *jwhois-3.2.0 (06 June 2002)
 
-  06 June 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> jwhois-3.2.0.ebuild :
+  Added stable mips keyword to the ebuild.
 
+  07 Jul 2002; phoen][ <phoenix@gentoo.org> jwhois-3.2.0.ebuild :
+  Added KEYWORDS.
+
+  06 June 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 3d879dfed1b8..95edeade7bb4 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,5 +1,10 @@
-MD5 13177e1775a618a22f8b3e325427cdea ChangeLog 1065
-MD5 b1880199665f6f9612b9619f491d4cdb jwhois-3.2.0.ebuild 845
-MD5 ff9ff9c8e3a2540660410105904056cd jwhois-3.2.1.ebuild 776
+MD5 848bacd4635e15b17ab73e82d885f331 ChangeLog 2832
 MD5 a3be5e722f33856d6bf281f4251e8b03 files/digest-jwhois-3.2.0 64
 MD5 8cbb8abe6a191a786d5b46109cda625d files/digest-jwhois-3.2.1 64
+MD5 7411f47db9ecd1d63caf18c87ef5c9db files/digest-jwhois-3.2.2 64
+MD5 bdae1dc474252cf39261057151097484 files/digest-jwhois-3.2.3 64
+MD5 8650b911e7bd5abb5571edbc236a1c83 jwhois-3.2.0.ebuild 767
+MD5 232dc7d34a05a7c82704d6f92853d1b0 jwhois-3.2.1.ebuild 784
+MD5 1340e640f52c2106618adcf5200fc519 jwhois-3.2.2.ebuild 789
+MD5 b678edcd10f65d4e8d811e4618fe5193 jwhois-3.2.3.ebuild 742
+MD5 d99678f16c4fcc4e0bc71763e07dbb22 metadata.xml 221
diff --git a/net-misc/jwhois/jwhois-3.2.0.ebuild b/net-misc/jwhois/jwhois-3.2.0.ebuild
index 64885aa84cc7..ddf292a4b459 100644
--- a/net-misc/jwhois/jwhois-3.2.0.ebuild
+++ b/net-misc/jwhois/jwhois-3.2.0.ebuild
@@ -1,22 +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/net-misc/jwhois/jwhois-3.2.0.ebuild,v 1.1 2002/06/06 21:13:40 stroke Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-3.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
-
-HOMEPAGE="http://http://www.gnu.org/software/jwhois/"
-
+HOMEPAGE="http://www.gnu.org/software/jwhois/"
 LICENSE="GPL-2"
-
-SRC_URI="http://www.mirror.ac.uk/sites/ftp.gnu.org/gnu/jwhois/${P}.tar.gz
-         ftp://ftp.gnu.org/gnu/jwhois/${P}.tar.gz"
-
+KEYWORDS="x86 sparc mips"
+SRC_URI="mirror://gnu/jwhois/${P}.tar.gz"
+RESTRICT="nomirror"
 SLOT="0"
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
 src_compile() {
 	./configure \
@@ -32,4 +27,3 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die
 }
-
diff --git a/net-misc/jwhois/jwhois-3.2.1.ebuild b/net-misc/jwhois/jwhois-3.2.1.ebuild
index 33daf19f1848..54b0a9b63065 100644
--- a/net-misc/jwhois/jwhois-3.2.1.ebuild
+++ b/net-misc/jwhois/jwhois-3.2.1.ebuild
@@ -1,28 +1,28 @@
-# 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-misc/jwhois/jwhois-3.2.1.ebuild,v 1.1 2003/05/22 22:39:51 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-3.2.1.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
 HOMEPAGE="http://www.gnu.org/software/jwhois/"
 LICENSE="GPL-2"
 IUSE="nls"
-KEYWORDS="~x86 ~mips ~sparc"
-SRC_URI="ftp://ftp.gnu.org/gnu/jwhois/${P}.tar.gz"
+KEYWORDS="x86 ~mips sparc"
+SRC_URI="mirror://gnu/jwhois/${P}.tar.gz"
+RESTRICT="nomirror"
 SLOT="0"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	local myconf
-	
+
 	use nls \
 		&& myconf="--enable-nls" \
 		|| myconf="--disable-nls"
 
 	myconf="${myconf} --sysconfdir=/etc --localstatedir=/var/cache/ --without-cache"
 
-	econf $myconf
+	econf $myconf || die "econf failed"
 	emake || die
 }
 
diff --git a/net-misc/jwhois/jwhois-3.2.2.ebuild b/net-misc/jwhois/jwhois-3.2.2.ebuild
index 06af4dc00110..49b799ded2a4 100644
--- a/net-misc/jwhois/jwhois-3.2.2.ebuild
+++ b/net-misc/jwhois/jwhois-3.2.2.ebuild
@@ -1,31 +1,35 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-3.2.2.ebuild,v 1.1 2003/07/27 21:20:58 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-3.2.2.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+inherit gnuconfig
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
 HOMEPAGE="http://www.gnu.org/software/jwhois/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
-IUSE="nls"
-KEYWORDS="~x86 ~mips ~sparc"
-SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
+IUSE="nls"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-src_compile() {
-	local myconf
-	
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
-	myconf="${myconf} --sysconfdir=/etc --localstatedir=/var/cache/ --without-cache"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
 
-	econf $myconf
+src_compile() {
+	econf \
+		--localstatedir=/var/cache \
+		--without-cache \
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 }
diff --git a/net-misc/jwhois/jwhois-3.2.3.ebuild b/net-misc/jwhois/jwhois-3.2.3.ebuild
index f9e101b328f2..ba0c1b8aed4d 100644
--- a/net-misc/jwhois/jwhois-3.2.3.ebuild
+++ b/net-misc/jwhois/jwhois-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/net-misc/jwhois/jwhois-3.2.3.ebuild,v 1.1 2005/08/30 22:45:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-3.2.3.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
 HOMEPAGE="http://www.gnu.org/software/jwhois/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.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"
 
 DEPEND=""
@@ -24,4 +24,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
index d8b96be3c5cd..ca125a098fa8 100644
--- a/net-misc/jwhois/metadata.xml
+++ b/net-misc/jwhois/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
+<herd>no-herd</herd>
+<maintainer>
+	<email>vapier@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/kbandwidth/ChangeLog b/net-misc/kbandwidth/ChangeLog
index 8f42f7edcffd..66edc7e649c5 100644
--- a/net-misc/kbandwidth/ChangeLog
+++ b/net-misc/kbandwidth/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/kbandwidth
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/ChangeLog,v 1.1 2004/12/19 12:46:14 centic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/ChangeLog,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> kbandwidth-1.0.3.ebuild:
+  Mark 1.0.3 stable on alpha
+
+  23 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kbandwidth-1.0.3.ebuild:
+  Stable on x86.
+
+*kbandwidth-1.0.3 (12 Mar 2005)
+
+  12 Mar 2005; Dominik Stadler <centic@gentoo.org> +kbandwidth-1.0.3.ebuild:
+  Add Version 1.0.3
 
 *kbandwidth-1.0.2 (19 Dec 2004)
 
diff --git a/net-misc/kbandwidth/Manifest b/net-misc/kbandwidth/Manifest
index ea997c5639d1..df5ecbcb7950 100644
--- a/net-misc/kbandwidth/Manifest
+++ b/net-misc/kbandwidth/Manifest
@@ -1,5 +1,6 @@
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 a0021fff5ceaab8700b35f04b3bcf9be ChangeLog 202
-MD5 b95d5100b3bf90b352a8d4c4dbb255c5 kbandwidth-1.0.2.ebuild 412
-MD5 01bcf212b917ec08510df137dcfbb590 files/digest-kbandwidth-1.0.1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 4280c65fabb36f844620305171fa22fa ChangeLog 698
+MD5 6411326a1e45480d92dbcf43bd683072 kbandwidth-1.0.2.ebuild 517
+MD5 abab69b4697ba261e0cb9adaf1b68f96 kbandwidth-1.0.3.ebuild 537
+MD5 4ee46e23f17057bef803177d470456aa files/digest-kbandwidth-1.0.3 68
 MD5 0bc1ab7a6eefbf007a94f5bd92aff310 files/digest-kbandwidth-1.0.2 68
diff --git a/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild b/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild
index 1031f6d87a02..f0481ef33baf 100644
--- a/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild
+++ b/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild,v 1.1 2004/12/19 12:46:14 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/kbandwidth-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 inherit kde
 need-kde 3
diff --git a/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild b/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild
index 1907b6519f66..f2c973300333 100644
--- a/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild
+++ b/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild,v 1.1 2005/03/12 19:57:05 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kbandwidth/kbandwidth-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 inherit kde
 need-kde 3
@@ -11,7 +11,7 @@ SRC_URI="http://people.freenet.de/stealth/kbandwidth/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/net-misc/kbandwidth/metadata.xml b/net-misc/kbandwidth/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/net-misc/kbandwidth/metadata.xml
+++ b/net-misc/kbandwidth/metadata.xml
@@ -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-misc/keychain/ChangeLog b/net-misc/keychain/ChangeLog
index 258f0d6f0e8a..5b403a126cf0 100644
--- a/net-misc/keychain/ChangeLog
+++ b/net-misc/keychain/ChangeLog
@@ -1,11 +1,254 @@
 # ChangeLog for net-misc/keychain
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.1 2002/02/02 05:25:15 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/ChangeLog,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> keychain-2.5.5.ebuild,
+  keychain-2.6.1.ebuild:
+  Remove coreutils dep for the sake of ppc-macos and fbsd, etc
+
+*keychain-2.6.1 (10 Oct 2005)
+
+  10 Oct 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.6.0.ebuild,
+  +keychain-2.6.1.ebuild:
+  Bump to 2.6.1 (from 2.6.0) with a one-line fix.  Remove 2.6.0
+
+*keychain-2.6.0 (10 Oct 2005)
+
+  10 Oct 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.3.1.ebuild,
+  -keychain-2.5.4.1.ebuild, keychain-2.5.5.ebuild, +keychain-2.6.0.ebuild:
+  Bump to 2.6.0 (from 2.5.5). Mark 2.5.5 stable on
+  alpha/amd64/arm/hppa/ia64/mips/ppc/ppc-macos/ppc64/s390/sparc/x86. Remove
+  2.5.4.1, 2.5.3.1
+
+  05 Oct 2005; Fabian Groffen <grobian@gentoo.org> keychain-2.5.5.ebuild:
+  Marking ~ppc-macos as it seems to work fine.
+
+*keychain-2.5.5 (28 Jul 2005)
+
+  28 Jul 2005; Aron Griffis <agriffis@gentoo.org> +keychain-2.5.5.ebuild:
+  Bump to 2.5.5, which adds support for --env
+
+  28 May 2005; Aron Griffis <agriffis@gentoo.org> keychain-2.5.4.1.ebuild:
+  Stable everywhere
+
+*keychain-2.5.4.1 (12 May 2005)
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.4.ebuild,
+  +keychain-2.5.4.1.ebuild:
+  Update to 2.5.4.1, which doesn't always exit(1)
+
+*keychain-2.5.4 (12 May 2005)
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.1.ebuild,
+  +keychain-2.5.4.ebuild:
+  Update to 2.5.4: If any locale variables are set, override them
+  with LC_ALL=C.  This fixes a multibyte issue with awk that could keep a running
+  ssh-agent from being found #92316.  Use files instead of symlinks for locking,
+  since symlink creation is not atomic on cygwin #87340
+
+  14 Mar 2005; Aron Griffis <agriffis@gentoo.org> keychain-2.5.3.1.ebuild:
+  Stable everywhere
+
+*keychain-2.5.3.1 (10 Mar 2005)
+
+  10 Mar 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.3.ebuild,
+  +keychain-2.5.3.1.ebuild:
+  Update to 2.5.3.1: Fix problem introduced in 2.5.3 wrt adding gpg keys to
+  the agent. Thanks to Azarah for spotting it.
+
+*keychain-2.5.3 (09 Mar 2005)
+
+  09 Mar 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.2.ebuild,
+  +keychain-2.5.3.ebuild:
+  Bump to 2.5.3 with minor gpg and DISPLAY fixes
+
+*keychain-2.5.2 (07 Mar 2005)
+
+  07 Mar 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.4.3.ebuild,
+  +keychain-2.5.2.ebuild:
+  Update to 2.5.2
+
+  15 Jan 2005; Aron Griffis <agriffis@gentoo.org> keychain-2.5.1.ebuild:
+  keychain-2.5.1 stable everywhere
+
+  12 Jan 2005; Aron Griffis <agriffis@gentoo.org> keychain-2.5.1.ebuild:
+  add reference to Keychain Guide in pkg_postinst #59382
+
+*keychain-2.5.1 (12 Jan 2005)
+
+  12 Jan 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.5.0.ebuild,
+  +keychain-2.5.1.ebuild:
+  Update to 2.5.1 which prevents inheriting a forwarded agent unless --inherit
+  any or any-once is specified
+
+*keychain-2.5.0 (07 Jan 2005)
+
+  07 Jan 2005; Aron Griffis <agriffis@gentoo.org> -keychain-2.3.5.ebuild,
+  keychain-2.4.3.ebuild, +keychain-2.5.0.ebuild:
+  Mark 2.4.3 stable, bump testing to 2.5.0
+
+*keychain-2.4.2.1 (18 Nov 2004)
+
+  18 Nov 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.4.2.1.ebuild,
+  +keychain-2.4.3.ebuild:
+  Update to 2.4.3 which fixes ps issues on BSD
+
+  30 Sep 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.4.2.ebuild:
+  Update to 2.4.2.1 which fixes some minor issues with gpg
+
+*keychain-2.4.2 (30 Sep 2004)
+
+  30 Sep 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.4.0.ebuild,
+  +keychain-2.4.2.ebuild:
+  Update to 2.4.2, remove 2.4.0
+  - Fix gpg-agent support and make it more complete.  Allow adding
+    keys, clearing the agent, etc.
+  - Fix --quick support to work properly again; it was broken since
+    2.4.0
+  - Change default --attempts to 1 since the progs ask multiple times
+    anyway
+
+*keychain-2.4.0 (09 Sep 2004)
+
+  09 Sep 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.3.4.ebuild,
+  keychain-2.3.5.ebuild, +keychain-2.4.0.ebuild:
+  Update to 2.4.0, bump 2.3.5 to stable, remove 2.3.4
+  - Fix bug 26970 with first pass at gpg-agent support.
+  - Fix Debian bug 269722: don't filter output of ssh-add.
+  - Fix bug reported by Marko Myllynen regarding keychain and
+    Solaris awk's inability to process -F'[ :]'
+  - Fix bug in now_seconds calculation, noticed by me.
+
+*keychain-2.3.5 (28 Jul 2004)
+
+  28 Jul 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.3.3.ebuild,
+  keychain-2.3.4.ebuild, +keychain-2.3.5.ebuild:
+  Update to 2.3.5, mark 2.3.4 stable, remove 2.3.3
+  - Fix problem where keychain would report the wrong number of keys
+    being added, thanks to Daniel Westermann-Clark for providing a patch
+    in bug 58623
+
+  24 Jul 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.3.2.ebuild,
+  keychain-2.3.3.ebuild, +keychain-2.3.4.ebuild:
+  Update to 2.3.4, mark 2.3.3 stable, remove 2.3.2
+  - Fix bug where keychain would mistake defunct ssh-agent processes
+    as running #28599
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> keychain-2.3.2.ebuild,
+  keychain-2.3.3.ebuild:
+  change virtual/glibc to virtual/libc
+
+*keychain-2.3.3 (01 Jul 2004)
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.2.2.ebuild,
+  -keychain-2.3.0.ebuild, +keychain-2.3.3.ebuild:
+  Bump version to 2.3.3 and trim older ebuilds
+  - Fix bug reported by Matthew S. Moore in email; escape the backticks
+    in --help output
+  - Fix bug reported by Herbie Ong in email; set pidf, cshpidf and lockf
+    variables after parsing command-line to honor --dir setting
+  - Fix bug reported by Stephan Stahl in email; make spaces in filenames
+    work throughout keychain, even in pure Bourne shell
+  - Fix operation on HP-UX with older OpenSSH by interpreting output of
+    ssh-add as well as the error status
+
+  18 Jun 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.3.1.ebuild,
+  keychain-2.3.2.ebuild:
+  Mark 2.3.2 stable everywhere, trim 2.3.1 ebuild
+
+*keychain-2.3.2 (16 Jun 2004)
+
+  16 Jun 2004; Aron Griffis <agriffis@gentoo.org> +keychain-2.3.2.ebuild:
+  Fix bug 53837 (keychain needs ssh-askpass) by unsetting SSH_ASKPASS when
+  --nogui is specified
+
+*keychain-2.3.1 (03 Jun 2004)
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> +keychain-2.3.1.ebuild:
+  Fix bug 52874: problems when using csh
+
+  28 May 2004; Aron Griffis <agriffis@gentoo.org> -keychain-2.0.2.ebuild,
+  -keychain-2.0.3.ebuild, -keychain-2.2.0.ebuild, keychain-2.2.2.ebuild,
+  keychain-2.3.0.ebuild:
+  Mark 2.2.2 and 2.3.0 stable on all arches
+
+*keychain-2.3.0 (14 May 2004)
+
+  14 May 2004; Aron Griffis <agriffis@gentoo.org> +keychain-2.3.0.ebuild:
+  Version bump to 2.3.0, which removes the dependency on procmail for locking
+
+*keychain-2.2.2 (03 May 2004)
+
+  03 May 2004; Aron Griffis <agriffis@gentoo.org> keychain-2.2.0.ebuild,
+  +keychain-2.2.2.ebuild:
+  Update to 2.2.2 with fixes for Solaris and csh. Mark 2.2.0 stable, 2.2.2 will
+  follow soon.
+
+*keychain-2.2.0 (21 Apr 2004)
+
+  21 Apr 2004; Aron Griffis <agriffis@gentoo.org> +keychain-2.2.0.ebuild:
+  Rewrote most of the code, organized into functions, fixed speed issues
+  involving ps, fixed compatibility issues for various UNIXes, hopefully
+  didn't introduce too many bugs.  This version has a --quick option
+  (for me) and a --timeout option (for carpaski).
+
+  19 Apr 2004; Mike Frysinger <vapier@gentoo.org> keychain-2.0.3.ebuild:
+  Marked 2.0.3 stable on all arches
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> keychain-2.0.3.ebuild:
+  added s390 keywords
+
+  11 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> keychain-2.0.2.ebuild,
+  keychain-2.0.3.ebuild:
+  error checking; don't use S=${WORKDIR}/${P}
+
+  05 Mar 2004; Tom Gall <tgall@gentoo.org>  keychain-2.0.3.ebuild:
+  Marked stable on ppc64
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> keychain-2.0.3.ebuild:
+  Marked stable on sparc.
+
+*keychain-2.0.3 (22 Apr 2003)
+
+  22 Apr 2003; Seth Chandler <sethbc@gentoo.org>; keychain-2.0.3.ebuild:
+  a couple of changes...one for cygwin ($grepopts), and a colorized doc
+  change...oh oh oh, we have a man page now ! man keychain =)  We also
+  Have COPYING included in the tar.bz2 now...not that it matters for us
+  Gentoo folk...
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> keychain-2.0.2.ebuild :
+  Automated cleanup of LICENSE
+
+  19 Dec 2002; Martin Holzer <mholzer@gentoo.org> keychain-2.0.2.ebuild Changelog :
+  Fixed Homepage url (#12455).
+
+  16 Dec 2002; Daniel Robbins <drobbins@gentoo.org> added sh-utils runtime dep
+  to the 2.0.2 ebuild; this closes bug #10376. No rev bump.
+  
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
+ 
+*keychain-2.0.2 (27 Mar 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*keychain-1.9 (23 Feb 2002)
+
+  28 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> keychain-2.0.2.ebuild :
+
+  New ebuild
+  
+  3 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> keychain-1.9.ebuild
+
+  Added ppc to KEYWORDS.
+
+  07 Jul 2002; phoen][x <phoenix@gentoo.org> keychain-1.9.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  23 Feb 2002; Daniel Robbins <drobbins@gentoo.org> : New release
 
 *keychain-1.8 (1 Feb 2002)
 
   1 Feb 2002; Donny Davies <woodchip@gentoo.org> :
-  
   Added Daniel Robbins' keychain utility to portage.  Feels weird but
   hey, somebody's gotta do it right?  :)
-
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index e0cb4bb30680..387fd1f7ced7 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,5 +1,16 @@
-MD5 2552e0bf4d3cc268ba05940f1b9d76eb keychain-2.0.3.ebuild 657
-MD5 16e848924f427c1e9ca22e965a645bca keychain-2.0.2.ebuild 613
-MD5 4629d76f2c02ed0b942096a245f90fb2 ChangeLog 1239
-MD5 2dabec3f722f068e33172f030b151ffd files/digest-keychain-2.0.2 65
-MD5 f9a92a5e09d95e7ca604b94eb35e4a83 files/digest-keychain-2.0.3 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 19097c46861a498fc7bd7d0475526a37 ChangeLog 9423
+MD5 2a123dba1a5e3746da8d974628e8da01 files/digest-keychain-2.5.5 66
+MD5 bed523e11da74c4a84a77943bd53bdc1 files/digest-keychain-2.6.1 66
+MD5 80aa699afd426896a360ba323280fd1e keychain-2.5.5.ebuild 888
+MD5 b040c4c5c776d3973e6d74c61a211b93 keychain-2.6.1.ebuild 900
+MD5 ec488c2827fab65ef67f47709c1c7de0 metadata.xml 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDTqwuJrHF4yAQTrARAqV+AKCTUqGDC+Z+gvvc+49Y8oo2pl8qiQCfYeRj
+JpiYPwW9uNeIQoVo+M2VoGI=
+=RIlO
+-----END PGP SIGNATURE-----
diff --git a/net-misc/keychain/keychain-2.5.5.ebuild b/net-misc/keychain/keychain-2.5.5.ebuild
index 9e1e41262b93..a8e5b7005f91 100644
--- a/net-misc/keychain/keychain-2.5.5.ebuild
+++ b/net-misc/keychain/keychain-2.5.5.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.5.5.ebuild,v 1.1 2005/07/28 21:03:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.5.5.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 DESCRIPTION="ssh-agent manager"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~agriffis/keychain/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	app-shells/bash
-	sys-apps/coreutils
 	|| ( net-misc/openssh net-misc/ssh )"
 
 src_install() {
diff --git a/net-misc/keychain/keychain-2.6.1.ebuild b/net-misc/keychain/keychain-2.6.1.ebuild
index 3f243ea573d5..0c45382dd942 100644
--- a/net-misc/keychain/keychain-2.6.1.ebuild
+++ b/net-misc/keychain/keychain-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.6.1.ebuild,v 1.1 2005/10/10 19:41:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.6.1.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 DESCRIPTION="ssh-agent manager"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain/"
@@ -14,7 +14,6 @@ IUSE=""
 DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	app-shells/bash
-	sys-apps/coreutils
 	|| ( net-misc/openssh net-misc/ssh )"
 
 src_install() {
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 878e1be2ee06..3330c8ff54e6 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>keychain</herd>
+<maintainer>
+  <email>agriffis@gentoo.org</email>
+  <name>Aron Griffis</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/kiax/ChangeLog b/net-misc/kiax/ChangeLog
index 7bc867520964..718f66de41b5 100644
--- a/net-misc/kiax/ChangeLog
+++ b/net-misc/kiax/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/kiax
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/ChangeLog,v 1.1 2005/04/26 22:13:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+  15 Aug 2005; <stkn@gentoo.org> kiax-0.8.4.ebuild:
+  Kiax doesn't like parallel builds, adding -j1
+  (fixes #102525)
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> kiax-0.8.4.ebuild:
+  Change qt dep per #100235
+
+  10 Jul 2005; Stefan Knoblich <stkn@gentoo.org> kiax-0.8.4.ebuild:
+  Stable on x86.
 
 *kiax-0.8.4 (27 Apr 2005)
 
diff --git a/net-misc/kiax/Manifest b/net-misc/kiax/Manifest
index 7e91cac454ae..645659fcc576 100644
--- a/net-misc/kiax/Manifest
+++ b/net-misc/kiax/Manifest
@@ -1,5 +1,5 @@
-MD5 72535ded64e9cef5866170b8f6abdaa2 kiax-0.8.4.ebuild 940
+MD5 b5828652b74b7897fc54217c00b2135b kiax-0.8.4.ebuild 933
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 56db0bd350314642692eed994d4c853d ChangeLog 365
-MD5 d496dea872c013c74b229c4c9192df60 files/kiax-0.8.4-iaxwrapper.patch 702
+MD5 4f9ba88be0ec7792368100790c526104 ChangeLog 665
 MD5 245d14d9a58bf769539219bc03fb653f files/digest-kiax-0.8.4 63
+MD5 d496dea872c013c74b229c4c9192df60 files/kiax-0.8.4-iaxwrapper.patch 702
diff --git a/net-misc/kiax/kiax-0.8.4.ebuild b/net-misc/kiax/kiax-0.8.4.ebuild
index b970a13bc705..5c923865c188 100644
--- a/net-misc/kiax/kiax-0.8.4.ebuild
+++ b/net-misc/kiax/kiax-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/net-misc/kiax/kiax-0.8.4.ebuild,v 1.1 2005/04/26 22:13:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kiax/kiax-0.8.4.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 inherit eutils kde-functions
 
@@ -10,11 +10,11 @@ DESCRIPTION="QT based IAX (Inter Asterisk eXchange) client"
 HOMEPAGE="http://kiax.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kiax/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=x11-libs/qt-3.2"
+DEPEND="$(qt_min_version 3.2)"
 
 src_unpack() {
 	unpack ${A}
@@ -28,10 +28,8 @@ src_unpack() {
 }
 
 src_compile() {
-	set-qtdir 3
-
 	econf || die "configure failed"
-	emake || die "make failed"
+	emake -j1 || die "make failed"
 }
 
 src_install() {
diff --git a/net-misc/kickpim/ChangeLog b/net-misc/kickpim/ChangeLog
index 3ad0249c7ee7..d59c5a090653 100644
--- a/net-misc/kickpim/ChangeLog
+++ b/net-misc/kickpim/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-misc/kickpim
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/ChangeLog,v 1.1 2004/03/10 21:05:40 centic Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/ChangeLog,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+  30 Dec 2004; Jason Wever <weeve@gentoo.org> kickpim-0.5.3.ebuild:
+  Added ~sparc keyword.
+
+  18 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/kickpim-0.5.3-gcc3.4.patch, kickpim-0.5.3.ebuild:
+  gcc-3.4 compatibility patch
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> kickpim-0.5.3.ebuild:
+  Typo in DESCRIPTION: Adressbook -> Addressbook. Bug 59717.
+
+  03 Jul 2004; Dominik Stadler <centic@gentoo.org> kickpim-0.5.3.ebuild:
+  Marking stable on x86
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kickpim-0.5.3.ebuild:
+  QA: inherit kde-base || die -> inherit kde
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kickpim-0.5.3.ebuild:
+  Add inherit eutils
+
+  03 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> kickpim-0.5.3.ebuild:
+  Adding amd64 keyword, closing #46591.
 
 *kickpim-0.5.3 (10 Mar 2004)
 
diff --git a/net-misc/kickpim/Manifest b/net-misc/kickpim/Manifest
index 68a6c55d02e2..89050e5d7a5a 100644
--- a/net-misc/kickpim/Manifest
+++ b/net-misc/kickpim/Manifest
@@ -1,2 +1,6 @@
-MD5 2ba9350060113741bcde540975c3cece kickpim-0.5.3.ebuild 416
+MD5 d2351f409b01caf72b271d7740e9fe41 kickpim-0.5.3.ebuild 596
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 aa544c845dd4d7c7d647717641e824da ChangeLog 1227
+MD5 2362fd167742f9ac1f4eb698fc95e948 files/kickpim-0.5.3-gcc3.4.patch 2959
 MD5 7d8f01840667f295b0a5a4cbcafe2327 files/digest-kickpim-0.5.3 66
+MD5 26afc3fcba026cf83bad3f5d6c625c40 files/kickpim-0.5.3-fPIC.patch 1384
diff --git a/net-misc/kickpim/kickpim-0.5.3.ebuild b/net-misc/kickpim/kickpim-0.5.3.ebuild
index e6ffa574104f..a0dfac445a0d 100644
--- a/net-misc/kickpim/kickpim-0.5.3.ebuild
+++ b/net-misc/kickpim/kickpim-0.5.3.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/kickpim-0.5.3.ebuild,v 1.1 2004/03/10 21:05:40 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/kickpim-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
-inherit kde-base || die
-need-kde 3
-
-IUSE=""
-SLOT="0"
+inherit kde eutils
 
-#S=${WORKDIR}/kickpim-${PV}
-DESCRIPTION="A KDE panel applet for editing and accessing the KDE Adressbook."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+DESCRIPTION="A KDE panel applet for editing and accessing the KDE Addressbook."
+SRC_URI="mirror://sourceforge/kickpim/${P}.tar.bz2"
 HOMEPAGE="http://kickpim.sourceforge.net"
 
+SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64 ~sparc"
+IUSE=""
+
+need-kde 3
 
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
+}
diff --git a/net-misc/kickpim/metadata.xml b/net-misc/kickpim/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/net-misc/kickpim/metadata.xml
+++ b/net-misc/kickpim/metadata.xml
@@ -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-misc/klapjack/ChangeLog b/net-misc/klapjack/ChangeLog
index 6153a54e0224..3b222cebe09a 100644
--- a/net-misc/klapjack/ChangeLog
+++ b/net-misc/klapjack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/klapjack
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/klapjack/ChangeLog,v 1.1 2005/06/30 12:34:51 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/klapjack/ChangeLog,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> klapjack-0.4.2.ebuild:
+  Change qt dep
 
 *net-misc/klapjack-0.4.2 (30 Jun 2005)
 
diff --git a/net-misc/klapjack/Manifest b/net-misc/klapjack/Manifest
index 0e637cc29fff..6f8b02bf97f0 100644
--- a/net-misc/klapjack/Manifest
+++ b/net-misc/klapjack/Manifest
@@ -1,2 +1,3 @@
-MD5 51463049a83d6d6188787646f46f8477 klapjack-0.4.2.ebuild 424
+MD5 47240f27ddf179aaebe64b112852657d klapjack-0.4.2.ebuild 562
+MD5 2c2e2e55cda507b89d53accc7ab61a0b ChangeLog 441
 MD5 6f9056e41de2979c88a9eae961e68573 files/digest-klapjack-0.4.2 66
diff --git a/net-misc/klapjack/klapjack-0.4.2.ebuild b/net-misc/klapjack/klapjack-0.4.2.ebuild
index f750549ff2fe..e179d4802035 100644
--- a/net-misc/klapjack/klapjack-0.4.2.ebuild
+++ b/net-misc/klapjack/klapjack-0.4.2.ebuild
@@ -1,5 +1,6 @@
-# Copyright James Harlow 2003
-# Distributed under the GNU GPL v2
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/klapjack/klapjack-0.4.2.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 inherit kde-base
 
@@ -8,9 +9,7 @@ DESCRIPTION="KLapJack - a KDE client for the popular online journal site LiveJou
 SRC_URI="mirror://sourceforge/klapjack/${P}.tar.gz"
 HOMEPAGE="http://klapjack.sourceforge.net/"
 KEYWORDS="~x86"
-DEPEND=">=kde-base/kdebase-3.0 \
-		>=x11-libs/qt-3.1 \
-		>=media-sound/xmms-1.2.7 \
-		>=dev-libs/xmlrpc-c-0.9.9"
-
-need-kde 3
+DEPEND=">=kde-base/kdebase-3.0
+	$(qt_min_version 3.1)
+	>=media-sound/xmms-1.2.7
+	>=dev-libs/xmlrpc-c-0.9.9"
diff --git a/net-misc/knemo/ChangeLog b/net-misc/knemo/ChangeLog
index 0867819f185d..a1e6f3702817 100644
--- a/net-misc/knemo/ChangeLog
+++ b/net-misc/knemo/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for net-misc/knemo
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/ChangeLog,v 1.1 2004/06/28 16:30:37 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/ChangeLog,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
+
+  02 Sep 2005; Luis Medinas <metalgod@gentoo.org> knemo-0.3.1-r1.ebuild:
+  Marked Stable on AMD64.
+
+  13 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> knemo-0.3.1-r1.ebuild:
+  Depend on sys-apps/net-tools just on Linux.
+
+  29 Jun 2005; Carsten Lohrke <carlo@gentoo.org> knemo-0.3.1-r1.ebuild:
+  stable on x86
+
+*knemo-0.3.1-r1 (01 May 2005)
+
+  01 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/knemo-0.3.1-linkquality.patch, +knemo-0.3.1-r1.ebuild:
+  always show link quality, #88653
+
+  07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> knemo-0.3.1.ebuild:
+  Marked ~amd64, closes bug 83489.
+
+  25 Mar 2005; Carsten Lohrke <carlo@gentoo.org> knemo-0.3.1.ebuild:
+  stable on x86
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> knemo-0.3.1.ebuild:
+  Added ~sparc keyword.
+
+*knemo-0.3.1 (06 Jan 2005)
+
+  06 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +knemo-0.3.1.ebuild:
+  version bump
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> -knemo-0.1.10.ebuild,
+  -knemo-0.1.8.ebuild, -knemo-0.1.9.ebuild, -knemo-0.2.0.ebuild,
+  -knemo-0.2.2.ebuild, knemo-0.3.0.ebuild:
+  stable on x86, clean up
+
+*knemo-0.3.0 (14 Sep 2004)
+
+  14 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +knemo-0.3.0.ebuild:
+  version bump
+
+*knemo-0.2.2 (17 Aug 2004)
+
+  17 Aug 2004; Dominik Stadler <centic@gentoo.org> +knemo-0.2.2.ebuild:
+  Add version 0.2.2, requested in Bug 60637
+
+*knemo-0.2.0 (01 Aug 2004)
+
+  01 Aug 2004; Dominik Stadler <centic@gentoo.org> +knemo-0.2.0.ebuild:
+  Add version 0.2.0, requested in Bug 59025
+
+*knemo-0.1.10 (12 Jul 2004)
+
+  12 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +knemo-0.1.10.ebuild:
+  version bump
+
+*knemo-0.1.9 (10 Jul 2004)
+
+  10 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +knemo-0.1.9.ebuild:
+  version bump
+
+  29 Jun 2004; David Holm <dholm@gentoo.org> knemo-0.1.8.ebuild:
+  Added to ~ppc.
 
 *knemo-0.1.8 (28 Jun 2004)
 
diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest
index b55aad2fe29d..1dda353fe2e7 100644
--- a/net-misc/knemo/Manifest
+++ b/net-misc/knemo/Manifest
@@ -1,4 +1,15 @@
-MD5 19c197464a259a42803731e5ed79c95a knemo-0.1.8.ebuild 368
-MD5 c128249cfb983b15013ff9a3b4006662 ChangeLog 282
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 136f0131ef7b503e1ddffafe37798536 files/digest-knemo-0.1.8 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fb8178fd61a4affc8f030106d9a44551 ChangeLog 2185
+MD5 4ebb1879e426b275794590ee4b3edbb5 knemo-0.3.1-r1.ebuild 835
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 880f6fce3873cebf4cb5bd3070ab5967 files/digest-knemo-0.3.1-r1 64
+MD5 e6a9a9aef0881e30022bd77be5ac5d90 files/knemo-0.3.1-linkquality.patch 463
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDF9QdwUpWvClEHQoRAjk8AKCGT0ZGVLuNk5/qIywlWroXg27a+wCfVcJj
+lGw7p52kds0qofLSys9RN0E=
+=mQeu
+-----END PGP SIGNATURE-----
diff --git a/net-misc/knemo/knemo-0.3.1-r1.ebuild b/net-misc/knemo/knemo-0.3.1-r1.ebuild
index a7475bf73545..5b59681b3399 100644
--- a/net-misc/knemo/knemo-0.3.1-r1.ebuild
+++ b/net-misc/knemo/knemo-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/net-misc/knemo/knemo-0.3.1-r1.ebuild,v 1.1 2005/05/01 13:37:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knemo/knemo-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,10 +10,10 @@ HOMEPAGE="http://kde-apps.org/content/show.php?content=12956"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="wifi"
 
-RDEPEND="sys-apps/net-tools
+RDEPEND="kernel_linux? ( sys-apps/net-tools )
 	wifi? ( net-wireless/wireless-tools )"
 need-kde 3.2
 
@@ -26,4 +26,4 @@ pkg_postinst() {
 	einfo "KNemo is not an executable but an KDED service. Therefore it has to"
 	einfo "be started using Control Center/KDE Components/Service Manager."
 	echo
-}
\ No newline at end of file
+}
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/net-misc/knemo/metadata.xml
+++ b/net-misc/knemo/metadata.xml
@@ -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-misc/knetload/ChangeLog b/net-misc/knetload/ChangeLog
index 946b34fdfc3c..3e92b36634db 100644
--- a/net-misc/knetload/ChangeLog
+++ b/net-misc/knetload/ChangeLog
@@ -1,11 +1,99 @@
 # ChangeLog for net-misc/knetload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+  27 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  knetload-3.0_alpha2.ebuild:
+  Remove configure file to force redoing all the auto* stuff which seems to
+  break on some systems.
+
+  08 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  knetload-3.0_alpha2.ebuild:
+  Clean up dependencies.
+
+  07 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  knetload-3.0_alpha2.ebuild:
+  Fix configure options passages. Fixes #90298.
+
+  23 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> knetload-2.3.ebuild:
+  Changed HOMEPAGE and SRC_URI as my old provider just died and those urls are
+  no more reachable.
+
+*knetload-3.0_alpha2 (22 Apr 2005)
+
+  22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  +knetload-3.0_alpha2.ebuild:
+  New upstream version, package.masked as it's still alpha-quality. I'm taking
+  over the maintainership of this package as I'm current upstream maintainer.
+  The new version depends on libksnmp to support remote network load
+  monitoring.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> knetload-2.3.ebuild:
+  Stable on sparc.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> knetload-2.2.2.ebuild,
+  knetload-2.3.ebuild:
+  stable on amd64.
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> knetload-2.3.ebuild:
+  stable on x86
+
+*knetload-2.3 (31 Jul 2004)
+
+  31 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +knetload-2.3.ebuild:
+  version bump
+
+  28 Jun 2004; Carsten Lohrke <carlo@gentoo.org> -knetload-1.94.ebuild,
+  knetload-1.99.ebuild, knetload-2.2.2.ebuild:
+  remove old ebuild, QA: IUSE, need-kde
+
+  21 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> knetload-2.2.2.ebuild:
+  Added to ~ppc, bug 54667.
+
+  22 May 2004; Danny van Dyk <kugelfang@gentoo.org> knetload-1.99.ebuild:
+  Marked stable on amd64.
+
+*knetload-2.2.2 (13 May 2004)
+
+  13 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  +knetload-2.2.2.ebuild:
+  Version bump as per bug #49686. Thanks to the current maintainer/author Diego
+  Pettenò for the notification
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> knetload-1.94.ebuild,
+  knetload-1.99.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> knetload-1.99.ebuild:
+  Marked stable on sparc.
+
+  26 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> knetload-1.99.ebuild :
+  Workaround faulty libsuffix detection. Add amd64 keyword.
+
+*knetload-1.99 (20 Dec 2002)
+
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> knetload-1.99.ebuild:
+  Mark as x86 stable.
+
+  20 Dec 2002; Hannes Mehnert <hannes@gentoo.org>: knetload-1.9..ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*knetload-1.94 (13 Apr 2002)
+
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> knetload-1.94.ebuild :  
+  Added KEYWORDS.  
+
+  13 Apr 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :  
+  New (KDE3) version.  
 
 *knetload-1.91-r2 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> knetload-1.94.ebuild :  
+  Added KEYWORDS, LICENSE.
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-misc/knetload/Manifest b/net-misc/knetload/Manifest
index e69de29bb2d1..d527f8f340c7 100644
--- a/net-misc/knetload/Manifest
+++ b/net-misc/knetload/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 271da76f4cf68921195ace4067fcc508 ChangeLog 3630
+MD5 52401b08e2060f8805d661b657e25af8 knetload-3.0_alpha2.ebuild 813
+MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
+MD5 42dbc9370b5644dad6c4e7f5e420dac0 knetload-2.3.ebuild 484
+MD5 fcd58fb6225a7442b0149f0fbb921970 files/digest-knetload-2.3 65
+MD5 bd89b61f8ce47d33f95143bdfbce4738 files/digest-knetload-3.0_alpha2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLHAFj5H05b2HAEkRAnxmAJ49wiabH/TjGWxTCYiB4IozvUECsgCfcHKs
+OjigMHdL2CT3UkdeZ7O9Ct4=
+=xXKq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/knetload/knetload-2.3.ebuild b/net-misc/knetload/knetload-2.3.ebuild
index 187e39705481..0e504118e10b 100644
--- a/net-misc/knetload/knetload-2.3.ebuild
+++ b/net-misc/knetload/knetload-2.3.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/net-misc/knetload/knetload-2.3.ebuild,v 1.1 2004/07/31 14:54:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-2.3.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="A Network applet for KDE3"
-HOMEPAGE="http://flameeyes.web.ctonet.it/kdeapps.html#knetload"
-SRC_URI="http://flameeyes.web.ctonet.it/files/${P}.tar.bz2"
+HOMEPAGE="http://dev.gentoo.org/~flameeyes/kdeapps#knetload"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 sparc amd64 ~ppc"
 IUSE=""
 
 need-kde 3
diff --git a/net-misc/knetload/knetload-3.0_alpha2.ebuild b/net-misc/knetload/knetload-3.0_alpha2.ebuild
index 863bef973c66..eb732f5d555d 100644
--- a/net-misc/knetload/knetload-3.0_alpha2.ebuild
+++ b/net-misc/knetload/knetload-3.0_alpha2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-3.0_alpha2.ebuild,v 1.1 2005/04/22 12:52:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetload/knetload-3.0_alpha2.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 inherit kde
 
@@ -10,18 +10,25 @@ MY_P="${PN}-2.9.92"
 DESCRIPTION="Network Load Monitor applet for Kicker with SNMP capabilities"
 HOMEPAGE="http://dev.gentoo.org/~flameeyes/kdeapps.xhtml#knetload"
 SRC_URI="http://digilander.libero.it/dgp85/files/${MY_P}.tar.bz2"
-
-RDEPEND="$RDEPEND
-	snmp? ( >=net-libs/libksnmp-0.3 )"
+LICENSE="GPL-2"
 
 SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE="snmp"
 
-S=${WORKDIR}/${MY_P}
+DEPEND="snmp? ( >=net-libs/libksnmp-0.3 )"
 
 need-kde 3.2
 
-myconf="--enable-libsuffix= $(use_with snmp libksnmp)"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	kde_src_unpack
+	rm ${S}/configure
+}
+
+src_compile() {
+	myconf="--enable-libsuffix= $(use_with snmp libksnmp)"
 
+	kde_src_compile
+}
diff --git a/net-misc/knetload/metadata.xml b/net-misc/knetload/metadata.xml
index d8b96be3c5cd..4609c87f40b1 100644
--- a/net-misc/knetload/metadata.xml
+++ b/net-misc/knetload/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>
+	<herd>kde</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>flameeyes@gentoo.org</email>
+		<name>Diego Pettenò</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/knetmonapplet/ChangeLog b/net-misc/knetmonapplet/ChangeLog
index 1a16b2894894..8742549bc570 100644
--- a/net-misc/knetmonapplet/ChangeLog
+++ b/net-misc/knetmonapplet/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for net-misc/knetmonapplet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/ChangeLog,v 1.1 2002/12/19 19:38:17 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+  05 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/knetmonapplet-0.9-noarts.patch, knetmonapplet-0.9.ebuild:
+  Add patch to compile without arts (#87925). Thanks to prymitive
+  <prymitive@o2.pl>.
+
+  29 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> knetmonapplet-0.9.ebuild:
+  Marked ~amd64.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  knetmonapplet-0.6.6.ebuild, knetmonapplet-0.9.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*knetmonapplet-0.9 (28 May 2003)
+
+  28 May 2003; Caleb Tennis <caleb@gentoo.org> knetmonapplet-0.9.ebuild:
+  Version bump, thanks to Sami Nieminen for bug report #19235
+
+
+  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.
 
 *knetmonapplet-0.6.6 (19 Dec 2002)
 
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> knetmonapplet-0.6.6.ebuild:
+  Mark as x86 stable.
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> knetmonapplet-0.6.6.ebuild :
+  set ~ppc in keywords
+
   19 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
   A kde panel applet that displays network traffix. Submission #10680 by
diff --git a/net-misc/knetmonapplet/Manifest b/net-misc/knetmonapplet/Manifest
index b62285e58f36..9b60269b5154 100644
--- a/net-misc/knetmonapplet/Manifest
+++ b/net-misc/knetmonapplet/Manifest
@@ -1,5 +1,16 @@
-MD5 37e57ecae72e89ad8f66c3217792a81f knetmonapplet-0.6.6.ebuild 661
-MD5 37e57ecae72e89ad8f66c3217792a81f knetmonapplet-0.9.ebuild 661
-MD5 008b78e796f7720c7737999e28322dbf ChangeLog 895
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6037b951324be8d75e66c59d2f044774 knetmonapplet-0.6.6.ebuild 592
+MD5 00cdf14f3a45b2dfa77124c5e553b63b knetmonapplet-0.9.ebuild 665
+MD5 9d50ef8b089ca884d499f0c786c0c00a ChangeLog 1514
 MD5 ce6272804a46fc47fbda45f19d153a9c files/digest-knetmonapplet-0.6.6 71
 MD5 f6e8238f1cafc06e30b26f90dedfca95 files/digest-knetmonapplet-0.9 69
+MD5 8798ce976a6ab0a43270915a13ed53bc files/knetmonapplet-0.9-noarts.patch 3828
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2vSvBXaUFmZvwyMRAiJhAJ4/EdtEPvqRCvx/rEgQOLNbWcClgACggrUP
+x/QUpKjCr7Y1pfa+mqzexgI=
+=IQiz
+-----END PGP SIGNATURE-----
diff --git a/net-misc/knetmonapplet/knetmonapplet-0.6.6.ebuild b/net-misc/knetmonapplet/knetmonapplet-0.6.6.ebuild
index 341bff8b15c3..31e03262184d 100644
--- a/net-misc/knetmonapplet/knetmonapplet-0.6.6.ebuild
+++ b/net-misc/knetmonapplet/knetmonapplet-0.6.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Alexander Papaspyrou <alexander.papaspyrou@udo.edu
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/knetmonapplet-0.6.6.ebuild,v 1.1 2002/12/19 19:38:17 danarmak Exp $
-inherit kde-base
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/knetmonapplet-0.6.6.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+inherit kde
 need-kde 3
 
 DESCRIPTION="Graphical network monitor for the KDE panel"
@@ -10,12 +10,11 @@ SRC_URI="http://ftp.kde.com/Computer_Devices/Networking/Monitoring/KnetmonApplet
 HOMEPAGE="http://perso.club-internet.fr/hftom/knetmonapplet/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 src_unpack() {
+	kde_src_unpack
 
-    base_src_unpack
-    
-    rm -f $S/knetmon/uiconfig.{h,cpp,moc}
-
+	rm -f $S/knetmon/uiconfig.{h,cpp,moc}
 }
diff --git a/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild b/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild
index 0e13741cdcd4..ee3303e2f9b7 100644
--- a/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild
+++ b/net-misc/knetmonapplet/knetmonapplet-0.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
-# Alexander Papaspyrou <alexander.papaspyrou@udo.edu
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild,v 1.1 2003/05/28 15:37:20 caleb Exp $
-inherit kde-base
-need-kde 3
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+inherit kde eutils
 
 DESCRIPTION="Graphical network monitor for the KDE panel"
 SRC_URI="http://ftp.kde.com/Computer_Devices/Networking/Monitoring/KnetmonApplet/${P}.tar.gz"
 HOMEPAGE="http://perso.club-internet.fr/hftom/knetmonapplet/"
-
 LICENSE="GPL-2"
-KEYWORDS="x86"
+
+SLOT="0"
+KEYWORDS="x86 ~amd64"
+IUSE="arts"
+
+need-kde 3
 
 src_unpack() {
+	kde_src_unpack
 
-    kde_src_unpack
-    
-    rm -f $S/knetmon/uiconfig.{h,cpp,moc}
+	use arts || epatch "${FILESDIR}/${P}-noarts.patch"
 
+	rm -f $S/knetmon/uiconfig.{h,cpp,moc}
 }
diff --git a/net-misc/knock/ChangeLog b/net-misc/knock/ChangeLog
index 4ea35bd8f4d6..8d5d6b3ddf8f 100644
--- a/net-misc/knock/ChangeLog
+++ b/net-misc/knock/ChangeLog
@@ -1,8 +1,68 @@
 # ChangeLog for net-misc/knock
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.1 2004/04/15 05:12:04 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/ChangeLog,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
+
+*knock-0.5 (03 Oct 2005)
+
+  03 Oct 2005; Markus Nigbur <pyrania@gentoo.org> +knock-0.5.ebuild:
+  Version bump.
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> -knock-0.1.ebuild:
+  removed 0.1 - patch problems
+
+*knock-0.4 (14 Mar 2005)
+
+  14 Mar 2005; Markus Nigbur <pyrania@gentoo.org> +knock-0.4.ebuild:
+  Version bump. Closing bug #78356.
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> knock-0.1.ebuild,
+  knock-0.3.1.ebuild, knock-0.3.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Nov 2004; Mike Frysinger <vapier@gentoo.org> knock-0.3.1.ebuild:
+  Fix broken patching.
+
+  27 Oct 2004; <pyrania@gentoo.org> knock-0.3.1.ebuild:
+  Removed nonblock patch for 0.3.1.
+
+*knock-0.3.1 (26 Oct 2004)
+
+  26 Oct 2004; <pyrania@gentoo.org> +knock-0.3.1.ebuild:
+  Version bump.
+
+  01 Oct 2004; <pyrania@gentoo.org> knock-0.3.ebuild:
+  Marked stable on x86.
+
+  26 Sep 2004; <pyrania@gentoo.org> -files/knock-0.3-nonblock.patch,
+  +files/nonblock.patch, knock-0.1.ebuild, knock-0.3.ebuild:
+  Fixed up some dumbness. Closing bug #64341.
+
+  27 Aug 2004; <pyrania@gentoo.org> +files/knockd.conf.patch,
+  knock-0.1.ebuild, +files/knock-0.3-nonblock.patch, knock-0.3.ebuild:
+  Closed bugs #59315, #59265 and #59251. Thanks to Per Cederberg
+  <per@percederberg.net>.
+
+  18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> knock-0.3.ebuild:
+  Added amd64 keyword, closing #57090.
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> knock-0.1.ebuild,
+  knock-0.3.ebuild:
+  Remove whitespace from CVS header to make repoman happy.
+
+  03 Jul 2004; <pyrania@gentoo.org> knock-0.3.ebuild:
+  Depending on net-libs/libpcap. Closing bug #55131.
+
+*knock-0.3 (12 Jun 2004)
+
+  12 Jun 2004; <pyrania@gentoo.org> knock-0.1.ebuild, +knock-0.3.ebuild:
+  Version bump. Closing bug #49077.
 
 *knock-0.1 (15 Apr 2004)
 
-  15 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
-  Initial import.  Ebuild submitted by me.
+  15 Apr 2004; Markus Nigbur <pyrania@gentoo.org> metadata.xml,
+  files/knockd.confd, files/knockd.initd:
+  Initial import.
+
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index e944057d0f0b..463ae8600fc8 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -1,3 +1,24 @@
-MD5 55534a099ff89b30b114d4aed57a1931 knock-0.1.ebuild 505
-MD5 503e3134931fbbd7729e4c6eb69bc38b files/digest-knock-0.1 60
-MD5 94de17733df9dffdbe5f50f953fcd8b1 ChangeLog 331
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 773cf0a1a316aa68c6704dd181c17ef6 ChangeLog 2255
+MD5 17156220622de497a4ce93ce3f98d7f1 knock-0.3.1.ebuild 775
+MD5 4046e0c50672e8c40f56dc81d0166e2b knock-0.3.ebuild 752
+MD5 78d585d2d34d01010bbd22f15df7866c knock-0.4.ebuild 853
+MD5 85096de16c2a05f92c5a5fb0e800a2bc metadata.xml 252
+MD5 808acfb3d312eb9948afffa93ea83f9d knock-0.5.ebuild 853
+MD5 5671d78faf881e925fe931f94ee38357 files/digest-knock-0.3.1 62
+MD5 ac58083c3cf8cbe43867dc69a30cbeec files/knockd.conf.patch 676
+MD5 4897af6befb034599f6c6467b17e8e53 files/digest-knock-0.4 60
+MD5 e29910cfc320b854bf223b518e84016b files/digest-knock-0.5 60
+MD5 6f594c8b1eb17d15a0ab9a73331598e3 files/digest-knock-0.3 60
+MD5 56d82b74345f127c4af5b92580b2b465 files/nonblock.patch 617
+MD5 ae09af5fe36f302c2b18a66ec789e6d4 files/knockd.initd 492
+MD5 141b7202730b744d2e3f884d1c8e8eec files/knockd.confd 264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQQfB8vunf3B9+MERAqFuAKCF6C1r2XsgN4Y7CJmasWRxr1d8wACfbWqA
+q86spZVnSWqcrQvGmyCvUDA=
+=aazy
+-----END PGP SIGNATURE-----
diff --git a/net-misc/knock/files/knockd.confd b/net-misc/knock/files/knockd.confd
index 8826f04e709d..e5af4bfbedcd 100644
--- a/net-misc/knock/files/knockd.confd
+++ b/net-misc/knock/files/knockd.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/files/knockd.confd,v 1.1 2004/04/15 23:00:45 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/files/knockd.confd,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 # options for knockd daemon
 OPTS="-d -i eth0"
diff --git a/net-misc/knock/files/knockd.initd b/net-misc/knock/files/knockd.initd
index 160157ffc06a..6ea5af3e796a 100644
--- a/net-misc/knock/files/knockd.initd
+++ b/net-misc/knock/files/knockd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/files/knockd.initd,v 1.1 2004/04/15 23:00:45 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/files/knockd.initd,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/knock/knock-0.3.1.ebuild b/net-misc/knock/knock-0.3.1.ebuild
index 89283ec1d24f..32d45d929f21 100644
--- a/net-misc/knock/knock-0.3.1.ebuild
+++ b/net-misc/knock/knock-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/net-misc/knock/knock-0.3.1.ebuild,v 1.1 2004/10/26 15:25:27 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 inherit eutils
 
@@ -8,29 +8,26 @@ DESCRIPTION="A simple port-knocking daemon"
 HOMEPAGE="http://www.zeroflux.org/knock/"
 SRC_URI="http://www.zeroflux.org/knock/${P}.tar.gz"
 
-DEPEND=">=net-libs/libpcap-0.8.3-r1"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RDEPEND="virtual/libpcap"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/nonblock.patch
+	cd ${S}
 	epatch ${FILESDIR}/knockd.conf.patch
 }
 
-src_compile() {
-	econf || die "could not configure"
-	emake || die "emake failed"
-}
-
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc README
 	dohtml doc/index.html
 
-	insinto /etc/conf.d; newins ${FILESDIR}/knockd.confd knock
-	exeinto /etc/init.d; newexe ${FILESDIR}/knockd.initd knock
+	newinitd ${FILESDIR}/knockd.initd knock
+	newconfd ${FILESDIR}/knockd.confd knock
 }
diff --git a/net-misc/knock/knock-0.3.ebuild b/net-misc/knock/knock-0.3.ebuild
index 21e1984199a5..d463d296cad7 100644
--- a/net-misc/knock/knock-0.3.ebuild
+++ b/net-misc/knock/knock-0.3.ebuild
@@ -1,21 +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/net-misc/knock/knock-0.3.ebuild,v 1.1 2004/06/12 17:39:38 pyrania Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A simple port-knocking daemon"
 HOMEPAGE="http://www.zeroflux.org/knock/"
 SRC_URI="http://www.zeroflux.org/knock/${P}.tar.gz"
 
-KEYWORDS="~x86"
+DEPEND="virtual/libpcap"
+
+KEYWORDS="x86 ~amd64"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/nonblock.patch
+	epatch ${FILESDIR}/knockd.conf.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc README
 	dohtml doc/index.html
 
-	insinto /etc/conf.d; newins ${FILESDIR}/knockd.confd knock
-	exeinto /etc/init.d; newexe ${FILESDIR}/knockd.initd knock
+	newconfd ${FILESDIR}/knockd.confd knock
+	newinitd ${FILESDIR}/knockd.initd knock
 }
diff --git a/net-misc/knock/knock-0.4.ebuild b/net-misc/knock/knock-0.4.ebuild
index a15f8a44ebaa..f7fe65781a67 100644
--- a/net-misc/knock/knock-0.4.ebuild
+++ b/net-misc/knock/knock-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.4.ebuild,v 1.1 2005/03/14 17:49:52 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.4.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/knock/knock-0.5.ebuild b/net-misc/knock/knock-0.5.ebuild
index 62a1d3cb2642..3ddf76d3e09f 100644
--- a/net-misc/knock/knock-0.5.ebuild
+++ b/net-misc/knock/knock-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.5.ebuild,v 1.1 2005/10/03 10:27:57 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knock/knock-0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/knutclient/ChangeLog b/net-misc/knutclient/ChangeLog
index 6ff0dcfe6fae..8d049a07912d 100644
--- a/net-misc/knutclient/ChangeLog
+++ b/net-misc/knutclient/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for net-misc/knutclient
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/ChangeLog,v 1.1 2003/06/24 20:41:16 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+*knutclient-0.8.6 (31 Aug 2005)
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/knutclient-0.8.5-arts-configure.patch, knutclient-0.8.5.ebuild,
+  +knutclient-0.8.6.ebuild:
+  Marked ~amd64 and patched configure so that is does not need arts, closes
+  bug 104084. Version bump.
+
+  30 Dec 2004; Carsten Lohrke <carlo@gentoo.org> knutclient-0.8.5.ebuild:
+  stable on x86
+
+*knutclient-0.8.5 (25 Nov 2004)
+
+  25 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +knutclient-0.8.5.ebuild:
+  version bump
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> knutclient-0.8.1_pre2.ebuild:
+  Added ~sparc keyword.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> knutclient-0.8.1_pre2.ebuild:
+  Added to ~ppc.
+
+  25 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +metadata.xml,
+  knutclient-0.8.1_pre2.ebuild:
+  fixed ${S}, missing metadata.xml
+
+  27 May 2004; Jason Wever <weeve@gentoo.org> knutclient-0.7.1.ebuild:
+  Added ~sparc keyword.
+
+*knutclient-0.8.1_pre2 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org> +knutclient-0.8.1_pre2.ebuild:
+  Version bump
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  knutclient-0.6.0.ebuild, knutclient-0.7.1.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*knutclient-0.7.1 (17 Oct 2003)
 
 *knutclient-0.6.0 (21 Apr 2003)
 
diff --git a/net-misc/knutclient/Manifest b/net-misc/knutclient/Manifest
index 81fa0c48c47e..ddb9ccfb238f 100644
--- a/net-misc/knutclient/Manifest
+++ b/net-misc/knutclient/Manifest
@@ -1,3 +1,17 @@
-MD5 4af589a79420ed942d6fbbdfbcc19922 files/digest-knutclient-0.6.0 68
-MD5 1d723f25fd6c834d9399535a37213059 knutclient-0.6.0.ebuild 808
-MD5 84ee85d986a22bde0782a17bb3dfcd41 ChangeLog 365
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dcd346b3b0b07de7ede806cb3c418d94 knutclient-0.8.5.ebuild 620
+MD5 963eb3632e2db810486c32a850a5ad32 knutclient-0.8.6.ebuild 635
+MD5 561ec8edfcd0855eb2e0b81914fd5501 ChangeLog 1602
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 aecc8da463fd7a070c24c5441ebb5e5c files/digest-knutclient-0.8.5 69
+MD5 e4d5c361a955a869636e3e5e42a72a3a files/digest-knutclient-0.8.6 69
+MD5 8e2ff7d646fbe3bf5bd42a98079b5a6e files/knutclient-0.8.5-arts-configure.patch 3569
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDFfZLntT9W3vfTuoRAsBeAKC1pDchbGWwGFe7TXuE8GPaDfZh3ACgsp6V
+Ye0leU1udGIAXJONh7o5FSM=
+=wqli
+-----END PGP SIGNATURE-----
diff --git a/net-misc/knutclient/knutclient-0.8.5.ebuild b/net-misc/knutclient/knutclient-0.8.5.ebuild
index 13b4fd7f5839..fa343d74bab1 100644
--- a/net-misc/knutclient/knutclient-0.8.5.ebuild
+++ b/net-misc/knutclient/knutclient-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.8.5.ebuild,v 1.1 2004/11/25 12:33:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.8.5.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit kde
 
@@ -13,7 +13,12 @@ SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc x86"
 IUSE=""
 
 need-kde 3.1
+
+src_unpack() {
+	kde_src_unpack
+	use arts || epatch ${FILESDIR}/${P}-arts-configure.patch
+}
diff --git a/net-misc/knutclient/knutclient-0.8.6.ebuild b/net-misc/knutclient/knutclient-0.8.6.ebuild
index 0d9d3764d205..abdd100e20a1 100644
--- a/net-misc/knutclient/knutclient-0.8.6.ebuild
+++ b/net-misc/knutclient/knutclient-0.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/net-misc/knutclient/knutclient-0.8.6.ebuild,v 1.1 2005/08/31 18:25:48 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.8.6.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit kde
 
diff --git a/net-misc/knutclient/metadata.xml b/net-misc/knutclient/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/net-misc/knutclient/metadata.xml
+++ b/net-misc/knutclient/metadata.xml
@@ -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-misc/kphone/ChangeLog b/net-misc/kphone/ChangeLog
index bf297be79cdb..f9201f769c57 100644
--- a/net-misc/kphone/ChangeLog
+++ b/net-misc/kphone/ChangeLog
@@ -1,6 +1,130 @@
 # ChangeLog for net-misc/kphone
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/ChangeLog,v 1.1 2002/07/08 18:10:11 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/ChangeLog,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
+
+  24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> kphone-4.2.ebuild:
+  Stable on ppc.
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> kphone-4.2.ebuild:
+  Stable on sparc
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kphone-4.1.1.ebuild,
+  kphone-4.2.ebuild:
+  Stable on x86.
+
+*kphone-4.2 (15 Jul 2005)
+
+  15 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kphone-4.2.ebuild:
+  New version (#99040).
+
+*kphone-4.1.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kphone-4.1.1-gcc34.patch, metadata.xml, +kphone-4.1.1.ebuild:
+  New version (#91773). Remove KDE dependency as kphone is a Qt-only application.
+
+  18 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> kphone-4.1.0.ebuild:
+  Stable on sparc
+
+  16 Jan 2005; Simone Gotti <motaboy@gentoo.org> -kphone-4.0.4.ebuild,
+  kphone-4.0.5.ebuild, kphone-4.1.0.ebuild:
+  Stable on x86. Removing kphone-4.0.4 ebuild to close bug #72940.
+
+*kphone-4.1.0 (12 Dec 2004)
+
+  12 Dec 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kphone-4.1.0-Makefiles.patch, +kphone-4.1.0.ebuild:
+  Version bump. Closes bug #74024
+
+*kphone-4.0.5 (26 Nov 2004)
+
+  26 Nov 2004; Simone Gotti <motaboy@gentoo.org> +kphone-4.0.5.ebuild:
+  Version Bump. Closes bug #72532.
+
+*kphone-4.0.4 (08 Nov 2004)
+
+  08 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kphone-4.0.4-makefile.diff, +kphone-4.0.4.ebuild:
+  Version Bump, closes bug #70339
+
+  18 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> kphone-4.0.3.ebuild:
+  Stable on sparc
+
+  12 Oct 2004; Carsten Lohrke <carlo@gentoo.org> kphone-4.0.3.ebuild:
+  stable on x86, readded lost archs (?)
+
+  25 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kphone-4.0.3.ebuild:
+  missing icons patch, #53648
+
+*kphone-4.0.3 (04 Jul 2004)
+
+  04 Jul 2004; Dominik Stadler <centic@gentoo.org> +kphone-4.0.3.ebuild:
+  Add new Version 4.0.3, fixes Bug 55641
+
+  18 May 2004; Caleb Tennis <caleb@gentoo.org> -kphone-1.0.2.ebuild,
+  -kphone-2.0.ebuild, -kphone-3.11.ebuild, -kphone-3.14.ebuild:
+  remove old versions, mark x86 stable
+
+  16 May 2004; Dominik Stadler <centic@gentoo.org> kphone-1.0.2.ebuild,
+  kphone-2.0.ebuild, kphone-3.11.ebuild, kphone-3.14.ebuild,
+  kphone-4.0.1.ebuild:
+  Add IUSE
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> kphone-4.0.1.ebuild,
+  kphone-4.0.2.ebuild:
+  Add die following econf for bug 48950
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> kphone-4.0.2.ebuild:
+  Added to ~ppc.
+
+  24 Apr 2004; Jason Wever <weeve@gentoo.org> kphone-4.0.2.ebuild:
+  Stable on sparc wrt bug #47480.
+
+*kphone-4.0.2 (24 Apr 2004)
+
+  24 Apr 2004; Dominik Stadler <centic@gentoo.org> +metadata.xml,
+  +kphone-4.0.2.ebuild:
+  Add Version 4.0.2, see Bug 47480, thanks to Samuel Greenfeld <n2uro@aol.com>
+
+  25 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> kphone-4.0.1.ebuild:
+  ~sparc baby
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> kphone-1.0.2.ebuild,
+  kphone-2.0.ebuild, kphone-3.11.ebuild, kphone-3.14.ebuild,
+  kphone-4.0.1.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  12 Mar 2004; Jason Wever <weeve@gentoo.org> kphone-3.11.ebuild:
+  Added ~sparc keyword.
+
+*kphone-4.0.1 (12 Mar 2004)
+
+  12 Mar 2004; Michael Imhof <tantive@gentoo.org> kphone-4.0.1.ebuild:
+  Version bumped. Closes #41318, #43818.
+
+*kphone-3.14 (07 Jan 2004)
+
+  07 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> kphone-3.14.ebuild:
+  Version bump. This version runs on amd64, closing #35797.
+
+*kphone-3.11 (07 Jul 2003)
+
+  07 Jul 2003; Caleb Tennis <caleb@gentoo.org> kphone-3.11.ebuild:
+  Version bump
+
+  12 Jun 2003; <msterret@gentoo.org> kphone-1.0.2.ebuild, kphone-2.0.ebuild:
+  add Header
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*kphone-2.0 (29 Oct 2002) 
+
+  29 Oct 2003; Bart Verwilst <verwilst@gentoo.org>
+
+*kphone-1.0.2 (12 Sep 2002)
+
+  13 Sep 2002; Wout Mertens <wmertens@gentoo.org> :
+  New upstream version, made it compile against KDE 3.
 
 *kphone-0.9.6 (08 July 2002)
 
diff --git a/net-misc/kphone/Manifest b/net-misc/kphone/Manifest
index e69de29bb2d1..97ada4cdb3ba 100644
--- a/net-misc/kphone/Manifest
+++ b/net-misc/kphone/Manifest
@@ -0,0 +1,10 @@
+MD5 79a9d63d5116f9fd85489f5b0464cfdb kphone-4.1.0.ebuild 933
+MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
+MD5 a0c1f0bb71a405c0f4d58e5f97ac12eb ChangeLog 4590
+MD5 ec9bc0dda04a943050ddd61534b705ab kphone-4.2.ebuild 959
+MD5 34e862915786f759ee014aa4aab3d0b9 kphone-4.1.1.ebuild 1031
+MD5 ce59ccd7de9e3fb78d4ab5bb40b0d283 files/kphone-4.1.1-gcc34.patch 456
+MD5 c96af639b76079a8a65e634df2154fb8 files/digest-kphone-4.1.1 64
+MD5 13744936b73f480a658795a553dd7efe files/kphone-4.1.0-Makefiles.patch 461
+MD5 021fac998cd116c8390408634abaf994 files/digest-kphone-4.2 62
+MD5 2ac98b4c3bd182f4d422edead25c56d9 files/digest-kphone-4.1.0 64
diff --git a/net-misc/kphone/kphone-4.1.0.ebuild b/net-misc/kphone/kphone-4.1.0.ebuild
index efaebaf402db..4a78de5d3333 100644
--- a/net-misc/kphone/kphone-4.1.0.ebuild
+++ b/net-misc/kphone/kphone-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/net-misc/kphone/kphone-4.1.0.ebuild,v 1.1 2004/12/12 13:45:32 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/kphone-4.1.0.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
 inherit eutils kde
 
@@ -8,7 +8,7 @@ DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connec
 HOMEPAGE="http://www.wirlab.net/kphone/index.html"
 SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 ~amd64 sparc ~ppc"
 LICENSE="GPL-2"
 
 IUSE="alsa jack"
diff --git a/net-misc/kphone/kphone-4.1.1.ebuild b/net-misc/kphone/kphone-4.1.1.ebuild
index 343f3773c346..83ea521de5e2 100644
--- a/net-misc/kphone/kphone-4.1.1.ebuild
+++ b/net-misc/kphone/kphone-4.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-misc/kphone/kphone-4.1.1.ebuild,v 1.1 2005/05/27 10:27:54 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/kphone-4.1.1.ebuild,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
 
 inherit eutils kde-functions
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="alsa debug jack"
 
 S=${WORKDIR}/${PN}
diff --git a/net-misc/kphone/kphone-4.2.ebuild b/net-misc/kphone/kphone-4.2.ebuild
index 6ea010bc63d6..e28a36df5e8b 100644
--- a/net-misc/kphone/kphone-4.2.ebuild
+++ b/net-misc/kphone/kphone-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/kphone-4.2.ebuild,v 1.1 2005/07/15 08:59:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kphone/kphone-4.2.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
 inherit qt3
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="alsa debug jack"
 
 S=${WORKDIR}/${PN}
diff --git a/net-misc/kphone/metadata.xml b/net-misc/kphone/metadata.xml
index b435a8440ccd..dc439f7e84f5 100644
--- a/net-misc/kphone/metadata.xml
+++ b/net-misc/kphone/metadata.xml
@@ -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>qt</herd>
 </pkgmetadata>
diff --git a/net-misc/ksb26/ChangeLog b/net-misc/ksb26/ChangeLog
index aee20d719f8c..fbb2d0893ced 100644
--- a/net-misc/ksb26/ChangeLog
+++ b/net-misc/ksb26/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/ksb26
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ChangeLog,v 1.1 2005/07/01 06:47:29 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ChangeLog,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
+
+*ksb26-0.0.3 (06 Oct 2005)
+
+  06 Oct 2005; Michele Noberasco <s4t4n@gentoo.org> ksb26-0.0.3.ebuild:
+  Version bump.
+  ksb26-0.0.2.ebuild:
+  stable for x86.
+
+  02 Jul 2005; David Holm <dholm@gentoo.org> ksb26-0.0.2.ebuild:
+  Added to ~ppc.
 
 *ksb26-0.0.2 (01 Jul 2005)
 
diff --git a/net-misc/ksb26/Manifest b/net-misc/ksb26/Manifest
index 5908c1e0a39f..a2ac2ed6f7fe 100644
--- a/net-misc/ksb26/Manifest
+++ b/net-misc/ksb26/Manifest
@@ -1,5 +1,7 @@
-MD5 0b42a941709f7fd85c5e2cae4c086030 ksb26-0.0.2.ebuild 1413
-MD5 21ba6ff47a99fce87c3e3971158974e4 ChangeLog 234
+MD5 3a8a103d8393e7d74a3e6ce997b92f0f ksb26-0.0.2.ebuild 1511
+MD5 a06e21a688ed867a1bfd316594453753 ksb26-0.0.3.ebuild 1512
+MD5 fb617f51309ba3ed348db5125cc25aab ChangeLog 559
 MD5 afc72dba8623e8e3cf89192e2dc879d9 metadata.xml 623
 MD5 913c75809106b0a9996d8ac3e2c21f30 files/ksb26-kernel-Makefile 370
 MD5 813dab5f0615b68f4271fc783965c166 files/digest-ksb26-0.0.2 62
+MD5 a2c92c540a6869abaffac8a2583f799c files/digest-ksb26-0.0.3 62
diff --git a/net-misc/ksb26/ksb26-0.0.2.ebuild b/net-misc/ksb26/ksb26-0.0.2.ebuild
index fa35b1df8c7c..7b09d96a05d3 100644
--- a/net-misc/ksb26/ksb26-0.0.2.ebuild
+++ b/net-misc/ksb26/ksb26-0.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.2.ebuild,v 1.1 2005/07/01 06:47:29 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 inherit linux-mod
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://ksb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ksb/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 S=${WORKDIR}/${PN}
 
diff --git a/net-misc/ksb26/ksb26-0.0.3.ebuild b/net-misc/ksb26/ksb26-0.0.3.ebuild
index c378d05a1580..3af9a5a975fd 100644
--- a/net-misc/ksb26/ksb26-0.0.3.ebuild
+++ b/net-misc/ksb26/ksb26-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/net-misc/ksb26/ksb26-0.0.3.ebuild,v 1.1 2005/10/06 14:17:02 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 inherit linux-mod
 
diff --git a/net-misc/kssh/ChangeLog b/net-misc/kssh/ChangeLog
index dec261d84c91..f10c2dff7154 100644
--- a/net-misc/kssh/ChangeLog
+++ b/net-misc/kssh/ChangeLog
@@ -1,10 +1,46 @@
-# ChangeLog for net-misc/komba2
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kssh/ChangeLog,v 1.1 2002/04/15 22:37:30 verwilst Exp $
+# ChangeLog for net-misc/kssh
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kssh/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
+  23 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kssh-0.7-noarts.patch, kssh-0.7.ebuild:
+  don't check for arts
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> kssh-0.7.ebuild:
+  Stable on ppc.
+
+  02 Jul 2004; Jason Wever <weeve@gentoo.org> kssh-0.7.ebuild:
+  Stable on sparc.
+
+  28 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kssh-0.6.ebuild,
+  kssh-0.7.ebuild:
+  0.7 stable on x86, QA: need-kde, newdepend
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> kssh-0.7.ebuild:
+  added ~amd64 keyword
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> kssh-0.6.ebuild,
+  kssh-0.7.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*kssh-0.7 (25 Sep 2003)
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> kssh-0.7.ebuild:
+  Version bumped. Closes #27244.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *kssh-0.6 (15 April 2002)
 
-  15 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
-  
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> kssh-0.6.ebuild :
+  set ~ppc in keywords
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> kssh-0.6.ebuild :
+  set ~ppc in keywords
+
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> kssh-0.6.ebuild :
+  Added KEYWORDS.
+
+  15 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :  
   Initial ebuild.. kssh seems good to easily log in to several ssh 
   accounts.. Have fun!
diff --git a/net-misc/kssh/Manifest b/net-misc/kssh/Manifest
index e69de29bb2d1..f8d8be8bf350 100644
--- a/net-misc/kssh/Manifest
+++ b/net-misc/kssh/Manifest
@@ -0,0 +1,5 @@
+MD5 71f7def49cc434684e91965204ac37ff kssh-0.7.ebuild 500
+MD5 a979f89f3a7ab5bc8bb70c252a22ea9f ChangeLog 1497
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 4c3c8f2d16263edcc08db53c5e0929ea files/digest-kssh-0.7 60
+MD5 d12bc02d6e148692e651d9f82af42495 files/kssh-0.7-noarts.patch 3131
diff --git a/net-misc/kssh/kssh-0.7.ebuild b/net-misc/kssh/kssh-0.7.ebuild
index ef572fb628c0..2e35630bfd85 100644
--- a/net-misc/kssh/kssh-0.7.ebuild
+++ b/net-misc/kssh/kssh-0.7.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kssh/kssh-0.7.ebuild,v 1.1 2003/09/24 19:56:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kssh/kssh-0.7.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
-inherit kde-base
+inherit kde
 
-need-kde 3
-
-S=${WORKDIR}/${P}
-LICENSE="GPL-2"
-SRC_URI="mirror://sourceforge//kssh/${P}.tar.gz"
 HOMEPAGE="http://kssh.sourceforge.net"
-DESCRIPTION="KDE 3.x frontend for SSH"
-KEYWORDS="~x86 ~sparc ~ppc"
+SRC_URI="mirror://sourceforge/kssh/${P}.tar.gz"
+DESCRIPTION="KDE frontend for SSH"
+LICENSE="GPL-2"
 
-newdepend ">=net-misc/openssh-3.1_p1"
+SLOT="0"
+KEYWORDS="x86 sparc ppc ~amd64"
+IUSE=""
+
+DEPEND=">=net-misc/openssh-3.1_p1"
+
+need-kde 3
 
+PATCHES="${FILESDIR}/${P}-noarts.patch"
\ No newline at end of file
diff --git a/net-misc/kssh/metadata.xml b/net-misc/kssh/metadata.xml
index d8b96be3c5cd..8d1e86a9cefb 100644
--- a/net-misc/kssh/metadata.xml
+++ b/net-misc/kssh/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>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/net-misc/ktraynetworker/ChangeLog b/net-misc/ktraynetworker/ChangeLog
index 108b00f303e1..cb3e729c8380 100644
--- a/net-misc/ktraynetworker/ChangeLog
+++ b/net-misc/ktraynetworker/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/ktraynetworker
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ktraynetworker/ChangeLog,v 1.1 2004/06/23 22:35:26 centic Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ktraynetworker/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+*ktraynetworker-0.8c (26 Apr 2005)
+
+  26 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  +ktraynetworker-0.8c.ebuild:
+  version bump
+
+  24 Jun 2004; David Holm <dholm@gentoo.org> ktraynetworker-0.7.ebuild:
+  Added to ~ppc.
 
 *ktraynetworker-0.7 (24 Jun 2004)
 
diff --git a/net-misc/ktraynetworker/Manifest b/net-misc/ktraynetworker/Manifest
index 669b0df18f57..601dc46ec6b9 100644
--- a/net-misc/ktraynetworker/Manifest
+++ b/net-misc/ktraynetworker/Manifest
@@ -1,3 +1,4 @@
-MD5 fcf480e16b00d3b25e05d152eb9084a6 ktraynetworker-0.7.ebuild 628
-MD5 e18ef5eecdad6acda237acbdc7bc0461 metadata.xml 163
-MD5 dcd792e90193b4961cbdeeaf13bde03f files/digest-ktraynetworker-0.7 71
+MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157
+MD5 c3c66fa5a4d5f0de64096ef095f37f29 ktraynetworker-0.8c.ebuild 939
+MD5 e9e39687965b3e379c6423f90234add7 ChangeLog 630
+MD5 77b602d2d94875ea5de8e1b235f16ce0 files/digest-ktraynetworker-0.8c 153
diff --git a/net-misc/ktraynetworker/ktraynetworker-0.8c.ebuild b/net-misc/ktraynetworker/ktraynetworker-0.8c.ebuild
index e177759c94ef..be8e594d5ab3 100644
--- a/net-misc/ktraynetworker/ktraynetworker-0.8c.ebuild
+++ b/net-misc/ktraynetworker/ktraynetworker-0.8c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ktraynetworker/ktraynetworker-0.8c.ebuild,v 1.1 2005/04/26 16:06:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ktraynetworker/ktraynetworker-0.8c.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 inherit kde
 
diff --git a/net-misc/ktraynetworker/metadata.xml b/net-misc/ktraynetworker/metadata.xml
index 4f72595534e5..a23f444b67d6 100644
--- a/net-misc/ktraynetworker/metadata.xml
+++ b/net-misc/ktraynetworker/metadata.xml
@@ -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-misc/kvpnc/ChangeLog b/net-misc/kvpnc/ChangeLog
index 63622b53e72a..4d28bcd699a6 100644
--- a/net-misc/kvpnc/ChangeLog
+++ b/net-misc/kvpnc/ChangeLog
@@ -1,6 +1,71 @@
 # ChangeLog for net-misc/kvpnc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/ChangeLog,v 1.1 2004/08/19 13:38:14 voxus Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+  12 Nov 2005; Jason Wever <weeve@gentoo.org> kvpnc-0.8.1.ebuild:
+  Added ~sparc keyword wrt bug #112330.
+
+*kvpnc-0.8.1 (13 Nov 2005)
+
+  13 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> +kvpnc-0.8.1.ebuild:
+  Version bump, closing bug #112330. Sparc keyword dropped due to new
+  crpyto++ dependency.
+
+  30 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -kvpnc-0.7.ebuild,
+  kvpnc-0.7.2.ebuild, kvpnc-0.8.ebuild:
+  Goes stable on x86.
+
+*kvpnc-0.8 (14 Oct 2005)
+
+  14 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +kvpnc-0.8.ebuild:
+  Version bump, closing bug #108668.
+
+*kvpnc-0.7.2 (17 Jul 2005)
+
+  17 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +kvpnc-0.7.2.ebuild:
+  Version bump.
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> kvpnc-0.7.ebuild:
+  Added ~sparc keyword.
+
+  02 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> kvpnc-0.4.1.2.ebuild,
+  kvpnc-0.6.1.ebuild, kvpnc-0.7.ebuild:
+  Added ~amd64 keyword, stabilized on x86.
+
+*kvpnc-0.7 (14 Jun 2005)
+
+  14 Jun 2005; Konstantin Arkhipov <voxus@gentoo.org> +kvpnc-0.7.ebuild:
+  Version bump.
+
+*kvpnc-0.4.1.2 (06 May 2005)
+
+  06 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +kvpnc-0.4.1.2.ebuild:
+  Restored old version as requested in bug #91686.
+
+*kvpnc-0.6.1 (12 Apr 2005)
+
+  12 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -kvpnc-0.4.1.2.ebuild,
+  -kvpnc-0.6.ebuild, +kvpnc-0.6.1.ebuild:
+  Version bump, closing bug #87479.
+
+*kvpnc-0.6 (27 Feb 2005)
+
+  27 Feb 2005; Konstantin Arkhipov <voxus@gentoo.org> -kvpnc-0.4.ebuild,
+  +kvpnc-0.6.ebuild:
+  Dropped 0.4 and added 0.6 (closing bug #83478).
+
+*kvpnc-0.4.1.2 (08 Dec 2004)
+
+  08 Dec 2004; Konstantin Arkhipov <voxus@gentoo.org> kvpnc-0.4.ebuild,
+  +kvpnc-0.4.1.2.ebuild:
+  Version bump, closing bug #73686.
+  Strict dependency on vpnc-0.2 set.
+
+  02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kvpnc-0.4.ebuild:
+  QA: need-kde() after R/DEPEND - inherit kde, not kdebase
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> kvpnc-0.4.ebuild:
+  Added to ~ppc.
 
 *kvpnc-0.4 (19 Aug 2004)
 
diff --git a/net-misc/kvpnc/Manifest b/net-misc/kvpnc/Manifest
index 43427b932564..dc1c1c60f837 100644
--- a/net-misc/kvpnc/Manifest
+++ b/net-misc/kvpnc/Manifest
@@ -1,4 +1,8 @@
-MD5 9a4726db9069cd8f4efe9d0d5cc9e819 kvpnc-0.4.ebuild 372
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 65ca3207d63cdb8dd034238944805993 ChangeLog 391
-MD5 b1f84d32871d3732c74a99e77c617ee9 files/digest-kvpnc-0.4 61
+MD5 e7e1547f7ebae3f8a58ecfc14dac92ab ChangeLog 2375
+MD5 40722844f5dc313176aa3315fa27efd8 files/digest-kvpnc-0.7.2 64
+MD5 9e284c060f26eb98a6154e0c220a35d4 files/digest-kvpnc-0.8 63
+MD5 763dd8ad8fbfc74b557d811cf2ab73b5 files/digest-kvpnc-0.8.1 65
+MD5 6f956105027383346070c5be88d712b7 kvpnc-0.7.2.ebuild 482
+MD5 24c4ab7ce6e7215b5b6f1987434c35a8 kvpnc-0.8.1.ebuild 510
+MD5 df74534a2d3498d9e67d191f250cdce8 kvpnc-0.8.ebuild 480
+MD5 b045d3420e428a024e2afea15d6b57a7 metadata.xml 199
diff --git a/net-misc/kvpnc/kvpnc-0.7.2.ebuild b/net-misc/kvpnc/kvpnc-0.7.2.ebuild
index 6adf212790fb..379425b36202 100644
--- a/net-misc/kvpnc/kvpnc-0.7.2.ebuild
+++ b/net-misc/kvpnc/kvpnc-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.7.2.ebuild,v 1.1 2005/07/17 11:46:00 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit kde
 
@@ -8,7 +8,7 @@ DESCRIPTION="kvpnc - a KDE-VPN connection utility."
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://home.gna.org/${PN}/"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 SLOT="0"
 
diff --git a/net-misc/kvpnc/kvpnc-0.8.1.ebuild b/net-misc/kvpnc/kvpnc-0.8.1.ebuild
index 732dce7c07df..cc083e869257 100644
--- a/net-misc/kvpnc/kvpnc-0.8.1.ebuild
+++ b/net-misc/kvpnc/kvpnc-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/net-misc/kvpnc/kvpnc-0.8.1.ebuild,v 1.1 2005/11/12 21:18:23 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit kde
 
@@ -8,7 +8,7 @@ DESCRIPTION="kvpnc - a KDE-VPN connection utility."
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://home.gna.org/${PN}/"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 SLOT="0"
 
diff --git a/net-misc/kvpnc/kvpnc-0.8.ebuild b/net-misc/kvpnc/kvpnc-0.8.ebuild
index cc7f21f0ef06..04399d7c1607 100644
--- a/net-misc/kvpnc/kvpnc-0.8.ebuild
+++ b/net-misc/kvpnc/kvpnc-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.8.ebuild,v 1.1 2005/10/14 10:16:13 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kvpnc/kvpnc-0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit kde
 
@@ -8,7 +8,7 @@ DESCRIPTION="kvpnc - a KDE-VPN connection utility."
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://home.gna.org/${PN}/"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 SLOT="0"
 
diff --git a/net-misc/kvpnc/metadata.xml b/net-misc/kvpnc/metadata.xml
index b435a8440ccd..d31b6f7f00b6 100644
--- a/net-misc/kvpnc/metadata.xml
+++ b/net-misc/kvpnc/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-other</herd>
+<maintainer>
+	<email>voxus@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/l7-protocols/ChangeLog b/net-misc/l7-protocols/ChangeLog
index f14f82823f67..3547fff10319 100644
--- a/net-misc/l7-protocols/ChangeLog
+++ b/net-misc/l7-protocols/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for net-misc/l7-protocols
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/ChangeLog,v 1.1 2004/09/03 23:08:51 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/ChangeLog,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*l7-protocols-2005.09.12 (16 Sep 2005)
+
+  16 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-protocols-2005.08.10.ebuild, -l7-protocols-2005.08.24.ebuild,
+  l7-protocols-2005.09.05.ebuild, +l7-protocols-2005.09.12.ebuild:
+  bump as per bug #106009. thanks tomas charvat
+
+*l7-protocols-2005.09.05 (06 Sep 2005)
+
+  06 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +l7-protocols-2005.09.05.ebuild:
+  version bump
+
+*l7-protocols-2005.08.24 (28 Aug 2005)
+
+  28 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-protocols-2005.06.04.ebuild, -l7-protocols-2005.07.28.ebuild,
+  +l7-protocols-2005.08.24.ebuild:
+  version bump and old version cleanout
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  l7-protocols-2005.08.10.ebuild:
+  FreeBSD fixes: cp -a -> cp -pPR; root:root -> root:0.
+
+*l7-protocols-2005.08.10 (14 Aug 2005)
+
+  14 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  +l7-protocols-2005.08.10.ebuild:
+  version bump
+
+  30 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  l7-protocols-2005.07.17.ebuild:
+  ppc stable
+
+*l7-protocols-2005.07.28 (30 Jul 2005)
+
+  30 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-protocols-2005.02.06.ebuild, -l7-protocols-2005.06.17.ebuild,
+  l7-protocols-2005.07.17.ebuild, +l7-protocols-2005.07.28.ebuild:
+  version bump. x86 stable to l7-protocols-2005.07.17, old version cleanout
+
+*l7-protocols-2005.07.17 (28 Jul 2005)
+
+  28 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +l7-protocols-2005.07.17.ebuild:
+  version bump
+
+  11 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  l7-protocols-2005.06.17.ebuild:
+  added ~amd64 keyword
+
+*l7-protocols-2005.06.17 (25 Jun 2005)
+
+  25 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-protocols-2004.12.29.ebuild, -l7-protocols-2005.03.14.ebuild,
+  l7-protocols-2005.06.04.ebuild, +l7-protocols-2005.06.17.ebuild:
+  version bump thanks to meatoo. Old version cleanout and 2005.06.04 x86 stable
+
+  20 Jun 2005; Jason Wever <weeve@gentoo.org>
+  l7-protocols-2005.06.04.ebuild:
+  Added ~sparc keyword.
+
+*l7-protocols-2005.06.04 (08 Jun 2005)
+
+  08 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  +l7-protocols-2005.06.04.ebuild:
+  version bump
+
+*l7-protocols-2005.03.14 (23 Mar 2005)
+
+  23 Mar 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-protocols-2004.11.28.ebuild, l7-protocols-2005.02.06.ebuild,
+  +l7-protocols-2005.03.14.ebuild:
+  Version bump, stablize later versions and old version cleanout. Version bump
+  thanks to Arne Stäcker <arnestaecker@web.de> in bug #85314
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> :
+  version bump as per bug #64571. Thanks to B. Bruce <nettech-bgb@nt-nv.com>
+
+*l7-protocols-2004.12.29 (04 Jan 2005)
+
+  04 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  -l7-protocols-2004.09.13.ebuild, +l7-protocols-2004.12.29.ebuild:
+  version bump. Remove old version.
+
+*l7-protocols-2004.11.28 (02 Dec 2004)
+
+  02 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  l7-protocols-2004.09.13.ebuild, +l7-protocols-2004.11.28.ebuild:
+  QA fix and version bump as per bug #69279. ${tc-getCC} and bad nomirror fixes.
+  Thanks Spanky
+
+*l7-protocols-2004.09.13 (19 Sep 2004)
+
+  19 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +l7-protocols-2004.09.13.ebuild, -l7-protocols-20040819.ebuild:
+  version bump thanks to David Holm <dholm@gentoo.org> in bug #64571. Modified
+  version numbering to aid easy version bumps
+
+  04 Sep 2004; David Holm <dholm@gentoo.org> l7-protocols-20040819.ebuild:
+  Added to ~ppc.
 
 *l7-protocols-20040819 (04 Sep 2004)
 
diff --git a/net-misc/l7-protocols/Manifest b/net-misc/l7-protocols/Manifest
index f046a8ae4861..48edb87a73eb 100644
--- a/net-misc/l7-protocols/Manifest
+++ b/net-misc/l7-protocols/Manifest
@@ -1,3 +1,18 @@
-MD5 351cc35005f6d2c3788ad2a0d8ca4106 l7-protocols-20040819.ebuild 492
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a562404ee22ce7290fd6f7a600f44af0 l7-protocols-2005.07.17.ebuild 1503
+MD5 06f4a1da1428b37ac7629a80b44e63eb l7-protocols-2005.09.05.ebuild 1496
+MD5 d6e602e170f30478453f4d84b52b116d l7-protocols-2005.09.12.ebuild 1503
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
-MD5 8fcc2bb64c6850837d5f0f8fc4c6cd00 files/digest-l7-protocols-20040819 74
+MD5 81339e25d2811843993b2ce034153258 ChangeLog 4018
+MD5 eaa41d61e00224d03b96044e9c0037b7 files/digest-l7-protocols-2005.09.12 74
+MD5 d41f93d0fa74a54ab989fba3daf185ad files/digest-l7-protocols-2005.09.05 74
+MD5 df9a9c3778a213e81067e0c0e88ad849 files/digest-l7-protocols-2005.07.17 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1WWLLFUmVNQ7rkRAt73AJ9uP1WOroxLSbQHfJ1InOBAE/EovQCfQxlX
+I4bNFv54dt6M5CdXiu7+k8w=
+=pV48
+-----END PGP SIGNATURE-----
diff --git a/net-misc/l7-protocols/l7-protocols-2005.07.17.ebuild b/net-misc/l7-protocols/l7-protocols-2005.07.17.ebuild
index 829903f88c1b..20a7f8f0d46d 100644
--- a/net-misc/l7-protocols/l7-protocols-2005.07.17.ebuild
+++ b/net-misc/l7-protocols/l7-protocols-2005.07.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/net-misc/l7-protocols/l7-protocols-2005.07.17.ebuild,v 1.1 2005/07/28 13:33:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2005.07.17.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 S=${WORKDIR}/${MY_P}
 
 RDEPEND="net-misc/l7-filter"
diff --git a/net-misc/l7-protocols/l7-protocols-2005.09.05.ebuild b/net-misc/l7-protocols/l7-protocols-2005.09.05.ebuild
index 7d3242e2be44..8d727e576e3f 100644
--- a/net-misc/l7-protocols/l7-protocols-2005.09.05.ebuild
+++ b/net-misc/l7-protocols/l7-protocols-2005.09.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2005.09.05.ebuild,v 1.1 2005/09/06 08:25:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2005.09.05.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 S=${WORKDIR}/${MY_P}
 
 RDEPEND="net-misc/l7-filter"
diff --git a/net-misc/l7-protocols/l7-protocols-2005.09.12.ebuild b/net-misc/l7-protocols/l7-protocols-2005.09.12.ebuild
index 1bcc6e064d4d..1682f6f4f642 100644
--- a/net-misc/l7-protocols/l7-protocols-2005.09.12.ebuild
+++ b/net-misc/l7-protocols/l7-protocols-2005.09.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2005.09.12.ebuild,v 1.1 2005/09/16 22:51:08 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-protocols/l7-protocols-2005.09.12.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-misc/lambdamoo/ChangeLog b/net-misc/lambdamoo/ChangeLog
index 09860d69244e..9d2efa0cb3ef 100644
--- a/net-misc/lambdamoo/ChangeLog
+++ b/net-misc/lambdamoo/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/lambdamoo
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lambdamoo/ChangeLog,v 1.1 2003/07/11 15:08:35 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lambdamoo/ChangeLog,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> lambdamoo-1.8.1-r1.ebuild:
+  Added ~sparc keyword.
+
+  10 Aug 2003; Luke-Jr <luke-jr@gentoo.org> lambdamoo-1.8.1-r1.ebuild:
+  mirror://sourceforge.net is invalid... removed the .net
+
+*lambdamoo-1.8.1-r1 (12 Jul 2003)
+
+  12 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Fix lack of encryption and add support for outbound connections #24327.
 
 *lambdamoo-1.8.1 (11 Jul 2003)
 
diff --git a/net-misc/lambdamoo/Manifest b/net-misc/lambdamoo/Manifest
index 5af21a868893..80c9ce4fb846 100644
--- a/net-misc/lambdamoo/Manifest
+++ b/net-misc/lambdamoo/Manifest
@@ -1,5 +1,6 @@
-MD5 44bbcf9ec8079594626a030ae34d6eb7 lambdamoo-1.8.1.ebuild 901
-MD5 e9acb6098550165a36259f6a07a861dc ChangeLog 391
+MD5 904a90ea04831721ae6fd47b8e976640 lambdamoo-1.8.1-r1.ebuild 951
+MD5 d3b890e71018c80957cb44c4bf7fcb13 ChangeLog 774
+MD5 53d94549a025c89635911877d75068ba files/digest-lambdamoo-1.8.1-r1 67
 MD5 4b918fff63c103c64a5862f561bc3b58 files/lambdamoo.conf 185
-MD5 53d94549a025c89635911877d75068ba files/digest-lambdamoo-1.8.1 67
-MD5 fc4b10da13ac2b1667f12da98bfbfe27 files/lambdamoo.rc 1265
+MD5 3b9fdebdc6426dbceac6f711795d3183 files/1.8.1-enable-outbound.patch 451
+MD5 7ae27b0fa0941310223cd19453664b5c files/lambdamoo.rc 1258
diff --git a/net-misc/lambdamoo/files/lambdamoo.rc b/net-misc/lambdamoo/files/lambdamoo.rc
index 3b0009841895..f614b4427e7f 100644
--- a/net-misc/lambdamoo/files/lambdamoo.rc
+++ b/net-misc/lambdamoo/files/lambdamoo.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lambdamoo/files/lambdamoo.rc,v 1.1 2003/07/11 15:08:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lambdamoo/files/lambdamoo.rc,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
 
 # adapted from Pavel Curtis' restart.sh
 
diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r1.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r1.ebuild
index ae6c5ccc671e..bcda26985140 100644
--- a/net-misc/lambdamoo/lambdamoo-1.8.1-r1.ebuild
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r1.ebuild
@@ -1,16 +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/net-misc/lambdamoo/lambdamoo-1.8.1-r1.ebuild,v 1.1 2003/07/12 07:29:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lambdamoo/lambdamoo-1.8.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="networked mud that can be used for different types of collaborative software"
 HOMEPAGE="http://sourceforge.net/projects/lambdamoo/"
-SRC_URI="mirror://sourceforge.net/lambdamoo/LambdaMOO-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/lambdamoo/LambdaMOO-${PV}.tar.gz"
 
-LICENSE=""
+LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
 
 DEPEND="sys-devel/bison"
 
@@ -33,5 +34,5 @@ src_install() {
 	dodoc *.txt README*
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/lambdamoo.rc lambdamoo
-        insinto /etc/conf.d ; newins ${FILESDIR}/lambdamoo.conf lambdamoo
+	insinto /etc/conf.d ; newins ${FILESDIR}/lambdamoo.conf lambdamoo
 }
diff --git a/net-misc/libmikey/ChangeLog b/net-misc/libmikey/ChangeLog
index 51cbdbb1fc88..37df5f1e0f61 100644
--- a/net-misc/libmikey/ChangeLog
+++ b/net-misc/libmikey/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/libmikey
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libmikey/ChangeLog,v 1.1 2005/06/02 01:18:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libmikey/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 *libmikey-0.4.0 (02 Jun 2005)
 
diff --git a/net-misc/libmikey/Manifest b/net-misc/libmikey/Manifest
index dc2a2f0d1f63..aff4855d3322 100644
--- a/net-misc/libmikey/Manifest
+++ b/net-misc/libmikey/Manifest
@@ -1,4 +1,14 @@
-MD5 703f32787efd7d23438a748235a04d1d ChangeLog 284
-MD5 ef87fce0599f5cc606fadbdf1d98b53f libmikey-0.4.0.ebuild 511
-MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e298c0971d3b4dea467139e5122f1b96 ChangeLog 375
 MD5 09b5da0ff7e7ed894526f9a3dac391c4 files/digest-libmikey-0.4.0 66
+MD5 7cc9bb94e704c016f3c1b857054ea7dc libmikey-0.4.0.ebuild 523
+MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68JyI1lqEGTUzyQRAuMvAKDA5E0Wd+P2Os6uZWIbbKIgF6lecACeIy3C
+0StHIJgGanUn3eWSDlFZ6I0=
+=sGPS
+-----END PGP SIGNATURE-----
diff --git a/net-misc/libmikey/libmikey-0.4.0.ebuild b/net-misc/libmikey/libmikey-0.4.0.ebuild
index 6b3c6c446ca5..a26eb4786316 100644
--- a/net-misc/libmikey/libmikey-0.4.0.ebuild
+++ b/net-misc/libmikey/libmikey-0.4.0.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/net-misc/libmikey/libmikey-0.4.0.ebuild,v 1.1 2005/06/02 01:18:31 gustavoz Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libmikey/libmikey-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Minisip keying support library"
@@ -15,11 +13,6 @@ KEYWORDS="~x86"
 DEPEND=">=dev-libs/openssl-0.9.6d
 		~net-misc/libmutil-0.3.0"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/net-misc/libmnetutil/ChangeLog b/net-misc/libmnetutil/ChangeLog
index 0313cdf335bd..b757f10a0dde 100644
--- a/net-misc/libmnetutil/ChangeLog
+++ b/net-misc/libmnetutil/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/libmnetutil
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libmnetutil/ChangeLog,v 1.1 2005/06/02 01:15:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libmnetutil/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 *libmnetutil-0.3.0 (02 Jun 2005)
 
diff --git a/net-misc/libmnetutil/Manifest b/net-misc/libmnetutil/Manifest
index 5f04fb5c5b4a..77ce47d73a01 100644
--- a/net-misc/libmnetutil/Manifest
+++ b/net-misc/libmnetutil/Manifest
@@ -1,4 +1,14 @@
-MD5 c03c1d5dab40eb5a6b3224e1d67bb1b6 ChangeLog 293
-MD5 5c88787e377178837bb92ea14b62ae25 libmnetutil-0.3.0.ebuild 486
-MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76145da1397e5de907493e0ec521aa07 ChangeLog 387
 MD5 2c9a316a817d2772892b5f76ddca13e6 files/digest-libmnetutil-0.3.0 69
+MD5 913a8945efbe1d307e02334fa9c3e2e3 libmnetutil-0.3.0.ebuild 503
+MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68KsI1lqEGTUzyQRAl4qAJ9RH2OggOZuKar2um04GQpGyUGsvQCgsuFW
+z+TdVCCyu7KfefE1BYGSryA=
+=T8Hv
+-----END PGP SIGNATURE-----
diff --git a/net-misc/libmnetutil/libmnetutil-0.3.0.ebuild b/net-misc/libmnetutil/libmnetutil-0.3.0.ebuild
index c5319023df98..331d050743f3 100644
--- a/net-misc/libmnetutil/libmnetutil-0.3.0.ebuild
+++ b/net-misc/libmnetutil/libmnetutil-0.3.0.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/net-misc/libmnetutil/libmnetutil-0.3.0.ebuild,v 1.1 2005/06/02 01:15:57 gustavoz Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libmnetutil/libmnetutil-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Minisip basic networking library"
@@ -14,12 +12,6 @@ KEYWORDS="~x86"
 
 DEPEND="~net-misc/libmutil-0.3.0"
 
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/net-misc/libmsip/ChangeLog b/net-misc/libmsip/ChangeLog
index e35735e03948..1afa5ebbd761 100644
--- a/net-misc/libmsip/ChangeLog
+++ b/net-misc/libmsip/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/libmsip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libmsip/ChangeLog,v 1.1 2005/06/02 01:21:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libmsip/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 *libmsip-0.3.0 (02 Jun 2005)
 
diff --git a/net-misc/libmsip/Manifest b/net-misc/libmsip/Manifest
index 338274be2390..ed96d1781001 100644
--- a/net-misc/libmsip/Manifest
+++ b/net-misc/libmsip/Manifest
@@ -1,4 +1,14 @@
-MD5 4dc57268758c9c0b2afce39caf92d968 libmsip-0.3.0.ebuild 547
-MD5 e618c351b21687278d951244f6c77aa7 ChangeLog 281
-MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9f87128ef842bf45559e9861088440e8 ChangeLog 371
 MD5 4654f9ade28e619565c6677e77d6b493 files/digest-libmsip-0.3.0 65
+MD5 6ab404afeb8efdf77e59f8a08b9f37db libmsip-0.3.0.ebuild 557
+MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68LoI1lqEGTUzyQRAhYGAKDVyU2o7zmX5Dkk5DT7o5v+NOafCwCgik5t
+jsSuEanYdMypIhNVa4KV+QM=
+=kA0E
+-----END PGP SIGNATURE-----
diff --git a/net-misc/libmsip/libmsip-0.3.0.ebuild b/net-misc/libmsip/libmsip-0.3.0.ebuild
index 4816c27f9b38..8b825a0270b0 100644
--- a/net-misc/libmsip/libmsip-0.3.0.ebuild
+++ b/net-misc/libmsip/libmsip-0.3.0.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/net-misc/libmsip/libmsip-0.3.0.ebuild,v 1.1 2005/06/02 01:21:21 gustavoz Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libmsip/libmsip-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Minisip SIP protocol support library"
@@ -16,11 +14,6 @@ DEPEND=">=dev-libs/openssl-0.9.6d
 		~net-misc/libmutil-0.3.0
 		~net-misc/libmnetutil-0.3.0"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/net-misc/linphone/ChangeLog b/net-misc/linphone/ChangeLog
index 79d8a1b634a9..d6c259b9b74b 100644
--- a/net-misc/linphone/ChangeLog
+++ b/net-misc/linphone/ChangeLog
@@ -1,6 +1,37 @@
-# ChangeLog for net-im/linphone
+# ChangeLog for net-misc/linphone
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.1 2005/07/14 19:01:14 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.1.0.ebuild:
+  Dropping unnecessary gnome-panel dependency, thanks to
+  Thomas Fischer <fischer@unix-ag.uni-kl.de> in bug #107704.
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org> -linphone-0.10.2.ebuild,
+  -linphone-1.0.1.ebuild:
+  Removed old ebuilds.
+
+  30 Sep 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.1.0.ebuild:
+  Stable on x86.
+
+  02 Sep 2005; <dang@gentoo.org> linphone-1.1.0.ebuild:
+  Marked ~amd64
+
+*linphone-1.1.0 (29 Aug 2005)
+
+  29 Aug 2005; Stefan Knoblich <stkn@gentoo.org> +linphone-1.1.0.ebuild:
+  Version bump, linphone libs are now put into /usr/lib/linphone and ortp
+  headers are removed to avoid conflicts with net-libs/ortp.
+
+  15 Jul 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.0.1.ebuild,
+  +linphone-1.0.1-ipv6-include.diff:
+  Always include <netdb.h> in coreapi/linphonecore.c even if USE flag is set
+  -ipv6, fixes #99083. Thanks to Anders Hellgen pointing out that patch from
+  0.12.x is still needed.
+
+  14 Jul 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.0.1.ebuild:
+  Indentation fixes, added missing dodoc, replaced einstall with make
+  (einstall completely broke file locations), added missing
+  dev-perl/XML-Parser and speex dependencies.
 
 *linphone-1.0.1 (14 Jul 2005)
 
diff --git a/net-misc/linphone/Manifest b/net-misc/linphone/Manifest
index e69de29bb2d1..c7da31e36a2f 100644
--- a/net-misc/linphone/Manifest
+++ b/net-misc/linphone/Manifest
@@ -0,0 +1,5 @@
+MD5 810e47a5b7316d318b884037eb874345 linphone-1.1.0.ebuild 1667
+MD5 bf329e2b298c08082a3ff4dfe6c236b3 metadata.xml 315
+MD5 61c613902c913c0c7410adc925ffde88 ChangeLog 4316
+MD5 09a1ce01898450b93c37d1021c5b4c7e files/linphone-1.0.1-ipv6-include.diff 340
+MD5 43613eb580df59c222f3572287b2adf2 files/digest-linphone-1.1.0 67
diff --git a/net-misc/linphone/linphone-1.1.0.ebuild b/net-misc/linphone/linphone-1.1.0.ebuild
index 9de72d5646eb..3ba6eab657cf 100644
--- a/net-misc/linphone/linphone-1.1.0.ebuild
+++ b/net-misc/linphone/linphone-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/net-misc/linphone/linphone-1.1.0.ebuild,v 1.1 2005/08/29 02:46:33 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
 
 inherit eutils
 
@@ -11,9 +11,9 @@ HOMEPAGE="http://www.linphone.org/?lang=us"
 SRC_URI="http://simon.morlat.free.fr/download/${MY_DPV}/source/${P}.tar.gz"
 SLOT=1
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 
-IUSE="xv ipv6 gnome alsa"
+IUSE="alsa gnome ipv6 xv"
 
 DEPEND="dev-libs/glib
 	dev-perl/XML-Parser
@@ -21,8 +21,7 @@ DEPEND="dev-libs/glib
 	|| ( >=media-libs/speex-1.1.6
 	     <media-libs/speex-1.1.0 )
 	x86? 	( xv? ( dev-lang/nasm ) )
-	gnome? 	( >=gnome-base/gnome-panel-2
-		  >=gnome-base/libgnome-2
+	gnome? 	( >=gnome-base/libgnome-2
 		  >=gnome-base/libgnomeui-2
 		  >=x11-libs/gtk+-2 )
 	alsa? 	( media-libs/alsa-lib )"
diff --git a/net-misc/linux-identd/ChangeLog b/net-misc/linux-identd/ChangeLog
index 642acb4879a8..7da4cabf9f1d 100644
--- a/net-misc/linux-identd/ChangeLog
+++ b/net-misc/linux-identd/ChangeLog
@@ -1,9 +1,56 @@
-# ChangeLog for media-gfx/scrot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-identd/ChangeLog,v 1.1 2002/04/26 18:22:56 prez Exp $
+# ChangeLog for net-misc/linux-identd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-identd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
-*linux-identd-1.1 (26 April 2002)
+*linux-identd-1.3-r1 (06 Apr 2005)
 
-  26 April 2002; Preston A. Elder <prez@gentoo.org> ChangeLog :
-  
+  06 Apr 2005; Seemant Kulleen <seemant@gentoo.org> -files/identd,
+  +files/identd.init, +files/identd.xinetd, +metadata.xml,
+  -linux-identd-1.2.ebuild, +linux-identd-1.3-r1.ebuild:
+  revision bump which now installs an optional xinetd file instead of the
+  initscript. Thanks to: Toralf Forster <toralf.foerster@gmx.de> in bug #80204
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> linux-identd-1.3.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> linux-identd-1.2.ebuild,
+  linux-identd-1.3.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> linux-identd-1.3.ebuild:
+  Stable on alpha.
+
+  13 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> linux-identd-1.3.ebuild:
+  Compile with users CFLAGS.
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org> linux-identd-1.3.ebuild:
+  Stable stable stable, I sparc'd it out of clay.
+
+  26 Jan 2004; Martin Holzer <mholzer@gentoo.org> linux-identd-1.3.ebuild:
+  x86 stable
+
+*linux-identd-1.3 (28 Oct 2003)
+
+  28 Oct 2003; Seemant Kulleen <seemant@gentoo.org> linux-identd-1.1.ebuild,
+  linux-identd-1.3.ebuild:
+  version bump, thanks to: Matthew <Techie2000@toolfox.com> in bug #32228
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*linux-identd-1.2 (12 Oct 2002)
+
+  12 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : new version
+
+  12 Oct 2002; Maik Schreiber <blizzy@gentoo.org> linux-identd-1.1.ebuild:
+  Added IUSE.
+
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> linux-identd-1.1.ebuild:
+  Added KEYWORDS, LICENSE, SLOT.
+
+*linux-identd-1.1 (26 Apr 2002)
+
+  26 Apr 2002; Preston A. Elder <prez@gentoo.org> ChangeLog:
   Initial ebuild... Enjoy..
diff --git a/net-misc/linux-identd/Manifest b/net-misc/linux-identd/Manifest
index e69de29bb2d1..aa6ddaef8bea 100644
--- a/net-misc/linux-identd/Manifest
+++ b/net-misc/linux-identd/Manifest
@@ -0,0 +1,8 @@
+MD5 12271f9b0edf498b812695ddf833cec6 ChangeLog 2056
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 f19c4ff80b56364fd6846f67c162e01b linux-identd-1.3.ebuild 739
+MD5 ae6290ade5fc64cbf0c7afad0bdfbe12 linux-identd-1.3-r1.ebuild 852
+MD5 b1ad99b417baabc108181b1ad22000ae files/digest-linux-identd-1.3 67
+MD5 5e0054f1528aa586b326acd9c0d736ce files/identd.init 493
+MD5 db2f13620029115313734b7bdab6aa9b files/identd.xinetd 130
+MD5 b1ad99b417baabc108181b1ad22000ae files/digest-linux-identd-1.3-r1 67
diff --git a/net-misc/linux-identd/files/identd.init b/net-misc/linux-identd/files/identd.init
index ae7c1f9ae3fd..afc6a3925355 100644
--- a/net-misc/linux-identd/files/identd.init
+++ b/net-misc/linux-identd/files/identd.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/net-misc/linux-identd/files/identd.init,v 1.1 2005/04/06 19:55:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-identd/files/identd.init,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/linux-identd/linux-identd-1.3-r1.ebuild b/net-misc/linux-identd/linux-identd-1.3-r1.ebuild
index dbc160cf81f3..79ce8c658786 100644
--- a/net-misc/linux-identd/linux-identd-1.3-r1.ebuild
+++ b/net-misc/linux-identd/linux-identd-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/net-misc/linux-identd/linux-identd-1.3-r1.ebuild,v 1.1 2005/04/06 19:55:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-identd/linux-identd-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 IUSE="xinetd"
 DESCRIPTION="A real IDENT daemon for linux."
diff --git a/net-misc/linux-identd/linux-identd-1.3.ebuild b/net-misc/linux-identd/linux-identd-1.3.ebuild
index c58f9a19b4b8..6401792de8d2 100644
--- a/net-misc/linux-identd/linux-identd-1.3.ebuild
+++ b/net-misc/linux-identd/linux-identd-1.3.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-identd/linux-identd-1.3.ebuild,v 1.1 2003/10/29 01:28:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-identd/linux-identd-1.3.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="A real IDENT daemon for linux."
 HOMEPAGE="http://www.fukt.bth.se/~per/identd"
 SRC_URI="http://www.fukt.bth.se/~per/identd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+KEYWORDS="x86 ppc sparc alpha ~hppa ~mips ia64 ~amd64"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-	emake || die
+	emake CEXTRAS="${CFLAGS}" || die
 }
 
 src_install() {
diff --git a/net-misc/linux-igd/ChangeLog b/net-misc/linux-igd/ChangeLog
index aea21c4626c1..f2e137be01cb 100644
--- a/net-misc/linux-igd/ChangeLog
+++ b/net-misc/linux-igd/ChangeLog
@@ -1,9 +1,26 @@
 # ChangeLog for net-misc/linux-igd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/ChangeLog,v 1.1 2002/07/20 19:36:01 blizzy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> linux-igd-0.75.ebuild:
+  Stable on ppc.
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> linux-igd-0.75.ebuild,
+  linux-igd-0.92.ebuild:
+  fixing depend qa issue. see 45343.
+
+*linux-igd-0.92 (17 Jun 2003)
+
+  17 Jun 2003; John Mylchreest <johnm@gentoo.org>; linux-igd-0.92.ebuild:
+  Bumping to latest version. fixes #22934?
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *linux-igd-0.75 (20 Jul 2002)
 
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> linux-igd-0.75.ebuild:
+  changed sys-apps/iptables to net-firewall/iptables
+
   20 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
 
   Initial import.
diff --git a/net-misc/linux-igd/Manifest b/net-misc/linux-igd/Manifest
index e69de29bb2d1..94ce266d00ee 100644
--- a/net-misc/linux-igd/Manifest
+++ b/net-misc/linux-igd/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 38a450bdcdfad817facbf8145cd5174c ChangeLog 957
+MD5 d558a748e7a1149c2afdf329e5c24a73 files/digest-linux-igd-0.75 60
+MD5 7801e26a39bae60e7cfbfe5277a9a7c8 files/digest-linux-igd-0.92 61
+MD5 3e13c42283a75a030090b2c87ff2fe65 files/rc_upnpd 601
+MD5 09036e3385f54dd26f318a44cf5b3d27 files/upnpd.conf 68
+MD5 7b0e3a4957196c1a35980212b26930d0 linux-igd-0.75.ebuild 1264
+MD5 f0ebbb2d3fdf608a763a95b6331a085a linux-igd-0.92.ebuild 1260
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68OwI1lqEGTUzyQRAk5pAKDC7cIIHAvtMcdIPJrLaa05FQ47xgCfdp/b
+lOi+BRsqWWuqUDiuT5SERiI=
+=/Cwr
+-----END PGP SIGNATURE-----
diff --git a/net-misc/linux-igd/linux-igd-0.75.ebuild b/net-misc/linux-igd/linux-igd-0.75.ebuild
index b09ab676d9cd..3e5258247027 100644
--- a/net-misc/linux-igd/linux-igd-0.75.ebuild
+++ b/net-misc/linux-igd/linux-igd-0.75.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/linux-igd-0.75.ebuild,v 1.1 2002/07/20 19:36:01 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/linux-igd-0.75.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 MY_PN="gateway"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -8,14 +8,14 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Daemon that emulates Microsoft's Internet Connection Service (ICS)
 	for UPnP-aware clients"
 HOMEPAGE="http://linux-igd.sourceforge.net"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/linux-igd/${MY_PN}-${PV}.tgz"
+SRC_URI="mirror://sourceforge/linux-igd/${MY_PN}-${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ppc"
+IUSE=""
 
-RDEPEND="net-misc/upnp
-	sys-apps/iptables"
-DEPEND="${RDEPEND}"
+DEPEND="net-misc/upnp
+	net-firewall/iptables"
 
 src_compile() {
 	mv Makefile Makefile.orig
@@ -29,13 +29,11 @@ src_compile() {
 }
 
 src_install () {
-	exeinto /usr/bin
-	doexe upnpd
+	dobin upnpd
 	insinto /etc/linuxigd
 	doins etc/*
 	doins ${FILESDIR}/upnpd.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc_upnpd upnpd
+	newinitd ${FILESDIR}/rc_upnpd upnpd
 	dodoc CHANGELOG LICENSE README SECURITY TODO
 }
 
diff --git a/net-misc/linux-igd/linux-igd-0.92.ebuild b/net-misc/linux-igd/linux-igd-0.92.ebuild
index 6aa4a2df1a7f..b34a19223f2d 100644
--- a/net-misc/linux-igd/linux-igd-0.92.ebuild
+++ b/net-misc/linux-igd/linux-igd-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/net-misc/linux-igd/linux-igd-0.92.ebuild,v 1.1 2003/06/17 12:32:41 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linux-igd/linux-igd-0.92.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 MY_PN="linuxigd"
 S="${WORKDIR}/${PN}"
@@ -8,18 +8,16 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="Daemon that emulates Microsoft's Internet Connection Service (ICS)
 	for UPnP-aware clients"
 HOMEPAGE="http://linux-igd.sourceforge.net"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/linux-igd/${MY_PN}-${PV}.tgz"
+SRC_URI="mirror://sourceforge/linux-igd/${MY_PN}-${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
 
-RDEPEND="net-misc/upnp
+DEPEND="net-misc/upnp
 	net-firewall/iptables"
-DEPEND="${RDEPEND}"
 
 src_compile() {
-	cd ${S}
-	
 	mv Makefile Makefile.orig
 	sed <Makefile.orig >Makefile \
 		-e "s|/etc/linuxigd|${D}/etc/linuxigd|" \
@@ -33,13 +31,11 @@ src_compile() {
 }
 
 src_install () {
-	exeinto /usr/bin
-	doexe upnpd
+	dobin upnpd
 	insinto /etc/linuxigd
 	doins etc/*
 	doins ${FILESDIR}/upnpd.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/rc_upnpd upnpd
+	newinitd ${FILESDIR}/rc_upnpd upnpd
 	dodoc CHANGELOG LICENSE README SECURITY TODO
 }
 
diff --git a/net-misc/liveice/ChangeLog b/net-misc/liveice/ChangeLog
index 328eae75d30c..851f4dad7f77 100644
--- a/net-misc/liveice/ChangeLog
+++ b/net-misc/liveice/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for net-misc/liveice
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/liveice/ChangeLog,v 1.1 2002/10/30 13:27:19 aliz Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/liveice/ChangeLog,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
-*liveice-20000530 (30 Oct 2002)
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> liveice-2000530.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  23 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  liveice-2000530.ebuild:
+  Updated mpg123 to virtual/mpg123
+
+*liveice-2000530 (30 Oct 2002)
 
   30 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild submitted by Hannes Mehnert <hannes@gentoo.org> 
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index e69de29bb2d1..33f8483dd1d9 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1255f15464dc033d7a5a4dcc6b646270 ChangeLog 616
+MD5 84709dba94d906e2f14e8f73dbe9dd21 files/digest-liveice-2000530 58
+MD5 58e14b5e9a009c0510856c5b70c46405 liveice-2000530.ebuild 689
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68PsI1lqEGTUzyQRAuU4AJ42B8Bai1dreKcKhmnqxY9/7ZOGVACfSoZR
+bktiFRXL1+18C2ucAuzmVmQ=
+=XWNi
+-----END PGP SIGNATURE-----
diff --git a/net-misc/liveice/liveice-2000530.ebuild b/net-misc/liveice/liveice-2000530.ebuild
index e96a2a376be6..d7ce0b6b275c 100644
--- a/net-misc/liveice/liveice-2000530.ebuild
+++ b/net-misc/liveice/liveice-2000530.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/net-misc/liveice/liveice-2000530.ebuild,v 1.1 2002/10/30 13:27:19 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/liveice/liveice-2000530.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
+IUSE=""
 DESCRIPTION="Live Source Client For IceCast"
 HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
 SRC_URI="http://star.arm.ac.uk/~spm/software/liveice.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="as-is"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="media-sound/lame
-	media-sound/mpg123"
+	virtual/mpg123"
 
 src_compile() {
 	./configure
@@ -22,7 +23,5 @@ src_compile() {
 
 src_install() {
 	dobin liveice
-	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt 
+	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt
 }
-
-
diff --git a/net-misc/lksctp-tools/ChangeLog b/net-misc/lksctp-tools/ChangeLog
index af1c3c47df87..09e670840ade 100644
--- a/net-misc/lksctp-tools/ChangeLog
+++ b/net-misc/lksctp-tools/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-misc/lksctp-tools
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lksctp-tools/ChangeLog,v 1.1 2004/11/24 01:35:05 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lksctp-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:55:01 chriswhite Exp $
+
+  25 Jun 2005; Sven Wegener <swegener@gentoo.org> lksctp-tools-1.0.1.ebuild,
+  lksctp-tools-1.0.2.ebuild:
+  Removed useless || dependency.
+
+*lksctp-tools-1.0.2 (01 May 2005)
+
+  01 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +lksctp-tools-1.0.2.ebuild:
+  Version bump.
+
+  01 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  lksctp-tools-1.0.1.ebuild:
+  Fix DESC bug #91051, move to stable x86.
+
+  11 Jan 2005; John Mylchreest <johnm@gentoo.org> lksctp-tools-1.0.1.ebuild:
+  fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?
 
 *lksctp-tools-1.0.1 (23 Nov 2004)
 
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index b9accf4d776d..8df9d4b5428d 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,2 +1,16 @@
-MD5 e599f105e744f681efdb9e574a65fd61 lksctp-tools-1.0.1.ebuild 736
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 05f3d80963afe322f0373ebcc4c7a88e ChangeLog 970
 MD5 bfc154edf9f162d5dbb3bfff4034c354 files/digest-lksctp-tools-1.0.1 70
+MD5 038fd0a35e5638ef6683dbfb6c94da8b files/digest-lksctp-tools-1.0.2 70
+MD5 ef3d3560e790034a0a22e645bfa77528 lksctp-tools-1.0.1.ebuild 768
+MD5 228e2d8e7b4f65145fce40b9f3f24605 lksctp-tools-1.0.2.ebuild 769
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCvWmwI1lqEGTUzyQRAhlLAJ9ut4SvKtb++M6ljm+wLMsoSflOVACglryH
+ynHpcehCdu9p2djlMmoEwu8=
+=Ssqu
+-----END PGP SIGNATURE-----
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.1.ebuild
index f9f1ebe36072..913ef1d9803b 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.1.ebuild
@@ -1,28 +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/net-misc/lksctp-tools/lksctp-tools-1.0.1.ebuild,v 1.1 2004/11/24 01:35:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lksctp-tools/lksctp-tools-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:01 chriswhite Exp $
 
 inherit eutils
-DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port."
+
+DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
 HOMEPAGE="http://lksctp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 # I don't known if *BSD has the support needed at all
 # hence the lockdown to glibc and linux26-headers
 DEPEND="sys-libs/glibc
-		sys-kernel/linux26-headers"
+		>=sys-kernel/linux-headers-2.6"
 #RDEPEND=""
 
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README ROADMAP doc/*txt
 }
-
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.2.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.2.ebuild
index 17085ddf617f..c28a399861a3 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.2.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lksctp-tools/lksctp-tools-1.0.2.ebuild,v 1.1 2005/05/02 03:43:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lksctp-tools/lksctp-tools-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:01 chriswhite Exp $
 
 inherit eutils
+
 DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
 HOMEPAGE="http://lksctp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
@@ -13,16 +14,10 @@ IUSE=""
 # I don't known if *BSD has the support needed at all
 # hence the lockdown to glibc and linux26-headers
 DEPEND="sys-libs/glibc
-		|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )"
+		>=sys-kernel/linux-headers-2.6"
 #RDEPEND=""
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README ROADMAP doc/*txt
 }
-
diff --git a/net-misc/logjam/ChangeLog b/net-misc/logjam/ChangeLog
index c3f8efbf18c5..5d68ec3ad228 100644
--- a/net-misc/logjam/ChangeLog
+++ b/net-misc/logjam/ChangeLog
@@ -1,7 +1,119 @@
 # ChangeLog for net-misc/logjam
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/ChangeLog,v 1.1 2002/05/31 04:53:11 edolnx Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+  28 Aug 2005; Simon Stelling <blubb@gentoo.org> logjam-4.4.1.ebuild:
+  stable on amd64
+
+*logjam-4.5.1 (25 Aug 2005)
+
+  25 Aug 2005; Joe McCann <joem@gentoo.org> -logjam-4.5.0.ebuild,
+  +logjam-4.5.1.ebuild:
+  quick bugfix release
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> logjam-4.4.1.ebuild:
+  Stable on sparc
+
+*logjam-4.5.0 (24 Aug 2005)
+
+  24 Aug 2005; Joe McCann <joem@gentoo.org> logjam-4.4.1.ebuild,
+  +logjam-4.5.0.ebuild:
+  New version with tag and sqlite support. Mark previous version x86 stable
+
+  30 Apr 2005; John N. Laliberte <allanonjl@gentoo.org> logjam-4.3.2.ebuild:
+  sed to fix gnome menu icon. Fixes bug #68092.
+
+*logjam-4.4.1 (05 Jan 2005)
+
+  05 Jan 2005; Joe McCann <joem@gentoo.org> +logjam-4.4.1.ebuild:
+  New version released, reported in bug 76696. Ebuild now offers more use
+  switches including a text only mode.
+
+  21 Dec 2004; Joe McCann <joem@gentoo.org> logjam-4.2.2.ebuild,
+  logjam-4.3.2.ebuild, logjam-4.4.0-r1.ebuild, logjam-4.4.0.ebuild:
+  Needs hard dep on libgtkhtml-3.0.10* now that a newer slot is available
+
+*logjam-4.4.0-r1 (21 Dec 2004)
+
+  21 Dec 2004; Joe McCann <joem@gentoo.org>
+  +files/logjam-4.4.0-offline-sync.patch, +logjam-4.4.0-r1.ebuild:
+  Adding patch to fix offline synchronization, closes bug 71252
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> logjam-4.4.0.ebuild:
+  Added to stable amd64
+
+  18 Jun 2004; Brad Laue <brad@gentoo.org> logjam-4.4.0.ebuild:
+  Fix GNOME menu icon.
+
+  12 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/logjam-4.4.0-gcc3.4.patch:
+  Added gcc 3.4 patch to fix bug #52481.  Added ~amd64.
+
+  27 May 2004; Jason Wever <weeve@gentoo.org> logjam-4.3.2.ebuild:
+  Stable on sparc.
+
+*logjam-4.4.0 (19 Apr 2004)
+
+  19 Apr 2004; <khai@gentoo.org> logjam-4.3.2.ebuild:
+  Version bump, closes #48344.  Marked logjam-4.3.2 stable on x86.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> logjam-4.2.2.ebuild,
+  logjam-4.3.2.ebuild:
+  Marked 4.2.2 stable and added ~sparc keyword to 4.3.2
+
+  12 Mar 2004; Jason Wever <weeve@gentoo.org> logjam-4.2.2.ebuild:
+  Added ~sparc keyword.
+
+*logjam-4.3.2 (06 Mar 2004)
+
+  06 Mar 2004; Alastair Tse <liquidx@gentoo.org> logjam-4.3.2.ebuild:
+  version bump
+
+*logjam-4.2.4 (28 Sep 2003)
+
+  28 Sep 2003; Mike Gardiner <obz@gentoo.org> logjam-4.2.2.ebuild,
+  logjam-4.2.4.ebuild:
+  New version, and marked 4.2.2 stable on x86. Sparc/ppc keywords need to be
+  updated
+
+*logjam-4.2.2 (21 Jul 2003)
+
+  21 Jul 2003; Alastair Tse <liquidx@gentoo.org> logjam-4.2.2.ebuild:
+  version bump
+
+*logjam-4.1.2-r1 (19 Jun 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  19 Jun 2003; Alastair Tse <liquidx@gentoo.org> logjam-4.1.2.ebuild:
+  bumping 4.1.2 to stable x86. introduce ebuild with gtkhtml editing option
+
+*logjam-4.1.2 (10 May 2003)
+
+  10 May 2003; Alastair Tse <liquidx@gentoo.org> logjam-4.1.2.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*logjam-4.0.0 (29 Nov 2002)
+  
+  29 Nov 2002; Jon Nall <nall@gentoo.org> logjam-4.0.0.ebuild,
+  files/digest-logjam-4.0.0 :
+
+  update to newest version
+
+*logjam-3.0.4-r2 (01 Oct 2002)
+
+  01 Oct 2002; Seemant Kulleen <seemant@gentoo.org> logjam-3.0.4-r2 :
+
+  Moved the app-office/logjam ebuild here instead.  The app-office one was
+  much cleaner and installs heftier documentation.  Thanks to: rigo@home.nl
+  (Rigo Ketelings) in bug #8473
 
 *logjam-3.0.4-r1 (30 MAY 2002)
 
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> logjam-3.0.4-r1 :
+  Added KEYWORDS, SLOT.
+
   30 MAY 2002; edolnx <edolnx@gentoo.org> Initial ebuild created. 
diff --git a/net-misc/logjam/Manifest b/net-misc/logjam/Manifest
index b3dfae8af515..832a30292685 100644
--- a/net-misc/logjam/Manifest
+++ b/net-misc/logjam/Manifest
@@ -1,9 +1,16 @@
-MD5 6e5bb466452768233aaf2f896ff37623 ChangeLog 1036
-MD5 1ebabd0e968c55acbce154f32778c1fe logjam-3.0.4-r1.ebuild 1404
-MD5 601ebde6779019775a1ff314052fa383 logjam-3.0.4-r2.ebuild 848
-MD5 707c2009aaea09b185cdd4368b379d7c logjam-4.0.0.ebuild 784
-MD5 c712b38c8258739f4a4fe5a97d6cc980 logjam-4.1.2.ebuild 792
-MD5 97bfca114805fe0dc7ab4671b3e742d9 files/digest-logjam-3.0.4-r1 64
-MD5 97bfca114805fe0dc7ab4671b3e742d9 files/digest-logjam-3.0.4-r2 64
-MD5 771163cda8a95e555a947269ec9b5a82 files/digest-logjam-4.0.0 64
-MD5 05d8622e6a8d9f1ddb2a675857d34fad files/digest-logjam-4.1.2 64
+MD5 974b1ea825c5702f289f17a6b3ce50b9 ChangeLog 3817
+MD5 3e5cb2e381b02c3f6e4ddeb35c3df735 logjam-4.2.2.ebuild 880
+MD5 8e3fea16320cbe5b30bbdfe0edb30489 logjam-4.3.2.ebuild 1035
+MD5 7102fb0d4e47599ec0b7b4de75a8b932 logjam-4.4.0-r1.ebuild 997
+MD5 a9dfc850af49c222fb98c4bb42275315 logjam-4.4.0.ebuild 1048
+MD5 a6b07f751e5133ecc460f84262451f4b logjam-4.4.1.ebuild 1094
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 5c18fe8310ecd5d058b982b892fd7643 logjam-4.5.1.ebuild 1185
+MD5 2903f2d3b78e59f9ed8b9f012c5e2210 files/digest-logjam-4.2.2 64
+MD5 94348f82d3a7b91d9988d1629c4bf2a8 files/digest-logjam-4.3.2 65
+MD5 30945ddb58c8f3eb3780fcf9e48dbda3 files/digest-logjam-4.4.0 65
+MD5 30945ddb58c8f3eb3780fcf9e48dbda3 files/digest-logjam-4.4.0-r1 65
+MD5 4e80e5bbdb7934542435e47d0f65b3fd files/digest-logjam-4.4.1 65
+MD5 68dac613ab0e68a698fcac1864aeae45 files/logjam-4.4.0-gcc3.4.patch 241
+MD5 1a113c3728bec399a937fb09aec13464 files/logjam-4.4.0-offline-sync.patch 870
+MD5 3290fea0af21ed124282018917aae472 files/digest-logjam-4.5.1 65
diff --git a/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch b/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch
index 0961c65806c9..5d010136d36a 100644
--- a/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch
+++ b/net-misc/logjam/files/logjam-4.4.0-offline-sync.patch
@@ -1,16 +1,15 @@
---- orig/protocol/liblivejournal/livejournal/sync.c
-+++ mod/protocol/liblivejournal/livejournal/sync.c
+--- protocol/liblivejournal/livejournal/sync.c.old	Fri Jun 18 14:57:51 2004
++++ protocol/liblivejournal/livejournal/sync.c	Fri Jun 18 14:58:20 2004
 @@ -33,8 +33,10 @@
  static int
  entry_date_compare_func(const void *a, const void *b) {
-        /* struct tm* cast needed to un-constify the times passed to mktime. */
--       const LJEntry *entrya = a; time_t timea = mktime((struct tm*)&entrya->time);
--       const LJEntry *entryb = b; time_t timeb = mktime((struct tm*)&entryb->time);
-+       const LJEntry *entrya = *(LJEntry **)a;
-+       const LJEntry *entryb = *(LJEntry **)b;
-+       time_t timea = mktime((struct tm*)&entrya->time);
-+       time_t timeb = mktime((struct tm*)&entryb->time);
-        /* mktime actually converts the times to local time, which isn't
-         * quite correct, but since we're comparing times directly like this
-         * it should still sort the same way and timegm is potentially slower. */
-
+ 	/* struct tm* cast needed to un-constify the times passed to mktime. */
+-	const LJEntry *entrya = a; time_t timea = mktime((struct tm*)&entrya->time);
+-	const LJEntry *entryb = b; time_t timeb = mktime((struct tm*)&entryb->time);
++	const LJEntry *entrya = *(LJEntry **)a;
++	const LJEntry *entryb = *(LJEntry **)b;
++	time_t timea = mktime((struct tm*)&entrya->time);
++	time_t timeb = mktime((struct tm*)&entryb->time);
+ 	/* mktime actually converts the times to local time, which isn't
+ 	 * quite correct, but since we're comparing times directly like this
+ 	 * it should still sort the same way and timegm is potentially slower. */
diff --git a/net-misc/logjam/logjam-4.2.2.ebuild b/net-misc/logjam/logjam-4.2.2.ebuild
index a4848c2907ba..bad865b305a1 100644
--- a/net-misc/logjam/logjam-4.2.2.ebuild
+++ b/net-misc/logjam/logjam-4.2.2.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.2.2.ebuild,v 1.1 2003/07/21 22:24:51 liquidx Exp $
-
-IUSE="xmms spell gtkhtml"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.2.2.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 DESCRIPTION="GTK2-based LiveJournal client"
 HOMEPAGE="http://logjam.danga.com/"
 SRC_URI="http://logjam.danga.com/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc"
+IUSE="xmms spell gtkhtml"
 
 DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.0
-	net-ftp/curl
-	gtkhtml? ( >=gnome-extra/libgtkhtml-3.0 )	
+	net-misc/curl
+	gtkhtml? ( =gnome-extra/libgtkhtml-3.0.10* )
 	spell? ( app-text/gtkspell )
 	xmms? ( media-sound/xmms )"
 
-src_compile () {
+src_compile() {
 	local myconf
 
 	use xmms && myconf="${myconf} --enable-xmms"
 	use gtkhtml && myconf="${myconf} --with-gtkhtml"
-	
+
 	econf ${myconf} || die "./configure failed"
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	dodoc README TODO ChangeLog COPYING AUTHORS
+	dodoc README TODO ChangeLog AUTHORS
 }
diff --git a/net-misc/logjam/logjam-4.3.2.ebuild b/net-misc/logjam/logjam-4.3.2.ebuild
index 5bbb6502d495..7cdda0889702 100644
--- a/net-misc/logjam/logjam-4.3.2.ebuild
+++ b/net-misc/logjam/logjam-4.3.2.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.3.2.ebuild,v 1.1 2004/03/06 14:56:35 liquidx Exp $
-
-IUSE="xmms spell gtkhtml"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.3.2.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 DESCRIPTION="GTK2-based LiveJournal client"
 HOMEPAGE="http://logjam.danga.com/"
 SRC_URI="http://logjam.danga.com/download/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc"
+IUSE="xmms spell gtkhtml"
 
 DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.0
-	net-ftp/curl
-	gtkhtml? ( >=gnome-extra/libgtkhtml-3.0 )
+	net-misc/curl
+	gtkhtml? ( =gnome-extra/libgtkhtml-3.0.10* )
 	spell? ( app-text/gtkspell )
 	xmms? ( media-sound/xmms )"
 
-src_compile () {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# needed to fix bug #68092
+	sed -i -e s/logjam.png/logjam_pencil.png/ ${S}/data/logjam.desktop.in
+}
+
+src_compile() {
 	local myconf
 
 	use xmms && myconf="${myconf} --enable-xmms"
@@ -29,7 +36,7 @@ src_compile () {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	dodoc README TODO ChangeLog COPYING AUTHORS
+	dodoc doc/README doc/TODO ChangeLog AUTHORS
 }
diff --git a/net-misc/logjam/logjam-4.4.0-r1.ebuild b/net-misc/logjam/logjam-4.4.0-r1.ebuild
index 8b96e05345f6..d7024038614e 100644
--- a/net-misc/logjam/logjam-4.4.0-r1.ebuild
+++ b/net-misc/logjam/logjam-4.4.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/net-misc/logjam/logjam-4.4.0-r1.ebuild,v 1.1 2004/12/21 12:37:43 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 IUSE="xmms spell gtkhtml"
 
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.0
 	net-misc/curl
-	gtkhtml? ( >=gnome-extra/libgtkhtml-3.0 )
+	gtkhtml? ( =gnome-extra/libgtkhtml-3.0.10* )
 	spell? ( app-text/gtkspell )
 	xmms? ( media-sound/xmms )"
 
diff --git a/net-misc/logjam/logjam-4.4.0.ebuild b/net-misc/logjam/logjam-4.4.0.ebuild
index 86cf10d950b6..904327a8d7e2 100644
--- a/net-misc/logjam/logjam-4.4.0.ebuild
+++ b/net-misc/logjam/logjam-4.4.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/net-misc/logjam/logjam-4.4.0.ebuild,v 1.1 2004/04/20 02:14:55 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
+
+IUSE="xmms spell gtkhtml"
+
+inherit eutils
 
 DESCRIPTION="GTK2-based LiveJournal client"
 HOMEPAGE="http://logjam.danga.com/"
@@ -8,16 +12,25 @@ SRC_URI="http://logjam.danga.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="xmms spell gtkhtml"
+KEYWORDS="~x86 ~ppc ~sparc amd64"
 
 DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.0
 	net-misc/curl
-	gtkhtml? ( >=gnome-extra/libgtkhtml-3.0 )
+	gtkhtml? ( =gnome-extra/libgtkhtml-3.0.10* )
 	spell? ( app-text/gtkspell )
 	xmms? ( media-sound/xmms )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
+
+	sed -i -e s/logjam.png/logjam_pencil.png/ ${S}/data/logjam.desktop.in
+
+}
+
 src_compile() {
 	local myconf
 
diff --git a/net-misc/logjam/logjam-4.4.1.ebuild b/net-misc/logjam/logjam-4.4.1.ebuild
index 9f260cbfe865..16008e33be5f 100644
--- a/net-misc/logjam/logjam-4.4.1.ebuild
+++ b/net-misc/logjam/logjam-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.4.1.ebuild,v 1.1 2005/01/05 09:58:00 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.4.1.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 IUSE="gtk gtkhtml spell svg xmms"
 
@@ -12,7 +12,7 @@ SRC_URI="http://logjam.danga.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 RDEPEND=">=dev-libs/libxml2-2.0
 	net-misc/curl
diff --git a/net-misc/logjam/logjam-4.5.1.ebuild b/net-misc/logjam/logjam-4.5.1.ebuild
index 608db8f5176e..bff8156590f5 100644
--- a/net-misc/logjam/logjam-4.5.1.ebuild
+++ b/net-misc/logjam/logjam-4.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.5.1.ebuild,v 1.1 2005/08/25 17:32:42 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.5.1.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 IUSE="gtk gtkhtml spell sqlite svg xmms"
 
diff --git a/net-misc/ltsp/ChangeLog b/net-misc/ltsp/ChangeLog
index 7b33c8b4f6b5..c34334cbaca5 100644
--- a/net-misc/ltsp/ChangeLog
+++ b/net-misc/ltsp/ChangeLog
@@ -1,6 +1,44 @@
-# ChangeLog for net-misc/ltsp-core
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ChangeLog,v 1.1 2004/09/25 07:53:51 lanius Exp $
+# ChangeLog for net-misc/ltsp
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:33 chriswhite Exp $
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> ltsp-4.1.1.ebuild:
+  bug 93620
+
+*ltsp-4.1.1 (29 Apr 2005)
+
+  29 Apr 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/ltsp-4.1.1-usb-config.patch, ltsp-4.1-r1.ebuild,
+  +ltsp-4.1.1.ebuild:
+  version bump; fix /etc/ltsp.conf; fix dev-perl/libwww-perl dependency; add
+  usb configure option
+
+  13 Apr 2005; Heinrich Wendel <lanius@gentoo.org> ltsp-4.1-r1.ebuild:
+  fix pxe file location
+
+  02 Mar 2005; Heinrich Wendel <lanius@gentoo.org> ltsp-4.1-r1.ebuild:
+  fix pxe support, bug #83463
+
+  07 Dec 2004; Simon Stelling <blubb@gentoo.org> ltsp-4.1-r1.ebuild:
+  added ~amd64
+
+  05 Dec 2004; lanius@gentoo.org ltsp-4.1-r1.ebuild:
+  fix handling of src_uri
+
+  11 Nov 2004; <lanius@gentoo.org> -files/INSTALL.Gentoo, -files/Xaccess,
+  -files/Xsetup_workstation, -files/dhcpd.conf, -files/gdm.conf.pl,
+  -files/install.sh, -files/kdmrc.pl, -files/ltsp.conf, -files/ltsp.gif,
+  -files/tftp, -ltsp-3.0.9-r3.ebuild, -ltsp-4.0.ebuild:
+  remove old ebuilds
+
+  28 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ltsp-4.1-r1.ebuild:
+  fix installation of sound packages, bug #65578
+
+  27 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ltsp-4.1-r1.ebuild:
+  mark x86
 
 *ltsp-3.0.9-r3 (25 Sep 2004)
 
diff --git a/net-misc/ltsp/Manifest b/net-misc/ltsp/Manifest
index 8b4a52f39fdb..c527815892a1 100644
--- a/net-misc/ltsp/Manifest
+++ b/net-misc/ltsp/Manifest
@@ -1,21 +1,20 @@
-MD5 54307674a386d1b9b5da4028bb6436a4 ltsp-core-3.0.9-r3.ebuild 10953
-MD5 b612ed4c93743e1f6c81d7653a7a8328 ChangeLog 6090
-MD5 8470ac6202a79e428be0ed6867af12e8 metadata.xml 574
-MD5 3c8886178146b87ef1bf61a9bfba94a0 ltsp-core-4.0.ebuild 4042
-MD5 dd237f2019724169708a7cef4f4c4dfd ltsp-core-4.1-r1.ebuild 4512
-MD5 e93ac4a097b01ca94ac388cc874ad8ac files/tftp 259
-MD5 03109ccf3695c8575faea0892e432db2 files/ltsp.conf 62
-MD5 9bb2a99257dc7f86f92d6a3c4d55ffd1 files/digest-ltsp-core-3.0.9-r3 1407
-MD5 1d8daed9b6e2768685b56bb3740d6af1 files/Xaccess 2057
-MD5 99460aed8423e55d484551404408f7b9 files/install.sh 496
-MD5 5ebe40a6a4b11abede73ff5daa139fe3 files/dhcpd.conf 4439
-MD5 0f37dcb7969240b88c680e0569385e2d files/eb-5.0.9-eepro100.lzpxe 16426
-MD5 28a7c3eb45b470b14d8008d19b867ea3 files/kdmrc.pl 2007
-MD5 bad8939159d8bdddfdb5625ca5ae9f8e files/ltsp.gif 8946
-MD5 f66bc50e497959cf0df7e1e830d528eb files/gdm.conf.pl 2238
-MD5 a4b38d8b3e2c77d7bc1029c9aaf5c459 files/Xsetup_workstation 421
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 035bf0f7c128eed40eabbdd74304daea ChangeLog 7868
+MD5 e54bcb2c2c658558ede4b99c5d1a9a82 files/digest-ltsp-4.1-r1 4466
+MD5 723d89c2799929bdb15335624c5d304c files/digest-ltsp-4.1.1 4863
 MD5 98c1e1d5fd02a42ec01348e7525e8108 files/eb-5.0.9-3c905c-tpo.lzpxe 17191
-MD5 8afc7afa7cf0eb6ef41de9d7e67a92bc files/INSTALL.Gentoo 3887
-MD5 31da1bb5b81fc2c1d76e43ad9814cc38 files/digest-ltsp-core-4.1-r1 4324
-MD5 a65f287c2cf9fbd3b9453b4007d8b35f files/digest-ltsp-core-4.0 3772
+MD5 0f37dcb7969240b88c680e0569385e2d files/eb-5.0.9-eepro100.lzpxe 16426
 MD5 b716ae3544e8ac3e53f315a1e95f27a0 files/eb-5.0.9-rtl8139.lzpxe 16054
+MD5 de9c3f040ef3ca39100ac7e5e13eaf67 files/ltsp-4.1.1-usb-config.patch 285
+MD5 929072b6724c853e72fbcc4f55a60c75 ltsp-4.1-r1.ebuild 5641
+MD5 4f268776693efdcf64436fe3335d9d7b ltsp-4.1.1.ebuild 6936
+MD5 8470ac6202a79e428be0ed6867af12e8 metadata.xml 574
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0ATRI1lqEGTUzyQRAh0YAJ92v6E66qI/E99FXZre2p9A0HSAowCgq5Sq
+Wn6lGnu27asX841J4iXNE/k=
+=81L5
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ltsp/files/digest-ltsp-4.1-r1 b/net-misc/ltsp/files/digest-ltsp-4.1-r1
index c9c960b4fff4..5959b3abadf9 100644
--- a/net-misc/ltsp/files/digest-ltsp-4.1-r1
+++ b/net-misc/ltsp/files/digest-ltsp-4.1-r1
@@ -35,9 +35,10 @@ MD5 877936daae880072e107cf4ce04cb80a ltsp-util-linux-1.0-0-i386.tgz 3946
 MD5 cc53c7925483376213d3145dddd88330 ltsp-vidlist-1.1-0-i386.tgz 5189
 MD5 ad662a97cda3389b2b1a4440977aa5bb ltsp-aumix-1.0-0-i386.tgz 48345
 MD5 13e79b438885aa790bbb7195563df3e5 ltsp-freetype-1.0-0-i386.tgz 586299
-MD5 0af5b6acee0f558c46621214cfbbda35 ltsp-snmpd-1-0-i386.tgz 4005591
 MD5 fb79db426a2f9f6888430c3c309aa55c ltsp-kernel-1.4-0-i386.tgz 3874772
 MD5 3d4861ab2bd0f8c7819ef9a562286ed3 ltsp-modules-1.4-0-i386.tgz 3923245
+MD5 51a1f889b78fde496e2f1a07afcd08b6 ltsp-utils-0.9.tgz 40575
+MD5 0af5b6acee0f558c46621214cfbbda35 ltsp-snmpd-1-0-i386.tgz 4005591
 MD5 435d486670bcb254616dfa5a607f8e9e ltsp-gdb-1.0-0-i386.tgz 1604176
 MD5 b3a98509650f587194a1a02ff2c02615 ltsp-strace-1.0-0-i386.tgz 360028
 MD5 45afcb2172955f0a7515ee904c72ae8f ltsp-x-core-1.2-0-i386.tgz 18718396
@@ -56,5 +57,6 @@ MD5 133acac5836e2f1d7fb6aeff0eb6bf6a ltsp-x336_S3_S3V-1.0-0-i386.tgz 2078825
 MD5 e082f4d298a4f135e6db21bb970d95ce ltsp-x336_SVGA-1.0-0-i386.tgz 1509363
 MD5 71f5167a49ead5eee5371926c5c2829f ltsp-x336_VGA16-1.0-0-i386.tgz 891345
 MD5 04578a927b90c27c4b88c5248d660f0c ltsp-x336_W32-1.0-0-i386.tgz 818829
+MD5 693f1302ff1122ebda4de9b90652492b ltsp-audiofile-1.0-0-i386.tgz 70173
 MD5 2e39198e18c4ce1e48636369cc86151f ltsp-esd-1.0-0-i386.tgz 198156
-MD5 51a1f889b78fde496e2f1a07afcd08b6 ltsp-utils-0.9.tgz 40575
+MD5 a8c6a26ce64a987dda05928ecb93227f ltsp_nasd-1.1-0-i386.tgz 644481
diff --git a/net-misc/ltsp/ltsp-4.1-r1.ebuild b/net-misc/ltsp/ltsp-4.1-r1.ebuild
index 6077ffd82b55..a426fedd96bd 100644
--- a/net-misc/ltsp/ltsp-4.1-r1.ebuild
+++ b/net-misc/ltsp/ltsp-4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ltsp-4.1-r1.ebuild,v 1.1 2004/09/25 07:53:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ltsp-4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:33 chriswhite Exp $
 
 IUSE="X debug nas esd audiofile snmp"
 
@@ -15,163 +15,137 @@ RDEPEND="X? ( virtual/x11 )
 	sys-apps/xinetd
 	net-misc/dhcp
 	net-fs/nfs-utils
-	net-nds/portmap"
+	net-nds/portmap
+	dev-perl/libwww-perl"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
+
+SRC_URI="
+http://www.ltsp.org/ltsp-4.1/ltsp-ltsptree-1.7-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-glibc-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-sysvinit-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-popt-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-bash-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-busybox-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-devfsd-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-getltscfg-1.2-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-libgcc_s-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-haltsys-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-e2fsprogs-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-startsess-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-lp_server-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ltspinfod-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-modutils-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ncurses-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-open-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-prep_swap-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-zlib-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-libpng-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-pci_scan-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-pam-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ssh-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-net-tools-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-xinetd-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-ypbind-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-tcp_wrappers-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-portmap-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-rdesktop-1.3-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-libvncserver-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-localdev-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-openssl-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-samba-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-util-linux-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-vidlist-1.1-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-aumix-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-freetype-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-kernel-1.4-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-modules-1.4-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-utils-0.9.tgz
+
+snmp? (
+http://www.ltsp.org/ltsp-4.1/http://www.ltsp.org/ltsp-4.1/ltsp-snmpd-1-0-i386.tgz )
+
+debug? (
+http://www.ltsp.org/ltsp-4.1/ltsp-gdb-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-strace-1.0-0-i386.tgz )
+
+X? (
+http://www.ltsp.org/ltsp-4.1/ltsp-x-core-1.2-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x-fonts-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x-fonts-100dpi-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_3DLabs-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_8514-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_AGX-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_I128-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mach32-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mach64-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mach8-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_Mono-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_P9000-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_S3_S3V-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_SVGA-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_VGA16-1.0-0-i386.tgz
+http://www.ltsp.org/ltsp-4.1/ltsp-x336_W32-1.0-0-i386.tgz )
+
+audiofile? (
+http://www.ltsp.org/ltsp-4.1/ltsp-audiofile-1.0-0-i386.tgz )
+
+esd? (
+http://www.ltsp.org/ltsp-4.1/ltsp-esd-1.0-0-i386.tgz )
+
+nas? (
+http://www.ltsp.org/ltsp-4.1/ltsp_nasd-1.1-0-i386.tgz )"
 
 S=${WORKDIR}/ltsp
 
-LTSP_CORE="ltsp-ltsptree-1.7-0-i386.tgz
-ltsp-glibc-1.0-0-i386.tgz
-ltsp-sysvinit-1.0-0-i386.tgz
-ltsp-popt-1.1-0-i386.tgz
-ltsp-bash-1.0-0-i386.tgz
-ltsp-busybox-1.0-0-i386.tgz
-ltsp-devfsd-1.0-0-i386.tgz
-ltsp-getltscfg-1.2-0-i386.tgz
-ltsp-libgcc_s-1.0-0-i386.tgz
-ltsp-haltsys-1.0-0-i386.tgz
-ltsp-e2fsprogs-1.1-0-i386.tgz
-ltsp-startsess-1.1-0-i386.tgz
-ltsp-lp_server-1.1-0-i386.tgz
-ltsp-ltspinfod-1.1-0-i386.tgz
-ltsp-modutils-1.0-0-i386.tgz
-ltsp-ncurses-1.0-0-i386.tgz
-ltsp-open-1.1-0-i386.tgz
-ltsp-prep_swap-1.0-0-i386.tgz
-ltsp-zlib-1.0-0-i386.tgz
-ltsp-libpng-1.0-0-i386.tgz
-ltsp-pci_scan-1.0-0-i386.tgz
-ltsp-pam-1.0-0-i386.tgz
-ltsp-ssh-1.0-0-i386.tgz
-ltsp-net-tools-1.0-0-i386.tgz
-ltsp-xinetd-1.0-0-i386.tgz
-ltsp-ypbind-1.0-0-i386.tgz
-ltsp-tcp_wrappers-1.0-0-i386.tgz
-ltsp-portmap-1.0-0-i386.tgz
-ltsp-rdesktop-1.3-0-i386.tgz
-ltsp-libvncserver-1.0-0-i386.tgz
-ltsp-localdev-1.1-0-i386.tgz
-ltsp-openssl-1.0-0-i386.tgz
-ltsp-samba-1.0-0-i386.tgz
-ltsp-util-linux-1.0-0-i386.tgz
-ltsp-vidlist-1.1-0-i386.tgz
-ltsp-aumix-1.0-0-i386.tgz
-ltsp-freetype-1.0-0-i386.tgz"
-
-use snmp && LTSP_CORE="${LTSP_CORE} ltsp-snmpd-1-0-i386.tgz"
-
-LTSP_DEBUG="ltsp-gdb-1.0-0-i386.tgz
-ltsp-strace-1.0-0-i386.tgz"
-
-LTSP_X="ltsp-x-core-1.2-0-i386.tgz
-ltsp-x-fonts-1.0-0-i386.tgz
-ltsp-x-fonts-100dpi-1.0-0-i386.tgz
-ltsp-x336_3DLabs-1.0-0-i386.tgz
-ltsp-x336_8514-1.0-0-i386.tgz
-ltsp-x336_AGX-1.0-0-i386.tgz
-ltsp-x336_I128-1.0-0-i386.tgz
-ltsp-x336_Mach32-1.0-0-i386.tgz
-ltsp-x336_Mach64-1.0-0-i386.tgz
-ltsp-x336_Mach8-1.0-0-i386.tgz
-ltsp-x336_Mono-1.0-0-i386.tgz
-ltsp-x336_P9000-1.0-0-i386.tgz
-ltsp-x336_S3_S3V-1.0-0-i386.tgz
-ltsp-x336_SVGA-1.0-0-i386.tgz
-ltsp-x336_VGA16-1.0-0-i386.tgz
-ltsp-x336_W32-1.0-0-i386.tgz"
-
-LTSP_STUFF="ltsp-kernel-1.4-0-i386.tgz
-ltsp-modules-1.4-0-i386.tgz"
-
-LTSP_UTILS="ltsp-utils-0.9.tgz"
-
 KERNEL_VERSION="2.4.26-ltsp-2"
 
-use audiofile && LTSP_SOUND="${LTSP_SOUND} ltsp-audiofile-1.0-0-i386.tgz"
-use esd && LTSP_SOUND="${LTSP_SOUND} ltsp-esd-1.0-0-i386.tgz"
-use nas && LTSP_SOUND="${LTSP_SOUND} ltsp_nasd-1.1-0-i386.tgz"
-
-for FILE in ${LTSP_CORE} ${LTSP_STUFF}
-do
-	SRC_URI="${SRC_URI} http://www.ltsp.org/ltsp-4.1/${FILE}"
-done
-
-for FILE in ${LTSP_DEBUG}
-do
-	SRC_URI="${SRC_URI} debug? ( http://www.ltsp.org/ltsp-4.1/${FILE} )"
-done
-
-for FILE in ${LTSP_X}
-do
-	SRC_URI="${SRC_URI} X? ( http://www.ltsp.org/ltsp-4.1/${FILE} )"
-done
-
-for FILE in ${LTSP_SOUND}
-do
-	SRC_URI="${SRC_URI} http://www.ltsp.org/ltsp-4.1/${FILE}"
-done
-
-SRC_URI="${SRC_URI} mirror://sourceforge/ltsp/${LTSP_UTILS}"
-
-
 src_unpack() {
 	# nothing to unpack
 	mkdir ltsp
 	cd ltsp
 
-	for FILE in ${LTSP_STUFF} ${LTSP_UTILS}
-	do
-		tar -xzf ${DISTDIR}/${FILE}
-	done
+	unpack ltsp-utils-0.9.tgz
+	unpack ltsp-kernel-1.4-0-i386.tgz
+	unpack ltsp-modules-1.4-0-i386.tgz
 }
 
 src_install() {
-	# now unpack the files
-	# first the core stuff
+	# core packages
+	MY_A=${A/ltsp-utils-0.9.tgz/}
+	MY_A=${MY_A/ltsp-kernel-1.4-0-i386.tgz/}
+	MY_A=${MY_A/ltsp-modules-1.4-0-i386.tgz/}
+
 	dodir /opt/ltsp-${PV}
-	echo "Installing core packages..."
-	for FILE in ${LTSP_CORE}
-	do
-		tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-	done
-
-	# debug stuff
-	if use debug ; then
-		echo "Installing debug packages..."
-		for FILE in ${LTSP_DEBUG}
-		do
-			tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-		done
-	fi
-
-	# X stuff
-	if use X ; then
-		echo "Installing X packages..."
-		for FILE in ${LTSP_X}
-		do
-			tar -xzf ${DISTDIR}/${FILE} -C ${D}/opt/ltsp-${PV} 2> /dev/null
-		done
-	fi
+	cd ${D}/opt/ltsp-${PV}
+	unpack ${MY_A}
 
 	# kernel stuff
-	echo "Installing kernel packages..."
+	cd ${S}
 	find i386 -print | cpio -pmud --quiet ${D}/opt/ltsp-${PV} 2> /dev/null
 	insinto /tftpboot/lts
 	doins vmlinuz-${KERNEL_VERSION}
 
 	# pxe stuff
 	insinto /tftpboot/pxe
+	doins 2.4.26-ltsp-2/pxelinux.0
+	doins 2.4.26-ltsp-2/initrd-2.4.26-ltsp-2.gz
+	doins 2.4.26-ltsp-2/bzImage-2.4.26-ltsp-2
+	insinto /tftpboot/pxelinux.cfg
+	doins 2.4.26-ltsp-2/pxelinux.cfg/default
+
+	insinto /tftpboot/pxe
 	doins ${FILESDIR}/eb-5.0.9-rtl8139.lzpxe
 	doins ${FILESDIR}/eb-5.0.9-eepro100.lzpxe
 	doins ${FILESDIR}/eb-5.0.9-3c905c-tpo.lzpxe
 
 	# config stuff
 	cd ltsp-utils
-	echo "Doing several other stuff..."
 	dosbin ltspcfg
+	dodir /etc
+	echo "LTSP_DIR=/opt/ltsp-4.1" > ${D}/etc/ltsp.conf
 	dosbin ltspinfo
 	dosbin ltspadmin
 	dodoc COPYING
@@ -179,11 +153,12 @@ src_install() {
 
 	# several other stuff
 	rm -fR ${D}/usr/share/
+	rm -fR ${D}/opt/ltsp-4.1/i386/usr/share/aclocal
 }
 
 pkg_postinst() {
 	einfo
 	einfo "Either use ltspcfg to configure your stuff, or follow the guide at gentoo.org:"
-	einfo "                   http://www.gentoo.org/doc/en/ltsp.xml                      "
+	einfo "                   http://www.gentoo.org/doc/en/ltsp.xml"
 	einfo
 }
diff --git a/net-misc/ltsp/ltsp-4.1.1.ebuild b/net-misc/ltsp/ltsp-4.1.1.ebuild
index 7deb564f4b39..6290dd0ecb5e 100644
--- a/net-misc/ltsp/ltsp-4.1.1.ebuild
+++ b/net-misc/ltsp/ltsp-4.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-misc/ltsp/ltsp-4.1.1.ebuild,v 1.1 2005/04/29 11:30:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ltsp/ltsp-4.1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:33 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ DEPEND="app-arch/tar
 RDEPEND="X? ( virtual/x11 )
 	virtual/tftp
 	sys-apps/xinetd
-	net-misc/dhcp
+	|| ( net-misc/dhcp net-dns/dnsmasq )
 	net-fs/nfs-utils
 	net-nds/portmap
 	dev-perl/libwww-perl"
@@ -190,10 +190,10 @@ src_install() {
 pkg_postinst() {
 	einfo
 	einfo "Either use ltspcfg to configure your stuff, or follow the guide at gentoo.org:"
-	einfo "                   http://www.gentoo.org/doc/en/ltsp.xml                      "
+	einfo "                   http://www.gentoo.org/doc/en/ltsp.xml"
 	einfo
-	einfo "     NOTE: The directory containing LTSP has changed to /opt/ltsp-4.1.1/      "
+	einfo "     NOTE: The directory containing LTSP has changed to /opt/ltsp-4.1.1/"
 	einfo
-	einfo "        NOTE: to enable USB you have to add USB=Y to your lts.conf            "
+	einfo "        NOTE: to enable USB you have to add USB=Y to your lts.conf"
 	einfo
 }
diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index 8bc2e47e3ad3..f0a3a11ac672 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-misc/mico
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.1 2002/12/11 10:52:18 mkennedy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
+
+*mico-2.3.11-r1 (04 Aug 2005)
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/mico-2.3.11-build-fix.patch, +mico-2.3.11-r1.ebuild:
+  Add new cleaned up ebuild by Graham Hudspith <gwh@allinea.com> (adds Qt, Gtk
+  and Postgresql support). Add build fix by Malcolm MacLeod
+  <mmacleod@webmail.co.za>. Both bug #56798.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> mico-2.3.11.ebuild,
+  mico-2.3.7.ebuild, mico-2.3.9.ebuild:
+  change virtual/glibc to virtual/libc
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> mico-2.3.11.ebuild:
+  Stable on alpha.
+
+  21 May 2004; Ferris McCormick <fmccor@gentoo.org> mico-2.3.11.ebuild:
+  Add ~sparc keyword, closing bug 51512.
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> mico-2.3.11.ebuild,
+  mico-2.3.9.ebuild:
+  added ~amd64 keyword
+
+*mico-2.3.11 (17 Feb 2004)
+
+  17 Feb 2004; David Holm <dholm@gentoo.org> mico-2.3.11.ebuild:
+  Version bumped and tested on big endian.
+
+*mico-2.3.9 (28 Mar 2003)
+
+  28 Mar 2003; Michael Imhof <tantive@gentoo.org> ChangeLog,
+  mico-2.3.9.ebuild, files/digest-mico-2.3.9 :
+  Version bumped, thanks to Theofilos Intzoglou <oscar10@yifan.net>.
+  Should close #18374
 
 *mico-2.3.7 (11 Dec 2002)
 
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index e69de29bb2d1..0bd5d0ce7fe4 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b1844ac1bb6944034afb8e9f3a600a8f ChangeLog 1621
+MD5 e12517e602ea525c7d741d5823d4797c mico-2.3.7.ebuild 1394
+MD5 17cf184ba5954b217b43429ecf2592d2 mico-2.3.11-r1.ebuild 1747
+MD5 611907b50de48923e75c344440d00480 mico-2.3.9.ebuild 1401
+MD5 9c8bb11952bdec1927f572db4af5d8ad mico-2.3.11.ebuild 1409
+MD5 67a6622b9fa3dc37121f3a43f0234f79 files/digest-mico-2.3.11 64
+MD5 67a6622b9fa3dc37121f3a43f0234f79 files/digest-mico-2.3.11-r1 64
+MD5 e08b36b538bb6b3739f116f5219e17b9 files/digest-mico-2.3.9 63
+MD5 92deafe718f5328130a6a1238621343d files/digest-mico-2.3.7 63
+MD5 6d29929690decb760ef768a999c93bdf files/mico-2.3.11-build-fix.patch 353
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFC8nvi1ZcsMnZjRyIRAqn0AJ4ycCJVHQzI9LMa64YdgaFDm17m7gCYvipc
+ltKt647Q53qvnq8cCu/LZA==
+=Xgti
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mico/mico-2.3.11-r1.ebuild b/net-misc/mico/mico-2.3.11-r1.ebuild
index 384ea094c02e..2dcded2b472e 100644
--- a/net-misc/mico/mico-2.3.11-r1.ebuild
+++ b/net-misc/mico/mico-2.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.11-r1.ebuild,v 1.1 2005/08/04 20:33:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/mico/mico-2.3.11.ebuild b/net-misc/mico/mico-2.3.11.ebuild
index 2c0c2f676352..031e81a132bb 100644
--- a/net-misc/mico/mico-2.3.11.ebuild
+++ b/net-misc/mico/mico-2.3.11.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-misc/mico/mico-2.3.11.ebuild,v 1.1 2004/02/17 15:15:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.11.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 IUSE="ssl tcltk"
 
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.mico.org/"
 SRC_URI="http://www.mico.org/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~alpha"
+KEYWORDS="~ppc alpha ~amd64 ~sparc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/flex
 	sys-devel/bison
 	ssl? ( dev-libs/openssl )
diff --git a/net-misc/mico/mico-2.3.7.ebuild b/net-misc/mico/mico-2.3.7.ebuild
index dbdfad43a762..12d872d69b35 100644
--- a/net-misc/mico/mico-2.3.7.ebuild
+++ b/net-misc/mico/mico-2.3.7.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/net-misc/mico/mico-2.3.7.ebuild,v 1.1 2002/12/11 10:52:18 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.7.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 IUSE="ssl tcltk"
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="x86 ~alpha"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/flex
 	sys-devel/bison
 	ssl? ( dev-libs/openssl )
@@ -20,8 +20,8 @@ DEPEND="virtual/glibc
 S="${WORKDIR}/${PN}"
 
 src_compile() {
-	local myopts="--enable-final 
-		--disable-mini-stl 
+	local myopts="--enable-final
+		--disable-mini-stl
 		--enable-except
 		--enable-dynamic
 		--enable-repo
diff --git a/net-misc/mico/mico-2.3.9.ebuild b/net-misc/mico/mico-2.3.9.ebuild
index c47545ce38b7..170972690453 100644
--- a/net-misc/mico/mico-2.3.9.ebuild
+++ b/net-misc/mico/mico-2.3.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/net-misc/mico/mico-2.3.9.ebuild,v 1.1 2003/03/28 22:01:31 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.9.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 IUSE="ssl tcltk"
 
@@ -9,9 +9,9 @@ HOMEPAGE="http://www.mico.org/"
 SRC_URI="http://www.mico.org/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 ~alpha ~amd64"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/flex
 	sys-devel/bison
 	ssl? ( dev-libs/openssl )
@@ -20,8 +20,8 @@ DEPEND="virtual/glibc
 S="${WORKDIR}/${PN}"
 
 src_compile() {
-	local myopts="--enable-final 
-		--disable-mini-stl 
+	local myopts="--enable-final
+		--disable-mini-stl
 		--enable-except
 		--enable-dynamic
 		--enable-repo
diff --git a/net-misc/midentd/ChangeLog b/net-misc/midentd/ChangeLog
index ae690c395b12..53f5d49e398c 100644
--- a/net-misc/midentd/ChangeLog
+++ b/net-misc/midentd/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/midentd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/ChangeLog,v 1.1 2004/03/05 15:47:07 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> midentd-2.3.1-r1.ebuild:
+  Marked ~amd64, closes bug 104400.
+
+  10 Dec 2004; Jason Wever <weeve@gentoo.org> midentd-2.3.1-r1.ebuild:
+  Added ~sparc keyword.
+
+*midentd-2.3.1-r1 (13 May 2004)
+
+  13 May 2004; Mike Frysinger <vapier@gentoo.org> +files/2.3.1-pidfile.patch,
+  +files/midentd.conf.d, files/midentd.rc, +midentd-2.3.1-r1.ebuild,
+  -midentd-2.3.1.ebuild:
+  Have the daemon create a .pid file so that the init.d script can kill it and
+  make the xinetd entry refer to the service auth instead of identd #50775 by
+  Remco Barendse
 
 *midentd-2.3.1 (05 Mar 2004)
 
diff --git a/net-misc/midentd/Manifest b/net-misc/midentd/Manifest
index a8d908613fc7..a6780b72b1be 100644
--- a/net-misc/midentd/Manifest
+++ b/net-misc/midentd/Manifest
@@ -1,4 +1,16 @@
-MD5 bc12b146137671b1b7d8d1359b4a5017 files/digest-midentd-2.3.1 64
-MD5 5445c18416fedeea882c4173f8fd8a81 files/midentd.rc 519
-MD5 2bff997b55af52efe0f7dd05f6fc7bc5 midentd-2.3.1.ebuild 840
-MD5 181d91a030cd9bc8fe8da9f7c23b209c ChangeLog 358
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c62f5858fa91a327d8c72d19be4c8af midentd-2.3.1-r1.ebuild 1025
+MD5 f732540150378bb12b7cb0ba0d885832 ChangeLog 938
+MD5 bc12b146137671b1b7d8d1359b4a5017 files/digest-midentd-2.3.1-r1 64
+MD5 6a6f0d5b0ff3509e7fd139a7812c054e files/midentd.rc 478
+MD5 840bfb83fe54f3fa0d946256c5d3e8a0 files/midentd.conf.d 276
+MD5 318af5ce11a2a752d2cd55d1ebf36f70 files/2.3.1-pidfile.patch 602
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDFf4nntT9W3vfTuoRAlfAAJ4o8EzfxFHbU1TZwL0uBwWaVMTRTwCeKgV6
+oMApOKyM60SRXERrY2+c1Uo=
+=mIYG
+-----END PGP SIGNATURE-----
diff --git a/net-misc/midentd/files/midentd.conf.d b/net-misc/midentd/files/midentd.conf.d
index 71f0ce948fe2..a49f795d9145 100644
--- a/net-misc/midentd/files/midentd.conf.d
+++ b/net-misc/midentd/files/midentd.conf.d
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/files/midentd.conf.d,v 1.1 2004/05/14 02:25:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/files/midentd.conf.d,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 # Options to pass to midentd
 MIDENTD_OPTS="-u nobody"
diff --git a/net-misc/midentd/files/midentd.rc b/net-misc/midentd/files/midentd.rc
index 9f8ebb2782fb..6d05d4424f6f 100644
--- a/net-misc/midentd/files/midentd.rc
+++ b/net-misc/midentd/files/midentd.rc
@@ -1,18 +1,18 @@
 #!/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-misc/midentd/files/midentd.rc,v 1.1 2004/03/05 15:47:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/files/midentd.rc,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 start() {
 	ebegin "Starting midentd"
-	start-stop-daemon --start --quiet \
-		--pidfile /var/run/midentd.pid --exec /usr/sbin/midentd \
-		-- -u nobody -f
+	/usr/sbin/midentd ${MIDENTD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping midentd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/midentd.pid
-	eend $?
+	local ret=$?
+	rm -f /var/run/midentd.pid
+	eend ${ret}
 }
diff --git a/net-misc/midentd/midentd-2.3.1-r1.ebuild b/net-misc/midentd/midentd-2.3.1-r1.ebuild
index 842cc0c8a2cd..c0bdfdf12e73 100644
--- a/net-misc/midentd/midentd-2.3.1-r1.ebuild
+++ b/net-misc/midentd/midentd-2.3.1-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/net-misc/midentd/midentd-2.3.1-r1.ebuild,v 1.1 2004/05/14 02:25:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/midentd/midentd-2.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ident daemon with masquerading and fake replies support"
 HOMEPAGE="http://panorama.sth.ac.at/midentd/"
@@ -8,7 +10,7 @@ SRC_URI="http://panorama.sth.ac.at/midentd/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
diff --git a/net-misc/mindterm/ChangeLog b/net-misc/mindterm/ChangeLog
index 763aec16b109..ebf16029e739 100644
--- a/net-misc/mindterm/ChangeLog
+++ b/net-misc/mindterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mindterm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/ChangeLog,v 1.1 2005/01/27 18:39:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+  16 Sep 2005; Thomas Matthijs <axxo@gentoo.org> mindterm-2.4.2.ebuild:
+  Dep fix, dropped alpha keyword
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mindterm-2.4.2.ebuild:
+  stable on amd64, ppc and x86
 
 *mindterm-2.4.2 (27 Jan 2005)
 
diff --git a/net-misc/mindterm/Manifest b/net-misc/mindterm/Manifest
index 5cbbe894a889..7d8f0143ae08 100644
--- a/net-misc/mindterm/Manifest
+++ b/net-misc/mindterm/Manifest
@@ -1,4 +1,15 @@
-MD5 4127fabcedf0386c8ba54696930fdc4e mindterm-2.4.2.ebuild 821
-MD5 26c0b1cebcbecee86d841d777d59f8b1 2.4.2-buildxml.patch 1225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c7cad85fdf67d0673153f33bebc136d0 mindterm-2.4.2.ebuild 1309
+MD5 190499314db63b71bd4c8f7a5ba2d5f0 ChangeLog 666
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 dadd3c7dad54c71db8facb7891677489 files/digest-mindterm-2.4.2 67
+MD5 26c0b1cebcbecee86d841d777d59f8b1 files/2.4.2-buildxml.patch 1225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKs5s/rLF9B432nYRArctAJ9BdsEOXtZuCHDOFJomsj7bbLuKyQCgwpNC
+pwEv9NHLAZgPCNoZinEQyWw=
+=blKb
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mindterm/mindterm-2.4.2.ebuild b/net-misc/mindterm/mindterm-2.4.2.ebuild
index 6ad2ef0e64dc..c1de3f79be56 100644
--- a/net-misc/mindterm/mindterm-2.4.2.ebuild
+++ b/net-misc/mindterm/mindterm-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/mindterm-2.4.2.ebuild,v 1.1 2005/01/27 18:39:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/mindterm-2.4.2.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit eutils java-pkg
 
@@ -10,19 +10,19 @@ SRC_URI="http://www.appgate.com/products/80_MindTerm/110_MindTerm_Download/${P/-
 
 LICENSE="mindterm"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc ~sparc amd64"
 IUSE="doc examples jikes"
 RDEPEND="virtual/x11
-	>=virtual/jre-1.1"
-DEPEND=">=virtual/jdk-1.1
+	>=virtual/jre-1.3"
+DEPEND=">=virtual/jdk-1.3
 	app-arch/unzip
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
 S=${WORKDIR}/${P/-/_}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	epatch ${FILESDIR}/${PV}-buildxml.patch
 }
 
@@ -37,13 +37,12 @@ src_install() {
 	java-pkg_dojar *.jar
 
 	echo "#!/bin/sh" > ${PN}
-	echo "cp=\`java-config -p mindterm\`" >> ${PN}
-	echo "\`java-config -J\` -cp \${cp} com.mindbright.application.MindTerm \$*" >> ${PN}
+	echo 'java -cp $(java-config -p mindterm) com.mindbright.application.MindTerm ${@}' >> ${PN}
 
 	into /usr
 	dobin ${PN}
 
-	dodoc README.txt LICENSE.txt
+	dodoc README.txt
 	use doc && java-pkg_dohtml -r javadoc/*
 
 	if use examples; then
diff --git a/net-misc/minisip/ChangeLog b/net-misc/minisip/ChangeLog
index 5d7a4324f8b7..73b18fdfe41b 100644
--- a/net-misc/minisip/ChangeLog
+++ b/net-misc/minisip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/minisip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minisip/ChangeLog,v 1.1 2005/06/02 01:25:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minisip/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org> minisip-0.7.0.ebuild:
+  added >=media-libs/libsamplerate-0.1.1-r1 DEPENDENCY as per bug #103225
+  thanks to Georg Sauthoff
 
 *minisip-0.7.0 (02 Jun 2005)
 
diff --git a/net-misc/minisip/Manifest b/net-misc/minisip/Manifest
index d8d2ecaec703..2641b4a1cba6 100644
--- a/net-misc/minisip/Manifest
+++ b/net-misc/minisip/Manifest
@@ -1,5 +1,15 @@
-MD5 f485fd4c41d53461fea8531469a4eb71 minisip-0.7.0.ebuild 1187
-MD5 8b80ac84b09053678d3fcdb3167e1d89 ChangeLog 354
-MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
-MD5 66f9e462eae33c5d64ba4ccefa07cc5c files/minisip-no-qtgui.patch 2868
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0ddf714cc80ca2d51ca745dddc260511 ChangeLog 624
 MD5 e6ba36dc5f1ea211ef790b0deb4e0c6a files/digest-minisip-0.7.0 65
+MD5 66f9e462eae33c5d64ba4ccefa07cc5c files/minisip-no-qtgui.patch 2868
+MD5 d620cd424e6c6553736cc5304899deae metadata.xml 253
+MD5 e0d181daa14518130b5b18cd6d07839e minisip-0.7.0.ebuild 1329
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDdyWEmdTrptrqvGERAgIEAJsErNwpBPmrXRG9QKUiVyWD/cP9HACdH+C7
+yvWyL0xByta8LvqgjnjOslM=
+=Fqi7
+-----END PGP SIGNATURE-----
diff --git a/net-misc/minisip/minisip-0.7.0.ebuild b/net-misc/minisip/minisip-0.7.0.ebuild
index 2ff61cafbdae..0403726cf36b 100644
--- a/net-misc/minisip/minisip-0.7.0.ebuild
+++ b/net-misc/minisip/minisip-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/net-misc/minisip/minisip-0.7.0.ebuild,v 1.1 2005/06/02 01:25:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minisip/minisip-0.7.0.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 inherit eutils
 
@@ -17,6 +17,7 @@ DEPEND=">=dev-libs/openssl-0.9.6d
 		~net-misc/libmnetutil-0.3.0
 		~net-misc/libmikey-0.4.0
 		~net-misc/libmsip-0.3.0
+		>=media-libs/libsamplerate-0.1.1-r1
 		alsa? ( >=media-libs/alsa-lib-1 )
 		gtk? ( >=dev-cpp/libglademm-2.0 )"
 
diff --git a/net-misc/mirror/ChangeLog b/net-misc/mirror/ChangeLog
index 439858eda62a..13c73689f39f 100644
--- a/net-misc/mirror/ChangeLog
+++ b/net-misc/mirror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mirror
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirror/ChangeLog,v 1.1 2003/08/22 11:33:32 mcummings Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirror/ChangeLog,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> mirror-2.9.ebuild:
+  Stable on alpha.
 
 *mirror-2.9 (22 Aug 2003)
 
diff --git a/net-misc/mirror/Manifest b/net-misc/mirror/Manifest
index 4dc8f20a0b86..83f0f28a0a7f 100644
--- a/net-misc/mirror/Manifest
+++ b/net-misc/mirror/Manifest
@@ -1,3 +1,4 @@
-MD5 9daf256bbaff939167b51ebe93980d51 mirror-2.9.ebuild 969
-MD5 6b984d38b2bd4623c01cfc7f5a9337e2 files/mirror-2.9-gentoo.diff 620
+MD5 cb458acaac18cc0f420a0e61d94c29f6 ChangeLog 628
+MD5 f600693f0870f73026c77fdcca3a8beb mirror-2.9.ebuild 1074
 MD5 cdab24634c7164f11ad0b9b396449eff files/digest-mirror-2.9 62
+MD5 6b984d38b2bd4623c01cfc7f5a9337e2 files/mirror-2.9-gentoo.diff 620
diff --git a/net-misc/mirror/mirror-2.9.ebuild b/net-misc/mirror/mirror-2.9.ebuild
index c29a280321b4..1e0f73ca3789 100644
--- a/net-misc/mirror/mirror-2.9.ebuild
+++ b/net-misc/mirror/mirror-2.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/net-misc/mirror/mirror-2.9.ebuild,v 1.1 2003/08/22 11:33:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirror/mirror-2.9.ebuild,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,8 @@ HOMEPAGE="http://sunsite.org.uk/packages/mirror/"
 SRC_URI="ftp://sunsite.org.uk/packages/mirror/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc"
+KEYWORDS="~x86 alpha ~sparc ~ppc"
+IUSE=""
 
 S=${WORKDIR}
 
@@ -29,7 +30,7 @@ ${S}
 EOC
 }
 
-src_install() {   
+src_install() {
 	dodir /etc/mirror
 	insinto /etc/mirror
 	doins mirror.defaults packages/sunsite.org.uk
diff --git a/net-misc/mknbi/ChangeLog b/net-misc/mknbi/ChangeLog
index 1dcf330b9d3a..0c43b3bf34fc 100644
--- a/net-misc/mknbi/ChangeLog
+++ b/net-misc/mknbi/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for net-misc/mknbi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.1 2002/12/13 17:01:06 mholzer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
-  13 Dec 2002; Martin Holzer <mholzer@gentoo.org> mknbi-1.2.10.ebuild files/digest-mknbi-1.2.10 Changelog
+  30 May 2005; Danny van Dyk <kugelfang@gentoo.org> mknbi-1.4.3.ebuild:
+  Fixed deprecated usage of gcc.eclass. (BUG #92745)
+
+  17 Apr 2005; <solar@gentoo.org> +files/mknbi-1.4.3-nossp.patch,
+  mknbi-1.4.3.ebuild:
+  - corrected compile problems when using pie or ssp while building this package
+
+  23 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org> mknbi-1.4.3.ebuild:
+  Fixed gcc-3.4 compile issues. Thanks to Mark Loeser <halcyon@whiterapid.com>
+  in Bug 64049
+
+  25 Apr 2004; Jon Hood <squinky86@gentoo.org> mknbi-1.4.0.ebuild,
+  mknbi-1.4.1.ebuild, mknbi-1.4.3.ebuild:
+  added "die"
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> mknbi-1.2.11.ebuild,
+  mknbi-1.2.12.ebuild, mknbi-1.4.0.ebuild, mknbi-1.4.1.ebuild,
+  mknbi-1.4.3.ebuild:
+  fix depend (bug #45110); tidy
+
+*mknbi-1.4.3 (08 Dec 2003)
+
+  08 Dec 2003; Martin Holzer <mholzer@gentoo.org> mknbi-1.4.3.ebuild:
+  Version bumped.
+
+*mknbi-1.2.12 (20 Jul 2003)
+
+  20 Jul 2003; Martin Holzer <mholzer@gentoo.org> mknbi-1.2.12.ebuild,
+  mknbi-1.4.1.ebuild:
+  Version bumped.
+
+*mknbi-1.4.0 (01 Mar 2003)
+
+  01 Mar 2003; Martin Holzer <mholzer@gentoo.org> mknbi-1.4.0.ebuild
+  files/digest-mknbi-1.4.0 ChangeLog :
+  Version bumped. Submitted in #16362.
+  
+
+*mknbi-1.2.11.ebuild (25 Dec 2002)
+
+  25 Dec 2002; Martin Holzer <mholzer@gentoo.org> knbi-1.2.11.ebuild files/digest-mknbi-1.2.11 ChangeLog :
+  Version pumped, fixed dependency. Closes #12446.
+
+*mknbi-1.2.10.ebuild (13 Dec 2002)
+
+  13 Dec 2002; Martin Holzer <mholzer@gentoo.org> mknbi-1.2.10.ebuild files/digest-mknbi-1.2.10 Changelog :
   Initial Version. 
diff --git a/net-misc/mknbi/Manifest b/net-misc/mknbi/Manifest
index e69de29bb2d1..73d775cbff58 100644
--- a/net-misc/mknbi/Manifest
+++ b/net-misc/mknbi/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f753ebd29690d305edf094cf62024a4 ChangeLog 1784
+MD5 0cefd24cbde09be9558582aa580b5e92 mknbi-1.2.11.ebuild 870
+MD5 a3a1403ba800b2b1ff9cee7d56af7347 mknbi-1.2.12.ebuild 871
+MD5 0018b82355f92f489a46c370c7f99034 mknbi-1.4.0.ebuild 733
+MD5 7ed4ecca75cd040c4d6766a28c666cf8 mknbi-1.4.1.ebuild 711
+MD5 a39f5d5775f290a6880eb1fa95ebf33a mknbi-1.4.3.ebuild 1083
+MD5 febff7af7446b0484f11f6a4274e6590 files/digest-mknbi-1.2.11 61
+MD5 febff7af7446b0484f11f6a4274e6590 files/digest-mknbi-1.2.12 61
+MD5 5907f8ed1ed6b036f9ce50c8e0d09636 files/digest-mknbi-1.4.0 63
+MD5 aa0982b30b1c97a47e4ac96ef0031ad1 files/digest-mknbi-1.4.1 63
+MD5 1835145d0916ad9628e9341502071873 files/digest-mknbi-1.4.3 63
+MD5 dc84e8754114dacfcab0eb3615b5caad files/mknbi-1.4.3-nossp.patch 511
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCm1ye5mJXAu5GbtIRAvyhAJwP3l/R57eGrqmlEzEENWjTEmxHtgCfUs2+
+mxZnCA3cl17+NpZkqvyB+gA=
+=AHJG
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mknbi/mknbi-1.2.11.ebuild b/net-misc/mknbi/mknbi-1.2.11.ebuild
index c00df832a115..e3c4442f2f84 100644
--- a/net-misc/mknbi/mknbi-1.2.11.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.11.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.1 2002/12/25 18:37:12 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.11.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
-LICENSE="GPL2"
+LICENSE="GPL-2"
 SLOT="0"
 
 SRC_FILE="mknbi-1.2.tar.gz"
 SRC_URI="mirror://sourceforge/etherboot/${SRC_FILE}"
 
 KEYWORDS="x86"
-IUSE="perl"
+IUSE=""
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
@@ -21,16 +21,15 @@ DEPEND=">=perl-5.6.1
 
 S="${WORKDIR}/mknbi-1.2"
 
-src_unpack() { 
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "test" > __abcdir
-        mv Makefile Makefile.org
-        cat Makefile.org | sed s/"\/usr\/local"/"\/usr"/ > Makefile
-
+	mv Makefile Makefile.org
+	cat Makefile.org | sed s/"\/usr\/local"/"\/usr"/ > Makefile
 }
 
-src_compile() 
+src_compile()
 {
 	make all || die
 }
@@ -40,4 +39,3 @@ src_install()
 	export BUILD_ROOT=${D}
 	make install || die
 }
-
diff --git a/net-misc/mknbi/mknbi-1.2.12.ebuild b/net-misc/mknbi/mknbi-1.2.12.ebuild
index af899fa5da6c..0344736e2f7a 100644
--- a/net-misc/mknbi/mknbi-1.2.12.ebuild
+++ b/net-misc/mknbi/mknbi-1.2.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/net-misc/mknbi/mknbi-1.2.12.ebuild,v 1.1 2003/07/19 20:04:43 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.2.12.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 HOMEPAGE="http://etherboot.sourceforge.net"
@@ -11,9 +11,9 @@ SRC_FILE="mknbi-1.2.tar.gz"
 SRC_URI="mirror://sourceforge/etherboot/${SRC_FILE}"
 
 KEYWORDS="~x86"
-IUSE="perl"
+IUSE=""
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
@@ -21,16 +21,15 @@ DEPEND=">=perl-5.6.1
 
 S="${WORKDIR}/mknbi-1.2"
 
-src_unpack() { 
+src_unpack() {
 	unpack ${A}
 	cd ${S}
 	echo "test" > __abcdir
-        mv Makefile Makefile.org
-        cat Makefile.org | sed s/"\/usr\/local"/"\/usr"/ > Makefile
-
+	mv Makefile Makefile.org
+	cat Makefile.org | sed s/"\/usr\/local"/"\/usr"/ > Makefile
 }
 
-src_compile() 
+src_compile()
 {
 	make all || die
 }
@@ -40,4 +39,3 @@ src_install()
 	export BUILD_ROOT=${D}
 	make install || die
 }
-
diff --git a/net-misc/mknbi/mknbi-1.4.0.ebuild b/net-misc/mknbi/mknbi-1.4.0.ebuild
index 10759f60ccf4..b18589b6baaa 100644
--- a/net-misc/mknbi/mknbi-1.4.0.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.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-misc/mknbi/mknbi-1.4.0.ebuild,v 1.1 2003/03/01 23:28:34 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.0.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
@@ -9,13 +9,12 @@ HOMEPAGE="http://etherboot.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
-S="${WORKDIR}/${P}"
-
-src_compile() 
+src_compile()
 {
 	mv Makefile Makefile.org
 	cat Makefile.org | sed s/"\/usr\/local"/"\/usr"/ > Makefile
@@ -26,6 +25,5 @@ src_install()
 {
 	export BUILD_ROOT=${D}
 	dodoc COPYING
-	make DESTDIR=${D} install || "Installing failed"
+	make DESTDIR=${D} install || die "Installing failed"
 }
-
diff --git a/net-misc/mknbi/mknbi-1.4.1.ebuild b/net-misc/mknbi/mknbi-1.4.1.ebuild
index 9b59da866f39..a88a63846ff3 100644
--- a/net-misc/mknbi/mknbi-1.4.1.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.1.ebuild,v 1.1 2003/07/19 20:04:43 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.1.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://etherboot.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
-S="${WORKDIR}/${P}"
-
-src_compile() 
+src_compile()
 {
-	mv Makefile Makefile.org
-	cat Makefile.org | sed s/"\/usr\/local"/"\/usr"/ > Makefile
+	sed -i -e "s:\/usr\/local:\/usr:"  Makefile
 	emake || die "Compile failed"
 }
 
@@ -26,6 +25,5 @@ src_install()
 {
 	export BUILD_ROOT=${D}
 	dodoc COPYING
-	make DESTDIR=${D} install || "Installing failed"
+	make DESTDIR=${D} install || die "Installing failed"
 }
-
diff --git a/net-misc/mknbi/mknbi-1.4.3.ebuild b/net-misc/mknbi/mknbi-1.4.3.ebuild
index 85dc8f71ca2b..8234879032e7 100644
--- a/net-misc/mknbi/mknbi-1.4.3.ebuild
+++ b/net-misc/mknbi/mknbi-1.4.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.3.ebuild,v 1.1 2003/12/08 12:34:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.3.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Utility for making tagged kernel images useful for netbooting"
 SRC_URI="mirror://sourceforge/etherboot/${P}.tar.gz"
@@ -10,15 +12,28 @@ HOMEPAGE="http://etherboot.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	dev-lang/nasm"
 
-S="${WORKDIR}/${P}"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/mknbi-1.4.3-nossp.patch
+}
 
 src_compile()
 {
 	sed -i -e "s:\/usr\/local:\/usr:"  Makefile
+
+	#apply modifications to CFLAGS to fix for gcc 3.4: bug #64049
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		sed -i -e "s:\-mcpu:\-mtune:" Makefile
+		sed -i -e "s:CFLAGS=:CFLAGS= -minline-all-stringops:" Makefile
+	fi
+
 	emake || die "Compile failed"
 }
 
@@ -26,6 +41,5 @@ src_install()
 {
 	export BUILD_ROOT=${D}
 	dodoc COPYING
-	make DESTDIR=${D} install || "Installing failed"
+	make DESTDIR=${D} install || die "Installing failed"
 }
-
diff --git a/net-misc/mmsclient/ChangeLog b/net-misc/mmsclient/ChangeLog
index a60e81432ca5..d445e49d8cdb 100644
--- a/net-misc/mmsclient/ChangeLog
+++ b/net-misc/mmsclient/ChangeLog
@@ -1,9 +1,38 @@
 # ChangeLog for net-misc/mmsclient
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/ChangeLog,v 1.1 2002/03/01 21:29:58 chouser Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/ChangeLog,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
+  29 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  mmsclient-0.0.3-r1.ebuild:
+  Marked ~ppc-macos (bug #107933)
+
+  31 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/mmsclient-0.0.3-fbsd.patch, mmsclient-0.0.3-r1.ebuild:
+  Add patch from FreeBSD.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> mmsclient-0.0.3-r1.ebuild,
+  mmsclient-0.0.3.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> mmsclient-0.0.3-r1.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mmsclient-0.0.3-r1.ebuild:
+  Add inherit eutils
+
+*mmsclient-0.0.3-r1 (26 Apr 2004)
+
+  26 Apr 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  mmsclient-0.0.3-r1.ebuild, mmsclient-0.0.3.ebuild,
+  files/mmsclient-0.0.3-r1.patch:
+  Big patch courtesy of siefkenj@onid.oregonstate.edu in bug #48188
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *mmsclient-0.0.3 (01 Mar 2002)
 
-  01 Mar 2002; Chris Houser <chouser@gentoo.org> :
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> mmsclient-0.0.3.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
 
+  01 Mar 2002; Chris Houser <chouser@gentoo.org> :
   First Gentoo package of a simple tool for downloading mms-protocol streams
diff --git a/net-misc/mmsclient/Manifest b/net-misc/mmsclient/Manifest
index e69de29bb2d1..35a69f5dcb4e 100644
--- a/net-misc/mmsclient/Manifest
+++ b/net-misc/mmsclient/Manifest
@@ -0,0 +1,8 @@
+MD5 c82d75c37493bfd2485164709cc74d20 mmsclient-0.0.3.ebuild 709
+MD5 78091657aad047c8875f845c759e7358 ChangeLog 1411
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 0a9767d1c7e24e5db6d27757a78e0a7a mmsclient-0.0.3-r1.ebuild 767
+MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3 68
+MD5 468ee33577278f11595cad8dc2f89fdf files/digest-mmsclient-0.0.3-r1 68
+MD5 1c904575316d5ddd46b55d8d400468b0 files/mmsclient-0.0.3-r1.patch 3784
+MD5 8b1f4c95b4b13abd91d2c7c4ba51ea23 files/mmsclient-0.0.3-fbsd.patch 1087
diff --git a/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild b/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
index 4ed5ca6e2764..1a31aa98b5b2 100644
--- a/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
+++ b/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild
@@ -1,37 +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/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild,v 1.1 2004/04/26 06:51:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
-include eutils
+inherit eutils
 
-S=${WORKDIR}/mms_client-${PV}
 DESCRIPTION="mms protocol download utility"
-SRC_URI="http://www.geocities.com/majormms/mms_client-${PV}.tar.gz"
 HOMEPAGE="http://www.geocities.com/majormms/"
+SRC_URI="http://www.geocities.com/majormms/mms_client-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc-macos ~sparc ~x86"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/gcc
 	sys-devel/automake
 	sys-devel/autoconf"
+DEPEND="virtual/libc"
 
-DEPEND="virtual/glibc"
-
-KEYWORDS="~x86 ~sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
+S=${WORKDIR}/mms_client-${PV}
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/${PF}.patch
+	epatch ${FILESDIR}/${P}-fbsd.patch
 }
 
-src_compile() {
-	econf || die
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc COPYING
+src_install() {
+	make DESTDIR=${D} install || die
 }
diff --git a/net-misc/mmsclient/mmsclient-0.0.3.ebuild b/net-misc/mmsclient/mmsclient-0.0.3.ebuild
index 16103124a399..3fc7eb181d75 100644
--- a/net-misc/mmsclient/mmsclient-0.0.3.ebuild
+++ b/net-misc/mmsclient/mmsclient-0.0.3.ebuild
@@ -1,12 +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/net-misc/mmsclient/mmsclient-0.0.3.ebuild,v 1.1 2002/03/01 21:29:58 chouser Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mmsclient/mmsclient-0.0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 S=${WORKDIR}/mms_client-${PV}
+IUSE=""
 DESCRIPTION="mms protocol download utility"
 SRC_URI="http://www.geocities.com/majormms/mms_client-${PV}.tar.gz"
 HOMEPAGE="http://www.geocities.com/majormms/"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+KEYWORDS="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
 
 src_compile() {
 	./configure \
diff --git a/net-misc/ndtpd/ChangeLog b/net-misc/ndtpd/ChangeLog
index 68c871ebd8f2..fa33c99e0d71 100644
--- a/net-misc/ndtpd/ChangeLog
+++ b/net-misc/ndtpd/ChangeLog
@@ -1,9 +1,37 @@
 # ChangeLog for net-misc/ndtpd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.1 2003/09/01 12:26:25 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
+
+  02 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> ndtpd-3.1.5.ebuild:
+  Don't use /bin/false as shell for ndtpuser user. Use -1 instead.
+
+  19 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> ndtpd-3.1.5.ebuild:
+  Marked as ~amd64.
+
+  18 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> ndtpd-3.1.5.ebuild:
+  Changed /sbin/nologin to /bin/false; /sbin/nologin no longer exists.
+
+  28 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> ndtpd-3.1.5.ebuild:
+  Moved enew* to pkg_setup(); see bug #58526
+
+  14 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> ndtpd-3.1.5.ebuild:
+  Changed uid.gid separator to :, closing bug #38038
+
+  04 Jan 2004; <usata@gentoo.org> ndtpd-3.1.5.ebuild:
+  Fixed compile bug when >=dev-libs/eb-4.0
 
 *ndtpd-3.1.5 (01 Sep 2003)
 
+  26 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> files/ndtpd.initd:
+  Changed need net to use net, see bug #33161
+
+  18 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
+  ndtpd-3.1.5.ebuild:
+  Marked as stable. Changed herd from cjk to no-herd
+
+  11 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> ndtpd-3.1.5.ebuild:
+  Changed default uid:gid of ndtpd to 402
+
   01 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> ndtpd-3.1.5.ebuild,
   files/ndtpd.initd:
   Initial import.  Thanks to jargon-san at GentooJP BugTrack.
diff --git a/net-misc/ndtpd/Manifest b/net-misc/ndtpd/Manifest
index 9a7f4f3028bd..24dc5774cdbe 100644
--- a/net-misc/ndtpd/Manifest
+++ b/net-misc/ndtpd/Manifest
@@ -1,3 +1,16 @@
-MD5 e49a490451384eded60241170914bebc ndtpd-3.1.5.ebuild 1430
-MD5 fa24ad84fecba69ce647c3f8d98234d1 files/ndtpd.initd 586
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1c27f624ac9441f5c8facefb718dc0fc ChangeLog 1460
 MD5 c50d3bad7e4228c971eeb2507f0de06f files/digest-ndtpd-3.1.5 63
+MD5 6b62661262cdfe606b598f57f9249a52 files/ndtpd-3.1.5-eb4-gentoo.diff 658
+MD5 55c0139b320c6367cf6b91e65d0511bc files/ndtpd.initd 663
+MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
+MD5 1fcc4386de0cab3130a1a903365579db ndtpd-3.1.5.ebuild 1450
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDP/ORj5H05b2HAEkRAn4yAJ4xQJ6fZlspTGMrRfibWwiJloPRBwCeMCpC
+8RY3gbj8XF1IL8k3qGE+9jI=
+=JOpE
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ndtpd/files/ndtpd.initd b/net-misc/ndtpd/files/ndtpd.initd
index 2785f2aa2e8e..2df8c40a90d7 100644
--- a/net-misc/ndtpd/files/ndtpd.initd
+++ b/net-misc/ndtpd/files/ndtpd.initd
@@ -1,12 +1,12 @@
 #!/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-misc/ndtpd/files/ndtpd.initd,v 1.1 2003/09/01 12:26:25 usata Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/files/ndtpd.initd,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 opts="${opts} reload"
 
 depend() {
-	need net
+	use net
 }
 
 start() {
diff --git a/net-misc/ndtpd/metadata.xml b/net-misc/ndtpd/metadata.xml
index 2d5852c16c60..23d9f0beb302 100644
--- a/net-misc/ndtpd/metadata.xml
+++ b/net-misc/ndtpd/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>cjk</herd>
+<herd>no-herd</herd>
+<maintainer>
+  <email>usata@gentoo.org</email>
+  <name>Mamoru KOMACHI</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/ndtpd/ndtpd-3.1.5.ebuild b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
index cbc3f1f0efb8..b1bfa8fea6a5 100644
--- a/net-misc/ndtpd/ndtpd-3.1.5.ebuild
+++ b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
@@ -1,26 +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/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.1 2003/09/01 12:26:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 inherit eutils
 
 IUSE=""
 
-DESCRIPTION="A server for accessing CD-ROM books with NDTP(Network Directory Transfer Protocol)" 
+DESCRIPTION="A server for accessing CD-ROM books with NDTP(Network Directory Transfer Protocol)"
 HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/ndtpd/"
 SRC_URI="ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
-DEPEND=">=dev-libs/eb-3
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+RDEPEND=">=dev-libs/eb-3
 	>=sys-libs/zlib-1.1.3-r2"
 
-S="${WORKDIR}/${P}"
+pkg_setup() {
+	# this is required; src_install() needs ndtpuser:ndtpgrp
+	enewgroup ndtpgrp 402
+	enewuser ndtpuser 402 -1 /usr/share/dict ndtpgrp
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-eb4-gentoo.diff
+}
 
 src_compile() {
 
+	autoconf || die
+
 	econf --with-eb-conf=/etc/eb.conf || die
 	emake || die
 }
@@ -29,24 +44,12 @@ src_install() {
 
 	einstall || die
 
-	# getent doesn't exist on FreeBSD system
-	if ! $(cut -d':' -f3 /etc/group | grep 2010 >/dev/null 2>&1) ; then
-		enewgroup ndtpgrp 2010
-	else
-		enewgroup ndtpgrp
-	fi
-
-	if ! $(cut -d':' -f3 /etc/passwd | grep 2010 >/dev/null 2>&1) ; then
-		enewuser ndtpuser 2010 /bin/false /usr/share/dict ndtpgrp
-	else
-		enewuser ndtpuser -1 /bin/false /usr/share/dict ndtpgrp
-	fi
-
 	if ! $(grep 2010/tcp /etc/services >/dev/null 2>&1) ; then
 		cp /etc/services ${T}/services
 		cat >>${T}/services<<-EOF
 		ndtp		2010/tcp			# Network Dictionary Transfer Protocol
 		EOF
+		insinto /etc
 		doins ${T}/services
 	fi
 
@@ -57,7 +60,7 @@ src_install() {
 	newins ndtpd.conf{.sample,}
 
 	keepdir /var/lib/ndtpd
-	fowners ndtpuser.ndtpgrp /var/lib/ndtpd
+	fowners ndtpuser:ndtpgrp /var/lib/ndtpd
 	fperms 4710 /var/lib/ndtpd
 
 	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* UPGRADE*
diff --git a/net-misc/nemesis/ChangeLog b/net-misc/nemesis/ChangeLog
index 08be50a2091b..1145c88f08c1 100644
--- a/net-misc/nemesis/ChangeLog
+++ b/net-misc/nemesis/ChangeLog
@@ -1,10 +1,39 @@
 # ChangeLog for net-misc/nemesis
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/ChangeLog,v 1.1 2002/04/23 19:43:58 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/ChangeLog,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
-*nemesis-1.32.ebuild (23 Apr 2002)
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> nemesis-1.4_beta3.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
 
-  23 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-  
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> nemesis-1.4_beta3.ebuild:
+  change virtual/glibc to virtual/libc
+
+  06 Jun 2004; Daniel Black <dragonheart@gentoo.org> nemesis-1.4_beta3.ebuild:
+  QA - IUSE
+
+  06 May 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/nemesis-1.32-gentoo.diff, -nemesis-1.32.ebuild:
+  Removed old version to fix bug #50070 - thanks to James Cook
+  <james.cook@utoronto.ca>
+
+*nemesis-1.4_beta3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772 + version bump.
+
+*nemesis-1.32 (23 Apr 2002)
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> nemesis-1.32.ebuild:
+  Add ~alpha to KEYWORDS
+
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> nemesis-1.32.ebuild :
+  Corrected Homepage. Fixed Depend to libnet-1.0*. Closes #17017.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  08 Jul 2002; phoen][x <phoenix@gentoo.org> nemesis-1.32.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  23 Apr 2002; Donny Davies <woodchip@gentoo.org> :  
   Initial package, thanks goto Alexander Gretencord <arutha@gmx.de>
   for the contribution.  Thanks Alexander! ;)
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index e69de29bb2d1..ba1f423fcd0d 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -0,0 +1,5 @@
+MD5 462db0283e063be2cc7684dfd8433c29 ChangeLog 1534
+MD5 c4f1be478113eb35fae101c8391a7f36 nemesis-1.4_beta3.ebuild 794
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 6ef15c54cfa32b816e14908e1e4f5547 files/1.4_beta3-libnet-1.0.patch 6121
+MD5 85e8def3255d1e5e66b19814b338bb21 files/digest-nemesis-1.4_beta3 68
diff --git a/net-misc/nemesis/nemesis-1.4_beta3.ebuild b/net-misc/nemesis/nemesis-1.4_beta3.ebuild
index 4f7c14268d8e..8b262b73a9b5 100644
--- a/net-misc/nemesis/nemesis-1.4_beta3.ebuild
+++ b/net-misc/nemesis/nemesis-1.4_beta3.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-misc/nemesis/nemesis-1.4_beta3.ebuild,v 1.1 2003/08/21 04:58:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/nemesis-1.4_beta3.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 inherit eutils
 
@@ -10,10 +10,10 @@ SRC_URI="http://www.packetfactory.net/Projects/nemesis/${P/_}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="alpha amd64 sparc x86"
+IUSE=""
 
-RDEPEND="virtual/glibc
-	>=net-libs/libpcap-0.6.2-r1"
+RDEPEND="virtual/libpcap"
 DEPEND="${RDEPEND}
 	>=net-libs/libnet-1.0.2a-r3
 	<net-libs/libnet-1.1"
@@ -22,16 +22,11 @@ S=${WORKDIR}/${P/_}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
-}
-
-src_compile() {
-	econf || die
-	emake || die "compile problem"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-libnet-1.0.patch
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc ChangeLog README
 }
diff --git a/net-misc/neon/ChangeLog b/net-misc/neon/ChangeLog
index 2d3878f075cc..35f0d925a882 100644
--- a/net-misc/neon/ChangeLog
+++ b/net-misc/neon/ChangeLog
@@ -1,13 +1,209 @@
 # ChangeLog for net-misc/neon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
-*neon-0.15.3-r1 (1 Feb 2002)
+  14 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> neon-0.24.7.ebuild:
+  0.24.7 stable on mips.
+
+*neon-0.25.3 (10 Sep 2005)
+
+  10 Sep 2005; Daniel Black <dragonheart@gentoo.org> -neon-0.21.3.ebuild,
+  -neon-0.23.8.ebuild, -neon-0.23.9.ebuild, -neon-0.24.0.ebuild,
+  -neon-0.24.2.ebuild, -neon-0.24.4.ebuild, -neon-0.24.5.ebuild,
+  -neon-0.24.6.ebuild, +neon-0.25.3.ebuild:
+  version bump. remove old and security vulnerable versions
+
+  29 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> neon-0.24.7.ebuild:
+  Added ~mips.
+
+  20 Jul 2005; Andrej Kacian <ticho@gentoo.org> neon-0.24.7.ebuild:
+  Commented out the darwin sed call for now. Bug #99647.
+
+  19 Jul 2005; Kito <kito@gentoo.org> neon-0.24.7.ebuild:
+  fix for shared library on Darwin
+
+  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> neon-0.24.7.ebuild:
+  Stable on ppc64
+
+  04 Nov 2004; Aron Griffis <agriffis@gentoo.org> neon-0.24.7.ebuild:
+  add ia64 keyword
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> neon-0.24.7.ebuild:
+  Marked ~ppc64; bug #63683
+
+  01 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> neon-0.24.6.ebuild,
+  neon-0.24.7.ebuild:
+  Added to ~ppc-macos; bug #58811.
+
+  23 Jul 2004; Travis Tilley <lv@gentoo.org> neon-0.24.7.ebuild:
+  stable on amd64
+
+  23 Jul 2004; Guy Martin <gmsoft@gentoo.org> neon-0.24.7.ebuild:
+  Marked stable on hppa.
+
+  23 Jul 2004; Bryan Østergaard,,, <kloeri@gentoo.org> neon-0.24.7.ebuild:
+  Stable on alpha, see bug #57747.
+
+  20 Jul 2004; Stuart Herbert <stuart@gentoo.org> neon-0.24.7.ebuild:
+  Stable on x86
+
+  20 Jul 2004; Ciaran McCreesh <ciaranm@gentoo.org> neon-0.24.7.ebuild:
+  Stable on sparc for bug #57747
+
+*neon-0.24.7 (20 Jul 2004)
+
+  20 Jul 2004; Stuart Herbert <stuart@gentoo.org> +neon-0.24.7.ebuild:
+  Version bump; required by subversion-1.0.6
+
+  02 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> neon-0.24.6.ebuild:
+  Stable on sparc at klieber's request
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> neon-0.24.6.ebuild:
+  stable on alpha
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> neon-0.24.6.ebuild:
+  Keyworded ~alpha, requested in bug #51550.
+
+  20 May 2004; Michael McCabe <randy@gentoo.org> neon-0.24.6.ebuild:
+  Marked stable on s390
+
+*neon-0.24.6 (19 May 2004)
+
+  19 May 2004; Paul de Vrieze <pauldv@gentoo.org> +neon-0.24.6.ebuild:
+  New version with security fixes
+
+  13 May 2004; Michael McCabe <randy@gentoo.org> neon-0.24.5.ebuild:
+  Added s390 keywords
+
+  27 Apr 2004; Travis Tilley <lv@gentoo.org> neon-0.24.5.ebuild:
+  stable on amd64
+
+*neon-0.24.5 (27 Apr 2004)
+
+  27 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> +neon-0.24.5.ebuild:
+  New upstream version with SECURITY fixes. Updating is highly recommended
+
+  26 Apr 2004; Paul de Vrieze <pauldv@gentoo.org> neon-0.24.4.ebuild:
+  Mark stable so that subversion can be marked stable
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> neon-0.23.8.ebuild,
+  neon-0.23.9.ebuild, neon-0.24.0.ebuild, neon-0.24.2.ebuild,
+  neon-0.24.4.ebuild:
+  Add die following econf for bug 48950
+
+  22 Jan 2004; <augustus@gentoo.org> neon-0.24.4.ebuild:
+  Added ~amd64 keyword.
+
+*neon-0.24.4 (13 Dec 2003)
+
+  13 Dec 2003; <paul@gentoo.org> neon-0.24.4.ebuild:
+  Add a new version, with some fixes based on bug #32232. patch slightly adapted
+  from a patch by Jani Averbach <jaa@iki.fi>
+
+  28 Nov 2003; Jason Wever <weeve@gentoo.org> neon-0.24.2.ebuild:
+  Added ~sparc keyword.
+
+  09 Nov 2003; David Holm <dholm@gentoo.org> neon-0.24.2.ebuild:
+  Added to ~ppc.
+
+*neon-0.24.2 (27 Sep 2003)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  27 Sep 2003; Paul de Vrieze <pauldv@gentoo.org> metadata.xml,
+  neon-0.24.2.ebuild:
+  Version bump as subversion needs 0.24.2
+
+*neon-0.24.0 (26 Sep 2003)
+
+  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> neon-0.24.0.ebuild:
+  Version bumped.
+
+*neon-0.23.9 (17 Aug 2003)
+
+  17 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> neon-0.23.8.ebuild,
+  neon-0.23.9.ebuild:
+  Add new upstream version that could probably fix some pkg-config bugs
+
+  17 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> neon-0.23.8.ebuild:
+  Mark neon stable as it is needed for subversion to become stable
+
+  31 May 2003; root <root@gentoo.org> neon-0.21.3.ebuild, neon-0.23.2.ebuild,
+  neon-0.23.3.ebuild, neon-0.23.5.ebuild, neon-0.23.8.ebuild:
+  ppc keyworded where necessary
+
+*neon-0.23.8 (15 Mar 2003)
+
+  15 Mar 2003; Alain Penders <alain@gentoo.org> neon-0.23.8.ebuild: Version bump, needed for subversion.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*neon-0.23.5 (15 Nov 2002)
+
+  15 Nov 2002; Karl Trygve (karltk@gentoo.org) neon-0.23.5.ebuild files/digest-neon-0.23.5 :
+  The version below was never committed, so I made a new one. Fixes #10721.
+
+  2 Nov 2002; Joshua Brindle (method@gentoo.org) neon-0.23.5.ebuild files/digest-neon-0.23.3 :
+  Added zlib support, new upstream version
+
+*neon-0.23.3 (26 Oct 2002)
+
+  26 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> neon-0.23.3.ebuild files/digest-neon-0.23.3 :
+  New upstream version.
+
+*neon-0.23.2 (18 Oct 2002)
+
+  18 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> neon-0.23.2.ebuild files/digest-neon-0.23.2 :
+  New upstream version.
+
+*neon-0.21.3 (14 Jul 2002)
+
+  14 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> neon-0.21.3.ebuild :
+  New upstream version.
+  Old versions 0.15.3-r1, 0.18.5, 0.19.2-r1, 0.19.2, 0.21.1 removed.
+
+*neon-0.21.1 (06 Jun 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> neon-0.19.2.ebuild :
+  Added KEYWORDS.
+
+  06 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> neon-0.21.1.ebuild :
+  Bumped to new version
+
+*neon-0.19.2-r1 (29 Oct 2002)
+
+  23 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> neon-0.19.2-r1.ebuild:
+  Unmasked neon-0.19.2 as subversion-0.10_pre1 is marked stable.
+
+  29 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> neon-0.19.2-r1.ebuild files/digest-neon-0.19.2-r1 :
+  Resurrected, so that subversion may work.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> neon-0.19.2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+*neon-0.19.2 (26 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> neon-0.19.2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  26 Feb 2002; G.Bevin <gbevin@gentoo.org> neon-0.19.2.ebuild, files/digest-neon-0.19.2 :
+
+  upgraded version to latest release  
+  
+*neon-0.18.5 (8 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> neon-0.18.5.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  8 Feb 2002; G.Bevin <gbevin@gentoo.org> neon-0.18.5.ebuild, files/digest-neon-0.18.5 :
+
+  upgraded version to latest release  
   
-  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.
+*neon-0.15.3-r1 (1 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> neon-0.15.3-r1.ebuild:
+  Added KEYWORDS, LICENSE, SLOT.
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
+  Added initial ChangeLog.
diff --git a/net-misc/neon/Manifest b/net-misc/neon/Manifest
index 97c1d2a950d5..de400ac9b602 100644
--- a/net-misc/neon/Manifest
+++ b/net-misc/neon/Manifest
@@ -1,13 +1,16 @@
-MD5 16956eb01eea2bee8dd366cd09994e48 ChangeLog 2643
-MD5 af336c2953cd60c6704138c51af11ff3 neon-0.19.2-r1.ebuild 901
-MD5 bc7e3c0a22b60ec07269856eb9ebd749 neon-0.21.3.ebuild 755
-MD5 f0cb3f0b658eaade4c9c0c74124d2285 neon-0.23.2.ebuild 745
-MD5 d5d1888ecd4f97f40a42c1a8e92eccf6 neon-0.23.3.ebuild 745
-MD5 c1f26dfbb98d29cb0c67133ce13837d7 neon-0.23.5.ebuild 757
-MD5 7cfc001baf264da2acc2dda766cde5e4 neon-0.23.8.ebuild 756
-MD5 8914729fa6c883b6ced95f393d56661c files/digest-neon-0.19.2-r1 63
-MD5 5a576942b2663898889c1239a5bec804 files/digest-neon-0.21.3 63
-MD5 45261a70909be9985d4469024297c42f files/digest-neon-0.23.2 63
-MD5 ab3549eb79b0038efdf679c12018e98a files/digest-neon-0.23.3 63
-MD5 6cea88da4c863e32f3ed07f3dd32e40f files/digest-neon-0.23.5 63
-MD5 e6994eafdacea2341c0b293f12a27e4c files/digest-neon-0.23.8 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 797b5fc3f40d9c99f837a18ec3bb46ab ChangeLog 6969
+MD5 2ae7200538068877dd6268e6a69a3c67 metadata.xml 635
+MD5 9a28876fe08f3e1b1832667a058f5fa5 neon-0.25.3.ebuild 1408
+MD5 189bd504f32f8d2e283701567c61c37d neon-0.24.7.ebuild 1042
+MD5 f4c20c929f124bfab9c6c66cddd7c210 files/digest-neon-0.25.3 63
+MD5 839f25b6c4eb84ed2157cd2904daf5b0 files/digest-neon-0.24.7 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDKLZSEZCkKN40op4RAjMuAKCcga0iK/tPQ965csEnwAJ/H9358wCeMP5q
+DJIswkw2ggV3gFVBS41k7FI=
+=qbtg
+-----END PGP SIGNATURE-----
diff --git a/net-misc/neon/neon-0.24.7.ebuild b/net-misc/neon/neon-0.24.7.ebuild
index 9bcc8fee80bb..c1a915d143d4 100644
--- a/net-misc/neon/neon-0.24.7.ebuild
+++ b/net-misc/neon/neon-0.24.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.24.7.ebuild,v 1.1 2004/07/20 19:28:55 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.24.7.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 DESCRIPTION="HTTP and WebDAV client library"
 HOMEPAGE="http://www.webdav.org/neon/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="ssl zlib expat"
 
 DEPEND="expat? ( dev-libs/expat )
@@ -16,13 +16,21 @@ DEPEND="expat? ( dev-libs/expat )
 	ssl? ( >=dev-libs/openssl-0.9.6f )
 	zlib? ( sys-libs/zlib )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use userland_Darwin ; then
+		sed -i -e "s:GXX:GCC:g" configure || die "sed failed"
+	fi
+}
+
 src_compile() {
 	local myc=""
 	use expat && myc="$myc --with-expat" || myc="$myc --with-xml2"
 	econf \
 		--enable-shared \
-		`use_with ssl` \
-		`use_with zlib` \
+		$(use_with ssl) \
+		$(use_with zlib) \
 		${myc} \
 		|| die "econf failed"
 	emake
diff --git a/net-misc/neon/neon-0.25.3.ebuild b/net-misc/neon/neon-0.25.3.ebuild
index 1753b8751ee8..6c8e986512c5 100644
--- a/net-misc/neon/neon-0.25.3.ebuild
+++ b/net-misc/neon/neon-0.25.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.25.3.ebuild,v 1.1 2005/09/10 08:08:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.25.3.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 DESCRIPTION="HTTP and WebDAV client library"
 HOMEPAGE="http://www.webdav.org/neon/"
diff --git a/net-misc/netcomics-cvs/ChangeLog b/net-misc/netcomics-cvs/ChangeLog
index a9c02219ed73..5385722ad2f1 100644
--- a/net-misc/netcomics-cvs/ChangeLog
+++ b/net-misc/netcomics-cvs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/netcomics-cvs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netcomics-cvs/ChangeLog,v 1.1 2003/10/06 10:44:56 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netcomics-cvs/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 *netcomics-cvs-0.14.1 (06 Oct 2003)
 
diff --git a/net-misc/netcomics-cvs/Manifest b/net-misc/netcomics-cvs/Manifest
index f3e73bba8c38..825505be75ef 100644
--- a/net-misc/netcomics-cvs/Manifest
+++ b/net-misc/netcomics-cvs/Manifest
@@ -1,3 +1,4 @@
-MD5 777752e9965ed9530c778a4563001f79 netcomics-cvs-0.14.1.ebuild 1124
-MD5 78b2485684ee80e083bc5b57fed18608 ChangeLog 303
+MD5 19214deece1612b1e59a3cc8cd0f5940 ChangeLog 391
+MD5 0d853c14d9f204860b9944c91b426a93 metadata.xml 628
+MD5 11f316b5044ec021a3c36133525160df netcomics-cvs-0.14.1.ebuild 1164
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-netcomics-cvs-0.14.1 0
diff --git a/net-misc/netcomics-cvs/netcomics-cvs-0.14.1.ebuild b/net-misc/netcomics-cvs/netcomics-cvs-0.14.1.ebuild
index c1ff701d9ec2..0bf4f1baf71a 100644
--- a/net-misc/netcomics-cvs/netcomics-cvs-0.14.1.ebuild
+++ b/net-misc/netcomics-cvs/netcomics-cvs-0.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netcomics-cvs/netcomics-cvs-0.14.1.ebuild,v 1.1 2003/10/06 10:44:56 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netcomics-cvs/netcomics-cvs-0.14.1.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 inherit cvs perl-module
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://netcomics.sourceforge.net"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="${DEPEND}
 	dev-perl/libwww-perl
diff --git a/net-misc/netdate/ChangeLog b/net-misc/netdate/ChangeLog
index c573fd3cd650..f1ab411c9d6d 100644
--- a/net-misc/netdate/ChangeLog
+++ b/net-misc/netdate/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-misc/netdate
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netdate/ChangeLog,v 1.1 2004/05/21 16:28:07 jhhudso Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netdate/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+  12 Feb 2005; Jared Hudson <jhhudso@gentoo.org> netdate-1.2.ebuild:
+  Marked netdate-1.2 as stable for all architectures.
+
+  06 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> netdate-1.2.ebuild:
+  Cleanup the ebuild, and add ~mips because I'm using this on the XXS1500.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netdate-1.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+*netdate-1.2 (26 May 2004)
+
+  26 May 2004; Jason Wever <weeve@gentoo.org> netdate-1.2.ebuild:
+  Added ~sparc keyword.
 
   21 May 2004; Jared Hudson <jhhudso@gentoo.org> :
   Initial import.
diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest
index 1ea70d47f240..908f82a203cb 100644
--- a/net-misc/netdate/Manifest
+++ b/net-misc/netdate/Manifest
@@ -1,8 +1,14 @@
-MD5 8fed9a009b429d4eea9d6c35980177fd netdate-1.2.ebuild~ 493
-MD5 4db4f1e009c18b7d0b46e95f8cd79ac9 netdate-1.2.ebuild 494
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b637341fa420d798062922bc7f6711f0 netdate-1.2.ebuild 624
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 39b06044c6e21a2a86019d496a32466d ChangeLog 775
 MD5 29edee867ca109ed22b4158b7be37109 files/digest-netdate-1.2 62
-MD5 95d0d10b1e2d552f888fe057836c946b tmp/netdate/Makefile 191
-MD5 2a7abe8da1d129c5b0ad9014d9c1cdf6 tmp/netdate/COPYRIGHT 1446
-MD5 d6d8cc5be9a5da48ebbcab9f6d37d965 tmp/netdate/netdate.8 5210
-MD5 5172c7830cada9fea2f5b21cde68dfa9 tmp/netdate/README 542
-MD5 6460cf904f3b464acfe291055ca02123 tmp/netdate/netdate.c 14079
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCvm+NgIKl8Uu19MoRAmjmAJ9qzA0FET6CMh+btTvab71RUDgAUACggDAt
+16PNZMKgiBsRCmO18JtEhi0=
+=ly5c
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netdate/metadata.xml b/net-misc/netdate/metadata.xml
index c5d67a611520..5d9f5be9d49d 100644
--- a/net-misc/netdate/metadata.xml
+++ b/net-misc/netdate/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>jhhudso@gentoo.org</email>
+  <email>robbat2@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/netdate/netdate-1.2.ebuild b/net-misc/netdate/netdate-1.2.ebuild
index eee5fe17850d..d9e68bf04360 100644
--- a/net-misc/netdate/netdate-1.2.ebuild
+++ b/net-misc/netdate/netdate-1.2.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/net-misc/netdate/netdate-1.2.ebuild,v 1.1 2004/05/21 16:28:07 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netdate/netdate-1.2.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 DESCRIPTION="A Utility to synchronize the time with ntp-servers"
-SRC_URI="mirror://netdate-${PV}.tar.bz2"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="amd64 mips sparc x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
 
 src_compile() {
-	cd ${WORKDIR}/netdate
 	emake || die "make failed"
 }
 
 src_install() {
-	cd ${WORKDIR}/netdate
-	dobin netdate
+	dobin netdate || die
 	doman netdate.8
-	dodoc README COPYRIGHT
-}
\ No newline at end of file
+	dodoc README
+}
diff --git a/net-misc/netgo/ChangeLog b/net-misc/netgo/ChangeLog
index 844842e8944b..d9f97237958a 100644
--- a/net-misc/netgo/ChangeLog
+++ b/net-misc/netgo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/netgo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netgo/ChangeLog,v 1.1 2005/01/29 14:32:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netgo/ChangeLog,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> netgo-0.5.ebuild:
+  Fix qt dep
 
 *netgo-0.5 (29 Jan 2005)
 
diff --git a/net-misc/netgo/Manifest b/net-misc/netgo/Manifest
index f2259e1f7e42..f7664365d610 100644
--- a/net-misc/netgo/Manifest
+++ b/net-misc/netgo/Manifest
@@ -1,4 +1,4 @@
-MD5 362ad4fcbe4efd5d18d24c281508b0cb netgo-0.5.ebuild 497
-MD5 3450ec5fa53868d247a18a4d040d07c0 ChangeLog 336
+MD5 1ca1eae30e97b130d3b931b1d5fa22ae netgo-0.5.ebuild 589
+MD5 dcbb1dd1b3680fed477b8916c58339fe ChangeLog 500
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 743c78682164daa1bc0dde0fe1388890 files/digest-netgo-0.5 61
diff --git a/net-misc/netgo/netgo-0.5.ebuild b/net-misc/netgo/netgo-0.5.ebuild
index 3ec6563d2c7f..675def69696b 100644
--- a/net-misc/netgo/netgo-0.5.ebuild
+++ b/net-misc/netgo/netgo-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netgo/netgo-0.5.ebuild,v 1.1 2005/01/29 14:32:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netgo/netgo-0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
 inherit eutils kde
 need-qt 3
@@ -15,7 +15,7 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 
 SRC_URI="http://netgo.hjolug.org/files/v${PV}/${P}.tar.gz"
 
-DEPEND=">=x11-libs/qt-3
+DEPEND="=x11-libs/qt-3*
 	sys-apps/net-tools"
 
 src_install() {
diff --git a/net-misc/netkit-bootpd/ChangeLog b/net-misc/netkit-bootpd/ChangeLog
index 6d21318417fa..59d4694707c8 100644
--- a/net-misc/netkit-bootpd/ChangeLog
+++ b/net-misc/netkit-bootpd/ChangeLog
@@ -1,11 +1,30 @@
 # ChangeLog for net-misc/netkit-bootpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
+*netkit-bootpd-0.17-r2 (19 Sep 2004)
+
+  19 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/0.17-jumpstart.patch, +netkit-bootpd-0.17-r2.ebuild:
+  Patch applied to make this compatible with jumpstart. Patch by Steve-o
+  <fnjordy@gmail.com> in bug #63940
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *netkit-bootpd-0.17-r1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  24 Feb 2003; Nicholas Wourmsdragon@gentoo.org> netkit-bootpd-0.17-r1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org>
+  netkit-bootpd-0.17-r1.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-bootpd-0.17-r1.ebuild:
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest
index e69de29bb2d1..97fd251ea249 100644
--- a/net-misc/netkit-bootpd/Manifest
+++ b/net-misc/netkit-bootpd/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 db5ef69e9ee7206493923b7a3f0ba2d0 ChangeLog 1379
+MD5 0d1e04d4f16edae8ed199f5c24e49dc8 netkit-bootpd-0.17-r1.ebuild 888
+MD5 1f52cf064718cb294789545645a25d08 netkit-bootpd-0.17-r2.ebuild 1056
+MD5 0fff8ed5c4395d99043f3f50422826bb files/digest-netkit-bootpd-0.17-r1 78
+MD5 6d9cf6a3cff3c0b1c71ce938a7a5fc6a files/0.17-jumpstart.patch 1163
+MD5 0fff8ed5c4395d99043f3f50422826bb files/digest-netkit-bootpd-0.17-r2 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBTUZemdTrptrqvGERAqwjAJ9DWf9mAbHbqPqQLF5lFETBj5By9QCeKPdB
+ic42J50PmJ1k/PpqOiSNVVE=
+=tSt+
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1 b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
index fca493e92772..8c3a50839166 100644
--- a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
+++ b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
@@ -1 +1 @@
-MD5 00d211115b11aec2e214b701fe72f397 netkit-bootparamd-0.17.tar.gz
+MD5 00d211115b11aec2e214b701fe72f397 netkit-bootparamd_0.17.orig.tar.gz 13934
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
index c091e10f9332..510cee575b58 100644
--- a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
+++ b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
@@ -1,29 +1,30 @@
-# 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/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild,v 1.1 2000/08/09 22:58:28 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
-P=netkit-bootpd-0.17
-A=netkit-bootparamd-0.17.tar.gz
-S=${WORKDIR}/netkit-bootparamd-0.17
+MY_PN=${PN/pd/paramd}
+S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Netkit - bootp"
-CATEGORY=net-misc
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
+SRC_URI="mirror://debian/pool/main/n/netkit-bootparamd/${MY_PN}_${PV}.orig.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+
+KEYWORDS="x86 sparc ppc mips"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
 
 src_compile() {
-    ./configure                           
-    make
+	./configure || die
+	make || die
 }
 
-src_install() {                               
+src_install() {
 	into /usr
 	dosbin rpc.bootparamd/bootparamd
-	dosym  bootparamd /usr/sbin/rpc.bootparamd
-	doman  rpc.bootparamd/bootparamd.8
-	dosym  bootparamd.8.gz /usr/man/man8/rpc.bootparamd.8.gz
-	doman  rpc.bootparamd/bootparams.5
-	dodoc  README ChangeLog
+	dosym bootparamd /usr/sbin/rpc.bootparamd
+	doman rpc.bootparamd/bootparamd.8
+	dosym bootparamd.8.gz /usr/share/man/man8/rpc.bootparamd.8.gz
+	doman rpc.bootparamd/bootparams.5
+	dodoc README ChangeLog
 	newdoc rpc.bootparamd/README README.bootparamd
 }
-
-
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild
index 5d7134a41d95..af546346a236 100644
--- a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild
+++ b/net-misc/netkit-bootpd/netkit-bootpd-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-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild,v 1.1 2004/09/19 08:41:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/netkit-fingerd/ChangeLog b/net-misc/netkit-fingerd/ChangeLog
index 9b197edd7430..6a17b4125a82 100644
--- a/net-misc/netkit-fingerd/ChangeLog
+++ b/net-misc/netkit-fingerd/ChangeLog
@@ -1,11 +1,42 @@
 # ChangeLog for net-misc/netkit-fingerd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-fingerd/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-fingerd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  netkit-fingerd-0.17-r2.ebuild:
+  Add xinetd entry #43825 by Thomas Eckert.
+
+  23 Jul 2004; Tom Gall <tgall@gentoo.org> netkit-fingerd-0.17-r2.ebuild:
+  stable on ppc64, bug #57655
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  netkit-fingerd-0.17-r2.ebuild:
+  Stable on alpha.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *netkit-fingerd-0.17-r2 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org>
+  netkit-fingerd-0.17-r2.ebuild:
+  Add ~alpha to KEYWORDS
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-fingerd-0.17-r2.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  17 Aug 2002; Seemant Kulleen <seemant@gentoo.org>
+  netkit-fingerd-0.17-r2.ebuild :
+
+  Fixed the symlink to the manpage.  Thanks to: kevin@aptbasilicata.it
+  (Maurizio Disimino) in bug #6631
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-fingerd-0.17-r2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest
index e69de29bb2d1..2631c83fc143 100644
--- a/net-misc/netkit-fingerd/Manifest
+++ b/net-misc/netkit-fingerd/Manifest
@@ -0,0 +1,5 @@
+MD5 c02375d6d28dd9a7543c76a19f5bd03b ChangeLog 1756
+MD5 896b3f53c103633a0d1f91050c089690 netkit-fingerd-0.17-r2.ebuild 1048
+MD5 6072e5427208b1c8bcc8638ad35ed79e files/digest-netkit-fingerd-0.17-r2 71
+MD5 73bad964b46bf7b78d714568121d0ea6 files/netkit-fingerd-0.17-r2-gentoo.diff 603
+MD5 e15ba7285c1de6655afb00ad7d7ebfe6 files/fingerd.xinetd 250
diff --git a/net-misc/netkit-fingerd/files/digest-netkit-fingerd-0.17-r2 b/net-misc/netkit-fingerd/files/digest-netkit-fingerd-0.17-r2
index 1c94cbe5cd59..224af620cf48 100644
--- a/net-misc/netkit-fingerd/files/digest-netkit-fingerd-0.17-r2
+++ b/net-misc/netkit-fingerd/files/digest-netkit-fingerd-0.17-r2
@@ -1 +1 @@
-MD5 52bf281aac8814bf56cdc92f7661ee75 bsd-finger-0.17.tar.gz
+MD5 52bf281aac8814bf56cdc92f7661ee75 bsd-finger_0.17.orig.tar.gz 25521
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild
index 83463f544ef9..159cda064814 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild
@@ -1,36 +1,42 @@
-# 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/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild,v 1.1 2001/04/29 21:53:54 achim Exp $
-
-P=netkit-fingerd-0.17
-A=bsd-finger-0.17.tar.gz
-S=${WORKDIR}/bsd-finger-0.17
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-fingerd/netkit-fingerd-0.17-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
+
+inherit eutils
+
+MY_PN=${PN/netkit/bsd}
+MY_PN=${MY_PN/rd/r}
+S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Netkit - fingerd"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD"
+IUSE=""
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+SLOT="0"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/libc"
 
 src_unpack() {
-    unpack ${A}
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
-src_compile() {     
-    try ./configure
-    try make
+src_compile() {
+	./configure || die
+	make || die
 }
 
-src_install() {                               
+src_install() {
 	into /usr
-	dobin  finger/finger
-	dosbin fingerd/fingerd
-	dosym  fingerd /usr/sbin/in.fingerd
-	doman  finger/finger.1
-	doman  fingerd/fingerd.8
-	dosym  fingerd.8.gz /usr/man/man8/in.fingerd.8.gz
-	dodoc  README ChangeLog BUGS
+	dobin finger/finger || die
+	dosbin fingerd/fingerd || die
+	dosym fingerd /usr/sbin/in.fingerd
+	doman finger/finger.1 fingerd/fingerd.8
+	dosym fingerd.8.gz /usr/share/man/man8/in.fingerd.8.gz
+	dodoc README ChangeLog BUGS
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/fingerd.xinetd fingerd
 }
-
-
-
diff --git a/net-misc/netkit-routed/ChangeLog b/net-misc/netkit-routed/ChangeLog
index cfad82ea55d2..c3f66c6cf563 100644
--- a/net-misc/netkit-routed/ChangeLog
+++ b/net-misc/netkit-routed/ChangeLog
@@ -1,11 +1,35 @@
 # ChangeLog for net-misc/netkit-routed
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
+*netkit-routed-0.17-r3 (06 Jun 2003)
+
+  06 Jun 2003; Aron Griffis <agriffis@gentoo.org>
+  netkit-routed-0.17-r3.ebuild, files/routed.confd:
+  Change ROUTED_OPTS default to -q per Paul Moore
+
+*netkit-routed-0.17-r2 (23 May 2003)
+
+  23 May 2003; Aron Griffis <agriffis@gentoo.org>
+  netkit-routed-0.17-r2.ebuild, files/routed.confd, files/routed.initd:
+  Fix bug 21124 by adding alpha to KEYWORDS and providing an init script
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *netkit-routed-0.17-r1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-routed-0.17-r1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org>
+  netkit-routed-0.17-r1.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-routed-0.17-r1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/netkit-routed/Manifest b/net-misc/netkit-routed/Manifest
index a6f015ca83dc..d7931269d104 100644
--- a/net-misc/netkit-routed/Manifest
+++ b/net-misc/netkit-routed/Manifest
@@ -1,6 +1,9 @@
-MD5 32a8b07e14cacf6194a458d283d2f6b6 netkit-routed-0.17-r2.ebuild 1003
-MD5 56e2ab40195e216fa899d2859d35b9c4 ChangeLog 1122
-MD5 fbf0c63aedb19c64ede14b9dd56fc036 files/routed.confd 474
-MD5 70255e99c0d3f7754b010c583e71ce28 files/routed.initd 419
+MD5 47a8dfb6e603545df9dd942550628d5f netkit-routed-0.17-r2.ebuild 977
+MD5 7be8dca9ceb6bf795d3eee42aefd1a0b netkit-routed-0.17-r1.ebuild 796
+MD5 ba39e86dc9af237c207a2ee409f5cefd ChangeLog 1541
+MD5 686bc79a206334ad44fe85c6a9ece66c netkit-routed-0.17-r3.ebuild 977
+MD5 23b57d7da68a49560fb9cccfe629e26b files/routed.confd 793
+MD5 b0cc8b77e3d18d8b15da690fda4ae453 files/routed.initd 513
 MD5 d2b37fe233957364eb10712cef981573 files/digest-netkit-routed-0.17-r1 74
 MD5 d2b37fe233957364eb10712cef981573 files/digest-netkit-routed-0.17-r2 74
+MD5 d2b37fe233957364eb10712cef981573 files/digest-netkit-routed-0.17-r3 74
diff --git a/net-misc/netkit-routed/files/digest-netkit-routed-0.17-r1 b/net-misc/netkit-routed/files/digest-netkit-routed-0.17-r1
index 1b837fd1ca27..5ac45fad5be7 100644
--- a/net-misc/netkit-routed/files/digest-netkit-routed-0.17-r1
+++ b/net-misc/netkit-routed/files/digest-netkit-routed-0.17-r1
@@ -1 +1 @@
-MD5 3a9507876db23109be6d1f41ced5570a netkit-routed-0.17.tar.gz
+MD5 3a9507876db23109be6d1f41ced5570a netkit-routed_0.17.orig.tar.gz 36435
diff --git a/net-misc/netkit-routed/files/routed.confd b/net-misc/netkit-routed/files/routed.confd
index 19f5318898e5..cc46252590d8 100644
--- a/net-misc/netkit-routed/files/routed.confd
+++ b/net-misc/netkit-routed/files/routed.confd
@@ -1,13 +1,18 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/files/routed.confd,v 1.1 2003/05/24 03:21:28 agriffis Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/files/routed.confd,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 # Normally routed is simply run as "/usr/sbin/routed".  Set this
-# option to run routed with additional paramters, for example:
+# option to run routed with additional parameters, for example:
 #
 #   -d  Enable additional debugging information
 #   -s  Force routed to supply routing information
 #   -q  Opposite of the -s option
 #
 # Additional options are listed in the routed(8) manual page.
-ROUTED_OPTS=""
+#
+# Our default configuration is to run quietly, i.e. don't publish
+# routes.  This is to keep from catching users unaware since routed
+# will publish routes if there's more than one interface configured on
+# the machine.
+ROUTED_OPTS="-q"
diff --git a/net-misc/netkit-routed/files/routed.initd b/net-misc/netkit-routed/files/routed.initd
index 9b4d8d9c50f2..b24d7d575a3e 100644
--- a/net-misc/netkit-routed/files/routed.initd
+++ b/net-misc/netkit-routed/files/routed.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/files/routed.initd,v 1.1 2003/05/24 03:21:28 agriffis Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/files/routed.initd,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild
index c74a093c9f4b..2b8a180238c4 100644
--- a/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild
@@ -1,30 +1,29 @@
-# 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/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild,v 1.1 2000/08/09 22:58:28 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
-P=netkit-routed-0.17
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="Netkit - routed"
-CATEGORY=net-misc
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
+SRC_URI="mirror://debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
-src_compile() {  
-    ./configure                         
-    make
+KEYWORDS="x86 sparc ppc mips"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+
+src_compile() {
+	./configure || die
+	make || die
 }
 
-src_install() {                               
+src_install() {
 	into /usr
 	dosbin ripquery/ripquery
-	doman  ripquery/ripquery.8
+	doman ripquery/ripquery.8
 	dosbin routed/routed
 	dosym routed /usr/sbin/in.routed
-	doman  routed/routed.8
-	dosym routed.8.gz /usr/man/man8/in.routed.8.gz
-	dodoc  README ChangeLog
+	doman routed/routed.8
+	dosym routed.8.gz /usr/share/man/man8/in.routed.8.gz
+	dodoc README ChangeLog
 	newdoc routed/README README.routed
 }
-
-
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r2.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r2.ebuild
index 4fdb7ac15e5c..144716d631c1 100644
--- a/net-misc/netkit-routed/netkit-routed-0.17-r2.ebuild
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r2.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/net-misc/netkit-routed/netkit-routed-0.17-r2.ebuild,v 1.1 2003/05/24 03:21:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/netkit-routed-0.17-r2.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 DESCRIPTION="Netkit - routed"
-SRC_URI="http://ftp.debian.org/debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 KEYWORDS="x86 sparc ppc mips alpha"
+IUSE=""
 LICENSE="BSD"
 SLOT="0"
 
-src_compile() {  
+src_compile() {
 	./configure || die
 	make || die
 }
 
-src_install() {							   
+src_install() {
 	into /usr
 
 	# ripquery
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r3.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r3.ebuild
index 5bd82304f854..38f6ee8a96b6 100644
--- a/net-misc/netkit-routed/netkit-routed-0.17-r3.ebuild
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r3.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/net-misc/netkit-routed/netkit-routed-0.17-r3.ebuild,v 1.1 2003/06/06 11:59:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/netkit-routed-0.17-r3.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 DESCRIPTION="Netkit - routed"
-SRC_URI="http://ftp.debian.org/debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 KEYWORDS="x86 sparc ppc mips alpha"
+IUSE=""
 LICENSE="BSD"
 SLOT="0"
 
-src_compile() {  
+src_compile() {
 	./configure || die
 	make || die
 }
 
-src_install() {							   
+src_install() {
 	into /usr
 
 	# ripquery
diff --git a/net-misc/netkit-rsh/ChangeLog b/net-misc/netkit-rsh/ChangeLog
index 1163cf03fed5..3386318bd647 100644
--- a/net-misc/netkit-rsh/ChangeLog
+++ b/net-misc/netkit-rsh/ChangeLog
@@ -1,11 +1,119 @@
 # ChangeLog for net-misc/netkit-rsh
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> netkit-rsh-0.17-r6.ebuild:
+  Stable on mips, bug #93215.
+
+  22 May 2005; Olivier Crête <tester@gentoo.org> netkit-rsh-0.17-r6.ebuild:
+  Mark stable on x86 per security bug #93215
+
+*netkit-rsh-0.17-r7 (22 May 2005)
+
+  22 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/rexec.pamd-include, +files/rlogin.pamd-include,
+  +files/rsh.pamd-include, netkit-rsh-0.17-r6.ebuild,
+  +netkit-rsh-0.17-r7.ebuild:
+  Inherit pam for newpamd function. Added new revision with include syntax for
+  OpenPAM compatibility.
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> netkit-rsh-0.17-r6.ebuild:
+  Stable on ppc64; bug #93215
+
+  20 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  netkit-rsh-0.17-r6.ebuild:
+  Stable on sparc wrt #93215
+
+  20 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  netkit-rsh-0.17-r6.ebuild:
+  Stable on alpha, bug 93215.
+
+  20 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  netkit-rsh-0.17-r6.ebuild:
+  Stable on ppc.
+
+  20 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  netkit-rsh-0.17-r6.ebuild:
+  stable on amd64 wrt #93215
+
+*netkit-rsh-0.17-r6 (20 May 2005)
+
+  20 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netkit-rsh-0.10-stdarg.patch, +files/netkit-rsh-0.16-jbj.patch,
+  +files/netkit-rsh-0.16-jbj4.patch, +files/netkit-rsh-0.16-nokrb.patch,
+  +files/netkit-rsh-0.16-prompt.patch,
+  +files/netkit-rsh-0.16-rlogin=rsh.patch,
+  +files/netkit-rsh-0.17-chdir.patch, +files/netkit-rsh-0.17-checkdir.patch,
+  +files/netkit-rsh-0.17-errno.patch, +files/netkit-rsh-0.17-ignchld.patch,
+  +files/netkit-rsh-0.17-lfs.patch, +files/netkit-rsh-0.17-nohost.patch,
+  +files/netkit-rsh-0.17-nohostcheck.patch,
+  +files/netkit-rsh-0.17-pam-nologin.patch,
+  +files/netkit-rsh-0.17-pam-sess.patch,
+  +files/netkit-rsh-0.17-pre20000412-jbj5.patch,
+  +files/netkit-rsh-0.17-rexec.patch,
+  +files/netkit-rsh-0.17-rexec-netrc.patch,
+  +files/netkit-rsh-0.17-rexec-sig.patch,
+  +files/netkit-rsh-0.17-sectty.patch, +files/netkit-rsh-0.17-strip.patch,
+  +files/netkit-rsh-0.17-userandhost.patch, +files/redhat.spec,
+  +netkit-rsh-0.17-r6.ebuild:
+  Import patches from Redhat to resolve #93215.
+
+  08 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  netkit-rsh-0.17-r5.ebuild:
+  Added a patch to prevent from segfaulting on ppc. See bug #72359.
+
+  22 Jul 2004; Jon Portnoy <avenj@gentoo.org> netkit-rsh-0.17-r5.ebuild :
+  Optional PAM support from Christer Ekholm in bug #56503.
+
+  24 Apr 2004; Tom Gall <tgall@gentoo.org> netkit-rsh-0.17-r5.ebuild:
+  marked stable on ppc64
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> netkit-rsh-0.17-r5.ebuild:
+  mark stable on amd64
+
+*netkit-rsh-0.17-r5 (01 Aug 2003)
+
+  01 Aug 2003; Aron Griffis <agriffis@gentoo.org> netkit-rsh-0.17-r5.ebuild,
+  files/rexec.xinetd, files/rlogin.xinetd, files/rsh.xinetd:
+  Remove log_type specification to default to syslog
+
+*netkit-rsh-0.17-r4 (25 Jul 2003)
+
+  25 Jul 2003; Donny Davies <woodchip@gentoo.org> netkit-rsh-0.17-r2.ebuild,
+  netkit-rsh-0.17-r4.ebuild, files/rexec.pamd, files/rlogin.pamd,
+  files/rsh.pamd:
+  Moved the pam.d/ snips to this package from sys-libs/pam.
+
+*netkit-rsh-0.17-r3 (25 Oct 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-rsh-0.17-r3.ebuild :
+  Added mips to the keywords.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Inherit eutils to use epatch instead.  Also, changed sed expression
+  delimiters to : from /, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> netkit-rsh-0.17-r3.ebuild :
+  Add alpha to KEYWORDS
+
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> : Add xinetd.d/ configs; #9443.
 
 *netkit-rsh-0.17-r2 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-rsh-0.17-r2.ebuild :
+  Added mips to the keywords.
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> netkit-rsh-0.17-r2.ebuild :
+  Added ppc to KEYWORDS.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-rsh-0.17-r2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index e69de29bb2d1..b186cef4d809 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -0,0 +1,51 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d35953e8d20a584860aec805fb3176f netkit-rsh-0.17-r5.ebuild 1956
+MD5 1e651e3bb0dad06fc1d7a10db5b3e281 netkit-rsh-0.17-r7.ebuild 1724
+MD5 524b466dcb2793a0a08e77bb9956db67 netkit-rsh-0.17-r6.ebuild 1707
+MD5 7563e67d30d7fbb6a90d2ab5c16d413a ChangeLog 4765
+MD5 00dc5439d1237d8da5351107131d6e28 files/digest-netkit-rsh-0.17-r5 71
+MD5 63c48d7feff5c54b16aecf12626c293b files/netkit-rsh-0.17-pam-nologin.patch 531
+MD5 85d47a9df3698dfa22f21aa92c345902 files/rlogin.xinetd 282
+MD5 f1f297025fb545f4cf2dc02e6c63867f files/netkit-rsh-0.17-strip.patch 2459
+MD5 6bb199dffcf2c9f158ca571310bb5569 files/netkit-rsh-0.17-userandhost.patch 2188
+MD5 501cf426db7510decc4dee17b07c5ea2 files/rexec.xinetd 280
+MD5 5b6497e87f4d7de5851f57d8ba73d75b files/digest-netkit-rsh-0.17-r7 126
+MD5 59f1a214971eac5d5ccb239d131c3d50 files/netkit-rsh-0.17-rexec-sig.patch 531
+MD5 47b233c663e185795193bb878b3cad32 files/netkit-rsh-0.17-sectty.patch 1454
+MD5 d5a4e566c929a48240e3d7dffbb0660c files/netkit-rsh-0.17-nohost.patch 1647
+MD5 d369da65b87f3866ddb93e5aca52f712 files/rsh.pamd-include 412
+MD5 14c9e8ca2d9f8b9ae525e14fdd13df31 files/rlogind-auth.diff 260
+MD5 f60ba4a805df1970aa974b4bfd2e0b94 files/netkit-rsh-0.17-errno.patch 1301
+MD5 ec86ca590fe01a6337ac02dd0576e4d2 files/netkit-rsh-0.16-rlogin=rsh.patch 265
+MD5 49b955e20153259f348033f607b9cac8 files/netkit-rsh-0.10-stdarg.patch 952
+MD5 32b64fc78b0854585f06df0a540f0528 files/netkit-rsh-0.17-lfs.patch 774
+MD5 edac8eeb92441f7fbbe7fc3ba0f28e7b files/netkit-rsh-0.17-nohostcheck.patch 4385
+MD5 832c05ebc6e994b74d08bb648e54233f files/netkit-rsh-0.17-pre20000412-jbj5.patch 1003
+MD5 8115f8e19b1c44ef73362ab422bc001e files/rexec.pamd-include 303
+MD5 62db9f7ed41a99ff61980d853100f3a8 files/netkit-rsh-0.17-ignchld.patch 706
+MD5 849aa086002eda305d4d6d59a94fadd8 files/rexec.pamd 457
+MD5 bfd431692675af108693a643a4a7213f files/netkit-rsh-0.16-nokrb.patch 5117
+MD5 ec3d6de902670c90897507f4a098f668 files/rlogin.pamd 580
+MD5 aca6e5f8860ac79411a050072ba76b88 files/netkit-rsh-0.17-checkdir.patch 701
+MD5 645b699bd649a22d2d0ef57b0efd9e93 files/redhat.spec 805
+MD5 5b6497e87f4d7de5851f57d8ba73d75b files/digest-netkit-rsh-0.17-r6 126
+MD5 7b9d8d0930734500608538c166d0179a files/rsh.pamd 445
+MD5 153c322d0e2565819b3ed63a73dfcd32 files/netkit-rsh-0.17-rexec.patch 1615
+MD5 7581ec0ca6e11e19ea3957a842329253 files/netkit-rsh-0.17-rexec-netrc.patch 6852
+MD5 2c6b59c60e873a8bb3037837b5c4acfa files/netkit-rsh-0.16-prompt.patch 1145
+MD5 de71a64316c629deb1587a183526cd37 files/rlogin.pamd-include 386
+MD5 9b184bf125dc1c12dea5364f6aeb2f69 files/va_start.diff 569
+MD5 5374e29074410610466a46a367b1324e files/netkit-rsh-0.17-chdir.patch 1294
+MD5 97e5406e59c08d21c2b06f9de5b1731f files/netkit-rsh-0.16-jbj.patch 1105
+MD5 0586a4c1829df038be6179b9be20c458 files/rsh.xinetd 279
+MD5 177a1cdcf36f1c698b8e94ac8b6abfc7 files/netkit-rsh-0.16-jbj4.patch 314
+MD5 372cee3fa5d8ef96a745c2f82c6f5830 files/netkit-rsh-0.17-pam-sess.patch 498
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCk65gIKl8Uu19MoRAps1AJwLSNb1UJhQxZ4gciDlef+442bRMQCdGyaB
+ObCNvEB349iS/MN4PEYxGDs=
+=0W4u
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-rsh/files/netkit-rsh-0.17-rexec-netrc.patch b/net-misc/netkit-rsh/files/netkit-rsh-0.17-rexec-netrc.patch
index dcb9a772017f..b376b282909a 100644
--- a/net-misc/netkit-rsh/files/netkit-rsh-0.17-rexec-netrc.patch
+++ b/net-misc/netkit-rsh/files/netkit-rsh-0.17-rexec-netrc.patch
@@ -38,7 +38,7 @@
 + * from: @(#)ruserpass.c	5.3 (Berkeley) 3/1/91
 + */
 +char ruserpass_rcsid[] = 
-+  "$Id: netkit-rsh-0.17-rexec-netrc.patch,v 1.1 2005/05/20 03:04:31 vapier Exp $";
++  "$Id: netkit-rsh-0.17-rexec-netrc.patch,v 1.1.1.1 2005/11/30 09:54:45 chriswhite Exp $";
 +
 +#include <stdio.h>
 +#include <stdlib.h>
diff --git a/net-misc/netkit-rsh/files/rexec.xinetd b/net-misc/netkit-rsh/files/rexec.xinetd
index dcd4c4938abe..fea3710ec664 100644
--- a/net-misc/netkit-rsh/files/rexec.xinetd
+++ b/net-misc/netkit-rsh/files/rexec.xinetd
@@ -6,8 +6,6 @@ service exec
 	user            = root
 	group           = tty
 	server          = /usr/sbin/in.rexecd
-	server_args     =
-	log_type        = FILE /var/log/rsh
 	log_on_success  = PID HOST USERID EXIT DURATION
 	log_on_failure  = USERID ATTEMPT
 	disable         = yes
diff --git a/net-misc/netkit-rsh/files/rlogin.xinetd b/net-misc/netkit-rsh/files/rlogin.xinetd
index d3eae6250386..76a99beba8d1 100644
--- a/net-misc/netkit-rsh/files/rlogin.xinetd
+++ b/net-misc/netkit-rsh/files/rlogin.xinetd
@@ -6,8 +6,6 @@ service login
 	user            = root
 	group           = tty
 	server          = /usr/sbin/in.rlogind
-	server_args     =
-	log_type        = FILE /var/log/rsh
 	log_on_success  = PID HOST USERID EXIT DURATION
 	log_on_failure  = USERID ATTEMPT
 	disable         = yes
diff --git a/net-misc/netkit-rsh/files/rsh.xinetd b/net-misc/netkit-rsh/files/rsh.xinetd
index ea9e5484d38f..3d1fa6527943 100644
--- a/net-misc/netkit-rsh/files/rsh.xinetd
+++ b/net-misc/netkit-rsh/files/rsh.xinetd
@@ -6,8 +6,6 @@ service shell
 	user            = root
 	group           = tty
 	server          = /usr/sbin/in.rshd
-	server_args     =
-	log_type        = FILE /var/log/rsh
 	log_on_success  = PID HOST USERID EXIT DURATION
 	log_on_failure  = USERID ATTEMPT
 	disable         = yes
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild
index 011c8666382b..56643f423c61 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild
@@ -1,30 +1,34 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild,v 1.1 2003/08/01 17:38:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r5.ebuild,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
 
 inherit eutils
 
-IUSE=""
+IUSE="pam"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
-SRC_URI="http://ftp.debian.org/debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 sparc ppc alpha mips"
+KEYWORDS="x86 sparc ppc alpha mips amd64 ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.2
-	>=sys-libs/pam-0.72"
+	pam? ( >=sys-libs/pam-0.72 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	epatch ${FILESDIR}/rlogind-auth.diff
+
+	# See bug #72359
+	epatch ${FILESDIR}/va_start.diff
 }
 
 src_compile() {
-	./configure || die
+	local myconf
+	use pam || myconf="--without-pam"
+	./configure ${myconf} || die
 
 	cp MCONFIG MCONFIG.orig
 	sed -e "s:-pipe -O2:${CFLAGS}:" \
@@ -34,7 +38,7 @@ src_compile() {
 	make || die
 }
 
-src_install() {							   
+src_install() {
 	into /usr
 	dobin  rcp/rcp
 	fperms 4755 /usr/bin/rcp
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r6.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r6.ebuild
index cdfeedd232f9..30c0d6ed5c17 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r6.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r6.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-misc/netkit-rsh/netkit-rsh-0.17-r6.ebuild,v 1.1 2005/05/20 03:04:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r6.ebuild,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
 
-inherit eutils
+inherit eutils pam
 
 DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r7.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r7.ebuild
index fe11825c11b9..6405bbb60fb4 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r7.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-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-misc/netkit-rsh/netkit-rsh-0.17-r7.ebuild,v 1.1 2005/05/22 12:04:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r7.ebuild,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
 
 inherit eutils pam
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="pam"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-misc/netkit-rusers/ChangeLog b/net-misc/netkit-rusers/ChangeLog
index e654dac34e1c..a5c0f5e62db2 100644
--- a/net-misc/netkit-rusers/ChangeLog
+++ b/net-misc/netkit-rusers/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/netkit-rusers
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rusers/ChangeLog,v 1.1 2004/10/24 09:56:50 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rusers/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 *net-misc/netkit-rusers-0.17 (23 Oct 2004)
 
diff --git a/net-misc/netkit-rusers/Manifest b/net-misc/netkit-rusers/Manifest
index 7f4c550dd052..d1ed07405ce0 100644
--- a/net-misc/netkit-rusers/Manifest
+++ b/net-misc/netkit-rusers/Manifest
@@ -1,4 +1,14 @@
-MD5 0565d829bd90dcf2d107d01bd9afca51 ChangeLog 238
-MD5 43125b16293f64e6d3b9d81f59d13a3b netkit-rusers-0.17.ebuild 825
-MD5 ca0bf2a02b7d249dfe7269af1338ac5f metadata.xml 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8a038dc91c27f0188d155a422b6ffda5 ChangeLog 334
+MD5 b803ff607562c4f4147ecc614e9de897 netkit-rusers-0.17.ebuild 825
+MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
 MD5 20c458d0f64b02611926ee788d048e07 files/digest-netkit-rusers-0.17 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLcA1V3J2n04EauwRAmViAKCvFYwgS09z86YS+XjS6g0UwAVhaACfbZw7
+vMkv8Se/vvxrgNUXMpfVmVw=
+=Yb/p
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-rusers/metadata.xml b/net-misc/netkit-rusers/metadata.xml
index 036f9cf848a0..d52c9e243149 100644
--- a/net-misc/netkit-rusers/metadata.xml
+++ b/net-misc/netkit-rusers/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>net-misc</herd>
-<maintainer>
-  <email>wmertens@gentoo.org</email>
-</maintainer>
+<herd>maintainer-needed</herd>
 </pkgmetadata>
diff --git a/net-misc/netkit-rusers/netkit-rusers-0.17.ebuild b/net-misc/netkit-rusers/netkit-rusers-0.17.ebuild
index 6f37f893642f..7dcd6814b2c5 100644
--- a/net-misc/netkit-rusers/netkit-rusers-0.17.ebuild
+++ b/net-misc/netkit-rusers/netkit-rusers-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rusers/netkit-rusers-0.17.ebuild,v 1.1 2004/10/24 09:56:50 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rusers/netkit-rusers-0.17.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 DESCRIPTION="Netkit - rup rpc.rusersd rusers"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
diff --git a/net-misc/netkit-rwall/ChangeLog b/net-misc/netkit-rwall/ChangeLog
index c819a2501311..64da388cef27 100644
--- a/net-misc/netkit-rwall/ChangeLog
+++ b/net-misc/netkit-rwall/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for net-misc/netkit-rwall
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwall/ChangeLog,v 1.1 2004/10/23 17:27:58 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwall/ChangeLog,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
-*netkit-rwalld-0.17 (23 Oct 2004)
+  24 Oct 2004; Wout Mertens <wmertens@gentoo.org> netkit-rwall-0.17.ebuild:
+  Changed keywords to be only ~x86. Removed my fancy sed use (-i is not
+  supported on all sed versions). No revision bump since it does not impact
+  the program itself.
 
-  23 Oct 2004; Wout Mertens <wmertens@gentoo.org> netkit-rwalld-0.17.ebuild:
+*netkit-rwall-0.17 (23 Oct 2004)
+
+  23 Oct 2004; Wout Mertens <wmertens@gentoo.org> netkit-rwall-0.17.ebuild:
   Initial import. Ebuild submitted by I.Radusch <ilja@radusch.com>.
diff --git a/net-misc/netkit-rwall/Manifest b/net-misc/netkit-rwall/Manifest
index 0537bcf9b5f4..a7070c6b3fd8 100644
--- a/net-misc/netkit-rwall/Manifest
+++ b/net-misc/netkit-rwall/Manifest
@@ -1,6 +1,14 @@
-MD5 c548032e467142a1888c3c7c83b50304 ChangeLog 302
-MD5 53c11476ac2f2668f4c154c1d0055e44 metadata.xml 789
-MD5 5300f5123691ecfad4bd41cac6b659a8 netkit-rwall-0.17.ebuild 813
-MD5 d41d8cd98f00b204e9800998ecf8427e files/.digest-netkit-rwall-0.17 0
-MD5 f17673e602e59e7ffca34d620c9c4f08 files/digest-netkit-rwall-0.17-r1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab27b065b974028e9c857b952cbe9a9c netkit-rwall-0.17.ebuild 834
+MD5 61d2f0fc461d338d8cd43f13324d3ea7 ChangeLog 642
+MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
 MD5 f17673e602e59e7ffca34d620c9c4f08 files/digest-netkit-rwall-0.17 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLcB7V3J2n04EauwRAph4AJ41/osRYb7vKqprnZ+Jp9KadRmDNgCgvW4M
+VsHScSx2PyKo5fIW1QLPdxQ=
+=6Hul
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-rwall/metadata.xml b/net-misc/netkit-rwall/metadata.xml
index 9b148cad4968..d52c9e243149 100644
--- a/net-misc/netkit-rwall/metadata.xml
+++ b/net-misc/netkit-rwall/metadata.xml
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!-- 
-
-This is the example metadata file.
-The root element of this file is <pkgmetadata>. Within this element a 
-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/
-
-
-Before committing, please remove the comments from this file. They are 
-not relevant for general metadata.xml files.
--->
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
-</maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
+<herd>maintainer-needed</herd>
 </pkgmetadata>
diff --git a/net-misc/netkit-rwall/netkit-rwall-0.17.ebuild b/net-misc/netkit-rwall/netkit-rwall-0.17.ebuild
index 7efdbdb13533..58cc58d1daf7 100644
--- a/net-misc/netkit-rwall/netkit-rwall-0.17.ebuild
+++ b/net-misc/netkit-rwall/netkit-rwall-0.17.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwall/netkit-rwall-0.17.ebuild,v 1.1 2004/10/23 17:27:58 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwall/netkit-rwall-0.17.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
-#S=${WORKDIR}/netkit-rwall-${PV}
-#S=${WORKDIR}/${P}
 DESCRIPTION="Netkit - rwall"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="~x86"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
 
 DEPEND="virtual/libc"
-RDEPEND="virtual/libc"
 
 src_compile() {
 	./configure || die
-	sed -i~ -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG
-	make || die
+	mv MCONFIG MCONFIG.ori
+	sed -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG.ori > MCONFIG
+	emake || die
 }
 
-src_install() {                               
+src_install() {
 	into /usr
 	dobin  rwall/rwall
 	doman  rwall/rwall.1
diff --git a/net-misc/netkit-rwho/ChangeLog b/net-misc/netkit-rwho/ChangeLog
index 4ca91f514775..9bed366e1351 100644
--- a/net-misc/netkit-rwho/ChangeLog
+++ b/net-misc/netkit-rwho/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for net-misc/netkit-talk
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/ChangeLog,v 1.1 2003/05/22 21:06:17 mholzer Exp $
+# ChangeLog for net-misc/netkit-rwho
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+*netkit-rwho-0.17-r1 (05 Feb 2005)
+
+  05 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/netkit-rwho-0.17-tiny-packet-dos.patch,
+  +netkit-rwho-0.17-r1.ebuild, -netkit-rwho-0.17.ebuild:
+  Add patch to fix DoS #78371.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netkit-rwho-0.17.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> netkit-rwho-0.17.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> netkit-rwho-0.17.ebuild:
+  Add inherit eutils
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> netkit-rwho-0.17.ebuild:
+  adding s390 keywords
 
 *netkit-rwho-0.17 (22 May 2003)
 
diff --git a/net-misc/netkit-rwho/Manifest b/net-misc/netkit-rwho/Manifest
index 437dfb063a7e..f34a4dbd2e6e 100644
--- a/net-misc/netkit-rwho/Manifest
+++ b/net-misc/netkit-rwho/Manifest
@@ -1,4 +1,6 @@
-MD5 2c099418f5300e0a5c75e7d8d253739c netkit-rwho-0.17.ebuild 1437
+MD5 02c647322674035acab270d8fe10427c ChangeLog 1220
+MD5 f613f5046419a1577a9efccb54994819 netkit-rwho-0.17-r1.ebuild 1142
 MD5 25a5144430969258d0a607505ba7e00a files/netkit-rwho-0.17-gentoo.diff 1139
-MD5 4817c77ec114079b62c6825805637f78 files/digest-netkit-rwho-0.17 67
 MD5 fd330d52abc6a48b8e25ab058b39c2b5 files/netkit-rwho-0.17-rc 246
+MD5 90c2da8beb52736b4e4f7973e0b16489 files/netkit-rwho-0.17-tiny-packet-dos.patch 583
+MD5 4817c77ec114079b62c6825805637f78 files/digest-netkit-rwho-0.17-r1 67
diff --git a/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild b/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild
index 09e9490d86a4..4c1a8b1054da 100644
--- a/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild
+++ b/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild,v 1.1 2005/02/05 06:45:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rwho/netkit-rwho-0.17-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/netkit-talk/ChangeLog b/net-misc/netkit-talk/ChangeLog
index 11ff18adc58f..48555ae673d1 100644
--- a/net-misc/netkit-talk/ChangeLog
+++ b/net-misc/netkit-talk/ChangeLog
@@ -1,11 +1,71 @@
 # ChangeLog for net-misc/netkit-talk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Oct 2004; Markus Nigbur <pyrania@gentoo.org>
+  netkit-talk-0.17-r4.ebuild:
+  hooray for epatch!
+
+  05 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> netkit-talk-0.17-r4.ebuild:
+  Added amd64 keyword, closing #58831.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netkit-talk-0.17-r3.ebuild,
+  netkit-talk-0.17-r4.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  netkit-talk-0.17-r4.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> netkit-talk-0.17-r3.ebuild,
+  netkit-talk-0.17-r4.ebuild:
+  Add inherit eutils
+
+  03 Mar 2004; Jason Wever <weeve@gentoo.org> netkit-talk-0.17-r4.ebuild:
+  Stable on sparc.
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> :
+  add ~alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> netkit-talk-0.17-r4.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  17 Oct 2003; Nick Hadaway <raker@gentoo.org> netkit-talk-0.17-r4.ebuild:
+  marked stable for x86.
+
+*netkit-talk-0.17-r4 (17 Jun 2003)
+
+  17 Jun 2003; Guy ?artin <gmsoft@gentoo.org> netkit-talk-0.17-r4.ebuild,
+  files/netkit-talk-0.17-r3.diff, files/netkit-talk-0.17-ipv6.ebuild :
+  Added ipv6 support. Thanks to Andrey Ulanov <drey@rt.mipt.ru> for the bug report
+  and Sergey Ulanov for the patch.
+
+*netkit-talk-0.17-r3 (03 Apr 2003)
+
+  05 May 2003; Martin Holzer <mholzer@gentoo.org> files/talk.xinetd:
+  Change service name. closes #18251.
+
+  03 Apr 2003; Martin Holzer <mholzer@gentoo.org> netkit-talk-0.17-r3.ebuild,
+  files/netkit-talk-0.17-r3-gentoo.diff, files/talk.xinetd:
+  Added xinetd entry. Closes #18251.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *netkit-talk-0.17-r2 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-talk-0.17-r2.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-talk-0.17-r2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest
index ae6ee82d5758..567f4c8cd0ce 100644
--- a/net-misc/netkit-talk/Manifest
+++ b/net-misc/netkit-talk/Manifest
@@ -1,8 +1,9 @@
-MD5 cbe26444fc36f6389c8cdc78df354ec1 ChangeLog 1404
-MD5 dd8d06bfc5e845c7081f828055da7932 netkit-talk-0.17-r2.ebuild 1065
-MD5 51fbf326b4698a567c931cf721d804a0 netkit-talk-0.17-r3.ebuild 1131
-MD5 c2bea2eb9cd8008b29f499010a39c62e files/talk.xinetd 265
-MD5 3d0dd3176e4b560813366a5f3ec7e914 files/digest-netkit-talk-0.17-r2 68
-MD5 c6c3a77378ec32d3369c56827fdb9cdf files/netkit-talk-0.17-r2-gentoo.diff 274
+MD5 715ac030f285da43262ad15f592bf500 ChangeLog 2783
+MD5 f9741e7983e4fe51c414f040fcca811d netkit-talk-0.17-r3.ebuild 1091
+MD5 826446b1af5ce81d298ef61922750aed netkit-talk-0.17-r4.ebuild 1160
+MD5 c6c3a77378ec32d3369c56827fdb9cdf files/netkit-talk-0.17-r4-gentoo.diff 274
+MD5 3d0dd3176e4b560813366a5f3ec7e914 files/digest-netkit-talk-0.17-r4 68
 MD5 c6c3a77378ec32d3369c56827fdb9cdf files/netkit-talk-0.17-r3-gentoo.diff 274
+MD5 f1b37f406f793eec620d29d082d7bf7b files/netkit-talk-0.17-ipv6.diff 1752
 MD5 3d0dd3176e4b560813366a5f3ec7e914 files/digest-netkit-talk-0.17-r3 68
+MD5 c2bea2eb9cd8008b29f499010a39c62e files/talk.xinetd 265
diff --git a/net-misc/netkit-talk/files/digest-netkit-talk-0.17-r3 b/net-misc/netkit-talk/files/digest-netkit-talk-0.17-r3
index 5859522c2a3f..639c1820f9f2 100644
--- a/net-misc/netkit-talk/files/digest-netkit-talk-0.17-r3
+++ b/net-misc/netkit-talk/files/digest-netkit-talk-0.17-r3
@@ -1,5 +1 @@
-MD5 c7bf0043b05bcc450fe35cd1045bff21 /files/talk.xinetd 264
-MD5 c6c3a77378ec32d3369c56827fdb9cdf /files/netkit-talk-0.17-r2-gentoo.diff 274
-MD5 c6c3a77378ec32d3369c56827fdb9cdf /files/netkit-talk-0.17-r3-gentoo.diff 274
-MD5 b867c6c98380667c0f9a991bd5ab6924 /netkit-talk-0.17-r3.ebuild 1132
 MD5 e3c57208f8644ae206dab5e236daf7b3 netkit-ntalk-0.17.tar.gz 37396
diff --git a/net-misc/netkit-talk/files/talk.xinetd b/net-misc/netkit-talk/files/talk.xinetd
index 03da783bb37c..524282582b24 100644
--- a/net-misc/netkit-talk/files/talk.xinetd
+++ b/net-misc/netkit-talk/files/talk.xinetd
@@ -1,7 +1,7 @@
 # default: off
 # description: The talk server accepts talk requests for chatting with users \
 #	on other systems.
-service talk
+service ntalk
 {
 #	flags			= IPv4
 	disable			= yes
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r3.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r3.ebuild
index f299d8f61be2..d4e72a4871aa 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r3.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r3.ebuild
@@ -1,42 +1,44 @@
-# 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-misc/netkit-talk/netkit-talk-0.17-r3.ebuild,v 1.1 2003/04/03 18:20:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+inherit eutils
 
 MY_P=netkit-ntalk-${PV}
 S=${WORKDIR}/netkit-ntalk-${PV}
+IUSE=""
 DESCRIPTION="Netkit - talkd"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-KEYWORDS="x86 ppc sparc alpha mips"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="x86 ppc sparc alpha mips"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2"
 
 src_unpack() {
-    unpack ${A}
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_compile() {
-    try ./configure
-    cp MCONFIG MCONFIG.orig
-    sed -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
-    try make
+	./configure || die
+	cp MCONFIG MCONFIG.orig
+	sed -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
+	make || die
 }
 
-src_install() {                               
+src_install() {
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/talk.xinetd talk 
+	newins ${FILESDIR}/talk.xinetd talk
 	into /usr
-	dobin  talk/talk
-	doman  talk/talk.1
+	dobin talk/talk
+	doman talk/talk.1
 	dosbin talkd/talkd
-	dosym  talkd /usr/sbin/in.talkd
-	doman  talkd/talkd.8
-	dosym  talkd.8.gz /usr/share/man/man8/in.talkd.8.gz
-	dodoc  README ChangeLog BUGS
+	dosym talkd /usr/sbin/in.talkd
+	doman talkd/talkd.8
+	dosym talkd.8.gz /usr/share/man/man8/in.talkd.8.gz
+	dodoc README ChangeLog BUGS
 }
-
-
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild
index 7392707a80f7..93ed2f13d537 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild
@@ -1,45 +1,48 @@
-# 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-misc/netkit-talk/netkit-talk-0.17-r4.ebuild,v 1.1 2003/06/17 19:02:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+inherit eutils
 
 IUSE="ipv6"
+
 MY_P=netkit-ntalk-${PV}
 S=${WORKDIR}/netkit-ntalk-${PV}
+
 DESCRIPTION="Netkit - talkd"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="x86 ppc sparc alpha mips ~amd64"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2"
 
 src_unpack() {
-    unpack ${A}
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 	cd ${S}
-	use ipv6 && patch -p1 < ${FILESDIR}/${P}-ipv6.diff
+	use ipv6 && epatch ${FILESDIR}/${P}-ipv6.diff
 }
 
 src_compile() {
-    try ./configure
-    cp MCONFIG MCONFIG.orig
-    sed -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
-    try make
+	./configure || die
+	cp MCONFIG MCONFIG.orig
+	sed -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
+	make || die
 }
 
-src_install() {                               
+src_install() {
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/talk.xinetd talk 
+	newins ${FILESDIR}/talk.xinetd talk
 	into /usr
-	dobin  talk/talk
-	doman  talk/talk.1
+	dobin talk/talk
+	doman talk/talk.1
 	dosbin talkd/talkd
-	dosym  talkd /usr/sbin/in.talkd
-	doman  talkd/talkd.8
-	dosym  talkd.8.gz /usr/share/man/man8/in.talkd.8.gz
-	dodoc  README ChangeLog BUGS
+	dosym talkd /usr/sbin/in.talkd
+	doman talkd/talkd.8
+	dosym talkd.8.gz /usr/share/man/man8/in.talkd.8.gz
+	dodoc README ChangeLog BUGS
 }
-
-
diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index f72913e0961a..a0551877b54f 100644
--- a/net-misc/netkit-telnetd/ChangeLog
+++ b/net-misc/netkit-telnetd/ChangeLog
@@ -1,7 +1,145 @@
 # ChangeLog for net-misc/netkit-telnetd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
+  03 Apr 2005; Hardave Riar <hardave@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  Stable on mips, bug #87211.
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  stable on ia64
+
+  31 Mar 2005; Guy Martin <gmsoft@gentoo.org> netkit-telnetd-0.17-r6.ebuild:
+  Stable on hppa.
+
+  30 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  Stable on alpha, bug 87211.
+
+  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  Stable on sparc wrt #87211
+
+  30 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  Marked stable on amd64 wrt Security BUG #87211.
+
+  30 Mar 2005; Markus Rothe <corsair@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  Stable on ppc64; bug #87211
+
+  30 Mar 2005; Olivier Crête <tester@gentoo.org>
+  netkit-telnetd-0.17-r6.ebuild:
+  Stable on x86 per security bug #87211
+
+*netkit-telnetd-0.17-r6 (29 Mar 2005)
+
+  29 Mar 2005; <solar@gentoo.org> +netkit-telnetd-0.17-r6.ebuild:
+  - debian changes from 0.17-28: telnet/telnet.cc: Fixed buffer overflow in the
+  handling of the LINEMODE suboptions in telnet clients (CAN-2005-0469). Thanks
+  Martin 'Joey' Schulze for the patch.
+
+  14 Mar 2005; <solar@gentoo.org>
+  files/netkit-telnetd-0.17-cflags-gnu_source.patch:
+  - update gnu-cflags patch from bug 68679
+
+*netkit-telnetd-0.17-r5 (12 Mar 2005)
+
+  12 Mar 2005; <solar@gentoo.org> +netkit-telnetd-0.17-r5.ebuild:
+  - bump patch version. fixes debian bug #272312
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  netkit-telnetd-0.17-r4.ebuild:
+  Marked ppc64; bug #64632
+
+  06 Oct 2004; Guy Martin <gmsoft@gentoo.org> netkit-telnetd-0.17-r4.ebuild:
+  Stable on hppa.
+
+  04 Oct 2004; Simon Stelling <blubb@gentoo.org> :
+  Stable on amd64 wrt bug #64632
+
+  02 Oct 2004; Olivier Crete <tester@gentoo.org>
+  netkit-telnetd-0.17-r4.ebuild:
+  Stable on x86 wrt security bug #64632
+
+  02 Oct 2004; Jason Wever <weeve@gentoo.org> netkit-telnetd-0.17-r4.ebuild:
+  Stable on sparc wrt bug #64632.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  netkit-telnetd-0.17-r4.ebuild:
+  Stable on alpha, bug 64632.
+
+  02 Oct 2004; Joshua Kinard <kumba@gentoo.org> netkit-telnetd-0.17-r4.ebuild:
+  Marked stable on mips.
+
+  02 Oct 2004; <SeJo@gentoo.org> netkit-telnetd-0.17-r4.ebuild:
+  stable on ppc gsla bug: 64632
+
+  01 Oct 2004; <solar@gentoo.org>
+  files/netkit-telnetd-0.17-cflags-gnu_source.patch:
+  corrected netkit-telnetd-0.17-cflags-gnu_source.patch so that it behaves with
+  our initscripts etc.
+
+*netkit-telnetd-0.17-r4 (30 Sep 2004)
+
+  30 Sep 2004; <solar@gentoo.org> +metadata.xml,
+  +files/netkit-telnetd-0.17-cflags-gnu_source.patch,
+  +netkit-telnetd-0.17-r4.ebuild:
+  fix really old old telnetd security bugs. We now follow debs source lead for
+  netkit-telnetd. bug 64632
+
+*netkit-telnetd-0.17-r3 (1 May 2002)
+
+  09 Apr 2003; Martin Holzer <mholzer@gentoo.org> netkit-telnetd-0.17-r3.ebuild:
+  Corrected description. Closes #18965.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-telnetd-0.17-r3.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  23 Feb 2003; Guy Martin <gmsoft@gentoo.org> netkit-telnetd-0.17-r3.ebuild :
+  Added hppa to keywords.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  netkit-telnetd-0.17-r3.ebuild :
+
+  Sed expression delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  19 Jan 2003; Bob Johnson <livewire@gentoo.org> : make ebuild cp config file to /etc/xinetd.d  
+
+  16 Dec 2002; Donny Davies <woodchip@gentoo.org> : #11294.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  25 Oct 2002; Donny Davies <woodchip@gentoo.org> : Add xinetd config; #6507.
+
+  25 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added alpha to KEYWORDS
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-telnetd-0.17-r3.ebuild:
+  Added KEYWORDS, LICENSE, SLOT:
+
+  1 May 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  netkit-telnetd-0.17-r3.ebuild, files/digest-netkit-telnetd-0.17-r3,
+  files/net.issue.sample :
+
+  Resolves bug #1896 (added missing man page and add sample config)
+
+*netkit-telnetd-0.17-r2 (05 Apr 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-telnetd-0.17-r2.ebuild:
+  Added KEYWORDS, LICENSE, SLOT:
+
+  05 Apr 2002; G.Bevin <gbevin@gentoo.org> netkit-telnetd-0.17-r2.ebuil,
+  files/netkit-telnetd-0.17-gentoo.patch files/digest-netkit-telnetd-0.17-r2 :
+  
+  Global fixes to makefile inclusion and library linkage to make it compile
+  with gcc3.
+  
 *netkit-telnetd-0.17-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 45cb11f9c446..43f0b72d3529 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,6 +1,24 @@
-MD5 aaa72d5592a277aa428710aa12ee0798 ChangeLog 2416
-MD5 360dc7b48b0ae7b00fc24dba42f03255 netkit-telnetd-0.17-r3.ebuild 1483
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 52e0448fc3169d4271ca2725ab28b27c netkit-telnetd-0.17-r3.ebuild 1485
+MD5 e286a898f5dcedfd88328321001d9a17 netkit-telnetd-0.17-r5.ebuild 2217
+MD5 813c0a4e32a41651ad59a56a7dbe0b5c netkit-telnetd-0.17-r4.ebuild 2210
+MD5 6f3722f76ebfb7799b865fe5622f9a93 ChangeLog 5341
+MD5 18641d94839066e87b8be43bbb27fd47 metadata.xml 408
+MD5 414a322bf4261bda08e974ea54827724 netkit-telnetd-0.17-r6.ebuild 2217
+MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
 MD5 248ab0551e59a480cbe3d64657fa586f files/digest-netkit-telnetd-0.17-r3 70
-MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
+MD5 a766f52cf4ac7ed020e1c3ba2816f4e5 files/digest-netkit-telnetd-0.17-r4 143
+MD5 70a74deba066ae505a7ae79a04559986 files/digest-netkit-telnetd-0.17-r5 143
+MD5 999ed3fb65fa707dce76bca8f7f6727a files/digest-netkit-telnetd-0.17-r6 143
+MD5 7dbf060bb9168e5f98621fe7c13a4965 files/netkit-telnetd-0.17-cflags-gnu_source.patch 830
 MD5 d741260d55b46b1e6ae6cf923b4542e5 files/netkit-telnetd-0.17-gentoo.patch 3155
-MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
+MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCT9HZM+I1L6GK/u4RAjBsAJ9mv7X0/kf6jmsWVjysf14Xc5kSOwCghX1b
+0g9oD0Pru26oKzbFZ6XnT7Q=
+=Tsq+
+-----END PGP SIGNATURE-----
diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
index be6a9c1d81ab..1ebbda77c078 100644
--- a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
@@ -5,7 +5,19 @@
  CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \
  	   -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \
 -	   -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\"
-+	   -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\" -D_GNU_SOURCE
++	   -DLOGIN_WRAPPER=\"/usr/sbin/telnetlogin\" -D_GNU_SOURCE
  # LIBS += $(LIBTERMCAP)
  
  OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
+--- telnet/Makefile.orig    2004-11-01 15:23:29 -0500
++++ telnet/Makefile     2004-11-01 16:05:05 -0500
+@@ -6,7 +6,7 @@
+ #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS))
+ 
+ # -DAUTHENTICATE
+-CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE
++CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -D_GNU_SOURCE
+ LIBS = $(LIBTERMCAP)
+ 
+ SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \
+
diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch
index d8845baddef8..6a7a38f41d04 100644
--- a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch
@@ -37,7 +37,7 @@ diff -r -u netkit-telnet-0.17_orig/telnet/network.cc netkit-telnet-0.17/telnet/n
 +++ netkit-telnet-0.17/telnet/network.cc	2002-04-05 09:22:52.000000000 +0200
 @@ -37,6 +37,7 @@
  char net_rcsid[] = 
-   "$Id: netkit-telnetd-0.17-gentoo.patch,v 1.1 2002/04/05 07:48:02 gbevin Exp $";
+   "$Id: netkit-telnetd-0.17-gentoo.patch,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $";
  
 +#include <stdlib.h>
  #include <sys/types.h>
diff --git a/net-misc/netkit-telnetd/files/telnetd.xinetd b/net-misc/netkit-telnetd/files/telnetd.xinetd
index 25fcfb2bf3f7..63dd6dac9e7f 100644
--- a/net-misc/netkit-telnetd/files/telnetd.xinetd
+++ b/net-misc/netkit-telnetd/files/telnetd.xinetd
@@ -1,6 +1,5 @@
 service telnet
 {
-	type            = INTERNAL
 	flags           = REUSE
 	socket_type     = stream
 	wait            = no
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild
index b3c9b3de7dc9..a80ca8e91f32 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild
@@ -1,50 +1,59 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild,v 1.1 2002/05/02 05:09:56 mkennedy Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
-P2=netkit-telnet-${PV}
-S=${WORKDIR}/${P2}
-DESCRIPTION="Standard Linux telnet client"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P2}.tar.gz"
+inherit eutils
 
-DEPEND="virtual/glibc 
-	>=sys-libs/ncurses-5.2"
+DESCRIPTION="Standard Linux telnet client and server"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ppc64"
+IUSE="build"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	!net-misc/telnet-bsd"
+
+S=${WORKDIR}/netkit-telnet-${PV}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/netkit-telnetd-0.17-gentoo.patch || die
+	epatch ${FILESDIR}/netkit-telnetd-0.17-gentoo.patch
 }
 
-src_compile() {                           
+src_compile() {
 	./configure --prefix=/usr || die
-	cp MCONFIG MCONFIG.orig
-	sed -e "s/-pipe -O2/${CFLAGS}/" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
+
+	sed -i \
+		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "s:-Wpointer-arith::" \
+		MCONFIG
+
 	make || die
 	cd telnetlogin
 	make || die
 }
 
 src_install() {
-	into /usr
-	dobin telnet/telnet
+	dobin telnet/telnet || die
 	#that's it if we're going on a build image
-	use build && return
-	
-	dosbin telnetd/telnetd
+	use build && return 0
+
+	dosbin telnetd/telnetd || die
 	dosym telnetd /usr/sbin/in.telnetd
-	dosbin telnetlogin/telnetlogin
+	dosbin telnetlogin/telnetlogin || die
 	doman telnet/telnet.1
 	doman telnetd/*.8
 	doman telnetd/issue.net.5
-
 	dosym telnetd.8.gz /usr/share/man/man8/in.telnetd.8.gz
 	doman telnetlogin/telnetlogin.8
 	dodoc BUGS ChangeLog README
 	dodoc ${FILESDIR}/net.issue.sample
 	newdoc telnet/README README.telnet
 	newdoc telnet/TODO TODO.telnet
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/telnetd.xinetd telnetd
 }
-
-
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
index eda134ff5ce5..f46953eef13f 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-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-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild,v 1.1 2004/09/30 04:44:51 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ppc64"
 IUSE="build"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild
index e47fff5d2d03..31175212a530 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-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-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild,v 1.1 2005/03/12 22:36:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild
index 6328516cecf1..c8b76ba65464 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-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-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild,v 1.1 2005/03/29 22:28:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="build"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-misc/netkit-timed/ChangeLog b/net-misc/netkit-timed/ChangeLog
index 4e58b63b5a79..b0758b762cfe 100644
--- a/net-misc/netkit-timed/ChangeLog
+++ b/net-misc/netkit-timed/ChangeLog
@@ -1,11 +1,48 @@
 # ChangeLog for net-misc/netkit-timed
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
+  26 Sep 2004; Tom Gall <tgall@gentoo.org> netkit-timed-0.17-r7.ebuild:
+  stable on ppc64, bug #59610
+
+  16 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  netkit-timed-0.17-r6.ebuild, netkit-timed-0.17-r7.ebuild:
+  x86 stable
+
+  14 Aug 2004; Hardave Riar <hardave@gentoo.org> netkit-timed-0.17-r7.ebuild:
+  Stable on mips, bug #59610
+
+  09 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  netkit-timed-0.17-r7.ebuild:
+  Stable on sparc wrt #59610
+
+*netkit-timed-0.17-r7 (07 Aug 2004)
+
+  07 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/0.17-CFLAG-DEF-fix.patch, +files/0.17-timed.patch, -files/timed.c,
+  netkit-timed-0.17-r6.ebuild, +netkit-timed-0.17-r7.ebuild +metadata.xml:
+  0.17-r6 broken as per bug #59610. Removed timed.c and replaced with patch.
+  Version 0.17-r7 fixed the problem. Thanks to Antonio <netbix@tiscali.it> for
+  the bug report and Jens Lindemann <jens.lindemann@gmail.com> for the fix.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netkit-timed-0.17-r6.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *netkit-timed-0.17-r6 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-timed-0.17-r6.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> netkit-timed-0.17-r6.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-timed-0.17-r6.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/netkit-timed/Manifest b/net-misc/netkit-timed/Manifest
index e69de29bb2d1..4c22b8711ccd 100644
--- a/net-misc/netkit-timed/Manifest
+++ b/net-misc/netkit-timed/Manifest
@@ -0,0 +1,10 @@
+MD5 97e0c17cd90dfb9ec93b97e5aedd9e97 ChangeLog 2158
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 fabb14a3dd32c8f04dddd3358c86cd20 netkit-timed-0.17-r6.ebuild 848
+MD5 bdd939e0f43860fae0b727266617a881 netkit-timed-0.17-r7.ebuild 954
+MD5 14536c906a1b3fa5a8d11640fef91f78 files/0.17-CFLAG-DEF-fix.patch 1551
+MD5 0742d77d356c6be01d3a8a99e377a7a0 files/0.17-timed.patch 878
+MD5 a968cd4ed6e20ba5caca252089d73a88 files/digest-netkit-timed-0.17-r6 68
+MD5 a968cd4ed6e20ba5caca252089d73a88 files/digest-netkit-timed-0.17-r7 68
+MD5 2674064ee1f22cdf5bf08d9aaeb0c23c files/timed.rc5 704
+MD5 af6cc7c3161dec7c5987639b5f4ced10 files/timed.rc6 471
diff --git a/net-misc/netkit-timed/files/0.17-timed.patch b/net-misc/netkit-timed/files/0.17-timed.patch
index 59e7952c28bc..96d3f28595b0 100644
--- a/net-misc/netkit-timed/files/0.17-timed.patch
+++ b/net-misc/netkit-timed/files/0.17-timed.patch
@@ -5,12 +5,12 @@ diff -ru netkit-timed-0.17.orig/timed/timed/timed.c netkit-timed-0.17/timed/time
   * From: @(#)timed.c	5.1 (Berkeley) 5/11/93
   */
  char timed_rcsid[] = 
--  "$Id: 0.17-timed.patch,v 1.1 2004/08/07 01:31:34 dragonheart Exp $";
-+  "$Id: 0.17-timed.patch,v 1.1 2004/08/07 01:31:34 dragonheart Exp $";
+-  "$Id: 0.17-timed.patch,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $";
++  "$Id: 0.17-timed.patch,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $";
  
  #ifdef sgi
--#ident "$Revision: 1.1 $"
-+#ident "$Revision: 1.1 $"
+-#ident "$Revision: 1.1.1.1 $"
++#ident "$Revision: 1.1.1.1 $"
  #endif /* sgi */
  
  #define TSPTYPES
diff --git a/net-misc/netkit-timed/files/digest-netkit-timed-0.17-r6 b/net-misc/netkit-timed/files/digest-netkit-timed-0.17-r6
index 3d9b4090a062..f4d493a33fdb 100644
--- a/net-misc/netkit-timed/files/digest-netkit-timed-0.17-r6
+++ b/net-misc/netkit-timed/files/digest-netkit-timed-0.17-r6
@@ -1 +1 @@
-MD5 1bffb4db753d9e5be227e444cf119bfe netkit-timed-0.17.tar.gz
+MD5 1bffb4db753d9e5be227e444cf119bfe netkit-timed-0.17.tar.gz 48655
diff --git a/net-misc/netkit-timed/files/timed.rc6 b/net-misc/netkit-timed/files/timed.rc6
index 86aa6e640cda..e700385cdbc4 100644
--- a/net-misc/netkit-timed/files/timed.rc6
+++ b/net-misc/netkit-timed/files/timed.rc6
@@ -1,17 +1,20 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/files/timed.rc6,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 depend() {
-    need net
+	need net
 }
 
 start() {
-    ebegin "Starting timed"
-    start-stop-daemon --start --quiet --exec /usr/sbin/timed
-    eend $?
+	ebegin "Starting timed"
+	start-stop-daemon --start --quiet --exec /usr/sbin/timed
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping timed"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/timed
-    eend $?
+	ebegin "Stopping timed"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/timed
+	eend $?
 }
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild
index 364aa7e2dd65..c59d0ff0a5a6 100644
--- a/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild
@@ -1,31 +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>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild,v 1.1 2001/09/10 02:06:30 woodchip Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/netkit-timed-0.17-r6.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
-S=${WORKDIR}/${P}   
+inherit eutils
+
+IUSE=""
 DESCRIPTION="Netkit - timed"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+KEYWORDS="x86 sparc ppc mips ppc64"
+LICENSE="BSD"
+SLOT="0"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
-        unpack ${A}
-        cp ${FILESDIR}/timed.c ${S}/timed/timed/timed.c
+	unpack ${A}
+	epatch ${FILESDIR}/0.17-timed.patch
 }
- 
+
 src_compile() {
-        ./configure || die
-        make || die
+	./configure || die
+	make || die
 }
- 
+
 src_install() {
-        dosbin timed/timed/timed
-        doman  timed/timed/timed.8
-        dosbin timed/timedc/timedc
-        doman  timed/timedc/timedc.8
-        dodoc  README ChangeLog BUGS
-        
-        exeinto /etc/init.d
-        newexe ${FILESDIR}/timed.rc6 timed
+	dosbin timed/timed/timed
+	doman  timed/timed/timed.8
+	dosbin timed/timedc/timedc
+	doman  timed/timedc/timedc.8
+	dodoc  README ChangeLog BUGS
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/timed.rc6 timed
 }
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r7.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r7.ebuild
index e1ca4df14dc7..2f1efc47be68 100644
--- a/net-misc/netkit-timed/netkit-timed-0.17-r7.ebuild
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r7.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-misc/netkit-timed/netkit-timed-0.17-r7.ebuild,v 1.1 2004/08/07 01:31:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/netkit-timed-0.17-r7.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ IUSE=""
 DESCRIPTION="Netkit - timed"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-KEYWORDS="~x86 ~sparc ~ppc ~mips ~ppc64"
+KEYWORDS="x86 sparc ppc mips ppc64"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/net-misc/netpipe/ChangeLog b/net-misc/netpipe/ChangeLog
index 5ed39b3c0f36..76e9a0b96f02 100644
--- a/net-misc/netpipe/ChangeLog
+++ b/net-misc/netpipe/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-misc/netpipe
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipe/ChangeLog,v 1.1 2003/02/11 22:27:50 zwelch Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipe/ChangeLog,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  netpipe-1.0.0_beta2.ebuild:
+  Stable on ppc.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> netpipe-1.0.0_beta2.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netpipe-1.0.0_beta2.ebuild:
+  change virtual/glibc to virtual/libc, fix header
+  ebuild created by Matthias Schwarzott <zzam@gmx.de>
+
+*netpipe-1.0.0_beta2 (13 Feb 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
 
 *netpipe-1.0.0_beta1 (08 Feb 2003)
 
diff --git a/net-misc/netpipe/Manifest b/net-misc/netpipe/Manifest
index e69de29bb2d1..f56e679f1a63 100644
--- a/net-misc/netpipe/Manifest
+++ b/net-misc/netpipe/Manifest
@@ -0,0 +1,3 @@
+MD5 14de7efe8b61003ef480c633bc4e7f7c netpipe-1.0.0_beta2.ebuild 781
+MD5 a125e4884b2ff51903d57a145f06eb0f ChangeLog 900
+MD5 bbcdfef6405664c701ea826f9bcdbeec files/digest-netpipe-1.0.0_beta2 58
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
index 5b35222fdbdd..a765dc7ebb7a 100644
--- a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
@@ -1,36 +1,34 @@
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# ebuild created by Matthias Schwarzott <zzam@gmx.de>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild,v 1.1 2003/02/11 22:27:50 zwelch Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
 DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
-
-SRC_URI="http://home.t-online.de/home/gerd.o/netpipe.tar.gz"
 HOMEPAGE="http://home.t-online.de/home/gerd.o/netpipe.html"
+SRC_URI="http://home.t-online.de/home/gerd.o/netpipe.tar.gz"
 
-DEPEND="virtual/glibc"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 S="${WORKDIR}/netpipe"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:^OPT=.*:OPT = ${CFLAGS}:" \
-				-e "s:^#CC.*:CC = gcc:" \
-				Makefile.orig > Makefile
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e "s:^OPT=.*:OPT = ${CFLAGS}:" \
+		-e "s:^#CC.*:CC = $(tc-getCC):" \
+		Makefile
 }
 
 src_compile() {
 	make || die
 }
 
-src_install () {
-	dobin netpipe
+src_install() {
+	dobin netpipe || die
 	dodoc DOCUMENTATION INSTALL TECH-NOTES
 }
diff --git a/net-misc/netprofiles-ims/ChangeLog b/net-misc/netprofiles-ims/ChangeLog
index 18e5d060b7e2..59e160b89868 100644
--- a/net-misc/netprofiles-ims/ChangeLog
+++ b/net-misc/netprofiles-ims/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/netprofiles-ims
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netprofiles-ims/ChangeLog,v 1.1 2003/10/07 11:13:44 pyrania Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netprofiles-ims/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org>
+  netprofiles-ims-0.1.0134.ebuild:
+  Marking stable.
 
 *netprofiles-ims-0.1.0134 (07 Oct 2003)
 
diff --git a/net-misc/netprofiles-ims/Manifest b/net-misc/netprofiles-ims/Manifest
index 72b732c40499..bc8e602a4881 100644
--- a/net-misc/netprofiles-ims/Manifest
+++ b/net-misc/netprofiles-ims/Manifest
@@ -1,4 +1,4 @@
-MD5 3f105a2d8784248bf2b263b8c6c4efed netprofiles-ims-0.1.0134.ebuild 667
-MD5 b0159cf9df99b3aa7987351e29c122d2 ChangeLog 327
-MD5 dac732777212e42314f98c765c7614b9 metadata.xml 293
+MD5 89c1344404086845d1921ec42f8bd3ff netprofiles-ims-0.1.0134.ebuild 748
+MD5 43e6968031f96650cbdab3ecc433f7ef ChangeLog 521
+MD5 f3f4190d7326546ca3820a1917f477e5 metadata.xml 259
 MD5 0abd5bba10c20714c45f1aa83afb74b7 files/digest-netprofiles-ims-0.1.0134 74
diff --git a/net-misc/netprofiles-ims/metadata.xml b/net-misc/netprofiles-ims/metadata.xml
index 7ed041d71de9..3d14d6cb1dd8 100644
--- a/net-misc/netprofiles-ims/metadata.xml
+++ b/net-misc/netprofiles-ims/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>buckminst@inconnu.isu.edu</email>
-  <name>Curtis Hogg</name>
+  <email>pyrania@gentoo.org</email>
 </maintainer>
 <longdescription></longdescription>
 </pkgmetadata>
diff --git a/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild b/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
index ece044faafbc..5ce4b72eeabe 100644
--- a/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
+++ b/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild,v 1.1 2003/10/07 11:13:44 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 DESCRIPTION="The Netprofiles Interface Management System (IMS) is an easy way to manage multiple network configurations for your wired or wireless network cards."
 
@@ -8,11 +8,9 @@ HOMEPAGE="http://www.furuba.net/~buckminst/gentoo/"
 SRC_URI="http://www.furuba.net/~buckminst/gentoo/netprofiles-ims-0.1.0134.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=""
-#RDEPEND=""
-S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/netsed/ChangeLog b/net-misc/netsed/ChangeLog
index ceca33dd0e7f..0dc2d13c418c 100644
--- a/net-misc/netsed/ChangeLog
+++ b/net-misc/netsed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/netsed
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netsed/ChangeLog,v 1.1 2004/05/14 19:40:51 avenj Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netsed/ChangeLog,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
+
+  14 Aug 2004; Jon Portnoy <avenj@gentoo.org> netsed-0.01b.ebuild :
+  Fix patch (bug #60345), add AMD64 keywords.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netsed-0.01b.ebuild:
+  change virtual/glibc to virtual/libc
 
 *netsed-0.01b (14 May 2004)
 
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
index df27616fe2b3..366941ae9ead 100644
--- a/net-misc/netsed/Manifest
+++ b/net-misc/netsed/Manifest
@@ -1,2 +1,4 @@
-MD5 2cd843674fe732205c0df468c17856a2 netsed-0.01b.ebuild 713
+MD5 d2183599e82bd8e6464c8ac9d818ff79 ChangeLog 583
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 ae0170d45f1916ef9587f89e00a5a83f netsed-0.01b.ebuild 821
 MD5 ac85c2d00f11249655b6f37621820137 files/digest-netsed-0.01b 118
diff --git a/net-misc/netsed/netsed-0.01b.ebuild b/net-misc/netsed/netsed-0.01b.ebuild
index e30ed76d6142..8ce43a9c4ba5 100644
--- a/net-misc/netsed/netsed-0.01b.ebuild
+++ b/net-misc/netsed/netsed-0.01b.ebuild
@@ -1,29 +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/net-misc/netsed/netsed-0.01b.ebuild,v 1.1 2004/05/14 19:40:51 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netsed/netsed-0.01b.ebuild,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="A small and handful utility designed to alter the contents of packets forwarded thru your network in real time"
-SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
-		http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
-
 HOMEPAGE="http://freshmeat.net/projects/netsed"
+SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
+	http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	mkdir -p ${S}
 	cd ${S}
 	unpack ${A}
-	epatch ${PN}_0.01c-2.diff
 }
 
 src_compile() {
+	epatch ${DISTDIR}/${PN}_0.01c-2.diff.gz
 	make CFLAGS="${CFLAGS}"
 }
 
diff --git a/net-misc/netstat-nat/ChangeLog b/net-misc/netstat-nat/ChangeLog
index 2c37494cd20d..a567d2f300be 100644
--- a/net-misc/netstat-nat/ChangeLog
+++ b/net-misc/netstat-nat/ChangeLog
@@ -1,6 +1,63 @@
 # ChangeLog for net-misc/netstat-nat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.1 2002/08/04 05:55:02 blizzy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/ChangeLog,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
+
+  30 Sep 2005; Christian Birchinger <joker@gentoo.org>
+  netstat-nat-1.4.5.ebuild:
+  Added sparc stable keyword
+
+*netstat-nat-1.4.6 (25 Sep 2005)
+
+  25 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  netstat-nat-1.4.5.ebuild, +netstat-nat-1.4.6.ebuild:
+  version bump - bug #107136. 1.4.5 x86 stable - bug #107137. thanks rockoo
+
+*netstat-nat-1.4.5 (29 Apr 2005)
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -netstat-nat-1.4.3.ebuild,
+  +netstat-nat-1.4.5.ebuild:
+  Version bump, remove old version.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> netstat-nat-1.4.4.ebuild:
+  Marked stable on x86.
+
+  30 Jan 2005; Jason Wever <weeve@gentoo.org> netstat-nat-1.4.4.ebuild:
+  Stable on sparc wrt bug #74775.
+
+*netstat-nat-1.4.4 (25 Jan 2005)
+
+  25 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +netstat-nat-1.4.4.ebuild, +metadata.xml:
+  version bump prompted by bug #74775. Thanks to  Matthew Sutton 
+  <msutton@circletgsc.org>. ~ppc keyword added.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netstat-nat-1.3.1.ebuild,
+  netstat-nat-1.4.2.ebuild, netstat-nat-1.4.3.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  16 Apr 2004; Jason Wever <weeve@gentoo.org> netstat-nat-1.4.3.ebuild:
+  Added ~sparc keyword.
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> netstat-nat-1.3.1.ebuild,
+  netstat-nat-1.4.2.ebuild, netstat-nat-1.4.3.ebuild:
+  fixing depend qa issue. see 45343.
+
+*netstat-nat-1.4.3 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> netstat-nat-1.4.3.ebuild:
+  Version bumped.
+
+*netstat-nat-1.4.2 (04 Aug 2003)
+
+  04 Aug 2003; Martin Holzer <mholzer@gentoo.org> netstat-nat-1.4.2.ebuild:
+  Version bumped.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*netstat-nat-1.3.1 (14 Aug 2002)
+
+  14 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New version.
+  Closes bug #6392.
 
 *netstat-nat-1.3 (04 Aug 2002)
 
diff --git a/net-misc/netstat-nat/Manifest b/net-misc/netstat-nat/Manifest
index e69de29bb2d1..03927e1e6b6c 100644
--- a/net-misc/netstat-nat/Manifest
+++ b/net-misc/netstat-nat/Manifest
@@ -0,0 +1,8 @@
+MD5 6063d5cac1d91c21bfcf0562acd9dd30 ChangeLog 2215
+MD5 d7d705735af1299707ee38eb80d1b762 metadata.xml 268
+MD5 341c636efed86577f66db62ac3ebb6dd netstat-nat-1.4.5.ebuild 521
+MD5 6231376dfe6ea6613a0df60fb8427fde netstat-nat-1.4.4.ebuild 524
+MD5 e7331208115b6d2233646f6373e967c0 netstat-nat-1.4.6.ebuild 529
+MD5 d343abd418e03d7c6c8b12df8f6cdc52 files/digest-netstat-nat-1.4.4 68
+MD5 3923f2ec77515dd51308c8b2421a2836 files/digest-netstat-nat-1.4.5 68
+MD5 92578b8ae0488ab69e7ef4a3763bc1d9 files/digest-netstat-nat-1.4.6 68
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.4.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.4.ebuild
index d06811c23a9e..1c675a62fe0c 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.4.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-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/net-misc/netstat-nat/netstat-nat-1.4.4.ebuild,v 1.1 2005/01/25 08:27:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.4.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 DESCRIPTION="Display NAT connections"
 HOMEPAGE="http://tweegy.demon.nl/projects/netstat-nat/index.html"
@@ -8,7 +8,7 @@ SRC_URI="http://tweegy.demon.nl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~sparc ~x86 ~ppc"
+KEYWORDS="sparc x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.5.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.5.ebuild
index 5509d3b6f27d..8b7793a15414 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.5.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-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/net-misc/netstat-nat/netstat-nat-1.4.5.ebuild,v 1.1 2005/04/29 15:04:26 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.5.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 DESCRIPTION="Display NAT connections"
 HOMEPAGE="http://tweegy.demon.nl/projects/netstat-nat/index.html"
@@ -8,7 +8,7 @@ SRC_URI="http://tweegy.demon.nl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~sparc ~x86 ~ppc"
+KEYWORDS="~ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.6.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.6.ebuild
index 78b1676f8aae..d6f96fc2e5ac 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.6.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.6.ebuild,v 1.1 2005/09/25 05:17:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netstat-nat/netstat-nat-1.4.6.ebuild,v 1.1.1.1 2005/11/30 09:55:12 chriswhite Exp $
 
 DESCRIPTION="Display NAT connections"
 HOMEPAGE="http://tweegy.demon.nl/projects/netstat-nat/index.html"
diff --git a/net-misc/noarp/ChangeLog b/net-misc/noarp/ChangeLog
index 41ad9297919c..36e3045c3e36 100644
--- a/net-misc/noarp/ChangeLog
+++ b/net-misc/noarp/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-misc/noarp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/noarp/ChangeLog,v 1.1 2003/11/04 03:04:07 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/noarp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
+
+  15 Apr 2005; Christian Zoffoli <xmerlin@gentoo.org> noarp-2.0.2.ebuild:
+  stable x86.
+
+  09 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> noarp-1.2.3-r1.ebuild,
+  noarp-2.0.2.ebuild:
+  removed inherit check-kernel
+
+*noarp-1.2.3-r1 (26 Feb 2005)
+
+  26 Feb 2005; Christian Zoffoli <xmerlin@gentoo.org> +metadata.xml,
+  +noarp-1.2.3-r1.ebuild, +noarp-2.0.2.ebuild:
+  added noarp-2.0.2 for 2.6.x kernels, improved noarp-1.x ebuild (r1)
+
+  06 Nov 2004; <pyrania@gentoo.org> noarp-1.2.3.ebuild:
+  Marked stable on x86.
 
 *noarp-1.2.3 (03 Nov 2003)
 
diff --git a/net-misc/noarp/Manifest b/net-misc/noarp/Manifest
index 8899a53002b4..ea9e45f7e4d7 100644
--- a/net-misc/noarp/Manifest
+++ b/net-misc/noarp/Manifest
@@ -1,3 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5dbbd42bb5570b0618b04ee4da24dbe7 ChangeLog 887
+MD5 4307008581c66a36632da5641d2dfd8e noarp-1.2.3.ebuild 707
+MD5 522a999e2d174468e01a1b145fe89236 noarp-2.0.2.ebuild 904
+MD5 a64b9a1937a5cfc2fbaf373521f65d47 metadata.xml 223
+MD5 febd3b56ddd4fe38c59957088ca9d91b noarp-1.2.3-r1.ebuild 908
 MD5 bb721051346f0f70e6de75e276b3c87b files/digest-noarp-1.2.3 63
-MD5 040157cb58c7d2c29e4a2517d19f5658 ChangeLog 376
-MD5 f68759e3814bb32d88f1d08f0139f80d noarp-1.2.3.ebuild 708
+MD5 b8d715a08f9fc0d6b5d6467d152d4623 files/digest-noarp-2.0.2 63
+MD5 bb721051346f0f70e6de75e276b3c87b files/digest-noarp-1.2.3-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCYBIFgMUyd/cdjWsRAveDAJ457jTUBgoOXdI8EOerMq1+zyUyIACgiAyL
+pkjRMLUdb6H7+ocfXMBPoeg=
+=iqjq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/noarp/noarp-1.2.3-r1.ebuild b/net-misc/noarp/noarp-1.2.3-r1.ebuild
index 1d00303e6dc3..35f4abe29ada 100644
--- a/net-misc/noarp/noarp-1.2.3-r1.ebuild
+++ b/net-misc/noarp/noarp-1.2.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/net-misc/noarp/noarp-1.2.3-r1.ebuild,v 1.1 2005/02/25 17:03:05 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/noarp/noarp-1.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
-inherit check-kernel linux-mod
+inherit linux-mod
 
 DESCRIPTION="a kernel module and userspace tool for hiding network interfaces"
 HOMEPAGE="http://www.masarlabs.com/noarp/"
@@ -17,8 +17,7 @@ DEPEND="virtual/linux-sources"
 RDEPEND=""
 
 pkg_setup() {
-	if is_2_6_kernel
-	then
+	if kernel_is 2 6; then
 		die "${P} supports only 2.4 kernels"
 	fi
 }
diff --git a/net-misc/noarp/noarp-1.2.3.ebuild b/net-misc/noarp/noarp-1.2.3.ebuild
index cca5058d6273..3123cd2c6a3a 100644
--- a/net-misc/noarp/noarp-1.2.3.ebuild
+++ b/net-misc/noarp/noarp-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/noarp/noarp-1.2.3.ebuild,v 1.1 2003/11/04 03:04:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/noarp/noarp-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 DESCRIPTION="a kernel module and userspace tool for hiding network interfaces"
 HOMEPAGE="http://www.masarlabs.com/noarp/"
@@ -8,7 +8,8 @@ SRC_URI="http://www.masarlabs.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND=""
 
diff --git a/net-misc/noarp/noarp-2.0.2.ebuild b/net-misc/noarp/noarp-2.0.2.ebuild
index c5be5c838eea..e0285ca64fc3 100644
--- a/net-misc/noarp/noarp-2.0.2.ebuild
+++ b/net-misc/noarp/noarp-2.0.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/net-misc/noarp/noarp-2.0.2.ebuild,v 1.1 2005/02/25 17:03:05 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/noarp/noarp-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
-inherit check-kernel linux-mod
+inherit linux-mod
 
 DESCRIPTION="a kernel module and userspace tool for hiding network interfaces"
 HOMEPAGE="http://www.masarlabs.com/noarp/"
@@ -10,15 +10,14 @@ SRC_URI="http://www.masarlabs.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/linux-sources"
 RDEPEND=""
 
 pkg_setup() {
-	if is_2_4_kernel
-	then
+	if kernel_is 2 4; then
 		die "${P} supports only 2.6 kernels"
 	fi
 }
@@ -42,4 +41,4 @@ pkg_postinst() {
 	einfo ""
 	einfo "Please remember to re-emerge ${PN} when you upgrade your kernel!"
 	einfo ""
-}
\ No newline at end of file
+}
diff --git a/net-misc/nstx/ChangeLog b/net-misc/nstx/ChangeLog
index cd8b918eaa20..258ca202525b 100644
--- a/net-misc/nstx/ChangeLog
+++ b/net-misc/nstx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nstx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/ChangeLog,v 1.1 2005/06/08 19:49:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/ChangeLog,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
+
+*nstx-1.1_beta6-r1 (21 Jul 2005)
+
+  21 Jul 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +nstx-1.1_beta6-r1.ebuild:
+  Bug #99503, ethertap stuff is available in proper kernel headers now.
 
 *nstx-1.1_beta6 (08 Jun 2005)
 
diff --git a/net-misc/nstx/Manifest b/net-misc/nstx/Manifest
index dcff6bf750c7..c742aa56e34c 100644
--- a/net-misc/nstx/Manifest
+++ b/net-misc/nstx/Manifest
@@ -1,2 +1,6 @@
-MD5 46855940c9f166bfba341bda05b9a230 nstx-1.1_beta6.ebuild 681
+MD5 31b2e76239b50ba7663f783bcf6ea0b6 nstx-1.1_beta6-r1.ebuild 799
+MD5 9a0d3e91fd4d5e8349ff5a8bc81d4ee7 ChangeLog 601
+MD5 cd6bda7470de36aaddf4274b283431e8 nstx-1.1_beta6.ebuild 802
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 9943b0c4bfa3099c67a0abbc9d0ff048 files/digest-nstx-1.1_beta6-r1 62
 MD5 9943b0c4bfa3099c67a0abbc9d0ff048 files/digest-nstx-1.1_beta6 62
diff --git a/net-misc/nstx/nstx-1.1_beta6-r1.ebuild b/net-misc/nstx/nstx-1.1_beta6-r1.ebuild
index 005413bbf9ce..2ce3c08345b2 100644
--- a/net-misc/nstx/nstx-1.1_beta6-r1.ebuild
+++ b/net-misc/nstx/nstx-1.1_beta6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6-r1.ebuild,v 1.1 2005/07/21 03:06:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 inherit versionator toolchain-funcs
 
diff --git a/net-misc/nstx/nstx-1.1_beta6.ebuild b/net-misc/nstx/nstx-1.1_beta6.ebuild
index 74e8a094edcd..5461a0e35c70 100644
--- a/net-misc/nstx/nstx-1.1_beta6.ebuild
+++ b/net-misc/nstx/nstx-1.1_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6.ebuild,v 1.1 2005/06/08 19:49:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 inherit linux-info versionator
 
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 6eae82baa25f..b9dafa6d70c3 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,287 @@
 # ChangeLog for net-misc/ntp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
+
+*ntp-4.2.0.20050303-r1 (25 Aug 2005)
+*ntp-4.2.0.20040617-r3 (25 Aug 2005)
+
+  25 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ntp-4.2.0-ntpd-using-wrong-group.patch, ntp-4.2.0-r2.ebuild,
+  +ntp-4.2.0.20040617-r3.ebuild, +ntp-4.2.0.20050303-r1.ebuild:
+  Fix security issue where ntpd assigns the wrong group #103719.
+
+  20 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/ntpd.rc:
+  Pass --exec to ssd when stopping so we kill the right process #82859 by
+  Peter Wendrich.
+
+  16 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ntp-4.2.0.20050303-rlimit-memlock.patch, ntp-4.2.0.20050303.ebuild:
+  Add fix for memlock issues #99713 by Marcin Deranek and Christoph Gysin.
+
+  20 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> ntp-4.1.2.ebuild,
+  ntp-4.2.0-r2.ebuild, ntp-4.2.0.20040617.ebuild,
+  ntp-4.2.0.20040617-r2.ebuild, ntp-4.2.0.20050303.ebuild:
+  Use -1 instead of /bin/false to set the shell for ntp user. Fix Gentoo/FreeBSD.
+
+*ntp-4.2.0.20050303 (18 Jul 2005)
+
+  18 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +ntp-4.2.0.20050303.ebuild:
+  Version bump.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> ntp-4.2.0.20040617-r2.ebuild:
+  Marked stable on mips.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ntp-4.2.0.20040617-r2.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ntp-4.2.0.20040617-r2.ebuild:
+  Stable on alpha.
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ntp-4.2.0.20040617-r2.ebuild:
+  Stable on sparc
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  ntp-4.2.0.20040617-r2.ebuild:
+  Stable on ppc64
+
+  29 May 2005; Sven Wegener <swegener@gentoo.org>
+  ntp-4.2.0.20040617-r2.ebuild:
+  It's kernel_linux not linux_kernel.
+
+  26 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/4.2.0.20040617-freebsd.patch, ntp-4.2.0.20040617-r2.ebuild:
+  Added patch to compile on Gentoo/FreeBSD. Closes bug #94038.
+
+*ntp-4.2.0.20040617-r2 (08 May 2005)
+
+  08 May 2005; Sven Wegener <swegener@gentoo.org>
+  +files/4.2.0.20040617-debug-fix.patch, -ntp-4.2.0.20040617-r1.ebuild,
+  +ntp-4.2.0.20040617-r2.ebuild:
+  Another revision bump. Added support for the debug USE flag which was
+  previously always enabled.
+
+*ntp-4.2.0.20040617-r1 (06 May 2005)
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org>
+  +files/4.2.0.20040617-errno-fix.patch,
+  +files/4.2.0.20040617-hostname.patch,
+  +files/4.2.0.20040617-ipv6-fixes.patch, +ntp-4.2.0.20040617-r1.ebuild:
+  Revision bump. Added a patch (based on the one from www.ecsirt.net) that
+  allows to override the hostname used in autokey authentication. Another
+  patch for a drop-root issue that comes up when using autokey. And the last
+  patch (from upstream) fixes some ipv6 issues.
+
+  15 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/ntp-4.2.0-gcc4.patch,
+  ntp-4.2.0.20040617.ebuild:
+  Patch for GCC4 compilation issues from Fedora
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Dec 2004; Aron Griffis <agriffis@gentoo.org> ntp-4.2.0-r2.ebuild,
+  ntp-4.2.0.20040617.ebuild:
+  add ia64 keywords
+
+*ntp-4.2.0.20040617 (09 Nov 2004)
+
+  09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  files/ntp-4.1.1b-syscall-libc.patch, files/ntp.conf,
+  +ntp-4.2.0.20040617.ebuild:
+  Version bump to resolve ipv6 problems (#51721 #57355 #67654), segfaults
+  (#48128 #58684), be more friendly with openntpd (#70142), clean up the
+  config files (#64171 #65502), some md5 key troubles (#65099 #67408), and
+  change the default install path (#66671).
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> ntp-4.2.0-r2.ebuild:
+  Stable on amd64.
+
+  08 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> ntp-4.2.0-r2.ebuild:
+  Stable on alpha.
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> ntp-4.1.2.ebuild,
+  ntp-4.2.0-r2.ebuild:
+  removed hardened-gcc logic
+
+  15 Apr 2004; Jason Wever <weeve@gentoo.org> ntp-4.2.0-r2.ebuild:
+  Stable on sparc.
+
+  13 Apr 2004; Joshua Kinard <kumba@gentoo.org> ntp-4.2.0-r2.ebuild:
+  Marked stable on mips.
+
+*ntp-4.2.0-r2 (05 Apr 2004)
+
+  05 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add checking for notrust in /etc/ntp.conf #41827 and
+  tweak the init.d script a bit.
+
+*ntp-4.2.0-r1 (01 Mar 2004)
+
+  01 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  New version to push accumulated fixes out.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> ntp-4.1.2.ebuild:
+  Marked stable on sparc, fixes bug #29106.
+
+*ntp-4.2.0 (14 Feb 2004)
+
+  14 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #31258 by Christian Strauf.
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> ntp-4.1.2.ebuild:
+  Marked stable on hppa.
+
+  17 Oct 2003; Chris PeBenito <pebenito@gentoo.org> ntp-4.1.1b-r6.ebuild,
+  ntp-4.1.2.ebuild:
+  Add SELinux policy dependancy
+
+  15 Oct 2003; Markus Nigbur <pyrania@gentoo.org> ntp-4.1.2.ebuild:
+  Fixed bug 31190. Thanks to James Slater.
+
+  11 Oct 2003; Alexander Gabert <pappy@gentoo.org> ntp-4.1.2.ebuild:
+  added hardened-gcc configure check flags and removal later for proper etdyn
+  build
+
+  09 Oct 2003; <tuxus@gentoo.org> ntp-4.1.2.ebuild:
+  stable on mips
+
+  04 Oct 2003; Markus Nigbur <pyrania@gentoo.org> ntp-4.1.2.ebuild:
+  Added dependency for >=sys-devel/automake-1.7 (bug 30293).
+
+  26 Sep 2003; Aron Griffis <agriffis@gentoo.org> ntp-4.1.2.ebuild:
+  Stable on alpha
+
+  20 Sep 2003; Alexander Gabert <pappy@gentoo.org> ntp-4.1.1b-r6.ebuild:
+  added configure logic for hardened-gcc
+
+*ntp-4.1.2 (06 Aug 2003)
+
+  13 Sep 2003; Guy Martin <gmsoft@gentoo.org> ntp-4.1.2 :
+  Marked -hppa while bug #26062 is not fixed.
+
+  06 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump (omg about time) #26023.
+  Add redhat drop root patch #21444.
+  Add broadcast bug fix #17336.
+  Split ntp init script into server and client scripts #21017.
+
+*ntp-4.1.1b-r6 (16 Jun 2003)
+
+  19 Jun 2003; Joshua Kinard <kumba@gentoo.org> :
+  Fixed b0rked digest file: Missing Changelog
+
+  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added custom manpages ... xsl is at #20747.
+  Script used to make custom manpage tarball is also there as an attachment.
+
+*ntp-4.1.1b-r5 (26 Feb 2003)
+
+  20 Mar 2003; Zach Welch <zwelch@gentoo.org> ntp-4.1.1b-r5.ebuild:
+  add arm keyword
+
+  17 Mar 2003; Seemant Kulleen <seemant@gentoo.org> ntp-4.1.1b-r5.ebuild,
+  files/ntp.conf:
+  added extra documentation to the ntp.conf file. thanks to: Daniel Seyffer
+  <gentoo-bugs@seyffer.de> in bug #17492
+
+  02 Mar 2003; Guy Martin <gmsoft@gentoo.org> ntp-4.1.1b-r5.ebuild :
+  Added hppa to keywords.
+
+  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumped to fix how some extra crud was installed into
+  /usr/share/ntp/ ... also add a few more files to that dir. #16403
+
+*ntp-4.1.1b-r4 (12 Jan 2003)
+
+  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> ntp-4.1.1b-r4.ebuild :
+  Added mips keyword to ebuild.
+
+  14 Feb 2003; Martin Holzer <mholzer@gentoo.org> ntp-4.1.1b-r4.ebuild : 
+  Added one more einfo. Closes #15690.
+
+  12 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a lot more comments to hopefully keep people from
+  messing up their ntp installs.
+
+*ntp-4.1.1b-r3 (31 Dec 2002)
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> :
+  Added 'use dns logger' to init script. Closes #13541.
+
+  06 Jan 2003; Bjoern Brauel <bjb@gentoo.org> :
+  Added a (nasty) hack for ntp on alpha. configure makes a false assumption 
+  about _adjtime on alpha. Fix forces use of libc implementation.
+
+  01 Jan 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added a patch to fix the namespace collision with linux include files.
+  Check Bugs #13001 #6432 #8807
+
+  31 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  Hopefully this will keep everyone happy
+  Added ntpd.confd back in but with the ability for the end
+  user to use ntpdate or ntpd or whatever to set the clock ... or nothing
+
+*ntp-4.1.1b-r2 (27 Dec 2002)
+
+  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update /etc/init.d/ntpd to retire ntpdate.  Also added improvements
+  suggested by Donny Davies <woodchip@gentoo.org>.  This closes bug #897.
+
+*ntp-4.1.1b-r1 (16 Dec 2002)
+
+  16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  Unified the previous set of /etc files (a) with the current set (b) and
+  addressed all the issues people had.
+
+*ntp-4.1.1b (27 Nov 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  changed sparc ~sparc keywords
+ 
+  28 Nov 2002; Stefan Jones <cretin@gentoo.org> :
+  Changed ./configure line back to fix building on sparc and others
+  
+  27 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added new ebuild + /etc files
+
+*ntp-4.1.1a (4 May 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> ntp-4.1.1a.ebuild :
+  Added KEYWORDS, SLOT.
+
+  4 May 2002; Jon Nelson <jnelson@gentoo.org> ntp-4.1.7*.ebuild
+  Removed all 4.1.7* ebuilds
+
+  13 aug 2002; Bart Verwilst <verwilst@gentoo.org> :
+
+  Added a few URLs that point to NTP server in ntpd.confd, as comments.
+
+*ntp-4.1.1a (1 May 2002)
+  1 May 2002; Jon Nelson <jnelson@gentoo.org> ntp-4.1.72-r2.ebuild :
+  Create 4.1.1a ebuild and mask 4.1.72* versions, the 4.1.72* versions
+  are *alpha* releases for 4.2.0, and have trouble building on some
+  hosts.
+  
+  This should finally close 1882
+
+*ntp-4.1.72-r2 (28 Apr 2002)
+  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ntp-4.1.72-r2.ebuild :
+
+  Remove -lncurses from LDFLAGS environment, it screws up
+  the build.
+  If there is a good reason for it to be there, prefix it with
+   -L/lib so that configure can find it there (it's not in /usr/lib).
+  Closes bug #1882 and allows compilation
+  Update ebuild for lintool compliance
+  
+*ntp-4.1.72-r1 (24 March 2002)
+  
+  24 March 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Resolve bug #897 (add ntpdate to rc-script); add config file for ntpd.
 
 *ntp-4.1.72 (1 Feb 2002)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index e69de29bb2d1..f0897cf73235 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -0,0 +1,43 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa39d0f69bf2ba5c5aaa98c5bc1002b5 ChangeLog 10376
+MD5 047fe77e01bc9335b07bcc5d963d8683 files/4.1.2-droproot.patch 12672
+MD5 0ac690ae52fe02f336ae73f9857461ec files/4.2.0-droproot.patch 13908
+MD5 24574e6ad1b468152839c10361b51a0f files/4.2.0-linux-config-phone.patch 711
+MD5 d07dbc58315f577cc6d1dd8614f95cb1 files/4.2.0-ntpdate-quiet.patch 1117
+MD5 5fecd7747324b76551f514df62a4d78d files/4.2.0.20040617-debug-fix.patch 232
+MD5 759c1adb57e9c61f519fe938902f1df7 files/4.2.0.20040617-errno-fix.patch 493
+MD5 2bc77f5ebab9804cdc2dff52ab4c267a files/4.2.0.20040617-freebsd.patch 803
+MD5 0c3a6df816f448a870e070797c22f72e files/4.2.0.20040617-hostname.patch 8476
+MD5 c51a9f2f2c85ab3bcdc54a1a9e3bedb6 files/4.2.0.20040617-ipv6-fixes.patch 2541
+MD5 4e13c1a5fa0fa54e3b65ec311dd7270a files/broadcastclient.patch 451
+MD5 af48491e8d6820a3d8eba16a771e5c26 files/digest-ntp-4.1.2 129
+MD5 5fc28af5c2a508eeb67a4d5d0ffab341 files/digest-ntp-4.2.0-r2 135
+MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617-r3 166
+MD5 df7cdf79440109a1535f013c796aabce files/digest-ntp-4.2.0.20050303-r1 166
+MD5 dded11ceec4b8f2c1b140341a357f507 files/linux-config-phone.patch 747
+MD5 e327d521e4dfb0c967941eeb84ad9207 files/ntp-4.1.1b-syscall-libc.patch 424
+MD5 20c344cec35350fe17773665094b2e57 files/ntp-4.2.0-gcc4.patch 1607
+MD5 621c8a8e9589eb73a7f51095d8fca090 files/ntp-4.2.0-ntpd-using-wrong-group.patch 338
+MD5 339d87d68d483b28f5b70dd76cbc20c4 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839
+MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
+MD5 47d7106c23cb6ac99c5bbfdcd2f3a7fa files/ntp-client.confd 747
+MD5 5eecb47ab966b2003b73b8cbd371de40 files/ntp-client.rc 933
+MD5 5bd3924f5720b97837969ec4ec4d5e09 files/ntp.conf 1451
+MD5 4d502821fd36c5a63b14ae4b54cb3526 files/ntpd-4.1.2.confd 185
+MD5 87951141777f50b2e4a2347a96f987b8 files/ntpd-4.1.2.rc 806
+MD5 5e1591f145a63cf66ee20ab65495781a files/ntpd.confd 189
+MD5 299ea30653b1e0b93d51f19e07176bc4 files/ntpd.rc 805
+MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
+MD5 4874c08acda470ce7373d36b64c39c09 ntp-4.1.2.ebuild 3162
+MD5 7e567989a1392464a324fd0cd64e54a3 ntp-4.2.0-r2.ebuild 3815
+MD5 45f151b05f4b7703610e2b908694ee3d ntp-4.2.0.20040617-r3.ebuild 4319
+MD5 0889dba2586d7f77d447b5235923544c ntp-4.2.0.20050303-r1.ebuild 4354
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYskcgIKl8Uu19MoRArY7AJsHFNMBUtIE8HyvK1uM0HrXeOBb6ACfSpjj
+ZrWQNSVMeyXF8SM3C+pFu9I=
+=tVB0
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
index 5a97fde7a442..a7c35e388a80 100644
--- a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
+++ b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
@@ -1,6 +1,7 @@
-diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c ntp-stable-4.2.0a-20040617-debug-fix/ntpd/ntp_proto.c
---- ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c	2004-05-25 11:02:24.000000000 +0000
-+++ ntp-stable-4.2.0a-20040617-debug-fix/ntpd/ntp_proto.c	2005-05-07 22:32:30.973867197 +0000
+https://ntp.isc.org/bugs/show_bug.cgi?id=464
+
+--- ntpd/ntp_proto.c
++++ ntpd/ntp_proto.c
 @@ -2293,8 +2293,8 @@
  			if (debug > 1)
  				printf("select: prefer offset %.6f\n",
diff --git a/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch b/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch
index 2c6fbdae2bc4..9eae0496a865 100644
--- a/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch
+++ b/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch
@@ -1,6 +1,7 @@
-diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_io.c ntp-stable-4.2.0a-20040617-errno-fix/ntpd/ntp_io.c
---- ntp-stable-4.2.0a-20040617/ntpd/ntp_io.c	2004-05-25 11:02:24.000000000 +0000
-+++ ntp-stable-4.2.0a-20040617-errno-fix/ntpd/ntp_io.c	2005-05-06 15:35:23.433595492 +0000
+https://ntp.isc.org/bugs/show_bug.cgi?id=465
+
+--- ntpd/ntp_io.c
++++ ntpd/ntp_io.c
 @@ -1795,16 +1795,16 @@
  				   sizeof(rb->recv_space), 0,
  				   (struct sockaddr *)&rb->recv_srcadr,
diff --git a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
index 881faef63c53..4ca3c5367722 100644
--- a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
+++ b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
@@ -1,6 +1,7 @@
-diff -ur ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c ntp-stable-4.2.0a-20040617-fbsd/ntpdc/ntpdc.c
---- ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c	2004-05-25 13:02:25.000000000 +0200
-+++ ntp-stable-4.2.0a-20040617-fbsd/ntpdc/ntpdc.c	2005-05-26 07:25:33.091870920 +0200
+https://ntp.isc.org/bugs/show_bug.cgi?id=438
+
+--- ntpdc/ntpdc.c
++++ ntpdc/ntpdc.c
 @@ -449,7 +449,11 @@
  	hints.ai_flags = AI_NUMERICHOST;
  
@@ -14,9 +15,8 @@ diff -ur ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c ntp-stable-4.2.0a-20040617-fbs
  		hints.ai_flags = AI_CANONNAME;
  #ifdef AI_ADDRCONFIG
  		hints.ai_flags |= AI_ADDRCONFIG;
-diff -ur ntp-stable-4.2.0a-20040617/ntpq/ntpq.c ntp-stable-4.2.0a-20040617-fbsd/ntpq/ntpq.c
---- ntp-stable-4.2.0a-20040617/ntpq/ntpq.c	2004-05-25 13:02:25.000000000 +0200
-+++ ntp-stable-4.2.0a-20040617-fbsd/ntpq/ntpq.c	2005-05-26 07:26:33.276721432 +0200
+--- ntpq/ntpq.c
++++ ntpq/ntpq.c
 @@ -631,7 +631,11 @@
  	hints.ai_flags = AI_NUMERICHOST;
  
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0-r2 b/net-misc/ntp/files/digest-ntp-4.2.0-r2
index a29b978410e4..eff87f02a9d5 100644
--- a/net-misc/ntp/files/digest-ntp-4.2.0-r2
+++ b/net-misc/ntp/files/digest-ntp-4.2.0-r2
@@ -1 +1,2 @@
 MD5 0f8fabe87cf54f409b57c6283f0c0c3d ntp-4.2.0.tar.gz 2514502
+MD5 0333bcec9a94b17621c785ccae674285 ntp-4.2.0-r2-manpages.tar.bz2 25355
diff --git a/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch b/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
index 48815334315b..02a7375f0e4a 100644
--- a/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
+++ b/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
@@ -1,17 +1,11 @@
 --- ntp-4.1.1b/include/ntp_syscall.h	2003-01-06 18:51:39.000000000 +0100
 +++ ntp-4.1.1b-alpha/include/ntp_syscall.h	2003-01-06 18:54:57.000000000 +0100
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,7 @@
  # include <sys/timex.h>
  #endif
  
 -#ifndef NTP_SYSCALLS_LIBC
++#if !defined(NTP_SYSCALLS_LIBC) || defined(__alpha__)
  #ifdef NTP_SYSCALLS_STD
  # define ntp_adjtime(t)		syscall(SYS_ntp_adjtime, (t))
  # define ntp_gettime(t)		syscall(SYS_ntp_gettime, (t))
-@@ -50,6 +49,5 @@
- #  endif
- # endif /* !HAVE_ADJTIMEX */
- #endif /* !NTP_SYSCALLS_STD */
--#endif /* !NTP_SYSCALLS_LIBC */
- 
- #endif /* NTP_SYSCALL_H */
diff --git a/net-misc/ntp/files/ntp-client-4.1.2.rc b/net-misc/ntp/files/ntp-client-4.1.2.rc
index ba5eb15e2b88..f38ee20ee551 100644
--- a/net-misc/ntp/files/ntp-client-4.1.2.rc
+++ b/net-misc/ntp/files/ntp-client-4.1.2.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client-4.1.2.rc,v 1.1 2004/02/16 01:56:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client-4.1.2.rc,v 1.1.1.1 2005/11/30 09:55:20 chriswhite Exp $
 
 depend() {
 	before cron
diff --git a/net-misc/ntp/files/ntp-client.confd b/net-misc/ntp/files/ntp-client.confd
index 0760fd5c0cd4..44affac3924f 100644
--- a/net-misc/ntp/files/ntp-client.confd
+++ b/net-misc/ntp/files/ntp-client.confd
@@ -1,6 +1,4 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2         
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.confd,v 1.1 2003/08/06 07:42:24 vapier Exp $
+# /etc/conf.d/ntp-client
 
 # Command to run to set the clock initially
 # Most people should just leave this line alone ...
@@ -9,14 +7,14 @@
 NTPCLIENT_CMD="ntpdate"
 
 # Options to pass to the above command
-# Most people should just uncomment this variable and
-# change 'someserver' to a valid hostname which you
-# can aquire from the URL's below
-#NTPCLIENT_OPTS="-b someserver"
+# This default setting should work fine but you should
+# change the default 'pool.ntp.org' to something closer
+# to your machine.  See http://www.pool.ntp.org/ or
+# try running `netselect -s 3 pool.ntp.org`.
+NTPCLIENT_OPTS="-Q -b -u pool.ntp.org"
 
-##
-# A list of available servers is available here:
-# http://www.eecis.udel.edu/~mills/ntp/servers.html
-# Please follow the rules of engagement and use a
-# Stratum 2 server (unless you qualify for Stratum 1)
-##
+# How long to wait (in seconds) before giving up.
+# Useful for when you boot and DNS/internet isn't
+# really available but you have your net interface
+# come up with say a static IP.
+NTPCLIENT_TIMEOUT=30
diff --git a/net-misc/ntp/files/ntp-client.rc b/net-misc/ntp/files/ntp-client.rc
index b6f0be48b003..a37b5f8c0432 100644
--- a/net-misc/ntp/files/ntp-client.rc
+++ b/net-misc/ntp/files/ntp-client.rc
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2         
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.1 2003/08/06 07:42:24 vapier Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.1.1.1 2005/11/30 09:55:20 chriswhite Exp $
 
 depend() {
+	before cron portmap
 	need net
 	use dns logger
 }
@@ -25,7 +26,10 @@ checkconfig() {
 start() {
 	checkconfig || return $?
 
-	ebegin "Setting clock via the ntp client '${NTPCLIENT_CMD}'"
-	${NTPCLIENT_CMD} >/dev/null ${NTPCLIENT_OPTS}
+	ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
+	${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null &
+	local pid=$!
+	(sleep ${NTPCLIENT_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &
+	wait ${pid}
 	eend $? "Failed to set clock"
 }
diff --git a/net-misc/ntp/files/ntp.conf b/net-misc/ntp/files/ntp.conf
index 366399e1b638..93fc91947e8c 100644
--- a/net-misc/ntp/files/ntp.conf
+++ b/net-misc/ntp/files/ntp.conf
@@ -1,14 +1,47 @@
-
-logfile		/var/log/ntpd.log
-driftfile	/var/state/ntp.drift
+# NOTES:
+#  - you should only have to update the server line below
+#  - if you start getting lines like 'restrict' and 'fudge'
+#    and you didnt add them, AND you run dhcpcd on your
+#    network interfaces, be sure to add '-Y -N' to the
+#    dhcpcd_ethX variables in /etc/conf.d/net
 
 # Name of the servers ntpd should sync with
 # Please respect the access policy as stated by the responsible person.
 #server		ntp.example.tld		iburst
 
+server pool.ntp.org
+
 ##
-# A list of available servers is available here:
-# * http://www.eecis.udel.edu/~mills/ntp/clock1.html
-# and
-# * http://www.eecis.udel.edu/~mills/ntp/clock2.html
+# A list of available servers can be found here:
+# http://www.pool.ntp.org/
+# http://www.pool.ntp.org/#use
+# A good way to get servers for your machine is:
+# netselect -s 3 pool.ntp.org
 ##
+
+# you should not need to modify the following paths
+driftfile	/var/lib/ntp/ntp.drift
+
+#server ntplocal.example.com prefer 
+#server timeserver.example.org 
+
+# Warning: Using default NTP settings will leave your NTP
+# server accessible to all hosts on the Internet.
+
+# If you want to deny all machines (including your own)
+# from accessing the NTP server, uncomment:
+#restrict default ignore
+
+
+# To deny other machines from changing the
+# configuration but allow localhost:
+restrict default nomodify nopeer
+restrict 127.0.0.1
+
+
+# To allow machines within your network to synchronize
+# their clocks with your server, but ensure they are
+# not allowed to configure the server or used as peers
+# to synchronize against, uncomment this line.
+#
+#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap
diff --git a/net-misc/ntp/files/ntpd-4.1.2.confd b/net-misc/ntp/files/ntpd-4.1.2.confd
index 2a19583b2cc3..804271146872 100644
--- a/net-misc/ntp/files/ntpd-4.1.2.confd
+++ b/net-misc/ntp/files/ntpd-4.1.2.confd
@@ -1,6 +1,4 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2         
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd-4.1.2.confd,v 1.1 2004/02/15 00:35:56 vapier Exp $
+# /etc/conf.d/ntpd
 
 # Options to pass to the ntpd process
 # Most people should leave this line alone ...
diff --git a/net-misc/ntp/files/ntpd-4.1.2.rc b/net-misc/ntp/files/ntpd-4.1.2.rc
index b1f7376d8503..a43c1b7eb30c 100644
--- a/net-misc/ntp/files/ntpd-4.1.2.rc
+++ b/net-misc/ntp/files/ntpd-4.1.2.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd-4.1.2.rc,v 1.1 2004/02/14 22:58:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd-4.1.2.rc,v 1.1.1.1 2005/11/30 09:55:20 chriswhite Exp $
 
 depend() {
 	need net
@@ -24,13 +24,13 @@ start() {
 	ebegin "Starting ntpd"
 	touch /var/run/ntpd.pid
 	chown ntp:ntp /var/run/ntpd.pid
-	start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \
-		--startas /usr/bin/ntpd -- -p /var/run/ntpd.pid ${NTPD_OPTS}
+	/usr/bin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS}
 	eend $? "Failed to start ntpd"
 }
 
 stop() {
 	ebegin "Stopping ntpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ntpd.pid
+	start-stop-daemon --stop --pidfile /var/run/ntpd.pid
 	eend $? "Failed to stop ntpd"
+	rm -f /var/run/ntpd.pid
 }
diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd
index 7ae77e8fc443..c651e80dcc67 100644
--- a/net-misc/ntp/files/ntpd.confd
+++ b/net-misc/ntp/files/ntpd.confd
@@ -1,7 +1,6 @@
-# Config file for /etc/init.d/ntpd
-
-
-# Name of the server ntpd should sync with
-
-#NTPDATESERVER=ntp.ctr.columbia.edu
+# /etc/conf.d/ntpd
 
+# Options to pass to the ntpd process
+# Most people should leave this line alone ...
+# however, if you know what you're doing, feel free to tweak
+NTPD_OPTS="-u ntp:ntp"
diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc
index d6b3262ac06a..b2347aab1951 100644
--- a/net-misc/ntp/files/ntpd.rc
+++ b/net-misc/ntp/files/ntpd.rc
@@ -1,44 +1,38 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2         
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.1 2002/12/16 16:17:46 vapier Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
 depend() {
 	need net
+	use dns logger
+	after ntp-client
 }
 
 checkconfig() {
 	if [ ! -f /etc/ntp.conf ] ; then
 		eerror "Please create /etc/ntp.conf"
+		eerror "Sample conf: /usr/share/ntp/ntp.conf"
 		return 1
 	fi
-
 	return 0
 }
 
 start() {
 	checkconfig || return $?
 
-	NTPDATESERVERS=`grep '^server[[:space:]]*' /etc/ntp.conf | awk '{print $2}'`
-	if [ -n "${NTPDATESERVERS}" ] ; then
-		ebegin "Running ntpdate"
-		ntpdate -b ${NTPDATESERVERS} > /dev/null
-		eend $? "Failed to run ntpdate"
-	else
-		ewarn "Please set a valid server line in /etc/ntp.conf"
-	fi
-
 	ebegin "Starting ntpd"
-	start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \
-		--startas /usr/bin/ntpd -- -p /var/run/ntpd.pid
+	/usr/sbin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS}
 	eend $? "Failed to start ntpd"
 }
 
 stop() {
 	ebegin "Stopping ntpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ntpd.pid
-	eend $? "Failed to stop ntpd"
-
-	# clean stale pidfile
-	[ -f /var/run/ntpd.pid ] && rm -f /var/run/ntpd.pid
+	start-stop-daemon --stop \
+		--pidfile /var/run/ntpd.pid \
+		--exec /usr/sbin/ntpd
+	local ret=$?
+	eend ${ret} "Failed to stop ntpd"
+	rm -f /var/run/ntpd.pid
+	return ${ret}
 }
diff --git a/net-misc/ntp/ntp-4.1.2.ebuild b/net-misc/ntp/ntp-4.1.2.ebuild
index c38a3317f78c..1e7d9f730f0b 100644
--- a/net-misc/ntp/ntp-4.1.2.ebuild
+++ b/net-misc/ntp/ntp-4.1.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/net-misc/ntp/ntp-4.1.2.ebuild,v 1.1 2003/08/06 07:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.2.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Network Time Protocol suite/programs"
 HOMEPAGE="http://www.ntp.org/"
@@ -11,19 +11,22 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64"
-IUSE="parse-clocks ssl"
+KEYWORDS="alpha amd64 hppa mips ppc sparc x86"
+IUSE="parse-clocks selinux ssl"
 
-DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1
 	sys-libs/libcap
-	ssl? ( dev-libs/openssl )"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 /dev/null /bin/false ntp
-}
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+DEPEND="${RDEPEND}
+	|| (
+		dev-libs/libelf
+		dev-libs/elfutils
+	)
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.7.7
+	>=sys-apps/sed-4.0.5"
 
 hax_bitkeeper() {
 	# the makefiles have support for bk ...
@@ -46,9 +49,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-config-phone.patch #13001
 	sed -i "s:-Wpointer-arith::" configure.in
 
-	aclocal -I . || die
-	automake || die
-	autoconf || die
+	# needed in order to make files with right ver info #30220.
+	aclocal -I . || die "autolocal"
+	automake || die "automake"
+	autoconf || die "autoconf"
 }
 
 src_compile() {
@@ -59,15 +63,21 @@ src_compile() {
 		&& mysslconf="--with-openssl-libdir=yes" \
 		|| mysslconf="--with-openssl-libdir=no"
 	econf \
-		--build=${CHOST} \
 		`use_enable parse-clocks` \
 		${mysslconf} \
 		|| die
+
 	emake || die
 }
 
+pkg_preinst() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
 src_install() {
 	hax_bitkeeper
+	pkg_preinst
 
 	make install DESTDIR=${D} || die
 
@@ -83,14 +93,20 @@ src_install() {
 		-name 'rc[12]' -o \
 		-name support`
 	mv scripts/* ${D}/usr/share/ntp/
+	chmod -R go-w ${D}/usr/share/ntp
 
-	[ ! -e /etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
+	[ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ntpd.rc ntpd
-	newexe ${FILESDIR}/ntp-client.rc ntp-client
+	newexe ${FILESDIR}/ntpd-${PV}.rc ntpd
+	newexe ${FILESDIR}/ntp-client-${PV}.rc ntp-client
 	insinto /etc/conf.d
-	newins ${FILESDIR}/ntpd.confd ntpd
+	newins ${FILESDIR}/ntpd-${PV}.confd ntpd
 	newins ${FILESDIR}/ntp-client.confd ntp-client
+
+	dodir /var/lib/ntp
+	fowners ntp:ntp /var/lib/ntp
+	touch ${D}/var/lib/ntp/ntp.drift
+	fowners ntp:ntp /var/lib/ntp/ntp.drift
 }
 
 pkg_postinst() {
diff --git a/net-misc/ntp/ntp-4.2.0-r2.ebuild b/net-misc/ntp/ntp-4.2.0-r2.ebuild
index 7fb24d0887c7..66f19a8237e1 100644
--- a/net-misc/ntp/ntp-4.2.0-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.0-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.1 2004/04/05 23:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic gnuconfig
 
 DESCRIPTION="Network Time Protocol suite/programs"
 HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz"
-#	mirror://gentoo/${PF}-manpages.tbz2"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz
+	mirror://gentoo/${PF}-manpages.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
+KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sparc x86 ia64"
 IUSE="parse-clocks nodroproot selinux ssl"
 
 RDEPEND=">=sys-libs/ncurses-5.2
@@ -24,11 +24,6 @@ DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.7.7
 	>=sys-apps/sed-4.0.5"
 
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 /bin/false /dev/null ntp
-}
-
 hax_bitkeeper() {
 	# the makefiles have support for bk ...
 	# basically we have to do this or bk will try to write
@@ -41,13 +36,14 @@ hax_bitkeeper() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	use alpha && epatch ${FILESDIR}/ntp-4.1.1b-syscall-libc.patch
+	use alpha && epatch "${FILESDIR}"/ntp-4.1.1b-syscall-libc.patch
 
-	epatch ${FILESDIR}/${PV}-ntpdate-quiet.patch
-	epatch ${FILESDIR}/${PV}-linux-config-phone.patch #13001
-	epatch ${FILESDIR}/${PV}-droproot.patch
+	epatch "${FILESDIR}"/${PV}-ntpdate-quiet.patch
+	epatch "${FILESDIR}"/${PV}-linux-config-phone.patch #13001
+	epatch "${FILESDIR}"/${PV}-droproot.patch
+	epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719
 	sed -i "s:-Wpointer-arith::" configure.in
 
 	# needed in order to make files with right ver info #30220
@@ -55,41 +51,47 @@ src_unpack() {
 	automake || die "automake"
 	autoconf || die "autoconf"
 
-	sed -i 's:-lelf:-la_doe_a_deer_a_female_deer:g' configure
+	sed -i \
+		-e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \
+		-e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \
+		configure || die "sed failed"
+
+	gnuconfig_update
 }
 
 src_compile() {
 	hax_bitkeeper
 
-	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
-
 	local mysslconf
 	use ssl \
 		&& mysslconf="--with-openssl-libdir=yes" \
 		|| mysslconf="--with-openssl-libdir=no"
 	econf \
-		--build=${CHOST} \
 		`use_enable !nodroproot linuxcaps` \
 		`use_enable parse-clocks` \
 		${mysslconf} \
 		|| die
 
-	has_version "sys-devel/hardened-gcc" && find ${WORKDIR} -name "Makefile" -type f -exec sed -i "s,-yet_exec,," {} \;
-
 	emake || die
 }
 
+pkg_preinst() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
 src_install() {
 	hax_bitkeeper
+	pkg_preinst
 
 	make install DESTDIR=${D} || die
 
 	dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
-#	doman ${WORKDIR}/man/*.1
+	doman ${WORKDIR}/man/*.1
 	dohtml -r html/*
 
 	insinto /usr/share/ntp
-	doins ${FILESDIR}/ntp.conf
+	doins "${FILESDIR}"/ntp.conf
 	rm -rf `find scripts/ \
 		-name '*.in' -o \
 		-name 'Makefile*' -o \
@@ -98,13 +100,13 @@ src_install() {
 	cp -r scripts/* ${D}/usr/share/ntp/
 	chmod -R go-w ${D}/usr/share/ntp
 
-	[ ! -e /etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
+	[ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins "${FILESDIR}"/ntp.conf
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ntpd.rc ntpd
-	newexe ${FILESDIR}/ntp-client.rc ntp-client
+	newexe "${FILESDIR}"/ntpd.rc ntpd
+	newexe "${FILESDIR}"/ntp-client.rc ntp-client
 	insinto /etc/conf.d
-	newins ${FILESDIR}/ntpd.confd ntpd
-	newins ${FILESDIR}/ntp-client.confd ntp-client
+	newins "${FILESDIR}"/ntpd.confd ntpd
+	newins "${FILESDIR}"/ntp-client.confd ntp-client
 	use nodroproot && dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
 
 	dodir /var/lib/ntp
@@ -122,7 +124,7 @@ pkg_postinst() {
 	einfo "Now you can use /etc/init.d/ntp-client to set your time at"
 	einfo "boot while you can use /etc/init.d/ntpd to maintain your time"
 	einfo "while your machine runs"
-	if [ ! -z "$(grep notrust ${ROOT}/etc/ntp.conf)" ] ; then
+	if [ ! -z "$(egrep '^[^#].*notrust' ${ROOT}/etc/ntp.conf)" ] ; then
 		echo
 		eerror "The notrust option was found in your /etc/ntp.conf!"
 		ewarn "If your ntpd starts sending out weird responses,"
diff --git a/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild b/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild
index 74c5f34478ed..f0ccc2eb1080 100644
--- a/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild
+++ b/net-misc/ntp/ntp-4.2.0.20040617-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-misc/ntp/ntp-4.2.0.20040617-r3.ebuild,v 1.1 2005/08/25 22:10:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild b/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild
index 73d285d764f4..e23439c5318f 100644
--- a/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild,v 1.1 2005/08/25 22:10:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20050303-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:19 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/nx-x11/ChangeLog b/net-misc/nx-x11/ChangeLog
index b1cc55a3f6b7..bca07dd0d0b4 100644
--- a/net-misc/nx-x11/ChangeLog
+++ b/net-misc/nx-x11/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for net-misc/nx-x11
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.1 2004/08/30 20:19:16 stuart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nx-x11-1.4.0-r4.ebuild:
+  Stable on ppc.
+
+*nx-x11-1.4.0-r4 (19 Feb 2005)
+
+  19 Feb 2005; Stuart Herbert <stuart@gentoo.org> +nx-x11-1.4.0-r4.ebuild:
+  Bug 81583: new release; Urs Joss <tschenturs@gmx.ch>
+  Bug 78881: missing dep; Joe Kowalski <joek@pckconsult.com>
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nx-x11-1.4.0-r1.ebuild,
+  -nx-x11-1.4.0-r2.ebuild, -nx-x11-1.4.0.ebuild:
+  Removed obsolete version
+
+*nx-x11-1.4.0-r3 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0-r2.ebuild,
+  +nx-x11-1.4.0-r3.ebuild:
+  Version bump; thanks to Christian Oyarzun for his help; see bug #71694
+
+  12 Sep 2004; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0-r1.ebuild,
+  nx-x11-1.4.0-r2.ebuild:
+  Fixed installation of NX.h header file
+
+*nx-x11-1.4.0-r2 (12 Sep 2004)
+
+  12 Sep 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/nx-x11-1.4.0.xprint.patch, nx-x11-1.4.0-r1.ebuild,
+  +nx-x11-1.4.0-r2.ebuild:
+  Switched to using libXcomp-1.4.0 (for problem reported in the forums)
+  Corrected description (bug #62297)
+  Corrected homepage (bug #62297)
+  Fix for missing libXp (bug #63522)
+
+*nx-x11-1.4.0-r1 (07 Sep 2004)
+
+  07 Sep 2004; Stuart Herbert <stuart@gentoo.org> +nx-x11-1.4.0-r1.ebuild,
+  nx-x11-1.4.0.ebuild:
+  Uses latest nxagent
+
+  30 Aug 2004; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0.ebuild:
+  Fixed use of incorrect version of nxcomp
 
 *nx-x11-1.4.0 (30 Aug 2004)
 
diff --git a/net-misc/nx-x11/Manifest b/net-misc/nx-x11/Manifest
index 30449b435f0e..7f64deac1a40 100644
--- a/net-misc/nx-x11/Manifest
+++ b/net-misc/nx-x11/Manifest
@@ -1,4 +1,7 @@
-MD5 08584f78fac3265eb23d0566fbc72c34 nx-x11-1.4.0.ebuild 2330
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
-MD5 8a921938fc6816240ca38170c3ae3ee8 ChangeLog 280
-MD5 4de7c9783e61a9ae43da6af51646718d files/digest-nx-x11-1.4.0 539
+MD5 76d296ae43407b76f47d1a2baaef0f26 ChangeLog 1808
+MD5 dd061df9cf4e99f32835ce0c74fc024e nx-x11-1.4.0-r3.ebuild 2847
+MD5 70ed03d995c23a6f3a70c3e9fc383efc nx-x11-1.4.0-r4.ebuild 2863
+MD5 b1b175fda7a68efc0ea21ac829c6449c files/digest-nx-x11-1.4.0-r3 539
+MD5 d2caae40bdf5748d68ca46ad1d0ec951 files/nx-x11-1.4.0.xprint.patch 341
+MD5 852f1c66a1d795124d5eea434e530ab8 files/digest-nx-x11-1.4.0-r4 540
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild
index 3aaa4ca4a584..ec94a93e71b3 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.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/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild,v 1.1 2005/01/02 09:34:56 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild
index 196ca70cff03..d09b6dc0eacf 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild,v 1.1 2005/02/19 10:11:54 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r4.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ SRC_NXESD="nxesd-1.4.0-1.tar.gz"
 SRC_URI="$URI_BASE/nx-X11/${SRC_NX_X11} $URI_BASE/nxagent/${SRC_NXAGENT} $URI_BASE/nxauth/${SRC_NXAUTH} $URI_BASE/nxcomp/${SRC_NXCOMP} $URI_BASE/nxcompext/${SRC_NXCOMPEXT} $URI_BASE/nxviewer/${SRC_NXVIEWER} $URI_BASE/nxdesktop/${SRC_NXDESKTOP} $URI_BASE/nxesd/${SRC_NXESD}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 #RESTRICT="nostrip"
 DEPEND="virtual/x11
diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index aa3b7b573c7f..4611751e543b 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for net-misc/nxclient
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.1 2003/08/27 03:12:19 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
+
+  25 Oct 2005; Aron Griffis <agriffis@gentoo.org> +files/1.5.0/50nxclient,
+  -nxclient-1.3.2-r1.ebuild, -nxclient-1.4.0-r3.ebuild,
+  -nxclient-1.4.0-r4.ebuild, nxclient-1.5.0.ebuild:
+  Install env.d snippet for 1.5.0 to set PATH.  Remove versions prior to 1.4.0-r5
+
+*nxclient-1.5.0 (20 Oct 2005)
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org> +nxclient-1.5.0.ebuild:
+  Bump to 1.5.0 (from 1.4.0-r5)
+
+  23 May 2005; Stuart Herbert <stuart@gentoo.org> :
+  Added missing nxprint binary; fixed up deps on other nx-packages; thanks to
+  bug #91409
+
+*nxclient-1.4.0-r4 (17 Feb 2005)
+
+  17 Feb 2005; Stuart Herbert <stuart@gentoo.org> +nxclient-1.4.0-r4.ebuild:
+  Bug 81308: missing dep; Daniel Herzog <expose@luftgetrock.net>
+
+  28 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> nxclient-1.3.2-r1.ebuild,
+  nxclient-1.4.0-r3.ebuild:
+  Avoid installing things in /usr/kde (#63863).
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nxclient-1.3.0.ebuild,
+  -nxclient-1.3.2.ebuild, -nxclient-1.4.0-r1.ebuild,
+  -nxclient-1.4.0-r2.ebuild, -nxclient-1.4.0.ebuild:
+  Removed obsolete version
+
+*nxclient-1.4.0-r3 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +nxclient-1.4.0-r3.ebuild:
+  Version bump
+
+*nxclient-1.4.0-r2 (13 Sep 2004)
+
+  13 Sep 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.4.0-r1.ebuild,
+  +nxclient-1.4.0-r2.ebuild:
+  Added missing dep on gnu-netcat; added support for snapshot 5 again after
+  feedback from zypher@gentoo.org
+
+  13 Sep 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.4.0-r1.ebuild:
+  Downgraded to snapshot 4 client
+
+*nxclient-1.4.0-r1 (12 Sep 2004)
+
+  12 Sep 2004; Stuart Herbert <stuart@gentoo.org> +nxclient-1.4.0-r1.ebuild:
+  Added dep on nxproxy-1.4.0
+
+  07 Sep 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.4.0.ebuild:
+  Updated to use latest nxclient snapshot
+
+  30 Aug 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.4.0.ebuild:
+  Added snapshot 4; needed by freenx
+
+  07 Jul 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.3.0.ebuild,
+  nxclient-1.3.2.ebuild, nxclient-1.4.0.ebuild:
+  Made sure HOMEPAGE is a valid URL; fixes bug 55315
+
+  26 Jun 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.3.2.ebuild:
+  Added missing libqt dependency; for bug #51105
+
+*nxclient-1.4.0 (26 Jun 2004)
+
+  26 Jun 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.4.0.ebuild:
+  Added binary snapshot of NX Client 1.4
+
+  13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; nxclient-1.3.0.ebuild,
+  nxclient-1.3.2.ebuild:
+  Change x11-base/xfree dependency to virtual/x11 (#52153).
+
+*nxclient-1.3.2 (15 May 2004)
+
+  15 May 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.3.2.ebuild:
+  Version bump
+
+  15 May 2004; Stuart Herbert <stuart@gentoo.org> nxclient-1.2.2-r1.ebuild,
+  nxclient-1.2.2.ebuild, nxclient-1.3.0_beta2.ebuild:
+  Removed old versions; I'm not supporting them any more
+
+*nxclient-1.3.0 (21 dec 2003)
+
+  21 Dec 2003; Stuart Herbert <stuart@gentoo.org> :
+  Version bump
+
+*nxclient-1.3.0_beta2 (13 Nov 2003)
+
+  13 Nov 2003; Stuart Herbert <stuart@gentoo.org> nxclient-1.3.0_beta2.ebuild:
+  Added 1.3.0_beta2
+
+*nxclient-1.2.2-r1 (10 Sep 2003)
+
+  10 Sep 2003; stuart metadata.xml, nxclient-1.2.2-r1.ebuild,
+  nxclient-1.2.2.ebuild:
+  Added ebuild for nxclient-1.2.2-42 release
 
 *nxclient-1.2.2 (27 Aug 2003)
 
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 9194b5df3ba9..e1a1161176df 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,4 +1,18 @@
-MD5 02c8d16464bcf3ee5683f7fd5abb40df nxclient-1.2.2.ebuild 1687
-MD5 50bda00a6885d3024a3f041d3f0c4939 ChangeLog 244
-MD5 2d2350797ee95d01a2c1fa5e2d0c2207 files/digest-nxclient-1.2.2 72
-MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.2.2/50nxclient 57
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ce54942a5882b5497e5dbcf7ce74f8c ChangeLog 3589
+MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.3.0/50nxclient 57
+MD5 f44884663100850b12e1fdb12b55645b files/1.5.0/50nxclient 38
+MD5 6532e2cbed5e3c88e36520dc46b1be4b files/digest-nxclient-1.4.0-r5 71
+MD5 f88ec7c11f1f61ad0c0c390e5325e8d5 files/digest-nxclient-1.5.0 149
+MD5 c1c67a77261d3b3fede94b41a9d0ce1e metadata.xml 455
+MD5 4429f22294184b7381a98271588fc29b nxclient-1.4.0-r5.ebuild 1648
+MD5 ceb7fb63bb0069577d0bf90e30241ab1 nxclient-1.5.0.ebuild 2192
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXhuCJrHF4yAQTrARAhQTAJwL0Bs/Hbac05DzmpqXUWNsKUroEgCffjNk
+gyJFq+PrinLY4Fpyn+LRZqk=
+=RrDI
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxclient/nxclient-1.4.0-r5.ebuild b/net-misc/nxclient/nxclient-1.4.0-r5.ebuild
index 1da3a65e7455..993640396d43 100644
--- a/net-misc/nxclient/nxclient-1.4.0-r5.ebuild
+++ b/net-misc/nxclient/nxclient-1.4.0-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-misc/nxclient/nxclient-1.4.0-r5.ebuild,v 1.1 2005/05/23 18:51:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r5.ebuild,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
 inherit rpm
 
diff --git a/net-misc/nxclient/nxclient-1.5.0.ebuild b/net-misc/nxclient/nxclient-1.5.0.ebuild
index 1eca363d4d2d..e4235c316ede 100644
--- a/net-misc/nxclient/nxclient-1.5.0.ebuild
+++ b/net-misc/nxclient/nxclient-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.5.0.ebuild,v 1.1 2005/10/20 21:29:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.5.0.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 inherit rpm
 
@@ -73,4 +73,8 @@ src_install() {
 		mv ${D}/usr/NX/share/applnk/"NX Client for Linux"
 			${D}/usr/share/applnk/Internet
 	fi
+
+	# Install env.d snippet to add /usr/NX/bin to the PATH
+	insinto /etc/env.d
+	doins ${FILESDIR}/1.5.0/50nxclient
 }
diff --git a/net-misc/nxcomp/ChangeLog b/net-misc/nxcomp/ChangeLog
index 29fd0dcecea5..a0c5ba7d83d5 100644
--- a/net-misc/nxcomp/ChangeLog
+++ b/net-misc/nxcomp/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for net-misc/nxcomp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.1 2003/08/27 03:02:39 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
+
+  21 Oct 2005; Aron Griffis <agriffis@gentoo.org> nxcomp-1.5.0.ebuild:
+  Install libXcomp.so* instead of libXcomp.so.${PV} so that nxssh and others
+  can link
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org> nxcomp-1.5.0.ebuild:
+  Add lib -> $(get_libdir) symlink in /usr/NX; seems to be necessary for
+  nxclient to start
+
+*nxcomp-1.5.0 (20 Oct 2005)
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/nxcomp-1.5.0-pic.patch, +nxcomp-1.5.0.ebuild:
+  Update to nxcomp-1.5.0
+
+*nxcomp-1.2.2-r1 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nxcomp-1.2.2-r1.ebuild,
+  -nxcomp-1.3.0.ebuild, -nxcomp-1.3.2.ebuild:
+  Removed obsolete version
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nxcomp-1.4.0.ebuild:
+  Now installed by nx-x11
+
+*nxcomp-1.4.0-r1 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +nxcomp-1.4.0-r1.ebuild,
+  -nxcomp-1.4.0.ebuild:
+  Now installed by nx-x11
+
+*nxcomp-1.4.0 (12 Sep 2004)
+
+  12 Sep 2004; Stuart Herbert <stuart@gentoo.org> +nxcomp-1.4.0.ebuild:
+  Version bump
+
+  15 May 2004; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.2.ebuild:
+  Added call to prelib, as portage doesn't seem to do this automagically :(
+
+  14 May 2004; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.2.ebuild:
+  Fix for nxcomp trying to install wrong library version
+
+*nxcomp-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org> nxcomp-1.2.2.ebuild,
+  nxcomp-1.3.0_beta2.ebuild, nxcomp-1.3.2.ebuild:
+  Added nxcomp-1.3.2, for nxserver 1.3.2.  Removed older versions
+
+  11 Mar 2004; David Holm <dholm@gentoo.org> nxcomp-1.3.0.ebuild:
+  Added to ~ppc.
+
+  27 Feb 2004; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.0.ebuild:
+  Fix for bug #36270
+
+  25 Dec 2003; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.0.ebuild:
+  Added missing dependencies; for bug #36483
+
+  21 Dec 2003; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.0.ebuild:
+  Marked as stable
+
+*nxcomp-1.3.0 (21 Dec 2003)
+
+  21 Dec 2003; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.0.ebuild:
+  Version bump
+
+*nxcomp-1.3.0_beta2 (24 Nov 2003)
+
+  24 Nov 2003; Stuart Herbert <stuart@gentoo.org> nxcomp-1.3.0_beta2.ebuild:
+  Fix for attempt to install wrong version of the .so file
+
+  13 Nov 2003; Stuart Herbert <stuart@gentoo.org> :
+  Added ebuild for beta2 of nxcomp-1.3.0
+
+  10 Sep 2003; stuart :
+  Added support for latest nxcomp release
+
+  09 Sep 2003; stuart nxcomp-1.2.2.ebuild:
+  Marked as stable
 
 *nxcomp-1.2.2 (27 Aug 2003)
 
diff --git a/net-misc/nxcomp/Manifest b/net-misc/nxcomp/Manifest
index 4230a4010f5d..985625581b29 100644
--- a/net-misc/nxcomp/Manifest
+++ b/net-misc/nxcomp/Manifest
@@ -1,2 +1,17 @@
-MD5 8685035385a0ed461a84915342adc210 nxcomp-1.2.2.ebuild 546
-MD5 b7ad142d655c6e9ae50d78bf227a1248 files/digest-nxcomp-1.2.2 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f2f30f5f9037b410cea69a3d5661032b ChangeLog 2727
+MD5 bbbdf1a4b71647d0606017837bb7fc69 files/digest-nxcomp-1.3.2-r1 66
+MD5 eb79d26514557a9076393ddca0e9db75 files/digest-nxcomp-1.5.0 67
+MD5 b3913b98fb03efcd7677b50a7d8d0b71 files/nxcomp-1.5.0-pic.patch 513
+MD5 8e92b9291198042d907534cb08b013f8 metadata.xml 361
+MD5 10613855f29c1af490bb1bb997eb46a3 nxcomp-1.3.2-r1.ebuild 979
+MD5 cca1c31c3b462d76dc4a66c2bb5d1cac nxcomp-1.5.0.ebuild 1070
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDWEV/JrHF4yAQTrARAunVAKDKth0jB7gcRm7Mu5BtqzjrUb4tIQCgo6TG
+W4DNPOLjntPpI1qJtJ2MW+8=
+=xm5L
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild b/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild
index 0e2a4c8b88e5..38c8244bc87a 100644
--- a/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild,v 1.1 2004/07/07 12:55:05 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 MY_P="${PN}-1.3.2-4"
 DESCRIPTION="X11 protocol compression library"
@@ -9,6 +9,7 @@ SRC_URI="http://www.nomachine.com/download/nxsources/nxcomp/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 DEPEND=">=media-libs/jpeg-6b-r3
 >=media-libs/libpng-1.2.5-r4
 >=sys-devel/gcc-3.2.3-r2
diff --git a/net-misc/nxcomp/nxcomp-1.5.0.ebuild b/net-misc/nxcomp/nxcomp-1.5.0.ebuild
index f7cc2603864f..157adb503828 100644
--- a/net-misc/nxcomp/nxcomp-1.5.0.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.5.0.ebuild,v 1.1 2005/10/20 21:24:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.5.0.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 inherit eutils multilib
 
@@ -34,7 +34,13 @@ src_compile() {
 
 src_install() {
 	into /usr/NX
-	dolib libXcomp.so.${PV}
+	dolib libXcomp.so*
+	if [[ $(get_libdir) != lib ]]; then
+		# necessary for nxclient to work, it seems
+		ln -s "$(get_libdir)" ${D}/usr/NX/lib
+	fi
+
+	preplib /usr/NX/lib
 
 	insinto /usr/NX/include
 	doins NX.h
diff --git a/net-misc/nxproxy/ChangeLog b/net-misc/nxproxy/ChangeLog
index 9ceb3e7bbed9..dd2bbc9680c8 100644
--- a/net-misc/nxproxy/ChangeLog
+++ b/net-misc/nxproxy/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for net-misc/nxproxy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/ChangeLog,v 1.1 2003/08/27 03:04:42 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/ChangeLog,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org> nxproxy-1.5.0.ebuild:
+  Need to get nxcomp's NX.h from /usr/NX/include
+
+*nxproxy-1.5.0 (20 Oct 2005)
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org> +nxproxy-1.5.0.ebuild:
+  Bump to 1.5.0 (from 1.4.0-r2)
+
+  23 May 2005; Stuart Herbert <stuart@gentoo.org> nxproxy-1.4.0-r2.ebuild:
+  Removed unneeded nxcomp sources; thanks to bug #91409
+
+*nxproxy-1.4.0-r2 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nxproxy-1.3.0.ebuild,
+  -nxproxy-1.4.0-r1.ebuild, +nxproxy-1.4.0-r2.ebuild, -nxproxy-1.4.0.ebuild:
+  Removed obsolete version
+
+*nxproxy-1.4.0-r1 (11 Dec 2004)
+
+  11 Dec 2004; Michael Imhof <tantive@gentoo.org> +nxproxy-1.4.0-r1.ebuild:
+  Bumped. Working version. Closes #65797.
+
+*nxproxy-1.4.0 (12 Sep 2004)
+
+  12 Sep 2004; Stuart Herbert <stuart@gentoo.org> +nxproxy-1.4.0.ebuild:
+  Added nxproxy-1.4.0 (needed by nxclient-1.4.0)
+
+*nxproxy-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org> nxproxy-1.2.2-r1.ebuild,
+  nxproxy-1.2.2.ebuild, nxproxy-1.3.0_beta2.ebuild, nxproxy-1.3.2.ebuild:
+  Version bump
+
+  11 Mar 2004; David Holm <dholm@gentoo.org> nxproxy-1.3.0.ebuild:
+  Added to ~ppc.
+
+*nxproxy-1.3.0 (21 Dec 2003)
+
+  21 Dec 2003; Stuart Herbert <stuart@gentoo.org> nxproxy-1.3.0.ebuild:
+  Version bump
+
+*nxproxy-1.3.0_beta2 (13 Nov 2003)
+
+  13 Nov 2003; Stuart Herbert <stuart@gentoo.org> nxproxy-1.3.0_beta2.ebuild:
+  Added 1.3.0-beta2
+
+*nxproxy-1.2.2-r1 (10 Sep 2003)
+
+  10 Sep 2003; stuart metadata.xml, nxproxy-1.2.2-r1.ebuild:
+  Added ebuild for nxproxy-1.2.2-6 release
+
+  09 Sep 2003; stuart nxproxy-1.2.2.ebuild:
+  Marked as stable
 
 *nxproxy-1.2.2 (27 Aug 2003)
 
diff --git a/net-misc/nxproxy/Manifest b/net-misc/nxproxy/Manifest
index 80b749985e36..5d81b6ade298 100644
--- a/net-misc/nxproxy/Manifest
+++ b/net-misc/nxproxy/Manifest
@@ -1,3 +1,19 @@
-MD5 75830d763b3e4fe2aa19b13093d94fe9 nxproxy-1.2.2.ebuild 865
-MD5 0738e13fa3f4d0504c8419991333f8d3 files/digest-nxproxy-1.2.2 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 366703dd1ed13a616c9f54b977bd441b ChangeLog 1972
 MD5 d7c92d02795ad3ecf951731efaac6b03 files/1.2.2-Makefile.in.patch 421
+MD5 34472d4d8979c06122ccb8e42633b27d files/digest-nxproxy-1.3.2 66
+MD5 249d00d3d6c27a44d67fe9b947fe2053 files/digest-nxproxy-1.4.0-r2 66
+MD5 0e0983b01ab6210a6dc9a8cc2574909b files/digest-nxproxy-1.5.0 66
+MD5 a50ecb98a1a261895a4d34af6cda6b3c metadata.xml 369
+MD5 467f8ee3d8dc9b6b742774307b6d8533 nxproxy-1.3.2.ebuild 966
+MD5 78b8700fdd169bdc90d9d7bf656fd610 nxproxy-1.4.0-r2.ebuild 921
+MD5 3e0c5965e78d49847e6e59148ab8fb16 nxproxy-1.5.0.ebuild 1062
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXOkjJrHF4yAQTrARAtnJAJ9u0m0TkVPoOdrc1NQKC1LHszKTOQCfeVDF
+qiuWYKD5Ed4oSQ1DTjCR3vQ=
+=ujED
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxproxy/files/digest-nxproxy-1.4.0-r2 b/net-misc/nxproxy/files/digest-nxproxy-1.4.0-r2
index ad1c48a44ccb..57bc1440c1d2 100644
--- a/net-misc/nxproxy/files/digest-nxproxy-1.4.0-r2
+++ b/net-misc/nxproxy/files/digest-nxproxy-1.4.0-r2
@@ -1,2 +1 @@
 MD5 15d89810730c7ed0e669b5525e5f3620 nxproxy-1.4.0-2.tar.gz 75223
-MD5 3b659bb177f3706f0b19589d56b120f8 nxcomp-1.4.0-30.tar.gz 454833
diff --git a/net-misc/nxproxy/files/digest-nxproxy-1.5.0 b/net-misc/nxproxy/files/digest-nxproxy-1.5.0
index e26186e93dd4..6f14671221c1 100644
--- a/net-misc/nxproxy/files/digest-nxproxy-1.5.0
+++ b/net-misc/nxproxy/files/digest-nxproxy-1.5.0
@@ -1,2 +1 @@
-MD5 cab094a88acb299cc1e89dfb2c6a95eb nxcomp-1.5.0-65.tar.gz 496878
 MD5 d2e3c1a109db336dfa497f4c2004f2d5 nxproxy-1.5.0-9.tar.gz 73470
diff --git a/net-misc/nxproxy/nxproxy-1.3.2.ebuild b/net-misc/nxproxy/nxproxy-1.3.2.ebuild
index 9dd77584131f..129d57a07d4d 100644
--- a/net-misc/nxproxy/nxproxy-1.3.2.ebuild
+++ b/net-misc/nxproxy/nxproxy-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.3.2.ebuild,v 1.1 2004/05/13 21:44:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
 MY_P="${PN}-1.3.2-1"
 DESCRIPTION="X11 protocol compression library wrapper"
@@ -9,6 +9,7 @@ SRC_URI="http://www.nomachine.com/download/nxsources/nxproxy/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 DEPEND=">=net-misc/nxcomp-1.3.2
 	sys-devel/patch
 	>=media-libs/jpeg-6b-r3
diff --git a/net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild b/net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild
index 0a9418d0dfae..0c97c400059c 100644
--- a/net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild
+++ b/net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild,v 1.1 2005/01/02 10:23:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.4.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
 MY_P="${PN}-${PV}-2"
 DESCRIPTION="X11 protocol compression library wrapper"
 HOMEPAGE="http://www.nomachine.com/"
 URI_BASE="http://www.nomachine.com/download/nxsources/"
 SRC_NXPROXY="${MY_P}.tar.gz"
-SRC_NXCOMP="nxcomp-1.4.0-30.tar.gz"
-SRC_URI="$URI_BASE/nxproxy/${SRC_NXPROXY} $URI_BASE/nxcomp/${SRC_NXCOMP}"
+SRC_URI="$URI_BASE/nxproxy/${SRC_NXPROXY}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
-DEPEND=">=net-misc/nx-x11-1.4.0
+DEPEND="=net-misc/nx-x11-1.4*
 	sys-devel/patch
 	>=media-libs/jpeg-6b-r3
 	>=sys-libs/glibc-2.3.2-r1
@@ -24,13 +23,6 @@ DEPEND=">=net-misc/nx-x11-1.4.0
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	# we can't use ${A} because of bug #61977
-	unpack ${SRC_NXPROXY}
-	unpack ${SRC_NXCOMP}
-	cd ${S}
-}
-
 src_compile() {
 	./configure
 
diff --git a/net-misc/nxproxy/nxproxy-1.5.0.ebuild b/net-misc/nxproxy/nxproxy-1.5.0.ebuild
index bff2ce61fc2a..80119badf6bf 100644
--- a/net-misc/nxproxy/nxproxy-1.5.0.ebuild
+++ b/net-misc/nxproxy/nxproxy-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.5.0.ebuild,v 1.1 2005/10/20 21:37:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxproxy/nxproxy-1.5.0.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
 inherit flag-o-matic multilib
 
@@ -21,6 +21,14 @@ DEPEND="=net-misc/nxcomp-1.5*
 
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# unfortunately this package doesn't honor environment variables correctly
+	# in configure, so append-flags doesn't work.
+	sed -i '/^C\(XX\|C\)INCLUDES =/s/$/ -I\/usr\/NX\/include/' Makefile.in
+}
+
 src_compile() {
 	append-ldflags -L/usr/NX/$(get_libdir)
 	econf --prefix=/usr/NX || die "econf failed"
diff --git a/net-misc/nxserver-business/ChangeLog b/net-misc/nxserver-business/ChangeLog
index cbe46b82514f..9c1ff570a677 100644
--- a/net-misc/nxserver-business/ChangeLog
+++ b/net-misc/nxserver-business/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for net-misc/nxserver-business
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/ChangeLog,v 1.1 2003/09/02 14:01:08 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/ChangeLog,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
+
+  29 Jun 2005; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.4.0.ebuild:
+  Stable on x86
+
+*nxserver-business-1.4.0 (23 May 2005)
+
+  23 May 2005; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-business-1.4.0.ebuild:
+  Version bump; see bug #91770
+
+  08 Aug 2004; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.3.2-r1.ebuild:
+  Fixed ebuild using the wrong eclass
+
+*nxserver-business-1.3.2-r1 (20 Jul 2004)
+
+  20 Jul 2004; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-business-1.3.2-r1.ebuild:
+  Moved dep from the eclass into the ebuild in response to user complaints that
+  the dep on nxclient wasn't being acted on
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.2.2-r1.ebuild, nxserver-business-1.2.2-r2.ebuild,
+  nxserver-business-1.2.2.ebuild, nxserver-business-1.3.0-r1.ebuild,
+  nxserver-business-1.3.0.ebuild, files/1.2.2/50nxserver:
+  Version bump
+
+*nxserver-business-1.3.0-r2 (10 Mar 2004)
+
+  10 Mar 2004; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.2.2-r1.ebuild, nxserver-business-1.2.2-r2.ebuild,
+  nxserver-business-1.2.2.ebuild, nxserver-business-1.3.0-r1.ebuild,
+  nxserver-business-1.3.0-r2.ebuild, nxserver-business-1.3.0.ebuild:
+  Fix for repoman complaining about date headers
+
+*nxserver-business-1.3.0-r2 (10 Mar 2004)
+
+  10 Mar 2004; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.3.0-r2.ebuild:
+  Version bump
+
+  29 Dec 2003; Stuart Herbert <stuart@gentoo.org> :
+  Nomachine have finally released the RPM for 1.3.0-24, so I can now add the
+  digest ;-)
+
+*nxserver-business-1.3.0-r1 (26 Dec 2003)
+
+  26 Dec 2003; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.3.0-r1.ebuild:
+  Updated the digest. Not sure whether I made it wrong last time, or whether
+  nomachine changed the RPM (they do that sometimes)
+
+*nxserver-business-1.3.0-r1 (23 Dec 2003)
+
+  23 Dec 2003; Stuart Herbert <stuart@gentoo.org>
+  nxserver-business-1.3.0-r1.ebuild:
+  Version bump
+
+*nxserver-business-1.2.2-r2 (17 Oct 2003)
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  nxserver-business-1.2.2-r2.ebuild:
+  minor version bumped. Closes #31297.
+  
+*nxserver-business-1.2.2-r1 (10 Sep 2003)
+
+  10 Sep 2003; stuart metadata.xml, nxserver-business-1.2.2-r1.ebuild,
+  nxserver-business-1.2.2.ebuild:
+  Added ebuild for nxserver-1.2.2-85 release
+
+  02 Sep 2003; stuart nxserver-business-1.2.2.ebuild:
+  Added blocks against other editions of nxserver
 
 *nxserver-business-1.2.2 (02 Sep 2003)
 
diff --git a/net-misc/nxserver-business/Manifest b/net-misc/nxserver-business/Manifest
index 56c997e2be4b..605f449f9733 100644
--- a/net-misc/nxserver-business/Manifest
+++ b/net-misc/nxserver-business/Manifest
@@ -1,4 +1,11 @@
-MD5 f77e8237d7aaf9a8fc57fc97d9683701 nxserver-business-1.2.2.ebuild 196
-MD5 d698349629896a24617eaf0952be85f1 files/digest-nxserver-business-1.2.2 72
-MD5 042cd0145c73c91b6d3e7cd7b0cebf0c files/digest-nxserver-1.2.2 72
-MD5 3d3179cfb8373d562ceb43a610c1ba7d files/1.2.2/50nxserver 84
+MD5 7c7fab45249588723a4500168853d5df ChangeLog 2787
+MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
+MD5 407cf382ecdfa25f1763be430a24003b nxserver-business-1.3.0-r2.ebuild 519
+MD5 c6d5887d38a3811725c086d98b10d598 nxserver-business-1.3.2.ebuild 516
+MD5 4607db5aff3a90e45b04525a85a9c61c nxserver-business-1.3.2-r1.ebuild 552
+MD5 0e38454f91c57f58e45410fa9a03f601 nxserver-business-1.4.0.ebuild 522
+MD5 2c4bd578bc0cbe24ad888c3bffbf7d1a files/digest-nxserver-business-1.3.0-r2 72
+MD5 ed116e6fdc88bb8fa58276075df99175 files/digest-nxserver-business-1.3.2 72
+MD5 ed116e6fdc88bb8fa58276075df99175 files/digest-nxserver-business-1.3.2-r1 72
+MD5 2ec5f8b28c693c48e333aabbba2069f2 files/digest-nxserver-business-1.4.0 73
+MD5 3d3179cfb8373d562ceb43a610c1ba7d files/1.3.0/50nxserver 84
diff --git a/net-misc/nxserver-business/files/digest-nxserver-business-1.4.0 b/net-misc/nxserver-business/files/digest-nxserver-business-1.4.0
index 88ed706715e0..fd2a2f934ab4 100644
--- a/net-misc/nxserver-business/files/digest-nxserver-business-1.4.0
+++ b/net-misc/nxserver-business/files/digest-nxserver-business-1.4.0
@@ -1 +1 @@
-MD5 cb2f404d93e6f00145a81803dc734896 nxserver-1.4.0-107.i386.rpm 5498146
+MD5 566b46afb0f59347ba602f9f51f3a577 nxserver-1.4.0-107.i386.rpm 5498634
diff --git a/net-misc/nxserver-business/nxserver-business-1.3.0-r2.ebuild b/net-misc/nxserver-business/nxserver-business-1.3.0-r2.ebuild
index 251c35a687f5..b5967becbf91 100644
--- a/net-misc/nxserver-business/nxserver-business-1.3.0-r2.ebuild
+++ b/net-misc/nxserver-business/nxserver-business-1.3.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/nxserver-business-1.3.0-r2.ebuild,v 1.1 2004/03/10 22:07:41 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/nxserver-business-1.3.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
 inherit nxserver
 
diff --git a/net-misc/nxserver-business/nxserver-business-1.3.2-r1.ebuild b/net-misc/nxserver-business/nxserver-business-1.3.2-r1.ebuild
index 17a4a15e4d1d..91eeb54cdf83 100644
--- a/net-misc/nxserver-business/nxserver-business-1.3.2-r1.ebuild
+++ b/net-misc/nxserver-business/nxserver-business-1.3.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/net-misc/nxserver-business/nxserver-business-1.3.2-r1.ebuild,v 1.1 2004/07/20 08:58:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/nxserver-business-1.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
-inherit nxserver
+inherit nxserver-1.3.2
 
 DEPEND="$DEPEND
 	!net-misc/nxserver-personal
diff --git a/net-misc/nxserver-business/nxserver-business-1.3.2.ebuild b/net-misc/nxserver-business/nxserver-business-1.3.2.ebuild
index f87709312ab9..cbc53566a26a 100644
--- a/net-misc/nxserver-business/nxserver-business-1.3.2.ebuild
+++ b/net-misc/nxserver-business/nxserver-business-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/nxserver-business-1.3.2.ebuild,v 1.1 2004/05/13 22:33:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/nxserver-business-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
 inherit nxserver
 
diff --git a/net-misc/nxserver-business/nxserver-business-1.4.0.ebuild b/net-misc/nxserver-business/nxserver-business-1.4.0.ebuild
index d2c8617cb96c..be3f49194854 100644
--- a/net-misc/nxserver-business/nxserver-business-1.4.0.ebuild
+++ b/net-misc/nxserver-business/nxserver-business-1.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/net-misc/nxserver-business/nxserver-business-1.4.0.ebuild,v 1.1 2005/05/23 19:01:02 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-business/nxserver-business-1.4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
 inherit nxserver-1.4
 
 MY_PV="${PV}-107"
 SRC_URI="http://www.nomachine.com/download/nxserver-small-business/${PV}/RedHat-9.0/nxserver-${MY_PV}.i386.rpm"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 DEPEND="$DEPEND
 	!net-misc/nxserver-personal
 	!net-misc/nxserver-enterprise
diff --git a/net-misc/nxserver-personal/ChangeLog b/net-misc/nxserver-personal/ChangeLog
index e45484b597b4..7bbafd63aa49 100644
--- a/net-misc/nxserver-personal/ChangeLog
+++ b/net-misc/nxserver-personal/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for net-misc/nxserver-personal
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/ChangeLog,v 1.1 2003/09/02 13:57:39 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/ChangeLog,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
+
+*nxserver-personal-1.4.0-r3 (23 May 2005)
+
+  23 May 2005; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-personal-1.4.0-r3.ebuild:
+  Version bump to pick up changes in eclass; adds blocker on nxserver-freenx
+  Thanks to bug #91770
+
+*nxserver-personal-1.4.0-r2 (30 Apr 2005)
+
+  30 Apr 2005; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-personal-1.4.0-r2.ebuild:
+  Version bump
+
+  30 Apr 2005; Stuart Herbert <stuart@gentoo.org> :
+  Version bump
+
+*nxserver-personal-1.4.0-r1 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-personal-1.4.0-r1.ebuild:
+  Version bump
+
+*nxserver-personal-1.4.0 (30 Aug 2004)
+
+  30 Aug 2004; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-personal-1.4.0.ebuild:
+  Added snapshot 4 of the next version of NX Server
+
+*nxserver-personal-1.3.2-r1 (20 Jul 2004)
+
+  20 Jul 2004; Stuart Herbert <stuart@gentoo.org>
+  +nxserver-personal-1.3.2-r1.ebuild:
+  Version bump; moved dep on nxclient from the ebuild after user complaints that
+  the dep was being ignored
+
+*nxserver-personal-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org>
+  nxserver-personal-1.2.2-r1.ebuild, nxserver-personal-1.2.2-r2.ebuild,
+  nxserver-personal-1.2.2.ebuild, nxserver-personal-1.3.0-r1.ebuild,
+  nxserver-personal-1.3.0.ebuild, nxserver-personal-1.3.0_beta2.ebuild,
+  nxserver-personal-1.3.2.ebuild, files/1.2.2/50nxserver:
+  Version bump; removed old versions
+
+*nxserver-personal-1.2.2-r1 (10 Mar 2004)
+
+  10 Mar 2004; Stuart Herbert <stuart@gentoo.org>
+  nxserver-personal-1.2.2-r1.ebuild, nxserver-personal-1.2.2-r2.ebuild,
+  nxserver-personal-1.2.2.ebuild, nxserver-personal-1.3.0-r1.ebuild,
+  nxserver-personal-1.3.0.ebuild, nxserver-personal-1.3.0_beta2.ebuild:
+  Changed date in the header, to shut repoman up
+
+  10 Mar 2004; Stuart Herbert <stuart@gentoo.org> :
+  Version bump
+
+*nxserver-personal-1.3.0-r1 (23 Dec 2003)
+
+  23 Dec 2003; Stuart Herbert <stuart@gentoo.org>
+  nxserver-personal-1.3.0-r1.ebuild:
+  Version bump
+
+*nxserver-personal-1.3.0 (21 Dec 2003)
+
+  21 Dec 2003; Stuart Herbert <stuart@gentoo.org>
+  nxserver-personal-1.3.0.ebuild, files/1.3.0/50nxserver:
+  Version bump
+
+  07 Dec 2003; <spider@gentoo.org> nxserver-personal-1.3.0_beta2.ebuild:
+  fixing a dependency to make repoman happy
+
+  26 Nov 2003; Stuart Herbert <stuart@gentoo.org>
+  nxserver-personal-1.3.0_beta2.ebuild:
+  Dependencies now working
+
+*nxserver-personal-1.3.0_beta2 (24 Nov 2003)
+
+  24 Nov 2003; Stuart Herbert <stuart@gentoo.org>
+  nxserver-personal-1.3.0_beta2.ebuild:
+  Added ebuild for 1.3.0_beta2
+
+  05 Nov 2003; Stuart Herbert <stuart@gentoo.org> :
+  Fixed digest for the nxserver RPM file; fixes bug #32633
+
+*nxserver-personal-1.2.2-r2 (28 Oct 2003)
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org>
+  nxserver-personal-1.2.2-r2.ebuild:
+  Version bumped. Closes #31297.
+
+  10 Sep 2003; stuart metadata.xml, nxserver-personal-1.2.2.ebuild:
+  Added ebuild for nxserver-1.2.2-85 release
 
 *nxserver-personal-1.2.2 (02 Sep 2003)
 
diff --git a/net-misc/nxserver-personal/Manifest b/net-misc/nxserver-personal/Manifest
index 81a42ebd09db..a449c6209c1e 100644
--- a/net-misc/nxserver-personal/Manifest
+++ b/net-misc/nxserver-personal/Manifest
@@ -1,3 +1,17 @@
-MD5 731d72a00bb5aa23b54e7dca4983e977 nxserver-personal-1.2.2.ebuild 282
-MD5 042cd0145c73c91b6d3e7cd7b0cebf0c files/digest-nxserver-personal-1.2.2 72
-MD5 3d3179cfb8373d562ceb43a610c1ba7d files/1.2.2/50nxserver 84
+MD5 5bcf2c4baa2ea976349cc044e430c461 ChangeLog 3317
+MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
+MD5 66c5729f0548d5ed6ba3f1c28eaeda96 nxserver-personal-1.3.0-r2.ebuild 513
+MD5 c3df17746c60c751a1fc33753578663e nxserver-personal-1.3.2.ebuild 516
+MD5 3a054f86c7901004e444778e96a8a6df nxserver-personal-1.3.2-r1.ebuild 546
+MD5 520c2fe3e5535619302ebd05d62b0693 nxserver-personal-1.4.0.ebuild 555
+MD5 33d8e27f7a2cfc8869741be5b0efa926 nxserver-personal-1.4.0-r1.ebuild 568
+MD5 526b9d1650c3b586715c01618e7faee5 nxserver-personal-1.4.0-r2.ebuild 568
+MD5 00e74e94177f1e29d2badc8a89a2faec nxserver-personal-1.4.0-r3.ebuild 517
+MD5 72b387787421250be0b0261cb9227c3e files/digest-nxserver-personal-1.3.0-r2 72
+MD5 5a3eba15c7064c53c5a177d558d1c4c8 files/digest-nxserver-personal-1.3.2 72
+MD5 5a3eba15c7064c53c5a177d558d1c4c8 files/digest-nxserver-personal-1.3.2-r1 72
+MD5 f005c855f1e87dad4bb53f79c3f69139 files/digest-nxserver-personal-1.4.0 72
+MD5 42974d617d0425b965a9bf9c16d28c02 files/digest-nxserver-personal-1.4.0-r1 73
+MD5 c1747c7576e20dce793ddd011483a233 files/digest-nxserver-personal-1.4.0-r2 73
+MD5 c1747c7576e20dce793ddd011483a233 files/digest-nxserver-personal-1.4.0-r3 73
+MD5 3d3179cfb8373d562ceb43a610c1ba7d files/1.3.0/50nxserver 84
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.3.0-r2.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.3.0-r2.ebuild
index 137ce47b6a3c..e2512f23d454 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.3.0-r2.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-1.3.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.3.0-r2.ebuild,v 1.1 2004/03/10 22:02:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.3.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit nxserver
 
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.3.2-r1.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.3.2-r1.ebuild
index b366abbe8b66..47f9908d2402 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.3.2-r1.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.3.2-r1.ebuild,v 1.1 2004/07/20 08:42:43 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 inherit nxserver-1.3.2
 
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.3.2.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.3.2.ebuild
index a12900b37261..015ec92e35c5 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.3.2.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.3.2.ebuild,v 1.1 2004/05/13 22:26:31 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit nxserver-1.3.2
 
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.4.0-r1.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.4.0-r1.ebuild
index 170147058f19..28037acabcee 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.4.0-r1.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-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/net-misc/nxserver-personal/nxserver-personal-1.4.0-r1.ebuild,v 1.1 2005/01/02 09:48:38 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit nxserver-1.4
 
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.4.0-r2.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.4.0-r2.ebuild
index 07e2bcc94437..6727291eadf6 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.4.0-r2.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-1.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/net-misc/nxserver-personal/nxserver-personal-1.4.0-r2.ebuild,v 1.1 2005/05/01 02:06:39 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.4.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit nxserver-1.4
 
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.4.0-r3.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.4.0-r3.ebuild
index d38e003a14f3..d9da2533ec7e 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.4.0-r3.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-1.4.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/net-misc/nxserver-personal/nxserver-personal-1.4.0-r3.ebuild,v 1.1 2005/05/23 18:57:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.4.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit nxserver-1.4
 
diff --git a/net-misc/nxserver-personal/nxserver-personal-1.4.0.ebuild b/net-misc/nxserver-personal/nxserver-personal-1.4.0.ebuild
index e13ff4203f0b..333bdc5356b1 100644
--- a/net-misc/nxserver-personal/nxserver-personal-1.4.0.ebuild
+++ b/net-misc/nxserver-personal/nxserver-personal-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.4.0.ebuild,v 1.1 2004/08/30 20:46:28 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-personal/nxserver-personal-1.4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 inherit nxserver-1.4
 
diff --git a/net-misc/nxssh/ChangeLog b/net-misc/nxssh/ChangeLog
index c4c7fa137883..1b24680ab20c 100644
--- a/net-misc/nxssh/ChangeLog
+++ b/net-misc/nxssh/ChangeLog
@@ -1,6 +1,59 @@
 # ChangeLog for net-misc/nxssh
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.1 2003/08/27 03:07:02 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/ChangeLog,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org> nxssh-1.5.0.ebuild:
+  Need to get nxcomp's NX.h from /usr/NX/include
+
+*nxssh-1.5.0 (20 Oct 2005)
+
+  20 Oct 2005; Aron Griffis <agriffis@gentoo.org> +nxssh-1.5.0.ebuild:
+  Bump to 1.5.0 (from 1.4.0-r1)
+
+  17 Feb 2005; Stuart Herbert <stuart@gentoo.org> nxssh-1.4.0-r1.ebuild:
+  Bug 62567: missing dep; Manuzhai <mail@manuzhai.nl>
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nxssh-1.3.0.ebuild,
+  -nxssh-1.4.0.ebuild:
+  Removed obsolete version
+
+*nxssh-1.4.0-r1 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +nxssh-1.4.0-r1.ebuild:
+  Version bump
+
+*nxssh-1.4.0 (30 Aug 2004)
+
+  30 Aug 2004; Stuart Herbert <stuart@gentoo.org> +nxssh-1.4.0.ebuild:
+  Version bump; required for freenx.
+
+*nxssh-1.3.2 (13 May 2004)
+
+  13 May 2004; Stuart Herbert <stuart@gentoo.org> nxssh-1.2.2-r1.ebuild,
+  nxssh-1.2.2.ebuild, nxssh-1.3.0.ebuild, nxssh-1.3.0_beta2.ebuild,
+  nxssh-1.3.2.ebuild:
+  Version bump
+
+  11 Mar 2004; David Holm <dholm@gentoo.org> nxssh-1.3.0.ebuild:
+  Added to ~ppc.
+
+*nxssh-1.3.0 (21 Dec 2003)
+
+  21 Dec 2003; Stuart Herbert <stuart@gentoo.org> :
+  Version bump
+
+*nxssh-1.3.0_beta2 (13 Nov 2003)
+
+  13 Nov 2003; Stuart Herbert <stuart@gentoo.org> nxssh-1.3.0_beta2.ebuild:
+  Added 1.3.0-beta2
+
+*nxssh-1.2.2-r1 (10 Sep 2003)
+
+  10 Sep 2003; stuart metadata.xml, nxssh-1.2.2-r1.ebuild:
+  Added ebuild for nxssh-1.2.2-6 release
+
+  02 Sep 2003; stuart nxssh-1.2.2.ebuild:
+  Marked as stable, to support the release of the nxserver ebuilds
 
 *nxssh-1.2.2 (27 Aug 2003)
 
diff --git a/net-misc/nxssh/Manifest b/net-misc/nxssh/Manifest
index a432da00bb9b..b24f71e1bd6f 100644
--- a/net-misc/nxssh/Manifest
+++ b/net-misc/nxssh/Manifest
@@ -1,2 +1,18 @@
-MD5 f81f27c7338a35f6b9ce809b10478a19 nxssh-1.2.2.ebuild 1189
-MD5 f6305e9a9358e4b8a76fc81c45775fce files/digest-nxssh-1.2.2 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aa91fe98b4f8b3ac60151a0c95dc887e ChangeLog 1811
+MD5 1621d9205e3725cfc24ccf19006e9699 files/digest-nxssh-1.3.2 65
+MD5 c55a5bd8cb8ece91220fc12237304f61 files/digest-nxssh-1.4.0-r1 66
+MD5 e7a08594cb696a58c52235c237075986 files/digest-nxssh-1.5.0 66
+MD5 0d90a3579c4f3a0310c775b71e87fb2a metadata.xml 370
+MD5 26d3d3c58c8b586790a97578d1a14367 nxssh-1.3.2.ebuild 1414
+MD5 739cb79eee52b9f08d4ce9e7782bdb73 nxssh-1.4.0-r1.ebuild 1425
+MD5 ab525ac2ba03e913b44286c1bf658454 nxssh-1.5.0.ebuild 1216
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDXCn+JrHF4yAQTrARArsPAJ9qhxPBXsVUa3SfjCm8b5cBGjwLygCgwUAY
+jluq07oXurjUxqViKKSaL9U=
+=vPjU
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxssh/files/digest-nxssh-1.5.0 b/net-misc/nxssh/files/digest-nxssh-1.5.0
index cb19c925b13e..3022d763a8c3 100644
--- a/net-misc/nxssh/files/digest-nxssh-1.5.0
+++ b/net-misc/nxssh/files/digest-nxssh-1.5.0
@@ -1,2 +1 @@
-MD5 cab094a88acb299cc1e89dfb2c6a95eb nxcomp-1.5.0-65.tar.gz 496878
 MD5 b5d0a97f8010f5e4047cccce971f2101 nxssh-1.5.0-21.tar.gz 866277
diff --git a/net-misc/nxssh/nxssh-1.3.2.ebuild b/net-misc/nxssh/nxssh-1.3.2.ebuild
index 14a4a4c1b498..88f2c1e1f6aa 100644
--- a/net-misc/nxssh/nxssh-1.3.2.ebuild
+++ b/net-misc/nxssh/nxssh-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.2.ebuild,v 1.1 2004/05/13 21:47:18 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 MY_P="${PN}-1.3.2-3"
 DESCRIPTION="Modified openssh client, used by nxclient"
@@ -12,7 +12,7 @@ KEYWORDS="x86 ~ppc -sparc -mips -alpha"
 DEPEND=""
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
 #RDEPEND=""
-IUSE="tcpd pam kerberos"
+IUSE="ipv6 kerberos pam tcpd"
 
 S=${WORKDIR}/${PN}
 
diff --git a/net-misc/nxssh/nxssh-1.4.0-r1.ebuild b/net-misc/nxssh/nxssh-1.4.0-r1.ebuild
index 57540bcc4ba7..47520d487766 100644
--- a/net-misc/nxssh/nxssh-1.4.0-r1.ebuild
+++ b/net-misc/nxssh/nxssh-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/net-misc/nxssh/nxssh-1.4.0-r1.ebuild,v 1.1 2005/01/02 09:40:02 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 MY_P="${PN}-${PV}-21"
 DESCRIPTION="Modified openssh client, used by nxclient"
@@ -8,13 +8,15 @@ HOMEPAGE="http://www.nomachine.com/"
 SRC_URI="http://www.nomachine.com/download/nxsources/nxssh/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 DEPEND=">=dev-libs/openssl-0.9.7d-r1
 	    >=sys-libs/glibc-2.3.3.20040420-r1
-	    >=sys-libs/zlib-1.2.1-r2"
+	    >=sys-libs/zlib-1.2.1-r2
+		tcpd? ( sys-apps/tcp-wrappers )
+		pam? ( sys-libs/pam )"
 # Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
 #RDEPEND=""
-IUSE="ipv6 kerberos pam tcpd"
+IUSE="ipv6 pam tcpd"
 
 S=${WORKDIR}/${PN}
 
@@ -27,9 +29,6 @@ src_compile() {
 	use pam  && myconf="${myconf} --with-pam"
 	use ipv6 || myconf="${myconf} --with-ipv4-default"
 
-	# app-crypt/mit-krb5
-	use kerberos && myconf="${myconf} --with-kerberos5"
-
 	./configure \
 	    --prefix=/usr \
 		--sysconfdir=/etc/ssh \
diff --git a/net-misc/nxssh/nxssh-1.5.0.ebuild b/net-misc/nxssh/nxssh-1.5.0.ebuild
index 6447cea02459..5331dba49acb 100644
--- a/net-misc/nxssh/nxssh-1.5.0.ebuild
+++ b/net-misc/nxssh/nxssh-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.5.0.ebuild,v 1.1 2005/10/20 21:25:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxssh/nxssh-1.5.0.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 inherit multilib flag-o-matic
 
@@ -25,6 +25,7 @@ DEPEND="
 S=${WORKDIR}/${PN}
 
 src_compile() {
+	append-flags -I/usr/NX/include
 	append-ldflags -L/usr/NX/$(get_libdir)
 	./configure \
 	    --prefix=/usr \
diff --git a/net-misc/oidentd/ChangeLog b/net-misc/oidentd/ChangeLog
index 8dfb3c5b6c0a..81071f2351ed 100644
--- a/net-misc/oidentd/ChangeLog
+++ b/net-misc/oidentd/ChangeLog
@@ -1,9 +1,83 @@
-# ChangeLog for net-print/oidentd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/ChangeLog,v 1.1 2002/04/10 22:24:08 woodchip Exp $
+# ChangeLog for net-misc/oidentd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
+
+  07 Jun 2005; Stuart Longland <redhatter@gentoo.org> oidentd-2.0.7-r1.ebuild:
+  Added ~mips as per bug #67602.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  oidentd-2.0.7-r1.ebuild:
+  Stable on ppc.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> oidentd-2.0.7-r1.ebuild:
+  Added ~ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> oidentd-2.0.6.ebuild,
+  oidentd-2.0.7-r1.ebuild, oidentd-2.0.7.ebuild:
+  change virtual/glibc to virtual/libc
+
+  08 Jun 2004; Guy Martin <gmsoft@gentoo.org> oidentd-2.0.7-r1.ebuild:
+  Marked stable on hppa.
+
+  10 Dec 2003; Jon Portnoy <avenj@gentoo.org> oidentd-2.0.7-r1.ebuild :
+  AMD64 keywords.
+
+*oidentd-2.0.7-r1 (26 Jul 2003)
+
+  26 Jul 2003; Jon Portnoy <avenj@gentoo.org> files/oidentd-2.0.7-init :
+  Fixed init script for 2.0.7.
+
+  15 Jul 2003; Christian Birchinger <joker@gentoo.org> oidentd-2.0.7.ebuild:
+  Added sparc stable keyword
+
+*oidentd-2.0.7 (13 Jul 2003)
+
+  13 Jul 2003; Jon Portnoy <avenj@gentoo.org> oidentd-2.0.7.ebuild :
+  Version bump.
+
+  12 Jun 2003; <msterret@gentoo.org> oidentd-2.0.3-r1.ebuild:
+  add Header
+
+*oidentd-2.0.6 (28 Apr 2003)
+
+  28 Apr 2003; Jon Portnoy <avenj@gentoo.org> oidentd-2.0.6.ebuild :
+  Version bump. No serious ebuild changes.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*oidentd-2.0.4-r1 (01 Dec 2002)
+
+  30 Mar 2003; Christian Birchinger <joker@gentoo.org>
+  oidentd-2.0.4-r1.ebuild:
+  Added sparc stable keyword
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> oidentd-2.0.4-r1.ebuild:
+  Mark stable on alpha
+
+  01 Dec 2002; phoen][x <phoenix@gentoo.org> oidentd-2.0.4-r1.ebuild:
+  Put it into the stable profile.
+
+  23 Oct 2002; phoen][x <phoenix@gentoo.org> oidentd-2.0.4-r1.ebuild:
+  Added ipv6 support.
+
+*oidentd-2.0.4 (29 Sep 2002)
+
+  29 Sep 2002; Bruce A. Locke <blocke@shivan.org> oidentd-2.0.4.ebuild:
+  Version bump and placement of example configs into docs directory
+
+*oidentd-2.0.3-r1 (23 Jun 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> oidentd-2.0.3-r1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  23 Jun 2002; Nicholas Jones <carpaski@gentoo.org> oidentd-2.0.3-r1.ebuild :
+  Update by Phoen][x. Added in USER/GROUP settings and checks in -init file.
+  New file conf.d/oidentd
 
 *oidentd-2.0.3 (10 Apr 2002)
 
-  10 Apr 2002; Donny Davies <woodchip@gentoo.org> oidentd-2.0.3.ebuild :
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> oidentd-2.0.3.ebuild :
+  Purged this (old) ebuild.
 
+  10 Apr 2002; Donny Davies <woodchip@gentoo.org> oidentd-2.0.3.ebuild :
   New package contributed by phoen][x <eqc_phoenix@gmx.de>.
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 906227f9fbd4..bf2013edb18a 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,16 +1,13 @@
-MD5 58458434f219374a196b765b1fc98027 ChangeLog 1488
-MD5 1ec4272c9609ac5dbfd09b8d604476e1 oidentd-2.0.3-r1.ebuild 671
-MD5 f94d8f3c768c583ca3bf8aaaa5dd9f36 oidentd-2.0.4-r1.ebuild 1058
-MD5 a6b0a242eb8efc3acab21091089da50c oidentd-2.0.4.ebuild 921
-MD5 69a4f83397d3aeab95278bea53852886 oidentd-2.0.6.ebuild 959
-MD5 46f7ca76169cc032ccedb960ff3ce804 files/digest-oidentd-2.0.3-r1 65
-MD5 550b78b88970ba0cb0c029087ca100b5 files/digest-oidentd-2.0.4 65
-MD5 550b78b88970ba0cb0c029087ca100b5 files/digest-oidentd-2.0.4-r1 65
-MD5 05a43d3987754f179f4e31bbe61ff315 files/oidentd-2.0.3-r1-confd 67
-MD5 cac2de961f4152986b7995f38dfb47a9 files/oidentd-2.0.3-r1-init 792
-MD5 05a43d3987754f179f4e31bbe61ff315 files/oidentd-2.0.4-confd 67
-MD5 cac2de961f4152986b7995f38dfb47a9 files/oidentd-2.0.4-init 792
-MD5 e8200bf63417ae1a1276f2e46e12ef0b files/oidentd-init 494
+MD5 19de6b62e5a5e109f8ef444c965c4345 ChangeLog 2709
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 e456bc7a7cd967321b393986525e534e oidentd-2.0.6.ebuild 1049
+MD5 9ce74cdb65e66c00056ee701348672fb oidentd-2.0.7-r1.ebuild 981
+MD5 c75e7251c3bd20df8ae8b99a2ba6a77e oidentd-2.0.7.ebuild 1048
+MD5 85be7f47ed6684f2868b48e82dd8fa6b files/digest-oidentd-2.0.6 65
+MD5 0c88fdf66a5a16f12d49b0a6c5dd5743 files/digest-oidentd-2.0.7 65
+MD5 0c88fdf66a5a16f12d49b0a6c5dd5743 files/digest-oidentd-2.0.7-r1 65
+MD5 05a43d3987754f179f4e31bbe61ff315 files/oidentd-2.0.7-confd 67
+MD5 bc9a656f63247445767f29dc1bcb1286 files/oidentd-2.0.7-init 782
+MD5 92fe6abaa19f4d70836d98ec6244be0f files/oidentd-init 477
 MD5 d9c40e4d6a0bde685a359ad49b4eada2 files/oidentd.conf 298
 MD5 9721b39b5edf1cf4f94f1ac84cdc1cbe files/oidentd_masq.conf 429
-MD5 85be7f47ed6684f2868b48e82dd8fa6b files/digest-oidentd-2.0.6 65
diff --git a/net-misc/oidentd/files/oidentd-2.0.7-init b/net-misc/oidentd/files/oidentd-2.0.7-init
index ead41b08ef7f..402ab029c31a 100644
--- a/net-misc/oidentd/files/oidentd-2.0.7-init
+++ b/net-misc/oidentd/files/oidentd-2.0.7-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/files/oidentd-2.0.7-init,v 1.1 2003/07/26 06:45:24 avenj Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/files/oidentd-2.0.7-init,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 depend() {
     need net
diff --git a/net-misc/oidentd/files/oidentd-init b/net-misc/oidentd/files/oidentd-init
index 1e4f588087bb..e6e5b5a28adb 100644
--- a/net-misc/oidentd/files/oidentd-init
+++ b/net-misc/oidentd/files/oidentd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/files/oidentd-init,v 1.1 2002/04/10 22:24:08 woodchip Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/files/oidentd-init,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index 4e98f418b45c..d05f9ba0821d 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<name>Jon Portnoy</name>
 <email>avenj@gentoo.org</email>
+<name>Jon Portnoy</name>
 </maintainer>
 </pkgmetadata>
 
diff --git a/net-misc/oidentd/oidentd-2.0.6.ebuild b/net-misc/oidentd/oidentd-2.0.6.ebuild
index 2d619d3f3232..6bc51aa1cb31 100644
--- a/net-misc/oidentd/oidentd-2.0.6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.6.ebuild
@@ -1,24 +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/net-misc/oidentd/oidentd-2.0.6.ebuild,v 1.1 2003/04/28 18:30:30 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.6.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 IUSE="ipv6"
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="http://dev.ojnk.net/"
 SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 ~sparc ~alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-src_compile() {	
+src_compile() {
 	local myconf=""
 
 	use ipv6 && \
 		myconf="${myconf} --enable-ipv6" || \
-		myconf="${myconf} --disable-ipv6"	
+		myconf="${myconf} --disable-ipv6"
 
 
 	./configure \
diff --git a/net-misc/oidentd/oidentd-2.0.7-r1.ebuild b/net-misc/oidentd/oidentd-2.0.7-r1.ebuild
index d695d1b8cb8a..67a69edf1f48 100644
--- a/net-misc/oidentd/oidentd-2.0.7-r1.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.7-r1.ebuild
@@ -1,42 +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/net-misc/oidentd/oidentd-2.0.7-r1.ebuild,v 1.1 2003/07/26 06:47:57 avenj Exp $
-
-IUSE="ipv6"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="http://dev.ojnk.net/"
 SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-KEYWORDS="x86 sparc ~alpha"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc alpha arm amd64 ia64 hppa ppc ~mips"
+IUSE="ipv6"
 
-DEPEND="virtual/glibc"
-
-src_compile() {	
-	local myconf=""
-
-	use ipv6 && \
-		myconf="${myconf} --enable-ipv6" || \
-		myconf="${myconf} --disable-ipv6"	
-
+DEPEND="virtual/libc"
 
+src_compile() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		${myconf} || die
+		`use_enable ipv6` \
+		|| die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog README TODO NEWS \
-			${FILESDIR}/oidentd_masq.conf ${FILESDIR}/oidentd.conf
+		${FILESDIR}/oidentd_masq.conf ${FILESDIR}/oidentd.conf
 	exeinto /etc/init.d ; newexe ${FILESDIR}/oidentd-${PV}-init oidentd
 	insinto /etc/conf.d ; newins ${FILESDIR}/oidentd-${PV}-confd oidentd
 }
 
 pkg_postinst() {
-	einfo Example configuration files are in /usr/share/doc/${P}
+	einfo Example configuration files are in /usr/share/doc/${PF}
 }
-
diff --git a/net-misc/oidentd/oidentd-2.0.7.ebuild b/net-misc/oidentd/oidentd-2.0.7.ebuild
index ae8b5d683354..ccd599ea9b98 100644
--- a/net-misc/oidentd/oidentd-2.0.7.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.7.ebuild
@@ -1,24 +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/net-misc/oidentd/oidentd-2.0.7.ebuild,v 1.1 2003/07/14 03:29:04 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 IUSE="ipv6"
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="http://dev.ojnk.net/"
 SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-KEYWORDS="x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc ~alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-src_compile() {	
+src_compile() {
 	local myconf=""
 
 	use ipv6 && \
 		myconf="${myconf} --enable-ipv6" || \
-		myconf="${myconf} --disable-ipv6"	
+		myconf="${myconf} --disable-ipv6"
 
 
 	./configure \
diff --git a/net-misc/omnievents/ChangeLog b/net-misc/omnievents/ChangeLog
index 40310aab429c..98b65e01dd24 100644
--- a/net-misc/omnievents/ChangeLog
+++ b/net-misc/omnievents/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/omnievents
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/ChangeLog,v 1.1 2005/09/30 00:55:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/ChangeLog,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
+
+  01 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  omnievents-2.6.2.ebuild:
+  Clean up.
 
 *omnievents-2.6.2 (30 Sep 2005)
 
diff --git a/net-misc/omnievents/Manifest b/net-misc/omnievents/Manifest
index 282f30e3899c..38cf99628cb4 100644
--- a/net-misc/omnievents/Manifest
+++ b/net-misc/omnievents/Manifest
@@ -1,4 +1,16 @@
-MD5 77dd284eeb5a0fc94329b78318ace5a3 omnievents-2.6.2.ebuild 940
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 200332597151f526a1704008cea0bdf3 metadata.xml 224
+MD5 b954b2d5d20d9c69c7f0dd8a90a5592e ChangeLog 557
+MD5 f7e1e96be5a25373f6083e8053fa2260 omnievents-2.6.2.ebuild 999
 MD5 ab37db48c0c5fa7134cf1c0d5dfbe5a5 files/digest-omnievents-2.6.2 73
-MD5 874e95b109a46e47a55ceb0953bbedc1 files/omnievents-init 666
-MD5 63439b3b1335e558f9889de7cdb30491 files/omnievents-conf 701
+MD5 0f14063c749ad37cbb4188b0ac08cfa3 files/omnievents-init 769
+MD5 6558f859f00eb7f641388d0f60b160f6 files/omnievents-conf 804
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPpPgKf2g/qXtneoRAnOwAKCK37FLxbrMu5NzGwfJfQnQQH5kQQCgs/Ku
+ZXeE6iAE4W5ORGhhr5cml3Y=
+=bC7f
+-----END PGP SIGNATURE-----
diff --git a/net-misc/omnievents/files/omnievents-conf b/net-misc/omnievents/files/omnievents-conf
index c30bbb4321b4..1b5b4dc5bc49 100644
--- a/net-misc/omnievents/files/omnievents-conf
+++ b/net-misc/omnievents/files/omnievents-conf
@@ -1,7 +1,7 @@
 # /etc/conf.d/omniEvents
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/files/omnievents-conf,v 1.1 2005/09/30 00:55:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/files/omnievents-conf,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 # Determines the port on which omniEvents will listen.
 
diff --git a/net-misc/omnievents/files/omnievents-init b/net-misc/omnievents/files/omnievents-init
index 245726c46a72..974692450cae 100644
--- a/net-misc/omnievents/files/omnievents-init
+++ b/net-misc/omnievents/files/omnievents-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/files/omnievents-init,v 1.1 2005/09/30 00:55:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/files/omnievents-init,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/omnievents/omnievents-2.6.2.ebuild b/net-misc/omnievents/omnievents-2.6.2.ebuild
index 212f02ac9c28..191d3dc9ecbd 100644
--- a/net-misc/omnievents/omnievents-2.6.2.ebuild
+++ b/net-misc/omnievents/omnievents-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/omnievents-2.6.2.ebuild,v 1.1 2005/09/30 00:55:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omnievents/omnievents-2.6.2.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 inherit versionator
 
@@ -39,6 +39,6 @@ src_install () {
 	dodir /var/lib/omniEvents
 	keepdir /var/lib/omniEvents
 
-	install -D -m0755 ${FILESDIR}/${PN}-init ${D}/etc/init.d/${PN}
-	install -D -m0644 ${FILESDIR}/${PN}-conf ${D}/etc/conf.d/${PN}
+	newinitd "${FILESDIR}"/${PN}-init ${PN}
+	newinitd "${FILESDIR}"/${PN}-conf ${PN}
 }
diff --git a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1 b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1
index a63345a1d3fc..e799b8d05c6a 100644
--- a/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1
+++ b/net-misc/openssh/files/digest-openssh-3.8.1_p1-r1
@@ -1,2 +1,3 @@
 MD5 1dbfd40ae683f822ae917eebf171ca42 openssh-3.8.1p1.tar.gz 817932
-MD5 52e42ecdf2b0498220661d4bf1cfaeae openssh-3.8.1p1+x509h.diff.gz 143652
+MD5 48db8e4857a32aa93506be8abd84b6b4 openssh-lpk-3.8.1p1-0.3.4.patch 44245
+MD5 c1cad487473e826dd8de554ac9856bc6 openssh-3.8.1p1+x509-5.1.diff.gz 161552
diff --git a/net-misc/openssh/files/digest-openssh-3.9_p1-r3 b/net-misc/openssh/files/digest-openssh-3.9_p1-r3
index 32d24bfd09a8..173e61a1a751 100644
--- a/net-misc/openssh/files/digest-openssh-3.9_p1-r3
+++ b/net-misc/openssh/files/digest-openssh-3.9_p1-r3
@@ -1,4 +1,4 @@
 MD5 8e1774d0b52aff08f817f3987442a16e openssh-3.9p1.tar.gz 854027
 MD5 e6b4c237887d76819e4c626016077907 openssh-lpk-3.9p1-0.3.6.patch 60920
-MD5 eedb263c96a1d7bf208eb2ba70c2e238 openssh-3.9p1+x509h.diff.gz 98011
+MD5 d556d5694c21d18fe3707afb08f2087a openssh-3.9p1+x509-5.2.diff.gz 121839
 MD5 b91d73e58e2b72aecb3025ee550411fb openssh-3.9p1-hpn11.diff 13237
diff --git a/net-misc/openssh/files/openssh-3.9_p1-chroot.patch b/net-misc/openssh/files/openssh-3.9_p1-chroot.patch
index 13625995a88e..ecb418c35f3c 100644
--- a/net-misc/openssh/files/openssh-3.9_p1-chroot.patch
+++ b/net-misc/openssh/files/openssh-3.9_p1-chroot.patch
@@ -45,9 +45,9 @@ diff -uNr openssh-3.7.1p2/session.c openssh-3.7.1p2-chroot/session.c
  	if (getuid() == 0 || geteuid() == 0)
  #endif /* HAVE_CYGWIN */
 @@ -1268,6 +1276,27 @@
- 			exit(1);
+ 			do_pam_setcred(0);
  		}
- 		endgrent();
+ # endif /* USE_PAM */
 +
 +#ifdef CHROOT
 +       user_dir = xstrdup(pw->pw_dir);
@@ -69,6 +69,6 @@ diff -uNr openssh-3.7.1p2/session.c openssh-3.7.1p2-chroot/session.c
 +#endif /* CHROOT */
 +
 +
- # ifdef USE_PAM
- 		/*
- 		 * PAM credentials may take the form of supplementary groups. 
+ # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
+ 		irix_setusercontext(pw);
+ #  endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */
diff --git a/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2 b/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2
index ae244ef30de6..cd3006158bfd 100644
--- a/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2
+++ b/net-misc/openssh/files/openssh-3.9_p1-largekey.patch.bz2
diff --git a/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2 b/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2
index 6cc73c31bda5..6a11945ce66b 100644
--- a/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2
+++ b/net-misc/openssh/files/openssh-3.9_p1-sftplogging-1.2-gentoo.patch.bz2
diff --git a/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2 b/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2
index 821bc1d6f58f..074e6081d375 100644
--- a/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2
+++ b/net-misc/openssh/files/openssh-4.0_p1-sftplogging-1.2-gentoo.patch.bz2
diff --git a/net-misc/openssh/files/sshd.pam b/net-misc/openssh/files/sshd.pam
index d66bca1be1d8..511494025162 100644
--- a/net-misc/openssh/files/sshd.pam
+++ b/net-misc/openssh/files/sshd.pam
@@ -1,8 +1,9 @@
-auth	   required	pam_pwdb.so	nullok 
+#%PAM-1.0
+
+auth       required	pam_stack.so service=system-auth
+auth       required     pam_shells.so
 auth	   required	pam_nologin.so
-auth	   required	pam_env.so
-account	   required	pam_pwdb.so
-password   required	pam_pwdb.so
-session	   required	pam_pwdb.so
-session	   required	pam_limits.so
-session	   required	pam_chroot.so
+account    required	pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
+session	   required	pam_stack.so service=system-auth
+
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 1bae066a75c0..7a140d95545b 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,10 +1,129 @@
 # ChangeLog for net-misc/openswan
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.1 2004/02/22 04:58:34 pfeifer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
+
+*openswan-2.4.3 (15 Nov 2005)
+
+  15 Nov 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  -files/openswan-2.4.2-gentoo.patch, +files/openswan-2.4.3-gentoo.patch,
+  -openswan-2.4.2.ebuild, +openswan-2.4.3.ebuild:
+  Version bump fixing assert in PSK+ID and aggressive mode.
+  Remove openswan-2.4.2.
+
+*openswan-2.4.2 (15 Nov 2005)
+
+  15 Nov 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  -files/openswan-2.1.4-gentoo.patch, -files/openswan-2.1.5-gentoo.patch,
+  -files/openswan-2.3.0-gentoo.patch, -files/openswan-2.3.1-gentoo.patch,
+  +files/openswan-2.4.2-gentoo.patch, -openswan-1.0.6.ebuild,
+  -openswan-2.1.4.ebuild, -openswan-2.1.5.ebuild, openswan-2.2.0.ebuild,
+  -openswan-2.3.0.ebuild, -openswan-2.3.1.ebuild, +openswan-2.4.2.ebuild:
+  Version bump fixing bug #112568.
+  Cleaning-up old ebuilds.
+
+  15 Jul 2005; George Shapovalov <george@gentoo.org> openswan-*.ebuild:
+  changed dependency net-misc/host -> net-dns/host to account for package move
+
+*openswan-2.3.1 (12 Apr 2005)
+
+  12 Apr 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/openswan-2.3.1-gentoo.patch, +openswan-2.3.1.ebuild:
+  Version bump.
+
+*openswan-2.3.0 (20 Jan 2005)
+
+  20 Jan 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/openswan-2.3.0-gentoo.patch, +openswan-2.3.0.ebuild:
+  Version bump.
+
+  25 Oct 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.2.0.ebuild:
+  Stable on x86.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> openswan-2.1.5.ebuild,
+  openswan-2.2.0.ebuild:
+  Stable on amd64.
+
+*openswan-2.2.0 (17 Sep 2004)
+
+  17 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.2.0.ebuild:
+  Version bump.
+
+  12 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6.ebuild,
+  openswan-1.0.7.ebuild, openswan-2.1.4.ebuild, openswan-2.1.5.ebuild:
+  Fix-up of ebuilds to block strongswan. Closing bug #60794.
+
+*openswan-2.1.5 (12 Aug 2004)
+
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.5.ebuild:
+  Version bump.
+
+*openswan-1.0.7 (12 Aug 2004)
+
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.7.ebuild:
+  Version bump for the 1.x users.
+
+  23 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6.ebuild:
+  Fix depend on iproute2 closing bug #57263.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> openswan-1.0.6.ebuild,
+  openswan-2.1.4.ebuild:
+  change virtual/glibc to virtual/libc
+
+*openswan-1.0.6 (01 Jul 2004)
+
+  01 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6.ebuild:
+  Version bump for the 1.x users.
+
+*openswan-2.1.4 (23 Jun 2004)
+
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.4.ebuild:
+  Version bump. Contains a fix for potential security issue in x509.
+
+*openswan-1.0.6rc1 (23 Jun 2004)
+
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6_rc1.ebuild:
+  Initial import of Openswan 1.0.x series.
+  Superfreeswan users will now be migrated to openswan.
+  Contains fixes for potential security issues in x509.
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> openswan-2.1.3.ebuild:
+  Added to ~ppc.
+
+*openswan-2.1.3 (19 Jun 2004)
+
+  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.3.ebuild:
+  Version bump. Contains fixes for potential security issues.
+  Info here: http://lists.openswan.org/pipermail/dev/2004-June/000370.html
+  Removing all prior versions.
+
+  15 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> openswan-2.1.1.ebuild:
+  Marked stable on amd64.
+
+*openswan-2.1.2 (19 May 2004)
+
+  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.2.ebuild:
+  Version bump.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> openswan-2.0.0.ebuild,
+  openswan-2.1.0.ebuild, openswan-2.1.1.ebuild:
+  Add inherit eutils
+
+  31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> openswan-2.1.1.ebuild:
+  Adding amd64 keyword, closing #46317.
+
+*openswan-2.1.1 (29 Mar 2004)
+
+  29 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.1.ebuild:
+  Version bump. Closes Bug #46006.
+
+*openswan-2.1.0 (17 Mar 2004)
+
+  17 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.0.ebuild:
+  Version bump.
 
 *openswan-2.0.0 (22 Feb 2004)
 
-  22 Feb 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.0.0.ebuild
+  22 Feb 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.0.0.ebuild:
   Initial import.
   Provides userspace IPsec tool/support for FreeS/WAN based 2.4 kernels
   and native 2.6 (KAME) based IPsec. 2.6 support is a work in progress.
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 54eb05156b75..456b8e5b820a 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,5 +1,11 @@
-MD5 e9cb374a726429bd816adad7d9854cf1 openswan-2.0.0.ebuild 2985
-MD5 9f6b9a781012c8887a70a8c47b6c2410 ChangeLog 402
-MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
-MD5 4964e70ea4748681d56d068cc04db232 files/digest-openswan-2.0.0 67
-MD5 ba724ecd48887a714b7ff231c0a3ef18 files/openswan-2.0.0-gentoo.patch 17451
+MD5 a6f8978a0d4d356d16cecfb19711ad91 ChangeLog 4443
+MD5 5a79041189d29ce8568c635f841cebd4 files/digest-openswan-1.0.7 67
+MD5 0ddd2a0be9ddea1e37f659f9d529ee19 files/digest-openswan-2.2.0 67
+MD5 f4f84eab128c1b8cd2fdca381fde7d73 files/digest-openswan-2.4.3 67
+MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
+MD5 9b866b02f096fc3ce577165fd17a82ec files/openswan-2.2.0-gentoo.patch 17438
+MD5 7015cc05d4916c9bcd1437cfce3c7156 files/openswan-2.4.3-gentoo.patch 17758
+MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568
+MD5 6e024f039baaa21ae409f042004a8c5a openswan-1.0.7.ebuild 1885
+MD5 3305d9fca22c0df5182a711f91c38abf openswan-2.2.0.ebuild 3160
+MD5 5cc8ab1cb3cbbe74307b3c83b7dc4df7 openswan-2.4.3.ebuild 3117
diff --git a/net-misc/openswan/metadata.xml b/net-misc/openswan/metadata.xml
index 6e1637acb631..8a28243d60e9 100644
--- a/net-misc/openswan/metadata.xml
+++ b/net-misc/openswan/metadata.xml
@@ -5,7 +5,6 @@
 <maintainer>
   <email>pfeifer@gentoo.org</email>
   <name>Jay Pfeifer</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
 <longdescription>From the Openswan web site: Openswan is an Open Source 
 implementation of IPsec for the Linux operating system. Is it a code fork 
diff --git a/net-misc/openswan/openswan-1.0.7.ebuild b/net-misc/openswan/openswan-1.0.7.ebuild
index 4417aa215056..b78ab49446fa 100644
--- a/net-misc/openswan/openswan-1.0.7.ebuild
+++ b/net-misc/openswan/openswan-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/net-misc/openswan/openswan-1.0.7.ebuild,v 1.1 2004/08/12 22:40:45 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.7.ebuild,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
 
 inherit eutils
 
@@ -11,14 +11,15 @@ HOMEPAGE="http://www.openswan.org/"
 SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}.tar.gz"
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/strongswan
+	virtual/libc
 	virtual/linux-sources
-	net-misc/host
+	net-dns/host
 	>=dev-libs/gmp-3.1.1"
 LICENSE="GPL-2"
 RDEPEND=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-misc/openswan/openswan-2.2.0.ebuild b/net-misc/openswan/openswan-2.2.0.ebuild
index fd2c327d56ec..19daa9f4f246 100644
--- a/net-misc/openswan/openswan-2.2.0.ebuild
+++ b/net-misc/openswan/openswan-2.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/net-misc/openswan/openswan-2.2.0.ebuild,v 1.1 2004/09/18 02:49:41 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.2.0.ebuild,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
 
 inherit eutils
 
@@ -13,14 +13,14 @@ SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64 ~ppc"
+KEYWORDS="-* x86 amd64 ~ppc"
 IUSE=""
 
 DEPEND="!net-misc/strongswan
 	virtual/libc
 	virtual/linux-sources
 	>=dev-libs/gmp-3.1.1
-	net-misc/host
+	net-dns/host
 	sys-apps/iproute2"
 RDEPEND=""
 
@@ -29,7 +29,7 @@ check_version_h() {
 	then
 		eerror "Please verify that your /usr/src/linux symlink is pointing"
 		eerror "to your current kernel sources, and that you have a running kernel"
-		die "/usr/src/linux symlink not setup!"
+		die "/usr/src/linux symlink not setup or kernel tree has not been configured!"
 	fi
 }
 
diff --git a/net-misc/openswan/openswan-2.4.3.ebuild b/net-misc/openswan/openswan-2.4.3.ebuild
index c12fdc4559b7..8b8566b8df2d 100644
--- a/net-misc/openswan/openswan-2.4.3.ebuild
+++ b/net-misc/openswan/openswan-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.3.ebuild,v 1.1 2005/11/15 04:12:35 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.3.ebuild,v 1.1.1.1 2005/11/30 09:54:55 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 074554b203a6..1c2cd2715cf5 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,11 +1,284 @@
 # ChangeLog for net-misc/openvpn
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.1 2002/05/26 19:57:28 ashmodai Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
+
+  08 Nov 2005; Roy Marples <uberlord@gentoo.org> -openvpn-2.0.1.ebuild,
+  -openvpn-2.0.2.ebuild, -openvpn-2.0.2-r3.ebuild, -openvpn-2.0.4-r1.ebuild,
+  -openvpn-2.0.4-r2.ebuild, -openvpn-2.0.5-r1.ebuild:
+  Punted a few versions.
+
+*openvpn-2.0.5-r2 (06 Nov 2005)
+
+  06 Nov 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.5.ebuild,
+  +openvpn-2.0.5-r2.ebuild:
+  easyrsa pkitool is now installed, #111635.
+  easyrsa no longer gets installed when minimum USE flag is set.
+
+  06 Nov 2005; Simon Stelling <blubb@gentoo.org> openvpn-2.0.5.ebuild:
+  stable on amd64 wrt bug 111116
+
+  05 Nov 2005; Bryan Østergaard <kloeri@gentoo.org> openvpn-2.0.5.ebuild:
+  Stable on alpha, bug 111116.
+
+  04 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> openvpn-2.0.5.ebuild:
+  Stable on sparc wrt #111116
+
+  04 Nov 2005; Fabian Groffen <grobian@gentoo.org> openvpn-2.0.5.ebuild:
+  Marked ppc-macos for bug #111116 (again)
+
+  04 Nov 2005; Mark Loeser <halcy0n@gentoo.org> openvpn-2.0.5.ebuild:
+  Stable on x86; bug #111116
+
+  03 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> openvpn-2.0.5.ebuild:
+  Stable on ppc. See bug #111116.
+
+*openvpn-2.0.5-r1 (03 Nov 2005)
+*openvpn-2.0.5 (03 Nov 2005)
+
+  03 Nov 2005; Roy Marples <uberlord@gentoo.org> +openvpn-2.0.5.ebuild,
+  +openvpn-2.0.5-r1.ebuild:
+  Version bump - fixes some serious issues 2.0.4 had
+  2.0.5 has old init script
+  2.0.5-r1 has new init script
+
+  03 Nov 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.4-r1.ebuild,
+  openvpn-2.0.4-r2.ebuild:
+  easy-rsa now gets installed properly, #111351
+
+  03 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  openvpn-2.0.4-r1.ebuild:
+  Stable on sparc wrt #111116
+
+  02 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/openvpn-2.0.4-darwin.patch, openvpn-2.0.4-r1.ebuild,
+  openvpn-2.0.4-r2.ebuild:
+  Fixed compilation problem on Darwin and marked ppc-macos (bug #111116)
+
+*openvpn-2.0.4-r2 (02 Nov 2005)
+*openvpn-2.0.4-r1 (02 Nov 2005)
+
+  02 Nov 2005; Roy Marples <uberlord@gentoo.org> -openvpn-2.0.4.ebuild,
+  +openvpn-2.0.4-r1.ebuild, +openvpn-2.0.4-r2.ebuild:
+  2.0.4 removed as it had the new init script
+  2.0.4-r1 added with old init script
+  2.0.4-r2 added with new init script
+
+  02 Nov 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.4.ebuild:
+  Fixed pam issue when building plugins, #111267
+
+  02 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> openvpn-2.0.4.ebuild:
+  Stable on ppc.
+
+  02 Nov 2005; Andrej Kacian <ticho@gentoo.org> openvpn-2.0.4.ebuild:
+  Stable on x86, security bug #111116.
+
+*openvpn-2.0.4 (02 Nov 2005)
+
+  02 Nov 2005; Roy Marples <uberlord@gentoo.org> metadata.xml,
+  +openvpn-2.0.4.ebuild:
+  Added myself as a maintainer until luckyduck comes back online
+  
+  Version bump, wrt bug #111116
+
+  Examples flag really now works, #100943
+
+  init script now appends the --cd option only when the same option
+  is not specified in the config file, #109363
+
+  15 Oct 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.2-r3.ebuild:
+  plugins now really install to /usr/lib/openvpn
+
+*openvpn-2.0.2-r3 (14 Oct 2005)
+
+  14 Oct 2005; Roy Marples <uberlord@gentoo.org> files/openvpn.init,
+  -openvpn-2.0.2-r2.ebuild, +openvpn-2.0.2-r3.ebuild:
+  init script now modprobes tun if /dev/tun does not exist and errors
+  if tun/tap support is not enabled in the kernel
+  
+  iproute2 USE flag fixed as --disable-iproute2 also enables it in the Makefile
+
+*openvpn-2.0.2-r2 (14 Oct 2005)
+
+  14 Oct 2005; Roy Marples <uberlord@gentoo.org> files/openvpn.init,
+  -openvpn-2.0.2-r1.ebuild, +openvpn-2.0.2-r2.ebuild:
+  Rev bump for new init script which stops properly on baselayout-1.11 and
+  earlier.
+
+  14 Oct 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.2-r1.ebuild:
+  Added net-tools as a dependency if iproute2 USE flag is not used.
+
+*openvpn-2.0.2-r1 (13 Oct 2005)
+
+  13 Oct 2005; Roy Marples <uberlord@gentoo.org> +files/openvpn.init,
+  +openvpn-2.0.2-r1.ebuild:
+  New init script which allows more granular control of seperate vpns, #105439
+  Install all docs, #100943
+  new iproute2 USE flag, #98782 thanks to Sean Lynn
+  new static USE flag, #105479 thanks to Clemens Noss
+  new minimal USE flag which decides to build bundled plugins or not, #103711
+
+*openvpn-2.0.2 (19 Sep 2005)
+
+  19 Sep 2005; Seemant Kulleen <seemant@gentoo.org> -openvpn-2.0.ebuild,
+  -openvpn-2.0-r1.ebuild, +openvpn-2.0.2.ebuild:
+  version bump to newest upstream release. wfm, and luckyduck is missing.
+  Closes bug #103913
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> openvpn-2.0.1.ebuild:
+  Mark 2.0.1 stable on alpha
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> openvpn-2.0.1.ebuild:
+  Stable on sparc wrt #102871
+
+  24 Aug 2005; Olivier Crête <tester@gentoo.org> openvpn-2.0.1.ebuild:
+  Stable on x86 per security bug #102871
+
+  21 Aug 2005; Fabian Groffen <grobian@gentoo.org> openvpn-2.0.1.ebuild:
+  Stable on ppc-macos (bug #102871)
+
+  21 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> openvpn-2.0.1.ebuild:
+  Stable on ppc.
+
+  21 Aug 2005; Luis Medinas <metalgod@gentoo.org> openvpn-2.0.1.ebuild:
+  Marked Stable on AMD64. Fixes bug #102871.
+
+*openvpn-2.0.1 (21 Aug 2005)
+
+  21 Aug 2005; petre rodan <kaiowas@gentoo.org> +openvpn-2.0.1.ebuild:
+  version bump as per security bug #102871; added selinux RDEPEND
+
+  25 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-2.0-r1.ebuild:
+  -r1 installs the initscript again, fixes #96855.
+
+  18 Jun 2005; Jason Wever <weeve@gentoo.org> openvpn-2.0.ebuild:
+  Stable on SPARC.
+
+  09 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-2.0-r1.ebuild:
+  Minor fixes.
+
+*openvpn-2.0-r1 (30 May 2005)
+
+  30 May 2005; Jan Brinkmann <luckyduck@gentoo.org> files/openvpn,
+  +openvpn-2.0-r1.ebuild:
+  make use of our initscript again, fixes #94350. the initscript now supports
+  checking if a connection is already online, see #92369 for details. thanks
+  to Christian Hesse <mail@earthworm.de> for the suggestion.
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-2.0.ebuild:
+  stable on amd64, ppc and x86
+
+  07 May 2005; Jeffrey Forman <jforman@gentoo.org> openvpn-1.6.0.ebuild:
+  openvpn-1.6.0 stable on sparc
+
+  01 May 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.6.0.ebuild:
+  marked 1.6.0 stable on amd64 and x86, some cosmetic changes.
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml:
+  herd -> secure-tunneling
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-2.0.ebuild:
+  added a compatibility warning.
+
+*openvpn-2.0 (29 Apr 2005)
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml,
+  -openvpn-1.1.0.ebuild, -openvpn-1.3.1.ebuild, -openvpn-1.3.2.ebuild,
+  -openvpn-1.3.2-r1.ebuild, -openvpn-1.4.2.ebuild, -openvpn-1.5.0.ebuild,
+  +openvpn-2.0.ebuild:
+  added ebuild for 2.0, fixes #50767. also updated metadata.xml, took over
+  maintainership. did some cleanup, removed older versions. introduced support
+  for the examples useflag.
+
+  05 Feb 2005; <solar@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.6.0.ebuild:
+  - q/a fix. os-headers are not needed in RDEPEND
+
+  23 Jan 2005; Daniel Black <dragonheart@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.6.0.ebuild:
+  threads is now a global use flags. Changed pthreads to threads.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> openvpn-1.6.0.ebuild:
+  added ~amd64
+
+  24 Nov 2004; Kito <kito@gentoo.org> openvpn-1.6.0.ebuild:
+  added ~ppc-macos. closes bug Bug 72324
+
+  17 Oct 2004; <solar@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.6.0.ebuild:
+  added gnuconfig_update for bug #61187
+
+*openvpn-1.6.0 (02 Oct 2004)
+
+  02 Oct 2004; Joshua Charles Campbell <warpzero@gentoo.org> openvpn-1.6.0.ebuild:
+  Version bump
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> openvpn-1.5.0-r1.ebuild:
+  Keyword ~alpha, bug 65839.
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> openvpn-1.1.0.ebuild,
+  openvpn-1.3.1.ebuild, openvpn-1.3.2-r1.ebuild, openvpn-1.3.2.ebuild,
+  openvpn-1.4.2.ebuild, openvpn-1.5.0-r1.ebuild, openvpn-1.5.0.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  09 Jul 2004; Travis Tilley <lv@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.5.0.ebuild:
+  switch linux-headers dependency to virtual/os-headers
+
+  25 Mar 2004; Jason Wever <weeve@gentoo.org> openvpn-1.5.0-r1.ebuild:
+  Marked stable on sparc.
+
+*openvpn-1.5.0-r1 (15 Mar 2004)
+
+  15 Mar 2004; <warpzero@gentoo.org> metadata.xml, openvpn-1.5.0-r1.ebuild;
+  Added pthreads support and made the ebuild actually consider its use flags, wow.
+
+*openvpn-1.5.0 (24 Dec 2003)
+
+*openvpn-1.4.2 (03 Aug 2003)
+
+  03 Aug 2003; <warpzero@gentoo.org> metadata.xml, openvpn-1.5.0.ebuild:
+  version 1.5.0 added
+  fixed init script added. Closes several bugs.
+
+*openvpn-1.4.2 (03 Aug 2003)
+
+  03 Aug 2003; <warpzero@gentoo.org> metadata.xml, openvpn-1.4.2.ebuild:
+  ~ppc keyword
+
+*openvpn-1.4.2 (03 Aug 2003)
+
+  03 Aug 2003; <warpzero@gentoo.org> metadata.xml, openvpn-1.4.2.ebuild:
+  version 1.4.2 added
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*openvpn-1.3.2-r1 (20 May 2003)
+
+   20 May 2003; Ryan Phillips <rphillips@gentoo.org> openvpn-1.3.2-r1.ebuild :
+   Included init script. Bug #20085 Fixed. Submitted by Warp Zero
+ 
+*openvpn-1.3.2 (31 Jan 2003)
+
+   31 Jan 2003; Ryan Phillips <rphillips@gentoo.org> openvpn-1.3.2 :
+
+   new version. 
+ 
+*openvpn-1.3.1 (15 Jul 2002)
+
+   15 Jul 2002; Ryan Phillips <rphillips@gentoo.org> openvpn-1.3.1 :
+
+   new version. Thanks to Marko Mikulicic
 
 *openvpn-1.1.0 (26 May 2002)
 
-   26 May 2002; Mike Jones <ashmodai@gentoo.org> ChangeLog, openvpn-1.1.0.ebuild:
-   
+   09 Jul 2002; phoen][x <phoenix@gentoo.org> openvpn-1.1.0.ebuild :
+   Added KEYWORDS.
+
+   26 May 2002; Mike Jones <ashmodai@gentoo.org> ChangeLog, openvpn-1.1.0.ebuild:   
    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-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index f41ccb6bab15..3cae38da01cf 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,10 +1,13 @@
-MD5 5d4a8568d770d544115dafa2a6eebf96 ChangeLog 1146
-MD5 3f7e95773164d6e54c960cb4f216922a openvpn-1.1.0.ebuild 826
-MD5 b6d5913240f443c12b8e9454c10d64c2 openvpn-1.3.1.ebuild 825
-MD5 21729c1eae379575328dd3b1529477e1 openvpn-1.3.2.ebuild 826
-MD5 5b025ea2bc6abf196879df048467656d openvpn-1.3.2-r1.ebuild 875
-MD5 7a773fcca001e35d171b15d68d435d97 files/digest-openvpn-1.1.0 65
-MD5 45d5378d808bbb444fe4435d781b4329 files/digest-openvpn-1.3.1 65
-MD5 13b6f9ae7f19da756c1b1fb22a6da994 files/openvpn 514
-MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2 65
-MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2-r1 65
+MD5 ad93ca28f8d512eb78e4a35d7c97ff99 openvpn-2.0.5.ebuild 3217
+MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
+MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
+MD5 fd9bced7c81febb0e2dcec2ca67a9261 ChangeLog 10333
+MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
+MD5 37d96647595be6fb0fe996a77d0c5009 openvpn-2.0.5-r2.ebuild 3867
+MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
+MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
+MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5 65
+MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
+MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
+MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5-r2 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
diff --git a/net-misc/openvpn/files/openvpn b/net-misc/openvpn/files/openvpn
index b025eae0e103..e0b7c14f36cf 100644
--- a/net-misc/openvpn/files/openvpn
+++ b/net-misc/openvpn/files/openvpn
@@ -6,26 +6,56 @@ depend() {
 	need net
 }
 
+checktundevice() {
+	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
+		ebegin Detected broken /dev/net/tun symlink, fixing...
+			rm /dev/net/tun
+			ln -s /dev/misc/net/tun /dev/net/tun
+		eend $?
+	fi
+}
+
 start() {
-	cd $VPNDIR
+	checktundevice || return 1
+	
+	cd ${VPNDIR}
 	for VPN in *
 	do
-		ebegin "Starting openvpn for $VPN"
-		start-stop-daemon --start --pidfile \
-			/var/run/openvpn-$VPN.pid --startas /usr/sbin/openvpn \
-			-- --config $VPN/local.conf --writepid \
-			/var/run/openvpn-$VPN.pid \
-			--daemon --cd $VPN
-		eend $?
+		if [ -d ${VPN} ] && [ -e ${VPN}/local.conf ]; then
+			if [ -f ${VPN}/onlinecheck ]; then
+				ping -c 3 `head -n 1 ${VPN}/onlinecheck` >& /dev/null
+			else
+				false
+			fi
+			
+			if [ $? -gt 0 ]; then
+				ebegin "Starting openvpn for ${VPN}"
+					start-stop-daemon --start --pidfile /var/run/openvpn-${VPN}.pid \
+						  	  --startas /usr/sbin/openvpn -- --config ${VPN}/local.conf \
+						  				 	--writepid /var/run/openvpn-${VPN}.pid \
+										 	--daemon --cd ${VPN}
+				eend $?
+			else
+				einfo "Connection ${VPN} already online. Skipping..."
+			fi
+		else
+			ewarn "Expected ${VPNDIR}/${VPN} to be a directory containing a local.conf."
+		fi
 	done
 }
 
 stop() {
-	cd $VPNDIR
+	cd ${VPNDIR}
 	for VPN in *
 	do
-		ebegin "Stoping openvpn for $VPN"
-		start-stop-daemon --stop --pidfile /var/run/openvpn-$VPN.pid
-		eend $?
+		if [ -e /var/run/openvpn-${VPN}.pid ]; then
+			ebegin "Stopping openvpn for ${VPN}"
+				start-stop-daemon --oknodo --stop --pidfile /var/run/openvpn-${VPN}.pid
+				rm /var/run/openvpn-${VPN}.pid
+			eend 0
+		else
+			ewarn "${VPN} has no pidfile!"
+		fi
 	done
+	return 0
 }
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
index 7e148c3ee242..c0a17383b5e5 100644
--- a/net-misc/openvpn/files/openvpn.init
+++ b/net-misc/openvpn/files/openvpn.init
@@ -1,4 +1,6 @@
 #!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 VPNDIR="/etc/openvpn"
 VPN="${myservice##*.}"
@@ -14,6 +16,12 @@ depend() {
 }
 
 checktundevice() {
+	if [[ ! -e /dev/net/tun ]]; then
+		if ! modprobe tun ; then
+			eerror "TUN/TAP support is not available in this kernel"
+			return 1
+		fi
+	fi
 	if [[ -h /dev/net/tun && -c /dev/misc/net/tun ]]; then
 		ebegin "Detected broken /dev/net/tun symlink, fixing..."
 		rm -f /dev/net/tun
@@ -23,24 +31,30 @@ checktundevice() {
 }
 
 start() {
+	ebegin "Starting ${myservice}"
+
 	checktundevice || return 1
 
-	ebegin "Starting ${myservice}"
-	
 	if [[ ! -e "${VPNCONF}" ]]; then
 		eend 1 "${VPNCONF} does not exist"
 		return 1
 	fi
-		
+
+	local args=""
+	# If the config file does not specify the cd option, we do
+	# But if we specify it, we override the config option which we do not want
+	if ! grep -q "^[ \t]*cd[ \t].*" "${VPNCONF}" ; then
+		args="${args} --cd ${VPNDIR}"
+	fi
+
 	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}"	\
-		--daemon --cd "${VPNDIR}"
+		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
 	eend $? "Check your logs to see why startup failed"
 }
 
 stop() {
 	ebegin "Stopping ${myservice}"
-	start-stop-daemon --stop -exec /usr/sbin/openvpn --pidfile "${VPNPID}"
+	start-stop-daemon --stop --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
 	eend $?
 }
 
diff --git a/net-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
index db17447b0718..2881c6500df2 100644
--- a/net-misc/openvpn/metadata.xml
+++ b/net-misc/openvpn/metadata.xml
@@ -3,9 +3,12 @@
 <pkgmetadata>
 <herd>secure-tunneling</herd>
 <maintainer>
-  <email>warpzero@gentoo.org</email>
-  <name>Joshua Charles Campbell</name>
-<!--  <description>Description of the maintainership</description> -->
+  <email>luckyduck@gentoo.org</email>
+  <name>Jan Brinkmann</name>
+</maintainer>
+<maintainer>
+  <email>uberlord@gentoo.org</email>
+  <name>Roy Marples</name>
 </maintainer>
 <longdescription>OpenVPN is an easy-to-use, robust and highly 
 configurable VPN daemon which can be used to securely link two or more 
diff --git a/net-misc/openvpn/openvpn-1.5.0-r1.ebuild b/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
index a05b5745f877..89b732245b38 100644
--- a/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
@@ -1,45 +1,49 @@
-# Copyright 1999-2004 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-misc/openvpn/openvpn-1.5.0-r1.ebuild,v 1.1 2004/03/16 03:06:02 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
+
+inherit gnuconfig
 
-IUSE="ssl pthreads"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/openvpn/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha ~amd64"
+IUSE="ssl threads"
 
-DEPEND=">=dev-libs/lzo-1.07
-	sys-kernel/linux-headers
+RDEPEND=">=dev-libs/lzo-1.07
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND} virtual/os-headers"
 
-src_compile() {
-
-
+src_unpack() {
+	unpack ${A}
+	gnuconfig_update
+}
 
+src_compile() {
 	econf \
-		`use_enable ssl` \
-		`use_enable ssl crypto` \
-		`use_enable pthreads pthread` \
-		|| die
-	emake || die
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		|| die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
+	make DESTDIR=${D} install || die "make install failed"
 
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING CHANGES INSTALL PORTS README
+	dodoc ChangeLog INSTALL PORTS README
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/openvpn
 }
 
-
 pkg_postinst() {
-	einfo "The init.d script that comes with OpenVPN expects directories /etc/openvpn/*/ with a local.conf and any supporting files, such as keys."
+	einfo "The init.d script that comes with OpenVPN expects directories"
+	einfo "/etc/openvpn/*/ with a local.conf and any supporting files, "
+	einfo "such as keys."
 	ewarn "This version of OpenVPN is NOT COMPATIBLE with 1.4.2!"
 	ewarn "If you need compatibility with 1.4.2 please emerge that version."
 }
diff --git a/net-misc/openvpn/openvpn-1.6.0.ebuild b/net-misc/openvpn/openvpn-1.6.0.ebuild
index 01190283a43b..257ce196dad0 100644
--- a/net-misc/openvpn/openvpn-1.6.0.ebuild
+++ b/net-misc/openvpn/openvpn-1.6.0.ebuild
@@ -1,48 +1,49 @@
-# Copyright 1999-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-misc/openvpn/openvpn-1.6.0.ebuild,v 1.1 2004/10/07 20:32:29 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
+
+inherit gnuconfig
 
-IUSE="ssl pthreads"
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
 SRC_URI="mirror://sourceforge/openvpn/${P}.tar.gz"
 HOMEPAGE="http://openvpn.sourceforge.net/"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~alpha ~ppc-macos amd64"
+IUSE="ssl threads"
 
-DEPEND=">=dev-libs/lzo-1.07
-	virtual/os-headers
+RDEPEND=">=dev-libs/lzo-1.07
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND} virtual/os-headers"
 
 src_unpack() {
-        unpack ${A}
-        
-        # an updated config.sub for the uclibc env
-        gnuconfig_update
-}                                             
+	unpack ${A}
+	gnuconfig_update
+}
 
 src_compile() {
 	econf \
-		`use_enable ssl` \
-		`use_enable ssl crypto` \
-		`use_enable pthreads pthread` \
-		|| die
-	emake || die
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		|| die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
+	make DESTDIR=${D} install || die "make install failed"
 
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING ChangeLog INSTALL PORTS README
+	dodoc ChangeLog INSTALL PORTS README
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/openvpn
 }
 
-
 pkg_postinst() {
-	einfo "The init.d script that comes with OpenVPN expects directories /etc/openvpn/*/ with a local.conf and any supporting files, such as keys."
+	einfo "The init.d script that comes with OpenVPN expects directories"
+	einfo "/etc/openvpn/*/ with a local.conf and any supporting files,"
+	einfo "such as keys."
 	ewarn "This version of OpenVPN is NOT COMPATIBLE with 1.4.2!"
 	ewarn "If you need compatibility with 1.4.2 please emerge that version."
 }
diff --git a/net-misc/openvpn/openvpn-2.0.5-r2.ebuild b/net-misc/openvpn/openvpn-2.0.5-r2.ebuild
index 4a58d472f6b0..e8032ce8079e 100644
--- a/net-misc/openvpn/openvpn-2.0.5-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.5-r2.ebuild,v 1.1 2005/11/06 14:04:35 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:54:43 chriswhite Exp $
 
 inherit eutils gnuconfig multilib
 
diff --git a/net-misc/openvpn/openvpn-2.0.5.ebuild b/net-misc/openvpn/openvpn-2.0.5.ebuild
index 5fa1d5f9509b..a96a734f1002 100644
--- a/net-misc/openvpn/openvpn-2.0.5.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.5.ebuild,v 1.1 2005/11/03 17:58:45 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.5.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc-macos sparc x86"
 IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
@@ -77,7 +77,7 @@ src_install() {
 
 	# Install easy-rsa stuff
 	exeinto "/usr/share/${PN}/easy-rsa"
-	doexe easy-rsa/2.0/*-*
+	doexe easy-rsa/2.0/*-* easy-rsa/2.0/pkitool
 	insinto "/usr/share/${PN}/easy-rsa"
 	doins easy-rsa/2.0/{README,openssl.cnf,vars}
 
diff --git a/net-misc/partysip/ChangeLog b/net-misc/partysip/ChangeLog
index b44695d08ab1..2be69c595b69 100644
--- a/net-misc/partysip/ChangeLog
+++ b/net-misc/partysip/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for net-misc/partysip
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.1 2004/03/14 21:23:55 stkn Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/ChangeLog,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
+
+  02 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/partysip-2.2.3-fix_auth.diff, partysip-2.2.3.ebuild:
+  Remove unused code in auth plugin, breaks authentication otherwise
+  (#107886), thanks to White_Angel@gmx.de for submitting this fix. Using
+  --with-db=no does not work, fix that too.
+
+  02 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/partysip-2.2.3-libresolv-check.diff, partysip-2.2.3.ebuild:
+  Fix libresolv check in configure.in (#107885), search for the internal
+  function name instead of the alias name, because that one is not present in
+  the amd64 libresolv.so. Thanks to White_Angel@gmx.de for reporting this.
+
+  18 Jul 2005; David Holm <dholm@gentoo.org> partysip-2.2.3.ebuild:
+  Added to ~ppc.
+
+*partysip-2.2.3 (18 Jul 2005)
+
+  18 Jul 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/partysip-2.1.1-libosip2fix.diff,
+  +files/partysip-2.2.3-configure.diff, files/partysip.rc6,
+  -partysip-2.1.1.ebuild, +partysip-2.2.3.ebuild:
+  Version bump and removed old non-working version (#92831).
+
+  22 Oct 2004; Jason Wever <weeve@gentoo.org> partysip-2.1.1.ebuild:
+  Added ~sparc keyword.
+
+  21 Sep 2004; <stkn@gentoo.org> partysip-2.1.1.ebuild:
+  changed DEPENDS to old value (>=net-libs/libosip-2.0.0) after closing #64526
+
+  21 Sep 2004; <stkn@gentoo.org> +files/partysip-2.1.1-libosip2fix.diff,
+  partysip-2.1.1.ebuild:
+  found a fix in the partysip cvs, works with >=libosip-2.0.7 and previous
+  versions
+
+  21 Sep 2004; <stkn@gentoo.org> partysip-2.1.1.ebuild:
+  partysip won't compile with >=libosip-2.0.7, changing dependency to
+  ~libosip-2.0.6 for now...
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> partysip-2.1.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> partysip-2.1.1.ebuild:
+  Fix use invocation
 
 *partysip-2.1.1 (14 Mar 2004)
 
diff --git a/net-misc/partysip/Manifest b/net-misc/partysip/Manifest
index 7635036c9012..8314988d7350 100644
--- a/net-misc/partysip/Manifest
+++ b/net-misc/partysip/Manifest
@@ -1,6 +1,9 @@
-MD5 d2805e5f00341d6c023fb44bbdc34c25 ChangeLog 445
-MD5 d9ad66c9db8a11c1dd86af1f96ca52dc partysip-2.1.1.ebuild 1486
+MD5 9ee0fce746351dda580145dd25e1aee9 partysip-2.2.3.ebuild 2058
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
+MD5 f512ef6e7278964481835f22b2ffff37 ChangeLog 2236
 MD5 af1cd5cfc31c0ad22707ebfb4c5d4a42 files/partysip.confd 51
-MD5 466f86cb9a94b83fd63cd4d9df68dcf2 files/partysip.rc6 563
-MD5 6d09d636a5e5279fee121ef636931eb7 files/digest-partysip-2.1.1 197
+MD5 24abad771636387287f7b64ae4d5d77b files/partysip-2.2.3-fix_auth.diff 568
+MD5 683b0ac31fb45361c565e39861b10edb files/partysip-2.2.3-configure.diff 1121
+MD5 28c1c4c474314301b9ae5a6df3bd96d8 files/digest-partysip-2.2.3 66
+MD5 3d8b82c59417e2b2174a12728fe8ce10 files/partysip.rc6 556
+MD5 4ac096b43167b02709123c988ad7f54a files/partysip-2.2.3-libresolv-check.diff 612
diff --git a/net-misc/partysip/files/partysip.rc6 b/net-misc/partysip/files/partysip.rc6
index 55f8cea368da..80e94f827d79 100644
--- a/net-misc/partysip/files/partysip.rc6
+++ b/net-misc/partysip/files/partysip.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/files/partysip.rc6,v 1.1 2004/03/14 21:23:55 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/files/partysip.rc6,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting partysip"
 	start-stop-daemon --start --background --pidfile /var/run/partysip.pid \
-		-m --quiet --exec /usr/bin/partysip -- ${PARTYSIP_OPTS}
+		-m --quiet --exec /usr/sbin/partysip -- ${PARTYSIP_OPTS}
 	eend $?
 }
 
diff --git a/net-misc/partysip/partysip-2.2.3.ebuild b/net-misc/partysip/partysip-2.2.3.ebuild
index 45c435db7c7e..f6b17fafa35e 100644
--- a/net-misc/partysip/partysip-2.2.3.ebuild
+++ b/net-misc/partysip/partysip-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/net-misc/partysip/partysip-2.2.3.ebuild,v 1.1 2005/07/17 22:20:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/partysip/partysip-2.2.3.ebuild,v 1.1.1.1 2005/11/30 09:55:21 chriswhite Exp $
 
 IUSE="berkdb debug syslog"
 
@@ -12,12 +12,11 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2" # not 100% about -2, but core is LGPL
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
 	>=net-libs/libosip-2.2.1
 	berkdb? ( =sys-libs/db-3* )"
-#	gdbm? ( sys-libs/gdbm )"
 
 src_unpack() {
 	unpack ${A}
@@ -25,6 +24,16 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-configure.diff
 
+	# fix libresolv check in configure.in (#107885)
+	# instead of res_query, we search for the real (internal)
+	# function name __res_query, because res_query isn't in the symbol
+	# list of libresolv on amd64
+	epatch ${FILESDIR}/${P}-libresolv-check.diff
+
+	# remove unused check in auth plugin (#107886)
+	# breaks authentication otherwise
+	epatch ${FILESDIR}/${P}-fix_auth.diff
+
 	# put partysip  binary into /usr/sbin
 	sed -i -e "s:^bin_PROGRAMS:sbin_PROGRAMS:" \
 		src/Makefile.am tools/Makefile.am
@@ -42,8 +51,8 @@ src_compile() {
 		myconf="--with-db=susedb3"
 #	elif use gdbm; then
 #		myconf="--with-db=gdbm"
-	else
-		myconf="--with-db=no"
+#	else
+#		myconf="--with-db=no"
 	fi
 
 	econf \
diff --git a/net-misc/pavuk/ChangeLog b/net-misc/pavuk/ChangeLog
index 4563688ffdc1..53c1e60d338b 100644
--- a/net-misc/pavuk/ChangeLog
+++ b/net-misc/pavuk/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for net-misc/pavuk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.1 2003/02/10 18:38:12 sethbc Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
+
+  09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pavuk-0.9.32.ebuild:
+  Stable on ppc.
+
+  09 Apr 2005; Jason Wever <weeve@gentoo.org> pavuk-0.9.32.ebuild:
+  Stable on SPARC wrt security bug #88028.
+
+  09 Apr 2005; Daniel Drake <dsd@gentoo.org> pavuk-0.9.32.ebuild:
+  Disable socks support due to brokenness
+
+  09 Apr 2005; Daniel Drake <dsd@gentoo.org> pavuk-0.9.32.ebuild:
+  Fix sandbox violation on USE=nls
+
+  05 Apr 2005; Daniel Drake <dsd@gentoo.org> pavuk-0.9.32.ebuild:
+  Stable on x86 for security
+
+*pavuk-0.9.32 (05 Apr 2005)
+
+  05 Apr 2005; Daniel Drake <dsd@gentoo.org> +pavuk-0.9.32.ebuild:
+  Version bump to fix bug 88028
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> pavuk-0.9.31.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  pavuk-0.9.31.ebuild:
+  Added to ~amd64.
+
+  11 Nov 2004; Daniel Drake <dsd@gentoo.org>
+  -files/pavuk-0.9.28-digest_auth.c.patch, -files/pavuk-0.9.28-http.patch,
+  -pavuk-0.9.28-r4.ebuild:
+  Remove old insecure version, GLSA 200411-19
+
+  10 Nov 2004; <SeJo@gentoo.org> pavuk-0.9.31.ebuild:
+  stable on ppc gsla:70516
+
+  09 Nov 2004; Jason Wever <weeve@gentoo.org> pavuk-0.9.31.ebuild:
+  Stable on sparc wrt security bug #70516.
+
+  09 Nov 2004; Daniel Drake <dsd@gentoo.org> pavuk-0.9.31.ebuild:
+  0.9.31 stable on x86
+
+*pavuk-0.9.31 (09 Nov 2004)
+
+  09 Nov 2004; Daniel Drake <dsd@gentoo.org> +pavuk-0.9.31.ebuild:
+  Version bump to 0.9.31. Fixes security stuff, see bug #70516. Note that GTK
+  support is quite broken and has been disabled
+
+  25 Sep 2004; Daniel Drake <dsd@gentoo.org> pavuk-0.9.28-r4.ebuild:
+  Fix gnome depend.
+
+  12 Sep 2004; Daniel Drake <dsd@gentoo.org> pavuk-0.9.28-r1.ebuild,
+  pavuk-0.9.28-r2.ebuild, pavuk-0.9.28-r3.ebuild, pavuk-0.9.28-r4.ebuild:
+  Mark 0.9.28-r4 stable x86/ppc/sparc. Remove old versions.
+
+*pavuk-0.9.28-r4 (17 Aug 2004)
+
+  17 Aug 2004; Daniel Drake <dsd@gentoo.org> metadata.xml,
+  pavuk-0.9.28-r4.ebuild:
+  Gnome menu entry fix thanks to Peter Robb <peter@newproject.pl> in bug 60568.
+  Also cleaned up ebuild, and marked myself as maintainer (even though upstream
+  seems pretty dead).
+
+*pavuk-0.9.28-r3 (26 Jul 2004)
+
+  26 Jul 2004; <solar@gentoo.org> pavuk-0.9.28-r3.ebuild,
+  files/pavuk-0.9.28-digest_auth.c.patch:
+  another security fix, this time in the digest auth code. Note: This package
+  appears to be at high risk for security problems and may/should be removed
+  from the tree in the future
+
+  29 Jun 2004; <solar@gentoo.org> pavuk-0.9.28-r2.ebuild:
+  marked x86 ppc sparc stable
+
+*pavuk-0.9.28-r2 (29 Jun 2004)
+
+  29 Jun 2004; <solar@gentoo.org> metadata.xml, pavuk-0.9.28-r2.ebuild,
+  files/pavuk-0.9.28-http.patch:
+  Security update. When pavuk connects to a web server and the server sends back
+  the HTTP status code 305 (Use Proxy), pavuk copies data from the HTTP Location
+  header in an unsafe manner. This leads to a stack-based buffer overflow with
+  control over EIP.
+
+*pavuk-0.9.28-r1 (28 Nov 2003)
+
+  28 Nov 2003; <spider@gentoo.org> pavuk-0.9.28-r1.ebuild:
+  Attempting to fix the DEPEND entries.
 
 *pavuk-0.9.28 (10 Feb 2003)
 
diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
index e69de29bb2d1..63b5cf15028a 100644
--- a/net-misc/pavuk/Manifest
+++ b/net-misc/pavuk/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7f80757d2db657a9f51fb876b6057283 pavuk-0.9.32.ebuild 1386
+MD5 725c351bbd5c502888a9b5ace13888be ChangeLog 3477
+MD5 a1457284faaa66902037dcd2eaeab292 metadata.xml 245
+MD5 452e79ff147b4c40cfee016d4c88c3bc files/digest-pavuk-0.9.32 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCWERriJcSIUGNthERAiADAJwO9wMQ9N/psIcH5TvJzZEu4KxX8wCfT/ZR
+lM8j76gBnvEqhxoLGko96nQ=
+=bDZd
+-----END PGP SIGNATURE-----
diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
index fcd98e81bcd5..6618c1f6a285 100644
--- a/net-misc/pavuk/metadata.xml
+++ b/net-misc/pavuk/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>bug-wranglers@gentoo.org</email>
+	<email>dsd@gentoo.org</email>
+	<name>Daniel Drake</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/pavuk/pavuk-0.9.32.ebuild b/net-misc/pavuk/pavuk-0.9.32.ebuild
index 06f63110fcf3..1ec15ffa88a7 100644
--- a/net-misc/pavuk/pavuk-0.9.32.ebuild
+++ b/net-misc/pavuk/pavuk-0.9.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.32.ebuild,v 1.1 2005/04/05 21:09:36 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.32.ebuild,v 1.1.1.1 2005/11/30 09:55:09 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ssl X gnome mozilla socks5 nls"
+KEYWORDS="~amd64 ppc sparc x86"
+IUSE="ssl X gnome mozilla nls"
 
 DEPEND=">=sys-apps/sed-4
 	sys-devel/gettext
@@ -19,19 +19,18 @@ DEPEND=">=sys-apps/sed-4
 	ssl? ( dev-libs/openssl )
 	X? ( virtual/x11 )
 	gnome? ( gnome-base/gnome-libs )
-	mozilla? ( www-client/mozilla )
-	socks5? ( net-misc/tsocks )"
+	mozilla? ( www-client/mozilla )"
 
 src_compile() {
 	econf \
 		--enable-threads \
 		--with-regex=auto \
 		--disable-gtk \
+		--disable-socks \
 		$(use_with X x) \
 		$(use_enable ssl) \
 		$(use_enable gnome) \
 		$(use_enable mozilla js) \
-		$(use_enable socks5 socks) \
 		$(use_enable nls) \
 		|| die "econf failed"
 
@@ -47,7 +46,7 @@ src_install() {
 		sed -i 's:Type=Internet:Type=Application:' pavuk.desktop
 	fi
 
-	einstall || die
+	make install DESTDIR=${D}
 
 	dodoc README CREDITS FAQ NEWS AUTHORS BUGS \
 		TODO MAILINGLIST ChangeLog wget-pavuk.HOWTO jsbind.txt \
diff --git a/net-misc/pimpd/ChangeLog b/net-misc/pimpd/ChangeLog
index e52f7c2bb5af..f00a5ef3d6e4 100644
--- a/net-misc/pimpd/ChangeLog
+++ b/net-misc/pimpd/ChangeLog
@@ -1,11 +1,26 @@
 # ChangeLog for net-misc/pimpd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pimpd/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pimpd/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pimpd-0.8.ebuild:
+  Stable on ppc.
+
+  27 Jun 2004; David Holm <dholm@gentoo.org> pimpd-0.8.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pimpd-0.8 (27 Apr 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> pimpd-0.8.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
 
 *pimpd-0.5 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> pimpd-0.5.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
index e69de29bb2d1..e4942cbfebe9 100644
--- a/net-misc/pimpd/Manifest
+++ b/net-misc/pimpd/Manifest
@@ -0,0 +1,3 @@
+MD5 27007f9d13e09f48259605331260fe7c ChangeLog 1131
+MD5 6eb9ceddef39cbe6c2958dd39c6c3886 pimpd-0.8.ebuild 556
+MD5 5ce03e5c55f42e21eab7dad808af80a8 files/digest-pimpd-0.8 59
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
index c4905c8cdee9..07c1f27287c2 100644
--- a/net-misc/pimpd/pimpd-0.8.ebuild
+++ b/net-misc/pimpd/pimpd-0.8.ebuild
@@ -1,24 +1,21 @@
-# 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/net-misc/pimpd/pimpd-0.8.ebuild,v 1.1 2002/04/27 18:33:38 bangert Exp $
-# Updated to version 0.8 by Olivier Reisch on Fri Apr 26 11:44:26 CEST 2002
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pimpd/pimpd-0.8.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
-A=pimpd_0.8.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="pimpd is a (hopefully) RFC1413-compliant identd server supporting Linux 2.2.x masqueraded connections and Linux 2.4.x connection tracking for use with NAT."
-SRC_URI="http://cats.meow.at/~peter/${A}"
+DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
 HOMEPAGE="http://cats.meow.at/~peter/pimpd.html"
+SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ppc"
+IUSE=""
 
 src_compile() {
-    make CFLAGS="$CFLAGS" || die
+	make CFLAGS="$CFLAGS" || die
 }
 
-src_install () {
-
-   dosbin pimpd
-   dodoc README
-
+src_install() {
+	dosbin pimpd
+	dodoc README
 }
-
diff --git a/net-misc/pipes/ChangeLog b/net-misc/pipes/ChangeLog
index 2147daad6a1e..19c8ce49f1f2 100644
--- a/net-misc/pipes/ChangeLog
+++ b/net-misc/pipes/ChangeLog
@@ -1,8 +1,25 @@
-# ChangeLog for net-analyzer/pipes
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pipes/ChangeLog,v 1.1 2003/09/24 12:55:42 vapier Exp $
+# ChangeLog for net-misc/pipes
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pipes/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> pipes-1.16.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> pipes-1.16.ebuild:
+  change virtual/glibc to virtual/libc
+
+*pipes-1.16 (20 Feb 2004)
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> pipes-1.16.ebuild:
+  adding s390 keywords
+
+  20 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #41305 by Joel Yliluoma.
 
 *pipes-1.15 (22 Sep 2003)
 
+  03 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> pipes-1.15.ebuild:
+  depend on sed >= 4 for -i; more error checking/messages
+
   22 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by Joel Yliluoma <bisqwit@iki.fi> #28462.
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 0cca2aeded6a..608e80bfbed4 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,3 +1,4 @@
-MD5 a804c7202d00ece8dede77488419d5b7 ChangeLog 375
-MD5 c1af5165389c38a18b411b9e2195176f pipes-1.15.ebuild 678
-MD5 8f67f91e26e89260f8a7e59033eb88a4 files/digest-pipes-1.15 62
+MD5 21c0e1dcc3330bc2fe416e1c887f9c6b ChangeLog 890
+MD5 21e67bcc9560a4a9919c6e9ec8592c79 metadata.xml 1189
+MD5 46b7e0a1c7a304c4e0e9a18dc233c382 pipes-1.16.ebuild 818
+MD5 88d7fa1e4af2c00a7e54e9be42c0e1fc files/digest-pipes-1.16 62
diff --git a/net-misc/pipes/pipes-1.16.ebuild b/net-misc/pipes/pipes-1.16.ebuild
index 83cf425befa3..638ad0bb7c90 100644
--- a/net-misc/pipes/pipes-1.16.ebuild
+++ b/net-misc/pipes/pipes-1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pipes/pipes-1.16.ebuild,v 1.1 2004/02/21 04:57:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pipes/pipes-1.16.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DESCRIPTION="Very versatile TCP pipes"
 HOMEPAGE="http://bisqwit.iki.fi/source/pipes.html"
@@ -8,9 +8,10 @@ SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 s390 ~ppc"
+IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -29,8 +30,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin plis                         || die "dobin failed"
+	dobin plis || die "dobin failed"
 	dohard /usr/bin/plis /usr/bin/pcon || die "dohard failed"
-	dodoc Examples ChangeLog           || die "dodoc failed"
-	dohtml README.html                 || die "dohtml failed"
+	dodoc Examples ChangeLog
+	dohtml README.html
 }
diff --git a/net-misc/portfwd/ChangeLog b/net-misc/portfwd/ChangeLog
index baa8d96ce3ea..340460f4e4f0 100644
--- a/net-misc/portfwd/ChangeLog
+++ b/net-misc/portfwd/ChangeLog
@@ -1,9 +1,46 @@
 # ChangeLog for net-misc/portfwd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/ChangeLog,v 1.1 2003/10/17 20:42:05 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
+
+*portfwd-0.28 (12 Jul 2005)
+
+  12 Jul 2005; Jonathan Smith <smithj@gentoo.org> +portfwd-0.28.ebuild:
+  #98055: version bump
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> portfwd-0.26_rc6.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> portfwd-0.26_rc6.ebuild:
+  stable on ia64
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> portfwd-0.26.ebuild:
+  Added to ~ppc.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> portfwd-0.26.ebuild,
+  portfwd-0.26_rc6-r1.ebuild, portfwd-0.26_rc6.ebuild:
+  Add die following econf for bug 48950
+
+*portfwd-0.26 (14 Feb 2004)
+
+  14 Feb 2004; Adrian Almenar <strider@gentoo.org> portfwd-0.26.ebuild:
+  Version Bump to latest Stable Release.
+	
+  11 Dec 2003; Jon Portnoy <avenj@gentoo.org> files/portfwd.init :
+  Another fix, bug 33994.
+
+*portfwd-0.26_rc6-r1 (03 Dec 2003)
+
+  03 Dec 2003; Jon Portnoy <avenj@gentoo.org> portfwd-0.26_rc6.ebuild,
+  files/portfwd.init, files/portfwd.confd :
+  Lots more fixes from Alessandro Pisani. Bug #33994.
+  Changed init script to check for proper config, added conf.d file,
+  lots of init script fixes...
+
+  20 Nov 2003; Jon Portnoy <avenj@gentoo.org> files/portfwd.init :
+  Fixed init script, bug #33918.
 
 *portfwd-0.26_rc6 (17 Oct 2003)
 
-    17 Oct 2003; Jon Portnoy <avenj@gentoo.org> portfwd-0.26_rc6.ebuild :
-    Initial import. Submitted in bug 29930 by Cory Visi 
-    <cory@visi.name>.
+  17 Oct 2003; Jon Portnoy <avenj@gentoo.org> portfwd-0.26_rc6.ebuild :
+  Initial import. Submitted in bug 29930 by Cory Visi 
+  <cory@visi.name>.
diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest
index b88dc0b68332..5796803033c9 100644
--- a/net-misc/portfwd/Manifest
+++ b/net-misc/portfwd/Manifest
@@ -1,4 +1,21 @@
-MD5 bbca487388cbca9bde137a1501486b98 portfwd-0.26_rc6.ebuild 1371
-MD5 e924c392dcbb193a9c9df5b6a60a9f4a ChangeLog 311
-MD5 e6a3ab5f84df42432043801310f18bae files/portfwd.init 480
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8b8eee4b18556e15f2bc2a60f19fda93 ChangeLog 1631
+MD5 800884f7ac3c6ca781b99313b2f0cdb6 portfwd-0.26.ebuild 1557
+MD5 77be0277167ea42c6c758fc858529c89 portfwd-0.26_rc6-r1.ebuild 1568
+MD5 a202c2ace5e7604f357b1845dd71d441 portfwd-0.26_rc6.ebuild 1570
+MD5 dd7528c1cd12acd49b23a3036fc79f1c portfwd-0.28.ebuild 1555
+MD5 960ab2c321e4752e952e9878a8e5ae71 files/digest-portfwd-0.26 64
 MD5 3e26912825dccefb4a4474400d2c7eb6 files/digest-portfwd-0.26_rc6 67
+MD5 3e26912825dccefb4a4474400d2c7eb6 files/digest-portfwd-0.26_rc6-r1 67
+MD5 2e5d079e07d2511ef3695aa36140dc2f files/portfwd.confd 55
+MD5 ffc48b45008b806173e4a719e023b7c4 files/portfwd.init 887
+MD5 e3a4e5a369cb42583320a9755e28be58 files/digest-portfwd-0.28 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0yral5AvwDPiUowRApBwAKCEUbLjnKKdPqUH0HQzd9ut+p7IqwCgxxY/
+5BEWnFkQvTa50S6IlYSWJh8=
+=HKxt
+-----END PGP SIGNATURE-----
diff --git a/net-misc/portfwd/files/portfwd.init b/net-misc/portfwd/files/portfwd.init
index 14bfe71d4ff1..cd2a8aa846df 100644
--- a/net-misc/portfwd/files/portfwd.init
+++ b/net-misc/portfwd/files/portfwd.init
@@ -1,28 +1,39 @@
-# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/files/portfwd.init,v 1.1 2003/10/17 20:42:05 avenj Exp $
-
 #!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/files/portfwd.init,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /etc/portfwd.cnf ] ; then
-		eerror "You need an /etc/portfwd.cnf file first"
+	if [ ! -e /etc/portfwd.cfg ] ; then
+		eerror "You need an /etc/portfwd.cfg file first"
 		eerror "There are samples in the documentation directory"
 		return 1
 	fi
 }
 
 start() {
-	checkconfig || return 1
-	ebegin "Starting portfwd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/portfwd -- -t -f
-	eend $?
+    checkconfig || return 1
+    ebegin "Starting portfwd"
+    start-stop-daemon --start --quiet --pidfile /var/run/portfwd.pid --exec /usr/sbin/portfwd -- ${PORTFWD_OPTS}
+
+    _pid="`ps -C portfwd -o pid= | head -n 1`"
+    if [ -n "$_pid" ] ; then
+        echo "${_pid/ /}" > /var/run/portfwd.pid
+        eend 0
+    else
+        eend 1
+    fi
 }
 
 stop() {
-	ebegin "Stopping portfwd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/portfwd.pid
-	eend $?
+    ebegin "Stopping portfwd"
+    start-stop-daemon --stop --quiet --pidfile /var/run/portfwd.pid
+
+    if [ $? -eq 0 ]; then
+        rm -f /var/run/portfwd.pid
+    fi
+
+    eend $?
 }
diff --git a/net-misc/portfwd/portfwd-0.26.ebuild b/net-misc/portfwd/portfwd-0.26.ebuild
index 580e58d419e3..5770ccf67f81 100644
--- a/net-misc/portfwd/portfwd-0.26.ebuild
+++ b/net-misc/portfwd/portfwd-0.26.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-misc/portfwd/portfwd-0.26.ebuild,v 1.1 2004/02/14 06:16:54 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/portfwd-0.26.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 DESCRIPTION="Port Forwarding Daemon"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
@@ -8,7 +8,8 @@ HOMEPAGE="http://portfwd.sourceforge.net"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ia64 ~amd64"
+KEYWORDS="~x86 ~ia64 ~amd64 ~ppc"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
 RDEPEND=""
@@ -38,7 +39,7 @@ src_compile() {
 	cd ${WORKDIR}/${P/_/}
 
 	./bootstrap
-	econf
+	econf || die "econf failed"
 	emake
 }
 
diff --git a/net-misc/portfwd/portfwd-0.26_rc6-r1.ebuild b/net-misc/portfwd/portfwd-0.26_rc6-r1.ebuild
index e785d7b81cd8..b909b6b81d8d 100644
--- a/net-misc/portfwd/portfwd-0.26_rc6-r1.ebuild
+++ b/net-misc/portfwd/portfwd-0.26_rc6-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-misc/portfwd/portfwd-0.26_rc6-r1.ebuild,v 1.1 2003/12/03 21:22:18 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/portfwd-0.26_rc6-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 DESCRIPTION="Port Forwarding Daemon"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
@@ -9,6 +9,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~x86 ~ia64 ~amd64"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
 RDEPEND="${DEPEND}"
@@ -38,7 +39,7 @@ src_compile() {
 	cd ${WORKDIR}/${P/_/}
 
 	./bootstrap
-	econf
+	econf || die "econf failed"
 	emake
 }
 
diff --git a/net-misc/portfwd/portfwd-0.26_rc6.ebuild b/net-misc/portfwd/portfwd-0.26_rc6.ebuild
index e67aee5488f2..e0eff038636d 100644
--- a/net-misc/portfwd/portfwd-0.26_rc6.ebuild
+++ b/net-misc/portfwd/portfwd-0.26_rc6.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-misc/portfwd/portfwd-0.26_rc6.ebuild,v 1.1 2003/10/17 20:42:05 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/portfwd-0.26_rc6.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 DESCRIPTION="Port Forwarding Daemon"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
@@ -8,11 +8,11 @@ HOMEPAGE="http://portfwd.sourceforge.net"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ia64 ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	>=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -39,7 +39,7 @@ src_compile() {
 	cd ${WORKDIR}/${P/_/}
 
 	./bootstrap
-	econf
+	econf || die "econf failed"
 	emake
 }
 
@@ -54,10 +54,13 @@ src_install() {
 	insinto /etc/init.d
 	insopts -m0755
 	newins ${FILESDIR}/${PN}.init ${PN}
+
+	insinto /etc/conf.d
+	insopts -m0644
+	newins ${FILESDIR}/${PN}.confd ${PN}
 }
 
 pkg_postinst() {
 	einfo "Many configuration file (/etc/portfwd.cfg) samples are available in /usr/share/doc/${P}"
 	einfo
 }
-
diff --git a/net-misc/portfwd/portfwd-0.28.ebuild b/net-misc/portfwd/portfwd-0.28.ebuild
index 6a8874c44722..5831dc92934b 100644
--- a/net-misc/portfwd/portfwd-0.28.ebuild
+++ b/net-misc/portfwd/portfwd-0.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-misc/portfwd/portfwd-0.28.ebuild,v 1.1 2005/07/12 02:28:22 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/portfwd/portfwd-0.28.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 DESCRIPTION="Port Forwarding Daemon"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
diff --git a/net-misc/powerd/ChangeLog b/net-misc/powerd/ChangeLog
index 48a5a2f885a4..e1d117dceb32 100644
--- a/net-misc/powerd/ChangeLog
+++ b/net-misc/powerd/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/powerd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/powerd/ChangeLog,v 1.1 2003/08/02 20:34:45 iggy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/powerd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+  25 Mar 2005; <blubb@gentoo.org> powerd-2.0.2.ebuild:
+  added ~amd64
+
+  16 Jul 2004; Rob Holland <tigger@ereet.co.uk> powerd-2.0.2.ebuild:
+  Fix ebuild to included man page and all the docs. Closes #35734. Thanks to
+  kevin_w69@hotmail.com and cumagyar@mts.net
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> powerd-2.0.2.ebuild:
+  qa fixes
+
+  29 Sep 2003; <iggy@gentoo.org> files/powerd-init:
+  fix the init script, thanks to Ryan Finnie
 
 *powerd-2.0.2 (02 Aug 2003)
 
diff --git a/net-misc/powerd/Manifest b/net-misc/powerd/Manifest
index ba983f2753bb..688ce510501a 100644
--- a/net-misc/powerd/Manifest
+++ b/net-misc/powerd/Manifest
@@ -1,3 +1,14 @@
-MD5 00535257ae90d87ec7cc2903fcc071e7 powerd-2.0.2.ebuild 918
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e484a3dd9c925bec610d046718939169 ChangeLog 857
 MD5 e04b3f1b7350599bef3b1266737389a5 files/digest-powerd-2.0.2 63
-MD5 bd02a31b26f2752f9d828738ce04fe04 files/powerd-init 333
+MD5 4d1225e94ad30f939205ca527ca50854 files/powerd-init 397
+MD5 142a0e4b3b04953085ae476bf897773a powerd-2.0.2.ebuild 958
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68ThI1lqEGTUzyQRAiDGAJ9ZulOWGo2HPz+G22tzUfwUfOZD8ACfVrM3
+SSGYL5CZT1ZCBHcptdEIbJY=
+=RE7K
+-----END PGP SIGNATURE-----
diff --git a/net-misc/powerd/files/powerd-init b/net-misc/powerd/files/powerd-init
index 484277603ba0..dcaf8e0ec37e 100644
--- a/net-misc/powerd/files/powerd-init
+++ b/net-misc/powerd/files/powerd-init
@@ -1,10 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	after local
-}
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/powerd/files/powerd-init,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 start() {
 	ebegin "Starting powerd"
@@ -17,4 +14,3 @@ stop() {
 	killall powerd
 	eend $?
 }
-
diff --git a/net-misc/powerd/powerd-2.0.2.ebuild b/net-misc/powerd/powerd-2.0.2.ebuild
index 62b137fca40a..f9a347d399a5 100644
--- a/net-misc/powerd/powerd-2.0.2.ebuild
+++ b/net-misc/powerd/powerd-2.0.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
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-misc/powerd/powerd-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="Generic UPS daemon"
 HOMEPAGE="http://power.sourceforge.net/"
 
-S=${WORKDIR}/${P}
-SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/power/${P}.tar.gz"
-KEYWORDS="x86"
+SRC_URI="mirror://sourceforge/power/${P}.tar.gz"
+KEYWORDS="x86 ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-src_unpack() {
-	unpack ${A} || die
-}
-
 src_compile() {
-	cd ${S}
 	./configure --prefix=${D}
 	emake || die
 }
@@ -26,10 +20,10 @@ src_compile() {
 src_install() {
 	dosbin powerd
 	dobin detectups
-	dodoc powerd.conf.monitor powerd.conf.peer README FAQ INSTALL
-	
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/powerd-init powerd
+	dodoc powerd.conf.monitor powerd.conf.peer README FAQ INSTALL SUPPORTED TODO Changelog
+	doman powerd.8 detectups.8
+
+	newinitd ${FILESDIR}/powerd-init powerd
 }
 
 pkg_postinst() {
diff --git a/net-misc/proxychains/ChangeLog b/net-misc/proxychains/ChangeLog
index 3721014efa3f..68dbc25a848c 100644
--- a/net-misc/proxychains/ChangeLog
+++ b/net-misc/proxychains/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-misc/proxychains
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.1 2004/03/13 00:51:47 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/ChangeLog,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
+
+  29 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/proxychains-2.1-autotools.patch, proxychains-2.1-r2.ebuild:
+  Cleanup autotools #91677.
+
+*proxychains-2.1-r2 (19 Apr 2005)
+
+  19 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  files/proxychains-2.1-libc-connect.patch, +proxychains-2.1-r2.ebuild:
+  Unbreak proxychains #89464 by Cliff Barnes.
+
+*proxychains-2.1-r1 (12 Mar 2005)
+
+  12 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/proxychains-2.1-libc-connect.patch, +proxychains-2.1-r1.ebuild:
+  Fix ugly connect() hacks.
+
+  06 Nov 2004; <pyrania@gentoo.org> proxychains-1.8.2.ebuild,
+  proxychains-2.1.ebuild:
+  Marked stable on x86.
+
+*proxychains-2.1 (30 Aug 2004)
+
+  30 Aug 2004; Mike Frysinger <vapier@gentoo.org> +proxychains-2.1.ebuild:
+  Version bump #61768 by Vasiliev Michael.
 
 *proxychains-1.8.2 (12 Mar 2004)
 
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index 34f254367eda..2b118bf6bdc5 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,3 +1,16 @@
-MD5 96685b8dbf1b08a2fa0e981d1088e130 files/digest-proxychains-1.8.2 69
-MD5 f40e95aaa293fb66b62d23f4cc760622 proxychains-1.8.2.ebuild 659
-MD5 708516fad6586ce00cd0a6f7faa12a2a ChangeLog 368
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4ef70dcf883dcbb7992ef179282f1ca5 ChangeLog 1162
+MD5 4cebebd00e1b468ed723ce38470e87e8 files/digest-proxychains-2.1-r2 67
+MD5 1c061d1b2cf15c31098b00f930145f11 files/proxychains-2.1-autotools.patch 2198
+MD5 31f74f67a6811847c3b733a8ee3595c3 files/proxychains-2.1-libc-connect.patch 294
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 7ebce22a77ec6ee78d053fc5532410e9 proxychains-2.1-r2.ebuild 1271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDY0GRgIKl8Uu19MoRAl8nAJ9iJKf7/C8186NcjQnaHz/2ObWJIQCfWJwZ
+RZmUDIb1BCw28+OcgvsglDE=
+=dGal
+-----END PGP SIGNATURE-----
diff --git a/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch b/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch
index 7f9bb98cc4d9..3751de4c164d 100644
--- a/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch
+++ b/net-misc/proxychains/files/proxychains-2.1-libc-connect.patch
@@ -1,16 +1,12 @@
+This is an ugly hax, but it's what upstream does, so i don't really care
+to try and 'fix' it.
+
 --- proxychains-2.1/proxychains/core.h
 +++ proxychains-2.1/proxychains/core.h
-@@ -65,11 +65,9 @@
- 
- int proxychains_write_log(char *str,...);
- 
--#ifndef __linux__
--#define __libc_connect _connect
--#endif
-+#include <sys/socket.h>
-+#define __libc_connect connect
- 
--extern int __libc_connect (int sock, const struct sockaddr *addr, unsigned int len);
- 
- 
+@@ -68,4 +68,6 @@
+ #ifndef __linux__
+ #define __libc_connect _connect
++#else
++#define __libc_connect __connect
  #endif
+ 
diff --git a/net-misc/proxychains/proxychains-2.1-r2.ebuild b/net-misc/proxychains/proxychains-2.1-r2.ebuild
index fff7979549c5..a7745060299d 100644
--- a/net-misc/proxychains/proxychains-2.1-r2.ebuild
+++ b/net-misc/proxychains/proxychains-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/net-misc/proxychains/proxychains-2.1-r2.ebuild,v 1.1 2005/04/19 22:12:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-2.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
 
 # This doesn't seem to be 64bit clean ... on amd64 for example,
 # trying to do `proxychains telnet 192.168.0.77` will attempt to 
@@ -24,9 +24,13 @@ DEPEND=""
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
-	sed -i 's:/etc/:$(DESTDIR)/etc/:' proxychains/Makefile.in || die
+	sed -i 's:/etc/:$(DESTDIR)/etc/:' proxychains/Makefile.am || die
 	epatch "${FILESDIR}"/${P}-libc-connect.patch
-	touch *
+
+	# bundled timestamps/autotools are all busted so rebuild
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	rm acconfig.h *.m4
+	aclocal && autoheader && libtoolize -c -f && autoconf && automake || die "autotools failed"
 }
 
 src_install() {
diff --git a/net-misc/ptrtd/ChangeLog b/net-misc/ptrtd/ChangeLog
index 448576a06fef..2c5f7ed9c9be 100644
--- a/net-misc/ptrtd/ChangeLog
+++ b/net-misc/ptrtd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/ptrtd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/ChangeLog,v 1.1 2003/05/31 19:34:44 latexer Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> ptrtd-0.5.2.ebuild:
+  Added to ~ppc.
 
 *ptrtd-0.5.2 (31 May 2003)
 
diff --git a/net-misc/ptrtd/Manifest b/net-misc/ptrtd/Manifest
index 29fc6f132f3e..b0bc63a9441d 100644
--- a/net-misc/ptrtd/Manifest
+++ b/net-misc/ptrtd/Manifest
@@ -1,4 +1,15 @@
-MD5 a904c4699c7417c5b6e42414d1aa2240 ptrtd-0.5.2.ebuild 1018
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1f861ceda638a89c0e1b2d74ed150696 ChangeLog 480
 MD5 2bf2484cf9bc9fb2d9d22e3a2079b4ba files/digest-ptrtd-0.5.2 62
-MD5 c79a7bb803eea5025cce1cfd7c1009c1 files/ptrtd.confd 295
-MD5 86671045b66e3358d9376d708312dbc7 files/ptrtd.initd 667
+MD5 9569d7878b02ed7917f13f2713dc0166 files/ptrtd.confd 383
+MD5 8d040162995360c626e14c2acec32613 files/ptrtd.initd 755
+MD5 40ceee5f15cf85ea235ae5556fc2e2f7 ptrtd-0.5.2.ebuild 934
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68WyI1lqEGTUzyQRAvyXAJwMuLflp2a0tvM4XzYj4vAo7vaT7QCdHhq1
+iZX+DIIJL8vpHi4GXizVYj8=
+=5CG8
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ptrtd/files/ptrtd.confd b/net-misc/ptrtd/files/ptrtd.confd
index e3a9df79809e..c81e6afb0f02 100644
--- a/net-misc/ptrtd/files/ptrtd.confd
+++ b/net-misc/ptrtd/files/ptrtd.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/files/ptrtd.confd,v 1.1 2003/05/31 19:34:44 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/files/ptrtd.confd,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 
 # Config file for ptrtd
diff --git a/net-misc/ptrtd/files/ptrtd.initd b/net-misc/ptrtd/files/ptrtd.initd
index 423297daf3bc..40b82d2d892f 100644
--- a/net-misc/ptrtd/files/ptrtd.initd
+++ b/net-misc/ptrtd/files/ptrtd.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
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/files/ptrtd.initd,v 1.1 2003/05/31 19:34:44 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/files/ptrtd.initd,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 # Init script for the ptrtd daemon.
 # 
diff --git a/net-misc/ptrtd/ptrtd-0.5.2.ebuild b/net-misc/ptrtd/ptrtd-0.5.2.ebuild
index c53ee73331ef..f1ae5fb045c8 100644
--- a/net-misc/ptrtd/ptrtd-0.5.2.ebuild
+++ b/net-misc/ptrtd/ptrtd-0.5.2.ebuild
@@ -1,44 +1,29 @@
-# 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-misc/ptrtd/ptrtd-0.5.2.ebuild,v 1.1 2003/05/31 19:34:44 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ptrtd/ptrtd-0.5.2.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 DESCRIPTION="Portable Transport Relay Translator Daemon for IPv6"
-
-HOMEPAGE="http://v6web.litech.org/ptrtd"
-
+HOMEPAGE="http://v6web.litech.org/ptrtd/"
 SRC_URI="http://v6web.litech.org/ptrtd/dist/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
-KEYWORDS="~x86"
 DEPEND=""
-RDEPEND="sys-apps/iproute"
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv -f Makefile.in ${T}
-	sed -e "s:-Wall -g:-Wall ${CFLAGS}:" \
-		${T}/Makefile.in > Makefile.in
-}
+RDEPEND="sys-apps/iproute2"
 
 src_compile() {
-	econf || die
-	emake || die
+	econf || die "econf failed"
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
 	einstall || die
 
-	dodir /etc/init.d
-	dodir /etc/conf.d
-
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/ptrtd.initd ptrtd
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/ptrtd.confd ptrtd
+	newinitd ${FILESDIR}/ptrtd.initd ptrtd
+	newconfd ${FILESDIR}/ptrtd.confd ptrtd
 
 	dodoc README
 }
diff --git a/net-misc/puf/ChangeLog b/net-misc/puf/ChangeLog
index 75b750117fb3..5380b1547757 100644
--- a/net-misc/puf/ChangeLog
+++ b/net-misc/puf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/puf
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/puf/ChangeLog,v 1.1 2003/06/25 21:40:07 mholzer Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/puf/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> puf-0.93.2a.ebuild:
+  change virtual/glibc to virtual/libc
 
 *puf-0.93.2a (25 Jun 2003)
 
diff --git a/net-misc/puf/Manifest b/net-misc/puf/Manifest
index 74a899d18c08..be333caa16f9 100644
--- a/net-misc/puf/Manifest
+++ b/net-misc/puf/Manifest
@@ -1,2 +1,3 @@
-MD5 a675e1575a88555c9e93ddf0bbba2adc puf-0.93.2a.ebuild 493
+MD5 8b39bdcd12c3d5a2d5888d938ec6335b puf-0.93.2a.ebuild 561
+MD5 bc6313c94f609274872da59d6b3607ce ChangeLog 459
 MD5 d78942f364432f010119190de762d218 files/digest-puf-0.93.2a 63
diff --git a/net-misc/puf/puf-0.93.2a.ebuild b/net-misc/puf/puf-0.93.2a.ebuild
index 2f508a39e734..7f896047a9fa 100644
--- a/net-misc/puf/puf-0.93.2a.ebuild
+++ b/net-misc/puf/puf-0.93.2a.ebuild
@@ -1,12 +1,12 @@
-# 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-misc/puf/puf-0.93.2a.ebuild,v 1.1 2003/06/25 21:40:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/puf/puf-0.93.2a.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DESCRIPTION="A download tool for UNIX-like systems."
 SRC_URI="mirror://sourceforge/puf/${P}.tar.gz"
 HOMEPAGE="http://puf.sourceforge.net/"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 IUSE=""
 SLOT="0"
diff --git a/net-misc/putty/ChangeLog b/net-misc/putty/ChangeLog
index fed7007341be..aeab0db11740 100644
--- a/net-misc/putty/ChangeLog
+++ b/net-misc/putty/ChangeLog
@@ -1,6 +1,122 @@
 # ChangeLog for net-misc/putty
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/ChangeLog,v 1.1 2003/06/03 15:57:53 taviso Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/ChangeLog,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> putty-0.58.ebuild:
+  Mark 0.58 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> putty-0.58.ebuild:
+  Stable on ppc.
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> putty-0.58.ebuild:
+  Stable on sparc
+
+  31 Aug 2005; Luis Medinas <metalgod@gentoo.org> putty-0.58.ebuild:
+  Marked Stable on AMD64.
+
+*putty-0.58 (21 Aug 2005)
+
+  21 Aug 2005; Tavis Ormandy <taviso@gentoo.org> +putty-0.58.ebuild:
+  bump
+
+  21 Aug 2005; Tavis Ormandy <taviso@gentoo.org> putty-0.57.ebuild:
+  fix #103268
+
+  21 Aug 2005; Tavis Ormandy <taviso@gentoo.org> putty-0.57.ebuild:
+  fix #44836
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> putty-0.57.ebuild:
+  Stable on ppc.
+
+  22 Feb 2005; Simon Stelling <blubb@gentoo.org> putty-0.57.ebuild:
+  stable on amd64 wrt bug #82753
+
+*putty-0.57 (21 Feb 2005)
+
+  21 Feb 2005; Tavis Ormandy,,, <taviso@gentoo.org> +putty-0.57.ebuild:
+  security bump, #82753
+
+  16 Dec 2004; Jason Huebel <jhuebel@gentoo.org> putty-0.56.ebuild:
+  removed ut_time patch from 0.56, bug #69411
+
+*putty-0.56 (27 Oct 2004)
+
+  27 Oct 2004; Tavis Ormandy <taviso@gentoo.org> -putty-0.54.ebuild,
+  -putty-0.54_pre1.ebuild, -putty-0.55.ebuild, +putty-0.56.ebuild:
+  fixing #69123
+
+*putty-0.55 (04 Aug 2004)
+
+  04 Aug 2004; Tavis Ormandy <taviso@gentoo.org> +putty-0.55.ebuild:
+  0.55 bumped to stable for security #59383, old ebuilds removed.
+
+  01 Jun 2004; Tavis Ormandy <taviso@gentoo.org> putty-0.54.ebuild:
+  include puttygen binary
+
+*putty-0.54_pre1 (01 Jun 2004)
+
+  01 Jun 2004; Tavis Ormandy <taviso@gentoo.org> putty-0.54.ebuild,
+  putty-0.54_pre1.ebuild, putty-20030902-r1.ebuild, putty-20040313.ebuild:
+  upstream made a unix release, starting at 0.54 which breaks previous
+  versioning system based on snapshot dates. 
+  Removed old ebuilds, 20040313-r1 is marked stable and becomes 0.54_pre1.
+  0.54 is added and masked.
+  Fixes #52710.
+
+  07 May 2004; Jason Eric Huebel <jhuebel@gentoo.org>
+  +files/putty-ut_time.patch, putty-20040313-r1.ebuild:
+  ~amd64 and added ut_time patch for amd64
+
+*putty-20040313-r1 (06 May 2004)
+
+  06 May 2004; Tavis Ormandy <taviso@gentoo.org> putty-20040313-r1.ebuild,
+  files/putty.desktop:
+  Thanks to Gustav Schaffter in #49577, putty will now appear in the
+  gnome applications menu.
+
+  17 Apr 2004; Tavis Ormandy <taviso@gentoo.org> putty-20040313.ebuild:
+  stable on x86
+
+  23 Mar 2004; Jason Wever <weeve@gentoo.org> putty-20040313.ebuild:
+  Added ~sparc keyword.
+
+*putty-20040313 (14 Mar 2004)
+
+  14 Mar 2004; David Holm <dholm@gentoo.org> putty-20040313.ebuild:
+  Added to ~ppc.
+
+  13 Mar 2004; Tavis Ormandy <taviso@gentoo.org> :
+  new snapshot, i'll use bzip2 instead of gzip.
+
+  29 Oct 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030902-r1.ebuild:
+  code cleanups, moving makefile generation into src_unpack()
+
+  07 Oct 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030603.ebuild,
+  putty-20030902-r1.ebuild, putty-20030902.ebuild:
+  stable on x86/alpha.
+  removing stale ebuilds.
+
+*putty-20030902-r1 (13 Sep 2003)
+
+  13 Sep 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030902-r1.ebuild:
+  including pscp and psftp
+
+  13 Sep 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030902.ebuild:
+  stable
+
+*putty-20030902 (02 Sep 2003)
+
+  02 Sep 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030902.ebuild:
+  updates from cvs.
+
+  22 Jun 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030603.ebuild:
+  adding a warning about unix98 pty's and pterm 
+  marking stable
+
+  14 Jun 2003; Tavis Ormandy <taviso@gentoo.org> putty-20030603.ebuild:
+  Fix some typos, minor tweaks, and some more informational messages.
+
+  added a doc USE flag.
 
 *putty-20030603 (03 Jun 2003)
 
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 88bd1bfc7809..e4a5b68266f9 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,8 @@
-MD5 ecea3626f3b38d9094d7ac8dca02613c putty-20030603.ebuild 1090
-MD5 bcc49e4648a2fa3b47fb42141928e0e0 files/digest-putty-20030603 70
+MD5 a95f430323d2b9413a9ae45efb4d616c metadata.xml 549
+MD5 f8055c420e2b54d2f78282bda83302a6 ChangeLog 4031
+MD5 4a383beb375f4954b2af0c9d53acfc22 putty-0.57.ebuild 1820
+MD5 bcab81a96ca9ada6ae9d34713b83fe06 putty-0.58.ebuild 1554
+MD5 3a07269379d199e6363fbe0250c5899a files/digest-putty-0.57 63
+MD5 7c38293f57fa00b6d687477113f0625b files/digest-putty-0.58 63
+MD5 4f674a5fd23877ac6d76c6d9baa33041 files/putty-ut_time.patch 824
+MD5 85355228c88a7a925e751df0f058f0ea files/putty.desktop 207
diff --git a/net-misc/putty/putty-0.57.ebuild b/net-misc/putty/putty-0.57.ebuild
index 624fac451c18..2c4131e1a235 100644
--- a/net-misc/putty/putty-0.57.ebuild
+++ b/net-misc/putty/putty-0.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/net-misc/putty/putty-0.57.ebuild,v 1.1 2005/02/21 08:39:08 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.57.ebuild,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
 inherit eutils
 
@@ -11,49 +11,64 @@ SRC_URI="http://the.earth.li/~sgtatham/putty/latest/${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="x86 ~alpha ~ppc ~sparc ~amd64"
-IUSE="doc"
+KEYWORDS="x86 alpha ppc ~sparc amd64"
+IUSE="doc gtk"
 
-RDEPEND="=x11-libs/gtk+-1.2* virtual/x11"
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* virtual/x11 )"
 
 DEPEND="${RDEPEND} dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
-
 	ebegin "Generating Makefiles"
-	cd ${S}; perl ${S}/mkfiles.pl || die
+		cd ${S}; perl ${S}/mkfiles.pl || die
 	eend $?
 
 	ebegin "Setting CFLAGS"
-	sed -i "s!-O2!${CFLAGS}!g" ${S}/unix/Makefile.gtk
+		# bug #103268
+		sed -i "s/-Werror//" ${S}/unix/Makefile.gtk
+		sed -i "s!-O2!${CFLAGS}!g" ${S}/unix/Makefile.gtk
+		# bug #44836
+		# prevent gtk-config from being used without gtk
+		if ! use gtk; then
+			sed -i "s/gtk-config/true/g" ${S}/unix/Makefile.gtk
+		fi
 	eend $?
 }
 
 src_compile() {
-	cd ${S}/unix; emake -f Makefile.gtk || die "make failed"
+	cd ${S}/unix
+
+	# compile all targets if gtk is required, otherwise
+	# just non-X utilities.
+	if use gtk; then
+		emake -f Makefile.gtk
+	else
+		emake -f Makefile.gtk puttygen plink pscp psftp
+	fi
 }
 
 src_install() {
 	cd ${S}/doc
-
-	doman plink.1 pterm.1 putty.1 puttytel.1 puttygen.1
+	use gtk && doman pterm.1 putty.1 puttytel.1
+	doman puttygen.1 plink.1
 
 	cd ${S}/unix
-
-	dobin plink pterm putty puttytel psftp pscp puttygen
+	use gtk && dobin pterm putty puttytel
+	dobin puttygen plink pscp psftp
 
 	cd ${S}
-
-	dodoc README README.txt LICENCE CHECKLST.txt LATEST.VER website.url MODULE
+	dodoc README README.txt LICENCE CHECKLST.txt LATEST.VER website.url
 	use doc && dodoc doc/*
 
 	prepallman
 
 	# install desktop file provided by Gustav Schaffter in #49577
-	dodir /usr/share/applications
-	insinto /usr/share/applications
-	doins ${FILESDIR}/putty.desktop
+	use gtk && {
+		dodir /usr/share/applications
+		insinto /usr/share/applications
+		doins ${FILESDIR}/putty.desktop
+	}
 
 	if test ! -c /dev/ptmx; then
 		ewarn
diff --git a/net-misc/putty/putty-0.58.ebuild b/net-misc/putty/putty-0.58.ebuild
index 608c9b830718..d46f2599b5da 100644
--- a/net-misc/putty/putty-0.58.ebuild
+++ b/net-misc/putty/putty-0.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.58.ebuild,v 1.1 2005/08/21 19:11:51 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/putty/putty-0.58.ebuild,v 1.1.1.1 2005/11/30 09:55:16 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -10,14 +10,14 @@ SRC_URI="http://the.earth.li/~sgtatham/putty/${PV}/${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="doc gtk ipv6"
 
 RDEPEND="gtk? ( =x11-libs/gtk+-1.2* virtual/x11 )"
 DEPEND="${RDEPEND} dev-lang/perl"
 
 src_compile() {
-	use gtk || local targets="puttygen plink pscp psftp"
+	use gtk || local ptargets="puttygen plink pscp psftp"
 	cd ${S}/unix
 
 	append-flags '-I.././' '-I../charset/' '-I../unix/'
@@ -25,7 +25,7 @@ src_compile() {
 	use ipv6 || append-flags '-DNO_IPV6'
 	use gtk  && append-flags '`gtk-config --cflags`'
 
-	emake -f Makefile.gtk ${targets:-all} CC="$(tc-getCC)" \
+	emake -f Makefile.gtk ${ptargets:-all} CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}"
 }
 
diff --git a/net-misc/pxes/ChangeLog b/net-misc/pxes/ChangeLog
index 7f91a2096ec8..cad2bf9a0d99 100644
--- a/net-misc/pxes/ChangeLog
+++ b/net-misc/pxes/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for net-misc/pxes
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/ChangeLog,v 1.1 2003/08/03 00:05:03 wolf31o2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+  23 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild,
+  pxes-0.7.ebuild, pxes-0.8.ebuild, pxes-0.9.ebuild, pxes-0.9-r1.ebuild,
+  pxes-1.0.ebuild:
+  cp -a -> cp -pPR for bug #103487.
+
+  18 May 2005; Sven Wegener <swegener@gentoo.org> pxes-0.6-r4.ebuild,
+  pxes-0.7.ebuild, pxes-0.8.ebuild, pxes-0.9.ebuild, pxes-0.9-r1.ebuild,
+  pxes-1.0.ebuild:
+  Moved inherit to the top to stop eclasses from overwriting the DESCRIPTION.
+
+*pxes-0.9-r1 (18 May 2005)
+
+  18 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> +pxes-0.9-r1.ebuild:
+  Updated ebuild to check for gtk-perl built_with_use gnome and also to
+  symlink mksquashfs. Closing bugs #46732 and #46874.
+
+*pxes-1.0 (18 May 2005)
+
+  18 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> +pxes-1.0.ebuild:
+  Initial PXES 1.0 ebuild.
+
+  08 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.9.ebuild:
+  Marking stable on amd64.
+
+  15 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.9.ebuild:
+  Removed cpio symlink and closing bug #78122.
+
+  10 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.9.ebuild:
+  Marking stable on x86 and marking ~amd64.
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> pxes-0.6-r4.ebuild,
+  pxes-0.7.ebuild, pxes-0.8.ebuild, pxes-0.9.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+  24 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.9.ebuild:
+  QA Cleanup and closing bug #56480.
+
+  16 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild,
+  pxes-0.7.ebuild, pxes-0.8.ebuild, pxes-0.9.ebuild:
+  Fixed dohtml
+
+*pxes-0.9 (16 Aug 2004)
+
+  16 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org> +pxes-0.9.ebuild:
+  Added latest version.
+
+  29 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.7.ebuild,
+  pxes-0.8.ebuild:
+  Fixing broken usage of perl-modules.eclass and closing bug #49884. Thanks,
+  mcummings
+
+  04 Jun 2004; Daniel Black <dragonheart@gentoo.org> pxes-0.8.ebuild:
+  sys-apps/squashfs-tools dependancy moved to sys-fs
+
+  12 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.8.ebuild:
+  Moving 0.8 to x86 and closing bug #49884.
+
+  03 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.8.ebuild:
+  Added squashfs-tools RDEPEND.
+
+*pxes-0.8 (03 Apr 2004)
+
+  03 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.8.ebuild:
+  Adding pxes-0.8 ebuild and closing bugs #32794 and #46639.
+
+  01 Mar 2004; Michael Cummings <mcummings@gentoo.org> pxes-0.7.ebuild:
+  Fixed calls to perl-modules eclass. This resolves the sandbox violation of bug
+  31134.
+
+  06 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.7.ebuild:
+  Marking stable on x86.
+
+*pxes-0.7 (20 Nov 2003)
+
+  20 Nov 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.7.ebuild:
+  Bumped to version 0.7 for ~x86
+
+  05 Nov 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild:
+  Adding cdr USE flag per bug #32794.
+
+  18 Oct 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild:
+  Added HOMEPAGE.  Closing bug #31389.
+
+  15 Oct 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6.ebuild:
+  Removing old version
+
+  07 Oct 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild:
+  Closing bug #28677 and bumping to stable on x86
+
+*pxes-0.6-r4 (25 Aug 2003)
+
+  25 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild,
+  pxes-0.6.ebuild:
+  Marked as stable
+
+*pxes-0.6-r4 (25 Aug 2003)
+
+  25 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org> pxes-0.6-r4.ebuild:
+  Bumped to latest version
 
   02 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org> files/makedevices.sh,
   files/pxes-0.6-gentoo.patch:
diff --git a/net-misc/pxes/Manifest b/net-misc/pxes/Manifest
index 444b8ee2b1a3..3e428da898a7 100644
--- a/net-misc/pxes/Manifest
+++ b/net-misc/pxes/Manifest
@@ -1,4 +1,15 @@
-MD5 dedff419843b05c7840601c25c349c27 pxes-0.6.ebuild 1600
-MD5 6b2dccca06359d913eaa2caa9215505c files/pxes-0.6-gentoo.patch 418
+MD5 aae440be3fee9a9b5d962256b9edfad7 ChangeLog 3820
+MD5 dc3371c7348c1a1e429a032198b6db20 metadata.xml 645
+MD5 3de6f8ae27cd8e30b5f410525fc5e999 pxes-0.6-r4.ebuild 1389
+MD5 0ef0193ffb1b5256e85243bb03a998fb pxes-0.7.ebuild 1471
+MD5 9276779941a5eb757c9310008726a5ac pxes-0.8.ebuild 1266
+MD5 c643df1054b9b598fb0599cabf850666 pxes-0.9.ebuild 1357
+MD5 9462363c459b8bdd5e70bac421f1c8a1 pxes-1.0.ebuild 1726
+MD5 5869e17151d572133bda647b9d2ef131 pxes-0.9-r1.ebuild 1745
+MD5 cd62bae9012dcfb2741b0d78ab20dd5b files/digest-pxes-1.0 142
+MD5 1708574c57ea3dbb43faa2a5abe17a5d files/digest-pxes-0.6-r4 206
+MD5 587792f4ed87b201b12047186b3c19c4 files/digest-pxes-0.7 208
+MD5 b491b02f1152ab8f37c398206f16cbfd files/digest-pxes-0.8 142
+MD5 c26357ce69d1a5de2b37834c63e91833 files/digest-pxes-0.9 142
 MD5 f3afb0ef2357d69147125eeb6cda6c43 files/makedevices.sh 1626
-MD5 ad26896c5d4dcf2cfd959cd80e7c8417 files/digest-pxes-0.6 256
+MD5 c26357ce69d1a5de2b37834c63e91833 files/digest-pxes-0.9-r1 142
diff --git a/net-misc/pxes/metadata.xml b/net-misc/pxes/metadata.xml
index ce3afecb7322..9443d29093d5 100644
--- a/net-misc/pxes/metadata.xml
+++ b/net-misc/pxes/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>noherd</herd>
+<herd>no-herd</herd>
 <maintainer>
   <email>wolf31o2@gentoo.org</email>
   <name>Chris Gianelloni</name>
diff --git a/net-misc/pxes/pxes-0.6-r4.ebuild b/net-misc/pxes/pxes-0.6-r4.ebuild
index 330b89982fdb..cc999efb593e 100644
--- a/net-misc/pxes/pxes-0.6-r4.ebuild
+++ b/net-misc/pxes/pxes-0.6-r4.ebuild
@@ -1,66 +1,61 @@
-# Copyright 1999-2003 Gentoo Technologues, Inc.
-# Distrbuted under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.6-r4.ebuild,v 1.1 2003/08/25 14:46:38 wolf31o2 Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.6-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
-IUSE="ltsp"
+inherit perl-module
+
+IUSE="cdr ltsp"
 DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
+HOMEPAGE="http://pxes.sourceforge.net"
 SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${PV}-4.tar.gz
 	mirror://sourceforge/pxes/pxesconfig-${PV}-4.tar.gz
 	ltsp? ( mirror://sourceforge/pxes/${PN}-ltsp-${PV}.tar.gz )"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=dev-lang/perl-5.8.0-r12
-	ltsp? >=net-misc/ltsp-core-3.0.9-r1"
+	ltsp? ( >=net-misc/ltsp-3.0.9-r1 )"
+
 RDEPEND="${DEPEND}
-	>=dev-perl/glade-perl-0.61"
+	dev-perl/gtk-perl
+	>=dev-perl/glade-perl-0.61
+	cdr? ( app-cdr/cdrtools )"
 
-S=${WORKDIR}/${P}
-
-inherit perl-module
+RESTRICT="nouserpriv"
 
 dir=/opt/${P}
 Ddir=${D}/${dir}
 
 src_unpack() {
-	tar -xzf ${DISTDIR}/${PN}-base-i586-${PV}-4.tar.gz \
-	--no-same-permissions \
-	--exclude=pxes-0.6/stock/dist/dev/* \
-	--exclude=pxes-0.6/stock/initrd/dev/* || die "unpacking base"
-	
-	tar -xzf ${DISTDIR}/${PN}config-${PV}-4.tar.gz \
-	--no-same-permissions \
-	--exclude=pxesconfig-0.6/lib \
-	--exclude=pxesconfig-0.6/MANIFEST || die "unpacking config"
+	unpack ${A}
 
 	use ltsp && unpack ${PN}-ltsp-${PV}.tar.gz
 }
 
 src_compile() {
 	cd ${WORKDIR}/pxesconfig-${PV}
-#	perl Makefile.PL || die
-#	make
 	perl-module_src_compile || die
 }
 
 src_install() {
 	dodir ${dir}
-	cp -r ${S}/stock ${Ddir}
-	cp -r ${S}/tftpboot ${D}
+	cp -pPR ${S}/stock ${Ddir}
+	cp -pPR ${S}/tftpboot ${D}
 	dodoc Documentation/ChangeLog
-	dohtml Documentation/html/{index,pxe,readme,screenshots}.html,howto/{configuring_ICA,customizing_kernel_and_modules,gdm,xfs,ms_only_environment/ms_only_environment}.html
+	dohtml -r Documentation/html/*
 	exeinto ${dir}
 	doexe ${FILESDIR}/makedevices.sh
 	cd ${WORKDIR}/pxesconfig-${PV}
 	perl-module_src_install || die
+	dosym /usr/bin/cpio /bin/cpio
 }
 
-pkg_postinst() {
-	${dir}/makedevices.sh
-}
+#pkg_postinst() {
+#	${dir}/makedevices.sh
+#}
 
-pkg_prerm() {
-	rm -rf ${dir}/stock/{dist,initrd}/dev
-}
+#pkg_prerm() {
+#	rm -rf ${dir}/stock/{dist,initrd}/dev
+#}
diff --git a/net-misc/pxes/pxes-0.7.ebuild b/net-misc/pxes/pxes-0.7.ebuild
index ea0ab122d624..1a737c22b9bb 100644
--- a/net-misc/pxes/pxes-0.7.ebuild
+++ b/net-misc/pxes/pxes-0.7.ebuild
@@ -1,51 +1,51 @@
-# Copyright 1999-2003 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-misc/pxes/pxes-0.7.ebuild,v 1.1 2003/11/20 16:16:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
-IUSE="ltsp"
+inherit perl-module
+
+IUSE="cdr ltsp"
 DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
 HOMEPAGE="http://pxes.sourceforge.net"
 SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${PV}-1.tar.gz
 	mirror://sourceforge/pxes/pxesconfig-${PV}-1.tar.gz
 	ltsp? ( mirror://sourceforge/pxes/${PN}-ltsp-${PV}-1.tar.gz )"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=dev-lang/perl-5.8.0-r12
-	ltsp? >=net-misc/ltsp-core-3.0.9-r1"
+	ltsp? ( >=net-misc/ltsp-3.0.9-r1 )"
 
 RDEPEND="${DEPEND}
 	dev-perl/gtk-perl
 	>=dev-perl/glade-perl-0.61
-	cdr? app-cdr/cdrtools"
+	cdr? ( app-cdr/cdrtools )"
 
-S=${WORKDIR}/${P}
 RESTRICT="nouserpriv"
 
-inherit perl-module
-
 dir=/opt/${P}
 Ddir=${D}/${dir}
 
 src_unpack() {
 	unpack ${A}
-
 	use ltsp && unpack ${PN}-ltsp-${PV}-1.tar.gz
 }
 
 src_compile() {
 	cd ${WORKDIR}/pxesconfig-${PV}
+	SRC_PREP="yes"
+	perl Makefile.PL PREFIX=${D}/usr INSTALLDIRS=vendor DESTDIR=${D}
 	perl-module_src_compile || die
 }
 
 src_install() {
 	dodir ${dir}
-	cp -ar ${S}/stock ${Ddir}
-	cp -ar ${S}/tftpboot ${D}
+	cp -pPR ${S}/stock ${Ddir}
+	cp -pPR ${S}/tftpboot ${D}
 	dodoc Documentation/ChangeLog
-	dohtml Documentation/html/{index,pxe,readme,screenshots}.html,howto/{configuring_ICA,customizing_kernel_and_modules,gdm,xfs,ms_only_environment/ms_only_environment}.html
+	dohtml -r Documentation/html/*
 	exeinto ${dir}
 	doexe ${FILESDIR}/makedevices.sh
 	cd ${WORKDIR}/pxesconfig-${PV}
diff --git a/net-misc/pxes/pxes-0.8.ebuild b/net-misc/pxes/pxes-0.8.ebuild
index ca40a4ad6899..bb07c0dbdc4f 100644
--- a/net-misc/pxes/pxes-0.8.ebuild
+++ b/net-misc/pxes/pxes-0.8.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/net-misc/pxes/pxes-0.8.ebuild,v 1.1 2004/04/03 18:23:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
-#IUSE="ltsp cdr"
-IUSE=""
+inherit perl-module
+
+IUSE="cdr"
 DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
 HOMEPAGE="http://pxes.sourceforge.net"
 SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${PV}-9.tar.gz
 	mirror://sourceforge/pxes/pxesconfig-${PV}-9.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -18,9 +19,9 @@ DEPEND=">=dev-lang/perl-5.8.0-r12"
 RDEPEND="${DEPEND}
 	dev-perl/gtk-perl
 	>=dev-perl/glade-perl-0.61
-	cdr? app-cdr/cdrtools"
+	sys-fs/squashfs-tools
+	cdr? ( app-cdr/cdrtools )"
 
-inherit perl-module
 
 dir=/opt/${P}
 Ddir=${D}/${dir}
@@ -32,8 +33,8 @@ src_unpack() {
 
 src_compile() {
 	cd ${WORKDIR}/pxesconfig-${PV}
-	MMSIXELEVEN=""
-	perl-module_src_prep || die
+	SRC_PREP="yes"
+	perl Makefile.PL PREFIX=${D}/usr INSTALLDIRS=vendor DESTDIR=${D}
 	perl-module_src_compile || die
 }
 
@@ -41,9 +42,9 @@ src_install() {
 	dodir ${dir}
 	cd ${Ddir}
 	cp -r ${S}/stock ${Ddir} || die "Copying files"
-	cp -a ${S}/tftpboot ${D}
+	cp -pPR ${S}/tftpboot ${D}
 	dodoc Documentation/ChangeLog
-	dohtml Documentation/html/{index,pxe,readme,screenshots}.html,howto/{configuring_ICA,customizing_kernel_and_modules,gdm,xfs,ms_only_environment/ms_only_environment}.html
+	dohtml -r Documentation/html/*
 	cd ${WORKDIR}/pxesconfig-${PV}
 	perl-module_src_install || die
 	dosym /usr/bin/cpio /bin/cpio
diff --git a/net-misc/pxes/pxes-0.9-r1.ebuild b/net-misc/pxes/pxes-0.9-r1.ebuild
index 14ab40a8da36..89d3415ac0b8 100644
--- a/net-misc/pxes/pxes-0.9-r1.ebuild
+++ b/net-misc/pxes/pxes-0.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/net-misc/pxes/pxes-0.9-r1.ebuild,v 1.1 2005/05/18 15:50:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+inherit eutils perl-module
 
 IUSE="cdr"
 MY_PV=${PV}-1
@@ -21,8 +23,6 @@ RDEPEND="${DEPEND}
 	sys-fs/squashfs-tools
 	cdr? ( app-cdr/cdrtools )"
 
-inherit eutils perl-module
-
 dir=/opt/${P}
 Ddir=${D}/${dir}
 
@@ -50,7 +50,7 @@ src_compile() {
 src_install() {
 	dodir ${dir}
 	cp -r ${S}/stock ${Ddir} || die "Copying files"
-	cp -a ${S}/tftpboot ${D} || die "Copying tftpboot"
+	cp -pPR ${S}/tftpboot ${D} || die "Copying tftpboot"
 	dodir ${dir}/tools
 	dosym /usr/bin/mksquashfs ${dir}/tools/mksquashfs
 	dodoc Documentation/ChangeLog
diff --git a/net-misc/pxes/pxes-0.9.ebuild b/net-misc/pxes/pxes-0.9.ebuild
index 4e120b7271ed..2b4ec229ee13 100644
--- a/net-misc/pxes/pxes-0.9.ebuild
+++ b/net-misc/pxes/pxes-0.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.9.ebuild,v 1.1 2004/08/16 17:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.9.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+inherit perl-module
 
 IUSE="cdr"
 MY_PV=${PV}-1
@@ -9,7 +11,7 @@ HOMEPAGE="http://pxes.sourceforge.net"
 SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${MY_PV}.tar.gz
 	mirror://sourceforge/pxes/pxesconfig-${MY_PV}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -19,9 +21,7 @@ RDEPEND="${DEPEND}
 	dev-perl/gtk-perl
 	>=dev-perl/glade-perl-0.61
 	sys-fs/squashfs-tools
-	cdr? app-cdr/cdrtools"
-
-inherit perl-module
+	cdr? ( app-cdr/cdrtools )"
 
 dir=/opt/${P}
 Ddir=${D}/${dir}
@@ -42,10 +42,12 @@ src_install() {
 	dodir ${dir}
 	cd ${Ddir}
 	cp -r ${S}/stock ${Ddir} || die "Copying files"
-	cp -a ${S}/tftpboot ${D}
+	cp -pPR ${S}/tftpboot ${D} || die "Copying tftpboot"
 	dodoc Documentation/ChangeLog
-	dohtml Documentation/html/{index,pxe,readme,screenshots}.html,howto/{configuring_ICA,customizing_kernel_and_modules,gdm,xfs,ms_only_environment/ms_only_environment}.html
+	dohtml -r Documentation/html/*
 	cd ${WORKDIR}/pxesconfig-${PV}
 	perl-module_src_install || die
-	dosym /usr/bin/cpio /bin/cpio
+	# Cleanup from improper install
+	cp -r ${D}/${D}/usr ${D}
+	rm -rf ${D}/var
 }
diff --git a/net-misc/pxes/pxes-1.0.ebuild b/net-misc/pxes/pxes-1.0.ebuild
index 4f2f1b7e74a0..b52f48f95f39 100644
--- a/net-misc/pxes/pxes-1.0.ebuild
+++ b/net-misc/pxes/pxes-1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-1.0.ebuild,v 1.1 2005/05/18 15:43:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-1.0.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+inherit eutils perl-module
 
 IUSE="cdr"
 DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
@@ -20,8 +22,6 @@ RDEPEND="${DEPEND}
 	sys-fs/squashfs-tools
 	cdr? ( app-cdr/cdrtools )"
 
-inherit eutils perl-module
-
 dir=/opt/${P}
 Ddir=${D}/${dir}
 
@@ -49,7 +49,7 @@ src_compile() {
 src_install() {
 	dodir ${dir}
 	cp -r ${S}/stock ${Ddir} || die "Copying files"
-	cp -a ${S}/tftpboot ${D} || die "Copying tftpboot"
+	cp -pPR ${S}/tftpboot ${D} || die "Copying tftpboot"
 	dodir ${dir}/tools
 	dosym /usr/bin/mksquashfs ${dir}/tools/mksquashfs
 	dodoc Documentation/ChangeLog
diff --git a/net-misc/qadsl/ChangeLog b/net-misc/qadsl/ChangeLog
index 7946b565c7c9..53108e86f3cb 100644
--- a/net-misc/qadsl/ChangeLog
+++ b/net-misc/qadsl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/qadsl
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/qadsl/ChangeLog,v 1.1 2004/04/02 19:48:36 aliz Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/qadsl/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+  04 Apr 2004; David Holm <dholm@gentoo.org> qadsl-1.3.2.ebuild:
+  Added to ~ppc.
 
 *qadsl-1.3.2 (02 Apr 2004)
 
diff --git a/net-misc/qadsl/Manifest b/net-misc/qadsl/Manifest
index e3a45dff1557..75cce754618c 100644
--- a/net-misc/qadsl/Manifest
+++ b/net-misc/qadsl/Manifest
@@ -1,2 +1,3 @@
-MD5 79134af7defbf266d2e218641130a1d9 qadsl-1.3.2.ebuild 441
+MD5 241f3d68a280dad7b66d5a142f906524 qadsl-1.3.2.ebuild 708
+MD5 febf4538f9e8a756d2c3c69f6f1f9caf ChangeLog 401
 MD5 9204573963997b60bc151ce988e86102 files/digest-qadsl-1.3.2 63
diff --git a/net-misc/qadsl/qadsl-1.3.2.ebuild b/net-misc/qadsl/qadsl-1.3.2.ebuild
index cc63311470f4..32bc86a6f1b1 100644
--- a/net-misc/qadsl/qadsl-1.3.2.ebuild
+++ b/net-misc/qadsl/qadsl-1.3.2.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/net-misc/qadsl/qadsl-1.3.2.ebuild,v 1.1 2004/04/02 19:48:36 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/qadsl/qadsl-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 DESCRIPTION="qADSL is an autologin & keep-alive daemon for various WAN/LAN/ADSL connections provided by several (mainly Swedish) ISPs."
 HOMEPAGE="http://www.nongnu.org/qadsl"
 SRC_URI="http://savannah.nongnu.org/download/qadsl/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 DEPEND=""
 #RDEPEND=""
diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index dda77a5b89a4..f3f1053b0cf1 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,14 +1,156 @@
-# ChangeLog for sys-apps/quagga
-# Copyright 2003 DataCore GmbH; Distributed under the GPL v2 
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.1 2004/03/29 12:29:03 amir Exp $
+# ChangeLog for net-misc/quagga
+# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2003-2004 DataCore GmbH
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
 
-* quagga-0.96.4-r6 (27 Mar 2004)
+*quagga-0.98.5-r1 (15 Nov 2005)
+
+  15 Nov 2005; Amir Guindehi <amir@gentoo.org> +quagga-0.98.5-r1.ebuild:
+  Added a local use flag 'fix-connected-rt'. It controls inclusion of the
+  patch amir-connected-route.patch which was causing more trouble than
+  it's worth for most folks. If you run into the kernel bug which routes        
+  packets to interfaces which are downed by link detect add this use flag.
+  Version bump.
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> quagga-0.98.4.ebuild:
+  Stable on ppc.
+
+*quagga-0.98.5 (10 Nov 2005)
+
+  10 Nov 2005; Alin Nastac <mrness@gentoo.org> quagga-0.98.2.ebuild,
+  quagga-0.98.4.ebuild, +quagga-0.98.5.ebuild:
+  Add autoconf-wrapper and libtool to DEPEND. Version bump.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> quagga-0.98.4.ebuild:
+  Mark 0.98.4 stable on alpha
+
+  14 Oct 2005; Alin Nastac <mrness@gentoo.org>
+  -files/patches-0.98.3/amir-connected-route.patch,
+  -files/patches-0.98.3/ht-20040304-classless-bgp.patch,
+  -files/patches-0.98.3/ht-20050110-0.98.0-bgp-md5.patch,
+  quagga-0.96.5-r1.ebuild, quagga-0.98.2.ebuild, -quagga-0.98.3.ebuild,
+  quagga-0.98.4.ebuild:
+  Remove obsolete test version 0.98.3. Add a warning about necessity of
+  patching kernel for being able to use TCP MD5 for BGP (#108364). Mark
+  version 0.98.4 stable on x86.
+
+  14 Sep 2005; Alin Nastac <mrness@gentoo.org> +files/bgpd.init,
+  -files/init/bgpd, -files/init/ospf6d, -files/init/ospfd, -files/init/ripd,
+  -files/init/ripngd, -files/init/zebra, +files/ospf6d.init,
+  +files/ospfd.init, +files/ripd.init, +files/ripngd.init,
+  +files/zebra.conf, +files/zebra.init, quagga-0.96.5-r1.ebuild,
+  quagga-0.98.2.ebuild, quagga-0.98.3.ebuild, quagga-0.98.4.ebuild:
+  Make zebra command line parameters configurable through conf.d (#102381).
+
+  13 Sep 2005; Alin Nastac <mrness@gentoo.org> quagga-0.98.2.ebuild,
+  quagga-0.98.3.ebuild, quagga-0.98.4.ebuild:
+  Replace sys-libs/libcap with >=sys-libs/libcap-1.10-r5 in RDEPEND (#95147).
+
+  03 Sep 2005; Simon Stelling <blubb@gentoo.org> quagga-0.98.4.ebuild:
+  made quagga multilib-strict aware
+
+*quagga-0.98.4 (11 Aug 2005)
+
+  11 Aug 2005; Alin Nastac <mrness@gentoo.org> files/init/bgpd,
+  files/init/ospf6d, files/init/ospfd, files/init/ripd, files/init/ripngd,
+  files/init/zebra, quagga-0.96.5-r1.ebuild, quagga-0.98.2.ebuild,
+  quagga-0.98.3.ebuild, +quagga-0.98.4.ebuild:
+  Fix check sanity in init scripts. Correct info messages regarding path to
+  sample files. Version bump with a new realms useflag which add realms
+  support in 0.98.4 version, thanks to the author of this patch, Calin Velea
+  <vcalinus@gemenii.ro> (#102044).
+
+*quagga-0.98.3 (15 Jun 2005)
+
+  15 Jun 2005; Alin Nastac <mrness@gentoo.org>
+  +files/patches-0.98.3/amir-connected-route.patch,
+  +files/patches-0.98.3/ht-20040304-classless-bgp.patch,
+  +files/patches-0.98.3/ht-20050110-0.98.0-bgp-md5.patch,
+  +quagga-0.98.3.ebuild:
+  Version bump.
+
+  12 Jun 2005; Alin Nastac <mrness@gentoo.org>
+  -files/patches-0.96.4/opaque-ready.patch,
+  -files/patches-0.96.4/ospf_refcount.patch,
+  -files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2,
+  -files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2,
+  -quagga-0.96.4-r6.ebuild, -quagga-0.96.5.ebuild, -quagga-0.97.1.ebuild,
+  -quagga-0.97.2.ebuild:
+  Remove obsolete versions.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> quagga-0.98.2.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Alin Nastac <mrness@gentoo.org> quagga-0.98.2.ebuild:
+  Stable on alpha and x86.
+
+*quagga-0.98.2 (20 Mar 2005)
+
+  20 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/patches-0.98.2/amir-connected-route.patch,
+  +files/patches-0.98.2/ht-20040304-classless-bgp.patch,
+  +files/patches-0.98.2/ht-20050110-0.98.0-bgp-md5.patch, +files/quagga.pam,
+  metadata.xml, quagga-0.96.4-r6.ebuild, quagga-0.96.5.ebuild,
+  quagga-0.96.5-r1.ebuild, quagga-0.97.1.ebuild, quagga-0.97.2.ebuild,
+  +quagga-0.98.2.ebuild:
+  Version bumped based on an ebuild made by Amir Guindehi <amir@gentoo.org>
+  and Michael Sandee <voidptr@voidptr.sboost.org>. The new version has support
+  for TCP MD5 & classless prefixes for BGP.
+  Fixed bugs #69900, #70457, #80633, #80636, #80697, #81095 and #83009.
+
+*quagga-0.97.2 (25 Oct 2004)
+
+  25 Oct 2004; Amir Guindehi <amir@datacore.ch> +quagga-0.97.2.ebuild:
+  Bumped version number. Removed obsolete patches.
+
+*quagga-0.97.1 (21 Oct 2004)
+
+  21 Oct 2004; Amir Guindehi <amir@datacore.ch> quagga-0.97.1.ebuild:
+  Bumped version number. Added two patches to fix compilation of
+  the source when used with the 'ospfapi' use flag.
+
+  25 Oct 2004; Amir Guindehi <amir@datacore.ch> quagga-0.97.1.ebuild:
+  Changed dependency to from >= to =libcap-1.10-r3. libcap-1.10-r4 does
+  not get correctly recognized and used by Quagga. This has to be 
+  investigated further.
+	
+*quagga-0.96.5-r1 (21 Oct 2004)
+
+  21 Oct 2004; Amir Guindehi <amir@datacore.ch> +quagga-0.96.5-r1.ebuild:
+  Added dependency to sys-apps/iproute2. Added --localstatedir. The ebuild
+  will apply patches if it finds the corresponding patch directory exists.
+  Fixed location of quagga include files to /usr/include/quagga. Added new
+  USE flag named 'ospfapi' to enable ospfapi and opaque lsa support 
+  sepparately. Made x86 stable.
+
+*quagga-0.96.5 (05 Oct 2004)
+
+  21 Oct 2004; Amir Guindehi <amir@datacore.ch> quagga-0.96.5.ebuild:
+  Made x86 stable.
+	
+  05 Oct 2004; Philip Walls <malverian@gentoo.org> +quagga-0.96.5.ebuild:
+  Version bump, support for tcp md5 passwords
+
+  16 Jul 2004; Amir Guindehi <amir@datacore.org> quagga-0.96.4-r6.ebuild:
+  fixed copyright statement according to dmwaters and seemants wishes.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> quagga-0.96.4-r6.ebuild:
+  change virtual/glibc to virtual/libc
+
+  13 Jun 2004; Jason Wever <weeve@gentoo.org> files/init/bgpd:
+  Fixed typo in bgpd init script.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> quagga-0.96.4-r6.ebuild:
+  Add inherit eutils
+
+*quagga-0.96.4-r6 (27 Mar 2004)
 
   27 Mar 2004; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
   Added missing IUSE to ebuild.
 
-* quagga-0.96.4-r5 (12 Mar 2004)
+*quagga-0.96.4-r5 (12 Mar 2004)
 
   12 Mar 2004; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
@@ -18,7 +160,7 @@
   triggert in certain cases and is not found. This patch allows
   ospfd to survive it in many cases.
 
-* quagga-0.96.4-r4 (02 Feb 2004)
+*quagga-0.96.4-r4 (02 Feb 2004)
 
   25 Feb 2004; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
@@ -30,13 +172,13 @@
   capabilities change from ON->OFF->ON. Submitted patch to upstream
   maintainer and ML.
 
-* quagga-0.96.4-r3 (22 Jan 2004)
+*quagga-0.96.4-r3 (22 Jan 2004)
 
   22 Jan 2003; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
   Added exports for broken ipforward detection.
 
-* quagga-0.96.4-r2 (11 Nov 2003)
+*quagga-0.96.4-r2 (11 Nov 2003)
 
   05 Dez 2003; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
@@ -46,19 +188,19 @@
   
   Fixed location of /usr/lib libraries to /usr/lib/quagga
 
-* quagga-0.96.4-r1 (02 Nov 2003)
+*quagga-0.96.4-r1 (02 Nov 2003)
 
   02 Nov 2003; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
   Fixed location of /usr/include headers to /usr/include/quagga
 
-* quagga-0.96.4 (02 Nov 2003)
+*quagga-0.96.4 (02 Nov 2003)
 
   02 Nov 2003; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
   Bumped version number.
 
-* quagga-0.96.3-r6 (01 Nov 2003)
+*quagga-0.96.3-r6 (01 Nov 2003)
 
   01 Nov 2003; Amir Guindehi <amir@datacore.ch> ChangeLog :
   
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 4794bd7d05bd..cdf62ce159b9 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,12 +1,24 @@
-MD5 3c1bee20964e44f3e8df0983bf549138 quagga-0.96.4-r6.ebuild 3257
-MD5 85e4446b56b61fb77fb7d486dd094cb9 ChangeLog 3512
-MD5 f0192175ecea09c49d5bae967c76bbd1 metadata.xml 1500
-MD5 72494598a213a5d6f441496f48aefd7b files/digest-quagga-0.96.4-r6 66
-MD5 9afac5d7db4181d89c49b4c6b698c407 files/init/bgpd 775
-MD5 0d0ee59690e07a0b4d8859f586c22cdd files/init/ripd 774
-MD5 b4f45ef6d7f9ebbafaab515848834bee files/init/ospfd 783
-MD5 512c245c461c72fa1915393b34777695 files/init/zebra 1055
-MD5 238592a498172e12c9dbe5247531e014 files/init/ospf6d 791
-MD5 c4f64c8f1e84e583812c036abe8d30f9 files/init/ripngd 792
-MD5 6d870c42af2625dcc07ba4b155618ebf files/patches-0.96.4/opaque-ready.patch 2617
-MD5 13439f842c485b5402125d2a18158c84 files/patches-0.96.4/ospf_refcount.patch 1296
+MD5 9927651424dd0548ba520a169d1afa88 quagga-0.98.5-r1.ebuild 4901
+MD5 fa39f9112f11093de5c4588bd571ad14 quagga-0.98.5.ebuild 4441
+MD5 89e7fe5c8a95c1564895e7b5ce057e81 quagga-0.98.2.ebuild 4672
+MD5 5fe7c527a2e968d0de6276ca9d401191 ChangeLog 9590
+MD5 e3212aca12f84a5cd7164e7727020318 quagga-0.98.4.ebuild 4438
+MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389
+MD5 6f7bbd50a0af9c0e1f2fae5116a8eacf quagga-0.96.5-r1.ebuild 4017
+MD5 cc109a746273bc0d6aee9d758e7524ab files/bgpd.init 900
+MD5 44547b687343ebfed7524cebc5626067 files/ospf6d.init 919
+MD5 1a1df9fb95d48001187e1f56dc4ff5e5 files/digest-quagga-0.98.2 66
+MD5 8550c2f78b4c3ba7ba66c6bcb0bf4913 files/digest-quagga-0.98.4 147
+MD5 d043f8666ea0af9633684d58dcef68e6 files/digest-quagga-0.98.5 147
+MD5 39b8cb21b55de53af38c94c2f5d85917 files/ripd.init 900
+MD5 120ab1b53975ec86e78266f31e935ab6 files/ripngd.init 920
+MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5-r1 142
+MD5 d043f8666ea0af9633684d58dcef68e6 files/digest-quagga-0.98.5-r1 147
+MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25
+MD5 0b834e6f9fd5d40f3018fb7e4ba04faa files/quagga.pam 1145
+MD5 89b0cf4e70172bfcd195b2869cae28da files/ospfd.init 910
+MD5 c38e884372406e9e59616e436cd26388 files/zebra.conf 371
+MD5 2c1c5b782f96a74b48ccc496ad7a3865 files/zebra.init 1168
+MD5 7da4097332468741416e156a2e5d35e4 files/patches-0.98.2/amir-connected-route.patch 6336
+MD5 6c9cdbdc237bb8d24dfd26504059464b files/patches-0.98.2/ht-20050110-0.98.0-bgp-md5.patch 14570
+MD5 e70bf25e2ca5f76efb2c5704234ccc1f files/patches-0.98.2/ht-20040304-classless-bgp.patch 1581
diff --git a/net-misc/quagga/files/bgpd.init b/net-misc/quagga/files/bgpd.init
index b6104235c39b..6006d696bb36 100644
--- a/net-misc/quagga/files/bgpd.init
+++ b/net-misc/quagga/files/bgpd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 DataCore GmbH, Amir Guindehi
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/bgpd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/bgpd.init,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 depend() {
 	need net zebra
diff --git a/net-misc/quagga/files/ospf6d.init b/net-misc/quagga/files/ospf6d.init
index 6edafe5f7450..74678d417394 100644
--- a/net-misc/quagga/files/ospf6d.init
+++ b/net-misc/quagga/files/ospf6d.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 DataCore GmbH, Amir Guindehi
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ospf6d.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ospf6d.init,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 depend() {
 	need net zebra
diff --git a/net-misc/quagga/files/ospfd.init b/net-misc/quagga/files/ospfd.init
index f67ca2c154a0..dfa4ad108414 100644
--- a/net-misc/quagga/files/ospfd.init
+++ b/net-misc/quagga/files/ospfd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 DataCore GmbH, Amir Guindehi
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ospfd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ospfd.init,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 depend() {
 	need net zebra
diff --git a/net-misc/quagga/files/quagga.pam b/net-misc/quagga/files/quagga.pam
index 486d45df9975..c188f9683880 100644
--- a/net-misc/quagga/files/quagga.pam
+++ b/net-misc/quagga/files/quagga.pam
@@ -23,4 +23,3 @@ auth       sufficient   /lib/security/pam_rootok.so
 #account    required     /lib/security/pam_stack.so service=system-auth
 #password   required     /lib/security/pam_stack.so service=system-auth
 #session    required     /lib/security/pam_stack.so service=system-auth
-#session    optional     /lib/security/pam_console.so
diff --git a/net-misc/quagga/files/ripd.init b/net-misc/quagga/files/ripd.init
index 987d6ec4b6ae..eeaafb2bd958 100644
--- a/net-misc/quagga/files/ripd.init
+++ b/net-misc/quagga/files/ripd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 DataCore GmbH, Amir Guindehi
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ripd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ripd.init,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 depend() {
 	need net zebra
diff --git a/net-misc/quagga/files/ripngd.init b/net-misc/quagga/files/ripngd.init
index 9bf2ff2a8729..f6dd1f895fff 100644
--- a/net-misc/quagga/files/ripngd.init
+++ b/net-misc/quagga/files/ripngd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 DataCore GmbH, Amir Guindehi
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ripngd.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/ripngd.init,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 depend() {
 	need net zebra
diff --git a/net-misc/quagga/files/zebra.init b/net-misc/quagga/files/zebra.init
index 45c90bf03736..50d0eded332f 100644
--- a/net-misc/quagga/files/zebra.init
+++ b/net-misc/quagga/files/zebra.init
@@ -1,7 +1,7 @@
 #!/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-misc/quagga/files/zebra.init,v 1.1 2005/09/14 11:11:08 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/files/zebra.init,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index 497b9f5a9529..d654a18f4fbf 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/metadata.xml
@@ -8,11 +8,7 @@
 		<description>Primary Maintainer</description>
 	</maintainer>
 	<maintainer>
-		<email>ueli@gentoo.org</email>
-		<description>Secondary Maintainer</description>
-	</maintainer>
-	<maintainer>
-		<email>solar@gentoo.org</email>
+		<email>mrness@gentoo.org</email>
 		<description>Secondary Maintainer</description>
 	</maintainer>
         <longdescription>Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ (*note Supported RFC::). Quagga also supports special BGP Route Reflector and Route Server behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol MIBs (*note SNMP Support::). Furthermore Quagga supports OSPFAPI (*note OSPFAPI Support::), a API interface to the OSPF LSDB. It supports inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood service state information into the routing domain.</longdescription>
diff --git a/net-misc/quagga/quagga-0.96.5-r1.ebuild b/net-misc/quagga/quagga-0.96.5-r1.ebuild
index 80564580f947..2e5f62489f3c 100644
--- a/net-misc/quagga/quagga-0.96.5-r1.ebuild
+++ b/net-misc/quagga/quagga-0.96.5-r1.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Copyright 2003-2004 DataCore GmbH
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5-r1.ebuild,v 1.1 2004/10/22 08:16:24 amir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
 
 inherit eutils
 
@@ -20,12 +19,7 @@ IUSE="ipv6 snmp pam tcpmd5 ospfapi"
 DEPEND="virtual/libc
 	sys-devel/binutils
 	sys-apps/iproute2
-	>=sys-libs/libcap-1.10-r3
-	!sys-apps/zebra
-	!sys-apps/zebra-ag-svn
-	!sys-apps/zebra-pj-cvs
-	!sys-apps/quagga-ag-svn-HEAD
-	!sys-apps/quagga-svn-HEAD"
+	>=sys-libs/libcap-1.10-r3"
 
 [ -z "${QUAGGA_USER_NAME}" ] && QUAGGA_USER_NAME="quagga"
 [ -z "${QUAGGA_USER_UID}" ] && QUAGGA_USER_UID=441
@@ -79,7 +73,7 @@ src_compile() {
 
 	# configure the stuff
 
-	./configure --host=${HOST} \
+	./configure --host=${CHOST} \
 		    --prefix=${D}/usr \
 		    --enable-tcp-zebra \
 	            --enable-nssa \
@@ -105,21 +99,27 @@ src_install() {
 
 	keepdir /var/run/quagga || die
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra || die
-	newexe ${FILESDIR}/init/ripd ripd || die
-	newexe ${FILESDIR}/init/ospfd ospfd || die
-	newexe ${FILESDIR}/init/bgpd bgpd || die
-
-	use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd )
-	use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d )
+	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
+	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
+	for i in ${MY_SERVICES_LIST} ; do
+		newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script"
+	done
+	newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script"
 }
 
 pkg_postinst() {
 	# empty dir for pid files for the new priv separation auth
-	install -d -m0755 -o quagga -g quagga ${ROOT}/var/run/quagga
+	#set proper owner/group/perms even if dir already existed
+	install -d -m0700 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
+	install -d -m0755 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/var/run/quagga
 
-	einfo "Sample configuration files can be found in /etc/quagga/sample."
+	einfo "Sample configuration files can be found in /etc/quagga/samples."
 	einfo "You have to create config files in /etc/quagga before"
 	einfo "starting one of the daemons."
+
+	if use tcpmd5; then
+		echo
+		ewarn "TCP MD5 for BGP needs a patched kernel!"
+		einfo "See http://hasso.linux.ee/quagga/bgp-md5.en.php for more info."
+	fi
 }
diff --git a/net-misc/quagga/quagga-0.98.2.ebuild b/net-misc/quagga/quagga-0.98.2.ebuild
index 95804b4909db..7745c2f1f4cf 100644
--- a/net-misc/quagga/quagga-0.98.2.ebuild
+++ b/net-misc/quagga/quagga-0.98.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.2.ebuild,v 1.1 2005/03/20 18:09:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.2.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 inherit eutils
 
@@ -10,17 +10,18 @@ SRC_URI="http://www.quagga.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ppc ~sparc x86"
 IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi"
 
-RDEPEND="!net-misc/zebra
-	sys-apps/iproute2
-	sys-libs/libcap
+RDEPEND="sys-apps/iproute2
+	>=sys-libs/libcap-1.10-r5
 	snmp? ( net-analyzer/net-snmp )
 	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	virtual/libc
-	sys-devel/binutils"
+	sys-devel/binutils
+	sys-devel/autoconf-wrapper
+	sys-devel/libtool"
 
 # TCP MD5 for BGP patch for Linux (RFC 2385) 
 MD5_PATCH="ht-20050110-0.98.0-bgp-md5.patch"
@@ -47,8 +48,6 @@ CONNECTED_PATCH="amir-connected-route.patch"
 pkg_preinst() {
 	enewgroup ${QUAGGA_GROUP_NAME} ${QUAGGA_GROUP_GID}
 	enewuser ${QUAGGA_USER_NAME} ${QUAGGA_USER_UID} ${QUAGGA_USER_SH} ${QUAGGA_USER_HOMEDIR} ${QUAGGA_USER_GROUPS}
-	fperms 770 /etc/quagga || die
-	fowners root:${QUAGGA_GROUP_NAME} /etc/quagga || die
 }
 
 src_unpack() {
@@ -105,13 +104,12 @@ src_install() {
 
 	keepdir /var/run/quagga || die
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra && \
-		newexe ${FILESDIR}/init/ripd ripd && \
-		newexe ${FILESDIR}/init/ospfd ospfd && \
-		( ! use ipv6 || newexe ${FILESDIR}/init/ripngd ripngd ) && \
-		( ! use ipv6 || newexe ${FILESDIR}/init/ospf6d ospf6d ) && \
-		newexe ${FILESDIR}/init/bgpd bgpd || die "failed to install init scripts"
+	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
+	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
+	for i in ${MY_SERVICES_LIST} ; do
+		newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script"
+	done
+	newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script"
 
 	if use pam; then
 		insinto /etc/pam.d
@@ -124,10 +122,16 @@ src_install() {
 pkg_postinst() {
 	# empty dir for pid files for the new priv separation auth
 	#set proper owner/group/perms even if dir already existed
-	install -d -m0700 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
+	install -d -m0770 -o root -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
 	install -d -m0755 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/var/run/quagga
 
-	einfo "Sample configuration files can be found in /etc/quagga/sample."
+	einfo "Sample configuration files can be found in /etc/quagga/samples."
 	einfo "You have to create config files in /etc/quagga before"
 	einfo "starting one of the daemons."
+
+	if use tcpmd5; then
+		echo
+		ewarn "TCP MD5 for BGP needs a patched kernel!"
+		einfo "See http://hasso.linux.ee/quagga/bgp-md5.en.php for more info."
+	fi
 }
diff --git a/net-misc/quagga/quagga-0.98.4.ebuild b/net-misc/quagga/quagga-0.98.4.ebuild
index 0448196234e0..b909e29374f4 100644
--- a/net-misc/quagga/quagga-0.98.4.ebuild
+++ b/net-misc/quagga/quagga-0.98.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/net-misc/quagga/quagga-0.98.4.ebuild,v 1.1 2005/08/11 09:01:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.4.ebuild,v 1.1.1.1 2005/11/30 09:55:26 chriswhite Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
 HOMEPAGE="http://quagga.net/"
@@ -11,16 +11,18 @@ SRC_URI="http://www.quagga.net/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ppc ~sparc x86"
 IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi realms"
 
 RDEPEND="sys-apps/iproute2
-	sys-libs/libcap
+	>=sys-libs/libcap-1.10-r5
 	snmp? ( net-analyzer/net-snmp )
 	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	virtual/libc
-	sys-devel/binutils"
+	sys-devel/binutils
+	sys-devel/autoconf-wrapper
+	sys-devel/libtool"
 
 src_unpack() {
 	unpack ${A} || die "failed to unpack sources"
@@ -66,7 +68,7 @@ src_compile() {
 		--sysconfdir=/etc/quagga \
 		--enable-exampledir=/etc/quagga/samples \
 		--localstatedir=/var/run/quagga \
-		--libdir=/usr/lib/quagga \
+		--libdir=/usr/$(get_libdir)/quagga \
 		${myconf} \
 		|| die "configure failed"
 	emake || die "make failed"
@@ -77,17 +79,16 @@ src_install() {
 		localstatedir=${D}/var/run/quagga \
 		sysconfdir=${D}/etc/quagga \
 		exampledir=${D}/etc/quagga/samples \
-		libdir=${D}/usr/lib/quagga || die "make install failed"
+		libdir=${D}/usr/$(get_libdir)/quagga || die "make install failed"
 
 	keepdir /var/run/quagga || die
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra && \
-		newexe ${FILESDIR}/init/ripd ripd && \
-		newexe ${FILESDIR}/init/ospfd ospfd && \
-		( ! use ipv6 || newexe ${FILESDIR}/init/ripngd ripngd ) && \
-		( ! use ipv6 || newexe ${FILESDIR}/init/ospf6d ospf6d ) && \
-		newexe ${FILESDIR}/init/bgpd bgpd || die "failed to install init scripts"
+	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
+	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
+	for i in ${MY_SERVICES_LIST} ; do
+		newinitd ${FILESDIR}/${i}.init ${i} || die "failed to install ${i} init.d script"
+	done
+	newconfd ${FILESDIR}/zebra.conf zebra || die "failed to install zebra conf.d script"
 
 	if use pam; then
 		insinto /etc/pam.d
@@ -112,12 +113,18 @@ pkg_postinst() {
 	einfo "You have to create config files in /etc/quagga before"
 	einfo "starting one of the daemons."
 
+	if use tcpmd5; then
+		echo
+		ewarn "TCP MD5 for BGP needs a patched kernel!"
+		einfo "See http://hasso.linux.ee/quagga/bgp-md5.en.php for more info."
+	fi
+
 	if use ipv6; then
 		echo
 		ewarn "This version of quagga contains a netlink race condition fix that triggered a kernel bug"
 		ewarn "which affects IPv6 users who have a kernel version < 2.6.13-rc6."
-		ewarn "See following links for more info:"
-		ewarn "   http://lists.quagga.net/pipermail/quagga-dev/2005-June/003507.html"
-		ewarn "   http://bugzilla.quagga.net/show_bug.cgi?id=196"
+		einfo "See following links for more info:"
+		einfo "   http://lists.quagga.net/pipermail/quagga-dev/2005-June/003507.html"
+		einfo "   http://bugzilla.quagga.net/show_bug.cgi?id=196"
 	fi
 }
diff --git a/net-misc/quagga/quagga-0.98.5-r1.ebuild b/net-misc/quagga/quagga-0.98.5-r1.ebuild
index c21dcfb73824..5ffb02755130 100644
--- a/net-misc/quagga/quagga-0.98.5-r1.ebuild
+++ b/net-misc/quagga/quagga-0.98.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-misc/quagga/quagga-0.98.5-r1.ebuild,v 1.1 2005/11/15 13:14:03 amir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 inherit eutils multilib
 
diff --git a/net-misc/quagga/quagga-0.98.5.ebuild b/net-misc/quagga/quagga-0.98.5.ebuild
index b0d4c32268d3..57366e0fde29 100644
--- a/net-misc/quagga/quagga-0.98.5.ebuild
+++ b/net-misc/quagga/quagga-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/net-misc/quagga/quagga-0.98.5.ebuild,v 1.1 2005/11/10 05:19:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.5.ebuild,v 1.1.1.1 2005/11/30 09:55:27 chriswhite Exp $
 
 inherit eutils multilib
 
diff --git a/net-misc/raccess/ChangeLog b/net-misc/raccess/ChangeLog
index 0de5735d8342..bab604d2f9da 100644
--- a/net-misc/raccess/ChangeLog
+++ b/net-misc/raccess/ChangeLog
@@ -1,11 +1,27 @@
 # ChangeLog for net-misc/raccess
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/raccess/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/raccess/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> raccess-0.7.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+  03 Sep 2004; <blubb@gentoo.org> raccess-0.7.ebuild:
+  added ~amd64 keyword
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> raccess-0.7.ebuild:
+  Added to ~ppc.
+
+*raccess-0.7 (05 Apr 2004)
+
+  05 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #46720 by Marcin Kryczek and clean up ebuild.
 
 *raccess-0.6 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> raccess-0.6.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/raccess/Manifest b/net-misc/raccess/Manifest
index e69de29bb2d1..4fee440f02ac 100644
--- a/net-misc/raccess/Manifest
+++ b/net-misc/raccess/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3b4db15310df0ba27bdf7a92fd46fde ChangeLog 1211
+MD5 4e7e9014696193c4090658f7b1c76778 raccess-0.6.ebuild 1167
+MD5 e2d49e8e18ae2af203ab98e6b79c50eb raccess-0.7.ebuild 832
+MD5 6f29cd79f699f5fe7678b0f86f20124d files/digest-raccess-0.6 63
+MD5 a18e5873428ae9421937358592a66ad9 files/digest-raccess-0.7 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB+/7smdTrptrqvGERAoDMAJsFxno3GIvRX1VVa5svCLVdzjLWxwCbBygV
+nPknUTZQ5Uod6sGH0OHrB1w=
+=1HYi
+-----END PGP SIGNATURE-----
diff --git a/net-misc/raccess/files/digest-raccess-0.6 b/net-misc/raccess/files/digest-raccess-0.6
index 8e0d76d973fd..006e90fa39e5 100644
--- a/net-misc/raccess/files/digest-raccess-0.6
+++ b/net-misc/raccess/files/digest-raccess-0.6
@@ -1 +1 @@
-MD5 8d045a0b336f0cd635c4ab788d2872da raccess-0.6.tar.gz 225280
+MD5 8d045a0b336f0cd635c4ab788d2872da raccess-0.6.tar.gz 225270
diff --git a/net-misc/raccess/raccess-0.6.ebuild b/net-misc/raccess/raccess-0.6.ebuild
index 8cc9ba4f8d38..38c4aab1aaa5 100644
--- a/net-misc/raccess/raccess-0.6.ebuild
+++ b/net-misc/raccess/raccess-0.6.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/raccess/raccess-0.6.ebuild,v 1.1 2002/01/16 00:16:41 blocke Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/raccess/raccess-0.6.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Remote Access Session is a security tool to analyze the integrity of systems using a library of publically available (and proven to work) exploits"
 SRC_URI="http://salix.org/raccess/${P}.tar.gz"
 HOMEPAGE="http://salix.org/raccess/"
+KEYWORDS="x86 sparc "
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
 
-DEPEND=""
+DEPEND="sys-devel/gcc"
 
 src_compile() {
 
-  ./configure --prefix=/usr --sysconfdir=/etc/raccess --host=${CHOST}  || die
-  make BINFILES="-DLOCATION_BIN_FILES=\\\"/usr/lib/raccess\\\"" CFGFILES="-DLOCATION_CONFIG_FILES=\\\"/etc/raccess\\\"" CFLAGS="-g ${CFLAGS}" all || die
-	
+	./configure --prefix=/usr --sysconfdir=/etc/raccess --host=${CHOST}  || die
+	make BINFILES="-DLOCATION_BIN_FILES=\\\"/usr/lib/raccess\\\"" CFGFILES="-DLOCATION_CONFIG_FILES=\\\"/etc/raccess\\\"" CFLAGS="-g ${CFLAGS}" all || die
+
 }
 
 src_install() {
+	dodir /etc/raccess
+	dodir /usr/lib/raccess
 
-  dodir /etc/raccess
-  dodir /usr/lib/raccess
-
-  mv ${S}/exploits/Makefile ${S}/exploits/Makefile.old
-  sed 's/bin\/exploits/lib\/raccess/g' ${S}/exploits/Makefile.old > ${S}/exploits/Makefile
+	mv ${S}/exploits/Makefile ${S}/exploits/Makefile.old
+	sed 's/bin\/exploits/lib\/raccess/g' ${S}/exploits/Makefile.old > ${S}/exploits/Makefile
 
-  make prefix=${D}/usr mandir=${D}/usr/share/man sysconfdir=${D}/etc/raccess install  || die
-
-  dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PROJECT_PLANNING README 
+	make prefix=${D}/usr mandir=${D}/usr/share/man sysconfdir=${D}/etc/raccess install  || die
 
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PROJECT_PLANNING README
 }
-
diff --git a/net-misc/raccess/raccess-0.7.ebuild b/net-misc/raccess/raccess-0.7.ebuild
index e271eea35c1b..c7ebb44a2354 100644
--- a/net-misc/raccess/raccess-0.7.ebuild
+++ b/net-misc/raccess/raccess-0.7.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-misc/raccess/raccess-0.7.ebuild,v 1.1 2004/04/06 01:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/raccess/raccess-0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 DESCRIPTION="Remote Access Session is an systems security analyzer"
 HOMEPAGE="http://salix.org/raccess/"
@@ -8,9 +8,10 @@ SRC_URI="http://salix.org/raccess/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
+IUSE=""
 
-DEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/radvd/ChangeLog b/net-misc/radvd/ChangeLog
index d9deb5decbc7..7960abc9c4f0 100644
--- a/net-misc/radvd/ChangeLog
+++ b/net-misc/radvd/ChangeLog
@@ -1,8 +1,77 @@
 # ChangeLog for net-misc/radvd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/ChangeLog,v 1.1 2002/10/18 18:59:40 hannes Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/ChangeLog,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
-*radvd-0.7.1 (18th July 2002)
+  20 Nov 2005; Henrik Brix Andersen <brix@gentoo.org> radvd-0.9.ebuild:
+  Stable on x86.
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> radvd-0.8-r1.ebuild:
+  Stable on ppc.
+
+  22 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> -radvd-0.8.ebuild:
+  Pruned old versions.
+
+*radvd-0.9 (20 Oct 2005)
+
+  20 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/radvd-0.9-conf.d, +files/radvd-0.9-init.d, +radvd-0.9.ebuild:
+  Version bump.
+
+  15 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> radvd-0.8-r1.ebuild:
+  Stable on x86.
+
+*radvd-0.8-r1 (31 Aug 2005)
+
+  31 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/radvd-0.8-conf.d, +files/radvd-0.8-init.d, +metadata.xml,
+  +radvd-0.8-r1.ebuild:
+  Cleaned up ebuild, taking ownership.
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> radvd-0.8.ebuild:
+  Use -1 instead of /bin/false on enewuser call.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> radvd-0.7.2-r1.ebuild:
+  Stable on ppc.
+
+*radvd-0.8 (02 Aug 2005)
+
+  02 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> +radvd-0.8.ebuild:
+  Version bump for bug 86879. Thanks to Kalin KOZHUHAROV <kalin@ThinRope.net>.
+
+  14 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> radvd-0.7.2-r1.ebuild:
+  Added to ~sparc and ~ppc.
+
+  02 Jan 2005; Daniel Drake <dsd@gentoo.org> radvd-0.7.2-r1.ebuild:
+  Change virtual/kernel to virtual/linux-sources
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> radvd-0.7.2-r1.ebuild:
+  Marked ~amd64, resolves 59087
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> radvd-0.7.2-r1.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> radvd-0.7.2-r1.ebuild:
+  Add die following econf for bug 48950
+
+  05 Dec 2003; Chuck Short <zul@gentoo.org> radvd-0.7.2-r1.ebuild:
+  Chown fixes.
+
+*radvd-0.7.2-r1 (21 Apr 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*radvd-0.7.2 (21 Apr 2003)
+
+  21 Apr 2003; Guy Martin <gmsoft@gentoo.org> radvd-0.7.2-r1.ebuild, files/radvd,
+  files/digest-radvd-0.7.2-r1 :
+  Corrected ownership of /var/run/radvd. Fix #19647
+  Marked stable for x86 and hppa.
+
+  02 Nov 2002; Hannes Mehnert <hannes@gentoo.org> radvd-0.7.1.ebuild:
+  marked stable for x86
+
+*radvd-0.7.1 (18 Jul 2002)
 
   18 Oct 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog, radvd-0.7.1.ebuild:
   Initial import.
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index e69de29bb2d1..db12e40df7fd 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -0,0 +1,13 @@
+MD5 49fb28a3bee0a2b748a6a28aec151e5d radvd-0.9.ebuild 1483
+MD5 7337cb83f7362b0e285ed10558084e79 radvd-0.8-r1.ebuild 1544
+MD5 1e22defa565212aed96500fa799333ad radvd-0.7.2-r1.ebuild 1380
+MD5 0dd9a42d169b4daf7bbc5f3abdd13109 ChangeLog 2712
+MD5 e41411344bcec2e0a59605acf1d821e9 metadata.xml 316
+MD5 707572a18aaddef9ed366e5f950f4460 files/digest-radvd-0.9 61
+MD5 6d745a03aa165ab8b22ddb683793c467 files/radvd-0.9-conf.d 447
+MD5 deb9430f74948534b343c3199157d78d files/radvd-0.9-init.d 1094
+MD5 fa53a0e062f5ca3ff6f7ceee7dcd0e61 files/radvd 606
+MD5 e280f79bd51397d60a2f877e8335cf86 files/radvd-0.8-conf.d 447
+MD5 48df423b3b993bec69b27f5bc4026415 files/digest-radvd-0.7.2-r1 63
+MD5 843b3bdf29860a7c94f33da1220979ed files/radvd-0.8-init.d 1068
+MD5 eef180eac1ac95e349d5e3131927f629 files/digest-radvd-0.8-r1 61
diff --git a/net-misc/radvd/files/radvd b/net-misc/radvd/files/radvd
index 7067ab1b1fa0..a912771eb778 100644
--- a/net-misc/radvd/files/radvd
+++ b/net-misc/radvd/files/radvd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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-misc/radvd/files/radvd,v 1.1 2002/10/18 18:59:42 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 depend () {
 	need net
@@ -9,12 +9,14 @@ depend () {
 
 start () {
 	ebegin "Starting radvd"
+	echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
 	start-stop-daemon --start --quiet --exec /usr/sbin/radvd -- -u radvd -p /var/run/radvd/radvd.pid
 	eend
 }
 
 stop() {
 	ebegin "Stopping radvd"
+	echo 0 > /proc/sys/net/ipv6/conf/all/forwarding
 	start-stop-daemon --stop --quiet --pidfile /var/run/radvd/radvd.pid
 	eend
 }
diff --git a/net-misc/radvd/files/radvd-0.8-conf.d b/net-misc/radvd/files/radvd-0.8-conf.d
index dd507293e627..8880fe05a4b9 100644
--- a/net-misc/radvd/files/radvd-0.8-conf.d
+++ b/net-misc/radvd/files/radvd-0.8-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/net-misc/radvd/files/radvd-0.8-conf.d,v 1.1 2005/08/31 13:28:08 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd-0.8-conf.d,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 # Extra options to pass to radvd
 OPTIONS=""
diff --git a/net-misc/radvd/files/radvd-0.8-init.d b/net-misc/radvd/files/radvd-0.8-init.d
index 6994874459ca..070d93b50e1b 100644
--- a/net-misc/radvd/files/radvd-0.8-init.d
+++ b/net-misc/radvd/files/radvd-0.8-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/net-misc/radvd/files/radvd-0.8-init.d,v 1.1 2005/08/31 13:28:08 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd-0.8-init.d,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 CONFIGFILE=/etc/radvd.conf
 PIDFILE=/var/run/radvd/radvd.pid
diff --git a/net-misc/radvd/files/radvd-0.9-conf.d b/net-misc/radvd/files/radvd-0.9-conf.d
index e4bab83ccabf..d3f568d2caaa 100644
--- a/net-misc/radvd/files/radvd-0.9-conf.d
+++ b/net-misc/radvd/files/radvd-0.9-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/net-misc/radvd/files/radvd-0.9-conf.d,v 1.1 2005/10/20 12:55:05 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd-0.9-conf.d,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 # Extra options to pass to radvd
 OPTIONS=""
diff --git a/net-misc/radvd/files/radvd-0.9-init.d b/net-misc/radvd/files/radvd-0.9-init.d
index 80fbb019d50a..4d23ac37c7e6 100644
--- a/net-misc/radvd/files/radvd-0.9-init.d
+++ b/net-misc/radvd/files/radvd-0.9-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/net-misc/radvd/files/radvd-0.9-init.d,v 1.1 2005/10/20 12:55:05 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd-0.9-init.d,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 CONFIGFILE=/etc/radvd.conf
 PIDFILE=/var/run/radvd/radvd.pid
diff --git a/net-misc/radvd/radvd-0.7.2-r1.ebuild b/net-misc/radvd/radvd-0.7.2-r1.ebuild
index b2908b6f56d6..48166bdc0fc5 100644
--- a/net-misc/radvd/radvd-0.7.2-r1.ebuild
+++ b/net-misc/radvd/radvd-0.7.2-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-misc/radvd/radvd-0.7.2-r1.ebuild,v 1.1 2003/04/21 15:11:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-0.7.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon (radvd)"
 HOMEPAGE="http://v6web.litech.org/radvd/"
@@ -8,15 +8,16 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 hppa"
+KEYWORDS="~amd64 arm hppa ppc ~sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc
-	virtual/kernel"
+DEPEND="virtual/libc
+	virtual/linux-sources"
 
 pkg_preinst() {
 	# Force ownership of radvd user and group. fix #19647
-	[ -d "/var/run/radvd" ] && chown 75.75 /var/run/radvd
-	
+	[ -d "/var/run/radvd" ] && chown 75:75 /var/run/radvd
+
 	if ! groupmod radvd; then
 		groupadd -g 75 radvd || die "problem adding group radvd"
 	fi
@@ -31,23 +32,23 @@ pkg_preinst() {
 src_compile() {
 	econf --libexecdir=/usr/lib/radvd \
 		--with-pidfile=/var/run/radvd/radvd.pid \
-		--sysconfdir=/etc/radvd
+		--sysconfdir=/etc/radvd || die "econf failed"
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc CHANGES COPYRIGHT INTRO.html README TODO
-	
+
 	insinto /etc/radvd
 	doins radvd.conf.example
-	
+
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/radvd
 
 	dodir /var/run/radvd
 	touch ${D}/var/run/radvd/.keep
-	chown -R 75.75 ${D}/var/run/radvd
+	chown -R 75:75 ${D}/var/run/radvd
 	chmod 755 ${D}/var/run/radvd
-			
+
 }
diff --git a/net-misc/radvd/radvd-0.8-r1.ebuild b/net-misc/radvd/radvd-0.8-r1.ebuild
index 27e75870dda7..1d1fdc596200 100644
--- a/net-misc/radvd/radvd-0.8-r1.ebuild
+++ b/net-misc/radvd/radvd-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-0.8-r1.ebuild,v 1.1 2005/08/31 13:28:08 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 arm hppa ppc ~sparc x86"
 
 IUSE=""
 DEPEND="virtual/libc"
diff --git a/net-misc/radvd/radvd-0.9.ebuild b/net-misc/radvd/radvd-0.9.ebuild
index 2cd2874c87ca..be68e5cc34e0 100644
--- a/net-misc/radvd/radvd-0.9.ebuild
+++ b/net-misc/radvd/radvd-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-0.9.ebuild,v 1.1 2005/10/20 12:55:05 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-0.9.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc x86"
 
 IUSE=""
 DEPEND="sys-devel/bison
diff --git a/net-misc/rdate/ChangeLog b/net-misc/rdate/ChangeLog
index 6e6ff883c3f7..800db48f3649 100644
--- a/net-misc/rdate/ChangeLog
+++ b/net-misc/rdate/ChangeLog
@@ -1,11 +1,93 @@
 # ChangeLog for net-misc/rdate
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+*rdate-1.4-r1 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> +files/rdate-confd,
+  +files/rdate-initd, +rdate-1.4-r1.ebuild:
+  Bug #57845, init scripts for rdate.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> rdate-0.990821-r1.ebuild,
+  rdate-0.990821-r2.ebuild, rdate-0.990821.ebuild:
+  Bug #63126.
+
+*rdate-0.990821-r2 (06 Sep 2004)
+
+  06 Sep 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +rdate-0.990821-r1.ebuild, +rdate-0.990821-r2.ebuild,
+  +rdate-0.990821.ebuild, -rdate-990821-r1.ebuild, -rdate-990821-r2.ebuild,
+  -rdate-990821.ebuild:
+  Renumber versions to solve bug #63007.
+
+*rdate-990821-r2 (06 Sep 2004)
+
+  06 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> +rdate-990821-r2.ebuild:
+  Bump revision, actually use CFLAGS now...
+
+  11 Jul 2004; Tom Gall <tgall@gentoo.org> rdate-990821-r1.ebuild:
+  stable on ppc64, bug #55666
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> rdate-1.4.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> rdate-990821-r1.ebuild:
+  Stable on alpha.
+
+*rdate-1.4 (10 May 2004)
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> rdate-1.4.ebuild,
+  rdate-990821-r1.ebuild, rdate-990821.ebuild:
+  fix license for older rdate ebuilds (bug #49404); version bump to newer GPL
+  version from Redhat
+
+  14 Jan 2004; <tuxus@gentoo.org> rdate-990821-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> rdate-990821-r1.ebuild,
+  rdate-990821.ebuild:
+  Marked 990821-r1 stable on sparc and adjusted the copyright dates in all.
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> rdate-990821-r1.ebuild:
+  mark stable on amd64
+
+  27 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> rdate-990821-r1.ebuild,
+  rdate-990821.ebuild:
+  Undo whatever it was that spanky did to the poor ebuilds; tidy -r1 a bit
+
+*rdate-990821-r1 (13 Mar 2003)
+
+  28 Jul 2003; Guy Martin <gmsoft@gentoo.org> rdate-990821-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> rdate-990821-r1.ebuild
+  :
+
+  Changed supsersed to sed dependency, closing bug #17278 by Eric Hustvedt
+  <ehustvedt@hotmail.com>
+
+*rdate-990821 (20 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> rdate-990821.ebuild :
+  Add alpha to KEYWORDS
+
+  20 Oct 2002; Seemant Kulleen <seemant@gentoo.org> rdate-990821-r1.ebuild
+  files/digest-rdate-990821-r1 :
+
+  Updated to use ipv6 and compiler flags from /etc/make.conf.  Thanks to:
+  maurizio@iridium.aetheric.org (Maurizio Disimino) in bug #8808.
 
 *rdate-990821 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> rdate-990821.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/rdate/Manifest b/net-misc/rdate/Manifest
index e69de29bb2d1..9af60279ad04 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -0,0 +1,13 @@
+MD5 5a0bdbfc32d6e2bb360d4537cf58daa0 rdate-0.990821-r1.ebuild 928
+MD5 6dc24db864531b91dad260466fd9352a rdate-1.4.ebuild 731
+MD5 13af08e55ba1d43dd51363fdf2ccdc83 rdate-1.4-r1.ebuild 812
+MD5 b383d0ee4555ed0768e69b822995c26c rdate-0.990821-r2.ebuild 908
+MD5 184b3596e0467bba4322cc560af18b20 ChangeLog 3491
+MD5 7c1ddab6f6615da7960377e8fbf21199 rdate-0.990821.ebuild 690
+MD5 31320ec84600fa3b9fe2d885edc46b48 files/digest-rdate-0.990821-r1 62
+MD5 31320ec84600fa3b9fe2d885edc46b48 files/digest-rdate-0.990821-r2 62
+MD5 7222ef09db66dfa05f4c3e27c247e8a2 files/digest-rdate-1.4 60
+MD5 2af5147484859452c8653fd5faba78e5 files/rdate-confd 617
+MD5 00059cdcb91936a3a6b32daa9c54215b files/rdate-initd 837
+MD5 31320ec84600fa3b9fe2d885edc46b48 files/digest-rdate-0.990821 62
+MD5 7222ef09db66dfa05f4c3e27c247e8a2 files/digest-rdate-1.4-r1 60
diff --git a/net-misc/rdate/files/rdate-confd b/net-misc/rdate/files/rdate-confd
index a2377031515d..8b326045d986 100644
--- a/net-misc/rdate/files/rdate-confd
+++ b/net-misc/rdate/files/rdate-confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/files/rdate-confd,v 1.1 2005/05/17 21:19:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/files/rdate-confd,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 # the NTP server to get the date from
 RDATE_SERVER="pool.ntp.org"
diff --git a/net-misc/rdate/files/rdate-initd b/net-misc/rdate/files/rdate-initd
index 6b96bbc30c6f..80e56eb84d3e 100644
--- a/net-misc/rdate/files/rdate-initd
+++ b/net-misc/rdate/files/rdate-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/files/rdate-initd,v 1.1 2005/05/17 21:19:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/files/rdate-initd,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 depend() {
 	before cron
diff --git a/net-misc/rdate/rdate-0.990821-r1.ebuild b/net-misc/rdate/rdate-0.990821-r1.ebuild
index 881ec827ea8c..7358ea7c4784 100644
--- a/net-misc/rdate/rdate-0.990821-r1.ebuild
+++ b/net-misc/rdate/rdate-0.990821-r1.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/net-misc/rdate/rdate-0.990821-r1.ebuild,v 1.1 2004/09/07 05:23:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-0.990821-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit flag-o-matic
 
+MY_P=${P/0.}
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
 HOMEPAGE="http://www.freshmeat.net/projects/rdate/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${P}.tar.gz"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha hppa ia64 amd64 ~mips ppc64"
+KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 ~mips ppc64"
 IUSE="ipv6"
 
 DEPEND=">=sys-apps/sed-4"
diff --git a/net-misc/rdate/rdate-0.990821-r2.ebuild b/net-misc/rdate/rdate-0.990821-r2.ebuild
index 283bdafda252..dc88d38fc559 100644
--- a/net-misc/rdate/rdate-0.990821-r2.ebuild
+++ b/net-misc/rdate/rdate-0.990821-r2.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/net-misc/rdate/rdate-0.990821-r2.ebuild,v 1.1 2004/09/07 05:23:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-0.990821-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit flag-o-matic
 
+MY_P=${P/0.}
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
 HOMEPAGE="http://www.freshmeat.net/projects/rdate/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${P}.tar.gz"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha hppa ia64 amd64 ~mips ppc64"
+KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 ~mips ppc64"
 IUSE="ipv6"
 
 DEPEND=">=sys-apps/sed-4"
diff --git a/net-misc/rdate/rdate-0.990821.ebuild b/net-misc/rdate/rdate-0.990821.ebuild
index f74032260f87..f1b1c53c87b1 100644
--- a/net-misc/rdate/rdate-0.990821.ebuild
+++ b/net-misc/rdate/rdate-0.990821.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-0.990821.ebuild,v 1.1 2004/09/07 05:23:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-0.990821.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
 HOMEPAGE="http://www.freshmeat.net/projects/rdate/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${P}.tar.gz"
+MY_P=${P/0.}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/network/misc/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
diff --git a/net-misc/rdate/rdate-1.4-r1.ebuild b/net-misc/rdate/rdate-1.4-r1.ebuild
index f147090d91de..2dcaf91867cd 100644
--- a/net-misc/rdate/rdate-1.4-r1.ebuild
+++ b/net-misc/rdate/rdate-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-1.4-r1.ebuild,v 1.1 2005/05/17 21:19:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-1.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/net-misc/rdate/rdate-1.4.ebuild b/net-misc/rdate/rdate-1.4.ebuild
index 4149a41e7b9e..794a7a94c213 100644
--- a/net-misc/rdate/rdate-1.4.ebuild
+++ b/net-misc/rdate/rdate-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-1.4.ebuild,v 1.1 2004/05/10 10:17:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdate/rdate-1.4.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~mips"
 IUSE="ipv6"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	use ipv6 && append-flags "-DINET6"
diff --git a/net-misc/rdist/ChangeLog b/net-misc/rdist/ChangeLog
index 6ccf5a2abcf7..eff50ce9c755 100644
--- a/net-misc/rdist/ChangeLog
+++ b/net-misc/rdist/ChangeLog
@@ -1,9 +1,25 @@
 # ChangeLog for net-misc/rdist
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/ChangeLog,v 1.1 2002/08/05 11:23:20 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
-*rdist-6.1.5 (04 Aug 2002)
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  10 Mar 2004; David Holm <dholm@gentoo.org> rdist-6.1.5-r1.ebuild:
+  Added to ~ppc.
+
+*rdist-6.1.5-r1 (10 Mar 2004)
 
-	04 Aug 2002; Aron Griffis <agriffis@gentoo.org> rdist-6.1.5.ebuild:
+  10 Mar 2004; Aron Griffis <agriffis@gentoo.org> rdist-6.1.5-r1.ebuild:
+  Fix bug 41781 by using yacc and ARG_TYPE=ARG_STDARG. Thanks to Antti Hätälä
+  and Horst Prote for the fix.
+
+  08 Sep 2003; Jon Portnoy <avenj@gentoo.org> rdist-6.1.5.ebuild :
+  Changed ebuild to use bison instead of yacc. Fixes bug 24465.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*rdist-6.1.5 (04 Aug 2002)
 
-	Initial ebuild for MagniComp's RDist.
+  04 Aug 2002; Aron Griffis <agriffis@gentoo.org> rdist-6.1.5.ebuild:
+  Initial ebuild for MagniComp's RDist.
diff --git a/net-misc/rdist/Manifest b/net-misc/rdist/Manifest
index e69de29bb2d1..adf9092a955f 100644
--- a/net-misc/rdist/Manifest
+++ b/net-misc/rdist/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b07d477917b9d41a8b328f22f447a548 rdist-6.1.5-r1.ebuild 1106
+MD5 e3e85d9161f6143fcc7ae4485eef71eb rdist-6.1.5.ebuild 824
+MD5 b1479377e40b1f476c0b9eafe874cc06 ChangeLog 966
+MD5 6e25273408e9c88374cac7f55459c18e files/digest-rdist-6.1.5 63
+MD5 6e25273408e9c88374cac7f55459c18e files/digest-rdist-6.1.5-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1XqLLFUmVNQ7rkRAsXqAJwP2wd4Tsc+5CsBmbL3cJsmCpyJZQCfW2zr
+x9qb6EFSb4a4NfFTrFQshMY=
+=aSsF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/rdist/rdist-6.1.5-r1.ebuild b/net-misc/rdist/rdist-6.1.5-r1.ebuild
index 43abc48dd201..dde1a98071a9 100644
--- a/net-misc/rdist/rdist-6.1.5-r1.ebuild
+++ b/net-misc/rdist/rdist-6.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/rdist-6.1.5-r1.ebuild,v 1.1 2004/03/10 14:36:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/rdist-6.1.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 DESCRIPTION="Remote software distribution system"
 HOMEPAGE="http://www.magnicomp.com/rdist/rdist.shtml"
@@ -8,7 +8,8 @@ SRC_URI="http://www.magnicomp.com/download/rdist/${P}.tar.gz"
 
 LICENSE="RDist"
 SLOT="1"
-KEYWORDS="x86 sparc alpha ia64"
+KEYWORDS="x86 sparc alpha ia64 ~ppc"
+IUSE=""
 
 DEPEND="dev-util/yacc >=sys-apps/sed-4"
 RDEPEND=""  # yacc only needed for compile
diff --git a/net-misc/rdist/rdist-6.1.5.ebuild b/net-misc/rdist/rdist-6.1.5.ebuild
index b72f94ae0a9f..b6bb6e834f37 100644
--- a/net-misc/rdist/rdist-6.1.5.ebuild
+++ b/net-misc/rdist/rdist-6.1.5.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/rdist-6.1.5.ebuild,v 1.1 2002/08/05 02:46:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/rdist-6.1.5.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 DESCRIPTION="Remote software distribution system"
 HOMEPAGE="http://www.magnicomp.com/rdist/rdist.shtml"
 SRC_URI="http://www.magnicomp.com/download/rdist/${P}.tar.gz"
+
 LICENSE="RDist"
 SLOT="1"
-KEYWORDS="x86"
-DEPEND="dev-util/yacc"
-RDEPEND=""  # yacc only needed for compile
-S=${WORKDIR}/${P}
+KEYWORDS="x86 sparc "
+IUSE=""
+
+DEPEND="sys-devel/bison"
+RDEPEND=""  # bison only needed for compile
 
 src_compile() {
-	emake || die "emake failed"
+	emake YACC="bison -y" || die "emake failed"
 }
 
-src_install () {
-	mkdir -p ${D}/usr/bin ${D}/usr/share/man/man{1,8}
+src_install() {
+	dodir /usr/bin /usr/share/man/man{1,8}
 	make install BIN_DIR=${D}/usr/bin || die "make install failed"
 	make install.man \
 		MAN_1_DIR=${D}/usr/share/man/man1 MAN_8_DIR=${D}/usr/share/man/man8 \
diff --git a/net-misc/redir/ChangeLog b/net-misc/redir/ChangeLog
index 58d6a843227b..ab3234c3277e 100644
--- a/net-misc/redir/ChangeLog
+++ b/net-misc/redir/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/redir
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/redir/ChangeLog,v 1.1 2003/09/19 13:46:58 hhg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/redir/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
+
+  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> redir-2.2.1.ebuild:
+  Stable on sparc wrt #95113
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> redir-2.2.1.ebuild:
+  Remove whitespace from CVS header to make repoman happy.
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> redir-2.2.1.ebuild:
+  Stable on alpha.
+
+  18 Nov 2003; Hallgrimur H. Gunnarsson <hhg@gentoo.org> redir-2.2.1.ebuild:
+  Marked stable on x86
 
 *redir-2.2.1 (19 Sep 2003)
 
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
index d40450c810aa..bbe4cb7ffc94 100644
--- a/net-misc/redir/Manifest
+++ b/net-misc/redir/Manifest
@@ -1,2 +1,14 @@
-MD5 52306833a432c5bbcc0761d6579d599d redir-2.2.1.ebuild 511
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d28a7783c6430beeca322e8dbfb0dc2d redir-2.2.1.ebuild 590
+MD5 ff3c39d788d2daa7b10ab770b4cc0cef ChangeLog 948
+MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
 MD5 06b729711ab6883796d9c46b6ca3a61c files/digest-redir-2.2.1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMIFqV3J2n04EauwRAih2AJ94cp1+3XX24lbAUPxIjFZpJLGEVACdEI4i
+I//NXnTjMqrSDJM6qv0oZ1M=
+=lyDI
+-----END PGP SIGNATURE-----
diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index 25ce5106a0b2..d52c9e243149 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/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>hhg@gentoo.org</email>
-    <name>Hallgrimur H. Gunnarsson</name>
-</maintainer>
-<longdescription>
-Redir is a port redirector.
-</longdescription>
+<herd>maintainer-needed</herd>
 </pkgmetadata>
diff --git a/net-misc/redir/redir-2.2.1.ebuild b/net-misc/redir/redir-2.2.1.ebuild
index 5d715697fb51..b407aacaf38a 100644
--- a/net-misc/redir/redir-2.2.1.ebuild
+++ b/net-misc/redir/redir-2.2.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/redir/redir-2.2.1.ebuild,v 1.1 2003/09/19 13:46:58 hhg Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-misc/redir/redir-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 DESCRIPTION="Redir is a port redirector."
 HOMEPAGE="http://sammy.net/~sammy/hacks/"
 SRC_URI="http://sammy.net/~sammy/hacks/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha ~arm ~hppa ~mips ~sparc"
+KEYWORDS="x86 ~amd64 alpha ~hppa ~mips sparc"
 IUSE=""
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/rfb/ChangeLog b/net-misc/rfb/ChangeLog
index c752c1271022..b50997a51589 100644
--- a/net-misc/rfb/ChangeLog
+++ b/net-misc/rfb/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-misc/rfb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/ChangeLog,v 1.1 2002/10/23 15:09:47 vapier Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/ChangeLog,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
+
+*rfb-0.6.1-r2 (27 Jun 2003)
+
+  27 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Updated the daemon to be a real daemon ;)
+  This one actually unbinds std{in,out,err} and all that stuff.
+  THX WWOODS YOU MAST0R OF C
+
+*rfb-0.6.1-r1 (25 Mar 2003)
+
+  25 Mar 2003; Rajiv Manglani <rajiv@gentoo.org> rfb-0.6.1-r1.ebuild :
+  fixed homepage url.
+
+*rfb-0.6.1 (18 Jan 2003)
+
+  25 Mar 2003; Rajiv Manglani <rajiv@gentoo.org> rfb-0.6.1.ebuild :
+  fixed homepage url.
+
+  18 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a patch to support a '-daemon' switch ... sexy :)
 
 *rfb-0.6.1 (23 Oct 2002)
 
diff --git a/net-misc/rfb/Manifest b/net-misc/rfb/Manifest
index e69de29bb2d1..80ec7e44d885 100644
--- a/net-misc/rfb/Manifest
+++ b/net-misc/rfb/Manifest
@@ -0,0 +1,7 @@
+MD5 c46886283a320e5e195c213f2ea2510b rfb-0.6.1.ebuild 985
+MD5 4c72ae8aca935b156153cee0e7f743de rfb-0.6.1-r2.ebuild 1066
+MD5 153948c0daab0cd9fc6647da5287330e ChangeLog 889
+MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1-r2 61
+MD5 8d0a143c99a1923432f70c970ccbde92 files/rfb-0.6.1-gcc3.x.patch 5981
+MD5 193705142d6cc32a958886b33bed5257 files/digest-rfb-0.6.1 61
+MD5 9a0937d122c4d19ed38529f120d3a6c1 files/rfb-0.6.1-daemon.patch 6506
diff --git a/net-misc/rfb/files/rfb-0.6.1-daemon.patch b/net-misc/rfb/files/rfb-0.6.1-daemon.patch
index 6a95ffff7988..cdcebf51d4f7 100644
--- a/net-misc/rfb/files/rfb-0.6.1-daemon.patch
+++ b/net-misc/rfb/files/rfb-0.6.1-daemon.patch
@@ -1,5 +1,5 @@
---- lib/rfbServer.cc.orig	2003-01-18 02:35:37.000000000 -0500
-+++ lib/rfbServer.cc	2003-01-18 02:49:07.000000000 -0500
+--- lib/rfbServer.cc.orig	2003-06-27 16:39:09.000000000 -0400
++++ lib/rfbServer.cc	2003-06-27 16:39:58.000000000 -0400
 @@ -29,9 +29,11 @@
  using std::cout;
  using std::endl;
@@ -48,8 +48,8 @@
        cerr << "encoding: " << (int) encodings.encoding[encodings.count] << endl;
        encodings.count = encodings.count + 1;
        data = (unsigned char*) &(encodings.encoding[encodings.count]);
---- include/rfbServer.h.orig	2003-01-18 02:39:38.000000000 -0500
-+++ include/rfbServer.h	2003-01-18 02:57:31.000000000 -0500
+--- include/rfbServer.h.orig	2003-06-27 16:39:19.000000000 -0400
++++ include/rfbServer.h	2003-06-27 16:39:58.000000000 -0400
 @@ -342,6 +342,7 @@
    void ResetBlocks();
    void DeleteBlocks();
@@ -58,8 +58,8 @@
  
    Block *blocks;
    unsigned int blockWidth, blockHeight;
---- x0rfbserver/x0rfbserver.cc.orig	2003-01-18 01:15:47.000000000 -0500
-+++ x0rfbserver/x0rfbserver.cc	2003-01-18 02:59:23.000000000 -0500
+--- x0rfbserver/x0rfbserver.cc.orig	2003-06-27 16:39:25.000000000 -0400
++++ x0rfbserver/x0rfbserver.cc	2003-06-27 16:43:54.000000000 -0400
 @@ -72,6 +72,7 @@
  OXClient *clientX;
  const OXWindow *root;
@@ -166,7 +166,7 @@
      << "       x0rfbserver -stdio" << endl
      << "       x0rfbserver -about" << endl
      << "       x0rfbserver -help" << endl
-+    << "       x0rfbserver -daemon (default)" << endl
++    << "       x0rfbserver -daemon" << endl
      << endl
      << "<options>" << endl
      << "       -shared" << endl
@@ -193,12 +193,18 @@
      } else printHelp_x0rfbserver();
    }
  
-@@ -920,6 +943,15 @@
+@@ -920,6 +943,21 @@
      break;
  
      
 +    case DAEMON: {
 +      if (fork()) { return; }
++      setsid();
++      if (fork()) { exit(0); }
++      chdir("/");
++      close(0);
++      close(1);
++      close(2);
 +      clientX = new OXClient;
 +      root = clientX->GetRoot();
 +      dpy = root->GetDisplay();
@@ -209,8 +215,8 @@
        
      case STDIO: {
        clientX = new OXClient;
---- x0rfbserver/XUpdateScanner.cc.orig	2003-01-18 02:07:02.000000000 -0500
-+++ x0rfbserver/XUpdateScanner.cc	2003-01-18 02:34:14.000000000 -0500
+--- x0rfbserver/XUpdateScanner.cc.orig	2003-06-27 16:39:30.000000000 -0400
++++ x0rfbserver/XUpdateScanner.cc	2003-06-27 16:39:58.000000000 -0400
 @@ -386,6 +386,7 @@
      }
    }
@@ -219,13 +225,13 @@
    cerr << "TILES: " << tilec << endl;
    
    if ( properties.showMousePointer ) {
---- x0rfbserver/XUpdateScanner.h.orig	2003-01-18 02:34:33.000000000 -0500
-+++ x0rfbserver/XUpdateScanner.h	2003-01-18 02:33:56.000000000 -0500
+--- x0rfbserver/XUpdateScanner.h.orig	2002-02-12 18:57:01.000000000 -0500
++++ x0rfbserver/XUpdateScanner.h	2003-06-27 16:39:58.000000000 -0400
 @@ -23,6 +23,7 @@
  
  
  #include "rfbServer.h"
 +extern bool isdaemon;
  
- namespace rfb {
  
+ namespace rfb {
diff --git a/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch b/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch
index f0b11f05d79e..46ba396f619b 100644
--- a/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch
+++ b/net-misc/rfb/files/rfb-0.6.1-gcc3.x.patch
@@ -198,3 +198,14 @@
  	cd xvncconnect  &&  $(MAKE) -e $(ENVIRONMENT) $@
  
  clean:
+--- include/rfb.h.orig	2003-10-09 11:10:21.131479008 -0400
++++ include/rfb.h	2003-10-09 11:10:30.480057808 -0400
+@@ -21,6 +21,8 @@
+ #ifndef _hexonet_rfb_h_
+ #define _hexonet_rfb_h_
+ 
++using namespace std;
++
+ namespace rfb {
+ 
+ 
diff --git a/net-misc/rfb/rfb-0.6.1-r2.ebuild b/net-misc/rfb/rfb-0.6.1-r2.ebuild
index b40e7ff56124..cccb8c33103e 100644
--- a/net-misc/rfb/rfb-0.6.1-r2.ebuild
+++ b/net-misc/rfb/rfb-0.6.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1-r2.ebuild,v 1.1 2003/06/27 20:54:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="http://download.hexonet.com/software/rfb/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE=""
 
 DEPEND="x11-libs/xclass"
 
@@ -30,7 +31,7 @@ src_install() {
 #	dolib lib/librfb.a	#does anything other than rfb use this ?
 
 	dobin rfbcat/rfbcat x0rfbserver/x0rfbserver \
-		xrfbviewer/{xplayfbs,xrfbviewer} 
+		xrfbviewer/{xplayfbs,xrfbviewer}
 	for f in rfbcat x0rfbserver xvncconnect xrfbviewer ; do
 		dobin ${f}/${f}
 	done
diff --git a/net-misc/rfb/rfb-0.6.1.ebuild b/net-misc/rfb/rfb-0.6.1.ebuild
index 1f14d87d920d..81321b44c5fc 100644
--- a/net-misc/rfb/rfb-0.6.1.ebuild
+++ b/net-misc/rfb/rfb-0.6.1.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/net-misc/rfb/rfb-0.6.1.ebuild,v 1.1 2002/10/23 15:09:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rfb/rfb-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="comprehensive collection of rfb enabled tools and applications"
-HOMEPAGE="http://forums.hexonet.com/"
+HOMEPAGE="http://forum.hexonet.com/"
 SRC_URI="http://download.hexonet.com/software/rfb/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+KEYWORDS="x86 ppc ~sparc ~alpha"
 IUSE=""
 
 DEPEND="x11-libs/xclass"
 
-S="${WORKDIR}/${P}"
-
-# todo: make this guy use zlib rather than the build in zlib functions ?
-
 src_compile() {
-	cd ${S}
-	patch -p0<${FILESDIR}/gcc3.x-rfb-0.6.1.patch
+	epatch ${FILESDIR}/${P}-gcc3.x.patch
 
 	make depend || die "make depend failed"
 	make CXXFLAGS="-DUSE_ZLIB_WARREN -I../include ${CXXFLAGS}" || die "make failed"
@@ -28,7 +26,7 @@ src_install() {
 #	dolib lib/librfb.a	#does anything other than rfb use this ?
 
 	dobin rfbcat/rfbcat x0rfbserver/x0rfbserver \
-		xrfbviewer/{xplayfbs,xrfbviewer} 
+		xrfbviewer/{xplayfbs,xrfbviewer}
 	for f in rfbcat x0rfbserver xvncconnect xrfbviewer ; do
 		dobin ${f}/${f}
 	done
diff --git a/net-misc/rinetd/ChangeLog b/net-misc/rinetd/ChangeLog
index 91d2881064c6..a5d50a367cc8 100644
--- a/net-misc/rinetd/ChangeLog
+++ b/net-misc/rinetd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/rinetd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rinetd/ChangeLog,v 1.1 2003/04/25 16:15:50 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rinetd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
+
+  05 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/rinetd.rc,
+  rinetd-0.62.ebuild:
+  Add init.d script #73507 by Peter Gordon.
 
 *rinetd-0.62 (25 Apr 2003)
 
diff --git a/net-misc/rinetd/Manifest b/net-misc/rinetd/Manifest
index e6032b655a29..f21c29b46943 100644
--- a/net-misc/rinetd/Manifest
+++ b/net-misc/rinetd/Manifest
@@ -1,3 +1,14 @@
-MD5 b8fec688a50b6a6fb232a4f52747652b rinetd-0.62.ebuild 546
-MD5 39a1b7b7238fb1fad2c21279fa3fc20c ChangeLog 247
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b237cd13513100ee65486828596621c ChangeLog 461
+MD5 e6d328934a807c2f000f0ff3064c33bd rinetd-0.62.ebuild 726
 MD5 385cb98a70d5f3003f1bf734e2db0f35 files/digest-rinetd-0.62 58
+MD5 ca5d55c104af9dea24e71111b805a411 files/rinetd.rc 473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBs+J+roRuSHgZdywRAiqwAJ98IY/iQBVCxzcQ8GAwDUG8WZLImACdHkhU
+7iEgo3H0+rCW1YZlzOVD2CM=
+=BQYQ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/rinetd/files/rinetd.rc b/net-misc/rinetd/files/rinetd.rc
index c8670395f93a..91fe40632b4b 100644
--- a/net-misc/rinetd/files/rinetd.rc
+++ b/net-misc/rinetd/files/rinetd.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/net-misc/rinetd/files/rinetd.rc,v 1.1 2004/12/06 04:39:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rinetd/files/rinetd.rc,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/net-misc/rinetd/rinetd-0.62.ebuild b/net-misc/rinetd/rinetd-0.62.ebuild
index 607dcc5b0731..dfdf871fc3da 100644
--- a/net-misc/rinetd/rinetd-0.62.ebuild
+++ b/net-misc/rinetd/rinetd-0.62.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rinetd/rinetd-0.62.ebuild,v 1.1 2003/04/25 16:15:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rinetd/rinetd-0.62.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 DESCRIPTION="redirects TCP connections from one IP address and port to another"
 HOMEPAGE="http://www.boutell.com/rinetd/"
@@ -9,8 +9,11 @@ SRC_URI="http://www.boutell.com/rinetd/http/rinetd.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND="sys-devel/gcc"
+RDEPEND=""
+DEPEND="sys-devel/gcc
+	>=sys-apps/portage-2.0.51"
 
 S=${WORKDIR}/${PN}
 
@@ -19,7 +22,8 @@ src_compile() {
 }
 
 src_install() {
-	dosbin rinetd
+	dosbin rinetd || die
+	newinitd ${FILESDIR}/rinetd.rc rinetd
 	doman rinetd.8
 	dodoc CHANGES README
 	dohtml index.html
diff --git a/net-misc/rwbs/ChangeLog b/net-misc/rwbs/ChangeLog
index 0a2f3622202f..4c1ab1c92276 100644
--- a/net-misc/rwbs/ChangeLog
+++ b/net-misc/rwbs/ChangeLog
@@ -1,12 +1,14 @@
 # ChangeLog for net-misc/rwbs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rwbs/ChangeLog,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 *rwbs-0.27 (5 Nov 2002)
   
+  04 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  Cleaned up ebuild and added sep files for conf.d/init.d
+
   5 Nov 2002; Matt Keadle <mkeadle@gentoo.org> rwbs-0.27.ebuild
   ChangeLog files/digest-rwbs-0.27:
-
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. Thanks to "delta407" for submitting this
   ebuild.
diff --git a/net-misc/rwbs/Manifest b/net-misc/rwbs/Manifest
index e69de29bb2d1..a9438a190fa0 100644
--- a/net-misc/rwbs/Manifest
+++ b/net-misc/rwbs/Manifest
@@ -0,0 +1,5 @@
+MD5 6232fc662326f282bdd1ac3b08ff32bf ChangeLog 586
+MD5 e34fcdd4fe256691f4a74ad82161d807 rwbs-0.27.ebuild 859
+MD5 00330e80e3efedc62799118b3bece6b7 files/rwbs.conf 1221
+MD5 76e3904008b1e551c2efb1b48946f3f8 files/rwbs.rc 557
+MD5 38a3f3f271aa00d6a9010243be3592bc files/digest-rwbs-0.27 67
diff --git a/net-misc/rwbs/files/rwbs.rc b/net-misc/rwbs/files/rwbs.rc
index 48a1aea3e6c9..18e151f19d5b 100644
--- a/net-misc/rwbs/files/rwbs.rc
+++ b/net-misc/rwbs/files/rwbs.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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-misc/rwbs/files/rwbs.rc,v 1.1 2002/12/04 19:50:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rwbs/files/rwbs.rc,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/rwbs/rwbs-0.27.ebuild b/net-misc/rwbs/rwbs-0.27.ebuild
index 3e8f23b876dd..a3f54cacae50 100644
--- a/net-misc/rwbs/rwbs-0.27.ebuild
+++ b/net-misc/rwbs/rwbs-0.27.ebuild
@@ -1,85 +1,37 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
-
-S=${WORKDIR}
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rwbs/rwbs-0.27.ebuild,v 1.1.1.1 2005/11/30 09:54:57 chriswhite Exp $
 
 DESCRIPTION="Roger Wilco base station"
 HOMEPAGE="http://rogerwilco.gamespy.com/"
 SRC_URI="http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_0_27.tar.gz"
-KEYWORDS="~x86"
+
+LICENSE="Resounding"
+KEYWORDS="x86"
+IUSE=""
+SLOT="0"
+
 # Everything is statically linked
 DEPEND=""
-IUSE=""
 
-src_install () {
-	cd ${WORKDIR}
-	dodoc README.TXT CHANGES.TXT LICENSE.TXT
+S=${WORKDIR}
+
+src_install() {
+	dodoc README.TXT CHANGES.TXT
+	rm -f {README,CHANGES,LICENSE}.TXT
 
-	dobin ${S}/rwbs ${S}/run_rwbs
-	rm -f ${S}/rwbs ${S}/run_rwbs
+	dobin rwbs run_rwbs
+	rm -f rwbs run_rwbs
 
 	# Put distribution into /usr/share/rwbs
-	mkdir -p ${D}/usr/share/rwbs/
+	dodir /usr/share/rwbs/
 	mv * ${D}/usr/share/rwbs/
 
 	# Do conf script
-	mkdir -p ${D}/etc/conf.d/
-	cat > ${D}/etc/conf.d/rwbs <<EOF
-# Roger Wilco base station configuration
-#
-# $ rwbs --help reads:
-# usage: ./rwbs [-b(ackwardcompat)] [-t(est)] [-s(tatic)] [-p <passwd>] [-u <udpport>] [-x <connectspeed>] [-n <hostname>]
-#    connectspeed is an integer measuring the allocated broadcast
-#     capacity for the channel host.  The recommended value is 1.
-#     Higher values will cause the RWBS to use its additional broadcast capacity
-#     to help relay transmissions, at the expense of scalability.
-#   the b(ackwardcompat) option tells RWBS to appear as a "user" on the
-#     channel.  Mark I users will prefer this, but not Mark Ia users.
-#   The s(tatic) option indicates that a client asking to join a
-#     non-existent named channel should be turned away with an error.
-#     rather than being hosted on a dynamically-created channel.
-#   hostname is what your station's name will be in the Roger Wilco Channel Tab.
-#     For instance, if you used -n "Clan Hurt", Roger Wilco users will see
-#     an entry in the Channel window named "Clan Hurt Base"
-#   If the -t(est) flag is used, the base station echoes transmissions
-#     when there is just one other party on the channel.
-
-# Specify whatever options you want on this line
-RWBS_OPTS='-n "Gentoo Linux"'
-EOF
+	insinto /etc/conf.d
+	newins ${FILESDIR}/rwbs.conf rwbs
 
 	# do init script
-	mkdir -p ${D}/etc/init.d/
-	cat > ${D}/etc/init.d/rwbs <<EOF
-#!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting Roger Wilco base station"
-        start-stop-daemon --start --quiet --exec /usr/bin/rwbs -b \\
-                -- \${RWBS_OPTS} >>/var/log/rwbs 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Roger Wilco base station"
-        start-stop-daemon --stop --quiet --exec /usr/bin/rwbs \\
-                > /dev/null 2>&1
-        eend $?
-}
-EOF
-	chmod 755 ${D}/etc/init.d/rwbs
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This build of ${PN} uses an init script, located at"
-	einfo "/etc/init.d/rwbs, to start and stop ${PN}."
-	einfo
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/rwbs.rc rwbs
 }
diff --git a/net-misc/sambasentinel/ChangeLog b/net-misc/sambasentinel/ChangeLog
index e69de29bb2d1..3eb1834eebf4 100644
--- a/net-misc/sambasentinel/ChangeLog
+++ b/net-misc/sambasentinel/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for net-misc/sambasentinel
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sambasentinel/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
+
+  26 May 2004; Jason Wever <weeve@gentoo.org> sambasentinel-0.1.ebuild:
+  Added ~sparc keyword.
+
+*sambasentinel-0.1 (06 Jun 2003)
+
+  06 Jun 2003; Brad Laue <brad@gentoo.org> sambasentinel-0.1.ebuild:
+  New ebuild SambaSentinel submitted by ghost@rucus.ru.ac.za
+
diff --git a/net-misc/sambasentinel/Manifest b/net-misc/sambasentinel/Manifest
index c724a0dcfa7d..2ea3084a8059 100644
--- a/net-misc/sambasentinel/Manifest
+++ b/net-misc/sambasentinel/Manifest
@@ -1,2 +1,13 @@
-MD5 359c70ad34f06192fa65a385d4e7b3e5 sambasentinel-0.1.ebuild 541
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 28eace0fe3cf046f59e0bc0b0310b478 ChangeLog 481
 MD5 f5b4bf41975cdd405aaf3756ae7206bc files/digest-sambasentinel-0.1 68
+MD5 6dbd55930f9e64b2214ff384dabe2e06 sambasentinel-0.1.ebuild 562
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68eHI1lqEGTUzyQRAlJaAKCIMQNjWToTawdQh2lk02HsnKEVKwCeOYNC
+/VGnXn54RluLJaHayej0AwI=
+=q2Nb
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sambasentinel/sambasentinel-0.1.ebuild b/net-misc/sambasentinel/sambasentinel-0.1.ebuild
index 0bd5dbc3e180..ebff74981e49 100644
--- a/net-misc/sambasentinel/sambasentinel-0.1.ebuild
+++ b/net-misc/sambasentinel/sambasentinel-0.1.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sambasentinel/sambasentinel-0.1.ebuild,v 1.1 2003/06/06 15:08:13 brad Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sambasentinel/sambasentinel-0.1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 DESCRIPTION="SambaSentinel is a GTK frontend to smbstatus"
 HOMEPAGE="http://kling.mine.nu/sambasentinel.htm"
@@ -9,21 +8,13 @@ SRC_URI="http://kling.mine.nu/files/SambaSentinel-${PV}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-1.2"
 
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/SambaSentinel ${WORKDIR}/${P}
-}
-
-src_compile() {
-	emake || die
-}
+S="${WORKDIR}"/SambaSentinel
 
 src_install() {
-	cd ${S}
 	dobin SambaSentinel
 }
diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index ab5aeec4d6ae..9c95005fb4a6 100644
--- a/net-misc/scponly/ChangeLog
+++ b/net-misc/scponly/ChangeLog
@@ -1,10 +1,67 @@
 # ChangeLog for net-misc/scponly
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.1 2003/04/22 21:27:03 avenj Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
+
+*scponly-4.1 (19 Sep 2005)
+
+  19 Sep 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/scponly-4.1-gentoo.patch, +scponly-4.1.ebuild:
+  Version bumped. Bug 89021.
+  Removed setting up chroot in pkg_postinst.
+
+*scponly-4.0 (03 Dec 2004)
+
+  03 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> +scponly-4.0.ebuild:
+  security bump - bug 72815
+
+  31 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> scponly-3.11-r2.ebuild,
+  -scponly-3.7.ebuild, -scponly-3.8.ebuild:
+  Marked stable on x86 and amd64.
+  Removed old versions.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> scponly-3.11-r2.ebuild,
+  scponly-3.7.ebuild, scponly-3.8.ebuild:
+  Typo in DESCRIPTION: psuedoshell -> pseudoshell. Bug 59717.
+
+*scponly-3.11-r2 (28 Jul 2004)
+
+  28 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> -scponly-3.11-r1.ebuild,
+  +scponly-3.11-r2.ebuild, -scponly-3.11.ebuild:
+  Removed useradd from pkg_config. Bug 58526.
+
+*scponly-3.11-r1 (03 Jul 2004)
+
+  03 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> +scponly-3.11-r1.ebuild:
+  Fixed chroot problem.
+  Added passwd file in ${myhome}/etc/.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> scponly-3.11.ebuild,
+  scponly-3.7.ebuild, scponly-3.8.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> scponly-3.11.ebuild:
+  Add inherit eutils
+
+  24 Mar 2004; David Holm <dholm@gentoo.org> scponly-3.11.ebuild:
+  Added to ~ppc.
+
+*scponly-3.11 (25 Mar 2004)
+
+  25 Mar 2004; <matsuu@gentoo.org> scponly-3.11.ebuild:
+  Version bumped.
+  Added --enable-rsync-compat and --enable-chrooted-binary to configure options.
+  Added pkg_postinst and pkg_config.
+
+  17 Oct 2003; Sven Blumenstein <bazik@gentoo.org> scponly-3.8.ebuild:
+  Added ~sparc keyword (bug #31195)
+
+*scponly-3.8 (05 May 2003)
+
+   05 May 2003; Jon Portnoy <avenj@gentoo.org> scponly-3.8.ebuild :
+   Version bump. Closes bug #20448.
 
 *scponly-3.7 (22 Apr 2003)
 
    22 Apr 2003; Jon Portnoy <avenj@gentoo.org> scponly-3.7.ebuild :
-
    Initial import. Ebuild submitted in bug #18850 by Matsuu Takuto
    <matsuu@7501.net>.
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 1784d886b3b3..bb28c04daefb 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,2 +1,7 @@
-MD5 8fd7008186c03dd71c97069bf2869b61 scponly-3.7.ebuild 829
-MD5 7f3245890a81d9e6c8e271517fa8b3ad files/digest-scponly-3.7 59
+MD5 48f3604e22751295c07e471844ade2bb scponly-4.0.ebuild 3067
+MD5 dadf22d4d802d59445e6a28a7f7fc934 scponly-4.1.ebuild 1124
+MD5 7810621f18a870c71aa97d3a543f9710 ChangeLog 2239
+MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
+MD5 a1f6bee0be7b749e155d9ec945ce31a4 files/digest-scponly-4.0 59
+MD5 43e0a1f99fd0eb893cf3608c3f1a236d files/digest-scponly-4.1 59
+MD5 686ea1fd09ee5c0522217845d6bc33cb files/scponly-4.1-gentoo.patch 4634
diff --git a/net-misc/scponly/scponly-4.0.ebuild b/net-misc/scponly/scponly-4.0.ebuild
index deb7078f6bb3..476c77307e58 100644
--- a/net-misc/scponly/scponly-4.0.ebuild
+++ b/net-misc/scponly/scponly-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/net-misc/scponly/scponly-4.0.ebuild,v 1.1 2004/12/02 15:30:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.0.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/scponly/scponly-4.1.ebuild b/net-misc/scponly/scponly-4.1.ebuild
index 37b07b22eb1e..a66421eb5e2a 100644
--- a/net-misc/scponly/scponly-4.1.ebuild
+++ b/net-misc/scponly/scponly-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.1.ebuild,v 1.1 2005/09/19 23:11:36 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.1.ebuild,v 1.1.1.1 2005/11/30 09:54:50 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/secpanel/ChangeLog b/net-misc/secpanel/ChangeLog
index cd3958f138e4..992e950ecd67 100644
--- a/net-misc/secpanel/ChangeLog
+++ b/net-misc/secpanel/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-misc/secpanel
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/secpanel/ChangeLog,v 1.1 2003/10/30 11:19:57 taviso Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/secpanel/ChangeLog,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
+
+  19 Apr 2005; Tavis Ormandy <taviso@gentoo.org> :
+  *bump*
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> secpanel-0.43.ebuild:
+  Stable on alpha.
+
+  11 May 2004; Jason Wever <weeve@gentoo.org> secpanel-0.43.ebuild:
+  Added ~sparc keyword.
+
+  29 Mar 2004; Tavis Ormandy <taviso@gentoo.org> secpanel-0.43.ebuild:
+  stable on x86
+
+  15 Mar 2004; Tavis Ormandy <taviso@gentoo.org> secpanel-0.43.ebuild:
+  fixing #44600
+
+*secpanel-0.43 (13 Mar 2004)
+
+  13 Mar 2004; Tavis Ormandy <taviso@gentoo.org> secpanel-0.43.ebuild:
+  new release, author changed directory name.
+
+  06 Nov 2003; Tavis Ormandy <taviso@gentoo.org> secpanel-0.41.ebuild:
+  stable
+
+  30 Oct 2003; Tavis Ormandy <taviso@gentoo.org> secpanel-0.41.ebuild:
+  updated description
+
+  30 Oct 2003; Tavis Ormandy <taviso@gentoo.org> secpanel-0.41.ebuild:
+  make gifs optional.
 
 *secpanel-0.41 (30 Oct 2003)
 
diff --git a/net-misc/secpanel/Manifest b/net-misc/secpanel/Manifest
index f725cf468638..b31847c1132a 100644
--- a/net-misc/secpanel/Manifest
+++ b/net-misc/secpanel/Manifest
@@ -1,2 +1,8 @@
-MD5 4b325c0443cc8161f225696a15592146 secpanel-0.41.ebuild 599
+MD5 f35344cea21b2eabde527e64120330c7 secpanel-0.51.ebuild 1527
+MD5 5bdbed01e01adb0a53fe7ccde7947d50 secpanel-0.41.ebuild 1478
+MD5 b825ee95d061f1ea644b8e949aa264eb ChangeLog 1310
+MD5 3dd1ad853d810ac676c577f655fa3853 metadata.xml 413
+MD5 1af024ed93b3d9e844214abb606a0eed secpanel-0.43.ebuild 1525
 MD5 0729b4247ac2598e6cf9b3acbf69f2d7 files/digest-secpanel-0.41 64
+MD5 e81b8359203cc823e6c66c9162cc2ee8 files/digest-secpanel-0.43 65
+MD5 f00986ad81efbd719e8ac8cb41bf9aa3 files/digest-secpanel-0.51 65
diff --git a/net-misc/secpanel/files/digest-secpanel-0.43 b/net-misc/secpanel/files/digest-secpanel-0.43
index 5d237855fbc7..82cbaa92cd1b 100644
--- a/net-misc/secpanel/files/digest-secpanel-0.43
+++ b/net-misc/secpanel/files/digest-secpanel-0.43
@@ -1 +1 @@
-MD5 99f8e26f882e95399322e75ad777eacf secpanel-0.43.tar.gz 52742
+MD5 99f8e26f882e95399322e75ad777eacf secpanel-0.4.3.tar.gz 52742
diff --git a/net-misc/secpanel/secpanel-0.41.ebuild b/net-misc/secpanel/secpanel-0.41.ebuild
index 2096dd6201d8..127c0aaa0af7 100644
--- a/net-misc/secpanel/secpanel-0.41.ebuild
+++ b/net-misc/secpanel/secpanel-0.41.ebuild
@@ -1,22 +1,48 @@
-# Copyright 1999-2003 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-misc/secpanel/secpanel-0.41.ebuild,v 1.1 2003/10/30 11:19:57 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/secpanel/secpanel-0.41.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
-DESCRIPTION="X11 Frontend for OpenSSH"
+DESCRIPTION="Graphical frontend for managing and running SSH and SCP connections"
 HOMEPAGE="http://www.pingx.net/secpanel/"
 
 SRC_URI="http://www.pingx.net/secpanel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~alpha"
-IUSE=""
+KEYWORDS="x86 alpha"
+IUSE="gif"
 
-DEPEND=""
+DEPEND="!gif? ( media-gfx/imagemagick )"
 
 RDEPEND="virtual/ssh dev-lang/tk"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+
+	# optionally remove gifs...
+	if ! use gif; then
+		ebegin "Setting secpanel to use PPM images"
+		sed -i 's/\.gif/\.ppm/g' ${S}/src/bin/secpanel
+		eend $?
+	fi
+}
+
+src_compile() {
+	if ! use gif; then
+		cd ${S}/src/lib/secpanel/images
+		einfo "Converting all GIF images to PPM format..."
+		for i in *.gif
+		do
+			ebegin "	${i} => ${i//.gif/.ppm}"
+			convert ${i} "ppm:${i//.gif/.ppm}" || {
+				eend $?
+				die "convert failed"
+			}
+			eend $?
+		done
+		einfo "done."
+	fi
+}
 
 src_install() {
 	dobin ${S}/src/bin/secpanel
@@ -26,7 +52,12 @@ src_install() {
 	doins ${S}/src/lib/secpanel/*.{tcl,config,profile,dist,wait}
 
 	insinto /usr/lib/secpanel/images
-	doins ${S}/src/lib/secpanel/images/*.gif
+
+	if ! use gif; then
+		doins ${S}/src/lib/secpanel/images/*.ppm
+	else
+		doins ${S}/src/lib/secpanel/images/*.gif
+	fi
 
 	fperms 755 /usr/lib/secpanel/{listserver.tcl,secpanel.dist,secpanel.wait}
 
diff --git a/net-misc/secpanel/secpanel-0.43.ebuild b/net-misc/secpanel/secpanel-0.43.ebuild
index 68c78444ea53..1e5cb39ac451 100644
--- a/net-misc/secpanel/secpanel-0.43.ebuild
+++ b/net-misc/secpanel/secpanel-0.43.ebuild
@@ -1,15 +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-misc/secpanel/secpanel-0.43.ebuild,v 1.1 2004/03/13 15:29:30 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/secpanel/secpanel-0.43.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 DESCRIPTION="Graphical frontend for managing and running SSH and SCP connections"
 HOMEPAGE="http://www.pingx.net/secpanel/"
 
-SRC_URI="http://www.pingx.net/secpanel/${P}.tar.gz"
+SRC_URI="http://www.pingx.net/secpanel/${P/43/4.3}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha ~sparc ~amd64"
 IUSE="gif"
 
 DEPEND="!gif? ( media-gfx/imagemagick )"
diff --git a/net-misc/secpanel/secpanel-0.51.ebuild b/net-misc/secpanel/secpanel-0.51.ebuild
index 55eadfbfc62d..3e0a2740ef41 100644
--- a/net-misc/secpanel/secpanel-0.51.ebuild
+++ b/net-misc/secpanel/secpanel-0.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/secpanel/secpanel-0.51.ebuild,v 1.1 2005/04/19 12:16:26 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/secpanel/secpanel-0.51.ebuild,v 1.1.1.1 2005/11/30 09:55:43 chriswhite Exp $
 
 DESCRIPTION="Graphical frontend for managing and running SSH and SCP connections"
 HOMEPAGE="http://www.pingx.net/secpanel/"
diff --git a/net-misc/selfdhcp/ChangeLog b/net-misc/selfdhcp/ChangeLog
index 514f5ee3a678..9eab41fe11be 100644
--- a/net-misc/selfdhcp/ChangeLog
+++ b/net-misc/selfdhcp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/selfdhcp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/ChangeLog,v 1.1 2004/07/13 15:29:30 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> -selfdhcp-0.2.ebuild:
+  remove broken version - compile fault
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> selfdhcp-0.2.ebuild,
+  selfdhcp-0.2a.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+*selfdhcp-0.2a (25 Aug 2004)
+
+  25 Aug 2004; Michael Imhof <tantive@gentoo.org> selfdhcp-0.2.ebuild,
+  +selfdhcp-0.2a.ebuild:
+  Version bumped. Closes #59209.
 
 *selfdhcp-0.2 (13 Jul 2004)
 
diff --git a/net-misc/selfdhcp/Manifest b/net-misc/selfdhcp/Manifest
index 2894db3729fb..a91f2dfbd30f 100644
--- a/net-misc/selfdhcp/Manifest
+++ b/net-misc/selfdhcp/Manifest
@@ -1,2 +1,13 @@
-MD5 298a2d766c387ef2a9916276662d771c selfdhcp-0.2.ebuild 658
-MD5 7b587bc8dd98655bf66a338fbd02c547 files/digest-selfdhcp-0.2 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8ebe660260cf3f15f0f7fa799c97a2cb ChangeLog 787
+MD5 865d3136b4637fad50637e68ee30418b selfdhcp-0.2a.ebuild 777
+MD5 8dababb85d4f9451707cd1408b1e745c files/digest-selfdhcp-0.2a 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGv+EmdTrptrqvGERAibjAJ9t5sxm9sXi9/gQcMFwBSZ5EmwcqQCfV8YL
+dSgWHiTGS3+ed1/0DGnK2fM=
+=X8ty
+-----END PGP SIGNATURE-----
diff --git a/net-misc/selfdhcp/selfdhcp-0.2a.ebuild b/net-misc/selfdhcp/selfdhcp-0.2a.ebuild
index 62b43f0a3a39..95d5d7d1cc8c 100644
--- a/net-misc/selfdhcp/selfdhcp-0.2a.ebuild
+++ b/net-misc/selfdhcp/selfdhcp-0.2a.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-misc/selfdhcp/selfdhcp-0.2a.ebuild,v 1.1 2004/08/25 16:58:00 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/selfdhcp-0.2a.ebuild,v 1.1.1.1 2005/11/30 09:55:42 chriswhite Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 DEPEND="dev-libs/popt
 		dev-libs/libxml2
 		>=net-libs/libnet-1.0.2
-		>=net-libs/libpcap-0.7"
+		virtual/libpcap"
 
 src_compile() {
 	gnuconfig_update
diff --git a/net-misc/sendfile/ChangeLog b/net-misc/sendfile/ChangeLog
index 7cd1f93ae2cd..84cc0ef0c67b 100644
--- a/net-misc/sendfile/ChangeLog
+++ b/net-misc/sendfile/ChangeLog
@@ -1,8 +1,18 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sendfile/ChangeLog,v 1.1 2002/10/29 18:29:07 aliz Exp $
+# ChangeLog for net-misc/sendfile
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sendfile/ChangeLog,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> sendfile-2.1a.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
+
+  27 Jun 2003; Lars Weiler <pylon@gentoo.org> sendfile-2.1a.ebuild:
+  Added ~ppc to KEYWORDS
 
 *sendfile-2.1a (29 Oct 2002)
 
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> sendfile-2.1a.ebuild:
+  Automated cleanup of LICENSE
+
   29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild submitted by Christopher Sharp <csharp@freeshell.org> in #5738.
diff --git a/net-misc/sendfile/Manifest b/net-misc/sendfile/Manifest
index e69de29bb2d1..474e166fc697 100644
--- a/net-misc/sendfile/Manifest
+++ b/net-misc/sendfile/Manifest
@@ -0,0 +1,3 @@
+MD5 5634e6638ce6474d528c3a06d4ed2269 sendfile-2.1a.ebuild 1391
+MD5 902197eaba82ac75c263d2f58842dc46 ChangeLog 710
+MD5 01198f8e96ceedcb29a617aa0ee84510 files/digest-sendfile-2.1a 65
diff --git a/net-misc/sendfile/sendfile-2.1a.ebuild b/net-misc/sendfile/sendfile-2.1a.ebuild
index b3295ceffa2c..026f922d11ee 100644
--- a/net-misc/sendfile/sendfile-2.1a.ebuild
+++ b/net-misc/sendfile/sendfile-2.1a.ebuild
@@ -1,18 +1,23 @@
-# 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-misc/sendfile/sendfile-2.1a.ebuild,v 1.1 2002/10/29 18:29:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sendfile/sendfile-2.1a.ebuild,v 1.1.1.1 2005/11/30 09:54:42 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Sendfile is a SAFT implementation for UNIX and serves as a tool for asynchronous sending of files in the Internet"
-SRC_URI="ftp://ftp.belwue.de/pub/unix/sendfile/${P}.tar.gz"
+DESCRIPTION="SAFT implementation for UNIX and serves as a tool for asynchronous sending of files in the Internet"
 HOMEPAGE="http://www.belwue.de/projekte/saft/sendfile-us.html"
+SRC_URI="ftp://ftp.belwue.de/pub/unix/sendfile/${P}.tar.gz"
+
+LICENSE="GPL-2"
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 src_compile() {
-	./makeconfig "CFLAGS=\"${CFLAGS}\" BINDIR=/usr/bin MANDIR=/usr/share/man \
-		CONFIG=/etc/sendfile SERVERDIR=/usr/sbin" || die
+	./makeconfig \
+		"CFLAGS=\"${CFLAGS}\" \
+		BINDIR=/usr/bin \
+		MANDIR=/usr/share/man \
+		CONFIG=/etc/sendfile \
+		SERVERDIR=/usr/sbin" || die
 
 	make all || die
 }
@@ -20,7 +25,7 @@ src_compile() {
 src_install() {
 	into /usr
 	dosbin src/sendfiled
-	dobin etc/check_sendfile src/sendfile src/sendmsg src/receive src/fetchfile 
+	dobin etc/check_sendfile src/sendfile src/sendmsg src/receive src/fetchfile
 	dobin src/utf7encode src/wlock etc/sfconf etc/sfdconf
 	dosym /usr/bin/utf7encode /usr/bin/utf7decode
 
@@ -33,13 +38,12 @@ src_install() {
 
 	insinto /etc/sendfile
 	doins etc/sendfile.deny etc/sendfile.cf
-	
+
 	doman doc/sendmsg.1 doc/sendfile.1 doc/receive.1 doc/fetchfile.1
 
-	dodoc doc/AUTHORS doc/COPYING doc/ChangeLog doc/README* doc/THANKS
+	dodoc doc/AUTHORS doc/ChangeLog doc/README* doc/THANKS
 }
 
 pkg_postinst() {
 	einfo "To start the sendfile daemon you have to start Inetd."
-	einfo
 }
diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog
index 77511466e0aa..5272e9b52f80 100644
--- a/net-misc/ser/ChangeLog
+++ b/net-misc/ser/ChangeLog
@@ -1,6 +1,80 @@
 # ChangeLog for net-misc/ser
-# 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/net-misc/ser/ChangeLog,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
+
+  16 Sep 2005; Stefan Knoblich <stkn@gentoo.org> ser-0.9.0.ebuild,
+  ser-0.9.4.ebuild:
+  Fixed default location of configuration file in ser executable
+  by adding a trailing / in src_compile (#106184).
+
+*ser-0.9.4 (12 Sep 2005)
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +ser-0.9.4.ebuild:
+  Version bump.
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org> -ser-0.8.9.ebuild,
+  -ser-0.8.10.ebuild, -ser-0.8.11.ebuild, -ser-0.8.14.ebuild:
+  Removed old versions.
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org> ser-0.9.0.ebuild:
+  Splitted DEPEND into RDEPEND / DEPEND and stable on x86.
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org> files/ser.confd:
+  Added location of config file to default options, because ser is looking for
+  it in the wrong place.
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> ser-0.9.0.ebuild:
+  Use -1 instead of /bin/false on enewuser call.
+
+  15 Jun 2005; David Holm <dholm@gentoo.org> ser-0.9.0.ebuild:
+  Added to ~ppc.
+
+  14 Jun 2005; Jason Wever <weeve@gentoo.org> ser-0.9.0.ebuild:
+  Added ~sparc keyword.
+
+  12 Jun 2005; Stefan Knoblich <stkn@gentoo.org> ser-0.9.0.ebuild:
+  Removed -* keyword, files are on gentoo mirrors now.
+
+*ser-0.9.0 (12 Jun 2005)
+
+  12 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/ethz-1.0-ser-0.9.0.diff, +files/ldap-1.0-ser-0.9.0.diff,
+  +files/ldaps-1.0-ser-0.9.0.diff, +files/silomail-1.0-ser-0.9.0.diff,
+  +files/ser.confd, +files/ser.rc6, +ser-0.9.0.ebuild:
+  Version bump and enhancements.
+
+*ser-0.8.14 (25 Dec 2004)
+
+  25 Dec 2004; Andrej Kacian <ticho@gentoo.org> ser-0.8.10.ebuild,
+  ser-0.8.11.ebuild, +ser-0.8.14.ebuild, ser-0.8.9.ebuild:
+  Version bump. Closes #75627, reported by Daniel Webert
+  <rockoo@rockoo.homelinux.org>. Also changed SRC_URI in all ebuilds to use
+  ${PV}.
+
+  11 Jun 2004; Aron Griffis <agriffis@gentoo.org> ser-0.8.10.ebuild,
+  ser-0.8.11.ebuild, ser-0.8.9.ebuild:
+  Fix use invocation
+
+*ser-0.8.11 (19 Nov 2003)
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> ser-0.8.11.ebuild:
+  Version bumped. Ebuild submitted by Nils Ohlmeier <nils@ohlmeier.de> in #27812.
+
+  12 Jun 2003; <msterret@gentoo.org> ser-0.8.10.ebuild, ser-0.8.9.ebuild:
+  fix Header
+
+*ser-0.8.10 (15 Nov 2002)
+
+  15 Nov 2002; Matt Keadle <mkeadle@gentoo.org> ser-0.9.10.ebuild
+  ChangeLog files/digest-ser-0.8.10:
+
+  Security update. From the iptel.org website: "We discovered the security
+  bug #1 in SER. If the SL module tries to filter ACKs without a To header
+  SER can crash. * We strongly recommend all users to update to version
+  0.8.10."
+
+  Bug #1 is described as "Filtering ACKs without To header with the SL
+  module can crash SER"
 
 *ser-0.8.9 (5 Nov 2002)
   
diff --git a/net-misc/ser/Manifest b/net-misc/ser/Manifest
index e69de29bb2d1..baa6aa9caa31 100644
--- a/net-misc/ser/Manifest
+++ b/net-misc/ser/Manifest
@@ -0,0 +1,11 @@
+MD5 d79189a7036267826e04b6706eafa666 ser-0.9.4.ebuild 3705
+MD5 f58ea218fa5eba027a15efe335ee5990 ChangeLog 3140
+MD5 c3eb4ae44cc1157de9922752ba2cfdaa ser-0.9.0.ebuild 3669
+MD5 731bfb3fccee7dbf639442d29948484c files/silomail-1.0-ser-0.9.0.diff 309
+MD5 f8bde4c96ce030c3857fcb596af4ef74 files/ser.confd 379
+MD5 2bb82ce57ef2641deb39ddc9f0792389 files/digest-ser-0.9.4 343
+MD5 6e319943ee713a85093870eb1c28a0d6 files/ldap-1.0-ser-0.9.0.diff 301
+MD5 16fc6b4f457162a12869d1ac72dc86f5 files/ser.rc6 549
+MD5 60e8a72a005fd298e920e6746c788980 files/ldaps-1.0-ser-0.9.0.diff 342
+MD5 08495f4d275d4340fcb21b69cac7d38c files/digest-ser-0.9.0 343
+MD5 13df81c549263be3a93c93095cac54c2 files/ethz-1.0-ser-0.9.0.diff 378
diff --git a/net-misc/ser/files/ser.confd b/net-misc/ser/files/ser.confd
index 28594a2c6a74..6993ff1631f3 100644
--- a/net-misc/ser/files/ser.confd
+++ b/net-misc/ser/files/ser.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-misc/ser/files/ser.confd,v 1.1 2005/06/12 15:48:26 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/files/ser.confd,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 # Additional options to start SER with
 #
@@ -8,4 +8,4 @@
 #
 # default: run SER as user:group = ser:ser
 #
-SER_OPTS="-u ser -g ser"
+SER_OPTS="-u ser -g ser -f /etc/ser/ser.cfg"
diff --git a/net-misc/ser/files/ser.rc6 b/net-misc/ser/files/ser.rc6
index 85b369d506ca..0c7cf239ed28 100755
--- a/net-misc/ser/files/ser.rc6
+++ b/net-misc/ser/files/ser.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 2002 Frauenhofer Gesellschaft FOKUS, Germany.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/files/ser.rc6,v 1.1 2005/06/12 15:48:26 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/files/ser.rc6,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/ser/ser-0.9.0.ebuild b/net-misc/ser/ser-0.9.0.ebuild
index 739c9b6a90e6..25d2ba84fc00 100644
--- a/net-misc/ser/ser-0.9.0.ebuild
+++ b/net-misc/ser/ser-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.0.ebuild,v 1.1 2005/06/12 15:48:26 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.0.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,16 +21,21 @@ SRC_URI="ftp://ftp.berlios.de/pub/ser/${PV}/src/${P}_src.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-*"
+KEYWORDS="~ppc ~sparc x86"
 
-DEPEND=">=sys-devel/bison-1.35
-	>=sys-devel/flex-2.5.4a
+RDEPEND="
 	mysql? ( >=dev-db/mysql-3.23.52 )
 	radius? ( >=net-dialup/radiusclient-ng-0.5.0 )
 	postgres? ( dev-db/postgresql )
 	jabber? ( dev-libs/expat )
-	ldap? ( net-nds/openldap
-		ssl? ( dev-libs/openssl ))"
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.35
+	>=sys-devel/flex-2.5.4a"
 
 src_unpack() {
 	local modules extmodules MY_A
@@ -86,7 +91,7 @@ src_unpack() {
 	done
 
 	# remove sasl if openldap hasn't been built with it
-	if use ldap && ! built_with_use openldap sasl; then
+	if use ldap && ! built_with_use net-nds/openldap sasl; then
 		sed -i -e "s:-lsasl::g" \
 			${S}/modules/ldap/Makefile
 
@@ -104,7 +109,7 @@ src_compile() {
 	make all \
 		CFLAGS="${CFLAGS}" \
 		cfg-prefix=/ \
-		cfg-target=/etc/ser \
+		cfg-target=/etc/ser/ \
 		${myconf} || die
 }
 
@@ -135,7 +140,7 @@ src_install () {
 	# non-root
 	#
 	enewgroup ser
-	enewuser  ser -1 /bin/false /dev/null ser
+	enewuser  ser -1 -1 /dev/null ser
 
 	chown -R root:ser ${D}/etc/ser
 	chmod 750 ${D}/etc/ser
diff --git a/net-misc/ser/ser-0.9.4.ebuild b/net-misc/ser/ser-0.9.4.ebuild
index 8c8d36ad1378..d186e5490bbd 100644
--- a/net-misc/ser/ser-0.9.4.ebuild
+++ b/net-misc/ser/ser-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.1 2005/09/12 21:30:33 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.1.1.1 2005/11/30 09:55:11 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -109,7 +109,7 @@ src_compile() {
 	make all \
 		CFLAGS="${CFLAGS}" \
 		cfg-prefix=/ \
-		cfg-target=/etc/ser \
+		cfg-target=/etc/ser/ \
 		${myconf} || die
 }
 
diff --git a/net-misc/ser2net/ChangeLog b/net-misc/ser2net/ChangeLog
index b7a8f8a0b743..00f1147b40b0 100644
--- a/net-misc/ser2net/ChangeLog
+++ b/net-misc/ser2net/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-misc/ser2net
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ChangeLog,v 1.1 2004/01/05 11:04:28 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+  16 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ser2net-2.2.ebuild,
+  ser2net-2.2-r1.ebuild:
+  2.2-r1: Readding to ~ppc as it also was dropped, 2.2: Stable on ppc.
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ser2net-2.2-r1.ebuild:
+  Added ~sparc keyword as it was dropped in the version bump.
+
+*ser2net-2.2-r1 (18 Mar 2005)
+
+  18 Mar 2005; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  +files/ser2net-2.2-tcpwrappers-configure.in.patch, +ser2net-2.2-r1.ebuild:
+  ser2net does not actually depend on glib, bug #85569. also make tcp wrappers
+  support optional via the tcpd USE flag.
+
+*ser2net-2.2 (03 Mar 2005)
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +ser2net-2.2.ebuild:
+  New version, bug #83589
+
+  15 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> ser2net-2.1.ebuild:
+  Added to ~ppc.
+
+  10 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> ser2net-2.1.ebuild:
+  Stable on x86 and sparc
 
 *ser2net-2.1 (05 Jan 2004)
 
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index 5f675ac0a3f1..af00a556ccdf 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,2 +1,9 @@
-MD5 ae56dca803b965ff2b27fea26cc0c877 ser2net-2.1.ebuild 476
+MD5 d490569555fb3cf62df92011f3f5ea36 ser2net-2.1.ebuild 567
+MD5 87b612e6d44748bf00a35c1a0c389f73 ser2net-2.2.ebuild 592
+MD5 c546ddef0d0bcf060c017bc93b2dc621 metadata.xml 257
+MD5 5b822cf080f9038736f48216e20b9abc ChangeLog 1310
+MD5 5bc41e425e1a62b31d0edda0bbcb4bfd ser2net-2.2-r1.ebuild 1042
+MD5 7295e582c629d0c67c477124d53f26fc files/digest-ser2net-2.2-r1 63
 MD5 cfc5b849d5aa10d856011fdf00295c96 files/digest-ser2net-2.1 63
+MD5 7295e582c629d0c67c477124d53f26fc files/digest-ser2net-2.2 63
+MD5 f2e8dd3909065a4135fbb65f7b1f2727 files/ser2net-2.2-tcpwrappers-configure.in.patch 571
diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
index 3cc8101c2b83..107a16f3fb80 100644
--- a/net-misc/ser2net/metadata.xml
+++ b/net-misc/ser2net/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>ciaranm@gentoo.org</email>
-  <name>Ciaran McCreesh</name>
-  <description>Feel free to take over maintainership</description>
+  <email>rajiv@gentoo.org</email>
+  <name>Rajiv Aaron Manglani</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/ser2net/ser2net-2.1.ebuild b/net-misc/ser2net/ser2net-2.1.ebuild
index 9ba29a31ed91..241e8aefaf6e 100644
--- a/net-misc/ser2net/ser2net-2.1.ebuild
+++ b/net-misc/ser2net/ser2net-2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ser2net-2.1.ebuild,v 1.1 2004/01/05 11:04:28 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ser2net-2.1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 DESCRIPTION="Serial To Network Proxy"
 SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/ser2net"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-misc/ser2net/ser2net-2.2-r1.ebuild b/net-misc/ser2net/ser2net-2.2-r1.ebuild
index 632bdc4cb757..1cf1bdb12ab7 100644
--- a/net-misc/ser2net/ser2net-2.2-r1.ebuild
+++ b/net-misc/ser2net/ser2net-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/net-misc/ser2net/ser2net-2.2-r1.ebuild,v 1.1 2005/03/18 20:05:43 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ser2net-2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Serial To Network Proxy"
 SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/ser2net"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-misc/ser2net/ser2net-2.2.ebuild b/net-misc/ser2net/ser2net-2.2.ebuild
index 80df802c2fc8..c6073771a4e7 100644
--- a/net-misc/ser2net/ser2net-2.2.ebuild
+++ b/net-misc/ser2net/ser2net-2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ser2net-2.2.ebuild,v 1.1 2005/03/03 20:50:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/ser2net-2.2.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 DESCRIPTION="Serial To Network Proxy"
 SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/ser2net"
 
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-misc/shmux/ChangeLog b/net-misc/shmux/ChangeLog
index 56206d6a070a..a3fb3b0f8b97 100644
--- a/net-misc/shmux/ChangeLog
+++ b/net-misc/shmux/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for net-misc/shmux
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/ChangeLog,v 1.1 2004/07/13 22:21:20 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/ChangeLog,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org> -shmux-1.0_beta5.ebuild,
+  shmux-1.0_beta6.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*shmux-1.0_beta6 (16 Dec 2004)
+
+  16 Dec 2004; Sven Wegener <swegener@gentoo.org> +shmux-1.0_beta6.ebuild:
+  Version bump.
+
+  06 Nov 2004; Sven Wegener <swegener@gentoo.org> -shmux-1.0_beta4.ebuild,
+  shmux-1.0_beta5.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+*shmux-1.0_beta5 (21 Sep 2004)
+
+  21 Sep 2004; Sven Wegener <swegener@gentoo.org> +shmux-1.0_beta5.ebuild:
+  Version bump.
+
+  08 Sep 2004; Sven Wegener <swegener@gentoo.org> -shmux-1.0_beta3.ebuild,
+  shmux-1.0_beta4.ebuild:
+  Marked stable on x86. Removed old ebuild.
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> shmux-1.0_beta3.ebuild:
+  Marked stable on x86.
+
+  13 Aug 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Added longdescription to metadata.xml.
+
+*shmux-1.0_beta4 (08 Aug 2004)
+
+  08 Aug 2004; Sven Wegener <swegener@gentoo.org> +shmux-1.0_beta4.ebuild:
+  Version bump.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> shmux-1.0_beta3.ebuild:
+  Added to ~ppc.
+
+  14 Jul 2004; Sven Wegener <swegener@gentoo.org> shmux-1.0_beta3.ebuild:
+  RDEPEND needs to be in DEPEND
+
+  14 Jul 2004; Sven Wegener <swegener@gentoo.org> shmux-1.0_beta3.ebuild:
+  Added sys-apps/gawk to build time dependencies.
 
 *shmux-1.0_beta3 (14 Jul 2004)
 
diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest
index 17929c2e145a..bec4a660e4cc 100644
--- a/net-misc/shmux/Manifest
+++ b/net-misc/shmux/Manifest
@@ -1,2 +1,14 @@
-MD5 33fd244194e10f0c5140d7d31b8ef8cc shmux-1.0_beta3.ebuild 697
-MD5 144fba546d28c924431ecb975ee22cd9 files/digest-shmux-1.0_beta3 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1c6b8a052933c9592b7f2d7d1c31ecf7 shmux-1.0_beta6.ebuild 795
+MD5 350dfeb083e3dcaf358a26f727963a78 ChangeLog 1703
+MD5 a0fae7a456514165d86dcc501c78e5ae metadata.xml 807
+MD5 adecae3a3e95a2ef39d9dc15a87aa4e3 files/digest-shmux-1.0_beta6 59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB8WYAI1lqEGTUzyQRAl2RAJ4gfOqhl5ma/imPAW+L/0HliTtUdgCgkw7W
+Gd+EfOWm1aukDFNXC6RMe8U=
+=r1+Z
+-----END PGP SIGNATURE-----
diff --git a/net-misc/shmux/metadata.xml b/net-misc/shmux/metadata.xml
index 30045fb9c00f..54b9a66ce7fd 100644
--- a/net-misc/shmux/metadata.xml
+++ b/net-misc/shmux/metadata.xml
@@ -5,7 +5,15 @@
 <maintainer>
   <email>swegener@gentoo.org</email>
     <name>Sven Wegener</name>
-    <description>An ebuild I had in my overlay. Please take over if you want it.</description>
+    <description>primary maintainer</description>
 </maintainer>
-<longdescription></longdescription>
+<longdescription>
+shmux is program for executing the same command on many hosts in parallel.
+For each target, a child process is spawned by shmux, and a shell on the
+target obtained one of the supported methods: rsh, ssh, or sh. The output
+produced by the children is received by shmux and either (optionally)
+output in turn to the user, and/or written to files for later processing.
+The list of targets may either be specified on the command line or be read
+from the standard input.
+</longdescription>
 </pkgmetadata>
diff --git a/net-misc/shmux/shmux-1.0_beta6.ebuild b/net-misc/shmux/shmux-1.0_beta6.ebuild
index 2d28877c2d7e..32c8eaf82af2 100644
--- a/net-misc/shmux/shmux-1.0_beta6.ebuild
+++ b/net-misc/shmux/shmux-1.0_beta6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/shmux/shmux-1.0_beta6.ebuild,v 1.1 2004/12/16 02:36:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/shmux-1.0_beta6.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 MY_P=${P/_beta/b}
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://web.taranis.org/shmux/"
 SRC_URI="http://web.taranis.org/${PN}/dist/${MY_P}.tgz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="pcre"
 
 RDEPEND="pcre? ( dev-libs/libpcre )"
diff --git a/net-misc/shout/ChangeLog b/net-misc/shout/ChangeLog
index 0fc07056c90b..19e6a900f049 100644
--- a/net-misc/shout/ChangeLog
+++ b/net-misc/shout/ChangeLog
@@ -1,11 +1,46 @@
 # ChangeLog for net-misc/shout
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Nov 2004; Chris White <chriswhite@gentoo.org> shout-0.8.0-r2.ebuild:
+  Changed http://www.icecast.org to http://icecast.org for the SRC_URI per bug
+  #70069.
+
+*shout-0.8.0-r2 (05 Sep 2004)
+
+  05 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml,
+  files/variables.diff, -shout-0.8.0-r1.ebuild, +shout-0.8.0-r2.ebuild,
+  -shout-0.8.0.ebuild:
+  Added metadata.xml. Fixed some install problems thanks to Alexander Gretencord
+  <arutha@gmx.de> in bug #57389.
+
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> shout-0.8.0-r1.ebuild,
+  shout-0.8.0.ebuild:
+  Fix compilation failure caused by upstream packaging a .o file.. Bugfix by
+  Olaf Freyer <aaron@cs.tu-berlin.de>
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> shout-0.8.0-r1.ebuild,
+  shout-0.8.0.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*shout-0.8.0-r1 (23 Jul 2002)
+
+  23 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  shout-0.8.0-r1.ebuild, files/digest-shout-0.8.0-r1, files/variables.diff :
+
+  Made shout FHS compliant.
 
 *shout-0.8.0 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> shout-0.8.0.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/shout/Manifest b/net-misc/shout/Manifest
index e69de29bb2d1..4c58069fa15c 100644
--- a/net-misc/shout/Manifest
+++ b/net-misc/shout/Manifest
@@ -0,0 +1,5 @@
+MD5 ecbdc0994498db0f33fb893e98d8909b ChangeLog 1965
+MD5 3db08719ab340f387d5d20c622f1729e shout-0.8.0-r2.ebuild 1008
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 0b75f95937f0f8d238142c325a390e15 files/digest-shout-0.8.0-r2 62
+MD5 7f1390e82e15f4e013b0018ab6de6c52 files/variables.diff 1142
diff --git a/net-misc/shout/files/variables.diff b/net-misc/shout/files/variables.diff
index f0c71c4c661b..afaefbcb2cad 100644
--- a/net-misc/shout/files/variables.diff
+++ b/net-misc/shout/files/variables.diff
@@ -17,4 +17,29 @@ diff -urN shout-0.8.0/Makefile.in shout-0.8.0-modified/Makefile.in
 +logdir = /var/log/shout
  
  DEFS = -I. @DEFS@
+
+--- shout-0.8.0/configure	2000-04-20 09:41:45.000000000 +0200
++++ shout-0.8.0/configure	2004-07-17 17:17:40.000000000 +0200
+@@ -532,20 +532,10 @@
+         prefix=$prefix
+ fi
  
+-if test "x$enable_fsstd" = "xyes"; then
+         echo "FSSTD ENABLED"
+         BINDIR="/usr/bin"
+-        ETCDIR="/etc/icecast"
+-        LOGDIR="/var/log/icecast"
+-else
+-        echo "FSSTD DISABLED"
+-        BINDIR="${prefix}/icecast/bin"
+-        ETCDIR="${prefix}/icecast/etc"
+-        LOGDIR="${prefix}/icecast/log"
+-fi
+-
+-
+-
++        ETCDIR="/etc/shout"
++        LOGDIR="/var/log/shout"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
diff --git a/net-misc/shout/shout-0.8.0-r2.ebuild b/net-misc/shout/shout-0.8.0-r2.ebuild
index 3768770be674..e3dfe394d8a3 100644
--- a/net-misc/shout/shout-0.8.0-r2.ebuild
+++ b/net-misc/shout/shout-0.8.0-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.1 2004/09/05 22:35:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:29 chriswhite Exp $
 
 IUSE=""
 
 inherit eutils
 
 DESCRIPTION="Shout is a program for creating mp3 stream for use with icecast or shoutcast"
-SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
+SRC_URI="http://icecast.org/releases/${P}.tar.gz"
 HOMEPAGE="http://www.icecast.org"
 KEYWORDS="x86 sparc ~ppc"
 LICENSE="GPL-2"
diff --git a/net-misc/sipcalc/ChangeLog b/net-misc/sipcalc/ChangeLog
index cd1416b31d07..98b0b46b8f61 100644
--- a/net-misc/sipcalc/ChangeLog
+++ b/net-misc/sipcalc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/sipcalc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sipcalc/ChangeLog,v 1.1 2004/11/20 14:22:18 ticho Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipcalc/ChangeLog,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
+
+  03 Oct 2005; Andrej Kacian <ticho@gentoo.org> sipcalc-1.1.2.ebuild:
+  Stable on amd64, do not install generic INSTALL document.
+
+  03 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> sipcalc-1.1.2.ebuild:
+  added ~amd64 to KEYWORDS, fixes #87346
+
+  27 Dec 2004; Andrej Kacian <ticho@gentoo.org> sipcalc-1.1.2.ebuild:
+  Stable on x86.
+
+  10 Dec 2004; Jason Wever <weeve@gentoo.org> sipcalc-1.1.2.ebuild:
+  Added ~sparc keyword.
 
 *sipcalc-1.1.2 (20 Nov 2004)
 
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 1998b507ed6b..d0211d98255a 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,2 +1,14 @@
-MD5 2491af624106c98b26c98e239c7f9a6c sipcalc-1.1.2.ebuild 621
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 759f2153159a91f0cab7fc7a806fe5c6 ChangeLog 837
 MD5 025d83b9fa0ed5567e8e9692acf0ff78 files/digest-sipcalc-1.1.2 64
+MD5 72725571aa7f1cccc7b0d1ca542152c9 metadata.xml 348
+MD5 88571c43d1da077f7a6b04b5559955b4 sipcalc-1.1.2.ebuild 621
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQRn4QlM6RnzZP+IRAk+iAJ9JINxFV0Oz/ZXb4B8oFiU5NAflKQCbBRFO
++k2U19glpTA+BTo/UeWzZ54=
+=nvd5
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sipcalc/sipcalc-1.1.2.ebuild b/net-misc/sipcalc/sipcalc-1.1.2.ebuild
index fdd59087c20f..55b71be30545 100644
--- a/net-misc/sipcalc/sipcalc-1.1.2.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.2.ebuild
@@ -1,24 +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/net-misc/sipcalc/sipcalc-1.1.2.ebuild,v 1.1 2004/11/20 14:22:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipcalc/sipcalc-1.1.2.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
-IUSE=""
 DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator."
 HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
-KEYWORDS="~x86"
 SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
 
 DEPEND="virtual/libc"
 
-src_compile() {
-#	econf --prefix="${D}" --bindir="${D}/usr/bin" --mandir="${D}/usr/man" || die "econf failed"
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog AUTHORS COPYING INSTALL NEWS README TODO
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog AUTHORS NEWS README TODO
 }
diff --git a/net-misc/sipsak/ChangeLog b/net-misc/sipsak/ChangeLog
index 93e46d9e4a51..6aea343ee98a 100644
--- a/net-misc/sipsak/ChangeLog
+++ b/net-misc/sipsak/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-misc/sipsak
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/ChangeLog,v 1.1 2003/10/13 20:13:24 stkn Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+  21 Aug 2005; Fabian Groffen <grobian@gentoo.org> sipsak-0.9.1.ebuild:
+  Marking ~ppc-macos (bug #91898)
+
+*sipsak-0.9.1 (21 Aug 2005)
+
+  21 Aug 2005; Daniel Black <dragonheart@gentoo.org> +sipsak-0.9.1.ebuild:
+  version bump. ~ppc keyword added as per bug #91898
+
+  09 May 2005; Stefan Knoblich <stkn@gentoo.org> sipsak-0.8.12.ebuild:
+  Changed HOMEPAGE to new url (bug #91898).
+
+  07 May 2005; Stefan Knoblich <stkn@gentoo.org> sipsak-0.8.6.ebuild:
+  Stable on x86.
+
+*sipsak-0.8.12 (07 May 2005)
+
+  07 May 2005; Stefan Knoblich <stkn@gentoo.org> +sipsak-0.8.12.ebuild:
+  Version bump.
+
+  22 Oct 2004; Jason Wever <weeve@gentoo.org> sipsak-0.8.6.ebuild:
+  Added ~sparc keyword.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> sipsak-0.8.6.ebuild:
+  Typo in DESCRIPTION: comand -> command. Bug 59717.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> sipsak-0.8.6.ebuild:
+  change virtual/glibc to virtual/libc
 
 *sipsak-0.8.6 (13 Oct 2003)
 
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index 85834e90bb91..644fe18db59a 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,4 +1,8 @@
-MD5 c7c8d5a14f7f8fee924117d4136a1c24 sipsak-0.8.6.ebuild 634
+MD5 f1bf4e23e45c32fa3a33ee08f039ab6c sipsak-0.8.12.ebuild 579
+MD5 2866514f7df655b80a5036bbe4edc78d sipsak-0.8.6.ebuild 569
+MD5 c6defefe38a1142dc66d86fe621bd0dd sipsak-0.9.1.ebuild 611
+MD5 cabbb9c25c14429b4db582415faee474 ChangeLog 1312
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 f99cb2830e7e1aafa6217b9a1be5865e ChangeLog 408
 MD5 940affa56618884a75018052679d7dff files/digest-sipsak-0.8.6 65
+MD5 2220372a4422369074370bdd16dece71 files/digest-sipsak-0.9.1 64
+MD5 664d12107bdc14c139ce9a5f6dc6c4fe files/digest-sipsak-0.8.12 65
diff --git a/net-misc/sipsak/sipsak-0.8.12.ebuild b/net-misc/sipsak/sipsak-0.8.12.ebuild
index 91fe704f8464..90ba0c740e00 100644
--- a/net-misc/sipsak/sipsak-0.8.12.ebuild
+++ b/net-misc/sipsak/sipsak-0.8.12.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/net-misc/sipsak/sipsak-0.8.12.ebuild,v 1.1 2005/05/07 14:18:03 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.8.12.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 IUSE=""
 
 DESCRIPTION="small command line tool for testing SIP applications and devices"
-HOMEPAGE="http://sipsak.berlios.de/"
+HOMEPAGE="http://sipsak.org/"
 SRC_URI="http://download.berlios.de/sipsak/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14,12 +14,6 @@ KEYWORDS="~x86 ~sparc"
 
 DEPEND="virtual/libc"
 
-src_compile() {
-	econf || die "configure failed"
-
-	emake || die "make failed"
-}
-
 src_install() {
 	einstall || die "install failed"
 
diff --git a/net-misc/sipsak/sipsak-0.8.6.ebuild b/net-misc/sipsak/sipsak-0.8.6.ebuild
index 8edba1dfbea3..802afc42058b 100644
--- a/net-misc/sipsak/sipsak-0.8.6.ebuild
+++ b/net-misc/sipsak/sipsak-0.8.6.ebuild
@@ -1,25 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.8.6.ebuild,v 1.1 2003/10/13 20:13:24 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.8.6.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 IUSE=""
 
-DESCRIPTION="small comand line tool for testing SIP applications and devices"
+DESCRIPTION="small command line tool for testing SIP applications and devices"
 HOMEPAGE="http://sipsak.berlios.de/"
 SRC_URI="http://download.berlios.de/sipsak/${P}-1.tar.gz"
-S=${WORKDIR}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc"
 
-DEPEND="virtual/glibc"
-
-src_compile() {
-	econf || die
-
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
 	einstall || die
diff --git a/net-misc/sipsak/sipsak-0.9.1.ebuild b/net-misc/sipsak/sipsak-0.9.1.ebuild
index 6aedbd5a75db..11a936fbe5b3 100644
--- a/net-misc/sipsak/sipsak-0.9.1.ebuild
+++ b/net-misc/sipsak/sipsak-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/net-misc/sipsak/sipsak-0.9.1.ebuild,v 1.1 2005/08/21 05:49:30 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sipsak/sipsak-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.berlios.de/sipsak/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc ~ppc-macos ~sparc ~x86"
 
 DEPEND="virtual/libc"
 
diff --git a/net-misc/sitecopy/ChangeLog b/net-misc/sitecopy/ChangeLog
index ed0e9f692ef7..a4ec132ed261 100644
--- a/net-misc/sitecopy/ChangeLog
+++ b/net-misc/sitecopy/ChangeLog
@@ -1,11 +1,119 @@
 # ChangeLog for net-misc/sitecopy
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
-*sitecopy-0.10.12-r1 (1 Feb 2002)
+*sitecopy-0.16.0 (10 Sep 2005)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  10 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -sitecopy-0.10.12-r1.ebuild, -sitecopy-0.12.1.ebuild,
+  -sitecopy-0.13.4.ebuild, -sitecopy-0.13.4-r1.ebuild,
+  -sitecopy-0.14.1.ebuild, -sitecopy-0.14.2.ebuild, -sitecopy-0.14.3.ebuild,
+  +sitecopy-0.16.0.ebuild:
+  version bump and old version cleanout
+
+*sitecopy-0.15.1 (25 May 2005)
+
+  25 May 2005; Chris White <chriswhite@gentoo.org> +sitecopy-0.15.1.ebuild:
+  Version bump to 0.15.1. Closes bug #89300. New features include sftp and
+  usage of libneon external for various functionality.
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> metadata.xml:
+  Remove retired developer from metadata.xml.
+
+  30 Jan 2005; Tom Martin <slarti@gentoo.org> sitecopy-0.14.3.ebuild:
+  Marked ~amd64.
+
+*sitecopy-0.14.3 (05 Jan 2005)
+
+  05 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/sitecopy-gcc3.4.patch, +sitecopy-0.14.3.ebuild:
+  Fixed bug #76582 and added a nice gcc3.4 patch to go with it.
+
+*sitecopy-0.14.2 (03 Oct 2004)
+
+  03 Oct 2004; Chris White <chriswhite@gentoo.org> +sitecopy-0.14.2.ebuild:
+  Bumped to 0.14.2. Thanks goes to Daniel Webert <rockoo@rockoo.homelinux.org>
+  for reporting. This closes bug #66157.
+
+*sitecopy-0.14.1 (16 Sep 2004)
+
+  16 Sep 2004; Chris White <chriswhite@gentoo.org>
+  +files/sitecopy-0.14.1-nls.patch, +sitecopy-0.14.1.ebuild:
+  Updated to version 0.14.1 as per bug #63855. Cleaned the ebuild logic up some
+  (use_with and use_enable). Removed some of the gnome fixes that are no longer
+  required. Crunched down the xsitecopy and sitecopy build decision to one or
+  the other. Fixed an nls issue while I was at it.
+
+  14 Aug 2004; Chris White <chriswhite@gentoo.org> sitecopy-0.13.4-r2.ebuild:
+  Marked stable on x86.  Closes stable marking for bug #51585.
+
+  07 Aug 2004; Jason Wever <weeve@gentoo.org> sitecopy-0.13.4-r2.ebuild:
+  Stable on sparc wrt bug #51585.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> :
+  Added to ~ppc.
+
+*sitecopy-0.13.4-r2 (17 Jul 2004)
+
+  17 Jul 2004; Chris White <chriswhite@gentoo.org> +sitecopy-0.13.4-r2.ebuild:
+  Updated to -r2 which fixes security Bug #51585.  Added myself as maintainer
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> sitecopy-0.10.12-r1.ebuild,
+  sitecopy-0.12.1.ebuild, sitecopy-0.13.4-r1.ebuild, sitecopy-0.13.4.ebuild:
+  change virtual/glibc to virtual/libc
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> sitecopy-0.10.12-r1.ebuild,
+  sitecopy-0.12.1.ebuild, sitecopy-0.13.4-r1.ebuild, sitecopy-0.13.4.ebuild:
+  Fix use invocation
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> sitecopy-0.13.4-r1.ebuild:
+  Add die following econf for bug 48950
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> sitecopy-0.12.1.ebuild,
+  sitecopy-0.13.4.ebuild:
+  Add die following econf for bug 48950
+
+*sitecopy-0.13.4-r1 (19 Oct 2003)
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> sitecopy-0.13.4-r1.ebuild:
+  added nls use flag, fixed installing of sitecopy when gnome is set
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> sitecopy-0.11.4.ebuild,
+  sitecopy-0.13.4.ebuild:
+  added gnome support, marked 13.4 stable
+
+*sitecopy-0.13.4 (31 Aug 2003)
+
+  31 Aug 2003; Martin Holzer <mholzer@gentoo.org> sitecopy-0.13.4.ebuild:
+  Version bumped.
+
+*sitecopy-0.12.1 (28 Apr 2003)
+
+  28 Apr 2003; Martin Holzer <mholzer@gentoo.org> sitecopy-0.12.1.ebuild:
+  Version bumped. Submitted by Hans Meine <gentoobug@chiefrocker.net> in #20107.
+
+  15 Dec 2002; Maik Schreiber <blizzy@gentoo.org> sitecopy-0.10.12-r1.ebuild:
+  Fixed sandbox violation (bug #10107, thanks to Bob Paddock
+  <bpaddock@csonline.net>).
+
+*sitecopy-0.11.4 (15 Dec 2002)
+
+  15 Dec 2002; Maik Schreiber <blizzy@gentoo.org> : New version.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  29 Oct 2002; Mike Frysinger <vapier@gentoo.org> : Cleanup / HOMEPAGE fix
+  (#9933)
+
+  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org>
+  sitecopy-0.10.12-r1.ebuild: Added ppc to keywords.
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> sitecopy-0.10.12-r1.ebuild:
+  Added KEYWORDS, LICENSE, SLOT.
+
+*sitecopy-0.10.12-r1 (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
   comments should well explained and written in clean English. The details about
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 245ef3b6d8cd..6da51b8eca73 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -1,7 +1,20 @@
-MD5 00db1d671b9cc9681e014667281147eb ChangeLog 1333
-MD5 187f73bae3eeae7871f2bb88fa2b53ab sitecopy-0.10.12-r1.ebuild 996
-MD5 d64c12eed3c7abbcdfba85a5486b5bfc sitecopy-0.11.4.ebuild 831
-MD5 c6b5f195933bc9aff491d34053195247 sitecopy-0.12.1.ebuild 1148
-MD5 09b3e7444248285b787fa3635d41aedc files/digest-sitecopy-0.10.12-r1 68
-MD5 33ca043ac941860223413b8d1ddc5d1f files/digest-sitecopy-0.11.4 67
-MD5 3ee0433186f6f3224dff93ab6818a119 files/digest-sitecopy-0.12.1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6c6d0ce57d673aff0ad1efb92dbf0cc1 ChangeLog 4751
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 d3286f6a00ba6935bf983d28040f63d0 sitecopy-0.13.4-r2.ebuild 1951
+MD5 a5aaa1005bcb0bec44f71e07c5e26006 sitecopy-0.15.1.ebuild 2793
+MD5 25fbd9090ba5b29d5013a4c918abf0bb sitecopy-0.16.0.ebuild 2769
+MD5 a9f8ec12aecca50ec49648f0a8c2829f files/digest-sitecopy-0.16.0 67
+MD5 2181dd9a02cbcac0257406ff7a30a37b files/digest-sitecopy-0.13.4-r2 67
+MD5 9d2f1b627c2e64ada7b81ea3fa5ee51d files/sitecopy-0.14.1-nls.patch 598
+MD5 1dfe28809075352e0eed13c4a713b728 files/sitecopy-gcc3.4.patch 493
+MD5 fdd1c7334ee674439936fa8eed17cfcc files/digest-sitecopy-0.15.1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIoT2mdTrptrqvGERAjtJAKCN5j/VzblMr1zKXwNkcfTZ2EEK0QCeOjDr
+T9VQKZ/94jbah1OjaC8p8Qs=
+=IR8C
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index b452dec7e591..20ce219711a2 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/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/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild b/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild
index f4639fde3aec..e7b3bae6d38d 100644
--- a/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild,v 1.1 2004/07/16 17:11:05 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.13.4-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 IUSE="ssl xml xml2 gnome nls"
 
 DESCRIPTION="sitecopy is for easily maintaining remote web sites"
 SRC_URI="http://www.lyra.org/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.lyra.org/sitecopy/"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-misc/sitecopy/sitecopy-0.15.1.ebuild b/net-misc/sitecopy/sitecopy-0.15.1.ebuild
index cbee59fa6e42..db1274993058 100644
--- a/net-misc/sitecopy/sitecopy-0.15.1.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.15.1.ebuild,v 1.1 2005/05/25 05:23:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.15.1.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,8 +19,8 @@ SLOT="0"
 #			gnome-base/gnome-libs
 #			=x11-libs/gtk+-1* )
 DEPEND="virtual/libc
-	rsh? (net-misc/netkit-rsh)
-	sftp? (net-misc/openssh)
+	rsh? ( net-misc/netkit-rsh )
+	sftp? ( net-misc/openssh )
 	>=net-misc/neon-0.24.6"
 
 pkg_setup() {
@@ -50,20 +50,20 @@ src_compile() {
 	einfo "therefore support must be built into neon."
 
 	if use zlib ; then
-		built_with_use neon zlib || die "neon needs zlib support"
+		built_with_use net-misc/neon zlib || die "neon needs zlib support"
 	fi
 
 	if use ssl ; then
-		built_with_use neon ssl || die "neon needs ssl support"
+		built_with_use net-misc/neon ssl || die "neon needs ssl support"
 		myconf="${myconf} --with-ssl=openssl"
 	fi
 
 	if use expat ; then
-		built_with_use neon expat || die "neon needs expat support"
+		built_with_use net-misc/neon expat || die "neon needs expat support"
 	fi
 
 	if use xml2 ; then
-		built_with_use neon expat && die "neon needs expat support disabled for
+		built_with_use net-misc/neon expat && die "neon needs expat support disabled for
 		xml2 support to be enabled"
 	fi
 
diff --git a/net-misc/sitecopy/sitecopy-0.16.0.ebuild b/net-misc/sitecopy/sitecopy-0.16.0.ebuild
index f20019474b44..f14d1f70ac99 100644
--- a/net-misc/sitecopy/sitecopy-0.16.0.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.0.ebuild,v 1.1 2005/09/10 07:01:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.0.ebuild,v 1.1.1.1 2005/11/30 09:55:28 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/net-misc/slidentd/ChangeLog b/net-misc/slidentd/ChangeLog
index 65872f7c3539..140638e60565 100644
--- a/net-misc/slidentd/ChangeLog
+++ b/net-misc/slidentd/ChangeLog
@@ -1,16 +1,43 @@
 # ChangeLog for net-misc/slidentd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/ChangeLog,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
-*slidentd-0.0.15 (05 Apr 2002)
+  28 Aug 2005; Mike Frysinger <vapier@gentoo.org> -slidentd-0.0.15.ebuild,
+  slidentd-1.0.0.ebuild:
+  Punt dietlibc cruft.
 
-  25 Apr 2002; Thilo Bangert <thilo.bangert@gmx.net> slidentd-0.0.15 :
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> slidentd-0.0.15.ebuild:
+  Dependency update: sys-apps/daemontools -> sys-process/daemontools.
 
-  fixed ucspi-tcp depandency
+  31 Aug 2004; Daniel Black <dragonheart@gentoo.org> slidentd-1.0.0.ebuild:
+  removed RDEPEND=sys-apps/ucspi-tcp. Fixes bug #35511. Thanks Sascha
+
+  06 Jun 2004; Daniel Black <dragonheart@gentoo.org> slidentd-1.0.0.ebuild:
+  QA - IUSE S=
 
+  13 May 2004; David Holm <dholm@gentoo.org> slidentd-1.0.0.ebuild:
+  Added to ~ppc.
 
+*slidentd-1.0.0 (13 May 2004)
+
+  13 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  files/slidentd-run, +slidentd-1.0.0.ebuild:
+  version bump and changes as per bug #35511. Thanks to Thilo Bangert
+  <fizzelpark-lists@gmx.net>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *slidentd-0.0.15 (25 Mar 2002)
 
-  25 Mar 2002; Thilo Bangert <thilo.bangert@gmx.net> ChangeLog :
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> slidentd-0.0.15.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
 
+  29 Apr 2002; Thilo Bangert <bangert@gentoo.org> slidentd-0.0.15 :
+  adjusted run file so slidentd runs with wheel group permissions (needed for grsecurity)
+  added run-file
+
+  25 Apr 2002; Thilo Bangert <thilo.bangert@gmx.net> slidentd-0.0.15 :
+  fixed ucspi-tcp depandency
+
+  25 Mar 2002; Thilo Bangert <thilo.bangert@gmx.net> ChangeLog :
   initial release ;-)
diff --git a/net-misc/slidentd/Manifest b/net-misc/slidentd/Manifest
index e69de29bb2d1..c0ac2e4e26eb 100644
--- a/net-misc/slidentd/Manifest
+++ b/net-misc/slidentd/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 e6279a286e8ac53a4ab748aa55ee2aea slidentd-1.0.0.ebuild 1011
+MD5 2d1c5615fd5d0a4e1a2bfd3539ebcd83 ChangeLog 1630
+MD5 1b48eba45c46d9cb2f340b54c6ccb594 files/digest-slidentd-1.0.0 65
+MD5 7941403451e35e669a28d6472eb33db5 files/slidentd-run 234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNoAagIKl8Uu19MoRAvrPAJwPDFHZpSY7g7W04EYptWpxeJzYtgCeL+J+
+zcmbD0yQhngSP5HGGv7uZeA=
+=4C37
+-----END PGP SIGNATURE-----
diff --git a/net-misc/slidentd/files/slidentd-run b/net-misc/slidentd/files/slidentd-run
index d2dff06c646d..2ffe3420f906 100644
--- a/net-misc/slidentd/files/slidentd-run
+++ b/net-misc/slidentd/files/slidentd-run
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 AUTH_USERID=`id -u nobody`
-AUTH_GRPID=`id -g wheel`
+AUTH_GRPID=`id -g nobody`
 
 exec 2>&1
 exec env - /usr/bin/softlimit -d64000 -c0 -l0 -s64000 -a3000000 -o10 \
diff --git a/net-misc/slidentd/slidentd-1.0.0.ebuild b/net-misc/slidentd/slidentd-1.0.0.ebuild
index 0131b0cb7c07..04d808999039 100644
--- a/net-misc/slidentd/slidentd-1.0.0.ebuild
+++ b/net-misc/slidentd/slidentd-1.0.0.ebuild
@@ -1,42 +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-misc/slidentd/slidentd-1.0.0.ebuild,v 1.1 2004/05/13 03:21:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/slidentd-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A secure, lightweight ident daemon."
-SRC_URI="http://www.uncarved.com/slidentd/${P}.tar.gz"
+DESCRIPTION="A secure, lightweight ident daemon"
 HOMEPAGE="http://www.uncarved.com/slidentd/"
-KEYWORDS="x86 sparc "
+SRC_URI="http://www.uncarved.com/slidentd/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~ppc sparc x86"
+IUSE=""
 
-DEPEND="dev-libs/dietlibc
-	dev-libs/libowfat
-	>=sys-apps/sed-4"
-
-RDEPEND="virtual/inetd
-	sys-apps/ucspi-tcp"
+DEPEND="dev-libs/libowfat"
+RDEPEND="${DEPEND}
+	virtual/inetd"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	sed -i -e "s:^\tCFLAGS=\$(diet_cflag.*:\tCFLAGS=${CFLAGS} \${diet_cflags}:" \
-		-e "s:^\tCC\:=diet -Os \$(CC):\tCC\:=diet -Os gcc:" \
-		Makefile
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^normal_cflags/s:=.*:=-DNDEBUG ${CFLAGS} -I/usr/include/libowfat:" \
+		-e '/ALL=/s:stripobjects::' \
+		-e '/ALL=/s:strip::' \
+		Makefile || die
 }
 
 src_compile() {
-	make build_mode=diet INCLUDES=-I/usr/include/libowfat LIBDIRS=-L/usr/lib || die
+	emake -j1 build_mode=normal || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	exeinto /var/lib/supervise/slidentd
-	newexe ${FILESDIR}/slidentd-run run
+	newexe "${FILESDIR}"/slidentd-run run
 }
 
 pkg_postinst() {
 	einfo "You need to start your supervise service:"
-	einfo '# ln -s /var/lib/supervise/slidentd/ /service'
-	einfo
+	einfo '# ln -s /var/lib/supervise/slidentd /service/'
 }
diff --git a/net-misc/smb4k/ChangeLog b/net-misc/smb4k/ChangeLog
index 4258e88022f5..529093d987a2 100644
--- a/net-misc/smb4k/ChangeLog
+++ b/net-misc/smb4k/ChangeLog
@@ -1,6 +1,124 @@
 # ChangeLog for net-misc/smb4k
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/ChangeLog,v 1.1 2003/08/12 03:16:32 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/ChangeLog,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
+
+  05 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> smb4k-0.6.4.ebuild:
+  Stable on amd64, bug 111089.
+
+  03 Nov 2005; Mark Loeser <halcy0n@gentoo.org> smb4k-0.6.4.ebuild:
+  Stable on x86; bug #111089
+
+  02 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> smb4k-0.6.4.ebuild:
+  Stable on ppc.
+
+*smb4k-0.6.4 (01 Nov 2005)
+
+  01 Nov 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.6.4.ebuild:
+  version bump
+
+  26 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> -smb4k-0.5.2.ebuild:
+  Clean out old version.
+
+  26 Oct 2005; Tobias Scherbaum <dertobi123@gentoo.org> smb4k-0.6.3.ebuild:
+  Marked ppc stable, bug #109814
+
+  26 Oct 2005; Mark Loeser <halcy0n@gentoo.org> smb4k-0.6.3.ebuild:
+  Stable on x86; bug #109814
+
+  25 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> smb4k-0.6.3.ebuild:
+  Stable on amd64, bug 109814.
+
+*smb4k-0.6.3 (01 Sep 2005)
+
+  01 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +smb4k-0.6.3.ebuild:
+  Updated to last upstream version.
+
+*smb4k-0.6.1 (07 Aug 2005)
+
+  07 Aug 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.6.1.ebuild:
+  version bump
+
+*smb4k-0.6.0 (18 Jun 2005)
+
+  18 Jun 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.6.0.ebuild:
+  version bump
+
+  18 Jun 2005; Carsten Lohrke <carlo@gentoo.org> smb4k-0.5.2.ebuild:
+  stable on x86
+
+*smb4k-0.5.2 (28 Mar 2005)
+
+  28 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.5.2.ebuild:
+  version bump
+
+  25 Mar 2005; Carsten Lohrke <carlo@gentoo.org> smb4k-0.5.1.ebuild:
+  stable on x86
+
+*smb4k-0.5.1 (31 Jan 2005)
+
+  31 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.5.1.ebuild:
+  version bump
+
+*smb4k-0.5.0 (12 Jan 2005)
+
+  12 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.5.0.ebuild,
+  -smb4k-0.5.0_pre2.ebuild, -smb4k-0.5.0_pre3.ebuild:
+  version bump
+
+*smb4k-0.5.0_pre3 (11 Jan 2005)
+
+  11 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +smb4k-0.5.0_pre3.ebuild:
+  version bump
+
+*smb4k-0.5.0_pre2 (02 Dec 2004)
+
+  02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> -smb4k-0.3.1.ebuild,
+  -smb4k-0.3.2.ebuild, +smb4k-0.5.0_pre2.ebuild:
+  version bump
+
+  15 Oct 2004; Carsten Lohrke <carlo@gentoo.org> smb4k-0.4.1a.ebuild:
+  stable on x86, minor fixes
+
+*smb4k-0.4.1a (07 Sep 2004)
+
+  07 Sep 2004; Carsten Lohrke <carlo@gentoo.org> -smb4k-0.4.0.ebuild,
+  -smb4k-0.4.1.ebuild, +smb4k-0.4.1a.ebuild:
+  data loss on remote shares possible in previous versions
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> smb4k-0.4.1.ebuild:
+  Added to ~ppc.
+
+*smb4k-0.4.1 (02 Sep 2004)
+
+  02 Sep 2004; <mglauche@gentoo.org> smb4k-0.4.1.ebuild:
+  Version bump, thanks to Volkov Peter <torre_cremata@mail.ru> for reporting
+  it. Bug #62518
+
+  28 Jun 2004; Michael Glauche <mglauche@gentoo.org> smb4k-0.3.2.ebuild,
+  smb4k-0.4.0.eubild
+  Small fixes for bug #55392, added samba RDEPEND
+
+  22 Jun 2004; <malc@gentoo.org> smb4k-0.4.0.ebuild:
+  Added ~amd64 keyword, fixes bug #54586
+
+*smb4k-0.4.0 (15 May 2004)
+
+  15 May 2004; Dominik Stadler <centic@gentoo.org> smb4k-0.4.0.eubild:
+  Add new Version 0.4.0, see Bug 40414
+
+*smb4k-0.3.2 (10 Feb 2004)
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> smb4k-0.2.1.ebuild,
+  smb4k-0.3.0a.ebuild, smb4k-0.3.2.ebuild:
+  Version bump
+
+  17 Nov 2003; Caleb Tennis <caleb@gentoo.org> :
+  Version bump
+
+*smb4k-0.3.0a (31 Oct 2003)
+
+  31 Oct 2003; Caleb Tennis <caleb@gentoo.org> metadata.xml, smb4k-0.3.0a.ebuild:
+  Version bump
 
 *smb4k 0.2.1 (14 Jul 2003)
 
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 6b80b1e79e12..4dd08042e157 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,4 @@
-MD5 a5c91ee873fa8347ba7c56200ed31b7a smb4k-0.2.1.ebuild 780
-MD5 719fe281cd2ae2f556f4024f91528143 ChangeLog 972
-MD5 90598caf738b27ceab90343ed28f2370 files/digest-smb4k-0.2.1 63
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ba9b9fdd8d95e00fef45474dbaffcc49 ChangeLog 4388
+MD5 3fab3de79533466ee1ef0288d8c79c66 smb4k-0.6.4.ebuild 664
+MD5 b3f1096a055c2ec9a63d5e4dac9978fe files/digest-smb4k-0.6.4 64
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/net-misc/smb4k/smb4k-0.6.4.ebuild b/net-misc/smb4k/smb4k-0.6.4.ebuild
index e4e73d16c3af..055b623fcb9d 100644
--- a/net-misc/smb4k/smb4k-0.6.4.ebuild
+++ b/net-misc/smb4k/smb4k-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/net-misc/smb4k/smb4k-0.6.4.ebuild,v 1.1 2005/11/01 22:22:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smb4k/smb4k-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:55:17 chriswhite Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/smb4k/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="|| ( kde-base/konqueror kde-base/kdebase )"
diff --git a/net-misc/smbc/ChangeLog b/net-misc/smbc/ChangeLog
index 07ef345b0d6a..b94958f54aad 100644
--- a/net-misc/smbc/ChangeLog
+++ b/net-misc/smbc/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/smbc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/ChangeLog,v 1.1 2004/12/20 10:34:06 satya Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+  11 Mar 2005; David Holm <dholm@gentoo.org> smbc-1.1.2.ebuild:
+  Added to ~ppc.
+
+*smbc-1.1.2 (03 Mar 2005)
+
+  03 Mar 2005; <mglauche@gentoo.org> +smbc-1.1.2.ebuild:
+  Version bump, thanks to Maciej Milewski <milu@data.pl> for the info.
+
+*smbc-1.0.0-r1 (20 Dec 2004)
+
+  20 Dec 2004; Christian Andreetta <satya@gentoo.org> +smbc-1.0.0-r1.ebuild:
+  two new iuse: debug and nls
 
 *smbc-1.0.0 (20 Dec 2004)
 
diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
index 454e8838ab60..e8a58e5b9270 100644
--- a/net-misc/smbc/Manifest
+++ b/net-misc/smbc/Manifest
@@ -1,3 +1,8 @@
-MD5 6522474c0b7dde0d44d53a4462329740 smbc-1.0.0.ebuild 480
+MD5 1e72e25d22ff9514d24334c89e498921 ChangeLog 742
 MD5 a3665e128a015f76d338a0ffa9bddc6f metadata.xml 583
+MD5 a80752ac2c7669ed0f06cb2e0ca99f10 smbc-1.0.0-r1.ebuild 1036
+MD5 97d814dc3ca6943a1e48689fd8bb836f smbc-1.0.0.ebuild 575
+MD5 ab8d4f5cfc9ced22720dd18d6767a86e smbc-1.1.2.ebuild 1027
 MD5 ef1e3219b3541a6c231f97810f71e848 files/digest-smbc-1.0.0 59
+MD5 ef1e3219b3541a6c231f97810f71e848 files/digest-smbc-1.0.0-r1 59
+MD5 37dcc260c672d7c939bab4114603618f files/digest-smbc-1.1.2 60
diff --git a/net-misc/smbc/smbc-1.0.0-r1.ebuild b/net-misc/smbc/smbc-1.0.0-r1.ebuild
index c67ea4b2bc0d..1fcd0ff32155 100644
--- a/net-misc/smbc/smbc-1.0.0-r1.ebuild
+++ b/net-misc/smbc/smbc-1.0.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/net-misc/smbc/smbc-1.0.0-r1.ebuild,v 1.1 2004/12/20 15:09:09 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/smbc-1.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 DESCRIPTION="A text mode (ncurses) SMB network commander. Features: resume and UTF-8"
 HOMEPAGE="http://smbc.airm.net/en/index.php"
diff --git a/net-misc/smbc/smbc-1.0.0.ebuild b/net-misc/smbc/smbc-1.0.0.ebuild
index 5eb1bcfbdcd7..41eac40d06c3 100644
--- a/net-misc/smbc/smbc-1.0.0.ebuild
+++ b/net-misc/smbc/smbc-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/net-misc/smbc/smbc-1.0.0.ebuild,v 1.1 2004/12/20 10:34:06 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/smbc-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 DESCRIPTION="A text mode (ncurses) SMB network commander. Features: resume and UTF-8"
 HOMEPAGE="http://smbc.airm.net/en/index.php"
diff --git a/net-misc/smbc/smbc-1.1.2.ebuild b/net-misc/smbc/smbc-1.1.2.ebuild
index c0a789d6ca8e..40cbc7986355 100644
--- a/net-misc/smbc/smbc-1.1.2.ebuild
+++ b/net-misc/smbc/smbc-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/smbc-1.1.2.ebuild,v 1.1 2005/03/03 10:03:38 mglauche Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/smbc-1.1.2.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 DESCRIPTION="A text mode (ncurses) SMB network commander. Features: resume and UTF-8"
 HOMEPAGE="http://smbc.airm.net/en/index.php"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="nls debug"
 
 DEPEND="sys-devel/gcc
diff --git a/net-misc/smbget/ChangeLog b/net-misc/smbget/ChangeLog
index 1379c03dd315..5d68fd67fd98 100644
--- a/net-misc/smbget/ChangeLog
+++ b/net-misc/smbget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/smbget
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smbget/ChangeLog,v 1.1 2004/01/22 01:07:23 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbget/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
+
+  26 Jun 2005; Simon Stelling <blubb@gentoo.org> smbget-0.6.ebuild:
+  added ~amd64 keyword
+
+  26 May 2004; Jason Wever <weeve@gentoo.org> smbget-0.6.ebuild:
+  Added ~sparc keyword.
 
 *smbget-0.6 (21 Jan 2004)
 
diff --git a/net-misc/smbget/Manifest b/net-misc/smbget/Manifest
index c10334f75842..88bc458f6f93 100644
--- a/net-misc/smbget/Manifest
+++ b/net-misc/smbget/Manifest
@@ -1,2 +1,3 @@
-MD5 e7cb4940eee8a950cf66a3547247140d smbget-0.6.ebuild 675
+MD5 dbfe62ff232e243320ac8124c89de869 ChangeLog 532
+MD5 3b5bb9fed8383f8a0d17c913b8eabbee smbget-0.6.ebuild 633
 MD5 387d019e03d89291ce2b0ab8a3f12db3 files/digest-smbget-0.6 61
diff --git a/net-misc/smbget/smbget-0.6.ebuild b/net-misc/smbget/smbget-0.6.ebuild
index 3298a1a514a3..c558a50967a8 100644
--- a/net-misc/smbget/smbget-0.6.ebuild
+++ b/net-misc/smbget/smbget-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smbget/smbget-0.6.ebuild,v 1.1 2004/01/22 01:07:23 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbget/smbget-0.6.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
 DESCRIPTION="a simple wget-like tool for the SMB/CIFS protocol"
 HOMEPAGE="http://jelmer.vernstok.nl/oss/smbget/"
@@ -8,7 +8,8 @@ SRC_URI="http://jelmer.vernstok.nl/oss/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~sparc x86"
+IUSE=""
 
 DEPEND="net-fs/samba
 	dev-libs/popt"
@@ -18,7 +19,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin smbget || die  
+	dobin smbget || die
 	doman smbget.1 smbgetrc.5
 	dodoc AUTHORS ChangeLog README TODO smbgetrc
 }
diff --git a/net-misc/snarf/ChangeLog b/net-misc/snarf/ChangeLog
index 04957bfd50c6..e1e8f7e30056 100644
--- a/net-misc/snarf/ChangeLog
+++ b/net-misc/snarf/ChangeLog
@@ -1,11 +1,63 @@
 # ChangeLog for net-misc/snarf
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/snarf/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/snarf/ChangeLog,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
-*snarf-7.0-r1 (1 Feb 2002)
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> snarf-7.0-r2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  26 Apr 2004; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r2.ebuild:
+  updated description, fixing #49055
+
+  25 Mar 2004; Jason Wever <weeve@gentoo.org> snarf-7.0-r2.ebuild:
+  Stable on sparc.
+
+  19 Mar 2004; Jason Wever <weeve@gentoo.org> snarf-7.0-r2.ebuild:
+  Added ~sparc keyword.
+
+  24 Oct 2003; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r2.ebuild:
+  src_compile isnt required.
+  using virtual/glibc, instead of >=sys-libs/glibc-2.1.3
+  `into` command not required.
+
+  20 Oct 2003; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r2.ebuild:
+  s/make/emake/
+
+  20 Oct 2003; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r2.ebuild:
+  adding a postinst blurb with commands to enable snarf for portage
+  downloading.
+
+  20 Oct 2003; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r2.ebuild:
+  marking stable.
+
+*snarf-7.0-r2 (01 Aug 2003)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  01 Aug 2003; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r2.ebuild,
+  files/snarf-basename-patch.diff, files/snarf-unlink-empty.diff:
+  Adding a new ebuild that contains two new patches i've created, 
+  a patch that unlinks empty files (essential for developer use with 
+  snarf as a FETCHCOMMAND), and a patch that adds a -b/-B option to 
+  only display the basename of the output, useful for use with 
+  FETCHCOMMAND.
+
+  Setting myself as Maintainer, as gbevin has retired.
   
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*snarf-7.0-r1 (30 Aug 2002)
+
+  16 Apr 2003; Tavis Ormandy <taviso@gentoo.org> snarf-7.0-r1.ebuild:
+  Marking stable on alpha.
+
+  30 Aug 2002; Sasha Schwabbauer <cybersystem@gentoo.org> snarf-7.0-r1.ebuild :
+
+  Added ppc to keywords.
+
+*snarf-7.0-r1 (1 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> snarf-7.0-r1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/snarf/Manifest b/net-misc/snarf/Manifest
index e69de29bb2d1..ffc2ecf7f884 100644
--- a/net-misc/snarf/Manifest
+++ b/net-misc/snarf/Manifest
@@ -0,0 +1,8 @@
+MD5 79882ab406978870829de6114effa4ed snarf-7.0-r1.ebuild 591
+MD5 92c5e336c512307eaaf0946161f5cd47 snarf-7.0-r2.ebuild 977
+MD5 048200fe45208edc4a33143d70828663 ChangeLog 2513
+MD5 db12e15fc605f25b9c7cc2ee19891bdf metadata.xml 452
+MD5 38c27038e70a5727fc7ae3e511b8c459 files/snarf-unlink-empty.diff 1581
+MD5 6c62e7ab396ad7a82749b3cce1db41f6 files/snarf-basename-patch.diff 4438
+MD5 cd29624c2e8f0ab7a4614a8f12578f56 files/digest-snarf-7.0-r1 60
+MD5 cd29624c2e8f0ab7a4614a8f12578f56 files/digest-snarf-7.0-r2 60
diff --git a/net-misc/snarf/files/digest-snarf-7.0-r1 b/net-misc/snarf/files/digest-snarf-7.0-r1
index 8070b433c861..47370af7b7a2 100644
--- a/net-misc/snarf/files/digest-snarf-7.0-r1
+++ b/net-misc/snarf/files/digest-snarf-7.0-r1
@@ -1 +1 @@
-MD5 7470d8457bc0d347b5cd8668c9e735c4 snarf-7.0.tar.gz
+MD5 7470d8457bc0d347b5cd8668c9e735c4 snarf-7.0.tar.gz 64495
diff --git a/net-misc/snarf/files/snarf-basename-patch.diff b/net-misc/snarf/files/snarf-basename-patch.diff
index 814cfbf5f18f..85cafb527d68 100644
--- a/net-misc/snarf/files/snarf-basename-patch.diff
+++ b/net-misc/snarf/files/snarf-basename-patch.diff
@@ -1,33 +1,3 @@
-######################################################
-# Purpose: Add a -b option to snarf, to only display basename() of target file.
-# Author: Tavis Ormandy <taviso@gentoo.org>
-# Date: 28/07/2003
-# Applies Against: snarf-7.0
-#
-# example output without patch:
-#
-#  # emerge elinks
-#  Calculating dependencies ...done!
-#  >>> emerge (1 of 1) net-www/elinks-0.4.2 to /
-#  >>> Downloading http://../elinks-0.4.2.tar.bz2
-#  http://../elinks-0.4.2.tar.bz2 (742K)
-#  /usr/portage/distfiles/e [#####                   ]     172K |   20.31K/s
-#
-# example with:
-#
-# # emerge elinks
-# Calculating dependencies ...done!
-# >>> emerge (1 of 1) net-www/elinks-0.4.2 to /
-# >>> Downloading http://../elinks-0.4.2.tar.bz2
-# http://../elinks-0.4.2.tar.bz2 (742K)
-# elinks-0.4.2.tar.bz2     [#####                   ]     172K |   20.31K/s
-#
-# I use these fetch/resume commands:
-# 
-# FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"
-# RESUMECOMMAND="/usr/bin/snarf -br \${URI} \${DISTDIR}/\${FILE}"
-# 
-##############################################################
 diff -ruN snarf-7.0.orig/http.c snarf-7.0/http.c
 --- snarf-7.0.orig/http.c	2000-08-09 01:33:30.000000000 +0100
 +++ snarf-7.0/http.c	2003-07-28 12:19:08.000000000 +0100
diff --git a/net-misc/snarf/files/snarf-unlink-empty.diff b/net-misc/snarf/files/snarf-unlink-empty.diff
index d9f4487839c4..66f3089b0b63 100644
--- a/net-misc/snarf/files/snarf-unlink-empty.diff
+++ b/net-misc/snarf/files/snarf-unlink-empty.diff
@@ -1,9 +1,3 @@
-######################################################
-# Purpose: If the requested file isnt empty, and snarf created the file, unlink it.
-# Author: Tavis Ormandy <taviso@gentoo.org>
-# Date: 1/08/2003
-# Applies Against: Snarf-7.0+basename
-###################################
 diff -urN snarf-7.0.orig/http.c snarf-7.0/http.c
 --- snarf-7.0.orig/http.c	2003-08-01 14:46:26.000000000 +0100
 +++ snarf-7.0/http.c	2003-08-01 14:44:02.000000000 +0100
diff --git a/net-misc/snarf/snarf-7.0-r1.ebuild b/net-misc/snarf/snarf-7.0-r1.ebuild
index 2ff07ea59354..e70a170e0ed0 100644
--- a/net-misc/snarf/snarf-7.0-r1.ebuild
+++ b/net-misc/snarf/snarf-7.0-r1.ebuild
@@ -1,30 +1,25 @@
-# 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/net-misc/snarf/snarf-7.0-r1.ebuild,v 1.1 2000/08/12 16:13:17 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/snarf/snarf-7.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
-P=snarf-7.0
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-CATEGORY="net-misc"
 DESCRIPTION="A full featured small web-spider"
-SRC_URI="http://www.xach.com/snarf/"${A}
+SRC_URI="http://www.xach.com/snarf/${P}.tar.gz"
 HOMEPAGE="http://www.xach.com/snarf/"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
 
-src_compile() {                           
-  cd ${S}
-  ./configure --host=${CHOST} --prefix=/usr
-  make
-}
+DEPEND=">=sys-libs/glibc-2.1.3"
 
-src_install() {                               
-  cd ${S}
-  into /usr
-  dobin snarf
-  doman snarf.1
-  dodoc COPYING ChangeLog README TODO
+src_compile() {
+	econf || die
+	make || die
 }
 
-
-
-
+src_install() {
+	into /usr
+	dobin snarf
+	doman snarf.1
+	dodoc COPYING ChangeLog README TODO
+}
diff --git a/net-misc/snarf/snarf-7.0-r2.ebuild b/net-misc/snarf/snarf-7.0-r2.ebuild
index 47831658af8a..9a1b50e46156 100644
--- a/net-misc/snarf/snarf-7.0-r2.ebuild
+++ b/net-misc/snarf/snarf-7.0-r2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/snarf/snarf-7.0-r2.ebuild,v 1.1 2003/08/01 15:50:57 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/snarf/snarf-7.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:37 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A full featured small web-spider"
+inherit eutils
+
+IUSE=""
+DESCRIPTION="Small and fast command line resource grabber with support for http, gopher, finger, and ftp protocols."
 SRC_URI="http://www.xach.com/snarf/${P}.tar.gz"
 HOMEPAGE="http://www.xach.com/snarf/"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha sparc ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -18,14 +20,15 @@ src_unpack() {
 	epatch ${FILESDIR}/snarf-unlink-empty.diff
 }
 
-src_compile() {													 
-	econf || die
-	make || die
-}
-
-src_install() {															 
-	into /usr
+src_install() {
 	dobin snarf
 	doman snarf.1
 	dodoc COPYING ChangeLog README TODO
 }
+
+pkg_postinst() {
+	einfo 'To use snarf with portage, try these settings in your make.conf'
+	einfo
+	einfo '	FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"'
+	einfo '	RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"'
+}
diff --git a/net-misc/snitch/ChangeLog b/net-misc/snitch/ChangeLog
index 6a1d9f149e6b..c6463d6ce4e4 100644
--- a/net-misc/snitch/ChangeLog
+++ b/net-misc/snitch/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for net-misc/snitch
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/snitch/ChangeLog,v 1.1 2004/05/09 23:32:03 dragonheart Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/snitch/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+  18 Jul 2004; Daniel Black <dragonheart@gentoo.org> snitch-0.0.1.ebuild:
+  x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> snitch-0.0.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  11 May 2004; Daniel Black <dragonheart@gentoo.org> :
+  Added sys-apps/iproute2 depandancy at caglar.onur@tubitak.gov.tr's request
+
+  10 May 2004; David Holm <dholm@gentoo.org> snitch-0.0.1.ebuild:
+  Added to ~ppc.
 
 *snitch-0.0.1 (10 May 2004)
 
   10 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
   +snitch-0.0.1.ebuild:
-  Initial import. Bug #50462 thanks to S.�aglar Onur <caglar.onur@tubitak.gov.tr>
+  Initial import. Bug #50462 thanks to S.Caglar Onur <caglar.onur@tubitak.gov.tr>
 
diff --git a/net-misc/snitch/Manifest b/net-misc/snitch/Manifest
index 8dd91d76611d..676d09ab4868 100644
--- a/net-misc/snitch/Manifest
+++ b/net-misc/snitch/Manifest
@@ -1,2 +1,14 @@
-MD5 a57c287a37530a63bb2f555ce047c661 snitch-0.0.1.ebuild 579
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4ec75f32938fe541721a28d2fe09a08d ChangeLog 825
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 1a69c5796e8f2fb5939a39c29ce5b19b snitch-0.0.1.ebuild 779
 MD5 aaa8dbd23fc6ec2a7b08134bf717437d files/digest-snitch-0.0.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFA+hQYmdTrptrqvGERAtzFAJ9vn4Qekwgj8EHLCUWfUfALNrRiOgCfWq0Q
+nRMps6QnoWz3/A+AfBoemP8=
+=fscW
+-----END PGP SIGNATURE-----
diff --git a/net-misc/snitch/snitch-0.0.1.ebuild b/net-misc/snitch/snitch-0.0.1.ebuild
index 5bb8f62bc688..e2f6390e3a04 100644
--- a/net-misc/snitch/snitch-0.0.1.ebuild
+++ b/net-misc/snitch/snitch-0.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/snitch/snitch-0.0.1.ebuild,v 1.1 2004/05/09 23:32:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/snitch/snitch-0.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 DESCRIPTION="Snitch is a powerful packetshaping utility that allows the user to easily harness the power of the Linux tc command to shape network traffic"
 HOMEPAGE="http://snitch.sourceforge.net/"
@@ -10,12 +10,13 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 IUSE=""
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
-	>=net-firewall/iptables-1.2.9-r1"
+	>=net-firewall/iptables-1.2.9-r1
+	sys-apps/iproute2"
 
 src_compile() {
 	emake || die "emake failed"
diff --git a/net-misc/sobby/ChangeLog b/net-misc/sobby/ChangeLog
index 5fe125030866..7199234277fe 100644
--- a/net-misc/sobby/ChangeLog
+++ b/net-misc/sobby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/sobby
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/ChangeLog,v 1.1 2005/08/14 22:01:58 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+*sobby-0.3.0_rc1 (20 Nov 2005)
+
+  20 Nov 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +sobby-0.3.0_rc1.ebuild:
+  Bump to version 0.3.0_rc1. Arch teams please do not mark stable, I'll open a
+  bug when i think it is ready.
 
   14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>; ChangeLog:
   Initial import
diff --git a/net-misc/sobby/Manifest b/net-misc/sobby/Manifest
index ae3b4d0f3faa..c3039b0a1ed8 100644
--- a/net-misc/sobby/Manifest
+++ b/net-misc/sobby/Manifest
@@ -1,6 +1,18 @@
-MD5 c22970517f1aae6fe0f276defeaa84ac sobby-0.2.0.ebuild 1445
-MD5 a6309fac7ef118b0b37b499a12854500 ChangeLog 201
-MD5 9c6acf8b7103a5a76752783ea820c568 metadata.xml 312
-MD5 182b9dcc83ce6b93ad35aad239545602 files/sobby-init-0.2.0 486
-MD5 5a8e7d50a8f1a42290cd2c5d940e2715 files/sobby-conf-0.2.0 379
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 81b2456f6f6204424a698d837607f553 ChangeLog 517
 MD5 9383a1f60a0fce0f3a86e31199a886e0 files/digest-sobby-0.2.0 63
+MD5 6246a317f5eeaab45c9533f05f3f8eff files/digest-sobby-0.3.0_rc1 66
+MD5 f5f94a0b4ed63e9a9f74d182a9cf1846 files/sobby-conf-0.2.0 480
+MD5 925da2634d9246b4f9a8045cf4e13b0b files/sobby-init-0.2.0 587
+MD5 9c6acf8b7103a5a76752783ea820c568 metadata.xml 312
+MD5 b5688bbf07fe796fdffe7f75e965dc7c sobby-0.2.0.ebuild 1542
+MD5 c46e0b0d47561992a51bc949560a097f sobby-0.3.0_rc1.ebuild 1592
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf8Ju8zY1VwezZiERAhDiAJ9IFW3oWzLyLUIuxgmozebIXJp21ACfS0an
+YUZ41ODDloK2MJqijB4BwqM=
+=O/VK
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sobby/files/sobby-conf-0.2.0 b/net-misc/sobby/files/sobby-conf-0.2.0
index 88408ec1596b..cf3003c2057c 100644
--- a/net-misc/sobby/files/sobby-conf-0.2.0
+++ b/net-misc/sobby/files/sobby-conf-0.2.0
@@ -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-misc/sobby/files/sobby-conf-0.2.0,v 1.1 2005/08/14 22:01:58 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/files/sobby-conf-0.2.0,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 # Options to pass to the sobby process
 # -n --name		Published server name
diff --git a/net-misc/sobby/files/sobby-init-0.2.0 b/net-misc/sobby/files/sobby-init-0.2.0
index 3100966fe488..33b27ba0161e 100755
--- a/net-misc/sobby/files/sobby-init-0.2.0
+++ b/net-misc/sobby/files/sobby-init-0.2.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2         
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/files/sobby-init-0.2.0,v 1.1 2005/08/14 22:01:58 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/files/sobby-init-0.2.0,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 depend() {
 	need mDNSResponder
diff --git a/net-misc/sobby/sobby-0.2.0.ebuild b/net-misc/sobby/sobby-0.2.0.ebuild
index 4cc161878fa9..ca91c98b0dac 100644
--- a/net-misc/sobby/sobby-0.2.0.ebuild
+++ b/net-misc/sobby/sobby-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/sobby-0.2.0.ebuild,v 1.1 2005/08/14 22:01:58 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/sobby-0.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/sobby/sobby-0.3.0_rc1.ebuild b/net-misc/sobby/sobby-0.3.0_rc1.ebuild
index c8135970382e..495af88302c4 100644
--- a/net-misc/sobby/sobby-0.3.0_rc1.ebuild
+++ b/net-misc/sobby/sobby-0.3.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/net-misc/sobby/sobby-0.3.0_rc1.ebuild,v 1.1 2005/11/20 00:24:50 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sobby/sobby-0.3.0_rc1.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index 2081e06dcd71..f3340f6714a6 100644
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,99 @@
-# ChangeLog for net-misc/whois
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.1 2003/01/12 14:58:32 mholzer Exp $
+# ChangeLog for net-misc/socat
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  socat-1.4.2.0-r1.ebuild:
+  Stable on ppc.
+
+  25 Oct 2005; <soulse@gentoo.org> socat-1.4.2.0-r1.ebuild,
+  socat-1.4.3.0-r1.ebuild:
+  Bad DEPEND/RDEPEND syntax fixed.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> socat-1.4.2.0-r1.ebuild:
+  Mark 1.4.2.0-r1 stable on alpha
+
+  17 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  socat-1.4.2.0-r1.ebuild:
+  Stable on sparc
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> socat-1.4.2.0-r1.ebuild:
+  Mark 1.4.2.0-r1 stable on ia64
+
+*socat-1.4.3.0-r1 (17 Oct 2005)
+*socat-1.4.2.0-r1 (17 Oct 2005)
+
+  17 Oct 2005; <soulse@gentoo.org> +socat-1.4.2.0-r1.ebuild,
+  +socat-1.4.3.0-r1.ebuild:
+  Rev bumps as per bug #109331 thanks to James Rowe <jnrow@ukfsn.org>, new
+  tcp-wrappers depend added as an option.
+
+*socat-1.4.3.0 (25 Sep 2005)
+
+  25 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/socat-1.4.3.0-noptytest.patch, +files/socat-1.4.3.0-tmp-tail.patch,
+  +metadata.xml, -socat-1.3.0.1.ebuild, -socat-1.3.1.0.ebuild,
+  -socat-1.3.2.0.ebuild, -socat-1.3.2.1.ebuild, -socat-1.3.2.2.ebuild,
+  +socat-1.4.3.0.ebuild:
+  version bump. netmon takes maintance. remove old security vulnerable versions
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> socat-1.4.2.0.ebuild:
+  Stable on ppc.
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> socat-1.4.2.0.ebuild:
+  Stable on sparc
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org> socat-1.4.2.0.ebuild:
+  stable on alpha amd64 ia64 x86
+
+*socat-1.4.2.0 (22 Mar 2005)
+
+  22 Mar 2005; Chris White <chriswhite@gentoo.org> +socat-1.4.2.0.ebuild:
+  Version bump to 1.4.2.0.  Closes bug #86187.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*socat-1.4.0.3 (22 Oct 2004)
+
+  22 Oct 2004; Mike Frysinger <vapier@gentoo.org> +socat-1.4.0.3.ebuild:
+  Version bump #68547 for security.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> socat-1.3.0.1.ebuild,
+  socat-1.3.1.0.ebuild, socat-1.3.2.0.ebuild, socat-1.3.2.1.ebuild,
+  socat-1.3.2.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> socat-1.3.2.2.ebuild:
+  Stable on alpha.
+
+*socat-1.3.2.2 (05 May 2004)
+
+  05 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump and cleanup.
+
+*socat-1.3.2.1 (13 Sep 2003)
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> socat-1.3.0.1.ebuild,
+  socat-1.3.1.0.ebuild, socat-1.3.2.0.ebuild, socat-1.3.2.1.ebuild:
+  Add die following econf for bug 48950
+
+  13 Sep 2003; Ian Leitch <port001@gentoo.org> socat-1.3.2.1.ebuild:
+  Version bump to 1.3.2.1 and added ~ppc ~hppa ~amd64 ~sparc ~mips ~arm flags.
+  Closes bug #28627
+
+  02 Aug 2003; Aron Griffis <agriffis@gentoo.org> socat-1.3.2.0.ebuild:
+  Add ~alpha to KEYWORDS
+
+*socat-1.3.2.0 (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> socat-1.3.2.0.ebuild:
+  Version bumped
+
+*socat-1.3.1.0 (25 Jun 2003)
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org> socat-1.3.1.0.ebuild:
+  Version bumped. Closes #21840.
 
 *socat-1.3.0.1 (12 Jan 2003)
 
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index e69de29bb2d1..52984586b1ae 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -0,0 +1,14 @@
+MD5 3922791c759c6aaa118085c1afad55f4 ChangeLog 3447
+MD5 3e1450e1811fbf675f8069ed1bbe2a18 files/digest-socat-1.4.0.3 66
+MD5 7e75e101e793cb7f39eddab4eeb0d286 files/digest-socat-1.4.2.0 66
+MD5 7e75e101e793cb7f39eddab4eeb0d286 files/digest-socat-1.4.2.0-r1 66
+MD5 c69f1c15c04237f76ac1c77d96a70dc0 files/digest-socat-1.4.3.0 66
+MD5 c69f1c15c04237f76ac1c77d96a70dc0 files/digest-socat-1.4.3.0-r1 66
+MD5 6d502092a174c12aa520b1ab3ac8798f files/socat-1.4.3.0-noptytest.patch 2906
+MD5 80bc464d7deaff0335540eb32a60c827 files/socat-1.4.3.0-tmp-tail.patch 986
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 f3009c0be501848ecefacf09a76b117b socat-1.4.0.3.ebuild 1021
+MD5 fa48974777ebd950698da3a9b42d12f8 socat-1.4.2.0-r1.ebuild 1097
+MD5 7496b06950337734d9a6c273d9ee67b4 socat-1.4.2.0.ebuild 1024
+MD5 e4db15575c72e3b86fb62c5d7d4020e0 socat-1.4.3.0-r1.ebuild 1331
+MD5 dadb08b3ec55ab84c53735ef8a5b5535 socat-1.4.3.0.ebuild 1264
diff --git a/net-misc/socat/socat-1.4.0.3.ebuild b/net-misc/socat/socat-1.4.0.3.ebuild
index 34a61a7d5fcb..9eee0e5d4ef1 100644
--- a/net-misc/socat/socat-1.4.0.3.ebuild
+++ b/net-misc/socat/socat-1.4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.0.3.ebuild,v 1.1 2004/10/22 21:53:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.0.3.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/"
diff --git a/net-misc/socat/socat-1.4.2.0-r1.ebuild b/net-misc/socat/socat-1.4.2.0-r1.ebuild
index ccd05951cc00..b807e7ce5f72 100644
--- a/net-misc/socat/socat-1.4.2.0-r1.ebuild
+++ b/net-misc/socat/socat-1.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/net-misc/socat/socat-1.4.2.0-r1.ebuild,v 1.1 2005/10/17 05:58:55 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/"
@@ -8,12 +8,12 @@ SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc sparc x86"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	tcpd? (sys-apps/tcp-wrappers)
+	tcpd? ( sys-apps/tcp-wrappers )
 	virtual/libc"
 
 S=${WORKDIR}/socat-${PV:0:3}
diff --git a/net-misc/socat/socat-1.4.2.0.ebuild b/net-misc/socat/socat-1.4.2.0.ebuild
index bf12ff9d4e1b..7879f36a6532 100644
--- a/net-misc/socat/socat-1.4.2.0.ebuild
+++ b/net-misc/socat/socat-1.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/net-misc/socat/socat-1.4.2.0.ebuild,v 1.1 2005/03/21 23:10:19 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.2.0.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.dest-unreach.org/${PN}/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc sparc x86"
 IUSE="ssl readline ipv6"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
diff --git a/net-misc/socat/socat-1.4.3.0-r1.ebuild b/net-misc/socat/socat-1.4.3.0-r1.ebuild
index 2563c392cf4e..a14354dcd31f 100644
--- a/net-misc/socat/socat-1.4.3.0-r1.ebuild
+++ b/net-misc/socat/socat-1.4.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/net-misc/socat/socat-1.4.3.0-r1.ebuild,v 1.1 2005/10/17 05:58:55 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.3.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	tcpd? (sys-apps/tcp-wrappers)
+	tcpd? ( sys-apps/tcp-wrappers )
 	virtual/libc"
 
 S=${WORKDIR}/socat-${PV:0:3}
diff --git a/net-misc/socat/socat-1.4.3.0.ebuild b/net-misc/socat/socat-1.4.3.0.ebuild
index f0063276b55a..58b0d3a98861 100644
--- a/net-misc/socat/socat-1.4.3.0.ebuild
+++ b/net-misc/socat/socat-1.4.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-misc/socat/socat-1.4.3.0.ebuild,v 1.1 2005/09/25 10:32:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.4.3.0.ebuild,v 1.1.1.1 2005/11/30 09:54:51 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/ssh-installkeys/ChangeLog b/net-misc/ssh-installkeys/ChangeLog
index 78f5510af4af..8bde077dda9d 100644
--- a/net-misc/ssh-installkeys/ChangeLog
+++ b/net-misc/ssh-installkeys/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ssh-installkeys
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-installkeys/ChangeLog,v 1.1 2004/06/05 16:47:27 jmglov Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-installkeys/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> ssh-installkeys-1.3.ebuild:
+  Added to ~ppc.
+
+  05 Jun 2004; Josh Glover <jmglov@gentoo.org> ssh-installkeys-1.3.ebuild:
+  Committed a tad prematurely; the layout changed a bit since version 1.1, from
+  which the ebuild originated
 
 *ssh-installkeys-1.3 (05 Jun 2004)
 
diff --git a/net-misc/ssh-installkeys/Manifest b/net-misc/ssh-installkeys/Manifest
index e31de5559e10..df259ce2fc23 100644
--- a/net-misc/ssh-installkeys/Manifest
+++ b/net-misc/ssh-installkeys/Manifest
@@ -1,3 +1,4 @@
-MD5 b09d42af1dcedf59c65d71c765e02628 ssh-installkeys-1.3.ebuild 636
+MD5 68c174c71ef608e73f69d635e9b63834 ssh-installkeys-1.3.ebuild 736
+MD5 3950975b55a0112341385de7089b456a ChangeLog 670
 MD5 c43fa88084625a4dd045b898e9971ad8 metadata.xml 557
 MD5 3d1de513382fa874706922e521e4e4ec files/digest-ssh-installkeys-1.3 70
diff --git a/net-misc/ssh-installkeys/ssh-installkeys-1.3.ebuild b/net-misc/ssh-installkeys/ssh-installkeys-1.3.ebuild
index 2ceabb41d397..68b8dbc9a721 100644
--- a/net-misc/ssh-installkeys/ssh-installkeys-1.3.ebuild
+++ b/net-misc/ssh-installkeys/ssh-installkeys-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/net-misc/ssh-installkeys/ssh-installkeys-1.3.ebuild,v 1.1 2004/06/05 16:47:27 jmglov Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-installkeys/ssh-installkeys-1.3.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 DESCRIPTION="This script tries to export ssh public keys to a specified site. It will walk you through generating key pairs if it doesn't find any to export."
 HOMEPAGE="http://www.catb.org/~esr/${PN}/"
@@ -8,7 +8,8 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 RDEPEND=">=virtual/python-2.3"
 
@@ -19,7 +20,7 @@ src_compile() {
 }
 
 src_install() {
-	doman ssh-installkeys.1
-	dodoc COPYING README freshmeat-submit.xml
-	dobin ssh-installkeys
+	doman ${PN}.1
+	dodoc COPYING README ${PN}.spec ${PN}.xml
+	dobin ${PN}
 }
diff --git a/net-misc/sslwrap/ChangeLog b/net-misc/sslwrap/ChangeLog
index 7b9cdfde33a5..d4d774ba5cb0 100644
--- a/net-misc/sslwrap/ChangeLog
+++ b/net-misc/sslwrap/ChangeLog
@@ -1,11 +1,36 @@
 # ChangeLog for net-misc/sslwrap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
 
-*sslwrap-2.0.5-r1 (1 Feb 2002)
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> sslwrap-2.0.6.ebuild:
+  Add inherit eutils
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+*sslwrap-2.0.6 (11 Jul 2002)
+
+  30 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Compile fix when using openssl 0.9.7 #34151.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Changed sed expression delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>. Also moved the files/ subdir things to a
+  tarball on the mirrors.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  11 Jul 2002; Brandon Low <lostlogic@gentoo.org> sslwrap-2.0.6.ebuild :
+
+  GCC-3.1 fix and updated version thanks to Robert Coie on bugzilla.
+
+*sslwrap-2.0.5-r1 (27 Mar 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> sslwrap-2.0.5-r1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sslwrap-2.0.5-r1.ebuild :
+  Ungzipped HTML docs.
+
+  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-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest
index e69de29bb2d1..06761e499012 100644
--- a/net-misc/sslwrap/Manifest
+++ b/net-misc/sslwrap/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3295bca0da892269bac953acae97d553 ChangeLog 1572
+MD5 8480b7cb00993d70ddb3950fa5e6e808 files/2.0.6-openssl-0.9.7.patch 459
+MD5 e510f94c5cb1d70ab6da66c674c1fff3 files/digest-sslwrap-2.0.6 127
+MD5 52709e671d08b02633a280be1b47a56e sslwrap-2.0.6.ebuild 946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68lxI1lqEGTUzyQRAnrTAKCitPwK4pDnp1jM13uLraAFrDor0ACgppDo
+V4JYzxHSgmF90wCKx+0+95c=
+=o74l
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sslwrap/files/digest-sslwrap-2.0.6 b/net-misc/sslwrap/files/digest-sslwrap-2.0.6
index 8e5e2f2101a8..dad4852f50bd 100644
--- a/net-misc/sslwrap/files/digest-sslwrap-2.0.6
+++ b/net-misc/sslwrap/files/digest-sslwrap-2.0.6
@@ -1 +1,2 @@
 MD5 5a09f966f9114a108572f70a57bafdf7 sslwrap206.tar.gz 21170
+MD5 7808c82735502786d8811c2bd992195a sslwrap-gentoo.tar.bz2 10886
diff --git a/net-misc/sslwrap/sslwrap-2.0.6.ebuild b/net-misc/sslwrap/sslwrap-2.0.6.ebuild
index fdd9097c6d47..452f9bfee0e1 100644
--- a/net-misc/sslwrap/sslwrap-2.0.6.ebuild
+++ b/net-misc/sslwrap/sslwrap-2.0.6.ebuild
@@ -1,38 +1,40 @@
-# 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-misc/sslwrap/sslwrap-2.0.6.ebuild,v 1.1 2002/07/12 15:15:20 lostlogic Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6.ebuild,v 1.1.1.1 2005/11/30 09:55:07 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${PN}${PV/.0./0}
 DESCRIPTION="TSL/SSL - Port Wrapper"
-SRC_URI="http://quiltaholic.com/rickk/sslwrap/${PN}${PV/.0./0}.tar.gz"
 HOMEPAGE="http://quiltaholic.com/rickk/sslwrap/"
-KEYWORDS="x86"
+SRC_URI="http://quiltaholic.com/rickk/sslwrap/${PN}${PV/.0./0}.tar.gz
+	mirror://gentoo/${PN}-gentoo.tar.bz2"
+
 LICENSE="sslwrap"
 SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.6"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=dev-libs/openssl-0.9.6"
+S=${WORKDIR}/${PN}${PV//.}
 
 src_unpack () {
 	unpack ${A}
 	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s/-O2/${CFLAGS}/" \
-			-e "s:/usr/local/ssl/include:/usr/include/openssl:" Makefile.orig > Makefile
-	cp ${FILESDIR}/*.c ${S}
-	for f in *.h *.c ; do
-		cp ${f} ${f}.orig
-		sed -e "s/OPENSSL\"/\"openssl\//g" ${f}.orig > ${f}
-	done
-}
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:/usr/local/ssl/include:/usr/include/openssl:" \
+		Makefile
 
-src_compile() {													 
-	emake || die
+	cp ${WORKDIR}/${PN}-gentoo/*.c ${S}
+	has_version '=dev-libs/openssl-0.9.7*' \
+		&& epatch ${FILESDIR}/${PV}-openssl-0.9.7.patch
+	sed -i \
+		-e "s:OPENSSL\":\"openssl\/:g" \
+		*.h *.c
 }
 
-src_install() {															 
-	cd ${S}
-	into /usr
+src_install() {
 	dosbin sslwrap
 	dodoc README
 	dohtml -r ./
diff --git a/net-misc/stone/ChangeLog b/net-misc/stone/ChangeLog
index 9c7b5f971a20..b4f5c0cce2ad 100644
--- a/net-misc/stone/ChangeLog
+++ b/net-misc/stone/ChangeLog
@@ -1,8 +1,46 @@
 # ChangeLog for net-misc/stone
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/ChangeLog,v 1.1 2003/09/08 16:50:19 avenj Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+*stone-2.2e (28 Feb 2005)
+
+  28 Feb 2005; MATSUU Takuto <matsuu@gentoo.org> +stone-2.2e.ebuild:
+  Version bumped.
+
+*stone-2.2d (01 Jan 2005)
+
+  01 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> -stone-2.2.ebuild,
+  +stone-2.2d.ebuild:
+  Version bumped.
+  Removed old version.
+
+  29 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> stone-2.2c.ebuild:
+  Stable on x86 and amd64.
+  Added ~ppc and ~sparc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> stone-2.2.ebuild,
+  stone-2.2c.ebuild:
+  change virtual/glibc to virtual/libc
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> stone-2.2.ebuild,
+  stone-2.2c.ebuild:
+  Fix use invocation
+
+*stone-2.2c (13 Mar 2004)
+
+  13 Mar 2004; <matsuu@gentoo.org> stone-2.2b.ebuild, stone-2.2c.ebuild:
+  Version bumped.
+  Removed old version.
+
+*stone-2.2b (01 Jan 2004)
+
+  01 Jan 2004; MATSUU Takuto <matsuu@gentoo.org> stone-2.2b.ebuild :
+  Version bumped.
 
 *stone-2.2 (08 Sep 2003)
 
+  01 Jan 2004; MATSUU Takuto <matsuu@gentoo.org> stone-2.2.ebuild :
+  Marked stable as x86 and amd64.
+
   08 Sep 2003; Jon Portnoy <avenj@gentoo.org> stone-2.2.ebuild :
   Initial import. Submitted in bug 21937 by Matsuu Takuto.
diff --git a/net-misc/stone/Manifest b/net-misc/stone/Manifest
index 5fd329950128..27f3f26cf4d9 100644
--- a/net-misc/stone/Manifest
+++ b/net-misc/stone/Manifest
@@ -1,3 +1,8 @@
-MD5 89e4a5743802908755578bf848e105cf stone-2.2.ebuild 678
-MD5 125ee013081b112d56a1d15507d72ef2 skel.ChangeLog 3674
-MD5 e366c21a42d2054cdfc1c007aee9a0a1 files/digest-stone-2.2 60
+MD5 9d821a773bf23bf733bfe728987b2e71 stone-2.2c.ebuild 709
+MD5 e5f598517f48ddd11570b9e7a4403a7a stone-2.2e.ebuild 711
+MD5 873e5bee4394536a1acd23fe5c70408e stone-2.2d.ebuild 711
+MD5 4a078377bc4c4ef47f2b1c6e831816f4 ChangeLog 1344
+MD5 985804fd116a26bf92914f08a3549691 metadata.xml 422
+MD5 1464957c569c3fb487b56365f48caf58 files/digest-stone-2.2c 61
+MD5 c86c66adadb3d8c866a85f8be27b405c files/digest-stone-2.2d 61
+MD5 9e4794be797737bafee282d8eebe5cd3 files/digest-stone-2.2e 61
diff --git a/net-misc/stone/metadata.xml b/net-misc/stone/metadata.xml
index b35df34ade84..d9adfa1caa96 100644
--- a/net-misc/stone/metadata.xml
+++ b/net-misc/stone/metadata.xml
@@ -5,4 +5,5 @@
   <email>matsuu@gentoo.org</email>
   <name>MATSUU Takuto</name>
 </maintainer>
+<longdescription>Stone is a TCP/IP packet repeater in the application layer.  It repeats TCP and UDP packets from inside to outside of a firewall, or from outside to inside.</longdescription>
 </pkgmetadata>
diff --git a/net-misc/stone/stone-2.2c.ebuild b/net-misc/stone/stone-2.2c.ebuild
index 398c030d19e4..fb012a814b27 100644
--- a/net-misc/stone/stone-2.2c.ebuild
+++ b/net-misc/stone/stone-2.2c.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-misc/stone/stone-2.2c.ebuild,v 1.1 2004/03/12 23:49:40 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/stone-2.2c.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DESCRIPTION="A simple TCP/IP packet repeater"
 HOMEPAGE="http://www.gcd.org/sengoku/stone/"
@@ -8,14 +8,14 @@ SRC_URI="http://www.gcd.org/sengoku/stone/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 IUSE="ssl"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	ssl? ( dev-libs/openssl )"
 
 src_compile() {
-	if [ "`use ssl`" ] ; then
+	if use ssl ; then
 		emake \
 			CFLAGS="${CFLAGS}" \
 			SSL=/usr \
diff --git a/net-misc/stone/stone-2.2d.ebuild b/net-misc/stone/stone-2.2d.ebuild
index 6a8ed87809f7..7226dd468aef 100644
--- a/net-misc/stone/stone-2.2d.ebuild
+++ b/net-misc/stone/stone-2.2d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/stone-2.2d.ebuild,v 1.1 2005/01/01 02:19:05 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/stone-2.2d.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DESCRIPTION="A simple TCP/IP packet repeater"
 HOMEPAGE="http://www.gcd.org/sengoku/stone/"
diff --git a/net-misc/stone/stone-2.2e.ebuild b/net-misc/stone/stone-2.2e.ebuild
index 0ca4bbb0ee05..21148d5c0dbf 100644
--- a/net-misc/stone/stone-2.2e.ebuild
+++ b/net-misc/stone/stone-2.2e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/stone-2.2e.ebuild,v 1.1 2005/02/28 14:46:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stone/stone-2.2e.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
 DESCRIPTION="A simple TCP/IP packet repeater"
 HOMEPAGE="http://www.gcd.org/sengoku/stone/"
diff --git a/net-misc/streamtuner/ChangeLog b/net-misc/streamtuner/ChangeLog
index bca5b5449aa5..21bc4570d58f 100644
--- a/net-misc/streamtuner/ChangeLog
+++ b/net-misc/streamtuner/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for net-misc/streamtuner
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.1 2003/03/14 12:46:48 jje Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/ChangeLog,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+  18 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  streamtuner-0.99.99-r1.ebuild:
+  Package depends on libxml2, not libxml. Closes bug #99159.
+
+*streamtuner-0.99.99-r1 (30 Jul 2005)
+
+  30 Jul 2005; Tony Vroon <chainsaw@gentoo.org>
+  +streamtuner-0.99.99-r1.ebuild:
+  Upstream patch resolves segfault with pygtk 2.6; closes bug #87149.
+
+  30 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/streamtuner-0.99.99-sedfix.patch, streamtuner-0.99.99.ebuild:
+  Fix sed statement in docs.  Closes bug #76014 thanks to tuXXer <bs.net@gmx.de>
+
+*streamtuner-0.99.99 (26 Dec 2004)
+
+  26 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  +streamtuner-0.99.99.ebuild:
+  Version bump.
+
+*streamtuner-0.99 (26 Nov 2004)
+
+  26 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +streamtuner-0.99.ebuild:
+  Version bump closes bug #68617.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamtuner-0.12.4.ebuild:
+  Added xmms to IUSE.
+
+  12 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -streamtuner-0.10.1.ebuild, -streamtuner-0.12.1.ebuild,
+  -streamtuner-0.12.3.ebuild:
+  Stable amd64, sparc, x86.  Added xmms to RDEPEND to close bug #63047.
+
+*streamtuner-0.12.4 (15 Aug 2004)
+
+  15 Aug 2004; Chris White <chriswhite@gentoo.org> +streamtuner-0.12.4.ebuild:
+  Version bumping streamtuner to version 0.12.4.
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamtuner-0.12.3.ebuild:
+  Stable x86, amd64.
+
+  22 Jul 2004; Chris White <chriswhite@gentoo.org> streamtuner-0.12.3.ebuild:
+  Adjusted dependancies for streamtuner 0.12.3 to use the correct libcurl
+  version (>= 7.10.8). Fixes Bug #57672
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamtuner-0.12.3.ebuild:
+  Added ~sparc
+
+  04 Jul 2004; <malc@gentoo.org> streamtuner-0.12.3.ebuild:
+  gcc3.4 compilation patch, fixes bug #54010
+
+  24 May 2004; Daniel Ahlberg <aliz@gentoo.org> streamtuner-0.12.3.ebuild:
+  Added amd64 keyword, closing #51764.
+
+*streamtuner-0.12.3 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> +streamtuner-0.12.3.ebuild,
+  -streamtuner-0.9.1.ebuild:
+  version bump, closes #51231
+
+  12 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamtuner-0.12.1.ebuild:
+  Stable x86.
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  streamtuner-0.10.1.ebuild, streamtuner-0.9.1.ebuild:
+  Added IUSE.
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> streamtuner-0.12.1.ebuild:
+  Added to ~ppc.
+
+*streamtuner-0.12.1 (08 Apr 2004)
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  streamtuner-0.10.1.ebuild, streamtuner-0.12.1.ebuild,
+  streamtuner-0.9.1.ebuild:
+  Version bump for bug #40009.  0.10.1 stable.  Added metadata.xml.
+
+  31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> streamtuner-0.10.1.ebuild:
+  Adding amd64 keyword, closing #46276.
+
+*streamtuner-0.10.1 (28 Sep 2003)
+
+  28 Sep 2003; jje <jje@gentoo.org> :
+  Version bump.
+  
+  Submitted by: jon <jmoses@vtsportbike.net>
+
+  12 Jun 2003; <msterret@gentoo.org> streamtuner-0.9.1.ebuild:
+  fix Header
 
 *streamtuner-0.9.1 (14 Mar 2003)
 
diff --git a/net-misc/streamtuner/Manifest b/net-misc/streamtuner/Manifest
index e69de29bb2d1..2c6b9b627b3a 100644
--- a/net-misc/streamtuner/Manifest
+++ b/net-misc/streamtuner/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0113cf37ab0d92b5517bbc3dd35e3406 ChangeLog 3389
+MD5 e79a63b27d38fa0f7b5574641a61738a files/digest-streamtuner-0.12.4 70
+MD5 a205326a0f0276838f0354f0cffd8dcc files/digest-streamtuner-0.99 68
+MD5 157193917ec6da747d3c44498bbc5d8b files/digest-streamtuner-0.99.99 71
+MD5 f43644f88f5023db6919c8e93c60beef files/digest-streamtuner-0.99.99-r1 147
+MD5 58f85470334ffd6799ca3330c1f87f5c files/streamtuner-0.12.3-gcc34.patch 413
+MD5 849257e447f1dea0c2e215fd81890064 files/streamtuner-0.99.99-sedfix.patch 796
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 b9d5b6d47e76fc165bd0b4950dcac8f8 streamtuner-0.12.4.ebuild 829
+MD5 b88c233d3fd6cde441231a0b1a9bf621 streamtuner-0.99.99-r1.ebuild 958
+MD5 5f7a918011fc771913cd76a8f341b4e8 streamtuner-0.99.99.ebuild 865
+MD5 70e93a189cd3a0009eb3b8cddffca184 streamtuner-0.99.ebuild 783
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXNDxI1lqEGTUzyQRAjhIAJ9rxs3D22UdBI2HoSblT21nS9oZWQCgw9Ce
+VU2p2pOoHeucriRNI5QgT74=
+=hXEK
+-----END PGP SIGNATURE-----
diff --git a/net-misc/streamtuner/streamtuner-0.12.4.ebuild b/net-misc/streamtuner/streamtuner-0.12.4.ebuild
index 23f48716d1f8..3f8ca437ab64 100644
--- a/net-misc/streamtuner/streamtuner-0.12.4.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.12.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/net-misc/streamtuner/streamtuner-0.12.4.ebuild,v 1.1 2004/08/14 17:10:37 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.12.4.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
+
+IUSE="xmms"
 
 inherit gnome2 eutils
 
@@ -8,9 +10,8 @@ DESCRIPTION="Stream directory browser for browsing internet radio streams"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.nongnu.org/streamtuner/"
 
-IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc amd64 sparc"
 LICENSE="BSD"
 
 DEPEND=">=x11-libs/gtk+-2.2.2
@@ -18,6 +19,9 @@ DEPEND=">=x11-libs/gtk+-2.2.2
 	>=app-text/scrollkeeper-0.3.0
 	dev-util/pkgconfig"
 
+RDEPEND="${DEPEND}
+	 xmms? ( media-sound/xmms )"
+
 DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
 src_unpack() {
diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild
index 6aebaabf701a..90b871a7a347 100644
--- a/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild,v 1.1 2005/07/30 17:53:53 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 IUSE="xmms"
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 DEPEND=">=x11-libs/gtk+-2.4
 	>=net-misc/curl-7.10.8
 	>=app-text/scrollkeeper-0.3.0
-	>=dev-libs/libxml-1.8.17-r2
+	dev-libs/libxml2
 	>=media-libs/taglib-1.2"
 
 RDEPEND="${DEPEND}
diff --git a/net-misc/streamtuner/streamtuner-0.99.99.ebuild b/net-misc/streamtuner/streamtuner-0.99.99.ebuild
index ba6108f0ee00..940a87b48684 100644
--- a/net-misc/streamtuner/streamtuner-0.99.99.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.99.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/streamtuner/streamtuner-0.99.99.ebuild,v 1.1 2004/12/26 17:17:30 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.99.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 IUSE="xmms"
 
@@ -27,3 +27,10 @@ DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-sedfix.patch
+}
diff --git a/net-misc/streamtuner/streamtuner-0.99.ebuild b/net-misc/streamtuner/streamtuner-0.99.ebuild
index 5412f75927a2..14295b869c34 100644
--- a/net-misc/streamtuner/streamtuner-0.99.ebuild
+++ b/net-misc/streamtuner/streamtuner-0.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-misc/streamtuner/streamtuner-0.99.ebuild,v 1.1 2004/11/26 20:21:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/streamtuner/streamtuner-0.99.ebuild,v 1.1.1.1 2005/11/30 09:55:03 chriswhite Exp $
 
 IUSE="xmms"
 
diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 92bb5658daff..a0867ada859d 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,10 +1,181 @@
-# ChangeLog for net-misc/openswan
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.1 2004/05/19 14:26:23 pfeifer Exp $
+# ChangeLog for net-misc/strongswan
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+*strongswan-2.5.7 (15 Nov 2005)
+
+  15 Nov 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.5.7-gentoo.patch, +strongswan-2.5.7.ebuild:
+  Version bump adding CA cert autoloading from smartcard.
+
+*strongswan-2.5.6 (15 Nov 2005)
+
+  15 Nov 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.5.6-gentoo.patch, +strongswan-2.5.6.ebuild:
+  Version bump.
+
+  13 Sep 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  -files/strongswan-2.2.2-gentoo.patch,
+  -files/strongswan-2.3.0-gentoo.patch,
+  -files/strongswan-2.3.2-gentoo.patch,
+  -files/strongswan-2.4.1-gentoo.patch,
+  -files/strongswan-2.4.4-gentoo.patch, -strongswan-2.2.2.ebuild,
+  -strongswan-2.3.0.ebuild, -strongswan-2.3.2.ebuild,
+  -strongswan-2.4.1.ebuild, -strongswan-2.4.4.ebuild:
+  Remove old ebuilds.
+
+*strongswan-2.5.4 (12 Sep 2005)
+
+  12 Sep 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.5.4-gentoo.patch, +strongswan-2.5.4.ebuild:
+  Version bump.
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  strongswan-2.5.0.ebuild:
+  Stable on ppc.
+
+  15 Aug 2005; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.5.0.ebuild:
+  Mark 2.5.0 stable on x86.
+
+*strongswan-2.5.0 (25 Jul 2005)
+
+  25 Jul 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.5.0-gentoo.patch, +strongswan-2.5.0.ebuild:
+  Version bump.
+
+  15 Jul 2005; George Shapovalov <george@gentoo.org> strongswan-*.ebuild:
+  changed dependency net-misc/host -> net-dns/host to account for package move
+
+  11 Jul 2005; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.4.4.ebuild:
+  Mark stable on x86.
+
+*strongswan-2.4.4 (23 Jun 2005)
+
+  23 Jun 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.4.4-gentoo.patch, +strongswan-2.4.4.ebuild:
+  Version bump.
+
+  10 May 2005; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.4.1.ebuild:
+  Mark stable on x86.
+
+*strongswan-2.4.1 (12 Apr 2005)
+
+  12 Apr 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.4.1-gentoo.patch, +strongswan-2.4.1.ebuild:
+  Version bump.
+
+  01 Apr 2005; Lars Weiler <pylon@gentoo.org> strongswan-2.3.0.ebuild:
+  Stable on ppc.
+
+*strongswan-2.3.2 (20 Feb 2005)
+
+  20 Feb 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  -files/strongswan-2.1.3-gcc34.patch, -files/strongswan-2.1.3-gentoo.patch,
+  -files/strongswan-2.1.5-gentoo.patch,
+  -files/strongswan-2.2.0-gentoo.patch,
+  -files/strongswan-2.2.1-gentoo.patch,
+  -files/strongswan-2.3.1-gentoo.patch,
+  +files/strongswan-2.3.2-gentoo.patch, -strongswan-2.1.3.ebuild,
+  -strongswan-2.1.5.ebuild, -strongswan-2.2.0.ebuild,
+  -strongswan-2.2.1.ebuild, -strongswan-2.3.1.ebuild,
+  +strongswan-2.3.2.ebuild:
+  Add version 2.3.2(mode config and nat-t seg fault fixes).
+  Remove 2.3.1 due to bug fixes placed into 2.3.2.
+  Remove older versions.
+
+*strongswan-2.3.1 (14 Feb 2005)
+
+  14 Feb 2005; Jay Pfeifer <pfeifer@gentoo.org>
+  +files/strongswan-2.3.1-gentoo.patch, +strongswan-2.3.1.ebuild:
+  Version bump adding IKE Mode Config.
+
+  05 Jan 2005; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.3.0.ebuild:
+  Mark stable on x86.
+
+*strongswan-2.3.0 (20 Dec 2004)
+
+  20 Dec 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.3.0.ebuild:
+  Version bump to strongswan-2.3.0.
+  Now with Group policies based on X.509 attribute certificates (RFC 3281)
+
+  15 Nov 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.2.ebuild:
+  Stable on x86.
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> strongswan-2.2.2.ebuild:
+  Stable on ppc.
+
+*strongswan-2.2.2 (25 Oct 2004)
+
+  25 Oct 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.2.ebuild:
+  Version bump to strongswan-2.2.2.
+  Move forward ~amd64 from version 2.1.3 to 2.2.2 since opensc/openct are now available for ~amd64.
+  Tested on opteron and nocona systems.
+
+  25 Oct 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.1.ebuild:
+  Mark stable on x86.
+
+*strongswan-2.2.1 (17 Sep 2004)
+
+  17 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.1.ebuild:
+  Version bump.
+
+  12 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3.ebuild,
+  strongswan-2.1.3-r1.ebuild, strongswan-2.1.5.ebuild, strongswan-2.2.0.ebuild:
+  Fix-up of ebuilds to block openswan. Closing bug #60794.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+*strongswan-2.2.0 (31 Aug 2004)
+
+  31 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.0.ebuild:
+  Version bump with DPD support!
+
+  15 Aug 2004; David Holm <dholm@gentoo.org> strongswan-2.1.5.ebuild:
+  Added to ~ppc.
+
+  15 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.5.ebuild:
+  Mark stable on x86.
+
+*strongswan-2.1.5 (22 Jul 2004)
+
+  22 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.5.ebuild:
+  Version bump.
+
+  07 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> strongswan-2.1.3-r1.ebuild:
+  fix use invocation
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> strongswan-2.1.3-r1.ebuild,
+  strongswan-2.1.3.ebuild:
+  change virtual/glibc to virtual/libc
+
+*strongswan-2.1.3-r1 (01 Jul 2004)
+
+  01 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3-r1.ebuild:
+  Added use flags for curl, ldap, & smartcard.
+
+  19 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/strongswan-2.1.3-gcc34.patch, strongswan-2.1.3.ebuild:
+  Added patch to make strongswan compile with gcc-3.4.
+
+*strongswan-2.1.3 (19 Jun 2004)
+
+  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3.ebuild:
+  Version bump. Contains fixes for potential security issues.
+  Info here: http://lists.openswan.org/pipermail/dev/2004-June/000370.html
+  Removing all prior versions.
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> strongswan-2.1.1.ebuild:
+  Added to ~ppc.
+
+*strongswan-2.1.1 (15 Jun 2004)
+
+  15 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.1.ebuild:
+  Version bump.
 
 *strongswan-2.0.2 (19 May 2004)
 
-  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.0.2.ebuild
+  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.0.2.ebuild:
   Initial import.
   Provides userspace IPsec tool/support for FreeS/WAN based 2.4 kernels
   and native 2.6 (KAME) based IPsec. Enjoy :)
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 2d314445c857..55cbec44c631 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,6 +1,15 @@
-MD5 9079e1a6c70579f08145fe58a95d973e strongswan-2.0.2.ebuild 2936
-MD5 386f5dbd6c852fa8523ee6257c7cd761 ChangeLog 369
-MD5 a64b79eda14e03e130f7dde467dfa860 metadata.xml 706
+MD5 2afec0ce19bead03bb43bc90e4923e20 ChangeLog 6166
+MD5 e6a1667ed80d993a4631509fce802b2b files/digest-strongswan-2.5.0 70
+MD5 1cf9be697a7fa602b57019a39ff07252 files/digest-strongswan-2.5.4 70
+MD5 1d6ad4992f2d15de19fe648ca089e2b3 files/digest-strongswan-2.5.6 70
+MD5 52b3df694f5bcf547de79d913e96114c files/digest-strongswan-2.5.7 70
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
-MD5 d092d971aee29fa685c6f7c998690f11 files/strongswan-2.0.2-gentoo.patch 17672
-MD5 874140675e403d9a3b5ab609d73fab56 files/digest-strongswan-2.0.2 69
+MD5 8871962155e5503d97764fa621063dc9 files/strongswan-2.5.0-gentoo.patch 11561
+MD5 1141a147fb5e595abe86007b106bb6ed files/strongswan-2.5.4-gentoo.patch 11561
+MD5 eedbc9f0a6254cfbeb2dd2a77ba30e76 files/strongswan-2.5.6-gentoo.patch 11561
+MD5 3c4497cd3d13f2c5e42de1e36579b2f8 files/strongswan-2.5.7-gentoo.patch 11561
+MD5 48d78406890387afe4b0d4bba793f8d1 metadata.xml 634
+MD5 c51c49fe2382efe8b609625aad583409 strongswan-2.5.0.ebuild 3708
+MD5 9181cbe1b69fe5bf1705356c673d2ac5 strongswan-2.5.4.ebuild 3711
+MD5 de51766f3c46913d07f409eb543f8ea0 strongswan-2.5.6.ebuild 3711
+MD5 73db86b0ef8aac8384723c4bc3dd5d18 strongswan-2.5.7.ebuild 3711
diff --git a/net-misc/strongswan/metadata.xml b/net-misc/strongswan/metadata.xml
index 27df4eb3ce8c..ffec0bf7257e 100644
--- a/net-misc/strongswan/metadata.xml
+++ b/net-misc/strongswan/metadata.xml
@@ -5,7 +5,6 @@
 <maintainer>
   <email>pfeifer@gentoo.org</email>
   <name>Jay Pfeifer</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<longdescription>strongSwan is an OpenSource IPsec implementation for the Linux operating system. It is based on the discontinued FreeS/WAN project and the X.509 patch which we developped over the last three years. In order to have a stable IPsec platform to base our future extensions of the X.509 capability on, we decided to lauch the strongSwan project.</longdescription>
+<longdescription>strongSwan is an OpenSource IPsec implementation for the Linux operating system. It is based on the discontinued FreeS/WAN project and the X.509 patch which we developed over the last three years. In order to have a stable IPsec platform to base our future extensions of the X.509 capability on, we decided to lauch the strongSwan project.</longdescription>
 </pkgmetadata>
diff --git a/net-misc/strongswan/strongswan-2.5.0.ebuild b/net-misc/strongswan/strongswan-2.5.0.ebuild
index 38fd2ddf789c..86ccab20ab8f 100644
--- a/net-misc/strongswan/strongswan-2.5.0.ebuild
+++ b/net-misc/strongswan/strongswan-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.0.ebuild,v 1.1 2005/07/25 17:16:17 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.0.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ~ppc ~amd64"
+KEYWORDS="-* ~amd64 ppc x86"
 IUSE="curl ldap smartcard"
 
 DEPEND="!net-misc/openswan
diff --git a/net-misc/strongswan/strongswan-2.5.4.ebuild b/net-misc/strongswan/strongswan-2.5.4.ebuild
index 6bdcf9107077..45b02446d27b 100644
--- a/net-misc/strongswan/strongswan-2.5.4.ebuild
+++ b/net-misc/strongswan/strongswan-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/net-misc/strongswan/strongswan-2.5.4.ebuild,v 1.1 2005/09/12 13:42:16 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.4.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/strongswan/strongswan-2.5.6.ebuild b/net-misc/strongswan/strongswan-2.5.6.ebuild
index bb87298634ef..1198baadd7b6 100644
--- a/net-misc/strongswan/strongswan-2.5.6.ebuild
+++ b/net-misc/strongswan/strongswan-2.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.6.ebuild,v 1.1 2005/11/15 01:23:59 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.6.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/strongswan/strongswan-2.5.7.ebuild b/net-misc/strongswan/strongswan-2.5.7.ebuild
index 97ab4ba0b3cd..50ed9e737ed9 100644
--- a/net-misc/strongswan/strongswan-2.5.7.ebuild
+++ b/net-misc/strongswan/strongswan-2.5.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-misc/strongswan/strongswan-2.5.7.ebuild,v 1.1 2005/11/15 20:38:59 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.7.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 2f7f047cea69..d838c28ac08f 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,29 +1,198 @@
 # ChangeLog for net-misc/stunnel
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.1 2002/03/19 05:40:10 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+*stunnel-4.14 (20 Nov 2005)
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org> -stunnel-4.05.ebuild,
+  stunnel-4.09-r1.ebuild, -stunnel-4.10-r1.ebuild, +stunnel-4.14.ebuild:
+  * Version bump
+  * Stable on x86
+  * Removed old ebuilds
+
+*stunnel-4.09-r1 (02 Oct 2005)
+
+  02 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +stunnel-4.09-r1.ebuild:
+  * Cert fix
+
+*stunnel-4.10-r1 (25 Jun 2005)
+
+  25 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/stunnel-3.26-gentoo.diff, +files/stunnel-4.10-inetd.patch,
+  +stunnel-3.26.ebuild, -stunnel-4.10.ebuild, +stunnel-4.10-r1.ebuild:
+  * Bump 4.10 to fix inetd problem from bug #96896
+  * Restored 3.23 for missed deps on other packages
+
+*stunnel-4.10 (22 Jun 2005)
+
+  22 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/stunnel-3.22-blinding.patch, -files/stunnel-3.22-gentoo.diff,
+  -files/stunnel-3.26-gentoo.diff, -files/stunnel-4.04-blinding.patch,
+  -files/stunnel-4.04-gentoo.diff, files/stunnel.conf,
+  -files/stunnel.conf.4.04-r2, -files/stunnel.conf.4.04-r3,
+  files/stunnel.rc6, -files/stunnel.rc6.4.04-r2, -files/stunnel.rc6.4.04-r3,
+  -stunnel-3.22-r2.ebuild, -stunnel-3.26.ebuild, -stunnel-4.04-r1.ebuild,
+  -stunnel-4.04-r2.ebuild, -stunnel-4.04-r3.ebuild, +stunnel-4.10.ebuild:
+  * Cleanup - taking out a bunch of old stuff
+  * Adding 4.10 as testing only (since upstream calls it experimental anyways)
+    Closing bug #92604
+
+  18 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> stunnel-4.09.ebuild:
+  stable on alpha, wrt bug #95802
+
+  18 Jun 2005; Jason Wever <weeve@gentoo.org> stunnel-4.09.ebuild:
+  Stable on SPARC wrt bug #95802.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> stunnel-4.09.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> stunnel-4.09.ebuild:
+  Marked stable on amd64.
+
+  11 Jun 2005; Lance Albertson <ramereth@gentoo.org> stunnel-4.09.ebuild:
+  Stable on x86
+
+*stunnel-4.09 (13 May 2005)
+
+  13 May 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/stunnel-4.09-gentoo.diff, +files/stunnel.conf.4.09,
+  +files/stunnel.rc6.4.09, metadata.xml, +stunnel-4.09.ebuild:
+  Several cleanups in the ebuild, and version bump
+  * fixed init scripts to use proper /var/run/stunnel location
+  * made the build more in line with upstream
+  * fixed cert generation
+  * added ipv6 useflag / took out static
+  * Updated metadata.xml
+
+  11 Feb 2005; petre rodan <kaiowas@gentoo.org> stunnel-3.22-r2.ebuild,
+  stunnel-3.26.ebuild, stunnel-4.04-r1.ebuild, stunnel-4.04-r2.ebuild,
+  stunnel-4.04-r3.ebuild, stunnel-4.05.ebuild:
+  added selinux RDEPEND - bug 79750
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> stunnel-3.26.ebuild:
+  Added to ~ppc-macos.
+
+  22 Aug 2004; Jason Wever <weeve@gentoo.org> stunnel-4.05.ebuild:
+  Stable on sparc.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.05.ebuild:
+  Stable on alpha.
+
+  18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> files/stunnel.conf.4.05,
+  files/stunnel.rc6.4.05:
+  Added missing files to CVS, closing #54390.
+  Unmasked on x86 and amd64.
+
+  28 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> stunnel-3.26.ebuild:
+  Marked ~amd64.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> stunnel-3.22-r2.ebuild,
+  stunnel-3.26.ebuild, stunnel-4.04-r1.ebuild, stunnel-4.04-r2.ebuild,
+  stunnel-4.04-r3.ebuild, stunnel-4.05.ebuild:
+  change virtual/glibc to virtual/libc
+
+  18 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> stunnel-4.05.ebuild:
+  Added to ~ppc
+
+*stunnel-4.05 (14 Jun 2004)
+
+  14 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.05.ebuild:
+  Version bump found by Daniel Webert <daniel_webert@web.de> in #53519. Added
+  metadata.xml.
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.04-r3.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> stunnel-4.04-r3.ebuild:
+  Add inherit eutils
+
+*stunnel-4.04-r3 (03 Jan 2004)
+
+  03 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04-r3.ebuild:
+  Fixes for #36403 along with other fixes.
+
+*stunnel-4.04-r2 (28 Oct 2003)
+
+  28 Oct 2003; Daniel AHlberg <aliz@gentoo.org> stunnel-4.04-r2 :
+  Now stunnel should run with its own uid/gid instead of noboody/nogroup. Experimental!
+  Closes #24572.
+
+  28 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04-r1 stunnel-3.26.ebuild :
+  Depend on >=openssl-0.9.6j becuse of blinding issues.
+
+  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> stunnel-4.04-r1.ebuild:
+  Stable on alpha
+
+  12 Sep 2003; Ian Leitch <port001@gentoo.org> :
+  Put back missing Manifest - #28505
+
+*stunnel-3.26 (11 Sep 2003)
+
+  11 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump because of DoS signaling bug #26175.
+
+*stunnel-3.24-r1 (02 Jul 2003)
+
+  22 Jul 2003; Christian Birchinger <joker@gentoo.org>
+  stunnel-4.04-r1.ebuild, files/stunnel.rc6:
+  Added sparc stable keyword. Fixed wrong "net-snmp" stop-message in stunnel.rc6
+
+  11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04-r1.ebuild :
+  Fixed path to patch. Closes #23702.
+
+  27 Jul 2003; Mamoru KOMACHI <usata@gentoo.org> stunnel-3.24-r1.ebuild:
+  Added alpha and ppc keywords.
+
+  02 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-3.24-r1.ebuild :
+  New revision without the blindingfix patch.
+
+*stunnel-3.24 (28 Jun 2003)
+
+  28 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-3.24.ebuild :
+  Version bump that hopefully resolvs blinding issues. Closes #23213.
+
+*stunnel-4.04-r1 (25 Jun 2003)
+
+  25 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04-r1.ebuild :
+  Fixed installation av shared and static libstunnel. Found by Simon Matthews <simon@paxonet.com>.
+
+  26 May 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-3.22-r1.ebuild, stunnel-3.22-r2.ebuild
+						stunnel-4.02.ebuild, stunnel-4.04.ebuild :
+  Fixed typo. Found by Brian Hatch <bri@ifokr.org>.
+
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04.ebuild :
+  Added static support from #19561.
+
+*stunnel-4.04 (25 Mar 2003)
+
+  25 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04.ebuild :
+  Security update.
+
+*stunnel-3.22-r2 (25 Mar 2003)
+
+  25 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-3.22-r2.ebuild :
+  Security update.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.02.ebuild, files/stunnel.rc6 :
+  Misc fixes, closes #12608.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*stunnel-4.02 (26 Oct 2002)
+
+  26 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump, found by fluxbox <fluxbox@cox.net> in #9512.
 
 *stunnel-3.22-r1 (18 Mar 2002)
 
-  18 Mar 2002; Seemant Kulleen <seemant@gentoo.org> stunnel-3.22-r1.ebuild :
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> stunnel-3.22-r1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+  Removed old ebuilds from the tree.
 
+  18 Mar 2002; Seemant Kulleen <seemant@gentoo.org> stunnel-3.22-r1.ebuild :
   Unmasked it, and made the dep >= instead of >, and added ChangeLog file.
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  This changelog is targetted to users. This means that the comments should be
-  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 copyright and cvs header
-  comments, in exactly the same format as this comment.
-  
-  This means that you start with header line that has the following format :
-  
-      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.
-  
-  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.
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index e69de29bb2d1..9eb510b70005 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -0,0 +1,20 @@
+MD5 09d99db3707515aa526674e02b224d27 ChangeLog 7097
+MD5 40938d8bb3bba86aea441e89ad04bdc9 stunnel-3.26.ebuild 1085
+MD5 3c7d56a1f6a95f21ceb95ddf5c76073c metadata.xml 703
+MD5 1217dcb1ea077fa30403aa71cdaf7480 stunnel-4.09.ebuild 2127
+MD5 b6c034bdc743886e7ca4202d3a6d6ed1 stunnel-4.09-r1.ebuild 2225
+MD5 2e5b35dd3147164d11d25c7dd45695dd stunnel-4.14.ebuild 2223
+MD5 ae279447729ad0d6d59b870b4ed28683 files/digest-stunnel-4.14 64
+MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf 1423
+MD5 f4879ffd6081bf6db14af6fac04f6b9e files/stunnel.rc6 933
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
+MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.05 725
+MD5 2d0c9c806bbcf7f7999d1ea564e27e9d files/stunnel.rc6.4.05 591
+MD5 915cb8e081d324df458589674689652c files/stunnel.rc6.4.09 938
+MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf.4.09 1423
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.09-gentoo.diff 321
+MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09 64
+MD5 09f88a8e4bd6ae556b11c82d2c09de32 files/stunnel-4.10-inetd.patch 818
+MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
+MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
+MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09-r1 64
diff --git a/net-misc/stunnel/files/stunnel.conf b/net-misc/stunnel/files/stunnel.conf
index 4114349df8cc..4aa8b8c5252e 100644
--- a/net-misc/stunnel/files/stunnel.conf
+++ b/net-misc/stunnel/files/stunnel.conf
@@ -1,26 +1,47 @@
-# location of pid file
-pid = /var/run/stunnel.pid
+# Sample stunnel configuration file by Michal Trojnara 2002-2005
+# Some options used here may not be adequate for your particular configuration
+# Please make sure you understand them (especially the effect of chroot jail)
 
-# user to run as
-setuid = nobody
-setgid = nogroup
+# Certificate/key is needed in server mode and optional in client mode
+# cert = /etc/stunnel/stunnel.pem
+# key = /etc/stunnel/stunnel.pem
+
+# Some security enhancements for UNIX systems - comment them out on Win32
+# chroot = /chroot/stunnel/
+setuid = stunnel
+setgid = stunnel
+# PID is created inside chroot jail
+pid = /var/run/stunnel/stunnel.pid
+
+# Some performance tunings
+socket = l:TCP_NODELAY=1
+socket = r:TCP_NODELAY=1
+#compression = rle
+
+# Workaround for Eudora bug
+#options = DONT_INSERT_EMPTY_FRAGMENTS
 
 # Authentication stuff
 #verify = 2
-# don't forget about c_rehash CApath
-# it is located inside chroot jail:
+# Don't forget to c_rehash CApath
+# CApath is located inside chroot jail:
 #CApath = /certs
-# or simply use CAfile instead:
-#CAfile = /usr/etc/stunnel/certs.pem
-
-# Some debugging stuff
+# It's often easier to use CAfile:
+#CAfile = /etc/stunnel/certs.pem
+# Don't forget to c_rehash CRLpath
+# CRLpath is located inside chroot jail:
+#CRLpath = /crls
+# Alternatively you can use CRLfile:
+#CRLfile = /etc/stunnel/crls.pem
+
+# Some debugging stuff useful for troubleshooting
 #debug = 7
 #output = stunnel.log
 
 # Use it for client mode
 #client = yes
 
-# sample service-level configuration
+# Service-level configuration
 
 #[pop3s]
 #accept  = 995
@@ -34,17 +55,7 @@ setgid = nogroup
 #accept  = 465
 #connect = 25
 
-#[s1]
-#accept  = 5000
-#connect = mail.osw.pl:110
-#delay = yes
-
-#[s2]
-#accept  = 5001
-#connect = mail.osw.pl:25
-
 #[https]
 #accept  = 443
 #connect = 80
 #TIMEOUTclose = 0
-
diff --git a/net-misc/stunnel/files/stunnel.rc6 b/net-misc/stunnel/files/stunnel.rc6
index 7bcbe435d6a2..8ff1148adab1 100644
--- a/net-misc/stunnel/files/stunnel.rc6
+++ b/net-misc/stunnel/files/stunnel.rc6
@@ -1,20 +1,34 @@
 #!/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-misc/stunnel/files/stunnel.rc6,v 1.1 2002/10/26 23:42:32 aliz Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+# Default pidfile location
+PIDFILE="/var/run/stunnel/stunnel.pid"
+
+checkconfig() {
+    # To ensure backwards compatibility
+    if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
+	ewarn "Please update your stunnel.conf!"
+	ewarn "pid should point to /var/run/stunnel/stunnel.pid"
+	PIDFILE="/etc/stunnel/stunnel.pid"
+    fi
+}
 
 depend() {
-	need net
+    need net
 }
 
 start() {
-	ebegin "Starting stunnel"
-	start-stop-daemon --start --quiet --exec /usr/sbin/stunnel
-	eend $?
+    checkconfig
+    ebegin "Starting stunnel"
+    start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf  
+    eend $?
 }
 
 stop() {
-	ebegin "Stopping net-snmpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/stunnel
-	eend $?
+    checkconfig
+    ebegin "Stopping stunnel"
+    start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+    eend $?
 }
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.05 b/net-misc/stunnel/files/stunnel.rc6.4.05
index 4f9d57fba0b2..b3e1d91fbb83 100644
--- a/net-misc/stunnel/files/stunnel.rc6.4.05
+++ b/net-misc/stunnel/files/stunnel.rc6.4.05
@@ -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-misc/stunnel/files/stunnel.rc6.4.05,v 1.1 2004/08/18 23:10:03 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.05,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.09 b/net-misc/stunnel/files/stunnel.rc6.4.09
index d3fac3283205..116a1c2e6899 100755
--- a/net-misc/stunnel/files/stunnel.rc6.4.09
+++ b/net-misc/stunnel/files/stunnel.rc6.4.09
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.09,v 1.1 2005/05/13 21:45:29 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.09,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 # Default pidfile location
 PIDFILE="/var/run/stunnel/stunnel.pid"
diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml
index 8060c04f89e1..b127144898eb 100644
--- a/net-misc/stunnel/metadata.xml
+++ b/net-misc/stunnel/metadata.xml
@@ -2,7 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>aliz@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>aliz@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Stunnel is a program that allows you to encrypt arbitrary TCP
+		connections inside SSL (Secure Sockets Layer) available on both Unix and
+		Windows. Stunnel can allow you to secure non-SSL aware daemons and
+		protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the
+		encryption, requiring no changes to the daemon's code.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/stunnel/stunnel-3.26.ebuild b/net-misc/stunnel/stunnel-3.26.ebuild
index fea5f908ddf7..ab3d04fb1e5c 100644
--- a/net-misc/stunnel/stunnel-3.26.ebuild
+++ b/net-misc/stunnel/stunnel-3.26.ebuild
@@ -1,22 +1,32 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.26.ebuild,v 1.1 2003/09/12 02:55:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-3.26.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="TLS/SSL - Port Wrapper"
-SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
 HOMEPAGE="http://www.stunnel.org/"
-DEPEND="virtual/glibc >=dev-libs/openssl-0.9.6c"
-RDEPEND=">=dev-libs/openssl-0.9.6c"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc alpha ppc ~amd64 ~ppc-macos"
+IUSE="selinux"
+
+RDEPEND=">=dev-libs/openssl-0.9.6j
+	selinux? ( sec-policy/selinux-stunnel )"
+DEPEND="${RDEPEND}
+	virtual/libc"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	if use ppc-macos ; then
+		sed -i -e "s,-shared,-dynamic -flat_namespace -bundle -undefined suppress,g" \
+			-e "s,stunnel.so,stunnel.dylib,g" \
+			Makefile.in || die "sed failed"
+	fi
 }
 
 src_compile() {
@@ -25,9 +35,12 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
 	dosbin stunnel
 	dodoc FAQ README HISTORY COPYING BUGS PORTS TODO transproxy.txt
 	doman stunnel.8
-	dolib.so stunnel.so
+	if use ppc-macos ; then
+		dolib.so stunnel.dylib
+	else
+		dolib.so stunnel.so
+	fi
 }
diff --git a/net-misc/stunnel/stunnel-4.09-r1.ebuild b/net-misc/stunnel/stunnel-4.09-r1.ebuild
index 8079e6e9f69b..b34c1b6d99cd 100644
--- a/net-misc/stunnel/stunnel-4.09-r1.ebuild
+++ b/net-misc/stunnel/stunnel-4.09-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.09-r1.ebuild,v 1.1 2005/10/02 18:53:22 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.09-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc x86"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="virtual/libc
diff --git a/net-misc/stunnel/stunnel-4.09.ebuild b/net-misc/stunnel/stunnel-4.09.ebuild
index 42dca0e0badf..5dc07f3e9836 100644
--- a/net-misc/stunnel/stunnel-4.09.ebuild
+++ b/net-misc/stunnel/stunnel-4.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.09.ebuild,v 1.1 2005/05/13 21:45:29 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.09.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64"
+KEYWORDS="alpha amd64 arm ppc sparc x86"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="virtual/libc
diff --git a/net-misc/stunnel/stunnel-4.14.ebuild b/net-misc/stunnel/stunnel-4.14.ebuild
index b944f8e36f51..81f772e121d8 100644
--- a/net-misc/stunnel/stunnel-4.14.ebuild
+++ b/net-misc/stunnel/stunnel-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/net-misc/stunnel/stunnel-4.14.ebuild,v 1.1 2005/11/20 03:16:42 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.14.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
diff --git a/net-misc/suite3270/ChangeLog b/net-misc/suite3270/ChangeLog
index f61db45152e4..9119f1f8d24b 100644
--- a/net-misc/suite3270/ChangeLog
+++ b/net-misc/suite3270/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/suite3270
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.1 2003/07/28 04:01:54 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/ChangeLog,v 1.1.1.1 2005/11/30 09:54:53 chriswhite Exp $
+
+  13 May 2004; Michael McCabe <randy@gentoo.org> suite3270-3.3.2_p1.ebuild:
+  Added s390 keywords
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> suite3270-3.3.2_p1.ebuild:
+  Adding amd64 keyword. Closing #44153.
+
+*suite3270-3.3.2_p1 (22 Dec 2003)
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
+  suite3270-3.3.2_p1.ebuild:
+  new major revision, bug #35375
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> suite3270-3.2.20.ebuild:
+  bump to stable
 
 *suite3270-3.2.20 (27 Jul 2003)
 
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 60d3e69ba017..7d6b20ec6719 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,2 +1,5 @@
-MD5 390b2d0b82fb0734d859d799d295cdff suite3270-3.2.20.ebuild 884
+MD5 b7a2470fbe64e5b206b4d2a8db2394c4 ChangeLog 803
+MD5 efab1a7811d023fde72fd982f9e36074 suite3270-3.2.20.ebuild 2214
+MD5 7691f59b19dcc6bc00748ea1a2017570 suite3270-3.3.2_p1.ebuild 3100
 MD5 35f92984c78401de3fdbc722e61d0e73 files/digest-suite3270-3.2.20 64
+MD5 f31ad988d81aec389a7ad99360ad9b98 files/digest-suite3270-3.3.2_p1 65
diff --git a/net-misc/suite3270/suite3270-3.2.20.ebuild b/net-misc/suite3270/suite3270-3.2.20.ebuild
index 2c4b63163ff0..14713621b246 100644
--- a/net-misc/suite3270/suite3270-3.2.20.ebuild
+++ b/net-misc/suite3270/suite3270-3.2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.2.20.ebuild,v 1.1 2003/07/28 04:01:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.2.20.ebuild,v 1.1.1.1 2005/11/30 09:54:53 chriswhite Exp $
 
 IUSE="tcltk X"
 
@@ -11,10 +11,10 @@ HOMEPAGE="http://www.geocities.com/SiliconValley/Peaks/7814/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc"
 
 DEPEND="X? ( virtual/x11 )
-		tcltk? ( dev-lang/tcl ) 
+		tcltk? ( dev-lang/tcl )
 		sys-libs/ncurses
 		sys-libs/readline"
 
diff --git a/net-misc/suite3270/suite3270-3.3.2_p1.ebuild b/net-misc/suite3270/suite3270-3.3.2_p1.ebuild
index a34fc1ed45bd..53f0b14757f2 100644
--- a/net-misc/suite3270/suite3270-3.3.2_p1.ebuild
+++ b/net-misc/suite3270/suite3270-3.3.2_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.2_p1.ebuild,v 1.1 2003/12/23 02:48:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/suite3270/suite3270-3.3.2_p1.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
-IUSE="tcltk X cjk ssl"
+IUSE="tcltk X cjk ssl debug"
 
 S="${WORKDIR}"
 DESCRIPTION="Complete 3270 access package"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.geocities.com/SiliconValley/Peaks/7814/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~amd64 s390"
 
 RDEPEND="X? ( virtual/x11 )
 		tcltk? ( dev-lang/tcl )
diff --git a/net-misc/taylor-uucp/ChangeLog b/net-misc/taylor-uucp/ChangeLog
index 41c614105c98..7f4939013efd 100644
--- a/net-misc/taylor-uucp/ChangeLog
+++ b/net-misc/taylor-uucp/ChangeLog
@@ -1,11 +1,68 @@
 # ChangeLog for net-misc/taylor-uucp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/ChangeLog,v 1.1 2002/06/21 21:28:37 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/ChangeLog,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
 
+  09 May 2005; Olivier Crête <tester@gentoo.org> taylor-uucp-1.07.ebuild:
+  Stable on amd64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  taylor-uucp-1.07.ebuild:
+  Stable on ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> taylor-uucp-1.06.2.ebuild,
+  taylor-uucp-1.07.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> taylor-uucp-1.06.2.ebuild:
+  Add inherit eutils
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> taylor-uucp-1.07.ebuild:
+  Added to ~ppc.
+
+  22 Jan 2004; Aron Griffis <agriffis@gentoo.org> taylor-uucp-1.07.ebuild:
+  stable on ia64
+
+  22 Jan 2004; Chuck Short <zul@gentoo.org> taylor-uucp-1.07.ebuild:
+  Fixed permissions on /var/lock/uucp. Closes #38977.
+
+  13 Jan 2004; Chuck Short <zul@gentoo.org> taylor-uucp-1.06.2.ebuild,
+  taylor-uucp-1.07.ebuild:
+  Header fixes
+
+  16 Dec 2003; Chuck Short <zul@gentoo.org> taylor-uucp-1.07.ebuild:
+  Added ~amd64 keyword, closes #35854.
+
+  10 Nov 2003; Chuck Short <zul@gentoo.org> taylor-uucp-1.07.ebuild:
+  Marked stable for x86 and sparc. Users should use 1.07.
+
+  24 Oct 2003; Chuck Short <zul@gentoo.org> taylor-uucp-1.07.ebuild,
+  files/gentoo-uucp-1.07.patch:
+  Ebuild improvements, closes #31817.
+
+  30 Sep 2003; Aron Griffis <agriffis@gentoo.org> taylor-uucp-1.07.ebuild:
+  Stable on alpha
+
+*taylor-uucp-1.07 (25 Sep 2003)
+
+  25 Sep 2003; Chuck Short <zul@gentoo.org> taylor-uucp-1.07.ebuild,
+  files/gentoo-uucp-1.07.patch:
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *taylor-uucp-1.06.2 (21 Jun 2002)
 
-  21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
-  
+  31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> :
+  Added Chuck Short's patches.  Bug #19128.
+  Spooled data in stored in /var/spool and logging in /var/log
+
+  27 Dec 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Added Arnim Littek's patch to the ebuild.  Fixes a configuration problem
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> taylor-uucp-1.06.2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  21 Jun 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-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index e69de29bb2d1..295c6abf2a9e 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 135397d55e388ecf5c660b79329a173e taylor-uucp-1.06.2.ebuild 1128
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 8bfc2717f433d960b3bf7a697b28fae7 taylor-uucp-1.07.ebuild 1286
+MD5 c817030640309ca9e9520b1b6156dfd1 ChangeLog 2654
+MD5 960bf47654d4d388fad012107bc1dbf4 files/digest-taylor-uucp-1.07 62
+MD5 3d5cc3426a7f1d61f90822a17a8fef03 files/digest-taylor-uucp-1.06.2 64
+MD5 0b3506193c11dfcee3c0db510974019a files/gentoo-uucp.diff 5284
+MD5 e0bcdeb5dc9bf6eaadbe44c39e65b42d files/gentoo-uucp-1.07.patch 4834
+MD5 ece1220b2ccfc902946f5c929dc2f3c9 files/uucp-patch.diff 2107
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCftMNmOfEJZHYOKcRAoizAJwMR2nYqqVrLZ6iPaS8rfKGw4qAyQCePddL
+UEZoRUZHl4M5ULXqkiCNofs=
+=1xsn
+-----END PGP SIGNATURE-----
diff --git a/net-misc/taylor-uucp/files/gentoo-uucp-1.07.patch b/net-misc/taylor-uucp/files/gentoo-uucp-1.07.patch
index 897c13311c73..a4968a92719b 100644
--- a/net-misc/taylor-uucp/files/gentoo-uucp-1.07.patch
+++ b/net-misc/taylor-uucp/files/gentoo-uucp-1.07.patch
@@ -6,7 +6,7 @@ diff -Naur uucp-1.07.old/policy.h uucp-1.07/policy.h
  /* #define LOCKDIR "/var/spool/lock" */
  /* #define LOCKDIR "/var/lock" */
 -
-+#define LOCKDIR "/var/log/subsys"
++#define LOCKDIR "/var/lock/uucp"
  /* You must also specify the format of the lock files by setting
     exactly one of the following macros to 1.  Check an existing lock
     file to decide which of these choices is more appropriate.
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild
index 29d8acf69c5c..3cb001f6ff6d 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild
@@ -1,31 +1,48 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: St�phane Dupille <sdupille@teaser.fr>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild,v 1.1 2002/06/21 21:28:37 rphillips Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.06.2.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+inherit eutils
 
-A="uucp-${PV}.tar.gz"
 S=${WORKDIR}/uucp-1.06.1	# This should be a .2 bug the package is messed
+IUSE=""
 DESCRIPTION="Taylor UUCP"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/uucp/${A}"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz"
 HOMEPAGE="http://www.airs.com/ian/uucp.html"
 
-DEPEND="virtual/glibc"
+KEYWORDS="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libc"
+
+src_compile() {
+	epatch ${FILESDIR}/gentoo-uucp.diff
 
-src_compile ()
-{
-	./configure --prefix=/usr --host=${CHOST}
-	make sbindir=/usr/sbin bindir=/usr/bin man1dir=/usr/share/man/man1 man8dir=/usr/share/man/man8 newconfigdir=/etc/uucp infodir=/usr/share/info || die
+	sh configure
+	make || die
 }
 
-src_install ()
-{
-	mkdir -p ${D}/usr/share/man/man1
-	mkdir -p ${D}/usr/share/man/man8
-	mkdir -p ${D}/usr/share/info
-	mkdir -p ${D}/etc/uucp
-	mkdir -p ${D}/usr/bin
-	mkdir -p ${D}/usr/sbin
-	make prefix=${D}/usr sbindir=${D}/usr/sbin bindir=${D}/usr/bin man1dir=${D}/usr/share/man/man1 man8dir=${D}/usr/share/man/man8 newconfigdir=${D}/etc/uucp infodir=${D}/usr/share/info install || die
-	make prefix=${D}/usr sbindir=${D}/usr/sbin bindir=${D}/usr/bin man1dir=${D}/usr/share/man/man1 man8dir=${D}/usr/share/man/man8 newconfigdir=${D}/etc/uucp infodir=${D}/usr/share/info install-info || die
+src_install() {
+	dodir /usr/share/man/man1
+	dodir /usr/share/man/man8
+	dodir /usr/share/info
+	dodir /etc/uucp
+	dodir /usr/bin
+	dodir /usr/sbin
+	make \
+		prefix=${D}/usr \
+		sbindir=${D}/usr/sbin \
+		bindir=${D}/usr/bin \
+		man1dir=${D}/usr/share/man/man1 \
+		man8dir=${D}/usr/share/man/man8 \
+		newconfigdir=${D}/etc/uucp \
+		infodir=${D}/usr/share/info \
+		install install-info || die
+	cp sample/* ${D}/etc/uucp
 	dodoc COPYING ChangeLog MANIFEST NEWS README TODO
 }
+
+pkg_preinst() {
+	usermod -s /bin/bash uucp
+}
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07.ebuild
index 9247eac1b2e1..e72075475bfd 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07.ebuild
@@ -1,30 +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/net-misc/taylor-uucp/taylor-uucp-1.07.ebuild,v 1.1 2003/09/26 02:15:34 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.07.ebuild,v 1.1.1.1 2005/11/30 09:54:52 chriswhite Exp $
+
+inherit eutils
 
 S=${WORKDIR}/uucp-1.07	# This should be a .2 bug the package is messed
+IUSE=""
 DESCRIPTION="Taylor UUCP"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz"
 HOMEPAGE="http://www.airs.com/ian/uucp.html"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz"
 
-KEYWORDS="~x86 ~sparc "
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc sparc alpha amd64 ia64"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gentoo-uucp-${PV}.patch
+}
 
 src_compile() {
-	epatch ${FILESDIR}/gentoo-uucp-${PV}.patch 
-	sh configure	make || die
+	econf --with-newconfigdir=/etc/uucp || die
+	make || die
 }
 
 src_install() {
-	dodir /usr/share/man/man1
-	dodir /usr/share/man/man8
+	dodir /usr/share/man/man{1,8}
 	dodir /usr/share/info
 	dodir /etc/uucp
-	dodir /usr/bin
-	dodir /usr/sbin
+	dodir /usr/bin /usr/sbin
+	dodir /var/log/uucp
+	dodir /var/lock/uucp
 	make \
 		prefix=${D}/usr \
 		sbindir=${D}/usr/sbin \
@@ -35,7 +44,10 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		install install-info || die
 	cp sample/* ${D}/etc/uucp
-	dodoc COPYING ChangeLog NEWS README TODO
+	dodoc ChangeLog NEWS README TODO
+
+	chmod -R 775 ${D}/var/lock/uucp
+	chown -R root:uucp ${D}/var/lock/uucp
 }
 
 pkg_preinst() {
diff --git a/net-misc/tiers/ChangeLog b/net-misc/tiers/ChangeLog
index 492b78456582..80d57efaaf8d 100644
--- a/net-misc/tiers/ChangeLog
+++ b/net-misc/tiers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tiers
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tiers/ChangeLog,v 1.1 2004/01/11 12:47:12 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tiers/ChangeLog,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> tiers-1.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tiers-1.1.ebuild:
+  Add inherit eutils
 
 *tiers-1.1 (11 Jan 2004)
 
diff --git a/net-misc/tiers/Manifest b/net-misc/tiers/Manifest
index f0ab27088810..7624864b8d22 100644
--- a/net-misc/tiers/Manifest
+++ b/net-misc/tiers/Manifest
@@ -1,3 +1,14 @@
-MD5 206c7cff64de59bfe753e27b0b10d398 tiers-1.1.ebuild 1467
-MD5 324eee4fe6016c45a7f30f6f214a46ed files/digest-tiers-1.1 174
-MD5 b6f7259dbd1acb8bfcc5d38a20e3889f files/tiers1.1-gccfixes.patch 5326
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3421789eca75a86d628848546af73ab9 tiers-1.1.ebuild 1365
+MD5 b6128e45169526a82fadbe9e2b76d922 ChangeLog 577
+MD5 de08488e62a5dc1c5d1349edfc61ae6f files/digest-tiers-1.1 119
+MD5 0b8b2907e0f34c042c6faf3f71df9077 files/tiers1.1-gccfixes.patch 5840
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBpQSvI1lqEGTUzyQRAg2iAKDHbb7mT1CudWAU06E/C+lvYkKLvwCeJBTN
+7shvggCc6ONpn8YWNI7xpjc=
+=UA7Q
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tiers/files/digest-tiers-1.1 b/net-misc/tiers/files/digest-tiers-1.1
index 9d1cdebaf623..eaf56e7c5703 100644
--- a/net-misc/tiers/files/digest-tiers-1.1
+++ b/net-misc/tiers/files/digest-tiers-1.1
@@ -1,3 +1,2 @@
 MD5 c7d5d0dfa7f7e07b9970664701279991 tiers1.1.tar.gz 392532
 MD5 68dacec891d76477e28a70d22fece73d tiers2ns-lan.awk 3258
-MD5 f5c4f08f4b9074c188b5d1ec5f98d3c8 tiers2ns.awk 2562
diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild
index 3ca50480486a..44e1ea475e34 100644
--- a/net-misc/tiers/tiers-1.1.ebuild
+++ b/net-misc/tiers/tiers-1.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/net-misc/tiers/tiers-1.1.ebuild,v 1.1 2004/01/11 12:47:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tiers/tiers-1.1.ebuild,v 1.1.1.1 2005/11/30 09:54:49 chriswhite Exp $
+
+inherit eutils
 
 MY_P="${PN}${PV}"
 DESCRIPTION="Random network topography generator"
@@ -11,8 +13,8 @@ LICENSE="BSD as-is"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND="sys-devel/gcc virtual/glibc"
-RDEPEND="sys-apps/gawk media-gfx/gnuplot virtual/glibc"
+DEPEND="sys-devel/gcc virtual/libc"
+RDEPEND="sys-apps/gawk media-gfx/gnuplot virtual/libc"
 S=${WORKDIR}/${PN}${PV}
 
 src_unpack() {
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 42c1b08cf676..fe502666479e 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,221 @@
 # ChangeLog for net-misc/tightvnc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/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-misc/tightvnc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/tightvnc-1.3_alpha7-darwin.patch, tightvnc-1.3_alpha7.ebuild:
+  Added patches for Darwin for source and ebuild and marked ~ppc-macos (bug
+  #89098)
+
+  25 Oct 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
+  Remove the 4.0 folder too
+
+  25 Oct 2005; Daniel Goller <morfic@gentoo.org>
+  -files/tightvnc-4.0_gcc-3.4.patch, -files/tightvnc_cvs20031113.patch.bz2,
+  -files/tightvnc-4.0_linux-headers.patch:
+  Punting old files, including evil binary leftover patch.bz2
+
+  14 Aug 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
+  Mnaifest signing with -Y if pinentry likes that over -X
+  No, it didnt like it, requiring local signing.
+  
+  14 Aug 2005; Daniel Goller <morfic@gentoo.org> tightvnc-1.3_alpha7.ebuild:
+  Added einfo regarding 'server' USE flag.
+
+  07 Aug 2005; Daniel Goller <morfic@gentoo.org> tightvnc-1.3_alpha7.ebuild:
+  Add server flag
+
+  06 Aug 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
+  Adding Manifest locally since it fails remotely
+
+*tightvnc-1.3_alpha7 (06 Aug 2005)
+
+  06 Aug 2005; Daniel Goller <morfic@gentoo.org>
+  +files/tightvnc-1.3_alpha7-gentoo.diff,
+  +files/tightvnc-1.3_alpha7-gentoo.security.patch,
+  +files/tightvnc-1.3_alpha7-imake-tmpdir.patch,
+  +tightvnc-1.3_alpha7.ebuild:
+  Added 1.3 dev 7
+
+  27 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  tightvnc-1.3_alpha5.ebuild:
+  Use the correct toolchain compiler.
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org>
+  tightvnc-1.3_alpha5.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  27 Apr 2005; Simon Stelling <blubb@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  stable on amd64
+
+  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>
+  tightvnc-1.3_alpha5.ebuild:
+  Stable on alpha.
+
+  03 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  tightvnc-1.3_alpha5.ebuild:
+  Stable on sparc
+
+  30 Oct 2004; Daniel Goller <morfic@gentoo.org> tightvnc-1.3_alpha5.ebuild:
+  Stable on Maintainer's archs
+
+  23 Oct 2004; Simon Stelling <blubb@gentoo.org> tightvnc-1.3_alpha5.ebuild:
+  removed amd64-'fix' again
+
+  18 Oct 2004; Daniel Goller <morfic@gentoo.org> metadata.xml,
+  tightvnc-1.3_alpha5.ebuild, -tightvnc-4.0_beta20031113.ebuild:
+  physically removed realvnc 4 beta from folder
+  fix up of changelog
+  readd the lost keywords into 1.3_alpha5
+
+  15 Oct 2004; Daniel Goller <morfic@gentoo.org> :
+  Cleaning realvnc out of tightvnc, too buggy to maintain, 1.3 dev5 is here in
+  its place.
+
+  02 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; tightvnc-1.2.8.ebuild:
+  x11-base/xfree -> virtual/x11.
+
+  26 Sep 2004; Daniel Goller <morfic@gentoo.org> tightvnc-1.3_alpha5.ebuild:
+  Some QA and simplifications
+
+  21 Sep 2004; Daniel Goller <morfic@gentoo.org> tightvnc-1.3_alpha5.ebuild:
+  dont apply gcc3.4 patch unconditionally
+
+*tightvnc-1.3_alpha5 (19 Sep 2004)
+
+  19 Sep 2004; Daniel Goller <morfic@gentoo.org> tightvnc-1.3_alpha5.ebuild:
+  header error :/ , fixed
+
+  19 Sep 2004; Daniel Goller <morfic@gentoo.org> :
+  new version 1.3_alpha5 + gcc3.4 patch
+
+  28 Jul 2004; Travis Tilley <lv@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  removed amd64 'fix' that broke compiling on amd64 and re-added ~amd64 keyword
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  Stable on alpha.
+
+  24 May 2004; Daniel Ahlberg <aliz@gentoo.org>
+  tightvnc-4.0_beta20031113.ebuild:
+  Added patches for linux 2.6 headers and GCC 3.4 by Ed Catmur <ed@catmur.co.uk> in #51701 and #51601.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org>
+  tightvnc-4.0_beta20031113.ebuild:
+  Changed x11-base/xfree dep to virtual/x11 for 4.0 beta build.
+
+  10 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  Changed depend from xfree to virtual/x11
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org>
+  tightvnc-4.0_beta20031113.ebuild:
+  Added ~sparc keyword as it fixes the vncserver character flip problem.
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  Stable on sparc.
+
+  27 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  x86 unmask.
+
+  15 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> files/tightvnc-1.2.9-gentoo.diff:
+  Change fontpath, closing #22024.
+
+*tightvnc-4.0_beta20031113 (27 Nov 2003)
+
+  27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-4.0_beta20031113:
+  New cvs snapshot together with a cleaner ebuild. WARNING, some features are missing in 4.0.
+  Also removed some old ebuilds.
+
+  13 Nov 2003; Aron Griffis <agriffis@gentoo.org> tightvnc-1.2.9-r1.ebuild:
+  Unbreak this ebuild for architectures other than amd64...  Maybe this was
+  commited accidentally by Daniel below?
+
+*tightvnc-4.0_beta20031031 (03 Nov 2003)
+
+  03 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-4.0_beta20031031.ebuild :
+  Add version that compiles on amd64. Very big and ugly at the momemnt, expect cleanups soon.
+
+  18 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-1.2.9-r1.ebuild :
+  Fix unpacking.
+
+*tightvnc-1.2.9-r1 (17 Sep 2003)
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-1.2.9-r1.ebuild :
+  Added patch from bartron <bartron@gmx.net>, closing #23843.
+
+*tightvnc-1.2.9 (07 Aug 2003)
+
+  07 Aug 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-1.2.9.ebuild :
+  Version bump.
+
+  12 Jun 2003; <msterret@gentoo.org> tightvnc-1.2.3-r2.ebuild:
+  fix Header
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-1.2.8.ebuild :
+  Do not allow tightvnc and vnc to be installed at the same time as they
+  overwrite each others files. Closes #15152.
+
+*tightvnc-1.2.8 (21 Feb 2003)
+
+  21 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*tightvnc-1.2.7 (17 Jan 2002) 
+
+  17 Jan 2002; Bart Verwilst <verwilst@gentoo.org>: new ebuild
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*tightvnc-1.2.6 (28 Sep 2002) 
+
+  28 Sep 2002; Bart Verwilst <verwilst@gentoo.org>
+
+  New ebuild
+
+*tightvnc-1.2.5-r1 (26 Aug 2002)
+
+  28 Aug 2002; Bart Verwilst <verwilst@gentoo.org> tightvnc-1.2.3-r2.ebuild, tightvnc-1.2.5-r1.ebuild :
+
+  Duplicate patch entry removed.
+
+  26 Aug 2002; Donny Davies <woodchip@gentoo.org> tightvnc-1.2.5-r1.ebuild :
+
+  Squash #6814.
+
+*tightvnc-1.2.5 (18 Aug 2002)
+
+  New version
+
+*tightvnc-1.2.3-r2 (12 Jul 2002)
+
+  12 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  closes bug #4603; thanks to Ivan C.
+
+*tightvnc-1.2.3-r1 (3 June 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> tightvnc-1.2.3-r1.ebuild :
+  Added KEYWORDS, LICENSE.
+
+  3 June 2002; Ryan Phillips <rphillips@gentoo.org> tightvnc-1.2.3-r1.ebuild :
+  Fixed installation procedure.  Fixes #3337
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> tightvnc-1.2.3-r1.ebuild :
+  tightvnc needs libjpeg in order to compile correctly, so it has been added as
+  a dependency.  Thanks to kpullin@socal.rr.com for spotting it.
+
+*tightvnc-1.2.3 (25 March 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> tightvnc-1.2.3.ebuild :
+  Added KEYWORDS, LICENSE.
+
+  25 March 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+  Upgraded to 1.2.3, and removed the old 2 versions..
+  Since 1.2.2 never compiled, the TightVNC people assured me 1.2.3
+  fixes all the problems, and it does! :o) So we have a fully working 
+  version for Gentoo 1.0 :o)
 
 *tightvnc-1.2.1 (1 Feb 2002)
 
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 69f2280f8e58..3c5319f36a11 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,14 +1,27 @@
-MD5 f59a2d623ee3214e0abbf2038d657f26 tightvnc-1.2.6.ebuild 1330
-MD5 324a43da97bdaa5c787c6a04c7a54d03 tightvnc-1.2.8.ebuild 1611
-MD5 fd37a7dfd01416173feeabe6b1a6900d tightvnc-1.2.3-r2.ebuild 1123
-MD5 f97ee5791b40575c277d795e2364f55b tightvnc-1.2.7.ebuild 1551
-MD5 156ce21db4d997f881627ed14906e00b ChangeLog 2617
-MD5 451572c22930322934ee8f6a857f9630 files/digest-tightvnc-1.2.6 76
-MD5 0fc7f73784063287c23b1945458e85b3 files/digest-tightvnc-1.2.7 76
+MD5 9fc18bd0e2fbd2d12b29707f5d72a697 tightvnc-1.3_alpha7.ebuild 2276
+MD5 ad61c2374702756a5341de9f1a63efda tightvnc-1.2.8.ebuild 1595
+MD5 3cc698e0e4dc7d3c778411161b5af86d tightvnc-1.2.9-r1.ebuild 1717
+MD5 c3388af0849a29205dbf0a090a78f2c4 tightvnc-1.3_alpha5.ebuild 1871
+MD5 7ae0a240735554975624754b6dc58aae ChangeLog 8028
+MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309
 MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
+MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
+MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
+MD5 123eaef930daa068bd0b5366ca89f33c files/tightvnc-1.3_alpha7-darwin.patch 827
+MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha7-gentoo.diff 697
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
 MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
+MD5 4e84efe3429797daa190b7d29e9b5857 files/digest-tightvnc-1.3_alpha5 78
+MD5 e972798c3780581c31b4c0a4b35dfbb6 files/digest-tightvnc-1.3_alpha7 78
+MD5 70b94ceb3134edc412d70768b55661aa files/tightvnc-1.3_alpha5-gcc34.patch 1540
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha5-gentoo.security.patch 771
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
-MD5 9138c55d41bebf73ee177ef75fee2cd1 files/digest-tightvnc-1.2.3-r2 76
+MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha7-gentoo.security.patch 771
+MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha5-gentoo.diff 697
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha5-imake-tmpdir.patch 956
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff
index 508fd2effb0e..25dd2ce6c9c7 100644
--- a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo.diff
@@ -8,7 +8,7 @@
 +$vncClasses = "/usr/share/tightvnc/classes";
  $vncUserDir = "$ENV{HOME}/.vnc";
 -$fontPath = "unix/:7100";
-+# $fontPath = "unix/:7100";
++$fontPath = "unix/:-1";
  
  # Here is another example of setting the font path:
 -# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
diff --git a/net-misc/tightvnc/metadata.xml b/net-misc/tightvnc/metadata.xml
index 8060c04f89e1..9c6cec7f156b 100644
--- a/net-misc/tightvnc/metadata.xml
+++ b/net-misc/tightvnc/metadata.xml
@@ -3,6 +3,10 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
+ <email>morfic@gentoo.org</email>
+ <name>Daniel Goller</name>
+</maintainer>
+<maintainer>
   <email>aliz@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/tightvnc/tightvnc-1.2.8.ebuild b/net-misc/tightvnc/tightvnc-1.2.8.ebuild
index 64670b5cd97c..fc3b07a71ee1 100644
--- a/net-misc/tightvnc/tightvnc-1.2.8.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.8.ebuild,v 1.1 2003/02/21 17:43:59 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.8.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 inherit eutils
 
@@ -11,18 +11,19 @@ DESCRIPTION="A great client/server software package allowing remote network acce
 SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=x11-base/xfree-4.2.1
+DEPEND="virtual/x11
 	~media-libs/jpeg-6b
 	sys-libs/zlib
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	!net-misc/vnc"
 
 RDEPEND="${DEPEND}
-	sys-devel/perl
-	java? ( || ( >=virtual/jdk-1.3.1-r7 >=virtual/jre-1.3.1-r7 ) )"
+	dev-lang/perl
+	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
 
 src_unpack() {
 	unpack ${A} && cd ${S}
@@ -50,7 +51,7 @@ src_install() {
 	dodir /usr/share/man/man1 /usr/bin
 	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
 
-	dodoc ChangeLog README WhatsNew 
+	dodoc ChangeLog README WhatsNew
 	use java && dodoc ${FILESDIR}/README.JavaViewer
 	newdoc vncviewer/README README.vncviewer
 }
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
index 9495b5da36b1..31fd9db2723a 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.1 2003/09/17 14:03:59 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 inherit eutils
 
@@ -11,11 +11,11 @@ DESCRIPTION="A great client/server software package allowing remote network acce
 SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=x11-base/xfree-4.2.1
+DEPEND="virtual/x11
 	~media-libs/jpeg-6b
 	sys-libs/zlib
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
@@ -27,21 +27,24 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A} && cd ${S}
-	epatch ${FILESDIR}/tightvnc-${PVR}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	epatch ${FILESDIR}/x86.patch
 }
 
 src_compile() {
+	local CDEBUGFLAGS="${CFLAGS}"
+
 	xmkmf -a || die "xmkmf failed"
 
-	make CDEBUGFLAGS="$CFLAGS" World || die "make World failed"
+	make CDEBUGFLAGS="${CDEBUGFLAGS}" World || die "make World failed"
 	cd Xvnc && ./configure || die "Configure failed."
 
 	if use tcpd; then
-		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$CFLAGS" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
+		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
 	else
-		make CDEBUGFLAGS="$CFLAGS"
+		make CDEBUGFLAGS="${CDEBUGFLAGS}"
 	fi
 }
 
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
index afee6612fd87..e9f864c85ae7 100644
--- a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
@@ -1,20 +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-misc/tightvnc/tightvnc-1.3_alpha5.ebuild,v 1.1 2004/09/20 02:05:13 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 IUSE="java tcpd"
 
-DLFILE="`echo ${P} | sed s:_alpha:dev:`"
-
 S="${WORKDIR}/vnc_unixsrc"
 DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
-SRC_URI="mirror://sourceforge/vnc-tight/${DLFILE}_unixsrc.tar.bz2"
+SRC_URI="mirror://sourceforge/vnc-tight/${P/_alpha/dev}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-#can't test on anything but x86
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc ~amd64 alpha"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -34,26 +31,22 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
 	epatch ${FILESDIR}/x86.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	[ "$(gcc-version)" == "3.4" ] && epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {
 	local CDEBUGFLAGS="${CFLAGS}"
 
-	use amd64 && CDEBUGFLAGS="${CDEBUGFLAGS} -m32 \
-		-L/emul/linux/x86/lib \
-		-L/emul/linux/x86/usr/lib/gcc-lib/i386-pc-linux-gnu/3.2.3 \
-		-L/emul/linux/x86/usr/lib -L/emul/linux/x86/usr/X11R6/lib"
-
 	xmkmf -a || die "xmkmf failed"
 
 	make CDEBUGFLAGS="${CDEBUGFLAGS}" World || die "make World failed"
 	cd Xvnc && ./configure || die "Configure failed."
 
 	if use tcpd; then
-		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
+		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1" CC="$(tc-getCC)" || die
 	else
-		make CDEBUGFLAGS="${CDEBUGFLAGS}" || die
+		make CDEBUGFLAGS="${CDEBUGFLAGS}" CC="$(tc-getCC)" || die
 	fi
 }
 
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
index 767891427b45..8094d928aee3 100644
--- a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.1 2005/08/06 14:35:11 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.1.1.1 2005/11/30 09:55:36 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
-IUSE="java tcpd"
+IUSE="java tcpd server"
 
 S="${WORKDIR}/vnc_unixsrc"
 DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
 SRC_URI="mirror://sourceforge/vnc-tight/${P/_alpha/dev}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -26,35 +26,60 @@ RDEPEND="${DEPEND}
 	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
 
 src_unpack() {
+
+	if ! use server;
+	then
+		echo
+		einfo "The 'server' USE flag will build tightvnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	fi
+
 	unpack ${A} && cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
 	epatch ${FILESDIR}/x86.patch
+	epatch "${FILESDIR}/${P}"-darwin.patch
 }
 
 src_compile() {
-	local CDEBUGFLAGS="${CFLAGS}"
-
 	xmkmf -a || die "xmkmf failed"
 
-	make CDEBUGFLAGS="${CDEBUGFLAGS}" World || die "make World failed"
-	cd Xvnc && ./configure || die "Configure failed."
+	make CDEBUGFLAGS="${CFLAGS}" World || die
 
-	if use tcpd; then
-		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1" CC="$(tc-getCC)" || die
-	else
-		make CDEBUGFLAGS="${CDEBUGFLAGS}" CC="$(tc-getCC)" || die
+	if use server; then
+		cd Xvnc && ./configure || die "Configure failed."
+		if use tcpd; then
+			local myextra="-lwrap"
+			use userland_Darwin || myextra="${myextra} -lnss_nis"
+			make EXTRA_LIBRARIES="${myextra}" \
+				CDEBUGFLAGS="${CFLAGS}"  \
+				EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
+		else
+			make CDEBUGFLAGS="${CFLAGS}" || die
+		fi
 	fi
+
 }
 
 src_install() {
 	# the web based interface and the java viewer need the java class files
-	insinto /usr/share/tightvnc/classes ; doins classes/*
+	if use java; then
+		insinto /usr/share/tightvnc/classes
+		doins classes/*
+	fi
 
 	dodir /usr/share/man/man1 /usr/bin
 	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
 
+	if ! use server; then
+		rm -f ${D}/usr/bin/vncserver
+		rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}*
+	fi
+
 	dodoc ChangeLog README WhatsNew
 	use java && dodoc ${FILESDIR}/README.JavaViewer
 	newdoc vncviewer/README README.vncviewer
diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 1973042a4a2e..e09b5c66750c 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/tinc
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.1 2003/12/24 13:21:04 warpzero Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
+
+*tinc-1.0.3 (29 Apr 2005)
+
+  29 Apr 2005: Joshua Charles Campbell <warpzero@gentoo.org> tinc-1.0.3.ebuild:
+   Bumpity bump bump.
+
+  26 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> tinc-1.0.2.ebuild:
+  Added to ~ppc.
+
+  24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> tinc-1.0.2.ebuild,
+  files/tincd:
+  Fixed init script and added ~sparc keyword.
 
 *tinc-1.0.2 (03 Aug 2003)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 874605af042e..db09a8bde225 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -1,4 +1,7 @@
-MD5 e4f713b38d4f4570c26f25167e6810ba tinc-1.0.2.ebuild 1088
-MD5 676774f512b91a9081e24ad5705362c1 ChangeLog 604
-MD5 5cd11fe8144c34041e8ab9baf4a5090d metadata.xml 427
+MD5 677ba877c579e6e9158fe0c46fd1dd91 tinc-1.0.3.ebuild 913
+MD5 c258796958401d97fea00d0b8e66a429 tinc-1.0.2.ebuild 911
+MD5 a65dd3f32b79bc0b8c88e16c1323acbd ChangeLog 1036
+MD5 26b2621b6066e021c4222dd149af002a metadata.xml 356
+MD5 9aa869612dc4114ba8b2c8761afccdd6 files/tincd 1340
 MD5 8f70364e159d1ba3c7ed7bd5e517b5fc files/digest-tinc-1.0.2 62
+MD5 fc51fa3730eaad946925216e0ed82f3f files/digest-tinc-1.0.3 62
diff --git a/net-misc/tinc/files/tincd b/net-misc/tinc/files/tincd
index 225a7caa83e7..75e8026a9c97 100644
--- a/net-misc/tinc/files/tincd
+++ b/net-misc/tinc/files/tincd
@@ -1,8 +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-misc/tinc/files/tincd,v 1.1 2003/12/24 14:23:51 bazik Exp $
-
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
 depend() {
 	use logger dns
@@ -48,4 +47,3 @@ stop() {
 		fi
 	done
 }
-
diff --git a/net-misc/tinc/metadata.xml b/net-misc/tinc/metadata.xml
index 3bc4d2d88c46..1dd324cfbfc6 100644
--- a/net-misc/tinc/metadata.xml
+++ b/net-misc/tinc/metadata.xml
@@ -5,7 +5,6 @@
 <maintainer>
   <email>warpzero@gentoo.org</email>
   <name>Joshua Charles Campbell</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
 <longdescription>tinc is an easy to configure VPN implementation.</longdescription>
 </pkgmetadata>
diff --git a/net-misc/tinc/tinc-1.0.2.ebuild b/net-misc/tinc/tinc-1.0.2.ebuild
index 62cfaeaf712b..65cc15b120ae 100644
--- a/net-misc/tinc/tinc-1.0.2.ebuild
+++ b/net-misc/tinc/tinc-1.0.2.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.2.ebuild,v 1.1 2003/12/24 13:21:04 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://tinc.nl.linux.org/"
 SRC_URI="http://tinc.nl.linux.org/packages/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~sparc ~x86 ~ppc"
 IUSE=""
+
 DEPEND=">=dev-libs/openssl-0.9.7c
-		virtual/linux-sources
-		>=dev-libs/lzo-1.08
-		>=sys-libs/zlib-1.1.4-r2"
+	virtual/linux-sources
+	>=dev-libs/lzo-1.08
+	>=sys-libs/zlib-1.1.4-r2"
 
 src_compile() {
 	econf --enable-jumbograms || die
@@ -22,8 +24,8 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING COPYING.README INSTALL NEWS README THANKS TODO
-	exeinto /etc/init.d ; newexe ${FILESDIR}/tinc tinc
+	dodoc AUTHORS INSTALL NEWS README THANKS TODO
+	exeinto /etc/init.d ; newexe ${FILESDIR}/tincd tincd
 }
 
 pkg_postinst() {
diff --git a/net-misc/tinc/tinc-1.0.3.ebuild b/net-misc/tinc/tinc-1.0.3.ebuild
index 3ac7a591a320..ce8175c3a9cd 100644
--- a/net-misc/tinc/tinc-1.0.3.ebuild
+++ b/net-misc/tinc/tinc-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.3.ebuild,v 1.1 2005/04/29 18:39:06 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:54:56 chriswhite Exp $
 
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
diff --git a/net-misc/tkusr/ChangeLog b/net-misc/tkusr/ChangeLog
index f65545440b81..8d27eedd9b27 100644
--- a/net-misc/tkusr/ChangeLog
+++ b/net-misc/tkusr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/tkusr
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/ChangeLog,v 1.1 2003/04/22 16:41:32 utx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> tkusr-0.80.ebuild:
+  fix depend (bug #45110); tidy
 
 *tkusr-0.80 (22 Apr 2003)
 
diff --git a/net-misc/tkusr/Manifest b/net-misc/tkusr/Manifest
index e69de29bb2d1..096734a481e8 100644
--- a/net-misc/tkusr/Manifest
+++ b/net-misc/tkusr/Manifest
@@ -0,0 +1,3 @@
+MD5 290bf2cee429b71528ac020defd3554d ChangeLog 473
+MD5 1653e324377fe997406fc298b1d6972b tkusr-0.80.ebuild 958
+MD5 5de266206fcf3d57b98980c220a5546c files/digest-tkusr-0.80 61
diff --git a/net-misc/tkusr/tkusr-0.80.ebuild b/net-misc/tkusr/tkusr-0.80.ebuild
index ee90c182877c..b542ca0fca98 100644
--- a/net-misc/tkusr/tkusr-0.80.ebuild
+++ b/net-misc/tkusr/tkusr-0.80.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/tkusr-0.80.ebuild,v 1.1 2003/04/22 16:40:43 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tkusr/tkusr-0.80.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 DESCRIPTION="TkUsr is a small program that allows you to manage the Self-mode of USR/3COM Message (Plus), Professional Message modems."
 HOMEPAGE="http://www.drolez.com/tkusr"
 SRC_URI="http://www.drolez.com/tkusr/${PN}_${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-S="${WORKDIR}/${P}"
-
-DEPEND=">=tcl-8.0
-	>=tk-8.0"
-
-RDEPEND=">=tcl-8.0
-	>=tk-8.0"
-
-src_unpack() {
-	unpack "${PN}_${PV}.tar.gz"
-	cd "${S}"
-}
+DEPEND=">=dev-lang/tcl-8.0
+	>=dev-lang/tk-8.0"
 
 src_compile() {
 	emake || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
-	dodoc COPYING README
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README
 }
 
 pkg_postinst() {
diff --git a/net-misc/tlsproxyd/ChangeLog b/net-misc/tlsproxyd/ChangeLog
index 2ef1bfaf16db..82bb7f628b91 100644
--- a/net-misc/tlsproxyd/ChangeLog
+++ b/net-misc/tlsproxyd/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsproxyd/ChangeLog,v 1.1 2002/11/01 10:29:43 aliz Exp $
+# ChangeLog for net-misc/tlsproxyd
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsproxyd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> tlsproxyd-0.0.2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
 
 *tlsproxyd-0.0.2 (31 Oct 2002)
 
diff --git a/net-misc/tlsproxyd/Manifest b/net-misc/tlsproxyd/Manifest
index e69de29bb2d1..62c58f9ccc01 100644
--- a/net-misc/tlsproxyd/Manifest
+++ b/net-misc/tlsproxyd/Manifest
@@ -0,0 +1,3 @@
+MD5 ad0e2e8fc18812851d697142d38bf353 tlsproxyd-0.0.2.ebuild 828
+MD5 a87d8b7dcad60dbd1fdc8b8cc3b31337 ChangeLog 507
+MD5 e88a13ecad4bef5b8fa61e31102d5aa5 files/digest-tlsproxyd-0.0.2 66
diff --git a/net-misc/tlsproxyd/tlsproxyd-0.0.2.ebuild b/net-misc/tlsproxyd/tlsproxyd-0.0.2.ebuild
index b4015efb55eb..cd7b809fb0fe 100644
--- a/net-misc/tlsproxyd/tlsproxyd-0.0.2.ebuild
+++ b/net-misc/tlsproxyd/tlsproxyd-0.0.2.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-misc/tlsproxyd/tlsproxyd-0.0.2.ebuild,v 1.1 2002/11/01 10:29:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tlsproxyd/tlsproxyd-0.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="An TLS Tunneling Tool."
 SRC_URI="http://www.ex-parrot.com/~chris/tlsproxyd/${P}.tar.gz"
 HOMEPAGE="http://www.ex-parrot.com/~chris/tlsproxyd/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6"
 
 src_compile() {
@@ -26,5 +26,4 @@ pkg_postinst() {
 	einfo "Read the tlsproxyd MAN-Page"
 	einfo "Please create /etc/tlsproxyd/tlsproxyd.conf to fit your Configuration"
 	einfo "init Script not included in this distribution. Shouldnt be to hard to create one on your own!"
-}				
-
+}
diff --git a/net-misc/tn5250/ChangeLog b/net-misc/tn5250/ChangeLog
index 4a50328c933b..41a7e60764f7 100644
--- a/net-misc/tn5250/ChangeLog
+++ b/net-misc/tn5250/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tn5250
-# 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/net-misc/tn5250/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
+
+  14 Feb 2005; Simon Stelling <blubb@gentoo.org> tn5250-0.16.5.ebuild:
+  added ~amd64
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> tn5250-0.16.5.ebuild:
+  patch for gcc3 (bug #53013); tidy
 
 *tn5250-0.16.5 (11 Dec 2002)
   
diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest
index e69de29bb2d1..6e7a0d57d7e9 100644
--- a/net-misc/tn5250/Manifest
+++ b/net-misc/tn5250/Manifest
@@ -0,0 +1,4 @@
+MD5 d5b561fde811c36f05c3a0f6036a6841 tn5250-0.16.5.ebuild 1783
+MD5 ca82bc83377a2e3abc6dd8416e29d7d5 ChangeLog 695
+MD5 fc5092e2c892e2b96b2ac9aecac9c9d3 files/digest-tn5250-0.16.5 65
+MD5 9f5882485c1a4adbc9605ddf6e54194e files/gcc3.patch 3353
diff --git a/net-misc/tn5250/tn5250-0.16.5.ebuild b/net-misc/tn5250/tn5250-0.16.5.ebuild
index 0eee3efc5fc0..6327205c5c3f 100644
--- a/net-misc/tn5250/tn5250-0.16.5.ebuild
+++ b/net-misc/tn5250/tn5250-0.16.5.ebuild
@@ -1,66 +1,60 @@
-# 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-misc/tn5250/tn5250-0.16.5.ebuild,v 1.1 2002/12/12 02:00:24 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tn5250/tn5250-0.16.5.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Telnet client for the IBM AS/400 that emulates 5250 terminals and printers."
 HOMEPAGE="http://tn5250.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="x86 ~amd64"
 IUSE="X ssl slang"
 
 DEPEND="sys-libs/ncurses
-        X? ( virtual/x11 )
-        ssl? ( dev-libs/openssl )
-		slang? ( sys-libs/slang )"
-
-S="${WORKDIR}/${P}"
+	X? ( virtual/x11 )
+	ssl? ( dev-libs/openssl )
+	slang? ( sys-libs/slang )"
 
 src_unpack() {
 	unpack ${A}
 
 	# First, for some reason, TRUE and FALSE aren't defined
 	# for the compile.  This causes some problems.  ???
-	echo                               >> ${S}/src/tn5250-config.h.in
-	echo "/* Define TRUE and FALSE */" >> ${S}/src/tn5250-config.h.in
-	echo "#define FALSE 0"             >> ${S}/src/tn5250-config.h.in
-	echo "#define TRUE !FALSE"         >> ${S}/src/tn5250-config.h.in
+	echo                               >> "${S}/src/tn5250-config.h.in"
+	echo "/* Define TRUE and FALSE */" >> "${S}/src/tn5250-config.h.in"
+	echo "#define FALSE 0"             >> "${S}/src/tn5250-config.h.in"
+	echo "#define TRUE !FALSE"         >> "${S}/src/tn5250-config.h.in"
 
 	# Next, the Makefile for the terminfo settings tries to remove
 	# some files it doesn't have access to.  We can just remove those
 	# lines.
-    cd ${S}/linux
-	cp Makefile.in Makefile.in.orig
-	sed -e "/rm -f \/usr\/.*\/terminfo.*5250/d" \
-	    Makefile.in.orig > Makefile.in
+	cd "${S}/linux"
+	sed -i \
+		-e "/rm -f \/usr\/.*\/terminfo.*5250/d" Makefile.in \
+		|| die "sed Makefile.in failed"
+	cd "${S}/src"
+	epatch "${FILESDIR}/gcc3.patch"
 }
 
 src_compile() {
-	local myconf
-	myconf=""
-	use X && myconf="${myconf} --with-x"
-	use ssl && myconf="${myconf} --with-ssl"
-	use slang && myconf="${myconf} --with-slang"
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		${myconf} || die "./configure failed"
-	emake || die
+	econf \
+		$(use_with X x) \
+		$(use_with ssl) \
+		$(use_with slang) || die
+	emake || die "emake failed"
 }
 
 src_install() {
-
 	# The TERMINFO variable needs to be defined for the install
 	# to work, because the install calls "tic."  man tic for
 	# details.
-	mkdir -p ${D}/usr/share/terminfo
-	make DESTDIR=${D} \
-	     TERMINFO=${D}/usr/share/terminfo install || die
-	dodoc AUTHORS BUGS COPYING INSTALL NEWS README README.ssl TODO
+	dodir /usr/share/terminfo
+	make DESTDIR="${D}" \
+	     TERMINFO="${D}/usr/share/terminfo" install \
+		 || die "make install failed"
+	dodoc AUTHORS BUGS NEWS README README.ssl TODO
 	dohtml -r doc/*
 }
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 117e63842a69..110f6b8f180d 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,234 @@
 # ChangeLog for net-misc/tor
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.1 2004/02/22 08:20:08 latexer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
+
+*tor-0.1.0.14-r1 (11 Sep 2005)
+
+  11 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
+  -tor-0.1.0.14.ebuild, +tor-0.1.0.14-r1.ebuild:
+  I was having some strange issues with sending signal 2 to tor. And we do not
+  need a SIGINT, a SIGTERM is fine.
+
+  06 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/torrc.sample.patch-00, -tor-0.0.9.10.ebuild:
+  Removing older version.
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on SPARC wrt security bug #102245.
+
+  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on ppc.
+
+  15 Aug 2005; Markus Rothe <corsair@gentoo.org> tor-0.1.0.14.ebuild:
+  Stable on ppc64 (bug #102245)
+
+*tor-0.1.0.14 (14 Aug 2005)
+
+  14 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/torrc.sample-0.1.0.14.patch, +tor-0.1.0.14.ebuild:
+  Adding new version as amd64 and x86 due to sec bug. See #102245
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on amd64.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on sparc
+
+  21 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on ppc (#96320).
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.10.ebuild:
+  Stable on ppc64
+
+*tor-0.0.9.10 (16 Jun 2005)
+
+  16 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.0.9.5.ebuild, -tor-0.0.9.6.ebuild, -tor-0.0.9.7.ebuild,
+  -tor-0.0.9.9.ebuild, +tor-0.0.9.10.ebuild:
+  Added version 0.9.0.10 that fixes a security bug, removed older versions
+  that were affected.
+
+  12 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild, tor-0.0.9.9.ebuild:
+  New HOMEPAGE, thanks to Matteo in bug #95754.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
+  Stable on ppc64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> tor-0.0.9.5.ebuild:
+  Stable on ppc.
+
+*tor-0.0.9.9 (25 Apr 2005)
+
+  25 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, +tor-0.0.9.9.ebuild:
+  Removing older versions and bumping to 0.9.9 .
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> tor-0.0.9.5.ebuild,
+  tor-0.0.9.6.ebuild, tor-0.0.9.7.ebuild:
+  net-misc/tsocks -> net-proxy/tsocks
+
+  08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> tor-0.0.9.7.ebuild:
+  Keyworded ~sparc wrt #88305
+
+*tor-0.0.9.7 (01 Apr 2005)
+
+  01 Apr 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.7.ebuild:
+  Bumped
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> tor-0.0.9.6.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #86993
+
+*tor-0.0.9.6 (25 Mar 2005)
+
+  25 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; +tor-0.0.9.6.ebuild:
+  Bumped to 0.0.9.6
+
+  23 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd:
+  Changed init script to send SIGINT at shutdown. May increase the shutdown time
+  of servers, but will close in a more clean way.
+
+  25 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -tor-0.0.9.4-r1.ebuild, -tor-0.0.9.4-r2.ebuild, tor-0.0.9.5.ebuild:
+  Marking latest as x86 and removing older versions.
+
+*tor-0.0.9.5 (23 Feb 2005)
+
+  23 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.0.9.4-r2.ebuild, +tor-0.0.9.5.ebuild:
+  Adding version 0.0.9.5 and marking 0.0.9.4-r2 as x86.
+
+*tor-0.0.9.4-r2 (13 Feb 2005)
+
+  13 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; files/tor.initd,
+  +files/torrc.sample.patch-00, -tor-0.0.8.1.ebuild, -tor-0.0.9.1.ebuild,
+  -tor-0.0.9.2.ebuild, +tor-0.0.9.4-r2.ebuild, -tor-0.0.9.4.ebuild:
+  Adding new version that properly patches the sample config and deleting older
+  versions. Lost the stable ppc-macos but that arch is lagging way to much.
+
+*tor-0.0.9.4-r1 (10 Feb 2005)
+
+  10 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>; +files/tor.initd,
+  +tor-0.0.9.4-r1.ebuild:
+  Using ideas in bug #75381 from Faustus <orlovm@cs.bgu.ac.il> and after talking
+  to latexer i'm commiting this version that can use a init.d script for easier
+  usage.
+
+*tor-0.0.9.4 (04 Feb 2005)
+
+  04 Feb 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.4.ebuild:
+  Bump.
+
+  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> tor-0.0.9.2.ebuild:
+  Marked ~amd64, closes bug 76780.
+
+*tor-0.0.9.2 (04 Jan 2005)
+
+  04 Jan 2005; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.2.ebuild:
+  Bump.
+
+*tor-0.0.9.1 (16 Dec 2004)
+
+  16 Dec 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.9.1.ebuild:
+  Bump. Add tsocks dependancy, see bug #70879
+
+  20 Oct 2004; Peter Johanson <latexer@gentoo.org> -tor-0.0.6.1.ebuild,
+  -tor-0.0.6.ebuild, -tor-0.0.7.2.ebuild, -tor-0.0.7.3.ebuild,
+  -tor-0.0.7.ebuild:
+  Remove old vulnerable versions. See bug #67756
+
+  21 Oct 2004; Joseph Jezak <josejx@gentoo.org> tor-0.0.8.1.ebuild:
+  Keyworded ppc-macos and macos due to vulnerability in previous versions.
+  Removed tsocks RDEPEND at the request of latexer. See bug #67756
+
+*tor-0.0.8.1 (17 Oct 2004)
+
+  17 Oct 2004; <peter@gentoo.org> +tor-0.0.8.1.ebuild, -tor-0.0.8.ebuild:
+  Bump and remove 0.0.8 which is vulnerable to a remote DoS. See bug #67756.
+
+*tor-0.0.8 (06 Oct 2004)
+
+  06 Oct 2004; <peter@gentoo.org> tor-0.0.6.1.ebuild, tor-0.0.6.ebuild,
+  tor-0.0.7.2.ebuild, tor-0.0.7.3.ebuild, tor-0.0.7.ebuild, +tor-0.0.8.ebuild:
+  Bump. Also fix the license as this is really under 3-clause BSD.
+
+*tor-0.0.7.3 (15 Aug 2004)
+
+  15 Aug 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.3.ebuild:
+  Bump. Only needed for servers.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  24 Jul 2004; Erik Swanson <erik@gentoo.org> tor-0.0.7.2.ebuild:
+  Added macos to KEYWORDS
+
+*tor-0.0.7.2 (15 Jul 2004)
+
+  15 Jul 2004; Peter Johanson <latexer@gentoo.org> +tor-0.0.7.2.ebuild:
+  Bump to latest version. tsocks is now a depend for everything but macos, since
+  tsocks no worky there.
+
+*tor-0.0.7 (07 Jun 2004)
+
+  07 Jun 2004; Peter Johanson,,, <peter@gentoo.org> tor-0.0.2_pre27.ebuild,
+  tor-0.0.5.ebuild, tor-0.0.6_rc1.ebuild, tor-0.0.7.ebuild:
+  Bump to lates release, and remove older versions.
+
+*tor-0.0.6.1 (06 May 2004)
+
+  06 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.1.ebuild:
+  Bump.
+
+  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
+  Adding back ~ppc, as dholm wants me to keep it around for future updates.
+
+*tor-0.0.6 (02 May 2004)
+
+  02 May 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6.ebuild:
+  Bump to latest release.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> tor-0.0.6_rc1.ebuild:
+  Added to ~ppc.
+
+*tor-0.0.6_rc1 (29 Apr 2004)
+
+  29 Apr 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.6_rc1.ebuild:
+  Bump to latest. Beware, this version is not backwards compatible with older
+  versions.
+
+*tor-0.0.5 (30 Mar 2004)
+
+  30 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre21.ebuild,
+  tor-0.0.2_pre22.ebuild, tor-0.0.2_pre23.ebuild, tor-0.0.2_pre24.ebuild,
+  tor-0.0.2_pre25.ebuild, tor-0.0.5.ebuild:
+  Bump to latest release. Removed a bunch of the old stuff. Initscript coming
+  soon, i swear.
+
+*tor-0.0.2_pre27 (15 Mar 2004)
+
+  15 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre27.ebuild:
+  Bump.
+
+*tor-0.0.2_pre25 (04 Mar 2004)
+
+  04 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre25.ebuild:
+  Bump. Fixes a crash due to DNS stuff.
+
+*tor-0.0.2_pre24 (03 Mar 2004)
+
+  03 Mar 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre24.ebuild:
+  Bump
+
+*tor-0.0.2_pre23 (29 Feb 2004)
+
+  29 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre23.ebuild:
+  Bump
+
+*tor-0.0.2_pre22 (28 Feb 2004)
+
+  28 Feb 2004; Peter Johanson <latexer@gentoo.org> tor-0.0.2_pre22.ebuild:
+  Bump
 
 *tor-0.0.2_pre21 (22 Feb 2004)
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 414cc3b430e3..a0642cfea7dd 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,3 +1,16 @@
-MD5 56af14c0d34e0d3fdcf49299cf37874a tor-0.0.2_pre21.ebuild 596
-MD5 b5865f551fa6dd21658e0f8349638c9f metadata.xml 223
-MD5 9913d07265bb00b95a4e19329d58191b files/digest-tor-0.0.2_pre21 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 68f8bf751a6bddbb1209e520d23c6337 tor-0.1.0.14-r1.ebuild 1271
+MD5 60844b617ce6eb89f0dd3bc2d8e377de ChangeLog 8025
+MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
+MD5 ddb143bc03f010846dd1c1a12c80ec04 files/digest-tor-0.1.0.14-r1 64
+MD5 ef65448a33725bf0e7f4d02d5e0b8fb1 files/torrc.sample-0.1.0.14.patch 1120
+MD5 3321d3725a619e687d9bb7e2fb97d6c1 files/tor.initd 856
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJLpc8zY1VwezZiERAo6jAJ4oyBXeG0NX49bQ8ei0RCF6B/DD/QCfYBpG
+5NNQScTqcCAkQgEh7QPyO0c=
+=ALrH
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor.initd b/net-misc/tor/files/tor.initd
index b714ee56fde8..b29243c8f893 100644
--- a/net-misc/tor/files/tor.initd
+++ b/net-misc/tor/files/tor.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd,v 1.1 2005/02/10 21:12:02 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
 depend() {
         need net
@@ -11,8 +11,7 @@ checkconfig() {
         # first check that it exists
         if [ ! -f /etc/tor/torrc ] ; then
                 eerror "You need to setup /etc/tor/torrc first"
-                eerror "Example is in /etc/tor"
-                eerror "for info: info sockd.conf"
+                eerror "Example is in /etc/tor/torrc.sample"
                 return 1
         fi
 }
diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index f5461571b386..30876e851586 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>latexer@gentoo.org</email>
+  <email>humpback@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-misc/tor/tor-0.1.0.14-r1.ebuild b/net-misc/tor/tor-0.1.0.14-r1.ebuild
index 760b9671111e..8e3949c113ee 100644
--- a/net-misc/tor/tor-0.1.0.14-r1.ebuild
+++ b/net-misc/tor/tor-0.1.0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.14-r1.ebuild,v 1.1 2005/09/11 23:14:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.14-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:34 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/trickle/ChangeLog b/net-misc/trickle/ChangeLog
index fbe8bd1e6bb8..b668e960ecd4 100644
--- a/net-misc/trickle/ChangeLog
+++ b/net-misc/trickle/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-misc/trickle
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/trickle/ChangeLog,v 1.1 2003/08/06 19:08:04 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/trickle/ChangeLog,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
+
+  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> trickle-1.06.ebuild:
+  Marked ~amd64 wrt bug #97758.
+
+  04 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> trickle-1.06.ebuild:
+  Added to ~ppc.
+
+  20 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> trickle-1.06.ebuild:
+  Added to ~sparc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> trickle-1.06.ebuild:
+  change virtual/glibc to virtual/libc
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> trickle-1.06.ebuild:
+  Add die following econf for bug 48950
 
 *trickle-1.06 (06 Aug 2003)
 
diff --git a/net-misc/trickle/Manifest b/net-misc/trickle/Manifest
index d1308337718d..76a4c1b48723 100644
--- a/net-misc/trickle/Manifest
+++ b/net-misc/trickle/Manifest
@@ -1,3 +1,13 @@
-MD5 0cd0ded6d91efc87401d90d1f755ab3b ChangeLog 290
-MD5 ff2504bbaaa4e626b3cc7309fb5da27c trickle-1.06.ebuild 362
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b5b3742ac785acae6a905f5edc2633ac trickle-1.06.ebuild 645
+MD5 ae086696a831d5027e0ce26076353cad ChangeLog 891
 MD5 32a904d9258e29aff82a406e10e0cc9b files/digest-trickle-1.06 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCzGRm2G5bA0cA/ScRAlYoAJ4kSUM2ZGjsh/ItY8fhJAb+Vhq/FgCgsW2Q
+XQdp+YQpm9yIHKd/0YcDa1A=
+=wbqE
+-----END PGP SIGNATURE-----
diff --git a/net-misc/trickle/trickle-1.06.ebuild b/net-misc/trickle/trickle-1.06.ebuild
index 7d950caee8b1..a2490a1517fc 100644
--- a/net-misc/trickle/trickle-1.06.ebuild
+++ b/net-misc/trickle/trickle-1.06.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/trickle/trickle-1.06.ebuild,v 1.1 2003/08/06 19:08:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/trickle/trickle-1.06.ebuild,v 1.1.1.1 2005/11/30 09:55:08 chriswhite Exp $
 
 DESCRIPTION="a portable lightweight userspace bandwidth shaper"
 SRC_URI="http://www.monkey.org/~marius/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.monkey.org/~marius/trickle/"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-libs/libevent
 	sys-apps/sed"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_compile() {
-	econf
+	econf || die "econf failed"
 	make PREFIX=/usr || die
 }
 
diff --git a/net-misc/tsclient/ChangeLog b/net-misc/tsclient/ChangeLog
index 19b30165c51c..5afe257d658b 100644
--- a/net-misc/tsclient/ChangeLog
+++ b/net-misc/tsclient/ChangeLog
@@ -1,10 +1,75 @@
 # ChangeLog for net-misc/tsclient
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.1 2002/11/06 06:19:39 bcowan Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
+
+  14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> tsclient-0.132.ebuild:
+  Added to ~ppc. See bug #112450.
+
+  14 May 2005; Jason Wever <weeve@gentoo.org> tsclient-0.132.ebuild:
+  Stable on SPARC.
+
+  18 Nov 2003; Aron Griffis <agriffis@gentoo.org> tsclient-0.132.ebuild:
+  Stable on alpha and ia64
+
+  18 Nov 2003; Chris Gianelloni <wolf31o2@gentoo.org> tsclient-0.132.ebuild:
+  Marked stable for x86.
+
+*tsclient-0.132 (10 Nov 2003)
+
+  10 Nov 2003; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml,
+  tsclient-0.132.ebuild:
+  Version bumped to 0.132 for testing.  Closing bug #33169.
+
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> tsclient-0.120.ebuild:
+  stable bump for 0.120
+
+*tsclient-0.124 (28 Sep 2003)
+
+  28 Sep 2003; Alastair Tse <liquidx@gentoo.org> tsclient-0.124.ebuild:
+  version bump
+
+  12 Aug 2003; Mike Gardiner <obz@gentoo.org> tsclient-0.116.ebuild,
+  tsclient-0.120.ebuild:
+  Added dependency on intltool and pkgconfig
+
+*tsclient-0.120 (12 Aug 2003)
+
+  12 Aug 2003; Mike Gardiner <obz@gentoo.org> tsclient-0.116.ebuild,
+  tsclient-0.120.ebuild:
+  new version, and bumped tsclient-0.160 to stable on x86
+
+*tsclient-0.116 (04 Jul 2003)
+
+  04 Jul 2003; Alastair Tse <liquidx@gentoo.org> tsclient-0.104.ebuild,
+  tsclient-0.116.ebuild:
+  version bump
+
+*tsclient-0.104 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*tsclient-0.91 (26 Jan 2003)
+  
+  22 Feb 2003; Alastair Tse <liquidx@gentoo.org> tsclient-0.91.ebuild,
+  files/tsclient.desktop:
+  Applet installs in the right location (#15925). Added Gnome menu entry.
+  
+  26 Jan 2003; Brad Cowan <bcowan@gentoo.org> tsclient-0.91.ebuild,
+  files/digest-tsclient-0.91:
+  Version bump.
+
+*tsclient-0.86 (28 Dec 2002)
+
+  22 Feb 2003; Alastair Tse <liquidx@gentoo.org tsclient-0.86.ebuild,
+  Applet installs in the right location (#15925). Added Gnome menu entry.
+
+  28 Dec 2002; Brad Cowan <bcowan@gentoo.org> tsclient-0.86.ebuild,
+  files/digest-tsclient-0.86:
+  Version bump.
 
 *tsclient-0.32 (06 Nov 2002)
 
   06 Nov 2002; Brad Cowan <bcowan@gentoo.org> tsclient-0.32.ebuild,
   files/digest-tsclient-0.32, ChangeLog :
-  
   Initial import.
diff --git a/net-misc/tsclient/Manifest b/net-misc/tsclient/Manifest
index e69de29bb2d1..b46c3f86bb18 100644
--- a/net-misc/tsclient/Manifest
+++ b/net-misc/tsclient/Manifest
@@ -0,0 +1,11 @@
+MD5 e33c7734f8a611b3ee5aaae3cf0a1a03 ChangeLog 2349
+MD5 c4c8d589f3b68a9f794079a97adb9cf6 files/digest-tsclient-0.116 66
+MD5 4892c42265f06312c5e7a58b01a029b7 files/digest-tsclient-0.120 66
+MD5 c21884e87daa4b14b26f59b994536c2b files/digest-tsclient-0.124 66
+MD5 cdf0181fb9c19219f34ccd186a4d9074 files/digest-tsclient-0.132 66
+MD5 59e31cc311a4c1c31a6ace61a722e35d files/tsclient.desktop 226
+MD5 25263231f48056d59cbf1f1f6b180e5e metadata.xml 334
+MD5 f3efa41f0f0923e91c2aa8a1d673d797 tsclient-0.116.ebuild 851
+MD5 6ac2566cce8fc0d7b925e957dc22805b tsclient-0.120.ebuild 901
+MD5 8f6a41796ba49e9713b8b83f6b159044 tsclient-0.124.ebuild 856
+MD5 43e8d1ac341bfa88e65113aadd0e52af tsclient-0.132.ebuild 806
diff --git a/net-misc/tsclient/files/tsclient.desktop b/net-misc/tsclient/files/tsclient.desktop
index cbd9cbd06573..5df1a20abbec 100644
--- a/net-misc/tsclient/files/tsclient.desktop
+++ b/net-misc/tsclient/files/tsclient.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Terminal Server Client
 Comment=Frontend for rdesktop
 TryExec=tsclient
@@ -6,3 +7,4 @@ Exec=tsclient
 Icon=/usr/share/pixmaps/tsclient/tsclient.png
 Terminal=0
 Type=Application
+Categories=Application;Network;
diff --git a/net-misc/tsclient/metadata.xml b/net-misc/tsclient/metadata.xml
index da6fd63d0085..5b7dbcf1d9a6 100644
--- a/net-misc/tsclient/metadata.xml
+++ b/net-misc/tsclient/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer>
+  <email>wolf31o2@gentoo.org</email>
+  <name>Chris Gianelloni</name>
+</maintainer>
+<longdescription>
+TSclient is a GTK2+ frontend for rdesktop.
+</longdescription>
 </pkgmetadata>
diff --git a/net-misc/tsclient/tsclient-0.116.ebuild b/net-misc/tsclient/tsclient-0.116.ebuild
index fdd76eff6f61..c02a6fcac4e6 100644
--- a/net-misc/tsclient/tsclient-0.116.ebuild
+++ b/net-misc/tsclient/tsclient-0.116.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.116.ebuild,v 1.1 2003/07/04 21:28:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.116.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 DESCRIPTION="GTK2 frontend for rdesktop"
 HOMEPAGE="http://www.gnomepro.com/tsclient"
@@ -8,14 +8,18 @@ SRC_URI="http://www.gnomepro.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.0
+RDEPEND=">=x11-libs/gtk+-2.0
 	>=net-misc/rdesktop-1.1.0
 	>=dev-libs/glib-2.0
 	>=gnome-base/gnome-panel-2.0"
 
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.22
+	  dev-util/pkgconfig"
+
 src_compile() {
 	econf || die "configure failed"
 	emake || die "make failed"
@@ -25,5 +29,5 @@ src_install() {
 	make DESTDIR=${D} install
 	insinto /usr/share/applications
 	doins ${FILESDIR}/tsclient.desktop
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION   
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
 }
diff --git a/net-misc/tsclient/tsclient-0.120.ebuild b/net-misc/tsclient/tsclient-0.120.ebuild
index bca6e06b4455..7f437b1a1ccf 100644
--- a/net-misc/tsclient/tsclient-0.120.ebuild
+++ b/net-misc/tsclient/tsclient-0.120.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.120.ebuild,v 1.1 2003/08/12 11:41:56 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.120.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 DESCRIPTION="GTK2 frontend for rdesktop"
 HOMEPAGE="http://www.gnomepro.com/tsclient"
@@ -8,14 +8,18 @@ SRC_URI="http://www.gnomepro.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.0
+RDEPEND=">=x11-libs/gtk+-2.0
 	>=net-misc/rdesktop-1.2.0
 	>=dev-libs/glib-2.0
 	>=gnome-base/gnome-panel-2.0"
 
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.22
+	  dev-util/pkgconfig"
+
 src_compile() {
 	econf || die "configure failed"
 	emake || die "make failed"
@@ -26,5 +30,5 @@ src_install() {
 	insinto /usr/share/applications
 	doins ${FILESDIR}/tsclient.desktop
 	# ChangeLog and INSTALL seem to have file size of 0 in the tarball
-	dodoc AUTHORS COPYING NEWS README VERSION   
+	dodoc AUTHORS COPYING NEWS README VERSION
 }
diff --git a/net-misc/tsclient/tsclient-0.124.ebuild b/net-misc/tsclient/tsclient-0.124.ebuild
index 1070d755f35a..3453a7e24619 100644
--- a/net-misc/tsclient/tsclient-0.124.ebuild
+++ b/net-misc/tsclient/tsclient-0.124.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.124.ebuild,v 1.1 2003/09/28 10:10:36 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.124.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 DESCRIPTION="GTK2 frontend for rdesktop"
 HOMEPAGE="http://www.gnomepro.com/tsclient"
diff --git a/net-misc/tsclient/tsclient-0.132.ebuild b/net-misc/tsclient/tsclient-0.132.ebuild
index 53c517d27051..a02391a8d3a0 100644
--- a/net-misc/tsclient/tsclient-0.132.ebuild
+++ b/net-misc/tsclient/tsclient-0.132.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-misc/tsclient/tsclient-0.132.ebuild,v 1.1 2003/11/11 00:01:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-0.132.ebuild,v 1.1.1.1 2005/11/30 09:54:54 chriswhite Exp $
 
 DESCRIPTION="GTK2 frontend for rdesktop"
 HOMEPAGE="http://www.gnomepro.com/tsclient"
@@ -8,7 +8,7 @@ SRC_URI="http://www.gnomepro.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="alpha ~amd64 ia64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.0
diff --git a/net-misc/ucarp/ChangeLog b/net-misc/ucarp/ChangeLog
index b2134d31bbb8..857dd8a39850 100644
--- a/net-misc/ucarp/ChangeLog
+++ b/net-misc/ucarp/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-misc/ucarp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ChangeLog,v 1.1 2004/07/13 19:29:26 tantive Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+  01 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> +metadata.xml,
+  ucarp-1.1.ebuild:
+  added metadata.xml, ucarp-1.1 marked stable on x86
+
+  01 Mar 2005; Christian Zoffoli <xmerlin@gentoo.org> +metadata.xml,
+  ucarp-1.1.ebuild:
+  added metadata.xml, ucarp-1.1 marked stable on x86
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> ucarp-0.7.ebuild,
+  ucarp-1.1.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+*ucarp-1.1 (19 Sep 2004)
+
+  19 Sep 2004; Michael Imhof <tantive@gentoo.org> +ucarp-1.1.ebuild:
+  Version bumped. Closes #64310.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> ucarp-0.7.ebuild:
+  Typo in DESCRIPTION: implimentation -> implementation. Bug 59717.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> ucarp-0.7.ebuild:
+  Added to ~ppc.
 
 *ucarp-0.7 (13 Jul 2004)
 
diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index c4f46e340c29..63c2ae90bc95 100644
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -1,2 +1,16 @@
-MD5 991f574478cf8b7f01f00f34d1cac1f3 ucarp-0.7.ebuild 636
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5861d7a2edbc5841da436ac004d87f06 ucarp-0.7.ebuild 715
+MD5 5e06c67e4ec89f51ad9e89b0ad77d614 ucarp-1.1.ebuild 1114
+MD5 385612308ee8c3a9ddb2530c9b90e117 ChangeLog 1117
+MD5 c6a4990c7e7c1c7c9c532bef426fc902 metadata.xml 222
 MD5 705d7cc5a9540cf4265ba8890308ef58 files/digest-ucarp-0.7 61
+MD5 3f0a78b9bbdbe61fd16e25ceb4ff1627 files/digest-ucarp-1.1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCJGOHgMUyd/cdjWsRArmPAJ4poaN+HRNCwnl+eTvYWeB4o6uUlQCfd6Pi
+JiyuhgTVqBPGwgciLf1chBI=
+=iCmK
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ucarp/ucarp-0.7.ebuild b/net-misc/ucarp/ucarp-0.7.ebuild
index 84b31bf6e8c2..47366ff70b4c 100644
--- a/net-misc/ucarp/ucarp-0.7.ebuild
+++ b/net-misc/ucarp/ucarp-0.7.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-0.7.ebuild,v 1.1 2004/07/13 19:29:26 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
-DESCRIPTION="Userspace CARP implimentation allows hosts to share ip address."
+DESCRIPTION="Userspace CARP implementation allows hosts to share ip address."
 
 HOMEPAGE="http://www.ucarp.org/"
 SRC_URI="http://www.pureftpd.org/ucarp/${P}.tar.bz2"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 
-DEPEND=">=net-libs/libpcap-0.8.3-r1"
+DEPEND="virtual/libpcap"
 
 src_compile() {
 
diff --git a/net-misc/ucarp/ucarp-1.1.ebuild b/net-misc/ucarp/ucarp-1.1.ebuild
index efd7cc8659a1..0dfbf3e8703e 100644
--- a/net-misc/ucarp/ucarp-1.1.ebuild
+++ b/net-misc/ucarp/ucarp-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-1.1.ebuild,v 1.1 2004/09/19 20:40:23 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ucarp/ucarp-1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 inherit eutils
 
@@ -9,23 +9,20 @@ Strong points of the CARP protocol are : very low overhead, cryptographically si
 "
 HOMEPAGE="http://www.ucarp.org"
 LICENSE="GPL-2"
-DEPEND=">=net-libs/libpcap-0.8.3-r1"
+DEPEND="virtual/libpcap"
 SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 src_compile() {
-	cd "${S}"
 	econf || die
-
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install-strip || die
-	#einstall || die
+	make DESTDIR=${D} install || die
 
 	dodoc README INSTALL NEWS ChangeLog || die
 	dodoc examples/linux/vip-up.sh examples/linux/vip-down.sh
diff --git a/net-misc/udpcast/ChangeLog b/net-misc/udpcast/ChangeLog
index 3321edbaac12..b33b8ed35adc 100644
--- a/net-misc/udpcast/ChangeLog
+++ b/net-misc/udpcast/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-misc/udpcast
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/ChangeLog,v 1.1 2004/02/28 09:37:05 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/ChangeLog,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> udpcast-20050226.ebuild:
+  Marking x86 stable.
+
+*udpcast-20050226 (24 Mar 2005)
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +udpcast-20050226.ebuild:
+  Version bump.
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> udpcast-20040222.ebuild:
+  x86 stable
+
+  31 Jul 2004; <malc@gentoo.org> udpcast-20040222.ebuild:
+  ~amd64 closes bug #57776
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> udpcast-20040222.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
 
 *udpcast-20040222 (28 Feb 2004)
 
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index 20d188902a51..023a42c57f7f 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -1,4 +1,6 @@
-MD5 07450e0ec2d1b1fb3cbe08f3908d49ad files/digest-udpcast-20040222 67
-MD5 45969099568664e0ed61412bed8b886f udpcast-20040222.ebuild 1007
-MD5 59f7057a68dfa4894524062780550d6e ChangeLog 361
+MD5 1ba35944929526f56e28f040193d8e57 udpcast-20050226.ebuild 1015
+MD5 e9461889bcb3ec75002c66ae59cbf35c ChangeLog 876
 MD5 db21dc26a3f6b6a8a90667fc2933a7b1 metadata.xml 575
+MD5 38c8c890d29c1e9fa1d66cd0c95b8f00 udpcast-20040222.ebuild 1015
+MD5 07450e0ec2d1b1fb3cbe08f3908d49ad files/digest-udpcast-20040222 67
+MD5 f7b97c79dec4b11bde01769669058839 files/digest-udpcast-20050226 67
diff --git a/net-misc/udpcast/udpcast-20040222.ebuild b/net-misc/udpcast/udpcast-20040222.ebuild
index 734f0e4cff42..4e835dad3323 100644
--- a/net-misc/udpcast/udpcast-20040222.ebuild
+++ b/net-misc/udpcast/udpcast-20040222.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-misc/udpcast/udpcast-20040222.ebuild,v 1.1 2004/02/28 09:37:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/udpcast-20040222.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Multicast file transfer tool"
 HOMEPAGE="http://udpcast.linux.lu/"
 SRC_URI="http://udpcast.linux.lu/current/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-lang/perl"
 
 S=${WORKDIR}/${PN}
diff --git a/net-misc/udpcast/udpcast-20050226.ebuild b/net-misc/udpcast/udpcast-20050226.ebuild
index c6abc2da7877..9ba3b4952af5 100644
--- a/net-misc/udpcast/udpcast-20050226.ebuild
+++ b/net-misc/udpcast/udpcast-20050226.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/udpcast-20050226.ebuild,v 1.1 2005/03/24 16:41:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/udpcast/udpcast-20050226.ebuild,v 1.1.1.1 2005/11/30 09:55:10 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Multicast file transfer tool"
@@ -9,7 +9,7 @@ SRC_URI="http://udpcast.linux.lu/current/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="virtual/libc
 	dev-lang/perl"
diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 0a5fdc91591f..abf1ea0dcb49 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,8 +1,131 @@
 # ChangeLog for net-misc/unison
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.1 2002/07/18 02:53:57 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
-*unison-2.9.1.ebuild (17 July 2002)
+*unison-2.12.0-r1 (21 Sep 2005)
+
+  21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> +unison-2.12.0-r1.ebuild,
+  -unison-2.12.0.ebuild, -unison-2.13.0.ebuild, +unison-2.13.16.ebuild,
+  +unison-2.17.1.ebuild:
+  Fix for deprecated gtk2 USE flag (bug #106560). Add latest stable and update
+  to latest unstable version.
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> unison-2.12.0.ebuild:
+  Stable on sparc
+
+  13 Aug 2005; Matthieu Sozeau <mattam@gentoo.org> unison-2.12.0.ebuild,
+  unison-2.13.0.ebuild:
+  Fixed wrong URL's.
+
+  02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> unison-2.12.0.ebuild,
+  unison-2.13.0.ebuild:
+  Keyworded ~sparc
+
+  19 Jul 2005; Matthieu Sozeau <mattam@gentoo.org>
+  +files/ocaml-3.08-extnames.patch, +unison-2.9.1-r1.ebuild:
+  Resurrected old stable version.
+
+  13 Jul 2005; Matthieu Sozeau <mattam@gentoo.org>
+  +files/unison-2.12.0-gtk2-bug.patch, unison-2.12.0.ebuild:
+  Fix for gtk2 bug (#56070 on gnome's bugzilla). Already worked around in 2.13.0.
+  Fixes bug #98883.
+
+  13 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> unison-2.12.0.ebuild,
+  unison-2.13.0.ebuild:
+  Make thread support configurable, minor fixes (doc flag, wrong cd).
+
+*unison-2.13.0 (12 Jul 2005)
+
+  12 Jul 2005; Matthieu Sozeau <mattam@gentoo.org>
+  -files/ocaml-3.08-extnames.patch, -unison-2.10.2.ebuild,
+  +unison-2.12.0.ebuild, -unison-2.12.2.ebuild, +unison-2.13.0.ebuild,
+  -unison-2.9.1-r1.ebuild:
+  Removed old versions and added latest stable and beta versions. Reworked docs
+  flag (now downloads prebuilt docs). Added static and debug use flags with
+  their usual sense. Now use THREADS=true by default, maybe not good on some
+  arches.
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> :
+  Dependency update: net-www/lynx -> www-client/lynx.
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> unison-2.12.2.ebuild:
+  Dependency update: net-www/lynx -> www-client/lynx.
+
+*unison-2.12.2 (14 Mar 2005)
+
+  14 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> +unison-2.12.2.ebuild:
+  Add latest beta, thanks to Martin von Gagern <Martin.vGagern@gmx.net> for the
+  new ebuild. Fixes bug #84678.
+
+  18 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> unison-2.10.2.ebuild,
+  unison-2.9.1-r1.ebuild:
+  Add ssh-askpass runtime dependencies (fixes bug #68298).
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  09 Oct 2004; Simon Stelling <blubb@gentoo.org> :
+  added ~amd64
+
+  30 Sep 2004; Tom Martin <slarti@gentoo.org> unison-2.10.2.ebuild:
+  Readded ~amd64 keyword, resolves bug 65926. Thanks to Neil Bothwick
+  <neil@digimed.co.uk> for reporting.
+
+*unison-2.10.2 (25 Sep 2004)
+
+  25 Sep 2004; Matthieu Sozeau <mattam@gentoo.org> +unison-2.10.2.ebuild,
+  -unison-2.9.1.ebuild:
+  New beta version of unison, with brand new lablgtk2 GUI. Thanks to Alan Shmitt
+  <alan.schmitt@polytechnique.org>, for the submission (bug #63107). Removed 
+  old, unused ebuild.
+  
+  19 Aug 2004; Stuart Herbert <stuart@gentoo.org> unison-2.9.1-r1.ebuild,
+  unison-2.9.1.ebuild:
+  Fixed broken SRC_URI settings, requested by tigger@gentoo.org
+  Removed macos KEYWORD; fails repoman checks (bad alexander ;-)
+
+*unison-2.9.1-r1 (09 Aug 2004)
+
+  09 Aug 2004; Matthieu Sozeau <mattam@gentoo.org>
+  +files/ocaml-3.08-extnames.patch, +unison-2.9.1-r1.ebuild, +metadata.xml:
+  Fix compilation bug with ocaml-3.08, thanks for Bardur Arantsson
+  <gentoo@scientician.net> for the patch (bug #59762). Stable on ppc.
+
+  26 Jul 2004; Alexander Plank <alexander@gentoo.org> unison-2.9.1.ebuild:
+  adding macos keyword (thanks Philippe Bouamriou who started bug #57918)
+
+  13 Jul 2004; Travis Tilley <lv@gentoo.org> unison-2.9.1.ebuild:
+  adding back ~amd64 keyword
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> unison-2.9.1.ebuild:
+  Fix use invocation
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> unison-2.9.1.ebuild:
+  Stable on alpha.
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> unison-2.9.1.ebuild:
+  Marked -amd64 as dependencies aren't fulfilled anymore.
+
+  13 May 2004; Travis Tilley <lv@gentoo.org> unison-2.9.1.ebuild:
+  added ~amd64 keyword
+
+  14 Apr 2004; <kloeri@gentoo.org> unison-2.9.1.ebuild:
+  Keyworded ~alpha.
+
+  22 Jan 2004; Matthieu Sozeau <mattam@gentoo.org> unison-2.9.1.ebuild:
+  Added ~ppc keyword, fix DEPEND & RDEPEND to avoid problems with (labl)gtk-2
+  packages.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> unison-2.9.1.ebuild:
+  Added sed-fu fix to unison to adjust it's Makefile.OCaml for the new tail
+  syntax.
+
+  23 Dec 2003; Markus Nigbur <pyrania@gentoo.org> unison-2.9.1.ebuild:
+  Fixed tarball and digest issues.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*unison-2.9.1 (17 July 2002)
 
   17 July 2002; George Shapovalov <george@gentoo.org> unison-2.9.1.ebuild, files/digest-unison-2.9.1, ChangeLog :
 
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index e69de29bb2d1..ba2157422386 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -0,0 +1,12 @@
+MD5 bfd01cd66f086cc9ca50321067cb43c1 unison-2.9.1-r1.ebuild 1276
+MD5 dc921f25945741ae308447b210b6d06f unison-2.12.0-r1.ebuild 1442
+MD5 bb6b0f0017f986bd9f2d8cb440925309 unison-2.13.16.ebuild 1696
+MD5 8b6f14fa98998bc5019f4006af2e5dff ChangeLog 5188
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 43fc45ee96440a704728a48654f42202 unison-2.17.1.ebuild 1773
+MD5 38eaac5e705cb7500f081bb5fc220273 files/digest-unison-2.12.0-r1 65
+MD5 613c9eae8429f41c8218d4967501b0ef files/digest-unison-2.17.1 204
+MD5 5abcf068ada1ab9eedbe3dfa16ad15fb files/ocaml-3.08-extnames.patch 748
+MD5 402b704e5c7c71a69fd6400c395834ec files/unison-2.12.0-gtk2-bug.patch 490
+MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1-r1 64
+MD5 3e50ed2240ee231bdb6079e1289eb97b files/digest-unison-2.13.16 207
diff --git a/net-misc/unison/unison-2.12.0-r1.ebuild b/net-misc/unison/unison-2.12.0-r1.ebuild
index e2244d5ed0c4..4b6374f942fe 100644
--- a/net-misc/unison/unison-2.12.0-r1.ebuild
+++ b/net-misc/unison/unison-2.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/net-misc/unison/unison-2.12.0-r1.ebuild,v 1.1 2005/09/21 16:32:39 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.12.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit eutils
 
@@ -15,8 +15,8 @@ KEYWORDS="x86 ppc ~amd64 sparc"
 DEPEND=">=dev-lang/ocaml-3.04
 	gtk? ( >=dev-ml/lablgtk-2.2 )"
 
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2 )
-|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass )"
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
diff --git a/net-misc/unison/unison-2.13.16.ebuild b/net-misc/unison/unison-2.13.16.ebuild
index 49ecd05990b0..cbb63f0842b6 100644
--- a/net-misc/unison/unison-2.13.16.ebuild
+++ b/net-misc/unison/unison-2.13.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16.ebuild,v 1.1 2005/09/21 16:32:39 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit eutils
 
@@ -15,8 +15,8 @@ KEYWORDS="x86 ppc ~amd64 ~sparc"
 DEPEND=">=dev-lang/ocaml-3.04
 	gtk? ( >=dev-ml/lablgtk-2.2 )"
 
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2 )
-|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass )"
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
 SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
diff --git a/net-misc/unison/unison-2.17.1.ebuild b/net-misc/unison/unison-2.17.1.ebuild
index f33ae0d5f563..b978eb7822a8 100644
--- a/net-misc/unison/unison-2.17.1.ebuild
+++ b/net-misc/unison/unison-2.17.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1.ebuild,v 1.1 2005/09/21 16:32:39 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit eutils
 
@@ -15,8 +15,8 @@ KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 DEPEND=">=dev-lang/ocaml-3.04
 	gtk? ( >=dev-ml/lablgtk-2.2 )"
 
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2 )
-|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass )"
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
 SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
diff --git a/net-misc/unison/unison-2.9.1-r1.ebuild b/net-misc/unison/unison-2.9.1-r1.ebuild
index 217d1fb24354..25b1fec28eba 100644
--- a/net-misc/unison/unison-2.9.1-r1.ebuild
+++ b/net-misc/unison/unison-2.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.9.1-r1.ebuild,v 1.1 2004/08/09 10:40:37 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit eutils
 
@@ -10,13 +10,14 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc alpha ~amd64 macos"
+KEYWORDS="x86 sparc ppc ~alpha ~amd64"
 
 DEPEND=">=dev-lang/ocaml-3.04
 	gtk? ( =dev-ml/lablgtk-1.2* )"
-RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2*
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
-SRC_URI="mirror://${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -32,7 +33,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 
 	if use gtk; then
diff --git a/net-misc/unix2tcp/ChangeLog b/net-misc/unix2tcp/ChangeLog
index 291249edffba..3fce0ab8fa0f 100644
--- a/net-misc/unix2tcp/ChangeLog
+++ b/net-misc/unix2tcp/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-misc/unix2tcp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unix2tcp/ChangeLog,v 1.1 2003/09/22 20:45:04 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unix2tcp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
+
+  31 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> unix2tcp-0.8.2.ebuild:
+  Marked ~amd64.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> unix2tcp-0.8.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+  06 Jun 2004; Daniel Black <dragonheart@gentoo.org> unix2tcp-0.7.2.ebuild,
+  unix2tcp-0.8.2.ebuild:
+  x86 keyworded and QA - IUSE on both
+
+  08 May 2004; David Holm <dholm@gentoo.org> unix2tcp-0.8.2.ebuild:
+  Added to ~ppc.
+
+*unix2tcp-0.8.2 (08 May 2004)
+
+  08 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  +unix2tcp-0.8.2.ebuild:
+  version bump thanks to Mihai RUSU <dizzy@roedu.net> in bug #50328
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> unix2tcp-0.7.2.ebuild:
+  adding s390 to keywords
 
 *unix2tcp-0.7.2 (22 Sep 2003)
 
diff --git a/net-misc/unix2tcp/Manifest b/net-misc/unix2tcp/Manifest
index 1f608ab053c3..5e447196eecc 100644
--- a/net-misc/unix2tcp/Manifest
+++ b/net-misc/unix2tcp/Manifest
@@ -1,3 +1,6 @@
-MD5 d2ddd21e4185a2e019a1cdd017e198c6 unix2tcp-0.7.2.ebuild 599
+MD5 ce9afe2c6fcdcfa6367e21b3c0b07e01 ChangeLog 1091
+MD5 e9d496470ea1086da7178fd43025928f unix2tcp-0.7.2.ebuild 587
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 880b1069c7938e8c1ba37bcfbf423da5 unix2tcp-0.8.2.ebuild 589
 MD5 d15c15cd9647b1b20fd4d826b07c237e files/digest-unix2tcp-0.7.2 66
-MD5 a4d3c0a6a4c1bf9113ab887d6abe8921 ChangeLog 375
+MD5 3c89fcdc7c66a368bf4dd1ed5315013e files/digest-unix2tcp-0.8.2 66
diff --git a/net-misc/unix2tcp/unix2tcp-0.7.2.ebuild b/net-misc/unix2tcp/unix2tcp-0.7.2.ebuild
index 5d68581f1c88..92645c4618c4 100644
--- a/net-misc/unix2tcp/unix2tcp-0.7.2.ebuild
+++ b/net-misc/unix2tcp/unix2tcp-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc., 2003 Mihai RUSU
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unix2tcp/unix2tcp-0.7.2.ebuild,v 1.1 2003/09/22 20:45:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unix2tcp/unix2tcp-0.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,8 @@ SRC_URI="http://dizzy.roedu.net/unix2tcp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 s390"
+IUSE=""
 
 src_compile() {
 	emake LDFLAGS="${LDFLAGS}" || die
diff --git a/net-misc/unix2tcp/unix2tcp-0.8.2.ebuild b/net-misc/unix2tcp/unix2tcp-0.8.2.ebuild
index d5cfa32803f1..8089d03641e0 100644
--- a/net-misc/unix2tcp/unix2tcp-0.8.2.ebuild
+++ b/net-misc/unix2tcp/unix2tcp-0.8.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-misc/unix2tcp/unix2tcp-0.8.2.ebuild,v 1.1 2004/05/07 17:55:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unix2tcp/unix2tcp-0.8.2.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 inherit eutils
 
@@ -10,21 +10,12 @@ SRC_URI="http://dizzy.roedu.net/unix2tcp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~s390"
+KEYWORDS="~amd64 arm hppa ia64 ~ppc s390 x86"
+IUSE=""
 
-DEPEND="sys-devel/gcc
-	virtual/glibc"
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND=""
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 	dodoc ChangeLog README
 }
-
-
diff --git a/net-misc/upnp/ChangeLog b/net-misc/upnp/ChangeLog
index 33299c480044..90788bb415b9 100644
--- a/net-misc/upnp/ChangeLog
+++ b/net-misc/upnp/ChangeLog
@@ -1,7 +1,39 @@
 # ChangeLog for net-misc/upnp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/ChangeLog,v 1.1 2002/07/20 19:36:01 blizzy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/ChangeLog,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
+  02 Nov 2005; Stefan Schweizer <genstef@gentoo.org> upnp-1.2.1a.ebuild:
+  app-text/ghostscript -> virtual/ghostscript
+
+  07 Jun 2005; Jason Wever <weeve@gentoo.org> upnp-1.2.1a.ebuild:
+  Added ~sparc keyword wrt bug #95319.
+
+*upnp-1.2.1a (25 May 2005)
+
+  25 May 2005; Daniel Black <dragonheart@gentoo.org> +upnp-1.2.1a.ebuild:
+  Version bump as per bug #59728 thanks to Brian Litzinger
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> upnp-1.0.4-r1.ebuild:
+  Stable on ppc.
+
+  05 Nov 2004; Travis Tilley <lv@gentoo.org> upnp-1.0.4-r1.ebuild:
+  added ~amd64 keyword
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> upnp-1.0.4-r1.ebuild:
+  Add inherit eutils
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> upnp-1.0.4-r1.ebuild,
+  upnp-1.0.4.ebuild:
+  fixing depend qa issue. see 45343.
+
+*upnp-1.0.4-r1 (15 Jul 2003)
+
+  15 Jul 2003; Nick Hadaway <raker@gentoo.org> upnp-1.0.4-r1.ebuild,
+  files/msmessenger.patch:
+  Added a patch for compatibility with MSN and linux-igd
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *upnp-1.0.4 (20 Jul 2002)
 
   20 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
diff --git a/net-misc/upnp/Manifest b/net-misc/upnp/Manifest
index e69de29bb2d1..9fd0f441157a 100644
--- a/net-misc/upnp/Manifest
+++ b/net-misc/upnp/Manifest
@@ -0,0 +1,8 @@
+MD5 bdb0256b1c57e5a4ec0c129f2f1b7ac3 ChangeLog 1420
+MD5 9c84a2a05767ba2a9032b767c32b19d9 files/digest-upnp-1.0.4 65
+MD5 9c84a2a05767ba2a9032b767c32b19d9 files/digest-upnp-1.0.4-r1 65
+MD5 3dbbca36405d3fb80da9e680a2457e1e files/digest-upnp-1.2.1a 66
+MD5 d1e8a04f3971c238d992f69d683fe65b files/msmessenger.patch 590
+MD5 1ab317d5868a9b63279d0fd1a2013ff7 upnp-1.0.4-r1.ebuild 919
+MD5 a0c64a5cb4d40e2ffa38d1a21c8d5915 upnp-1.0.4.ebuild 859
+MD5 4115ce784cee05c2d11e91939021e2d3 upnp-1.2.1a.ebuild 1229
diff --git a/net-misc/upnp/upnp-1.0.4-r1.ebuild b/net-misc/upnp/upnp-1.0.4-r1.ebuild
index 363b99f48c72..48023ee1bc4d 100644
--- a/net-misc/upnp/upnp-1.0.4-r1.ebuild
+++ b/net-misc/upnp/upnp-1.0.4-r1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.0.4-r1.ebuild,v 1.1 2003/07/15 08:01:16 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
+
+inherit eutils
 
 S="${WORKDIR}/${PN}sdk-${PV}"
 
 DESCRIPTION="Intel's UPnP SDK"
 HOMEPAGE="http://upnp.sourceforge.net"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/upnp/${PN}sdk-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/upnp/${PN}sdk-${PV}.tar.gz"
+RESTRICT="nomirror"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="x86 sparc ppc ~amd64"
+IUSE=""
 
-RDEPEND="sys-apps/e2fsprogs"
-DEPEND="${RDEPEND}"
+DEPEND="sys-fs/e2fsprogs"
 
 src_compile() {
 	epatch ${FILESDIR}/msmessenger.patch
diff --git a/net-misc/upnp/upnp-1.0.4.ebuild b/net-misc/upnp/upnp-1.0.4.ebuild
index 313a4a0bc1cf..4ae1e350bd1d 100644
--- a/net-misc/upnp/upnp-1.0.4.ebuild
+++ b/net-misc/upnp/upnp-1.0.4.ebuild
@@ -1,18 +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/net-misc/upnp/upnp-1.0.4.ebuild,v 1.1 2002/07/20 19:36:01 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.0.4.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 S="${WORKDIR}/${PN}sdk-${PV}"
 
 DESCRIPTION="Intel's UPnP SDK"
 HOMEPAGE="http://upnp.sourceforge.net"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/upnp/${PN}sdk-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/upnp/${PN}sdk-${PV}.tar.gz"
+RESTRICT="nomirror"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ~ppc"
+IUSE=""
 
-RDEPEND="sys-apps/e2fsprogs"
-DEPEND="${RDEPEND}"
+DEPEND="sys-fs/e2fsprogs"
 
 src_compile() {
 	emake || die "compile problem"
diff --git a/net-misc/upnp/upnp-1.2.1a.ebuild b/net-misc/upnp/upnp-1.2.1a.ebuild
index db8a08957dcd..71a850995686 100644
--- a/net-misc/upnp/upnp-1.2.1a.ebuild
+++ b/net-misc/upnp/upnp-1.2.1a.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.2.1a.ebuild,v 1.1 2005/06/07 08:54:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.2.1a.ebuild,v 1.1.1.1 2005/11/30 09:55:46 chriswhite Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${PN}sdk-${PV}"
-
 DESCRIPTION="Intel's UPnP SDK"
 HOMEPAGE="http://upnp.sourceforge.net"
-SRC_URI="mirror://sourceforge/upnp/lib${PN}-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/upnp/lib${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc debug"
 
 DEPEND="sys-fs/e2fsprogs
 	doc? ( app-doc/doc++
 	       app-text/tetex
-	       app-text/ghostscript )"
+	       virtual/ghostscript )"
 
-S=${WORKDIR}/lib${PN}-${PV}/upnp
+S="${WORKDIR}"/lib${P}/upnp
 
 src_compile() {
 	myconf=""
diff --git a/net-misc/urlview/ChangeLog b/net-misc/urlview/ChangeLog
index f04fa3d58d5a..e8999b6eaa0b 100644
--- a/net-misc/urlview/ChangeLog
+++ b/net-misc/urlview/ChangeLog
@@ -1,11 +1,51 @@
 # ChangeLog for net-misc/urlview
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/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-misc/urlview/ChangeLog,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
 
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> urlview-0.9.ebuild:
+  Mark 0.9 stable on amd64
+
+  26 Feb 2005; Simon Stelling <blubb@gentoo.org> +files/include-fix.patch,
+  urlview-0.9.ebuild:
+  added Bernhard Ager's patch to fix bug 70254 and ~amd64
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> urlview-0.9.ebuild:
+  Stable on ppc64
+
+  15 Dec 2004; Markus Rothe <corsair@gentoo.org> urlview-0.9.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #74231
+
+  04 Sep 2004; Tom Martin <slarti@gentoo.org> urlview-0.9.ebuild:
+  Added einfo with regard to bug 42907.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> urlview-0.9.ebuild:
+  Add inherit eutils
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> urlview-0.9.ebuild:
+  adding s390 keywords
+
+  19 Oct 2003; Markus Nigbur <pyrania@gentoo.org> urlview-0.9.ebuild:
+  Added newline fix. Thanks to James Harlow (#25101).
+
+  22 May 2003; Aron Griffis <agriffis@gentoo.org> urlview-0.9.ebuild:
+  Mark stable on alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *urlview-0.9 (1 Feb 2002)
+  
+  26 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> urlview-0.9.ebuild :
+  Added ppc to Keywords.
+  Added RDEPEND
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> urlview-0.9.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  25 Apr 2002; Tod Neidt <tod@gentoo.org> urlview-0.9.ebuild :
+  Fixed sandbox violation. Updated syntax.
   
+
+  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-misc/urlview/Manifest b/net-misc/urlview/Manifest
index e69de29bb2d1..9f5133c6db23 100644
--- a/net-misc/urlview/Manifest
+++ b/net-misc/urlview/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 659bacec4472ac464b6de0c57b17e63e ChangeLog 2033
+MD5 593ad36c743cdc743a30217f4814febb files/digest-urlview-0.9 62
+MD5 f631f5ca3775f966209cb1425160f52f files/include-fix.patch 238
+MD5 c3cd1ba7a6d71c5c30a75ef47d767eee files/no-trailing-newline.patch 527
+MD5 9bf6deb71ef4b12cc5d240e97370e50d urlview-0.9.ebuild 1384
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFDVWqdJrHF4yAQTrARAt53AJ9CbTNIN55zCMsoSZBfIXnAOfZoFQCY8u6e
+lw1WoU4QycR0ROgSa5H/Zw==
+=bSch
+-----END PGP SIGNATURE-----
diff --git a/net-misc/urlview/files/digest-urlview-0.9 b/net-misc/urlview/files/digest-urlview-0.9
index 5338e92379e4..87d6e98032c6 100644
--- a/net-misc/urlview/files/digest-urlview-0.9
+++ b/net-misc/urlview/files/digest-urlview-0.9
@@ -1 +1 @@
-MD5 67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz
+MD5 67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz 46685
diff --git a/net-misc/urlview/urlview-0.9.ebuild b/net-misc/urlview/urlview-0.9.ebuild
index 09951c37b0fa..e94ab9f0e377 100644
--- a/net-misc/urlview/urlview-0.9.ebuild
+++ b/net-misc/urlview/urlview-0.9.ebuild
@@ -1,35 +1,54 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/urlview-0.9.ebuild,v 1.1 2001/07/18 00:46:22 lamer Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/urlview/urlview-0.9.ebuild,v 1.1.1.1 2005/11/30 09:54:47 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="extracts urls from text and will send them to another app"
-SRC_URI="ftp://gd.tuwien.ac.at/infosys/mail/mutt/contrib/${P}.tar.gz"
 HOMEPAGE="http://www.mutt.org"
-DEPEND=">=sys-libs/ncurses-5.2"
+SRC_URI="ftp://gd.tuwien.ac.at/infosys/mail/mutt/contrib/${P}.tar.gz"
 
-#RDEPEND=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 s390 sparc x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2"
 
 src_compile() {
-	try ./configure --infodir=/usr/share/info --mandir=/usr/share/man \
-	--prefix=/usr --sysconfdir=/etc --host=${CHOST}
-	
-	try emake
-	#try make
+	epatch ${FILESDIR}/no-trailing-newline.patch
+	epatch ${FILESDIR}/include-fix.patch
+
+	./configure \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--host=${CHOST} || die "Configure Failed"
+
+	 emake || die "Parallel Make Failed"
 }
 
 src_install () {
-	
-	# try make prefix=${D}/usr install
+	dodir /usr/share/man/man1
+
+	make infodir=${D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc \
+		install || die "Installation Failed"
 
-    try make DESTDIR=${D} install
-	 dodoc README INSTALL ChangeLog AUTHORS COPYING sample.urlview
-	 dobin url_handler.sh
+	dodoc README INSTALL ChangeLog AUTHORS COPYING sample.urlview
+	dobin url_handler.sh
 }
 
 pkg_postinst() {
+	echo
 	einfo "There is a sample.urlview in /usr/share/doc/${P}"
 	einfo "You can also customize /usr/bin/url_handler.sh"
+	echo
+	einfo "If using urlview from mutt, you may need to "set pipe_decode" in"
+	einfo "your ~/.muttrc to prevent garbled URLs."
+	echo
 }
 
diff --git a/net-misc/utelnetd/ChangeLog b/net-misc/utelnetd/ChangeLog
index f87182973377..22fe468122d7 100644
--- a/net-misc/utelnetd/ChangeLog
+++ b/net-misc/utelnetd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/utelnetd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/utelnetd/ChangeLog,v 1.1 2004/01/23 00:52:18 matsuu Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/utelnetd/ChangeLog,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
+
+  29 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> utelnetd-0.1.9.ebuild:
+  Fixed CC usage to use new toolchain-funcs.eclass. bug 69278.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> utelnetd-0.1.9.ebuild:
+  change virtual/glibc to virtual/libc
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> :
+  adding s390 keywords
 
 *utelnetd-0.1.9 (23 Jan 2004)
 
diff --git a/net-misc/utelnetd/Manifest b/net-misc/utelnetd/Manifest
index c6009568adbe..034380bb1e3c 100644
--- a/net-misc/utelnetd/Manifest
+++ b/net-misc/utelnetd/Manifest
@@ -1,5 +1,5 @@
-MD5 de35be2bce270ce4414f85f6840af250 utelnetd-0.1.9.ebuild 612
+MD5 e34d6210c106a35b6475508f45f67b01 utelnetd-0.1.9.ebuild 721
+MD5 15dc02968dc280aa2cdd1af523a790fe ChangeLog 674
 MD5 7d953237baf36020d41bb64e1527b03a metadata.xml 339
-MD5 fe27089058a9401ba802ad8091e5d6bd ChangeLog 272
-MD5 c90647159e49926abff1b25741b1a940 files/utelnetd.initd 469
+MD5 217a51497aaa289b6108836ed967b298 files/utelnetd.initd 463
 MD5 6c1972c3a4aca49cd5fc0e6a9e879aa0 files/digest-utelnetd-0.1.9 65
diff --git a/net-misc/utelnetd/files/utelnetd.initd b/net-misc/utelnetd/files/utelnetd.initd
index 678d23f09512..65a6f33700ef 100644
--- a/net-misc/utelnetd/files/utelnetd.initd
+++ b/net-misc/utelnetd/files/utelnetd.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
-# $Header: /var/cvsroot/gentoo-x86/net-misc/utelnetd/files/utelnetd.initd,v 1.1 2004/01/23 00:52:18 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/utelnetd/files/utelnetd.initd,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
 
 start() {
 	ebegin "Starting utelnetd"
diff --git a/net-misc/utelnetd/utelnetd-0.1.9.ebuild b/net-misc/utelnetd/utelnetd-0.1.9.ebuild
index 185ec3203466..903e5bc7ad3a 100644
--- a/net-misc/utelnetd/utelnetd-0.1.9.ebuild
+++ b/net-misc/utelnetd/utelnetd-0.1.9.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/net-misc/utelnetd/utelnetd-0.1.9.ebuild,v 1.1 2004/01/23 00:52:18 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/utelnetd/utelnetd-0.1.9.ebuild,v 1.1.1.1 2005/11/30 09:54:44 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="A small Telnet daemon, derived from the Axis tools"
 HOMEPAGE="http://www.pengutronix.de/software/utelnetd_en.html"
@@ -8,15 +10,13 @@ SRC_URI="http://www.pengutronix.de/software/utelnetd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc s390"
 IUSE=""
 
-DEPEND="virtual/glibc"
-
-S=${WORKDIR}/${P}
+DEPEND="virtual/libc"
 
 src_compile() {
-	emake CC="${CC}" || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
diff --git a/net-misc/vconfig/ChangeLog b/net-misc/vconfig/ChangeLog
index e1e12c3b3865..b403050a6c73 100644
--- a/net-misc/vconfig/ChangeLog
+++ b/net-misc/vconfig/ChangeLog
@@ -1,6 +1,58 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/ChangeLog,v 1.1 2003/06/07 15:12:35 solar Exp $
+# ChangeLog for net-misc/vconfig
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+*vconfig-1.9 (12 Nov 2005)
+
+  12 Nov 2005; <solar@gentoo.org> +vconfig-1.9.ebuild:
+  - version bump. This release fixes return error codes in vconfig.
+
+  27 Jun 2005; David Holm <dholm@gentoo.org> vconfig-1.8.ebuild:
+  Added to ~ppc.
+
+  05 Feb 2005; <solar@gentoo.org> vconfig-1.8.ebuild:
+  - update rdepends
+
+  28 Oct 2004; <solar@gentoo.org> -vconfig-1.7-r1.ebuild,
+  -vconfig-1.7-r2.ebuild, -vconfig-1.7.ebuild, vconfig-1.8.ebuild:
+  fixed CC usage to use new toolchain-funcs.eclass. bug 69275
+
+  12 Jul 2004; <solar@gentoo.org> vconfig-1.7-r1.ebuild,
+  vconfig-1.7-r2.ebuild, vconfig-1.7.ebuild, vconfig-1.8.ebuild:
+  updated ebuilds to use virtual/os-headers s versioned >=2.4.14 headers
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> vconfig-1.7-r2.ebuild,
+  vconfig-1.8.ebuild:
+  Add inherit eutils
+
+  08 Mar 2004; <augustus@gentoo.org> vconfig-1.8.ebuild:
+  Added ~amd64 keyword.
+
+  13 Oct 2003; <solar@gentoo.org> vconfig-1.8.ebuild:
+  bumping to stable on x86, Thanks for helping confirm this Andy.Dustman
+
+*vconfig-1.8 (01 Oct 2003)
+
+  01 Oct 2003; <solar@gentoo.org> vconfig-1.8.ebuild:
+  version bump that adds Updated MAC-VLAN code. Bugs in the code are to be
+  reported to the VLAN mailing list per request.
+
+*vconfig-1.7-r2 (24 Sep 2003)
+
+  24 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> vconfig-1.7-r2.ebuild:
+  add multiline string patch for gcc3.3 (submitted upstream as well), cleanup
+  ebuild, add details about MTU workaround
+
+  05 Jul 2003; <solar@gentoo.org> metadata.xml:
+  added metadata.xml
+
+*vconfig-1.7-r1 (10 Jun 2003)
+
+  10 Jun 2003; Ned Ludd solar@gentoo.org Manifest, vconfig-1.7-r1.ebuild:
+  Update to get vconfig to install into /sbin vs /usr/sbin (planning for support
+  of init scripts) Added vlan test scripts to docs with path fixes in the .pl
+  scripts I suggest that those .pl scripts not be used as it looks like they
+  contain a /tmp race condition
 
 *vconfig-1.7 (07 Jun 2003)
 
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
index 7f8de26982c0..58d9b98f89f5 100644
--- a/net-misc/vconfig/Manifest
+++ b/net-misc/vconfig/Manifest
@@ -1,2 +1,18 @@
-MD5 26fde1309cac1f3011e7b266f43c17a8 vconfig-1.7.ebuild 794
-MD5 f2bc7516c2dfe6d1722ef5cc7c546488 files/digest-vconfig-1.7 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3181e8bf6601cea6f8c9a870a8e8579 ChangeLog 2342
+MD5 4522407c3158529f4f2c56dce0c498b5 files/digest-vconfig-1.8 60
+MD5 4dd77294f21b543a02d809ac585aa12b files/digest-vconfig-1.9 60
+MD5 5a9b16815d29150da06fa36dba3535f2 metadata.xml 500
+MD5 cdadfe60a8f4b0dfd4a7f55002ff3bdb vconfig-1.8.ebuild 1515
+MD5 32045b10ead649d097fe22b473753850 vconfig-1.9.ebuild 1415
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iQCVAwUBQ3XqD54WFLgrx1GWAQKWLQP9HDZGpnHZ8J7aLIlRorbB+sxviBTtz/pN
+iwsO+UJyOa7AZlCW2IaWQYDA8dHkZCQQtqzN5JVXZcjc/UJTi3MMTg1aPGQLkVnG
+Ed/FtGZlNGxdfdfW4fLlGAAqtJHNgOrYcu+c1gtoYFhh4TRvkraxbMM51LtIYtkj
+d6BY3nkIX8Y=
+=z79n
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vconfig/metadata.xml b/net-misc/vconfig/metadata.xml
index e87fde198db7..625f8564cccf 100644
--- a/net-misc/vconfig/metadata.xml
+++ b/net-misc/vconfig/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>hardened</herd>
+	<herd>base-system</herd>
 	<maintainer>
 		<email>solar@gentoo.org</email>
 		<description>Primary Maintainer</description>
diff --git a/net-misc/vconfig/vconfig-1.8.ebuild b/net-misc/vconfig/vconfig-1.8.ebuild
index d80f0e18c0a9..f6f5ed0a7ee1 100644
--- a/net-misc/vconfig/vconfig-1.8.ebuild
+++ b/net-misc/vconfig/vconfig-1.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.8.ebuild,v 1.1 2003/10/01 06:41:20 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.8.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
 
 MY_PN="vlan"
 S=${WORKDIR}/${MY_PN}
@@ -11,10 +13,10 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
 # mirror://gentoo/vconfig-1.7-gcc33-multiline.patch"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~arm"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="static"
-DEPEND=">=sys-kernel/linux-headers-2.4.14"
-RDEPEND=">=virtual/kernel-2.4.14"
+DEPEND="virtual/libc virtual/os-headers"
+RDEPEND="!static? ( virtual/libc )"
 
 src_unpack() {
 	unpack ${MY_PN}.${PV}.tar.gz
@@ -23,8 +25,8 @@ src_unpack() {
 }
 
 src_compile() {
-	use static && LDFLAGS="${LDFLAGS} -static"
-	emake CC="${CC}" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	use static && appened-ldflags -static
+	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
index cee345e4a5bc..8ec8c852eee2 100644
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ b/net-misc/vconfig/vconfig-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-misc/vconfig/vconfig-1.9.ebuild,v 1.1 2005/11/12 13:11:17 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vconfig/vconfig-1.9.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog
index abd107fae50a..99c934e0f52e 100644
--- a/net-misc/vde/ChangeLog
+++ b/net-misc/vde/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/vde
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.1 2005/02/07 02:19:57 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+  09 Jun 2005; <rphillips@gentoo.org> +files/vde.init.d, vde-1.5.8.ebuild:
+  Added init script from Nico Baggus
+
+*vde-1.5.8 (09 Jun 2005)
+
+  09 Jun 2005; <rphillips@gentoo.org> +files/vde-qemu-Makefile.in.diff,
+  +vde-1.5.8.ebuild:
+  version bump. Thanks to Nico Baggus. Fixes #95611
 
 *vde-1.5.7 (06 Feb 2005)
 
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index ef46a97169f9..be947f501148 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,2 +1,18 @@
-MD5 9460c97490b3e1e0792a7e7957c1251c vde-1.5.7.ebuild 972
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ad5b416aa3600c7972a73954b476ab7c ChangeLog 609
 MD5 1f08cfb4e6c7ac2cdf36de3515171dfb files/digest-vde-1.5.7 58
+MD5 1bb099a717f163a56a1ec18919e4e93a files/digest-vde-1.5.8 58
+MD5 be0314f824da3e7ae0ca64c4c791b600 files/vde-qemu-Makefile.in.diff 362
+MD5 9f6d117cccae4215334a4485ba469e96 files/vde.init.d 564
+MD5 98727198655490ad4bf4b8a2bcc8d5db metadata.xml 293
+MD5 7983b29b84f31064b69cfe3115c628af vde-1.5.7.ebuild 1071
+MD5 abd5e8ba34bda25a4fc48fc9da80b97d vde-1.5.8.ebuild 736
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1mOYI1lqEGTUzyQRAuQDAJ92v8UdzJXRDQrrrmtg75UUwbTcMQCg023Q
+0eN4Ynss9xLtl9Banri1Pak=
+=1TRV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vde/files/vde.init.d b/net-misc/vde/files/vde.init.d
index a1f4118406df..e227612ae9ef 100644
--- a/net-misc/vde/files/vde.init.d
+++ b/net-misc/vde/files/vde.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/files/vde.init.d,v 1.1 2005/06/09 22:34:46 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/files/vde.init.d,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 depend() {
 	before net
diff --git a/net-misc/vde/vde-1.5.7.ebuild b/net-misc/vde/vde-1.5.7.ebuild
index 445e54d4e9df..0146d7c5ecf7 100644
--- a/net-misc/vde/vde-1.5.7.ebuild
+++ b/net-misc/vde/vde-1.5.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-misc/vde/vde-1.5.7.ebuild,v 1.1 2005/02/07 02:19:57 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-1.5.7.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 DESCRIPTION="vde is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
 SRC_URI="mirror://sourceforge/vde/${P}.tgz"
@@ -33,5 +33,3 @@ src_install() {
 
 	dodoc COPYING INSTALL PORTS README
 }
-
-
diff --git a/net-misc/vde/vde-1.5.8.ebuild b/net-misc/vde/vde-1.5.8.ebuild
index 80d9ea3d1080..a4e8ce61412f 100644
--- a/net-misc/vde/vde-1.5.8.ebuild
+++ b/net-misc/vde/vde-1.5.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-1.5.8.ebuild,v 1.1 2005/06/09 22:21:11 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-1.5.8.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="vde is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml."
 SRC_URI="mirror://sourceforge/vde/${P}.tgz"
@@ -11,8 +13,6 @@ KEYWORDS="~x86"
 IUSE=""
 DEPEND=""
 
-inherit eutils
-
 src_compile() {
 	pushd qemu
 	epatch ${FILESDIR}/vde-qemu-Makefile.in.diff
@@ -23,7 +23,10 @@ src_compile() {
 
 src_install() {
 	einstall
-	dodoc COPYING INSTALL PORTS README
-}
 
+	dodir /etc/init.d
+	cp ${FILESDIR}/vde.init.d ${D}/etc/init.d/vde
+	fperms a+x ${D}/etc/init.d/vde
 
+	dodoc COPYING INSTALL PORTS README
+}
diff --git a/net-misc/vmnet/ChangeLog b/net-misc/vmnet/ChangeLog
index 5a3ed3981403..ab1ee07b3f14 100644
--- a/net-misc/vmnet/ChangeLog
+++ b/net-misc/vmnet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vmnet
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vmnet/ChangeLog,v 1.1 2003/07/28 01:51:26 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmnet/ChangeLog,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> vmnet-0.4.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> vmnet-0.4.ebuild:
+  Add inherit eutils
+
+*vmnet-0.4 (27 Jul 2003)
 
   27 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> vmnet-0.4.ebuild:
   Initial Commit. Based off debian package.
diff --git a/net-misc/vmnet/Manifest b/net-misc/vmnet/Manifest
index 2d426b157709..8785d75cc15f 100644
--- a/net-misc/vmnet/Manifest
+++ b/net-misc/vmnet/Manifest
@@ -1,3 +1,3 @@
-MD5 7e449315c0ce319d0d3bcc611d1955cc vmnet-0.4.ebuild 2852
-MD5 7e449315c0ce319d0d3bcc611d1955cc vmnet-0.4.ebuild~ 2852
+MD5 2b4e7d51afe92cdc07eb08cb6bfc3bad ChangeLog 516
+MD5 391b01377e29c7d69b8edb934edf4217 vmnet-0.4.ebuild 1117
 MD5 006508bcd1eeb5d1d3fd01679bb3404b files/digest-vmnet-0.4 122
diff --git a/net-misc/vmnet/vmnet-0.4.ebuild b/net-misc/vmnet/vmnet-0.4.ebuild
index 1d77923d1220..5cb875f0a31d 100644
--- a/net-misc/vmnet/vmnet-0.4.ebuild
+++ b/net-misc/vmnet/vmnet-0.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vmnet/vmnet-0.4.ebuild,v 1.1 2003/07/28 01:51:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmnet/vmnet-0.4.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A simple virtual networking program"
 HOMEPAGE="ftp://ftp.xos.nl/pub/linux/${PN}/"
@@ -8,14 +10,15 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/${PN}/"
 # So this might be better but it's a different filename
 # http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz
 # We use the debian patch anyway
-SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz 
-	http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
+SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
+
 DEPEND="sys-apps/net-tools"
-S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -27,19 +30,13 @@ src_compile() {
 }
 
 src_install() {
-	# Binary
-	into /usr
-	dobin ${PN}
-	# This line doesn't seem to work?
-	# fperms 4755 ${PN}
-	chmod 4755 ${D}/usr/bin/${PN}
-	
-	# Docs
+	dobin ${PN} || die "dobin"
+	fperms 4711 /usr/bin/${PN} || die "fperms"
+
 	doman ${PN}.1
-	dodoc COPYING README debian/${PN}.sgml
-	
-	# Config file
-	into /etc
+	dodoc README debian/${PN}.sgml
+
+	insinto /etc
 	doins debian/${PN}.conf
 }
 
diff --git a/net-misc/vmpsd/ChangeLog b/net-misc/vmpsd/ChangeLog
index 2698e66f6cce..e4f83fa95271 100644
--- a/net-misc/vmpsd/ChangeLog
+++ b/net-misc/vmpsd/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/vmpsd
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/ChangeLog,v 1.1 2004/12/08 00:38:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 *vmpsd-1.3 (07 Dec 2004)
 
diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index 851b69649f01..51686b485aef 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -1,2 +1,4 @@
-MD5 ce767f98116739ea7043865d04fb4254 vmpsd-1.3.ebuild 535
+MD5 c05e75588cdeb1c0049bc065d915c22c ChangeLog 481
+MD5 5c9d9683447326ea1f1a6fe9aa699120 metadata.xml 225
+MD5 43acb0e78c9e240e5e2bffdc3dc4ad3b vmpsd-1.3.ebuild 926
 MD5 d792e8dbf7b9f22201dbcfb493118d81 files/digest-vmpsd-1.3 60
diff --git a/net-misc/vmpsd/vmpsd-1.3.ebuild b/net-misc/vmpsd/vmpsd-1.3.ebuild
index e6f182e778ca..93ecfa4881ad 100644
--- a/net-misc/vmpsd/vmpsd-1.3.ebuild
+++ b/net-misc/vmpsd/vmpsd-1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/vmpsd-1.3.ebuild,v 1.1 2004/12/08 00:38:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/vmpsd-1.3.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
-inherit eutils 
+inherit eutils
 
 DESCRIPTION="An open-source VLAN management system"
 HOMEPAGE="http://vmps.sourceforge.net"
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 7d2d968f75d9..86974891c93f 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,11 +1,179 @@
 # ChangeLog for net-misc/vnc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/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-misc/vnc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
-*vnc-3.3.3-r2 (1 Feb 2002)
+  18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> vnc-4.0-r1.ebuild:
+  Stable on ppc.
+
+  16 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> vnc-4.0-r1.ebuild:
+  Stable on sparc
+
+  15 Nov 2005; Paul Varner <fuzzyray@gentoo.org> vnc-4.0-r1.ebuild:
+  Stable on x86
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> vnc-4.0-r1.ebuild:
+  Mark 4.0-r1 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> vnc-4.0-r1.ebuild:
+  stable on ia64
+
+  25 Jun 2005; Simon Stelling <blubb@gentoo.org> vnc-4.0-r1.ebuild:
+  make vnc multilib-capable, bug 91755
+
+  09 Jun 2005; <omkhar@gentoo.org> +files/xc.patch-eieio.patch,
+  vnc-4.0-r1.ebuild:
+  fix for eieio compile error with 2.6 headers and vnc server on ppc64
+
+  18 May 2005; Michael Sterrett <mr_bones_@gentoo.org> vnc-4.0.ebuild,
+  vnc-4.0-r1.ebuild:
+  remove invalid virtual
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> vnc-4.0-r1.ebuild:
+  ~alpha + ~ia64 keywords.
+
+  22 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0-r1.ebuild:
+  Removed subshells, closing #78638.
+
+  08 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0-r1.ebuild:
+  Fixed optional building of server.
+
+*vnc-4.0-r1 (07 Jan 2005)
+
+  07 Jan 2005; Daniel Ahlberg <aliz@gentoo.org>
+  files/vnc-4.0/vnc-xorg.patch, +vnc-4.0-r1.ebuild, vnc-4.0.ebuild, +imake-tmpdir.patch,
+  vnc-xorg-x11-fixes.patch:
+  Revision bump to use X.Org 6.8.1, closing #67565.
+  Create /usr/X11R6/lib/modules/extensions so that .so file gets installed, closing #63596.
+  Added patch to prevent /tmp execution, closing #71295.
+  Don't hardcode CC/CXX, closing #69277.
+  Split server and client with USE flags, closing #68290."
+  Updated SRC_URI to xorg.freedesktop.org.
+
+  15 Sep 2004; <agriffis@gentoo.org> vnc-4.0.ebuild:
+  stable on amd64
+
+  25 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0.ebuild,
+  files/xc.patch-cfbglblt8.patch:
+  Added missing patch.
+
+*vnc-4.0 (20 Aug 2004)
+
+  20 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0.ebuild:
+  Version bump, closing #55592.
+
+  15 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> vnc-3.3.7.ebuild:
+  Marked stable on amd64.
+
+  10 Jan 2004; <augustus@gentoo.org> vnc-3.3.7.ebuild:
+  Added ~amd64 keyword. In order for this to work I had to disable Xvnc like ppc
+  did. This may be able to be fixed but my knowledge of Imake is limited and I
+  didn't see Xvnc as a show stopper to this package.
+
+  01 Dec 2003; Jason Wever <weeve@gentoo.org> vnc-3.3.7.ebuild:
+  Marked stable on sparc.
+
+  21 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> vnc-3.3.7.ebuild :
+  Copied patch from tightvnc that fixes compilation if /tmp is set noexec. Closing #22356.
+
+  09 Jun 2003; Jason Wever <weeve@gentoo.org> vnc-3.3.3-r2.ebuild,
+  vnc-3.3.3-r3.ebuild, vnc-3.3.4.ebuild, vnc-3.3.5-r1.ebuild,
+  vnc-3.3.5.ebuild, vnc-3.3.6-r1.ebuild, vnc-3.3.6.ebuild, vnc-3.3.7.ebuild,
+  files/vnc-3.3.3-10-xdm-auth-support.patch,
+  files/vnc-3.3.3r2-getline-fix.patch, files/vnc-3.3.4-platform-fixes.patch:
+  Added a couple patches from debian to make vnc-3.3.7 build and display
+  correctly on sparc. Marked all other vnc ebuilds as -sparc.
+
+*vnc-3.3.7 (24 Mar 2003)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  19 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Disable Xvnc for ppc building and remove -ppc.
   
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> vnc-3.3.7.ebuild :
+  Do not allow tightvnc and vnc to be installed at the same time as they
+  overwrite each others files. Closes #15152.
+
+  24 Mar 2003; Patrick Kursawe <phosphan@gentoo.org> vnc-3.3.7.ebuild,
+  files/digest-vnc-3.3.7, files/vnc-3.3.7-gentoo.security.patch:
+  Version bump. 
+
+*vnc-3.3.6-r1 (21 Feb 2003)
+
+  21 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*vnc-3.3.6 (11 Dec 2002)
+
+  21 Dec 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.6.ebuild :
+  Added CFLAGS fix from 3.3.5-r1.  Closes bug #12024
+
+  11 Dec 2002; Brad Cowan <bcowan@gentoo.org> vnc-3.3.6.ebuild,
+  files/digest-vnc-3.3.6:
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*vnc-3.3.5-r1 (27 Nov 2002)
+
+  29 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5-r1.ebuild :
+  Marked stable.
+
+  27 Nov 2002; Martin Holzer <mholzer@gentoo.org> vnc-3.3.5-r1.ebuild :
+  Rechanged make to emake, added dependency and added compilerflags.
+  Fixed #11080.
+
+*vnc-3.3.5 (18 Nov 2002)
+
+  26 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5.ebuild :
+  Changed emake to make.  This should clear up compile issues found
+  on gcc2 systems.
+
+  21 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5.ebuild :
+  Marked stable.
+
+  18 Nov 2002; Nick Hadaway <raker@gentoo.org> vnc-3.3.5.ebuild,
+  files/digest-vnc-3.3.5 :
+  Version bump.  Currently marked unstable.
+
+*vnc-3.3.4 (26 Sep 2002)
+
+  26 Sep 2002; Brad Cowan <bradlyatc@gentoo.org> vnc-3.3.4.ebuild 
+  files/digest-vnc-3.3.4 :
+  Updated version with many bugfixes. Notably a change in maintainers
+  back to the original dev team. Homepage changed, removed patches,
+  patches may need replaced after testing.
+
+*vnc-3.3.3-r3 (03 Sep 2002)
+
+  09 Sep 2002; Seemant Kulleen <seemant@gentoo.org> vnc-3.3.3-r3.ebuild :
+  Added Mandrake's javabin stuff, since the javasrc stuff was written in the
+  Roaring 20's and the days of Coltrane and Java-1.1, so it is not even
+  compilable with the more contemporary (and altogether more hip) java
+  compilers (1.3 and above)
+
+  03 Sep 2002; Seemant Kulleen <seemant@gentoo.org> vnc-3.3.3-r3.ebuild
+  files/digest-vnc-3.3.3-r3 :
+  Added a bunch of packages, courtesy of Mandrake's src.rpm.  The following
+  patches are applied: imake, xauth, tightvnc encoding, using xinit's
+  XClients script to start the session, vncpassword creates ~/.vnc if
+  non-existent, system libs (zlib) and shared memory patch.  Additionally,
+  there is a patch to let it use the X font server (closing bug #6614 by:
+  kelsall@dsl.pipex.com (Chris Paulson-Ellis)) and a patch to compile even
+  though the manpage isn';t present (closing bug #7365 by: gentoo@inrevo.com
+  (Alistair McDonald)).  Additionally, an optional patch is applied if
+  "tcpd" is in USE to use tcp wrappers.  Finally, for ppc users a patch is
+  applied so that vnc is compilable/installable/runnable on ppc systems.
+
+*vnc-3.3.3-r2 (1 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> vnc-3.3.3-r2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT, DESCRIPTION.
+
+  11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> vnc-3.3.3-r2.ebuild :
+  Added X as a dependency since xmkmf is required for compilation, and that is
+  provided by X (and openmotif, but that is pointless).  Also, brought ebuild's
+  syntax up to date.  No revision bump necessary.
+
+  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-misc/vnc/Manifest b/net-misc/vnc/Manifest
index e69de29bb2d1..3459c4de8f1f 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -0,0 +1,27 @@
+MD5 f915651ee1c8a1d1fd423f770f341578 vnc-4.0.ebuild 2078
+MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 78428f930fbc7a018c25d18b28d05d7f ChangeLog 7207
+MD5 7f5d47c9e69b03072fcc7637f7f27404 vnc-4.0-r1.ebuild 2789
+MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
+MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575
+MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
+MD5 bc74b6827faf0e3039de99a4e21cc5bd files/digest-vnc-4.0-r1 270
+MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781
+MD5 2132dc5ea4e5a5349f5ec193ea3667c6 files/xc.patch-eieio.patch 703
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
+MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
+MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
+MD5 69dfbaa72c6b66cba94868885c09fc92 files/vnc-3.3.4-platform-fixes.patch 63005
+MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557
+MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
+MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482
+MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911
+MD5 6572073121cd6b24eb72ec9df69927e0 files/vnc-4.0/vnc-via.patch 5681
+MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
+MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
+MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819
+MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440
+MD5 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365
+MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401
+MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
index d7a46223ab3c..cd749c5398c3 100644
--- a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
+++ b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
@@ -37,25 +37,6 @@
  #endif
  
  #if BuildXprint
---- vnc-4.0b4-unixsrc/xc.patch.xorg	2004-03-23 10:53:05.000000000 +0000
-+++ vnc-4.0b4-unixsrc/xc.patch	2004-03-23 10:53:42.000000000 +0000
-@@ -8,11 +8,11 @@
- + XCOMM
- + XCOMM X VNC server
- + XCOMM
--+ MFBDIR = mfb
--+ CFB8DIR = cfb
--+ CFB16DIR = cfb16
--+ CFB24DIR = cfb24
--+ CFB32DIR = cfb32
-++ MFBSUBDIR = mfb
-++ CFB8SUBDIR = cfb
-++ CFB16SUBDIR = cfb16
-++ CFB24SUBDIR = cfb24
-++ CFB32SUBDIR = cfb32
- + XVNCDDXDIR = vnc/Xvnc
- + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
- + 	    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
 --- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg	2003-05-30 11:42:38.000000000 +0100
 +++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h	2004-05-27 11:26:06.499536143 +0100
 @@ -36,7 +36,7 @@
@@ -78,3 +59,43 @@
      } else {
        REGION_INIT(pScreen, reg, rect, size);
      }
+--- vnc-4.0-unixsrc/xc.patch.xorg	2004-08-25 16:10:52.131987786 +0100
++++ vnc-4.0-unixsrc/xc.patch	2004-08-25 16:12:23.896276533 +0100
+@@ -8,11 +8,11 @@
+ + XCOMM
+ + XCOMM X VNC server
+ + XCOMM
+-+ MFBDIR = mfb
+-+ CFB8DIR = cfb
+-+ CFB16DIR = cfb16
+-+ CFB24DIR = cfb24
+-+ CFB32DIR = cfb32
+++ MFBSUBDIR = mfb
+++ CFB8SUBDIR = cfb
+++ CFB16SUBDIR = cfb16
+++ CFB24SUBDIR = cfb24
+++ CFB32SUBDIR = cfb32
+ + XVNCDDXDIR = vnc/Xvnc
+ + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
+ +          $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
+--- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.xorg	2004-08-31 14:24:12.140503335 +0100
++++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2004-08-31 14:24:45.189675775 +0100
+@@ -201,6 +201,7 @@
+ }
+ 
+ extern "C" {
++  void ddxInitGlobals() {}
+   void ddxGiveUp()
+   {
+     int i;
+--- vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:55:57.732303799 +0100
++++ vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:56:30.495034234 +0100
+@@ -9,6 +9,8 @@
+ #define XnestServer YES
+ #define XF86Server NO
+ #define XprtServer NO
++#define BuildXFree86ConfigTools NO
++#define BuildScanpci NO
+ 
+ #ifdef SunArchitecture
+ #define ProjectRoot /usr/openwin
diff --git a/net-misc/vnc/vnc-3.3.7.ebuild b/net-misc/vnc/vnc-3.3.7.ebuild
index 72ffdac01cf9..17a05eefaa66 100644
--- a/net-misc/vnc/vnc-3.3.7.ebuild
+++ b/net-misc/vnc/vnc-3.3.7.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.1 2003/03/24 15:38:19 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit eutils
 
-IUSE="java tcpd"
-
 MY_P="${P}-unixsrc"
-
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.realvnc.com/"
-
 SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc ppc amd64"
+IUSE="java tcpd"
 
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!net-misc/tightvnc"
 RDEPEND="java? ( virtual/jre )"
 
 S="${WORKDIR}/${MY_P}"
@@ -27,16 +25,29 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	if [ "${ARCH}" = "sparc" ]
+	then
+		epatch ${FILESDIR}/vnc-3.3.3r2-getline-fix.patch
+		epatch ${FILESDIR}/vnc-3.3.4-platform-fixes.patch
+		epatch ${FILESDIR}/vnc-3.3.3-10-xdm-auth-support.patch
+	fi
+	sed -i \
+		's:CC = cc:CC = gcc:' \
+		Xvnc/config/imake/Makefile.ini \
+		Xvnc/config/util/Makefile.ini
 }
 
 src_compile() {
-	
+
 	export CXX="g++"
 
 	econf || die "./configure failed"
 
-	make 
-	
+	make
+
+	use ppc && return 0
+	use amd64 && return 0
 	cd Xvnc
 	if use tcpd
 	then
@@ -55,7 +66,7 @@ src_compile() {
 }
 
 src_install () {
-	
+
 	dodir /usr/bin /usr/share/man/man1
 
 	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die
@@ -65,7 +76,7 @@ src_install () {
 		cd ${S}/classes
 		insinto /usr/share/vnc/classes
 		doins *.class *.jar *.vnc
-	fi	
+	fi
 
 	cd ${S}
 	dodoc LICENCE.TXT README
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
index 05d711c19d9e..4b7a3831dd1c 100644
--- a/net-misc/vnc/vnc-4.0-r1.ebuild
+++ b/net-misc/vnc/vnc-4.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/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.1 2005/01/07 18:12:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
 X_VERSION="6.8.1"
 
@@ -10,68 +10,85 @@ MY_P="${P}-unixsrc"
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.realvnc.com/"
 SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
-	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz
-	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz
-	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz"
+	server? (
+		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz
+		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz
+		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz
+	)"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE=""
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="server"
 
 DEPEND="sys-libs/zlib
 	media-libs/freetype
-	!virtual/vnc
 	x11-base/xorg-x11"
 
-PROVIDE="virtual/vnc"
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	mkdir -p ${S}/xc ; cd ${S}
-
-	unpack X11R${X_VERSION}-src1.tar.gz
-	unpack X11R${X_VERSION}-src2.tar.gz
-	unpack X11R${X_VERSION}-src3.tar.gz
-
-	cd ${WORKDIR}
 	unpack ${MY_P}.tar.gz ; cd ${S}
 
-	# patches from Redhat
+	epatch ${FILESDIR}/${P}/vnc-gcc34.patch
 	epatch ${FILESDIR}/${P}/vnc-cookie.patch
-	epatch ${FILESDIR}/${P}/vnc-def.patch
 	epatch ${FILESDIR}/${P}/vnc-fPIC.patch
-	epatch ${FILESDIR}/${P}/vnc-gcc34.patch
 	epatch ${FILESDIR}/${P}/vnc-idle.patch
 	epatch ${FILESDIR}/${P}/vnc-restart.patch
-	epatch ${FILESDIR}/${P}/vnc-sparc.patch
 	epatch ${FILESDIR}/${P}/vnc-via.patch
-	epatch ${FILESDIR}/${P}/vnc-xclients.patch
-	epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
-	epatch ${FILESDIR}/${P}/vnc-xorg.patch
-	epatch ${FILESDIR}/${P}/imake-tmpdir.patch
 
-	epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
-	epatch xc.patch
-
-	echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def
+	if use server; then
+		unpack X11R${X_VERSION}-src1.tar.gz
+		unpack X11R${X_VERSION}-src2.tar.gz
+		unpack X11R${X_VERSION}-src3.tar.gz
+
+		# patches from Redhat
+		epatch ${FILESDIR}/${P}/vnc-sparc.patch
+		epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
+		epatch ${FILESDIR}/${P}/vnc-def.patch
+		epatch ${FILESDIR}/${P}/vnc-xclients.patch
+		epatch ${FILESDIR}/${P}/vnc-xorg.patch
+		epatch ${FILESDIR}/${P}/imake-tmpdir.patch
+
+		epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
+		epatch ${FILESDIR}/xc.patch-eieio.patch
+		epatch xc.patch
+
+		HOSTCONF="${S}/xc/config/cf/vnc.def"
+		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+		echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
+		echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
+		echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF}
+	fi
 }
 
 src_compile() {
-	# client
 	econf --with-installed-zlib || die
 	emake || die
 
-	# server
-	cd ${S}/xc
-	make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die
+	if use server; then
+		cd ${S}/xc
+		make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die
+	fi
 }
 
 src_install() {
-	# client
-	dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions
-	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die
+	dodir /usr/bin /usr/share/man/man1
+	use server && dodir /usr/$(get_libdir)/modules/extensions
+
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die
 	dodoc LICENCE.TXT README
 
+	use server || (
+		rm ${D}/usr/bin/vncserver
+		rm ${D}/usr/bin/x0vncserver
+		rm ${D}/usr/share/man/man1/vncpasswd.1.gz
+		rm ${D}/usr/bin/vncpasswd
+		rm ${D}/usr/share/man/man1/vncconfig.1.gz
+		rm ${D}/usr/bin/vncconfig
+		rm ${D}/usr/share/man/man1/vncserver.1.gz
+		rm ${D}/usr/share/man/man1/x0vncserver.1.gz
+	)
+
 	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
 }
diff --git a/net-misc/vnc/vnc-4.0.ebuild b/net-misc/vnc/vnc-4.0.ebuild
index 2a8adaf9cf9b..56731a2a0d32 100644
--- a/net-misc/vnc/vnc-4.0.ebuild
+++ b/net-misc/vnc/vnc-4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.1 2004/08/23 12:53:44 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 X_VERSION="6.7.0"
 
@@ -16,14 +16,14 @@ SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc amd64"
 IUSE=""
 
 DEPEND="sys-libs/zlib
+	!net-misc/tightvnc
 	media-libs/freetype
-	!virtual/vnc"
+	x11-base/xorg-x11"
 
-PROVIDE="virtual/vnc"
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}/vnc-sparc.patch
 	epatch ${FILESDIR}/${P}/vnc-via.patch
 	epatch ${FILESDIR}/${P}/vnc-xclients.patch
+	epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
 	epatch ${FILESDIR}/${P}/vnc-xorg.patch
 
 	epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
@@ -64,7 +65,9 @@ src_compile() {
 
 src_install() {
 	# client
-	dodir /usr/bin /usr/share/man/man1
+	dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions
 	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die
 	dodoc LICENCE.TXT README
+
+	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
 }
diff --git a/net-misc/vncrec/ChangeLog b/net-misc/vncrec/ChangeLog
index 4de6a0477206..27e48c8a48d9 100644
--- a/net-misc/vncrec/ChangeLog
+++ b/net-misc/vncrec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/vncrec
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.1 2004/03/28 07:33:48 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/ChangeLog,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
+
+  28 Mar 2004; David Holm <dholm@gentoo.org> vncrec-0.2.ebuild:
+  Added to ~ppc.
 
 *vncrec-0.2 (28 Mar 2004)
 
diff --git a/net-misc/vncrec/Manifest b/net-misc/vncrec/Manifest
index 6993758eee71..6884e804d89f 100644
--- a/net-misc/vncrec/Manifest
+++ b/net-misc/vncrec/Manifest
@@ -1,3 +1,3 @@
+MD5 a43ae8ea3a50b23a85142c6962c58203 ChangeLog 423
+MD5 2cd5383923020195f7dbffcdb8e51481 vncrec-0.2.ebuild 676
 MD5 84dfa8e41e23663ae3195b81e9ce4db8 files/digest-vncrec-0.2 61
-MD5 1c0d86ea498f5ea6f884e65926e2055f vncrec-0.2.ebuild 673
-MD5 1943fbd294e08f2d96a5728f335f1dc0 ChangeLog 429
diff --git a/net-misc/vncrec/vncrec-0.2.ebuild b/net-misc/vncrec/vncrec-0.2.ebuild
index fe79f275090a..5ad18cc89507 100644
--- a/net-misc/vncrec/vncrec-0.2.ebuild
+++ b/net-misc/vncrec/vncrec-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/vncrec-0.2.ebuild,v 1.1 2004/03/28 07:33:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncrec/vncrec-0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:45 chriswhite Exp $
 
 DESCRIPTION="VNC session recorder and player"
 HOMEPAGE="http://www.sodan.org/~penny/vncrec/"
@@ -8,7 +8,8 @@ SRC_URI="http://www.sodan.org/~penny/vncrec/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND="virtual/x11"
 
diff --git a/net-misc/vncsnapshot/ChangeLog b/net-misc/vncsnapshot/ChangeLog
index 85b7b08386d0..4e21139e0035 100644
--- a/net-misc/vncsnapshot/ChangeLog
+++ b/net-misc/vncsnapshot/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/vncsnapshot
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/ChangeLog,v 1.1 2003/04/21 17:51:45 g2boojum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/ChangeLog,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  vncsnapshot-1.1.ebuild:
+  Stable on ppc.
+
+*vncsnapshot-1.2a (25 Jun 2005)
+
+  25 Jun 2005; Fernando Serboncini <fserb@gentoo.org> +metadata.xml,
+  +vncsnapshot-1.2a.ebuild:
+  Version bump. Assuming maintainership.
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> vncsnapshot-1.1.ebuild:
+  Added to ~ppc.
 
 *vncsnapshot-1.1 (21 Apr 2003)
 
diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
index e69de29bb2d1..c5d61ff490c6 100644
--- a/net-misc/vncsnapshot/Manifest
+++ b/net-misc/vncsnapshot/Manifest
@@ -0,0 +1,6 @@
+MD5 503128348c72d05d4b61e63efcec2430 vncsnapshot-1.1.ebuild 886
+MD5 db6edc8a810ccb0d18acaf03e20a677c metadata.xml 259
+MD5 0d21445340f30fa0bff12d51f35457de ChangeLog 693
+MD5 0e5a5ceddc5dcccf1caac8d55df4710d vncsnapshot-1.2a.ebuild 888
+MD5 21841ad97e9ecf1236c69f9999e779d7 files/digest-vncsnapshot-1.1 71
+MD5 5282a9f8749ae599819f873f2c66ccd1 files/digest-vncsnapshot-1.2a 72
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.1.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.1.ebuild
index c56c2e3c870b..fe38efe4c679 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.1.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.1.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/net-misc/vncsnapshot/vncsnapshot-1.1.ebuild,v 1.1 2003/04/21 17:51:45 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/vncsnapshot-1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 LICENSE="GPL-2"
 DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 HOMEPAGE="http://vncsnapshot.sourceforge.net/"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 IUSE=""
 SLOT="0"
 DEPEND=">=media-libs/jpeg-6b
@@ -14,16 +14,15 @@ DEPEND=">=media-libs/jpeg-6b
 
 # no configure for this puppy
 src_compile() {
-    #note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
+	#note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
 	#      we lost the INCLUDES in the makefile.
-    make CDEBUGFLAGS="${CFLAGS}" || die "make failed"
+	make CDEBUGFLAGS="${CFLAGS}" || die "make failed"
 }
 
 
 # likewise, no make install (we're real Unix hackers, we are)
 src_install() {
-    dobin vncsnapshot || die
-    cp vncsnapshot.man1 vncsnapshot.1
-    doman vncsnapshot.1
+	dobin vncsnapshot || die
+	cp vncsnapshot.man1 vncsnapshot.1
+	doman vncsnapshot.1
 }
-
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 4cd4eb4dc9b4..9161585b7594 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild,v 1.1 2005/06/25 20:19:46 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild,v 1.1.1.1 2005/11/30 09:55:44 chriswhite Exp $
 
 LICENSE="GPL-2"
 DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
diff --git a/net-misc/vnet/ChangeLog b/net-misc/vnet/ChangeLog
index efac88558546..da1c7dee52ac 100644
--- a/net-misc/vnet/ChangeLog
+++ b/net-misc/vnet/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/vnet
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnet/ChangeLog,v 1.1 2005/05/27 07:40:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnet/ChangeLog,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 *vnet-0.03 (27 May 2005)
 
diff --git a/net-misc/vnet/Manifest b/net-misc/vnet/Manifest
index cb8fa9a2329c..4e51b0a922b1 100644
--- a/net-misc/vnet/Manifest
+++ b/net-misc/vnet/Manifest
@@ -1,2 +1,14 @@
-MD5 1caf80012b3d2507f72d2d8908518b3e vnet-0.03.ebuild 587
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0aec7c5bc8fb10f96118bf6b40d0cbfb vnet-0.03.ebuild 577
+MD5 b55bfb88b955107a0f0e6c5aaef21723 metadata.xml 162
+MD5 6f2e974683139025454c289781d6a017 ChangeLog 331
 MD5 ec41c5cccfd91f18dd09b00c755e4283 files/digest-vnet-0.03 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC6nrdmPFBzbX68WERAqHjAKCNP1gx1mX1c5v9AZ4UhAde+UaCjQCaA+yJ
+I7pq2yhvi/x0wWmdSSNKXnk=
+=14Sl
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vnet/metadata.xml b/net-misc/vnet/metadata.xml
index 0fb4a0cdedca..63d45921090f 100644
--- a/net-misc/vnet/metadata.xml
+++ b/net-misc/vnet/metadata.xml
@@ -1,8 +1,5 @@
 <?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>
 </pkgmetadata>
diff --git a/net-misc/vnet/vnet-0.03.ebuild b/net-misc/vnet/vnet-0.03.ebuild
index d69383d5073c..64f87a310a59 100644
--- a/net-misc/vnet/vnet-0.03.ebuild
+++ b/net-misc/vnet/vnet-0.03.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnet/vnet-0.03.ebuild,v 1.1 2005/05/27 07:40:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnet/vnet-0.03.ebuild,v 1.1.1.1 2005/11/30 09:55:40 chriswhite Exp $
 
 inherit toolchain-funcs
 
-DESCRIPTION="NGNET interface utility"
+DESCRIPTION="Linux-VServer - NGNET interface utility"
 SRC_URI="http://vserver.13thfloor.at/Experimental/NGNET/${P}.tar.bz2"
-HOMEPAGE="http://vserver.13thfloor.at/Experimental/NGNET/"
+HOMEPAGE="http://linux-vserver.org/NGNET-Testing-HOWTO"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index f6f19bc5a1a4..975e81546284 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-misc/vpnc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.1 2004/02/03 16:30:47 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
+
+*vpnc-0.3.3 (24 Oct 2005)
+
+  24 Oct 2005; Hanno Boeck <hanno@gentoo.org> +files/vpnc-iproute-fix.diff,
+  +vpnc-0.3.3.ebuild:
+  Version bump and fix for iproute.
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> vpnc-0.3.2.ebuild:
+  Added ~sparc keyword.
+
+  08 May 2005; Lars Weiler <pylon@gentoo.org> vpnc-0.3.2.ebuild:
+  Stable on ppc.
+
+  11 Feb 2005; Danny van Dyk <kugelfang@gentoo.org>
+  +files/vpnc-0.3.2-64-bit.patch, vpnc-0.3.2.ebuild:
+  Added 64-bit patch (BUG #80030), marked ~amd64. QA: Removed S=${WORKDIR}/${P}.
+
+  29 Dec 2004; Hanno Boeck <hanno@gentoo.org> vpnc-0.3.2.ebuild:
+  Stable on x86.
+
+*vpnc-0.3.2 (07 Dec 2004)
+
+  07 Dec 2004; <hanno@gentoo.org> +vpnc-0.3.2.ebuild:
+  Version bump.
+
+  02 Sep 2004; David Holm <dholm@gentoo.org> vpnc-0.2.ebuild:
+  Added to ~ppc.
+
+*vpnc-0.2 (17 May 2004)
+
+  17 May 2004; Hanno Boeck <hanno@gentoo.org> +vpnc-0.2.ebuild:
+  Version bump.
 
 *vpnc-0.2_pre7 (03 Feb 2004)
 
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 9aede5cc9c40..fe221b8d9b18 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -1,4 +1,22 @@
-MD5 1c6d993dcff05e4333731060b86025fd vpnc-0.2_pre7.ebuild 818
-MD5 d494b01a2c18719da0894aa775cd4f22 ChangeLog 352
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 069348f252ace2327cf9be24687dd6ac ChangeLog 1233
+MD5 d54e8a4d5935b1e97cff81e856bbf81a files/digest-vpnc-0.2 69
 MD5 a39fb4aa56f341f55789da220fe25c22 files/digest-vpnc-0.2_pre7 72
+MD5 93f950ddb46dfe6df41af92346c4176f files/digest-vpnc-0.3.2 61
+MD5 1a6e7a25b38584ea728eeb08436bf038 files/digest-vpnc-0.3.3 61
+MD5 728254537c733428bbb21c0e6c7f0f1d files/vpnc-0.3.2-64-bit.patch 8405
+MD5 23f1f1f9e89e90a8167152ac6a6dccb8 files/vpnc-iproute-fix.diff 318
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 39d4e738948eab214d837d8132a175ec vpnc-0.2.ebuild 816
+MD5 91d0df2f6face8216eb31781c454707f vpnc-0.2_pre7.ebuild 823
+MD5 902f606380fea4093d70e3c080cc1054 vpnc-0.3.2.ebuild 854
+MD5 b0939d68e6a35e645e2969fe80634358 vpnc-0.3.3.ebuild 887
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDXJvmr2QksT29OyARAnJzAJwOUS5egi+1FEJUI5HP70TdtPtrygCbBtxC
+yVD6Aq9a94AM7ulC0aO3zxY=
+=mNqp
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/vpnc-0.2.ebuild b/net-misc/vpnc/vpnc-0.2.ebuild
index a030258d121a..3debee54f5a4 100644
--- a/net-misc/vpnc/vpnc-0.2.ebuild
+++ b/net-misc/vpnc/vpnc-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/net-misc/vpnc/vpnc-0.2.ebuild,v 1.1 2004/05/17 08:46:30 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.2.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 MY_P="${P}-rm+zomb.1"
 DESCRIPTION="Free client for Cisco VPN routing software"
@@ -9,7 +9,7 @@ SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
diff --git a/net-misc/vpnc/vpnc-0.2_pre7.ebuild b/net-misc/vpnc/vpnc-0.2_pre7.ebuild
index cc05799cac1a..1bcfc4cfeb5a 100644
--- a/net-misc/vpnc/vpnc-0.2_pre7.ebuild
+++ b/net-misc/vpnc/vpnc-0.2_pre7.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.2_pre7.ebuild,v 1.1 2004/02/03 16:30:47 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.2_pre7.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 MY_P="vpnc-0.2-rm+zomb-pre7"
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${MY_P}.tar.gz"
+
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
+
 DEPEND=">=dev-libs/libgcrypt-1.1.91
-	sys-apps/iproute"
+	sys-apps/iproute2"
+
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	# Workaround for crappy Makefile
 	sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
-
 	emake || die
 }
 
 src_install() {
-	dobin vpnc vpnc-connect vpnc-disconnect
+	dobin vpnc vpnc-connect vpnc-disconnect || die
 	dodoc ChangeLog README TODO VERSION
 	insinto /etc
 	doins vpnc.conf
diff --git a/net-misc/vpnc/vpnc-0.3.2.ebuild b/net-misc/vpnc/vpnc-0.3.2.ebuild
index e280da458c3c..07059d8a1c07 100644
--- a/net-misc/vpnc/vpnc-0.3.2.ebuild
+++ b/net-misc/vpnc/vpnc-0.3.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/net-misc/vpnc/vpnc-0.3.2.ebuild,v 1.1 2004/12/07 15:21:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Free client for Cisco VPN routing software"
 HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -8,18 +10,18 @@ SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/libgcrypt-1.1.91
 	sys-apps/iproute2"
 
-S=${WORKDIR}/${P}
-
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-64-bit.patch
 	# Workaround for crappy Makefile
 	sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
-	emake || die
 }
 
 src_install() {
diff --git a/net-misc/vpnc/vpnc-0.3.3.ebuild b/net-misc/vpnc/vpnc-0.3.3.ebuild
index b448fe2b69e3..e31786484260 100644
--- a/net-misc/vpnc/vpnc-0.3.3.ebuild
+++ b/net-misc/vpnc/vpnc-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.3.ebuild,v 1.1 2005/10/24 08:30:04 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.3.ebuild,v 1.1.1.1 2005/11/30 09:54:46 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/vtun/ChangeLog b/net-misc/vtun/ChangeLog
index c1ac3c9a8a01..73c3e1a6e595 100644
--- a/net-misc/vtun/ChangeLog
+++ b/net-misc/vtun/ChangeLog
@@ -1,11 +1,94 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# ChangeLog for net-misc/vtun
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+*vtun-2.6-r1 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/vtun-2.6-lzo2.patch, vtun-2.5.ebuild, vtun-2.5-r1.ebuild,
+  vtun-2.5-r2.ebuild, vtun-2.6.ebuild, +vtun-2.6-r1.ebuild:
+  revision bump. vtun did not compile against lzo2 so dependencies
+  altered. vtun-2.6-r1 added that does work with lzo2. bug #112367
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> vtun-2.6.ebuild:
+  Stable on alpha.
+
+  07 Nov 2004; David Holm <dholm@gentoo.org> vtun-2.6.ebuild:
+  Added to ~ppc.
+
+  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> vtun-2.6.ebuild:
+  ~alpha keyword.
+
+  16 Oct 2004; <solar@gentoo.org> vtun-2.6.ebuild:
+  added missing RDEPEND
+
+  31 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> :
+  Marked ~amd64.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> vtun-2.5.ebuild,
+  vtun-2.6.ebuild:
+  change virtual/glibc to virtual/libc
+
+  11 Jun 2004; Aron Griffis <agriffis@gentoo.org> vtun-2.5-r1.ebuild,
+  vtun-2.5-r2.ebuild, vtun-2.5.ebuild, vtun-2.6.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> vtun-2.6.ebuild:
+  Add inherit eutils
+
+  22 Jan 2004; Chuck Short <zul@gentoo.org> vtun-2.5-r1.ebuild,
+  vtun-2.5-r2.ebuild, vtun-2.5.ebuild, vtun-2.6.ebuild, files/vtun.rc:
+  Header fixes.
+
+  22 Jan 2004; Chuck Short <zul@gentoo.org> files/vtun.rc:
+  Fixed init script so that more than one vtun can run. closes #38977.
+
+  20 Oct 2003; Chuck Short <zul@gentoo.org> files/vtun.rc:
+  More init tweaks.
+
+  19 Oct 2003; Chuck Short <zul@gentoo.org> files/vtun.rc:
+  Fixed initscript bug. closes #31517.
+
+*vtun-2.6 (17 Oct 2003)
+
+  17 Oct 2003; Chuck Short <zul@gentoo.org> vtun-2.6.ebuild,
+  files/vtun-2.6-makefile.patch:
+  New version.
+
+  16 Oct 2003; Chuck Short <zul@gentoo.org> files/vtun.rc:
+  Fixed init script, removed start-stop-daemon. It was not starting vtun
+  when run init script. Fixes bug #21351.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+
+*vtun-2.5-r2 (28 April 2002)
+
+  06 Mar 2003; Aron Griffis <agriffis@gentoo.org> vtun-2.5-r2.ebuild:
+  Add alpha to KEYWORDS
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> vtun-2.5-r2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  06 June 2002; Mike Jones <ashmodai@gentoo.org> vtun-2.5-r2.ebuild
+  Added a patch for the configure script which prevents errors under gcc 3.1 when
+  /usr/include is manually appended to the include search path.
+
+*vtun-2.5-r1 (28 April 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> vtun-2.5-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  28 May 2002; Preston A. Elder <prez@gentoo.org> vtun-2.5-r1.ebuild
+  Accomodated for /usr/include/md5.h left from cyrus-sasl.
 
 *vtun-2.5 (28 April 2002)
 
-  28 April 2002; Bryce Allen <ballen@mum.edu> vtun-2.5.ebuild ChangeLog files/digest-vtun-2.5 files/vtun.rc files/vtund-start.conf :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> vtun-2.5.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  28 April 2002; Bryce Allen <ballen@mum.edu> vtun-2.5.ebuild ChangeLog files/digest-vtun-2.5 files/vtun.rc files/vtund-start.conf :  
   Initial revision.
   Includes a few patches for the excellent PLD folks, specifically
   to fix a bison issue, and to add DESTDIR to the 'make install' command.
+
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index e69de29bb2d1..10e2761cf004 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -0,0 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dd6fa6c4b8d697fabbe17962a387636e ChangeLog 3271
+MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5 59
+MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5-r1 59
+MD5 e5c8a47e7b30540f4094b1aa6d3f6e5f files/digest-vtun-2.5-r2 59
+MD5 f6c794a4c6d2965b321514400900e5ef files/digest-vtun-2.6 59
+MD5 f6c794a4c6d2965b321514400900e5ef files/digest-vtun-2.6-r1 59
+MD5 f48bedfa560d860030f8da2155092016 files/vtun-2.5-expect.patch 334
+MD5 eae860aeae73e470782dd4ece745d0b1 files/vtun-2.5-makefile.patch 1794
+MD5 1e46f74e06c298440ef80e55ea493cbb files/vtun-2.5-r2-gentoo-gcc3.1.patch 767
+MD5 3ed66a4e8454320147cdb763731c5b9e files/vtun-2.6-lzo2.patch 2547
+MD5 49170c19de7a8830d2d2135f244b750a files/vtun-2.6-makefile.patch 1919
+MD5 e19e6e833add738ce8f46e18c7d7d060 files/vtun.rc 772
+MD5 a806782ec385a60514f85833ed455fbc files/vtund-start.conf 1174
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 52c6990c3559940ee57861f87435cf56 vtun-2.5-r1.ebuild 1928
+MD5 62c38ac4aea9f0af7847f0e1b9babba5 vtun-2.5-r2.ebuild 2031
+MD5 0cdc5d7ca0eb5bc2f02b0f225e6e6a6b vtun-2.5.ebuild 1704
+MD5 6297fc936f3dec3e595fd170cc2f0efc vtun-2.6-r1.ebuild 1776
+MD5 139727784b34cbb655e5312a2402b847 vtun-2.6.ebuild 1751
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDdtuRmdTrptrqvGERAqV3AKCdhbfKhNE9IZh6/VO/306m2NFVJwCdHdYd
+m4KP1ivycQNbk53gEwNuxiU=
+=9Tdg
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vtun/files/vtun.rc b/net-misc/vtun/files/vtun.rc
index 77ef993ddd1d..31fb8bc4df8d 100644
--- a/net-misc/vtun/files/vtun.rc
+++ b/net-misc/vtun/files/vtun.rc
@@ -1,13 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/files/vtun.rc,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 depend() {
 	need net
 }
 
 start() {
-	IFS=""
+	IFS=$'\n'
 	for line in `grep -v '^[[:space:]]*#' /etc/vtund-start.conf | grep -v '^[[:space:]]*$'`
 	do
 		echo $line | 
@@ -15,11 +16,11 @@ start() {
 			 read host server args
 			 if [ "$host" = "--server--" ]; then
 				 ebegin "Starting vtund server"
-				 start-stop-daemon --start --quiet --exec /usr/sbin/vtund -- $args -s -P $server
+				 /usr/sbin/vtund -s -P $server $args
 				 eend $?
 			 else
 				 ebegin "Starting vtund client $host to $server"
-				 start-stop-daemon --start --quiet --exec /usr/sbin/vtund -- $args $host $server
+				 /usr/sbin/vtund $args -- $host $server
 				 eend $?
 			 fi)
 	done
diff --git a/net-misc/vtun/vtun-2.5-r1.ebuild b/net-misc/vtun/vtun-2.5-r1.ebuild
index ec02115fe6d6..ba690da4f044 100644
--- a/net-misc/vtun/vtun-2.5-r1.ebuild
+++ b/net-misc/vtun/vtun-2.5-r1.ebuild
@@ -1,20 +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/net-misc/vtun/vtun-2.5-r1.ebuild,v 1.1 2002/05/28 04:28:41 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+IUSE="ssl"
 
 DESCRIPTION="Tunneling software to use the universal tunnel"
 HOMEPAGE="http://vtun.sourceforge.net"
+KEYWORDS="x86 sparc "
 LICENSE="GPL-2"
+SLOT="0"
 DEPEND=">=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	ssl? ( >=dev-libs/openssl-0.9.6c-r1 )
 	>=sys-kernel/linux-headers-2.4.18"
 #RDEPEND=""
-SRC_URI="ftp://prdownloads.sourceforge.net/vtun/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
 S=${WORKDIR}/vtun
 
 src_compile() {
-	if [ -z "`use ssl`" ]
+	if ! use ssl
 	then
 		use_opts="--disable-ssl"
 	fi
@@ -44,7 +48,7 @@ src_compile() {
 		VAR_DIR=/var || FAILED=1
 
 	# OK, we're done, rename the cyrus one back to what it was.
-	if [ -f /usr/include/md5.h.vtun_compile -a 
+	if [ -f /usr/include/md5.h.vtun_compile -a
 		! -f /usr/include/md5.h ]; then
 	    mv /usr/include/md5.h.vtun_compile /usr/include/md5.h
 	fi
diff --git a/net-misc/vtun/vtun-2.5-r2.ebuild b/net-misc/vtun/vtun-2.5-r2.ebuild
index 0ef0bdf75e60..29ab84e69dd8 100644
--- a/net-misc/vtun/vtun-2.5-r2.ebuild
+++ b/net-misc/vtun/vtun-2.5-r2.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r2.ebuild,v 1.1 2002/06/06 16:19:09 ashmodai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+IUSE="ssl"
 
 DESCRIPTION="Tunneling software to use the universal tunnel"
 HOMEPAGE="http://vtun.sourceforge.net"
+KEYWORDS="x86 sparc alpha"
 LICENSE="GPL-2"
+SLOT="0"
 DEPEND=">=sys-libs/zlib-1.1.4
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	ssl? ( >=dev-libs/openssl-0.9.6c-r1 )
 	>=sys-kernel/linux-headers-2.4.18"
 #RDEPEND=""
@@ -14,11 +18,11 @@ SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
 S=${WORKDIR}/vtun
 
 src_compile() {
-	if [ -z "`use ssl`" ]
+	if ! use ssl
 	then
 		use_opts="--disable-ssl"
 	fi
-	
+
 	cat ${FILESDIR}/vtun-2.5-r2-gentoo-gcc3.1.patch | patch -p1 || die "couldn't patch for gcc3.1";
 
 	./configure \
@@ -46,7 +50,7 @@ src_compile() {
 		VAR_DIR=/var || FAILED=1
 
 	# OK, we're done, rename the cyrus one back to what it was.
-	if [ -f /usr/include/md5.h.vtun_compile -a 
+	if [ -f /usr/include/md5.h.vtun_compile -a
 		! -f /usr/include/md5.h ]; then
 	    mv /usr/include/md5.h.vtun_compile /usr/include/md5.h
 	fi
diff --git a/net-misc/vtun/vtun-2.5.ebuild b/net-misc/vtun/vtun-2.5.ebuild
index c545b8d1f211..a7a853114769 100644
--- a/net-misc/vtun/vtun-2.5.ebuild
+++ b/net-misc/vtun/vtun-2.5.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Bryce Allen <ballen@mum.edu>
-# Maintainer: Jon Nelson <jnelson@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5.ebuild,v 1.1 2002/04/28 19:42:50 jnelson Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.5.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+IUSE="ssl"
 
 S=${WORKDIR}/vtun
 DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression"
-SRC_URI="http://prdownloads.sourceforge.net/vtun/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
 HOMEPAGE="http://vtun.sourceforge.net/"
+KEYWORDS="x86 sparc "
+LICENSE="GPL-2"
+SLOT="0"
 
 # NOTE: you also need the tun/tap driver compiled into your kernel
 #		to do tun/tap tunneling
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.3
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	sys-devel/bison
 	ssl? ( >=dev-libs/openssl-0.9.6c )"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A} && cd ${S} || die
@@ -27,11 +29,11 @@ src_unpack() {
 src_compile() {
 	local use_opts
 	use_opts=""
-	if [ -z "`use ssl`" ]
+	if ! use ssl
 	then
 		use_opts="--disable-ssl"
 	fi
-	
+
 	econf ${use_opts} --with-ssl-headers=/usr/include/openssl || die
 
 	make || die
diff --git a/net-misc/vtun/vtun-2.6-r1.ebuild b/net-misc/vtun/vtun-2.6-r1.ebuild
index 9ff73e465b75..ae197820cb26 100644
--- a/net-misc/vtun/vtun-2.6-r1.ebuild
+++ b/net-misc/vtun/vtun-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6-r1.ebuild,v 1.1 2005/11/13 06:21:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/vtun/vtun-2.6.ebuild b/net-misc/vtun/vtun-2.6.ebuild
index fe38f12016da..7b1fca03b9dc 100644
--- a/net-misc/vtun/vtun-2.6.ebuild
+++ b/net-misc/vtun/vtun-2.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6.ebuild,v 1.1 2003/10/18 02:04:50 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-2.6.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
+
+inherit eutils
 
 IUSE="ssl"
 
@@ -8,18 +10,22 @@ S=${WORKDIR}/vtun
 DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression"
 SRC_URI="mirror://sourceforge/vtun/${P}.tar.gz"
 HOMEPAGE="http://vtun.sourceforge.net/"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc ~amd64 alpha ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
 # NOTE: you also need the tun/tap driver compiled into your kernel
 #		to do tun/tap tunneling
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.3
-	>=dev-libs/lzo-1.07
+	=dev-libs/lzo-1*
 	sys-devel/bison
 	ssl? ( >=dev-libs/openssl-0.9.6c )"
 
+RDEPEND="virtual/libc
+	>=sys-libs/zlib-1.1.3
+	ssl? ( >=dev-libs/openssl-0.9.6c )"
+
 src_unpack() {
 	unpack ${A} && cd ${S} || die
 	epatch ${FILESDIR}/${PN}-${PV}-makefile.patch
@@ -28,7 +34,7 @@ src_unpack() {
 src_compile() {
 	local use_opts
 	use_opts=""
-	if [ -z "`use ssl`" ]
+	if ! use ssl
 	then
 		use_opts="--disable-ssl"
 	fi
diff --git a/net-misc/wakeonlan/ChangeLog b/net-misc/wakeonlan/ChangeLog
index fddf218f7f3d..9b0f2889e885 100644
--- a/net-misc/wakeonlan/ChangeLog
+++ b/net-misc/wakeonlan/ChangeLog
@@ -1,13 +1,25 @@
 # ChangeLog for net-misc/wakeonlan
-# 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/net-misc/wakeonlan/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
+
+*wakeonlan-0.41 (02 Sep 2005)
+
+  02 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +wakeonlan-0.41.ebuild:
+  Version bump. Fixes bug 104571. Thanks to wiktorw@people.pl.
+
+  15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> wakeonlan-0.40.ebuild:
+  stable on amd64
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> wakeonlan-0.40.ebuild:
+  Adding amd64 keyword. Closing #45591.
+
+  12 Jun 2003; <msterret@gentoo.org> wakeonlan-0.40.ebuild:
+  add Header
 
 *wakeonlan-0.40 (4 Nov 2002)
   
   4 Nov 2002; Matt Keadle <mkeadle@gentoo.org> wakeonlan-0.40.ebuild :
 
   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.
+  updated in any way. Thanks to Matthias Schwarzott for submitting this
+  ebuild.
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index e69de29bb2d1..f2b1d734c6ec 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -0,0 +1,5 @@
+MD5 f869cb486ccce26276ca77af30eb47dd wakeonlan-0.41.ebuild 489
+MD5 fc69745620aef809719f74c755b639b3 wakeonlan-0.40.ebuild 486
+MD5 929790f21c005927dad83e50d57b1c95 ChangeLog 924
+MD5 7fe048dfb6f703771bca3a1160d3b986 files/digest-wakeonlan-0.40 64
+MD5 56229c040ac99ceaba1225016b58d0a3 files/digest-wakeonlan-0.41 64
diff --git a/net-misc/wakeonlan/wakeonlan-0.40.ebuild b/net-misc/wakeonlan/wakeonlan-0.40.ebuild
index 8ecfc618232a..c4fb43e361c8 100644
--- a/net-misc/wakeonlan/wakeonlan-0.40.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.40.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wakeonlan/wakeonlan-0.40.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Client for Wake-On-LAN"
-SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
 HOMEPAGE="http://gsd.di.uminho.pt/jpo/software/wakeonlan/"
-IUSE=""
+SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic GPL-2"
-KEYWORDS="x86"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
diff --git a/net-misc/wakeonlan/wakeonlan-0.41.ebuild b/net-misc/wakeonlan/wakeonlan-0.41.ebuild
index cfa697beb605..36c1d20b3527 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-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/net-misc/wakeonlan/wakeonlan-0.41.ebuild,v 1.1 2005/09/02 23:24:36 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wakeonlan/wakeonlan-0.41.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index de1215e16455..26f180595be3 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,349 @@
 # ChangeLog for net-misc/wget
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/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-misc/wget/ChangeLog,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
+
+  20 Nov 2005; Hardave Riar <hardave@gentoo.org> wget-1.10.2.ebuild:
+  Stable on mips.
+
+  03 Nov 2005; Daniel Ostrow <dostrow@gentoo.org> wget-1.10.2.ebuild:
+  Stable on ppc64.
+
+  25 Oct 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.10.2.ebuild:
+  Fix for bug #110035, so now it will build statically and with ssl support.
+  Azarah wrote the patch for that, and upstram has been notified of it.
+  bug #109299 was the original bug he found, but that was a user issue.
+  bug #110035 is the actual issue.
+
+  20 Oct 2005; Luis Medinas <metalgod@gentoo.org> wget-1.10.2.ebuild:
+  Marked Stable on amd64. Bug #109097.
+
+  19 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> wget-1.10.2.ebuild:
+  Stable on sparc
+
+  19 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> wget-1.10.2.ebuild:
+  Stable on ppc.
+
+  19 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> wget-1.10.2.ebuild:
+  Stable on hppa. See bug #109097.
+
+  19 Oct 2005; Andrej Kacian <ticho@gentoo.org> wget-1.10.2.ebuild:
+  Stable on x86, security bug #109097.
+
+*wget-1.10.2 (13 Oct 2005)
+
+  13 Oct 2005; Seemant Kulleen <seemant@gentoo.org> -wget-1.10.ebuild,
+  +wget-1.10.2.ebuild:
+  Version bump to newest security fix, thanks to Carlo in bug #109125
+
+  12 Sep 2005; Seemant Kulleen <seemant@gentoo.org> +files/wgetrc-ipv6,
+  -wget-1.9.1-r3.ebuild, wget-1.10.ebuild:
+  add a note about preferring ipv6 in the wgetrc file, closing bug #102209
+
+  28 Jul 2005; Kito <kito@gentoo.org> wget-1.9.1-r5.ebuild:
+  stable on ppc-macos.
+
+  19 Jul 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.10.ebuild:
+  added a patch for uclibc and bumped the patchball version. Thanks to
+  solar@gentoo.org in bug #96716
+
+*wget-1.10 (18 Jul 2005)
+
+  18 Jul 2005; Seemant Kulleen <seemant@gentoo.org> +wget-1.10.ebuild:
+  version bump thanks to Tijs Zwinkels <gentoobugs@tumblecow.net> for
+  notifying me in bug #96716, and to: emanuele.giaquinta@gmail.com for porting
+  the patchset over in the same bug
+
+  18 Jul 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r5.ebuild:
+  adjust patches: debian CAN fix and Mandrake largefile to compile with
+  gcc-2.95. Thanks to Az in irc and solar@gentoo.org in bug #93703
+
+  16 May 2005; Tom Gall <tgall@gentoo.org> wget-1.9.1-r5.ebuild:
+  ppc64 stable, for #83920
+
+  16 May 2005; Stephen Bennett <spb@gentoo.org> wget-1.9.1-r5.ebuild:
+  Mips stable for #83920
+
+  16 May 2005; Rene Nussbaumer <killerfox@gentoo.org> wget-1.9.1-r5.ebuild:
+  Stable on hppa; bug #83920
+
+  16 May 2005; <plasmaroo@gentoo.org> wget-1.9.1-r5.ebuild:
+  Stable on IA64; bug #83920.
+
+  16 May 2005; Bryan Østergaard <kloeri@gentoo.org> wget-1.9.1-r5.ebuild:
+  Stable on alpha.
+
+  16 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> wget-1.9.1-r5.ebuild:
+  Stable on sparc wrt #seemantoni
+
+  16 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r5.ebuild:
+  stable on x86 and amd64
+
+  16 May 2005; Michael Hanselmann <hansmi@gentoo.org> ChangeLog,
+  wget-1.9.1-r5.ebuild:
+  Stable on ppc.
+
+*wget-1.9.1-r5 (16 May 2005)
+
+  16 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r4.ebuild,
+  +wget-1.9.1-r5.ebuild:
+  ouch, I didn't see CAN 2004-1488, so this patch from Debian fixes both 1487
+  and 1488. Thanks muchly to Evgeny Stambulchik <fnevgeny@weizmann.ac.il> in
+  bug #83920
+
+*wget-1.9.1-r4 (10 May 2005)
+
+  10 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r3.ebuild,
+  +wget-1.9.1-r4.ebuild:
+  revision bump which now adds patches from mandrake's source rpm to handle
+  large files properly and other misc. fixes: french and german translations;
+  proper handling of username/passwords in urls; spelling referrer correctly,
+  printing out the percentage in the output, removing rpath from the binary,
+  and finally in wgetrc: passive ftp is the default (closing bug #89814 by Tor
+  Klingberg <tor.klingberg@gmx.net>), and the references to /usr/local/etc now
+  point to /etc instead.  The de and fr patches should fix bug #77138 by: Sven <skoehler@upb.de>
+
+  10 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/wget-1.9.1+ipvmisc.patch, -files/wget-1.9.1-locale.patch,
+  -files/wget-1.9-uclibc.patch, -files/wget-CAN-2004-1487.patch,
+  wget-1.9.1-r3.ebuild:
+  move patches to a tarball on the mirrors.  No more 25K things in files
+
+  10 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/wget-1.8.2-2Glimit.diff, -files/wget-1.8.2-gentoo.diff,
+  wget-1.9.1-r3.ebuild:
+  remove unused patches
+
+  10 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r3.ebuild:
+  make sure to RDEPEND on a socks5 implementation -- dante is the only one I
+  can figure out that does implement it. Closing bug #89523 by Mihai Limbasan
+  <mihailim@gmail.com>
+
+  14 Mar 2005; Hardave Riar <hardave@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable on mips, bug #74008.
+
+  06 Mar 2005; Olivier Crête <tester@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable on x86 per security bug #74008
+
+  03 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable on alpha, bug 74008.
+
+  02 Mar 2005; Jason Wever <weeve@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable on sparc wrt security bug #74008.
+
+  02 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable ppc-macos
+
+  02 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable on ppc.
+
+  02 Mar 2005; Markus Rothe <corsair@gentoo.org> wget-1.9.1-r3.ebuild:
+  Stable on ppc64; bug #74008
+
+  02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> wget-1.9.1-r3.ebuild:
+  stable on amd64. see #74008
+
+*wget-1.9.1-r3 (02 Mar 2005)
+
+  02 Mar 2005; <solar@gentoo.org> +files/wget-CAN-2004-1487.patch,
+  +wget-1.9.1-r3.ebuild:
+  - security bump for bug 74008. CAN-2004-1487 - overwrite files via ".." in
+  path component
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> wget-1.8.2-r3.ebuild,
+  wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+  04 Jan 2005; Chris White <chriswhite@gentoo.org>
+  +files/wget-1.9.1-locale.patch, wget-1.9.1-r2.ebuild:
+  Added fix for bug #70734 per seemant's request as he's leaving and won't be
+  able to fix it for awhile.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  15 Jun 2004; <solar@gentoo.org> wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild,
+  files/wget-1.9-uclibc.patch:
+  basic uclibc support added
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> wget-1.9.1-r2.ebuild:
+  Stable on alpha.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> wget-1.9.1-r2.ebuild:
+  stable on amd64
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> wget-1.8.2-r3.ebuild,
+  wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild:
+  Add inherit eutils
+
+  18 Mar 2004; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r3.ebuild,
+  wget-1.9-r2.ebuild, wget-1.9.1-r2.ebuild:
+  HOMEPAGE fix thanks to: Dice Random <dice@warpenguin.com> in bug #45041
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r2.ebuild,
+  files/wget-1.9.1+ipvmisc.patch:
+  port patch fix from 1.9 to this patch, closing the same bug again
+
+  05 Dec 2003; Daniel Robbins <drobbins@gentoo.org> wget-1.8.2.ebuild:
+  making autoconf a non-conditional DEPEND, closing bug #34114.
+
+*wget-1.9-r2 (04 Dec 2003)
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9-r1.ebuild,
+  wget-1.9-r2.ebuild, wget-1.9.1-r1.ebuild:
+  fix the ipvmisc patch to allow name resolution as well as ipaddresses. The fix
+  was found by: Josh Grebe <josh@brokedown.net> in bug #33827 opened by Marcin
+  Kryczek <crytcheck@napisy.org>
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r2.ebuild:
+  why was autoconf moved into nls USE check???? Closing bug #34411 by Daniel
+  Ahlberg <aliz@gentoo.org>
+
+*wget-1.9.1-r2 (30 Nov 2003)
+
+  30 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.1-r2.ebuild:
+  Fix german locale, closes bug #34515
+
+  27 Nov 2003; Brad House <brad_mssw@gentoo.org> wget-1.9-r1.ebuild,
+  wget-1.9.1-r1.ebuild:
+  always require autoconf to be installed for this package
+
+  27 Nov 2003; Brad House <brad_mssw@gentoo.org> wget-1.9-r1.ebuild:
+  make autoconf a dep, as in a stage3 build it requires autoconf
+
+  20 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.1-r1.ebuild:
+  Enabled ipv6 support
+
+*wget-1.9-r1 (18 Nov 2003)
+
+  19 Nov 2003; Nicholas Jones <carpaski@gentoo.org> wget-1.8.2-r3.ebuild,
+  wget-1.9-r1.ebuild, wget-1.9.1-r1.ebuild:
+  Fixed all the deps so that autoconf and gettext were 'nls' USE. Added
+  autoconf to 1.9-r1.
+
+  18 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r2.ebuild,
+  wget-1.9-r1.ebuild, wget-1.9.1-r1.ebuild, wget-1.9.1.ebuild:
+  1.9-r1 restored as stable release -- WITH THE PATCH. DON'T ANYONE F'ING REMOVE
+  IT
+
+  18 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> wget-1.8.2-r3.ebuild,
+  wget-1.9.1-r1.ebuild:
+  sys-devl/autoconf -> sys-devel/autoconf; repoman: Trim trailing whitespace
+
+*wget-1.9.1-r1 (17 Nov 2003)
+
+  17 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.1-r1.ebuild,
+  wget-1.9.1.ebuild:
+  Version bump to add patch to fix ipv4
+
+  17 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.ebuild:
+  1.9 has bugs removed for 1.9.1
+
+*wget-1.9.1 (14 Nov 2003)
+
+  14 Nov 2003; Martin Holzer <mholzer@gentoo.org> wget-1.9.1.ebuild:
+  Version bumped.
+
+  10 Nov 2003; Brandon Low <lostlogic@gentoo.org> wget-1.9-r2.ebuild:
+  Actually remove the patch
+
+  10 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.9.ebuild:
+  wget-1.9 marked as stable.
+
+*wget-1.9-r2 (10 Nov 2003)
+
+  10 Nov 2003; Greg Fitzgerald <gregf@gentoo.org> wget-1.8.2-r2.ebuild,
+  wget-1.9-r2.ebuild:
+  Removed ipv6 support till the patch is reworked.
+
+*wget-1.9-r1 (03 Nov 2003)
+
+  03 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9-r1.ebuild:
+  added a patch to make ipv6 and ipv4 both work, instead of being mutually
+  exclusive. The patch was written by: ari edelkind
+  <edelkind-gentoo-bugzilla@episec.com> and submitted in bug #31798 by Bernd
+  Wurst <mail@bernd-wurst.de>
+
+  01 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r2.ebuild,
+  wget-1.8.2-r3.ebuild:
+  changed the SRC_URI for the new percentage patches to point to the Gentoo
+  mirrors instead. Closes bug #32514 by Stony Yakovac <stonyy@tek.com>
+
+*wget-1.9 (22 Oct 2003)
+
+  22 Oct 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.9.ebuild:
+  version bump -- this one should have support for ipv6, >2G fetches, and ipv6
+  out of the box
+
+*wget-1.8.2-r3 (14 Oct 2003)
+
+  14 Oct 2003; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r2.ebuild,
+  wget-1.8.2-r3.ebuild, files/wget-1.8.2-2Glimit.diff,
+  files/wget-1.8.2-gentoo.diff, files/wget-1.8.2-r2-gentoo.diff:
+  Added debian's patch to let wget download files larger than 2G. Ciaranm in
+  #gentoo/#gentoo-sparc found the patch at:
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=137989 . This closes bug
+  #30985 by katerina <kllba@operamail.com>
+
+*wget-1.8.2-r2 (20 Dec 2002)
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> wget-1.8.2-r2.ebuild:
+  Changed ~mips to mips in KEYWORDS
+  Cleaned up Changelog
+
+  19 May 2003; Joshua Kinard <kumba@gentoo.org> wget-1.8.2-r2.ebuild:
+  Add gnuconfig eclass, and gnuconfig_update to src_compile to allow
+  proper detection of linux-mips systems.  Also added ~mips to KEYWORDS.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> wget-1.8.2-r2.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> wget-1.8.2-r2.ebuild :
+  Added hppa to keywords.
+
+  20 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> wget-1.8.2.ebuild, wget-1.8.2-r1.ebuild
+						wget-1.8.2-r2.ebuild :
+  Updated SRC_URI and HOMEPAGE.
+
+  20 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update - added patch from RedHat.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*wget-1.8.2-r1 (31 Oct 2002)
+
+  31 Oct 2002; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2-r1.ebuild
+  files/digest-wget-1.8.2-r1 :
+
+  Added debian's patch for ipv6 if "ipv6" is in USE.  Thanks to:
+  andre@tomt.net (Andre Tomt) in bug #8286 for the patch.
+
+*wget-1.8.2 (29 May 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> wget-1.8.2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  29 May 2002; Seemant Kulleen <seemant@gentoo.org> wget-1.8.2.ebuild
+  files/digest-wget-1.8.2 :
+
+  Version bump. The patch still works, so there is no noticeable difference
+  to the user.
+
+*wget-1.8.1-r1 (22 Feb 2002)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> wget-1.8.2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  22 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Added openssl to RDEPEND as
+  well so that .tbz2 installation works.  This fixes bug #799.
 
 *wget-1.8.1 (1 Feb 2002)
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 0531ad5ed8c6..da27321301d7 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,8 +1,7 @@
-MD5 c68e0e7e5fa02bc50ea7de5952c5ebf9 ChangeLog 2511
-MD5 1903bae07e9a6f46e5383abf7b4b93a8 wget-1.8.2-r1.ebuild 1739
-MD5 bf7193bb73f20f9ecc43c9471e3ca5ee wget-1.8.2-r2.ebuild 1918
-MD5 a418c09dd82a46504b8480741c9f5ee1 wget-1.8.2.ebuild 1677
-MD5 00e7e0c66e6e615b96d3a83e3b0c9a16 files/digest-wget-1.8.2 146
-MD5 28f004e72194fae0e65365e48b867c83 files/digest-wget-1.8.2-r1 221
-MD5 28f004e72194fae0e65365e48b867c83 files/digest-wget-1.8.2-r2 221
-MD5 987b30c931a50d2dc02a905c29f84821 files/wget-1.8.2-r2-gentoo.diff 1549
+MD5 f11e304b063b2d3de6f4a84c3b635a5b ChangeLog 13456
+MD5 ccd4f075b5537ea4109931e85ad3b298 files/digest-wget-1.10.2 137
+MD5 9da83719265c58f22ba93bcb2e8d299f files/digest-wget-1.9.1-r5 136
+MD5 8e4630728c37bc391e699cd91c848d5f files/wgetrc-ipv6 54
+MD5 bc1353abf3bc2339ee85980675343fdf metadata.xml 252
+MD5 f6787b1099b535f35400b3130a1e3d53 wget-1.10.2.ebuild 1704
+MD5 420bb5bbf1253af5fd8dc56a60f6f092 wget-1.9.1-r5.ebuild 1613
diff --git a/net-misc/wget/files/digest-wget-1.10.2 b/net-misc/wget/files/digest-wget-1.10.2
index 9d1d623148e6..3eae11981f73 100644
--- a/net-misc/wget/files/digest-wget-1.10.2
+++ b/net-misc/wget/files/digest-wget-1.10.2
@@ -1,2 +1,2 @@
-MD5 68a82891033d4461855e81514a88e351 wget-1.10.2-gentoo-0.1.tar.bz2 3409
 MD5 795fefbb7099f93e2d346b026785c4b8 wget-1.10.2.tar.gz 1213056
+MD5 122f553b110a83923f0dc5be45c366ff wget-1.10.2-gentoo-0.2.tar.bz2 4777
diff --git a/net-misc/wget/files/digest-wget-1.9.1-r5 b/net-misc/wget/files/digest-wget-1.9.1-r5
index 0ea71b62587b..470c45db325a 100644
--- a/net-misc/wget/files/digest-wget-1.9.1-r5
+++ b/net-misc/wget/files/digest-wget-1.9.1-r5
@@ -1,2 +1,2 @@
 MD5 e6051f1e1487ec0ebfdbda72bedc70ad wget-1.9.1.tar.gz 1322378
-MD5 530fc57c6e8bd8244e73210e66e49ae3 wget-1.9.1-gentoo-0.3.tar.bz2 37113
+MD5 457443fe38191db142544893bf0d6172 wget-1.9.1-gentoo-0.4.tar.bz2 37430
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 91691bad0035..8b6bb0bf7429 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-misc</herd>
-<maintainer>
-	<email>gregf@gentoo.org</email>
-	<name>Greg Fitzgerald</email>
-</maintainer>
+<herd>no-herd</herd>
 <maintainer>
 	<email>seemant@gentoo.org</email>
 	<name>Seemant Kulleen</name>
-</maintinaer>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/wget/wget-1.10.2.ebuild b/net-misc/wget/wget-1.10.2.ebuild
index 1fc9bb3009a8..5940ac54caa8 100644
--- a/net-misc/wget/wget-1.10.2.ebuild
+++ b/net-misc/wget/wget-1.10.2.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.10.2.ebuild,v 1.1 2005/10/13 13:34:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.10.2.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
-PATCHVER=0.1
+PATCHVER=0.2
 DESCRIPTION="Network utility to retrieve files from the WWW"
 HOMEPAGE="http://wget.sunsite.dk/"
-SRC_URI="http://dev.gentoo.org/~seemant/distfiles/${P}.tar.gz
-	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
-	mirror://gentoo/${P}.tar.gz
+SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gnu/wget/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="build debug ipv6 nls socks5 ssl static"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
diff --git a/net-misc/wget/wget-1.9.1-r5.ebuild b/net-misc/wget/wget-1.9.1-r5.ebuild
index 7cc3147c2b12..93ed5c409228 100644
--- a/net-misc/wget/wget-1.9.1-r5.ebuild
+++ b/net-misc/wget/wget-1.9.1-r5.ebuild
@@ -1,47 +1,38 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r5.ebuild,v 1.1 2005/05/16 19:00:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r5.ebuild,v 1.1.1.1 2005/11/30 09:55:31 chriswhite Exp $
 
-inherit gnuconfig eutils flag-o-matic
+inherit eutils flag-o-matic
 
-IUSE="build debug ipv6 nls socks5 ssl static"
-
-PATCHVER=0.3
+PATCHVER=0.4
 DESCRIPTION="Network utility to retrieve files from the WWW"
 HOMEPAGE="http://wget.sunsite.dk/"
 SRC_URI="mirror://gnu/wget/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2"
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh
-~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86"
+IUSE="build debug ipv6 nls socks5 ssl static"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
 	socks5? ( net-proxy/dante )"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-devel/autoconf"
 
-
-PATCHDIR="${WORKDIR}/patches"
-
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	export EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}/gentoo
-	epatch ${PATCHDIR}/debian
-	epatch ${PATCHDIR}/mandrake
+	unpack ${A} ; cd "${S}"
+	local PATCHDIR=${WORKDIR}/patches
+	EPATCH_SUFFIX="patch"
+	EPATCH_MULTI_MSG="Applying Gentoo patches ..." epatch "${PATCHDIR}"/gentoo
+	EPATCH_MULTI_MSG="Applying Debian patches ..." epatch "${PATCHDIR}"/debian
+	EPATCH_MULTI_MSG="Applying Mandrake patches ..." epatch "${PATCHDIR}"/mandrake
+	autoconf || die "autoconf failed"
 }
 
 src_compile() {
-	# Make wget use up-to-date configure scripts
-	gnuconfig_update
-
-	use ssl && append-flags -I/usr/include/openssl
-
+	use static && append-ldflags -static
 	econf \
 		--sysconfdir=/etc/wget \
 		$(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \
@@ -50,22 +41,16 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_with socks5 socks) \
 		|| die
-
-	if use static; then
-		emake LDFLAGS="--static" || die
-	else
-		emake || die
-	fi
+	emake || die
 }
 
 src_install() {
-	if use build; then
-		insinto /usr
-		dobin ${S}/src/wget
-		return
+	if use build ; then
+		dobin "${S}"/src/wget || die "dobin"
+		return 0
 	fi
 
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog MACHINES MAILING-LIST NEWS README TODO
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog MACHINES MAILING-LIST NEWS README TODO
 	dodoc doc/sample.wgetrc
 }
diff --git a/net-misc/whatmask/ChangeLog b/net-misc/whatmask/ChangeLog
index d4f6605e8cc4..662cf97e9782 100644
--- a/net-misc/whatmask/ChangeLog
+++ b/net-misc/whatmask/ChangeLog
@@ -1,11 +1,37 @@
 # ChangeLog for net-misc/whatmask
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whatmask/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-misc/whatmask/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> whatmask-1.2.ebuild:
+  Stable on ppc.
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> whatmask-1.2.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> whatmask-1.1.ebuild,
+  whatmask-1.2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+*whatmask-1.2 (23 Jan 2004)
+
+  23 Jan 2004; Chuck Short <zul@gentoo.org> metadata.xml, whatmask-1.1.ebuild,
+  whatmask-1.2.ebuild:
+  Added metadata.xml.
+
+*whatmask-1.2 (23 Jan 2004)
+
+  23 Jan 2004; Chuck Short <zul@gentoo.org> whatmask-1.1.ebuild,
+  whatmask-1.2.ebuild:
+  Version bump, closes #39047. Header fixes as well.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *whatmask-1.1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> whatmask-1.1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/whatmask/Manifest b/net-misc/whatmask/Manifest
index e69de29bb2d1..e1a5feb52379 100644
--- a/net-misc/whatmask/Manifest
+++ b/net-misc/whatmask/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d26bf86b62f27a3e1e9965f25c17ce58 ChangeLog 1492
+MD5 208207aad1e3590eae78ec12697af28d files/digest-whatmask-1.1 64
+MD5 015cb5edc15790f8428a0773c640a850 files/digest-whatmask-1.2 64
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 72cf1b3d4d50252bb3fcab07fa5abc44 whatmask-1.1.ebuild 612
+MD5 1d2d6ad9688657f710e07de253d656b0 whatmask-1.2.ebuild 617
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC68nxI1lqEGTUzyQRAisQAJ9UyoA6Y49Lo04Cwf60ONkZPbL5rwCg1r1w
+VwRvNvx/DDupKhK5ia2JzD8=
+=C0H3
+-----END PGP SIGNATURE-----
diff --git a/net-misc/whatmask/files/digest-whatmask-1.1 b/net-misc/whatmask/files/digest-whatmask-1.1
index eb4042b8a1cf..3bd6333335ba 100644
--- a/net-misc/whatmask/files/digest-whatmask-1.1
+++ b/net-misc/whatmask/files/digest-whatmask-1.1
@@ -1 +1 @@
-MD5 2fa6b1bb18f037d0f9c3c8b2eed19277 whatmask-1.1.tar.gz
+MD5 2fa6b1bb18f037d0f9c3c8b2eed19277 whatmask-1.1.tar.gz 162664
diff --git a/net-misc/whatmask/whatmask-1.1.ebuild b/net-misc/whatmask/whatmask-1.1.ebuild
index 95b4a30284d8..91e4b033013c 100644
--- a/net-misc/whatmask/whatmask-1.1.ebuild
+++ b/net-misc/whatmask/whatmask-1.1.ebuild
@@ -1,28 +1,19 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whatmask/whatmask-1.1.ebuild,v 1.1 2001/09/25 15:58:58 lamer Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whatmask/whatmask-1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="little C program to compute different subnet mask notations"
-SRC_URI="http://downloads.laffeycomputer.com/current_builds/whatmask/${P}.tar.gz"
 HOMEPAGE="http://www.laffeycomputer.com/whatmask.html"
-DEPEND="virtual/glibc"
+SRC_URI="http://downloads.laffeycomputer.com/current_builds/whatmask/${P}.tar.gz"
 
-#RDEPEND=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc"
 
-src_compile() {
-	try ./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST}
-	
-	emake || die
-	#make || die
-}
+DEPEND="virtual/libc"
 
-src_install () {
-	
-	# try make prefix=${D}/usr install
-
-    try make DESTDIR=${D} install
-	 dodoc README INSTALL AUTHORS ChangeLog NEWS
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc README INSTALL AUTHORS ChangeLog NEWS
 }
-
diff --git a/net-misc/whatmask/whatmask-1.2.ebuild b/net-misc/whatmask/whatmask-1.2.ebuild
index af86e6962c65..34167f8268c7 100644
--- a/net-misc/whatmask/whatmask-1.2.ebuild
+++ b/net-misc/whatmask/whatmask-1.2.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whatmask/whatmask-1.2.ebuild,v 1.1 2004/01/24 16:45:50 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whatmask/whatmask-1.2.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="little C program to compute different subnet mask notations"
 HOMEPAGE="http://www.laffeycomputer.com/whatmask.html"
 SRC_URI="http://downloads.laffeycomputer.com/current_builds/whatmask/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ppc"
 
-DEPEND="virtual/glibc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc README INSTALL AUTHORS ChangeLog NEWS
 }
diff --git a/net-misc/whois/ChangeLog b/net-misc/whois/ChangeLog
index 4b5928a7d807..c164ae4a73df 100644
--- a/net-misc/whois/ChangeLog
+++ b/net-misc/whois/ChangeLog
@@ -1,6 +1,211 @@
 # ChangeLog for net-misc/whois
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/ChangeLog,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
+
+*whois-4.7.8 (31 Oct 2005)
+
+  31 Oct 2005; Mike Frysinger <vapier@gentoo.org> +whois-4.7.8.ebuild:
+  Version bump #111004 by Daniel Webert.
+
+  08 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> whois-4.7.2.ebuild:
+  Install as mdwhois (Marco d'Itri) instead of gwhois on other userlands, as
+  gwhois is another package.
+
+  26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> whois-4.7.2.ebuild:
+  Make whois install as gwhois while out of GNU userland. Also let the
+  makefile use the right CC compiler.
+
+*whois-4.7.2 (19 Apr 2005)
+
+  19 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/whois-4.7.2-config-file.patch,
+  +files/whois-4.7.2-gentoo-security.patch, +whois-4.7.2.ebuild:
+  Version bump #73845 by Daniel Webert and add /etc/whois.conf support #89417
+  by Wakko Warner.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*whois-4.6.22 (16 Oct 2004)
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> +whois-4.6.22.ebuild:
+  Version bump #49629 by Marcin Kryczek. Restrict maketest #59327 by Daniel
+  Black. Add support for country domains #43470 by Bernd Wurst.
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> whois-4.6.13-r1.ebuild:
+  Dont install mkpasswd anymore, shadow does #6428 by Paul Thompson.
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> whois-4.6.13-r1.ebuild:
+  stable on ppc64, bug #55520
+
+*whois-4.6.13-r1 (13 Jul 2004)
+
+  13 Jul 2004; Seemant Kulleen <seemant@gentoo.org> +whois-4.6.13-r1.ebuild,
+  -whois-4.6.13.ebuild, -whois-4.6.6-r2.ebuild, +whois-4.6.6-r3.ebuild,
+  +whois-4.6.9-r1.ebuild, -whois-4.6.9.ebuild:
+  in place bumps to ensure that whois owns the mkpasswd binary and manpage,
+  rather than expect. This bump corresponds to bug #51353 by Carsten Lohrke
+  <carlo@gentoo.org>
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> whois-4.6.13.ebuild,
+  whois-4.6.6-r2.ebuild, whois-4.6.9.ebuild:
+  change virtual/glibc to virtual/libc
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> whois-4.6.13.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> whois-4.6.13.ebuild,
+  whois-4.6.6-r2.ebuild, whois-4.6.9.ebuild:
+  Add inherit eutils
+
+  13 Apr 2004; Joshua Kinard <kumba@gentoo.org> whois-4.6.9.ebuild:
+  Marked stable on mips.
+
+*whois-4.6.13 (13 Apr 2004)
+
+  13 Apr 2004; Martin Holzer <mholzer@gentoo.org> whois-4.6.13.ebuild,
+  files/whois-4.6.13-gentoo-security.patch:
+  Version bumped. Closes 47532
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> whois-4.6.9.ebuild :
+  Stable on AMD64.
+
+  14 Jan 2004; Martin Guy <gmsoft@gentoo.org> whois-4.6.6-r2.ebuild,
+  whois-4.6.9.ebuild:
+  Changed /bin/install to install because different versions of coreutils place
+  install in different locations.
+
+  08 Dec 2003; Martin Holzer <mholzer@gentoo.org>
+  files/whois-4.6.9-gentoo-security.patch:
+  correcting security patch. submitted by Marcin Krycze <crytcheck@napisy.org>
+  in #34768.
+
+*whois-4.6.9 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> whois-4.6.9.ebuild,
+  files/whois-4.6.9-gentoo-security.patch:
+  Version bumped.
+
+  28 Nov 2003; Chuck Short <zul@gentoo.org> whois-4.6.8.ebuild:
+  Added ~amd64 keywords.
+
+*whois-4.6.8 (23 Nov 2003)
+
+  23 Nov 2003; Martin Holzer <mholzer@gentoo.org> whois-4.6.8.ebuild,
+  files/whois-4.6.8-gentoo-security.patch:
+  Version bumped. Closes #34109.
+
+  21 Nov 2003; Aron Griffis <agriffis@gentoo.org> whois-4.6.6-r2.ebuild:
+  Stable on alpha
+
+*whois-4.6.6-r2 (11 Aug 2003)
+
+  11 Aug 2003; <solar@gentoo.org> whois-4.6.6-r1.ebuild,
+  whois-4.6.6-r2.ebuild, files/whois-4.6.6-gentoo-security-2.patch,
+  files/whois-4.6.6-gentoo-security.patch:
+  whois does not check the return values of malloc and realloc to ensure that
+  they succeeded which can lead to unexpected results including segfaults. So
+  I merged the last gentoo-security.patch with Matt Kraai's idea from debian
+  bug report - #135822 to form the gentoo-security-2.patch
+
+*whois-4.6.6-r1 (11 Aug 2003)
+
+  11 Aug 2003; <solar@gentoo.org> whois-4.5.28-r1.ebuild, whois-4.6.2.ebuild,
+  whois-4.6.5.ebuild, whois-4.6.6-r1.ebuild, whois-4.6.6.ebuild,
+  files/whois-4.6.6-gentoo-security.patch:
+  Ok so looking at the whois code, there seems to be quite a few ways to
+  overflow it. I've written a little patch which should address this. I'm also
+  removing all the older exploitable versions of whois from the portage tree,
+  and adding my patch. Closes bug 24860
+
+  08 Jul 2003; Jason Wever <weeve@gentoo.org> whois-4.6.6.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  30 Jun 2003; Martin Holzer <mholzer@gentoo.org> whois-4.6.6.ebuild:
+  Stable on x86
+
+*whois-4.6.6 (25 Jun 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> whois-4.6.6.ebuild :
+  Marked stable on hppa.
+
+  25 Jun 2003; Martin Holzer <mholzer@gentoo.org> whois-4.6.6.ebuild:
+  Version bumped.
+
+  24 May 2003; Christian Birchinger <joker@gentoo.org> whois-4.6.5.ebuild:
+  Added sparc stable keyword
+
+*whois-4.6.5 (09 May 2003)
+
+  19 Jun 2003; Zach Welch <zwelch@gentoo.org whois-4.6.5.ebuild:
+  add arm keyword
+
+  21 May 2003; Martin Holzer <mholzer@gentoo.org> whois-4.6.5.ebuild:
+  Marked stable on x86.
+
+  09 May 2003; Martin Holzer <mholzer@gentoo.org> whois-4.5.31.ebuild,
+  whois-4.5.31.ebuild, whois-4.5.33.ebuild, whois-4.5.33.ebuild,
+  whois-4.6.1.ebuild, whois-4.6.1.ebuild, whois-4.6.5.ebuild:
+  Version bumped. Cleanup.
+
+*whois-4.6.2 (29 Jan 2003)
+
+  06 Apr 2003; Guy Martin <gmsoft@gentoo.org> whois-4.6.2.ebuild :
+  Added hppa to KEYWORDS.
+
+  30 Mar 2003; Christian Birchinger <joker@gentoo.org> whois-4.6.2.ebuild:
+  Added sparc stable keyword
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> whois-4.6.2.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  29 Jan 2003; Martin Holzer <mholzer@gentoo.org> whois-4.6.2.ebuild
+  files/digest-whois-4.6.2 ChangeLog :
+  Version bumped. Closes #14695.
+
+*whois-4.6.1 (25 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> whois-4.6.1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  25 Dec 2002; Martin Holzer <mholzer@gentoo.org> whois-4.6.1.ebuild
+  files/digest-whois-4.6.1 ChangeLog :
+  Version bumped. Closes #12107.
+ 
+*whois-4.5.33 (21 Nov 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> whois-4.5.33.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  21 Nov 2002; Hannes Mehnert <hannes@gentoo.org> whois-4.5.33.ebuild,
+  files/digest-whois-4.5.33: version bump
+
+*whois-4.5.31 (31 Oct 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> whois-4.5.31.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  31 Oct 2002; Hannes Mehnert <hannes@gentoo.org> whois-4.5.31.ebuild,
+  files/digest-whois-4.5.31: version bump
+
+*whois-4.5.28-r1 (1 Jul 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> whois-4.5.28-r1.ebuild :
+  Added stable mips keyword to the ebuild.
+
+  01 Jul 2002; Seemant Kulleen <seemant@gentoo.org> whois-4.5.28-r1.ebuild
+  files/digest-whois-4.5.28-r1 :
+
+  NLS fixes (bloat reduction)
+
+*whois-4.5.28 (25 Jun 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> whois-4.5.28.ebuild :
+  Added KEYWORDS.
+
+  25 Jun 2002; Thilo Bangert <bangert@gentoo.org> whois-4.5.28.ebuild :
+  version bump - added SLOT
+
 
 *whois-4.5.8 (1 Feb 2002)
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index db15ea3ad83a..3a53ad99b0ed 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,7 +1,17 @@
-MD5 a3078fefd506ba05bc1daca40cf80320 ChangeLog 2470
-MD5 9fec9226a0f38d1f96541d99aaa36b6b whois-4.5.28-r1.ebuild 1230
-MD5 6c69bac534e9026d4a96a72a23f4a353 whois-4.6.2.ebuild 1246
-MD5 d0c7a3d20825af742f19058ac2eff500 whois-4.6.5.ebuild 1101
-MD5 e5bfe59600d5004e660bc25b44ef57cb files/digest-whois-4.5.28-r1 63
-MD5 e0ddfa19a7be8e839b1230c90cf7f212 files/digest-whois-4.6.2 62
-MD5 32a907197a525d414f902c78fee2be6e files/digest-whois-4.6.5 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 81cdc413cb7ec754349c3490fca516e5 ChangeLog 7805
+MD5 57973d31d6aaf8ccd822e6f11837978b files/digest-whois-4.7.2 62
+MD5 5c08968b7ef917ca2149df794515dda5 files/digest-whois-4.7.8 62
+MD5 1327d76b68095d1c08e847fe3bbb4367 files/whois-4.7.2-config-file.patch 198
+MD5 df632f0b3d2992153d9671f55cd835cf files/whois-4.7.2-gentoo-security.patch 5609
+MD5 e861882f62667c61182650f4c5b8a642 whois-4.7.2.ebuild 1269
+MD5 98df396a37d45a2a97a96982f97930ab whois-4.7.8.ebuild 1330
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZqQagIKl8Uu19MoRAt5nAKCAD2A1SDK4pGqkzXWcqHFjtPyFPACfdUeY
+e9jdXve3b9a/BHcHbAAnBzc=
+=C836
+-----END PGP SIGNATURE-----
diff --git a/net-misc/whois/files/whois-4.7.2-gentoo-security.patch b/net-misc/whois/files/whois-4.7.2-gentoo-security.patch
index 2d6c7b78d4a3..39553a6ec3af 100644
--- a/net-misc/whois/files/whois-4.7.2-gentoo-security.patch
+++ b/net-misc/whois/files/whois-4.7.2-gentoo-security.patch
@@ -5,7 +5,7 @@
  	if (strchr(ripeflags, ch)) {
  	    for (p = fstring; *p; p++);
 -	    sprintf(p--, "-%c ", ch);
-+	    snprintf(p--, sizeof(fstring)-1, "-%c ", ch);
++	    snprintf(p--, sizeof(fstring), "-%c ", ch);
  	    continue;
  	}
  	if (strchr(ripeflagsp, ch)) {
diff --git a/net-misc/whois/whois-4.7.2.ebuild b/net-misc/whois/whois-4.7.2.ebuild
index 3678870d9052..56e419fb3bb0 100644
--- a/net-misc/whois/whois-4.7.2.ebuild
+++ b/net-misc/whois/whois-4.7.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/net-misc/whois/whois-4.7.2.ebuild,v 1.1 2005/04/19 00:04:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.2.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P=${P/-/_}
 DESCRIPTION="improved Whois Client"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="nls"
-RESTRICT="maketest" #59327
+RESTRICT="test" #59327
 
 RDEPEND="net-dns/libidn"
 DEPEND="${RDEPEND}
@@ -35,6 +35,7 @@ src_unpack() {
 }
 
 src_compile() {
+	tc-export CC
 	emake OPTS="${CFLAGS}" HAVE_LIBIDN=1 || die
 }
 
@@ -44,4 +45,9 @@ src_install() {
 	insinto /etc
 	doins whois.conf
 	dodoc README
+
+	if [[ "${USERLAND}" != "GNU" ]]; then
+		mv ${D}/usr/share/man/man1/{whois,mdwhois}.1
+		mv ${D}/usr/bin/{whois,mdwhois}
+	fi
 }
diff --git a/net-misc/whois/whois-4.7.8.ebuild b/net-misc/whois/whois-4.7.8.ebuild
index c037dd7598fb..45707c2415da 100644
--- a/net-misc/whois/whois-4.7.8.ebuild
+++ b/net-misc/whois/whois-4.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.8.ebuild,v 1.1 2005/10/31 23:08:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whois/whois-4.7.8.ebuild,v 1.1.1.1 2005/11/30 09:55:32 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/net-misc/whoischk/ChangeLog b/net-misc/whoischk/ChangeLog
index ecb7ae08f317..8b90e1f14823 100644
--- a/net-misc/whoischk/ChangeLog
+++ b/net-misc/whoischk/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for net-misc/whoischk
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/whoischk/ChangeLog,v 1.1 2003/07/27 20:41:01 lisa Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whoischk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
+*whoischk-0.2.4 (23 Feb 2004)
+
+  23 Feb 2004; Martin Holzer <mholzer@gentoo.org> whoischk-0.2.4.ebuild:
+  Version bumped. Closes 42367
+
+*whoischk-0.2.3 (17 Aug 2003)
+
+  17 Aug 2003; Martin Holzer <mholzer@gentoo.org> whoischk-0.2.3.ebuild:
+  Version bumped.
 
 *whoischk-0.2.2 (2003 Jul 27)
 
diff --git a/net-misc/whoischk/Manifest b/net-misc/whoischk/Manifest
index bbf59ce66268..8b251204d7fa 100644
--- a/net-misc/whoischk/Manifest
+++ b/net-misc/whoischk/Manifest
@@ -1,2 +1,3 @@
-MD5 bf8c1b2ec5f00d56f780b91d924a654a whoischk-0.2.2.ebuild 929
-MD5 2544c6851b5169fb64ad14ac40039688 files/digest-whoischk-0.2.2 65
+MD5 1fc9c8431d2279cdd8e02edc6ecf1ab8 ChangeLog 646
+MD5 ea326517eb90dc328790b95f5e1b0a6c whoischk-0.2.4.ebuild 731
+MD5 12b42cd64a1c7ab5571d98ace4e053a5 files/digest-whoischk-0.2.4 65
diff --git a/net-misc/whoischk/whoischk-0.2.4.ebuild b/net-misc/whoischk/whoischk-0.2.4.ebuild
index 7904afbd9044..febc77873596 100644
--- a/net-misc/whoischk/whoischk-0.2.4.ebuild
+++ b/net-misc/whoischk/whoischk-0.2.4.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/net-misc/whoischk/whoischk-0.2.4.ebuild,v 1.1 2004/02/23 18:06:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/whoischk/whoischk-0.2.4.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
 
 DESCRIPTION="monitor a list of domains and report when there has been any change"
 HOMEPAGE="http://downloads.afterdark.org.uk/whoischk/"
 SRC_URI="http://downloads.afterdark.org.uk/whoischk/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
-S="${WORKDIR}/${P}"
+KEYWORDS="amd64 arm hppa ia64 x86"
+IUSE=""
 
 RDEPEND="app-shells/bash
 	net-misc/jwhois"
 
-
 src_compile() {
 	sed -i -e 's|WHOIS=whois|WHOIS=jwhois|' whoischk || die
 }
 
 src_install() {
-	dobin whoischk
+	dobin whoischk || die
 	dodoc AUTHOR ChangeLog INSTALL LICENCE PATCHES README USAGE sample-rc-file
 }
diff --git a/net-misc/wol/ChangeLog b/net-misc/wol/ChangeLog
index 28705eaffca4..13c19339e74b 100644
--- a/net-misc/wol/ChangeLog
+++ b/net-misc/wol/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/wol
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wol/ChangeLog,v 1.1 2005/01/04 01:21:12 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wol/ChangeLog,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
+
+  22 Sep 2005; Wolfram Schlich <wschlich@gentoo.org> wol-0.7.1.ebuild:
+  cleanup, add nls USE flag and -ppc-macos keyword, remove debug USE flag
+
+  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> wol-0.7.1.ebuild:
+  Added to ~ppc.
+
+  30 Mar 2005; <blubb@gentoo.org> wol-0.7.1.ebuild:
+  added ~amd64
 
 *wol-0.7.1 (04 Jan 2005)
 
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index d1849e63d1ce..8435845fb170 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,4 @@
-MD5 1f4541ef71f264f2ad3336a6f9978f89 wol-0.7.1.ebuild 733
+MD5 f81a95095d2e19ded9af0843d2aef774 ChangeLog 636
 MD5 1c2628739cc6796853a41d91b00ad554 metadata.xml 614
-MD5 28c707a7ee85eeac22b3823f578ba016 ChangeLog 246
+MD5 77c01b19e4aa4c136264fc1798f20ed4 wol-0.7.1.ebuild 684
 MD5 1868681f609da06939ef047d9acdf058 files/digest-wol-0.7.1 61
diff --git a/net-misc/wol/wol-0.7.1.ebuild b/net-misc/wol/wol-0.7.1.ebuild
index ff533fe00a76..d13ef267f437 100644
--- a/net-misc/wol/wol-0.7.1.ebuild
+++ b/net-misc/wol/wol-0.7.1.ebuild
@@ -1,32 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wol/wol-0.7.1.ebuild,v 1.1 2005/01/04 01:21:12 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wol/wol-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:55:18 chriswhite Exp $
 
-inherit eutils flag-o-matic
-
-DESCRIPTION="wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant."
+DESCRIPTION="Wake On LAN client, wakes up hardware that is Magic Packet compliant."
 HOMEPAGE="http://ahh.sourceforge.net/wol/"
 SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
+KEYWORDS="~x86 ~amd64 ~ppc -ppc-macos"
+IUSE="nls"
 
 src_compile() {
-	use debug && {
-		append-flags -O -ggdb -DDEBUG
-		RESTRICT="${RESTRICT} nostrip"
-	}
-	econf || die "configure failed"
+	econf \
+		$(use_enable nls) \
+		|| die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog TODO
+	dodoc README ChangeLog TODO AUTHORS
 }
diff --git a/net-misc/wput/ChangeLog b/net-misc/wput/ChangeLog
index 0d04d2aa47f1..ffd3aa04755d 100644
--- a/net-misc/wput/ChangeLog
+++ b/net-misc/wput/ChangeLog
@@ -1,10 +1,43 @@
 # ChangeLog for net-misc/wput
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.1 2004/05/02 18:47:48 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
+
+*wput-0.6_pre (18 Apr 2005)
+
+  18 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/wput-0.6_pre-gentoo.diff, +wput-0.6_pre.ebuild:
+  Version bump.
+
+  12 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> wput-0.5.ebuild:
+  Marked stable on x86.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*wput-0.5 (12 Dec 2004)
+
+  12 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  +files/wput-0.5-gentoo.diff, +wput-0.5.ebuild:
+  Version bump; updated metadata.xml.
+
+  25 Jul 2004; Josh Glover <jmglov@gentoo.org> metadata.xml:
+  Taking over maintainership of this ebuild
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wput-0.4.ebuild:
+  Stable on x86.
+
+  07 May 2004; Ciaran McCreesh <ciaranm@gentoo.org> wput-0.4.ebuild:
+  Added ~sparc, #50377
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> wput-0.4.ebuild:
+  Fix manpage installation.
+
+  03 May 2004; David Holm <dholm@gentoo.org> wput-0.4.ebuild:
+  Added to ~ppc.
 
 *wput-0.4 (02 May 2004)
 
-  02 May 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  02 May 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +wput-0.4.ebuild:
   Initial import, bug #48790.
 
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index c6fab15dd7f8..749129c0a867 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,3 +1,20 @@
-MD5 8c2edefc7b732b9d63f125a5213b66f7 wput-0.4.ebuild 696
-MD5 e2197bbca51952701bf182a7c4740f74 metadata.xml 218
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b565e76bf336a1cfa9ee427f45311ba8 wput-0.5.ebuild 943
+MD5 99ee84722a32630b8271c4932a346e42 wput-0.4.ebuild 825
+MD5 c0c615f8bdf4187e33907c487c9d7845 ChangeLog 1335
+MD5 0ea3ffdc7ca29f08414d91f62d259c31 metadata.xml 249
+MD5 d67f907f4b0e4e2d56c0e2a9a7aefecc wput-0.6_pre.ebuild 978
 MD5 c4f33a3f597e892402d506bb45c85e71 files/digest-wput-0.4 57
+MD5 5658b10fdaa5e2c2663e63aa8d58db37 files/digest-wput-0.5 57
+MD5 25eb8a44df9c58935f1fa03421d2a493 files/wput-0.5-gentoo.diff 1164
+MD5 dca13fc1fa17e657e296a43d7a76ce77 files/digest-wput-0.6_pre 60
+MD5 85947ddfe7018ac0babd3ea2a7263672 files/wput-0.6_pre-gentoo.diff 1906
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCY+2QEZCkKN40op4RAgCuAJ9pqY9ux86DJcy1LauxVjjf88qAHACgs/nd
+wrWaVCNjJa5nBGNbK/oLEYE=
+=TXXq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/wput/metadata.xml b/net-misc/wput/metadata.xml
index 1a0fa6ed6c78..6ba82d66be8b 100644
--- a/net-misc/wput/metadata.xml
+++ b/net-misc/wput/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer><email>kloeri@gentoo.org</email></maintainer>
+<maintainer>
+	<email>ka0ttic@gentoo.org</email>
+	<name>Aaron Walker</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-misc/wput/wput-0.4.ebuild b/net-misc/wput/wput-0.4.ebuild
index 09a3af7c2941..54d79979251a 100644
--- a/net-misc/wput/wput-0.4.ebuild
+++ b/net-misc/wput/wput-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.4.ebuild,v 1.1 2004/05/02 18:47:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.4.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 S="${WORKDIR}/${PN}"
 
@@ -10,20 +10,20 @@ SRC_URI="http://itooktheredpill.dyndns.org/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
 DEPEND=""
 
 src_compile() {
-	econf --prefix=${D}usr || die "configure failed"
+	econf --prefix=/usr || die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
-	einstall || die "install failed"
+	einstall mandir=${D}/usr/share/man/man1 || die "install failed"
 
 	# Documentation
 	dodoc COPYING ChangeLog INSTALL TODO
diff --git a/net-misc/wput/wput-0.5.ebuild b/net-misc/wput/wput-0.5.ebuild
index 106106635a7f..767b112c6d4a 100644
--- a/net-misc/wput/wput-0.5.ebuild
+++ b/net-misc/wput/wput-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.5.ebuild,v 1.1 2004/12/12 19:08:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://itooktheredpill.dyndns.org/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE="debug"
 
 DEPEND="virtual/libc"
diff --git a/net-misc/wput/wput-0.6_pre.ebuild b/net-misc/wput/wput-0.6_pre.ebuild
index 412136ba127c..f7b1d84fc1be 100644
--- a/net-misc/wput/wput-0.6_pre.ebuild
+++ b/net-misc/wput/wput-0.6_pre.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.6_pre.ebuild,v 1.1 2005/04/18 17:25:10 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.6_pre.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-misc/x11-ssh-askpass/ChangeLog b/net-misc/x11-ssh-askpass/ChangeLog
index 96d589c5ec89..2c7e14eac7ae 100644
--- a/net-misc/x11-ssh-askpass/ChangeLog
+++ b/net-misc/x11-ssh-askpass/ChangeLog
@@ -1,11 +1,63 @@
 # ChangeLog for net-misc/x11-ssh-askpass
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/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-misc/x11-ssh-askpass/ChangeLog,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
-*x11-ssh-askpass-1.2.2 (1 Feb 2002)
+*x11-ssh-askpass-1.2.4.1-r1 (17 Oct 2005)
+
+  17 Oct 2005; Doug Goldstein <cardoe@gentoo.org>
+  -x11-ssh-askpass-1.2.4.1.ebuild, +x11-ssh-askpass-1.2.4.1-r1.ebuild:
+  get_libdir fixes to work with openssh's use of ssh-askpass
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  x11-ssh-askpass-1.2.2-r1.ebuild:
+  Mark 1.2.2-r1 stable on alpha
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org>
+  x11-ssh-askpass-1.2.2-r1.ebuild, x11-ssh-askpass-1.2.4.1.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  x11-ssh-askpass-1.2.2-r1.ebuild:
+  Add inherit eutils
+
+  10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
+  x11-ssh-askpass-1.2.4.1.ebuild:
+  Adding amd64 keyword. Closing #44159.
+
+*x11-ssh-askpass-1.2.4.1 (22 Feb 2004)
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org>
+  x11-ssh-askpass-1.2.4.1.ebuild:
+  Version bump. Found by daniel webert <daniel_webert@web.de> in #40922.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org>
+  x11-ssh-askpass-1.2.2-r1.ebuild, x11-ssh-askpass-1.2.2.ebuild:
+  Updated Homepage. Closes #23862
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*x11-ssh-askpass-1.2.2-r1 (04 Apr 2002)
+
+  17 Apr 2003; Graham Forest <vladimir@gentoo.org>
+  x11-ssh-askpass-1.2.2-r1.ebuild, x11-ssh-askpass-1.2.2.ebuild:
+  set ~ppc in keywords
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org>
+  x11-ssh-askpass-1.2.2-r1.ebuild:
+  Add ~alpha to KEYWORDS
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> x11-ssh-askpass-1.2.2-r1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  04 Apr 2002; Spider <spider@gentoo.org>
+  added CDEBUGFLAGS=${CFLAGS} to close bug 1505
   
+*x11-ssh-askpass-1.2.2 (1 Feb 2002)
+
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> x11-ssh-askpass-1.2.2.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index ddacd20545d6..06db8a4bf6a4 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,6 +1,17 @@
-MD5 f1145afbe88dbd185a77bd7495e382f9 ChangeLog 1389
-MD5 ecfe2a86ba5b4fce54b01b0d6fc9d4a2 x11-ssh-askpass-1.2.2-r1.ebuild 1055
-MD5 3603e9afa8b01a21f709d73a674e0376 x11-ssh-askpass-1.2.2.ebuild 1069
-MD5 a507a3e3da835a4e8d763cdea183d071 files/digest-x11-ssh-askpass-1.2.2 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a04319af9b208cfca9958e831c5fc8f5 ChangeLog 2463
 MD5 a507a3e3da835a4e8d763cdea183d071 files/digest-x11-ssh-askpass-1.2.2-r1 72
+MD5 a5820e00831335cc416df383e206a5eb files/digest-x11-ssh-askpass-1.2.4.1-r1 74
 MD5 1a90e521c0674c6fd9a34b9c6ebfcb62 files/stupid-imake.diff 548
+MD5 2c1edf73176f0cce9f6ee1753c6c08d9 metadata.xml 298
+MD5 d8d330386e303b9b36044d872224b3e8 x11-ssh-askpass-1.2.2-r1.ebuild 1035
+MD5 a7e463b20c6bf868057c22b2203f891a x11-ssh-askpass-1.2.4.1-r1.ebuild 969
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVBx/BtvusYtCZMsRAie5AKCHKwkSmK7OnwUotny6X7ZiO7a9lQCdERhS
+f/nfmz5h7sJtiPjyMblbHTg=
+=RVqF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.2-r1.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.2-r1.ebuild
index 8a811b8fa080..3a68942171ef 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.2-r1.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.2-r1.ebuild
@@ -1,36 +1,40 @@
-# Copyright 2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Adam Manthei <manthei@sistina.com>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.2-r1.ebuild,v 1.1 2002/04/04 06:18:07 spider Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
+inherit eutils
 
-P=x11-ssh-askpass-1.2.2
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="X11-based passphrase dialog for use with OpenSSH"
-HOMEPAGE="http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/"
-SRC_URI="http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/${A}"
+HOMEPAGE="http://www.liquidmeme.net/software/x11-ssh-askpass/"
+SRC_URI="http://www.liquidmeme.net/software/${PN}/${P}.tar.gz"
 
-DEPEND="virtual/glibc virtual/x11"
-RDEPEND=">=net-misc/openssh-2.3.0 virtual/x11"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha ppc sparc x86"
+
+DEPEND="virtual/libc
+	virtual/x11"
+RDEPEND="virtual/ssh
+	virtual/x11"
+#>=net-misc/openssh-2.3.0
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/stupid-imake.diff
+	epatch ${FILESDIR}/stupid-imake.diff
 }
 src_compile() {
-    try ./configure --prefix=/usr --libexecdir=/usr/lib/misc 
-    try xmkmf
-    try make includes
-	try make "CDEBUGFLAGS=${CFLAGS}" 
+	./configure --prefix=/usr --libexecdir=/usr/lib/misc || die
+	xmkmf || die
+	make includes || die
+	make "CDEBUGFLAGS=${CFLAGS}" || die
 }
 
-
 src_install() {
-    newman x11-ssh-askpass.man x11-ssh-askpass.1 
-    dobin x11-ssh-askpass
-    dodir /usr/lib/misc
-    dosym /usr/bin/x11-ssh-askpass /usr/lib/misc/ssh-askpass
-    dodoc ChangeLog README TODO
+	newman x11-ssh-askpass.man x11-ssh-askpass.1
+	dobin x11-ssh-askpass
+	dodir /usr/lib/misc
+	dosym /usr/bin/x11-ssh-askpass /usr/lib/misc/ssh-askpass
+	dodoc ChangeLog README TODO
 }
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
index bce7998a19c1..a45b82dae2f2 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild,v 1.1 2005/10/17 21:49:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 inherit eutils multilib
 
diff --git a/net-misc/x25_utils/ChangeLog b/net-misc/x25_utils/ChangeLog
index 1b931e50bf2b..ef6cbcb8a1c5 100644
--- a/net-misc/x25_utils/ChangeLog
+++ b/net-misc/x25_utils/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-misc/x25_utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x25_utils/ChangeLog,v 1.1 2005/08/21 03:18:45 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x25_utils/ChangeLog,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 *x25_utils-2.3.93 (21 Aug 2005)
 
diff --git a/net-misc/x25_utils/Manifest b/net-misc/x25_utils/Manifest
index f0b33d562501..5df5ab4d1b37 100644
--- a/net-misc/x25_utils/Manifest
+++ b/net-misc/x25_utils/Manifest
@@ -1,4 +1,5 @@
-MD5 3c26f37301cd72696d61ea764900eb40 x25_utils-2.3.93.ebuild 1044
+MD5 6fdf55064b6188066facfcdfd896eef4 x25_utils-2.3.93.ebuild 1041
+MD5 bef3ef4b0172a1ba7bcceebd9169961c ChangeLog 427
 MD5 6a99c12d9ee65e9e37afbaf998a322da metadata.xml 435
 MD5 23250f180c2838e32cbdaf418936b613 files/digest-x25_utils-2.3.93 68
-MD5 de3c60bf654d1656842c4c1f5823dcda files/x25_utils-2.3.93.patch 3225
+MD5 1eb12b236d908ced82ac64cc810751ef files/x25_utils-2.3.93.patch 3560
diff --git a/net-misc/x25_utils/files/x25_utils-2.3.93.patch b/net-misc/x25_utils/files/x25_utils-2.3.93.patch
index d0c056471f19..4c30c5f00c14 100644
--- a/net-misc/x25_utils/files/x25_utils-2.3.93.patch
+++ b/net-misc/x25_utils/files/x25_utils-2.3.93.patch
@@ -1,3 +1,14 @@
+--- Makefile.orig	2000-10-20 16:14:28.000000000 +0200
++++ Makefile	2005-08-21 05:39:41.000000000 +0200
+@@ -43,7 +43,7 @@
+ SUB = libtelnet telnet telnetd trace route
+ 
+ all:
+-	for i in $(SUB); do make -C  $$i; done
++	for i in $(SUB); do make -C  $$i || exit 1; done
+ 
+ install:
+ 	for i in $(SUB); do make -C  $$i install; done
 --- telnet/commands.c.orig	1996-12-15 23:00:16.000000000 +0100
 +++ telnet/commands.c	2005-08-21 04:47:29.000000000 +0200
 @@ -55,7 +55,8 @@
@@ -107,7 +118,7 @@
 --- telnetd/sys_term.c.orig	2000-12-01 00:22:49.000000000 +0100
 +++ telnetd/sys_term.c	2005-08-21 04:54:01.000000000 +0200
 @@ -39,6 +39,7 @@
- static char rcsid[] = "$Id: x25_utils-2.3.93.patch,v 1.1 2005/08/21 03:18:45 sbriesen Exp $";
+ static char rcsid[] = "$Id: x25_utils-2.3.93.patch,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $";
  #endif /* not lint */
  
 +#include <stdint.h>
diff --git a/net-misc/x25_utils/x25_utils-2.3.93.ebuild b/net-misc/x25_utils/x25_utils-2.3.93.ebuild
index 4cafdeb49066..1898425ef6b6 100644
--- a/net-misc/x25_utils/x25_utils-2.3.93.ebuild
+++ b/net-misc/x25_utils/x25_utils-2.3.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x25_utils/x25_utils-2.3.93.ebuild,v 1.1 2005/08/21 03:18:45 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x25_utils/x25_utils-2.3.93.ebuild,v 1.1.1.1 2005/11/30 09:54:58 chriswhite Exp $
 
 inherit eutils linux-info
 
@@ -22,11 +22,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	# patch Makefile to catch errors
-	sed -i -e "s:\(\$\$i\);:\1 || exit;:g" Makefile
-
-	# patch telnet/telnetd
 	epatch "${FILESDIR}/${P}.patch"
 }
 
diff --git a/net-misc/xf4vnc/ChangeLog b/net-misc/xf4vnc/ChangeLog
index 2edfe8c2621f..e5576d941e64 100644
--- a/net-misc/xf4vnc/ChangeLog
+++ b/net-misc/xf4vnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/xf4vnc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/ChangeLog,v 1.1 2004/03/29 14:43:05 aliz Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/ChangeLog,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
+
+  13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xf4vnc-4.3.0.103.ebuild, xf4vnc-4.3.0.104.ebuild:
+  Change x11-base/xfree dependency to virtual/x11 (#52153).
+
+  28 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xf4vnc-4.3.0.103.ebuild,
+  xf4vnc-4.3.0.104.ebuild:
+  Fixed KEYWORDS, mark stable on x86.
 
 *xf4vnc-4.3.0.104 (29 Mar 2004)
 *xf4vnc-4.3.0.103 (29 Mar 2004)
diff --git a/net-misc/xf4vnc/Manifest b/net-misc/xf4vnc/Manifest
index dcf7d8b3097c..b4bf6a7c0e16 100644
--- a/net-misc/xf4vnc/Manifest
+++ b/net-misc/xf4vnc/Manifest
@@ -1,5 +1,6 @@
-MD5 265a195328634416475ab739c9f875aa xf4vnc-4.3.0.104.ebuild 870
-MD5 d3f6ab18dea9acdc7a6b83776fe8c4d9 xf4vnc-4.3.0.103.ebuild 878
-MD5 4b78cc64f0873f6d2895f7e03adba7e0 ChangeLog 124
+MD5 effa5fe77ba944992c024fc6cf21918a xf4vnc-4.3.0.104.ebuild 956
+MD5 7c846b871e552c496213491500360a95 xf4vnc-4.3.0.103.ebuild 965
+MD5 76d810d7178ee9b2739da6835631dec2 ChangeLog 760
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 7f830d071cb72fa4c72f06ddb18b7342 files/digest-xf4vnc-4.3.0.103 81
 MD5 8001da33480c7792aa66e9b41a55a8e0 files/digest-xf4vnc-4.3.0.104 80
diff --git a/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild b/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild
index 8359325712cf..1e6ff53ccff0 100644
--- a/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild
+++ b/net-misc/xf4vnc/xf4vnc-4.3.0.103.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-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild,v 1.1 2004/03/29 14:43:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/xf4vnc-4.3.0.103.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
 DESCRIPTION="VNC (remote desktop viewer) derived from tightvnc but cooler :-)"
 HOMEPAGE="http://xf4vnc.sourceforge.net/"
@@ -15,10 +15,10 @@ esac
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha"
+KEYWORDS="~alpha -*"
 IUSE=""
 
-DEPEND="=x11-base/xfree-4.3*"
+DEPEND="virtual/x11"
 
 src_install() {
 	insinto /usr/X11R6/lib/modules/
diff --git a/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild b/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild
index 64e80ab963f7..3b0cf91139d9 100644
--- a/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild
+++ b/net-misc/xf4vnc/xf4vnc-4.3.0.104.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-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild,v 1.1 2004/03/29 14:43:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xf4vnc/xf4vnc-4.3.0.104.ebuild,v 1.1.1.1 2005/11/30 09:54:59 chriswhite Exp $
 
 DESCRIPTION="VNC (remote desktop viewer) derived from tightvnc but cooler :-)"
 HOMEPAGE="http://xf4vnc.sourceforge.net/"
@@ -15,10 +15,10 @@ esac
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 -*"
 IUSE=""
 
-DEPEND="=x11-base/xfree-4.3*"
+DEPEND="virtual/x11"
 
 src_install() {
 	insinto /usr/X11R6/lib/modules/
diff --git a/net-misc/xfsamba/ChangeLog b/net-misc/xfsamba/ChangeLog
index af78c04fcbb6..62fd1f959b96 100644
--- a/net-misc/xfsamba/ChangeLog
+++ b/net-misc/xfsamba/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for net-misc/xfsamba
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xfsamba/ChangeLog,v 1.1 2002/06/04 06:57:22 rphillips Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xfsamba/ChangeLog,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
 
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> xfsamba-0.47.ebuild:
+  Adding amd64 keyword. Closing #42789.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *xfsamba-0.47 (3 June 2002)
 
-  3 June 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> xfsamba-0.47.ebuild :
+  Added KEYWORDS, SLOT.
 
+  3 June 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   Ebuild submitted by Dan Naumov <jago@telefragged.com>
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-misc/xfsamba/Manifest b/net-misc/xfsamba/Manifest
index e69de29bb2d1..504238b1fa24 100644
--- a/net-misc/xfsamba/Manifest
+++ b/net-misc/xfsamba/Manifest
@@ -0,0 +1,3 @@
+MD5 6e3cb18306ae6c69ad11b39d3c9df830 ChangeLog 1018
+MD5 33ba0ebd81852e57114b10c790755144 xfsamba-0.47.ebuild 875
+MD5 439e2240bfa3318549e508214f51faad files/digest-xfsamba-0.47 65
diff --git a/net-misc/xfsamba/xfsamba-0.47.ebuild b/net-misc/xfsamba/xfsamba-0.47.ebuild
index 070e21f472b5..7aee5133458d 100644
--- a/net-misc/xfsamba/xfsamba-0.47.ebuild
+++ b/net-misc/xfsamba/xfsamba-0.47.ebuild
@@ -1,12 +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/net-misc/xfsamba/xfsamba-0.47.ebuild,v 1.1 2002/06/04 06:57:22 rphillips Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xfsamba/xfsamba-0.47.ebuild,v 1.1.1.1 2005/11/30 09:55:30 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A GUI SMB network navigator"
-SRC_URI="http://xfsamba.sourceforge.net/archive/${P}.tar.gz"
 HOMEPAGE="http://xfsamba.sourceforge.net/"
+SRC_URI="http://xfsamba.sourceforge.net/archive/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~amd64"
+IUSE="nls"
+
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
 	nls? ( sys-devel/gettext )"
@@ -22,11 +26,10 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--disable-gtktest \
 		--disable-glibtest || die "./configure failed"
-	
+
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die "install failed"
 }
-
diff --git a/net-misc/xsmbrowser/ChangeLog b/net-misc/xsmbrowser/ChangeLog
index 5488d6265270..563050b1c80e 100644
--- a/net-misc/xsmbrowser/ChangeLog
+++ b/net-misc/xsmbrowser/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-misc/xsmbrowser
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xsmbrowser/ChangeLog,v 1.1 2003/04/15 03:34:51 pebenito Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsmbrowser/ChangeLog,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+  21 Aug 2004; David Holm <dholm@gentoo.org> xsmbrowser-3.4.0.ebuild:
+  Added to ~ppc.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> xsmbrowser-3.4.0.ebuild:
+  Fix use invocation
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> xsmbrowser-3.4.0.ebuild:
+  Adding amd64 keyword. Closing #44908.
+
+  23 Mar 2004; Jason Wever <weeve@gentoo.org> xsmbrowser-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  26 May 2003; Chris PeBenito <pebenito@gentoo.org> xsmbrowser-3.4.0.ebuild:
+  Mark stable for x86. This probably will work on any arch that has a working
+  samba and expect, but only tested on x86.
 
 *xsmbrowser-3.4.0 (14 Apr 2003)
 
diff --git a/net-misc/xsmbrowser/Manifest b/net-misc/xsmbrowser/Manifest
index 438eca2b95b2..cb0d61bef47c 100644
--- a/net-misc/xsmbrowser/Manifest
+++ b/net-misc/xsmbrowser/Manifest
@@ -1,2 +1,3 @@
-MD5 9709132d0c6ced2dd24a7e41e34f33a7 xsmbrowser-3.4.0.ebuild 1110
+MD5 a8117e0a103513801e459e1c76174494 ChangeLog 976
+MD5 5e22e04566e082be0ea1c5fa7354de28 xsmbrowser-3.4.0.ebuild 1186
 MD5 df7c069a9a03a9594a809ee7df0606d4 files/digest-xsmbrowser-3.4.0 67
diff --git a/net-misc/xsmbrowser/xsmbrowser-3.4.0.ebuild b/net-misc/xsmbrowser/xsmbrowser-3.4.0.ebuild
index d8cf2f27bc21..7f0c04f34aab 100644
--- a/net-misc/xsmbrowser/xsmbrowser-3.4.0.ebuild
+++ b/net-misc/xsmbrowser/xsmbrowser-3.4.0.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License
-# $Header: /var/cvsroot/gentoo-x86/net-misc/xsmbrowser/xsmbrowser-3.4.0.ebuild,v 1.1 2003/04/15 03:34:51 pebenito Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/xsmbrowser/xsmbrowser-3.4.0.ebuild,v 1.1.1.1 2005/11/30 09:55:00 chriswhite Exp $
+
+DESCRIPTION="GUI SMB browser with preview written in expect"
+HOMEPAGE="http://www.public.iastate.edu/~chadspen/xsmbrowser.html"
+SRC_URI="http://www.public.iastate.edu/~chadspen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
+IUSE="X"
 
-DESCRIPTION="GUI SMB browser with preview written in expect" 
-HOMEPAGE="http://www.public.iastate.edu/~chadspen/xsmbrowser.html" 
-LICENSE="GPL-2" 
 RDEPEND="virtual/x11
 	 net-fs/samba
-	 dev-tcltk/expect" 
-KEYWORDS="~x86"
-SLOT="0" 
-SRC_URI="http://www.public.iastate.edu/~chadspen/${P}.tar.gz" 
-S=${WORKDIR}/${P} 
+	 dev-tcltk/expect"
 
 pkg_setup() {
-	if [ -z "`use X`" ]; then
-		eerror " "
+	if ! use X; then
+		eerror
 		eerror "You must have X in your USE flags.  Expect must be compiled with X support."
 		eerror "Without X support, xSMBrowser will not function."
-		eerror " "
+		eerror
 		eerror "If expect is already merged, you probably have to remerge it with USE=\"X\"."
-		eerror " "
+		eerror
 		die "You must have USE=\"X\"."
 	fi
 }
@@ -29,9 +31,9 @@ src_install() {
 	dobin ${S}/xsmbrowser || die "xsmbrowser dobin failed"
 
 	# fix the default pixmap path
-        dosed s:\"pixmaps\":\"/usr/share/pixmaps/xsmbrowser\": \
-			/usr/bin/xsmbrowser || die "Pixmap path fix failed"
+	dosed s:\"pixmaps\":\"/usr/share/pixmaps/xsmbrowser\": \
+		/usr/bin/xsmbrowser || die "Pixmap path fix failed"
 
 	insinto /usr/share/pixmaps/xsmbrowser
 	doins ${S}/pixmaps/* || die "Pixmap doins failed"
-} 
+}
diff --git a/net-misc/yate/ChangeLog b/net-misc/yate/ChangeLog
index 88014e14bbe3..717b6b1ecbd2 100644
--- a/net-misc/yate/ChangeLog
+++ b/net-misc/yate/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-misc/yate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/ChangeLog,v 1.1 2005/03/21 01:56:47 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/ChangeLog,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
+
+*yate-0.9.0_pre2 (29 Oct 2005)
+
+  29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/yate-0.9.0-gtk2.diff, +yate-0.9.0_pre2.ebuild:
+  Version bump.
+
+  23 Sep 2005; Stefan Knoblich <stkn@gentoo.org> yate-0.9.0_pre1.ebuild:
+  gtk2 -> gtk use-flag change for bug #106560 and small cleanup.
+
+*yate-0.9.0_pre1 (09 Sep 2005)
+
+  09 Sep 2005; Stefan Knoblich <stkn@gentoo.org> +yate-0.9.0_pre1.ebuild:
+  Version bump. Engine has been rewritten, new RTP stack,... pre-release, still
+  missing some features.
+
+  28 Jul 2005; <stkn@gentoo.org> +files/yate-0.8.7-gcc34.patch,
+  yate-0.8.7.ebuild:
+  Patch from yate cvs fixes compiling with >=gcc-3.4.
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> yate-0.8.7.ebuild:
+  fix qt dep per bug #100235
+
+  22 Mar 2005; Stefan Knoblich <stkn@gentoo.org> +files/yate.confd,
+  +files/yate.rc6:
+  Added two missing files (duh).
+
+  22 Mar 2005; Sven Wegener <swegener@gentoo.org> yate-0.8.7.ebuild:
+  Fixed invalid atom in *DEPEND. Replaced myconf with use_with magic.
+
+  21 Mar 2005; Stefan Knoblich <stkn@gentoo.org> yate-0.8.7.ebuild:
+  Now that there's a working spandsp version on amd64 we can keyword this
+  ~amd64 too.
 
 *yate-0.8.7 (21 Mar 2005)
 
diff --git a/net-misc/yate/Manifest b/net-misc/yate/Manifest
index fa5243088b7b..b865d5111efc 100644
--- a/net-misc/yate/Manifest
+++ b/net-misc/yate/Manifest
@@ -1,4 +1,12 @@
-MD5 aaa59eed2e51b579fc71194ee5c51fe2 yate-0.8.7.ebuild 2003
+MD5 ea5916a9c7bef10e4269f2b23911ef2a yate-0.8.7.ebuild 1511
+MD5 40ced3866d63d0e787ceded1e0bf14ab yate-0.9.0_pre1.ebuild 1186
+MD5 a5853967c728ef2cec64962ebbc237f8 yate-0.9.0_pre2.ebuild 1375
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 1dbfa8151a0c079009cfb1880697e10a ChangeLog 364
+MD5 1744b6b97b78b5fdeaf505fc2592e1bb ChangeLog 1523
+MD5 8027cc2ba989b40324b2d179e3239faa files/yate-0.8.7-gcc34.patch 719
+MD5 26cfc21d3f5f0e1dbec294e66f7ad71b files/yate.rc6 499
+MD5 4fdef5b11a7def702e6ade6468d466d5 files/digest-yate-0.9.0_pre2 66
+MD5 25957eca186961762745baaf9774ca8a files/yate.confd 219
+MD5 edecbe99a20c597bf25842b603efb5a7 files/yate-0.9.0-gtk2.diff 339
 MD5 9b480e9a4409cd15839e2a7338714ccf files/digest-yate-0.8.7 62
+MD5 7c5dec856dd8b7ac3c6478dc08d25a4b files/digest-yate-0.9.0_pre1 66
diff --git a/net-misc/yate/files/yate.confd b/net-misc/yate/files/yate.confd
index acb654cfa06c..c628bee79d70 100644
--- a/net-misc/yate/files/yate.confd
+++ b/net-misc/yate/files/yate.confd
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/files/yate.confd,v 1.1 2005/03/22 15:37:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/files/yate.confd,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
 OPTS=""
diff --git a/net-misc/yate/files/yate.rc6 b/net-misc/yate/files/yate.rc6
index 33c85b76418e..f4864c3b5c9f 100755
--- a/net-misc/yate/files/yate.rc6
+++ b/net-misc/yate/files/yate.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/net-misc/yate/files/yate.rc6,v 1.1 2005/03/22 15:37:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/files/yate.rc6,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
 depend() {
     need net
diff --git a/net-misc/yate/yate-0.8.7.ebuild b/net-misc/yate/yate-0.8.7.ebuild
index 2ed2aa271487..7c8fde4dacc0 100644
--- a/net-misc/yate/yate-0.8.7.ebuild
+++ b/net-misc/yate/yate-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/yate-0.8.7.ebuild,v 1.1 2005/03/21 01:56:47 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/yate-0.8.7.ebuild,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
 IUSE="h323 postgres zaptel fax qt gtk gsm ortp"
 
@@ -14,71 +14,50 @@ S=${WORKDIR}/${PN}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 
 DEPEND="media-sound/sox
 	postgres? ( dev-db/postgresql )
 	zaptel? ( >=net-libs/libpri-1.0.0
 	       >=net-misc/zaptel-1.0.0 )
 	h323? ( >=net-libs/openh323-1.13.0 )
-	fax? ( >=media-libs/spandsp )
-	qt? ( x11-libs/qt )
+	fax? ( media-libs/spandsp )
+	qt? ( =x11-libs/qt-3* )
 	gtk? ( <x11-libs/gtk+-2.0.0 )
 	gsm? ( media-sound/gsm )
 	ortp? ( net-libs/ortp )"
 
+src_unpack() {
+	unpack ${A}
 
-src_compile() {
-	local myconf
-
-	use postgres \
-		&& myconf="${myconf} --with-libpq=/usr" \
-		|| myconf="${myconf} --without-libpq"
-
-	use fax \
-		&& myconf="${myconf} --with-spandsp=/usr" \
-		|| myconf="${myconf} --without-spandsp"
-
-	use qt \
-		&& myconf="${myconf} --with-libqt=${QTDIR}" \
-		|| myconf="${myconf} --without-libqt"
-
-	use gtk \
-		&& myconf="${myconf} --with-libgtk" \
-		|| myconf="${myconf} --without-libgtk"
-
-	use h323 \
-		&& myconf="${myconf} --with-openh323=/usr --with-pwlib=/usr" \
-		|| myconf="${myconf} --without-openh323 --without-pwlib"
-
-	use zaptel \
-		&& myconf="${myconf} --with-libpri" \
-		|| myconf="${myconf} --without-libpri"
-
-	use gsm \
-		&& myconf="${myconf} --with-libgsm" \
-		|| myconf="${myconf} --without-libgsm"
-
-	use ortp \
-		&& myconf="${myconf} --with-libortp=/usr" \
-		|| myconf="${myconf} --without-libortp"
+	cd ${S}
+	# patch for gcc3.4
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
 
-	econf ${myconf} || die "Configure failed"
+src_compile() {
+	econf \
+		$(use_with postgres libpq /usr) \
+		$(use_with fax spandsp /usr) \
+		$(use_with qt libqt "${QTDIR}") \
+		$(use_with gtk libgtk) \
+		$(use_with h323 openh323 /usr) \
+		$(use_with h323 pwlib /usr) \
+		$(use_with zaptel libpri) \
+		$(use_with gsm libgsm) \
+		$(use_with ortp libortp /usr) \
+		|| die "Configure failed"
 	emake everything || die "Make failed"
 }
 
 src_install() {
 	emake DESTDIR=${D} install || die "Make install failed"
 
-	exeinto /etc/init.d
-	newexe  ${FILESDIR}/yate.rc6 yate
-
-	insinto /etc/conf.d
-	newins  ${FILESDIR}/yate.confd yate
+	newinitd ${FILESDIR}/yate.rc6 yate
+	newconfd ${FILESDIR}/yate.confd yate
 
 	# install standard docs...
-	dodoc README ChangeLog
-	dodoc docs/*
+	dodoc README ChangeLog docs/*
 
 	docinto scripts
 	dodoc scripts/*
diff --git a/net-misc/yate/yate-0.9.0_pre1.ebuild b/net-misc/yate/yate-0.9.0_pre1.ebuild
index ecba28ec7823..d9d718aea86b 100644
--- a/net-misc/yate/yate-0.9.0_pre1.ebuild
+++ b/net-misc/yate/yate-0.9.0_pre1.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-misc/yate/yate-0.9.0_pre1.ebuild,v 1.1 2005/09/09 02:12:45 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/yate-0.9.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
-IUSE="gsm gtk2 h323 ilbc zaptel"
+IUSE="gsm gtk h323 ilbc zaptel"
 
 inherit eutils
 
@@ -20,20 +20,12 @@ DEPEND="media-sound/sox
 	zaptel? ( >=net-libs/libpri-1.0.0
 	          >=net-misc/zaptel-1.0.0 )
 	h323? ( >=net-libs/openh323-1.15.3 )
-	gtk2? ( >=x11-libs/gtk+-2.6.8 )
+	gtk? ( >=x11-libs/gtk+-2.6.8 )
 	gsm? ( media-sound/gsm )"
 
-#src_unpack() {
-#	unpack ${A}
-#
-#	cd ${S}
-#	# patch for gcc3.4
-#	epatch ${FILESDIR}/${P}-gcc34.patch
-#}
-
 src_compile() {
 	econf \
-		$(use_with gtk2 libgtk2 /usr) \
+		$(use_with gtk libgtk2 /usr) \
 		$(use_with h323 openh323 /usr) \
 		$(use_with h323 pwlib /usr) \
 		$(use_with zaptel libpri) \
diff --git a/net-misc/yate/yate-0.9.0_pre2.ebuild b/net-misc/yate/yate-0.9.0_pre2.ebuild
index 269ee0ee3533..43f8faa5605f 100644
--- a/net-misc/yate/yate-0.9.0_pre2.ebuild
+++ b/net-misc/yate/yate-0.9.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/yate-0.9.0_pre2.ebuild,v 1.1 2005/10/29 15:55:35 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yate/yate-0.9.0_pre2.ebuild,v 1.1.1.1 2005/11/30 09:55:35 chriswhite Exp $
 
 IUSE="gsm gtk h323 ilbc postgres zaptel"
 
diff --git a/net-misc/ytalk/ChangeLog b/net-misc/ytalk/ChangeLog
index 34865a6203b6..27ebac219abc 100644
--- a/net-misc/ytalk/ChangeLog
+++ b/net-misc/ytalk/ChangeLog
@@ -1,11 +1,51 @@
 # ChangeLog for net-misc/ytalk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ytalk/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-misc/ytalk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
+*ytalk-3.3.0 (25 Feb 2005)
+
+  25 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +ytalk-3.3.0.ebuild:
+  version bump (X support dropped, license changed to GPL)
+
+*ytalk-3.2.0 (03 Jan 2005)
+
+  03 Jan 2005; Seemant Kulleen <seemant@gentoo.org> +ytalk-3.2.0.ebuild:
+  version bump which fixes the disable-X issue. Thanks again to Andreas Kling
+  <keso@impul.se> in bug #76334 by Danek Duvall <duvall@emufarm.org>
+
+*ytalk-3.1.6 (30 Dec 2004)
+
+  30 Dec 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
+  ytalk-3.1.1.ebuild, +ytalk-3.1.6.ebuild:
+  version bump, thanks to Andreas Kling <keso@impul.se> who I've listed as the
+  user-maintainer for this package
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  25 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> ytalk-3.1.1.ebuild:
+  Stable on amd64
+
+  05 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> ytalk-3.1.1.ebuild:
+  Added amd64 keyword, closing #58831.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ytalk-3.1.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ytalk-3.1.1.ebuild:
+  Stable on alpha.
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> ytalk-3.1.1.ebuild:
+  add ~alpha
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ytalk-3.1.1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  09 Jul 2002; phoen][x <phoenix@gentoo.org> ytalk-3.1.1.ebuild :
+  Added KEYWORDS, LICENSE, SLOT.
+
+  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-misc/ytalk/Manifest b/net-misc/ytalk/Manifest
index e69de29bb2d1..a44d1c87a40d 100644
--- a/net-misc/ytalk/Manifest
+++ b/net-misc/ytalk/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 14651eef0c7d6d035b9da57740df36c8 metadata.xml 398
+MD5 3ede58a8ec0fa5d893a5237f56a1cb29 ytalk-3.1.1.ebuild 739
+MD5 421a6224e3f7b070a1dbd23fbe8afa9b ytalk-3.2.0.ebuild 702
+MD5 93760cf451a4b29858c11bd0de1d6c37 ytalk-3.3.0.ebuild 658
+MD5 c3d262477db95bc0cdc00ee6ed6d6b64 ChangeLog 2091
+MD5 d7c085876eec894758505ef4ad2d36e1 files/digest-ytalk-3.1.1 62
+MD5 0cf57e06f61a019c5005a6a678d8fe19 files/digest-ytalk-3.2.0 63
+MD5 4647f10da55ce9d3acc70ea7ec0161ec files/digest-ytalk-3.3.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLAo+Kf2g/qXtneoRAmKfAKCUd0aVscSORarVJrp8FXa1KyIAgACgs+3r
+QWOmHqUV4WL8F/NsywWqkcA=
+=uis0
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ytalk/ytalk-3.1.1.ebuild b/net-misc/ytalk/ytalk-3.1.1.ebuild
index 1ec1f826e303..1ca4b1cb6b28 100644
--- a/net-misc/ytalk/ytalk-3.1.1.ebuild
+++ b/net-misc/ytalk/ytalk-3.1.1.ebuild
@@ -1,51 +1,28 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Chris Giorgi <chrisgio@virtualscape.net>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ytalk/ytalk-3.1.1.ebuild,v 1.1 2002/01/31 22:48:40 tod 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/net-misc/ytalk/ytalk-3.1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 DESCRIPTION="Multi-user replacement for UNIX talk"
-
+HOMEPAGE="http://www.iagora.com/~espel/ytalk/ytalk.html"
 SRC_URI="http://www.iagora.com/~espel/ytalk/${P}.tar.gz"
 
-HOMEPAGE="http://www.iagora.com/~espel/ytalk/ytalk.html"
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="x86 sparc ppc alpha amd64"
+IUSE="X"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2
 	X? ( virtual/x11 )"
 
 src_compile() {
+	econf `use_with X x` || die "./configure failed"
 
-	local myconf=""
-	use X || myconf="$myconf --without-x" #default enabled
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} \
-	|| die "./configure failed"
-		
 	emake || die "Parallel Make Failed"
-	
 }
 
-src_install() {                               
+src_install() {
+	einstall || die "Installation Failed"
 
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die "Installation Failed"
-	
 	dodoc BUGS ChangeLog INSTALL README README.old
-	
 }
-
-
diff --git a/net-misc/ytalk/ytalk-3.2.0.ebuild b/net-misc/ytalk/ytalk-3.2.0.ebuild
index 2899ed84f87d..7c296c570f57 100644
--- a/net-misc/ytalk/ytalk-3.2.0.ebuild
+++ b/net-misc/ytalk/ytalk-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ytalk/ytalk-3.2.0.ebuild,v 1.1 2005/01/04 04:47:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ytalk/ytalk-3.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 DESCRIPTION="Multi-user replacement for UNIX talk"
 HOMEPAGE="http://www.impul.se/ytalk/"
diff --git a/net-misc/ytalk/ytalk-3.3.0.ebuild b/net-misc/ytalk/ytalk-3.3.0.ebuild
index 3cc2f9ca535c..210dc9ac6272 100644
--- a/net-misc/ytalk/ytalk-3.3.0.ebuild
+++ b/net-misc/ytalk/ytalk-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-misc/ytalk/ytalk-3.3.0.ebuild,v 1.1 2005/02/25 20:33:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ytalk/ytalk-3.3.0.ebuild,v 1.1.1.1 2005/11/30 09:55:02 chriswhite Exp $
 
 DESCRIPTION="Multi-user replacement for UNIX talk"
 HOMEPAGE="http://www.impul.se/ytalk/"
diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index fd3896ba3a05..071793931643 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,313 @@
 # ChangeLog for net-misc/zaptel
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.1 2004/01/04 00:16:17 stkn Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
+
+  20 Nov 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.2.0.ebuild:
+  Re-enabled bri support.
+
+*zaptel-1.2.0 (18 Nov 2005)
+
+  18 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.2.0-devfs26.diff, +files/zaptel-1.2.0-gentoo.diff,
+  +files/zaptel-1.2.0-ukcid.patch, -files/zaptel-1.2.0_beta1-gentoo.diff,
+  -zaptel-1.2.0_beta1.ebuild, +zaptel-1.2.0.ebuild:
+  Version bumped and removed old beta ebuild
+
+  19 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-1.0.0-experimental-devfs26.diff,
+  -files/zaptel-1.0.3-gcc34.patch, -zaptel-1.0.3.ebuild,
+  -zaptel-1.0.4.ebuild, -zaptel-1.0.6.ebuild, -zaptel-1.0.7.ebuild,
+  -zaptel-1.0.9_p1.ebuild:
+  Removed outdated ebuilds.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  zaptel-1.2.0_beta1.ebuild:
+  Converted to UTF-8, fixed encoding screwups
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild,
+  zaptel-1.0.4.ebuild, zaptel-1.0.4-r1.ebuild, zaptel-1.0.6.ebuild,
+  zaptel-1.0.6-r1.ebuild, zaptel-1.0.7.ebuild, zaptel-1.0.7-r1.ebuild,
+  zaptel-1.0.8.ebuild, zaptel-1.0.9_p1.ebuild, zaptel-1.0.9_p1-r1.ebuild:
+  Fixed SRC_URI.
+
+*zaptel-1.0.9_p2 (15 Sep 2005)
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.9_p2-gentoo.diff, +zaptel-1.0.9_p2.ebuild:
+  Version bump, new upstream release fixes issues with linux-2.6.13, tor2 on
+  64bit systems and problems with dual-span cards.
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.2.0_beta1.ebuild:
+  Small cleanup.
+
+*zaptel-1.2.0_beta1 (27 Aug 2005)
+
+  27 Aug 2005; <stkn@gentoo.org> +files/zaptel-1.2.0_beta1-gentoo.diff,
+  +zaptel-1.2.0_beta1.ebuild:
+  Added new 1.2.0 beta ebuild.
+
+  27 Aug 2005; <stkn@gentoo.org>
+  -files/zaptel-1.2.0_pre20050818-gentoo.diff,
+  -zaptel-1.2.0_pre20050818.ebuild:
+  Removing old version.
+
+*zaptel-1.2.0_pre20050818 (19 Aug 2005)
+
+  19 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.2.0_pre20050818-gentoo.diff,
+  +zaptel-1.2.0_pre20050818.ebuild:
+  Pre-release version, work-in-progress.
+
+*zaptel-1.0.9_p1-r1 (18 Aug 2005)
+
+  18 Aug 2005; <stkn@gentoo.org> +files/zaptel-bristuff-0.2.0-RC8n.patch,
+  zaptel-1.0.6.ebuild, zaptel-1.0.6-r1.ebuild, zaptel-1.0.7.ebuild,
+  zaptel-1.0.7-r1.ebuild, zaptel-1.0.8.ebuild, zaptel-1.0.9_p1.ebuild,
+  +zaptel-1.0.9_p1-r1.ebuild:
+  Revision bump (bristuff update) and fixed bristuff part of SRC_URI (after
+  site redesign).
+
+*zaptel-1.0.9_p1 (28 Jul 2005)
+
+  28 Jul 2005; <stkn@gentoo.org> +files/zaptel-bristuff-0.2.0-RC8l.patch,
+  -files/zaptel-1.0.0-modulesd.diff, -files/zaptel-1.0.1-modulesd.diff,
+  -files/zaptel-1.0.1-skbuff.diff, +files/zaptel-1.0.9-gentoo.diff,
+  +files/zaptel-1.0.9-rtc.patch, -files/zaptel-install_prefix-typo.patch,
+  -files/zaptel-mkdir-usrincludelinux.patch, +zaptel-1.0.9_p1.ebuild:
+  Version bump and unused files cleanup.
+
+  26 Jul 2005; <stkn@gentoo.org> files/zaptel.devfsd:
+  Updated devfsd rules file, fixes incorrect permissions on span subdirectories.
+
+  26 Jul 2005; <stkn@gentoo.org> zaptel-1.0.8.ebuild:
+  Stable on x86 and fixed SRC_URI.
+
+  26 Jul 2005; <stkn@gentoo.org>
+  -files/zaptel-0.9.1-experimental-devfs26.diff,
+  -files/zaptel-0.9.1-modulesd.diff, -zaptel-0.9.1.ebuild:
+  Removing old version.
+
+  12 Jul 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild,
+  zaptel-1.0.4-r1.ebuild, zaptel-1.0.4.ebuild, zaptel-1.0.6-r1.ebuild,
+  zaptel-1.0.6.ebuild, zaptel-1.0.7-r1.ebuild, zaptel-1.0.7.ebuild,
+  zaptel-1.0.8.ebuild:
+  Changed ebuilds to use tc-arch-kernel instead of set_arch_to_* and removed
+  non-existent docs file from dodoc lines.
+
+  28 Jun 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.7-r1.ebuild:
+  Marking stable on x86.
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.4-r1.ebuild,
+  zaptel-1.0.4.ebuild, zaptel-1.0.6-r1.ebuild, zaptel-1.0.6.ebuild,
+  zaptel-1.0.7-r1.ebuild, zaptel-1.0.7.ebuild:
+  Fixed SRC_URI.
+
+*zaptel-1.0.8 (25 Jun 2005)
+
+  25 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.8-gentoo.diff, +files/zaptel-bristuff-0.2.0-RC8h.patch,
+  +zaptel-1.0.8.ebuild:
+  Version bump.
+
+  24 Jun 2005; Stefan Knoblich <stkn@gentoo.org> -zaptel-1.0.0.ebuild,
+  -zaptel-1.0.1.ebuild, -zaptel-1.0.2.ebuild:
+  Removing old zaptel ebuilds
+
+*zaptel-1.0.4-r1 (24 Jun 2005)
+
+  24 Jun 2005; Stefan Knoblich <stkn@gentoo.org> +zaptel-1.0.4-r1.ebuild,
+  +zaptel-1.0.6-r1.ebuild:
+  Backported non-root changes to zaptel-1.0.4 and 1.0.6 for asterisk security
+  fix.
+
+  24 Jun 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.7-r1.ebuild:
+  Renamed udev rules file to 10-zaptel.rules, making udev use our custom rules
+  instead of the shipped.
+
+  23 Jun 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.7-r1.ebuild:
+  ~* keywords restored for asterisk-1.0.7 security update.
+
+  01 Jun 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-bristuff-0.2.0-RC8d.patch,
+  +files/zaptel-bristuff-0.2.0-RC8g.patch, zaptel-1.0.7-r1.ebuild:
+  Bristuff updated to 0.2.0-RC8g.
+
+  12 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-bristuff-0.2.0-RC8c.patch,
+  +files/zaptel-bristuff-0.2.0-RC8d.patch, zaptel-1.0.7-r1.ebuild:
+  Bristuff update and moved pkg_config permission bits to pkg_postinst.
+
+  11 May 2005; Stefan Knoblich <stkn@gentoo.org> files/zaptel.devfsd,
+  files/zaptel.rc6:
+  Fixed init script and devfs.d file for 1.0.7-r1.
+
+  10 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-bristuff-0.2.0-RC8a.patch,
+  +files/zaptel-bristuff-0.2.0-RC8c.patch, zaptel-1.0.7-r1.ebuild:
+  Updated bristuff to latest version, minor changes.
+
+*zaptel-1.0.7-r1 (07 May 2005)
+
+  07 May 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-bristuff-0.2.0-RC8a.patch, +files/zaptel.devfsd,
+  +files/zaptel.udevd, +zaptel-1.0.7-r1.ebuild:
+  Fix for bug #88732, changing ownerships and permissions for
+  zaptel devices (root:dialup rw-rw----), updated to
+  bristuff-0.2.0-RC8a and florz-0.2.0-RC8a-6, masked for testing.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> zaptel-1.0.6.ebuild,
+  zaptel-1.0.7.ebuild:
+  Added missing parentheses to SRC_URI.
+
+*zaptel-1.0.7 (21 Mar 2005)
+
+  21 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.7-gentoo.diff, +zaptel-1.0.7.ebuild:
+  Version bump and moved some sed lines into the patch. Removed
+  selinux line in Makefile to fix #85052.
+
+  18 Mar 2005; Chris Bainbridge <chrb@gentoo.org> zaptel-1.0.6.ebuild:
+  Add missing call to linux-mod_pkg_postinst
+
+  12 Mar 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.6.ebuild:
+  Fixed gcc-3.4 patch path
+
+  11 Mar 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.6.ebuild:
+  Fix zaptel Makefile(s) to use /usr/src/linux as the kernel to build for,
+  instead of the one reported by uname -r
+
+*zaptel-1.0.6 (10 Mar 2005)
+
+  10 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-bristuff-0.2.0-RC7k.patch, +zaptel-1.0.6.ebuild:
+  New version. Adds bristuff (+florz patches) support.
+
+  14 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.4-experimental-devfs26.diff, zaptel-1.0.4.ebuild:
+  Updated devfs26 patch (fixes devfs_mk_symlink errors and fixes devices node if
+  >1 card/interface), devfs26 disables zaptel's udev support to avoid conflicts.
+  Made the ebuild sleep once in pkg_setup(), not multiple times.
+
+  07 Feb 2005; Simon Stelling <blubb@gentoo.org> zaptel-1.0.4.ebuild:
+  added ~amd64
+
+  03 Feb 2005; Stefan Knoblich <stkn@gentoo.org> files/zaptel.rc6:
+  Fixed zaptel init script (checkconfig returned wrong values, bug #80298),
+  changed config  error messages to use eerror. Using return instead of exit
+  if there's no config file, service won't be in state "started" this way.
+
+  02 Feb 2005; Chris Bainbridge <chrb@gentoo.org> zaptel-1.0.4.ebuild:
+  Removed failure when PPP isn't found. The ebuild now gives a warning but
+  continues. Not everyone is using their ISDN for PPP ;-)
+
+  01 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.4-gcc34.patch, zaptel-1.0.3.ebuild, zaptel-1.0.4.ebuild:
+  New gcc34 patch, provided by Ray Russell Reese III <anti@gentoo.org>,
+  ebuild stops now if required PPP support is missing in kernel config.
+  Fixed check for DEVFS_FS and moved the UDEV message to pkg_postinst.
+  Fixed SRC_URI for 1.0.3.
+
+*zaptel-1.0.4 (28 Jan 2005)
+
+  28 Jan 2005; Chris Bainbridge <chrb@gentoo.org> +zaptel-1.0.4.ebuild:
+  Version bump. Updated to linux-info eclass. Cleaned up einfos.
+
+  27 Jan 2005; Stefan Knoblich <stkn@gentoo.org> -files/zaptel-modulesd.patch,
+  -zaptel-0.7.0.ebuild, -zaptel-0.8.1.ebuild:
+  removing old versions
+
+  27 Jan 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.0.ebuild:
+  updated to use kernel-kmod
+
+  13 Jan 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild:
+  Only apply gcc-3.4 fix if gcc-3.4.3 is used, older versions seem not to be
+  affected.
+
+  13 Jan 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.3-gcc34.patch, zaptel-1.0.3.ebuild:
+  Added workaround for gcc-3.4.x broken/unsupported static inline handling on
+  x86 (bug #76707).
+
+  05 Jan 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild:
+  changed the linux-2.6 + devfs warning messages, should be less confusing now...
+
+  19 Dec 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.2.ebuild:
+  fixed SRC_URI
+
+*zaptel-1.0.3 (19 Dec 2004)
+
+  19 Dec 2004; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.3-gentoo.diff, +zaptel-1.0.3.ebuild:
+  new version, changes: /etc/modules.d/zaptel cleanup, users will have to
+  use the zaptel init-script to load settings (or run /sbin/ztcfg manually)
+
+*zaptel-1.0.2 (10 Nov 2004)
+
+  10 Nov 2004; <stkn@gentoo.org> +zaptel-1.0.2.ebuild:
+  version bump.
+
+*zaptel-1.0.1 (24 Oct 2004)
+
+  24 Oct 2004; <stkn@gentoo.org> +files/zaptel-1.0.1-modulesd.diff,
+  +files/zaptel-1.0.1-skbuff.diff, +zaptel-1.0.1.ebuild:
+  New version, includes skbuff fixes for >=linux-2.6.9 (bug #66168, thx to Kevin
+  Daughtridge <kevin@kdau.ath.cx>), now using kernel-mod.eclass
+  (bug #68451, thx to Stefan Schweizer <sschweizer@gmail.com>)
+
+  03 Oct 2004; <iggy@gentoo.org> zaptel-1.0.0.ebuild:
+  switched custom ARCH setting code to use set_arch_to_* from eutils, also
+  used some functions from kmod instead of homebrew stuff
+
+*zaptel-1.0.0 (24 Sep 2004)
+
+  24 Sep 2004; <stkn@gentoo.org>
+  +files/zaptel-1.0.0-experimental-devfs26.diff,
+  +files/zaptel-1.0.0-modulesd.diff, +zaptel-1.0.0.ebuild:
+  version bump
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> zaptel-0.7.0.ebuild,
+  zaptel-0.8.1.ebuild, zaptel-0.9.1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  27 Jul 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-0.9.1.ebuild:
+  stable on x86
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> zaptel-0.7.0.ebuild,
+  zaptel-0.8.1.ebuild, zaptel-0.9.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> zaptel-0.7.0.ebuild,
+  zaptel-0.8.1.ebuild, zaptel-0.9.1.ebuild:
+  Fix use invocation
+
+  10 May 2004; David Holm <dholm@gentoo.org> zaptel-0.9.1.ebuild:
+  Added to ~ppc.
+
+*zaptel-0.9.1 (10 May 2004)
+
+  10 May 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-0.9.1.ebuild,
+  files/zaptel-0.9.1-experimental-devfs26.diff,
+  files/zaptel-0.9.1-modulesd.diff:
+  version bump.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> zaptel-0.7.0.ebuild,
+  zaptel-0.8.1.ebuild:
+  Add inherit eutils
+
+  17 Mar 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-0.8.1.ebuild:
+  fixed SRC_URI
+
+  16 Mar 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-0.7.0.ebuild:
+  removed blocking of dev-sources (bug #44588)
+
+*zaptel-0.8.1 (16 Mar 2004)
+
+  16 Mar 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-0.8.1.ebuild:
+  version bump, this version still lacks linux-2.6 support
+  (kbuild + sandbox is a problem atm...)
+
+  19 Feb 2004; Stefan Knoblich <stkn@gentoo.org> zaptel-0.7.0.ebuild:
+  fixed SRC_URI
 
 *zaptel-0.7.0 (04 Jan 2004)
 
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index df0a14737c95..6070f0165af2 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,7 +1,36 @@
-MD5 dd4c9bb100476bab9a1b54cff3d646d0 zaptel-0.7.0.ebuild 1324
+MD5 276ca202b6c1471af85d43ce0eb6b94f zaptel-1.0.7-r1.ebuild 6517
+MD5 ac774e9b1e15c4e3060c325560be97d3 zaptel-1.0.6-r1.ebuild 6217
+MD5 1ab383ffeab849e778401125f478fc6d zaptel-1.0.4-r1.ebuild 4417
+MD5 6263a968f86b50a23db0b3bcaf19b0ae zaptel-1.0.8.ebuild 6370
+MD5 a9b97edfc9559f48e71f9f232590143f zaptel-1.0.9_p1-r1.ebuild 6641
+MD5 5c63aa4881f27d9421f5e005c6333687 zaptel-1.0.9_p2.ebuild 6637
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 511a1dd9ff3181a0bb53ed07100835d0 ChangeLog 501
-MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
-MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
-MD5 48c7eb4a7726cb0ce920784778ad2efb files/zaptel-modulesd.patch 1601
-MD5 4f38ae7d0fb20dee726303a35ca85eda files/digest-zaptel-0.7.0 64
+MD5 2ad493dd61ec7b75bbed24faef998bda ChangeLog 12253
+MD5 b26100fa09e5b61e0b4a9e3455497b5c zaptel-1.2.0.ebuild 9098
+MD5 69d0c3831715ccac6422b13a99fc6557 files/digest-zaptel-1.0.9_p2 214
+MD5 6029a1280d38d8c67577bc7a873fd336 files/zaptel-1.0.9-rtc.patch 4238
+MD5 3a4f554056143ac54f033cc3356821b5 files/digest-zaptel-1.0.9_p1-r1 214
+MD5 f574df759efe80013bc3e7fa04d95232 files/digest-zaptel-1.2.0 136
+MD5 f46e4409c0bb701f8a6214e793de72a2 files/digest-zaptel-1.0.8 212
+MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
+MD5 c0f95d699055c3b46e5d3078bfaa2afb files/zaptel-1.2.0-devfs26.diff 6046
+MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
+MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
+MD5 9be11ef13f32ceaffef87920fe47a93e files/digest-zaptel-1.0.7-r1 212
+MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
+MD5 74863c2b19f217f2f23daa1cd617c4f9 files/zaptel-bristuff-0.2.0-RC7k.patch 6065
+MD5 5fe59834ed82727b3297f9e39eb855be files/zaptel-1.0.9-gentoo.diff 4855
+MD5 e72dc0fa3cbcd55182b6f05d8c731694 files/zaptel-1.0.8-gentoo.diff 4747
+MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
+MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
+MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6-r1 212
+MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4-r1 64
+MD5 f06df1defd75000b5fdfa7f81b4ef78b files/zaptel-bristuff-0.2.0-RC8l.patch 5551
+MD5 8471d7eb15aebff9c72f67861cb1ad88 files/zaptel-1.0.7-gentoo.diff 4459
+MD5 d893c36bffff825ab0e6d48e1ad0acea files/zaptel-bristuff-0.2.0-RC8h.patch 6064
+MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
+MD5 e6c7407f2478a1836a087eec78ecd69d files/zaptel-1.2.0-gentoo.diff 4626
+MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
+MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
+MD5 6fec683d2df451d8094093511d1138db files/zaptel.devfsd 204
+MD5 077231bb1ba50aedfd08476b9d4eb18b files/zaptel-1.0.9_p2-gentoo.diff 5179
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.7-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
index bcdbe9128875..bfec429fbc6f 100644
--- a/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
+++ b/net-misc/zaptel/files/digest-zaptel-1.0.7-r1
@@ -1,3 +1,3 @@
 MD5 d043f54f38b6262ab3cd5599982a7032 zaptel-1.0.7.tar.gz 316693
-MD5 8029d465ffc1ae8fb076a6b7198da03c bristuff-0.2.0-RC8a.tar.gz 133171
+MD5 7a5ff01d3befff1fbd3de1c303cb10d1 bristuff-0.2.0-RC8g.tar.gz 139013
 MD5 cc91bd69d6e880f89a1f95a27aa714c9 zaphfc_0.2.0-RC8a_florz-6.diff.gz 10428
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.0 b/net-misc/zaptel/files/digest-zaptel-1.2.0
index 16f5dc990fb5..26f88125bc63 100644
--- a/net-misc/zaptel/files/digest-zaptel-1.2.0
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.0
@@ -1 +1,2 @@
+MD5 884979fbfb75e6cdf7d8bdb66841e728 bristuff-0.3.0-PRE-1.tar.gz 159742
 MD5 83d4aaab1594c5aa0dedc6b4f221fb48 zaptel-1.2.0.tar.gz 596257
diff --git a/net-misc/zaptel/files/zaptel.confd b/net-misc/zaptel/files/zaptel.confd
index 5a27a4c9f60c..bd33a856cab7 100644
--- a/net-misc/zaptel/files/zaptel.confd
+++ b/net-misc/zaptel/files/zaptel.confd
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/files/zaptel.confd,v 1.1 2004/05/10 01:18:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/files/zaptel.confd,v 1.1.1.1 2005/11/30 09:55:15 chriswhite Exp $
 
 #
 # Some options for the zaptel init script
diff --git a/net-misc/zaptel/files/zaptel.devfsd b/net-misc/zaptel/files/zaptel.devfsd
index 1dc0a8ae87af..a9f32d7b0a26 100644
--- a/net-misc/zaptel/files/zaptel.devfsd
+++ b/net-misc/zaptel/files/zaptel.devfsd
@@ -1,5 +1,6 @@
 #
 # devfs rules for zaptel
 #
-REGISTER     zap	PERMISSIONS root.asterisk rwxrwx---
-REGISTER     zap/.*     PERMISSIONS root.asterisk rw-rw----
+REGISTER     ^zap		PERMISSIONS root.dialout rwxrwx---
+REGISTER     ^zap/.*		PERMISSIONS root.dialout rw-rw----
+REGISTER     ^zap/span[0-9]*	PERMISSIONS root.dialout rwxrwx---
diff --git a/net-misc/zaptel/files/zaptel.rc6 b/net-misc/zaptel/files/zaptel.rc6
index 085082778970..9439b03fe0c0 100644
--- a/net-misc/zaptel/files/zaptel.rc6
+++ b/net-misc/zaptel/files/zaptel.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/files/zaptel.rc6,v 1.1 2004/05/10 01:18:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/files/zaptel.rc6,v 1.1.1.1 2005/11/30 09:55:15 chriswhite Exp $
 
 depend() {
 	need net
@@ -9,11 +9,11 @@ depend() {
 
 checkconfig() {
 	if [ ! -f /etc/zaptel.conf ]; then
-		echo "Please create /etc/zaptel.conf!"
-		return 0
+		eerror "Please create /etc/zaptel.conf!"
+		return 1
 	fi
 
-	return 1
+	return 0
 }
 
 create_devices() {
@@ -25,11 +25,14 @@ create_devices() {
 	mknod /dev/zap/timer c 196 253
 	mknod /dev/zap/channel c 196 254
 	mknod /dev/zap/pseudo c 196 255
+
+	chown -R root:dialout   /dev/zap
+	chmod -R u=rwX,g=rwX,o= /dev/zap
 }
 
 
 start() {
-	checkconfig || exit 1
+	checkconfig || return 1
 
 	if [ ! -d /dev/zap ] && [ "$ZAP_FORCE_CREATE" != "no" ]; then
 		einfo "Creating zaptel device nodes"
diff --git a/net-misc/zaptel/zaptel-1.0.4-r1.ebuild b/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
index 553b08541cb4..2c74ed63964a 100644
--- a/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4-r1.ebuild,v 1.1 2005/06/24 16:40:42 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
 
 IUSE="devfs26"
 
@@ -8,7 +8,7 @@ inherit toolchain-funcs eutils linux-info
 
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${PV}.tar.gz"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -99,9 +99,7 @@ src_unpack() {
 }
 
 src_compile() {
-	set_arch_to_kernel
-	make || die
-	set_arch_to_portage
+	make ARCH=$(tc-arch-kernel) || die
 }
 
 src_install() {
diff --git a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
index f97ccc5e122c..c459686220c0 100644
--- a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6-r1.ebuild,v 1.1 2005/06/24 16:40:42 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -11,8 +11,8 @@ FLORZ_VERSION="0.2.0-RC7j_florz-4"
 
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )
+SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
 	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
 
 SLOT="0"
@@ -115,15 +115,13 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap || die
-		make -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C qozap || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
@@ -155,7 +153,7 @@ src_install() {
 		newins zaphfc/zapata.conf zapata.conf.zaphfc
 
 		docinto bristuff
-		dodoc CHANGES INSTALL README-ZAPHFC-USERS.1st
+		dodoc CHANGES INSTALL
 
 		docinto bristuff/qozap
 		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
diff --git a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild b/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
index 1654284e518e..4660b8c307cc 100644
--- a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.7-r1.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/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.1 2005/05/07 18:24:31 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
 
 IUSE="devfs26 bri florz"
 
 inherit toolchain-funcs eutils linux-mod
 
-BRI_VERSION="0.2.0-RC8a"
+BRI_VERSION="0.2.0-RC8g"
 FLORZ_VERSION="0.2.0-RC8a_florz-6"
 
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )
+SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
 	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
-#KEYWORDS="~x86 ~ppc ~amd64"
-KEYWORDS="-*"
+KEYWORDS="x86 ~ppc ~amd64"
 
 DEPEND="virtual/libc
 	virtual/linux-sources
@@ -112,16 +111,14 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap  || die
-		make -C zaphfc || die
-		make -C cwain  || die
+		make ARCH=$(tc-arch-kernel) -C qozap  || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C cwain  || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
@@ -158,7 +155,7 @@ src_install() {
 		newins cwain/zapata.conf  zapata.conf.E1
 
 		docinto bristuff
-		dodoc CHANGES INSTALL README-ZAPHFC-USERS.1st
+		dodoc CHANGES INSTALL
 
 		docinto bristuff/qozap
 		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
@@ -171,10 +168,8 @@ src_install() {
 	fi
 
 	# install init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/zaptel.rc6 zaptel
-	insinto /etc/conf.d
-	newins ${FILESDIR}/zaptel.confd zaptel
+	newinitd ${FILESDIR}/zaptel.rc6 zaptel
+	newconfd ${FILESDIR}/zaptel.confd zaptel
 
 	# install devfsd rule file
 	insinto /etc/devfs.d
@@ -182,11 +177,11 @@ src_install() {
 
 	# install udev rule file
 	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 99-zaptel.rules
+	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
 
 	# fix permissions if there's no udev / devfs around
 	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout  ${D}/dev/zap
+		chown -R root:dialout	${D}/dev/zap
 		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
 	fi
 }
@@ -224,26 +219,10 @@ pkg_postinst() {
 		einfo "    zapata.conf.doubleE1"
 		echo
 	fi
-}
-
-pkg_config() {
-	einfo "Bla... [y/N]"
-
-	read x
-
-	if [[ "$x" = "y" ]] || [[ "$x" = "Y" ]]; then
-		# yes, this is needed :(
-		enewgroup asterisk
 
-		einfo "Fixing permissions and ownerships"
-
-		# fix permissions if there's no udev / devfs around
-		if [[ -d ${D}/dev/zap ]]; then
-			chown -R root:asterisk  ${D}/dev/zap
-			chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-		fi
-	else
-		einfo "Aborted"
+	# fix permissions if there's no udev / devfs around
+	if [[ -d ${ROOT}/dev/zap ]]; then
+		chown -R root:dialout	${ROOT}/dev/zap
+		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
 	fi
-
 }
diff --git a/net-misc/zaptel/zaptel-1.0.8.ebuild b/net-misc/zaptel/zaptel-1.0.8.ebuild
index 5d5d593a0783..df14fd473754 100644
--- a/net-misc/zaptel/zaptel-1.0.8.ebuild
+++ b/net-misc/zaptel/zaptel-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/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.1 2005/06/25 08:56:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.1.1.1 2005/11/30 09:55:14 chriswhite Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -11,13 +11,13 @@ FLORZ_VERSION="0.2.0-RC8a_florz-6"
 
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${PV}.tar.gz
-	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )
+SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
 	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 DEPEND="virtual/libc
 	virtual/linux-sources
@@ -116,16 +116,14 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap  || die
-		make -C zaphfc || die
-		make -C cwain  || die
+		make ARCH=$(tc-arch-kernel) -C qozap  || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C cwain  || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
diff --git a/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild b/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
index b64355c5024f..b56a9453f6c8 100644
--- a/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild,v 1.1 2005/08/18 17:55:09 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
 
 IUSE="devfs26 bri florz rtc"
 
@@ -13,7 +13,7 @@ MY_PV="${PV/_p/.}"
 
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${MY_PV}.tar.gz
+SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${MY_PV}.tar.gz
 	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
 	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
 
diff --git a/net-misc/zaptel/zaptel-1.0.9_p2.ebuild b/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
index 5fb105e993cc..b78989f4c776 100644
--- a/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p2.ebuild,v 1.1 2005/09/15 02:29:49 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p2.ebuild,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
 
 IUSE="devfs26 bri florz rtc"
 
diff --git a/net-misc/zaptel/zaptel-1.2.0.ebuild b/net-misc/zaptel/zaptel-1.2.0.ebuild
index 3729d5b0d658..a78494f574c4 100644
--- a/net-misc/zaptel/zaptel-1.2.0.ebuild
+++ b/net-misc/zaptel/zaptel-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/net-misc/zaptel/zaptel-1.2.0.ebuild,v 1.1 2005/11/18 16:34:14 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:13 chriswhite Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -11,21 +11,23 @@ inherit toolchain-funcs eutils linux-mod
 # - testing of new features (zapras / -net)
 #
 
-#BRI_VERSION="0.2.0-RC8h"
+BRI_VERSION="0.3.0-PRE-1"
 #FLORZ_VERSION="0.2.0-RC8a_florz-6"
 
-IUSE="devfs26 rtc ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 ukcid watchdog zapras zapnet"
+IUSE="bri devfs26 ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 rtc ukcid watchdog zapras zapnet"
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz"
-#	 bri? ( http://www.junghanns.net/asterisk/downloads/bristuff-${BRI_VERSION}.tar.gz )
+SRC_URI="http://ftp.digium.com/pub/zaptel/${MY_P}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
 #	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
 
 S="${WORKDIR}/${MY_P}"
 
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -170,12 +172,12 @@ src_unpack() {
 		epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch
 
 	# try to apply bristuff patch
-#	if use bri; then
-#		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-#		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-#
-#		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-#
+	if use bri; then
+		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
+		epatch ${S_BRI}/patches/zaptel.patch
+
+		cd ${S_BRI}
+
 #		if use florz; then
 #			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
 #
@@ -185,24 +187,26 @@ src_unpack() {
 #
 #			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
 #		fi
-#
-#		# patch includes
-#		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-#			qozap/qozap.c \
-#			zaphfc/zaphfc.c \
-#			cwain/cwain.c
-#
-#		# patch makefiles
-#		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-#			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-#			-e "s:linux-2.6:linux:g" \
-#			qozap/Makefile \
-#			zaphfc/Makefile \
-#			cwain/Makefile
-#
-#		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-#			zaphfc/Makefile
-#	fi
+
+		# patch includes
+		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
+			qozap/qozap.c \
+			zaphfc/zaphfc.c \
+			cwain/cwain.c
+
+		# patch makefiles
+		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
+			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
+			-e "s:linux-2.6:linux:g" \
+			qozap/Makefile \
+			zaphfc/Makefile \
+			cwain/Makefile
+
+		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
+			zaphfc/Makefile
+
+		cd ${S}
+	fi
 
 ### Configuration changes
 	local myEC
@@ -248,12 +252,16 @@ src_compile() {
 	make KVERS=${KV_FULL} \
 	     KSRC=/usr/src/linux ARCH=$(tc-arch-kernel) || die
 
-#	if use bri; then
-#		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-#		make -C qozap  || die
-#		make -C zaphfc || die
-#		make -C cwain  || die
-#	fi
+	if use bri; then
+		cd ${S_BRI}
+		for x in cwain qozap zaphfc; do
+			einfo "Building ${x}..."
+			make KVERS=${KV_FULL} \
+				KSRC=/usr/src/linux \
+				ARCH=$(tc-arch-kernel) \
+				-C ${x} || die "make ${x} failed"
+		done
+	fi
 }
 
 src_install() {
@@ -271,38 +279,40 @@ src_install() {
 	insinto /usr/include/zaptel
 	doins *.h
 
-#	if use bri; then
-#		einfo "Installing bri"
-#		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-#
-#		insinto /lib/modules/${KV_FULL}/misc
-#		doins qozap/qozap.${KV_OBJ}
-#		doins zaphfc/zaphfc.${KV_OBJ}
-#		doins cwain/cwain.${KV_OBJ}
-#
-#		# install example configs for octoBRI and quadBRI
-#		insinto /etc
-#		doins qozap/zaptel.conf.octoBRI
-#		newins qozap/zaptel.conf zaptel.conf.quadBRI
-#		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-#
-#		insinto /etc/asterisk
-#		doins qozap/zapata.conf.octoBRI
-#		newins qozap/zapata.conf zapata.conf.quadBRI
-#		newins zaphfc/zapata.conf zapata.conf.zaphfc
-#
-#		docinto bristuff
-#		dodoc CHANGES INSTALL
-#
-#		docinto bristuff/qozap
-#		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-#
-#		docinto bristuff/zaphfc
-#		dodoc zaphfc/LICENSE zaphfc/*.conf
-#
-#		docinto bristuff/cwain
-#		dodoc cwain/TODO cwain/LICENSE
-#	fi
+	if use bri; then
+		einfo "Installing bri"
+		cd ${S_BRI}
+
+		insinto /lib/modules/${KV_FULL}/misc
+		doins qozap/qozap.${KV_OBJ}
+		doins zaphfc/zaphfc.${KV_OBJ}
+		doins cwain/cwain.${KV_OBJ}
+
+		# install example configs for octoBRI and quadBRI
+		insinto /etc
+		doins qozap/zaptel.conf.octoBRI
+		newins qozap/zaptel.conf zaptel.conf.quadBRI
+		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
+
+		insinto /etc/asterisk
+		doins qozap/zapata.conf.octoBRI
+		newins qozap/zapata.conf zapata.conf.quadBRI
+		newins zaphfc/zapata.conf zapata.conf.zaphfc
+
+		docinto bristuff
+		dodoc CHANGES INSTALL
+
+		docinto bristuff/qozap
+		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
+
+		docinto bristuff/zaphfc
+		dodoc zaphfc/LICENSE zaphfc/*.conf
+
+		docinto bristuff/cwain
+		dodoc cwain/TODO cwain/LICENSE
+
+		cd ${S}
+	fi
 
 	# install init script
 	newinitd ${FILESDIR}/zaptel.rc6 zaptel
diff --git a/net-misc/zebedee/ChangeLog b/net-misc/zebedee/ChangeLog
index aee85f4eb2c9..f65f2c47ccdc 100644
--- a/net-misc/zebedee/ChangeLog
+++ b/net-misc/zebedee/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for net-misc/zebedee
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.1 2003/03/18 05:27:43 alron Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> zebedee-2.5.3.ebuild:
+  Mark 2.5.3 stable on ia64
+
+  10 Sep 2005; Jose Luis Rivero <yoswink@gentoo.org> zebedee-2.5.3.ebuild:
+  Stable on alpha wrt to security bug #105115
+
+*zebedee-2.5.3 (07 Sep 2005)
+*zebedee-2.4.1-r1 (07 Sep 2005)
+
+  07 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -zebedee-2.4.1.ebuild,
+  +zebedee-2.4.1-r1.ebuild, +zebedee-2.5.3.ebuild:
+  Version bump for bug 105115. Thanks to Bill Kenworthy <billk@iinet.net.au>.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> zebedee-2.5.2.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> zebedee-2.5.2.ebuild:
+  Stable on alpha.
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> zebedee-2.5.2.ebuild:
+  adding s390 keywords
+
+  20 Feb 2004; Seemant Kulleen <seemant@gentoo.org> zebedee-2.4.1.ebuild,
+  zebedee-2.5.2.ebuild, files/zebedee-2.4.1-Makefile.patch:
+  no need for the patch, this can be done from the ebuild.
+
+  20 Feb 2004; Seemant Kulleen <seemant@gentoo.org> zebedee-2.5.2.ebuild:
+  change some things, like the installation of keys and examples to /etc/zebedee
+  instead of /usr/lib/zebedee
+
+*zebedee-2.5.2 (19 Feb 2004)
+
+  19 Feb 2004; Seemant Kulleen <seemant@gentoo.org> zebedee-2.5.2.ebuild:
+  version bump, for our own infrastructure team
+
+  17 Jun 2003; Dean Bailey <alron@gentoo.org> zebedee-2.4.1 :
+  unmasked for x86
 
 *zebedee-2.4.1 (17 Mar 2003)
 
diff --git a/net-misc/zebedee/Manifest b/net-misc/zebedee/Manifest
index e69de29bb2d1..2a35a209e516 100644
--- a/net-misc/zebedee/Manifest
+++ b/net-misc/zebedee/Manifest
@@ -0,0 +1,8 @@
+MD5 1f8fb8569a7fc6965bd2e22d10d3fe85 zebedee-2.5.3.ebuild 1327
+MD5 5ba34a1637cc702c844bd483ae0ec9de zebedee-2.4.1-r1.ebuild 1370
+MD5 c466ae252289b87bb006b5b3f1a7b87d ChangeLog 1868
+MD5 f06ef27114b90127f2708b225262c119 zebedee-2.5.2.ebuild 1326
+MD5 b9dcf8ebb9db0fb78b1f74cff39bca5a files/zebedee 796
+MD5 68d88d75a98379c598ce0236cc84c830 files/digest-zebedee-2.5.3 65
+MD5 c5e389680be29fd73513e0f43f57e953 files/digest-zebedee-2.4.1-r1 66
+MD5 8cf68657b127300b9493ffdb0edfe288 files/digest-zebedee-2.5.2 65
diff --git a/net-misc/zebedee/files/zebedee b/net-misc/zebedee/files/zebedee
index 7c34d32bf6f3..95f905f21cf3 100644
--- a/net-misc/zebedee/files/zebedee
+++ b/net-misc/zebedee/files/zebedee
@@ -1,6 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/files/zebedee,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-misc/zebedee/zebedee-2.4.1-r1.ebuild b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
index 094e097c6770..44b7e3e28ea3 100644
--- a/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
+++ b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.1 2005/09/07 16:05:59 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:39 chriswhite Exp $
 
 MY_P="${P}A"
 DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
diff --git a/net-misc/zebedee/zebedee-2.5.2.ebuild b/net-misc/zebedee/zebedee-2.5.2.ebuild
index fd30cb8469d7..aadfb077d481 100644
--- a/net-misc/zebedee/zebedee-2.5.2.ebuild
+++ b/net-misc/zebedee/zebedee-2.5.2.ebuild
@@ -1,15 +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-misc/zebedee/zebedee-2.5.2.ebuild,v 1.1 2004/02/20 03:18:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.5.2.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
 HOMEPAGE="http://www.winton.org.uk/zebedee/"
 SRC_URI="mirror://sourceforge/zebedee/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~amd64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc alpha ~hppa ~mips ia64 ~amd64 ~ppc64 s390"
+IUSE=""
 
 
 DEPEND="dev-lang/perl
@@ -17,19 +17,6 @@ DEPEND="dev-lang/perl
 	sys-libs/zlib
 	app-arch/bzip2"
 
-
-#src_unpack() {
-#	unpack ${P}.tar.gz
-#	cd ${S}
-#
-#	cp Makefile Makefile.orig
-#	patch -p0 < ${FILESDIR}/${P}-Makefile.patch || die
-#	mv zebedee.c zebedee.c.orig
-#	cat zebedee.c.orig | \
-#		sed "s/^#include \"blowfish\.h\"$/#include \"openssl\/blowfish\.h\"/g" \
-#		> zebedee.c
-#}
-
 src_compile() {
 	emake \
 		BFINC=-I/usr/include/openssl \
@@ -45,26 +32,17 @@ src_install() {
 	make \
 		ROOTDIR=${D}/usr \
 		MANDIR=${D}/usr/share/man/man1 \
+		ZBDDIR=${D}/etc/zebedee \
 		OS=linux \
 		install || die
 
-	rm -f ${D}/usr/lib/zebedee/*.{txt,html}
+	rm -f ${D}/etc/zebedee/*.{txt,html}
 
 	dodoc *.txt
 	dohtml *.html
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/zebedee
-
-	insinto /etc/zebedee
-	doins server.zbd vncviewer.zbd vncserver.zbd
-	newins server.id server.id.example
-
-	insopts -m 600
-	newins server.key server.key.example
-	newins client1.key client1.key.example
-	newins client2.key client2.key.example
-	newins clients.id clients.id.example
 }
 
 pkg_postinst() {
diff --git a/net-misc/zebedee/zebedee-2.5.3.ebuild b/net-misc/zebedee/zebedee-2.5.3.ebuild
index 34447aba7baf..d2f9dd171385 100644
--- a/net-misc/zebedee/zebedee-2.5.3.ebuild
+++ b/net-misc/zebedee/zebedee-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.5.3.ebuild,v 1.1 2005/09/07 16:05:59 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.5.3.ebuild,v 1.1.1.1 2005/11/30 09:55:38 chriswhite Exp $
 
 DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
 HOMEPAGE="http://www.winton.org.uk/zebedee/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/zebedee/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~amd64 ~ppc64 ~s390"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/net-misc/zssh/ChangeLog b/net-misc/zssh/ChangeLog
index f21a16f43a65..1aede5a42883 100644
--- a/net-misc/zssh/ChangeLog
+++ b/net-misc/zssh/ChangeLog
@@ -1,8 +1,18 @@
 # ChangeLog for net-misc/zssh
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zssh/ChangeLog,v 1.1 2002/12/12 16:39:58 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zssh/ChangeLog,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
-*zssh-1.5a-0 (20 Sep 2002)
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> zssh-1.5a.ebuild:
+  change virtual/glibc to virtual/libc
+
+  03 Mar 2004; Seemant Kulleen <seemant@gentoo.org> zssh-1.5a.ebuild:
+  moved to stable x86, at the behest of: Petter <tt@linux.nu> in bug #43451, and
+  he thinks he's rough around the edges, but he's not
+
+*zssh-1.5a (20 Sep 2002)
+
+  23 Dec 2002; Christian Birchinger <joker@gentoo.org> :     
+  Removed sparc64 keyword.
 
   20 Sep 2002; phoen][x <phoenix@gentoo.org> ChangeLog, zssh-1.5a.ebuild,
   files/digest-zssh-1.5a :
diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
index e69de29bb2d1..6d3489fefd5f 100644
--- a/net-misc/zssh/Manifest
+++ b/net-misc/zssh/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0184fa76a58077a00f060ebb8870949c ChangeLog 823
+MD5 aabf5f520963471b16f1fab367ca1426 zssh-1.5a.ebuild 847
+MD5 f52cf7d8f81baebdc41762a9e2403d86 files/zssh-1.5a-gentoo-termcap.diff 312
+MD5 761d5c3c6844a11229f8ec48df476b1c files/digest-zssh-1.5a 58
+MD5 e6b1336b7eaaa0ca2e2bf12cdfbd7b4b files/zssh-1.5a-gentoo-include.diff 321
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZtMgjiC39V7gKu0RAom8AJ417foHXqWHhDNjX06NGnaCD9Z7IgCgx2zZ
+fCbCkgPYzu70O0qeNIeqvjY=
+=BzP7
+-----END PGP SIGNATURE-----
diff --git a/net-misc/zssh/zssh-1.5a.ebuild b/net-misc/zssh/zssh-1.5a.ebuild
index 5c4ed7dc4657..cc351dd5884a 100644
--- a/net-misc/zssh/zssh-1.5a.ebuild
+++ b/net-misc/zssh/zssh-1.5a.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zssh/zssh-1.5a.ebuild,v 1.1 2002/12/12 16:39:58 phoenix Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zssh/zssh-1.5a.ebuild,v 1.1.1.1 2005/11/30 09:55:04 chriswhite Exp $
 
 inherit eutils
 
-IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="A ssh wrapper enabling zmodem up/download in ssh"
-SRC_URI="ftp://ftp.sourceforge.net/pub/sourceforge/zssh/zssh-1.5a.tgz"
 HOMEPAGE="http://zssh.sourceforge.net/"
-KEYWORDS="~x86 sparc sparc64"
+SRC_URI="mirror://sourceforge/zssh/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE="readline nls"
 
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc 
-	 net-misc/openssh 
-	 net-misc/lrzsz"
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+	 net-misc/openssh
+	 net-dialup/lrzsz"
 
 src_unpack() {
 	unpack ${A}
@@ -26,26 +26,15 @@ src_unpack() {
 }
 
 src_compile() {
-	local options
-
-	use nls || options="${options} --disable-nls"
-	use readline || options="${options} --disable-readline"
+	econf \
+		`use_enable nls` \
+		`use_enable readline` || die
 
-	./configure	\
-		--prefix=/usr	\
-		--host=${CHOST}	\
-		${options} || die
-	
 	emake || die
 }
 
 src_install() {
-	doman zssh.1
-	doman ztelnet.1
-
-	dobin zssh
-	dobin ztelnet
-
+	dobin zssh ztelnet
+	doman zssh.1 ztelnet.1
 	dodoc CHANGES FAQ README TODO
 }
-
diff --git a/net-misc/zsync/ChangeLog b/net-misc/zsync/ChangeLog
index ff77881b028e..c5be5ad44a63 100644
--- a/net-misc/zsync/ChangeLog
+++ b/net-misc/zsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/zsync
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zsync/ChangeLog,v 1.1 2005/03/23 19:01:45 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zsync/ChangeLog,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
+
+*zsync-0.4.1 (30 Jul 2005)
+
+  30 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +zsync-0.4.1.ebuild:
+  New upstream version.
 
   23 Mar 2005; Karl Trygve Kalleberg <karltk@gentoo.org> :
   Initial import. Ebuild submitted by Ricardo Correia <gentoo-bugs@wizy.org>.
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index 044257441635..51c9e9ade0f4 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,2 +1,6 @@
-MD5 24b7693c5d5d26202ea2a81a1cccface zsync-0.3.2.ebuild 470
+MD5 8c14c05efb6568700324ca1e9b1a2b78 zsync-0.4.1.ebuild 587
+MD5 3ca61bcf9ebd08dac7586121abd923f0 zsync-0.3.2.ebuild 587
+MD5 b3f723cadfcf85db64bb4af0081bb885 ChangeLog 488
+MD5 7b71da86f5097e1aaceb15a68cee789f metadata.xml 1272
 MD5 a07bcd0db30b90e6a36f72c8809f996e files/digest-zsync-0.3.2 63
+MD5 98838c36ea8e8c7b0bb4f76835f6a55c files/digest-zsync-0.4.1 63
diff --git a/net-misc/zsync/zsync-0.3.2.ebuild b/net-misc/zsync/zsync-0.3.2.ebuild
index 1a46d7942af8..bfae06ed497e 100644
--- a/net-misc/zsync/zsync-0.3.2.ebuild
+++ b/net-misc/zsync/zsync-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zsync/zsync-0.3.2.ebuild,v 1.1 2005/03/23 19:01:45 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zsync/zsync-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 DESCRIPTION="Partial/differential file download client over HTTP which uses the rsync algorithm"
 HOMEPAGE="http://zsync.moria.org.uk/"
diff --git a/net-misc/zsync/zsync-0.4.1.ebuild b/net-misc/zsync/zsync-0.4.1.ebuild
index ef8173851a10..f0b56af7886e 100644
--- a/net-misc/zsync/zsync-0.4.1.ebuild
+++ b/net-misc/zsync/zsync-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zsync/zsync-0.4.1.ebuild,v 1.1 2005/07/30 17:45:23 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zsync/zsync-0.4.1.ebuild,v 1.1.1.1 2005/11/30 09:54:48 chriswhite Exp $
 
 DESCRIPTION="Partial/differential file download client over HTTP which uses the rsync algorithm"
 HOMEPAGE="http://zsync.moria.org.uk/"
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 5125cf89139e..8d5ddae1e897 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-sci/Macaulay2
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.1 2004/12/28 14:30:11 ribosome Exp $
+# ChangeLog for sci-mathematics/Macaulay2
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> Macaulay2-0.9.2.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> :
+  change dep from net-www/epiphany to www-client/epiphany
+
+  18 Mar 2005; Seemant Kulleen <seemant@gentoo.org> Macaulay2-0.9.2.ebuild:
+  epiphany and firefox are in www-client
 
 *Macaulay2-0.9.2 (28 Dec 2004)
 
diff --git a/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild b/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild
index 9c13f63e9e33..2226948da054 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.1 2004/12/28 14:30:11 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -62,13 +62,13 @@ src_install () {
 	if has_version 'kde-base/kdebase' ; then
 		einfo "Using konqueror as default help-browser!"
 		sed "s:netscape:konqueror:g" < tmp > ${D}/usr/bin/M2-help
-	elif has_version 'net-www/mozilla' ; then
+	elif has_version 'www-client/mozilla' ; then
 		einfo "Using mozilla as default help-browser!"
 		sed "s:netscape:mozilla:g" < tmp > ${D}/usr/bin/M2-help
-	elif has_version 'net-www/mozilla-firefox' ; then
+	elif has_version 'www-client/mozilla-firefox' ; then
 		einfo "Using mozilla-firefox as default help-browser!"
 		sed "s:netscape:firefox:g" < tmp > ${D}/usr/bin/M2-help
-	elif has_version 'net-www/epiphany' ; then
+	elif has_version 'www-client/epiphany' ; then
 		einfo "Using epiphany as default help-browser!"
 		sed "s:netscape:epiphany:g" < tmp > ${D}/usr/bin/M2-help
 	else
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 4256434742ba..aa5917c40bc9 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,7 +1,7 @@
-MD5 ee6f02d0e41ad14889cba1b79f5eb6cf Macaulay2-0.9.2.ebuild 2584
-MD5 11178139341ebefcbb14ef34a55660ec ChangeLog 742
+MD5 f4885968bdb7253e06fb43860a7ea631 ChangeLog 1422
 MD5 8ed0bde4e7e96671f190d97c92e1d67b metadata.xml 514
+MD5 b11d53b3b8b20ea3fbe1df72b24eb987 Macaulay2-0.9.2.ebuild 2600
+MD5 49353124d1f121c795a570079153114d files/digest-Macaulay2-0.9.2 199
 MD5 0926cfa1c448a5d6464a6c0fc04425d6 files/gentoo-Macaulay2-0.9.2.diff 10410
-MD5 02f8c3fb68df6d22a55f92102a3956ee files/gentoo-libfac-0.3.2.include.diff 641
 MD5 22fafa18c7db240002ce1110747a9c9b files/gentoo-factory-1.3b.diff 680
-MD5 49353124d1f121c795a570079153114d files/digest-Macaulay2-0.9.2 199
+MD5 02f8c3fb68df6d22a55f92102a3956ee files/gentoo-libfac-0.3.2.include.diff 641
diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index 16c19ae5fd30..420d7bf9c717 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sci-mathematics/axiom
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.1 2005/01/16 16:39:20 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 *axiom-9999 (16 Jan 2005)
 
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 151d2406dd52..1838ab3ae62a 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 89b31b6f5c38956e75300ec422a509bf ChangeLog 336
-MD5 f23469427ca41105a3fc81473cec9fb7 axiom-9999.ebuild 2877
-MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
+MD5 31e3467519edf2226abfc483fb1ad378 axiom-9999.ebuild 2874
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-axiom-9999 0
+MD5 e49bb02132d2cd74ad4e6ee291e102d9 metadata.xml 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaAPogIKl8Uu19MoRAhoZAJ9eX3pfQG8+dP8AWRq1M1aKH7SJ1ACfd/i7
+R5L4Tv5h8QcmAFABjwiayaM=
+=+Mf/
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/axiom/axiom-9999.ebuild b/sci-mathematics/axiom/axiom-9999.ebuild
index 58391f49cdc9..508c3a167242 100644
--- a/sci-mathematics/axiom/axiom-9999.ebuild
+++ b/sci-mathematics/axiom/axiom-9999.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/sci-mathematics/axiom/axiom-9999.ebuild,v 1.1 2005/01/16 16:39:20 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-9999.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
-ECVS_AUTH='ext'
-export CVS_RSH='ssh'
-ECVS_SERVER='savannah.gnu.org:/cvsroot/axiom'
-ECVS_MODULE='axiom'
-ECVS_USER='anoncvs'
-ECVS_PASS=''
-ECVS_CVS_OPTIONS='-dP'
-ECVS_SSH_HOST_KEY='savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0='
+ECVS_AUTH="ext"
+export CVS_RSH="ssh"
+ECVS_SERVER="savannah.gnu.org:/cvsroot/axiom"
+ECVS_MODULE="axiom"
+ECVS_USER="anoncvs"
+ECVS_PASS=""
+ECVS_CVS_OPTIONS="-dP"
+ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0="
 
 inherit cvs eutils
 
-IUSE=''
-S=${WORKDIR}/${ECVS_MODULE}
-DESCRIPTION='Axiom is a general purpose Computer Algebra system.'
-SRC_URI=''
-HOMEPAGE='http://axiom.axiom-developer.org/index.html'
+DESCRIPTION="Axiom is a general purpose Computer Algebra system"
+HOMEPAGE="http://axiom.axiom-developer.org/index.html"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
 
-DEPEND='virtual/x11
-	virtual/tetex'
+DEPEND="virtual/x11
+	virtual/tetex"
 
-SLOT='0'
-LICENSE='GPL-2'
-KEYWORDS='~x86'
+S=${WORKDIR}/${ECVS_MODULE}
 
 pkg_setup() {
 	echo
diff --git a/sci-mathematics/calc/ChangeLog b/sci-mathematics/calc/ChangeLog
index 231ef54c166d..fc56862791f5 100644
--- a/sci-mathematics/calc/ChangeLog
+++ b/sci-mathematics/calc/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-sci/calc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/ChangeLog,v 1.1 2004/12/28 05:00:44 ribosome Exp $
+# ChangeLog for sci-mathematics/calc
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
+
+  20 Nov 2005; Markus Rothe <corsair@gentoo.org> calc-2.11.10.1.ebuild:
+  Added ~ppc64 keyword
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> calc-2.11.9.3.ebuild:
+  Mark 2.11.9.3 stable on alpha
 
 *calc-2.11.10.1 (28 Dec 2004)
 
@@ -19,7 +28,7 @@
   Version bump, old version declared stable for x86, disabled check if sandbox
   is present.
 
-  12 Sep 2004; Bryan �stergaard <kloeri@gentoo.org> calc-2.11.9.3.ebuild:
+  12 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> calc-2.11.9.3.ebuild:
   Add ~alpha keyword, bug 62067.
 
   08 Sep 2004; <blubb@gentoo.org> calc-2.11.9.3.ebuild:
@@ -31,5 +40,5 @@
 *calc-2.11.9.3 (11 Mar 2004)
 
   11 Mar 2004; Peter Bienstman <pbienst@gentoo.org> calc-2.11.9.3.ebuild:
-  New app, thanks to Jos� Romildo Malaquias <romildo@uber.com.br> (#38736)
+  New app, thanks to José Romildo Malaquias <romildo@uber.com.br> (#38736)
 
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index e236fdbf33a2..697c99969e52 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,6 +1,6 @@
-MD5 034b32ebc1301127ef29a19076550a2f ChangeLog 981
-MD5 6c88949bf12e51e5cda8882de4437f4b calc-2.11.9.3.ebuild 996
+MD5 af6f4c89a1a127d9bd7d89e84a25c5b5 ChangeLog 1510
+MD5 b0b031942c83c5f109a42564aa738673 calc-2.11.10.1.ebuild 1013
+MD5 4c44ad810290371eb0123023fa0c0605 calc-2.11.9.3.ebuild 1004
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 272db5eaee620f89da0073476f156438 calc-2.11.10.1.ebuild 998
-MD5 aedaccd22126ab6a17ed25191a32325d files/digest-calc-2.11.9.3 65
 MD5 b25b154cc59b2f742c8a23d1cee01783 files/digest-calc-2.11.10.1 66
+MD5 aedaccd22126ab6a17ed25191a32325d files/digest-calc-2.11.9.3 65
diff --git a/sci-mathematics/calc/calc-2.11.10.1.ebuild b/sci-mathematics/calc/calc-2.11.10.1.ebuild
index a06089af60d4..dbd8b10a26c6 100644
--- a/sci-mathematics/calc/calc-2.11.10.1.ebuild
+++ b/sci-mathematics/calc/calc-2.11.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/sci-mathematics/calc/calc-2.11.10.1.ebuild,v 1.1 2004/12/28 05:00:44 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.11.10.1.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 DESCRIPTION="An arbitrary precision C-like arithmetic system"
 HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/sci-mathematics/calc/calc-2.11.9.3.ebuild b/sci-mathematics/calc/calc-2.11.9.3.ebuild
index c7cbaa0c7656..28a1595a4aaa 100644
--- a/sci-mathematics/calc/calc-2.11.9.3.ebuild
+++ b/sci-mathematics/calc/calc-2.11.9.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/sci-mathematics/calc/calc-2.11.9.3.ebuild,v 1.1 2004/12/28 05:00:44 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.11.9.3.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 DESCRIPTION="An arbitrary precision C-like arithmetic system"
 HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="x86 ~ppc ~amd64 ~alpha ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~ppc ~ppc-macos x86"
 
 IUSE=""
 
diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index 595cc2abfa78..08c36f042eae 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for app-sci/coq
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.1 2004/12/28 05:03:02 ribosome Exp $
+# ChangeLog for sci-mathematics/coq
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
+
+  13 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> coq-8.0-r1.ebuild:
+  added ~amd64 to KEYWORDS, fixes #88950
 
 *coq-8.0-r1 (28 Dec 2004)
 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 0d8a82e0cdcc..b99382b255e2 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,8 +1,11 @@
-MD5 4b3e22466363130a7a799228534043a2 coq-8.0.ebuild 1910
-MD5 2559fb0ebf76645f855752a3a18fa7d2 coq-7.4.ebuild 975
-MD5 c919fa171c61513b8683d11944adc86b ChangeLog 1538
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cb898371df21f1a9d28fa6e073a5505f coq-8.0.ebuild 1921
+MD5 ec14c64c02c2760bfd7750bb764b41df coq-7.4.ebuild 986
+MD5 26d5c8abe245a9fb5540eea4558e91bf ChangeLog 1990
 MD5 5af6b26df9264817e5b6a292c1436417 metadata.xml 238
-MD5 da62f53c7b4fab39a73e5f847ac5cad5 coq-8.0-r1.ebuild 2056
+MD5 83bfd344102e7fbd781532543b9a782f coq-8.0-r1.ebuild 2074
 MD5 02ac210c6af5d8e258a2805a22822a8b files/coq-8.0-ocaml-3.08.1.patch 1321
 MD5 dc0f737371101bc7c97b0a80165ddac6 files/digest-coq-8.0-r1 136
 MD5 d3f33f3602d82ea691f91b062dbf236b files/digest-coq-7.4 60
@@ -10,3 +13,10 @@ MD5 86922705a72292e7508baae5bc75e2a3 files/digest-coq-8.0 130
 MD5 393c3085f82f205122b4e66c94232ff7 files/ocaml-3.07.patch 333
 MD5 5d46723c29afcd1e24e529e5993c3096 files/coq-8.0-byteflags.patch 676
 MD5 e5491c930f8f944ed9c3590fdc8492c1 files/coqide.desktop 242
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCXWdV06ebR+OMO78RAirZAJ97+fqd3K/MqyD8YQSs2fLeyY1xZwCfX1WV
+N1PToVe395/xJCpJinFj9lQ=
+=+SOF
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-7.4.ebuild b/sci-mathematics/coq/coq-7.4.ebuild
index 1c168e0cbd55..9ec061c5158f 100644
--- a/sci-mathematics/coq/coq-7.4.ebuild
+++ b/sci-mathematics/coq/coq-7.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/sci-mathematics/coq/coq-7.4.ebuild,v 1.1 2004/12/28 05:03:02 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-7.4.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/coq/coq-8.0-r1.ebuild b/sci-mathematics/coq/coq-8.0-r1.ebuild
index 27f98d532cb5..c001dca0d3b2 100644
--- a/sci-mathematics/coq/coq-8.0-r1.ebuild
+++ b/sci-mathematics/coq/coq-8.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/sci-mathematics/coq/coq-8.0-r1.ebuild,v 1.1 2004/12/28 05:03:02 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit eutils
 
@@ -18,7 +18,7 @@ translator? ( ftp://ftp.inria.fr/INRIA/coq/V${MY_PV}/${MY_P}-translator.tar.gz )
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND=">=dev-lang/ocaml-3.06
 ide? ( >=dev-ml/lablgtk-2.2.0 )"
diff --git a/sci-mathematics/coq/coq-8.0.ebuild b/sci-mathematics/coq/coq-8.0.ebuild
index 24fbf597ff94..3b19f5647c1a 100644
--- a/sci-mathematics/coq/coq-8.0.ebuild
+++ b/sci-mathematics/coq/coq-8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.0.ebuild,v 1.1 2004/12/28 05:03:02 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.0.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/drgeo/ChangeLog b/sci-mathematics/drgeo/ChangeLog
index beb7775ad436..5fa56e1dfda2 100644
--- a/sci-mathematics/drgeo/ChangeLog
+++ b/sci-mathematics/drgeo/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for app-sci/drgeo
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.1 2004/12/28 05:04:51 ribosome Exp $
+# ChangeLog for sci-mathematics/drgeo
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/ChangeLog,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
+
+*drgeo-1.1.0 (23 Aug 2005)
+
+  23 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> +drgeo-1.1.0.ebuild:
+  Version bump, closes bug 101823.
+
+  26 Jul 2005; Marcus D. Hanwell <cryos@gentoo.org> -drgeo-0.9.14.ebuild:
+  Remove old version.
+
+  10 May 2005; Marcus D. Hanwell <cryos@gentoo.org> metadata.xml,
+  drgeo-1.0.0.ebuild:
+  Stable on amd64 and x86. Updated metadata.
+
+*drgeo-1.0.0 (08 Apr 2005)
+
+  08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +drgeo-1.0.0.ebuild:
+  Version bump with a few ebuild clean ups.
+
+  18 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> -drgeo-0.9.12.ebuild:
+  Removing old ebuild.
+
+  06 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> drgeo-0.9.14.ebuild:
+  Marked stable on amd64 and x86.
 
 *drgeo-0.9.14 (28 Dec 2004)
 
diff --git a/sci-mathematics/drgeo/Manifest b/sci-mathematics/drgeo/Manifest
index 4f0c817a66c2..b988ffb22cc7 100644
--- a/sci-mathematics/drgeo/Manifest
+++ b/sci-mathematics/drgeo/Manifest
@@ -1,6 +1,16 @@
-MD5 6e641e21b08e189bedb9dca934865c3a drgeo-0.9.12.ebuild 637
-MD5 96498aa1f1d8200ba88b2091c45cb7ef drgeo-0.9.14.ebuild 1143
-MD5 2a4377ef287925cac54322864b24afca ChangeLog 1131
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 9ea30754ac7c2be75033142b679dcb0d files/digest-drgeo-0.9.12 65
-MD5 071a0455c3fec522e4561a64a2cdbf2f files/digest-drgeo-0.9.14 131
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 273718ad3a91623d0f6323f47b62426f drgeo-1.0.0.ebuild 1271
+MD5 44c3de441db451949ceb29087759fe21 ChangeLog 2082
+MD5 b7754813bc9622131031666d24ae5db7 metadata.xml 635
+MD5 e11f743e7c958399212196378285ef13 drgeo-1.1.0.ebuild 1273
+MD5 2517f39945f64a2eafa7c8cd288efbec files/digest-drgeo-1.0.0 130
+MD5 a1b6304f55623103659e59a8dfb286b2 files/digest-drgeo-1.1.0 130
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDEPsPntT9W3vfTuoRAl+KAJ9CvsZ+MZKFHsxGK2ul0+K/ebtVVgCfQ2ek
+eDB14ddfx/cJ40ELJUFhvKo=
+=eAyV
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/drgeo/drgeo-1.0.0.ebuild b/sci-mathematics/drgeo/drgeo-1.0.0.ebuild
index cc67c74914c5..0a4b9624420f 100644
--- a/sci-mathematics/drgeo/drgeo-1.0.0.ebuild
+++ b/sci-mathematics/drgeo/drgeo-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/sci-mathematics/drgeo/drgeo-1.0.0.ebuild,v 1.1 2005/04/08 14:40:31 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 DOCN="${PN}-doc"
 DOCV="1.5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/ofset/${P}.tar.gz
 	mirror://sourceforge/ofset/${DOC}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE="nls no-helpbrowser"
 
 DEPEND=">=x11-libs/gtk+-2
diff --git a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild b/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
index c149bddcad88..da00b19455c5 100644
--- a/sci-mathematics/drgeo/drgeo-1.1.0.ebuild
+++ b/sci-mathematics/drgeo/drgeo-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/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.1 2005/08/23 14:40:25 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/drgeo/drgeo-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 DOCN="${PN}-doc"
 DOCV="1.5"
diff --git a/sci-mathematics/drgeo/metadata.xml b/sci-mathematics/drgeo/metadata.xml
index b229aec85b8f..fd19a2f25d00 100644
--- a/sci-mathematics/drgeo/metadata.xml
+++ b/sci-mathematics/drgeo/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>sci</herd>
+  <herd>sci</herd>
+  <maintainer>
+    <email>cryos@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    Dr. Geo is a GTK2 interactive geometry software. It allows one to create
+	geometric figure plus the interactive manipulation of such figure in respect
+	with their geometric constraints. It is useable in teaching situation with
+	students from primary or secondary level. It also features an integrated
+	Scheme programming language to define scripts within a figure.
+  </longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/euler/ChangeLog b/sci-mathematics/euler/ChangeLog
index 3235aac82ae0..f27e2c5b0101 100644
--- a/sci-mathematics/euler/ChangeLog
+++ b/sci-mathematics/euler/ChangeLog
@@ -1,6 +1,17 @@
-# ChangeLog for app-sci/euler
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/ChangeLog,v 1.1 2004/12/28 05:20:30 ribosome Exp $
+# ChangeLog for sci-mathematics/euler
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/ChangeLog,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -euler-1.60.6.ebuild:
+  Removed obsolete version.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  euler-1.60.6-r1.ebuild:
+  Stable on ppc.
+
+  11 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> euler-1.60.6-r1.ebuild,
+  euler-1.60.6.ebuild:
+  Keyworded -sparc, it's duff
 
 *euler-1.60.6 (28 Dec 2004)
 
diff --git a/sci-mathematics/euler/Manifest b/sci-mathematics/euler/Manifest
index 9b55f96c2be1..d67aec46ce74 100644
--- a/sci-mathematics/euler/Manifest
+++ b/sci-mathematics/euler/Manifest
@@ -1,8 +1,6 @@
-MD5 a8593fa356b51fe6d542bbc2efbe530b euler-1.60.6.ebuild 1200
-MD5 11433b0f58d7ea69bec41594d5d1a316 euler-1.60.6-r1.ebuild 1250
-MD5 d2d02447d1d9b8fcdb9228d9e84d0448 ChangeLog 2427
+MD5 1e9c619b86892f3ce3cc1f52626ed1da euler-1.60.6-r1.ebuild 1255
+MD5 b4d0635e11466c626dbb6239e4660eba ChangeLog 3042
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6 64
 MD5 797a67ee56e452b239fbadb6a9a8c319 files/euler-1.60.6.patch 284
 MD5 25c07f2cd7585d6b674ba310cf33fafa files/digest-euler-1.60.6-r1 64
 MD5 9efb40aa017b65e543bc280229e78da6 files/euler-1.60-compound_statements.patch 851
diff --git a/sci-mathematics/euler/euler-1.60.6-r1.ebuild b/sci-mathematics/euler/euler-1.60.6-r1.ebuild
index 37ad316ee516..6735b8dc2230 100644
--- a/sci-mathematics/euler/euler-1.60.6-r1.ebuild
+++ b/sci-mathematics/euler/euler-1.60.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/euler-1.60.6-r1.ebuild,v 1.1 2004/12/28 05:20:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/euler/euler-1.60.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
 
 inherit eutils
 IUSE=""
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/euler/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc amd64"
+KEYWORDS="x86 ppc -sparc amd64"
 
 DEPEND="virtual/libc
 	virtual/x11
diff --git a/sci-mathematics/fann/ChangeLog b/sci-mathematics/fann/ChangeLog
index 1eca141aec5c..3f97f4454d8e 100644
--- a/sci-mathematics/fann/ChangeLog
+++ b/sci-mathematics/fann/ChangeLog
@@ -1,6 +1,17 @@
-# ChangeLog for app-sci/fann
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/ChangeLog,v 1.1 2004/12/28 21:57:36 ribosome Exp $
+# ChangeLog for sci-mathematics/fann
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/ChangeLog,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
+
+  24 Aug 2005; Christian Andreetta <satya@gentoo.org> fann-1.2.0.ebuild,
+  fann-1.2.0-r1.ebuild:
+  'cp -pPR' instead of 'cp -a' required by Darwin and BSD (bug #103487)
+
+*fann-1.2.0-r1 (04 Jan 2005)
+
+  04 Jan 2005; Christian Andreetta <satya@gentoo.org>
+  +files/fann-1.2.0-r1.patch, +fann-1.2.0-r1.ebuild:
+  python bindings patch by Martin Renold.
+  (http://old.homeip.net/martin/fann-python-bindings.patch)
 
 *fann-1.2.0 (28 Dec 2004)
 
diff --git a/sci-mathematics/fann/Manifest b/sci-mathematics/fann/Manifest
index efcb44325307..1905e5c2af0c 100644
--- a/sci-mathematics/fann/Manifest
+++ b/sci-mathematics/fann/Manifest
@@ -1,5 +1,8 @@
-MD5 7f71462c7f520e6adaa523e034f32a5d ChangeLog 360
+MD5 81fbc5e7550d18d1cea1a48f1a91fa45 fann-1.2.0-r1.ebuild 2498
+MD5 cf753889b6608fc285d9bf5bf4e5b0e9 ChangeLog 983
 MD5 a1a8f7b84e93c6954c7a492419204578 metadata.xml 700
-MD5 52ac2e5a4653da9135c3a8e46b7773e8 fann-1.2.0.ebuild 2418
+MD5 8d603efe483abb2cfa0a55fda15598eb fann-1.2.0.ebuild 2430
+MD5 2f3e1ec485ad30450d503501c4d67912 files/digest-fann-1.2.0-r1 64
 MD5 2f3e1ec485ad30450d503501c4d67912 files/digest-fann-1.2.0 64
+MD5 b5581af0afa35074fc76a910ae6e9b5c files/fann-1.2.0-r1.patch 14130
 MD5 c3136d6017e2e2debb0c8518543a9900 files/fann-1.2.0-setup.py 1503
diff --git a/sci-mathematics/fann/fann-1.2.0-r1.ebuild b/sci-mathematics/fann/fann-1.2.0-r1.ebuild
index 3e0cf7cf8e6f..7037df89fa67 100644
--- a/sci-mathematics/fann/fann-1.2.0-r1.ebuild
+++ b/sci-mathematics/fann/fann-1.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/sci-mathematics/fann/fann-1.2.0-r1.ebuild,v 1.1 2005/01/04 11:37:55 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-1.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
 
 inherit eutils
 #-----------------------------------------------------------------------------
@@ -51,11 +51,11 @@ src_install() {
 		einfo "doc ---------------------------------"
 		dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 		insinto /usr/share/doc/${PF}/benchmarks
-		cp -a ${S}/benchmarks/* ${D}/usr/share/doc/${PF}/benchmarks
+		cp -pPR ${S}/benchmarks/* ${D}/usr/share/doc/${PF}/benchmarks
 		insinto /usr/share/doc/${PF}/examples/c
 		doins ${S}/examples/*
 		insinto /usr/share/doc/${PF}/html
-		cp -a doc/html/* ${D}/usr/share/doc/${PF}/html
+		cp -pPR doc/html/* ${D}/usr/share/doc/${PF}/html
 		insinto /usr/share/doc/${PF}/pdf
 		doins doc/*pdf
 	fi
diff --git a/sci-mathematics/fann/fann-1.2.0.ebuild b/sci-mathematics/fann/fann-1.2.0.ebuild
index f64c7f31f068..e6cae5d50b32 100644
--- a/sci-mathematics/fann/fann-1.2.0.ebuild
+++ b/sci-mathematics/fann/fann-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-1.2.0.ebuild,v 1.1 2004/12/28 21:57:36 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
 
 inherit eutils
 #-----------------------------------------------------------------------------
@@ -49,11 +49,11 @@ src_install() {
 		einfo "doc ---------------------------------"
 		dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 		insinto /usr/share/doc/${PF}/benchmarks
-		cp -a ${S}/benchmarks/* ${D}/usr/share/doc/${PF}/benchmarks
+		cp -pPR ${S}/benchmarks/* ${D}/usr/share/doc/${PF}/benchmarks
 		insinto /usr/share/doc/${PF}/examples/c
 		doins ${S}/examples/*
 		insinto /usr/share/doc/${PF}/html
-		cp -a doc/html/* ${D}/usr/share/doc/${PF}/html
+		cp -pPR doc/html/* ${D}/usr/share/doc/${PF}/html
 		insinto /usr/share/doc/${PF}/pdf
 		doins doc/*pdf
 	fi
diff --git a/sci-mathematics/geomview/ChangeLog b/sci-mathematics/geomview/ChangeLog
index fb7fa06d0f4e..b195a69f0685 100644
--- a/sci-mathematics/geomview/ChangeLog
+++ b/sci-mathematics/geomview/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-sci/geomview
+# ChangeLog for sci-mathematics/geomview
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.1 2004/12/28 05:28:11 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
 
 *geomview-1.8.1-r3 (28 Dec 2004)
 
diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest
index 1e80ed1a1927..3497fba26dc1 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -1,6 +1,16 @@
-MD5 dafaee6979042fbea5d26761057f9c35 ChangeLog 1012
-MD5 7c7ab93b69e1701c89c2c69a091dc678 geomview-1.8.1-r3.ebuild 829
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2aeba514c28e0d283ef2b72f25f52afe ChangeLog 1301
+MD5 198d709a2060c952b869fd28e23f286b geomview-1.8.1-r3.ebuild 839
 MD5 3fbaa47f9b0997b5153ab4c51e2543e8 metadata.xml 418
 MD5 3d18ce933a28b57ce8532b5855eb4c18 files/geomview-1.8.1-configure.diff 345
 MD5 516cbbb8f525f64c20a456811b93c9fc files/geomview-1.8.1-stdiostream.diff 3679
 MD5 4a24ace30f19b0c7d510c15d67f60ee2 files/digest-geomview-1.8.1-r3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB0b0QI1lqEGTUzyQRAjZtAKDUKEIRtDvvelv1mm73CB+91UxLIgCgzwP4
+7CeroG4XsbpppNps4CGvKUc=
+=p1qM
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild b/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild
index b9d772af16b1..a3e54a452dec 100644
--- a/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild
+++ b/sci-mathematics/geomview/geomview-1.8.1-r3.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/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild,v 1.1 2004/12/28 05:28:11 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.8.1-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/sci-mathematics/gimps/ChangeLog b/sci-mathematics/gimps/ChangeLog
index 926896b6421d..ad8af9a2a68a 100644
--- a/sci-mathematics/gimps/ChangeLog
+++ b/sci-mathematics/gimps/ChangeLog
@@ -1,6 +1,51 @@
-# ChangeLog for app-sci/gimps
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.1 2004/12/28 05:30:36 ribosome Exp $
+# ChangeLog for sci-mathematics/gimps
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
+
+*gimps-24.14-r1 (06 Nov 2005)
+
+  06 Nov 2005; Michał Januszewski <spock@gentoo.org>
+  +files/gimps-24.14-conf.d, +files/gimps-24.14-init.d,
+  +gimps-24.14-r1.ebuild:
+  Updated the initscript to use start-stop-daemon. Added the option to run
+  mprime as a non-root user (bug #107168).
+
+  12 Oct 2005; Luis Medinas <metalgod@gentoo.org> gimps-24.14.ebuild:
+  Marked Stable on amd64. Bug #108265.
+
+  17 Sep 2005; Michał Januszewski <spock@gentoo.org> gimps-24.14.ebuild:
+  Changed the info messages about starting gimps manually (bug #106039).
+  Marked 24.14 stable on x86.
+
+  26 Aug 2005; Michał Januszewski <spock@gentoo.org> -gimps-24.6.ebuild,
+  gimps-24.13.ebuild, gimps-24.14.ebuild:
+  Changed 'chown root:root' to 'chown root:0' (bug #103563). Removed old
+  ebuild. Marked 24.13 stable on x86.
+
+*gimps-24.14 (16 Aug 2005)
+
+  16 Aug 2005; Michał Januszewski <spock@gentoo.org> -gimps-23.5.ebuild,
+  -gimps-23.9-r1.ebuild, +gimps-24.14.ebuild:
+  Version bump (bug #102210). Removed old ebuilds. 
+
+*gimps-24.13 (13 Jul 2005)
+
+  13 Jul 2005; Michał Januszewski <spock@gentoo.org> +gimps-24.13.ebuild:
+  Version bump. Closes #98867.
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org> gimps-24.6.ebuild:
+  Marked stable on x86.
+
+  14 Apr 2005; Michał Januszewski <spock@gentoo.org> files/gimps-conf.d:
+  Fixed comments in the config file (bug #89129).
+
+  04 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org> gimps-24.6.ebuild:
+  Added to ~amd64, bug #76320
+
+*gimps-24.6 (28 Dec 2004)
+
+  28 Dec 2004; Michal Januszewski <spock@gentoo.org> +gimps-24.6.ebuild:
+  Version bump. Closes #74981.
 
 *gimps-23.5 (28 Dec 2004)
 
@@ -38,7 +83,7 @@
 
 *gimps-23.5 (23 Jan 2004)
 
-  23 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+  23 Jan 2004; Michal Januszewski <spock@gentoo.org>
   gimps-23.5.ebuild, metadata.xml:
   Initial commit, closes bug #38010.
 
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 0bd1bb77a35f..07beb206cb67 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -1,8 +1,22 @@
-MD5 559311cca11f35633fc61b65c698bf36 gimps-23.9-r1.ebuild 1423
-MD5 2c6ac7ba285dd90f0bbb91c1c0371a73 gimps-23.5.ebuild 1417
-MD5 d9950e24f04ad4e5b8aed06872270c74 ChangeLog 1244
-MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 1e5892c6e82e3ad26032af4e0637a493 files/gimps-conf.d 283
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0df68817c5cdeb9b785f9ca596860f5d ChangeLog 3085
+MD5 d84449f9d7cdf190e22c6be4ccd485fa files/digest-gimps-24.13 62
+MD5 59b44ec0de10774c77941413d23f7608 files/digest-gimps-24.14 62
+MD5 59b44ec0de10774c77941413d23f7608 files/digest-gimps-24.14-r1 62
+MD5 317ec6140b05f0e8fbb5eab409f0ef4a files/gimps-24.14-conf.d 306
+MD5 b7719db3d3bfe39c0df6d95b34691d5c files/gimps-24.14-init.d 686
+MD5 33a08082d7b3dfeef6076ff5a4bdb1d0 files/gimps-conf.d 276
 MD5 f7593578a8d077eda7d23c5a894ff1d9 files/gimps-init.d 535
-MD5 c3bae23e497746877bbd06134c1edd8e files/digest-gimps-23.9-r1 61
-MD5 6b074ac7234f04005d756b656851a22b files/digest-gimps-23.5 61
+MD5 66ef0bb965fdfd6791cf3ea20a37c5a6 gimps-24.13.ebuild 1565
+MD5 f163430b9e6ca6524881736eff8f8213 gimps-24.14-r1.ebuild 1614
+MD5 936cb0c6477a4c19f39342db7a23952a gimps-24.14.ebuild 1600
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbge5chej4aZK9/cRAo4RAJ95sfWpRKRFdOSdVg/5VzK4e1JFgQCdG2sd
+9amI2ouihRUvWwBe4DYtX5E=
+=hx+A
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gimps/files/digest-gimps-24.13 b/sci-mathematics/gimps/files/digest-gimps-24.13
index d20e25490a74..08fac32b235d 100644
--- a/sci-mathematics/gimps/files/digest-gimps-24.13
+++ b/sci-mathematics/gimps/files/digest-gimps-24.13
@@ -1 +1 @@
-MD5 b9201e32e84255b5a8963562088dbd85 mprime2413.tar.gz 659248
+MD5 7d18a7e57deb5255156b4885492806ba sprime2413.tar.gz 885726
diff --git a/sci-mathematics/gimps/files/gimps-conf.d b/sci-mathematics/gimps/files/gimps-conf.d
index 7e285f6ec2a0..251e681fc145 100644
--- a/sci-mathematics/gimps/files/gimps-conf.d
+++ b/sci-mathematics/gimps/files/gimps-conf.d
@@ -7,6 +7,6 @@ GIMPS_CPUS="1"
 # for more info, `mprime -h`
 # GIMPS_OPTIONS=""
 
-# this is the directory where setiathome's run-time
+# this is the directory where GIMPS run-time
 # data files will be stored
 GIMPS_DIR=/var/lib/gimps
diff --git a/sci-mathematics/gimps/gimps-24.13.ebuild b/sci-mathematics/gimps/gimps-24.13.ebuild
index a8dd3944bc03..38073f7adbdc 100644
--- a/sci-mathematics/gimps/gimps-24.13.ebuild
+++ b/sci-mathematics/gimps/gimps-24.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/sci-mathematics/gimps/gimps-24.13.ebuild,v 1.1 2005/07/13 21:04:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-24.13.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
@@ -14,7 +14,7 @@ DEPEND=">=sys-apps/baselayout-1.8.0
 	>=sys-libs/glibc-2.1"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 ~amd64"
 
 S="${WORKDIR}"
 I="/opt/gimps"
@@ -25,8 +25,8 @@ src_install () {
 	dodir ${I} /var/lib/gimps
 	cp mprime ${D}/${I}
 	chmod a-w ${D}/${I}/mprime
-	chown root:root ${D}/${I}
-	chown root:root ${D}/${I}/mprime
+	chown root:0 ${D}/${I}
+	chown root:0 ${D}/${I}/mprime
 
 	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
 
diff --git a/sci-mathematics/gimps/gimps-24.14-r1.ebuild b/sci-mathematics/gimps/gimps-24.14-r1.ebuild
index 64c87fd332ef..66ff65645fbf 100644
--- a/sci-mathematics/gimps/gimps-24.14-r1.ebuild
+++ b/sci-mathematics/gimps/gimps-24.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-24.14-r1.ebuild,v 1.1 2005/11/06 13:38:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-24.14-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
diff --git a/sci-mathematics/gimps/gimps-24.14.ebuild b/sci-mathematics/gimps/gimps-24.14.ebuild
index d35f60d88d99..9176369c407a 100644
--- a/sci-mathematics/gimps/gimps-24.14.ebuild
+++ b/sci-mathematics/gimps/gimps-24.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/sci-mathematics/gimps/gimps-24.14.ebuild,v 1.1 2005/08/16 16:14:18 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-24.14.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="GIMPS - The Great Internet Mersenne Prime Search"
@@ -14,7 +14,7 @@ DEPEND=">=sys-apps/baselayout-1.8.0
 	>=sys-libs/glibc-2.1"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* amd64 x86"
 
 S="${WORKDIR}"
 I="/opt/gimps"
@@ -25,8 +25,8 @@ src_install () {
 	dodir ${I} /var/lib/gimps
 	cp mprime ${D}/${I}
 	chmod a-w ${D}/${I}/mprime
-	chown root:root ${D}/${I}
-	chown root:root ${D}/${I}/mprime
+	chown root:0 ${D}/${I}
+	chown root:0 ${D}/${I}/mprime
 
 	dodoc license.txt readme.txt stress.txt whatsnew.txt undoc.txt
 
@@ -40,9 +40,10 @@ pkg_postinst () {
 	einfo "background at boot. Have a look at /etc/conf.d/gimps and check some"
 	einfo "configuration options."
 	einfo
-	einfo "If you don't want to use the init script to start gimps, remember"
-	einfo "to cd into the directory where the data files are to be stored first, eg.:"
-	einfo "   cd /var/lib/gimps && ${I}/mprime"
+	einfo "If you don't want to use the init script to start gimps, remember to"
+	einfo "pass it an additional command line parameter specifying where the data"
+	einfo "files are to be stored, eg.:"
+	einfo "   ${I}/mprime -w/var/lib/gimps"
 	echo
 }
 
diff --git a/sci-mathematics/ginac/ChangeLog b/sci-mathematics/ginac/ChangeLog
index d02fe6a54455..22484a4eb218 100644
--- a/sci-mathematics/ginac/ChangeLog
+++ b/sci-mathematics/ginac/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for app-sci/ginac
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.1 2004/12/28 05:33:41 ribosome Exp $
+# ChangeLog for sci-mathematics/ginac
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ChangeLog,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -ginac-1.1.3.ebuild,
+  -ginac-1.1.6.ebuild:
+  Removed obsolete versions.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> ginac-1.2.3.ebuild:
+  Dependency update: dev-libs/cln -> sci-libs/cln.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> ginac-1.1.6.ebuild:
+  Dependency update: dev-libs/cln -> sci-libs/cln.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> ginac-1.1.3.ebuild:
+  Dependency update: dev-libs/cln -> sci-libs/cln.
 
 *ginac-1.1.6 (28 Dec 2004)
 
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 7f6c53587efd..49853d5b23ef 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,8 +1,4 @@
-MD5 409a9e3cbe6ff688986b5c960b66d5df ginac-1.2.3.ebuild 695
-MD5 66b3aad52cca0700e8bf14d81084aa49 ginac-1.1.6.ebuild 696
-MD5 7774d0e34ed27d26992aa2f189b50c38 ChangeLog 1368
+MD5 047751a8cc0ccd9fbbfd3fc8bb572520 ginac-1.2.3.ebuild 703
+MD5 8cac7a5f8335be0547bd2780fb1f32f0 ChangeLog 2103
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 de1aaa4b611385c599981a5224b9e314 ginac-1.1.3.ebuild 695
-MD5 d2ea63bca4f3db9789c13a7a568ed185 files/digest-ginac-1.1.3 64
-MD5 4007ab2506865c9eda6f28459c9521dc files/digest-ginac-1.1.6 64
 MD5 f4742264ea978194ec2b9c9c196d4e8f files/digest-ginac-1.2.3 64
diff --git a/sci-mathematics/ginac/ginac-1.2.3.ebuild b/sci-mathematics/ginac/ginac-1.2.3.ebuild
index 7609b84901aa..af23468cc550 100644
--- a/sci-mathematics/ginac/ginac-1.2.3.ebuild
+++ b/sci-mathematics/ginac/ginac-1.2.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/sci-mathematics/ginac/ginac-1.2.3.ebuild,v 1.1 2004/12/28 05:33:41 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ginac/ginac-1.2.3.ebuild,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
 
 IUSE=""
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc"
 
-DEPEND="dev-libs/cln"
+DEPEND="sci-libs/cln"
 
 src_compile() {
 	filter-flags "-funroll-loops -frerun-loop-opt"
diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 243a25ded956..e73520a720cd 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for app-sci/glpk
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.1 2004/12/28 05:39:58 ribosome Exp $
+# ChangeLog for sci-mathematics/glpk
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
+
+*glpk-4.8 (21 Sep 2005)
+
+  21 Sep 2005; Olivier Fisette <ribosome@gentoo.org> +glpk-4.8.ebuild:
+  New version. Documents and examples are now installed into proper locations
+  (fixes bug #106520). Thanks to Markus Dittrich <markusle@gmail.com> for his
+  work.
+
+  06 May 2005; David Holm <dholm@gentoo.org> glpk-4.7.ebuild:
+  Added to ~ppc.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> glpk-4.7.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  06 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> -glpk-4.2.ebuild,
+  glpk-4.7.ebuild: 
+  4.7 in stable x86 now, and old 4.2 removed from tree for bug #55139.
 
 *glpk-4.7 (28 Dec 2004)
 
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index dc8235d8c29b..2af3531e11d3 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0d2287c4f916c2cedcd500b1fa6d1344 glpk-4.7.ebuild 896
-MD5 e0c7435f781d0ab5995459c90e3d274a glpk-4.2.ebuild 1510
-MD5 ea2ea1a0ff7707907351d6556a65b46e ChangeLog 969
+MD5 5fdadd8dc3d3171236a7ef2b6b6c2ba6 glpk-4.8.ebuild 1080
+MD5 7d861a12f224b0cd985efbabf8265588 glpk-4.7.ebuild 903
+MD5 838ee756642dcba953bd64c5f3ab798a ChangeLog 1794
 MD5 f9b985eff5cf629c334273be8fbdee5c metadata.xml 219
-MD5 19c5df347fc8cf8bcfec4351c072bdcf files/digest-glpk-4.2 61
 MD5 8b0aabaae9e61d7aa12c4bb982b2a996 files/digest-glpk-4.7 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo0bsZ/iYVBmujdURAqsRAJ9K9pAiwKdprgVFgFGyRn3tADYLZgCg8T0X
-HEcTSzelcKWH2oEfmkxXADk=
-=nofV
------END PGP SIGNATURE-----
+MD5 24b218cfde877d055613cae7fe421cd9 files/digest-glpk-4.8 60
diff --git a/sci-mathematics/glpk/glpk-4.7.ebuild b/sci-mathematics/glpk/glpk-4.7.ebuild
index 393ee2010561..a52b39853cd0 100644
--- a/sci-mathematics/glpk/glpk-4.7.ebuild
+++ b/sci-mathematics/glpk/glpk-4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.7.ebuild,v 1.1 2004/12/28 05:39:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.7.ebuild,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
 
 DESCRIPTION="GNU Linear Programming Kit"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -8,11 +8,11 @@ HOMEPAGE="http://www.gnu.org/software/glpk/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="doc"
 
 RDEPEND="sys-libs/glibc"
-DEPEND=">=sys-devel/gcc-3.2* ${RDEPEND}
+DEPEND=">=sys-devel/gcc-3.2 ${RDEPEND}
 		 doc? ( virtual/ghostscript )"
 
 src_compile() {
diff --git a/sci-mathematics/glpk/glpk-4.8.ebuild b/sci-mathematics/glpk/glpk-4.8.ebuild
index 5d3653175cbe..c3f86725163f 100644
--- a/sci-mathematics/glpk/glpk-4.8.ebuild
+++ b/sci-mathematics/glpk/glpk-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/sci-mathematics/glpk/glpk-4.8.ebuild,v 1.1 2005/09/21 00:58:28 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.8.ebuild,v 1.1.1.1 2005/11/30 09:55:51 chriswhite Exp $
 
 DESCRIPTION="GNU Linear Programming Kit"
 LICENSE="GPL-2"
diff --git a/sci-mathematics/gturing/ChangeLog b/sci-mathematics/gturing/ChangeLog
index 7aa339b52ab0..f1939ea906ed 100644
--- a/sci-mathematics/gturing/ChangeLog
+++ b/sci-mathematics/gturing/ChangeLog
@@ -1,6 +1,10 @@
-# ChangeLog for app-sci/gturing
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gturing/ChangeLog,v 1.1 2004/12/28 05:48:07 ribosome Exp $
+# ChangeLog for sci-mathematics/gturing
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gturing/ChangeLog,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
+
+  23 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
+  +files/gturing-0.1.1-gettext.patch, gturing-0.1.1.ebuild:
+  Added example files (fixes bug #96002). Fixed GCC 3.4 issues.
 
 *gturing-0.1.1 (28 Dec 2004)
 
diff --git a/sci-mathematics/gturing/Manifest b/sci-mathematics/gturing/Manifest
index ec1571d21003..593d3b179a4c 100644
--- a/sci-mathematics/gturing/Manifest
+++ b/sci-mathematics/gturing/Manifest
@@ -1,4 +1,5 @@
-MD5 b097deefccfa58d14c0c587be84d9b8f gturing-0.1.1.ebuild 601
-MD5 9a45939b3ad80c825ebc840ae461b025 ChangeLog 653
+MD5 cd56ea5911c164818eb4ad67ecdf314a gturing-0.1.1.ebuild 754
+MD5 fc3b3bccdfd66aa1e1b20e3157dcfead ChangeLog 1016
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 4e495972145cafe97e445160e6cde60e files/digest-gturing-0.1.1 66
+MD5 e93c10925468636db26e343be058ff99 files/gturing-0.1.1-gettext.patch 418
diff --git a/sci-mathematics/gturing/gturing-0.1.1.ebuild b/sci-mathematics/gturing/gturing-0.1.1.ebuild
index 98ee15a64413..1aa90bf9aef7 100644
--- a/sci-mathematics/gturing/gturing-0.1.1.ebuild
+++ b/sci-mathematics/gturing/gturing-0.1.1.ebuild
@@ -1,10 +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/sci-mathematics/gturing/gturing-0.1.1.ebuild,v 1.1 2004/12/28 05:48:07 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gturing/gturing-0.1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
-DESCRIPTION="GNOME turing machine simulator for"
+inherit eutils
+
+DESCRIPTION="GNOME turing machine simulator"
 HOMEPAGE="http://www.nuclecu.unam.mx/~arturo/gTuring/"
-SRC_URI="mirror://gnome/sources/gturing/0.1/${P}.tar.bz2"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,12 +15,20 @@ IUSE=""
 
 DEPEND=">=gnome-base/libgnomeui-2.0.0"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gettext.patch
+}
+
 src_compile() {
-	econf || die "econf failed"
+	econf || die
 	emake || die
 }
 
 src_install() {
-	einstall
+	einstall || die
 	dodoc README AUTHORS NEWS TODO
+	insinto /usr/share/doc/${PF}/examples
+	doins tapes/*.tur
 }
diff --git a/sci-mathematics/kalamaris/ChangeLog b/sci-mathematics/kalamaris/ChangeLog
index 63d64ff533a4..e42c20002245 100644
--- a/sci-mathematics/kalamaris/ChangeLog
+++ b/sci-mathematics/kalamaris/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-sci/kalamaris
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kalamaris/ChangeLog,v 1.1 2004/12/28 14:24:42 ribosome Exp $
+# ChangeLog for sci-mathematics/kalamaris
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kalamaris/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+  22 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> kalamaris-0.7.1.ebuild:
+  Adding an ugly workaround for the broken 'dependency' on ARTS (bug #96757)
+
+  10 Jul 2005; Jason Wever <weeve@gentoo.org> kalamaris-0.7.1.ebuild:
+  Added ~sparc keyword.
 
 *kalamaris-0.7.1 (28 Dec 2004)
 
diff --git a/sci-mathematics/kalamaris/Manifest b/sci-mathematics/kalamaris/Manifest
index c8feb4b30334..59314e75d1c4 100644
--- a/sci-mathematics/kalamaris/Manifest
+++ b/sci-mathematics/kalamaris/Manifest
@@ -1,4 +1,4 @@
-MD5 f8376ee82e490c6f2b5cd5407f5246ae kalamaris-0.7.1.ebuild 662
-MD5 bf31cad4912d95fc664f2844b7fe5a34 ChangeLog 652
+MD5 0869bc3a9ec9eeac5250a89bf18a0959 kalamaris-0.7.1.ebuild 955
+MD5 def92bda25b0616d1e93c0e87c32d1bf ChangeLog 1110
 MD5 0ffcd41aa96cf1bcffd8b539c27957db metadata.xml 157
 MD5 428aa2f2615902e3e9c937a25a5c5cfd files/digest-kalamaris-0.7.1 68
diff --git a/sci-mathematics/kalamaris/kalamaris-0.7.1.ebuild b/sci-mathematics/kalamaris/kalamaris-0.7.1.ebuild
index 44e58f7010bb..08cf0ce4b8a1 100644
--- a/sci-mathematics/kalamaris/kalamaris-0.7.1.ebuild
+++ b/sci-mathematics/kalamaris/kalamaris-0.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kalamaris/kalamaris-0.7.1.ebuild,v 1.1 2004/12/28 14:24:42 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kalamaris/kalamaris-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
 inherit kde
 
@@ -9,13 +9,29 @@ HOMEPAGE="http://developer.kde.org/~larrosa/kalamaris.html"
 SRC_URI="http://developer.kde.org/~larrosa/bin/${P}.tar.bz2"
 LICENSE="GPL-2"
 
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~ppc ~sparc x86"
 
 DEPEND="dev-libs/gmp"
+
 need-kde 3
 
 S="${WORKDIR}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mkdir fakebin
+	for prog in mcopidl artsc-config; do
+		echo '#!/bin/sh' > fakebin/${prog}
+		chmod +x fakebin/${prog}
+	done
+}
+
+src_compile() {
+	PATH="${PATH}:${KDEDIR}/bin:fakebin" econf || die "econf failed"
+	emake || die "emake failed"
+}
+
 src_install() {
 	kde_src_install
 	insinto /usr/share/${PN}/examples
diff --git a/sci-mathematics/koctave/ChangeLog b/sci-mathematics/koctave/ChangeLog
index 0f575c99783a..36fccb6fb5a3 100644
--- a/sci-mathematics/koctave/ChangeLog
+++ b/sci-mathematics/koctave/ChangeLog
@@ -1,6 +1,37 @@
-# ChangeLog for app-sci/koctave
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/ChangeLog,v 1.1 2004/12/28 14:26:18 ribosome Exp $
+# ChangeLog for sci-mathematics/koctave
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/ChangeLog,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> koctave-0.65-r1.ebuild:
+  Stable on amd64.
+
+  20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> -koctave-0.65.ebuild,
+  koctave-0.65-r1.ebuild:
+  Changed dependency from kdebase to kdelibs (see bug #83058). Added to x86.
+  Removed old version.
+
+*koctave-0.65-r1 (05 Jun 2005)
+
+  05 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  +koctave-0.65-r1.ebuild:
+  Workaround for bug #43843. Adds documentation.
+
+  31 May 2005; Marcus D. Hanwell <cryos@gentoo.org> koctave-0.65.ebuild:
+  Update homepage and download locations.
+
+  24 Apr 2005; Jason Wever <weeve@gentoo.org> koctave-0.65.ebuild:
+  Added ~sparc keyword.
+
+  24 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/koctave-0.65-arts-configure.patch, koctave-0.65.ebuild:
+  Patched configure conditionally to allow compilation without arts. Fixes bug
+  80980.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> koctave-0.65.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.
 
 *koctave-0.65 (28 Dec 2004)
 
diff --git a/sci-mathematics/koctave/Manifest b/sci-mathematics/koctave/Manifest
index ae3349400d9b..79702f6ad2ba 100644
--- a/sci-mathematics/koctave/Manifest
+++ b/sci-mathematics/koctave/Manifest
@@ -1,4 +1,15 @@
-MD5 1af58ecccbcfbd332347dc446e138bd1 koctave-0.65.ebuild 574
-MD5 569ab55e22b33ec338a8e7ed3639f9b1 ChangeLog 681
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 183af58d7ee9453f10df87f08b912476 koctave-0.65-r1.ebuild 807
+MD5 caecd7666a4fbd1f979a9b75a6279130 ChangeLog 2116
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 c118f6e51940e1810fd2907f9edde38f files/digest-koctave-0.65 66
+MD5 4f0ca821e35f031a4ca215f4640e10d4 files/koctave-0.65-arts-configure.patch 3569
+MD5 9b94d969cb9913fb64624694df0523f4 files/digest-koctave-0.65-r1 140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDEQ0ZntT9W3vfTuoRAi0sAKCHVyGWf2LtZg5/bMh+0lsLiIuiqACfTGWB
+mCTFF30hqFeapNjJ85RGL94=
+=65EK
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/koctave/koctave-0.65-r1.ebuild b/sci-mathematics/koctave/koctave-0.65-r1.ebuild
index 8a82b57f2259..75359c3e3857 100644
--- a/sci-mathematics/koctave/koctave-0.65-r1.ebuild
+++ b/sci-mathematics/koctave/koctave-0.65-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/koctave-0.65-r1.ebuild,v 1.1 2005/06/05 19:43:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/koctave/koctave-0.65-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit kde
 
@@ -11,12 +11,13 @@ SRC_URI="http://athlone.ath.cx/~matti/kde/koctave/${PN}3-${PV}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE=""
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="arts"
+
 
 DEPEND="virtual/libc
 	sci-mathematics/octave
-	|| ( kde-base/kdebase-meta kde-base/kdebase )"
+	kde-base/kdelibs"
 
 S=${WORKDIR}/${PN}3-${PV}
 
diff --git a/sci-mathematics/ksimus-boolean/ChangeLog b/sci-mathematics/ksimus-boolean/ChangeLog
index 042c867578a0..8f1beb5b9554 100644
--- a/sci-mathematics/ksimus-boolean/ChangeLog
+++ b/sci-mathematics/ksimus-boolean/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-sci/ksimus-boolean
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-boolean/ChangeLog,v 1.1 2004/12/28 15:26:07 ribosome Exp $
+# ChangeLog for sci-mathematics/ksimus-boolean
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-boolean/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+  09 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-boolean-0.3.6.ebuild:
+  Removing unnecessary ARTS detection, see bug #100249
+
+  27 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-boolean-0.3.6.ebuild:
+  Cosmetic changes
+
+  27 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-boolean-0.3.6.ebuild:
+  Adding a patch for bug #88370 (too many ; that newer gccs don't like)
 
 *ksimus-boolean-0.3.6 (28 Dec 2004)
 
diff --git a/sci-mathematics/ksimus-boolean/Manifest b/sci-mathematics/ksimus-boolean/Manifest
index b93db39730cc..55c1cfd1f739 100644
--- a/sci-mathematics/ksimus-boolean/Manifest
+++ b/sci-mathematics/ksimus-boolean/Manifest
@@ -1,4 +1,4 @@
-MD5 27e23f06047f434471d3c7a4f7cf65c8 ksimus-boolean-0.3.6.ebuild 532
-MD5 7f80db0a566c99e0fa0958da3950a686 ChangeLog 796
+MD5 561910da32a874c9ab1c824119534e3b ksimus-boolean-0.3.6.ebuild 952
+MD5 dd6e9337ca783f668f6897ba23a70fe4 ChangeLog 1425
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 481210bbaa9d4fa6b636bdec64bcfc5a files/digest-ksimus-boolean-0.3.6 74
+MD5 884b53979f4ac4324f30e58810af7f43 files/digest-ksimus-boolean-0.3.6 158
diff --git a/sci-mathematics/ksimus-boolean/files/digest-ksimus-boolean-0.3.6 b/sci-mathematics/ksimus-boolean/files/digest-ksimus-boolean-0.3.6
index e297d3d3b4f2..67ed404059e5 100644
--- a/sci-mathematics/ksimus-boolean/files/digest-ksimus-boolean-0.3.6
+++ b/sci-mathematics/ksimus-boolean/files/digest-ksimus-boolean-0.3.6
@@ -1 +1,2 @@
 MD5 ae3db75b13a947c8ebcc952326893f83 ksimus-boolean-3-0.3.6.tar.gz 627732
+MD5 2ea8e1f7649b547a1e4c3100829007ba ksimus-boolean-0.3.6-namespaces.patch.bz2 1997
diff --git a/sci-mathematics/ksimus-boolean/ksimus-boolean-0.3.6.ebuild b/sci-mathematics/ksimus-boolean/ksimus-boolean-0.3.6.ebuild
index 6c39c45ed257..f59b1ce9d018 100644
--- a/sci-mathematics/ksimus-boolean/ksimus-boolean-0.3.6.ebuild
+++ b/sci-mathematics/ksimus-boolean/ksimus-boolean-0.3.6.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/sci-mathematics/ksimus-boolean/ksimus-boolean-0.3.6.ebuild,v 1.1 2004/12/28 15:26:07 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-boolean/ksimus-boolean-0.3.6.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
-inherit kde
+inherit kde eutils fixheadtails
 
+MYPATCH="${PN}-${PV}-namespaces.patch"
 HOMEPAGE="http://ksimus.berlios.de/"
 DESCRIPTION="The package Boolean contains some boolean components for KSimus."
 KEYWORDS="x86"
-SRC_URI="http://ksimus.berlios.de/download/ksimus-boolean-3-${PV}.tar.gz"
+SRC_URI="http://ksimus.berlios.de/download/${PN}-3-${PV}.tar.gz
+		mirror://gentoo/${MYPATCH}.bz2"
 
 LICENSE="GPL-2"
 IUSE=""
@@ -16,3 +18,16 @@ SLOT="0"
 DEPEND="sci-mathematics/ksimus"
 
 need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	unpack ${MYPATCH}.bz2
+	cd ${S}
+	epatch ${WORKDIR}/${MYPATCH}
+	ht_fix_file acinclude.m4 aclocal.m4 configure \
+			admin/acinclude.m4.in admin/cvs.sh admin/libtool.m4.in
+
+	sed -e 's/.*MISSING_ARTS_ERROR(.*//' -i admin/acinclude.m4.in || \
+			die "could not remove ARTS check"
+	make -f Makefile.dist
+}
diff --git a/sci-mathematics/ksimus-datarecorder/ChangeLog b/sci-mathematics/ksimus-datarecorder/ChangeLog
index 974b91816ebd..3bd04a3b96e2 100644
--- a/sci-mathematics/ksimus-datarecorder/ChangeLog
+++ b/sci-mathematics/ksimus-datarecorder/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-sci/ksimus-datarecorder
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-datarecorder/ChangeLog,v 1.1 2004/12/28 15:27:45 ribosome Exp $
+# ChangeLog for sci-mathematics/ksimus-datarecorder
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-datarecorder/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+  09 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-datarecorder-0.3.6.ebuild:
+  Removing unnecessary ARTS detection, see bug #100249
+
+  27 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-datarecorder-0.3.6.ebuild:
+  Fixing namespace related stuff, bug #88370
 
 *ksimus-datarecorder-0.3.6 (28 Dec 2004)
 
diff --git a/sci-mathematics/ksimus-datarecorder/Manifest b/sci-mathematics/ksimus-datarecorder/Manifest
index 6d398a8b0780..f2f6e2cb8d3a 100644
--- a/sci-mathematics/ksimus-datarecorder/Manifest
+++ b/sci-mathematics/ksimus-datarecorder/Manifest
@@ -1,4 +1,4 @@
-MD5 1b22e4e4c8eacefafada315ca9c97676 ksimus-datarecorder-0.3.6.ebuild 564
-MD5 d2f2c4d1ecd20b4bd04e3c1cf9e0142c ChangeLog 835
+MD5 f44da5b2479a071da3cef4b237d8fb3a ksimus-datarecorder-0.3.6.ebuild 978
+MD5 7c2bd1189d6a483751a9952c215f639d ChangeLog 1363
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 2aba03df1bd1b4ffdd8e552a327de184 files/digest-ksimus-datarecorder-0.3.6 79
+MD5 597a1fc7c18dc0896707a81961a43e00 files/digest-ksimus-datarecorder-0.3.6 168
diff --git a/sci-mathematics/ksimus-datarecorder/files/digest-ksimus-datarecorder-0.3.6 b/sci-mathematics/ksimus-datarecorder/files/digest-ksimus-datarecorder-0.3.6
index 280248821b7c..531290442ee4 100644
--- a/sci-mathematics/ksimus-datarecorder/files/digest-ksimus-datarecorder-0.3.6
+++ b/sci-mathematics/ksimus-datarecorder/files/digest-ksimus-datarecorder-0.3.6
@@ -1 +1,2 @@
 MD5 bd83fbe513c12dc6cd7b34df38364aa9 ksimus-datarecorder-3-0.3.6.tar.gz 606926
+MD5 67e1f5b6ebbef4578e924c8c6355b098 ksimus-datarecorder-0.3.6-namespaces.patch.bz2 1530
diff --git a/sci-mathematics/ksimus-datarecorder/ksimus-datarecorder-0.3.6.ebuild b/sci-mathematics/ksimus-datarecorder/ksimus-datarecorder-0.3.6.ebuild
index 60b5c2259048..004c9c65e170 100644
--- a/sci-mathematics/ksimus-datarecorder/ksimus-datarecorder-0.3.6.ebuild
+++ b/sci-mathematics/ksimus-datarecorder/ksimus-datarecorder-0.3.6.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/sci-mathematics/ksimus-datarecorder/ksimus-datarecorder-0.3.6.ebuild,v 1.1 2004/12/28 15:27:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-datarecorder/ksimus-datarecorder-0.3.6.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
-inherit kde
+inherit kde eutils fixheadtails
 
-DESCRIPTION="The package Data Recorder contains some components which records data for KSimus."
+MYPATCH="${PN}-${PV}-namespaces.patch"
 HOMEPAGE="http://ksimus.berlios.de/"
+DESCRIPTION="The package Data Recorder contains some components which record data for KSimus."
 KEYWORDS="x86"
-SRC_URI="http://ksimus.berlios.de/download/ksimus-datarecorder-3-${PV}.tar.gz"
+SRC_URI="http://ksimus.berlios.de/download/${PN}-3-${PV}.tar.gz
+		mirror://gentoo/${MYPATCH}.bz2"
 
 LICENSE="GPL-2"
 IUSE=""
@@ -16,3 +18,16 @@ SLOT="0"
 DEPEND="sci-mathematics/ksimus"
 
 need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	unpack ${MYPATCH}.bz2
+	cd ${S}
+	epatch ${WORKDIR}/${MYPATCH}
+	ht_fix_file acinclude.m4 aclocal.m4 configure \
+			admin/acinclude.m4.in admin/cvs.sh admin/libtool.m4.in
+
+	sed -e 's/.*MISSING_ARTS_ERROR(.*//' -i admin/acinclude.m4.in || \
+			die "could not remove ARTS check"
+	make -f Makefile.dist
+}
diff --git a/sci-mathematics/ksimus-floatingpoint/ChangeLog b/sci-mathematics/ksimus-floatingpoint/ChangeLog
index b0b72f6981f3..42e7ead0692b 100644
--- a/sci-mathematics/ksimus-floatingpoint/ChangeLog
+++ b/sci-mathematics/ksimus-floatingpoint/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-sci/ksimus-floatingpoint
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-floatingpoint/ChangeLog,v 1.1 2004/12/28 15:29:51 ribosome Exp $
+# ChangeLog for sci-mathematics/ksimus-floatingpoint
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-floatingpoint/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
+
+  09 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-floatingpoint-0.3.6.ebuild:
+  Removing unnecessary ARTS detection, see bug #100249
+
+  27 May 2005; Patrick Kursawe <phosphan@gentoo.org>
+  ksimus-floatingpoint-0.3.6.ebuild:
+  Fixing mostly namespace-related errors (bug #88370)
 
 *ksimus-floatingpoint-0.3.6 (28 Dec 2004)
 
diff --git a/sci-mathematics/ksimus-floatingpoint/Manifest b/sci-mathematics/ksimus-floatingpoint/Manifest
index 884d1d3a8e78..3600ab74589f 100644
--- a/sci-mathematics/ksimus-floatingpoint/Manifest
+++ b/sci-mathematics/ksimus-floatingpoint/Manifest
@@ -1,4 +1,4 @@
-MD5 fbc6cf4d6d3cdcbf22352ccd28398c5b ksimus-floatingpoint-0.3.6.ebuild 572
-MD5 f10b12612d937eb3dbad8bbdcea7d9d0 ChangeLog 843
+MD5 53e8e1f83c6353071c06b6e2c73d6aab ksimus-floatingpoint-0.3.6.ebuild 1035
+MD5 4a76c7a48782d69d3e390f175403ad67 ChangeLog 1388
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 16a06645b5b19dfee76ddb72fa997fb3 files/digest-ksimus-floatingpoint-0.3.6 80
+MD5 2a4ef1acfbe6501df7f06e1120742b3c files/digest-ksimus-floatingpoint-0.3.6 170
diff --git a/sci-mathematics/ksimus-floatingpoint/files/digest-ksimus-floatingpoint-0.3.6 b/sci-mathematics/ksimus-floatingpoint/files/digest-ksimus-floatingpoint-0.3.6
index 7dfa0532b5cb..3890a4b844c2 100644
--- a/sci-mathematics/ksimus-floatingpoint/files/digest-ksimus-floatingpoint-0.3.6
+++ b/sci-mathematics/ksimus-floatingpoint/files/digest-ksimus-floatingpoint-0.3.6
@@ -1 +1,2 @@
 MD5 34b4b9dc9c6f3843e0807a59b3e765f6 ksimus-floatingpoint-3-0.3.6.tar.gz 643636
+MD5 a7337714efbedb6b7b0a6b65befed1a7 ksimus-floatingpoint-0.3.6-namespaces.patch.bz2 2392
diff --git a/sci-mathematics/ksimus-floatingpoint/ksimus-floatingpoint-0.3.6.ebuild b/sci-mathematics/ksimus-floatingpoint/ksimus-floatingpoint-0.3.6.ebuild
index 2f8bf8611798..1837b26ce683 100644
--- a/sci-mathematics/ksimus-floatingpoint/ksimus-floatingpoint-0.3.6.ebuild
+++ b/sci-mathematics/ksimus-floatingpoint/ksimus-floatingpoint-0.3.6.ebuild
@@ -1,13 +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/sci-mathematics/ksimus-floatingpoint/ksimus-floatingpoint-0.3.6.ebuild,v 1.1 2004/12/28 15:29:51 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus-floatingpoint/ksimus-floatingpoint-0.3.6.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
-inherit kde
+inherit kde eutils fixheadtails
 
-DESCRIPTION="The package Floating Point contains some floating point related components for KSimus."
+MYPATCH="${PN}-${PV}-namespaces.patch"
 HOMEPAGE="http://ksimus.berlios.de/"
+DESCRIPTION="The package Floating Point contains some floating point related components for KSimus."
 KEYWORDS="x86"
-SRC_URI="http://ksimus.berlios.de/download/ksimus-floatingpoint-3-${PV}.tar.gz"
+SRC_URI="http://ksimus.berlios.de/download/${PN}-3-${PV}.tar.gz
+		mirror://gentoo/${MYPATCH}.bz2
+		http://dev.gentoo.org/~phosphan/${MYPATCH}.bz2"
 
 LICENSE="GPL-2"
 IUSE=""
@@ -16,3 +19,16 @@ SLOT="0"
 DEPEND="sci-mathematics/ksimus"
 
 need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	unpack ${MYPATCH}.bz2
+	cd ${S}
+	epatch ${WORKDIR}/${MYPATCH}
+	ht_fix_file acinclude.m4 aclocal.m4 configure \
+			admin/acinclude.m4.in admin/cvs.sh admin/libtool.m4.in
+
+	sed -e 's/.*MISSING_ARTS_ERROR(.*//' -i admin/acinclude.m4.in || \
+			die "could not remove ARTS check"
+	make -f Makefile.dist
+}
diff --git a/sci-mathematics/ksimus/ChangeLog b/sci-mathematics/ksimus/ChangeLog
index abc403641cfb..dfa78f93b70a 100644
--- a/sci-mathematics/ksimus/ChangeLog
+++ b/sci-mathematics/ksimus/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-sci/ksimus
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus/ChangeLog,v 1.1 2004/12/28 15:20:58 ribosome Exp $
+# ChangeLog for sci-mathematics/ksimus
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus/ChangeLog,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
+
+  30 Aug 2005; Luis Medinas <metalgod@gentoo.org> ksimus-0.3.6-r1.ebuild:
+  Added ~amd64 keywords.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> ksimus-0.3.6-r1.ebuild:
+  Added ~sparc keyword.
+
+  06 May 2005; David Holm <dholm@gentoo.org> ksimus-0.3.6-r1.ebuild:
+  Added to ~ppc.
+
+  13 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> ksimus-0.3.6-r1.ebuild:
+  Adding patch for gcc 3.4 supplied in bug #84579. Thanks!
 
 *ksimus-0.3.6-r1 (28 Dec 2004)
 
diff --git a/sci-mathematics/ksimus/Manifest b/sci-mathematics/ksimus/Manifest
index dfef772e7253..1e681572af21 100644
--- a/sci-mathematics/ksimus/Manifest
+++ b/sci-mathematics/ksimus/Manifest
@@ -1,4 +1,14 @@
-MD5 46395378c2fe8eede660e8beee36eae9 ksimus-0.3.6-r1.ebuild 996
-MD5 223b5280bbe8d996961872a4294f3a2f ChangeLog 1489
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47d0ea77c5574cd9da00dd1f0421fa70 ChangeLog 2106
+MD5 b75154ce8c16966a9ce5c27ca6a80b4f ksimus-0.3.6-r1.ebuild 1145
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
-MD5 744267bc1f43695ed7f186e671a127c0 files/digest-ksimus-0.3.6-r1 133
+MD5 e91ccbce39cac3aab6219137ca80c0a1 files/digest-ksimus-0.3.6-r1 205
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDFH2dwUpWvClEHQoRAlJxAJ9Tsg3Mmzs6q0/WBj3f6I4GAcpumgCdEh31
+qdWY9rnSDZwkZ81PAD0pE4Q=
+=WO9g
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/ksimus/files/digest-ksimus-0.3.6-r1 b/sci-mathematics/ksimus/files/digest-ksimus-0.3.6-r1
index 35352f19f46c..8a884a9094eb 100644
--- a/sci-mathematics/ksimus/files/digest-ksimus-0.3.6-r1
+++ b/sci-mathematics/ksimus/files/digest-ksimus-0.3.6-r1
@@ -1,2 +1,3 @@
 MD5 065ae258b59d2be5ae77515fad1f2a45 ksimus-3-0.3.6.tar.gz 1367809
 MD5 657bcbfbd26747b3cd4b137bb5cf56e3 ksimus-patch-0.3.6-2.gz 4107
+MD5 96ef407c3b9a0a3e683960e3f236a694 ksimus-0.3.6-gcc3.4.patch.bz2 3851
diff --git a/sci-mathematics/ksimus/ksimus-0.3.6-r1.ebuild b/sci-mathematics/ksimus/ksimus-0.3.6-r1.ebuild
index f6fba5f621f8..3bfd0b3f02c4 100644
--- a/sci-mathematics/ksimus/ksimus-0.3.6-r1.ebuild
+++ b/sci-mathematics/ksimus/ksimus-0.3.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus/ksimus-0.3.6-r1.ebuild,v 1.1 2004/12/28 15:20:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ksimus/ksimus-0.3.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit kde eutils
 
@@ -8,11 +8,13 @@ MY_PATCH="ksimus-patch-0.3.6-2"
 DESCRIPTION="KSimus is a KDE tool for simulation, automatization and visualization of technical processes."
 HOMEPAGE="http://ksimus.berlios.de/"
 SRC_URI="http://ksimus.berlios.de/download/ksimus-3-${PV}.tar.gz
-	http://ksimus.berlios.de/download/${MY_PATCH}.gz"
+	http://ksimus.berlios.de/download/${MY_PATCH}.gz
+	mirror://gentoo/${P}-gcc3.4.patch.bz2
+	http://dev.gentoo.org/~phosphan/${P}-gcc3.4.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4
@@ -24,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ../${MY_PATCH}
+	epatch ../${P}-gcc3.4.patch
 	sed -i 's/head -\([1-9]\)/head -n \1/g' acinclude.m4 aclocal.m4 configure \
 		admin/acinclude.m4.in admin/cvs.sh admin/libtool.m4.in
 	# does not really need arts
diff --git a/sci-mathematics/ktechlab/ChangeLog b/sci-mathematics/ktechlab/ChangeLog
index fa31d8c76fb7..c2a8a41114df 100644
--- a/sci-mathematics/ktechlab/ChangeLog
+++ b/sci-mathematics/ktechlab/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sci-mathematics/ktechlab
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ktechlab/ChangeLog,v 1.1 2005/05/19 19:43:21 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ktechlab/ChangeLog,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 *ktechlab-0.1.3 (19 May 2005)
 
diff --git a/sci-mathematics/ktechlab/Manifest b/sci-mathematics/ktechlab/Manifest
index a78fb3eaf248..92d3f6ace826 100644
--- a/sci-mathematics/ktechlab/Manifest
+++ b/sci-mathematics/ktechlab/Manifest
@@ -1,4 +1,14 @@
-MD5 2c85b3e9047f012cb176b97be5248e2d ktechlab-0.1.3.ebuild 467
-MD5 746ac3dcbe6d022f4d4936373cf07aab ChangeLog 395
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d69a7cd060cccd382702de9d5b865650 ktechlab-0.1.3.ebuild 582
+MD5 0e5a2cd7dc93e40658dfcddc90bca46a ChangeLog 491
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 68b92d3c2b4c05993fe9bea01d6b5cf0 files/digest-ktechlab-0.1.3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCjPY7evY57Fted3ERAkFfAJ9LG2k+usIIX1sRCG0qlgwksj4/awCgvbA2
+L3EzcuqDBQNWc+TJ1H0+REA=
+=l0QS
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/ktechlab/ktechlab-0.1.3.ebuild b/sci-mathematics/ktechlab/ktechlab-0.1.3.ebuild
index a30b89effced..17eeec074537 100644
--- a/sci-mathematics/ktechlab/ktechlab-0.1.3.ebuild
+++ b/sci-mathematics/ktechlab/ktechlab-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/sci-mathematics/ktechlab/ktechlab-0.1.3.ebuild,v 1.1 2005/05/19 19:43:21 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/ktechlab/ktechlab-0.1.3.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit kde
 
diff --git a/sci-mathematics/mathomatic/ChangeLog b/sci-mathematics/mathomatic/ChangeLog
index de67181d0870..a2a25e48a963 100644
--- a/sci-mathematics/mathomatic/ChangeLog
+++ b/sci-mathematics/mathomatic/ChangeLog
@@ -1,6 +1,50 @@
-# ChangeLog for app-sci/mathomatic
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/ChangeLog,v 1.1 2004/12/28 14:35:26 ribosome Exp $
+# ChangeLog for sci-mathematics/mathomatic
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/ChangeLog,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
+
+*mathomatic-12.4.11-r1 (02 Oct 2005)
+
+  02 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  +mathomatic-12.4.11-r1.ebuild:
+  Fixed readline support (bug #107109).
+
+*mathomatic-12.4.11 (23 Sep 2005)
+
+  23 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +mathomatic-12.4.11.ebuild:
+  Version bump, now installing files in ebuild due to broken makefile.
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -mathomatic-12.3.1.ebuild, mathomatic-12.4.5.ebuild:
+  Stable on amd64 and x86. Remove old version.
+
+*mathomatic-12.4.5 (26 Jul 2005)
+
+  26 Jul 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  mathomatic-12.3.1.ebuild, +mathomatic-12.4.5.ebuild:
+  Version bump, and mark previous version stable.
+
+*mathomatic-12.3.1 (09 May 2005)
+
+  09 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/gentoo-mathomatic-11.1c.diff,
+  -files/mathomatic-12.2c-makefile.patch, metadata.xml,
+  -mathomatic-11.1c.ebuild, -mathomatic-11.7.ebuild,
+  -mathomatic-12.2c.ebuild, +mathomatic-12.3.1.ebuild:
+  Version bump with some security fixes, thanks to DerCorny for spotting it.
+  Cleaned out old versions.
+
+*mathomatic-12.2c (08 Apr 2005)
+
+  08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/mathomatic-12.2c-makefile.patch, +mathomatic-12.2c.ebuild:
+  Version bump, tidied ebuild up, made it respect user CFLAGS and added
+  src_test(). Closes bug 88254.
+
+*mathomatic-11.7 (28 Jan 2005)
+
+  28 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +mathomatic-11.7.ebuild:
+  Version bump (bug #69483) with little changes
 
 *mathomatic-11.1c (28 Dec 2004)
 
diff --git a/sci-mathematics/mathomatic/Manifest b/sci-mathematics/mathomatic/Manifest
index d3e23db830d4..ce8a822a316b 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -1,5 +1,8 @@
-MD5 3abf3c126ea8c41fa253de334525981d metadata.xml 454
-MD5 f9df943a5e3506e4401d16665e52313c ChangeLog 591
-MD5 eaa4e196d369426ec6a47f5e77514b9c mathomatic-11.1c.ebuild 1097
-MD5 29133f46e7d703ecfcbc9a083f272147 files/digest-mathomatic-11.1c 65
-MD5 f7d0b9c7af7201990a0beeadca7abf3f files/gentoo-mathomatic-11.1c.diff 957
+MD5 36cce25455b74386d084d7b4dbeccdd2 mathomatic-12.4.11-r1.ebuild 968
+MD5 f38bccf593e0f1fb97f5b13047bdd99e mathomatic-12.4.5.ebuild 942
+MD5 3bcddd67111a9ae99e5f5e2bd8533332 mathomatic-12.4.11.ebuild 940
+MD5 99ae28b30a872b10b18470d87369517a ChangeLog 2352
+MD5 ee7955cc2715e3bac994bb045163c8b1 metadata.xml 479
+MD5 32a964754f69321292b8d2b29b2d89c0 files/digest-mathomatic-12.4.5 66
+MD5 bf6afb923996c68d8e305c5a2124a6e5 files/digest-mathomatic-12.4.11-r1 67
+MD5 bf6afb923996c68d8e305c5a2124a6e5 files/digest-mathomatic-12.4.11 67
diff --git a/sci-mathematics/mathomatic/mathomatic-12.4.11-r1.ebuild b/sci-mathematics/mathomatic/mathomatic-12.4.11-r1.ebuild
index cc341113d20e..70dd3db8e03b 100644
--- a/sci-mathematics/mathomatic/mathomatic-12.4.11-r1.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-12.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-12.4.11-r1.ebuild,v 1.1 2005/10/02 03:13:43 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-12.4.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/mathomatic/mathomatic-12.4.11.ebuild b/sci-mathematics/mathomatic/mathomatic-12.4.11.ebuild
index efe2f1b91210..62419c18a986 100644
--- a/sci-mathematics/mathomatic/mathomatic-12.4.11.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-12.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/sci-mathematics/mathomatic/mathomatic-12.4.11.ebuild,v 1.1 2005/09/23 00:43:20 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-12.4.11.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/mathomatic/mathomatic-12.4.5.ebuild b/sci-mathematics/mathomatic/mathomatic-12.4.5.ebuild
index c2a36fc2df5c..b92a3a2b167d 100644
--- a/sci-mathematics/mathomatic/mathomatic-12.4.5.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-12.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/sci-mathematics/mathomatic/mathomatic-12.4.5.ebuild,v 1.1 2005/07/26 22:54:09 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mathomatic/mathomatic-12.4.5.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.panix.com/~gesslein/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="icc"
 
 DEPEND="sys-libs/readline
diff --git a/sci-mathematics/mathomatic/metadata.xml b/sci-mathematics/mathomatic/metadata.xml
index d3028cb66d43..98f29371fec5 100644
--- a/sci-mathematics/mathomatic/metadata.xml
+++ b/sci-mathematics/mathomatic/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>xtv@gentoo.org</email>
-</maintainer>
-<longdescription>
-Mathomatic is a small, portable symbolic math program that can automatically 
-solve, simplify, differentiate, combine, and compare algebraic equations, 
-perform polynomial and complex arithmetic, etc. 
-</longdescription>
+  <herd>sci</herd>
+  <maintainer>
+    <email>cryos@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    Mathomatic is a small, portable symbolic math program that can automatically
+    solve, simplify, differentiate, combine, and compare algebraic equations, 
+    perform polynomial and complex arithmetic, etc. 
+  </longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 5babff4ee903..06b7c402d125 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,56 @@
-# ChangeLog for app-sci/maxima
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.1 2004/12/28 14:38:51 ribosome Exp $
+# ChangeLog for sci-mathematics/maxima
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
+
+  04 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  maxima-5.9.1-r5.ebuild:
+  Keyworded ~sparc
+
+*maxima-5.9.1-r5 (01 Oct 2005)
+
+  01 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  +maxima-5.9.1-r5.ebuild:
+  Install info files in "/usr/share/info", not "/usr/info" (fixes bug #105705).
+
+*maxima-5.9.1-r4 (19 Sep 2005)
+
+  19 Sep 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/5.9.1-sbcl-gentoo.patch, -maxima-5.9.1-r2.ebuild,
+  -maxima-5.9.1-r3.ebuild, +maxima-5.9.1-r4.ebuild:
+  New ebuild with improved support for LISP compilers, thanks to Lucas Chiesa
+  <lucas.chiesa@gmail.com> (fixes bug #98763). Removed obsolete versions.
+
+  29 Aug 2005; Olivier Fisette <ribosome@gentoo.org> maxima-5.9.1-r3.ebuild:
+  Readded ~amd64 support, thanks to a patch by Matthew Kennedy
+  <mkennedy@gentoo.org>. Partially fixes bug #98763.
+
+*maxima-5.9.1-r3 (20 Aug 2005)
+
+  20 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
+  +files/maxima-5.9.1-unicode-fix.patch, +maxima-5.9.1-r3.ebuild:
+  New revision incorporating a Unicode patch, thanks to Thomas Weidner
+  <3.14159@gmx.net> (fixes bug #92644).
+
+  20 Aug 2005; Olivier Fisette <ribosome@gentoo.org> maxima-5.9.1-r2.ebuild:
+  Depend on >=gcl-2.6.7 (fixes bug #81869). Removed ~amd64 previously added by
+  Matthew Kennedy since AMD64 support is obviously broken (see bug #98763).
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> maxima-5.9.1.ebuild:
+  Stable on ppc.
+
+  01 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/5.9.1-sbcl-gentoo.patch, maxima-5.9.1-r2.ebuild:
+  Patch for SBCL support; Keywording ~mad64.
+
+  17 Apr 2005; Olivier Fisette <ribosome@gentoo.org> -maxima-5.9.0.ebuild,
+  -maxima-5.9.0-r2.ebuild, -maxima-5.9.0-r3.ebuild, -maxima-5.9.1-r1.ebuild:
+  Removed obsolete versions.
+
+*maxima-5.9.1-r2 (17 Apr 2005)
+
+  17 Apr 2005; Olivier Fisette <ribosome@gentoo.org>
+  +maxima-5.9.1-r2.ebuild:
+  Fixed documentation location problem (#82000).
 
 *maxima-5.9.1-r1 (28 Dec 2004)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index e6ebdcf667c2..1c60ff3b68e1 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,14 +1,21 @@
-MD5 870604232354646e69c57d16da1a6af8 maxima-5.9.0-r3.ebuild 2477
-MD5 780474ef22cbaff6cd18228747a7fd83 maxima-5.9.0-r2.ebuild 2357
-MD5 450124e4e8ae5a35df660a58d7b0ffd5 maxima-5.9.1-r1.ebuild 2532
-MD5 c460b4acb43710708be8561f6aecac41 maxima-5.9.1.ebuild 2490
-MD5 0e9910aaf20f51b2536b850d5ee2f230 ChangeLog 2734
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 34088e52192b29787ef45aa41a483be9 ChangeLog 5013
+MD5 e7a5da1e4db40c53cc9be7f903f385f6 maxima-5.9.1-r5.ebuild 2374
+MD5 f66b0e67bab788e42e587ce2a7d299a5 maxima-5.9.1-r4.ebuild 2331
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 b91d1554583fba944bc04476c4af394e maxima-5.9.0.ebuild 778
-MD5 aaa91ea4812a84a1054b82e69d3fe05b files/digest-maxima-5.9.0-r2 65
-MD5 aaa91ea4812a84a1054b82e69d3fe05b files/digest-maxima-5.9.0-r3 65
-MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r1 65
-MD5 6957a9bafd71a24b58e148bb2ee58257 files/50maxima-gentoo.el 346
-MD5 aaa91ea4812a84a1054b82e69d3fe05b files/digest-maxima-5.9.0 65
+MD5 1a4d91430daee0b2899a662587093b22 maxima-5.9.1.ebuild 2494
 MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1 65
+MD5 6957a9bafd71a24b58e148bb2ee58257 files/50maxima-gentoo.el 346
+MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r5 65
+MD5 9d2fde2c70ca34c55c220ac2e46fe463 files/maxima-5.9.1-unicode-fix.patch 9157
 MD5 55d928e715074355a442baf0934487de files/maxima-emacs.patch 826
+MD5 6f3becd603f999b2bb7488753ec07518 files/digest-maxima-5.9.1-r4 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDQt2YKRy60XGEcJIRAkPfAKCR8bm5pV1SKHyXMg5nDqDVDZSvigCgmNWu
+zANoKCX58nBtMyYGftNeG7g=
+=1MQL
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild b/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild
index e3608ae94c46..0aa5b7be16f0 100644
--- a/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild
+++ b/sci-mathematics/maxima/maxima-5.9.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/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild,v 1.1 2005/09/19 04:24:15 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
 
 inherit eutils elisp-common
 
diff --git a/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild b/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild
index 8ae39172a5b8..ddd98b92b466 100644
--- a/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild
+++ b/sci-mathematics/maxima/maxima-5.9.1-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/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild,v 1.1 2005/10/01 22:25:27 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1-r5.ebuild,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
 
 inherit eutils elisp-common
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 AECA"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE="cmucl clisp sbcl tetex emacs auctex"
 
 DEPEND="tetex? ( virtual/tetex )
diff --git a/sci-mathematics/maxima/maxima-5.9.1.ebuild b/sci-mathematics/maxima/maxima-5.9.1.ebuild
index a33e935bc15f..a522133d8c67 100644
--- a/sci-mathematics/maxima/maxima-5.9.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.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/sci-mathematics/maxima/maxima-5.9.1.ebuild,v 1.1 2004/12/28 14:38:51 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.1.ebuild,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/maxima/${P}.tar.gz"
 
 LICENSE="GPL-2 AECA"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE="cmucl clisp gcl tetex emacs auctex"
 
 DEPEND="tetex? ( virtual/tetex )
diff --git a/sci-mathematics/metadata.xml b/sci-mathematics/metadata.xml
index 149292429536..fcdb3f5ebcaa 100644
--- a/sci-mathematics/metadata.xml
+++ b/sci-mathematics/metadata.xml
@@ -2,7 +2,29 @@
 <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
-		The sci-mathematics category contains mathematics software.
+		The sci-mathematics category contains mathematical software.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie sci-mathematics enthält mathematische Software.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría sci-mathemathics contiene programas relacionados con las
+		matemáticas.
+	</longdescription>
+	<longdescription lang="ja">
+		sci-mathematicsカテゴリーには数学のソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De sci-mathematics categorie bevat wiskundige software.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm sci-mathematics chứa các phần mềm toán học.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória sci-mathematics obsahuje matematické programy.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria sci-mathemathics contiene programmi matematici.
 	</longdescription>
 </catmetadata>
 
diff --git a/sci-mathematics/mupad/ChangeLog b/sci-mathematics/mupad/ChangeLog
index b721876907b5..592d90c4eed1 100644
--- a/sci-mathematics/mupad/ChangeLog
+++ b/sci-mathematics/mupad/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-sci/mupad
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mupad/ChangeLog,v 1.1 2004/12/28 14:43:46 ribosome Exp $
+# ChangeLog for sci-mathematics/mupad
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mupad/ChangeLog,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -mupad-2.5.2-r1.ebuild:
+  Removed obsolete version.
+
+  28 Dec 2004; Seemant Kulleen <seemant@gentoo.org> mupad-2.5.2-r1.ebuild,
+  mupad-2.5.2-r2.ebuild:
+  do NOT use awk in global scope. Use bash expressions or versionator.eclass.
+  I have switched to versionator.eclass for simplicity here.
 
 *mupad-2.5.2-r2 (28 Dec 2004)
 
diff --git a/sci-mathematics/mupad/Manifest b/sci-mathematics/mupad/Manifest
index 69276bd60293..f81afad1828d 100644
--- a/sci-mathematics/mupad/Manifest
+++ b/sci-mathematics/mupad/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bfbf21f11e7e581736fd8d152c6309f2 ChangeLog 1714
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 5cdd01347d11b830437f4ca6a2fc86a8 mupad-2.5.2-r1.ebuild 3136
-MD5 e4e82a795b224edc36775c33d6ece1a3 mupad-2.5.2-r2.ebuild 3376
-MD5 4e05b1eb3ba3380509b9085086cad7ef files/digest-mupad-2.5.2-r1 249
+MD5 18c85940b7fb1c5e5b609e48fd125f2d ChangeLog 2278
 MD5 4e05b1eb3ba3380509b9085086cad7ef files/digest-mupad-2.5.2-r2 249
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 895676c3ef90cbb51be01cd949c6f3b3 mupad-2.5.2-r2.ebuild 3384
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBXsT0I1lqEGTUzyQRAke5AJ9AFBesFpYk3TIDvnx3Lo6bAxRJJgCgzf9a
-ARzhnthS24d0tFTwJM6dkSo=
-=h7a5
+iD8DBQFC0COiI1lqEGTUzyQRApslAKCFeTmC670HleY+oRhhX5RilZoCiQCghByz
+rzf9jdnk2Ahg1ZY0MGhkquk=
+=xSbZ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/mupad/mupad-2.5.2-r2.ebuild b/sci-mathematics/mupad/mupad-2.5.2-r2.ebuild
index 191074844ffb..de99e29c09be 100644
--- a/sci-mathematics/mupad/mupad-2.5.2-r2.ebuild
+++ b/sci-mathematics/mupad/mupad-2.5.2-r2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mupad/mupad-2.5.2-r2.ebuild,v 1.1 2004/12/28 14:43:46 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/mupad/mupad-2.5.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
 
-VER=`echo $PV|awk -F. '{ print $1$2$3 }'`
+inherit versionator
+
+VER=$(replace_all_version_separators '')
 URLPATH="ftp://ftp.mupad.de/MuPAD/distrib/unix/"
 INSTDIR="/usr/lib/mupad"
 INSTBINDIR="${INSTDIR}/share/bin"
@@ -86,23 +88,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo ""
+	echo
 	einfo "SOME IMPORTANT NOTES:"
-	einfo ""
+	einfo
 	einfo " - This version of MuPAD has Scilab functionality"
-	einfo "   integrated, so if you have Scilab installed already, "
+	einfo "   integrated, so if you have Scilab installed already,"
 	einfo "   you might find it to be redundant."
-	einfo ""
+	einfo
 	einfo " - MuPAD is only free for non-commercial use.  Visit"
 	einfo "   http://www.mupad.com/ for commercial downloads."
-	einfo ""
+	einfo
 	einfo " - In this non-commercial version, you must register to"
 	einfo "   obtain a license key in order to deactivate the memory"
 	einfo "   limit.  The memory limit prevents large calculations."
 	einfo "   Read the documentation or visit"
-	einfo ""
+	einfo
 	einfo "       ${HOMEPAGE}"
-	einfo ""
+	einfo
 	einfo "   for more info."
-	echo ""
+	echo
 }
diff --git a/sci-mathematics/num-utils/ChangeLog b/sci-mathematics/num-utils/ChangeLog
index 9987d97f5df9..ae3402f84de2 100644
--- a/sci-mathematics/num-utils/ChangeLog
+++ b/sci-mathematics/num-utils/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-sci/num-utils
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/ChangeLog,v 1.1 2004/12/28 14:45:31 ribosome Exp $
+# ChangeLog for sci-mathematics/num-utils
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
+
+  06 May 2005; David Holm <dholm@gentoo.org> num-utils-0.5.ebuild:
+  Added to ~ppc.
+
+*num-utils-0.5 (13 Mar 2005)
+
+  13 Mar 2005; Patrick Kursawe <phosphan@gentoo.org> num-utils-0.3.ebuild,
+  +num-utils-0.5.ebuild:
+  Version bump
 
 *num-utils-0.3 (28 Dec 2004)
 
diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index 62642d60503a..c9d00665b49f 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c488c6930c26671abd723e307f72e1b0 ChangeLog 449
+MD5 f5f60fc8d6996ab78828ae77d8fad56f ChangeLog 878
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 aff5bef4043f429bd73ef828df6e8676 num-utils-0.3.ebuild 666
+MD5 269859babffc857e0a85bf9502b48faa num-utils-0.3.ebuild 673
+MD5 1192848454d6ea5dd28a862da95352d6 num-utils-0.5.ebuild 676
 MD5 54b34948d0302ae82f0edaea5dfe04ab files/digest-num-utils-0.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXsWWI1lqEGTUzyQRAsXNAKCMbZXqP7a6rBE2nRnUl+56e+NK4wCgkU6L
-0L/pIUzkqQlecgyFmgxuV7o=
-=FOVv
------END PGP SIGNATURE-----
+MD5 550588a3be3a23456ae0cfd9a8c32177 files/digest-num-utils-0.5 64
diff --git a/sci-mathematics/num-utils/num-utils-0.3.ebuild b/sci-mathematics/num-utils/num-utils-0.3.ebuild
index 4e25439fa510..17fa04610b92 100644
--- a/sci-mathematics/num-utils/num-utils-0.3.ebuild
+++ b/sci-mathematics/num-utils/num-utils-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/sci-mathematics/num-utils/num-utils-0.3.ebuild,v 1.1 2004/12/28 14:45:31 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/num-utils-0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ DEPEND=""
 RDEPEND="dev-lang/perl"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_compile() {
 	emake || die
diff --git a/sci-mathematics/num-utils/num-utils-0.5.ebuild b/sci-mathematics/num-utils/num-utils-0.5.ebuild
index 7fda0b90b50a..1b67424270b4 100644
--- a/sci-mathematics/num-utils/num-utils-0.5.ebuild
+++ b/sci-mathematics/num-utils/num-utils-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/sci-mathematics/num-utils/num-utils-0.5.ebuild,v 1.1 2005/03/12 23:33:33 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/num-utils/num-utils-0.5.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ DEPEND=""
 RDEPEND="dev-lang/perl"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 src_compile() {
 	emake || die
diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index c8050d5adba5..0df754c5be00 100644
--- a/sci-mathematics/octave-forge/ChangeLog
+++ b/sci-mathematics/octave-forge/ChangeLog
@@ -1,6 +1,64 @@
-# ChangeLog for app-sci/octave-forge
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.1 2004/12/28 14:54:43 ribosome Exp $
+# ChangeLog for sci-mathematics/octave-forge
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
+
+*octave-forge-2005.06.13-r1 (01 Oct 2005)
+*octave-forge-2004.11.16-r2 (01 Oct 2005)
+
+  01 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  octave-forge-2004.11.16-r1.ebuild, +octave-forge-2004.11.16-r2.ebuild,
+  +octave-forge-2005.06.13-r1.ebuild:
+  New revisions using ncurses in place of libtermcap-compat (see bug #103105).
+
+  21 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/2004.11.16.patch, +files/octave-forge-mex.patch,
+  +files/octave-forge-randmtzig.patch:
+  Added mex and randmtzig patches (fixes bug #99783). Thanks to Federico
+  Zenith <zenith@chemeng.ntnu.no>.
+
+*octave-forge-2005.06.13 (20 Aug 2005)
+
+  20 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
+  +octave-forge-2005.06.13.ebuild:
+  New version. Depends strictly on Octave 2.69 rather than 2.69 or later like
+  previous ebuilds (see bug #99781). This dependency should be kept in sync as
+  new versions of Octave and Octave-Forge are released.
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/octave-2.1.57+.patch, -files/octave-forge-2004.02.12-fPIC.patch,
+  -octave-forge-2004.02.12.ebuild, -octave-forge-2004.02.12-r1.ebuild,
+  -octave-forge-2004.11.16.ebuild, octave-forge-2004.11.16-r1.ebuild:
+  Stable x86 and amd64. Removed obsolete versions.
+
+*octave-forge-2004.02.12-r1 (10 Mar 2005)
+
+  10 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +octave-forge-2004.02.12-r1.ebuild, octave-forge-2004.02.12.ebuild:
+  Fixing bug #84366 (wrong path to graceplot) for old version
+
+*octave-forge-2004.11.16-r1 (08 Mar 2005)
+
+  08 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +octave-forge-2004.11.16-r1.ebuild:
+  Fixing bug #84366 (wrong path to graceplot)
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  octave-forge-2004.11.16.ebuild:
+  Put in a fix to allow aurecord to build when X isn't installed.
+
+  18 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  octave-forge-2004.02.12.ebuild:
+  Fixing range of allowed octave versions
+
+  17 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  octave-forge-2004.02.12.ebuild:
+  Updating DEPEND
+
+*octave-forge-2004.11.16 (17 Jan 2005)
+
+  17 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +files/2004.11.16.patch
+  +octave-forge-2004.11.16.ebuild:
+  Version bump
 
 *octave-forge-2003.02.22 (28 Dec 2004)
 
diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index 1e5063ab6305..22e13752a2a5 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,10 +1,12 @@
-MD5 15a05529286b6ee98289e23fd711af0d octave-forge-2003.06.02.ebuild 1929
-MD5 58bd232dbc2505d23c7afa787bb5f782 octave-forge-2003.02.22.ebuild 1958
-MD5 7c404b8e5a2c490befde86c512311ce7 octave-forge-2004.02.12.ebuild 2186
-MD5 8368c9155ee095f737692eeecfff3ee6 ChangeLog 2080
+MD5 3334f713282804a5632cbef98de4d46a octave-forge-2004.11.16-r2.ebuild 2259
+MD5 fb924747cbcd79b9a4f4bc7b4e0634bd octave-forge-2005.06.13-r1.ebuild 2319
+MD5 9c1f0cdc188f3c183d9f523635926b47 octave-forge-2004.11.16-r1.ebuild 2271
+MD5 c0b992412fda6a292815ccacec4c3fec octave-forge-2005.06.13.ebuild 2326
+MD5 4db3a5ce9aa7fac4d23fc736e3b28263 ChangeLog 4667
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 df51218baee555e6ec187aa95115aa01 files/digest-octave-forge-2003.02.22 76
-MD5 b0d60c59feed689f1454ba67e50df211 files/digest-octave-forge-2003.06.02 76
-MD5 7a2c9437d0cf3b7b65738969d0aac2e1 files/digest-octave-forge-2004.02.12 76
-MD5 8d2f41d57f555add4c78fbe6dc0ee758 files/octave-2.1.57+.patch 905
-MD5 9429fc7b84a5d36c0599ddeccad6d379 files/octave-forge-2004.02.12-fPIC.patch 526
+MD5 64ae87b1b1190c6a51f7dfd91be73d05 files/octave-forge-mex.patch 1580
+MD5 cfc1fc06a341728e53b81d09d6376dea files/digest-octave-forge-2005.06.13 76
+MD5 3aacf6f3c335a1f63edef94a9bd7011a files/digest-octave-forge-2004.11.16-r1 76
+MD5 3aacf6f3c335a1f63edef94a9bd7011a files/digest-octave-forge-2004.11.16-r2 76
+MD5 e1393e9f0f19ccc9e6192c227cccc644 files/octave-forge-randmtzig.patch 428
+MD5 cfc1fc06a341728e53b81d09d6376dea files/digest-octave-forge-2005.06.13-r1 76
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild
index 53a569602afc..2cde2dd024de 100644
--- a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2004.11.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/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild,v 1.1 2005/03/09 08:32:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ DEPEND=">=sci-mathematics/octave-2.1.62
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}.patch
+	epatch ${FILESDIR}/${PN}-mex.patch
 
 	# make it compile when X isn't installed. The source file there really
 	# doesn't need X at all.
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild
index ca06dec55e28..93eaee116ea2 100644
--- a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2004.11.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/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild,v 1.1 2005/10/01 21:54:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild
index b16dc132256e..7a35962ea0ae 100644
--- a/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild,v 1.1 2005/10/01 21:54:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/octave-forge/octave-forge-2005.06.13.ebuild b/sci-mathematics/octave-forge/octave-forge-2005.06.13.ebuild
index b87515897571..13dddcd7df27 100644
--- a/sci-mathematics/octave-forge/octave-forge-2005.06.13.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2005.06.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/sci-mathematics/octave-forge/octave-forge-2005.06.13.ebuild,v 1.1 2005/08/20 19:03:19 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2005.06.13.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="0"
 IUSE="ginac qhull"
 
-DEPEND="=sci-mathematics/octave-2.1.69
+DEPEND="=sci-mathematics/octave-2.1.69*
 		>=sys-apps/sed-4
 		sys-libs/libtermcap-compat
 		!amd64? ( ginac? ( sci-mathematics/ginac ) )
@@ -22,7 +22,8 @@ DEPEND="=sci-mathematics/octave-2.1.69
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/2004.11.16.patch
+	epatch ${FILESDIR}/${PN}-mex.patch
+	epatch ${FILESDIR}/${PN}-randmtzig.patch
 
 	# make it compile when X isn't installed. The source file there really
 	# doesn't need X at all.
@@ -31,7 +32,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die "econf failed"
+	econf --enable-shared || die "econf failed"
 
 	# this must be done before the *PATH variables are changed
 	cd extra/graceplot && make grace_octave_path.m
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 79dd7f2d046e..0b332aa92dec 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,74 @@
-# ChangeLog for app-sci/octave
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.1 2004/12/28 14:48:35 ribosome Exp $
+# ChangeLog for sci-mathematics/octave
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
+
+  16 Nov 2005; Ferris McCormick <fmccor@gentoo.org> octave-2.1.71-r2.ebuild:
+  (Re)add ~sparc keyword after having changed sparc's default virtual for
+  mpi to lam-mpi.  With this change, octave builds on sparc with USE=mpi,
+  and it runs the mini-test suggested by the ebuild installation.  This
+  closes Bug #108955 for sparc.
+
+*octave-2.1.71-r2 (16 Nov 2005)
+
+  16 Nov 2005; Markus Dittrich <markusle@gentoo.org>
+  +octave-2.1.71-r2.ebuild:
+  Implemented proper compilation when using MPI. This fixes bug #108955.
+
+*octave-2.1.71-r1 (13 Nov 2005)
+
+  13 Nov 2005; Olivier Fisette <ribosome@gentoo.org>
+  +octave-2.1.71-r1.ebuild:
+  Migrated to fortran.eclass (bug #65950).
+
+  22 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> octave-2.1.71.ebuild:
+  Allow the use of gfortran too for gcc4, closes bug 108781.
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> octave-2.1.69.ebuild:
+  Mark 2.1.69 stable on alpha
+
+  06 Sep 2005; Danny van Dyk <kugelfang@gentoo.org> octave-2.1.69.ebuild:
+  Fixed USE=mpi handling.
+
+*octave-2.1.71 (21 Aug 2005)
+
+  21 Aug 2005; Olivier Fisette <ribosome@gentoo.org> octave-2.1.69.ebuild,
+  +octave-2.1.71.ebuild:
+  New version (fixes bug #99481), along with a sed trick to remove Portage
+  paths in ls-R files (fixes bug #92565). Thanks to Colin Macdonald
+  <cbm@sfu.ca>.
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> octave-2.1.69.ebuild:
+  Stable on ppc.
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> octave-2.1.69.ebuild:
+  Stable x86 and amd64.
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -files/filebuf.diff,
+  -files/kill-dvips.diff, -octave-2.1.64.ebuild:
+  Removed obsolete version and unused patches.
+
+  10 Jun 2005; Patrick Kursawe <phosphan@gentoo.org> octave-2.1.57-r1.ebuild,
+  octave-2.1.64.ebuild, octave-2.1.69.ebuild:
+  Adding library directory to LDPATH
+
+  04 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  octave-2.1.57-r1.ebuild, octave-2.1.64.ebuild, octave-2.1.69.ebuild:
+  Added warning about agressive CFLAGS. (See bug #76067.)
+
+  04 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  -octave-2.1.36-r1.ebuild, -octave-2.1.50.ebuild, -octave-2.1.57.ebuild:
+  Removed obsolete versions. Fixed header.
+
+*octave-2.1.69 (21 Apr 2005)
+
+  21 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +octave-2.1.69.ebuild:
+  Version bump, closes bug 89397.
+
+  18 Apr 2005; Joseph Jezak <josejx@gentoo.org> octave-2.1.57-r1.ebuild:
+  Marked ppc stable.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
 *octave-2.1.64 (28 Dec 2004)
 
@@ -64,7 +132,7 @@
   09 May 2004; Danny van Dyk <kugelfang@gentoo.org> octave-2.1.57.ebuild:
   Added local useflag "blas" to make ebuild depend on virtual/blas.
 
-  05 May 2004; Bryan �stergaard <kloeri@gentoo.org> octave-2.1.57.ebuild:
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> octave-2.1.57.ebuild:
   Stable on alpha.
 
   21 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> octave-2.1.36-r1.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index d4d71e235cfa..10bdcd90c347 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,24 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9dcbed94ef4a87f6a80e9f0c5cdca609 octave-2.1.64.ebuild 2880
-MD5 11a8df55d6973d265e7507e68a01eb3a ChangeLog 6665
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 da68a6e1ee5ed6f35f9a2e328d809a49 octave-2.1.50.ebuild 2361
-MD5 3b91b6ca6d7146d7d1973f1642d083c7 octave-2.1.57.ebuild 2195
-MD5 2cf28a7957f83f2a88c48510c78b3870 octave-2.1.57-r1.ebuild 2852
-MD5 2a52ead20f5e9a16b481e43fe9415104 octave-2.1.36-r1.ebuild 1934
-MD5 c93a44a52d46ca6e8fed8c3c23877c0d files/digest-octave-2.1.36-r1 67
+MD5 b07a488c296efa4d8dd3f3e1bbbd234f ChangeLog 9535
 MD5 32c6cee1f5b42b8b20369c3722fb4db2 files/digest-octave-2.1.57-r1 67
-MD5 74d376b9c7367fe7b333cbc7e8ca37b3 files/kill-dvips.diff 2448
-MD5 32c6cee1f5b42b8b20369c3722fb4db2 files/digest-octave-2.1.57 67
-MD5 806a54605ad877d62105b2f58819c92d files/digest-octave-2.1.50 67
-MD5 045463e5ebb1615d834a8145b27a765d files/filebuf.diff 1275
-MD5 157e958a946705cefe2968c7f46d5263 files/digest-octave-2.1.64 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxVw9ugEuf3OQ0akRAuTpAKCkFyOZJ/BNX5SDqptNcK9ZXxwP0wCfS2vv
-0P+5cjE5Gyer3Je/AO4iU7c=
-=3ZrB
------END PGP SIGNATURE-----
+MD5 67d13a7bca35d1d0210394b7735fd073 files/digest-octave-2.1.69 67
+MD5 6582a298022b4c4301eca44791cb6da2 files/digest-octave-2.1.71 67
+MD5 6582a298022b4c4301eca44791cb6da2 files/digest-octave-2.1.71-r1 67
+MD5 6582a298022b4c4301eca44791cb6da2 files/digest-octave-2.1.71-r2 67
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 62c4dfb1220dccc6624875121b80bbeb octave-2.1.57-r1.ebuild 3668
+MD5 bd2ed4dec06725b62ae2a8d1f97c196e octave-2.1.69.ebuild 3633
+MD5 a71b9b13b29a378bd8931963cefbc6b0 octave-2.1.71-r1.ebuild 3426
+MD5 4cc0bb241b460b885456fba320156a3d octave-2.1.71-r2.ebuild 3773
+MD5 e7a66fad5a451fe4a902ee91bc6cd6a2 octave-2.1.71.ebuild 3546
diff --git a/sci-mathematics/octave/octave-2.1.57-r1.ebuild b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
index 9060d83e8d4e..f075569bac6e 100644
--- a/sci-mathematics/octave/octave-2.1.57-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.57-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/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.1 2004/12/28 14:48:35 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.57-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -11,16 +11,16 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc alpha ~sparc amd64"
+KEYWORDS="x86 ppc alpha ~sparc amd64"
 IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r3
 	>=media-gfx/gnuplot-3.7.1-r3
-	>=dev-libs/fftw-2.1.3
+	>=sci-libs/fftw-2.1.3
 	>=dev-util/gperf-2.7.2
 	zlib? ( sys-libs/zlib )
-	hdf5? ( dev-libs/hdf5 )
+	hdf5? ( sci-libs/hdf5 )
 	tetex? ( virtual/tetex )
 	x86? ( ifc? ( dev-lang/ifc ) )
 	blas? ( virtual/blas )"
@@ -34,7 +34,7 @@ pkg_setup() {
 	use ifc || if [ -z `which g77` ]; then
 		#if ifc is defined then the dep was already checked
 		eerror "No fortran compiler found on the system!"
-		eerror "Please add f77 to your USE flags and reemerge gcc!"
+		eerror "Please add fortran to your USE flags and reemerge gcc!"
 		die
 	fi
 }
@@ -88,6 +88,26 @@ src_install() {
 		done
 		cd ..
 	fi
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/octave-${PV}" > ${D}/etc/env.d/99octave
+}
+
+pkg_postinst() {
+	echo
+	einfo "Some users have reported failures at running simple tests if"
+	einfo "octave was built with agressive optimisations. You can check if"
+	einfo "your setup is affected by this bug by running the following test"
+	einfo "(inside the octave interpreter):"
+	einfo
+	einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];"
+	einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];"
+	einfo "octave:3> anova(y, g)"
+	einfo
+	einfo "If these commands complete successfully with no error message,"
+	einfo "your installation should be ok. Otherwise, try recompiling"
+	einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and"
+	einfo "\"-march=pentium4\" is known to cause problems)."
+	echo
 }
 
 octave-install-doc() {
diff --git a/sci-mathematics/octave/octave-2.1.69.ebuild b/sci-mathematics/octave/octave-2.1.69.ebuild
index f7c5ca632b47..1e45f0450160 100644
--- a/sci-mathematics/octave/octave-2.1.69.ebuild
+++ b/sci-mathematics/octave/octave-2.1.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.1 2005/04/21 21:05:41 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas"
 
 DEPEND="virtual/libc
@@ -24,6 +24,7 @@ DEPEND="virtual/libc
 	tetex? ( virtual/tetex )
 	x86? ( ifc? ( dev-lang/ifc ) )
 	blas? ( virtual/blas )
+	mpi? ( sys-cluster/lam-mpi )
 	!=app-text/texi2html-1.70"
 
 # NOTE: octave supports blas/lapack from intel but this is not open
@@ -51,9 +52,14 @@ src_compile() {
 	# Danny van Dyk 2004/08/26
 	use zlib && LDFLAGS="${LDFLAGS} -lz"
 
+	if use mpi; then
+		myconf="${myconf} --with-mpi=lammpi++"
+	else
+		myconf="${myconf} --without-mpi"
+	fi
+
 	econf \
 		$(use_with hdf5) \
-		$(use_with mpi) \
 		$(use_enable readline) \
 		${myconf} \
 		LDFLAGS="${LDFLAGS}" || die "econf failed"
@@ -75,6 +81,30 @@ src_install() {
 		done
 		cd ..
 	fi
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/octave-${PV}" > ${D}/etc/env.d/99octave
+
+	# Fixes ls-R files to remove /var/tmp/portage references.
+	sed -i -e "s:${D}::g" ${D}/usr/libexec/${PN}/ls-R || die
+	sed -i -e "s:${D}::g" ${D}/usr/share/${PN}/ls-R || die
+}
+
+pkg_postinst() {
+	echo
+	einfo "Some users have reported failures at running simple tests if"
+	einfo "octave was built with agressive optimisations. You can check if"
+	einfo "your setup is affected by this bug by running the following test"
+	einfo "(inside the octave interpreter):"
+	einfo
+	einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];"
+	einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];"
+	einfo "octave:3> anova(y, g)"
+	einfo
+	einfo "If these commands complete successfully with no error message,"
+	einfo "your installation should be ok. Otherwise, try recompiling"
+	einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and"
+	einfo "\"-march=pentium4\" is known to cause problems)."
+	echo
 }
 
 octave-install-doc() {
diff --git a/sci-mathematics/octave/octave-2.1.71-r1.ebuild b/sci-mathematics/octave/octave-2.1.71-r1.ebuild
index 4acbf5d20281..ec3652b5aa6e 100644
--- a/sci-mathematics/octave/octave-2.1.71-r1.ebuild
+++ b/sci-mathematics/octave/octave-2.1.71-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r1.ebuild,v 1.1 2005/11/13 05:34:47 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit flag-o-matic fortran
 
diff --git a/sci-mathematics/octave/octave-2.1.71-r2.ebuild b/sci-mathematics/octave/octave-2.1.71-r2.ebuild
index 2695986b64a0..2f5489b76f99 100644
--- a/sci-mathematics/octave/octave-2.1.71-r2.ebuild
+++ b/sci-mathematics/octave/octave-2.1.71-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/sci-mathematics/octave/octave-2.1.71-r2.ebuild,v 1.1 2005/11/16 06:17:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit flag-o-matic fortran
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
 
 SLOT="0"
 IUSE="emacs static readline zlib tetex hdf5 mpi blas"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r3
diff --git a/sci-mathematics/octave/octave-2.1.71.ebuild b/sci-mathematics/octave/octave-2.1.71.ebuild
index 96cda01c8ca8..d3010b622350 100644
--- a/sci-mathematics/octave/octave-2.1.71.ebuild
+++ b/sci-mathematics/octave/octave-2.1.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71.ebuild,v 1.1 2005/08/21 04:15:27 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.71.ebuild,v 1.1.1.1 2005/11/30 09:55:54 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -32,7 +32,7 @@ DEPEND="virtual/libc
 # more information
 
 pkg_setup() {
-	use ifc || if [ -z `which g77` ]; then
+	use ifc || if [ -z `which g77` ] && [ -z `which gfortran` ]; then
 		#if ifc is defined then the dep was already checked
 		eerror "No fortran compiler found on the system!"
 		eerror "Please add fortran to your USE flags and reemerge gcc!"
diff --git a/sci-mathematics/otter/ChangeLog b/sci-mathematics/otter/ChangeLog
index 7304eeafccdf..c08af6fdd740 100644
--- a/sci-mathematics/otter/ChangeLog
+++ b/sci-mathematics/otter/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for app-sci/otter
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/ChangeLog,v 1.1 2004/12/28 14:56:31 ribosome Exp $
+# ChangeLog for sci-mathematics/otter
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+  24 Jul 2005; <dang@gentoo.org> otter-3.3-r1.ebuild:
+  Add ~amd64
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -otter-3.2.ebuild,
+  -otter-3.3.ebuild, otter-3.3-r1.ebuild:
+  Added to x86. Removed old versions.
+
+*otter-3.3-r1 (21 Apr 2005)
+
+  21 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +otter-3.3-r1.ebuild:
+  install the examples instead of leaving index.html with broken links
+
+  21 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> otter-3.3.ebuild:
+  marked ~ppc
 
 *otter-3.3 (28 Dec 2004)
 
diff --git a/sci-mathematics/otter/Manifest b/sci-mathematics/otter/Manifest
index 5d227759501b..05a72a27e332 100644
--- a/sci-mathematics/otter/Manifest
+++ b/sci-mathematics/otter/Manifest
@@ -1,6 +1,14 @@
-MD5 3e97c23a3d5eaa47b946daf59770aebd ChangeLog 1409
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 371501d9932cbe6dd635f84d97957132 otter-3.3-r1.ebuild 798
+MD5 d048aa051e6d6d5ad4b419ae267a58a1 ChangeLog 2110
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 9987d1075d2f3f7f21b11830147fa29d otter-3.2.ebuild 686
-MD5 27c539dc5343b04d38b85d6e2fa6b664 otter-3.3.ebuild 709
-MD5 b299411e0aa76723d9617046d8d7ea5e files/digest-otter-3.2 62
-MD5 aa559b24f0a62ba3189129735c89b785 files/digest-otter-3.3 62
+MD5 aa559b24f0a62ba3189129735c89b785 files/digest-otter-3.3-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC4xFeomPajV0RnrERAkamAJ9tYShqKuNrIb+QVFy3GLCL2Jys+ACbBtt8
+O42KuQbNAk3nlvUI+l5xZOE=
+=ZoBw
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/otter/otter-3.3-r1.ebuild b/sci-mathematics/otter/otter-3.3-r1.ebuild
index 8769ac3bcec3..8b7f08159894 100644
--- a/sci-mathematics/otter/otter-3.3-r1.ebuild
+++ b/sci-mathematics/otter/otter-3.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/otter-3.3-r1.ebuild,v 1.1 2005/04/22 01:14:36 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/otter-3.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
 DESCRIPTION="An Automated Deduction System."
 SRC_URI="http://www-unix.mcs.anl.gov/AR/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www-unix.mcs.anl.gov/AR/otter/"
 
-KEYWORDS="~x86 ~ppc-macos ~ppc"
+KEYWORDS="~amd64 ~ppc ~ppc-macos x86"
 LICENSE="otter"
 SLOT="0"
 IUSE=""
diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index ff7a01e3517c..f394eb0f12c2 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,80 @@
-# ChangeLog for app-sci/pari
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.1 2004/12/28 15:08:39 ribosome Exp $
+# ChangeLog for sci-mathematics/pari
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
+
+*pari-2.1.7 (09 Nov 2005)
+
+  09 Nov 2005; <gerr@gentoo.org> +pari-2.1.7.ebuild:
+  new version (#110772), the patch to sources seems no longer necessary, 
+  as the corresponding upstream bug said "it's in cvs" for previous version (and it tests fine).
+
+  08 Nov 2005; George Shapovalov <george@gentoo.org> pari-2.1.6.ebuild:
+  fix for sparc arch (#87790)
+
+  08 Nov 2005; George Shapovalov <george@gentoo.org> pari-2.1.6.ebuild:
+  no-optimization fixes were neede for this version as well, also 
+  adjusted -fPIC fix as in 2.1.5
+
+  08 Nov 2005; George Shapovalov <george@gentoo.org> pari-2.1.5-r4.ebuild:
+  fixed no-optimization-given issue (#79278), also added -fPIC fix to this version
+
+  07 Jul 2005; George Shapovalov <george@gentoo.org> pari-2.1.6.ebuild:
+  executables needed -fPIC on amd64, fixed ebuild
+  (noticed while fixing qt dep for pariguide: #98180)
+
+  26 Jun 2005; Guy Martin <gmsoft@gentoo.org> pari-2.1.5-r4.ebuild:
+  Stable on hppa.
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -pari-2.1.5-r1.ebuild:
+  Removed obsolete version.
+
+  31 May 2005; Guy Martin <gmsoft@gentoo.org> pari-2.1.6.ebuild:
+  Stable and fixed on hppa.
+
+  12 Apr 2005; Olivier Crête <tester@gentoo.org> pari-2.1.6.ebuild:
+  Stable on x86, bug #87790
+
+  09 Apr 2005; Ferris McCormick <fmccor@gentoo.org> pari-2.1.6.ebuild:
+  Remove ~sparc keyword (Compare Bug 87790).  This version will NOT compile on
+  sparc, and so cannot be tested.  Action on Comments 3 and 4 at Bug 87990 is
+  required before testing is remotely possible.
+
+  06 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> pari-2.1.6.ebuild:
+  Stable on alpha, bug 87790.
+
+  03 Apr 2005; Hardave Riar <hardave@gentoo.org> pari-2.1.6.ebuild:
+  Stable on mips, bug #87790.
+
+  03 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pari-2.1.6.ebuild:
+  Stable on ppc.
+
+  03 Apr 2005; Danny van Dyk <kugelfang@gentoo.org> pari-2.1.6.ebuild:
+  Fixed toolchain usage and added src_test() function.
+
+  03 Apr 2005; Danny van Dyk <kugelfang@gentoo.org> pari-2.1.6.ebuild:
+  Fixed -fPIC handling for all architectures. Fixed BUG #87283.
+  Marked stable on amd64.
+
+*pari-2.1.5-r4 (07 Jan 2005)
+
+  07 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/wrong_functype-r1.patch, files/wrong_functype.patch,
+  -pari-2.1.5-r3.ebuild, +pari-2.1.5-r4.ebuild, pari-2.1.6.ebuild:
+  Function call patch was missing one line of 2.1.5. Bumping revision,
+  modified patch, removed old version.
+
+*pari-2.1.6 (06 Jan 2005)
+
+  06 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/wrong_functype.patch, -pari-2.1.5-r2.ebuild, pari-2.1.5-r3.ebuild,
+  +pari-2.1.6.ebuild:
+  Fixing bug #74431 (gp segfaults on start). Patch from 
+  http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=133
+  (development branch).
+  Declaring fixed version as stable for x86.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
 *pari-2.1.5-r3 (28 Dec 2004)
 
@@ -9,7 +83,7 @@
   +pari-2.1.5-r3.ebuild:
   Moved from app-sci/pari to sci-mathematics/pari.
 
-  12 Sep 2004; Bryan �stergaard <kloeri@gentoo.org> pari-2.1.5-r3.ebuild:
+  12 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> pari-2.1.5-r3.ebuild:
   Fix fPIC issue on alpha.
 
   06 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> pari-2.1.5-r3.ebuild:
@@ -29,7 +103,7 @@
   08 May 2004; Danny van Dyk <kugelfang@gentoo.org> pari-2.1.5-r2.ebuild:
   Shared library will now be built with -fPIC, solves BUG #49853.
 
-  05 May 2004; Bryan �stergaard <kloeri@gentoo.org> pari-2.1.5-r2.ebuild:
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> pari-2.1.5-r2.ebuild:
   Stable on alpha.
 
   19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> pari-2.1.4.ebuild,
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 6003b1267463..0ff0a9156e40 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,9 +1,11 @@
-MD5 812f92e455b08016cdf6a3f69d6bb7b2 pari-2.1.5-r1.ebuild 945
-MD5 265994ad005596593e08a282debb4c6c pari-2.1.5-r3.ebuild 1832
-MD5 eb02d6782a6529df3d7b710a39f5fd0c pari-2.1.5-r2.ebuild 1362
-MD5 87decba0d2fbdf3f3ccaad95ef7b0cb1 ChangeLog 2515
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 b9ee81070b9fa2036a267df0e97a06f8 ChangeLog 5678
+MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r4 63
+MD5 2fd9906f2bf293fdad42d572846508de files/digest-pari-2.1.6 60
+MD5 af657a173514360dabaac40ecd6ee695 files/digest-pari-2.1.7 60
 MD5 c3f89da5ddbdb73646e3d64ee31ea887 files/docs.patch 915
-MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r1 63
-MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r2 63
-MD5 ee951aeeb2122fab2aaf9803097fad76 files/digest-pari-2.1.5-r3 63
+MD5 dccf7ef464f99fa750a5c7fc3ec67e8f files/wrong_functype-r1.patch 1498
+MD5 cbd309a01e2fee1a5ba6cb3a93ba5708 files/wrong_functype.patch 1946
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 c49cfeebeab95672f9d228b76c63522b pari-2.1.5-r4.ebuild 2520
+MD5 8aca1c2d2f15f55900235c498da7a34a pari-2.1.6.ebuild 2482
+MD5 b46e81d1d0ac1468e9705febc1e5291f pari-2.1.7.ebuild 2454
diff --git a/sci-mathematics/pari/files/wrong_functype.patch b/sci-mathematics/pari/files/wrong_functype.patch
index 5eb95e622c7a..a1dd4c98fe0a 100644
--- a/sci-mathematics/pari/files/wrong_functype.patch
+++ b/sci-mathematics/pari/files/wrong_functype.patch
@@ -33,3 +33,16 @@ diff -ru src.old/gp/gp_rl.c src/gp/gp_rl.c
  
    Defun("short-help", rl_short_help, -1);
    Defun("long-help", rl_long_help, -1);
+diff -ru src-old/basemath/buch2.c src/basemath/buch2.c
+--- src-old/basemath/buch2.c	2001-11-04 15:09:54.000000000 +0100
++++ src/basemath/buch2.c	2005-01-07 10:08:25.442785391 +0100
+@@ -2922,7 +2922,8 @@
+ 
+   /* random relations */
+   if (cglob == KCCO) /* enough relations, initialize nevertheless */
+-    ((void(*)(long))random_relation)(-1);
++     random_relation(-1,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
++
+   else
+   {
+     GEN maarch;
diff --git a/sci-mathematics/pari/pari-2.1.5-r4.ebuild b/sci-mathematics/pari/pari-2.1.5-r4.ebuild
index 4127e28ad08c..b1a84233b4db 100644
--- a/sci-mathematics/pari/pari-2.1.5-r4.ebuild
+++ b/sci-mathematics/pari/pari-2.1.5-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r4.ebuild,v 1.1 2005/01/07 09:40:26 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.5-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
 HOMEPAGE="http://www.parigp-home.de/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.gn-50uma.de/ftp/pari-2.1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips ~hppa amd64"
+KEYWORDS="x86 ~ppc ~sparc alpha ~mips hppa amd64"
 
 IUSE="doc emacs"
 
@@ -21,9 +21,20 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/docs.patch
 	epatch ${FILESDIR}/wrong_functype.patch
+
 }
 
 src_compile() {
+	#need to force optimization here, as it breaks without
+	if   is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+
+	#we also need to force -fPIC
+	if ! is-flag -fPIC; then append-flags -fPIC; fi
+
 	./Configure \
 		--host="$(echo ${CHOST} | cut -f "1 3" -d '-')" \
 		--prefix=/usr \
@@ -46,6 +57,13 @@ src_compile() {
 		emake CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
 		einfo "Building executables..."
 		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building exec  tu  ables failed!"
+	elif use hppa; then
+		einfo "Building shared library..."
+		cd Olinux-hppa*
+		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+		emake CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" ${mymake} lib-dyn || die "Building shared library failed!"
+		einfo "Building executables..."
+		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building exec  tu  ables failed!"
 	else
 		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp || die
 	fi
diff --git a/sci-mathematics/pari/pari-2.1.6.ebuild b/sci-mathematics/pari/pari-2.1.6.ebuild
index 851cb4c49f22..1c49f6493589 100644
--- a/sci-mathematics/pari/pari-2.1.6.ebuild
+++ b/sci-mathematics/pari/pari-2.1.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/sci-mathematics/pari/pari-2.1.6.ebuild,v 1.1 2005/01/06 10:34:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.6.ebuild,v 1.1.1.1 2005/11/30 09:55:50 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="pari (or pari-gp) : a software package for computer-aided number theory"
 HOMEPAGE="http://pari.math.u-bordeaux.fr/"
@@ -10,8 +10,7 @@ SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
-
+KEYWORDS="alpha amd64 hppa mips ppc ~sparc x86"
 IUSE="doc emacs"
 
 DEPEND="doc? ( virtual/tetex )"
@@ -20,41 +19,67 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/docs.patch
-	epatch ${FILESDIR}/wrong_functype.patch
+	epatch ${FILESDIR}/wrong_functype-r1.patch
 }
 
 src_compile() {
+	# Fix usage of toolchain
+	tc-getAS; tc-getLD; tc-getCC; tc-getCXX
+
+	# Special handling for sparc
+	local myhost
+	[ "${PROFILE_ARCH}" == "sparc64" ] && myhost="sparc64-linux" \
+		|| myhost="$(echo ${CHOST} | cut -f "1 3" -d '-')"
+	einfo "Building for ${myhost}"
+
+	#need to force optimization here, as it breaks without
+	if   is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+	#we also need to force -fPIC on amd64
+	if [ "${ARCH}" = "amd64" ] && ! is-flag -fPIC; then append-flags -fPIC; fi
+
 	./Configure \
-		--host="$(echo ${CHOST} | cut -f "1 3" -d '-')" \
+		--host=${myhost} \
 		--prefix=/usr \
-		--miscdir=/usr/share/doc/${P} \
+		--miscdir=/usr/share/doc/${PF} \
 		--datadir=/usr/share/${P} \
+		--libdir=/usr/$(get_libdir) \
 		--mandir=/usr/share/man/man1 || die "./configure failed"
 	addwrite "/var/lib/texmf"
 	addwrite "/usr/share/texmf"
 	addwrite "/var/cache/fonts"
-	if use amd64; then
-		# Fixes BUG #49583
-		einfo "Building shared library..."
-		cd Olinux-x86_64
-		emake CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
-		einfo "Building executables..."
-		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building exectuables failed!"
-	elif use alpha; then
-		einfo "Building shared library..."
-		cd Olinux-alpha
-		emake CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
-		einfo "Building executables..."
-		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building exec  tu  ables failed!"
-	else
-		emake CFLAGS="${CFLAGS} -DGCC_INLINE" gp || die
+
+	if use hppa
+	then
+		mymake=DLLD\=/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
 	fi
+
+	# Shared libraries should be PIC on ALL architectures.
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/31
+	# Fixes BUG #49583
+	einfo "Building shared library..."
+	cd Olinux-* || die "Bad directory. File a BUG!"
+	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE -fPIC" lib-dyn || die "Building shared library failed!"
+
+	einfo "Building executables..."
+	emake ${mymake} CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp || die "Building executables failed!"
+
 	use doc || rm -rf doc/*.tex
 	use doc && emake doc
 }
 
-src_install () {
-	make DESTDIR=${D} install || die
+src_test() {
+	cd ${S}
+	ebegin "Testing pari kernel"
+	make CFLAGS="-Wl,-lpari" test-kernel > /dev/null
+	eend $?
+}
+
+src_install() {
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
 	if use emacs; then
 		insinto /usr/share/emacs/site-lisp
 		doins emacs/pari.el
diff --git a/sci-mathematics/pari/pari-2.1.7.ebuild b/sci-mathematics/pari/pari-2.1.7.ebuild
index c3209d10f9de..4d1a1374c151 100644
--- a/sci-mathematics/pari/pari-2.1.7.ebuild
+++ b/sci-mathematics/pari/pari-2.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/sci-mathematics/pari/pari-2.1.7.ebuild,v 1.1 2005/11/09 16:23:26 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.1.7.ebuild,v 1.1.1.1 2005/11/30 09:55:49 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
diff --git a/sci-mathematics/pariguide/ChangeLog b/sci-mathematics/pariguide/ChangeLog
index ca9ead7034f6..1b25e8b43103 100644
--- a/sci-mathematics/pariguide/ChangeLog
+++ b/sci-mathematics/pariguide/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for app-sci/pariguide
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pariguide/ChangeLog,v 1.1 2004/12/28 21:51:31 ribosome Exp $
+# ChangeLog for sci-mathematics/pariguide
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pariguide/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+  07 Jul 2005; George Shapovalov <george@gentoo.org> pariguide-0.43a.ebuild:
+  fixed qt dependency (#98180, qt-4 is upcoming)
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pariguide-0.43a.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
 *pariguide-0.43a (28 Dec 2004)
 
@@ -8,7 +18,7 @@
   +pariguide-0.43a.ebuild:
   Moved from app-sci/pariguide to sci-mathematics/pariguide.
 
-  05 May 2004; Bryan �stergaard <kloeri@gentoo.org> pariguide-0.43a.ebuild:
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> pariguide-0.43a.ebuild:
   Stable on alpha.
 
   23 Mar 2004; Joshua Kinard <kumba@gentoo.org> pariguide-0.43a.ebuild:
diff --git a/sci-mathematics/pariguide/Manifest b/sci-mathematics/pariguide/Manifest
index 8620d0283c01..8f1833e0cb95 100644
--- a/sci-mathematics/pariguide/Manifest
+++ b/sci-mathematics/pariguide/Manifest
@@ -1,4 +1,4 @@
-MD5 99426f2b8ab410e25802a7bae2cb9ea6 pariguide-0.43a.ebuild 879
-MD5 7306698441d49c4b31c60e46ce79ac8a ChangeLog 853
+MD5 3aa902d3e402b4e1c1aa520ac6397a8c pariguide-0.43a.ebuild 886
+MD5 c8b6c3e90f50100896aa64ea6aa1cbf5 ChangeLog 1387
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 634bbf3664aaa81da8769398869b914f files/digest-pariguide-0.43a 67
diff --git a/sci-mathematics/pariguide/pariguide-0.43a.ebuild b/sci-mathematics/pariguide/pariguide-0.43a.ebuild
index 5ceb35c7181f..d20e8a0e01fb 100644
--- a/sci-mathematics/pariguide/pariguide-0.43a.ebuild
+++ b/sci-mathematics/pariguide/pariguide-0.43a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pariguide/pariguide-0.43a.ebuild,v 1.1 2004/12/28 21:51:31 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pariguide/pariguide-0.43a.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
 IUSE=""
 
@@ -10,9 +10,9 @@ SRC_URI="mirror://sourceforge/pariguide/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha ~hppa"
+KEYWORDS="~amd64 x86 ppc ~sparc alpha ~hppa"
 
-DEPEND=">=x11-libs/qt-2.2.0
+DEPEND="<x11-libs/qt-4
 	virtual/x11"
 
 RDEPEND=">=sci-mathematics/pari-2.1.0"
diff --git a/sci-mathematics/qtiplot/ChangeLog b/sci-mathematics/qtiplot/ChangeLog
index c9a869b10ba7..7ae3f06f6562 100644
--- a/sci-mathematics/qtiplot/ChangeLog
+++ b/sci-mathematics/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/qtiplot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.1 2005/10/14 02:26:26 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
+
+*qtiplot-0.7 (23 Oct 2005)
+
+  23 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> -qtiplot-0.6.9.ebuild,
+  +qtiplot-0.7.ebuild:
+  Version bump, bug 109968.
 
 *qtiplot-0.6.9 (14 Oct 2005)
 
diff --git a/sci-mathematics/qtiplot/Manifest b/sci-mathematics/qtiplot/Manifest
index 8f3c48754dc3..9ac707810d0f 100644
--- a/sci-mathematics/qtiplot/Manifest
+++ b/sci-mathematics/qtiplot/Manifest
@@ -1,3 +1,14 @@
-MD5 893bc4adeb75782d32a1a7725958b2fa files/digest-qtiplot-0.6.9 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9137e4cfbd339113203a1e6e24a1b5a0 ChangeLog 599
+MD5 0fb2c4631892f19ca2c9701415170d7a files/digest-qtiplot-0.7 60
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
-MD5 ef79989d3d2df00daa502971c65af377 qtiplot-0.6.9.ebuild 967
+MD5 6dfdb8f5ea22b60828e3e4dd4894ff95 qtiplot-0.7.ebuild 1136
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDW6YrntT9W3vfTuoRAi1uAJ9B8823IB8xl/XvZpIdUstaTTZw+QCaAgwF
+FQJe/TRacVNMlZ15AstssvY=
+=zMmF
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/qtiplot/qtiplot-0.7.ebuild b/sci-mathematics/qtiplot/qtiplot-0.7.ebuild
index ecf58df2db88..9b83d1aebf36 100644
--- a/sci-mathematics/qtiplot/qtiplot-0.7.ebuild
+++ b/sci-mathematics/qtiplot/qtiplot-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/sci-mathematics/qtiplot/qtiplot-0.7.ebuild,v 1.1 2005/10/23 15:02:38 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/qtiplot-0.7.ebuild,v 1.1.1.1 2005/11/30 09:55:55 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 32500ae46429..0040a0efa100 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,57 @@
-# ChangeLog for app-sci/scilab
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.1 2004/12/28 15:14:40 ribosome Exp $
+# ChangeLog for sci-mathematics/scilab
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
+
+*scilab-3.1.1-r3 (13 Nov 2005)
+
+  13 Nov 2005; Olivier Fisette <ribosome@gentoo.org>
+  +scilab-3.1.1-r3.ebuild:
+  Migrated to fortran.eclass (bug #65950).
+
+*scilab-3.1.1-r2 (01 Oct 2005)
+
+  01 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  +scilab-3.1.1-r2.ebuild:
+  Removing deprecated "gtk2" USE flag (bug #106560).
+
+  08 Sep 2005; Peter Bienstman <pbienst@gentoo.org> scilab-3.1.1-r1.ebuild:
+  Fix bug #105034.
+
+  07 Sep 2005; Peter Bienstman <pbienst@gentoo.org> scilab-3.1.1-r1.ebuild:
+  Change order of lapack and blas libraries.
+
+*scilab-3.1.1-r1 (05 Sep 2005)
+
+  05 Sep 2005; Peter Bienstman <pbienst@gentoo.org> +scilab-3.1.1-r1.ebuild:
+  Convert to new lapack infrastructure.
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  -files/scilab-3.0-initialization.patch, -scilab-3.0.ebuild,
+  -scilab-3.0-r1.ebuild:
+  Removed obsolete versions.
+
+  23 Jun 2005; Olivier Fisette <ribosome@gentoo.org> scilab-3.1.1.ebuild:
+  Fixed references to the WORKDIR in installed files (bug #95429).
+
+  21 Jun 2005; Olivier Fisette <ribosome@gentoo.org> scilab-3.1.1.ebuild:
+  Add ocaml support.
+
+*scilab-3.1.1 (21 Jun 2005)
+
+  21 Jun 2005; Olivier Fisette <ribosome@gentoo.org> +scilab-3.1.1.ebuild:
+  New version.
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> scilab-3.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  04 May 2005; David Holm <dholm@gentoo.org> scilab-3.0-r1.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+*scilab-3.0-r1 (02 Mar 2005)
+
+  02 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/scilab-3.0-initialization.patch, +scilab-3.0-r1.ebuild:
+  Dependency cleanup. Added patch to fix #67905.
 
 *scilab-2.7-r3 (28 Dec 2004)
 
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 52ff29f6c76d..eb008b7a74b7 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,7 +1,13 @@
-MD5 0eabe414a1914d996803eba847694a63 scilab-3.0.ebuild 5065
-MD5 2b8bc410fc32427b27bcaefab3d62220 scilab-2.7-r3.ebuild 4014
-MD5 be9f9bf4a7f3ef22a63ee2d21b038c01 ChangeLog 3986
+MD5 693bb0bca5adf98abe428a3ca435d095 scilab-2.7-r3.ebuild 4028
+MD5 d0d35035f63b012c250b165d95ac0a8d scilab-3.1.1.ebuild 5789
+MD5 40f7671ad69b1687f87850e710843f0d scilab-3.1.1-r2.ebuild 5808
+MD5 98a93c775c31d389443fdbb685449d81 scilab-3.1.1-r1.ebuild 5942
+MD5 4c0bf92924dae9800994c429a4586eff ChangeLog 5922
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 16bcc7ae423c5154b2d8e0b15dcfe40e scilab-3.1.1-r3.ebuild 4796
+MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1-r1 70
+MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1-r2 70
+MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1-r3 70
 MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702
-MD5 a485d7f0600472c5f79d8c78a09deb6a files/digest-scilab-3.0 68
 MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r3 135
+MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1 70
diff --git a/sci-mathematics/scilab/scilab-2.7-r3.ebuild b/sci-mathematics/scilab/scilab-2.7-r3.ebuild
index 6e38e4c9e827..1204e138af2a 100644
--- a/sci-mathematics/scilab/scilab-2.7-r3.ebuild
+++ b/sci-mathematics/scilab/scilab-2.7-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/sci-mathematics/scilab/scilab-2.7-r3.ebuild,v 1.1 2004/12/28 15:14:40 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-2.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit virtualx eutils
 
@@ -38,7 +38,7 @@ pkg_setup() {
 	if ! use ifc && [ -z `which g77` ]; then
 		#if ifc is defined then the dep was already checked
 		eerror "No fortran compiler found on the system!"
-		eerror "Please add f77 to your USE flags and reemerge gcc!"
+		eerror "Please add fortran to your USE flags and reemerge gcc!"
 		die
 	fi
 }
diff --git a/sci-mathematics/scilab/scilab-3.1.1-r1.ebuild b/sci-mathematics/scilab/scilab-3.1.1-r1.ebuild
index 2313177936fa..4ae29384f207 100644
--- a/sci-mathematics/scilab/scilab-3.1.1-r1.ebuild
+++ b/sci-mathematics/scilab/scilab-3.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/sci-mathematics/scilab/scilab-3.1.1-r1.ebuild,v 1.1 2005/09/05 07:47:23 pbienst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.1.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit eutils
 
@@ -71,7 +71,7 @@ src_unpack() {
 	cd ${S}
 
 	sed -i \
-		-e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/libblas.so $(ATLASDIR)/liblapack.so,' \
+		-e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
 		-e 's,$(SCIDIR)/libs/lapack.a,,' \
 		Makefile.OBJ.in
 
diff --git a/sci-mathematics/scilab/scilab-3.1.1-r2.ebuild b/sci-mathematics/scilab/scilab-3.1.1-r2.ebuild
index 80ea63edc740..ee72cdc2da28 100644
--- a/sci-mathematics/scilab/scilab-3.1.1-r2.ebuild
+++ b/sci-mathematics/scilab/scilab-3.1.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/sci-mathematics/scilab/scilab-3.1.1-r2.ebuild,v 1.1 2005/10/01 18:53:19 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.1.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild b/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild
index b05dafeea9e7..8cdf4bdfd03a 100644
--- a/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild
+++ b/sci-mathematics/scilab/scilab-3.1.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/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild,v 1.1 2005/11/13 05:36:47 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit eutils fortran
 
diff --git a/sci-mathematics/scilab/scilab-3.1.1.ebuild b/sci-mathematics/scilab/scilab-3.1.1.ebuild
index 2b410bf6bcde..78f9c90765e2 100644
--- a/sci-mathematics/scilab/scilab-3.1.1.ebuild
+++ b/sci-mathematics/scilab/scilab-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/sci-mathematics/scilab/scilab-3.1.1.ebuild,v 1.1 2005/06/21 00:12:24 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.1.1.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.scilab.org/"
 LICENSE="scilab"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-IUSE="ifc tcltk atlas gtk gtk2 Xaw3d"
+IUSE="ifc ocaml tcltk atlas gtk gtk2 Xaw3d"
 
 RDEPEND="virtual/x11
 	sys-libs/ncurses
@@ -29,7 +29,8 @@ RDEPEND="virtual/x11
 	)
 	tcltk? ( >=dev-lang/tk-8.4
 		>=dev-lang/tcl-8.4 )
-	Xaw3d? ( x11-libs/Xaw3d )"
+	Xaw3d? ( x11-libs/Xaw3d )
+	ocaml? ( dev-lang/ocaml )"
 
 DEPEND="${RDEPEND}
 	ifc? ( dev-lang/ifc )
@@ -81,6 +82,9 @@ src_compile() {
 		use gtk2 && myopts="${myopts} --with-gtk2" || \
 			myopts="${myopts} --with-gtk"
 	fi
+	if ! use ocaml; then
+		myopts="${myopts} --without-ocaml"
+	fi
 
 	econf ${myopts} || die
 	env HOME=${S} make all || die
@@ -172,10 +176,23 @@ src_install() {
 	dosym /usr/lib/${P}/bin/intersci-n /usr/bin/intersci-n
 
 	# The compile and install process causes the work folder to be registered
-	# as the runtime folder in the launch script. This is corrected here.
-	BAD_LINE=SCI\=\"${WORKDIR}/${P}\"
-	FIXED_LINE=SCI\=\"/usr/lib/${P}\"
-	sed -i -e "s#${BAD_LINE}#${FIXED_LINE}#" ${D}/usr/lib/${P}/bin/scilab
+	# as the runtime folder in many files. This is corrected here.
+	BAD_REF="${WORKDIR}/${P}"
+	FIXED_REF="/usr/lib/${P}"
+	BIN_TO_FIX="Blpr BEpsf Blatexpr2 Blatexprs Blatexpr scilab"
+	for i in ${BIN_TO_FIX}; do
+		sed -e "s%${BAD_REF}%${FIXED_REF}%" -i ${D}/usr/lib/${P}/bin/${i} || die
+	done
+	MAN_TO_FIX="eng fr"
+	for i in ${MAN_TO_FIX}; do
+		for j in ${D}/usr/lib/${P}/man/${i}/*.h*; do
+			sed -e "s%${BAD_REF}%${FIXED_REF}%" -i ${j} || die
+		done
+	done
+	MISC_TO_FIX="util/Blatdoc util/Blatdocs"
+	for i in ${MISC_TO_FIX}; do
+		sed -e "s%${BAD_REF}%${FIXED_REF}%" -i ${D}/usr/lib/${P}/${i} || die
+	done
 }
 
 pkg_postinst() {
diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 3f4df0f78b99..13af6e1962d0 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,10 @@
-# ChangeLog for app-sci/singular
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.1 2004/12/28 15:17:37 ribosome Exp $
+# ChangeLog for sci-mathematics/singular
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org>
+  -singular-2.0.4-r1.ebuild, singular-2.0.5-r4.ebuild:
+  Fixed typo in description. Removed old version.
 
 *singular-2.0.4-r1 (28 Dec 2004)
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 4bfb4a60bb61..d3244ac3f867 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,9 +1,6 @@
-MD5 e6b00ca4be498551bfd966c315daa9bf singular-2.0.5-r4.ebuild 4263
-MD5 195ad9d11cb3fdd0d3dc1c98f8c30279 singular-2.0.4-r1.ebuild 3673
-MD5 52f2a7a035ad01be00b2506199751988 ChangeLog 2760
+MD5 04e6be188d434a23dbb138e9a5889ef6 singular-2.0.5-r4.ebuild 4271
+MD5 16b502df043a8600a3fbd0e5c7a10344 ChangeLog 3246
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 b1383ace2a0b30413341982e4e34341f files/fake_ssh 150
-MD5 b52673163a28446aae41691abc3e705d files/digest-singular-2.0.4-r1 862
 MD5 673cd925126b07ea0e78cf91269b7d66 files/digest-singular-2.0.5-r4 859
 MD5 916f91466aad4f177f2270b4c1fad94a files/singular-2.0.5-r3-gentoo.diff 4399
-MD5 8f79455c2cd6352e5e0907b21a7390f1 files/singular-2.0.4-gentoo.diff 3287
diff --git a/sci-mathematics/singular/singular-2.0.5-r4.ebuild b/sci-mathematics/singular/singular-2.0.5-r4.ebuild
index 5c69ce4adb7b..2b553f93d8e9 100644
--- a/sci-mathematics/singular/singular-2.0.5-r4.ebuild
+++ b/sci-mathematics/singular/singular-2.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/sci-mathematics/singular/singular-2.0.5-r4.ebuild,v 1.1 2004/12/28 15:17:37 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-2.0.5-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ BPN=${PN/s/S}
 NTLVERSION="5.3.1"
 # attention: different versions are mixed. IntProg is older
 
-DESCRIPTION="computer algebra system for polynomial computations"
+DESCRIPTION="Computer algebra system for polynomial computations"
 SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-doc-${MINPV}.tar.gz
 		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-emacs-${MINPV}.tar.gz
 		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-factory-${MINPV}.tar.gz
diff --git a/sci-mathematics/snns/ChangeLog b/sci-mathematics/snns/ChangeLog
index cd03233d9e7b..d13b190a845f 100644
--- a/sci-mathematics/snns/ChangeLog
+++ b/sci-mathematics/snns/ChangeLog
@@ -1,6 +1,26 @@
-# ChangeLog for app-sci/snns
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.1 2004/12/28 15:31:38 ribosome Exp $
+# ChangeLog for sci-mathematics/snns
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/ChangeLog,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> snns-4.2-r7.ebuild:
+  Stable on ppc.
+
+  24 Aug 2005; Patrick Kursawe <phosphan@gentoo.org> snns-4.2-r6.ebuild,
+  snns-4.2-r7.ebuild:
+  No longer using cp -a (bug #103487), marking -r7 stable for x86.
+
+  20 Feb 2005; Joseph Jezak <josejx@gentoo.org> snns-4.2-r7.ebuild:
+  Marked ~ppc for bug #81482. Python bindings may not function correctly,
+  ensure that it's working before marking ppc.
+
+*snns-4.2-r7 (10 Feb 2005)
+
+  10 Feb 2005; Patrick Kursawe <phosphan@gentoo.org> +snns-4.2-r7.ebuild:
+  New patch for python function calls from the SNNS kernel
+
+  30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/4.2-fPIC-python.patch, snns-4.2-r6.ebuild:
+  added ~amd64 to -r6 and a patch which is required if USE=python. fixes #79773
 
 *snns-4.2-r4 (28 Dec 2004)
 
diff --git a/sci-mathematics/snns/Manifest b/sci-mathematics/snns/Manifest
index aaaae618ecf5..b93823eee891 100644
--- a/sci-mathematics/snns/Manifest
+++ b/sci-mathematics/snns/Manifest
@@ -1,6 +1,9 @@
-MD5 965a49cb6e92cb30aa26a1397e1f34ed snns-4.2-r4.ebuild 1633
-MD5 3f45feb1ab7562379faba5558b15a226 snns-4.2-r6.ebuild 2518
-MD5 9316c9bef19882d7d4d764aa031ea4cf ChangeLog 2097
+MD5 74eb817bd528c04a396576ef594eb643 snns-4.2-r4.ebuild 1640
+MD5 d6c2822f706c971ed4d1eb73d5276c33 snns-4.2-r7.ebuild 2853
 MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
+MD5 11bde3adbdc130ef02502c9210179947 ChangeLog 3092
+MD5 bcd4e2d19956f5e748ad0a349baecefa snns-4.2-r6.ebuild 2603
 MD5 409a7ed863845a91ab923aee9873a062 files/digest-snns-4.2-r4 196
+MD5 5ff18c8925d0470f7a9e21fac5aa030e files/digest-snns-4.2-r7 345
 MD5 13bc6c016dc3aa799a25598dead6346e files/digest-snns-4.2-r6 262
+MD5 e810e01b587c8fc167a868700f105be6 files/4.2-fPIC-python.patch 498
diff --git a/sci-mathematics/snns/snns-4.2-r4.ebuild b/sci-mathematics/snns/snns-4.2-r4.ebuild
index 806087da56ef..11184d9bc08b 100644
--- a/sci-mathematics/snns/snns-4.2-r4.ebuild
+++ b/sci-mathematics/snns/snns-4.2-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/sci-mathematics/snns/snns-4.2-r4.ebuild,v 1.1 2004/12/28 15:31:38 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r4.ebuild,v 1.1.1.1 2005/11/30 09:55:52 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/snns/snns-4.2-r6.ebuild b/sci-mathematics/snns/snns-4.2-r6.ebuild
index 89e3cf07d19e..0b3beaa14aa8 100644
--- a/sci-mathematics/snns/snns-4.2-r6.ebuild
+++ b/sci-mathematics/snns/snns-4.2-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/sci-mathematics/snns/snns-4.2-r6.ebuild,v 1.1 2004/12/28 15:31:38 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r6.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils python
 
@@ -16,7 +16,7 @@ SRC_URI="http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
 	python? ( http://download.berlios.de/snns-dev/${MYPYTHONEXT}.tar.gz )"
 
 LICENSE="SNNS-${PV}"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 SLOT="0"
 IUSE="X doc python"
 
@@ -31,7 +31,12 @@ src_unpack() {
 	unpack ${MY_P}.tar.gz
 	unpack ${MYPATCH}.patch.gz
 	epatch ${MYPATCH}.patch
-	use python && unpack ${MYPYTHONEXT}.tar.gz
+	if use python; then
+		unpack ${MYPYTHONEXT}.tar.gz
+
+		cd ${S}
+		epatch ${FILESDIR}/${PV}-fPIC-python.patch
+	fi
 }
 
 src_compile() {
@@ -72,7 +77,7 @@ src_install() {
 	if use python; then
 		cd python
 		python setup.py install --prefix=${D}/usr || die "could not install python module"
-		cp -a examples ${D}/usr/share/doc/${PF}/python-examples
+		cp -pPR examples ${D}/usr/share/doc/${PF}/python-examples
 		chmod +x ${D}/usr/share/doc/${PF}/python-examples/*.py
 		newdoc README README.python
 		cd ${S}
diff --git a/sci-mathematics/snns/snns-4.2-r7.ebuild b/sci-mathematics/snns/snns-4.2-r7.ebuild
index fb8c047235be..406827d93086 100644
--- a/sci-mathematics/snns/snns-4.2-r7.ebuild
+++ b/sci-mathematics/snns/snns-4.2-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/sci-mathematics/snns/snns-4.2-r7.ebuild,v 1.1 2005/02/10 11:43:22 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/snns/snns-4.2-r7.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils python
 
@@ -18,7 +18,7 @@ SRC_URI="http://www-ra.informatik.uni-tuebingen.de/downloads/SNNS/${MY_P}.tar.gz
 			  http://download.berlios.de/snns-dev/${MYPYTHONPATCH}.gz )"
 
 LICENSE="SNNS-${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ppc x86"
 SLOT="0"
 IUSE="X doc python"
 
@@ -84,7 +84,7 @@ src_install() {
 	if use python; then
 		cd python
 		python setup.py install --prefix=${D}/usr || die "could not install python module"
-		cp -a examples ${D}/usr/share/doc/${PF}/python-examples
+		cp -pPR examples ${D}/usr/share/doc/${PF}/python-examples
 		chmod +x ${D}/usr/share/doc/${PF}/python-examples/*.py
 		newdoc README README.python
 		cd ${S}
diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index 833168ec04fb..1cf731dfb360 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for app-sci/yacas
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.1 2004/12/28 15:19:17 ribosome Exp $
+# ChangeLog for sci-mathematics/yacas
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
+
+*yacas-1.0.58 (02 Oct 2005)
+
+  02 Oct 2005; Olivier Fisette <ribosome@gentoo.org> yacas-1.0.56.ebuild,
+  yacas-1.0.57.ebuild, +yacas-1.0.58.ebuild:
+  New version. Ebuild clean-ups. Fixed location of help files (bug #106308).
+
+*yacas-1.0.57 (14 Jan 2005)
+
+  14 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> +files/1.0.57.patch,
+  +yacas-1.0.57.ebuild:
+  Removing GMP support because it looks like it is not maintained upstream (does
+  not compile without the patches from 1.0.56 and fails on several tests).
+  Added optional media-libs/glut dependency.
+  Switching off the plugin size optimization because it causes yacas to segfault
+  when trying to build the plugins (source: BSD ports).
+
+  14 Jan 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +files/opengl-gcc3.4.patch, yacas-1.0.56.ebuild:
+  Adding a fix for yet another gcc 3.4 problem that appears only when
+  media-libs/glut is not installed (bug #77595)
 
 *yacas-1.0.56 (28 Dec 2004)
 
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index 7804ff57558e..c5f0c95652f5 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,4 +1,10 @@
-MD5 bf447abbdf41739561f07b4c04d0bb6e ChangeLog 1570
+MD5 1be4437420e7596162d8f8eed6212119 yacas-1.0.57.ebuild 1445
+MD5 5d5cdc9104e23720c296277ed1212723 yacas-1.0.56.ebuild 1606
+MD5 b30503ab4331ba2b3f931f7a528b9272 yacas-1.0.58.ebuild 1411
+MD5 b40075e54074bf385478939de86c5348 ChangeLog 2678
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 4019b2f736a3cb190e32dcd4ef8291b1 yacas-1.0.56.ebuild 1286
 MD5 5c748030f6e6f803d4e272ce57a31361 files/digest-yacas-1.0.56 130
+MD5 e222e9a7debd7c3e79ee700005276c93 files/digest-yacas-1.0.57 65
+MD5 7a24f28d999fff717cf52796702c816d files/digest-yacas-1.0.58 65
+MD5 b49a5413d88ccb8242bc01dedb22afd0 files/opengl-gcc3.4.patch 227
+MD5 3edf1638789f8529fb17f44a33907e47 files/1.0.57.patch 1955
diff --git a/sci-mathematics/yacas/yacas-1.0.56.ebuild b/sci-mathematics/yacas/yacas-1.0.56.ebuild
index 0ce545bb9a66..e60bcf6f5a3a 100644
--- a/sci-mathematics/yacas/yacas-1.0.56.ebuild
+++ b/sci-mathematics/yacas/yacas-1.0.56.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.56.ebuild,v 1.1 2004/12/28 15:19:17 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.56.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils
 
@@ -23,8 +23,9 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}.patch
+	cd "${S}"
+	epatch "${WORKDIR}"/${P}.patch
+	epatch "${FILESDIR}"/opengl-gcc3.4.patch
 }
 
 src_compile() {
@@ -41,11 +42,14 @@ src_install() {
 	find -name Makefile |xargs sed -i -e "s:datadir = /usr/share:datadir = ${D}/usr/share:"
 	cd manmake
 	sed -i -e "s:htmldir = :htmldir = ${D}:" -e "s:psdir = :psdir = ${D}:" Makefile
-	cd ${S}
+	cd "${S}"
 
-	DESTDIR=${D} make install-strip || die
+	DESTDIR="${D}" make install-strip || die
 
 	dodoc AUTHORS INSTALL NEWS README TODO
-	mv ${D}/usr/share/${PN}/documentation ${D}/usr/share/doc/${PF}/html
-	rmdir ${D}/usr/include/
+	mv "${D}"/usr/share/${PN}/documentation "${D}"/usr/share/doc/${PF}/html
+	rmdir "${D}"/usr/include/
+	sed -e "s|\":FindFile(\"documentation/ref.html\"):\"|localhost/usr/share/doc/${PF}/html/ref.html|" \
+		-e "s|\":FindFile(\"documentation/books.html\"):\"|localhost/usr/share/doc/${PF}/html/books.html|" \
+		-i "${D}"/usr/share/${PN}/yacasinit.ys || die
 }
diff --git a/sci-mathematics/yacas/yacas-1.0.57.ebuild b/sci-mathematics/yacas/yacas-1.0.57.ebuild
index 8405b4783a9f..3ed9af3729cb 100644
--- a/sci-mathematics/yacas/yacas-1.0.57.ebuild
+++ b/sci-mathematics/yacas/yacas-1.0.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/sci-mathematics/yacas/yacas-1.0.57.ebuild,v 1.1 2005/01/14 17:05:53 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.57.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils
 
@@ -16,13 +16,13 @@ KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/libc
 	>=sys-apps/sed-4
-	glut? ( media-libs/glut )"
-
+	glut? ( media-libs/glut )
+	www-client/lynx"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}.patch
 	if ! use glut; then
 		sed -e 's:opengl::g' -i plugins/Makefile.in || die "sed (opengl) failed"
 		sed -e 's/\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\)/\1 \2/' -i \
@@ -39,7 +39,10 @@ src_install() {
 	make DESTDIR="${D}" install-strip || die
 
 	dodoc AUTHORS INSTALL NEWS README TODO
-	mv ${D}/usr/share/${PN}/documentation ${D}/usr/share/doc/${PF}/html
-	rmdir ${D}/usr/include/
-	rm ${D}/usr/share/${PN}/include/win32*
+	mv "${D}"/usr/share/${PN}/documentation "${D}"/usr/share/doc/${PF}/html
+	rmdir "${D}"/usr/include/
+	rm "${D}"/usr/share/${PN}/include/win32*
+	sed -e "s|\":FindFile(\"documentation/ref.html\"):\"|localhost/usr/share/doc/${PF}/html/ref.html|" \
+		-e "s|\":FindFile(\"documentation/books.html\"):\"|localhost/usr/share/doc/${PF}/html/books.html|" \
+		-i "${D}"/usr/share/${PN}/yacasinit.ys || die
 }
diff --git a/sci-mathematics/yacas/yacas-1.0.58.ebuild b/sci-mathematics/yacas/yacas-1.0.58.ebuild
index 66c245f6b71a..fa3a62c7821c 100644
--- a/sci-mathematics/yacas/yacas-1.0.58.ebuild
+++ b/sci-mathematics/yacas/yacas-1.0.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.58.ebuild,v 1.1 2005/10/02 02:47:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.58.ebuild,v 1.1.1.1 2005/11/30 09:55:53 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/855resolution/855resolution-0.4.ebuild b/sys-apps/855resolution/855resolution-0.4.ebuild
index 7aa5b0219f59..a43eef02c145 100644
--- a/sys-apps/855resolution/855resolution-0.4.ebuild
+++ b/sys-apps/855resolution/855resolution-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-apps/855resolution/855resolution-0.4.ebuild,v 1.1 2005/06/19 22:07:03 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/855resolution-0.4.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
 
diff --git a/sys-apps/855resolution/ChangeLog b/sys-apps/855resolution/ChangeLog
index f3b918498931..9b9eb560a261 100644
--- a/sys-apps/855resolution/ChangeLog
+++ b/sys-apps/855resolution/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/855resolution
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/ChangeLog,v 1.1 2005/06/19 22:07:03 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/ChangeLog,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
   19 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org> ChangeLog:
   Initial import of 855resolution package which patches the VBIOS of Intel
diff --git a/sys-apps/855resolution/Manifest b/sys-apps/855resolution/Manifest
index 59d46e40b7ad..e3e54c812f4f 100644
--- a/sys-apps/855resolution/Manifest
+++ b/sys-apps/855resolution/Manifest
@@ -1,6 +1,6 @@
-MD5 e14c6559476cbd13b1250c69791bb04b 855resolution-0.4.ebuild 659
-MD5 495ab43dbd9d2e091b192c1eef101361 ChangeLog 451
+MD5 6c3d67b5621624b3a1868c9333c1d4ef 855resolution-0.4.ebuild 768
+MD5 c065973ecbb197956868208cf80d409f ChangeLog 545
 MD5 749d1a615d9d995c9ce5f05a0b77b06b metadata.xml 720
 MD5 4e0085928cb8a40e48ea5c76f13a6776 files/digest-855resolution-0.4 64
-MD5 a0e1dfa404d0f001abcdf801923d376e files/0.4/conf 875
-MD5 836cf1504be8f859bf55ca7ba034db05 files/0.4/init 658
+MD5 8f50dd5098706793af1ff05cacedd8f1 files/0.4/conf 974
+MD5 11beb320a6e1bd95298b36fcdc63cec0 files/0.4/init 757
diff --git a/sys-apps/855resolution/files/0.4/conf b/sys-apps/855resolution/files/0.4/conf
index ac2c28da7e88..663c2ccf9bdd 100644
--- a/sys-apps/855resolution/files/0.4/conf
+++ b/sys-apps/855resolution/files/0.4/conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/files/0.4/conf,v 1.1 2005/06/19 22:07:03 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/files/0.4/conf,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 # Config file for /etc/init.d/855resolution
 
diff --git a/sys-apps/855resolution/files/0.4/init b/sys-apps/855resolution/files/0.4/init
index 448a9c7b171a..37ec1c90b75c 100644
--- a/sys-apps/855resolution/files/0.4/init
+++ b/sys-apps/855resolution/files/0.4/init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/files/0.4/init,v 1.1 2005/06/19 22:07:03 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/855resolution/files/0.4/init,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 depend() {
 	before xdm
diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog
index 6cc7aabb8c70..258547766c18 100644
--- a/sys-apps/acl/ChangeLog
+++ b/sys-apps/acl/ChangeLog
@@ -1,6 +1,167 @@
 # ChangeLog for sys-apps/acl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+  25 Sep 2005; Stuart Longland <redhatter@gentoo.org> acl-2.2.27.ebuild:
+  Marking stable as per bug #73278 (which has hung around for yonks)
+
+*acl-2.2.31 (02 Sep 2005)
+
+  02 Sep 2005; Mike Frysinger <vapier@gentoo.org> +acl-2.2.31.ebuild:
+  Version bump.
+
+  10 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/acl-2.2.27-nls.patch, acl-2.2.27.ebuild:
+  Fix USE=-nls support #84641 by B. Bruce.
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> acl-2.2.27.ebuild:
+  Stable on amd64. Closes bug 73277.
+
+  07 Dec 2004; Joseph Jezak <josejx@gentoo.org> acl-2.2.27.ebuild:
+  Marked ppc stable for bug #73280.
+
+  04 Dec 2004; Markus Rothe <corsair@gentoo.org> acl-2.2.27.ebuild:
+  Stable on ppc64; bug #73279
+
+  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> acl-2.2.27.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> acl-2.2.27.ebuild:
+  Stable on sparc
+
+  12 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> acl-2.2.13-r3.ebuild:
+  Stable on sparc
+
+*acl-2.2.27 (09 Oct 2004)
+
+  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> +acl-2.2.27.ebuild:
+  Version bump.
+
+*acl-2.2.13-r3 (31 Aug 2004)
+
+  31 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +acl-2.2.13-r3.ebuild:
+  Cleanup of XFS-related apps: dmapi, acl, xfsdump, attr.
+
+  15 Aug 2004; Travis Tilley <lv@gentoo.org> acl-2.2.13-r2.ebuild:
+  made acl CONF_LIBDIR aware for installing to lib64/lib32
+
+  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> acl-2.2.13-r2.ebuild:
+  stable on x86.
+
+  14 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> acl-2.2.13-r1.ebuild,
+  acl-2.2.13-r2.ebuild:
+  IUSE; tidy
+
+  14 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> acl-2.1.1-r1.ebuild,
+  acl-2.2.13.ebuild:
+  clean older ebuilds
+
+  06 May 2004; Michael McCabe <randy@gentoo.org> acl-2.2.13-r2.ebuild:
+  Unset platform variable for s390
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> acl-2.2.13-r1.ebuild,
+  acl-2.2.13-r2.ebuild, acl-2.2.13.ebuild:
+  marked as stable on amd64
+
+  01 Mar 2004; Tom Gall <tgall@gentoo.org> acl-2.2.13-r2.ebuild:
+  bug #42937 affects ppc64 as well, utilize the same fix
+
+  27 Feb 2004; Luca Barbato <lu_zero@gentoo.org> acl-2.2.13-r2.ebuild:
+  Fix bug #42937, same way used by sparc team
+
+  25 Feb 2004; Tom Gall <tgall@gentoo.org> acl-2.2.13-r2.ebuild
+  Stable on ppc64
+
+  21 Feb 2004; Jason Wever <weeve@gentoo.org> acl-2.2.13-r2.ebuild:
+  Changed sparc fix so now it's an actual fix rather than a workaround.
+
+  04 Dec 2003; <agriffis@gentoo.org> acl-2.2.13-r2.ebuild:
+  Stable on alpha, sparc, ia64 to support vim-6.2-r5
+
+  28 Nov 2003; Jason Wever <weeve@gentoo.org> acl-2.1.1-r1.ebuild,
+  acl-2.2.13-r1.ebuild, acl-2.2.13-r2.ebuild, acl-2.2.13.ebuild:
+  Fixed ebuilds for sparc, resolves bug #34611 (see for more details).
+
+*acl-2.2.13-r2 (08 Oct 2003)
+
+  08 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> acl-2.2.13-r2.ebuild:
+  fix bug #30731
+
+  02 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> acl-2.2.13-r1.ebuild,
+  acl-2.2.13.ebuild:
+  changed to depend on >=attr-2.4
+
+  27 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> acl-2.2.13-r1.ebuild:
+  set ppc in keywords
+
+  24 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> acl-2.2.13-r1.ebuild,
+  acl-2.2.13.ebuild:
+  bump to x86
+
+  24 Sep 2003; Seemant Kulleen <seemant@gentoo.org> acl-2.2.13-r1.ebuild,
+  acl-2.2.13.ebuild:
+  add autoconf to dependency list -- thanks again to Jared Hudso
+  <jhhudso@gentoo.org>
+
+*acl-2.2.13-r1 (28 Aug 2003)
+
+  28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> acl-2.2.13-r1.ebuild:
+  update for bug #27064, move binaries to root filesystem
+
+*acl-2.2.13 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> acl-2.2.13.ebuild:
+  version bump and fix bug #17578
+
+  21 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: 20020330 ->
+  2.0.5_p20020330 version rename to fix policy violation for naming of CVS
+  ebuilds.
+
+*acl-2.1.1-r1 (16 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> acl-2.1.1-r1.ebuild :
+  Marked as testing for mips.  Made ChangeLog compatible with echangelog.
+
+  16 Dec 2002; Brad Cowan <bcowan@gentoo.org> acl-2.1.1-r1.ebuild,
+  files/digest-acl-2.1.1-r1: 
+  
+  Changed symlinks.
+
+*acl-2.1.1 (09 Dec 2002)
+
+  09 Dec 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*acl-2.0.18 (27 Sep 2002)
+
+  27 Sep 2002; Brad Cowan <bcowan@gentoo.org> acl-2.0.18.ebuild
+  files/digest-acl-2.0.18 : version bump thanks to <hanno@gentoo.org>
+
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> acl-2.0.18.ebuild :  
+  Fixed symlinks and "modernized" ebuild.   
+
+*acl-20020330 (14 July 2002)
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> acl-20020330.ebuild :
+  Added KEYWORDS, SLOT.
+
+*acl-1.1.3 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> acl-1.1.3.ebuild :
+  Added KEYWORDS, SLOT.
+
+*acl-20020124-r1 (4 March 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> acl-20020124-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  4 March 2002; Donny Davies <woodchip@gentoo.org> acl-20020124-r1.ebuild :
+  Updated to perform the install-dev target by hand, so things like SAMBA
+  will compile with USE acl support.
 
 *acl-20020124 (1 Feb 2002)
 
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index e69de29bb2d1..2f498aec607e 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -0,0 +1,7 @@
+MD5 6a8cb2900cbf017fc249b6c6facc6c74 ChangeLog 5895
+MD5 3fb8481acda7e25fc113503048270918 acl-2.2.27.ebuild 1472
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 89190d1927c01dcf4ab26d7c9cae87d4 acl-2.2.31.ebuild 1280
+MD5 ceae91d3b0c364559020d5a1737763ce files/acl-2.2.27-nls.patch 1282
+MD5 202ece244d099994a2eda97e02a85a15 files/digest-acl-2.2.27 66
+MD5 089e5cae0e2e085a622fd209e91b0cec files/digest-acl-2.2.31 66
diff --git a/sys-apps/acl/acl-2.2.27.ebuild b/sys-apps/acl/acl-2.2.27.ebuild
index b6a007e78fb0..2aebee941a53 100644
--- a/sys-apps/acl/acl-2.2.27.ebuild
+++ b/sys-apps/acl/acl-2.2.27.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/sys-apps/acl/acl-2.2.27.ebuild,v 1.1 2004/10/10 00:26:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.27.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Access control list utilities, libraries and headers"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
+	ftp://xfs.org/mirror/SGI/cmd_tars/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls debug"
 
 RDEPEND=">=sys-apps/attr-2.4
@@ -20,10 +21,11 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-nls.patch
 	sed -i \
-		-e '/^PKG_[[:upper:]]*_DIR/s:= := $(DESTDIR):' \
 		-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \
+		-e '/^PKG_[[:upper:]]*_DIR/s:= := $(DESTDIR):' \
 		include/builddefs.in \
 		|| die "failed to update builddefs"
 }
@@ -53,5 +55,6 @@ src_compile() {
 }
 
 src_install() {
-	make DIST_ROOT=${D} install install-dev install-lib || die
+	make DIST_ROOT="${D}" install install-dev install-lib || die
+	dodoc README
 }
diff --git a/sys-apps/acl/acl-2.2.31.ebuild b/sys-apps/acl/acl-2.2.31.ebuild
index aea69db3db95..6107f1d7dee4 100644
--- a/sys-apps/acl/acl-2.2.31.ebuild
+++ b/sys-apps/acl/acl-2.2.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.31.ebuild,v 1.1 2005/09/02 22:52:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.31.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/acl/files/acl-2.2.27-nls.patch b/sys-apps/acl/files/acl-2.2.27-nls.patch
index ed90cd2e856b..6ea1bdd8cf5f 100644
--- a/sys-apps/acl/files/acl-2.2.27-nls.patch
+++ b/sys-apps/acl/files/acl-2.2.27-nls.patch
@@ -23,3 +23,21 @@ http://bugs.gentoo.org/show_bug.cgi?id=84641
  				"`%s': %s at entry %d\n"), progname, path_p,
  				acl_text, acl_error(error), which_entry+1);
  			acl_free(acl_text);
+@@ -416,7 +416,7 @@
+ 			goto fail;
+ 		if (error > 0) {
+ 			acl_text = acl_to_any_text(default_acl, NULL, ',', 0);
+-			fprintf(stderr, gettext("%s: %s: Malformed default ACL "
++			fprintf(stderr, _("%s: %s: Malformed default ACL "
+ 			                  "`%s': %s at entry %d\n"),
+ 				progname, path_p, acl_text,
+ 				acl_error(error), which_entry+1);
+@@ -478,7 +478,7 @@
+ 			}
+ 		} else {
+ 			if (acl_entries(default_acl) != 0) {
+-				fprintf(stderr, gettext(
++				fprintf(stderr, _(
+ 						"%s: %s: Only directories "
+ 						"can have default ACLs\n"),
+ 					progname, path_p);
diff --git a/sys-apps/acl/files/digest-acl-2.2.27 b/sys-apps/acl/files/digest-acl-2.2.27
index 47e6eeaddb9e..16cecb8de79e 100644
--- a/sys-apps/acl/files/digest-acl-2.2.27
+++ b/sys-apps/acl/files/digest-acl-2.2.27
@@ -1 +1 @@
-MD5 bccc63369b5c446e5e2e999bb0a83e31 acl-2.2.27.src.tar.gz 144408
+MD5 973c63cea7402345d834ceb0049a1f86 acl-2.2.27.src.tar.gz 144400
diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/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-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index f890efb38224..113fef1a404b 100644
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for sys-apps/apmd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/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/sys-apps/apmd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+  10 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  apmd-3.2.1_p4.ebuild:
+  Adding modular X dependencies
+
+  15 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> apmd-3.2.1_p4.ebuild:
+  proper quoting and error checking
+
+  13 Sep 2005; <dang@gentoo.org> apmd-3.2.1_p4.ebuild:
+  Fix multilib-strict failure.  Bug #105846
+
+  05 Feb 2005; <solar@gentoo.org> apmd-3.2.1_p4.ebuild:
+  - q/a virtual/os-headers should not be set in an ebuilds RDEPEND
+
+  04 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> files/apmd.confd:
+  Removed --proxy-timeout argument, fixes bug #57732.
+
+  16 Sep 2004; Olivier Crete <tester@gentoo.org> apmd-3.2.1_p4.ebuild:
+  Stable on x86 per request in bug 59139
+
+  03 Sep 2004; Lars Weiler <pylon@gentoo.org> apmd-3.2.1_p4.ebuild:
+  Stable on ppc (with gcc-3.4); see bug #59139.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> apmd-3.2.0.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> apmd-3.2.1_p4.ebuild:
+  stable on ppc64, bug #58191
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> apmd-3.0.2-r3.ebuild,
+  apmd-3.2.0.ebuild:
+  sync IUSE (+nls)
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> apmd-3.0.2-r3.ebuild,
+  apmd-3.2.0.ebuild:
+  QA - fix use invocation
+
+  06 Jun 2004; Travis Tilley <lv@gentoo.org> apmd-3.2.1_p4.ebuild:
+  marking stable on amd64 for gcc 3.4 fix
+
+  31 Mar 2004; Tom Gall <tgall@gentoo.org> apmd-3.2.0.ebuild, apmd-3.0.2-r3.ebuild
+  apmd-3.2.1_p4.ebuild:
+  remove ppc64, we're not ready
+
+*apmd-3.2.1_p4 (29 Feb 2004)
+
+  29 Feb 2004; Alastair Tse <liquidx@gentoo.org> apmd-3.2.0.ebuild,
+  apmd-3.2.1_p4.ebuild, files/apmd.confd:
+  version bump. using debian's apmd as development seems to have moved there
+  (#36952), adapted new ebuild based on changes suggested by narendra sankar
+  <nsankar@broadcom.com>. added man pages and docs.
+
+*apmd-3.2.0 (30 Dec 2003)
+
+  13 Oct 2003; <plasmaroo@gentoo.org> apmd-3.0.2-r3.ebuild,
+  files/apmd.kernel26x.patch: Added a patch to get apmd to compile on 
+  2.6x kernels: Bug #29636.
+
+*apmd-3.0.2-r3 (12 July 2002)
+
+  06 Feb 2003; Seemant Kulleen <seemant@gentoo.org> apmd-3.0.2-r3.ebuild :
+
+  use epatch and nls fixes
+
+  16 Jul 2003; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  actually apmd is available on ppc :-) limited usefullness, marking ppc
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> apmd-3.0.2-r3.ebuild :
+  Added KEYWORDS.
+  
+  12 July 2002; Doug Goldstein <cardoe@gentoo.org>; apmd-3.0.2-r3.ebuild
+  patched to respect the X use variable and to build xapmd if +X and not build it otherwise
+  (so we don't require X for the console utils of apmd)
+
+*apmd-3.0.2-r2 (02 May 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> apmd-3.0.2-r2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  02 May 2002; Daniel Robbins <drobbins@gentoo.org>: New release with a new
+  patch to fix compilation with recent 2.4 kernels.  Closes bug #1472; thanks
+  meekrob! :)
+
+*apmd-3.0.2-r1 (17 March 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> apmd-3.0.2-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  17 March 2002; Donny Davies <woodchip@gentoo.org> apmd-3.0.2-r1.ebuild,
+  files/apmd.rc6 : Fixed initscript booboo which prevented apmd from starting
+  properly.  Ooops :) Closes #1143, #1072.
 
 *apmd-3.0.2 (1 Feb 2002)
 
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index e69de29bb2d1..eb5302b11f00 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -0,0 +1,14 @@
+MD5 c69b7ddde24380ff318642f9d2bc0326 ChangeLog 3960
+MD5 88e3463d354ae8c261776456764ad06e apmd-3.0.2-r3.ebuild 1781
+MD5 27e5317f463949dfc99f018f5fcc2527 apmd-3.2.0.ebuild 1856
+MD5 b1f0bde94ec7b38f1065226d075862df apmd-3.2.1_p4.ebuild 1881
+MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
+MD5 5aa18e3b8ad79d8893bddb038e29ab98 files/apmd.confd 161
+MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
+MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
+MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
+MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
+MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
+MD5 d37ae27d1835ba334535714614c799dd files/digest-apmd-3.2.1_p4 130
+MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
index b142497f3331..5c4970bfd667 100644
--- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
@@ -1,20 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.1 2002/07/12 07:15:40 cardoe Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
+inherit eutils
+
+IUSE="X nls"
+
+S=${WORKDIR}/${PN}
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
 SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
-S=${WORKDIR}/${PN}
 
-DEPEND="virtual/glibc >=sys-apps/debianutils-1.16 X? ( virtual/x11 )"
-RDEPEND=${DEPEND}
-LICENSE="GPL"
-SLOT=0
-KEYWORD="x86"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ppc"
 
-src_unpack() {
 
+DEPEND=">=sys-apps/debianutils-1.16
+	X? ( virtual/x11 )"
+
+src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	cp Makefile Makefile.orig
@@ -24,30 +29,29 @@ src_unpack() {
 		-e "s:\(MANDIR\=\${PREFIX}\)\(/man\):\1/share\2:" \
 		Makefile.orig > Makefile
 
-	if [ "`use X`" ] 
-	then
+	if use X ; then
 		echo -e "xinstall:\n\tinstall\txapm\t\${PREFIX}/bin" >> Makefile
-		
 	else
-
 		cp Makefile Makefile.orig
 		sed -e "/^EXES=/s/xapm//" \
 			-e "/install.*xapm/d" \
 			Makefile.orig > Makefile
 	fi
 
-	#This closes bug #1472: fixes compilation with recent 2.4 kernels
-	cat ${FILESDIR}/apmsleep.c.diff | patch -p0 -l || die
+	# This closes bug #1472: fixes compilation with recent 2.4 kernels
+	epatch ${FILESDIR}/apmsleep.c.diff
+
+	# This closes bug #29636: needs 2.6 patching [plasmaroo@gentoo.org]
+	epatch ${FILESDIR}/apmd.kernel26x.patch
+
 }
 
 src_compile() {
-
 	make CFLAGS="${CFLAGS}" || die "compile problem"
 }
 
-src_install () {
-
-	make DESTDIR=${D} install || die
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
 
 	dodir /etc/apm/{event.d,suspend.d,resume.d}
 	exeinto /etc/apm ; doexe debian/apmd_proxy
@@ -56,8 +60,12 @@ src_install () {
 	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
 
-	if [ "`use X`" ]
+	if use X ; then
+		make DESTDIR=${D} xinstall || die "xinstall failed"
+	fi
+
+	if ! use nls
 	then
-		make DESTDIR=${D} xinstall || die
+		rm -rf ${D}/usr/share/man/fr
 	fi
 }
diff --git a/sys-apps/apmd/apmd-3.2.0.ebuild b/sys-apps/apmd/apmd-3.2.0.ebuild
index b1c5c7842069..7ac14e932ed0 100644
--- a/sys-apps/apmd/apmd-3.2.0.ebuild
+++ b/sys-apps/apmd/apmd-3.2.0.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/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.1 2003/12/30 23:12:19 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
-IUSE="X"
+IUSE="X nls"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${P}.orig"
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/a/apmd/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/a/apmd/${PN}_${PV}.orig.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 
 
 DEPEND=">=sys-apps/debianutils-1.16
@@ -29,7 +29,7 @@ src_unpack() {
 		-e "s:\(MANDIR\=\${PREFIX}\)\(/man\):\1/share\2:" \
 		Makefile.orig > Makefile
 
-	if [ `use X` ] ; then
+	if use X ; then
 		echo -e "xinstall:\n\tinstall\txapm\t\${PREFIX}/bin" >> Makefile
 	else
 		cp Makefile Makefile.orig
@@ -42,33 +42,30 @@ src_unpack() {
 	epatch ${FILESDIR}/apmsleep.c.diff.3.2.0
 
 	# This closes bug #29636: needs 2.6 patching [plasmaroo@gentoo.org]
-	#epatch ${FILESDIR}/apmd.kernel26x.patch
-	#this doesn't seem to be needed anymore [warpzero@gentoo.org]
+	# If this does not compile with newer versions, rediff the patch
+	# and DO NOT just ignore it.
+	epatch ${FILESDIR}/apmd-3.2.0.kernel26x.patch
 }
 
-src_compile() {
-	#make CFLAGS="${CFLAGS}" || die "compile problem"
-	emake || die
-}
-
-S="${WORKDIR}/${PN}-${PV}.orig"
-
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	dodir /usr/sbin
+
+	make DESTDIR=${D} PREFIX=/usr install || die "install failed"
 
 	dodir /etc/apm/{event.d,suspend.d,resume.d}
-	exeinto /etc/apm ; doexe debian/apmd_proxy
+	exeinto /etc/apm ; doexe apmd_proxy
 	dodoc ANNOUNCE BUGS.apmsleep COPYING* README* ChangeLog LSM
 
 	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
 
-	if [ `use X` ] ; then
+	if use X ; then
 		make DESTDIR=${D} xinstall || die "xinstall failed"
 	fi
 
-	if [ ! `use nls` ]
+	if ! use nls
 	then
 		rm -rf ${D}/usr/share/man/fr
 	fi
+
 }
diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
index 1699683a2477..e25fa5bcf324 100644
--- a/sys-apps/apmd/apmd-3.2.1_p4.ebuild
+++ b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
@@ -1,59 +1,76 @@
-# Copyright 1999-2004 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-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.1 2004/02/29 17:51:13 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
-IUSE="X nls"
+inherit eutils multilib
 
 MY_PV="${PV%_p*}"
 MY_P="${PN}_${MY_PV}"
 PATCHV="${PV#*_p}"
 
-S="${WORKDIR}/${PN}-${MY_PV}.orig"
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
 SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
-DEPEND="sys-kernel/linux-headers
-	>=sys-apps/debianutils-1.16
-	>=sys-apps/sed-4
-	X? ( virtual/x11 )"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
+IUSE="X nls"
+
+RDEPEND=">=sys-apps/debianutils-1.16
+	X? ( || ( ( x11-libs/libX11
+				x11-libs/libXaw
+				x11-libs/libXmu
+				x11-libs/libSM
+				x11-libs/libICE
+				x11-libs/libXt
+				x11-libs/libXext )
+				virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+S=${WORKDIR}/${PN}-${MY_PV}.orig
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${WORKDIR}/${MY_P}-${PATCHV}.diff
-	
-	if [ -z "`use X`" ]; then
-		sed -e 's:\(EXES=.*\)xapm:\1:' \
+	cd "${S}"
+	epatch "${WORKDIR}"/${MY_P}-${PATCHV}.diff
+
+	if ! use X ; then
+		sed -i \
+			-e 's:\(EXES=.*\)xapm:\1:' \
 			-e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
-			-i ${S}/Makefile	
+			"${S}"/Makefile \
+			|| die "sed failed"
 	fi
 }
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	dodir /usr/sbin
 
-	make DESTDIR=${D} PREFIX=/usr install || die "install failed"
+	make DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) install \
+		|| die "install failed"
 
-	dodir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
-	exeinto /etc/apm ; doexe debian/apmd_proxy
-	dodoc AUTHORS apmsleep.README README debian/README.debian 
-	dodoc debian/changelog* debian/copyright*
+	keepdir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
+	exeinto /etc/apm
+	doexe debian/apmd_proxy || die "doexe failed"
+	dodoc AUTHORS apmsleep.README README debian/README.Debian \
+		debian/changelog* debian/copyright*
 
 	doman *.1 *.8
 
 	# note: apmd_proxy.conf is currently disabled and not used, thus
 	#       not installed - liquidx (01 Mar 2004)
 
-	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
+	insinto /etc/conf.d
+	newins "${FILESDIR}"/apmd.confd apmd || die "newins failed"
+	exeinto /etc/init.d
+	newexe "${FILESDIR}"/apmd.rc6 apmd || die "newexe failed"
 
-	[ -z "`use nls`" ] && rm -rf ${D}/usr/share/man/fr
+	use nls || rm -rf "${D}"/usr/share/man/fr
 }
diff --git a/sys-apps/apmd/files/apmd.confd b/sys-apps/apmd/files/apmd.confd
index 47b287757ef6..e5199576ee0c 100644
--- a/sys-apps/apmd/files/apmd.confd
+++ b/sys-apps/apmd/files/apmd.confd
@@ -1,3 +1,4 @@
-# Config file for /etc/init.d/apmd
+# /etc/init.d/apmd:
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/files/apmd.confd,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
-#APMD_OPTS="-P /etc/apm/apmd_proxy"
+APMD_OPTS="-P /etc/apm/apmd_proxy"
diff --git a/sys-apps/apmd/files/apmd.rc6 b/sys-apps/apmd/files/apmd.rc6
index 18258c333ff2..15f7b589bcfe 100644
--- a/sys-apps/apmd/files/apmd.rc6
+++ b/sys-apps/apmd/files/apmd.rc6
@@ -1,4 +1,7 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/files/apmd.rc6,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 depend() {
 	need localmount
@@ -14,7 +17,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting apmd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/apmd -- -P /etc/apm/apmd_proxy
+	start-stop-daemon --start --quiet --pidfile /var/run/apmd.pid \
+		--startas /usr/sbin/apmd -- ${APMD_OPTS}
 	eend $?
 }
 
diff --git a/sys-apps/apmd/files/digest-apmd-3.2.1_p4 b/sys-apps/apmd/files/digest-apmd-3.2.1_p4
index cb2b0a74303e..fc8c91abc105 100644
--- a/sys-apps/apmd/files/digest-apmd-3.2.1_p4
+++ b/sys-apps/apmd/files/digest-apmd-3.2.1_p4
@@ -1,2 +1,2 @@
-MD5 99523e709f5033d3d64ad38d3954f7fc apmd_3.2.1.orig.tar.gz 72610
 MD5 3bec6042cc90c730209046fdc0b99ec1 apmd_3.2.1-4.diff.gz 22350
+MD5 99523e709f5033d3d64ad38d3954f7fc apmd_3.2.1.orig.tar.gz 72610
diff --git a/sys-apps/apmd/metadata.xml b/sys-apps/apmd/metadata.xml
index f093d416cbb1..b27ff8eb4ed6 100644
--- a/sys-apps/apmd/metadata.xml
+++ b/sys-apps/apmd/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>mobile</herd>
 </pkgmetadata>
diff --git a/sys-apps/attr/ChangeLog b/sys-apps/attr/ChangeLog
index cca8a3ef506f..d81327d9414e 100644
--- a/sys-apps/attr/ChangeLog
+++ b/sys-apps/attr/ChangeLog
@@ -1,9 +1,204 @@
 # ChangeLog for sys-apps/attr
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
+
+*attr-2.4.23 (02 Sep 2005)
+
+  02 Sep 2005; Mike Frysinger <vapier@gentoo.org> +attr-2.4.23.ebuild:
+  Version bump.
+
+*attr-2.4.19-r1 (21 May 2005)
+
+  21 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/attr-2.4.19-attr_copy_file-suppress-warning.patch,
+  +attr-2.4.19-r1.ebuild:
+  Tweak the warning message #93348 by Doug Goldstein.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> attr-2.4.19.ebuild:
+  Marked stable on mips.
+
+  30 Dec 2004; Dylan Carlson <absinthe@gentoo.org> attr-2.4.19.ebuild:
+  Fixed SRC_URI to close #76092.
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> attr-2.4.19.ebuild:
+  Stable on amd64.
+
+  07 Dec 2004; Joseph Jezak <josejx@gentoo.org> attr-2.4.19.ebuild:
+  Marked ppc stable for bug #73280.
+
+  04 Dec 2004; Markus Rothe <corsair@gentoo.org> attr-2.4.19.ebuild:
+  Stable on ppc64; bug #73279
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> attr-2.4.19.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> attr-2.4.19.ebuild:
+  Stable on sparc
+
+  12 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> attr-2.4.16.ebuild:
+  Stable on sparc
+
+*attr-2.4.19 (09 Oct 2004)
+
+  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> attr-2.4.16.ebuild:
+  Version bump.
+
+  01 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> attr-2.4.16.ebuild:
+  One of the SRC_URI is bad.
+
+*attr-2.4.16 (31 Aug 2004)
+
+  31 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +attr-2.4.16.ebuild:
+  Cleanup of XFS-related apps: dmapi, acl, xfsdump, attr.
+
+  10 Aug 2004; Travis Tilley <lv@gentoo.org> attr-2.4.7-r1.ebuild,
+  attr-2.4.8.ebuild:
+  made attr ebuild lib64 aware
+
+  02 Aug 2004; Jon Portnoy <avenj@gentoo.org> attr-2.4.7-r1.ebuild, 
+  attr-2.4.8.ebuild :
+  Quick description change to reflect the fact that this package is
+  useful for filesystems other than XFS.
+
+  01 Mar 2004; Tom Gall <tgall@gentoo.org> attr-2.4.7-r1.ebuild:
+  stable on ppc64, unset PLATFORM as per bug #42937
+
+  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> attr-2.4.8.ebuild:
+  stable on x86.
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> attr-2.4.8.ebuild:
+  QA - fix use invocation
+
+  15 Jun 2004; Martin Holzer <mholzer@gentoo.org> attr-2.4.7-r1.ebuild,
+  attr-2.4.8.ebuild:
+  removing gcc3 depend which breaks default-1.0 profile
+
+  09 Jun 2004; Seemant Kulleen <seemant@gentoo.org> -attr-2.4.1.ebuild,
+  attr-2.4.7-r1.ebuild, attr-2.4.8.ebuild:
+  add libtool to DEPEND, closing bug #53030 by Stephen Ulmer <ulmer@ulmer.org>
+
+  06 May 2004; Michael McCabe <randy@gentoo.org> attr-2.4.7-r1.ebuild:
+  Unset platform variable for s390 to fix bug 50224
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> attr-2.4.7-r1.ebuild:
+  marked stable on amd64
+
+*attr-2.4.8 (27 Feb 2004)
+
+  27 Feb 2004; Luca Barbato <lu_zero@gentoo.org> attr-2.4.7-r1.ebuild,
+  attr-2.4.8.ebuild:
+  Fixed a ppc issue unsetting the PLATFORM variable, solves bug #42937, version
+  bump
+
+  21 Feb 2004; Jason Wever <weeve@gentoo.org> attr-2.4.7-r1.ebuild:
+  Changed sparc fix so now it's an actual fix rather than a workaround.
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> attr-2.4.7-r1.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> attr-2.4.7-r1.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> attr-2.2.0.ebuild,
+  attr-2.4.1.ebuild, attr-2.4.7-r1.ebuild, files/attr-no-man2pages.patch:
+  Since the man-pages package provides much more extensive documentation in man2
+  for this, the man2 manpages will not be generated in attr
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> attr-2.4.7-r1.ebuild:
+  Marked stable on sparc because of acl dependency borkage.
+
+  28 Nov 2003; Jason Wever <weeve@gentoo.org> attr-2.4.7-r1.ebuild:
+  Added a fix for sparcs so attr will build. Not that we can use XFS yet, but
+  acl wants it.
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> attr-2.4.7-r1.ebuild:
+  set ppc in keywords
+
+  24 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> attr-2.4.1.ebuild,
+  attr-2.4.7-r1.ebuild:
+  bump 2.4.1 to x86/mips, bump 2.4.7-r1 to x86
+
+*attr-2.4.7-r1 (28 Aug 2003)
+
+  28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> attr-2.4.7-r1.ebuild:
+  migrate binaries and shared library to / filesystem for use when /usr is not
+  available, as per bug #27064
+
+*attr-2.4.7 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> attr-2.4.7.ebuild:
+  update to new version, doing nls properly, as well as proper debug support (we
+  built debug code in before anyway!) and require gcc3 as the source is
+  incompatible with gcc2. fixes bug #21347
+
+  30 Jun 2003; Bartosch Pixa <darkspecter@gentoo.org> attr-2.4.1.ebuild:
+  set ppc in keywords
+
+*attr-2.4.1 (13 Apr 2003)
+
+  13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  attr-2.4.1.ebuild:
+  another version bump -- it's a snapshot that SuSE talk from xfs upstream
+
+*attr-2.2.0 (13 Apr 2003)
+
+  13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> attr-2.2.0.ebuild:
+  fixed ebuild so patch doesn't fail
+
+  13 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  attr-2.2.0.ebuild:
+  version bump. The gettext patch in FILESDIR is to disable the "compulsory"
+  gettext dependency.
+
+  21 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: 20020330 ->
+  2.0.5_p20020330 version rename to fix policy violation for naming of CVS
+  ebuilds.
+
+*attr-2.1.1-r1 (16 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> attr-2.1.1-r1.ebuild :
+  Marked as testing for mips.  Made ChangeLog compatible with echangelog.
+
+  16 Dec 2002; Brad Cowan <bcowan@gentoo.org> attr-2.1.1-r1.ebuild,
+  files/digest-attr-2.1.1-r1:
+  
+  Changed symlinks.
+
+*attr-2.1.1 (09 Dec 2002)
+
+  09 Dec 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*attr-2.0.9 (27 Sep 2002)
+
+  27 Sep 2002; Brad Cowan <bcowan@gentoo.org> attr-2.0.9.ebuild
+  files/digest-attr-2.0.9 : version bump thanks to <hanno@gentoo.org>
+
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> attr-2.0.9.ebuild :  
+  Fixed symlinks and "modernized" ebuild.
+
+*attr-20020330 (14 July 2002)
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> attr-20020330.ebuild :
+  Added KEYWORDS, SLOT.
+
+*attr-1.1.3-r1 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> attr-1.1.3.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> attr-1.1.3-r1.ebuild :
+  Added KEYWORDS, SLOT.
 
 *attr-20020124 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> attr-20020124.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 7f19dd08a349..4fd8624088b0 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,6 +1,18 @@
-MD5 fb51e4ffff9fd176fc4254cd5c5af9bc attr-2.2.0.ebuild 1285
-MD5 0fe8288bf6a1cd5ca76b2f68f465b427 attr-2.1.1-r1.ebuild 1159
-MD5 0d20ec0c5024d2d3c542684d3534f0f1 ChangeLog 2083
-MD5 b57048711f1d8bc6ae87ea34a3dc212f files/digest-attr-2.2.0 123
-MD5 7811c86d928ecacca36f3fd7282d4883 files/digest-attr-2.1.1-r1 65
-MD5 eb9d74131b80a3e1c465474ea5eb5d9e files/attr-2.2.0-gettext.diff 642
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5bf9405e2ffb4ac628eced8fd0efcac6 attr-2.4.19-r1.ebuild 1430
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fdf15553ad62bbd1f8b040a5e69339e9 attr-2.4.23.ebuild 1291
+MD5 097b3aed4891fd04313af908ab4e8942 ChangeLog 7235
+MD5 2a77f72ca75841e774fdcf83147b8aa3 files/digest-attr-2.4.23 67
+MD5 9884f12ef497050faff6f6418acae8e2 files/digest-attr-2.4.19-r1 67
+MD5 c09974172d4e6f9fd20a4c4b53c0a8d4 files/attr-2.4.19-attr_copy_file-suppress-warning.patch 715
+MD5 8c0ffc8078bf36ce6eb5c698e9df7e0f files/attr-no-man2pages.patch 398
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGNb7gIKl8Uu19MoRAm85AJ9BgJsP8G6lra4jhggrf/govlCaKwCfSWMr
+lAXjy76wy69VWe1/0hZNdUg=
+=gFrm
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/attr/attr-2.4.19-r1.ebuild b/sys-apps/attr/attr-2.4.19-r1.ebuild
index d9457d8dfc7e..da58e20bab10 100644
--- a/sys-apps/attr/attr-2.4.19-r1.ebuild
+++ b/sys-apps/attr/attr-2.4.19-r1.ebuild
@@ -1,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-apps/attr/attr-2.4.19-r1.ebuild,v 1.1 2005/05/21 01:35:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.19-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
 
 LICENSE="LGPL-2.1"
 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="nls debug"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
diff --git a/sys-apps/attr/attr-2.4.23.ebuild b/sys-apps/attr/attr-2.4.23.ebuild
index 52546d480d3f..94af47f95fe0 100644
--- a/sys-apps/attr/attr-2.4.23.ebuild
+++ b/sys-apps/attr/attr-2.4.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/sys-apps/attr/attr-2.4.23.ebuild,v 1.1 2005/09/02 22:48:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.23.ebuild,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/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-apps/bar/ChangeLog b/sys-apps/bar/ChangeLog
index 7c76a58abda5..75e46e066003 100644
--- a/sys-apps/bar/ChangeLog
+++ b/sys-apps/bar/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for sys-apps/bar
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bar/ChangeLog,v 1.1 2003/11/21 19:57:18 rphillips Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bar/ChangeLog,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
+
+  05 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> -bar-1.08.ebuild,
+  bar-1.10.3.ebuild:
+  Marked stable on x86 early due to nature of bug fixes over prev version.
+
+*bar-1.10.3 (19 Jan 2005)
+
+  19 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +bar-1.10.3.ebuild:
+  Version bump; fixes critical I/O bug that could cause data truncation.
+
+  09 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -bar-1.07.ebuild,
+  bar-1.10.2.ebuild:
+  Marked 1.10.2 stable on x86; removed old 1.07.
+
+  18 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> bar-1.08.ebuild:
+  Never actually marked 1.08 stable.
+
+  11 Dec 2004; Sven Wegener <swegener@gentoo.org> bar-1.10.2.ebuild:
+  app-doc/doxygen only needs to be in DEPEND.
+
+*bar-1.10.2 (06 Dec 2004)
+
+  06 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  -bar-1.06.ebuild, +bar-1.10.2.ebuild:
+  Version bump; cleaned up ebuild and added support for USE=doc. Marked 1.08
+  stable on x86. Also updated metadata for shell-tools.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> bar-1.06.ebuild,
+  bar-1.07.ebuild, bar-1.08.ebuild:
+  sync IUSE (missing), add sed-4 dep
+
+  02 Feb 2004; Heinrich Wendel <lanius@gentoo.org> bar-1.07.ebuild:
+  mark 1.07 x86
+
+*bar-1.08 (02 Feb 2004)
+
+  02 Feb 2004; Heinrich Wendel <lanius@gentoo.org> bar-1.08.ebuild:
+  version bump; fixed DEPEND
+
+*bar-1.07 (26 Dec 2003)
+
+  26 Dec 2003; Heinrich Wendel <lanius@gentoo.org> bar-1.07.ebuild:
+  Version bump; modified to use portage's CFLAGS
 
 *bar-1.06 (21 Nov 2003)
 
diff --git a/sys-apps/bar/Manifest b/sys-apps/bar/Manifest
index 345c8774f263..85cbb70c393b 100644
--- a/sys-apps/bar/Manifest
+++ b/sys-apps/bar/Manifest
@@ -1,3 +1,16 @@
-MD5 27c2dab8b1aca9e5b5cb91c2ce17f69d bar-1.06.ebuild 579
-MD5 96dc7f786a7060cd5fa477271494afe1 ChangeLog 216
-MD5 3ae88119ba205b2153c6b03b898a2b82 files/digest-bar-1.06 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bba2a89f0faef24053bf2c83e565e747 bar-1.10.3.ebuild 840
+MD5 c1253adf3eba5d57fde8b18a733e3f89 bar-1.10.2.ebuild 840
+MD5 392dc0f57a3932f5e3d4316a42cba814 ChangeLog 1742
+MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
+MD5 a1c4e5adf75247ad7bec79232ac65dcd files/digest-bar-1.10.2 62
+MD5 d24d2b014484a5715f0393b248683eb7 files/digest-bar-1.10.3 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCBJm9EZCkKN40op4RArzkAJ9CV1LQr6ic1M7Ypj4g9E86qoM9rQCfRWhP
+UuSEbz4O4tH6eWBZ7Zm0MCw=
+=f4lx
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/bar/bar-1.10.2.ebuild b/sys-apps/bar/bar-1.10.2.ebuild
index 9566841cd357..bbaf7314f23a 100644
--- a/sys-apps/bar/bar-1.10.2.ebuild
+++ b/sys-apps/bar/bar-1.10.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-apps/bar/bar-1.10.2.ebuild,v 1.1 2004/12/06 17:57:44 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bar/bar-1.10.2.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
 DESCRIPTION="Console Progress Bar"
 HOMEPAGE="http://clpbar.sourceforge.net/"
@@ -8,10 +8,11 @@ SRC_URI="mirror://sourceforge/clpbar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc"
 
 DEPEND="doc? ( >=app-doc/doxygen-1.3.5 )"
+RDEPEND=""
 
 src_compile() {
 	econf || die "econf failed"
diff --git a/sys-apps/bar/bar-1.10.3.ebuild b/sys-apps/bar/bar-1.10.3.ebuild
index 4a4b902a8a30..503ce1760d51 100644
--- a/sys-apps/bar/bar-1.10.3.ebuild
+++ b/sys-apps/bar/bar-1.10.3.ebuild
@@ -1,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-apps/bar/bar-1.10.3.ebuild,v 1.1 2005/01/19 10:44:18 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bar/bar-1.10.3.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
 DESCRIPTION="Console Progress Bar"
 HOMEPAGE="http://clpbar.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/clpbar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc"
 
 DEPEND="doc? ( >=app-doc/doxygen-1.3.5 )"
diff --git a/sys-apps/bar/metadata.xml b/sys-apps/bar/metadata.xml
index fc52d7ba53dd..40149c995561 100644
--- a/sys-apps/bar/metadata.xml
+++ b/sys-apps/bar/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>rphillips@gentoo.org</email>
-</maintainer>
+	<herd>shell-tools</herd>
 </pkgmetadata>
diff --git a/sys-apps/baselayout-darwin/ChangeLog b/sys-apps/baselayout-darwin/ChangeLog
index 713dc6706dcc..36adda7594c7 100644
--- a/sys-apps/baselayout-darwin/ChangeLog
+++ b/sys-apps/baselayout-darwin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/baselayout-darwin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/ChangeLog,v 1.1 2005/05/12 06:11:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/ChangeLog,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
+
+*baselayout-darwin-1.11.11-r1 (07 Aug 2005)
+
+  07 Aug 2005; Joseph Jezak <josejx@gentoo.org>
+  +files/dont-destroy-path.patch, +baselayout-darwin-1.11.11-r1.ebuild:
+  Fixed less than stellar profile handling of PATH.
+
+  13 May 2005; <gongloo@gentoo.org> baselayout-darwin-1.11.11.ebuild:
+  Fixed xargs command-line argument (--null to -0).
 
 *baselayout-darwin-1.11.11 (12 May 2005)
 
diff --git a/sys-apps/baselayout-darwin/Manifest b/sys-apps/baselayout-darwin/Manifest
index fdbd7bf8e776..3e2a50d7caf9 100644
--- a/sys-apps/baselayout-darwin/Manifest
+++ b/sys-apps/baselayout-darwin/Manifest
@@ -1,3 +1,17 @@
-MD5 ce8fb4bf41912eb4e521d7f80cf2419f baselayout-darwin-1.11.11.ebuild 1882
-MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a4e2561f4befc5e7701a8d6264079451 ChangeLog 727
+MD5 74582a2b01f982b22695517175786d31 baselayout-darwin-1.11.11.ebuild 2194
+MD5 fc76b60032187aa3e2029ee04b00e773 metadata.xml 156
+MD5 d589f6f3e2aea56d03862a0ceb494ee0 baselayout-darwin-1.11.11-r1.ebuild 2303
 MD5 195cf81f844cac1211a1b29cb1528bde files/digest-baselayout-darwin-1.11.11 76
+MD5 195cf81f844cac1211a1b29cb1528bde files/digest-baselayout-darwin-1.11.11-r1 76
+MD5 6dcd5d21a9f7a57cd54aa8f0ae4835a1 files/dont-destroy-path.patch 1253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC9Vh0csIHjyDViGQRAurkAJ4hdK+w89lbbg0kVnrKlLEWa4p/tACg0yBs
+wf11dnnUivXXDCBq7UK9ESM=
+=hUCl
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild b/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild
index d7e67fe3c0c3..c9903e400b81 100644
--- a/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild
+++ b/sys-apps/baselayout-darwin/baselayout-darwin-1.11.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/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild,v 1.1 2005/08/07 00:39:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11.ebuild b/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11.ebuild
index 59015be6fb69..5e691dd64f6b 100644
--- a/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11.ebuild
+++ b/sys-apps/baselayout-darwin/baselayout-darwin-1.11.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-apps/baselayout-darwin/baselayout-darwin-1.11.11.ebuild,v 1.1 2005/05/12 06:11:18 josejx Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-darwin/baselayout-darwin-1.11.11.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 DESCRIPTION="Baselayout and init scripts (eventually)"
 HOMEPAGE="http://www.gentoo.org/"
@@ -36,7 +36,7 @@ src_install() {
 	insinto /etc/env.d
 	doins ${S}/etc/env.d/*
 	insinto /etc/skel
-	find ${S}/etc/skel -maxdepth 1 -type f -print0 | xargs --null doins
+	find ${S}/etc/skel -maxdepth 1 -type f -print0 | xargs -0 doins
 
 	#
 	# Setup files in /sbin
diff --git a/sys-apps/baselayout-lite/ChangeLog b/sys-apps/baselayout-lite/ChangeLog
index 942aa511818a..1cddf1518b39 100644
--- a/sys-apps/baselayout-lite/ChangeLog
+++ b/sys-apps/baselayout-lite/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for sys-apps/baselayout-lite
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-lite/ChangeLog,v 1.1 2004/02/23 03:19:56 pebenito Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-lite/ChangeLog,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
+
+  26 Oct 2005; Brian Jackson <iggy@gentoo.org>
+  baselayout-lite-1.0_pre1.ebuild:
+  a few changes I've had sitting around here that fix some known bugs
+
+  12 Jun 2005; Brian Jackson <iggy@gentoo.org>
+  -baselayout-lite-1.0_pre2.ebuild:
+  removing pre2 ebuild since that branch is no longer actively developed
+
+  08 Jun 2005; <solar@gentoo.org> baselayout-lite-1.0_pre2.ebuild:
+  - update baselayout-lite to be cross compile aware
+
+  29 May 2005; <solar@gentoo.org> baselayout-lite-1.0_pre1.ebuild,
+  baselayout-lite-1.0_pre2.ebuild:
+  - update baselayout-lite to use libc expanded variable elibc_uclibc vs uclibc
+  so USE=-* works
+
+*baselayout-lite-1.0_pre2 (06 Mar 2005)
+
+  06 Mar 2005; Brian Jackson <iggy@gentoo.org>
+  +baselayout-lite-1.0_pre2.ebuild:
+  pre2 release for testing
+
+  01 Mar 2005; <solar@gentoo.org> baselayout-lite-1.0_pre1.ebuild:
+  - make baselayout-lite provide virtual/baselayout
+
+  23 Jul 2004; <solar@gentoo.org> baselayout-lite-1.0_pre1.ebuild:
+  Moved device node creation to src_install() so that we can get the device nods
+  into a binary package which can then be installed on a host which does not
+  have python/portage etc.
+
+  15 Jun 2004; <solar@gentoo.org> baselayout-lite-1.0_pre1.ebuild:
+  remove unneeded /etc/nsswitch.conf with USE=uclibc
 
 *baselayout-lite-1.0_pre1 (22 Feb 2004)
 
diff --git a/sys-apps/baselayout-lite/Manifest b/sys-apps/baselayout-lite/Manifest
index 751dd1f9428f..d66155b0b7df 100644
--- a/sys-apps/baselayout-lite/Manifest
+++ b/sys-apps/baselayout-lite/Manifest
@@ -1,4 +1,4 @@
-MD5 e247853096f4ed2323374b1e305c75f1 baselayout-lite-1.0_pre1.ebuild 1476
-MD5 d75f3485baecddfa52de751da0e7ceda ChangeLog 457
-MD5 80eb89a0e028f94140bee79817433941 metadata.xml 367
+MD5 1eb79174efdc8b5e41cb1051ed329634 ChangeLog 1723
+MD5 aca2b93069c50bcb97c9429e58227d3e baselayout-lite-1.0_pre1.ebuild 2416
 MD5 865feeaee968ccbfa160d6b31ea179e1 files/digest-baselayout-lite-1.0_pre1 75
+MD5 80eb89a0e028f94140bee79817433941 metadata.xml 367
diff --git a/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild b/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild
index d2dae1d6b979..cdf3f098a526 100644
--- a/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild
+++ b/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.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/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild,v 1.1 2004/02/23 03:19:56 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
-IUSE=""
+IUSE="build bootstrap"
 
 DESCRIPTION="Baselayout for embedded systems"
 HOMEPAGE="http://www.gentoo.org/proj/en/base/embedded/"
@@ -11,24 +11,42 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-*"
 
+#PROVIDE="virtual/baselayout"
+#DEPEND="!virtual/baselayout"
+
 S="${WORKDIR}/${PN}"
+PROVIDE="virtual/baselayout"
 
 src_install() {
-	keepdir /bin /etc /etc/init.d /home /lib /sbin /usr /var /proc /root
+	keepdir /bin /etc /etc/init.d /home /lib /sbin /usr /var /root /mnt
+	keepdir /var/log /proc
+
+	# if ROOT=/ and we make /proc, we will get errors when portage tries 
+	# to create /proc/.keep, so we remove it if we need to
+	[ "${ROOT}" = "/" ] && rm -rf ${D}/proc
+	[ "${ROOT}" = "" ] && rm -rf ${D}/proc
+
+	# (Jul 23 2004 -solar)
+	# This fails a when merging if /proc is already mounted. We
+	# could postinst it but 99% of the time we only are building
+	# this port as a package via emerge -B 
+	#keepdir /proc
 
 	insinto /etc
 	doins ${S}/{fstab,group,nsswitch.conf,passwd,profile.env,protocols,shells}
+
+	# Fixup the inittab file first
+	sed -i -e 's:/usr/bin/tail:/bin/tail:' ${S}/init/inittab
 	doins ${S}/init/inittab
 
+	use elibc_uclibc && rm -f ${D}/etc/nsswitch.conf
+
 	exeinto /etc/init.d
 	doexe ${S}/init/rc[SK]
-}
 
-pkg_postinst() {
-	# Doing device node creation here, since portage doesnt record
-	# device nodes in CONTENTS
+	mkdir -p ${D}/dev
 
-	cd ${ROOT}/dev
+	cd ${D}/dev || die
 	einfo "Making device nodes (this could take a minute or so...)"
 
 	MAKEDEV std
@@ -36,20 +54,30 @@ pkg_postinst() {
 
 	for i in 0 1 2 3 4; do
 		mknod -m 0660 hda${i/0} b 3 ${i}
-		chown root:disk hda${i/0}
+		mknod -m 0660 sda${i/0} b 8 ${i}
+		chown root:disk hda${i/0} sda${i/0}
 		mknod -m 0600 tty${i} c 4 ${i}
 		chown root:tty tty${i}
 	done
 
 	MAKEDEV ttyS0
+}
 
+pkg_postinst() {
 	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
 	# new users do not update them properly.  thus remove all ._cfg files if
 	# we are not busy with a build.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
+	if ! ( use build || use bootstrap )
 	then
 		ewarn "Removing invalid backup copies of critical config files..."
 		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
 	fi
-}
 
+	# Doing device node creation here, since portage doesnt record
+	# device nodes in CONTENTS
+
+	# (Jul 23 2004 -solar)
+	# Moved device node creation to src_install() so that we can get
+	# the device nods into a binary package which can then be
+	# installed on a host which does not have python/portage etc.
+}
diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index cd3c5efc637e..0adb96d0d07f 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,86 @@
 # ChangeLog for sys-apps/baselayout-vserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.1 2005/04/20 11:47:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
+
+  12 Nov 2005; Benedikt Boehm <hollow@gentoo.org>
+  -baselayout-vserver-1.11.13.ebuild, baselayout-vserver-1.11.13-r1.ebuild,
+  baselayout-vserver-1.12.0_pre8-r2.ebuild:
+  add ~amd64 keywords
+
+  03 Oct 2005; Benedikt Boehm <hollow@gentoo.org>
+  baselayout-vserver-1.11.13-r1.ebuild:
+  1.11.13-r1 to stable
+
+  30 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/baselayout-vserver-1.11.13-cleanup.patch,
+  -files/baselayout-vserver-1.11.13-init-timeout-fix.patch,
+  baselayout-vserver-1.11.13-r1.ebuild:
+  fix halt/reboot borkage + minor fixes
+
+*baselayout-vserver-1.11.13-r1 (27 Sep 2005)
+
+  27 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/baselayout-vserver-1.11.13-init-timeout-fix.patch,
+  -baselayout-vserver-1.11.12-r4.ebuild,
+  +baselayout-vserver-1.11.13-r1.ebuild,
+  -baselayout-vserver-1.12.0_pre8-r1.ebuild:
+  cleanup; backport init timeout fix to 1.11.13; sync with baselayout-1.11.13-r1
+
+*baselayout-vserver-1.12.0_pre8-r2 (22 Sep 2005)
+
+  22 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch,
+  +baselayout-vserver-1.12.0_pre8-r2.ebuild:
+  adapt r2 + fix init timeout issues
+
+*baselayout-vserver-1.12.0_pre8-r1 (04 Sep 2005)
+
+  04 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch,
+  baselayout-vserver-1.11.13.ebuild,
+  +baselayout-vserver-1.12.0_pre8-r1.ebuild:
+  add 1.12.0_pre8 (with gentoo init style support); 1.11.13 to stable
+
+  31 Aug 2005; Christian Heim <phreak@gentoo.org>
+  baselayout-vserver-1.11.12-r4.ebuild:
+  Stable on x86
+
+*baselayout-vserver-1.11.13 (03 Aug 2005)
+
+  03 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
+  +baselayout-vserver-1.11.13.ebuild:
+  Version bump
+
+  15 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
+  baselayout-vserver-1.11.12-r4.ebuild:
+  fixed dummy linking
+
+  12 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
+  baselayout-vserver-1.11.12-r4.ebuild:
+  minor fixes + cleanup
+
+*baselayout-vserver-1.11.12-r4 (08 Jun 2005)
+
+  08 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
+  -baselayout-vserver-1.0.ebuild, +baselayout-vserver-1.11.12-r4.ebuild:
+  added compatible versioning with sys-apps/baselayout; new, revised patch;
+  1.0 is obsolete
+
+  29 May 2005; <solar@gentoo.org> baselayout-vserver-1.0.ebuild:
+  - update baselayout-vserver to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+  21 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  baselayout-vserver-1.0.ebuild:
+  needs deps before going stable
+
+  18 May 2005; Benedikt Boehm <hollow@gentoo.org>
+  baselayout-vserver-1.0.ebuild:
+  moved to stable, but still in p.mask
+
+  20 Apr 2005; Benedikt Boehm <hollow@gentoo.org>
+  baselayout-vserver-1.0.ebuild:
+  fixed patch
 
 *baselayout-vserver-1.0 (20 Apr 2005)
 
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index d946167fcce4..fae673ca41f7 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,6 +1,22 @@
-MD5 9af9e1f91af7165192aa76a4f509337c baselayout-vserver-1.0.ebuild 12849
-MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239
-MD5 e15d4ac9b7888933dcfdf1ce3335fa4f ChangeLog 374
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 196c23f5b36993732ae83f50c5cf35ee ChangeLog 3207
+MD5 7afdc8eb3810c86fdd8b61177817f07d baselayout-vserver-1.11.13-r1.ebuild 13186
+MD5 72c550310f5dc96cc0d1fc25d131c831 baselayout-vserver-1.12.0_pre8-r2.ebuild 12606
+MD5 cf693ea87e77c1dc6f72cf58c32b7143 files/baselayout-vserver-1.11.13-cleanup.patch 18552
+MD5 cd1ba3815d5592a3c65f185cc7585107 files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch 339
+MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch 1236
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 a551ddae4bfb1b2bd7cbc16c57f481d3 files/digest-baselayout-vserver-1.11.13-r1 78
+MD5 d1b600f26f783320972a6692720df0d3 files/digest-baselayout-vserver-1.12.0_pre8-r2 83
+MD5 51a97031d54d767b45fb247d60727e9d files/fakelog.initd 449
 MD5 76a9437d29bd77c416f76fbcf0cf2af2 files/vserver-changes 1642
-MD5 8a0d41f3187138a032d55869caedf650 files/digest-baselayout-vserver-1.0 144
+MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdghdmPFBzbX68WERAsgxAJwLF3mJ0y+XV7lGnpYx7m4l1NFYzwCbBj9D
+7ZoTkSJAPly6YPU/bi0DGXY=
+=+vUR
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
index 25152670d111..981b2a3cdd30 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild,v 1.1 2005/09/27 13:36:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:02 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/baselayout/rc-scripts-${SV}${SVREV}-vserver.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="bootstrap build fakelog static"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
@@ -25,17 +25,16 @@ RDEPEND=">=sys-apps/sysvinit-2.84
 		>=sys-libs/readline-5.0-r1
 		>=app-shells/bash-3.0-r10
 		>=sys-apps/coreutils-5.2.1
-	) )
-	!sys-apps/baselayout
-	!sys-apps/baselayout-lite"
-DEPEND="virtual/os-headers"
+	) )"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
 PROVIDE="virtual/baselayout"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-init-timeout-fix.patch
+	epatch ${FILESDIR}/${P}-cleanup.patch
 }
 
 src_compile() {
@@ -180,9 +179,9 @@ src_install() {
 	# Ugly compatibility with stupid ebuilds and old profiles symlinks
 	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
 		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
 	# FHS compatibility symlinks stuff
@@ -201,16 +200,15 @@ src_install() {
 	# attempting to merge files, (3) accidentally packaging up personal files
 	# with quickpkg
 	fperms 0600 /etc/shadow
-	mv "${D}"/etc/{passwd,shadow,group,hosts,issue.devfix} "${D}"/usr/share/baselayout
+	mv "${D}"/etc/{passwd,shadow,group,hosts} "${D}"/usr/share/baselayout
 
 	insopts -m0755
 	insinto /etc/init.d
 	doins ${S}/init.d/*
-	use fakelog && newins ${FILESDIR}/fakelog.initd fakelog
 
 	# link dummy init scripts
 	cd ${D}/etc/init.d
-	for i in checkfs checkroot clock consolefont localmount modules net netmount; do
+	for i in checkfs checkroot clock consolefont keymaps localmount modules net netmount numlock urandom; do
 		ln -sf dummy $i
 	done
 
@@ -310,7 +308,7 @@ src_install() {
 	#
 	# Install baselayout utilities
 	#
-	cd ${S}/src
+	cd "${S}"/src
 	make DESTDIR="${D}" install || die
 
 	# Normal baselayout generate devices in pkg_postinst(), but we keep
@@ -349,16 +347,16 @@ pkg_postinst() {
 	# Set up default runlevel symlinks
 	# This used to be done in src_install but required knowledge of ${ROOT},
 	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls ${ROOT}/etc/runlevels 2>/dev/null) ]]; then
+	if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
 		for x in boot default; do
 			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p ${ROOT}/etc/runlevels/${x}
-			for y in $(<${ROOT}/usr/share/baselayout/rc-lists/${x}); do
+			mkdir -p "${ROOT}"/etc/runlevels/${x}
+			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
 				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
 					ewarn "init.d/${y} not found -- ignoring"
 				else
-					ln -sfn ${ROOT}/etc/init.d/${y} \
-						${ROOT}/etc/runlevels/${x}/${y}
+					ln -sfn /etc/init.d/${y} \
+						"${ROOT}"/etc/runlevels/${x}/${y}
 				fi
 			done
 		done
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild
index 9b106046ce3c..a57580390930 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-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-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild,v 1.1 2005/09/22 10:11:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre8-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:02 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~hollow/vserver/baselayout/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="bootstrap build static"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
index b85d4ea2e27e..6de3c5f1c8eb 100644
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
@@ -194,26 +194,6 @@ diff -NurpP rc-scripts-1.6.13-vserver/init.d/bootmisc rc-scripts-1.6.13-vserver2
  
 +
  # vim:ts=4
-diff -NurpP rc-scripts-1.6.13-vserver/init.d/dummy rc-scripts-1.6.13-vserver2/init.d/dummy
---- rc-scripts-1.6.13-vserver/init.d/dummy	2005-06-11 15:11:23.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/init.d/dummy	2005-09-03 20:13:45.000000000 +0200
-@@ -1,14 +1,13 @@
- #!/sbin/runscript
- # Copyright 1999-2005 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
--# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch,v 1.1 2005/09/30 14:02:47 hollow Exp $
- 
- start() {
--	return 0
-+    return 0
- }
- 
- stop() {
--	return 0
-+    return 0
- }
- 
- # vim:ts=4
 diff -NurpP rc-scripts-1.6.13-vserver/init.d/halt.sh rc-scripts-1.6.13-vserver2/init.d/halt.sh
 --- rc-scripts-1.6.13-vserver/init.d/halt.sh	1970-01-01 01:00:00.000000000 +0100
 +++ rc-scripts-1.6.13-vserver2/init.d/halt.sh	2005-09-30 15:06:54.672505500 +0200
diff --git a/sys-apps/baselayout-vserver/files/fakelog.initd b/sys-apps/baselayout-vserver/files/fakelog.initd
index 1662f0d53656..8cbbbe351068 100644
--- a/sys-apps/baselayout-vserver/files/fakelog.initd
+++ b/sys-apps/baselayout-vserver/files/fakelog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/files/fakelog.initd,v 1.1 2005/06/08 09:33:21 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/files/fakelog.initd,v 1.1.1.1 2005/11/30 09:56:02 chriswhite Exp $
 
 depend() {
             provide logger
diff --git a/sys-apps/baselayout-vserver/metadata.xml b/sys-apps/baselayout-vserver/metadata.xml
index 7858f6985354..39c416e08e99 100644
--- a/sys-apps/baselayout-vserver/metadata.xml
+++ b/sys-apps/baselayout-vserver/metadata.xml
@@ -1,8 +1,8 @@
 <?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>
 </pkgmetadata>
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 6700b0f1c199..1ecfbd160730 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,6 +1,1662 @@
 # ChangeLog for sys-apps/baselayout
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.1.1.1 2005/11/30 09:56:52 chriswhite Exp $
+
+# See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
+# http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
+
+*baselayout-1.12.0_pre10-r1 (10 Nov 2005)
+
+  10 Nov 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.0_pre10-svn-1611.patch,
+  +baselayout-1.12.0_pre10-r1.ebuild:
+  Fix bugs 112031 and 112049
+  Allows wpa_supplicant to specify config file and --pidfile
+
+*baselayout-1.12.0_pre10 (08 Nov 2005)
+
+  08 Nov 2005; Roy Marples <uberlord@gentoo.org>
+  +baselayout-1.12.0_pre10.ebuild:
+  New baselayout release, many bugs fixed!
+
+*baselayout-1.12.0_pre9-r2 (08 Nov 2005)
+*baselayout-1.11.13-r2 (08 Nov 2005)
+
+  08 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.11.0-split-out-udev.patch,
+  +files/baselayout-1.12.0-split-out-udev.patch,
+  +baselayout-1.11.13-r2.ebuild, +baselayout-1.12.0_pre9-r2.ebuild:
+  Split out udev/devfs.
+
+*baselayout-1.12.0_pre9-r1 (12 Oct 2005)
+
+  12 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.0_pre9-npref.patch,
+  +baselayout-1.12.0_pre9-r1.ebuild:
+  Changed number of preferred modules from 3 to 4 in net.lo, #108960.
+
+*baselayout-1.12.0_pre9 (11 Oct 2005)
+
+  11 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  +baselayout-1.12.0_pre9.ebuild:
+  New release.
+
+  05 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.12.0_pre8-r2.ebuild:
+  Fix /sbin/runscript for no-symlink profiles.
+
+  04 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.13-r1.ebuild, baselayout-1.12.0_pre8-r2.ebuild:
+  Wrap symlink creation like we do with dir creation so readonly file systems
+  dont cause emerge to abort #103618.
+
+*baselayout-1.12.0_pre8-r2 (04 Sep 2005)
+
+  04 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.12.0_pre8-usr-remount-ro.patch,
+  +baselayout-1.12.0_pre8-r2.ebuild:
+  Remount /usr readonly instead of unmounting, else we run into locale issues.
+
+*baselayout-1.12.0_pre8-r1 (02 Sep 2005)
+
+  02 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.12.0_pre8-whitelist-fixes.patch,
+  +baselayout-1.12.0_pre8-r1.ebuild:
+  Some environ whitelist fixes
+
+*baselayout-1.12.0_pre8 (02 Sep 2005)
+
+  02 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +baselayout-1.12.0_pre8.ebuild:
+  New release.
+
+*baselayout-1.12.0_pre7-r1 (01 Sep 2005)
+
+  01 Sep 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.0_pre7-ifconfig.patch,
+  +baselayout-1.12.0_pre7-r1.ebuild:
+  Fix ifconfig from bringing lo up and then working out aliases, #104415
+
+*baselayout-1.12.0_pre7 (31 Aug 2005)
+
+  31 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  -files/baselayout-1.12.0_pre6-1420.patch,
+  -files/baselayout-1.12.0_pre6-rc-daemon.patch,
+  -baselayout-1.12.0_pre6.ebuild, -baselayout-1.12.0_pre6-r1.ebuild,
+  -baselayout-1.12.0_pre6-r2.ebuild, -baselayout-1.12.0_pre6-r3.ebuild,
+  +baselayout-1.12.0_pre7.ebuild:
+  New release
+
+*baselayout-1.12.0_pre6-r3 (24 Aug 2005)
+
+  24 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.0_pre6-rc-daemon.patch,
+  +baselayout-1.12.0_pre6-r3.ebuild:
+  Fix rc-daemon.sh signal handling, bug #103182
+
+*baselayout-1.12.0_pre6-r2 (23 Aug 2005)
+*baselayout-1.11.13-r1 (23 Aug 2005)
+
+  23 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +baselayout-1.11.13-r1.ebuild, +baselayout-1.12.0_pre6-r2.ebuild:
+  Fix symlink generation in default runlevels #103275.
+
+*baselayout-1.12.0_pre6-r1 (23 Aug 2005)
+
+  23 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  -files/baselayout-1.12.0_pre3-dhclient.patch,
+  -files/baselayout-1.12.0_pre3-iwconfig.patch,
+  +files/baselayout-1.12.0_pre6-1420.patch,
+  +baselayout-1.12.0_pre6-r1.ebuild:
+
+  dhcpcd now reports the correct required version
+  iwconfig and wpa_supplicant have better wireless vs wired detection
+
+*baselayout-1.12.0_pre6 (18 Aug 2005)
+
+  18 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  -baselayout-1.12.0_pre5.ebuild, +baselayout-1.12.0_pre6.ebuild:
+  New release - hopefully we're almost stable now :)
+
+*baselayout-1.12.0_pre5 (11 Aug 2005)
+
+  11 Aug 2005; Roy Marples <uberlord@gentoo.org>
+  -baselayout-1.12.0_pre4.ebuild, +baselayout-1.12.0_pre5.ebuild:
+  New release. Should finally fix circular init script dependency problems!
+
+*baselayout-1.12.0_pre4 (05 Aug 2005)
+
+  05 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +baselayout-1.12.0_pre4.ebuild:
+  New release.
+
+*baselayout-1.12.0_pre3-r2 (30 Jul 2005)
+
+  30 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.0_pre3-iwconfig.patch,
+  +baselayout-1.12.0_pre3-r2.ebuild:
+  Fixed associate_order "forcepreferred" #100799, thanks to Benoit Boissinot.
+
+*baselayout-1.12.0_pre3-r1 (29 Jul 2005)
+
+  29 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.12.0_pre3-dhclient.patch,
+  +baselayout-1.12.0_pre3-r1.ebuild:
+  Fixed dhclient sending hostname #100745, thanks to Benoit Boissinot.
+
+*baselayout-1.12.0_pre3 (29 Jul 2005)
+
+  29 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  -files/baselayout-1.12.0_pre1-r1.patch, -baselayout-1.12.0_pre1-r1.ebuild,
+  -baselayout-1.12.0_pre2.ebuild, +baselayout-1.12.0_pre3.ebuild:
+  New version.
+  Punted pre1 and pre2 as they proved too buggy even for ~ARCH.
+
+*baselayout-1.12.0_pre2 (22 Jul 2005)
+
+  22 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +baselayout-1.12.0_pre2.ebuild:
+  Update version.
+
+  21 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  baselayout-1.12.0_pre1-r1.ebuild:
+  Re-add fix for path to filefuncs.so
+
+*baselayout-1.12.0_pre1-r1 (19 Jul 2005)
+
+  19 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  -files/baselayout-1.12.0-alpha2-netscripts-1.patch,
+  +files/baselayout-1.12.0_pre1-r1.patch,
+  -baselayout-1.12.0_alpha2-r1.ebuild, -baselayout-1.12.0_pre1.ebuild,
+  +baselayout-1.12.0_pre1-r1.ebuild:
+  Bring us up to SVN r1317 which fixes a fair few buglets mainly with
+  networking.
+  
+  Marked as unstable on all arches.
+
+  19 Jul 2005; Roy Marples <uberlord@gentoo.org> baselayout-1.11.13.ebuild:
+  Marked stable for all arches
+
+  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.12.0_pre1.ebuild:
+  Fix /etc/gentoo-release not having a version.
+
+*baselayout-1.12.0_pre1 (14 Jul 2005)
+
+  14 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +baselayout-1.12.0_pre1.ebuild:
+  New testing release.
+
+*baselayout-1.11.13 (13 Jul 2005)
+
+  13 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +baselayout-1.11.13.ebuild:
+  Update version.
+
+  10 Jul 2005; Daniel Ostrow <dostrow@gentoo.org>
+  baselayout-1.11.12-r4.ebuild:
+  Remove ibm use flag check as inittab is now takes from sysvinit.
+
+  10 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.12-quote-EDITOR.patch,
+  baselayout-1.11.12-r4.ebuild:
+  Add patch from svn to fix EDITOR quoting.
+
+  07 Jul 2005; Tom Gall <tgall@gentoo.org>
+  baselayout-1.11.12-r4.ebuild:
+  update for use of ibm and hvsi0 console
+
+  27 Jun 2005; Tom Gall <tgall@gentoo.org>
+  baselayout-1.11.12-r4.ebuild:
+  slight tweak for hvc console systems. 
+
+  19 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.12.0_alpha2-r1.ebuild:
+  Fixed path to filefuncs.so on multilib systems thanks to Christophe Saout
+  <christophe@saout.de>. Closes bug #87772.
+
+  09 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.12-r4.ebuild:
+  Stabilize for all arches.
+
+  31 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.12-volume-order-etc-update.patch,
+  baselayout-1.11.12-r4.ebuild:
+  Add a small patch to help people who dont etc-update properly during their
+  upgrade.
+
+  29 May 2005; <solar@gentoo.org> baselayout-1.11.10-r7.ebuild,
+  baselayout-1.11.11-r1.ebuild, baselayout-1.11.11-r2.ebuild,
+  baselayout-1.11.11-r3.ebuild, baselayout-1.11.11.ebuild,
+  baselayout-1.11.9-r1.ebuild, baselayout-1.12.0_alpha2-r1.ebuild,
+  baselayout-1.12.0_alpha2.ebuild, baselayout-1.9.4-r6.ebuild,
+  baselayout-1.9.4-r7.ebuild:
+  - update baselayout to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
+
+  27 May 2005; Roy Marples <uberlord@gentoo.org>
+  files/baselayout-1.11.12-profile.patch:
+  patch now applies cleanly
+
+*baselayout-1.11.12-r4 (27 May 2005)
+
+  27 May 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.12-is-net-fs.patch,
+  +files/baselayout-1.11.12-profile.patch, +baselayout-1.11.12-r4.ebuild:
+  fix is_net_up to work with what was mounted and not what will be mounted
+  fixes #53104
+  
+  gfs is now a recognised network fs - fixes #93911
+  
+  removed bashisms from /etc/profile
+
+*baselayout-1.11.12-r3 (26 May 2005)
+
+  26 May 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.12-runscript-boot.patch,
+  +baselayout-1.11.12-r3.ebuild:
+  report ${myservice} instead of $0 when disallowing net scripts to work in
+  the boot runlevel - fixes #91534
+
+*baselayout-1.11.12-r2 (25 May 2005)
+
+  25 May 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.12-ifconfig-cidr.patch,
+  +baselayout-1.11.12-r2.ebuild:
+  updated ESSID variables example in wireless.example - fixes #92469
+  fix ifconfig to understand CIDR addresses - bug #93237
+
+  22 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.12-swapon-quiet.patch,
+  baselayout-1.11.12-r1.ebuild:
+  Make initial swapon quiet #93143.
+
+*baselayout-1.11.12-r1 (17 May 2005)
+
+  17 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.12-exec-dev.patch, +baselayout-1.11.12-r1.ebuild:
+  Fix mounting of /dev #92921 by Lachlan Pease.
+
+*baselayout-1.11.12 (17 May 2005)
+
+  17 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +baselayout-1.11.12.ebuild:
+  Version bump.
+
+  04 May 2005; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.11-r3.ebuild, baselayout-1.12.0_alpha2-r1.ebuild:
+  Install sysctl.conf with 0640 perms by default #91435.
+
+  30 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.11-r3.ebuild, baselayout-1.12.0_alpha2-r1.ebuild:
+  Move crypto-loop to util-linux and skel/bash files to bash.
+
+*baselayout-1.11.11-r3 (29 Apr 2005)
+
+  29 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/baselayout-1.11.10-bashrc.patch, baselayout-1.11.10-r7.ebuild,
+  baselayout-1.11.11-r1.ebuild, baselayout-1.11.11-r2.ebuild,
+  +baselayout-1.11.11-r3.ebuild:
+  Move /etc/bashrc back to /etc/bash/bashrc to prep for #90488.
+
+*baselayout-1.12.0_alpha2-r1 (26 Apr 2005)
+*baselayout-1.11.11-r2 (26 Apr 2005)
+
+  26 Apr 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.11-wpa_supplicant.patch,
+  +files/baselayout-1.12.0-alpha2-netscripts-1.patch,
+  +baselayout-1.11.11-r2.ebuild, +baselayout-1.12.0_alpha2-r1.ebuild:
+  Add support for wpa_supplicant-0.4.0
+  Hopefully fix an obscure iwconfig bug
+
+*baselayout-1.11.11-r1 (21 Apr 2005)
+
+  21 Apr 2005; Roy Marples <uberlord@gentoo.org>
+  -baselayout-1.11.10-r3.ebuild, -baselayout-1.11.10-r4.ebuild,
+  -baselayout-1.11.10-r5.ebuild, -baselayout-1.11.10-r6.ebuild,
+  +baselayout-1.11.11-r1.ebuild, -baselayout-1.12.0_alpha1-r4.ebuild:
+  fixed bashrc location
+  
+  punted old ebuilds
+
+  21 Apr 2005; Roy Marples <uberlord@gentoo.org> baselayout-1.11.11.ebuild,
+  baselayout-1.12.0_alpha2.ebuild:
+  /mnt/floppy and /mnt/cdrom are only installed when USE flag build is set
+  fixes 88835
+
+*baselayout-1.11.11 (20 Apr 2005)
+
+  20 Apr 2005; Roy Marples <uberlord@gentoo.org> +baselayout-1.11.11.ebuild,
+  baselayout-1.12.0_alpha2.ebuild:
+  Update /etc/conf.d/{net,wireless} to change domain_* to dns_domain_*,
+  nameservers_* to dns_servers_* and searchdomains_* to dns_search_domains_*
+  
+  Added warning when using depracted variables iface_*, aliases_*, broadcasts_*,
+  netmasks_*, inet6_*, ipaddr_*, iproute_*
+
+*baselayout-1.12.0_alpha2 (19 Apr 2005)
+
+  19 Apr 2005; Roy Marples <uberlord@gentoo.org>
+  +baselayout-1.12.0_alpha2.ebuild:
+  version bump for testing highly experimental network code 
+
+  15 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/rc-scripts-1.4.16-livecd.patch, baselayout-1.9.4-r6.ebuild,
+  baselayout-1.9.4-r7.ebuild, baselayout-1.11.9-r1.ebuild,
+  baselayout-1.11.10-r3.ebuild, baselayout-1.11.10-r4.ebuild,
+  baselayout-1.11.10-r5.ebuild, baselayout-1.11.10-r6.ebuild,
+  baselayout-1.11.10-r7.ebuild, baselayout-1.12.0_alpha1-r4.ebuild:
+  Removing livecd-specific patches and all livecd-specific options as these
+  have all been moved to livecd-tools.
+
+*baselayout-1.11.10-r7 (11 Apr 2005)
+
+  11 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.10-selinux-udev.patch,
+  +baselayout-1.11.10-r7.ebuild:
+  Add selinux/udev patch to shut spb up.
+
+  07 Apr 2005; Tom Gall <tgall@gentoo.org>
+  files/rc-scripts-1.4.16-livecd.patch, baselayout-1.9.4-r6.ebuild:
+  downgrade hvc0 from vt320 to vt220, add hvc to inittab on ppc64 when use ibm
+  use flag is on
+
+*baselayout-1.11.10-r6 (01 Apr 2005)
+
+  01 Apr 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.10-wireless.patch, +baselayout-1.11.10-r6.ebuild:
+  Stopped setting ESSID in predown functions in iwconfig and wpa_supplicant
+  as there is no guarantee that the current ESSID is the one we started with
+  Also, we may not have an ESSID at all...
+
+*baselayout-1.11.10-r5 (30 Mar 2005)
+
+  30 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/baselayout-1.11.10-bashrc.patch, +baselayout-1.11.10-r5.ebuild:
+  Move /etc/bash/bashrc to /etc/bashrc.
+
+*baselayout-1.12.0_alpha1-r4 (23 Mar 2005)
+*baselayout-1.11.10-r4 (24 Mar 2005)
+
+  23 Mar 2005; Roy Marples <uberlord@gentoo.org>
+  files/baselayout-1.11.10-bridge.patch,
+  +files/baselayout-1.12.0_alpha1-iwconfig.patch,
+  +baselayout-1.11.10-r4.ebuild, +baselayout-1.12.0_alpha1-r4.ebuild:
+  version bump to remove iwconfig.orig
+
+  23 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/rc-scripts-1.4.16-livecd.patch:
+  Updated livecd patch to include better ppc64 serial console support.
+
+*baselayout-1.12.0_alpha1-r3 (23 Mar 2005)
+*baselayout-1.11.10-r3 (23 Mar 2005)
+
+  23 Mar 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.10-bridge.patch,
+  +files/baselayout-1.12.0_alpha1-bridge.patch, +baselayout-1.11.10-r3.ebuild,
+  +baselayout-1.12.0_alpha1-r3.ebuild:
+  bridge stops removing IP addresses from bridge ports.
+  iwconfig no longer tries to get an ESSID from non-wireless interfaces.
+  ifconfig no longer errors when deleting addresses on a non-existant
+  interface.
+
+  16 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.12.0_alpha1-r2.ebuild:
+  Stop defaulting WEP key to [1] as it messes with ndiswrapper users.
+
+*baselayout-1.12.0_alpha1-r2 (15 Mar 2005)
+
+  15 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch,
+  +baselayout-1.12.0_alpha1-r2.ebuild:
+  Export myservice when starting critical services, as its needed by
+  some of the addons (dmcrypt for example).  Also fixup find argument
+  order for findutils-4.2.18+.  Fix syntax touchups to init.d/modules
+  clobbering return value.
+
+*baselayout-1.11.10-r2 (14 Mar 2005)
+
+  14 Mar 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.10-iwconfig-2.patch, +baselayout-1.11.10-r2.ebuild:
+  Stop defaulting WEP key to [1] as it messes with ndiswrapper users
+
+*baselayout-1.11.10-r1 (14 Mar 2005)
+
+  14 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.11.10-iwconfig.patch, +baselayout-1.11.10-r1.ebuild:
+  Add patch for bug #84999.
+
+*baselayout-1.12.0_alpha1-r1 (11 Mar 2005)
+
+  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch,
+  +baselayout-1.12.0_alpha1-r1.ebuild:
+  The system() stuff in *depends.awk should be dosystem(). Change the tar -l
+  option to --one-file-system.
+
+  10 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.10.ebuild, baselayout-1.11.9-r1.ebuild,
+  baselayout-1.12.0_alpha1.ebuild:
+  Fix logic to create /etc/env.d/04multilib on amd64/2004.3. This closes bug
+  #82911.
+
+*baselayout-1.12.0_alpha1 (10 Mar 2005)
+
+  10 Mar 2005; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.10.ebuild,
+  +baselayout-1.12.0_alpha1.ebuild:
+  Don't apply 1.11.9-r1 patches to 1.11.10, which already contains them. Add
+  1.12.0_alpha1 for baselayout developers only
+
+*baselayout-1.11.10 (10 Mar 2005)
+
+  10 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  +baselayout-1.11.10.ebuild:
+  Bump to 1.11.10 ... might this be golden for stabilization? I guess we will
+  soon know
+
+  01 Mar 2005; <solar@gentoo.org> baselayout-1.11.8-r3.ebuild,
+  baselayout-1.11.9-r1.ebuild, baselayout-1.9.4-r6.ebuild,
+  baselayout-1.9.4-r7.ebuild:
+  - baselayout now provide itself as virtual/baselayout so ebuilds don't have to
+  hard DEPEND/RDEPEND on the standard baselayout.
+
+  25 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/rc-scripts-1.4.16-livecd.patch:
+  Updated livecd patch to have bashlogin source .bashrc and .bash_profile, if
+  they exist.
+
+  24 Feb 2005; Chris PeBenito <pebenito@gentoo.org>
+  files/sysvinit-2.84-selinux1.patch:
+  Fix paths in selinux patch to permanently fix #77101, since libselinux no
+  longer statically #define's them
+
+  24 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/rc-scripts-1.4.16-livecd.patch:
+  Updated livecd patch to allow for 19200 baud on serial console and also to
+  export CDBOOT when cdroot=
+
+  06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.9-r1.ebuild:
+  Changing the 04multilib logic to be "(is more than one api) or (libdir isn't
+  lib)".
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.9-r1.ebuild:
+  Dont install the 04multilib file if it only contains default lib paths ...
+  thats just silly.
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.9-r1.ebuild:
+  Keep lib32 in LDPATH if the dir exists and it's not a libdir. Otherwise
+  people switching from lib32 -> lib amd64 profiles will get tripped up.
+
+*baselayout-1.11.9-r1 (31 Jan 2005)
+
+  31 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/rc-scripts-1.6.9-checkfs-lvm.patch,
+  +files/rc-scripts-1.6.9-domainname.patch,
+  +files/rc-scripts-1.6.9-ifconfig.patch, +baselayout-1.11.9-r1.ebuild:
+  Version bump to fix #80183 (ifconfig debug) / #80206 (lvm logic error) / 
+  #80174 (domainname quote fix) / #80189 (don't install X related dirs).
+
+*baselayout-1.11.9 (30 Jan 2005)
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> +baselayout-1.11.9.ebuild:
+  Version bump.
+
+*baselayout-1.11.8-r3 (16 Jan 2005)
+
+  16 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.8-r2.ebuild, +baselayout-1.11.8-r3.ebuild:
+  Revision bump to fix missing net.modules.d in some configurations. -- bug
+  #78258.  Removed ~ppc64 from KEYWORDS.  ppc64 people, check what this does
+  on fresh installs (ie.  use it in catalyst).  I don't believe it will work
+  right with your current profiles because you are using 'lib' when you should
+  be using lib64 for your libdir.
+
+  16 Jan 2005; Markus Rothe <corsair@gentoo.org> baselayout-1.11.8-r2.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  15 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.8-r2.ebuild, baselayout-1.9.4-r7.ebuild:
+  Added support for hackish profiles that symlink lib to lib64.
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.9.4-r7.ebuild:
+  Stable for 2005.0.
+
+*baselayout-1.9.4-r7 (13 Jan 2005)
+
+  13 Jan 2005; Aron Griffis <agriffis@gentoo.org>
+  +baselayout-1.9.4-r7.ebuild:
+  backport multilib patch from 1.11.8-r2 to 1.9.4-r7 for the sake of amd64
+  livecds; marked ~amd64 momentarily until tested
+
+*baselayout-1.11.8-r2 (12 Jan 2005)
+
+  12 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -baselayout-1.11.8-r1.ebuild, +baselayout-1.11.8-r2.ebuild:
+  Nobody was in #-base, and this fix was important, so doing so now. 1)
+  Setting to ~amd64 only as that was what was mentioned in the CL and
+  discussed on #-base, but the ebuild had all archs for some reason. 2)
+  s/libdirs/${libdirs}/ in the for loop.
+
+  12 Jan 2005; Aron Griffis <agriffis@gentoo.org>
+  baselayout-1.11.8-r1.ebuild:
+  chown /lib/rcscripts to root so it doesn't get installed as the portage
+  user; thanks to Eradicator for catching this
+
+*baselayout-1.11.8-r1 (12 Jan 2005)
+
+  12 Jan 2005; Aron Griffis <agriffis@gentoo.org>
+  +baselayout-1.11.8-r1.ebuild:
+  Add eradicator's latest multilib patch for amd64. This ebuild is marked
+  ~amd64 only, but the changes should roll forward for all arches in 1.11.9
+
+*baselayout-1.11.8 (15 Dec 2004)
+
+  15 Dec 2004; Mike Frysinger <vapier@gentoo.org> +baselayout-1.11.8.ebuild:
+  Version bump.
+
+  06 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.11.7-r2.ebuild:
+  Fix /lib vs /lib64 logic.
+
+*baselayout-1.11.7-r2 (04 Dec 2004)
+
+  04 Dec 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/rc-scripts-1.6.7-dhclient.patch,
+  +files/rc-scripts-1.6.7-udhcpc.patch, -baselayout-1.11.7-r1.ebuild,
+  +baselayout-1.11.7-r2.ebuild:
+  Various fixes for /lib/rcscripts/net.modules.d/helpers.d #73327. Thanks to
+  Benoit Boissinot for the patches
+
+*baselayout-1.11.7-r1 (04 Dec 2004)
+
+  04 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/rc-scripts-1.6.7-fix-runscript.patch, +baselayout-1.11.7-r1.ebuild:
+  Fix runscript.sh so people can run /etc/init.d/ scripts again.
+
+*baselayout-1.11.7 (03 Dec 2004)
+
+  03 Dec 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.10.3.ebuild,
+  -baselayout-1.10.4.ebuild, -baselayout-1.11.5.ebuild,
+  +baselayout-1.11.7.ebuild, -baselayout-1.9.4-r3.ebuild,
+  -baselayout-1.9.4-r4.ebuild, -baselayout-1.9.4-r5.ebuild:
+  Update to rc-scripts-1.6.7. This will hopefully be the 1.11.x release that
+  we can mark stable in a few days
+
+*baselayout-1.11.6-r1 (08 Nov 2004)
+
+  08 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  +baselayout-1.11.6-r1.ebuild, -baselayout-1.11.6.ebuild:
+  bump to -r1 (no changes to ebuild) to push out helpers.d update
+
+  08 Nov 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.6.ebuild:
+  Add installation of /lib/rcscripts/net.modules.d/helpers.d
+
+*baselayout-1.11.6 (08 Nov 2004)
+
+  08 Nov 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.4.ebuild,
+  +baselayout-1.11.6.ebuild:
+  Update to rc-scripts-1.6.6
+
+*baselayout-1.11.5 (01 Nov 2004)
+
+  01 Nov 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.11.5.ebuild:
+  Update to rc-scripts-1.6.5: Fix problems related to depscan/envupdate
+  caching. Add the 'lo' option to RC_NET_STRICT_CHECKING to resolve bug #29225.
+  Lots of net-scripts bug-fixes.  See rc-scripts ChangeLog for more details
+
+*baselayout-1.11.4 (25 Oct 2004)
+
+  25 Oct 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.3.ebuild,
+  +baselayout-1.11.4.ebuild:
+  Update to rc-scripts-1.6.4: Fix net-scripts problems related to module
+  loading and alias management. Fix some bugs related to /dev and fsck. See
+  rc-scripts ChangeLog for details
+
+  23 Oct 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.3.ebuild:
+  Use rc-scripts-1.4.16-livecd.patch for baselayout-1.11.x until patch is
+  applied to rc-scripts in cvs
+
+*baselayout-1.11.3 (23 Oct 2004)
+
+  23 Oct 2004; Aron Griffis <agriffis@gentoo.org>
+  -baselayout-1.11.2.ebuild, +baselayout-1.11.3.ebuild:
+  Update to rc-scripts-1.6.3 (see rc-scripts ChangeLog)
+
+*baselayout-1.9.4-r6 (22 Oct 2004)
+
+  22 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/rc-scripts-1.4.16-livecd.patch, +baselayout-1.9.4-r6.ebuild:
+  Changed from using mingetty to using bashlogin on the livecd. This only
+  affects livecd-functions,sh, so moving straight to stable.
+
+  21 Oct 2004; Mike Frysinger <vapier@gentoo.org> baselayout-1.11.2.ebuild:
+  Dont install a lot of old symlinks anymore #27082.
+
+  19 Oct 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.9.4-r5.ebuild:
+  stable everywhere
+
+*baselayout-1.9.4-r5 (16 Oct 2004)
+
+  16 Oct 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/rc-scripts-1.4.16-splash.patch, +baselayout-1.9.4-r5.ebuild:
+  Add baselayout-1.9.4-r5 with splash patch from Spock for the sake of 2004.3;
+  this version will need to go stable in a day or so. baselayout-1.11.x will
+  go into testing and then stable post-release. baselayout-1.10.x will never
+  go stable because there's no point switching networking setup twice
+
+  13 Oct 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.2.ebuild:
+  Remove rogue doexe that installed init-scripts to /
+
+  13 Oct 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.2.ebuild:
+  Use cp -P instead of doexe to install init-scripts to preserve symlinks
+
+  13 Oct 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.2.ebuild:
+  Provide warning in pkg_postinst when older /etc/init.d/net.eth* are found
+
+*baselayout-1.11.2 (13 Oct 2004)
+
+  13 Oct 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.1.ebuild,
+  +baselayout-1.11.2.ebuild:
+  Update to rc-scripts-1.6.2 with net-scripts changes and lots of bug fixes
+  (see rc-scripts ChangeLog)
+
+  06 Oct 2004; Mike Frysinger <vapier@gentoo.org> baselayout-1.10.3.ebuild,
+  baselayout-1.10.4.ebuild, baselayout-1.11.1.ebuild,
+  baselayout-1.9.4-r3.ebuild, baselayout-1.9.4-r4.ebuild:
+  Change the permissions from 755 to 775 per #48016. Also referenced RedHat
+  installs and they too use 755.
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org> baselayout-1.10.3.ebuild,
+  baselayout-1.10.4.ebuild, baselayout-1.11.1.ebuild,
+  baselayout-1.9.4-r3.ebuild, baselayout-1.9.4-r4.ebuild:
+  Dont install the nscd script anymore, let glibc do it #43076.
+
+*baselayout-1.11.1 (29 Sep 2004)
+
+  27 Sep 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.11.0.ebuild:
+  Update to rc-scripts-1.6.1 with dm-crypt fixes (I hope).  Still package.masked
+
+  20 Sep 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.0.ebuild:
+  Stow our versions of critical files in /usr/share/baselayout so that quickpkg
+  won't pick up personal files like /etc/passwd
+
+*baselayout-1.11.0 (15 Sep 2004)
+
+  15 Sep 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.11.0.ebuild:
+  Update to 1.11.0 with new modular net-scripts thanks to Roy Marples. This
+  update also includes the new dm-crypt support (bug 43146) and netmount fix
+  (bug 64034). This release is pmasked for the moment so we can get wider
+  testing on the net-scripts
+
+  20 Aug 2004; Mike Frysinger <vapier@gentoo.org> baselayout-1.10.3.ebuild,
+  baselayout-1.10.4.ebuild:
+  Fix default runlevel generation. Seems the variable name was changed from foo
+  to x, but not all instances of foo were changed over.  Also, the script was 
+  checking for the files in /init.d/ instead of /etc/init.d/.
+
+*baselayout-1.10.4 (18 Aug 2004)
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  -baselayout-1.10.1-r2.ebuild, -baselayout-1.10.2.ebuild,
+  +baselayout-1.10.4.ebuild:
+  Update to rc-scripts-1.5.3
+  - Fix bug 60719 (request for better error messages from runscript) by
+    allowing errors to show on the screen when they're encountered in
+    wrap_rcscript
+  - Apply Spock's bootsplash patch from bug 45784.  This moves most of
+    the splash functionality out of baselayout.
+  - Don't export PS1.  Continuation of bug 26951, comments 60-62.
+
+*baselayout-1.9.4-r4 (11 Aug 2004)
+
+  11 Aug 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.9.4-r3.ebuild,
+  +baselayout-1.9.4-r4.ebuild:
+  Backport amd64 changes to stable baselayout 1.9.x for initial multilib support
+  #59710
+
+*baselayout-1.10.3 (10 Aug 2004)
+
+  10 Aug 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.10.3.ebuild:
+  Include amd64 /lib64 patch from lv in bug 59710
+
+*baselayout-1.10.2 (02 Aug 2004)
+
+  02 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  -baselayout-1.10.1-r1.ebuild, -baselayout-1.10.1.ebuild,
+  +baselayout-1.10.2.ebuild, -baselayout-1.9.4-r2.ebuild:
+  Update to rc-scripts-1.5.2
+  - Related to bug 38955, don't set INPUTRC.  Instead patch bash so
+    that it looks for /etc/inputrc automatically if ~/.inputrc is
+    missing.  This is better than using INPUTRC since that will
+    override even after the user creates ~/.inputrc.
+  - Fix bug 54275: Don't set INFODIR.  The correct variable used by
+    texinfo is INFOPATH, which is already set in 00basic.  Setting
+    INFODIR is useless, and breaks a NetBSD cross compile from Gentoo
+  - Fix bug 58805: net.eth0 should use bridge so that bridge
+    interfaces are configured prior to net.br0 running
+  - Fix bug 56856: Get rid of net.rej and integrate missing stuff to
+    conf.d/net
+  - Apply half of spock's patch in bug 45784: Check for
+    conf.d/bootsplash instead of conf.d/bootsplash.conf
+  - Fix bug 51351: Quote parsed output of /proc/filesystems to handle
+    octal sequences in mountpoint such as encoded spaces (\040)
+  - Fix bug 46680: Add cifs support to localmount and netmount.
+    Thanks to Ronald Moesbergen for the patches
+  - Fix bug 26952: Use /etc/bash/bashrc to setup PS1, testing $- to
+    determine if shell is interactive.  The new system-wide bashrc is
+    installed by bash-2.05b-r10
+  - Fix bug 38743: strip leading and trailing spaces from variable
+    values in genenviron.awk.  Thanks to Marius Mauch for the patch.
+  - Fix bug 55576: swap words "start" and "stop" in runscript.sh error
+    message
+
+  27 Jul 2004; <agriffis@gentoo.org> baselayout-1.10.1-r1.ebuild,
+  baselayout-1.10.1-r2.ebuild:
+  Move util-linux back inside conditional since it pulls in a lot of dependencies
+
+*baselayout-1.10.1-r2 (11 Jul 2004)
+
+  11 Jul 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.10.1-r2.ebuild:
+  - Get rid of ROOT trick which had the potential to break binary installs.
+  - Make /sys directory on all installations, not just ppc, since it will be
+    needed anywhere 2.6 is running.
+  - Create default runlevel symlinks in pkg_postinst instead of src_install
+    since it tests content of ${ROOT}. 
+  - Create device nodes in pkg_postinst for the same reason. Don't call
+	/sbin/init U in pkg_postinst since that is handled by the sysvinit ebuild
+	now.
+
+*baselayout-1.9.4-r3 (09 Jul 2004)
+
+  09 Jul 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.9.4-r3.ebuild:
+  Bump to -r3 to fix building of sulogin in catalyst stages
+
+  01 Jul 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.10.1-r1.ebuild:
+  Fix bug 55814: RDEPEND on sysvinit and util-linux regardless of
+  USE=build since neither one requires a c++ compiler
+
+*baselayout-1.10.1-r1 (29 Jun 2004)
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  +baselayout-1.10.1-r1.ebuild, baselayout-1.10.1.ebuild,
+  -baselayout-1.8.11.ebuild, -baselayout-1.8.12.ebuild,
+  -baselayout-1.8.6.13-r1.ebuild, -baselayout-1.8.6.13.ebuild,
+  -baselayout-1.9.1.ebuild, -baselayout-1.9.4-r1.ebuild,
+  baselayout-1.9.4-r2.ebuild, -baselayout-1.9.4.ebuild:
+  Split sysvinit from baselayout.  Trim old ebuilds
+
+*baselayout-1.10.1 (28 Jun 2004)
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.10.ebuild,
+  +baselayout-1.10.1.ebuild,
+  - Fix dhcp in iface_start_ifconfig: It was re-using the variable
+    ${i} which would result in a syntax error
+  - Use vlan_IFACE instead of iface_IFACE_vlans in net.eth0 for more
+    consistent vlan configuration.  Thanks to robbat2 in bug 55394 (not
+    fully resolved)
+  - Add example for checking if root filesystem is NFS-mounted via
+    predown function in conf.d/net for bug 53104.  This might be better
+    integrated at some point into net.eth0
+  - Add http://dev.gentoo.org/~agriffis/rc-scripts/ as an
+    alternative download point while the mirrors catch up
+
+*baselayout-1.10 (26 Jun 2004)
+
+  26 Jun 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.10.ebuild,
+  baselayout-1.9.4-r2.ebuild:
+  Update to rc-scripts-1.5.0
+  - Fix bug 47659: support iproute2-style configuration.  Thanks to Dean
+    Bailey for some fantastic patches, including documentation for
+    conf.d/net
+  - Fix bug 34607: provide examples for in conf.d/net for preup, postup,
+    predown, postdown functions.  Also pay attention to return value
+    from postdown (previously ignored)
+  - Fix bug 25975: support adsl in net.eth0.  Thanks to Patrick McLean
+    for the initial pass at the code.
+  - Fix bug 34140: add --servicelist option to rc-status.  Thanks to
+    Eldad Zack for the patch.
+  - Fix bug 37418: fix order of LVM and RAID in checkfs.  Thanks to
+    Raimondo Giammanco for the patch.
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  baselayout-1.8.6.13-r1.ebuild, baselayout-1.8.6.13.ebuild:
+  QA - fix use invocation
+
+  15 Jun 2004; <solar@gentoo.org> baselayout-1.9.4-r2.ebuild:
+  remove unneeded /etc/nsswitch.conf with USE=uclibc
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> baselayout-1.9.4-r2.ebuild:
+  adding in /sys for ppc64 bug #52703
+
+  06 Jun 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.9.4-r2.ebuild:
+  Marking stable everywhere
+
+*baselayout-1.9.4-r2 (06 Jun 2004)
+
+  06 Jun 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.9.4-r2.ebuild:
+  Update to rc-scripts-1.4.16: Only call generate-modprobe.conf with
+  --assume-kernel if modules-update was called with --assume-kernel. This means
+  that only catalyst has the dependency on module-init-tools, not everybody with
+  the newer baselayout. This is ~arch at the moment, but should be marked stable
+  within 24 hours or so
+
+  04 Jun 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.9.4-r1.ebuild:
+  Change module-init-tools-3.0-r2 DEPEND to RDEPEND
+
+*baselayout-1.9.4-r1 (04 Jun 2004)
+
+  04 Jun 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.9.4-r1.ebuild:
+  Bump revision with DEPEND on >=sys-apps/module-init-tools-3.0-r2 to fix bug
+  52999
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.9.4.ebuild:
+  Stable everywhere
+
+*baselayout-1.9.4 (21 May 2004)
+
+  21 May 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.9.3.ebuild,
+  +baselayout-1.9.4.ebuild:
+  Update to rc-scripts-1.4.15, which contains fixes for bug 51570 (typo/error on
+  line 161 of /sbin/livecd-functions.sh) and bug 51626 (wrong var declaration in
+  get_bootparam in /sbin/functions.sh).
+
+  Fix pkg_postinst to write to ${ROOT}/etc/gentoo-release instead of
+  ${D}/etc/gentoo-release (D'oh!)
+
+*baselayout-1.9.3 (17 May 2004)
+
+  17 May 2004; Aron Griffis <agriffis@gentoo.org> -baselayout-1.9.2.ebuild,
+  +baselayout-1.9.3.ebuild:
+  Update to rc-scripts-1.4.14, which contains an hppa console fix from gmsoft
+
+*baselayout-1.9.2 (16 May 2004)
+
+  16 May 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.9.2.ebuild:
+  Update to rc-scripts-1.4.13, which contains Gustavo's livecd serial console
+  fixes for sparc and hppa
+
+  10 May 2004; Michael McCabe <randy@gentoo.org> baselayout-1.9.1.ebuild:
+  Stable on s390
+
+*baselayout-1.9.1 (10 May 2004)
+
+  10 May 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.9.1.ebuild,
+  -baselayout-1.9.0.ebuild:
+  Update to rc-scripts-1.4.12, which fixes the following issues that
+  were introduced in baselayout-1.9.0:
+  - Fix bug 50434: The new version of start-stop-daemon changes
+    directory to / by default unless --chdir is specified.  Revert
+    this behavior to maintain working directory.  This fixes openvpn
+    startup (probably among other things).  Thanks to Sven Wegener for
+    the patch.
+  - Fix bug 50448: Four days ago I changed bash loops to use the wrong
+    conditional syntax in net.eth0.  Thanks to Sven Wegener for
+    pointing out the problem and providing a patch.
+
+  08 May 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.9.0.ebuild:
+  Bump rc-scripts rev to 1.4.11-r1 because I accidentally packaged x86 .o files
+  in the 1.4.11 release. This fixes bug 50430 (baselayout-1.9.0 won't build on
+  non-x86 arch)
+
+*baselayout-1.9.0 (07 May 2004)
+
+  07 May 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.9.0.ebuild:
+  Update to rc-scripts-1.4.11, which fixes the following issues:
+  - Fix bug 20597: Skip RCS files when updating modules
+  - Fix bug 49926: Add a --assume-kernel flag to modules-update.  This
+    requires a companion patch in module-init-tools-3.0-r2 to handle the
+    same flag in generate-modprobe.conf; this dependency won't be
+    handled in the baselayout ebuild since it only affects livecd
+    building.
+  - Fix bug 34827: net.eth0 breaks when localized because the ifconfig
+    output changes.  Wrap ifconfig in a function that overrides LC_ALL=C
+  - Fix bug 48305: Provide a new network configuration variable
+    ifconfig_fallback_eth0 which allows one to specify a fallback
+    configuration in case DHCP fails.
+  - Fix bug 50246: Give root an invalid password ("*" in /etc/shadow) in
+    the default baselayout.  This prevents the first reboot after
+    installation from having a blank password.
+  - Fix bug 48595: Make sure $(id -u) is zero (root user) when running
+    init scripts to avoid a lot of error messages.
+  - Fix bug 44316: Use 0644 instead of 0640 for resolv.conf in net.ppp0
+  - Fix bug 22686: Update to version 1.10.20 of Debian's start-stop-daemon 
+    (contained in dpkg at http://packages.debian.org/testing/base/dpkg)
+    which makes --nicelevel work right
+  - In net.eth0, fix many instances of loops like "for ((i = 0; i < 100;
+    i = i + 1))".  The problem here is that the middle comparison is
+    being interpreted as a bash conditional, which means that it's doing
+    string comparison by default.  It needs to be "i -lt 100"
+  - Replace many lines of awk with two lines of grep in
+    init.d/localmount
+  
+  In the baselayout ebuild, add some information prior to calling
+  mkdirs.sh to alleviate the confusion around .keep warnings.  For
+  example bug 50369
+
+  05 May 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.8.12.ebuild:
+  Fix bug 50108: Create /boot/boot symlink in pkg_postinst because sometimes
+  /boot is a FAT filesystem.  When that is the case, then the symlink will
+  fail.  Consequently, if we create it in src_install, then merge will fail.
+  AFAIK there is no point to this symlink except for misconfigured grubs.
+
+  03 May 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.8.12.ebuild:
+  Mark 1.8.12 stable everywhere
+
+  02 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Do not install doc/man pages if build is in USE.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  baselayout-1.8.6.13-r1.ebuild, baselayout-1.8.6.13.ebuild:
+  Add inherit eutils
+
+  27 Apr 2004; Michael McCabe <randy@gentoo.org> baselayout-1.8.12.ebuild:
+  Marked stable on s390
+
+*baselayout-1.8.12 (25 Apr 2004)
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.8.12.ebuild:
+  - Fix bug 40987 (gentoo should be able to boot with an empty /dev)
+    with patch from Spanky.  The patch avoids redirection to /dev/null
+    when it doesn't exist; this was breaking /sbin/rc.
+  - Fix bug 48629 (/sbin/rc fixups for udev) with patch from GregKH
+  - Fix typos in sbin/rc: "try try mount" and "mount ... & >/dev/null"
+    Also removed the errstr double-checking since the need for that is
+    alleviated by these typo fixes.
+
+  21 Apr 2004; <rac@gentoo.org> baselayout-1.8.11.ebuild:
+  Add needed extra () to RDEPEND
+
+  19 Apr 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.8.10.ebuild,
+  baselayout-1.8.5.9.ebuild, baselayout-1.8.6.10-r1.ebuild,
+  baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild,
+  baselayout-1.8.6.12-r4.ebuild, baselayout-1.8.6.12-r5.ebuild,
+  baselayout-1.8.6.8-r1.ebuild, baselayout-1.8.7.ebuild,
+  baselayout-1.8.8.ebuild, baselayout-1.8.9.ebuild, files/MAKEDEV.8:
+  Prune older ebuilds for bug 48353
+
+*baselayout-1.8.11 (15 Apr 2004)
+
+  15 Apr 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.8.11.ebuild:
+  Update to rc-scripts-1.4.9:
+  - Fix bug 47111 (severe depcache problems) with tons of help from
+    dswhite42 and the rest of the crew in that bug.
+
+*baselayout-1.8.10 (14 Apr 2004)
+
+  14 Apr 2004; Aron Griffis <agriffis@gentoo.org> metadata.xml,
+  +baselayout-1.8.10.ebuild:
+  Update to rc-scripts-1.4.8:
+  - Fix bug 47623 (error removing inet6 addresses) with patch from Vlad
+    Yasevich
+  
+  Since this one-liner was the only change from 1.8.9, mark this version
+  stable on all arches for 2004.1 release
+
+*baselayout-1.8.9 (12 Apr 2004)
+
+  12 Apr 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.8.9.ebuild:
+  Update to rc-scripts-1.4.7:
+  - Fix bug 47218 (net.eth0 broken for vlans), patch provided by Andy Dustman
+  - Fix bug 47250 (depscan.sh fails to create /var/lib/init.d/*
+    directories), patch provided by Terje Bergstrvm.
+
+  Additionally clean up the baselayout ebuild, in particular remove
+  confusing defaltmerge() and broken keepdir_mount(). Add kdir() and
+  unkdir() functions which are a more complete hack to workaround bug
+  9849, just until Jason Stubbs's portage patch is applied and
+  available in stable-land.
+
+*baselayout-1.8.8 (08 Apr 2004)
+
+  08 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/sysvinit-2.84-selinux1.patch, +baselayout-1.8.8.ebuild:
+  Update to rc-scripts-1.4.6 which contains checkroot patch for bug 38360. Fix a
+  typo in Gustavoz's previous patch for serial console. Add selinux patch from
+  bug 47139 to handle different versions of libselinux
+
+*baselayout-1.8.7 (07 Apr 2004)
+
+  07 Apr 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.8.7.ebuild:
+  Update to rc-scripts-1.4.4 with net.eth0 fixes and sparc fixes
+
+  17 Mar 2004; Seemant Kulleen <seemant@gentoo.org>
+  baselayout-1.8.6.13-r1.ebuild:
+  fix for bug #44712 by Michael Sterret <mr_bones_@gentoo.org>
+
+  03 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc2.x compat patch #43097 by Tristan Henderson.
+
+  28 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.13-r1.ebuild:
+  Bug #43099.
+
+*baselayout-1.8.6.13-r1 (26 Feb 2004)
+
+  26 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.13-r1.ebuild:
+  Make baselayout .tbz2 friendly, bug #42193.  Major cleanups.
+
+  16 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.13.ebuild:
+  Add missing -r switch to grpck.
+
+  15 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.13.ebuild:
+  Do not run grpconv if grpck do not return 0, bug #33282.
+
+  08 Feb 2004; Brad House <brad_mssw@gentoo.org> baselayout-1.8.6.13.ebuild:
+  ppc64 fixes
+
+*baselayout-1.8.6.13 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.13.ebuild:
+  Update version.  Mostly livecd/linux-2.6 updates.
+
+  03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  baselayout-1.8.6.12-r3.ebuild:
+  set ppc in keywords
+
+  01 Feb 2004; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild,
+  baselayout-1.8.6.12-r4.ebuild, baselayout-1.8.6.12-r5.ebuild:
+  In catalyst, with USE=build and ROOT != / the ROOT/dev directory doesn't exist, so
+  you MUST create it otherwise extracting the dev tarball to that directory will
+  fail without stopping the ebuild
+
+  25 Jan 2004; Chris PeBenito <pebenito@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild,
+  baselayout-1.8.6.12-r4.ebuild:
+  Add sysvinit SELinux patch.
+
+*baselayout-1.8.6.12-r5 (21 Jan 2004)
+
+  21 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.12-r5.ebuild, files/sysvinit-2.84-selinux.patch:
+  Tweak livecd support. Add selinux patch from Chris PeBenito
+  <pebenito@gentoo.org>.
+
+  16 Jan 2004; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.12-r4.ebuild:
+  livecd fixes
+
+*baselayout-1.8.6.12-r4 (12 Jan 2004)
+
+  12 Jan 2004; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.12-r4.ebuild:
+  put a baselayout in for testing specifically for livecds. It is keyworded -*
+  and has restrict=nomirror set, this will be updated as we fix more bugs
+
+*baselayout-1.8.6.12-r3 (27 Dec 2003)
+
+  27 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild:
+  Add some udev specific tweaks. Fix logic that deals with the unpacking of the
+  device-node-tarball.
+
+  14 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild:
+  baselayout fixes for catalyst stage builds
+
+  15 Dec 2003; <spider@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.8-r1.ebuild:
+  QA: fixing chown user.group to user:group, bug #35127
+
+  14 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.12-r2.ebuild,
+  baselayout-1.8.6.8-r1.ebuild:
+  stage binaries do not have proper /dev fs if you do not pass the proper
+  MAKEDEV command. MAKEDEV does not yet support x86_64/amd64 therefore we must
+  use the 'generic-i386' options. If we let it default to 'generic' MAKEDEV
+  errors out b/c it internally doesn't support it. Open up /sbin/MAKEDEV with an
+  editor if in doubt.
+
+  10 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild:
+  Update selinux check.
+
+  30 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild:
+  Fix format of calling chown, bug #34612.
+
+*baselayout-1.8.6.12-r2 (26 Nov 2003)
+
+  26 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild:
+  New release with new rc-scripts tarball.
+
+*baselayout-1.8.6.12-r1 (26 Nov 2003)
+
+  26 Nov 2003; Luca Barbato <lu_zero@gentoo.org>
+  baselayout-1.8.6.12-r1.ebuild:
+  Installs the initreq.h include, needed by newer pbbuttonsd
+
+*baselayout-1.8.6.12 (11 Nov 2003)
+
+  11 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.12.ebuild:
+  New release.
+
+  27 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.11.ebuild:
+  Enable shadow groups, bug #31762.
+
+  27 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild:
+  Also do not remove real hosts for this ebuild.
+
+  27 Oct 2003; Martin Holzer <mholzer@gentoo.org> baselayout-1.8.6.11.ebuild:
+  Removing new hosts. Closes #32094
+
+*baselayout-1.8.6.11 (14 Oct 2003)
+
+  14 Oct 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.11.ebuild,
+  baselayout-1.8.6.8-r1.ebuild:
+  New version. Fixed keymap for sun (should be 'sunkeymap' and not 'sun'),
+  Moved code that added '-static' to LDFLAGS to proper function, namely
+  src_compile(). Fixed merge errors when /dev/pts and /dev/shm was mounted
+  but not on devfs.
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild:
+  removed hardened-gcc flags again
+
+  05 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.8-r1.ebuild:
+  Fix $S.
+
+  05 Oct 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.8-r1.ebuild,
+  files/rc-scripts-1.4.2.9.tar.bz2, files/rc-scripts-1.4.3.10p1.tar.bz2,
+  files/rc-scripts-1.4.3.8p1.tar.bz2:
+  Move tarballs to mirrors.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> baselayout-1.8.6.10-r1.ebuild :
+  Added ia64 keywords.
+
+  13 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild:
+  Mark stable
+
+  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.10.ebuild, baselayout-1.8.6.7.ebuild,
+  baselayout-1.8.6.8-r1.ebuild, baselayout-1.8.6.9.ebuild,
+  files/rc-scripts-1.4.3.10.tar.bz2, files/rc-scripts-1.4.3.7.tar.bz2,
+  files/rc-scripts-1.4.3.9.tar.bz2:
+  Fix RDEPEND to use a more simple form.  Cleanup old ebuilds.
+
+*baselayout-1.8.6.10-r1 (08 Sep 2003)
+
+  23 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.8-r1.ebuild:
+  Add static support, bug #29295.
+
+  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, files/rc-scripts-1.4.3.10p1.tar.bz2:
+  This update is a service release - I will get to all the open bugs in the next
+  few days.
+
+*baselayout-1.8.6.10 (04 Aug 2003)
+
+  04 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.10.ebuild, files/rc-scripts-1.4.3.10.tar.bz2:
+  New version - see ChangeLog in /usr/share/doc as always.
+
+  23 Jul 2003; Olivier Crete <tester@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.7.ebuild, baselayout-1.8.6.8-r1.ebuild,
+  baselayout-1.8.6.9.ebuild:
+  Added lib64->lib symlinks for amd64
+
+*baselayout-1.8.6.9 (17 Jul 2003)
+
+  17 Jul 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.9.ebuild,
+  files/rc-scripts-1.4.3.9.tar.bz2:
+  New bugfix release - check ChangeLog in /usr/share/doc/$P for changes.
+
+  15 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.8.6.8-r1.ebuild:
+  Add lastb symlink.
+
+  15 Jul 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.9.ebuild,
+  baselayout-1.8.6.7.ebuild, baselayout-1.8.6.8-r1.ebuild:
+  Remove the ppp stuff, as they now ship with net-dialup/ppp.
+
+*baselayout-1.8.6.8-r1 (21 May 2003)
+
+  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> baselayout-1.8.6.8-r1.ebuild:
+  Added hppa to ARCH where serial console are enabled.
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> baselayout-1.8.6.8-r1.ebuild :
+  Marked stable on hppa.
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> baselayout-1.8.6.8-r1.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org>
+  baselayout-1.8.6.8-r1.ebuild:
+  Mark stable on alpha
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> baselayout-1.8.6.8-r1.ebuild:
+  Changed ~sparc to sparc in KEYWORDS
+
+  21 May 2003; Martin Schlemmer <azaraht@gentoo.org> Manifest, baselayout-1.8.6.8-r1.ebuild,
+  files/rc-scripts-1.4.3.8p1.tar.bz2:
+  Fix a bad bug that I missed, bug #21376.
+
+*baselayout-1.8.6.8 (20 May 2003)
+
+  20 May 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.8.ebuild,
+  files/rc-scripts-1.4.3.8.tar.bz2 :
+  Bugfix release.
+
+*baselayout-1.8.6.7 (12 May 2003)
+
+  12 May 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.7.ebuild,
+  files/rc-scripts-1.4.3.7.tar.bz2:
+  New release with lots of updates and fixes.
+
+  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.6.ebuild :
+  Some of the build images have MAKEDEV in /usr/sbin, and we called it with
+  /usr/sbin/MAKEDEV, which is wrong since we moved it to /sbin.  This caused
+  things to break, as we called /usr/sbin/MAKEDEV, and subsequent calls used
+  the copy in /sbin, which is different versions.  Add a symlink in /usr/sbin
+  to overwrite the invalide MAKEDEV, and call it via /sbin/MAKEDEV.  This
+  should close bug #15299.
+
+  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.6.ebuild :
+  Fix docs installing to the wrong place (bug #20091), thanks to sharp eye of
+  Matt Taylor <liverbugg@juno.com>.
+
+*baselayout-1.8.6.6 (27 Apr 2003)
+
+  27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.6.ebuild :
+  Update version.
+
+*baselayout-1.8.5.9 (27 Apr 2003)
+
+  27 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.9.ebuild :
+  Add slocate group, bug #19604.
+
+*baselayout-1.8.6.5 (07 Apr 2003)
+
+  07 Apr 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.5.ebuild :
+  New release.
+
+  23 Mar 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.4-r1.ebuild :
+  Fix the check for 'si::sysinit:/sbin/rc sysinit' in /etc/inittab to also
+  update inittab if the line is commented, thanks to report form
+  Norberto BENSA <nbensa@gmx.net>.
+
+*baselayout-1.8.6.4-r1 (21 Mar 2003)
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org>
+  baselayout-1.8.6.4-r1.ebuild:
+  Move a cd so that it gets done for all cases where it is needed
+
+  21 Mar 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.4-r1.ebuild :
+  Fix 'etc-update' to be 'env-update' as it *should* have been.  Tweak updating
+  of /etc/conf.d/rc and /etc/inittab to resolve bug #17829, thanks to
+  Jay Pfeifer <pfeifer@gentoo.org>.
+
+  17 Mar 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.4.ebuild :
+  Only run 'keepdir /usr/portage' if ${ROOT}/usr/portage do NOT exist, else we
+  run into problems if it is a readonly NFS mount among others.
+
+*baselayout-1.8.6.4 (16 Mar 2003)
+
+  16 Mar 2003;  Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.4.ebuild :
+  New release.
+
+*baselayout-1.8.6.3 (09 March 2003)
+
+  11 Mar 2003; Zach Welch <zwelch@gentoo.org> baselayout-1.8.5.5.ebuild,
+  baselayout-1.8.5.8.ebuild, baselayout-1.8.6.2.ebuild,
+  baselayout-1.8.6.3.ebuild:
+  change sys-kernel/linux-headers to new virtual/os-headers
+
+  09 March 2003;  Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.3.ebuild :
+  New beta release; check ChangeLog in usual place for more info.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> baselayout-1.8.5.8.ebuild :
+  Added arm to keywords.
+
+  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> baselayout-1.8.5.8.ebuild :
+  Added hppa to keywords.
+
+  22 Jan 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.8.ebuild :
+  Mark stable.
+
+*baselayout-1.8.6.2 (07 Jan 2003)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  serial console for mips
+
+  15 Jan 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.2.ebuild :
+
+  Bugfixes for /var stuff.
+
+  15 Jan 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.1.ebuild :
+
+  New version with /var on seperate partition fixes ...
+
+  07 Jan 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.0.ebuild :
+
+  Make sure we only update /etc/conf.d/rc if the user do not have the new with
+  'svcmount' stuff ...
+
+*baselayout-1.8.6.0 (07 Jan 2003)
+
+
+  07 Jan 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.6.0.ebuild :
+
+  New alpha release that do not need tmpfs for caching dependencies.  Also
+  RAID changes, etc.  Please make sure to update all ._cfg????_* files, else
+  things might break ....  See ChangeLog in /usr/share/doc/$PF for more info.
+
+*baselayout-1.8.5.8 (07 Jan 2003)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  serial console for mips
+
+  15 Jan 2003; Jason Wever <weeve@gentoo.org> baselayout-1.8.5.8.ebuild :
+
+  Changed ~sparc keyword to sparc.
+
+  07 Jan 2003; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.8.ebuild :
+
+  Bugfix release; see ChangeLog in /usr/share/doc/$PF.
+
+*baselayout-1.8.5.7 (24 Dec 2002)
+
+  24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.7.ebuild :
+
+  Minor bugfixes.
+
+  18 Dec 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.5.ebuild :
+
+  Bump to stable.
+
+*baselayout-1.8.5.6 (18 Dec 2002)
+
+  18 Dec 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.6.ebuild :
+
+  Mips support among things.
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.5.ebuild :
+
+  Fix /usr/lib/X11 symlink.  Change gawk module to compile if
+  /usr/include/awk/awk.h exists.
+
+*baselayout-1.8.5.5 (09 Dec 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Fix mips specific stuff
+  Added mips to keywords
+
+  10 Dec 2002; Seemant Kulleen <seemant@gentoo.org>
+  baselayout-1.8.5.5.ebuild :
+
+  Removed references to sparc64 ARCH/KEYWORD as it is deprecated until we
+  have a 64 bit userland implementation.
+
+  09 Dec 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.5.ebuild :
+
+  Add a 'keepdir /var/state', closing bug #11546.  Change console type for
+  serial console (sparc) from 'linux' to 'vt100', closing bug #11551.
+
+  Check /usr/share/doc/baselayout-1.8.5.5/ChangeLog.gz for details.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+
+  Changed sparc and ~sparc keywords.
+ 
+*baselayout-1.8.5.4 (26 Nov 2002)
+
+  26 Nov 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.4.ebuild :
+
+  Check /usr/share/doc/baselayout-1.8.5.4/ChangeLog.gz for details.
+
+*baselayout-1.8.5.3 (18 Nov 2002)
+
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.3.ebuild :
+
+  Ok, new version again.  Fixes config files containing licenses, and a problem
+  with the awk module on non-x86 arch's.  This should hopefully be the last release
+  for a bit.
+
+*baselayout-1.8.5.2 (18 Nov 2002)
+
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.2.ebuild :
+
+  New version with super fast rc-envupdate.sh.
+
+*baselayout-1.8.5.1 (18 Nov 2002)
+
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.1.ebuild :
+
+  Fix using /usr/bin/find in depscan.sh.
+
+*baselayout-1.8.5 (17 Nov 2002)
+
+  17 Nov 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.ebuild :
+
+  New version that have depscan.sh using awk scripts to do the main work.
+  This should improve speed a lot, and hopefully resolve bug #10548.
+
+*baselayout-1.8.4.2 (5 Nov 2002)
+
+  5 Nov 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.4.2.ebuild :
+
+  Another minor bugfix release to resolve current major show stoppers.
+
+  30 Oct 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.4.1.ebuild :
+
+  Add poweroff symlink, closing bug #9857 thanks to
+  Jose Fonseca <j_r_fonseca@yahoo.co.uk>.
+
+*baselayout-1.8.4.1 (28 Oct 2002)
+
+  28 Oct 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.4.1.ebuild :
+
+  Bugfix release for 1.8.4.
+
+*baselayout-1.8.4 (13 Oct 2002)
+
+  20 Oct 2002; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Changed unsite.nc.edu to sunsite.nc.edu  --- thanks to mg (abiword
+  developer and gentoo user) -- mentioned it on irc to me.
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.4.ebuild :
+  Lots of fixes.  See ChangeLog.
+
+*baselayout-1.8.3 (7 Sep 2002)
+
+  7 Sep 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.3.ebuild :
+  Get things ready for suid utmp stuff for xterms .. bug #7630.
+
+  5 Sep 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.2.ebuild :
+  Remove /etc/termcap.  Anything that needs it, should depend on
+  sys-libs/libtermcap-compat.  Some cleanups; should have passwd and
+  shadow back in CONTENTS.
+
+  26 Aug 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.2.ebuild :
+  Tweak DEPEND to depend on portage-2.0.23 or later.  Also remove the '!'
+  depend on <sys-apps/gawk-3.1.0-r3 in favour of one that depend on
+  >=sys-apps/gawk-3.1.0-r3 if "build" and "bootstrap" not in USE.  This
+  should resolve bug #7018.
+
+*baselayout-1.8.2 (25 Aug 2002)
+
+  25 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
+  New release, see included ChangeLog for changes.
+
+*baselayout-1.8.1 (08 Aug 2002)
+
+  08 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
+  New release.  Adds many fixes/update.  Add /etc/termcap.
+
+*baselayout-1.8.0 (17 July 2002)
+
+  17 July 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Lots of bugfixes and updates.  Please see included ChangeLog in
+  /usr/share/doc/baselayout-1.8.0/ChangeLog.gz for details.
+
+*baselayout-1.7.9-r2 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> baselayout-1.7.9-r2.ebuild :
+  Added KEYWORDS.
+
+*baselayout-1.7.9-r1 (13 May 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> baselayout-1.7.9.ebuild :
+  Added KEYWORDS.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> baselayout-1.7.9-r1.ebuild :
+  Added KEYWORDS.
+
+  13 May 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Dont install /usr/sbin/run-crons anymore, as sys-apps/cronbase do it now.
+
+*baselayout-1.7.9 (12 May 2002)
+
+*baselayout-1.7.8-r1 (23 Apr 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> baselayout-1.7.8-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  23 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Remove /var/run/utmpx again.
+
+*baselayout-1.7.8 (22 Apr 2002)
+
+*baselayout-1.7.7 (5 Apr 2002)
+
+  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Move /etc/init.d/depscan.sh, /etc/init.d/runscript.sh and
+  /etc/init.d/functions.sh to /sbin to ensure that they are updated correctly.
+
+  Other minor bug fixes, check the Changelog.
+
+*baselayout-1.7.6 (24 Mar 2002)
+
+  24 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  As rc-scripts-1.3.1 was pretty much still in the works, "before" and "after"
+  order deps was pretty broken.  This release fix this along with a few other
+  minor bugfixes.
+
+  24 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  baselayout-1.7.4* used copies of depscan.sh and functions.sh in ${FILESDIR} to
+  fix problems, and this was forgotten to be taken out in 1.7.5*.
+
+*baselayout-1.7.5-r1 (23 Mar 2002)
+
+  23 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : Jim Nutt pointed out that
+  his /etc/inittab kept on getting overwritten after every new baselayout merge.
+  Investigated and found many illegal things being done in pkg_postinst(), which
+  are now hopefully fixed.
+
+*baselayout-1.7.5 (23 Mar 2002)
+
+  23 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : New release with several
+  rc-script bug fixes; see /usr/share/doc/baselayout-1.7.5/ChangeLog.gz for more
+  info (this new baselayout includes rc-scripts-1.3.1)
+  
+  21 March 2002; M.Schlemmer <azarah@gentoo.org> :
+
+  Update the pkg_postinst() stuff to use the build USE flag when doing stuff
+  that really should not be done during bootstrap.
+
+  Add support for the "bootstrap" USE flag.
+
+  20 March 2002; Daniel Robbins <drobbins@gentoo.org> : fixed pkg_postinst()
+  that was changing dirs to ${D}/dev instead of ${ROOT}/dev.  No rev bump.
+  
+  20 March 2002; Daniel Robbins <drobbins@gentoo.org> : tweaked ebuild to test
+  for devfs mount by looking for /dev/.devfsd, not by catting /proc/mounts.
+  Catting /proc/mounts can give inaccurate results if you're inside a chroot
+  and your "outside" root has devfs enabled (which is normally the case,
+  really, since the CD uses devfs).  This should fix a problem where device
+  nodes don't exist after bootstrap, which causes the sys-devel/perl build to
+  fail since it cats stuff to /dev/null. (causes obscure "missing seperator
+  in makefile, line 613" error).  No rev bump for this fix.
+
+*baselayout-1.7.4-r2 (11 March 2002)
+
+  11 March 2002; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.7.4-r2.ebuild, functions.sh : Fix functions.sh using
+  /usr/bin/basename for users that have /usr on seperate partition.
+
+*baselayout-1.7.4-r1 (11 March 2002)
+
+  11 March 2002; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.7.4-r1.ebuild, depscan.sh : Fix bash error if no service
+  "provide" a virtual service.
+
+*baselayout-1.7.4 (10 March 2002)
+
+  6 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.3-r3.ebuild :
+
+  Fix a bug where merging baselayout with 1.7.3-r1 already installed, would kill
+  X when it was started with /etc/init.d/xdm.
+
+  6 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.3-r2.ebuild :
+
+  Fixed the respawning "startDM.sh" process.  Fixed the fsck of / when rebooting
+  for the first time after baselayout merge.
+
+  5 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.3-r1.ebuild :
+
+  Update /etc/init.d/keymaps and /etc/init.d/consolefont to use the new
+  sys-apps/kbd package.  More xdm fixes and safeguards in /sbin/rc.
+
+  Added a "mkdir -p /etc/X11/" for if it do not exist.
+
+*baselayout-1.7.3 (4 March 2002)
+
+  4 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.3.ebuild :
+
+  Add updated xdm scripts to handle the "dead keys" bug. They should move to
+  the xfree package when tested fully.
+
+  Other minor ajustments.
+
+*baselayout-1.7.2 (3 March 2002)
+
+  3 March 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.2.ebuild :
+
+  Lots of updates and fixes, check /usr/share/doc/baselayout-1.7.2/ChangeLog
+  for details.
+
+*baselayout-1.7.1-r2 (25 Feb 2002)
+
+  25 Feb 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.7.1-r2.ebuild :
+
+  Change devices to be created in ${D}/dev and not ${D}/lib/dev-state, as they
+  are for use only when devfs is not used.
+
+*baselayout-1.7.1-r1 (20 Feb 2002)
+
+  20 Feb 2002; Daniel Robbins <drobbins@gentoo.org> baselayout-1.7.1-r1.ebuild:
+  moved MAKEDEV device node creation to pkg_postinst() so that device nodes don't
+  get recorded in CONTENTS.  Latest CVS Portage no longer records device nodes
+  in CONTENTS since there's generally no point or clean way to unmerge them.
+
+*baselayout-1.7.1 (6 Feb 2002)
+
+  6 Feb 2002; M.Schlemmer <azarah@gentoo.org> baselayout-1.7.1.ebuild :
+
+  Move rc-scripts.tar.bz2 to CVS.  Remove forcefull install of /etc/devfsd.conf.
 
 *baselayout-1.7.0-r1 (1 Feb 2002)
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 4b2739206fab..466707cdba72 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,18 +1,19 @@
-MD5 03ae2a51dad2d4612bc6a3c2723cc8e3 ChangeLog 13829
-MD5 ee6918e35ec1e9bd824601ba85e84640 baselayout-1.8.5.9.ebuild 15844
-MD5 41752745c674aec9b15d556f9a3a9d42 baselayout-1.8.6.5.ebuild 18884
-MD5 763ffc211f53779bfc1be64917ad3779 baselayout-1.8.6.4-r1.ebuild 19755
-MD5 14be0664579e530555279e74054f7b28 baselayout-1.8.5.5.ebuild 15534
-MD5 22cacb1440a77ed686fa6ff4ae9a1191 baselayout-1.8.5.8.ebuild 15844
-MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397
-MD5 e529ca65fcd240b6849689a01b95aa07 files/rc-scripts-1.4.3.4.tar.bz2 89599
+MD5 1a527bd84c664eb91c4c86e0541661e6 baselayout-1.12.0_pre9-r1.ebuild 19244
+MD5 1504d26e7455237817c4aad741fd5043 baselayout-1.11.13-r2.ebuild 18950
+MD5 c42f7e1a141c81201181d67a0fedafac baselayout-1.12.0_pre10.ebuild 19113
+MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 de833571c0a01edcaad4f88e3c63998a baselayout-1.12.0_pre10-r1.ebuild 19248
+MD5 f51ce492513c3ccfaf25109ef2447727 baselayout-1.11.13-r1.ebuild 18880
+MD5 082614b874e566427552f74c16b14616 ChangeLog 64217
+MD5 24fb2da934d48e3ba45749025f58d975 baselayout-1.12.0_pre9-r2.ebuild 19298
+MD5 eff8fe09709e228fdbd27bc679cd9375 files/digest-baselayout-1.12.0_pre10-r1 76
+MD5 a8758dae68c9d170d121029522c5b4bd files/baselayout-1.12.0_pre10-svn-1611.patch 11764
+MD5 24ab73edde880efe7f7716737a2ec56f files/digest-baselayout-1.12.0_pre9-r2 75
+MD5 167d03d77269b982eab8814a0e9ccd65 files/baselayout-1.12.0_pre9-npref.patch 404
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 a32a9e5e0459deedba5c8355ec21b463 files/rc-scripts-1.4.3.5.tar.bz2 89804
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.4-r1 64
-MD5 1854fffe49998cb27f6b093fb79d3b40 files/rc-scripts-1.4.2.8.tar.bz2 79003
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.5 64
-MD5 963a1c8eb93fbf75d215a832b039c65a files/rc-scripts-1.4.2.9.tar.bz2 78886
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.5 64
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.8 64
-MD5 8b7ccf68bb8ec10e865eedc9c1001ca8 files/rc-scripts-1.4.2.5.tar.bz2 76778
-MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.9 64
+MD5 e216c479c1b336a6e82b720c9b0d231d files/baselayout-1.12.0-split-out-udev.patch 7287
+MD5 eff8fe09709e228fdbd27bc679cd9375 files/digest-baselayout-1.12.0_pre10 76
+MD5 8d10a229861f862fca52cd8e3bc655d9 files/baselayout-1.11.0-split-out-udev.patch 7413
+MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13-r1 70
+MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13-r2 70
+MD5 24ab73edde880efe7f7716737a2ec56f files/digest-baselayout-1.12.0_pre9-r1 75
diff --git a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
index 79f7b72d55a0..2e236001f6bf 100644
--- a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.1 2005/08/23 23:53:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:54 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -115,12 +115,18 @@ EOF
 # aren't listed in CONTENTS, unfortunately.
 unkdir() {
 	einfo "Running unkdir to workaround bug 9849"
-	find ${D} -depth -type d -exec rmdir {} \; 2>/dev/null
+	find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null
 	if [[ $? == 127 ]]; then
 		ewarn "Problem running unkdir: find command not found"
 	fi
 }
 
+# Same as kdir above, but for symlinks #103618
+ksym() {
+	echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn '  unable to symlink $2 to $1' ; }" \
+		>> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
 src_install() {
 	local dir libdirs libdirs_env rcscripts_dir
 
@@ -226,14 +232,14 @@ src_install() {
 	# Ugly compatibility with stupid ebuilds and old profiles symlinks
 	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
 		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
 	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-	dosym share/man /usr/local/man
+	ksym /var/tmp /usr/tmp
+	ksym share/man /usr/local/man
 
 	#
 	# Setup files in /etc
@@ -407,7 +413,8 @@ pkg_postinst() {
 	einfo "Creating directories and .keep files."
 	einfo "Some of these might fail if they're read-only mounted"
 	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
+	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
+	source "${ROOT}"/usr/share/baselayout/mklinks.sh
 
 	# This could be done in src_install, which would have the benefit of
 	# (1) devices.tar.bz2 would show up in CONTENTS
diff --git a/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
index b66e3be61ad9..c27cf68f4ed7 100644
--- a/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13-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-apps/baselayout/baselayout-1.11.13-r2.ebuild,v 1.1 2005/11/08 11:03:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:53 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild
index 16db61248069..9d92c15f39ed 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild
@@ -1,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-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild,v 1.1 2005/11/10 16:11:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:50 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre10.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre10.ebuild
index ee92847ce683..63e8d87c8b30 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre10.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre10.ebuild
@@ -1,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-apps/baselayout/baselayout-1.12.0_pre10.ebuild,v 1.1 2005/11/08 16:50:18 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre10.ebuild,v 1.1.1.1 2005/11/30 09:56:51 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre9-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre9-r1.ebuild
index 81ca422e68b5..681dd0f526af 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre9-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre9-r1.ebuild
@@ -1,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-apps/baselayout/baselayout-1.12.0_pre9-r1.ebuild,v 1.1 2005/10/12 06:26:45 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre9-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:53 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre9-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre9-r2.ebuild
index 867e11e124c4..0f4d6d384e1f 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre9-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre9-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-apps/baselayout/baselayout-1.12.0_pre9-r2.ebuild,v 1.1 2005/11/08 11:03:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre9-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:53 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
index f093d416cbb1..e0481ab5e4d9 100644
--- a/sys-apps/baselayout/metadata.xml
+++ b/sys-apps/baselayout/metadata.xml
@@ -1,7 +1,13 @@
- * 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>
+<maintainer>
+  <email>azarah@gentoo.org</email>
+  <description>primary maintainer</description>
+</maintainer>
+<maintainer>
+  <email>agriffis@gentoo.org</email>
+  <description>backup maintainer</description>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/biosdisk/ChangeLog b/sys-apps/biosdisk/ChangeLog
index b6801e4a327b..e74ceb96f33a 100644
--- a/sys-apps/biosdisk/ChangeLog
+++ b/sys-apps/biosdisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/biosdisk
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdisk/ChangeLog,v 1.1 2004/08/22 04:22:23 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdisk/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+*biosdisk-0.65 (03 Jan 2005)
+
+  03 Jan 2005; Patrick Dawson <pkdawson@gentoo.org> biosdisk-0.50.ebuild,
+  +biosdisk-0.65.ebuild:
+  Version bump.
 
 *biosdisk-0.50 (22 Aug 2004)
 
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index 115dc4e45431..cb9b1f235053 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,2 +1,6 @@
-MD5 3b165c0cb22632bbe6c1e89e77221afa biosdisk-0.50.ebuild 622
+MD5 95cc1a4a9d4327f169ea84d5c01c1c27 biosdisk-0.65.ebuild 821
+MD5 78f4fa344a2d2180e9c312f07311a289 ChangeLog 564
+MD5 a25bc82f23ed36bc5fa881adfee6a295 metadata.xml 224
+MD5 be061ca016c439254363214a8959617f biosdisk-0.50.ebuild 742
 MD5 1a9f8e09103565280c74e359dff11d7b files/digest-biosdisk-0.50 65
+MD5 e133105ebe6031f5ac0702f17a6e69e5 files/digest-biosdisk-0.65 65
diff --git a/sys-apps/biosdisk/biosdisk-0.50.ebuild b/sys-apps/biosdisk/biosdisk-0.50.ebuild
index 6d6b56e0ba53..eb6567b6b237 100644
--- a/sys-apps/biosdisk/biosdisk-0.50.ebuild
+++ b/sys-apps/biosdisk/biosdisk-0.50.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/sys-apps/biosdisk/biosdisk-0.50.ebuild,v 1.1 2004/08/22 04:22:23 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdisk/biosdisk-0.50.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
 HOMEPAGE="http://linux.dell.com/projects.shtml#biosdisk"
-SRC_URI="http://linux.dell.com/biosdisk/${P}.tar.gz"
+SRC_URI="http://linux.dell.com/biosdisk/permalink/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/sys-apps/biosdisk/biosdisk-0.65.ebuild b/sys-apps/biosdisk/biosdisk-0.65.ebuild
index ad625d460fa7..ff96102950ae 100644
--- a/sys-apps/biosdisk/biosdisk-0.65.ebuild
+++ b/sys-apps/biosdisk/biosdisk-0.65.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdisk/biosdisk-0.65.ebuild,v 1.1 2005/01/04 00:07:03 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdisk/biosdisk-0.65.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
 HOMEPAGE="http://linux.dell.com/projects.shtml#biosdisk"
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RDEPEND="app-text/dos2unix
+RDEPEND="app-text/unix2dos
 	sys-boot/syslinux"
 
 src_install() {
diff --git a/sys-apps/blktool/ChangeLog b/sys-apps/blktool/ChangeLog
index dc0d4263973c..2362b0e689d6 100644
--- a/sys-apps/blktool/ChangeLog
+++ b/sys-apps/blktool/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/blktool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/blktool/ChangeLog,v 1.1 2005/05/22 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/blktool/ChangeLog,v 1.1.1.1 2005/11/30 09:56:31 chriswhite Exp $
 
 *blktool-4 (22 May 2005)
 
diff --git a/sys-apps/blktool/Manifest b/sys-apps/blktool/Manifest
index bf27b3a5f98d..f37d2fbb1cd3 100644
--- a/sys-apps/blktool/Manifest
+++ b/sys-apps/blktool/Manifest
@@ -1,2 +1,3 @@
-MD5 e6a3afb74e98106e18e96b151b622063 blktool-4.ebuild 417
+MD5 b68678fda612b65913c14e5c2e4682cc blktool-4.ebuild 557
+MD5 2c4a2ab8eb0596a933dee48936271882 ChangeLog 360
 MD5 9fb6069ce2635e204865a07f3cb71ed7 files/digest-blktool-4 60
diff --git a/sys-apps/blktool/blktool-4.ebuild b/sys-apps/blktool/blktool-4.ebuild
index 3c4f35083922..3050fc3de93c 100644
--- a/sys-apps/blktool/blktool-4.ebuild
+++ b/sys-apps/blktool/blktool-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-apps/blktool/blktool-4.ebuild,v 1.1 2005/05/22 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/blktool/blktool-4.ebuild,v 1.1.1.1 2005/11/30 09:56:31 chriswhite Exp $
 
 DESCRIPTION="query and/or change settings of a block device"
 HOMEPAGE="http://sourceforge.net/projects/gkernel/"
diff --git a/sys-apps/bootstrap_cmds/ChangeLog b/sys-apps/bootstrap_cmds/ChangeLog
index cc1fd12ea735..a3eaa1ec3add 100644
--- a/sys-apps/bootstrap_cmds/ChangeLog
+++ b/sys-apps/bootstrap_cmds/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/bootstrap_cmds
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bootstrap_cmds/ChangeLog,v 1.1 2004/09/26 23:02:35 kito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bootstrap_cmds/ChangeLog,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
+
+*bootstrap_cmds-49 (19 May 2005)
+
+  19 May 2005; Kito <kito@gentoo.org> +bootstrap_cmds-49.ebuild:
+  version bump.
+
+  03 Mar 2005; Kito <kito@gentoo.org> bootstrap_cmds-44.ebuild:
+  stable on ppc-macos
 
 *bootstrap_cmds-44 (25 Sep 2004)
 
diff --git a/sys-apps/bootstrap_cmds/Manifest b/sys-apps/bootstrap_cmds/Manifest
index d94bfba51e98..7f55bbdca701 100644
--- a/sys-apps/bootstrap_cmds/Manifest
+++ b/sys-apps/bootstrap_cmds/Manifest
@@ -1,2 +1,6 @@
-MD5 ffc75f6297cb2414518633c3ff0d9b7d bootstrap_cmds-44.ebuild 1466
+MD5 d7f5ea9600d585e2292b4e0298211ebc ChangeLog 534
+MD5 ad894d5f7ff413600825aa95700547d9 bootstrap_cmds-44.ebuild 1372
+MD5 4b31943e1fecfdf69fd2f2368f32a9d5 bootstrap_cmds-49.ebuild 1362
+MD5 e526e84277cb8eb1bcf73840117ff45a metadata.xml 220
 MD5 476b98a9a8f0ba1fccda9ccdd2a58edc files/digest-bootstrap_cmds-44 69
+MD5 dae9b9721da57d030dc729cd574dc0cd files/digest-bootstrap_cmds-49 69
diff --git a/sys-apps/bootstrap_cmds/bootstrap_cmds-44.ebuild b/sys-apps/bootstrap_cmds/bootstrap_cmds-44.ebuild
index a237ebadf350..648af88d95fc 100644
--- a/sys-apps/bootstrap_cmds/bootstrap_cmds-44.ebuild
+++ b/sys-apps/bootstrap_cmds/bootstrap_cmds-44.ebuild
@@ -1,60 +1,48 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bootstrap_cmds/bootstrap_cmds-44.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
-DESCRIPTION="Darwin bootstrap_cmds - config, decomment, mig, relpath,"
-WEBPAGE="http://darwinsource.opendarwin.org/10.3.5/"
+DESCRIPTION="Darwin bootstrap_cmds - config, decomment, mig, relpath"
+HOMEPAGE="http://darwinsource.opendarwin.org/10.3.5/"
 SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/${P}.tar.gz"
 
 LICENSE="APSL-2"
 
 SLOT="0"
-KEYWORDS="~ppc-macos"
-IUSE=""
-
+KEYWORDS="ppc-macos"
+IUSE="build"
 DEPEND="virtual/libc"
 
-##
-# Setup the Darwin build environment
-#=================================================================
-# requires fat build tools
-# use build && BUILDARCHS="ppc i386" || 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	sed -i -e 's:^NEXTSTEP_BUILD_OUTPUT_DIR = .*:NEXTSTEP_BUILD_OUTPUT_DIR = ${T}:' Makefile
 
-BUILDARCHS="ppc"
+	cd ${S}/config.tproj
+	sed -i -e '/raise/d' config.h
 
-mkdir -p ${WORKDIR}/build/obj ${WORKDIR}/build/sym ${S}/BUILD
+	cd ${S}/decomment.tproj
+	sed -i \
+		-e 's:^NEXTSTEP_INSTALLDIR = .*:NEXTSTEP_INSTALLDIR = /usr/bin:' \
+		-e 's:^NEXTSTEP_BUILD_OUTPUT_DIR = .*:NEXTSTEP_BUILD_OUTPUT_DIR = ${T}:' Makefile
 
-export RC_OS=macos
-export RC_ARCHS=${BUILDARCHS}
-export TARGETS=${BUILDARCHS}
-export SRCROOT=${S}
-export OBJROOT=${WORKDIR}/build/obj
-export DSTROOT=${D}
-export SYMROOT=${WORKDIR}/build/sym
-export RC_CFLAGS="${CFLAGS}"
+	cd ${S}/relpath.tproj
+	sed -i \
+		-e 's:^NEXTSTEP_INSTALLDIR = .*:NEXTSTEP_INSTALLDIR = /usr/bin:' \
+		-e 's:^NEXTSTEP_BUILD_OUTPUT_DIR = .*:NEXTSTEP_BUILD_OUTPUT_DIR = ${T}:' Makefile
+
+	rm ${S}/Makefile.postamble ${S}/config.tproj/Makefile.postamble \
+	${S}/decomment.tproj/Makefile.postamble ${S}/relpath.tproj/Makefile.postamble
+}
 
 src_compile() {
-	emake || die "make failed :("
+	:
 }
 
 src_install() {
-	cd ${S}
-	rm ${S}/Makefile.postamble
-	rm ${S}/config.tproj/Makefile.postamble
-	rm ${S}/decomment.tproj/Makefile.postamble
-	rm ${S}/relpath.tproj/Makefile.postamble
-
-	make install DSTROOT=${S}/BUILD
-
-	dobin ${S}/BUILD/usr/bin/config
-	newbin ${S}/migcom.tproj/mig.sh mig
-	newbin ${S}/vers_string.sh vers_string
-	dobin ${S}/BUILD/usr/local/bin/decomment
-	dobin ${S}/BUILD/usr/local/bin/relpath
+	make install DSTROOT=${D} || die "make install failed"
 
-	exeinto /usr/libexec
-	doexe ${S}/BUILD/usr/libexec/migcom
-
-	cd ${S}
-	doman ${S}/vers_string.1
+	newbin vers_string.sh vers_string
+	use build || doman *.1
 }
\ No newline at end of file
diff --git a/sys-apps/bootstrap_cmds/bootstrap_cmds-49.ebuild b/sys-apps/bootstrap_cmds/bootstrap_cmds-49.ebuild
index eb33f7c4a5dd..32ba5b5bff2d 100644
--- a/sys-apps/bootstrap_cmds/bootstrap_cmds-49.ebuild
+++ b/sys-apps/bootstrap_cmds/bootstrap_cmds-49.ebuild
@@ -1,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-apps/bootstrap_cmds/bootstrap_cmds-49.ebuild,v 1.1 2005/05/19 20:10:20 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bootstrap_cmds/bootstrap_cmds-49.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 DESCRIPTION="Darwin bootstrap_cmds - config, decomment, mig, relpath"
 HOMEPAGE="http://darwinsource.opendarwin.org/10.3.5/"
diff --git a/sys-apps/bootstrap_cmds/metadata.xml b/sys-apps/bootstrap_cmds/metadata.xml
index f3c4173ce6dc..a65e8c2fdf72 100644
--- a/sys-apps/bootstrap_cmds/metadata.xml
+++ b/sys-apps/bootstrap_cmds/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-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index fc8ea7985e26..ebf47437d91c 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,9 +1,347 @@
 # ChangeLog for sys-apps/busybox
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.1.1.1 2005/11/30 09:56:12 chriswhite Exp $
+
+*busybox-1.01 (18 Aug 2005)
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> +busybox-1.01.ebuild:
+  Version bump.
+
+*busybox-1.1_pre20050802 (03 Aug 2005)
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +busybox-1.1_pre20050802.ebuild:
+  Add snapshot for #99849.
+
+  11 Jun 2005; <solar@gentoo.org> busybox-1.00-r4.ebuild:
+  - ifup/ifdown need run-parts. #95190
+
+  04 Jun 2005; Mike Frysinger <vapier@gentoo.org> busybox-1.00-r4.ebuild:
+  Dont abort if user has a known broken glibc wrt to static compilation #94879.
+
+  03 Jun 2005; <solar@gentoo.org> busybox-1.00-r4.ebuild:
+  - remove redirection of stderr to null when static linking. This will make the
+  ebuild a little noisy, but we have faith you will get over it
+
+  29 May 2005; <solar@gentoo.org> busybox-1.00-r1.ebuild,
+  busybox-1.00-r2.ebuild, busybox-1.00-r3.ebuild, busybox-1.00-r4.ebuild:
+  echangelog - update package to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+  18 May 2005; <solar@gentoo.org> busybox-1.00-r4.ebuild:
+  - reenable a few useful default applets
+
+*busybox-1.00-r4 (17 May 2005)
+
+  17 May 2005; Mike Frysinger <vapier@gentoo.org> +files/1.00/nice.patch,
+  +files/1.00/printenv.patch, files/busybox-1.00-pre3.config,
+  +files/1.00/standalone.patch, +files/1.00/sum.patch, +busybox-1.00-r4.ebuild:
+  Add more applets and prepare to replace sash.
+
+  12 May 2005; Fernando J. Pereda <ferdy@gentoo.org> busybox-1.00-r1.ebuild:
+  alpha stable wrt #73241
+
+  07 May 2005; <solar@gentoo.org> busybox-1.00-r3.ebuild:
+  - have savedconfig look in ROOT first then fallback to / if nothing is found
+
+*busybox-1.00-r3 (01 May 2005)
+
+  01 May 2005; <solar@gentoo.org> +busybox-1.00-r3.ebuild:
+  - prep ebuild so bb may be used as our static rescue shell. we now install
+  busybox and busybox.static when USE=static is not set.
+
+*busybox-1.00-r2 (16 Apr 2005)
+
+  16 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.00/bash-tests.patch, files/1.00/more-insmod-arches.patch,
+  +files/1.00/cp-posix-opts.patch, +busybox-1.00-r2.ebuild:
+  Add fixes from upstream to support more bash code and more cp options #88841.
+
+  08 Apr 2005; <solar@gentoo.org> busybox-1.00-r1.ebuild:
+  - added ~ppc64 keyword. bug 73241
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> busybox-1.00.ebuild:
+  stable on amd64 wrt #73241
+
+  15 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> busybox-1.00-r1.ebuild:
+  Stable on sparc
+
+  10 Feb 2005; <solar@gentoo.org> metadata.xml, -files/Config.h,
+  -files/Config.h-0.60.2-cd, -files/Config.h-0.60.3-cd,
+  -files/Config.h-0.60.5-cd, -files/busybox-0.60.5-dietlibc.diff,
+  -files/msh.diff, -busybox-0.60.3-r1.ebuild, -busybox-0.60.3-r2.ebuild,
+  busybox-1.00-r1.ebuild, -busybox-1.00_rc3.ebuild:
+  - cleanup busybox dir and updated metadata
+
+  24 Jan 2005; Brian Jackson <iggy@gentoo.org> busybox-1.00.ebuild,
+  busybox-1.00_rc3.ebuild:
+  few more uclibc move changes
+
+  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> busybox-1.00-r1.ebuild:
+  Yes we *NEED* the symlinks for netboot.
+
+  02 Jan 2005; Guy Martin <gmsoft@gentoo.org> busybox-1.00-r1.ebuild:
+  Added dodir before dosym for creating correctly the link /sbin/init when
+  USE=netboot.
+
+  01 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.00/more-insmod-arches.patch, busybox-1.00-r1.ebuild:
+  Add patch from upstream to support alpha/hppa.
+
+  31 Dec 2004; Guy Martin <gmsoft@gentoo.org> busybox-1.00-r1.ebuild:
+  Added needed symlink of /sbin/init for busybox when USE=netboot.
+
+*busybox-1.00-r1 (11 Dec 2004)
+
+  11 Dec 2004; <solar@gentoo.org> +files/1.00/busybox-read-timeout.patch,
+  +files/1.00/readlink-follow.patch, +busybox-1.00-r1.ebuild:
+  - CONFIG_FEATURE_READLINK_FOLLOW readlink -f patch from Colin Watson
+  <cjwatson@debian.org> on busybox mailing list 08/11/04. - Added ash -t timeout
+  patch from plasmaroo.
+
+  08 Dec 2004; Daniel Black <dragonheart@gentoo.org> busybox-1.00.ebuild:
+  ppc stable as per bug 73241
+
+  02 Dec 2004; <solar@gentoo.org> busybox-1.00.ebuild:
+  Stable on x86
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> busybox-1.00.ebuild:
+  Stable on sparc
+
+  16 Oct 2004; <solar@gentoo.org> busybox-1.00.ebuild,
+  busybox-1.00_rc3.ebuild:
+  removed erroneous RDEPEND on sed4
+
+  13 Oct 2004; Sven Wegener <swegener@gentoo.org> :
+  Removed stray digest.
+
+*busybox-1.00 (13 Oct 2004)
+
+  13 Oct 2004; <solar@gentoo.org> -files/busybox-1.00_pre8-amd64.patch,
+  -busybox-0.60.5-r1.ebuild, -busybox-0.60.5-r2.ebuild, +busybox-1.00.ebuild,
+  -busybox-1.00_pre8.ebuild, busybox-1.00_rc3.ebuild:
+  The highly anticipated release of BusyBox 1.00 has arrived after 3 years in
+  development. (arches please test and mark stable so we can clean out files/*)
+
+  28 Sep 2004; Guy Martin <gmsoft@gentoo.org> busybox-1.00_rc3.ebuild:
+  Removed build of insmod for hppa. Marked stable on hppa.
+
+  20 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/busybox-1.00_rc3-amd64.patch:
+  Added missing amd64 patch.
+
+  16 Sep 2004; <solar@gentoo.org> busybox-1.00_rc3.ebuild:
+  marked busybox-1.00-rc3 stable for x86, other arches please follow so it can
+  be used for the next release cycle
+
+  11 Sep 2004; Daniel Black <dragonheart@gentoo.org> busybox-1.00_pre8.ebuild,
+  busybox-1.00_rc3.ebuild:
+  Fixed saveconfig and make-busybox-symlinks as per bugs #60982 and #60805.
+  Thanks to Edward Flick <eddy@cdf-imaging.com> and Dirk Heinrichs
+  <ext-dirk.heinrichs@nokia.com>
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  busybox-1.00_pre8.ebuild, busybox-1.00_rc3.ebuild:
+  Masked busybox-1.00_rc3.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  busybox-1.00_pre8.ebuild:
+  Masked busybox-1.00_pre8.ebuild stable for ppc
+
+  24 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> busybox-1.00_rc3.ebuild:
+  Keyworded ~sparc
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> busybox-1.00_rc3.ebuild:
+  Sync IUSE (uclibc missing)
+
+  17 Aug 2004; <solar@gentoo.org> busybox-1.00_pre8.ebuild:
+  marked 1.00_pre8 stable
+
+*busybox-1.00_rc3 (17 Aug 2004)
+
+  17 Aug 2004; <solar@gentoo.org> -busybox-1.0.0_pre20040721.ebuild,
+  -busybox-1.0.0_pre20040726.ebuild, +busybox-1.00_rc3.ebuild:
+  version bump to rc3
+
+*busybox-1.0.0_pre20040726 (26 Jul 2004)
+
+  26 Jul 2004; <solar@gentoo.org> busybox-1.0.0_pre20040726.ebuild:
+  updated snapshot and forceable enable ash = sh. This fixes a problem in native
+  uclibc environments with busybox and system(), popen() etc not working. (posix
+  demands that a /bin/sh exist)
+
+*busybox-1.0.0_pre20040721 (21 Jul 2004)
+
+  21 Jul 2004; <solar@gentoo.org> busybox-1.0.0_pre20040721.ebuild,
+  busybox-1.0_pre20040720.ebuild:
+  bump again to avoid fcntl/readadhead problems on native glibc hosts
+
+*busybox-1.0_pre20040720 (20 Jul 2004)
+
+  20 Jul 2004; <solar@gentoo.org> busybox-1.0_pre20040720.ebuild:
+  busybox-1.0-rc1 coming soon, using this snapshot to help test readiness.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> busybox-0.60.3-r1.ebuild,
+  busybox-0.60.3-r2.ebuild, busybox-1.00_pre8.ebuild:
+  sync IUSE (+static), add sed-4 dep
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> busybox-0.60.5-r1.ebuild,
+  busybox-0.60.5-r2.ebuild:
+  QA - fix use invocation
+
+  23 Jun 2004; <solar@gentoo.org> busybox-1.00_pre8.ebuild:
+  Added ~mips to the KEYWORDS after a successful compile
+
+  11 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/busybox-1.00_pre8-amd64.patch, busybox-0.60.3-r1.ebuild,
+  busybox-0.60.3-r2.ebuild, busybox-0.60.5-r1.ebuild,
+  busybox-0.60.5-r2.ebuild, busybox-1.00_pre8.ebuild:
+  Marked all versions -amd64, except -1.00_pre8. Added patch to make the latter
+  work on amd64.
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> busybox-0.50.ebuild,
+  busybox-0.60.2.ebuild, busybox-0.60.3.ebuild, busybox-0.60.5.ebuild,
+  busybox-1.00_pre5.ebuild, busybox-1.00_pre7.ebuild:
+  prune extra ebuilds
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> busybox-0.60.3-r2.ebuild,
+  busybox-0.60.5-r2.ebuild:
+  Add inherit eutils
+
+  17 Mar 2004; Daniel Black <dragonheart@gentoo.org> busybox-0.60.5-r2.ebuild:
+  added devfs use flag thanks to David Bryson <mutex@cryptobackpack.org> in bug
+  #43404
+
+*busybox-1.00_pre8 (02 Mar 2004)
+
+  05 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add local USE flag make-busybox-symlinks to help out embedded building.
+  This will create all the appropriate symlinks in /sbin and /bin #43406.
+
+  02 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix #43450 by Aaron Peterson.
+
+  14 Feb 2004; Luca Barbato <lu_zero@gentoo.org> busybox-1.00_pre7.ebuild:
+  Marked ~ppc
+
+*busybox-0.60.3-r2 (14 Feb 2004)
+
+  14 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  busybox-0.60.3-r2.ebuild, files/busybox-cmdedit-sparc.diff:
+  new 0.60.3-r2, bumped for sparc only, fixes cmdedit lag
+
+*busybox-1.00_pre7 (06 Feb 2004)
+
+  06 Feb 2004; Daniel Black <dragonheart@gentoo.org> busybox-1.00_pre6.ebuild,
+  busybox-1.00_pre7.ebuild:
+  busybox-1.00_pre6 removed - buggy release. Version bumped to 1.00_pre7. Fixed
+  savedconfig too.
+
+*busybox-1.00_pre6 (03 Feb 2004)
+
+  03 Feb 2004; <solar@gentoo.org> busybox-0.50.ebuild, busybox-0.60.2.ebuild,
+  busybox-0.60.3-r1.ebuild, busybox-0.60.3.ebuild, busybox-0.60.5-r1.ebuild,
+  busybox-0.60.5-r2.ebuild, busybox-0.60.5.ebuild, busybox-1.00_pre5.ebuild,
+  busybox-1.00_pre6.ebuild:
+  ~arch version bump, adds new procps sysctl option to busybox. misc bugfixes.
+  new local useflag called savedconfig for user defined configs.
+
+*busybox-1.00_pre5 (24 Dec 2003)
+
+  24 Dec 2003; <solar@gentoo.org> busybox-1.00_pre3.ebuild,
+  busybox-1.00_pre4.ebuild, busybox-1.00_pre5.ebuild:
+  The most obvious thing in this release is a fix for a terribly stupid bug in
+  mount that prevented it from working properly unless you specified the
+  filesystem type. This release also fixes a few compile problems, updates
+  udhcp, fixes a silly bug in fdisk, fixes ifup/ifdown to behave like the Debian
+  version, updates devfsd, updates the 2.6.x modutils support, add a new 'rx'
+  applet, removes the obsolete 'loadacm' applet, fixes a few tar bugs, fixes a
+  sed bug, and a few other odd fixes.
+
+*busybox-1.00_pre4 (18 Dec 2003)
+
+  18 Dec 2003; <solar@gentoo.org> busybox-1.00_pre4.ebuild:
+  version bump of the _pre series.. This release includes major rework to sed,
+  lots of rework on tar, a new tiny implementation of bunzip2, a new devfsd
+  applet, support for 2.6.x kernel modules, updates to the ash shell, sha1sum
+  and md5sum have been merged into a common applet, the dpkg applets has been
+  cleaned up.
+
+*busybox-1.00_pre3 (06 Nov 2003)
+
+  06 Nov 2003; <solar@gentoo.org> busybox-1.00_pre3.ebuild,
+  files/busybox-1.00-pre3.config:
+  version bump for ~arch, please do not mark any of the _pre ebuild as stable
+
+*busybox-0.60.5-r2 (27 Aug 2003)
+
+  27 Aug 2003; <solar@gentoo.org> busybox-0.60.5-r2.ebuild,
+  files/busybox-0.60.5-dietlibc.diff:
+  Added support for building busybox with dietlibc. size=306K on i386
+
+  24 Jul 2003; Will Woods <wwoods@gentoo.org> busybox-0.60.5-r1.ebuild, 
+  busybox-0.60.5.ebuild:
+  rmmod/insmod/modprobe don't compile for alpha, so 0.60.5 is marked -alpha
+
+  24 Jul 2003; Will Woods <wwoods@gentoo.org> busybox-0.60.3-r1.ebuild:
+  added ~alpha to KEYWORDS
+
+*busybox-0.60.3-r1 (03 Apr 2003)
+
+  03 Apr 2003; Martin Holzer <mholzer@gentoo.org> busybox-0.60.3-r1.ebuild:
+  Added busybox.links into scripts dir. Closes #18678.
+
+*busybox-0.60.5-r1 (13 Jan 2003)
+
+  15 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Change local env var to a local use flag.
+
+  13 Jan 2003; Nick Hadaway <raker@gentoo.org> busybox-0.60.5-r1.ebuild :
+  Added some logic for detection of uclibc which needs to be tested.
+  Please comment on bug #13517.  2 hours later: New local environment
+  variable $LINK_LIBC.  Set to "uclibc" to link against uclibc instead
+  of glibc.
+
+*busybox-0.60.5 (20 Dec 2002)
+
+   20 Dec 2002; Jon Portnoy <avenj@gentoo.org> busybox-0.60.5.ebuild :
+   Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*busybox-0.50 (14 July 2002)
+
+  03 Apr 2003; Martin Holzer <mholzer@gentoo.org> busybox-0.50.ebuild,
+  busybox-0.60.2.ebuild, busybox-0.60.3.ebuild:
+  Updated Homepage. Closes #15784.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> busybox-0.50.ebuild :
+  Added KEYWORDS, SLOT.
+
+*busybox-0.60.3 (21 May 2002)
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> busybox-0.60.3.ebuild :
+  Added KEYWORDS, SLOT.
+
+  21 May 2002; Wout Mertens <wmertens@gentoo.org> busybox-0.60.3.ebuild
+  files/dodeps files/Config.h-0.60.3-cd:
+
+  Upped to new stable version. Played with settings to get smallish build
+  that provides as much as possible. See the files/dodeps script.
 
 *busybox-0.60.2 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> busybox-0.60.2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  24 Feb 2002; Donny Davies <woodchip@gentoo.org> files/Config.h-0.60.2-cd :
+
+  Comment out #define BB_MT since we're including the 'real' mt-st on the
+  boot CD now.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index e69de29bb2d1..c835010dfbd6 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -0,0 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7544fceeb5eaefc424889d4651850237 busybox-1.1_pre20050802.ebuild 6334
+MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
+MD5 fe2861ddcc79aa407758c05886aee1e0 busybox-1.00-r4.ebuild 7084
+MD5 1dad6f571e1a8d34c2aa521ce6b3f50c busybox-1.01.ebuild 6924
+MD5 67d9008dfb895deda9cc7b5d1fc27a26 ChangeLog 13662
+MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142
+MD5 4bd102f0f2dae4271f441ca0d53c33c9 files/digest-busybox-1.01 141
+MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
+MD5 c6ef5df865f1dd6a2f4d1200184a366b files/digest-busybox-1.1_pre20050802 70
+MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964
+MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007
+MD5 c5891798e8da55d3441b5361b62ee377 files/1.00/fix-amd64-insmod.patch 427
+MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245
+MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723
+MD5 8a3287074aab50454f7785651ddea71c files/1.00/gcc4.patch 632
+MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795
+MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
+MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571
+MD5 42df6649bab3689e562877edf2694f04 files/1.00/more-insmod-arches.patch 1079
+MD5 0e50cd0ad938a8c15f1af8b59028c959 files/1.00/printenv.patch 3365
+MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJ2n5gIKl8Uu19MoRAuPKAJwKyyre5xSIBbXDe/OmpQ2shJPThwCggJrp
+ACSIg7nKRD36jJW2WLG4inI=
+=k/Ji
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.00-r4.ebuild b/sys-apps/busybox/busybox-1.00-r4.ebuild
index 60b762407b4d..5a2769278955 100644
--- a/sys-apps/busybox/busybox-1.00-r4.ebuild
+++ b/sys-apps/busybox/busybox-1.00-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/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.1 2005/05/17 01:02:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.1.1.1 2005/11/30 09:56:12 chriswhite Exp $
 
 inherit eutils
 
@@ -20,8 +20,8 @@ SRC_URI="${SRC_URI} mirror://gentoo/${P}-e2fsprogs.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug uclibc static savedconfig netboot floppyboot make-symlinks"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="debug static savedconfig netboot floppyboot make-symlinks"
 
 DEPEND=""
 
@@ -30,35 +30,46 @@ S=${WORKDIR}/${MY_P}
 # <pebenito> then eventually turning on selinux would mean
 # adding a dep: selinux? ( sys-libs/libselinux )
 
+busybox_set_env() {
+	type -p ${CHOST}-ar && export CROSS=${CHOST}-
+	# Don't let KBUILD_OUTPUT mess us up #88088
+	unset KBUILD_OUTPUT
+}
+
 busybox_config_option() {
-	[[ -z $2 ]] && return 1
 	case $1 in
 		y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
 		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		*) return 1;;
+		Y) echo "CONFIG_$2=y" >> .config;;
+		N) echo "CONFIG_$2=n" >> .config;;
+		*) use $1 \
+		       && busybox_config_option y $2 \
+		       || busybox_config_option n $2
+		   return 0
+		   ;;
 	esac
 	einfo $(grep "CONFIG_$2[= ]" .config)
 }
 
 src_unpack() {
+	busybox_set_env
 	unpack ${A}
 	cd "${S}"
-cp -r "${S}"{,.orig}
 
 	# patches for 1.00 go here.
 	epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
 	epatch "${FILESDIR}"/1.00/readlink-follow.patch
 	epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
+	epatch "${FILESDIR}"/1.00/fix-amd64-insmod.patch
 	epatch "${FILESDIR}"/1.00/bash-tests.patch
 	epatch "${FILESDIR}"/1.00/cp-posix-opts.patch
 	epatch "${FILESDIR}"/1.00/standalone.patch
 	epatch "${FILESDIR}"/1.00/nice.patch
 	epatch "${FILESDIR}"/1.00/printenv.patch
 	epatch "${FILESDIR}"/1.00/sum.patch
+	epatch "${FILESDIR}"/1.00/bb.patch
 	epatch "${WORKDIR}"/${P}-e2fsprogs.patch
-
-	# Don't let KBUILD_OUTPUT mess us up #88088
-	unset KBUILD_OUTPUT
+	epatch "${FILESDIR}"/1.00/gcc4.patch
 
 	#bunzip
 	#ftp://ftp.simtreas.ru/pub/my/bb/new/find.c.gz
@@ -86,80 +97,84 @@ cp -r "${S}"{,.orig}
 		fi
 	fi
 	if use netboot ; then
-		cp ${FILESDIR}/config-netboot .config
+		cp "${FILESDIR}"/config-netboot .config
 		sed -i \
 			-e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
 			networking/udhcp/libbb_udhcp.h \
 			|| die "fixing netboot/udhcpc"
 	elif use floppyboot ; then
-		cp ${FILESDIR}/config-floppyboot .config
+		cp "${FILESDIR}"/config-floppyboot .config
 	fi
 
-	# busybox has changed quite a bit from 0.[5-6]* to 1.x so this
-	# config might not be cd ready.
-
+	# setup the config file
 	make allyesconfig > /dev/null
 	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID
+	busybox_config_option n FEATURE_SUID_CONFIG
 
 	# If these are not set and we are using a uclibc/busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y FEATURE_SH_IS_ASH
 	busybox_config_option n FEATURE_SH_IS_NONE
 
-	use static \
-		&& busybox_config_option y STATIC \
-		|| busybox_config_option n STATIC
-
-	# 1.00-pre2 uses the old selinux api which is no longer
-	# maintained. perhaps the next stable release will include
-	# support. 
-	# 1.00-pre5  pebenito says busybox is still using the old se api.
-	#use selinux \
-	#	&& busybox_config_option y SELINUX \
-	#	|| 
+	busybox_config_option static STATIC
+	busybox_config_option debug DEBUG
+	use debug \
+		&& busybox_config_option Y NO_DEBUG_LIB \
+		&& busybox_config_option N DMALLOC \
+		&& busybox_config_option N EFENCE
+
+	# 1.00-pre5 uses the old selinux api which is no longer maintained
+	#busybox_config_option selinux SELINUX
 	busybox_config_option n SELINUX
 
-	use debug \
-		&& busybox_config_option y DEBUG \
-		|| busybox_config_option n DEBUG
-
-	#busybox_features=`grep CONFIG_ .config | tr '#' '\n' | 
-	#	awk  '{print $1}' | cut -d = -f 1 | grep -v ^$ | cut -c 8- | 
-	#		tr [A-Z] [a-z] | awk '{print "busybox_"$1}'`
-	#for f in $busybox_features; do
-	#	has $f ${FEATURES} && busybox_config_option y `echo ${f/busybox_/}|tr [a-z] [A-Z]`
-	#done
-	( echo | make clean oldconfig > /dev/null ) || :
-}
+	# default a bunch of uncommon options to off
+	for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
+		LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
+		UUDECODE UUENCODE SULOGIN DC
+	do
+		busybox_config_option n ${opt}
+	done
 
-busybox_set_cross_compiler() {
-	type -p ${CHOST}-ar && export CROSS=${CHOST}-
+	make oldconfig > /dev/null
 }
 
 src_compile() {
-	busybox_set_cross_compiler
-	#emake -j1 CROSS="${CROSS}" include/config.h busybox || die
-	emake -j1 CROSS="${CROSS}" busybox || die
-	if ! use static; then
-		cp busybox{,.dyn}
-		rm busybox
-		emake -j1 LDFLAGS="${LDFLAGS} -static" CROSS="${CROSS}" busybox 2>/dev/null || die
-		cp busybox{,.static}
-		cp busybox{.dyn,}
+	busybox_set_env
+	emake -j1 CROSS="${CROSS}" depend || die "depend failed"
+	emake CROSS="${CROSS}" busybox || die "build failed"
+	if ! use static ; then
+		mv busybox{,.bak}
+		local failed=0
+		emake -j1 \
+			LDFLAGS="${LDFLAGS} -static" \
+			CROSS="${CROSS}" \
+			busybox || failed=1
+		if [[ ${failed} == 1 ]] ; then
+			if has_version '<sys-libs/glibc-2.3.5' ; then
+				eerror "Your glibc has broken static support, ignorning static build failure."
+				eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879"
+				cp busybox.bak bb
+			else
+				die "static build failed"
+			fi
+		else
+			mv busybox bb
+		fi
+		mv busybox{.bak,}
 	fi
 }
 
 src_install() {
-	busybox_set_cross_compiler
+	busybox_set_env
 
 	into /
 	dobin busybox
-	use static || dobin busybox.static
+	use static \
+		&& dosym busybox /bin/bb \
+		|| dobin bb
 
 	if use make-symlinks ; then
-		if [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ;
-		then
+		if [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
 			ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
 			ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
 			ewarn "If you are creating a binary only and not merging this is probably ok."
@@ -168,10 +183,10 @@ src_install() {
 		fi
 		make CROSS="${CROSS}" install || die
 		dodir /bin
-		cp -a _install/bin/* ${D}/bin/
+		cp -pPR _install/bin/* "${D}"/bin/
 		dodir /sbin
-		cp -a _install/sbin/* ${D}/sbin/
-		cd ${D}
+		cp -pPR _install/sbin/* "${D}"/sbin/
+		cd "${D}"
 		local symlink
 		for symlink in {bin,sbin}/* ; do
 			[[ -L ${symlink} ]] || continue
@@ -204,7 +219,7 @@ src_install() {
 
 	cd ../../ || die
 	if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
-		cd ${S}
+		cd "${S}"
 		# this should install to the ./_install/ dir by default.
 		# we make a micro pkg of busybox that can be used for
 		# embedded systems -solar
@@ -220,7 +235,7 @@ src_install() {
 		einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
 		einfo "Read this ebuild for more info on how to take advantage of this option"
 		insinto /etc/${PN}/${CHOST}/
-		newins ${S}/.config ${PN}-${PV}-${PR}.config
+		newins "${S}"/.config ${PN}-${PV}-${PR}.config
 	fi
 }
 
diff --git a/sys-apps/busybox/busybox-1.01.ebuild b/sys-apps/busybox/busybox-1.01.ebuild
index 53f8cef04973..56661bb78ba7 100644
--- a/sys-apps/busybox/busybox-1.01.ebuild
+++ b/sys-apps/busybox/busybox-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/sys-apps/busybox/busybox-1.01.ebuild,v 1.1 2005/08/18 00:54:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.01.ebuild,v 1.1.1.1 2005/11/30 09:56:12 chriswhite Exp $
 
 inherit eutils
 
@@ -59,6 +59,7 @@ src_unpack() {
 	# patches for 1.00 go here.
 	epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
 	epatch "${FILESDIR}"/1.00/readlink-follow.patch
+	epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
 	epatch "${FILESDIR}"/1.00/bash-tests.patch
 	epatch "${FILESDIR}"/1.00/standalone.patch
 	epatch "${FILESDIR}"/1.00/nice.patch
@@ -176,9 +177,9 @@ src_install() {
 		fi
 		make CROSS="${CROSS}" install || die
 		dodir /bin
-		cp -a _install/bin/* "${D}"/bin/
+		cp -pPR _install/bin/* "${D}"/bin/
 		dodir /sbin
-		cp -a _install/sbin/* "${D}"/sbin/
+		cp -pPR _install/sbin/* "${D}"/sbin/
 		cd "${D}"
 		local symlink
 		for symlink in {bin,sbin}/* ; do
diff --git a/sys-apps/busybox/busybox-1.1_pre20050802.ebuild b/sys-apps/busybox/busybox-1.1_pre20050802.ebuild
index e87253e7986d..41e18511e8f2 100644
--- a/sys-apps/busybox/busybox-1.1_pre20050802.ebuild
+++ b/sys-apps/busybox/busybox-1.1_pre20050802.ebuild
@@ -1,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-apps/busybox/busybox-1.1_pre20050802.ebuild,v 1.1 2005/08/03 01:31:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1_pre20050802.ebuild,v 1.1.1.1 2005/11/30 09:56:11 chriswhite Exp $
 
 inherit eutils
 
@@ -54,6 +54,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/1.00/bb.patch
+
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
 	# fine grained config control for user defined busybox configs.
@@ -163,9 +165,9 @@ src_install() {
 		fi
 		make CROSS="${CROSS}" install || die
 		dodir /bin
-		cp -a _install/bin/* "${D}"/bin/
+		cp -pPR _install/bin/* "${D}"/bin/
 		dodir /sbin
-		cp -a _install/sbin/* "${D}"/sbin/
+		cp -pPR _install/sbin/* "${D}"/sbin/
 		cd "${D}"
 		local symlink
 		for symlink in {bin,sbin}/* ; do
diff --git a/sys-apps/busybox/files/1.00/more-insmod-arches.patch b/sys-apps/busybox/files/1.00/more-insmod-arches.patch
index 7a88cb6fa31a..3056942b94a1 100644
--- a/sys-apps/busybox/files/1.00/more-insmod-arches.patch
+++ b/sys-apps/busybox/files/1.00/more-insmod-arches.patch
@@ -4,8 +4,8 @@ RCS file: /var/cvs/busybox/modutils/insmod.c,v
 retrieving revision 1.125
 retrieving revision 1.126
 diff -u -r1.125 -r1.126
---- busybox/modutils/insmod.c	2 Sep 2004 23:03:25 -0000	1.125
-+++ busybox/modutils/insmod.c	26 Dec 2004 09:13:32 -0000	1.126
+--- modutils/insmod.c	2 Sep 2004 23:03:25 -0000	1.125
++++ modutils/insmod.c	26 Dec 2004 09:13:32 -0000	1.126
 @@ -109,6 +109,14 @@
  #endif
  
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index f093d416cbb1..5c40e771595f 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/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>embedded</herd>
 </pkgmetadata>
diff --git a/sys-apps/byld/ChangeLog b/sys-apps/byld/ChangeLog
index 7825934cc580..49f859872356 100644
--- a/sys-apps/byld/ChangeLog
+++ b/sys-apps/byld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/byld
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/byld/ChangeLog,v 1.1 2003/07/25 22:56:54 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/byld/ChangeLog,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> byld-1.0.3.ebuild:
+  sync IUSE (missing)
 
 *byld-1.0.3 (25 Jul 2003)
 
diff --git a/sys-apps/byld/Manifest b/sys-apps/byld/Manifest
index b5df85ad75de..80094ad5bdd8 100644
--- a/sys-apps/byld/Manifest
+++ b/sys-apps/byld/Manifest
@@ -1,3 +1,4 @@
-MD5 d4c37f2d46d87f97f8df1efa121673fd byld-1.0.3.ebuild 770
+MD5 00ab5dfb3d8846291da1df36bc7e1a10 byld-1.0.3.ebuild 771
+MD5 3eada3dabe86fc04dd89b28836cf8c64 ChangeLog 415
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 38165840c7c7459d6e77030444cb8215 files/digest-byld-1.0.3 60
-MD5 336d868410654f881c5f821b46a75235 ChangeLog 330
diff --git a/sys-apps/byld/byld-1.0.3.ebuild b/sys-apps/byld/byld-1.0.3.ebuild
index f624df47d5ac..f2c8030daf5a 100644
--- a/sys-apps/byld/byld-1.0.3.ebuild
+++ b/sys-apps/byld/byld-1.0.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/sys-apps/byld/byld-1.0.3.ebuild,v 1.1 2003/07/25 22:56:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/byld/byld-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 DESCRIPTION="build a Linux distribution on a single floppy"
 HOMEPAGE="http://byld.sourceforge.net/"
@@ -9,6 +9,7 @@ SRC_URI="mirror://sourceforge/byld/byld-${PV//./_}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND="sys-apps/util-linux"
 
diff --git a/sys-apps/byld/metadata.xml b/sys-apps/byld/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/byld/metadata.xml
+++ b/sys-apps/byld/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-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 4af761ca09dc..b1a364f5e12b 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,129 @@
 # ChangeLog for sys-apps/checkpolicy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.1 2003/08/04 04:25:09 pebenito Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
+
+  09 Sep 2005; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.24.ebuild:
+  Mark stable.
+
+*checkpolicy-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org>
+  -checkpolicy-1.20.ebuild, +checkpolicy-1.24.ebuild:
+  New upstream release.
+
+  10 May 2005; Stephen Bennett <spb@gentoo.org> checkpolicy-1.22.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@gentoo.org> checkpolicy-1.22.ebuild:
+  Added ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.22.ebuild:
+  Mark stable.
+
+*checkpolicy-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org>
+  +checkpolicy-1.22.ebuild:
+  New upstream release.
+
+  13 Feb 2005; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.20.ebuild:
+  Mark stable.
+
+*checkpolicy-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.18.ebuild,
+  +checkpolicy-1.20.ebuild:
+  New upstream release.  Mark 1.18 stable.
+
+*checkpolicy-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  +checkpolicy-1.18.ebuild:
+  New upstream release.
+
+  15 Sep 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.16.ebuild:
+  Fix Makefile for multiple compile jobs.
+
+*checkpolicy-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@gentoo.org> +checkpolicy-1.16.ebuild:
+  New upstream release.
+
+*checkpolicy-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org> +checkpolicy-1.14.ebuild:
+  New upstream version.  This compiles policy versions 15 to 18.
+
+  27 Apr 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.10.ebuild:
+  Make it listen to LDFLAGS.
+
+*checkpolicy-1.10 (18 Apr 2004)
+
+  18 Apr 2004; Chris PeBenito <pebenito@gentoo.org> +checkpolicy-1.10.ebuild:
+  New upstream version.
+
+  08 Apr 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.8.ebuild:
+  Mark stable for 2004.1
+
+*checkpolicy-1.8 (12 Mar 2004)
+
+  12 Mar 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.8.ebuild:
+  New upstream release.
+
+*checkpolicy-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.6.ebuild:
+  New upstream release.
+
+  26 Jan 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.4-r1.ebuild:
+  Mark stable.
+
+*checkpolicy-1.4-r1 (17 Jan 2004)
+
+  17 Jan 2004; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.4-r1.ebuild,
+  files/checkpolicy-1.4-negset.diff:
+  Add patch to exclude types in TE rules.
+
+  16 Dec 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.4.ebuild:
+  Mark stable.
+
+*checkpolicy-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.4.ebuild:
+  New upstream version.
+
+  29 Oct 2003; Joshua Brindle <method@gentoo.org> checkpolicy-1.2.ebuild:
+  added sparc
+
+  07 Oct 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.2.ebuild:
+  Mark stable.
+
+*checkpolicy-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.2.ebuild,
+  files/checkpolicy-1.2-gentoo.diff:
+  New upstream version.
+
+  22 Sep 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.1.ebuild:
+  Add selinux-base-policy dependancy.
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+  24 Aug 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.0-r1.ebuild,
+  checkpolicy-1.1.ebuild, files/checkpolicy-little_endian.diff:
+  Mark stable
+
+*checkpolicy-1.1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.1.ebuild:
+  New upstream version
+
+*checkpolicy-1.0-r1 (13 Aug 2003)
+
+  13 Aug 2003; Chris PeBenito <pebenito@gentoo.org> checkpolicy-1.0-r1.ebuild,
+  checkpolicy-1.0.ebuild, files/checkpolicy-little_endian.diff:
+  Add endian-ness fix
 
 *checkpolicy-1.0 (03 Aug 2003)
 
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index fc855a0ff742..ee1247b9a5ad 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,2 +1,7 @@
-MD5 db975c31f3219e44a161103bc735d863 checkpolicy-1.0.ebuild 1248
-MD5 caef3839291cd8719631c4c52de9e614 files/digest-checkpolicy-1.0 63
+MD5 5db72c19ff001355de16de2cf9dde80e ChangeLog 4053
+MD5 927093fd813bc45afc77ef11c9258e91 metadata.xml 360
+MD5 f8071a78f23e4489f8d857382943c466 checkpolicy-1.22.ebuild 1039
+MD5 5c1a1a2c33b689d87e54ec1f42860caa checkpolicy-1.24.ebuild 1086
+MD5 d607f647a52bbb00a5bf754fe4f1dc90 files/checkpolicy-1.16-no-netlink-warn.diff 1022
+MD5 4d0b80c6cd8e1b17acbb212cbd7ca68b files/digest-checkpolicy-1.22 64
+MD5 92e9ef3f1778a43902e0813adfdfec11 files/digest-checkpolicy-1.24 64
diff --git a/sys-apps/checkpolicy/checkpolicy-1.22.ebuild b/sys-apps/checkpolicy/checkpolicy-1.22.ebuild
index d427456e001b..b9d827e8039b 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.22.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-1.22.ebuild
@@ -1,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-apps/checkpolicy/checkpolicy-1.22.ebuild,v 1.1 2005/03/13 13:36:54 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.22.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,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=">=sys-libs/libsepol-${SEPOL_VER}
 	sys-devel/flex
diff --git a/sys-apps/checkpolicy/checkpolicy-1.24.ebuild b/sys-apps/checkpolicy/checkpolicy-1.24.ebuild
index 95d512ac2121..f732782558a9 100644
--- a/sys-apps/checkpolicy/checkpolicy-1.24.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-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-apps/checkpolicy/checkpolicy-1.24.ebuild,v 1.1 2005/06/25 23:38:30 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.24.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 IUSE=""
 
@@ -13,8 +13,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"
+#KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
 
 DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	sys-devel/flex
diff --git a/sys-apps/checkpolicy/metadata.xml b/sys-apps/checkpolicy/metadata.xml
index 323ebf74ce08..f2fbfb8fd523 100644
--- a/sys-apps/checkpolicy/metadata.xml
+++ b/sys-apps/checkpolicy/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>
diff --git a/sys-apps/checkservice/ChangeLog b/sys-apps/checkservice/ChangeLog
index a93dc9102394..624e1b56a9bd 100644
--- a/sys-apps/checkservice/ChangeLog
+++ b/sys-apps/checkservice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/checkservice
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkservice/ChangeLog,v 1.1 2004/10/10 02:35:07 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkservice/ChangeLog,v 1.1.1.1 2005/11/30 09:56:45 chriswhite Exp $
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  checkservice-1.2.0.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
 
 *checkservice-1.2.0 (09 Oct 2004)
 
diff --git a/sys-apps/checkservice/Manifest b/sys-apps/checkservice/Manifest
index 89c5dbb9ce1f..33ca2b89e7e4 100644
--- a/sys-apps/checkservice/Manifest
+++ b/sys-apps/checkservice/Manifest
@@ -1,2 +1,13 @@
-MD5 948ab1ffd642b36f795dae9e51592534 checkservice-1.2.0.ebuild 1633
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 497797d09528e6e0f1d3c171f94da957 ChangeLog 508
+MD5 92e055ddd201f95fc4e86fc4b0e87285 checkservice-1.2.0.ebuild 1423
 MD5 90487cab684ee96661a995a23dde0e13 files/digest-checkservice-1.2.0 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClIYCtG5z4I8BtQoRAr/7AJ9G5HU6dXSqrkpBTFHyXVIh5JSmawCghmWM
+W8fR3JPS+UrohpukrgPa+Qs=
+=crnP
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/checkservice/checkservice-1.2.0.ebuild b/sys-apps/checkservice/checkservice-1.2.0.ebuild
index 52758a43816b..1ba47a38ca76 100644
--- a/sys-apps/checkservice/checkservice-1.2.0.ebuild
+++ b/sys-apps/checkservice/checkservice-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkservice/checkservice-1.2.0.ebuild,v 1.1 2004/10/10 02:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkservice/checkservice-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:56:45 chriswhite Exp $
 
 DESCRIPTION="Check the status of services running on local/remote machines"
 HOMEPAGE="http://www.linvision.com/checkservice/"
@@ -14,7 +14,7 @@ IUSE=""
 RDEPEND=">=dev-lang/perl-5.8
 	>=dev-perl/MailTools-1.58
 	>=dev-perl/File-Find-Rule-0.26
-	>=dev-perl/Getopt-Long-2.34"
+	>=perl-core/Getopt-Long-2.34"
 
 src_unpack() {
 	unpack ${A}
@@ -22,7 +22,7 @@ src_unpack() {
 	sed -i -e 's:/usr/local:/usr:g' $(grep -rl /usr/local *) || die "sed /usr/local"
 }
 
-src_install ()  {
+src_install() {
 	dodir /var/{log,lock,cache}/checkservice
 	dobin checkservice || die
 
@@ -40,7 +40,7 @@ src_install ()  {
 	doins config/plugins/warning/*
 
 	doman man/*
-	dodoc INSTALL README TODO checkservice.php cron/checkservice 
+	dodoc INSTALL README TODO checkservice.php cron/checkservice
 }
 
 pkg_postinst() {
diff --git a/sys-apps/chpax/ChangeLog b/sys-apps/chpax/ChangeLog
index bd65a52b7561..b8198ae8c1e8 100644
--- a/sys-apps/chpax/ChangeLog
+++ b/sys-apps/chpax/ChangeLog
@@ -1,9 +1,123 @@
 # ChangeLog for sys-apps/chpax
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.1 2003/05/17 02:28:51 method Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/ChangeLog,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
+
+  22 Apr 2005; <solar@gentoo.org> -chpax-0.6.1.ebuild, chpax-0.7.ebuild:
+  - removed old ebuild from the tree. SRC_URI no longer fetchable
+
+  15 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> chpax-0.7.ebuild:
+  Stable on ppc64
+
+  14 Mar 2005; <solar@gentoo.org> chpax-0.7.ebuild:
+  - stable mips
+
+  28 Oct 2004; <solar@gentoo.org> -chpax-0.5.ebuild, chpax-0.6.1.ebuild,
+  chpax-0.7.ebuild:
+  fixed CC usage to use new toolchain-funcs.eclass. bug 69286
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> chpax-0.7.ebuild:
+  Stable on hppa.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> chpax-0.7.ebuild:
+  Stable on sparc.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/pax-init.d:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  16 Sep 2004; <solar@gentoo.org> files/pax-conf.d, chpax-0.7.ebuild:
+  marked stable for x86* added sunjdk to exemptions
+
+*chpax-0.7 (22 Jul 2004)
+
+  22 Jul 2004; <solar@gentoo.org> chpax-0.7.ebuild, files/pax-conf.d,
+  files/pax-init.d:
+  version bump, now with bubble gum flavor and support for more arches
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> chpax-0.6.1.ebuild:
+  sync IUSE (-static), add sed-4 dep
+
+  27 Jun 2004; <solar@gentoo.org> files/pax-conf.d:
+  updated conf.d script from bug #40665
+
+  06 Jun 2004; <solar@gentoo.org> files/pax-conf.d, files/pax-init.d:
+  Updated chpax/paxctl init/conf scripts. Submitted by John Richard Moser. bug
+  #40665
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> chpax-0.6.1.ebuild:
+  Stable on sparc.
+
+  08 Mar 2004; Jon Portnoy <avenj@gentoo.org> chpax-0.6.1.ebuild :
+  Stable on AMD64 to make repoman happy.
+
+  18 Feb 2004; Guy Martin <gmsoft@gentoo.org> chpax-0.6.1.ebuild :
+  Marked stable on hppa.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> chpax-0.6.1.ebuild:
+  stable on alpha and ia64
+
+  20 Jan 2004; <solar@gentoo.org> chpax-0.6.1.ebuild, files/pax-conf.d:
+  marking 0.6.1 stable on x86. Added a few more entrys to pageexec/segmexec
+  exempt
+
+*chpax-0.6.1 (02 Jan 2004)
+
+  02 Jan 2004; <solar@gentoo.org> chpax-0.6.1.ebuild, chpax-0.6.ebuild:
+  PaX has moved homepages to http://pax.grsecurity.net. This change was
+  reflected in the upstream version of the chpax-0.6 release after it's initial
+  release... so our mirror's see a bad chpax md5sums. A -q flag was also added
+  for use in shell scripts to be a little less verbose with error reporting
+
+*chpax-0.6 (30 Dec 2003)
+
+  30 Dec 2003; <solar@gentoo.org> chpax-0.6.ebuild, files/pax-conf.d:
+  This release adds mips and mips64 support. Currently Gentoo does not support
+  mips64 but when we do chpax can be ~mips64 keyworded
+
+  09 Dec 2003; <solar@gentoo.org> chpax-0.5.ebuild:
+  permission change on chpax so the portage user can execute it.
+
+  05 Dec 2003; Jason Wever <weeve@gentoo.org> chpax-0.5.ebuild:
+  Marked stable on sparc.
+
+  22 Nov 2003; <solar@gentoo.org> chpax-0.4.ebuild, files/pax-conf.d,
+  files/pax-init.d:
+  extended functionality added for initscript, added sane settings to keep bugs
+  down. no version bump needed
+
+  27 Oct 2003; <solar@gentoo.org> chpax-0.5.ebuild, files/pax-conf.d,
+  files/pax-init.d:
+  init.d/conf.d name changes..
+
+  08 Oct 2003; <solar@gentoo.org> chpax-0.5.ebuild:
+  bumping to stable
+
+*chpax-0.5 (05 Oct 2003)
+
+  05 Oct 2003; <solar@gentoo.org> chpax-0.5.ebuild, files/pax-conf.d,
+  files/pax-init.d:
+  version bump of chpax, adds manpage, little more verbose when -v is used in
+  combo with other flags. this should go stable pretty quickly
+
+  26 Sep 2003; <solar@gentoo.org> chpax-0.4.ebuild:
+  marking stable for sparc
+
+  12 Sep 2003; <solar@gentoo.org> chpax-0.4.ebuild:
+  marking stable for ppc
+
+  05 Jul 2003; <solar@gentoo.org> metadata.xml:
+  Added metadata.xml
 
 *chpax-0.4 (16 May 2003)
 
+  24 Jun 2003; Ned Ludd <solar@gentoo.org> chpax-0.4.ebuild:
+  added ~ppc to keywords
+
+  24 Jun 2003; Guy Martin <gmsoft@gentoo.org> chpax-0.4.ebuild :
+  Added hppa to KEYWORDS.
+
+  02 Jun 2003; <solar@gentoo.org> Manifest, chpax-0.4.ebuild:
+  Moved to stable x86/ added ~sparc keyword
+
   16 May 2003; Joshua Brindle <method@gentoo.org> Manifest, chpax-0.4.ebuild:
   Initial import courtesy of solarx <solar@linbsd.net>
 
diff --git a/sys-apps/chpax/Manifest b/sys-apps/chpax/Manifest
index 0d483b171435..10c45bdbf42c 100644
--- a/sys-apps/chpax/Manifest
+++ b/sys-apps/chpax/Manifest
@@ -1,2 +1,18 @@
-MD5 859fe41039d76d5f9c02bae532749f65 chpax-0.4.ebuild 748
-MD5 e0bef5df8955711a482c1d29f060b6ac files/digest-chpax-0.4 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 238bcef1216623b2e83d6e27508d6484 chpax-0.7.ebuild 1052
+MD5 533a52b0372a4095519b2ec5fc54ce16 ChangeLog 4330
+MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
+MD5 add5e23e35065b6f32d1221f41b4b986 files/digest-chpax-0.7 59
+MD5 a76f6e6491b16c254c9aeecbec775478 files/pax-conf.d 2743
+MD5 f30daa23cf11e88be6678388f2561f8a files/pax-init.d 2536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQmlYG54WFLgrx1GWAQLXMwP9EsXvQMEvEwEk0K8zmZcoWhgp+k2VqRMv
+Mtsg7W9SyNx1l6hOn0RnLU2YTnbRbmYfEqzO5lR37AWbKCIuzfIpkFzXEVIzkN+A
+Abb1xTmuyBMVeqpp33U87FioLMhFxwma7I2/b+vJo6hBkjoXwWQX5bcvtr3LAQr9
+vsbtCVAfwxE=
+=RU3L
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/chpax/chpax-0.7.ebuild b/sys-apps/chpax/chpax-0.7.ebuild
index 410d789f8f28..49ecbbbe404c 100644
--- a/sys-apps/chpax/chpax-0.7.ebuild
+++ b/sys-apps/chpax/chpax-0.7.ebuild
@@ -1,21 +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/sys-apps/chpax/chpax-0.7.ebuild,v 1.1 2004/07/22 22:07:08 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
-inherit flag-o-matic gcc
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries."
 HOMEPAGE="http://pax.grsecurity.net/"
-SRC_URI="mirror://chpax-${PV}.tar.gz
-	http://pax.grsecurity.net/${P}.tar.gz"
+SRC_URI="http://pax.grsecurity.net/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +24,7 @@ src_unpack() {
 
 src_compile() {
 	# use static && append-ldflags -static	; # breaks with current ssp.
-	emake CC="$(gcc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed"
+	emake CC="$(tc-getCC)" TARGET="chpax ${LDFLAGS:0}" || die "Parallel Make Failed"
 }
 
 src_install() {
diff --git a/sys-apps/chpax/files/pax-conf.d b/sys-apps/chpax/files/pax-conf.d
index 78ac17e8597b..b56b5d747215 100644
--- a/sys-apps/chpax/files/pax-conf.d
+++ b/sys-apps/chpax/files/pax-conf.d
@@ -1,18 +1,65 @@
 ####################################################################
-#         Copyright 1999-2003 Gentoo Technologies, Inc.            #
+#            Copyright 1999-2004 Gentoo Foundation                 #
 # Distributed under the terms of the GNU General Public License v2 #
-####################################################################
+###################################################################
+# chpax	prefix	description
+# p	PE	do not enforce paging based non-executable pages
+# E	ET	emulate trampolines
+# r	RE	do not randomize mmap() base [ELF only]
+# m	ME	do not restrict mprotect()
+# s	SE	do not enforce segmentation based non-executable pages
+# x	XE	do not randomize ET_EXEC base [ELF only]
+# psem	PSE	same as PE + SE + ME, or -psem
+
+# NOTE:  PS_EXEC_EXEMPT is {PAGE,SEGM}_EXEC_EXEMPT.  For executables
+# with BOTH, you should use this, as it enables -e and -m, to make
+# sure that pax doesn't cry about odd flag settings in softmode
+
+# chpax command.  If using multiple tools, can separate by spaces.
+# This one hits BOTH chpax and paxctl
+CHPAX="/sbin/chpax /sbin/paxctl"
+
+# yes to be annoyed
+#VERBOSE="yes"
+
+#########################################################################
+# Here's some basic apps we'll use, that we have to apply much stuff to #
+########################################################################
+
+# I'm debating if I should do the eval here or in the actual script; I'm
+# currently opting for doing it in the init.d script.
 #
-# p	do not enforce paging based non-executable pages
-# e	do not emulate trampolines
-# r	do not randomize mmap() base [ELF only]
-# m	do not restrict mprotect()
-# s	do not enforce segmentation based non-executable pages
-# x	do not randomize ET_EXEC base [ELF only]
-
-PAGEEXEC_EXEMPT="/usr/X11R6/bin/XFree86 /usr/lib/wine/bin/wine"
+# To do it here, set things ="`eval echo /path/to/{some,binaries}`"
+
+#java=/opt/blackdown-{jdk-*/{,jre/},jre-*/}bin/{java{,_vm,c},keytool,kinit,klist,ktab,orbd,policytool,rmi{d,registry},servertool,tnameserv,*}
+java="/opt/*-{j{,2s}dk-*/{,jre/},jre-*/}bin/*"
+wine="/usr/lib/wine/bin/{wine{,build,clipsrv,dump,gcc,server,wrap,-{k,p}thread},w{mc,rc,idl}}"
+x11="/usr/X11R6/bin/{XFree86,Xorg}"
+xine="/usr/bin/{g,}xine"
+openoffice="/opt/OpenOffice.org*/program/soffice.bin"
+mozilla="/usr/lib/MozillaFirefox/firefox-bin /usr/lib/mozilla/mozilla-bin"
+xmms="/usr/bin/xmms"
+mplayer="/usr/bin/{g,}mplayer"
+
+#####################################################
+# Miscillaneous things that need each of these tags #
+####################################################
+
+PSE_misc="/usr/bin/blender /usr/bin/totem /usr/bin/acme \
+ /usr/bin/gnome-sound-recorder /usr/games/bin/bzflag /usr/bin/xfce4-panel"
+
+####################################
+# Settings are really applied here #
+###################################
+
+PS_EXEC_EXEMPT="${PSE_misc} ${x11} ${xine} ${wine} ${java} ${openoffice} ${mplayer}"
+PAGEEXEC_EXEMPT=""
 TRAMPOLINE_EXEMPT=""
-MPROTECT_EXEMPT=""
-MMAP_EXEMPT=""
-SEGEXEC_EXEMPT=""
-RANDEXEC_EXEMPT=""
+MPROTECT_EXEMPT="${java} ${mozilla} ${xmms}"
+RANDMMAP_EXEMPT="${java} ${x11}"
+SEGMEXEC_EXEMPT="${PAGEEXEC_EXEMPT}"
+RANDEXEC_EXEMPT="${java} ${x11}"
+
+# when zero flag mask is set to "yes" it will remove all pax flags from all files on reboot/stop
+#ZERO_FLAG_MASK="yes"
+
diff --git a/sys-apps/chpax/files/pax-init.d b/sys-apps/chpax/files/pax-init.d
index bb2d3bc60e0e..67544088aba2 100644
--- a/sys-apps/chpax/files/pax-init.d
+++ b/sys-apps/chpax/files/pax-init.d
@@ -1,47 +1,92 @@
 #!/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/sys-apps/chpax/files/pax-init.d,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 depend() {
 	need bootmisc
 }
 
 checkconfig() {
-	/sbin/chpax -v /sbin/chpax >/dev/null 2>&1 || return 1
+	if [ "x$CHPAX" = "x" ]; then
+		CHPAX="/sbin/chpax /sbin/paxctl"
+	fi
+	# Find non-existant chpaxes
+	REALCHPAX=""
+	for i in $CHPAX; do
+		REALCHPAX="$REALCHPAX`$i -v $i >/dev/null 2>&1 && echo \ $i`"
+	done
+	if [ "x$REALCHPAX" = "x" ]; then
+		eerror "error:  none of the specified chpax commands exist!"
+		return 1
+	fi
+	CHPAX="$REALCHPAX"
 }
 
-start() {
-	checkconfig || return 1
-
-	local err_msg="error running chpax on "
-
-	for x in ${PAGEEXEC_EXEMPT} ; do
-		[ -f ${x} ] && /sbin/chpax -p ${x} || eerror ${err_msg} ${x}
-	done
+chpax_flag() {
+	flag=$1
+	fname=$2
 
-	for x in ${TRAMPOLINE_EXEMPT} ; do
-		[ -f ${x} ] && /sbin/chpax -e ${x} || eerror ${err_msg} ${x}
-	done
+	#if [ -w ${fname} ]; then
+		#einfo "-${flag} flagging ${fname}"
+		for i in $CHPAX; do
+			#einfo "    with $i"
+			# nonverbose is ultraquiet
+			if [ "$VERBOSE" = "yes" -a -x ${fname} ]; then
+				einfo "-${flag} flagging ${fname} with $i"
+				$i -$flag ${fname}
+				[ $? != 0 ] && eerror "error: $i -$flag ${fname}"
+			else
+				[ -x ${fname} ] && $i -$flag ${fname} 2>/dev/null >/dev/null
+			fi
+		done
+	#fi
+}
 
-	for x in ${MMAP_EXEMPT} ; do
-		[ -f ${x} ] && /sbin/chpax -r ${x} || eerror ${err_msg} ${x}
-	done
+fix_exempts() {
+	#need to do this for foo{,bar,baz} expressions to work.
+	PAGEEXEC_EXEMPT=`eval echo $PAGEEXEC_EXEMPT`
+	TRAMPOLINE_EXEMPT=`eval echo $TRAMPOLINE_EXEMPT`
+	RANDMMAP_EXEMPT=`eval echo $RANDMMAP_EXEMPT`
+	MPROTECT_EXEMPT=`eval echo $MPROTECT_EXEMPT`
+	SEGMEXEC_EXEMPT=`eval echo $SEGMEXEC_EXEMPT`
+	PS_EXEC_EXEMPT=`eval echo $PS_EXEC_EXEMPT`
+	RANDEXEC_EXEMPT=`eval echo $RANDEXEC_EXEMPT`
+}
 
-	for x in ${MPROTECT_EXEMPT} ; do
-		[ -f ${x} ] && /sbin/chpax -m ${x} || eerror ${err_msg} ${x}
-	done
+start() {
+	checkconfig || return 1
 
-	for x in ${SEGEXEC_EXEMPT} ; do
-		[ -f ${x} ] && /sbin/chpax -s ${x} || eerror ${err_msg} ${x}
-	done
+	fix_exempts
 
-	for x in ${RANDEXEC_EXEMPT} ; do
-		[ -f ${x} ] && /sbin/chpax -x ${x} || eerror ${err_msg} ${x}
-	done
+	ebegin "Setting PaX flags on binaries"
+	for e in $TRAMPOLINE_EXEMPT; do chpax_flag e ${e}    ;done
+	for r in $RANDMMAP_EXEMPT;   do chpax_flag r ${r}    ;done
+	for m in $MPROTECT_EXEMPT;   do chpax_flag m ${m}    ;done
+	for p in $PAGEEXEC_EXEMPT;   do chpax_flag p ${p}    ;done
+	for s in $SEGMEXEC_EXEMPT;   do chpax_flag s ${s}    ;done
+	for s in $PS_EXEC_EXEMPT;    do chpax_flag psem ${s} ;done
+	for x in $RANDEXEC_EXEMPT;   do chpax_flag x ${x}    ;done
 
+	eend
+	return 0
 }
 
 stop() {
+	checkconfig || return 1
+
+	[ "$ZERO_FLAG_MASK" = "yes" ] || return 0
+	fix_exempts
+	einfo "chpax zero flag masking"
+	for p in $PAGEEXEC_EXEMPT;   do chpax_flag ze ${p} ;done
+	for e in $TRAMPOLINE_EXEMPT; do chpax_flag ze ${e} ;done
+	for r in $RANDMMAP_EXEMPT;   do chpax_flag ze ${r} ;done
+	for m in $MPROTECT_EXEMPT;   do chpax_flag ze ${m} ;done
+	for s in $SEGMEXEC_EXEMPT;   do chpax_flag ze ${s} ;done
+	for s in $PS_EXEC_EXEMPT;    do chpax_flag ze ${s} ;done
+	for x in $RANDEXEC_EXEMPT;   do chpax_flag ze ${x} ;done
+
 	return 0
 }
 
+
diff --git a/sys-apps/chpax/metadata.xml b/sys-apps/chpax/metadata.xml
index b0bc90e4f0ae..ae95b38fe32f 100644
--- a/sys-apps/chpax/metadata.xml
+++ b/sys-apps/chpax/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>solar@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>Manage PaX flags for binaries</longdescription>
+<herd>hardened</herd>
+<maintainer>
+ <email>solar@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/cinit/ChangeLog b/sys-apps/cinit/ChangeLog
index ed35303527d0..15d29873425f 100644
--- a/sys-apps/cinit/ChangeLog
+++ b/sys-apps/cinit/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/cinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cinit/ChangeLog,v 1.1 2005/06/20 03:41:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cinit/ChangeLog,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
+
+  17 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> cinit-0.1.ebuild:
+  Added to ~hppa.
+
+*cinit-0.1 (24 Jun 2005)
+
+  24 Jun 2005; Mike Frysinger <vapier@gentoo.org> +cinit-0.1.ebuild:
+  Version bump.
+
+  20 Jun 2005; David Holm <dholm@gentoo.org> cinit-0.0.8.ebuild:
+  Added to ~ppc.
 
 *cinit-0.0.8 (19 Jun 2005)
 
diff --git a/sys-apps/cinit/Manifest b/sys-apps/cinit/Manifest
index 4c6fa00dd03a..4c76db7a782f 100644
--- a/sys-apps/cinit/Manifest
+++ b/sys-apps/cinit/Manifest
@@ -1,2 +1,5 @@
-MD5 99adfa4548dfbad7fc4e8a2e7dd21825 cinit-0.0.8.ebuild 444
+MD5 384bfc2dc9cdefe7c16e38767dd30159 ChangeLog 620
+MD5 5c4b235a4ffb161f5834a25d7c958f51 cinit-0.0.8.ebuild 787
+MD5 52442675a9d611d10ee12e3116bba92a cinit-0.1.ebuild 725
 MD5 23d3591d17fc9401915a32d6cd4fbce8 files/digest-cinit-0.0.8 63
+MD5 db3d44148177c00798504f679618b927 files/digest-cinit-0.1 61
diff --git a/sys-apps/cinit/cinit-0.0.8.ebuild b/sys-apps/cinit/cinit-0.0.8.ebuild
index 2c8ecef692e0..b310162417b5 100644
--- a/sys-apps/cinit/cinit-0.0.8.ebuild
+++ b/sys-apps/cinit/cinit-0.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cinit/cinit-0.0.8.ebuild,v 1.1 2005/06/20 03:41:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cinit/cinit-0.0.8.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 DESCRIPTION="fast executing, small and simple init with support for profiles"
 HOMEPAGE="http://linux.schottelius.org/cinit/"
@@ -8,7 +8,7 @@ SRC_URI="http://linux.schottelius.org/cinit/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/cinit/cinit-0.1.ebuild b/sys-apps/cinit/cinit-0.1.ebuild
index 356e97ca612c..0dfbf59a0f93 100644
--- a/sys-apps/cinit/cinit-0.1.ebuild
+++ b/sys-apps/cinit/cinit-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-apps/cinit/cinit-0.1.ebuild,v 1.1 2005/06/24 01:09:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cinit/cinit-0.1.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 DESCRIPTION="fast executing, small and simple init with support for profiles"
 HOMEPAGE="http://linux.schottelius.org/cinit/"
@@ -8,7 +8,7 @@ SRC_URI="http://linux.schottelius.org/cinit/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/clrngd/ChangeLog b/sys-apps/clrngd/ChangeLog
index 6c707914f32c..c34c3cd0e7c7 100644
--- a/sys-apps/clrngd/ChangeLog
+++ b/sys-apps/clrngd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/clrngd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/ChangeLog,v 1.1 2004/01/04 23:20:13 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
+
+  20 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> clrngd-1.0.3.ebuild:
+  Add ~amd64.
+
+  18 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> clrngd-1.0.3.ebuild:
+  stable on x86.
 
 *clrngd-1.0.3 (04 Jan 2004)
 
diff --git a/sys-apps/clrngd/Manifest b/sys-apps/clrngd/Manifest
index d765be695786..54e20faf3499 100644
--- a/sys-apps/clrngd/Manifest
+++ b/sys-apps/clrngd/Manifest
@@ -1,6 +1,6 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/Manifest,v 1.1 2004/01/04 23:20:13 robbat2 Exp $
-MD5 063096dcf8699085425fc870afe94adc clrngd-1.0.3.ebuild 668
+MD5 9780e6ffd8b8b7b5721945382c964a8b clrngd-1.0.3.ebuild 781
+MD5 e9fb5642af4548a2c52d845386b0f1a6 ChangeLog 595
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-MD5 986877d6a71de29a8c5102c45df92b24 files/clrngd-conf.d 416
-MD5 cfc145bbc592f4751c42727d4ea466f1 files/clrngd-init.d 444
+MD5 2547fefbb82be0e3c0ff51ddce43fb2d files/clrngd-conf.d 489
+MD5 4cdd916672c420b4c8bf90bffcf10ea1 files/clrngd-init.d 502
 MD5 08adeed9571a7bc44a80c7ba1c7a1614 files/digest-clrngd-1.0.3 63
diff --git a/sys-apps/clrngd/clrngd-1.0.3.ebuild b/sys-apps/clrngd/clrngd-1.0.3.ebuild
index bfd13d55658a..ff407c1155ea 100644
--- a/sys-apps/clrngd/clrngd-1.0.3.ebuild
+++ b/sys-apps/clrngd/clrngd-1.0.3.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/sys-apps/clrngd/clrngd-1.0.3.ebuild,v 1.1 2004/01/04 23:20:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/clrngd-1.0.3.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 DESCRIPTION="Clock randomness gathering daemon"
 HOMEPAGE="http://echelon.pl/pubs/"
 SRC_URI="http://echelon.pl/pubs/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
-DEPEND="virtual/glibc sys-devel/gcc"
-RDEPEND="virtual/glibc"
-S=${WORKDIR}/${P}
+
+DEPEND="virtual/libc sys-devel/gcc"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	econf --bindir=/usr/sbin || die
diff --git a/sys-apps/clrngd/files/clrngd-conf.d b/sys-apps/clrngd/files/clrngd-conf.d
index 80dee33b6ecc..e64a6e1861e2 100644
--- a/sys-apps/clrngd/files/clrngd-conf.d
+++ b/sys-apps/clrngd/files/clrngd-conf.d
@@ -1,7 +1,6 @@
-#!/bin/sh
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/files/clrngd-conf.d,v 1.1 2004/01/04 23:20:13 robbat2 Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/files/clrngd-conf.d,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 # This is the interval between runs of the clrngd main loop. It should NOT be
 # less than 60 seconds (the daemon will exit with an error) as the main loop
diff --git a/sys-apps/clrngd/files/clrngd-init.d b/sys-apps/clrngd/files/clrngd-init.d
index 6715a22b8c71..8f5b4a6e4e1d 100644
--- a/sys-apps/clrngd/files/clrngd-init.d
+++ b/sys-apps/clrngd/files/clrngd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/files/clrngd-init.d,v 1.1 2004/01/04 23:20:13 robbat2 Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/files/clrngd-init.d,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 DAEMON=clrngd
 OPTS=${DELAYTIME}
@@ -17,5 +17,3 @@ stop() {
 	start-stop-daemon --stop --quiet --exec /usr/sbin/${DAEMON}
 	eend $?
 }
-
-# vim: ts=4 sw=4 ft=sh:
diff --git a/sys-apps/cobalt-panel-utils/ChangeLog b/sys-apps/cobalt-panel-utils/ChangeLog
index 02f8f7d0706e..03028045ebe2 100644
--- a/sys-apps/cobalt-panel-utils/ChangeLog
+++ b/sys-apps/cobalt-panel-utils/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-apps/cobalt-panel-utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/ChangeLog,v 1.1 2005/05/01 18:56:31 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
+
+  07 Aug 2005; Stuart Longland <redhatter@gentoo.org>
+  cobalt-panel-utils-1.0.2.ebuild:
+  v1.0.2 tested and works on mips. Added ~mips keyword.
+
+*cobalt-panel-utils-1.0.2 (01 Aug 2005)
+
+  01 Aug 2005; Jeff Walter <jeffw@gentoo.org>
+  +cobalt-panel-utils-1.0.2.ebuild:
+  Unified source indenting. Cleaned up some conditionals. Added the "static" USE
+  flag, stopping the previous behavior of always building static.
+
+*cobalt-panel-utils-1.0.1 (15 May 2005)
+
+  15 May 2005; <plasmaroo@gentoo.org> +cobalt-panel-utils-1.0.1.ebuild:
+  Version bump.
 
 *cobalt-panel-utils-1.0.0 (01 May 2005)
 
diff --git a/sys-apps/cobalt-panel-utils/Manifest b/sys-apps/cobalt-panel-utils/Manifest
index a6f3351a3b70..68a290a08559 100644
--- a/sys-apps/cobalt-panel-utils/Manifest
+++ b/sys-apps/cobalt-panel-utils/Manifest
@@ -1,4 +1,18 @@
-MD5 3ca1dadd85b021f766a1c360de63c95d ChangeLog 276
-MD5 adb42f9353ff1c87ca8b7dbc670a540d cobalt-panel-utils-1.0.0.ebuild 649
-MD5 1fbf4d326e486116a8f444a1b3bde584 metadata.xml 375
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7c4a5442805350fcac3dfd20663e9333 ChangeLog 925
+MD5 3ea39e3e63a46bdf2864129430556697 cobalt-panel-utils-1.0.0.ebuild 773
+MD5 23763b65f97411623e6e50d4e8070491 cobalt-panel-utils-1.0.1.ebuild 792
+MD5 2041b50eece466a16bc9470fdc4d2bd3 cobalt-panel-utils-1.0.2.ebuild 891
 MD5 920885e8d359755fd2db48ab4fbaf781 files/digest-cobalt-panel-utils-1.0.0 75
+MD5 660e5928b1926a3f6951f8966575a22a files/digest-cobalt-panel-utils-1.0.1 75
+MD5 bbebeb295062bec0a5ef2c6e6de6d027 files/digest-cobalt-panel-utils-1.0.2 75
+MD5 1fbf4d326e486116a8f444a1b3bde584 metadata.xml 375
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRs0yI1lqEGTUzyQRAoE0AKCjVxUFFoF4Kkbk/a31hiY5vMYsHQCgnNhU
+kTd5GfJg0X36SG00w3Xv7Eo=
+=EZ/L
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.0.ebuild b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.0.ebuild
index 1c150e41b87f..90e4d1d83793 100644
--- a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.0.ebuild
+++ b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-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/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.0.ebuild,v 1.1 2005/05/01 18:56:31 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild
index c40bca2deb73..0de34b4246cf 100644
--- a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild
+++ b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-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/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild,v 1.1 2005/05/14 23:10:12 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.1.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild
index 125bd575a0f7..c9f82fd1e1f6 100644
--- a/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild
+++ b/sys-apps/cobalt-panel-utils/cobalt-panel-utils-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/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild,v 1.1 2005/08/01 01:11:13 jeffw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cobalt-panel-utils/cobalt-panel-utils-1.0.2.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://www.404ster.com/pub/gentoo-stuff/ebuilds/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~mips x86"
 IUSE="static"
 
 DEPEND="sys-devel/gettext
diff --git a/sys-apps/coldplug/ChangeLog b/sys-apps/coldplug/ChangeLog
index 86c6a668cfb4..3093ba249605 100644
--- a/sys-apps/coldplug/ChangeLog
+++ b/sys-apps/coldplug/ChangeLog
@@ -1,6 +1,43 @@
-# ChangeLog for sys-apps/hotplug
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/ChangeLog,v 1.1 2004/09/21 00:27:44 gregkh Exp $
+# ChangeLog for sys-apps/coldplug
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/ChangeLog,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
+
+  17 Oct 2005; Joshua Kinard <kumba@gentoo.org> coldplug-20040920.ebuild:
+  Marked stable on mips.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> coldplug-20040920.ebuild:
+  stable on ia64
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  coldplug-20040920.ebuild:
+  Stable on sparc
+
+  09 Feb 2005; Aron Griffis <agriffis@gentoo.org> coldplug-20040920.ebuild:
+  stable on alpha
+
+  05 Feb 2005; Markus Rothe <corsair@gentoo.org> coldplug-20040920.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/coldplug.rc:
+  Updated coldplug.rc to unpack firmware tarball. This is used by the LiveCD
+  to allow /lib/firmware to be tmpfs without losing any firmwares that were
+  installed on the LiveCD and allows users to provdie their own firmwares.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> coldplug-20040920.ebuild:
+  Stable on ppc.
+
+  27 Nov 2004; Jason Huebel <jhuebel@gentoo.org> coldplug-20040920.ebuild:
+  stable on amd64
+
+  10 Nov 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  coldplug-20040920.ebuild:
+  marked 20040920 stable on x86 as hotplug just went stable
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/coldplug.rc:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  24 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *coldplug-20040920 (20 Sep 2004)
 
diff --git a/sys-apps/coldplug/Manifest b/sys-apps/coldplug/Manifest
index d1ae9b458972..2ba5aae6dbf5 100644
--- a/sys-apps/coldplug/Manifest
+++ b/sys-apps/coldplug/Manifest
@@ -1,5 +1,5 @@
-MD5 1613f0c39766a6371f26e6f6d87ce8d6 ChangeLog 216
-MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 cf380e03094af976c5d1255621e51039 coldplug-20040920.ebuild 842
-MD5 7c7bdd621c151e38b9f282d9dec54c5c files/coldplug.rc 697
+MD5 595d6666dbc80f20e0806ab2476c94bf ChangeLog 2102
+MD5 9b89edce72549949f87a38878eed667b coldplug-20040920.ebuild 841
+MD5 6c7d68e4987abe08c5c82a440b13a246 files/coldplug.rc 889
 MD5 6038bb8c3af43a0e6f0aa876e4307df6 files/digest-coldplug-20040920 69
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
diff --git a/sys-apps/coldplug/coldplug-20040920.ebuild b/sys-apps/coldplug/coldplug-20040920.ebuild
index a48024bf4f75..b6672e27e994 100644
--- a/sys-apps/coldplug/coldplug-20040920.ebuild
+++ b/sys-apps/coldplug/coldplug-20040920.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/coldplug/coldplug-20040920.ebuild,v 1.1 2004/09/21 00:27:44 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/coldplug-20040920.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ia64 mips ~ppc64"
 IUSE=""
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
@@ -23,4 +23,3 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/coldplug.rc coldplug
 }
-
diff --git a/sys-apps/coldplug/files/coldplug.rc b/sys-apps/coldplug/files/coldplug.rc
index 2aad4ac472b1..0d503365e8b0 100644
--- a/sys-apps/coldplug/files/coldplug.rc
+++ b/sys-apps/coldplug/files/coldplug.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/sys-apps/coldplug/files/coldplug.rc,v 1.1 2004/09/21 00:27:44 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coldplug/files/coldplug.rc,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 depend() {
 	need modules
@@ -16,6 +16,14 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
+
+	# This unpacks any firmware tarballs.  Used for LiveCD.
+	if [ -e /lib/firmware.tar.bz2 ]
+	then
+		ebegin "Unpacking hotplug firmware"
+		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
+		eend 0
+	fi
 	
 	for RC in /etc/hotplug/*.rc
 	do
diff --git a/sys-apps/compare/ChangeLog b/sys-apps/compare/ChangeLog
index e974cf701793..6f00a861e7e1 100644
--- a/sys-apps/compare/ChangeLog
+++ b/sys-apps/compare/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/compare
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/ChangeLog,v 1.1 2005/01/07 22:56:39 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/ChangeLog,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 *compare-1.16 (07 Jan 2005)
 
diff --git a/sys-apps/compare/Manifest b/sys-apps/compare/Manifest
index 11f0e230a0f0..8e4e0632f113 100644
--- a/sys-apps/compare/Manifest
+++ b/sys-apps/compare/Manifest
@@ -1,4 +1,14 @@
-MD5 b20d61603e68ade4602f7bab083097e4 compare-1.16.ebuild 515
-MD5 b569bfa4bf7e5a21b59def541bb4ae83 metadata.xml 369
-MD5 904af217cbf4ca78dbb2b7ec4685c3b2 ChangeLog 315
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 241614d99b4a0dc839dbdc644e893a86 compare-1.16.ebuild 613
+MD5 e0f31f568feebd8ce0014a1cdcafa5c2 ChangeLog 403
+MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
 MD5 9a3d86d6b1f89b6048a3ccb9d84ea94b files/digest-compare-1.16 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCf1+AI1lqEGTUzyQRAhEIAKCW7R5/NVNjirKlBiLct4q/Ptwz2wCgtohG
+EwrfAPdXEjszLtz7Wmlp1Y8=
+=Mif3
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/compare/compare-1.16.ebuild b/sys-apps/compare/compare-1.16.ebuild
index 2d67cc6167aa..72d99eb0864a 100644
--- a/sys-apps/compare/compare-1.16.ebuild
+++ b/sys-apps/compare/compare-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/sys-apps/compare/compare-1.16.ebuild,v 1.1 2005/01/07 22:56:39 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/compare/compare-1.16.ebuild,v 1.1.1.1 2005/11/30 09:55:56 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/compare/metadata.xml b/sys-apps/compare/metadata.xml
index fa65af46be4e..71d7ba9c0605 100644
--- a/sys-apps/compare/metadata.xml
+++ b/sys-apps/compare/metadata.xml
@@ -4,7 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>stuart@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/sys-apps/coreutils-darwin/ChangeLog b/sys-apps/coreutils-darwin/ChangeLog
index aa0f188bbc37..a822b1cbe019 100644
--- a/sys-apps/coreutils-darwin/ChangeLog
+++ b/sys-apps/coreutils-darwin/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for sys-apps/coreutils-darwin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/ChangeLog,v 1.1 2005/05/12 06:03:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/ChangeLog,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+  26 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org>
+  coreutils-darwin-5.3.0.ebuild:
+  Moved groups and uptime to EXISTINGUSR. This is the setup on both my Panther
+  and Tiger installs. See bug #95279 for details
+
+  28 May 2005; Joseph Jezak <josejx@gentoo.org>
+  -coreutils-darwin-5.0.ebuild, coreutils-darwin-5.3.0.ebuild:
+  Added man page fix, removed coreutils-5.0.
+
+  28 May 2005; Joseph Jezak <josejx@gentoo.org> coreutils-darwin-5.0.ebuild,
+  coreutils-darwin-5.3.0.ebuild:
+  Fixed more collisions.
+
+  28 May 2005; Joseph Jezak <josejx@gentoo.org>
+  coreutils-darwin-5.3.0.ebuild:
+  Fixed su issue.
+
+  13 May 2005; Joseph Jezak <josejx@gentoo.org>
+  coreutils-darwin-5.3.0.ebuild:
+  Fixed stupid typo.
+
+  13 May 2005; Joseph Jezak <josejx@gentoo.org>
+  coreutils-darwin-5.3.0.ebuild:
+  Added fix for 10.4
+
+*coreutils-darwin-5.3.0 (12 May 2005)
+
+  12 May 2005; Joseph Jezak <josejx@gentoo.org>
+  +coreutils-darwin-5.3.0.ebuild:
+  Added coreutils-5.3.0.
 
 *coreutils-darwin-5.0 (12 May 2005)
 
diff --git a/sys-apps/coreutils-darwin/Manifest b/sys-apps/coreutils-darwin/Manifest
index 5ca100186492..64b553778326 100644
--- a/sys-apps/coreutils-darwin/Manifest
+++ b/sys-apps/coreutils-darwin/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ff4274c8a1c213bd12bab3dbf7a337ba coreutils-darwin-5.0.ebuild 5065
-MD5 1ac933b0480704003dd26a9b47498f06 ChangeLog 374
+MD5 229de4cb94620807a2205f2c4d63b388 ChangeLog 1331
+MD5 687a95a2b7ef0f422bf0e63d66463bb9 coreutils-darwin-5.3.0.ebuild 3336
 MD5 fc76b60032187aa3e2029ee04b00e773 metadata.xml 156
-MD5 e80d3d87cfbe40bc56636167ae5b4768 files/digest-coreutils-darwin-5.0 141
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCgyEZI1lqEGTUzyQRAt9JAJ49fAGYpMpf5alNZJv8mbKrcUo+mQCfdVnT
-C0MVD1XlaJHXzqOQD9IrXzE=
-=Nv2L
------END PGP SIGNATURE-----
+MD5 fadcaa23c9484df6bd9dd2eefce42003 files/digest-coreutils-darwin-5.3.0 69
diff --git a/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild b/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild
index 3d8b3b1aab65..c7ed9ee99444 100644
--- a/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild
+++ b/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild,v 1.1 2005/05/12 20:03:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Standard GNU file utilities, text utilities, and shell utilities missing from Darwin."
 HOMEPAGE="http://www.gnu.org/software/coreutils/"
@@ -24,14 +26,17 @@ S=${WORKDIR}/coreutils-${PV}
 # Existing utils
 
 EXISTINGUSR="basename chgrp cksum comm cut dirname \
-	du env expand false fmt fold head install id join \
+	du env expand false fmt fold groups head install id join \
 	logname mkfifo nice nohup od paste pr printenv \
-	printf sort split stat sum tail tee touch tr true \
-	tsort tty uname unexpand uniq users wc who whoami yes"
-EXISTINGBIN="cat chmod cp date dd df echo expr ln ls mkdir mv pwd rm rmdir sleep stty sync test"
+	printf sort split stat su sum tail tee touch tr true \
+	tsort tty uname unexpand uniq uptime users wc who whoami yes"
+EXISTINGBIN="cat chmod cp date dd df echo expr ln ls mkdir \
+			 mv pwd rm rmdir sleep stty sync test"
 EXISTINGUSBIN="chown chroot"
 EXISTINGSBIN="mknod"
 DONTLINK="[ kill hostname"
+TENFOURBIN="link unlink csplit nl"
+TENFOURUSBIN="pathchk readlink"
 
 src_compile() {
 	cd ${S}
@@ -40,12 +45,10 @@ src_compile() {
 		--bindir=/bin \
 		`use_enable nls` || die
 
-	if use static
-	then
-		emake LDFLAGS="${LDFLAGS} -static" || die
-	else
-		emake || die
+	if use static; then
+		append-ldflags -static
 	fi
+	emake || die
 }
 
 src_install() {
@@ -58,12 +61,18 @@ src_install() {
 	dodir /usr/bin
 	rm -rf usr/lib
 
-	cd bin
+	cd ${D}/bin
+	if [ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]; then
+		rm ${TENFOURBIN} ${TENFOURUSBIN}
+	fi
+
 	rm ${EXISTINGBIN} ${EXISTINGUSR} ${EXISTINGUSBIN} ${EXISTINGSBIN} ${DONTLINK}
 
 	# Move the non-critical pacakges to /usr/bin
-	mv csplit factor md5sum nl ${D}usr/bin
-	mv pathchk pinky sha1sum tac ${D}usr/bin
+	if [ "$MACOSX_DEPLOYMENT_TARGET" != "10.4" ]; then
+		mv csplit nl pathchk ${D}usr/bin
+	fi
+	mv factor md5sum pinky sha1sum tac ${D}usr/bin
 
 	# Link binaries
 	cd ${D}/usr/bin
@@ -91,19 +100,24 @@ src_install() {
 
 	# Remove the redundant man pages
 	cd ${D}/usr/share/man/man1
-	rm basename.1 cat.1 chroot.1 cksum.1 comm.1 \
-	   cut.1 date.1 dirname.1 echo.1 env.1 expand.1 expr.1 \
-	   false.1 fmt.1 fold.1 head.1 id.1 join.1 \
-	   logname.1 nice.1 nohup.1 od.1 paste.1 pr.1 printenv.1 \
-	   printf.1 pwd.1 readlink.1 sleep.1 sort.1 split.1 stat.1 \
-	   stty.1 sum.1 sync.1 tail.1 tee.1 test.1 tr.1 true.1 tsort.1 \
-	   tty.1 uname.1 unexpand.1 uniq.1 users.1 wc.1 who.1 whoami.1 \
-	   yes.1
+	for BINS in ${EXISTINGBIN} ${EXISTINGUSR} ${EXISTINGUSBIN} ${EXISTINGSBIN} ${DONTLINK}; do
+		if [ -f ${BINS}.1 ]; then
+			rm ${BINS}.1
+		fi
+	done
+
+	if [ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]; then
+		for BINS in ${TENFOURBIN} ${TENFOURUSBIN}; do
+			if [ -f ${BINS}.1 ]; then
+				rm ${BINS}.1
+			fi
+		done
+	fi
 
 	if ! use build
 	then
 		cd ${S}
-		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
+		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
 	else
 		rm -rf ${D}/usr/share
 	fi
diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 0d6e8b785963..b289c08b4265 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,9 +1,549 @@
 # ChangeLog for sys-apps/coreutils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.1 2003/03/05 21:39:46 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
+
+*coreutils-5.3.0-r2 (05 Oct 2005)
+
+  05 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +coreutils-5.3.0-r2.ebuild:
+  Fix uname parsing of cpuinfo on alpha/ia64 and use timestyle patch from
+  upstream.
+
+  13 Sep 2005; Mike Frysinger <vapier@gentoo.org> coreutils-5.3.0-r1.ebuild:
+  Fix off-by-one issue #105639 by Michal Januszewski.
+
+*coreutils-5.3.0-r1 (30 Aug 2005)
+
+  30 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +coreutils-5.3.0-r1.ebuild:
+  Update the i18n patch to fix cut again as well as expand #104286 by peteru.
+
+  30 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.3.0.ebuild:
+  Remove charset.alias if it's present, only libiconv should install it.
+
+*coreutils-5.3.0 (30 Aug 2005)
+
+  30 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/DIR_COLORS,
+  +coreutils-5.3.0.ebuild:
+  Version bump.
+
+*coreutils-5.2.1-r7 (30 Aug 2005)
+
+  30 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/DIR_COLORS,
+  +coreutils-5.2.1-r7.ebuild:
+  Fix memleak in chmod #87490 and update DIR_COLORS with stuff from Fedora and
+  #104087.
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> coreutils-5.2.1-r6.ebuild:
+  Merge support for using coreutils on non-GNU systems by Diego Pettenò
+  #101218.
+
+  28 Jun 2005; Joshua Kinard <kumba@gentoo.org> coreutils-5.2.1-r6.ebuild:
+  Marked stable on mips.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> coreutils-5.2.1-r6.ebuild:
+  Stable on ppc64
+
+  30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  coreutils-5.2.1-r6.ebuild:
+  Stable on sparc
+
+  29 May 2005; <solar@gentoo.org> coreutils-5.2.1-r2.ebuild,
+  coreutils-5.2.1-r5.ebuild, coreutils-5.2.1-r6.ebuild:
+  - update coreutils to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
+
+  29 May 2005; Joseph Jezak <josejx@gentoo.org> coreutils-5.2.1-r6.ebuild:
+  Marked ppc stable.
+
+*coreutils-5.2.1-r6 (02 Apr 2005)
+
+  02 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +coreutils-5.2.1-r6.ebuild:
+  Update i18n patch to the redhat version #87429 and include the tty utf8 fix
+  #77633.
+
+*coreutils-5.2.1-r5 (14 Mar 2005)
+
+  14 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +coreutils-5.2.1-r5.ebuild:
+  Add fix for bug #84564.
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  coreutils-5.2.1-r3.ebuild, coreutils-5.2.1-r4.ebuild:
+  Dependency update: sys-apps/at -> sys-process/at.
+
+*coreutils-5.2.1-r4 (09 Jan 2005)
+
+  09 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +coreutils-5.2.1-r4.ebuild:
+  Fix tail -f behavior #57477 by rob holland. Have the progress bar use normal
+  spaces #76903 by Nikolai Weibull. Fix chown --dereference #53750 by Georgi
+  Georgiev. Fix test running #75932 / #76089.
+
+*coreutils-5.2.1-r3 (21 Dec 2004)
+
+  21 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +coreutils-5.2.1-r3.ebuild:
+  Remove i686-specific asm code on i486 systems #32429. Fix tail +# syntax
+  #66713. Move [ to same place as test #65296. Fix man-page tests #69216. Fix
+  autotool code #74210. Fix @echo in man/Makefile #53881. Use DESTDIR instead
+  of einstall. Make symlinks absolute #55620.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  coreutils-5.2.1-r1.ebuild, coreutils-5.2.1-r2.ebuild,
+  coreutils-5.2.1.ebuild:
+  Masked coreutils-5.2.1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  coreutils-5.2.1-r1.ebuild, coreutils-5.2.1-r2.ebuild:
+  Masked coreutils-5.2.1-r2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  coreutils-5.2.1-r1.ebuild:
+  Masked coreutils-5.2.1-r1.ebuild stable for ppc
+
+  26 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> files/DIR_COLORS:
+  Added rxvt-unicode to the DIR_COLORS supported terminal list
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> coreutils-5.2.1.ebuild:
+  fix ppc64 and s390, bug #61735
+
+*coreutils-5.2.1-r2 (25 Aug 2004)
+
+  25 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
+  +coreutils-5.2.1-r2.ebuild:
+  Version bump to incorporate two fixes. First, the uname patch is made to work
+  on amd64 architecture (fixing bug #59774 by Danny van Dyk
+  <kugelfang@gentoo.org>), and the second is a fix to sort on large files
+  reported by: qube99@hotmail.com in bug #39515, and fixed by: Sven Wegener
+  <swegener@gentoo.org>
+
+  15 Aug 2004; Travis Tilley <lv@gentoo.org>
+  +files/003_all_coreutils-gentoo-uname.patch, coreutils-5.2.1-r1.ebuild,
+  coreutils-5.2.1.ebuild:
+  fixed uname -p on amd64
+
+  23 Jul 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0-r2.ebuild,
+  coreutils-5.2.1-r1.ebuild:
+  put a hacky fix for bug #46593 while the sparc team figures out what the
+  actual fix is
+
+  13 Jul 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.1-r1.ebuild:
+  fix b0rked uname patch, closes bug #56866 by Doug Goldstein <cardoe@cardoe.com>
+
+*coreutils-5.2.1-r1 (12 Jul 2004)
+
+  12 Jul 2004; Seemant Kulleen <seemant@gentoo.org>
+  -coreutils-5.0.91-r3.ebuild, +coreutils-5.2.1-r1.ebuild:
+  Fix the sort -M deal, thanks to Sven Wegener <swegener@gentoo.org> in
+  #gentoo-bugs and also bartron@gmx.dein bug #54765 by
+  Thomas Petersen <mendocino@mendo.dk>. Also, fix the s390 stuff as reported in
+  bug #52581 by jochen <jochen.eisinger@gmx.de>. Added the ppc64 stuff into the
+  regular uname patch. Finally, fix the selinux-noacl patch, thanks to Chris
+  PeBenito <pebenito@gentoo.org> via e-mail.
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> coreutils-5.0-r6.ebuild,
+  coreutils-5.0.91-r3.ebuild, coreutils-5.0.91-r4.ebuild:
+  QA - fix use invocation
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> coreutils-5.0-r6.ebuild,
+  coreutils-5.0.91-r3.ebuild, coreutils-5.0.91-r4.ebuild,
+  coreutils-5.2.0-r2.ebuild, coreutils-5.2.1.ebuild:
+  uclibc not dependant on sys-apps/help2man thanks to Peter S. Mazinger
+  <ps.m@gmx.net>. Changed dev.gentoo.org SRC_URI to mirror://gentoo/.
+
+  31 May 2004; Tom Gall <tgall@gentoo.org> coreutils-5.0.91-r4.ebuild:
+  added coreutils-5.0.91-ppc64-1.patch which fixes bug #52617
+
+  17 May 2004; Mike Frysinger <vapier@gentoo.org> coreutils-5.2.1.ebuild:
+  Fixes for uname: no more segfaults for unknown archs #36190, integrate the
+  broken out s390 patch, and add support arm support.
+
+  16 May 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.1.ebuild:
+  fixed the progress bar patch for acl enabled coreutils. Thanks to: Aaron
+  Peterson <alpeterson@wsu.edu> in bug #51244 for pointing it out.
+
+*coreutils-5.2.1 (16 May 2004)
+
+  16 May 2004; Seemant Kulleen <seemant@gentoo.org> -coreutils-5.0-r5.ebuild,
+  -coreutils-5.0.91-r2.ebuild, -coreutils-5.2.0-r1.ebuild,
+  -coreutils-5.2.0.ebuild, +coreutils-5.2.1.ebuild:
+  version bump to latest upstream. This one adds a patch from Sunil
+  <funtoos@yahoo.com> in bug #44403 which allows compilation if MBRTOWC is *not*
+  set.
+
+  16 May 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0-r2.ebuild:
+  Change dependency to autoconf-2.58 or above. This finally fixes the reconf bug
+  #49137
+
+  12 May 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0-r2.ebuild:
+  set autoconf explicitly to 2.5. Should solve bug #49137 by Matt Davis
+  <mdavis2173@comporium.net>
+
+  11 May 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  coreutils-5.2.0-r2.ebuild:
+  Stable on sparc wrt #50400
+
+*coreutils-5.2.0-r2 (07 May 2004)
+
+  07 May 2004; Seemant Kulleen <seemant@gentoo.org>
+  +coreutils-5.2.0-r2.ebuild:
+  version bump, to install /etc/DIR_COLORS. Thanks to Weeve for noticing on
+  sparc, and to SPANKY for being SPANKY.
+
+  22 Apr 2004; Martin Holzer <mholzer@gentoo.org> coreutils-5.2.0-r1.ebuild,
+  coreutils-5.2.0.ebuild:
+  changing src_uri.
+
+*coreutils-5.2.0-r1 (18 Apr 2004)
+
+  18 Apr 2004; Michael McCabe <randy@gentoo.org> +coreutils-5.2.0-r1.ebuild:
+  Adding s390 specific fixes to close bug 47965
+
+  05 Mar 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.2.0.ebuild:
+  added a don't worry blurb to the reconf section
+
+*coreutils-5.2.0 (05 Mar 2004)
+
+  05 Mar 2004; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild,
+  coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild,
+  coreutils-5.0.91-r3.ebuild, coreutils-5.0.91-r4.ebuild,
+  coreutils-5.2.0.ebuild:
+  version bump, should close bug #39632 by SpanKY <vapier@gentoo.org>, who came
+  up with the fixes anyway, and that bug is related to bug #36337 by Robin
+  Johnson <robbat2@gentoo.org>. Also, added attr to the explicit deps, per bug
+  #41641 by toon <toon@hout.vanvergehaald.nl>. Just in case, we're affected by:
+  bug #43655 by Rajiv Manglani <rajiv@gentoo.org>, this release should fix it.
+
+  17 Feb 2004; Tom Gall <tgall@gentoo.org> 
+  coreutils-5.0.91-r4.ebuild:
+  Added ppc64 stable keyword
+
+  03 Feb 2004; Daniel Robbins <drobbins@gentoo.org> coreutils-5.0.91*.ebuild:
+  removed unnecessary append-flags -fPIC from ebuilds.
+  
+  17 Jan 2004; Christian Birchinger <joker@gentoo.org>
+  coreutils-5.0.91-r4.ebuild:
+  Added sparc stable keyword
+
+  15 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r4.ebuild :
+  symlink bin/install to usr/bin/install for Brad House
+
+  14 Jan 2004; Guy Martin <gmsoft@gentoo.org> coreutils-5.0.91-r4.ebuild :
+  Marked stable on hppa to have a working g++ again.
+
+  11 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r4.ebuild:
+  Applied the 64 bit fixes from MDK's newest src.rpm, which seems to solve the
+  segfaults. In my defense, I did do some preliminary testing on -r4 with the
+  previous patchset, and it didn't segfault -- this time, I checked an ls -R /
+  output on both ia64 and amd64 boxes, so this should be sorted finally (bug
+  #37891 by E. Papegaaij <e.papegaaij@student.utwente.nl>). Also, it now links
+  against ncurses-5.3-r5 and greater for building and running. So, we finally
+  get rid of the termcap cruft, thanks to Azarah for that (bug #37026).
+
+  11 Jan 2004; Brad House <brad_mssw@gentoo.org> coreutils-5.0.91-r4.ebuild:
+  coreutils -r4 is not stable on amd64. or at least ls is not. seemant broke it
+  again :/
+
+  09 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r4.ebuild:
+  uniq and split are moved back to /bin because they are needed by the
+  bootscripts (checkroot and functions.sh respectively). Thanks to Norberto
+  Bensa <nbensa@gmx.net> in bug #36453
+
+  09 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r4.ebuild:
+  The ACL patches failed with nls in USE because it was still linking to
+  termcap. Thanks to: Paul Giordano <giordano@covad.net> in bug #37682 opened
+  by: Paul de Vrieze <pauldv@gentoo.org>
+
+*coreutils-5.0.91-r4 (09 Jan 2004)
+
+  09 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r4.ebuild:
+  the patches link against ncurses rather than libtermcap, closing bug #37026 by
+  Martin Flugeldufel <martin_flugeldufel@yahoo.com>. Additionally, some of the
+  non-critical binaries (those not needed for bootup) have been moved to
+  /usr/bin, which partially sorts out bug #36453, also by Martin Flugedufel
+
+  31 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r3.ebuild:
+  make sure to depend on the newest libtermcap stuff
+
+  30 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r2.ebuild, coreutils-5.0.91-r3.ebuild:
+  Added acl, gettext and libtermcap-compat to RDEPEND as well, otherwise that
+  leads to b0rked tbz2's. Thanks to Donny Davies <woodchip@gentoo.org> :)
+
+  30 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r3.ebuild:
+  the lsw patch from mandrake has issues for us on amd64 and ia64, so we don't
+  use it. Thanks to Brad House <brad_mssw@gentoo.org> for noticing
+
+  30 Dec 2003; Brad House <brad_mssw@gentoo.org> coreutils-5.0.91-r3.ebuild:
+  coreutils -r3 is broken bad! See note above KEYWORDS=, marking -*
+
+  29 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r3.ebuild:
+  Added libtermcap-compat to DEPEND string, thanks to rommel in #gentoo-ppc
+
+*coreutils-5.0.91-r3 (29 Dec 2003)
+
+  29 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r3.ebuild:
+  several changes to this. First, we're using most of Mandrake's patchset with
+  fixes, which adds some option to touch -- to make the timestamp move forwards
+  or backwards. I need some input on whether we should keep this. Additionally,
+  there is a patch to restore chown's behaviour to the old way. And another
+  patch to allow old options for several of the utilities here. Additionally,
+  we're using openi18n.org's patches for coreutils, which should sort (no pun
+  intended) out bug #29136 by Sven Sternberger <sven.sternberger@desy.de>
+
+  27 Dec 2003; Seemant Kulleen <seemant@gentoo.org> :
+  fix uname output for hppa and ppc. Patch by Guy Martin <gmsoft@gentoo.org>.
+  Closes bug #36190
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> coreutils-5.0.91-r2.ebuild:
+  Added dependency ppc? ( >=sys-devel/m4-1.4-r1 ).  See bug #35759
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild,
+  coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild:
+  Bartron pointed out the dangers of filtering the flag in the same bug report.
+  So yanking that. USe dangerous flags at your risk, not mine :P
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild,
+  coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild:
+  filter out the malign-double flag, closing bug #35411
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r5.ebuild,
+  coreutils-5.0-r6.ebuild, coreutils-5.0.91-r2.ebuild:
+  patch added to prevent the installation of the following inferior man pages:
+  chgrp, chmod, chown, cp, dd, df, dir, dircolors, du, install, ln, ls, mkdir,
+  mkfifo, mknod, mv, rm, rmdir, touch and vdir. Those man pages will be supplied
+  by the man-pages package instead.  This should close most of bug #32096
+  by Radek Podgorny <radek@podgorny.cz>
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r2.ebuild:
+  make sure it uses automake-1.7 -- closing bug #35425 by Marc Bevand
+  <bevand_m@epita.fr>
+
+*coreutils-5.0-r6 (08 Dec 2003)
+*coreutils-5.0-r5 (08 Dec 2003)
+*coreutils-5.0.91-r2 (08 Dec 2003)
+
+  08 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r3.ebuild,
+  coreutils-5.0-r4.ebuild, coreutils-5.0-r5.ebuild, coreutils-5.0-r6.ebuild,
+  coreutils-5.0.91-r1.ebuild, coreutils-5.0.91-r2.ebuild,
+  coreutils-5.0.91.ebuild:
+  coreutils will now not compile the following: su, groups (both from shadow),
+  uptime, kill (both from procps), and hostname (from net-tools). This
+  closes bug #18181 by Jon Portnoy <avenj@gentoo.org>. Also, the groups
+  thing was bug in #27071 by Marcin Wisnicki <wisnia21@freeshell.org>
+
+  06 Dec 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild,
+  coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild:
+  moved -r3 to stable mips and removed crufty older ebuilds
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> coreutils-5.0.91-r1.ebuild,
+  coreutils-5.0.91.ebuild:
+  adding version number to automake. Closes #33836.
+
+*coreutils-5.0.91-r1 (18 Nov 2003)
+
+  23 Nov 2003; Guy Martin <gmsoft@gentoo.org> coreutils-5.0.91-r1.ebuild :
+  The uname patch now works on hppa.
+
+  18 Nov 2003; Chris PeBenito <pebenito@gentoo.org>
+  coreutils-5.0.91-r1.ebuild:
+  Bump to update SELinux patch. The old patch had a rare segfault/hang problem
+  in ls. Otherwise, same as -r0.
+
+  03 Nov 2003; Daniel Robbins <drobbins@gentoo.org> all of 'em: added missing
+  RDEPEND so they don't default to DEPEND.
+  
+  02 Nov 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r4.ebuild:
+  Missed removing SELinux patch from 5.0-r4
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r1.ebuild,
+  coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0.91.ebuild:
+  Switch SELinux patch from old API to new API.
+
+  01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> coreutils-5.0.91.ebuild:
+  missing help2man dependency
+
+  28 Sep 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0.91.ebuild:
+  Fix selinux patch for 5.0.91.
+
+*coreutils-5.0.91 (28 Sep 2003)
+
+  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0.91.ebuild:
+  Update version. I ported the ACL patches, except for the i18n one, as it gets
+  messy, and there are a lot of Makefile breakage, and also what might be
+  upstream fixes for the same thing. I thus rather think somebody that know a
+  bit more about locale and such that can test it should do this. Same thing for
+  the SELINUX patch - its a lot of small breakages and is tedious - I thought
+  getting this in so far should motivate somebody with more time than me :)
+
+  26 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> coreutils-5.0-r4.ebuild:
+  set ppc in keywords
+
+*coreutils-4.5.11-r1 (24 Sep 2003)
+
+  24 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-4.5.11-r1.ebuild, coreutils-5.0-r1.ebuild,
+  coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0-r4.ebuild:
+  added static to IUSE, closing bug #29186 by Sascha Silbe
+  <sascha-gentoo-bugzilla@silbe.org>
+
+  24 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild,
+  coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0-r4.ebuild:
+  add automake to depends, because it provides aclocal, which is needed to build
+  coreutils. Thanks to Jared Hudso <jhhudso@gentoo.org>
+
+  22 Sep 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r4.ebuild:
+  Ok, was on crack there for a moment - the test for cvs was inverted, should be
+  fixed now.
+
+  22 Sep 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r4.ebuild:
+  Fix issues with gettext's autopoint if cvs is not installed (bug #28920).
+
+  19 Sep 2003; Christian Birchinger <joker@gentoo.org>
+  coreutils-5.0-r3.ebuild:
+  Added sparc stable keyword
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> coreutils-5.0-r4.ebuild :
+  IA64 keywords. And don't believe Seemant - he really isn't an idiot. :)
+
+  14 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r4.ebuild:
+  I'm an idiot sometimes. The progress bar patch was being moved out of the way.
+  Thanks pebenito, and sorry :(
+
+  13 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r4.ebuild:
+  Luca Barbato <lu_zero@gentoo.org> fixed the acl patch to compile with NLS
+  disabled. This should close the NULL not found errors, as reported in bug
+  #18151 by shadow.
+
+  12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r3.ebuild:
+  Added message about removing fileutils, textutils and sh-utils in
+  pkg_postinst. Closes bug #25019 by Chuck Brewer <cbrewer@stealthaccess.net>
+
+*coreutils-5.0-r4 (12 Sep 2003)
+
+  12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r4.ebuild:
+  ACL patches _finally_ added into coreutils.  A note about this.  If "acl"
+  and "selinux" are both in USE, then "selinux" will be preferred and "acl"
+  discarded.  Also, the progress-bar patch has been modified to work with
+  the acl stuff.  This modification was done by: Marcin Wisnicki
+  <wisnia21@freeshell.org> in bug #18151.  What I have done is put the acl
+  patches into the gentoo patch tarball and changed the layout.  Patches are
+  numbered to work with epatch's directory patching functionality, and if
+  acl is used, then the original progresspatch is discarded.  Marked -r3
+  stable on x86.  Bug #18151 by: shadow@ines.ro is now closed.
+
+*coreutils-5.0-r3 (26 Aug 2003)
+
+  26 Aug 2003; Martin Schlemmer <azarah@gentoo.org> Manifest,
+  coreutils-5.0-r3.ebuild:
+  Fix issues with gcc-2.95.3, bug #27329, thanks to patch from TGL
+  <degrenier@easyconnect.fr>.
+
+  25 Aug 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r2.ebuild:
+  Fix selinux patch, as the old patch fails to apply when the progress bar patch
+  is applied.
+
+*coreutils-5.0-r2 (24 Aug 2003)
+
+  24 Aug 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r2.ebuild:
+  adds a patch to display a progress bar for mv and cp (when invoked with the -g
+  option). Thanks to Haukkari in #gentoo for passing this on to us. The patch
+  was authored by: Miika Pekkarinen <miipekk@ihme.org>
+
+  03 Aug 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild,
+  coreutils-5.0.ebuild, files/coreutils-5.0-confdir3.patch:
+  gentoo patch updated to query mips properly for the uname info -- thanks to
+  Kumba
+
+  02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r1.ebuild:
+  Remove confdir3 patch for now.
+
+  02 Aug 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-5.0-r1.ebuild,
+  coreutils-5.0.ebuild:
+  Azarah's brilliance again :) sandbox is disabled for coreutils while
+  portage-2.0.49 has not come out
+
+  01 Aug 2003; Aron Griffis <agriffis@gentoo.org> coreutils-5.0-r1.ebuild,
+  files/coreutils-5.0-confdir3.patch:
+  Fix bug 25702 by refraining from cleaning up PATH_MAX test
+
+*coreutils-5.0-r1 (28 Jul 2003)
+
+  28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-5.0-r1.ebuild:
+  Do not include su infopage, as it is not valid for the su from sys-apps/shadow
+  that we are using (bug #23711).
+
+*coreutils-5.0 (04 Apr 2003)
+
+  04 Apr 2003; Joshua Brindle <method@gentoo.org> coreutils-5.0.ebuild:
+  bumped to upstream stable release version
+
+*coreutils-4.5.11 (20 Mar 2003)
+
+  20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.10.ebuild,
+  coreutils-4.5.11.ebuild, files/coreutils-4.5.10-gentoo-rms.diff,
+  files/coreutils-4.5.10-gentoo-uname.diff,
+  files/coreutils-4.5.9-gentoo-rms.diff,
+  files/coreutils-4.5.9-gentoo-uname.diff:
+  version bump, and moved patches to mirrors
+
+*coreutils-4.5.10 (14 Mar 2003)
+
+  20 Mar 2003; Joshua Brindle <method@gentoo.org> coreutils-4.5.10.ebuild:
+  fixed selinux dependancy
+
+  20 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-4.5.10.ebuild :
+
+  Patched to add selinux, thanks to sindian. Note, I removed the -r1
+  revision bump as it was unnecessary.
+
+  14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.10.ebuild:
+  version bump thanks to drobbins on -core
+
+*coreutils-4.5.9-r1 (11 Mar 2003)
+
+  11 Mar 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-4.5.9-r1.ebuild :
+  Fix overwriting /bin/hostname, and causing /bin/domainname (symlink to
+  /bin/hostname) to set the hostname instead of the domainname.  We use
+  hostname from net-tools after all.  Ditto for /bin/uptime.
+
+  11 Mar 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-4.5.9.ebuild :
+  OK, I am dense.  Seems when I did previous fix, I changed the:
+
+    rm ${D}/usr/share/man/man1/su
+
+  to:
+
+    rm ${D}/usr/share/man/man1/su*
+
+  Fixed this to fix the sum problem.
+
+  11 Mar 2003; Martin Schlemmer <azarah@gentoo.org> coreutils-4.5.9.ebuild :
+  Move symlink stuff till after we remove stuff we do not use, else we have
+  invalid symlinks.  Change einstall to 'make DESTDIR=$D install', else it
+  do not install all the manpages.
+
+  Fix manpages again by manually installing.
 
 *coreutils-4.5.9 (06 Mar 2003)
 
+  11 Mar 2003; Zach Welch <zwelch@gentoo.org> coreutils-4.5.9-r1.ebuild,
+  coreutils-4.5.9.ebuild:
+  add arm keyword
+
   06 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.9.ebuild
   ChangeLog files/digest-coreutils-4.5.9 :
 
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 7565437fa1aa..bf226c0367df 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,5 +1,23 @@
-MD5 220b73db20626f84ad2b2322300287a8 coreutils-4.5.11-r1.ebuild 2505
-MD5 ff7ff0841cddbb2bcdfdb0262ef9449a ChangeLog 2419
-MD5 db449d915f8c7c6da44a94a610c9556a coreutils-5.0.ebuild 2496
-MD5 0ff5f66b1d04c85d2434fa73547e67f3 files/digest-coreutils-4.5.11-r1 207
-MD5 1f151a22e3adc814c28d4b8a54a094a5 files/digest-coreutils-5.0 273
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fec5668aa8fc8fa3d9715fe7acae898d ChangeLog 23240
+MD5 dad6f5e5b11fa505d937744875049b5e coreutils-5.2.1-r2.ebuild 4175
+MD5 d42fe8eb18b6bc0ce5b32a565bbfc5b2 coreutils-5.2.1-r6.ebuild 4579
+MD5 dd55631495154d45d0e5a0fa18f15024 coreutils-5.2.1-r7.ebuild 4585
+MD5 f0af52a774fe8a60ba4cdaf3723bb50d coreutils-5.3.0-r1.ebuild 4167
+MD5 8f5bb1108101fc1688d0d88fdf63be12 coreutils-5.3.0-r2.ebuild 4167
+MD5 8c4e2e82c0b5e6fc4088d1bc496681b4 files/DIR_COLORS 3593
+MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
+MD5 a7f49f56e12b6b16a5c347a666fb9b37 files/digest-coreutils-5.2.1-r6 149
+MD5 c82065025499ef6aec62f772aa8637cf files/digest-coreutils-5.2.1-r7 148
+MD5 897ff60239ed7b2b12ab098b2516a7ac files/digest-coreutils-5.3.0-r1 148
+MD5 6971790215509377129f29b52928ecae files/digest-coreutils-5.3.0-r2 148
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDY0POgIKl8Uu19MoRAqLsAJ9k7P+WR8Sd+wZ/l5us4E9mr1B7NwCfWAvC
++55rRVnzYBMEkDNynmlv5pg=
+=bHJZ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild
index 51b0ec67b94e..470b2a4521f7 100644
--- a/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild
@@ -1,11 +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/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild,v 1.1 2004/08/26 01:50:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
-IUSE="nls build acl selinux static uclibc"
-
 PATCH_VER=0.6
 I18N_VER=i18n-0.2
 PATCHDIR=${WORKDIR}/patch
@@ -13,27 +11,24 @@ PATCHDIR=${WORKDIR}/patch
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
 HOMEPAGE="http://www.gnu.org/software/coreutils/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2
-	mirror://gentoo/${P}-${I18N_VER}.patch.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2"
+	mirror://gentoo/${P}-${I18N_VER}.patch.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ia64 ~ppc64 ~s390"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls build acl selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
-	acl? ( !hppa? ( sys-apps/acl sys-apps/attr ) )
+	acl? ( sys-apps/acl sys-apps/attr )
 	nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.3-r5"
 DEPEND="${RDEPEND}
-	virtual/libc
 	>=sys-apps/portage-2.0.49
 	>=sys-devel/automake-1.8.3
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/m4-1.4-r1
-	!uclibc? ( sys-apps/help2man )"
+	sys-apps/help2man"
 
 src_unpack() {
 	unpack ${A}
@@ -44,6 +39,7 @@ src_unpack() {
 	# Reported upstream, but we don't apply it for now
 	# mv ${PATCHDIR}/mandrake/019* ${PATCHDIR}/excluded
 	mv ${PATCHDIR}/mandrake/025* ${PATCHDIR}/excluded
+	sed -i -e '/rm.*fr/s:\\::' ${PATCHDIR}/mandrake/027_all_coreutils-mdk-build-fix.patch #53881
 	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
 	epatch ${WORKDIR}/${P}-${I18N_VER}.patch
 
@@ -72,6 +68,12 @@ src_unpack() {
 
 	# Sparc32 SMP bug fix -- see bug #46593
 	use sparc && echo -ne "\n\n" >> ${S}/src/pr.c
+
+	# Since we've patched many .c files, the make process will 
+	# try to re-build the manpages by running `./bin --help`.  
+	# When cross-compiling, we can't do that since 'bin' isn't 
+	# a native binary, so let's just install outdated man-pages.
+	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] && touch man/*.1
 }
 
 src_compile() {
diff --git a/sys-apps/coreutils/coreutils-5.2.1-r6.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r6.ebuild
index 23ca491447ef..6d72cfcff042 100644
--- a/sys-apps/coreutils/coreutils-5.2.1-r6.ebuild
+++ b/sys-apps/coreutils/coreutils-5.2.1-r6.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-apps/coreutils/coreutils-5.2.1-r6.ebuild,v 1.1 2005/04/02 04:31:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r6.ebuild,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 PATCH_VER=0.11
 PATCHDIR="${WORKDIR}/patch"
@@ -12,41 +12,40 @@ HOMEPAGE="http://www.gnu.org/software/coreutils/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
 	mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
 	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build acl selinux static uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="acl build nls selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( sys-apps/acl sys-apps/attr )
 	nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.3-r5"
 DEPEND="${RDEPEND}
-	virtual/libc
 	>=sys-apps/portage-2.0.49
 	=sys-devel/automake-1.8*
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/m4-1.4-r1
-	!uclibc? ( sys-apps/help2man )"
+	sys-apps/help2man"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
+	EPATCH_MULTI_MSG="Applying patches from Mandrake ..." \
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/mandrake
 
 	# Apply the ACL patches. 
 	# WARNING: These CONFLICT with the SELINUX patches
 	if use acl ; then
-		mv ${PATCHDIR}/generic/00{1,2,4}* ${PATCHDIR}/excluded
-		mv ${PATCHDIR}/selinux/001_all_coreutils-noacl* ${PATCHDIR}/excluded
-		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
+		mv "${PATCHDIR}"/generic/00{2,4}* "${PATCHDIR}"/excluded
+		mv "${PATCHDIR}"/selinux/001_all_coreutils-noacl* "${PATCHDIR}"/excluded
+		EPATCH_MULTI_MSG="Applying ACL patches ..." \
+		EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/acl
 	else
-		mv ${PATCHDIR}/selinux/001_all_coreutils-acl* ${PATCHDIR}/excluded
+		mv "${PATCHDIR}"/selinux/001_all_coreutils-acl* "${PATCHDIR}"/excluded
 	fi
 
 	# patch to remove Stallman's su/wheel group rant (which doesn't apply,
@@ -54,27 +53,21 @@ src_unpack() {
 	# do not include su infopage, as it is not valid for the su
 	# from sys-apps/shadow that we are using.
 	# Patch to add processor specific info to the uname output
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/generic
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/extra
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/generic
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/extra
+	# Make sure test is +x #87795
+	chmod a+rx tests/sort/sort-mb-tests
 
-	use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
+	use selinux && EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/selinux
 
 	# Sparc32 SMP bug fix -- see bug #46593
-	use sparc && echo -ne "\n\n" >> ${S}/src/pr.c
+	use sparc && echo -ne "\n\n" >> "${S}"/src/pr.c
 
 	# Since we've patched many .c files, the make process will 
 	# try to re-build the manpages by running `./bin --help`.  
 	# When cross-compiling, we can't do that since 'bin' isn't 
 	# a native binary, so let's just install outdated man-pages.
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] && touch man/*.1
-}
-
-src_compile() {
-	if ! type -p cvs > /dev/null ; then
-		# Fix issues with gettext's autopoint if cvs is not installed,
-		# bug #28920.
-		export AUTOPOINT="/bin/true"
-	fi
+	tc-is-cross-compiler && touch man/*.1
 
 	ebegin "Reconfiguring configure scripts (be patient)"
 	export WANT_AUTOMAKE=1.8
@@ -88,12 +81,25 @@ src_compile() {
 	autoconf || die "autoconf"
 	automake || die "automake"
 	eend $?
+}
+
+src_compile() {
+	if ! type -p cvs > /dev/null ; then
+		# Fix issues with gettext's autopoint if cvs is not installed,
+		# bug #28920.
+		export AUTOPOINT="/bin/true"
+	fi
+
+	local myconf=""
+	[[ ${USERLAND} == "GNU" ]] \
+		&& myconf="${myconf} --bindir=/bin" \
+		|| myconf="${myconf} --program-prefix=g"
 
 	econf \
-		--bindir=/bin \
 		--enable-largefile \
 		$(use_enable nls) \
 		$(use_enable selinux) \
+		${myconf} \
 		|| die "econf"
 
 	use static && append-ldflags -static
@@ -113,24 +119,25 @@ src_test() {
 src_install() {
 	make install DESTDIR="${D}" || die
 
-	# add DIRCOLORS
 	insinto /etc
-	doins ${FILESDIR}/DIR_COLORS
-
-	# move non-critical packages into /usr
-	cd "${D}"
-	dodir /usr/bin
-	mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
-	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
-	mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
-	cd bin
-	local x
-	for x in * ; do
-		dosym /bin/${x} /usr/bin/${x}
-	done
+	doins "${FILESDIR}"/DIR_COLORS
+
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# move non-critical packages into /usr
+		cd "${D}"
+		dodir /usr/bin
+		mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
+		mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
+		mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
+		cd bin
+		local x
+		for x in * ; do
+			dosym /bin/${x} /usr/bin/${x}
+		done
+	fi
 
 	if ! use build ; then
-		cd ${S}
+		cd "${S}"
 		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
 	else
 		rm -r "${D}"/usr/share
@@ -138,10 +145,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	[[ ${USERLAND} != "GNU" ]] && return 0
+
 	# hostname does not get removed as it is included with older stage1
 	# tarballs, and net-tools installs to /bin
-	if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
-	then
-		rm -f ${ROOT}/usr/bin/hostname
+	if [[ -e ${ROOT}/usr/bin/hostname && ! -L ${ROOT}/usr/bin/hostname ]] ; then
+		rm -f "${ROOT}"/usr/bin/hostname
 	fi
 }
diff --git a/sys-apps/coreutils/coreutils-5.2.1-r7.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r7.ebuild
index 2cd0a5a59dfe..2fa86596bb7c 100644
--- a/sys-apps/coreutils/coreutils-5.2.1-r7.ebuild
+++ b/sys-apps/coreutils/coreutils-5.2.1-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/sys-apps/coreutils/coreutils-5.2.1-r7.ebuild,v 1.1 2005/08/30 00:31:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r7.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="acl build nls selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	=sys-devel/automake-1.8*
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/m4-1.4-r1
-	!elibc_uclibc? ( sys-apps/help2man )"
+	sys-apps/help2man"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/coreutils/coreutils-5.3.0-r1.ebuild b/sys-apps/coreutils/coreutils-5.3.0-r1.ebuild
index f3aa0a6e9dbc..bb45daec24b6 100644
--- a/sys-apps/coreutils/coreutils-5.3.0-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-5.3.0-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/sys-apps/coreutils/coreutils-5.3.0-r1.ebuild,v 1.1 2005/08/30 23:53:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.3.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-PATCH_VER=1.1
+PATCH_VER=1.3
 
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
 HOMEPAGE="http://www.gnu.org/software/coreutils/"
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	=sys-devel/automake-1.8*
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/m4-1.4-r1
-	!elibc_uclibc? ( sys-apps/help2man )"
+	sys-apps/help2man"
 
 src_unpack() {
 	unpack ${A}
@@ -61,7 +61,6 @@ src_unpack() {
 	ebegin "Reconfiguring configure scripts (be patient)"
 	export WANT_AUTOMAKE=1.8
 	export WANT_AUTOCONF=2.5
-	rm m4/inttypes.m4
 	aclocal -I m4 || die "aclocal"
 	autoconf || die "autoconf"
 	automake || die "automake"
diff --git a/sys-apps/coreutils/coreutils-5.3.0-r2.ebuild b/sys-apps/coreutils/coreutils-5.3.0-r2.ebuild
index fdbe48f7bfc1..013bed71560f 100644
--- a/sys-apps/coreutils/coreutils-5.3.0-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-5.3.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/sys-apps/coreutils/coreutils-5.3.0-r2.ebuild,v 1.1 2005/10/05 00:19:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.3.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	=sys-devel/automake-1.8*
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/m4-1.4-r1
-	!elibc_uclibc? ( sys-apps/help2man )"
+	sys-apps/help2man"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/coreutils/files/DIR_COLORS b/sys-apps/coreutils/files/DIR_COLORS
index eff27d451374..c567dd39c0d5 100644
--- a/sys-apps/coreutils/files/DIR_COLORS
+++ b/sys-apps/coreutils/files/DIR_COLORS
@@ -3,25 +3,10 @@
 #
 # You can copy this file to .dir_colors in your $HOME directory to override
 # the system defaults.
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/files/DIR_COLORS,v 1.1 2004/05/14 04:08:10 vapier Exp $
-
-# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
-# pipes. 'all' adds color characters to all output. 'none' shuts colorization
-# off.
-COLOR tty
-
-# Extra command line options for ls go here.
-# Basically these ones are:
-#  -F = show '/' for dirs, '*' for executables, etc.
-#  -T 0 = don't trust tab spacing when formatting ls output.
-OPTIONS -F -T 0
 
 # Below, there should be one TERM entry for each termtype that is colorizable
-TERM linux
-TERM linux-c
-TERM mach-color
-TERM console
+TERM ansi
+TERM color-xterm
 TERM con132x25
 TERM con132x30
 TERM con132x43
@@ -33,21 +18,30 @@ TERM con80x43
 TERM con80x50
 TERM con80x60
 TERM cons25
-TERM xterm
-TERM xterm-color
-TERM xterm-debian
-TERM color-xterm
-TERM color_xterm
+TERM console
+TERM cygwin
+TERM dtterm
+TERM Eterm
+TERM gnome
+TERM konsole
+TERM kterm
+TERM linux
+TERM linux-c
+TERM mach-color
+TERM putty
 TERM rxvt
+TERM rxvt-cygwin
+TERM rxvt-cygwin-native
+TERM rxvt-unicode
 TERM screen
+TERM screen-bce
 TERM screen-w
+TERM screen.linux
 TERM vt100
-TERM dtterm
-TERM ansi
-TERM Eterm
-
-# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
-EIGHTBIT 1
+TERM xterm
+TERM xterm-256color
+TERM xterm-color
+TERM xterm-debian
 
 # Below are the color init strings for the basic file types. A color init
 # string consists of one or more of the following numeric codes:
@@ -57,16 +51,16 @@ EIGHTBIT 1
 # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
 # Background color codes:
 # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-NORMAL 00	# global default, although everything should be something.
-FILE 00 	# normal file
-DIR 01;34 	# directory
-LINK 01;36 	# symbolic link.  (If you set this to 'target' instead of a
-            # numerical value, the color is as for the file pointer to.)
-FIFO 40;33	# pipe
-SOCK 01;35	# socket
-DOOR 01;35	# door
-BLK 40;33;01	# block device driver
-CHR 40;33;01 	# character device driver
+NORMAL 00           # global default, although everything should be something.
+FILE 00             # normal file
+DIR 01;34           # directory
+LINK 01;36          # symbolic link.  (If you set this to 'target' instead of a
+                    # numerical value, the color will match the file pointed to)
+FIFO 40;33          # pipe
+SOCK 01;35          # socket
+DOOR 01;35          # door
+BLK 40;33;01        # block device driver
+CHR 40;33;01        # character device driver
 ORPHAN 01;05;37;41  # orphaned syminks
 MISSING 01;05;37;41 # ... and the files they point to
 
@@ -85,7 +79,7 @@ EXEC 01;32
 .sh  01;32
 .csh 01;32
 
-.tar 01;31 # archives or compressed (bright red)
+.tar 01;31 # archives / compressed (bright red)
 .tgz 01;31
 .arj 01;31
 .taz 01;31
@@ -96,12 +90,16 @@ EXEC 01;32
 .gz  01;31
 .bz2 01;31
 .bz  01;31
+.tbz2 01;31
 .tz  01;31
 .deb 01;31
 .rpm 01;31
-.rar 01;31
-.ace 01;31
-.cpio 01;31
+.rar 01;31		# app-arch/rar
+.ace 01;31		# app-arch/unace
+.zoo 01;31		# app-arch/zoo
+.cpio 01;31		# app-arch/cpio
+.7z  01;31		# app-arch/p7zip
+.rz  01;31		# app-arch/rzip
 
 .jpg 01;35 # image formats
 .jpeg 01;35
@@ -136,3 +134,21 @@ EXEC 01;32
 .fli 01;35  # AutoDesk Animator
 .gl 01;35
 .dl 01;35
+
+.pdf 00;32 # Document files
+.ps 00;32
+.txt 00;32
+.patch 00;32
+.diff 00;32
+.log 00;32
+.tex 00;32
+.doc 00;32
+
+.mp3 00;36 # Audio files
+.wav 00;36
+.mid 00;36
+.midi 00;36
+.au 00;36
+.ogg 00;36
+.flac 00;36
+.aac 00;36
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r6 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r6
index cf9ba0978764..7f3dc729ab0b 100644
--- a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r6
+++ b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r6
@@ -1,2 +1,2 @@
 MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
-MD5 2f00d63408014394a74708198d5989a7 coreutils-5.2.1-patches-0.11.tar.bz2 92045
+MD5 7c84ee1692c3cb068b7069321444556e coreutils-5.2.1-patches-0.11.tar.bz2 91118
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.3.0-r1 b/sys-apps/coreutils/files/digest-coreutils-5.3.0-r1
index 09ef80a66eaf..ff2ebc2996fd 100644
--- a/sys-apps/coreutils/files/digest-coreutils-5.3.0-r1
+++ b/sys-apps/coreutils/files/digest-coreutils-5.3.0-r1
@@ -1,2 +1,2 @@
 MD5 903890208248639ac723d2c4988e04bd coreutils-5.3.0.tar.bz2 4473010
-MD5 7641a2e15d974ae604d72f24bc173ead coreutils-5.3.0-patches-1.1.tar.bz2 54039
+MD5 15038f61180579cbb9385d3ce9777bf3 coreutils-5.3.0-patches-1.3.tar.bz2 55111
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/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-apps/count/ChangeLog b/sys-apps/count/ChangeLog
index 514006b951dc..027d7385b6ee 100644
--- a/sys-apps/count/ChangeLog
+++ b/sys-apps/count/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/count
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/count/ChangeLog,v 1.1 2005/01/07 23:09:57 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/count/ChangeLog,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 *count-1.20 (07 Jan 2005)
 
diff --git a/sys-apps/count/Manifest b/sys-apps/count/Manifest
index cf64e131138a..3404850e3567 100644
--- a/sys-apps/count/Manifest
+++ b/sys-apps/count/Manifest
@@ -1,4 +1,14 @@
-MD5 6117dbffeff1fed9b875b7f36ba78226 count-1.20.ebuild 516
-MD5 b569bfa4bf7e5a21b59def541bb4ae83 metadata.xml 369
-MD5 a1c87eea12ec07569cd4d7649f7f9cbd ChangeLog 200
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d0a09068157e224b73c8c913ada5c9e count-1.20.ebuild 610
+MD5 0581c811d58f06818a0d9390a29d5eba ChangeLog 396
+MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
 MD5 dfad8adc48ab4c9815c2a20853b73aca files/digest-count-1.20 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCf2XmI1lqEGTUzyQRAkPPAJ9bfif2qNuBN2IEI0h9sipzfxnTcwCfcNUm
+MOAi4nez21qNC7+3mxDvGok=
+=EjZH
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/count/count-1.20.ebuild b/sys-apps/count/count-1.20.ebuild
index eba1277f62cc..e9adc76a103d 100644
--- a/sys-apps/count/count-1.20.ebuild
+++ b/sys-apps/count/count-1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/count/count-1.20.ebuild,v 1.1 2005/01/07 23:09:57 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/count/count-1.20.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/count/metadata.xml b/sys-apps/count/metadata.xml
index fa65af46be4e..71d7ba9c0605 100644
--- a/sys-apps/count/metadata.xml
+++ b/sys-apps/count/metadata.xml
@@ -4,7 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>stuart@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/sys-apps/cpint/ChangeLog b/sys-apps/cpint/ChangeLog
index 11c51e672c5e..90f0dbdede90 100644
--- a/sys-apps/cpint/ChangeLog
+++ b/sys-apps/cpint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/cpint
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/ChangeLog,v 1.1 2004/04/20 20:13:13 randy Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/ChangeLog,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> cpint-1.1.6.ebuild:
+  sync IUSE (missing), trim trailing whitespace
+
+*cpint-1.1.6 (20 Apr 2004)
 
   20 Apr 2004; Michael McCabe <randy@gentoo.org> :
   Initial Commit. Submitted by Jochen Eisinger jochen.eisinger@gmx.de
diff --git a/sys-apps/cpint/Manifest b/sys-apps/cpint/Manifest
index a35a662765f0..4a928028bbca 100644
--- a/sys-apps/cpint/Manifest
+++ b/sys-apps/cpint/Manifest
@@ -1,2 +1,4 @@
-MD5 4592de78838a90736343e2095c9d48f2 cpint-1.1.6.ebuild 687
+MD5 c018e4717a62c9b5f1ddf4e3d0b47d1a ChangeLog 472
+MD5 e35397a845f3db15f80c763231bf4da3 metadata.xml 306
+MD5 ad6dad4687e0d9c03b3f16671198c2f2 cpint-1.1.6.ebuild 782
 MD5 3162e9d8ca878a18ed17a6800d29048e files/digest-cpint-1.1.6 56
diff --git a/sys-apps/cpint/cpint-1.1.6.ebuild b/sys-apps/cpint/cpint-1.1.6.ebuild
index 0829e66b2cf9..22f5574b023c 100644
--- a/sys-apps/cpint/cpint-1.1.6.ebuild
+++ b/sys-apps/cpint/cpint-1.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/cpint-1.1.6.ebuild,v 1.1 2004/04/20 20:13:13 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpint/cpint-1.1.6.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 MY_PV=${PV//./}
 
@@ -9,6 +9,7 @@ SRC_URI="http://linuxvm.org/Patches/s390/${PN}${MY_PV}.tgz"
 HOMEPAGE="http://linuxvm.org/Patches/index.html"
 LICENSE="GPL-2"
 KEYWORDS="s390"
+IUSE=""
 SLOT="${KV}"
 DEPEND=""
 
@@ -28,5 +29,3 @@ src_install() {
 	rm -rf ${D}/lib/modules/misc
 	dodoc ChangeLog HOW-TO
 }
-
-
diff --git a/sys-apps/cracklib-words/ChangeLog b/sys-apps/cracklib-words/ChangeLog
index fcb3d2a1c246..66010fda62ab 100644
--- a/sys-apps/cracklib-words/ChangeLog
+++ b/sys-apps/cracklib-words/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/cracklib-words
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cracklib-words/ChangeLog,v 1.1 2005/02/12 20:21:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cracklib-words/ChangeLog,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 *cracklib-words-1.1 (12 Feb 2004)
 
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index e77a89597eca..4d62354d5cf0 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,4 +1,4 @@
-MD5 b8f7b791b95841081f44218e7200d910 ChangeLog 210
-MD5 664d393ce2c056c10b77f1de646532fc metadata.xml 258
-MD5 8ea3da91ec7d95b5d04be4f082b7c794 cracklib-words-1.1.ebuild 487
-MD5 5d131f39c8a4f1a2b378ca97d81f02aa files/digest-cracklib-words-1.1 63
+MD5 93bd03e57b95783f838d1bb5457a14b7 ChangeLog 349
+MD5 0e1ec439a4cb3d009907a9147bd42a43 cracklib-words-1.1.ebuild 603
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 24b74cfecb980af5b827fbbc40492033 files/digest-cracklib-words-1.1 63
diff --git a/sys-apps/cracklib-words/cracklib-words-1.1.ebuild b/sys-apps/cracklib-words/cracklib-words-1.1.ebuild
index eca343db015c..d91357d629c4 100644
--- a/sys-apps/cracklib-words/cracklib-words-1.1.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-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/sys-apps/cracklib-words/cracklib-words-1.1.ebuild,v 1.1 2005/02/12 20:21:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cracklib-words/cracklib-words-1.1.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 DESCRIPTION="large set of crack/cracklib dictionaries"
 HOMEPAGE="http://sourceforge.net/projects/cracklib"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/cracklib/${PN}.gz"
 
 LICENSE="public-domain"
 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=""
 
 DEPEND=""
diff --git a/sys-apps/cracklib-words/files/digest-cracklib-words-1.1 b/sys-apps/cracklib-words/files/digest-cracklib-words-1.1
index ed0721ae31a4..2332679056cd 100644
--- a/sys-apps/cracklib-words/files/digest-cracklib-words-1.1
+++ b/sys-apps/cracklib-words/files/digest-cracklib-words-1.1
@@ -1 +1 @@
-MD5 d18e670e5df560a8745e1b4dede8f84f cracklib-words.gz 4433906
+MD5 575a44add4db95b43c7abb46b307950f cracklib-words.gz 4559371
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 26a89d4a618f..c34b1d260e40 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,262 @@
 # ChangeLog for sys-apps/dbus
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.1 2003/06/22 01:34:44 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
+
+  08 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org> files/dbus:
+  fixed init-script.
+
+*dbus-0.50-r1 (08 Nov 2005)
+
+  08 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> files/dbus,
+  +dbus-0.50-r1.ebuild:
+  Changing the initscript (with revbump).  Minor cosmetic changes (changed to
+  doinit).
+
+  07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> dbus-0.50.ebuild:
+  Don't enable dnotify for every system, but just when using Linux kernel, as
+  it's a Linux feature.
+
+  07 Nov 2005; Steev Klimaszewski <steev@gentoo.org> dbus-0.36.2.ebuild,
+  dbus-0.50.ebuild:
+  Change the path for the system socket back into /var/run/dbus/
+  This fixeds Bug #96451.  Thanks to joem for pointing it out, as 
+  well as kwant <qbit.interia.pl> for filing the bug.
+
+*dbus-0.50 (07 Nov 2005)
+
+  07 Nov 2005; Steev Klimaszewski <steev@gentoo.org>
+  +files/dbus-dnotify_configure-01.diff,
+  +files/dbus-dnotify_watchdirs-01.diff, +dbus-0.50.ebuild:
+  Version bump.  Add patches to fix dnotify support.
+
+  05 Nov 2005; Stephen P. Becker <geoman@gentoo.org> dbus-0.36.2.ebuild:
+  added ~mips keyword
+
+  01 Nov 2005; Doug Goldstein <cardoe@gentoo.org> dbus-0.36.2.ebuild:
+  make dbus depend on gtk+ 2.6 while they claim gtk+ 2.0, they use 2.6 API
+  calls. fixes bug #111118
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> dbus-0.23.4-r1.ebuild:
+  added ~mips keyword
+
+  15 Sep 2005; <dang@gentoo.org> dbus-0.23.4-r1.ebuild:
+  Make hal not pass /bin/false as a shell to ecommit. Bug #103421
+
+*dbus-0.36.2 (10 Sep 2005)
+
+  10 Sep 2005; Doug Goldstein <cardoe@gentoo.org> -dbus-0.36.1.ebuild,
+  +dbus-0.36.2.ebuild:
+  Rev Bump for security reasons
+
+  26 Aug 2005; Doug Goldstein <cardoe@gentoo.org> dbus-0.36.1.ebuild:
+  Fixing bug #103421
+
+*dbus-0.36.1 (25 Aug 2005)
+
+  25 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -dbus-0.36.ebuild,
+  +dbus-0.36.1.ebuild:
+  rev bump. Should fix amd64 issues. bug #103601
+
+*dbus-0.36 (24 Aug 2005)
+
+  24 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -dbus-0.35.2.ebuild,
+  +dbus-0.36.ebuild:
+  revision bump. Make sure we're using the messagebus user as well.
+
+*dbus-0.35.2 (18 Aug 2005)
+
+  18 Aug 2005; Doug Goldstein <cardoe@gentoo.org> metadata.xml,
+  +dbus-0.35.2.ebuild:
+  added dbus 0.35.2 to tree, p.mask'd as per Gnome herd's request
+  added self to maintainership to receive the issues
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> dbus-0.23-r3.ebuild,
+  dbus-0.23.4-r1.ebuild:
+  Stable on hppa.
+
+  22 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> dbus-0.23-r3.ebuild:
+  Stable on sparc
+
+*dbus-0.23.4-r1 (14 Jul 2005)
+
+  14 Jul 2005; Marinus Schraal <foser@gentoo.org> dbus-0.23.4-r1.ebuild :
+  Fix location of system socket (#96451)
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> dbus-0.23-r3.ebuild,
+  dbus-0.23.2.ebuild, dbus-0.23.2-r1.ebuild:
+  Fix qt dep
+
+*dbus-0.23.4 (15 Mar 2005)
+
+  15 Mar 2005; foser <foser@gentoo.org> dbus-0.23.4.ebuild :
+  New release, fix qt dep (#84256)
+
+  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org> files/dbus:
+  Fix rcscript to not clobber return of stop() due to existance of pidfile or
+  not.
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> dbus-0.23-r3.ebuild,
+  dbus-0.23.2-r1.ebuild, dbus-0.23.2.ebuild:
+  mono moved from dev-dotnet -> dev-lang
+
+*dbus-0.23.2-r1 (06 Mar 2005)
+
+  06 Mar 2005; foser <foser@gentoo.org> dbus-0.23.2-r1.ebuild :
+  Add patch to fix abi/api issues (#83979)
+  Add session launch script (#77504)
+
+*dbus-0.23.2 (03 Mar 2005)
+
+  03 Mar 2005; foser <foser@gentoo.org> dbus-0.23.2.ebuild :
+  New release (#81794)
+  Add patch to work around mono lib versioning problem (#81794)
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> dbus-0.23-r3.ebuild:
+  Added ~sparc keyword.
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> dbus-0.23-r3.ebuild:
+  stable on ia64 #80601
+
+  11 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> dbus-0.23-r3.ebuild:
+  stable on amd64. see #80601
+
+  10 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> dbus-0.23-r3.ebuild:
+  Stable on ppc.
+
+  10 Feb 2005; Markus Rothe <corsair@gentoo.org> dbus-0.23-r3.ebuild:
+  Stable on ppc64; bug #80601
+
+*dbus-0.23-r3 (09 Feb 2005)
+
+  09 Feb 2005; foser <foser@gentoo.org> dbus-0.23-r3.ebuild :
+  Bump to remove mono dep (still ~arch :/) so we can mark stable
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/dbus-0.23-pyexecdir.patch, dbus-0.23-r2.ebuild:
+  Multilib fix for python.
+
+*dbus-0.23-r2 (06 Feb 2005)
+
+  06 Feb 2005; foser <foser@gentoo.org> dbus-0.23-r2.ebuild :
+  Add include fix (#78617)
+  Add fix for unsafe default permissions (#80601)
+  Fix the X switch to actually work
+
+  20 Jan 2005; Aron Griffis <agriffis@gentoo.org> dbus-0.22-r1.ebuild,
+  dbus-0.22-r2.ebuild, dbus-0.22-r3.ebuild, dbus-0.23-r1.ebuild:
+  mark 0.22-r1 stable on ia64; add ~ia64 to the rest
+
+*dbus-0.23-r1 (21 Jan 2005)
+
+  21 Jan 2005; foser <foser@gentoo.org> dbus-0.23-r1.ebuild :
+  Keep the right services dir
+
+  13 Jan 2005; Heinrich Wendel <lanius@gentoo.org> +files/dbus-0.23-qt.patch,
+  dbus-0.23.ebuild:
+  fix qt again
+
+*dbus-0.23 (13 Jan 2005)
+
+  13 Jan 2005; foser <foser@gentoo.org> dbus-0.23.ebuild :
+  New release, minor ebuild fixes
+  Add some touch statements for #77833
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> dbus-0.22-r1.ebuild:
+  Stable on amd64.
+
+*dbus-0.22-r3 (29 Dec 2004)
+
+  29 Dec 2004; Heinrich Wendel <lanius@gentoo.org> +files/dbus-0.22-qt.patch,
+  +dbus-0.22-r3.ebuild:
+  readd qt support, bug #65504
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> dbus-0.22-r2.ebuild:
+  Stable on ppc64
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org> dbus-0.22-r1.ebuild,
+  dbus-0.22-r2.ebuild:
+  Keyworded ppc for GNOME 2.8
+
+  08 Nov 2004; Markus Rothe <corsair@gentoo.org> dbus-0.22-r2.ebuild:
+  Marked ~ppc64
+
+*dbus-0.22-r2 (31 Oct 2004)
+
+  31 Oct 2004; foser <foser@gentoo.org> dbus-0.22-r2.ebuild :
+  Re-enable mono USE
+  Add a couple of patches to get the mono bindings up to par
+
+  29 Oct 2004; foser <foser@gentoo.org> dbus-0.22-r1.ebuild :
+  Disable mono USE, so we can mark stable
+
+  21 Oct 2004; Aron Griffis <agriffis@gentoo.org> dbus-0.22-r1.ebuild:
+  add ~ia64
+
+  15 Oct 2004; foser <foser@gentoo.org> dbus-0.22-r1.ebuild :
+  Disable qt bindings for now (#65504)
+  Fix LICENSE
+
+*dbus-0.22-r1 (21 Sep 2004)
+
+  21 Sep 2004; foser <foser@gentoo.org> dbus-0.22-r1.ebuild :
+  Add python bindings patch to make hal-device-manager work
+  Add inherit python for the python modules
+
+  18 Sep 2004; Travis Tilley <lv@gentoo.org> dbus-0.22.ebuild:
+  added a fix that gets around a lib64 sandbox bug and added ~amd64 keyword
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> dbus-0.22.ebuild:
+  Masked dbus-0.22.ebuild stable for ppc
+
+*dbus-0.22 (17 Aug 2004)
+
+  17 Aug 2004; foser <foser@gentoo.org> dbus-0.22.ebuild :
+  Readd mono & libxml2 building
+  Fix licensing to dual GPL-2 AFL-2.1 (#60280)
+  Fix init script to also work when a user session is running, thanks to Marcel Martin (#60280)
+  Set the session socket dir to /tmp (should probably be reconsidered)
+  Disable doc building, it works halfway but doesn't get installed right
+
+  11 Aug 2004; foser <foser@gentoo.org> dbus-0.21.ebuild :
+  Add messagebus user creation (#52462)
+
+  08 Aug 2004; David Holm <dholm@gentoo.org> dbus-0.21.ebuild:
+  Added to ~ppc.
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> dbus-0.21.ebuild:
+  QA - fix use invocation
+
+*dbus-0.21 (07 Apr 2004)
+
+  07 Apr 2004; foser <foser@gentoo.org> dbus-0.21.ebuild :
+  Overhaul of the whole ebuild, lots of cleanups.
+  Fixed deps (#43806)
+  Fixed api doc building & installation
+  Added init script & postinst note (#46101)
+  Added myself as maintainer for this package to metadat
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> dbus-0.20.ebuild:
+  Remove all KEYWORDS other than ~x86, since none of the support stuff (i.e.
+  mono) is marked on the other platforms
+
+*dbus-0.20 (04 Dec 2003)
+
+  04 Dec 2003; Seemant Kulleen <seemant@gentoo.org> dbus-0.12.ebuild,
+  dbus-0.20.ebuild:
+  version bump. Ebuild provided by: James Dumay <i386@sauceage.org> in bug
+  #35301
+
+  14 Nov 2003; Seemant Kulleen <seemant@gentoo.org> dbus-0.13.ebuild:
+  qt disabled, because the bindings are broken currently
+
+*dbus-0.13 (03 Oct 2003)
+
+  03 Oct 2003; Seemant Kulleen <seemant@gentoo.org> dbus-0.13.ebuild:
+  version bump
+
+*dbus-0.12 (12 Sep 2003)
+  12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> :
+  version bump
 
 *dbus-0.11 (21 Jun 2003)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 7d8fb432068f..594595814597 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,2 +1,29 @@
-MD5 9ac76de7edbf78199600fd282e163d88 dbus-0.11.ebuild 471
-MD5 b034e8f25d00e0214f5598e374516546 files/digest-dbus-0.11 61
+MD5 d581d037cc738857b76db1250ee80e57 ChangeLog 8750
+MD5 fab22de6cb9a5cf7e0abedfe77c9b04a dbus-0.23-r3.ebuild 3246
+MD5 fedfd2a1281d8773038a8036a2a75ef8 dbus-0.23.2-r1.ebuild 3454
+MD5 321657dd580453465e0cab3102a92e98 dbus-0.23.2.ebuild 3242
+MD5 fc8c0f943b0a6462694f8f3874a2db6c dbus-0.23.4-r1.ebuild 3448
+MD5 bb8292b02298d653808cb0d0edd271da dbus-0.23.4.ebuild 3413
+MD5 f127ffa8cdc75cbd0befadcb16d08401 dbus-0.36.2.ebuild 3620
+MD5 36c0119912a6585c12c8ef05b9687074 dbus-0.50-r1.ebuild 3749
+MD5 0a1ae7c5d57aceed3246ab0627f0c356 dbus-0.50.ebuild 3767
+MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
+MD5 2a21cd128b106bc728a0566c13e727e3 files/dbus 938
+MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
+MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
+MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131
+MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816
+MD5 9308d3d8014ebf53a946c6219675ffc3 files/dbus-0.23.2-abi_api.patch 1893
+MD5 c66dfd4b07508de75f541b24035b74af files/dbus-0.23.2-python_api.patch 571
+MD5 038de28fe446b2303c072e96df531500 files/dbus-0.23.2-version_fix.patch 496
+MD5 4fd89997ba6101161202f761bb666167 files/dbus-dnotify_configure-01.diff 2197
+MD5 6f02f0df54613a9e34a452b1c8d92ecb files/dbus-dnotify_watchdirs-01.diff 1252
+MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r3 62
+MD5 dd13fcb75ab8edf4c308de6a66f2b3e3 files/digest-dbus-0.23.2 64
+MD5 dd13fcb75ab8edf4c308de6a66f2b3e3 files/digest-dbus-0.23.2-r1 64
+MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4 64
+MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4-r1 64
+MD5 19d40bbc05e7cf89bf6d023540874468 files/digest-dbus-0.36.2 64
+MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50 62
+MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
+MD5 41b60b877b1e6ea53476ff69c5ed77d3 metadata.xml 282
diff --git a/sys-apps/dbus/dbus-0.23-r3.ebuild b/sys-apps/dbus/dbus-0.23-r3.ebuild
index 804312201821..fd2e8aec992f 100644
--- a/sys-apps/dbus/dbus-0.23-r3.ebuild
+++ b/sys-apps/dbus/dbus-0.23-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-apps/dbus/dbus-0.23-r3.ebuild,v 1.1 2005/02/09 22:53:09 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib
@@ -15,7 +15,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="x86 ~ppc ~amd64 ~ppc64 ~ia64"
+KEYWORDS="x86 ppc amd64 ppc64 ia64 sparc hppa"
 
 RDEPEND=">=dev-libs/glib-2
 	xml2? ( >=dev-libs/libxml2-2.6 )
@@ -24,9 +24,9 @@ RDEPEND=">=dev-libs/glib-2
 	gtk? ( >=x11-libs/gtk+-2 )
 	python? ( >=dev-lang/python-2.2
 		>=dev-python/pyrex-0.9 )
-	qt? ( >=x11-libs/qt-3 )"
+	qt? ( =x11-libs/qt-3* )"
 #	!ppc64? (
-#		mono? ( >=dev-dotnet/mono-0.95 )
+#		mono? ( >=dev-lang/mono-0.95 )
 #	)
 
 
diff --git a/sys-apps/dbus/dbus-0.23.2-r1.ebuild b/sys-apps/dbus/dbus-0.23.2-r1.ebuild
index 713ffb0123b1..047ee4fa8153 100644
--- a/sys-apps/dbus/dbus-0.23.2-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.23.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-apps/dbus/dbus-0.23.2-r1.ebuild,v 1.1 2005/03/06 21:59:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib
@@ -24,9 +24,9 @@ RDEPEND=">=dev-libs/glib-2
 	gtk? ( >=x11-libs/gtk+-2 )
 	python? ( >=dev-lang/python-2.2
 		>=dev-python/pyrex-0.9 )
-	qt? ( >=x11-libs/qt-3 )
+	qt? ( =x11-libs/qt-3* )
 	!ppc64? (
-		mono? ( >=dev-dotnet/mono-0.95 )
+		mono? ( >=dev-lang/mono-0.95 )
 	)"
 
 
diff --git a/sys-apps/dbus/dbus-0.23.2.ebuild b/sys-apps/dbus/dbus-0.23.2.ebuild
index d792aeb9bb11..6eb0ff454149 100644
--- a/sys-apps/dbus/dbus-0.23.2.ebuild
+++ b/sys-apps/dbus/dbus-0.23.2.ebuild
@@ -1,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-apps/dbus/dbus-0.23.2.ebuild,v 1.1 2005/03/02 23:49:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.2.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib
@@ -24,9 +24,9 @@ RDEPEND=">=dev-libs/glib-2
 	gtk? ( >=x11-libs/gtk+-2 )
 	python? ( >=dev-lang/python-2.2
 		>=dev-python/pyrex-0.9 )
-	qt? ( >=x11-libs/qt-3 )
+	qt? ( =x11-libs/qt-3* )
 	!ppc64? (
-		mono? ( >=dev-dotnet/mono-0.95 )
+		mono? ( >=dev-lang/mono-0.95 )
 	)"
 
 
@@ -51,7 +51,7 @@ src_unpack() {
 
 	# It stupidly tries to install python stuff to platform-independent
 	# libdir
-	epatch ${FILESDIR}/dbus-0.23-pyexecdir.patch
+#	epatch ${FILESDIR}/dbus-0.23-pyexecdir.patch
 
 	# Don't rerun auto*
 	sleep 1
diff --git a/sys-apps/dbus/dbus-0.23.4-r1.ebuild b/sys-apps/dbus/dbus-0.23.4-r1.ebuild
index 0f57f5458ed5..ba1e3bcffbf1 100644
--- a/sys-apps/dbus/dbus-0.23.4-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.23.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/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.1 2005/07/13 22:38:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib
@@ -15,7 +15,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64 ~sparc"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-libs/glib-2
 	xml2? ( >=dev-libs/libxml2-2.6 )
@@ -133,7 +133,7 @@ src_install() {
 pkg_preinst() {
 
 	enewgroup messagebus || die "Problem adding messagebus group"
-	enewuser messagebus -1 /bin/false /dev/null messagebus || die "Problem adding messagebus user"
+	enewuser messagebus -1 "-1" /dev/null messagebus || die "Problem adding messagebus user"
 
 }
 
diff --git a/sys-apps/dbus/dbus-0.23.4.ebuild b/sys-apps/dbus/dbus-0.23.4.ebuild
index 785f567f8293..cc686b1203d8 100644
--- a/sys-apps/dbus/dbus-0.23.4.ebuild
+++ b/sys-apps/dbus/dbus-0.23.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-apps/dbus/dbus-0.23.4.ebuild,v 1.1 2005/03/15 22:30:20 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.4.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib
diff --git a/sys-apps/dbus/dbus-0.36.2.ebuild b/sys-apps/dbus/dbus-0.36.2.ebuild
index 5a3dc205ce51..452063ef0751 100644
--- a/sys-apps/dbus/dbus-0.36.2.ebuild
+++ b/sys-apps/dbus/dbus-0.36.2.ebuild
@@ -1,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-apps/dbus/dbus-0.36.2.ebuild,v 1.1 2005/09/10 06:42:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.36.2.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 inherit eutils mono python multilib debug
 
@@ -12,7 +12,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64 ~sparc"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-libs/glib-2.6
 	xml2? ( dev-libs/libxml2 )
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		x11-libs/libX11
 		)
 	virtual/x11 ) )
-	gtk? ( >=x11-libs/gtk+-2 )
+	gtk? ( >=x11-libs/gtk+-2.6 )
 	python? ( >=dev-lang/python-2.4
 		>=dev-python/pyrex-0.9.3-r2 )
 	qt? ( =x11-libs/qt-3* )
@@ -78,7 +78,7 @@ src_compile() {
 		--enable-checks \
 		--enable-asserts \
 		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-system-socket=/var/dbus/dbus/system_bus_socket \
 		--with-session-socket-dir=/tmp \
 		--with-dbus-user=messagebus \
 		`use_enable doc doxygen-docs` \
@@ -117,7 +117,7 @@ src_install() {
 	doexe ${FILESDIR}/30-dbus
 
 	# needs to exist for the system socket
-	keepdir /var/lib/dbus
+	keepdir /var/run/dbus
 
 	keepdir /usr/lib/dbus-1.0/services
 	keepdir /usr/share/dbus-1/services
diff --git a/sys-apps/dbus/dbus-0.50-r1.ebuild b/sys-apps/dbus/dbus-0.50-r1.ebuild
index b7e63709ded5..f2a49dad753c 100644
--- a/sys-apps/dbus/dbus-0.50-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.50-r1.ebuild
@@ -1,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-apps/dbus/dbus-0.50-r1.ebuild,v 1.1 2005/11/08 04:46:00 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 inherit eutils mono python multilib autotools debug
 
diff --git a/sys-apps/dbus/dbus-0.50.ebuild b/sys-apps/dbus/dbus-0.50.ebuild
index 49bc8d0f8d97..7cc85cb3b798 100644
--- a/sys-apps/dbus/dbus-0.50.ebuild
+++ b/sys-apps/dbus/dbus-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50.ebuild,v 1.1 2005/11/07 02:56:35 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 inherit eutils mono python multilib autotools debug
 
@@ -76,13 +76,13 @@ src_compile() {
 		`use_enable qt` \
 		`use_enable python` \
 		`use_enable mono` \
+		`use_enable kernel_linux dnotify` \
 		--enable-glib \
-		--enable-dnotify \
 		--enable-verbose-mode \
 		--enable-checks \
 		--enable-asserts \
 		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
 		--with-session-socket-dir=/tmp \
 		--with-dbus-user=messagebus \
 		`use_enable doc doxygen-docs` \
@@ -121,7 +121,7 @@ src_install() {
 	doexe ${FILESDIR}/30-dbus
 
 	# needs to exist for the system socket
-	keepdir /var/lib/dbus
+	keepdir /var/run/dbus
 
 	keepdir /usr/lib/dbus-1.0/services
 	keepdir /usr/share/dbus-1/services
diff --git a/sys-apps/dbus/files/dbus b/sys-apps/dbus/files/dbus
index 261d890ea3ef..f4b5730b0dff 100644
--- a/sys-apps/dbus/files/dbus
+++ b/sys-apps/dbus/files/dbus
@@ -1,13 +1,13 @@
 #!/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/sys-apps/dbus/files/dbus,v 1.1 2004/04/07 14:26:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 start() {
 
 	ebegin "Starting D-BUS system messagebus"
 
-	start-stop-daemon --start --exec /usr/bin/dbus-daemon-1 -- --system
+	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon-1 -- --system
 
 	eend $?
 
@@ -15,11 +15,22 @@ start() {
 
 stop() {
 
+	local retval
+
 	ebegin "Stopping D-BUS system messagebus"
 
-	start-stop-daemon --stop --pidfile /var/run/dbus.pid 
-	rm /var/run/dbus.pid
+	start-stop-daemon --stop --pidfile /var/run/dbus.pid
+	retval=$?
 
-	eend $?
+	eend ${retval}
+
+	# This should vanish when baselayout-1.12.0 is marked stable.
+	[[ -f /var/run/dbus.pid ]] && rm -f /var/run/dbus.pid
+
+	# Changes to the system dbus socket run file force us to take care of both
+	[[ -S /var/lib/dbus/system_bus_socket ]] && rm -f /var/lib/dbus/system_bus_socket
+	[[ -S /var/run/dbus/system_bus_socket ]] && rm -f /var/run/dbus/system_bus_socket
+
+	return ${retval}
 
 }
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index f093d416cbb1..b84e876133b0 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -1,7 +1,11 @@
- * 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>gentopia</herd>
+<maintainer>
+	<email>foser@gentoo.org</email>
+</maintainer>
+<maintainer>
+	<email>cardoe@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dcfldd/ChangeLog b/sys-apps/dcfldd/ChangeLog
index 78e134bd316c..3916bf3d9431 100644
--- a/sys-apps/dcfldd/ChangeLog
+++ b/sys-apps/dcfldd/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for sys-apps/dcfldd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/ChangeLog,v 1.1 2004/02/21 05:23:25 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
+
+*dcfldd-1.2.4-r1 (12 Oct 2005)
+
+  12 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/dcfldd-1.2.4_md5_amd64_fix.patch, dcfldd-1.2.2.ebuild,
+  dcfldd-1.2.4.ebuild, +dcfldd-1.2.4-r1.ebuild:
+  -amd64 masked on versions 1.2.2 and 1.2.4 due to bad md5 implenation in bug
+  108653. Corrected version in 1.2.4-r1 thanks to Martin Scharrer for the bug
+  report and the patch
+
+  25 Sep 2005; Daniel Black <dragonheart@gentoo.org> dcfldd-1.2.4.ebuild:
+  ~ppc keyworded
+
+  25 Sep 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  dcfldd-1.2.4.ebuild:
+  forensics herd takes maintainence. Thanks vapier. 1.2.4 stable now too
+
+*dcfldd-1.2.4 (20 Aug 2005)
+
+  20 Aug 2005; Mike Frysinger <vapier@gentoo.org> +dcfldd-1.2.4.ebuild:
+  Version bump #96789 by Joe Corrigan.
+
+*dcfldd-1.2.2 (06 May 2005)
+
+  06 May 2005; Mike Frysinger <vapier@gentoo.org> +dcfldd-1.2.2.ebuild:
+  Version bump #91581 by Ken Garland.
 
 *dcfldd-1.0 (21 Feb 2004)
 
diff --git a/sys-apps/dcfldd/Manifest b/sys-apps/dcfldd/Manifest
index 97feed01dc73..a79962baf22e 100644
--- a/sys-apps/dcfldd/Manifest
+++ b/sys-apps/dcfldd/Manifest
@@ -1,4 +1,19 @@
-MD5 dfd77773fda7d84185ac47ace1f44601 files/digest-dcfldd-1.0 63
-MD5 1ca69410fbf508dd3b4ee0075a42d26d dcfldd-1.0.ebuild 765
-MD5 ea4834a64fec7a6b59b12dd1aa94c648 ChangeLog 353
-MD5 3397688b2f4db584778dc038677159d1 metadata.xml 222
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cbbbdc97f0ae813017c2993e3498f161 ChangeLog 1263
+MD5 4bc012d1c5403978dfc326346c0b806b dcfldd-1.2.2.ebuild 743
+MD5 55ef56ead87d49db6bc82b013e172e0f dcfldd-1.2.4-r1.ebuild 659
+MD5 1c132caf217f6313e4f7404120cbde3b dcfldd-1.2.4.ebuild 648
+MD5 3a79a9f5e94568a6ec1bc4d3c789ea12 files/dcfldd-1.2.4_md5_amd64_fix.patch 1033
+MD5 d3182354b01dc122b2ab3b2122302ac5 files/digest-dcfldd-1.2.2 64
+MD5 3201022427aff6dedf8455be81c7a2d0 files/digest-dcfldd-1.2.4 64
+MD5 3201022427aff6dedf8455be81c7a2d0 files/digest-dcfldd-1.2.4-r1 64
+MD5 9f665d3c6a1e0eb7509c6d55fc171395 metadata.xml 227
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDTYWNmdTrptrqvGERAnuoAJ42Pk1p0afzUxfjU7amrX4ZjOtnUACggWvf
+PpFsIObtHzHflX1TvMM/iUo=
+=nrk5
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dcfldd/dcfldd-1.2.2.ebuild b/sys-apps/dcfldd/dcfldd-1.2.2.ebuild
index d1f80fe80729..82756199d91d 100644
--- a/sys-apps/dcfldd/dcfldd-1.2.2.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.2.ebuild,v 1.1 2005/05/06 22:33:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.2.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 DESCRIPTION="enhanced dd with features for forensics and security"
 HOMEPAGE="http://dcfldd.sourceforge.net/"
@@ -8,7 +8,9 @@ SRC_URI="mirror://sourceforge/dcfldd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-amd64 x86"
+# -amd64 in this version because of bug 108653 - bad md5 impliementation on
+# x86_64
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild b/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild
index c3c2c55879b3..2ffb74961821 100644
--- a/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.2.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/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild,v 1.1 2005/10/12 21:51:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/dcfldd/dcfldd-1.2.4.ebuild b/sys-apps/dcfldd/dcfldd-1.2.4.ebuild
index 5b7ddf0655a5..389174293d61 100644
--- a/sys-apps/dcfldd/dcfldd-1.2.4.ebuild
+++ b/sys-apps/dcfldd/dcfldd-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/sys-apps/dcfldd/dcfldd-1.2.4.ebuild,v 1.1 2005/08/20 04:56:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 DESCRIPTION="enhanced dd with features for forensics and security"
 HOMEPAGE="http://dcfldd.sourceforge.net/"
@@ -8,7 +8,9 @@ SRC_URI="mirror://sourceforge/dcfldd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="-amd64 ~ppc x86"
+# -amd64 in this version because of bug 108653 - bad md5 impliementation on
+# x86_64
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/dcfldd/metadata.xml b/sys-apps/dcfldd/metadata.xml
index 21481b2a893a..95c0cd08de9d 100644
--- a/sys-apps/dcfldd/metadata.xml
+++ b/sys-apps/dcfldd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>forensics</herd>
 <maintainer>
-  <email>vapier@gentoo.org</email>
+  <email>forensics@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dchroot/ChangeLog b/sys-apps/dchroot/ChangeLog
index 4b7b90b12a98..f79c00ac037e 100644
--- a/sys-apps/dchroot/ChangeLog
+++ b/sys-apps/dchroot/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/dchroot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/ChangeLog,v 1.1 2005/02/12 02:17:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 *dchroot-0.10 (11 Feb 2004)
 
diff --git a/sys-apps/dchroot/Manifest b/sys-apps/dchroot/Manifest
index e0528f481bb0..33a79c38e265 100644
--- a/sys-apps/dchroot/Manifest
+++ b/sys-apps/dchroot/Manifest
@@ -1,2 +1,3 @@
-MD5 2bc8b0b71b9e750c6b40afccbb932ab9 dchroot-0.10.ebuild 615
+MD5 85d07df4ce03958175e037e9127232b0 dchroot-0.10.ebuild 707
+MD5 1169e44a09129bf0fca2aeafa6a4e40c ChangeLog 347
 MD5 7cb2c02de4ae39987ae3fa7db4a5329b files/digest-dchroot-0.10 63
diff --git a/sys-apps/dchroot/dchroot-0.10.ebuild b/sys-apps/dchroot/dchroot-0.10.ebuild
index 22737d994aeb..a8e4d32dadbf 100644
--- a/sys-apps/dchroot/dchroot-0.10.ebuild
+++ b/sys-apps/dchroot/dchroot-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/sys-apps/dchroot/dchroot-0.10.ebuild,v 1.1 2005/02/12 02:17:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/dchroot-0.10.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 DESCRIPTION="Utility for managing chroots for non-root users"
 HOMEPAGE="http://packages.debian.org/unstable/admin/dchroot"
diff --git a/sys-apps/ddcxinfo-knoppix/ChangeLog b/sys-apps/ddcxinfo-knoppix/ChangeLog
index 15ebca0cdacf..7b5e235486ba 100644
--- a/sys-apps/ddcxinfo-knoppix/ChangeLog
+++ b/sys-apps/ddcxinfo-knoppix/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-apps/ddcxinfo-knoppix
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ddcxinfo-knoppix/ChangeLog,v 1.1 2004/01/03 17:31:21 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ddcxinfo-knoppix/ChangeLog,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
+
+  16 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ddcxinfo-knoppix-0.6.ebuild:
+  Install ddcprobe and close bug #85475.
+
+  05 Mar 2005; Mike Doty <kingtaco@gentoo.org> ddcxinfo-knoppix-0.6.ebuild:
+  -amd64 because of very x86 centric code, won't build on amd64
+
+  14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
+  Changing maintainers to newly formed livecd herd.
+
+  23 Mar 2004; John Davis <zhen@gentoo.org> metadata.xml:
+  adding the almighty metadata
+
+  20 Mar 2004; John Davis <zhen@gentoo.org> ddcxinfo-knoppix-0.6.ebuild:
+  bumping to x86 stable since we use it on livecds and it has proven to be
+  stable.
 
 *ddcxinfo-knoppix-0.6 (03 Jan 2004)
 
diff --git a/sys-apps/ddcxinfo-knoppix/Manifest b/sys-apps/ddcxinfo-knoppix/Manifest
index 511f36aa364a..504fecf9328b 100644
--- a/sys-apps/ddcxinfo-knoppix/Manifest
+++ b/sys-apps/ddcxinfo-knoppix/Manifest
@@ -1,2 +1,4 @@
-MD5 42839d2c7875c963bd06fde74c80d788 ddcxinfo-knoppix-0.6.ebuild 612
+MD5 502ed6b51b0e9c6e8113f76d6197d02c ddcxinfo-knoppix-0.6.ebuild 722
+MD5 b399380e027dc366796b1e712306df65 ChangeLog 1046
+MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 MD5 dcdb2bfc109960ea73a1ed3d7256a569 files/digest-ddcxinfo-knoppix-0.6 73
diff --git a/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild b/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild
index 4ab20e071839..cdfb14936540 100644
--- a/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild
+++ b/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.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/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild,v 1.1 2004/01/03 17:31:21 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 IUSE=""
 
@@ -11,9 +11,9 @@ MY_PV=${PV}-5
 SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 -amd64"
 
-RDEPEND="virtual/glibc"
+RDEPEND=""
 DEPEND=""
 
 src_compile() {
@@ -22,7 +22,7 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/sbin
-	doexe ddcxinfo-knoppix
+	doexe ddcxinfo-knoppix ddcprobe
 	dodoc debian/changelog debian/control debian/copyright README COPYING
 	doman debian/ddcxinfo-knoppix.1
 }
diff --git a/sys-apps/ddcxinfo-knoppix/metadata.xml b/sys-apps/ddcxinfo-knoppix/metadata.xml
index 96a2d586367d..88653ddd7172 100644
--- a/sys-apps/ddcxinfo-knoppix/metadata.xml
+++ b/sys-apps/ddcxinfo-knoppix/metadata.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>livecd</herd>
 </pkgmetadata>
diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 908cff014e29..5bd712f439bb 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,9 +1,225 @@
 # ChangeLog for sys-apps/debianutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
+
+*debianutils-2.15 (03 Nov 2005)
+
+  03 Nov 2005; Mike Frysinger <vapier@gentoo.org> +debianutils-2.15.ebuild:
+  Version bump #111275 by Richard Hartmann.
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  debianutils-2.14.1-r1.ebuild:
+  Mark 2.14.1-r1 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org>
+  debianutils-2.14.1-r1.ebuild:
+  Stable on ppc64
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  debianutils-2.14.1-r1.ebuild:
+  Stable on ppc.
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  debianutils-2.14.1-r1.ebuild:
+  Stable on sparc
+
+*debianutils-2.14.1-r1 (13 Jul 2005)
+
+  13 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/debianutils-2.14.1-no-bs-namespace.patch,
+  +debianutils-2.14.1-r1.ebuild:
+  Allow dots in the names, bug #95173.  Patch by Kerin Millar.
+
+*debianutils-2.14.1 (02 Jul 2005)
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +debianutils-2.14.1.ebuild:
+  Version bump #92748 by Kerin Millar.
+
+*debianutils-2.13.2 (16 Jun 2005)
+
+  16 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +debianutils-2.13.2.ebuild:
+  Version bump.
+
+*debianutils-2.13.1-r1 (24 Mar 2005)
+
+  24 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +debianutils-2.13.1-r1.ebuild:
+  Version bump to fix install locations #86349 by Peter Gantner.
+
+*debianutils-2.13.1 (22 Mar 2005)
+
+  22 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +debianutils-2.13.1.ebuild:
+  Version bump.
+
+  28 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+  debianutils-1.16.7-r4.ebuild:
+  Had to remove coreutils from the ppc-macos dependancy list because we
+  still don't have a coreutils virtual and it got added back in.
+
+  12 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  debianutils-1.16.7-r4.ebuild:
+  keeping in stable, but made coreutils a !macos? dependency
+  Debianutils is needed for portage, but we haven't been able to create a 
+  coreutils virtual yet.
+ 
+  22 Aug 2004; Michael Hanselmann <hansmi@gentoo.org>
+  debianutils-1.16.7-r4.ebuild:
+  Added to macos. Stable because it's a dependency for bleeding-edge
+  Portage-versions.
+
+  25 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  debianutils-1.16.7-r4.ebuild:
+  inherit eutils for epatch
+
+*debianutils-1.16.7-r4 (10 Dec 2003)
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r3.ebuild, debianutils-1.16.7-r4.ebuild,
+  files/debianutils-1.16.7-gentoo.patch:
+  mkboot queries portage for sys-boot/grub instead of sys-apps/grub, thanks to
+  max@gentoo.org in #gentoo-dev
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild:
+  don't install the readlink manpage -- partially closes bug #32096 by Radek
+  Podgorny <radek@podgorny.cz>
+
+  26 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  debianutils-1.16.7-r3.ebuild:
+  set ppc in keywords
+
+  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  debianutils-1.16.7-r3.ebuild, files/debianutils-1.16.7-gentoo.patch:
+  Fix bug #25216 (use portageq and not qpkg to check if grub is installed), mark
+  stable as otherwise its been working fine for a long time.
+
+  19 Sep 2003; Christian Birchinger <joker@gentoo.org>
+  debianutils-1.16.7-r3.ebuild:
+  Added sparc stable keyword
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> 
+  debianutils-1.16.7-r3.ebuild :
+  ia64 keywords.
+
+  12 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r3.ebuild:
+  moved to stable x86
+
+  27 Aug 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r3.ebuild:
+  hits stable, because coreutils-5.0 has hit stable. marked for all arches --
+  the change between -r2 and -r3 is just the removal of readlink
+
+  27 Aug 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild:
+  changed SRC_URI to point to our own mirrors. thanks to Alastair Tse
+  <liquidx@gentoo.org> for pointing that out in bug #26274
+
+  03 Aug 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r3.ebuild:
+  added coreutils to dependency
+
+*debianutils-1.16.7-r3 (02 Aug 2003)
+
+  02 Aug 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r1.ebuild, debianutils-1.16.7-r2.ebuild,
+  debianutils-1.16.7-r3.ebuild:
+  removed old version, this version will hit stable, when coreutils-5.0 hits
+  stable -- removal of /bin/readlink from here, thanks to SpanKYzor in bug
+  #25600
+
+*debianutils-1.16.7-r2 (19 May 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> debianutils-1.16.7-r2.ebuild :
+  Marked stable on hppa.
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> debianutils-1.16.7-r2.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org>
+  debianutils-1.16.7-r2.ebuild:
+  Mark stable on alpha
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> debianutils-1.16.7-r2.ebuild:
+  Changed ~sparc to sparc in KEYWORDS
+
+  19 May 2003; Martin Schlemmer <azarah@gentoo.org>
+  debianutils-1.16.7-r2.ebuild, files/debianutils-1.16.7-gcc33.patch:
+  Fix gcc-3.3 issue, bug #21211.
+
+*debianutils-1.16.7-r1 (03 Apr 2003)
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  debianutils-1.16.7-r1.ebuild:
+  SMAIL license removed, thanks to: Luke-Jr <Luke7Jr@yahoo.com> in bug #18948
+
+  03 Apr 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r1.ebuild, debianutils-1.16.7.ebuild,
+  debianutils-1.16.7.ebuild, files/debianutils-1.16.7-gentoo.patch:
+  Added patch for run-parts to ignore .keep files. Patch was submitted by: Jukka
+  Salmi <jukka-gentoo@2003.salmi.ch> in bug #18423.
+
+*debianutils-1.16.7 (26 Mar 2003)
+
+  26 Mar 2003; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.7.ebuild,
+  files/debianutils-1.16.7-gentoo.patch:
+  version bump
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> debianutils-1.16.3.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> debianutils-1.16.3.ebuild :
+  Added hppa to keywords.
+
+*debianutils-1.16.3 (20 Dec 2002)
+
+  07 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  files/debianutils-compress.patch:
+  added patch to use bzip2 instead of gzip for savelog
+
+  07 Mar 2003; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.3.ebuild:
+  use epatch
+
+  20 Dec 2002; Jan Seidel <tuxus@gentoo.org> : debianutils-1.13.3-r3.ebuild
+  Added mips to keywords
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*debianutils-1.16.3 (25 Sep 2002)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag and added IUSE
+
+  25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Version update.  Add some of missing util.  Add patch to make
+  installkernel and mkboot more Gentoo friendly.
+
+*debianutils-1.13.3-r3 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> debianutils-1.13.3-r3.ebuild :
+  Added KEYWORDS, SLOT.
+
+*debianutils-1.16 (23 Mar 2002)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag and added IUSE
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> debianutils-1.16.ebuild :
+  Added KEYWORDS, SLOT.
+
+  23 Mar 2002; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.ebuild :
+
+  Version update.  With it came a change in the SRC_URI as well.  Submitted by
+  Jim Nutt.
 
 *debianutils-1.13.3-r4 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> debianutils-1.13.3-r4.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 1ba436f62787..2343c7ef564f 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,5 +1,19 @@
-MD5 2c753de28217aa412016b3dcba1cc25d ChangeLog 2803
-MD5 2f974d961e1890e0f0a0e07290825ed1 debianutils-1.16.7-r1.ebuild 1357
-MD5 f668f7cf3760bd5f131cec5de5602523 files/digest-debianutils-1.16.7-r1 69
-MD5 e814d4dcbe42ad46f0fa3449b653c173 files/debianutils-1.16.7-gentoo.patch 7521
-MD5 3f67e66ea1d7aa13843f253310322f51 files/debianutils-compress.patch 743
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f95f8f6b2d3aea5e0a37300bac11c3b4 ChangeLog 7948
+MD5 b98e33513bbc6f2222bca2b81df815f8 debianutils-2.13.1-r1.ebuild 1040
+MD5 dde4623a7e4629ff3ae7a5c872e7acdf debianutils-2.14.1-r1.ebuild 1129
+MD5 0979a4314b67393c77f81abb798c1021 debianutils-2.15.ebuild 1144
+MD5 c2a83b7cc35cd0a76df37cf57c8f6563 files/debianutils-2.14.1-no-bs-namespace.patch 1412
+MD5 930d33ac394a1a72aa0023368f998b2d files/digest-debianutils-2.13.1-r1 70
+MD5 1139a531f41ec299352621154a9f8cca files/digest-debianutils-2.14.1-r1 70
+MD5 2003427638987c496d640728278cf18a files/digest-debianutils-2.15 68
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaWrWgIKl8Uu19MoRAjGGAJ9g18Q5yOGcIyZsc2CPoDqAyGVG5ACfVc0M
+Xn8lIaC8B2+jF9IQnr+7CaU=
+=F6A6
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/debianutils/debianutils-2.13.1-r1.ebuild b/sys-apps/debianutils/debianutils-2.13.1-r1.ebuild
index 023e9cd0a407..8764b217b8db 100644
--- a/sys-apps/debianutils/debianutils-2.13.1-r1.ebuild
+++ b/sys-apps/debianutils/debianutils-2.13.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/sys-apps/debianutils/debianutils-2.13.1-r1.ebuild,v 1.1 2005/03/24 02:05:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.13.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="static build"
 
 DEPEND=""
diff --git a/sys-apps/debianutils/debianutils-2.14.1-r1.ebuild b/sys-apps/debianutils/debianutils-2.14.1-r1.ebuild
index 7b98a2c812c4..c85d0f3fc282 100644
--- a/sys-apps/debianutils/debianutils-2.14.1-r1.ebuild
+++ b/sys-apps/debianutils/debianutils-2.14.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/sys-apps/debianutils/debianutils-2.14.1-r1.ebuild,v 1.1 2005/07/13 09:25:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.14.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="static build"
 
 DEPEND=""
diff --git a/sys-apps/debianutils/debianutils-2.15.ebuild b/sys-apps/debianutils/debianutils-2.15.ebuild
index cdb46b23a522..7e426bc0c827 100644
--- a/sys-apps/debianutils/debianutils-2.15.ebuild
+++ b/sys-apps/debianutils/debianutils-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/sys-apps/debianutils/debianutils-2.15.ebuild,v 1.1 2005/11/03 01:41:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.15.ebuild,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/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-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index 63d39d1c49f2..a241ef297414 100644
--- a/sys-apps/diffutils/ChangeLog
+++ b/sys-apps/diffutils/ChangeLog
@@ -1,13 +1,184 @@
 # ChangeLog for sys-apps/diffutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/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/sys-apps/diffutils/ChangeLog,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
-*diffutils-2.7.5-r1 (1 Feb 2002)
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> diffutils-2.8.7-r1.ebuild:
+  Marked stable on mips.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  diffutils-2.8.7-r1.ebuild:
+  Stable on ppc.
+
+  26 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  diffutils-2.8.7-r1.ebuild:
+  Stable on alpha.
+
+  25 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  diffutils-2.8.7-r1.ebuild:
+  Stable on sparc
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> diffutils-2.8.7-r1.ebuild:
+  Stable on ppc64
+
+  17 Feb 2005; Kito <kito@gentoo.org> diffutils-2.8.7-r1.ebuild:
+  ~ppc-macos keyword
+
+  23 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> diffutils-2.8.7.ebuild:
+  Stable on alpha.
+
+  18 Jan 2005; Joshua Kinard <kumba@gentoo.org> diffutils-2.8.7.ebuild:
+  Marked stable on mips.
+
+*diffutils-2.8.7-r1 (03 Jan 2005)
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +diffutils-2.8.7-r1.ebuild:
+  Add patch to fix i18n support #71689 by S.Caglar Onur.
+
+  17 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> diffutils-2.8.7.ebuild:
+  Stable on sparc
+
+  09 Dec 2004; Mike Frysinger <vapier@gentoo.org> diffutils-2.8.4-r4.ebuild,
+  diffutils-2.8.7.ebuild:
+  Make sure we dont try to regenerate the manpages #55479.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  diffutils-2.8.4-r4.ebuild:
+  Masked diffutils-2.8.4-r4.ebuild stable for ppc
+
+  05 Aug 2004; <solar@gentoo.org> diffutils-2.8.7.ebuild:
+  This build defines --build= to the CHOST which breaks when your trying to
+  cross compile and CBUILD is already defined
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> diffutils-2.8.4-r3.ebuild:
+  QA - fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> diffutils-2.8.7.ebuild:
+  sending ebuild straight to stable
+
+*diffutils-2.8.7 (10 May 2004)
+
+  10 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/diffutils-2.8.7-no-manpage.patch, +diffutils-2.8.7.ebuild:
+  New version, solves many problems with sdiff on ppc.
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> diffutils-2.8.4-r4.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  20 Dec 2003; Christian Birchinger <joker@gentoo.org>
+  diffutils-2.8.4-r4.ebuild:
+  Added sparc stable keyword
+
+  19 Dec 2003; Guy Martin <gmsoft@gentoo.org> diffutils-2.8.4-r4.ebuild:
+  Marked stable on hppa.
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> diffutils-2.7.7.ebuild,
+  diffutils-2.8.4-r1.ebuild, diffutils-2.8.4-r2.ebuild,
+  diffutils-2.8.4-r3.ebuild, diffutils-2.8.4-r4.ebuild:
+  diff man page installation disabled in this package, since it blows goats. The
+  diff man page is installed by the man-pages package
+
+  07 Nov 2003; Tavis Ormandy <taviso@gentoo.org> diffutils-2.8.4-r4.ebuild:
+  stable.
+
+*diffutils-2.8.4-r4 (01 Aug 2003)
+
+  01 Aug 2003; Tavis Ormandy <taviso@gentoo.org> diffutils-2.8.4-r4.ebuild::
+  typo in diff.c causes core dump with the --tabsize option.
+  closing #24238
+  version bump.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> diffutils-2.8.4-r3.ebuild:
+  Mark stable on alpha
+
+*diffutils-2.8.4-r3 (04 Feb 2003)
+
+  13 Jun 2003; Guy Martin <gmnsoft@gentoo.org> diffutils-2.8.4-r3.ebuild :
+  Added hppa to KEYWORDS.
+
+  22 Apr 2003; <msterret@gentoo.org> diffutils-2.8.4-r3.ebuild:
+  Added support for USE=static Added use_enable nls to cleanup myconf
+  (>=sys-apps/portage-2.0.47-r10 in DEPEND) Use einstall instead of big make
+  line
+
+  22 Apr 2003; Michael Sterrett <msterret@gentoo.org>
+  diffutils-2.8.4-r3.ebuild:
+  Changed to use sed -i (added >=sys-apps/sed-4 to DEPEND)
+  Removed some extra cds
+  Added extra command checking (something || die)
+  Some mild formatting
+
+  02 Apr 2003; Christian Birchinger <joker@gentoo.org>
+  diffutils-2.8.4-r3.ebuild:
+  Added stable sparc keyword
+
+  27 Feb 2003; Zach Welch <zwelch@gentoo.org> diffutils-2.7.7.ebuild,
+  diffutils-2.8.4-r2.ebuild, diffutils-2.8.4-r3.ebuild:
+  add arm keywords
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> diffutils-2.8.4-r3.ebuild :
+  Mark as stable for mips.
+
+  04 Feb 2003; Jon Nall <nall@gentoo.org> diffutils-2.8.4-r3.ebuild,
+  files/digest-diffutils-2.8.4-r3 :
+  filter -mpowerpc-gfxopt out of CFLAGS to fix #13502;
+  add deps on help2man to fix broken man pages
+
+*diffutils-2.8.4-r2 (20 Jan 2003)
+
+  20 Jan 2003; Martin Schlemmer <azarah@gentoo.org> diffutils-2.8.4-r2.ebuild :
+  Removes waitpid() call after pclose() on piped diff stream, closing
+  bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords.
+ 
+*diffutils-2.8.4-r1 (14 Oct 2002)
+
+  02 Apr 2003; Rajiv Manglani <rajiv@gentoo.org> :
+  fixed if/else typo.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  14 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Build fails with make -j5 or greater on pentium4.  This is because
+  the jobs creating the opjects, which depend on paths.h is sheduled
+  at the same time paths.h is generated.  This closes bug #8934.
+
+*diffutils-2.8.4 (25 Sep 2002)
+
+  29 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add 'datadir=${D}/usr/share' to 'make install' as is
+  the proper fix.
+
+  25 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added --datadir=${D}/usr/share to fix #8364
+
+  25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Version update.
+
+*diffutils-2.7.5-r1.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> diffutils-2.7.5.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> diffutils-2.7.5-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+*diffutils-2.7-r4.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> diffutils-2.7-r4.ebuild :
+  Added KEYWORDS, SLOT.
+
+*diffutils-2.7.7 (1 Feb 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> diffutils-2.7.7.ebuild :
+  Added KEYWORDS, SLOT.
+
+  1 Feb 2002; Leo Lipelis <aeoo@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.
+  Minor upgrade.  sdiff now works as you would expect.
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index e69de29bb2d1..89c971afd14c 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -0,0 +1,12 @@
+MD5 8a33b547a9772a55a6df04888a38e748 ChangeLog 6173
+MD5 2b8888ea3c1b05e81e1bbf61b1f2b945 diffutils-2.8.4-r4.ebuild 1933
+MD5 de60c34ab991a72af9481028b5046116 diffutils-2.8.7-r1.ebuild 1591
+MD5 88a4de059e8e49fff9b4aada4824afd7 diffutils-2.8.7.ebuild 1404
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
+MD5 bb27bd30edca169156e905ebe7dab570 files/diffutils-2.8.4-no-manpage.patch 1168
+MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
+MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
+MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r4 67
+MD5 28aba2261ffb7634265a612938df28f5 files/digest-diffutils-2.8.7 68
+MD5 d639850d7ddca0f4a6eb5be82a1c42a2 files/digest-diffutils-2.8.7-r1 141
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
index bdbeaa5c4eb7..c079e6e71bea 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
@@ -1,42 +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/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.1 2003/08/01 18:18:55 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
-IUSE="nls build static"
+inherit eutils flag-o-matic
 
-inherit eutils      
-inherit flag-o-matic
-
-# sdiff SIGSEGVs with this on gcc-3.2.1, so take it out
-# this fixes bug #13502
-filter-flags "-mpowerpc-gfxopt"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 
-KEYWORDS="~x86 ~alpha"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls static"
 
-DEPEND="virtual/glibc
-	>=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	!build? ( sys-apps/texinfo sys-apps/help2man )"
-
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	if [ -n "`use build`" ] ; then
-		#disable texinfo building so we can remove the dep
-		sed -i -e 's:SUBDIRS = doc:SUBDIRS =:' \
-			Makefile.in || die "Makefile.in sed"
-	fi
 
 	# Build fails with make -j5 or greater on pentium4.  This is because
 	# the jobs creating the opjects, which depend on paths.h is sheduled
@@ -50,27 +33,27 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-sdiff-no-waitpid.patch
 
 	# --tabsize option, undocumented in diff but used in sdiff, makes
-	# diff dump core.
+	# diff dump core, closing #24238.
 	# <taviso@gentoo.org> (1 Aug 2003)
 	epatch ${FILESDIR}/${P}-tabsize-dumps-core.diff
+
+	# Make sure we don't try generating the manpages ... this requires 
+	# 'help2man' which is a perl app which is not available in a 
+	# stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
+	# for more info, see #55479
+	touch man/*.1
 }
 
 src_compile() {
-	econf --build=${CHOST} `use_enable nls` || die "econf"
-
-	if [ "`use static`" ] ; then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
+	econf $(use_enable nls) || die "econf"
+	use static && append-ldflags -static
+	emake LDFLAGS="${LDFLAGS}" || die "make"
 }
 
 src_install() {
-	einstall
+	make install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README
 
-	if [ -z "`use build`" ] ; then
-		dodoc COPYING ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
+	# use the manpage from 'sys-apps/man-pages'
+	rm -f "${D}"/usr/share/man/man1/diff.1*
 }
diff --git a/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild b/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
index eec74556f00e..dad7a3b25fd8 100644
--- a/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild,v 1.1 2005/01/04 03:43:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,29 +11,32 @@ SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${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 ppc64 ~ppc-macos s390 sh sparc x86"
 IUSE="nls static"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Removes waitpid() call after pclose() on piped diff stream, closing
 	# bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
-	epatch ${FILESDIR}/diffutils-2.8.4-sdiff-no-waitpid.patch
+	epatch "${FILESDIR}"/diffutils-2.8.4-sdiff-no-waitpid.patch
 
 	# Fix utf8 support.  Patch from MDK. #71689
-	epatch ${WORKDIR}/${P}-i18n.patch
+	epatch "${WORKDIR}"/${P}-i18n.patch
 
 	# Make sure we don't try generating the manpages ... this requires 
 	# 'help2man' which is a perl app which is not available in a 
 	# stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
 	# for more info, see #55479
 	touch man/*.1
+
+	# Fix userpriv perm problems #76600
+	chmod ug+w config/*
 }
 
 src_compile() {
diff --git a/sys-apps/diffutils/diffutils-2.8.7.ebuild b/sys-apps/diffutils/diffutils-2.8.7.ebuild
index 5d2e234acbb3..8dfae689939b 100644
--- a/sys-apps/diffutils/diffutils-2.8.7.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7.ebuild,v 1.1 2004/05/10 14:42:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,51 +10,38 @@ SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~ppc ~ppc64"
-IUSE="nls build static"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 s390 sh sparc x86"
+IUSE="nls static"
 
-DEPEND="virtual/glibc
-	>=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	!build? ( sys-apps/texinfo sys-apps/help2man )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	if use build ; then
-		#disable texinfo building so we can remove the dep
-		sed -i -e 's:SUBDIRS = doc:SUBDIRS =:' \
-			Makefile.in || die "Makefile.in sed"
-	fi
 
 	# Removes waitpid() call after pclose() on piped diff stream, closing
 	# bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
 	epatch ${FILESDIR}/diffutils-2.8.4-sdiff-no-waitpid.patch
 
-	# the manpage for diff is better provided by the man-pages package, so
-	# we disable it here
-	epatch ${FILESDIR}/${P}-no-manpage.patch
+	# Make sure we don't try generating the manpages ... this requires 
+	# 'help2man' which is a perl app which is not available in a 
+	# stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
+	# for more info, see #55479
+	touch man/*.1
 }
 
 src_compile() {
-	econf --build=${CHOST} `use_enable nls` || die "econf"
-
-	if use static ; then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
+	econf $(use_enable nls) || die "econf"
+	use static && append-ldflags -static
+	emake LDFLAGS="${LDFLAGS}" || die "make"
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README
 
-	if ! use build ; then
-		dodoc ChangeLog NEWS README
-	else
-		rm -rf ${D}/usr/share/info
-	fi
+	# use the manpage from 'sys-apps/man-pages'
+	rm -f "${D}"/usr/share/man/man1/diff.1*
 }
diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/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-apps/discover-data/ChangeLog b/sys-apps/discover-data/ChangeLog
index 005391ce6fc2..3eacedc86ee7 100644
--- a/sys-apps/discover-data/ChangeLog
+++ b/sys-apps/discover-data/ChangeLog
@@ -1,5 +1,48 @@
+# ChangeLog for sys-apps/discover-data
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/ChangeLog,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
-discover-data-1.2002.05.23-r1.ebuild July 30, 2002 christoph@gentoo.org
+*discover-data-2.2005.02.13 (08 Mar 2005)
 
-  First release into gentoo cvs tree
- 
\ No newline at end of file
+  08 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +discover-data-2.2005.02.13.ebuild:
+  Version bump #84321 by Jonas MG.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org>
+  discover-data-1.2002.05.23-r1.ebuild:
+  Changed SRC_URI to use mirror:// syntax and use epatch.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  discover-data-1.2002.05.23-r1.ebuild, discover-data-2.2003.02.05.ebuild:
+  sync IUSE (missing)
+
+*discover-data-1.2002.05.23-r1 (25 Feb 2004)
+
+  25 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  discover-data-1.2002.05.23-r1.ebuild, discover-data-2.2003.02.05.ebuild:
+  Won't work on sparc, no matter how much you prod it and say pretty please.
+
+*discover-data-2.2003.02.05 (08 Feb 2004)
+
+  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #40346 by Diego Garcia.
+
+*discover-data-2.2002.10.17 (17 Sep 2003)
+
+  17 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  discover-data-1.2002.05.23-r1.ebuild, discover-data-2.2002.10.17.ebuild:
+  version bump to newer snapshot
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*discover-data--1.2002.05.23 (30 July 2002)
+
+  30 July 2002; Christoph Lameter <christoph@gentoo.org> discover-data--1.2002.05.23-r1.ebuild
+
+  Initial submission.
+ 
+  31 July 2002; Christoph Lameter <christoph@gentoo.org> discover-data--1.2002.05.23-r1.ebuild
+
+  Make files conform to gentoo standards.
+
+ 
diff --git a/sys-apps/discover-data/Manifest b/sys-apps/discover-data/Manifest
index e69de29bb2d1..00a79aa05fd4 100644
--- a/sys-apps/discover-data/Manifest
+++ b/sys-apps/discover-data/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 995bf36315cfaed50d366cf5a4363ed0 ChangeLog 1659
+MD5 f678f2d5585384f63ffd8841a03b9628 discover-data-2.2003.02.05.ebuild 590
+MD5 c27fbab543177bcc9d5845559053f24a discover-data-2.2005.02.13.ebuild 593
+MD5 37ed5e2c605c0477d8d2b077e2e5c989 files/digest-discover-data-2.2003.02.05 78
+MD5 d5d0b07be407dfd8fccfdb145293c078 files/digest-discover-data-2.2005.02.13 78
+MD5 6437294b2d605a5f86a119b238d08d15 files/kernel-2.2-2.4.drivername.patch 995
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSnnegIKl8Uu19MoRAg4pAKCAolc0OE4kwJwiBP+/lYm6FobYuwCdFcg4
+hCEMwT4Nvt4fGWHDcZrXyq0=
+=eW25
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild b/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild
index 972e28924e58..b6c000362a59 100644
--- a/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild
+++ b/sys-apps/discover-data/discover-data-2.2003.02.05.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/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild,v 1.1 2004/02/08 20:08:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
-DESCRIPTION="This is a sample skeleton ebuild file"
-HOMEPAGE="http://hackers.progeny.com/discover/"
+DESCRIPTION="data for discover. list of pci ids. pnp ids etc."
+HOMEPAGE="http://componentizedlinux.org/discover/"
 SRC_URI="http://archive.progeny.com/progeny/discover/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
-IUSE="X gnome"
+KEYWORDS="alpha amd64 hppa mips ppc -sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_install() {
 	make prefix=/usr DESTDIR=${D} install || die
diff --git a/sys-apps/discover-data/discover-data-2.2005.02.13.ebuild b/sys-apps/discover-data/discover-data-2.2005.02.13.ebuild
index e5ac0e2a5d23..debf6fc71726 100644
--- a/sys-apps/discover-data/discover-data-2.2005.02.13.ebuild
+++ b/sys-apps/discover-data/discover-data-2.2005.02.13.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/sys-apps/discover-data/discover-data-2.2005.02.13.ebuild,v 1.1 2005/03/09 01:00:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-2.2005.02.13.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 DESCRIPTION="data for discover. list of pci ids. pnp ids etc."
-HOMEPAGE="http://componentizedlinux.org/discover/"
+HOMEPAGE="http://alioth.debian.org/projects/pkg-discover/"
 SRC_URI="http://archive.progeny.com/progeny/discover/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/discover-data/metadata.xml b/sys-apps/discover-data/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/discover-data/metadata.xml
+++ b/sys-apps/discover-data/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-apps/discover/ChangeLog b/sys-apps/discover/ChangeLog
index db2f12e309c3..3c9f91223f8c 100644
--- a/sys-apps/discover/ChangeLog
+++ b/sys-apps/discover/ChangeLog
@@ -1,5 +1,46 @@
+# ChangeLog for sys-apps/discover
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/ChangeLog,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
-discover-1.5-r1.ebuild July 30, 2002 christoph@gentoo.org
+*discover-2.0.7 (08 Mar 2005)
+
+  08 Mar 2005; Mike Frysinger <vapier@gentoo.org> +discover-2.0.7.ebuild:
+  Version bump #84321 by Jonas MG.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> discover-1.5-r1.ebuild:
+  sync IUSE (missing)
+
+  25 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> discover-1.5-r1.ebuild,
+  discover-2.0.2.ebuild:
+  Won't work on sparc, no matter how much you prod it and say pretty please.
+
+*discover-2.0.2 (08 Feb 2004)
+
+  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #40345 by Diego Garcia.
+
+*discover-1.5 (June 2002)
+
+  20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Updated HOMEPAGE variable since the URI has changed
+
+  June 2002; Christoph Lameter <christoph@lameter.com> discover-1.5.ebuild files/digest-discover-1.5
+
+  Discover is a hardware identification system based on the libdiscover1
+  library.  Discover provides a flexible interface that programs can use to
+  report a wide range of information about the hardware that is installed on a
+  Linux system.  In addition to reporting information, discover includes
+  support for doing hardware detection at boot time.  Detection occurs in two
+  stages: The first stage, which runs from an initial ramdisk (initrd), loads
+  just the drivers needed to mount the root file system, and the second stage
+  loads the rest (ethernet cards, sound cards, etc.).
+ 
+*discover-1.5-r1 (30 July 2002)
+  30 July 2002; Christoph Lameter <christoph@gentoo.org> discover-1.5-r1.ebuild files/digest-discover-1.5-r1
 
   First release into gentoo cvs tree
- 
\ No newline at end of file
+
+  31 July 2002; Christoph Lameter <christoph@gentoo.org>
+
+  Fix ebuild RDEPEND and other things
+ 
diff --git a/sys-apps/discover/Manifest b/sys-apps/discover/Manifest
index e69de29bb2d1..e71f388c82c8 100644
--- a/sys-apps/discover/Manifest
+++ b/sys-apps/discover/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a2bfe9a68a6b6b0a31db16b656b300d8 ChangeLog 1853
+MD5 67a51497ee3fcc51b62061fd046a5eea discover-2.0.2.ebuild 1094
+MD5 9468e2808e019c5e7901c3a66ab62254 discover-2.0.7.ebuild 1177
+MD5 35b4323ba6b9e9878fdda8d7d3703e89 files/digest-discover-2.0.2 66
+MD5 622af6b2cf2794fd0ba50addb2a815af files/digest-discover-2.0.7 66
+MD5 a43ca5971902215ada3f6fd11f9e61b1 files/etc-init.d-discover 4860
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDSnmagIKl8Uu19MoRAumOAJ47qAfQSnhxt8AubVekUYWyeK41zwCcDeHy
+qX2WkZ3ovzuIy1r/uILF6X0=
+=/sZM
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/discover/discover-2.0.2.ebuild b/sys-apps/discover/discover-2.0.2.ebuild
index 0cb8253102a5..09926e048b7e 100644
--- a/sys-apps/discover/discover-2.0.2.ebuild
+++ b/sys-apps/discover/discover-2.0.2.ebuild
@@ -1,26 +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/sys-apps/discover/discover-2.0.2.ebuild,v 1.1 2004/02/08 20:09:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/discover-2.0.2.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 DESCRIPTION="Library and front-end for retrieving information about a system's hardware"
-HOMEPAGE="http://hackers.progeny.com/discover/"
+HOMEPAGE="http://componentizedlinux.org/discover/"
 SRC_URI="http://archive.progeny.com/progeny/discover/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="alpha amd64 hppa ppc -sparc x86"
 IUSE="pcmcia"
 
 DEPEND="pcmcia? ( virtual/linux-sources )
-	net-ftp/curl
+	net-misc/curl
 	dev-libs/expat"
 PDEPEND="sys-apps/discover-data"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	which docbook-to-man 2>/dev/null \
-		|| sed -i 's:docbook-to-man:docbook2man:' doctools/docbook.mk
+	if ! which docbook-to-man 2>/dev/null ; then
+		if which docbook2man 2>/dev/null ; then
+			sed -i 's:docbook-to-man:docbook2man:' doctools/docbook.mk
+		else
+			sed -i 's:docbook-to-man:echo:' doctools/docbook.mk
+		fi
+	fi
 }
 
 src_compile() {
diff --git a/sys-apps/discover/discover-2.0.7.ebuild b/sys-apps/discover/discover-2.0.7.ebuild
index 19a5bd1400ea..3274ff279f1d 100644
--- a/sys-apps/discover/discover-2.0.7.ebuild
+++ b/sys-apps/discover/discover-2.0.7.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/sys-apps/discover/discover-2.0.7.ebuild,v 1.1 2005/03/09 01:00:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover/discover-2.0.7.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 DESCRIPTION="Library and front-end for retrieving information about a system's hardware"
-HOMEPAGE="http://componentizedlinux.org/discover/"
+HOMEPAGE="http://alioth.debian.org/projects/pkg-discover/"
 SRC_URI="http://archive.progeny.com/progeny/discover/${P}.tar.gz"
 
 LICENSE="as-is"
@@ -18,9 +18,12 @@ PDEPEND="sys-apps/discover-data"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	if ! which docbook-to-man 2>/dev/null ; then
-		if which docbook2man 2>/dev/null ; then
+	cd "${S}"
+	sed -i \
+		-e '/curl_libs=.*sed/d' \
+		configure || die #108695
+	if ! type -p docbook-to-man > /dev/null ; then
+		if type -p docbook2man > /dev/null ; then
 			sed -i 's:docbook-to-man:docbook2man:' doctools/docbook.mk
 		else
 			sed -i 's:docbook-to-man:echo:' doctools/docbook.mk
diff --git a/sys-apps/discover/metadata.xml b/sys-apps/discover/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/discover/metadata.xml
+++ b/sys-apps/discover/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-apps/dmapi/ChangeLog b/sys-apps/dmapi/ChangeLog
index 783668f539b2..cb53833ca48f 100644
--- a/sys-apps/dmapi/ChangeLog
+++ b/sys-apps/dmapi/ChangeLog
@@ -1,9 +1,99 @@
 # ChangeLog for sys-apps/dmapi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/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/sys-apps/dmapi/ChangeLog,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> dmapi-2.2.1.ebuild:
+  Stable on alpha.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> dmapi-2.2.1.ebuild:
+  Stable on ppc.
+
+  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org> dmapi-2.2.1.ebuild:
+  Stable on amd64.
+
+*dmapi-2.2.1 (08 Oct 2004)
+
+  08 Oct 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*dmapi-2.2.0 (03 Sep 2004)
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> dmapi-2.2.0.ebuild:
+  Masked dmapi-2.2.0.ebuild stable for ppc
+
+  31 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  Cleanup of XFS-related apps: dmapi, acl, xfsdump, attr.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> dmapi-2.0.5-r1.ebuild:
+  sync IUSE (missing)
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> dmapi-2.0.5-r1.ebuild:
+  set ppc in keywords
+
+  15 Dec 2003; Jason Wever <weeve@gentoo.org> dmapi-2.0.5-r1.ebuild:
+  Added ~sparc keyword.
+
+  28 Sep 2003; David Holm <dholm@gentoo.org>
+  dmapi-2.0.5-r1.ebuild:
+  Added to ~ppc.
+
+*dmapi-2.0.5-r1 (16 Apr 2003)
+
+  16 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> dmapi-2.05-r1.ebuild :
+  Fixed sandbox issues.
+
+  21 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: 20020330 ->
+  2.0.1_p20020330 to fix policy violation for the naming of CVS snapshot
+  ebuilds.
+  
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*dmapi-2.0.5 (27 Sep 2002)
+
+  27 Sep 2002; Brad Cowan <bcowan@gentoo.org> dmapi-2.0.5.ebuild
+  files/digest-dmapi-2.0.5 :
+  
+  version bump thanks to Hanno Boeck <hanno@gentoo.org>
+
+  05 Oct 2002; Brad Cowan <bcowan@gentoo.org> dmapi-2.0.5.ebuild :
+  
+  Fixed symlinks and "modernized" ebuild.
+  
+  16 Dec 2002; Brad Cowan <bcowan@gentoo.org> dmapi-2.0.5-r1.ebuild,
+  files/dmapi-2.0.5-r1:
+  
+  Changed symlinks.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dmapi-2.0.5-r1.ebuild :
+  Marked as testing for mips.  Made ChangeLog compatible with echangelog.
+
+*dmapi-20020330 (14 July 2002)
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> dmapi-20020330.ebuild :
+  Added KEYWORDS, SLOT.
+
+*dmapi-0.2.2-r1 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> dmapi-0.2.2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> dmapi-0.2.2-r1.ebuild :
+  Added KEYWORDS, SLOT.
 
 *dmapi-20020124-r1 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> dmapi-20020124.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> dmapi-20020124-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index e69de29bb2d1..0362b9b09919 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0642b0cd6a13c17236990affe381a1f3 ChangeLog 3286
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a683706b0c4600f000dbacabd942e373 dmapi-2.2.1.ebuild 1062
+MD5 c38b511afc9ceb131628d5d903ee3834 files/digest-dmapi-2.2.1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0cJmBXaUFmZvwyMRArixAJ9iwuqyLGjMZ++PKaYMRVtDAjpoeQCfX17Z
+arai+FzQ+pkHFXnC5/LnGc4=
+=RJ+6
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dmapi/dmapi-2.2.1.ebuild b/sys-apps/dmapi/dmapi-2.2.1.ebuild
index 1f36799c1eea..1c45bb7f8504 100644
--- a/sys-apps/dmapi/dmapi-2.2.1.ebuild
+++ b/sys-apps/dmapi/dmapi-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/sys-apps/dmapi/dmapi-2.2.1.ebuild,v 1.1 2004/10/08 13:24:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.2.1.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="debug static"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ~sparc x86"
+IUSE="debug"
 
 DEPEND="sys-fs/xfsprogs"
 
@@ -19,6 +19,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i \
+		-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \
 		-e 's:^PKG_\(.*\)_DIR[[:space:]]*= \(.*\)$:PKG_\1_DIR = $(DESTDIR)\2:' \
 		include/builddefs.in || die
 }
diff --git a/sys-apps/dmapi/metadata.xml b/sys-apps/dmapi/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/dmapi/metadata.xml
+++ b/sys-apps/dmapi/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-apps/dmidecode/ChangeLog b/sys-apps/dmidecode/ChangeLog
index 29d72e4c7d59..686daf2829b3 100644
--- a/sys-apps/dmidecode/ChangeLog
+++ b/sys-apps/dmidecode/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for sys-apps/dmidecode
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/ChangeLog,v 1.1 2004/08/21 04:41:18 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/ChangeLog,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
+
+*dmidecode-2.7 (08 Sep 2005)
+
+  08 Sep 2005; Mike Frysinger <vapier@gentoo.org> +dmidecode-2.7.ebuild:
+  Version bump #105310 by Martin Nowack.
+
+  21 May 2005; David Holm <dholm@gentoo.org> dmidecode-2.5.ebuild,
+  dmidecode-2.6.ebuild:
+  Masked on ppc since it depends on x86 BIOS extensions
+
+*dmidecode-2.6 (02 Mar 2005)
+
+  02 Mar 2005; Tony Vroon <chainsaw@gentoo.org> -dmidecode-2.4.ebuild,
+  +dmidecode-2.6.ebuild:
+  Version bump to 2.6; removed old 2.4 ebuild.
+
+*dmidecode-2.5 (29 Nov 2004)
+
+  29 Nov 2004; Tony Vroon <chainsaw@gentoo.org> dmidecode-2.4.ebuild,
+  +dmidecode-2.5.ebuild:
+  Version bump, closes bug #72810. 2.4 stable on x86.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> dmidecode-2.4.ebuild:
+  Added to ~ppc.
 
 *dmidecode-2.4 (21 Aug 2004)
 
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 937970a6d0d1..c7efdc7f483e 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,2 +1,16 @@
-MD5 9ef20c0a471b90b7e83192935179737a dmidecode-2.4.ebuild 1227
-MD5 6a74ce88ec57714cc3170b034b461293 files/digest-dmidecode-2.4 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1ba5683061b1b3e849b3267cfd0307c5 dmidecode-2.6.ebuild 930
+MD5 f2d7857ba189ff36e67ca2acb7624cd0 dmidecode-2.7.ebuild 863
+MD5 259e9d31829447ff7f3b9206c013bb68 ChangeLog 1087
+MD5 fa7a11967392113ce7db9fbeec2d8587 files/digest-dmidecode-2.6 65
+MD5 473f450c6b4ddbb037acbaf0ffc64962 files/digest-dmidecode-2.7 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIMmNgIKl8Uu19MoRAtAtAJ4hb19NALeHujpLfNo7xTtDc/HPAACdGelc
+6nbB9G1oe01CJP1j6VulvEk=
+=S4yS
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dmidecode/dmidecode-2.6.ebuild b/sys-apps/dmidecode/dmidecode-2.6.ebuild
index 2374b44b624d..ba4936157674 100644
--- a/sys-apps/dmidecode/dmidecode-2.6.ebuild
+++ b/sys-apps/dmidecode/dmidecode-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/dmidecode-2.6.ebuild,v 1.1 2005/03/02 17:01:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/dmidecode-2.6.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -10,10 +10,10 @@ SRC_URI="http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ia64 -ppc x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4"
+DEPEND=""
 RDEPEND=""
 
 src_unpack() {
@@ -23,7 +23,7 @@ src_unpack() {
 	use ia64 && append-flags -D__IA64__
 	sed -i \
 		-e "s:-O2:${CFLAGS}${ARCHFLAGS}:" \
-		-e "s:man/man8:share/man/man8:g" \
+		-e '/^mandir/s:/man:/share/man:' \
 		-e "s:/usr/local:${D}/usr:" \
 		Makefile || die "manpage sed failed"
 }
diff --git a/sys-apps/dmidecode/dmidecode-2.7.ebuild b/sys-apps/dmidecode/dmidecode-2.7.ebuild
index ae73927af2cd..cc7b534750d1 100644
--- a/sys-apps/dmidecode/dmidecode-2.7.ebuild
+++ b/sys-apps/dmidecode/dmidecode-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/sys-apps/dmidecode/dmidecode-2.7.ebuild,v 1.1 2005/09/08 23:30:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/dmidecode-2.7.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/sys-apps/dnotify/ChangeLog b/sys-apps/dnotify/ChangeLog
index b9635356be8d..94735418763f 100644
--- a/sys-apps/dnotify/ChangeLog
+++ b/sys-apps/dnotify/ChangeLog
@@ -1,9 +1,54 @@
 # ChangeLog for sys-apps/dnotify
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/ChangeLog,v 1.1 2002/06/14 19:41:07 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/ChangeLog,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> dnotify-0.17.1.ebuild:
+  Stable on ppc.
+
+*dnotify-0.18.0 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +dnotify-0.18.0.ebuild:
+  Version bump.
+
+  03 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> dnotify-0.16.0.ebuild,
+  dnotify-0.17.1.ebuild, dnotify-0.5.0.ebuild:
+  Keyworded -sparc, they're b0rked
+
+  01 Nov 2004; Joshua Kinard <kumba@gentoo.org> dnotify-0.17.1.ebuild:
+  Marked stable on mips.
+
+  26 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> dnotify-0.16.0.ebuild:
+  Marked stable on amd64.
+
+*dnotify-0.17.1 (18 Sep 2004)
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> dnotify-0.16.0.ebuild,
+  +dnotify-0.17.1.ebuild, dnotify-0.5.0.ebuild:
+  Version bump. Marked 0.16.0 stable on x86. Updated HOMEPAGE in all ebuilds.
+
+*dnotify-0.16.0 (18 Jul 2004)
+
+  18 Jul 2004; Daniel Black <dragonheart@gentoo.org> +dnotify-0.16.0.ebuild,
+  dnotify-0.5.0.ebuild:
+  0.5.0 - QA fix S= is default, SRC_URI doesn't exist - changed to
+  mirror://gentoo/. 0.16.0 - version bump
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> dnotify-0.5.0.ebuild:
+  sync IUSE (missing)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *dnotify-0.5.0 (14 June 2002)
 
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> dnotify-0.5.0.ebuild :
+  Marked as stable for mips.
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> dnotify-0.5.0.ebuild :
+  Added KEYWORDS, SLOT.
+
   14 June 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/dnotify/Manifest b/sys-apps/dnotify/Manifest
index e69de29bb2d1..e8e97f00c040 100644
--- a/sys-apps/dnotify/Manifest
+++ b/sys-apps/dnotify/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d15aec4f72de8fc59a900ad262080b21 dnotify-0.17.1.ebuild 737
+MD5 8bce7728595becbccf38b63581491585 dnotify-0.18.0.ebuild 723
+MD5 b17122125332d8333622a9f0e37f7f1b ChangeLog 2175
+MD5 85d105f04895e3af7c3ca6f17f0a54ca dnotify-0.16.0.ebuild 833
+MD5 064c626efc734f07a2d6f5ce4de5e1f0 files/digest-dnotify-0.17.1 66
+MD5 1b56ee3ed03445117aa35b1efb48578a files/digest-dnotify-0.18.0 66
+MD5 286c6f49267c740d89cc3b9315172301 files/digest-dnotify-0.16.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDB+aJgIKl8Uu19MoRAuYFAJ9pU8LSXIH90BnkhTFGQLCV5hHUiACfYhdw
+dcML/J+RTfUkVWBh8fk6kSU=
+=7g81
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dnotify/dnotify-0.16.0.ebuild b/sys-apps/dnotify/dnotify-0.16.0.ebuild
index 2f9b2c246842..d78b20554a0a 100644
--- a/sys-apps/dnotify/dnotify-0.16.0.ebuild
+++ b/sys-apps/dnotify/dnotify-0.16.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.16.0.ebuild,v 1.1 2004/07/17 23:28:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.16.0.ebuild,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
 DESCRIPTION="Execute a command when the contents of a directory change"
 SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
-HOMEPAGE="http://www.student.lu.se/~nbi98oli/"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~mips"
+HOMEPAGE="http://www.student.lu.se/~nbi98oli/dnotify.html"
+KEYWORDS="x86 amd64 ppc -sparc ~mips"
 IUSE="nls"
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/sys-apps/dnotify/dnotify-0.17.1.ebuild b/sys-apps/dnotify/dnotify-0.17.1.ebuild
index 101be14ad560..1e9ceb177a7b 100644
--- a/sys-apps/dnotify/dnotify-0.17.1.ebuild
+++ b/sys-apps/dnotify/dnotify-0.17.1.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.17.1.ebuild,v 1.1 2004/09/18 17:26:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.17.1.ebuild,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
 DESCRIPTION="Execute a command when the contents of a directory change"
-SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 HOMEPAGE="http://www.student.lu.se/~nbi98oli/dnotify.html"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~mips"
-IUSE="nls"
-SLOT="0"
+SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 mips ppc -sparc x86"
+IUSE="nls"
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/gettext"
+DEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	econf $(use_enable nls) || die "failed to configure"
@@ -22,10 +19,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS TODO NEWS README || die "dodoc failed"
-}
-
-src_test() {
-	make check
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS TODO NEWS README
 }
diff --git a/sys-apps/dnotify/dnotify-0.18.0.ebuild b/sys-apps/dnotify/dnotify-0.18.0.ebuild
index 5a30c181189b..5a54602603b4 100644
--- a/sys-apps/dnotify/dnotify-0.18.0.ebuild
+++ b/sys-apps/dnotify/dnotify-0.18.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/sys-apps/dnotify/dnotify-0.18.0.ebuild,v 1.1 2005/07/17 13:33:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dnotify/dnotify-0.18.0.ebuild,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
 DESCRIPTION="Execute a command when the contents of a directory change"
-HOMEPAGE="http://www.student.lu.se/~nbi98oli/dnotify.html"
-SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
+HOMEPAGE="http://oskarsapps.mine.nu/dnotify.html"
+SRC_URI="http://oskarsapps.mine.nu/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/dnotify/metadata.xml b/sys-apps/dnotify/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/dnotify/metadata.xml
+++ b/sys-apps/dnotify/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-apps/dog/ChangeLog b/sys-apps/dog/ChangeLog
index 9f7d3d8066b7..12cad013a259 100644
--- a/sys-apps/dog/ChangeLog
+++ b/sys-apps/dog/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for sys-apps/dog
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.1 2003/03/14 18:50:41 rac Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> dog-1.7-r2.ebuild:
+  Stable on ppc.
+
+  10 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> dog-1.7-r1.ebuild,
+  dog-1.7-r2.ebuild:
+  Fix sed to work if the compiler path includes slashes, bug #102025
+
+  10 Aug 2005; Luis Medinas <metalgod@gentoo.org> dog-1.7-r2.ebuild:
+  Marked Stable on AMD64.
+
+  28 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> dog-1.7-r2.ebuild:
+  Added ~mips.
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> dog-1.7-r2.ebuild:
+  Stable on alpha.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> dog-1.7-r2.ebuild:
+  Stable on ppc64
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> dog-1.7-r2.ebuild:
+  Stable on sparc
+
+  28 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> -dog-1.7.ebuild,
+  dog-1.7-r2.ebuild:
+  1.7 stable on x86; tidy old ebuild.
+
+*dog-1.7-r1 (13 May 2005)
+
+  13 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dog-1.7-check-ctime.diff, +dog-1.7-r1.ebuild:
+  Revision bump; added patch to fix missing check on ctime return value (was
+  using strcpy(buf, ctime(...))). Also use socklen_t over int as it should be
+  (fixes gcc-4 warning as well).
+
+  28 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> metadata.xml:
+  Move from base-system to shell-tools
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.7-manpage-touchup.patch, dog-1.7.ebuild:
+  Touchup -w example usage #69660.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> dog-1.7.ebuild:
+  Masked dog-1.7.ebuild stable for ppc
+
+  18 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> dog-1.7.ebuild:
+  Added sparc, bug #60789
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> dog-1.7.ebuild:
+  stable on ppc64, bug #58301
+
+  25 Jul 2004; Erik Swanson <erik_swanson@gentoo.org> dog-1.7.ebuild:
+  Added macos to KEYWORDS re bug #58307
+
+  01 Oct 2003; Tavis Ormandy <taviso@gentoo.org> dog-1.7.ebuild:
+  Stable on alpha
+
+  07 Jun 2003; <rac@gentoo.org> dog-1.7.ebuild:
+  Add sed-4 dependency because we use sed -i
+
+  05 Jun 2003; Tavis Ormandy <taviso@gentoo.org> dog-1.7.ebuild:
+  marking ~alpha, removing gcc hardcode if ccc is being used.
 
 *dog-1.7 (14 Mar 2003)
 
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index e69de29bb2d1..2fbec8028e32 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -0,0 +1,9 @@
+MD5 548521193355a36e7a16aa46fb2f8dab dog-1.7-r1.ebuild 768
+MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
+MD5 a11dabbf28347277b34c12eccadc2c5b ChangeLog 2471
+MD5 dfbf53fe243e4c0cee3dd0a73e42495d dog-1.7-r2.ebuild 820
+MD5 39566b62f641a9ca7555f7bbea2878d9 files/1.7-manpage-touchup.patch 498
+MD5 c53d189c92688fe749f4f4376d4727e7 files/dog-1.7-64bit-goodness.patch 791
+MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7-r1 58
+MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7-r2 58
+MD5 4af367da579347ba9b87e42418a0c3fd files/dog-1.7-check-ctime.diff 1409
diff --git a/sys-apps/dog/dog-1.7-r1.ebuild b/sys-apps/dog/dog-1.7-r1.ebuild
index 5d1c588745b5..b79e5ccca8e2 100644
--- a/sys-apps/dog/dog-1.7-r1.ebuild
+++ b/sys-apps/dog/dog-1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7-r1.ebuild,v 1.1 2005/05/13 12:46:31 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,8 +19,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-check-ctime.diff
 	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
 	sed -i \
-		-e 's/^CFLAGS/#CFLAGS/' \
-		-e "s/gcc/$(tc-getCC)/" \
+		-e 's,^CFLAGS,#CFLAGS,' \
+		-e "s,gcc,$(tc-getCC)," \
 		Makefile || die "sed Makefile failed"
 }
 
diff --git a/sys-apps/dog/dog-1.7-r2.ebuild b/sys-apps/dog/dog-1.7-r2.ebuild
index a7d1a4106288..42fa294e308f 100644
--- a/sys-apps/dog/dog-1.7-r2.ebuild
+++ b/sys-apps/dog/dog-1.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/sys-apps/dog/dog-1.7-r2.ebuild,v 1.1 2005/05/23 09:01:51 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://jl.photodex.com/dog/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~mips ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 src_unpack() {
@@ -20,8 +20,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
 	epatch ${FILESDIR}/${P}-64bit-goodness.patch
 	sed -i \
-		-e 's/^CFLAGS/#CFLAGS/' \
-		-e "s/gcc/$(tc-getCC)/" \
+		-e 's,^CFLAGS,#CFLAGS,' \
+		-e "s,gcc,$(tc-getCC)," \
 		Makefile || die "sed Makefile failed"
 }
 
diff --git a/sys-apps/dog/metadata.xml b/sys-apps/dog/metadata.xml
index f093d416cbb1..1bd09b7fe2c3 100644
--- a/sys-apps/dog/metadata.xml
+++ b/sys-apps/dog/metadata.xml
@@ -1,7 +1,9 @@
- * 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>shell-tools</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dstat/ChangeLog b/sys-apps/dstat/ChangeLog
index bf4cde71d0fa..49dad30815a7 100644
--- a/sys-apps/dstat/ChangeLog
+++ b/sys-apps/dstat/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for sys-apps/dstat
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.1 2004/11/13 19:32:32 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
+
+*dstat-0.6.1 (09 Sep 2005)
+*dstat-0.6.0-r1 (09 Sep 2005)
+
+  09 Sep 2005; Sven Wegener <swegener@gentoo.org> -dstat-0.6.0.ebuild,
+  +dstat-0.6.0-r1.ebuild, +dstat-0.6.1.ebuild:
+  Version bump to 0.6.1. Revision bump for the old version to distribute a
+  plugin installation fix.
+
+  03 Sep 2005; <dang@gentoo.org> dstat-0.6.0.ebuild:
+  Marked stable on amd64
+
+  07 Jul 2005; Sven Wegener <swegener@gentoo.org> -dstat-0.5.10.ebuild,
+  dstat-0.6.0.ebuild:
+  Marked stable on x86.
+
+*dstat-0.6.0 (31 May 2005)
+
+  31 May 2005; Sven Wegener <swegener@gentoo.org> +dstat-0.6.0.ebuild:
+  Version bump.
+
+  16 May 2005; Sven Wegener <swegener@gentoo.org> -dstat-0.5.7.ebuild,
+  -dstat-0.5.8.ebuild, -dstat-0.5.9.ebuild, dstat-0.5.10.ebuild:
+  Marked 0.5.10 stable on x86. Removed old ebuilds.
+
+*dstat-0.5.10 (10 Apr 2005)
+
+  10 Apr 2005; Sven Wegener <swegener@gentoo.org> +dstat-0.5.10.ebuild:
+  Version bump.
+
+  09 Apr 2005; Joseph Jezak <josejx@gentoo.org> dstat-0.5.9.ebuild:
+  Marked ~ppc for bug #87984.
+
+*dstat-0.5.9 (02 Apr 2005)
+
+  02 Apr 2005; Sven Wegener <swegener@gentoo.org> +dstat-0.5.9.ebuild:
+  Version bump.
+
+*dstat-0.5.8 (15 Mar 2005)
+
+  15 Mar 2005; Sven Wegener <swegener@gentoo.org> -dstat-0.5.5.ebuild,
+  dstat-0.5.7.ebuild, +dstat-0.5.8.ebuild:
+  Version bump. Marked 0.5.7 stable on x86.
+
+*dstat-0.5.7 (26 Jan 2005)
+
+  26 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> metadata.xml,
+  +dstat-0.5.7.ebuild:
+  version bump, add ~amd64, update metadata.xml
+
+  21 Jan 2005; Sven Wegener <swegener@gentoo.org> dstat-0.5.5.ebuild:
+  Marked stable on x86.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> -dstat-0.5.2.ebuild,
+  -dstat-0.5.4.ebuild:
+  Removed old ebuilds.
+
+*dstat-0.5.5 (02 Dec 2004)
+
+  02 Dec 2004; Sven Wegener <swegener@gentoo.org> +dstat-0.5.5.ebuild:
+  Version bump.
+
+*dstat-0.5.4 (26 Nov 2004)
+
+  26 Nov 2004; Sven Wegener <swegener@gentoo.org> +dstat-0.5.4.ebuild:
+  Version bump.
 
 *dstat-0.5.2 (13 Nov 2004)
 
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index a10562b29922..77f32f41d876 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,2 +1,16 @@
-MD5 8b0a929d1dc0748e1091d024569dbc60 dstat-0.5.2.ebuild 364
-MD5 612731a09013c28e27503e23d80213dc files/digest-dstat-0.5.2 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b7460a04831bf23d4ad524b0861c8a4 ChangeLog 2275
+MD5 489c9301bc36ad666b39a175c2b54997 dstat-0.6.0-r1.ebuild 1061
+MD5 4d339c7a786df310132fda5cfafafcb1 dstat-0.6.1.ebuild 1060
+MD5 848b9935dac0ed2a49a059a7a870bb19 files/digest-dstat-0.6.0-r1 63
+MD5 e3a3aeb864d1287421ffb1e3f3878218 files/digest-dstat-0.6.1 63
+MD5 ffa68eb3467e3f5612b56c42288a9fb6 metadata.xml 876
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIXaUI1lqEGTUzyQRAm0RAJ9HRI2xhPJBmyeH1qzmd6VHWNr34QCgqxt1
+Gqy88oBgK5S9nlCFvrwzcjo=
+=sOHg
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dstat/dstat-0.6.0-r1.ebuild b/sys-apps/dstat/dstat-0.6.0-r1.ebuild
index 701452cd3776..61a63ff83d1d 100644
--- a/sys-apps/dstat/dstat-0.6.0-r1.ebuild
+++ b/sys-apps/dstat/dstat-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/sys-apps/dstat/dstat-0.6.0-r1.ebuild,v 1.1 2005/09/09 11:48:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 inherit python
 
diff --git a/sys-apps/dstat/dstat-0.6.1.ebuild b/sys-apps/dstat/dstat-0.6.1.ebuild
index 8a04859074a1..b7825e0610c5 100644
--- a/sys-apps/dstat/dstat-0.6.1.ebuild
+++ b/sys-apps/dstat/dstat-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/sys-apps/dstat/dstat-0.6.1.ebuild,v 1.1 2005/09/09 11:48:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 inherit python
 
diff --git a/sys-apps/dstat/metadata.xml b/sys-apps/dstat/metadata.xml
index 6614cb149d4f..d0a93c95f315 100644
--- a/sys-apps/dstat/metadata.xml
+++ b/sys-apps/dstat/metadata.xml
@@ -4,8 +4,14 @@
 	<herd>no-herd</herd>
 	<maintainer>
 		<email>swegener@gentoo.org</email>
+		<name>Sven Wegener</name>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Secondary Maintainer</description>
+	</maintainer>
 	<longdescription>
 Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat overcomes
 some of the limitations and adds some extra features.
diff --git a/sys-apps/ed/ChangeLog b/sys-apps/ed/ChangeLog
index 4ca56b516bd8..e1c281fb0b87 100644
--- a/sys-apps/ed/ChangeLog
+++ b/sys-apps/ed/ChangeLog
@@ -1,9 +1,75 @@
 # ChangeLog for sys-apps/ed
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/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/sys-apps/ed/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
+*ed-0.2-r6 (10 Jan 2005)
+
+  10 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/0.2-mkstemp.patch,
+  -ed-0.2-r5.ebuild, +ed-0.2-r6.ebuild:
+  Really fix the mktemp patch #77367.
+
+  09 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/0.2-mkstemp.patch,
+  -files/0.2-r5-mkstemp.patch, -ed-0.2-r4.ebuild, ed-0.2-r5.ebuild:
+  Push to stable.  Only run make the autoconf stuff when cross-compiling #76038.
+
+*ed-0.2-r5 (09 Jan 2005)
+
+  09 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/0.2-r5-mkstemp.patch, +ed-0.2-r5.ebuild:
+  Bug #73858 - patch from bug #66400 produced incorrect output in some cases.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Dec 2004; Mike Frysinger <vapier@gentoo.org> ed-0.2-r4.ebuild:
+  cross-compile fixes
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> ed-0.2-r4.ebuild:
+  stable on ppc64, bug #66400
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> ed-0.2-r4.ebuild:
+  Stable amd64.
+
+  06 Oct 2004; <SeJo@gentoo.org> ed-0.2-r4.ebuild:
+  stable masking for gsla: 66400
+
+  05 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> ed-0.2-r4.ebuild:
+  Stable on sparc wrt #66400
+
+  05 Oct 2004; Olivier Crete <tester@gentoo.org> ed-0.2-r4.ebuild:
+  Marking stable on x86 wrt bug #66400
+
+  05 Oct 2004; Bryan Østergaard,,, <kloeri@gentoo.org> ed-0.2-r4.ebuild:
+  Stable on alpha, bug 66400.
+
+*ed-0.2-r4 (05 Oct 2004)
+
+  05 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/0.2-info-dir.patch,
+  +files/0.2-mkstemp.patch, +ed-0.2-r4.ebuild:
+  Security fix #66400.
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> ed-0.2-r3.ebuild:
+  adding initial s390 support
+
+  20 Feb 2003; Zach Welch <gmsoft@gentoo.org> ed-0.2-r3.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> ed-0.2-r3.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ed-0.2-r3 (1 Feb 2002)
 
+  15 Feb 2003; Jan Seidel <tuxus@gentoo.org> ed-0.2-r3.ebuild :
+  Added mips to keywords
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> ed-0.2-r3.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index e69de29bb2d1..8921998acc9e 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8437ba0a2d889f98ec8828bcaf39485c ChangeLog 2837
+MD5 fe11e0ded7a0d23a1974e46851c11442 ed-0.2-r6.ebuild 1535
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1b60eebda7e05a6a35164bc4b23ac8ff files/digest-ed-0.2-r6 58
+MD5 0c8a87453a1d75e2ff8ed4510b306de0 files/0.2-mkstemp.patch 979
+MD5 549e2478edb18002261ae5dd055bcf5b files/0.2-info-dir.patch 373
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.14 (GNU/Linux)
+
+iD8DBQFB4ra0roRuSHgZdywRApcDAJ4tbOAxoPYZNfYMSMTGGoNrRahLNgCgj7AS
+eV4DtyW+HfuDHNSoSEvkKiA=
+=Lj+Y
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ed/ed-0.2-r6.ebuild b/sys-apps/ed/ed-0.2-r6.ebuild
index 12cb48724341..82cf7f356a7f 100644
--- a/sys-apps/ed/ed-0.2-r6.ebuild
+++ b/sys-apps/ed/ed-0.2-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-apps/ed/ed-0.2-r6.ebuild,v 1.1 2005/01/10 17:01:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r6.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sys-apps/ed/files/0.2-mkstemp.patch b/sys-apps/ed/files/0.2-mkstemp.patch
index 6103a2d088dd..5fe98b81049a 100644
--- a/sys-apps/ed/files/0.2-mkstemp.patch
+++ b/sys-apps/ed/files/0.2-mkstemp.patch
@@ -1,8 +1,15 @@
+This is based on the following:
+===
 Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
 Date: 2003-10-05
 Initial Package Version: 0.2
 Origin: Slackware Source
 Description: Use mkstemp instead of mktemp.
+===
+However the original patch contained an error.
+mkstemp returns a file description, so when fopen ran, the file was opened twice.
+The correct change is to use fdopen with mkstemp.
+See gentoo bug #73858.
 diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
 --- ed-0.2/buf.c	Sat Nov 19 04:37:59 1994
 +++ ed-0.2-2/buf.c	Tue May 28 18:38:23 2002
@@ -19,7 +26,7 @@ diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
    strcpy (sfn, "/tmp/ed.XXXXXX");
 -  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
 +  sfd = mkstemp(sfn);
-+    if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)
++  if ((sfd == -1) || (sfp = fdopen (sfd, "w+")) == NULL)
      {
        fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
        sprintf (errmsg, "Cannot open temp file");
diff --git a/sys-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/ed/metadata.xml
+++ b/sys-apps/ed/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-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index ab13f74b2ca1..f56754076902 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,9 +1,164 @@
 # ChangeLog for sys-apps/eject
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
+
+  03 Oct 2005; Hardave Riar <hardave@gentoo.org> eject-2.0.13-r2.ebuild:
+  Stable on mips.
+
+  02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> eject-2.0.13-r2.ebuild:
+  Alpha stable.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> eject-2.0.13-r2.ebuild:
+  Marked Stable on amd64.
+
+  24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  eject-2.0.13-r2.ebuild:
+  Stable on ppc.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> eject-2.0.13-r2.ebuild:
+  Stable on ppc64
+
+  19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  eject-2.0.13-r2.ebuild:
+  Stable on sparc
+
+*eject-2.1.0 (18 Sep 2005)
+
+  18 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/eject-2.1.0-regcomp-check.patch,
+  +files/eject-2.1.0-scsi-io-update.patch, +eject-2.1.0.ebuild:
+  Version bump #106356 by Surakshan Mendis.
+
+  25 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> eject-2.0.13.ebuild,
+  eject-2.0.13-r1.ebuild, eject-2.0.13-r2.ebuild:
+  Block virtual/eject else it conflicts with sys-block/unieject.
+
+  23 Jul 2005; <solar.@gentoo.org> +files/eject-2.0.13-i18n-uclibc.patch,
+  eject-2.0.13-r2.ebuild:
+  - handle uclibc minimal exceptions when i18n/nls/gettext is not active
+
+  28 May 2005; Diego Pettenò <flameeyes@gentoo.org> eject-2.0.13.ebuild,
+  eject-2.0.13-r1.ebuild, eject-2.0.13-r2.ebuild:
+  Added virtual provision for virtual/eject.
+
+*eject-2.0.13-r2 (21 May 2005)
+
+  21 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/eject-2.0.13-close-check.patch, files/eject-2.0.13-finddev.patch,
+  +files/eject-2.0.13-fstab-error.patch,
+  +files/eject-2.0.13-no-umount.patch,
+  +files/eject-2.0.13-prefix-defaultdevice-with-dev.patch,
+  +files/eject-2.0.13-toggle.patch, +files/eject-2.0.13-xmalloc.patch,
+  +files/eject-2.0.13-xregcomp.patch, +eject-2.0.13-r2.ebuild,
+  +eject-2.0.13-pumount.patch:
+  Add toggle support by Patrik Kullman #62612 and a bunch of patches from
+  Debian #91977.
+
+*eject-2.0.13-r1 (13 Feb 2005)
+
+  13 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/eject-2.0.13-autoclose.patch, +files/eject-2.0.13-finddev.patch,
+  +files/eject-2.0.13-header.patch,
+  files/eject-2.0.13-kernel25-support.patch,
+  +files/eject-2.0.13-use-mountpoints.patch, +eject-2.0.13-r1.ebuild:
+  Grab a bunch of patches from Fedora.
+
+  25 Jan 2005; Mike Doty <kingtaco@gentoo.org> eject-2.0.13.ebuild:
+  nls patch provided by seemant
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  eject-2.0.13.ebuild:
+  Masked eject-2.0.13.ebuild stable for ppc
+
+  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> eject-2.0.13.ebuild:
+  depend on sed-4; error check sed; tidy install
+
+  13 May 2004; Stephen P. Becker <geoman@gentoo.org> eject-2.0.13.ebuild:
+  Stable on mips.
+
+  14 Mar 2004; Stephen P. Becker <geoman@gentoo.org> eject-2.0.13.ebuild:
+  Added ~mips keyword.
+
+  09 Mar 2004; <agriffis@gentoo.org> eject-2.0.13.ebuild:
+  stable on alpha and ia64
+
+  26 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org> eject-2.0.13.ebuild:
+  stable on sparc
+
+  25 Feb 2004; Guy Martin <gmsoft@gentoo.org> eject-2.0.13.ebuild:
+  Marked stable on hppa.
+
+  24 Feb 2004; <augustus@gentoo.org> eject-2.0.13.ebuild:
+  Made eject-2.0.13 stable on amd64. BUG #42720.
+
+  23 Feb 2004; Seemant Kulleen <seemant@gentoo.org> eject-2.0.13.ebuild:
+  moved 13 to stable, 12 is causing issues all over the place it seems
+
+  19 Feb 2004; Martin Schlemmer <azarah@gentoo.org> eject-2.0.13.ebuild:
+  Fix silly includes based on a patch by Ronald Hummelink
+  <gentoo-bugzilla@hummelink.xs4all.nl>, bug #41856.
+
+  05 Dec 2003; <plasmaroo@gentoo.org>
+  files/eject-2.0.12-kernel25-support.patch,
+  files/eject-2.0.13-kernel25-support.patch:
+  Fixed the patches to work happily with 2.6. kernels; closing bug #35088.
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> eject-2.0.12-r1.ebuild:
+  Stable on ia64.
+
+*eject-2.0.13 (08 Nov 2003)
+
+  08 Nov 2003; Martin Holzer <mholzer@gentoo.org> eject-2.0.13.ebuild,
+  files/eject-2.0.13-kernel25-support.patch:
+  Version bumped. Closes bug #32953.
+
+  06 Mar 2003; Martin Schlemmer <azarah@gentoo.org> eject-2.0.12-r1.ebuild :
+  Get eject to build with kernel-2.5.x.
+
+  03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  This update should not be classified as a security update. The advisory says that eject is only
+  vulnerable if it is install setuid root and in Gentoo it is not. However if someone decides to
+  make it setuid root the patch in -r1 will make it safer.
+
+*eject-2.0.12-r1 (03 Mar 2003)
+
+  04 Jul 2003; Guy Martin <gmsoft@gentoo.org> eject-2.0.12-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> eject-2.0.12.ebuild :
+  Unmasked becuse of GLSA.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*eject-2.0.12 (05 Nov 2002)
+
+  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> eject-2.0.12.ebuild :
+  Mark stable on Alpha.
+
+  05 Dec 2002; Will Woods <wwoods@gentoo.org> eject-2.0.10.ebuild, eject-2.0.12.ebuild: 
+  Added 'alpha' keyword.
+
+  06 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*eject-2.0.10 (9 May 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> eject-2.0.10.ebuild :
+  Added KEYWORDS, SLOT.
+
+  9 May 2002; D.Chamberlain <daybird@gentoo.org> Changelog:
+  
+  Updated to 2.0.10.  This version is not sandbox friendly, so we only install the
+  binaries and docs.
 
 *eject-2.0.6 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> eject-2.0.6.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index e69de29bb2d1..614a06fa8c9d 100644
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -0,0 +1,24 @@
+MD5 718881f23ead192ea93f9f29ef521abe ChangeLog 6126
+MD5 35241bc9ea850572d8d7275f822b8162 eject-2.0.13-r1.ebuild 1109
+MD5 8326cfa02e968ee3060dc791691fd990 eject-2.0.13-r2.ebuild 1560
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 6ad3c8045456a789af1971b0d6527302 eject-2.1.0.ebuild 1412
+MD5 342a30a8b7f066819287f915db430865 files/digest-eject-2.1.0 62
+MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r1 63
+MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r2 63
+MD5 79ae9b9c17b25df97606a29a7bb47150 files/eject-2.0.13-autoclose.patch 726
+MD5 c5613bc078215c657678c57e387731ac files/eject-2.0.13-close-check.patch 1405
+MD5 c72d5d5d53d6390c871f8ee901770c7b files/eject-2.0.13-finddev.patch 1978
+MD5 31688554edc80b2d6cf1ae427a6533f7 files/eject-2.0.13-fstab-error.patch 956
+MD5 c7f02cf0dea0ee27a338220804de25ab files/eject-2.0.13-header.patch 848
+MD5 f9dc8e0281dbe9fd3f4db87d5ecfc69e files/eject-2.0.13-kernel25-support.patch 458
+MD5 ba37ff5a9223af8de446a18e62dbe19d files/eject-2.0.13-no-umount.patch 2496
+MD5 9ce8b7632acf54813ee4336d89293b53 files/eject-2.0.13-prefix-defaultdevice-with-dev.patch 488
+MD5 9741dfe0732a1a137742fc5302acb007 files/eject-2.0.13-pumount.patch 896
+MD5 0109237261a5ce6357ddcd041259e61e files/eject-2.0.13-toggle.patch 2838
+MD5 9a4e89b1944feaa8da40749822de0f44 files/eject-2.0.13-use-mountpoints.patch 965
+MD5 4c62f46d6d72dd079fd677db6ae57059 files/eject-2.0.13-xmalloc.patch 654
+MD5 6511dfbfe2029a7e582f958af0d41ca7 files/eject-2.0.13-xregcomp.patch 649
+MD5 b92a6e4f192ffefdc4ad665fba3ed4a7 files/eject-2.0.13-i18n-uclibc.patch 645
+MD5 dd1b8295e14d3b2ee85a9f06860a5a9f files/eject-2.1.0-regcomp-check.patch 503
+MD5 b60886258cade258841187669f401bb9 files/eject-2.1.0-scsi-io-update.patch 2949
diff --git a/sys-apps/eject/eject-2.0.13-r1.ebuild b/sys-apps/eject/eject-2.0.13-r1.ebuild
index 83923cecd11a..8e9cd89c4537 100644
--- a/sys-apps/eject/eject-2.0.13-r1.ebuild
+++ b/sys-apps/eject/eject-2.0.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r1.ebuild,v 1.1 2005/02/13 05:12:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 inherit eutils
 
@@ -11,12 +11,11 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 sh sparc x86"
 IUSE="nls"
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND="!virtual/eject"
+PROVIDE="virtual/eject"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/eject/eject-2.0.13-r2.ebuild b/sys-apps/eject/eject-2.0.13-r2.ebuild
index ce4900933848..c9d67ffb8aa0 100644
--- a/sys-apps/eject/eject-2.0.13-r2.ebuild
+++ b/sys-apps/eject/eject-2.0.13-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-apps/eject/eject-2.0.13-r2.ebuild,v 1.1 2005/05/21 03:31:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 inherit eutils
 
@@ -11,10 +11,11 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-DEPEND=""
+DEPEND="!virtual/eject"
+PROVIDE="virtual/eject"
 
 src_unpack() {
 	unpack ${A}
@@ -31,6 +32,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-no-umount.patch
 	epatch "${FILESDIR}"/${P}-toggle.patch
 	epatch "${FILESDIR}"/${P}-fstab-error.patch
+	epatch "${FILESDIR}"/${P}-pumount.patch
+	epatch "${FILESDIR}"/${P}-i18n-uclibc.patch
 
 	sed -i '/^AM_CFLAGS/s:-O3::' Makefile.in
 	if ! use nls ; then
diff --git a/sys-apps/eject/eject-2.1.0.ebuild b/sys-apps/eject/eject-2.1.0.ebuild
index e4006f5f32f6..5b63fc687bdd 100644
--- a/sys-apps/eject/eject-2.1.0.ebuild
+++ b/sys-apps/eject/eject-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.0.ebuild,v 1.1 2005/09/18 22:05:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/eject/files/eject-2.0.13-autoclose.patch b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
index 9d3662b19c05..c6a13a4b66fc 100644
--- a/sys-apps/eject/files/eject-2.0.13-autoclose.patch
+++ b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
@@ -1,4 +1,4 @@
-Ripped from Fedora
+Ripped from Fedora [has been merged upstream]
 
 --- eject.c	Tue Jul  3 00:17:41 2001
 +++ eject.c	Tue Feb  5 05:50:58 2002
diff --git a/sys-apps/eject/files/eject-2.0.13-finddev.patch b/sys-apps/eject/files/eject-2.0.13-finddev.patch
index 8b12504907fa..8006b1c84bd6 100644
--- a/sys-apps/eject/files/eject-2.0.13-finddev.patch
+++ b/sys-apps/eject/files/eject-2.0.13-finddev.patch
@@ -1,8 +1,48 @@
-Ripped from Fedora
+Ripped from Fedora, updates from Ubuntu
 
---- eject-2.0.13/eject.c.orig	2004-09-07 12:10:58.382649630 +0200
-+++ eject-2.0.13/eject.c	2004-09-07 12:10:43.930067903 +0200
-@@ -326,6 +326,11 @@
+http://bugs.gentoo.org/91977
+
+--- eject.1
++++ eject.1
+@@ -34,8 +34,8 @@
+ 
+ The device corresponding to <name> is ejected. The name can be a
+ device file or mount point, either a full path or with the leading
+-"/dev" or "/mnt" omitted. If no name is specified, the default name
+-"cdrom" is used.
++"/dev", "/media" or "/mnt" omitted. If no name is specified, the 
++default name "cdrom" is used.
+ 
+ There are four different methods of ejecting, depending on whether the
+ device is a CD-ROM, SCSI device, removable floppy, or tape. By default
+@@ -257,11 +257,11 @@
+ the name ends in a trailing slash, it is removed (this is to support
+ filenames generated using shell file name completion). If the name
+ starts with '.' or '/', it tries to open it as a device file or mount
+-point. If that fails, it tries prepending '/dev/', '/mnt/', '/dev/cdroms',
+-\&'/dev/rdsk/', '/dev/dsk/', and finally './' to the name, until a
+-device file or mount point is found that can be opened. The program
+-checks /etc/mtab for mounted devices. If that fails, it also checks
+-/etc/fstab for mount points of currently unmounted devices.
++point. If that fails, it tries prepending '/dev/', '/media/', '/mnt/', 
++'/dev/cdroms', '/dev/rdsk/', '/dev/dsk/', and finally './' to the name, 
++until a device file or mount point is found that can be opened. The 
++program checks /etc/mtab for mounted devices. If that fails, it also 
++checks /etc/fstab for mount points of currently unmounted devices.
+ 
+ Creating symbolic links such as /dev/cdrom or /dev/zip is recommended
+ so that
+--- eject.c
++++ eject.c
+@@ -294,6 +294,7 @@
+  *
+  * foo (if foo starts with '.' or '/')
+  * /dev/foo
++ * /media/foo
+  * /mnt/foo
+  * /dev/cdroms/foo
+  * /dev/cdroms/foo0
+@@ -321,6 +322,11 @@
  	if (FileExists(buf))
  		return buf;
  
@@ -11,6 +51,6 @@ Ripped from Fedora
 +	if (FileExists(buf))
 +		return buf;
 +
- 	/* for devfs under Linux */
- 	strcpy(buf, "/dev/cdroms/");
+ 	strcpy(buf, "/mnt/");
  	strcat(buf, name);
+ 	if (FileExists(buf))
diff --git a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
index 4a161242cb2b..a42f3f791c9e 100644
--- a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
+++ b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
@@ -1,11 +1,13 @@
---- eject.c.orig	2002-12-09 22:28:08.000000000 +0000
-+++ eject.c	2003-11-08 17:06:43.000000000 +0000
+	# Get this puppy working with kernel 2.5.x
+	# <azarah@gentoo.org> (06 March 2003)
+--- eject.c.orig
++++ eject.c
 @@ -58,7 +58,13 @@
  #include <sys/ioctl.h>
  #include <sys/wait.h>
  #include <sys/mtio.h>
 -#include <linux/types.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) /* 2.5.x breaks things again */
++#ifndef __KERNEL__
 +# define __KERNEL__
 +# include <linux/types.h>
 +# undef __KERNEL__
diff --git a/sys-apps/eject/files/eject-2.0.13-toggle.patch b/sys-apps/eject/files/eject-2.0.13-toggle.patch
index d095fad57e5c..3e11d9060e69 100644
--- a/sys-apps/eject/files/eject-2.0.13-toggle.patch
+++ b/sys-apps/eject/files/eject-2.0.13-toggle.patch
@@ -35,7 +35,7 @@ or the 4th and 5th hunks will fail.
  "  -v\t-- enable verbose output\n"
  "  -n\t-- don't eject, just show device found\n"
  "  -r\t-- eject CD-ROM\n"
-+"  -T\t-- toggle tray status (EXPERIMENTAL)"
++"  -T\t-- toggle tray status (EXPERIMENTAL)\n"
  "  -s\t-- eject SCSI device\n"
  "  -f\t-- eject floppy\n"
  "  -q\t-- eject tape\n"
@@ -81,10 +81,10 @@ or the 4th and 5th hunks will fail.
  
 +	/* handle -T option */
 +	if (T_option) {
++		struct timeval tv, tv2;
 +		if (v_option)
 +			printf(_("%s: trying to eject\n"), programName);
 +		fd = OpenDevice(deviceName);
-+		struct timeval tv, tv2;
 +		gettimeofday(&tv, NULL);
 +		EjectCdrom(fd);
 +		gettimeofday(&tv2, NULL);
diff --git a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
index 9b12992a7c28..a508c8196749 100644
--- a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
+++ b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
@@ -1,4 +1,4 @@
-Ripped from Fedora
+Ripped from Fedora [merged upstream]
 
 More recent kernels actually want to umount using the mount point and
 not the device name (this makes more sense, you can have the same
@@ -6,9 +6,8 @@ device mounted in many places).
 
 This is a minor changes to do just that.
 
-diff --exclude=debian -Nur eject-2.0.13deb/eject.c eject-2.0.13deb.cw/eject.c
---- eject-2.0.13deb/eject.c	2004-04-17 12:25:10.000000000 -0700
-+++ eject-2.0.13deb.cw/eject.c	2004-04-17 12:26:55.000000000 -0700
+--- eject-2.0.13deb/eject.c
++++ eject-2.0.13deb/eject.c
 @@ -718,8 +718,8 @@
  			status = regexec(&preg, s1, 0, 0, 0);
  			if (status == 0) {
diff --git a/sys-apps/eject/metadata.xml b/sys-apps/eject/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/eject/metadata.xml
+++ b/sys-apps/eject/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-apps/ethtool/ChangeLog b/sys-apps/ethtool/ChangeLog
index 0f52b15f744a..bcfd034df567 100644
--- a/sys-apps/ethtool/ChangeLog
+++ b/sys-apps/ethtool/ChangeLog
@@ -1,9 +1,60 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ChangeLog,v 1.1 2002/11/10 20:53:40 cretin Exp $
+# ChangeLog for sys-apps/ethtool
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ChangeLog,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  23 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> ethtool-2.ebuild:
+  Stable on sh.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> ethtool-2.ebuild:
+  Stable on ppc64
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> ethtool-2.ebuild:
+  Stable on ppc.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> ethtool-2.ebuild:
+  Stable on alpha.
+
+  14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> ethtool-2.ebuild:
+  Stable on sparc
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> ethtool-2.ebuild,
+  ethtool-3.ebuild:
+  Add ~mips for my XXS1500 hardware.
+
+*ethtool-3 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org> +ethtool-3.ebuild:
+  Version bump and magically fix #55941 by Milus János in the process.
+
+*ethtool-2 (29 Sep 2004)
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org> +ethtool-2.ebuild:
+  Version bump #64544 by Kenneth Ljungh.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> ethtool-1.8.ebuild:
+  Masked ethtool-1.8.ebuild stable for ppc
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> ethtool-1.8.ebuild:
+  stable on ppc64, bug #56893
+
+*ethtool-1.8 (10 Mar 2004)
+
+  10 Mar 2004; Aron Griffis <agriffis@gentoo.org> ethtool-1.8.ebuild:
+  version bump
+
+  10 Mar 2004; <agriffis@gentoo.org> ethtool-1.7.ebuild:
+  add ia64 keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ethtool-1.7 (10 Nov 2002)
 
+  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> ethtool-1.7.ebuild :
+  Added hppa to KEYWORDS.
+
   10 Nov 2002; Stefan Jones <cretin@gentoo.org>:
 
   A utility which allows you to manipulate ehternet driver options 
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index e69de29bb2d1..23a9339b1d6f 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 564fc639625c1cf02818ac053ba41d78 ethtool-2.ebuild 588
+MD5 b5d0a094f67d9512b27d329dfe294ce2 ethtool-1.8.ebuild 552
+MD5 a332dc10027eb8a2dae22ebfbaf5a97e ethtool-3.ebuild 597
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 6b243d673fa34e44738cbee0530867db ChangeLog 2105
+MD5 a3bc02ee4d82e2319bade1d5505b67aa files/digest-ethtool-1.8 62
+MD5 966d55d939d32d2c01231666796eeccb files/digest-ethtool-3 61
+MD5 c1a3131f24e207f5697559ccca02b37b files/digest-ethtool-2 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK2LfLLFUmVNQ7rkRAt64AJwJlsORVWh5zWLPFE3p49Rwyh93mwCgksVP
+4j+5LQlamGHGfsd5UXp9L9w=
+=ndER
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ethtool/ethtool-1.8.ebuild b/sys-apps/ethtool/ethtool-1.8.ebuild
index 5d8c9ce76b42..0ecbf5dd1179 100644
--- a/sys-apps/ethtool/ethtool-1.8.ebuild
+++ b/sys-apps/ethtool/ethtool-1.8.ebuild
@@ -1,15 +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/sys-apps/ethtool/ethtool-1.8.ebuild,v 1.1 2004/03/10 23:03:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-1.8.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
 HOMEPAGE="http://sourceforge.net/projects/gkernel/"
 SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86 ~amd64 ~alpha ~sparc ~ppc ~hppa ~ia64"
-
+KEYWORDS="x86 amd64 alpha sparc ppc hppa ia64 ppc64"
 IUSE=""
 
 src_install() {
diff --git a/sys-apps/ethtool/ethtool-2.ebuild b/sys-apps/ethtool/ethtool-2.ebuild
index 761843a48795..60b1195367d3 100644
--- a/sys-apps/ethtool/ethtool-2.ebuild
+++ b/sys-apps/ethtool/ethtool-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-apps/ethtool/ethtool-2.ebuild,v 1.1 2004/09/30 03:20:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-2.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
 HOMEPAGE="http://sourceforge.net/projects/gkernel/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sh sparc x86 ~mips"
 IUSE=""
 
 src_install() {
diff --git a/sys-apps/ethtool/ethtool-3.ebuild b/sys-apps/ethtool/ethtool-3.ebuild
index 9187a4de42a8..1ac38ed9ed21 100644
--- a/sys-apps/ethtool/ethtool-3.ebuild
+++ b/sys-apps/ethtool/ethtool-3.ebuild
@@ -1,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-apps/ethtool/ethtool-3.ebuild,v 1.1 2005/02/12 03:53:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ethtool/ethtool-3.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
 HOMEPAGE="http://sourceforge.net/projects/gkernel/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~mips"
 IUSE=""
 
 src_install() {
diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/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-apps/evkeyd/ChangeLog b/sys-apps/evkeyd/ChangeLog
index b70b985e2d2c..f4b433f5d5fa 100644
--- a/sys-apps/evkeyd/ChangeLog
+++ b/sys-apps/evkeyd/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for sys-apps/evkeyd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/evkeyd/ChangeLog,v 1.1 2003/06/19 07:24:15 vladimir Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evkeyd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
+
+  14 May 2005; <plasmaroo@gentoo.org> evkeyd-0.1_pre7.ebuild:
+  Fix compile on 2.6 headers; bug #91131.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  evkeyd-0.1_pre2.ebuild, evkeyd-0.1_pre3.ebuild, evkeyd-0.1_pre7.ebuild:
+  Masked evkeyd-0.1_pre7.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  evkeyd-0.1_pre2.ebuild, evkeyd-0.1_pre3.ebuild:
+  Masked evkeyd-0.1_pre3.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  evkeyd-0.1_pre2.ebuild:
+  Masked evkeyd-0.1_pre2.ebuild stable for ppc
+
+*evkeyd-0.1_pre7 (24 Feb 2004)
+
+  20 Jun 2003; Graham Forest <vladimir@gentoo.org> :
+  digest fix
+
+*evkeyd-0.1_pre3 (20 Jun 2003)
+
+  20 Jun 2003; Graham Forest <vladimir@gentoo.org> evkeyd-0.1_pre3.ebuild:
+  Version bump
 
 *evkeyd-0.1_pre2 (19 Jun 2003)
 
diff --git a/sys-apps/evkeyd/Manifest b/sys-apps/evkeyd/Manifest
index 697e62b0773f..6396e6f19690 100644
--- a/sys-apps/evkeyd/Manifest
+++ b/sys-apps/evkeyd/Manifest
@@ -1,2 +1,5 @@
-MD5 401d7935f7b5ca5e33d1fa3f8e3655bc evkeyd-0.1_pre2.ebuild 549
-MD5 64ad3c5dd053ec5ce8e96dab1748e145 files/digest-evkeyd-0.1_pre2 65
+MD5 31fc5dddb02744d02d136e69881d330d ChangeLog 1148
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a6359ecf514a3e82b3c0a23fefbb0bb4 evkeyd-0.1_pre7.ebuild 720
+MD5 c27007872204d890c558963ce1d0b716 files/digest-evkeyd-0.1_pre7 65
+MD5 6c71378ccb8985cdd61762c3f447c74e files/evkeyd.rc 482
diff --git a/sys-apps/evkeyd/evkeyd-0.1_pre7.ebuild b/sys-apps/evkeyd/evkeyd-0.1_pre7.ebuild
index 481d42b284d7..024d4953bf64 100644
--- a/sys-apps/evkeyd/evkeyd-0.1_pre7.ebuild
+++ b/sys-apps/evkeyd/evkeyd-0.1_pre7.ebuild
@@ -1,29 +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/sys-apps/evkeyd/evkeyd-0.1_pre7.ebuild,v 1.1 2004/02/24 00:33:00 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evkeyd/evkeyd-0.1_pre7.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
+MY_PV=${PV/_/}
 DESCRIPTION="Input event layer media key activator"
 HOMEPAGE="http://www.stampflee.com/evkeyd/"
-MY_PV=${PV/_/}
 SRC_URI="http://www.stampflee.com/evkeyd/downloads/evkeyd-${MY_PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
+
 DEPEND=""
-S=${WORKDIR}/${PN}-${MY_PV}
 
-# Some opto breaks forking - upstream bug
-#CFLAGS=""
+S=${WORKDIR}/${PN}-${MY_PV}
 
-src_compile() {
-	emake || die
+src_unpack() {
+	unpack ${A}
+	sed -e "s/_IOR('B', 6, 0)/_IOR('B', 6, int)/" -i ${S}/backlight.c
 }
 
 src_install() {
-	dosbin evkeyd
+	dosbin evkeyd || die
 	insinto /etc
 	doins evkeyd.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/evkeyd.rc evkeyd
+	newinitd ${FILESDIR}/evkeyd.rc evkeyd
 }
diff --git a/sys-apps/evkeyd/files/evkeyd.rc b/sys-apps/evkeyd/files/evkeyd.rc
index 738ad4c1264c..9faa9d77b5fd 100644
--- a/sys-apps/evkeyd/files/evkeyd.rc
+++ b/sys-apps/evkeyd/files/evkeyd.rc
@@ -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/sys-apps/evkeyd/files/evkeyd.rc,v 1.1 2003/06/19 07:24:15 vladimir Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/evkeyd/files/evkeyd.rc,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 depend() {
 	need localmount
@@ -10,11 +10,11 @@ depend() {
 start() {
 	ebegin "Starting evkeysd"
 	start-stop-daemon --start --quiet --exec /usr/sbin/evkeyd
-	eend ${?}
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping evkeysd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/evkeyd.pid
-	eend ${?}
+	eend $?
 }
diff --git a/sys-apps/evkeyd/metadata.xml b/sys-apps/evkeyd/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/evkeyd/metadata.xml
+++ b/sys-apps/evkeyd/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-apps/ezusb2131/ChangeLog b/sys-apps/ezusb2131/ChangeLog
index eb471904c8b4..3428f9a3d2c5 100644
--- a/sys-apps/ezusb2131/ChangeLog
+++ b/sys-apps/ezusb2131/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/ezusb2131
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ezusb2131/ChangeLog,v 1.1 2003/05/22 11:15:09 jje Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ezusb2131/ChangeLog,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 *ezusb2131-1.0 (22 May 2003)
 
diff --git a/sys-apps/ezusb2131/Manifest b/sys-apps/ezusb2131/Manifest
index 9665af1e66a1..5426df858003 100644
--- a/sys-apps/ezusb2131/Manifest
+++ b/sys-apps/ezusb2131/Manifest
@@ -1,3 +1,14 @@
-MD5 746e943c5037e0f29954b44e37653167 ezusb2131-1.0.ebuild 783
-MD5 32a2d66b0bc0487035d3aeb994283670 ChangeLog 273
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a953411759c8f8efa6153048a4106c0 ChangeLog 357
+MD5 9be386ad422b0fabfd92efbea00edee5 ezusb2131-1.0.ebuild 1023
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 12ad28c74c2e43a88054e0c4c61f95db files/digest-ezusb2131-1.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB3LybroRuSHgZdywRAp8gAJ9CbiiOJIG2PHgHNPWmlf03cYCWXwCfdq1o
+dTCJzs1jdy5AXHon+s8Bj+w=
+=DFmu
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ezusb2131/ezusb2131-1.0.ebuild b/sys-apps/ezusb2131/ezusb2131-1.0.ebuild
index 7d4781685884..9a6a3bae8b30 100644
--- a/sys-apps/ezusb2131/ezusb2131-1.0.ebuild
+++ b/sys-apps/ezusb2131/ezusb2131-1.0.ebuild
@@ -1,30 +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/sys-apps/ezusb2131/ezusb2131-1.0.ebuild,v 1.1 2003/05/22 11:15:09 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ezusb2131/ezusb2131-1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 MY_P=${PN/e/E}-${PV}
 DESCRIPTION="This is a firmware uploader for EZ-USB devices"
 HOMEPAGE="http://ezusb2131.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ezusb2131/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
-DEPEND=""
 
+DEPEND=""
 RDEPEND="sys-apps/hotplug"
 
 S=${WORKDIR}/Ezusb2131
+
+pkg_setup() {
+	if [[ ${KV:0:2} != "2.6" ]] ; then
+		eerror "This kernel module is only for 2.4 kernels."
+		eerror "See ${HOMEPAGE} for 2.6 support."
+		die "2.4 kernel only"
+	fi
+}
+
 src_compile() {
-	einfo "${S}"
 	make all || die
 }
 
 src_install() {
-	cp Makefile Makefile~
-	sed -e 's/INSTALLDIR = \/lib\/modules/INSTALLDIR = ${D}\/lib\/modules/' \
-	    -e 's/depmod -a/#depmod -a/' Makefile~ > Makefile
+	sed -i \
+		-e 's/INSTALLDIR = \/lib\/modules/INSTALLDIR = ${D}\/lib\/modules/' \
+	    -e 's/depmod -a/#depmod -a/' \
+		Makefile
 
 	make install || die
 	dodoc ${S}/README ${S}/COPYING ${S}/AUTHORS
@@ -34,4 +43,3 @@ pkg_postinst() {
 	einfo "Updating modules dependancies"
 	depmod -a
 }
-
diff --git a/sys-apps/ezusb2131/metadata.xml b/sys-apps/ezusb2131/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/ezusb2131/metadata.xml
+++ b/sys-apps/ezusb2131/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-apps/fakeroot/ChangeLog b/sys-apps/fakeroot/ChangeLog
index 73a9a6a50251..a195aed6a901 100644
--- a/sys-apps/fakeroot/ChangeLog
+++ b/sys-apps/fakeroot/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for sys-apps/fakeroot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/ChangeLog,v 1.1 2002/08/13 14:20:36 blizzy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/ChangeLog,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org> fakeroot-1.1.5.ebuild:
+  Stable on ppc.
+
+  26 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> fakeroot-1.1.5.ebuild:
+  Stable on alpha.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> fakeroot-1.1.5.ebuild:
+  ~alpha keyword.
+
+  20 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> fakeroot-1.1.5.ebuild:
+  Added to ~ppc.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> fakeroot-1.1.5.ebuild:
+  stable on amd64
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> fakeroot-1.1.5.ebuild:
+  keyworded for testing on amd64
+
+  21 Mar 2005; Brian Harring <ferringb@gentoo.org> fakeroot-1.1.5.ebuild:
+  Stabling it for x86.
+
+  27 Dec 2004; Jason Wever <weeve@gentoo.org> fakeroot-1.1.5.ebuild:
+  Added ~sparc keyword.
+
+*fakeroot-1.1.5 (07 Nov 2004)
+
+  07 Nov 2004; Brian Harring <ferringb@gentoo.org> +fakeroot-1.1.5.ebuild:
+  further bump.  keyworded ~x86 atm.
+
+*fakeroot-1.0.7 (04 Nov 2004)
+
+  04 Nov 2004; Aron Griffis <agriffis@gentoo.org> +fakeroot-1.0.7.ebuild:
+  Major bump up to version 1.0.7 from Debian testing
+
+  31 Oct 2004; Aron Griffis <agriffis@gentoo.org> fakeroot-0.4.4-r1.ebuild:
+  add ~ia64
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> fakeroot-0.4.4-r1.ebuild,
+  fakeroot-0.4.4.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  05 Jul 2004; <solar@gentoo.org> fakeroot-0.4.4-r1.ebuild,
+  files/fakeroot-0.4.4-faked.patch:
+  update ebuild to use epatch vs calling patch directly. Also added a patch that
+  will allow fakeroot to be compiled with gcc-3.4/uclibc
+
+  02 Apr 2004; Jon Portnoy <avenj@gentoo.org> fakeroot-0.4.4-r1.ebuild :
+  Use gnuconfig_update for all archs.
+
+  03 Oct 2003; Aron Griffis <agriffis@gentoo.org> fakeroot-0.4.4-r1.ebuild:
+  Use gnuconfig_update and mark stable on alpha
+
+  12 Aug 2003; Alexander Gabert <pappy@gentoo.org> fakeroot-0.4.4.ebuild:
+  tested and compiled on hppa
+
+  20 Jan 2003; Jon Nall <nall@gentoo.org fakeroot-0.4.4-r1.ebuild :
+  added ~ppc
+
+  05 Jan 2003; Rodney Rees <manson@gentoo.org>;
+  added ~sparc keyword
+
+*fakeroot-0.4.4-r1 (29 Sep 2002)
+
+  29 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  files/digest-fakeroot-0.4.4-r1, files/fakeroot-gcc3-gentoo.patch,
+  fakeroot-0.4.4-r1.ebuild, ChangeLog :
+
+  C++ patch for GCC3.2. Resolves bug #8538.
 
 *fakeroot-0.4.4 (13 Aug 2002)
 
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index e69de29bb2d1..ad734cd5b933 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -0,0 +1,12 @@
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 56d0fcf5e1a5c6f7f284aec7cb30bc27 ChangeLog 2588
+MD5 47ec776de93d7125e3486534fa6c74b5 fakeroot-1.0.7.ebuild 1097
+MD5 9ce0b947971bccd2d0b570f7f47e2071 fakeroot-1.1.5.ebuild 578
+MD5 27b729d7ff7471af33888cc2d35aac2e fakeroot-0.4.4-r1.ebuild 790
+MD5 8c2f1a80a8ffa182ab53d11cb511528a fakeroot-0.4.4.ebuild 601
+MD5 83191a9ebafc35745d1ee214e40803b6 files/digest-fakeroot-1.0.7 67
+MD5 a192b4e65779c0403da6a1868edc5ac3 files/digest-fakeroot-0.4.4 70
+MD5 c96cefb60bc53da4ca582dae25a479b8 files/fakeroot-gcc3-gentoo.patch 405
+MD5 eb58a21dd11a81680b1499565d074682 files/fakeroot-0.4.4-faked.patch 240
+MD5 4f0d7f1308c49429b78e25f29fe29e20 files/digest-fakeroot-1.1.5 67
+MD5 a192b4e65779c0403da6a1868edc5ac3 files/digest-fakeroot-0.4.4-r1 70
diff --git a/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild b/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
index b4b2dce8f97b..e4b1963b5431 100644
--- a/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild,v 1.1 2002/09/30 03:53:22 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
+
+inherit gnuconfig eutils
 
 MY_P="${PN}_${PV}-4.1"
 
 DESCRIPTION="Run commands in an environment faking root privileges"
 HOMEPAGE="http://joostje.op.het.net/fakeroot/index.html"
-SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
+SRC_URI="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND=">=virtual/glibc-2.2.2"
-DEPEND="${RDEPEND}"
+KEYWORDS="x86 ppc ~sparc alpha amd64 ~ia64"
+IUSE=""
 
-S="${WORKDIR}/${P}"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} && patch -p1 <${FILESDIR}/fakeroot-gcc3-gentoo.patch || die
-}
-
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
+	cd ${S}
+	epatch ${FILESDIR}/fakeroot-gcc3-gentoo.patch
+	epatch ${FILESDIR}/${P}-faked.patch
+	gnuconfig_update
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die "install problem"
 }
diff --git a/sys-apps/fakeroot/fakeroot-0.4.4.ebuild b/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
index b62149fe2698..ef16b2b2c07a 100644
--- a/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
+++ b/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
@@ -1,26 +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/sys-apps/fakeroot/fakeroot-0.4.4.ebuild,v 1.1 2002/08/13 14:20:36 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 MY_P="${PN}_${PV}-4.1"
 
 DESCRIPTION="Run commands in an environment faking root privileges"
 HOMEPAGE="http://joostje.op.het.net/fakeroot/index.html"
-SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
+SRC_URI="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND=">=virtual/glibc-2.2.2"
-DEPEND="${RDEPEND}"
+KEYWORDS="x86 ~hppa amd64"
+IUSE=""
 
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
+RDEPEND="virtual/libc"
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die "install problem"
 }
diff --git a/sys-apps/fakeroot/fakeroot-1.0.7.ebuild b/sys-apps/fakeroot/fakeroot-1.0.7.ebuild
index 02899f449703..2288ce5b3bec 100644
--- a/sys-apps/fakeroot/fakeroot-1.0.7.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-1.0.7.ebuild,v 1.1 2004/11/02 21:22:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-1.0.7.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 DESCRIPTION="Run commands in an environment faking root privileges"
 HOMEPAGE="http://joostje.op.het.net/fakeroot/index.html"
diff --git a/sys-apps/fakeroot/fakeroot-1.1.5.ebuild b/sys-apps/fakeroot/fakeroot-1.1.5.ebuild
index 59e443b72a08..decbc878097b 100644
--- a/sys-apps/fakeroot/fakeroot-1.1.5.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.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/sys-apps/fakeroot/fakeroot-1.1.5.ebuild,v 1.1 2004/11/07 18:06:20 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-1.1.5.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 DESCRIPTION="Run commands in an environment faking root privileges"
 HOMEPAGE="http://joostje.op.het.net/fakeroot/index.html"
@@ -8,7 +8,7 @@ SRC_URI="mirror://debian/pool/main/f/fakeroot/${PF/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/fakeroot/metadata.xml
+++ b/sys-apps/fakeroot/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-apps/fbset/ChangeLog b/sys-apps/fbset/ChangeLog
index f83914c86174..5b53f3b09316 100644
--- a/sys-apps/fbset/ChangeLog
+++ b/sys-apps/fbset/ChangeLog
@@ -1,9 +1,26 @@
 # ChangeLog for sys-apps/fbset
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/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/sys-apps/fbset/ChangeLog,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
+  17 Aug 2005; Paul de Vrieze <pauldv@gentoo.org> fbset-2.1.ebuild:
+  Change the homepage to a actually working url
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> fbset-2.1.ebuild:
+  make parallel-safe; use emake; error messages
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> fbset-2.1.ebuild:
+  adding initial s390 support
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> fbset-2.1.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *fbset-2.1 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> fbset-2.1.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index e69de29bb2d1..fae98b87b566 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -0,0 +1,4 @@
+MD5 7c5563dc5d6db678834fd874bb378e91 fbset-2.1.ebuild 935
+MD5 a5330230a1a8ad9c3ca4d4cfb97a24a4 ChangeLog 1256
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e6632ed4e8023dba71c57d76e038ae5a files/digest-fbset-2.1 60
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index f21d74b8bae6..433fbe57f846 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,28 +1,37 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.1 2001/08/08 20:37:43 pete Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A utility to set the framebuffer videomode"
-SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${A}"
-HOMEPAGE="http://linux-fbdev.org"
+inherit toolchain-funcs flag-o-matic
 
-DEPEND="virtual/glibc"
+DESCRIPTION="A utility to set the framebuffer videomode"
+HOMEPAGE="http://members.chello.be/cr26864/Linux/fbdev/"
+SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e "/^CC =/s:gcc:$(tc-getCC):" \
+		-e "/^CC =/s:-O2:${CFLAGS}:" \
+		-e 's/^modes.tab.c/modes.tab.h modes.tab.c/' \
+		Makefile || die "sed Makefile failed"
+}
 
 src_compile() {
-
-    try make
-
+	replace-flags -O3 -O2
+	emake || die "emake failed"
 }
 
-src_install () {
-
-    dobin fbset modeline2fb
-    doman *.[58]
-    dodoc etc/fb.modes.*
-    dodoc INSTALL
-
+src_install() {
+	dobin fbset modeline2fb || die "dobin failed"
+	doman *.[58]
+	dodoc etc/fb.modes.* INSTALL
 }
-
diff --git a/sys-apps/fbset/files/digest-fbset-2.1 b/sys-apps/fbset/files/digest-fbset-2.1
index 11a6ca25d63f..f8aaea435a30 100644
--- a/sys-apps/fbset/files/digest-fbset-2.1
+++ b/sys-apps/fbset/files/digest-fbset-2.1
@@ -1 +1 @@
-MD5 e547cfcbb8c1a4f2a6b8ba4acb8b7164 fbset-2.1.tar.gz
+MD5 e547cfcbb8c1a4f2a6b8ba4acb8b7164 fbset-2.1.tar.gz 27721
diff --git a/sys-apps/fbset/metadata.xml b/sys-apps/fbset/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/fbset/metadata.xml
+++ b/sys-apps/fbset/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-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 99c1e5dde69f..5f2980fb8d0d 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,9 +1,341 @@
 # ChangeLog for sys-apps/file
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
+
+*file-4.16 (17 Oct 2005)
+
+  17 Oct 2005; Mike Frysinger <vapier@gentoo.org> +file-4.16.ebuild:
+  Versin bump.
+
+*file-4.15-r1 (08 Oct 2005)
+
+  08 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.15-cracklib-magic.patch, +file-4.15-r1.ebuild:
+  Fix from upstream for detection of block devices with -s #108287 by Preston
+  Crow.
+
+  17 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.15-empty-mime-buffer.patch, file-4.15.ebuild:
+  Add a check for empty buffers #106152.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  14 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.15-libtool.patch, file-4.15.ebuild:
+  Fix building with people who set LD_LIBRARY_PATH to retarded values #99593.
+
+*file-4.15 (18 Aug 2005)
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> +file-4.15.ebuild:
+  Version bump to fix up #101298 by PIERRE Benoît / #101639 by Preston 
+  Crow / #102520 by Daniel Drake.
+
+  24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/file-4.14-gcc2.patch, file-4.14.ebuild:
+  Fix building with gcc2.
+
+*file-4.14 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +file-4.14.ebuild:
+  Version bump.
+
+*file-4.13 (01 Apr 2005)
+
+  01 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/file-4.13-cross-compile.patch, +file-4.13.ebuild:
+  Version bump, closes bug #87496.
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.12-cross-compile.patch, file-4.12.ebuild:
+  Cross-compiling patch from uClibc.
+
+  11 Dec 2004; Markus Rothe <corsair@gentoo.org> file-4.12.ebuild:
+  Stable on ppc64; bug #72521
+
+  09 Dec 2004; Guy Martin <gmsoft@gentoo.org> file-4.12.ebuild:
+  Stable on hppa.
+
+  08 Dec 2004; Hardave Riar <hardave@gentoo.org>
+  files/file-4.xx-mips-gentoo.diff, file-4.12.ebuild:
+  Fixed up mips patch so it applies cleanly. Keyworded stable on mips, bug
+  #72521.
+
+  08 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> file-4.12.ebuild:
+  Stable on alpha, bug 72521.
+
+  08 Dec 2004; Daniel Black <dragonheart@gentoo.org> file-4.12.ebuild:
+  ppc stable as per bug #72521
+
+  07 Dec 2004; Olivier Crete <tester@gentoo.org> file-4.12.ebuild:
+  Stable on x86 wrt bug 72521
+
+  07 Dec 2004; <solar@gentoo.org> file-4.12.ebuild:
+  - marked stable on x86 bug #72521
+
+  07 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> file-4.12.ebuild:
+  Stable on sparc wrt #72521
+
+  07 Dec 2004; Mike Doty <kingtaco@gentoo.org> file-4.12.ebuild:
+  stable on amd64 per bug #72521
+
+*file-4.12 (25 Nov 2004)
+
+  25 Nov 2004; <solar@gentoo.org> +file-4.12.ebuild:
+  version bump. See file-4.12/ChangeLog for more details
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> file-4.10-r1.ebuild:
+  Stable on alpha.
+
+  13 Nov 2004; <solar@gentoo.org> +files/file-4.10-mconvert.patch,
+  file-4.10-r1.ebuild:
+  fixed off by one bug in file-4.10
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> file-4.10-r1.ebuild:
+  Stable on sparc
+
+  07 Oct 2004; Lina Pezzella <j4rg0n@gentoo.org> file-4.08.ebuild:
+  Removed ppc-macos keyword Bug # 65763
+
+  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> file-4.10-r1.ebuild:
+  Marked stable on mips.
+
+  22 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> file-4.10.ebuild:
+  Marked stable on amd64.
+
+*file-4.10-r1 (13 Sep 2004)
+
+  13 Sep 2004; Rob Holland <tigger@gentoo.org> +file-4.10-r1.ebuild:
+  removed -j1 from emake. emerge -C file; MAKEOPTS=-j emerge file worked fine on
+  an SMP box
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> file-4.10.ebuild:
+  Stable on sparc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> file-4.06.ebuild:
+  Masked file-4.06.ebuild stable for ppc
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> file-4.10.ebuild:
+  stable on alpha and ia64
+
+*file-4.10 (28 Jul 2004)
+
+  28 Jul 2004; Mike Frysinger <vapier@gentoo.org> +file-4.10.ebuild:
+  Version bump.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  24 Jun 2004; Alexander Plank <alexander@gentoo.org> file-4.08.ebuild:
+  add macos keyword (emerge 4.09 gives error "emerge: there are no ebuilds to 
+  satisfy "virtual/python"."
+
+  22 Jul 2004; <solar@gentoo.org> file-4.09.ebuild:
+  enable shared support for uclibc
+
+  14 Jul 2004; Mike Frysinger <vapier@gentoo.org> file-4.09.ebuild:
+  Make sure when building the python component we link against the current
+  libmagic.so and not the system one found in /usr/lib #54401 by tyarling.
+
+  12 Jul 2004; <solar@gentoo.org> file-4.08.ebuild, file-4.09.ebuild:
+  remove the unneeded lib/*.a cruft from a stage1 build
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> file-3.41.ebuild,
+  file-4.02.ebuild, file-4.06.ebuild, file-4.07-r1.ebuild, file-4.07.ebuild,
+  file-4.08.ebuild:
+  sync IUSE (+build, -uclibc)
+
+  26 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> file-4.09.ebuild:
+  Stable on sparc, mips
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> file-3.41.ebuild,
+  file-4.02.ebuild, file-4.06.ebuild, file-4.07-r1.ebuild, file-4.07.ebuild:
+  QA - fix use invocation
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/file-4.08-uclibc.patch, +files/ltconfig-uclibc.patch,
+  file-4.06.ebuild, file-4.08.ebuild:
+  uclibc patches thanks to Peter S. Mazinger <ps.m@gmx.net>. Missing build use
+  flag on 4.08.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> file-4.09.ebuild:
+  Stable on alpha.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> file-4.09.ebuild:
+  stable on amd64
+
+  03 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add python support #39217 by herve coatanhay.
+
+  30 Apr 2004; Michael McCabe <randy@gentoo.org> file-4.09.ebuild:
+  Stable on s390
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> file-4.06.ebuild,
+  file-4.07-r1.ebuild, file-4.07.ebuild:
+  Add inherit eutils
+
+*file-4.09 (27 Apr 2004)
+
+  27 Apr 2004; Martin Holzer <mholzer@gentoo.org> file-4.09.ebuild:
+  Version bumped.
+
+  27 Apr 2004; Michael McCabe <randy@gentoo.org> file-4.08.ebuild:
+  Marked stable on s390
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> file-4.06.ebuild:
+  stable on amd64
+
+*file-4.08 (23 Mar 2004)
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> file-4.08.ebuild:
+  Version bumped.
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> file-4.07-r1.ebuild:
+  adding initial s390 support
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> file-4.06.ebuild:
+  stable on alpha and ia64
+
+*file-4.07-r1 (23 Jan 2004)
+
+  23 Jan 2004; Jared Hudson <jhhudso@gentoo.org> : Added a patch from source
+  changes found in the debian file package. This fixes a serious (IMO) bug
+  that causes a endless loop (100% cpu usage) when using file against certain
+  elf binaries.
+
+
+  22 Jan 2004; <gustavoz@gentoo.org> file-4.06.ebuild:
+  marked stable on sparc
+
+  22 Jan 2004; Martin Holzer <mholzer@gentoo.org> file-4.06.ebuild:
+  x86 stable.
+
+  20 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> file-4.07.ebuild:
+  mark the new ebuild all ~
+
+*file-4.07 (20 Jan 2004)
+
+  20 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> file-4.07.ebuild:
+  version bump
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> file-4.06.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> file-4.06.ebuild:
+  Stable on ia64
+
+*file-4.03 (01 Nov 2003)
+
+  01 Nov 2003; Seemant Kulleen <seemant@gentoo.org> file-3.37.ebuild,
+  file-3.39.ebuild, file-4.01.ebuild, file-4.02.ebuild, file-4.03.ebuild,
+  file-4.05.ebuild:
+  removed old versions, and also changed SRC_URI on file-4.02 point to Gentoo
+  mirrors, since upstream doesn't have it available any more. Thanks to: Stony
+  Yakovac <stonyy@tek.com> in bug #32513
+
+*file-4.06 (17 Oct 2003)
+
+  19 Nov 2003; Guy Martin <gmsoft@gentoo.org> file-4.06.ebuild :
+  Marked stable on hppa. It resolv some segfault problems.
+
+  20 Oct 2003; Joshua Kinard <kumba@gentoo.org> file-4.06.ebuild:
+  Added gnuconfig support for mips64
+
+  18 Oct 2003; Joshua Kinard <kumba@gentoo.org> file-4.05.ebuild,
+  file-4.06.ebuild, files/file-4.05-mips-gentoo.diff,
+  files/file-4.xx-mips-gentoo.diff:
+  Renamed the 4.05 patch for mips to 4.xx because it'll likely apply cleanly for
+  several versions. Modified file-4.05 and file-4.06 to use this patch.
+
+  17 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> file-4.06.ebuild:
+  fix failure of parallel make.  bug 31356
+
+  17 Oct 2003; Joshua Kinard <kumba@gentoo.org> file-4.05.ebuild,
+  file-4.06.ebuild:
+  Added "cd ${S}" lines to file-4.05 and file-4.06, as well as removed the
+  uneeded sed statement from file-4.06, as the patch level is properly set now.
+
+  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> file-4.06.ebuild:
+  Version bumped.
+
+*file-4.05 (09 Oct 2003)
+
+  12 Oct 2003; Joshua Kinard <kumba@gentoo.org> file-4.05.ebuild,
+  files/file-4.05-mips-gentoo.diff:
+  Added a patch for mips which changes file's output somewhat to allow shared
+  libs to be detected.
+  Also added a sed command to tweak src/patchlevel.h to
+  make file report the proper version. Currently, file-4.05 claims to be
+  file-4.04.
+  Also added ~mips to KEYWORDS (We're still using file-3.41, update time!)
+
+  09 Oct 2003; Joel Hill <hillster@gentoo.org> file-4.05.ebuild:
+  version bump. marking ~ on all arch's
+
+  11 Aug 2003; Alexander Gabert <pappy@gentoo.org> file-4.02.ebuild:
+  file command segfaults on hppa when pa8000 schedule for gcc is used
+
+  23 Jun 2003; Aron Griffis <agriffis@gentoo.org> file-4.02.ebuild:
+  Mark stable on alpha
+
+  01 Jun 2003; Joshua Kinard <kumba@gentoo.org>
+  file-4.01.ebuild, file-4.02.ebuild:
+  Removed ~mips from KEYWORDS as file lacks a patch necessary to generate proper
+  output used by configure scripts to detect shared libs.
+
+*file-4.02 (04 Apr 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> file-4.02.ebuild :
+  Marked stable on hppa.
+
+  04 Apr 2003; Daniel Robbins <drobbins@gentoo.org> file-4.02.ebuild:
+  Added latest version and marked stable for x86, sparc.
+
+*file-4.01 (26 Mar 2003)
+
+  02 Apr 2003; Christian Birchinger <joker@gentoo.org> file-4.01.ebuild:
+  Added stable sparc keyword
+
+  26 Mar 2003; Daniel Robbins <drobbins@gentoo.org>: file-4.01.ebuild: New
+  upstream release, marked ~x86.
+
+*file-3.41 (06 Mar 2003)
+
+  06 Mar 2003; Daniel Ahlberg <aliz@gentoo.rg> :
+  Security update.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> file-3.39.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> file-3.39.ebuild :
+  Added hppa to keywords.
+
+*file-3.37 (20 Dec 2002)
+
+  20 Dec 2002; Jan Seidel <tuxus@gentoo.org> file-3.37.ebuild :
+  Added mips to keywords
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*file-3.39 (25 Sep 2002)
+
+  08 Feb 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+  Added a patch for mips that changes the file output so that's work with libtool
+
+  25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.
+
+*file-3.33-r3.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> file-3.33-r3.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
 
 *file-3.37 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> file-3.37.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 7d67e45183c7..e03c0154c1c1 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,13 +1,29 @@
-MD5 e745b9f91fe0032433085990eccced1a ChangeLog 2016
-MD5 da378761c33a767f0d9907c77f68d13c file-3.37.ebuild 862
-MD5 deb16b44c8c936656f48641d10be5aee file-3.39.ebuild 1026
-MD5 0116729493efa6cc548bee3e5c4fc8e8 file-3.41.ebuild 1015
-MD5 32ee319d7e96b0525ee16fc5a2c43009 file-4.01.ebuild 939
-MD5 12ae14c6eb9a61e2097b74d8b369911d file-4.02.ebuild 939
-MD5 3a18c97dfcc727e6c1b701cc8c03af47 files/digest-file-3.37 267
-MD5 950dd57055e8275bd852869557035f42 files/digest-file-3.39 268
-MD5 eabc698678353b52ea7d9bfb724d4e1e files/digest-file-3.41 268
-MD5 aff834708f034a4995abba4192e79583 files/file-3.39-gentoo.diff 4673
-MD5 aff834708f034a4995abba4192e79583 files/file-3.41-mips-gentoo.diff 4673
-MD5 419df5c3f794f6f0b42d8d78d5f9a0da files/digest-file-4.01 267
-MD5 fd38ae2f761ce496f7caedf3226166ae files/digest-file-4.02 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f5f921f3a6ef10bf5726db3ee73e86cf ChangeLog 11706
+MD5 c6073a11ea3fcb5cc0d1625a54aad8d4 file-4.12.ebuild 2081
+MD5 213bc8ded7a22b2fcb129f4ee60e892c file-4.13.ebuild 2226
+MD5 7b53e1d21af2cb92d83127a3765386bf file-4.15-r1.ebuild 1508
+MD5 c8555bdb10c9bc53b598919bc841e1e1 file-4.16.ebuild 1461
+MD5 f0f2d2181cac822f0c4d4675fb1ff38c files/cracklib.magic 360
+MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
+MD5 407c20e1fb3186144d6c7d2788714163 files/digest-file-4.13 61
+MD5 56c4aa931e56a129d1c631c52a3b6d67 files/digest-file-4.15-r1 61
+MD5 6dca9a167755298125478cb0d4417226 files/digest-file-4.16 61
+MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.13-cross-compile.patch 964
+MD5 7a96e5548d52493366ab39f1c6ae9237 files/file-4.13-ia64.patch 530
+MD5 13c1a487996e5e26560f9feaae56e811 files/file-4.14-gcc2.patch 494
+MD5 26e3155407a33adebfc7ed7d06a59988 files/file-4.15-cracklib-magic.patch 352
+MD5 cbb2d6e5512eb5f33299107848ca9e30 files/file-4.15-empty-mime-buffer.patch 708
+MD5 26f26c3f7caf28f0bdb9dbb6fe83c254 files/file-4.15-libtool.patch 561
+MD5 66df8eecd30769daeb3f643dc6432db3 files/file-4.xx-mips-gentoo.patch 5578
+MD5 a952f0eca26a046e4b815529d2b734ef files/misc.magic 71
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVCyWgIKl8Uu19MoRAvPTAJ9x5yfpjXryiagbJ8x9CyydNWDJvwCfQrKC
+02VyJwnaIc+2xDage3mopas=
+=BdQr
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.12.ebuild b/sys-apps/file/file-4.12.ebuild
index bbf2601908ba..bdc08a2381c6 100644
--- a/sys-apps/file/file-4.12.ebuild
+++ b/sys-apps/file/file-4.12.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-apps/file/file-4.12.ebuild,v 1.1 2004/11/26 00:24:08 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.12.ebuild,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
-inherit flag-o-matic gnuconfig eutils distutils libtool
+inherit flag-o-matic gnuconfig eutils distutils libtool toolchain-funcs
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${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 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="python build"
 
 DEPEND="virtual/libc
@@ -25,11 +25,15 @@ src_unpack() {
 	# This patch is for MIPS only.  It slightly changes the 'file' output
 	# on MIPS machines to a specific format so that other programs can
 	# recognize things.
-	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
+	epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.patch
 
-	# GNU updates
+	# The build process tries to run the compiled file ... not a good
+	# thing if file was cross compiled ;)
+	tc-is-cross-compiler && epatch ${FILESDIR}/${PN}-4.13-cross-compile.patch
+
+	# misc updates
+	cat "${FILESDIR}"/*.magic >> magic/magic.mime
 	uclibctoolize
-	gnuconfig_update
 
 	# make sure python links against the current libmagic #54401
 	sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py
@@ -40,7 +44,7 @@ src_unpack() {
 
 src_compile() {
 	# file command segfaults on hppa -  reported by gustavo@zacarias.com.ar
-	[ ${ARCH} = "hppa" ] && filter-flags "-mschedule=8000"
+	[[ ${ARCH} == hppa ]] && filter-flags "-mschedule=8000"
 
 	econf --datadir=/usr/share/misc || die
 
diff --git a/sys-apps/file/file-4.13.ebuild b/sys-apps/file/file-4.13.ebuild
index aa9114a72178..4fb966e45bec 100644
--- a/sys-apps/file/file-4.13.ebuild
+++ b/sys-apps/file/file-4.13.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-apps/file/file-4.13.ebuild,v 1.1 2005/04/01 19:25:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.13.ebuild,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
 
-inherit flag-o-matic gnuconfig eutils distutils libtool toolchain-funcs
+inherit flag-o-matic eutils distutils libtool toolchain-funcs
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
@@ -11,25 +11,28 @@ SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${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 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="python build"
 
-DEPEND="virtual/libc
-	!build? ( python? ( virtual/python ) )"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	# (12 Oct 2003) <kumba@gentoo.org>
-	# This patch is for MIPS only.  It slightly changes the 'file' output
-	# on MIPS machines to a specific format so that other programs can
-	# recognize things.
-	use mips && epatch ${FILESDIR}/${PN}-4.xx-mips-gentoo.diff
+	# the magic and src subdir sometimes don't get along #81974
+	sed -i -e '/^SUBDIRS/s:magic::' Makefile.in
+
+	# Rename ia64 labels (from Fedora)
+	epatch "${FILESDIR}"/${P}-ia64.patch
+
+	# This tweaks the output format for mips binaries so things like 
+	# libtool don't barf all over the place when trying to parse it.
+	epatch "${FILESDIR}"/${PN}-4.xx-mips-gentoo.patch
 
 	# The build process tries to run the compiled file ... not a good
 	# thing if file was cross compiled ;)
-	tc-is-cross-compiler && epatch ${FILESDIR}/${P}-cross-compile.patch
+	tc-is-cross-compiler && epatch "${FILESDIR}"/${P}-cross-compile.patch
 
 	# misc updates
 	cat "${FILESDIR}"/*.magic >> magic/magic.mime
@@ -44,23 +47,23 @@ src_unpack() {
 
 src_compile() {
 	# file command segfaults on hppa -  reported by gustavo@zacarias.com.ar
-	[[ ${ARCH} == hppa ]] && filter-flags "-mschedule=8000"
+	[[ ${ARCH} == hppa ]] && filter-flags -mschedule=8000
 
 	econf --datadir=/usr/share/misc || die
-
 	emake || die "emake failed"
+	emake -C magic || die "emake magic failed"
 
+	use build && return 0
 	use python && cd python && distutils_src_compile
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" install -C magic || die "make magic install failed"
 
 	if ! use build ; then
 		dodoc ChangeLog MAINT README
 		use python && cd python && distutils_src_install
-	else
-		rm -rf ${D}/usr/share/man ${D}/usr/lib/*.a
 	fi
 }
 
diff --git a/sys-apps/file/file-4.15-r1.ebuild b/sys-apps/file/file-4.15-r1.ebuild
index e7ef58a32695..aaf827414359 100644
--- a/sys-apps/file/file-4.15-r1.ebuild
+++ b/sys-apps/file/file-4.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/sys-apps/file/file-4.15-r1.ebuild,v 1.1 2005/10/08 16:16:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
 
 inherit distutils libtool
 
diff --git a/sys-apps/file/file-4.16.ebuild b/sys-apps/file/file-4.16.ebuild
index 0514c66a0b86..eb0025bfc7bb 100644
--- a/sys-apps/file/file-4.16.ebuild
+++ b/sys-apps/file/file-4.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/sys-apps/file/file-4.16.ebuild,v 1.1 2005/10/17 22:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.16.ebuild,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 inherit distutils libtool
 
diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/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-apps/fileutils/ChangeLog b/sys-apps/fileutils/ChangeLog
index e4e83b8cf864..926f7bc8df58 100644
--- a/sys-apps/fileutils/ChangeLog
+++ b/sys-apps/fileutils/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for sys-apps/fileutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> fileutils-4.1.11-r1.ebuild,
+  fileutils-4.1.11.ebuild:
+  QA - fix use invocation
+
+  19 Apr 2004; Michael McCabe <randy@gentoo.org> fileutils-4.1.11-r2.ebuild:
+  added s390 keywords
+
+  23 Jan 2004; <gustavoz@gentoo.org> fileutils-4.1.11-r2.ebuild:
+  marked stable on sparc - we shouldn't have -r1 laying around
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> fileutils-4.1.11-r2.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> fileutils-4.1.11-r2.ebuild:
+  Marked stable on hppa.
+
+  01 Oct 2003; Aron Griffis <agriffis@gentoo.org> fileutils-4.1.11-r2.ebuild:
+  Stable on alpha to handle the coreutils changeover (see bug 30032)
+
+*fileutils-4.1.11-r2 (18 Jul 2003)
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org>
+  fileutils-4.1.11-r2.ebuild, fileutils-4.1.8-r2.ebuild,
+  fileutils-4.1.8.ebuild:
+  upgrade to coreutils
+
+  10 Jul 2003; Christian Birchinger <joker@gentoo.org>
+  fileutils-4.1.11-r1.ebuild:
+  Added sparc stable keyword
+
+*fileutils-4.1.11-r1 (12 Dec 2002)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> fileutils-4.1.11-r1.ebuild :
+  Marked stable on hppa.
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> fileutils-4.1.11-r1.ebuild:
+  Changed ~mips to mips in KEYWORDS
+  Cleaned up Changelog
+
+  23 Jun 2003; Martin Holzer <mholzer@gentoo.org> fileutils-4.1.11-r1.ebuild:
+  Fixed SRC_URI. Closes #23333.
+
+  23 Jun 2003; Brandon Low <lostlogic@gentoo.org> fileutils-4.1.11-r1.ebuild:
+  Fix KEYWORDS
+
+  20 Feb 2003; Zach Welch <gmsoft@gentoo.org> fileutils-4.1.11.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> fileutils-4.1.11.ebuild :
+  Added hppa to keywords.
+
+  12 Dec 2002; Joachim Blaabjerg <styx@gentoo.org>
+  files/digest-fileutils-4.1.11-r1 :
+
+  Committing a new digest file to match the updated patch. I didn't bother to
+  bump, as the package was masked and has only lived in cvs for a few hours.
+
+  12 Dec 2002; Joachim Blaabjerg <styx@gentoo.org> fileutils-4.1.11-r1.ebuild,
+  files/digest-fileutils-4.1.11-r1, ChangeLog :
+
+  Readded the ACL support, ditched xdelta (what's the point of using that
+  anyway?) and forward-ported the 4.1.8 patch to 4.1.11, masked for testing.
+  Fixes bug #11936
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*fileutils-4.1.11 (25 Sep 2002)
+
+  15 Mar 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to KEYWORDS
+
+  25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.  Seems acl is included in this release.
+
+*fileutils-4.1.8-r2 (04 May 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> fileutils-4.1.8.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> fileutils-4.1.8-r2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  04 May 2002; Bruce A. Locke <blocke@shivan.org> fileutils-4.1.8-r2.ebuild:
+
+  ACL/NLS fix patch should only be applied if ACL support is actually
+  being compiled in.  Bumping rev so people don't keep trying to merge
+  previous broken version.
+
+*fileutils-4.1.8-r1 (02 May 2002)
+
+  03 May 2002; Daniel Robbins <drobbins@gentoo.org>: Added acl.c.diff to fix
+  compilation with nls disabled.  Blocke is sending this fix upstream to
+  acl.bestbits.at.  No rev bump -- no need for a recompile if it worked for
+  people.
+
+  02 May 2002; Daniel Robbins <drobbins@gentoo.org>: Added ACL support, closing
+  bug #2343 (USE="acl" must be set)
+
+*fileutils-4.1.8 (30 Mar 2002)
+
+  30 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : New release that fixes
+  a not-so-great "mv" bug.
 
 *fileutils-4.1.4-r1 (1 Feb 2002)
 
diff --git a/sys-apps/fileutils/Manifest b/sys-apps/fileutils/Manifest
index e69de29bb2d1..e30e01f57650 100644
--- a/sys-apps/fileutils/Manifest
+++ b/sys-apps/fileutils/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 048113f584fd47dc00799c65653ba875 ChangeLog 4305
+MD5 93c69f072e7d23f939111380d4c32eb3 fileutils-4.1.11-r1.ebuild 1671
+MD5 5cbc0905067d14bdf159815275bc3ed1 fileutils-4.1.11-r2.ebuild 498
+MD5 323b7b6f543f6df5f2b15c7c8b2a91f4 fileutils-4.1.11.ebuild 1481
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 63624ac3762352823e34bb2556dae6c7 files/DIR_COLORS 2224
+MD5 579d1206958af450711d6703b6cdfdce files/acl.c.diff 211
+MD5 937d5da030f7e7b487b21f37aac123c7 files/digest-fileutils-4.1.11 69
+MD5 604dce65d45d5d77c28f74ff4b9292d8 files/digest-fileutils-4.1.11-r1 147
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-fileutils-4.1.11-r2 0
+MD5 4a37c9153acde32c571d40358219342c files/dircolors.1.gz 4076
+MD5 9ac7b23c345fb5ab5183c9d922b7abda files/fileutils-4.1.11-configure.patch 448
+MD5 0abe0f85c62b2bf556386201cc4e1625 files/fileutils.dircolors.diff.gz 3641
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA4D+EHTu7gpaalycRAirUAKCZE/ZGM+jc13yARLLypUEogjjrdQCfWzr4
+ghAYJ7T0p1N8bGJ6h29Y2BM=
+=niln
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.1.11-r1 b/sys-apps/fileutils/files/digest-fileutils-4.1.11-r1
index 5b5b3916a020..5489f427a960 100644
--- a/sys-apps/fileutils/files/digest-fileutils-4.1.11-r1
+++ b/sys-apps/fileutils/files/digest-fileutils-4.1.11-r1
@@ -1,2 +1,2 @@
 MD5 bb4c7625c96a4123d3dddde1a2cbcfa1 fileutils-4.1.11.tar.gz 2563888
-MD5 9adef12e6166bba1732b2f0c433c79ac fileutils-4.1.11acl-0.8.25.diff.gz 10788
+MD5 f028ebad10571ed944cd92aa02e8dc54 fileutils-4.1.11acl-0.8.25.diff.gz 10705
diff --git a/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild b/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild
index 8bc9b2073a6f..1b8b6b0c2d16 100644
--- a/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild
@@ -1,35 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild,v 1.1 2002/12/12 12:43:01 styx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
-IUSE="acl nls build"
 ACLPV=4.1.11acl-0.8.25
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz http://cvs.gentoo.org/~styx/fileutils-${ACLPV}.diff.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz mirror://gentoo/fileutils-${ACLPV}.diff.gz"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha hppa mips"
+IUSE="acl nls build"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc"
-
+RDEPEND="virtual/libc"
 
 src_unpack() {
 
 	unpack ${A}
 
-	if [ "`use acl`" ]; then 
+	if use acl; then
 		zcat ${DISTDIR}/fileutils-${ACLPV}.diff | patch -p0
 		cd ${S}/lib
 		cat ${FILESDIR}/acl.c.diff | patch -p0 -l || die
 	fi
-		
+
 	cd ${S}
 	# Fix braindead scripting problem in configure
 	# <azarah@gentoo.org> (25 Sep 2002)
@@ -39,13 +36,13 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
-	
+
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--bindir=/bin \
 		${myconf} || die
-	
+
 	emake || die
 }
 
@@ -55,14 +52,14 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		bindir=${D}/bin \
 		install || die
-	
+
 	cd ${D}
 	dodir /usr/bin
 	rm -rf usr/lib
 	cd usr/bin
 	ln -s ../../bin/* .
-	
-	if [ -z "`use build`" ]
+
+	if ! use build
 	then
 		cd ${S}
 		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
diff --git a/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild b/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild
index dc95cfa1846d..cd98cfc1b600 100644
--- a/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild
@@ -1,13 +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/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild,v 1.1 2003/07/18 12:48:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 DESCRIPTION="textutils, sh-utils and fileutils are replaced by coreutils"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
-
-RDEPEND="sys-apps/coreutils"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ppc64 s390"
+IUSE=""
 
+RDEPEND=">=sys-apps/coreutils-5.0-r3"
diff --git a/sys-apps/fileutils/fileutils-4.1.11.ebuild b/sys-apps/fileutils/fileutils-4.1.11.ebuild
index 86f1d8d1d70a..3df41bb05118 100644
--- a/sys-apps/fileutils/fileutils-4.1.11.ebuild
+++ b/sys-apps/fileutils/fileutils-4.1.11.ebuild
@@ -1,21 +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/sys-apps/fileutils/fileutils-4.1.11.ebuild,v 1.1 2002/09/25 14:29:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.11.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc sparc64 alpha"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa mips"
+IUSE="nls build"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc"
-
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -29,13 +27,13 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
-	
+
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--bindir=/bin \
 		${myconf} || die
-	
+
 	emake || die
 }
 
@@ -45,14 +43,14 @@ src_install() {
 		infodir=${D}/usr/share/info \
 		bindir=${D}/bin \
 		install || die
-	
+
 	cd ${D}
 	dodir /usr/bin
 	rm -rf usr/lib
 	cd usr/bin
 	ln -s ../../bin/* .
-	
-	if [ -z "`use build`" ]
+
+	if ! use build
 	then
 		cd ${S}
 		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
@@ -60,6 +58,7 @@ src_install() {
 		#conflicts with textutils.  seems that they install the same
 		#.info file between the two of them
 		rm -f ${D}/usr/share/info/coreutils.info
+		rmdir ${D}/usr/share/info
 	else
 		rm -rf ${D}/usr/share
 	fi
diff --git a/sys-apps/fileutils/metadata.xml b/sys-apps/fileutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/fileutils/metadata.xml
+++ b/sys-apps/fileutils/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-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 0f8341888b2e..4645546e9a91 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,223 @@
 # ChangeLog for sys-apps/findutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:05 chriswhite Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org> findutils-4.2.25.ebuild:
+  Marked ~ppc-macos (bug #58089)
+
+  10 Oct 2005; Chris PeBenito <pebenito@gentoo.org>
+  -files/findutils-4.2.18-selinux.diff,
+  -files/findutils-4.2.20-selinux.diff,
+  -files/findutils-4.2.23-selinux.patch,
+  +files/findutils-4.2.24-selinux.diff, findutils-4.2.24.ebuild,
+  findutils-4.2.25.ebuild:
+  Clean up SELinux patches.
+
+*findutils-4.2.25 (07 Oct 2005)
+
+  07 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -findutils-4.2.18.ebuild, -findutils-4.2.20.ebuild,
+  -findutils-4.2.23.ebuild, +findutils-4.2.25.ebuild:
+  New version, tidy up older versions
+
+  01 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> findutils-4.2.24.ebuild:
+  Add --without-included-regex, bug #107638
+
+  29 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> findutils-4.2.24.ebuild:
+  Comment out selinux patch stuff until the selinux people get their act
+  together. Bug #106908.
+
+  26 Sep 2005; Mike Frysinger <vapier@gentoo.org> findutils-4.2.23.ebuild,
+  findutils-4.2.24.ebuild:
+  Punt CPPFLAGS hack since it only existed for the purpose of afs which too
+  has been punted.
+
+*findutils-4.2.24 (22 Sep 2005)
+
+  22 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +findutils-4.2.24.ebuild:
+  Version bump
+
+  30 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> findutils-4.2.23.ebuild:
+  Remove AFS support, bug #104132. Remove from package.mask.
+
+*findutils-4.2.23 (30 Aug 2005)
+
+  30 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/findutils-4.2.23-selinux.patch, +findutils-4.2.23.ebuild:
+  Version bump, bug #104132. Initially in package.mask, needs testing on AFS
+  and SELinux systems.
+
+  22 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/findutils-4.2.20-man.patch, findutils-4.2.20.ebuild:
+  Clarify the man page wording, thanks to Jason Bucata in bug #93294
+
+  14 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> findutils-4.2.20.ebuild:
+  Add in *bsd things, bug #92588. Change to not use einstall.
+
+*findutils-4.2.20 (17 Mar 2005)
+
+  17 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/findutils-4.2.20-selinux.diff, +findutils-4.2.20.ebuild:
+  Version bump
+
+  20 Feb 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/findutils-4.2.18-gcc295.patch, findutils-4.2.18.ebuild:
+  Fix variable definition to be gcc-2.95.3 compatible.
+
+*findutils-4.2.18 (19 Feb 2005)
+
+  19 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org> metadata.xml,
+  +files/findutils-4.2.18-selinux.diff, +findutils-4.2.18.ebuild:
+  Version bump, bug #82581. Thanks to spb for testing the updated selinux patch
+
+  01 Jul 2004; <solar@gentoo.org> findutils-4.1.20-r1.ebuild:
+  added support for static linking of find/xargs
+
+  10 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  findutils-4.1.20-r1.ebuild:
+  Added 'use x86' for matching use afs to fix bug #53599.
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> findutils-4.1.20-r1.ebuild:
+  Marked stable on mips.
+
+  29 Apr 2004; Ryan Phillips <rphillips@gentoo.org> findutils-4.1.20-r1.ebuild,
+  findutils-4.1.20.ebuild, findutils-4.1.7-r2.ebuild,
+  findutils-4.1.7-r3.ebuild, findutils-4.1.7-r4.ebuild,
+  findutils-4.1.7-r5.ebuild:
+  Added a fix for openafs. Fixes #19994
+
+  09 Apr 2004; Brian Jackson <iggy@gentoo.org> findutils-4.1.20-r1.ebuild:
+  add s390 keywords
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> findutils-4.1.20-r1.ebuild:
+  Added gnuconfig support for mips.
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> findutils-4.1.20-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  09 Mar 2004; <agriffis@gentoo.org> findutils-4.1.20-r1.ebuild:
+  stable on alpha and ia64
+
+  10 Feb 2004; Brad House <brad_mssw@gentoo.org> findutils-4.1.20-r1.ebuild:
+  ppc64 fix
+
+  07 Feb 2004; <gustavoz@gentoo.org> findutils-4.1.20-r1.ebuild:
+  Stable on hppa and sparc
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  findutils-4.1.20-r1.ebuild:
+  Bump to stable for x86.
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  findutils-4.1.20-r1.ebuild:
+  set ppc in keywords
+
+  29 Dec 2003; Joshua Kinard <kumba@gentoo.org> findutils-4.1.7-r5.ebuild:
+  Added gnuconfig support to detect mips machines properly
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> findutils-4.1.7-r5.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  findutils-4.1.20-r1.ebuild, findutils-4.1.20.ebuild,
+  findutils-4.1.7-r3.ebuild, findutils-4.1.7-r4.ebuild,
+  findutils-4.1.7-r5.ebuild, files/findutils-4.1.20-selinux.diff.bz2:
+  Switch SELinux patch from old API to new API.
+
+*findutils-4.1.7-r5 (23 Oct 2003)
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> findutils-4.1.7-r5.ebuild:
+  Adding the environment size fix to the stable version too
+
+*findutils-4.1.20-r1 (23 Oct 2003)
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> findutils-4.1.20-r1.ebuild,
+  files/findutils-env-size.patch:
+  Enlarge the xargs acceptable environment to 50k as 20k is reached with big
+  ebuilds as ebuild.sh is "too" large
+
+*findutils-4.1.20 (28 Sep 2003)
+
+  28 Sep 2003; Martin Schlemmer <azarah@gentoo.org> findutils-4.1.20.ebuild:
+  Update veersion.
+
+  16 Apr 2003; Patrick Kursawe <phosphan@gentoo.org>
+  digest-findutils-4.1.7-r4 :
+  digest for selinux patch was missing
+
+*findutils-4.1.7-r4 (11 Apr 2003)
+
+  16 Apr 2003; Christian Birchinger <joker@gentoo.org>
+  findutils-4.1.7-r4.ebuild:
+  Added stable sparc keyword
+
+  13 Apr 2003; Guy Martin <gmsoft@gentoo.org> findutils-4.1.7-r4.ebuild :
+  Added hppa to KEYWORDS.
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> findutils-4.1.7-r4.ebuild:
+  added ewarns to pkg_postinst to inform of locate and updatedb removal
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> findutils-4.1.7-r4.ebuild:
+  added ewarns to pkg_postinst to inform of locate and updatedb removal
+
+  11 Apr 2003; Aron Griffis <agriffis@gentoo.org> findutils-4.1.7-r4.ebuild:
+  Mark stable on x86 and alpha
+
+  11 Apr 2003; Aron Griffis <agriffis@gentoo.org> findutils-4.1.7-r4.ebuild:
+  Point SRC_URI to mirror://gentoo since alpha.gnu.org is no longer supplying
+  findutils-4.1.x versions.  See bug 18926.
+
+  11 Apr 2003; Aron Griffis <agriffis@gentoo.org> findutils-4.1.7-r4.ebuild:
+  Don't install locate/updatedb because they conflict with slocate, which is a
+  better solution. See bug 18729.  Thanks to Michael Sterrett for the concepts
+  in the patch.
+
+*findutils-4.1.7-r3 (19 Mar 2003)
+
+  20 Mar 2003; Joshua Brindle <method@gentoo.org> findutils-4.1.7-r3.ebuild:
+  fixed selinux dependancy
+
+  19 Mar 2003; Joshua Brindle <method@gentoo.org> findutils-4.1.7-r3.ebuild:
+  Added selinux use flag
+
+*findutils-4.1.7-r2 (29 Nov 2002)
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> findutils-4.1.7-r2.ebuild:
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  29 Nov 2002; Brad Cowan <bcowan@gentoo.org> findutils-4.1.7-r2.ebuild,
+  files/digest-findutils-4.1.7-r2:
+  
+  Added some library dependencies if use afs, temp fix for bug #260.
+
+*findutils-4.1-r7.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> findutils-4.1-r7.ebuild :
+  Added KEYWORDS, SLOT.
+
+*findutils-4.1.7-r1 (12 Mar 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> findutils-4.1.7.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> findutils-4.1.7-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog :
+
+  Added USE dependent nls compilation
 
 *findutils-4.1.7 (1 Feb 2002)
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index e01076734b9b..03d83911b07f 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,9 +1,13 @@
-MD5 11d14f19048ad779bb550d0f33d88866 findutils-4.1.7-r2.ebuild 1534
-MD5 a3a9dc7d8a0d97e9da4f3fbfacf25771 findutils-4.1.7-r4.ebuild 1865
-MD5 80fed0801ef1930afc295dc435df7019 findutils-4.1.7-r1.ebuild 1387
-MD5 bc9976414dcf601867fd79a89614cc7f ChangeLog 2838
-MD5 1a948208ae367f2ef83aa13c3574526d findutils-4.1.7-r3.ebuild 1644
-MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r1 67
-MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r2 67
-MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r3 161
-MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r4 67
+MD5 03ce983ed4a749d09b6264da58d82b05 findutils-4.2.25.ebuild 1705
+MD5 7ad72dd1133e9c5896ee04cdb7a85d38 findutils-4.2.24.ebuild 1706
+MD5 9c5a5faded918f0b423a78416f762777 ChangeLog 8326
+MD5 1f7197b778d47c773d19430261c84f49 metadata.xml 261
+MD5 054571cd32e981304231461745b82e07 findutils-4.1.20-r1.ebuild 2070
+MD5 43e3e3c15b66b30de4be62db3b7674ea files/findutils-4.1.20-selinux.diff 10392
+MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672
+MD5 6d52de5b305608054e88b17c5b282048 files/findutils-4.2.20-man.patch 331
+MD5 0b8c5e1bc2e54e46c292ad6a90729f75 files/findutils-4.2.24-selinux.diff 14356
+MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20-r1 68
+MD5 2b5e0b42a11ea009340805d461a6ecc5 files/digest-findutils-4.2.24 69
+MD5 20f929ed7c70bcf734d389a7dd03b6d5 files/digest-findutils-4.2.25 69
+MD5 df65fc9a616feac9570c654f02b2edcc files/findutils-4.2.18-gcc295.patch 457
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20-r1 b/sys-apps/findutils/files/digest-findutils-4.1.20-r1
index f304c6405801..ee97aa90b56d 100644
--- a/sys-apps/findutils/files/digest-findutils-4.1.20-r1
+++ b/sys-apps/findutils/files/digest-findutils-4.1.20-r1
@@ -1,2 +1 @@
 MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980
-MD5 0fe2231e7a309c98077b7290b6269e49 findutils-4.1.20-2003011510-selinux-gentoo.patch.bz2 4407
diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
index 1fcf0e9534de..89f30d360b83 100644
--- a/sys-apps/findutils/findutils-4.1.20-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
@@ -1,36 +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/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.1 2003/10/23 10:51:39 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
-IUSE="nls build afs selinux"
+inherit eutils flag-o-matic gnuconfig toolchain-funcs
 
-inherit eutils
-
-DESCRIPTION="GNU utilities to find files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
+SELINUX_PATCH="findutils-4.1.20-selinux.diff"
 
 # Note this doesn't point to gnu.org because alpha.gnu.org has quit
 # supplying the development versions.  If it comes back in the future
 # then we might want to redirect the link.  See bug 18729
+DESCRIPTION="GNU utilities to find files"
+HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+	mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~arm ~alpha ~ia64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls build afs selinux static"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	afs? ( net-fs/openafs )
-	selinux? ( sys-apps/selinux-small )"
-RDEPEND="virtual/glibc"
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Detect new systems properly
+	gnuconfig_update
+
 	# Don't build or install locate because it conflicts with slocate,
 	# which is a secure version of locate.  See bug 18729
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
@@ -38,39 +40,30 @@ src_unpack() {
 	#get a bigger environment as ebuild.sh is growing large
 	epatch ${FILESDIR}/findutils-env-size.patch
 
-	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 }
 
 src_compile() {
-	local myconf=
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use afs; then
-		export CPPFLAGS=-I/usr/afsws/include
-		export LDFLAGS=-lpam
-		export LIBS=/usr/afsws/lib/pam_afs.so.1
+	if use afs && use x86; then
+		append-flags -I/usr/afsws/include
+		append-ldflags -lpam
+		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
 	fi
+	export CPPFLAGS="${CXXFLAGS}"
+	use static && append-ldflags -static
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		${myconf} || die
-
-	emake libexecdir=/usr/lib/find || die
+	econf $(use_enable nls) || die
+	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die
 }
 
 src_install() {
 	einstall libexecdir=${D}/usr/lib/find || die
-
 	prepallman
 
 	rm -rf ${D}/usr/var
-	if ! use build; then
-		dodoc COPYING NEWS README TODO ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
+	use build \
+		&& rm -rf ${D}/usr/share \
+		|| dodoc NEWS README TODO ChangeLog
 }
 
 pkg_postinst() {
diff --git a/sys-apps/findutils/findutils-4.2.24.ebuild b/sys-apps/findutils/findutils-4.2.24.ebuild
index 639e8daef676..cb751db7d0b6 100644
--- a/sys-apps/findutils/findutils-4.2.24.ebuild
+++ b/sys-apps/findutils/findutils-4.2.24.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/sys-apps/findutils/findutils-4.2.24.ebuild,v 1.1 2005/09/22 18:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.24.ebuild,v 1.1.1.1 2005/11/30 09:56:05 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-# SELINUX_PATCH="findutils-4.2.23-selinux.patch"
+SELINUX_PATCH="findutils-4.2.24-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
@@ -33,11 +33,10 @@ src_unpack() {
 }
 
 src_compile() {
-	export CPPFLAGS="${CXXFLAGS}"
 	use static && append-ldflags -static
 
-	local myconf=""
-	[[ "${USERLAND}" != "GNU" ]] && myconf="--program-prefix=g"
+	local myconf="--without-included-regex"
+	[[ "${USERLAND}" != "GNU" ]] && myconf=" --program-prefix=g"
 
 	econf $(use_enable nls) ${myconf} || die "configure failed"
 	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die "make failed"
@@ -47,9 +46,9 @@ src_install() {
 	make DESTDIR="${D}" libexecdir="${D}/usr/lib/find" install || die
 	prepallman
 
-	rm -rf ${D}/usr/var
+	rm -rf "${D}"/usr/var
 	use build \
-		&& rm -rf ${D}/usr/share \
+		&& rm -rf "${D}"/usr/share \
 		|| dodoc NEWS README TODO ChangeLog
 }
 
diff --git a/sys-apps/findutils/findutils-4.2.25.ebuild b/sys-apps/findutils/findutils-4.2.25.ebuild
index 8af1625d2458..97342dbe4b1e 100644
--- a/sys-apps/findutils/findutils-4.2.25.ebuild
+++ b/sys-apps/findutils/findutils-4.2.25.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/sys-apps/findutils/findutils-4.2.25.ebuild,v 1.1 2005/10/07 21:09:30 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.25.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-# SELINUX_PATCH="findutils-4.2.23-selinux.patch"
+SELINUX_PATCH="findutils-4.2.24-selinux.diff"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls build selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )"
@@ -29,7 +29,7 @@ src_unpack() {
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
 
 	# Patches for selinux
-	# use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
+	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
 }
 
 src_compile() {
diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
index f093d416cbb1..6e000d4d4f29 100644
--- a/sys-apps/findutils/metadata.xml
+++ b/sys-apps/findutils/metadata.xml
@@ -1,7 +1,9 @@
- * 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>base-system</herd>
+	<maintainer>
+		<email>ciaranm@gentoo.org</email>
+		<name>Ciaran McCreesh</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/freebsd-stat/ChangeLog b/sys-apps/freebsd-stat/ChangeLog
index a693f09fa37d..32b24db90d42 100644
--- a/sys-apps/freebsd-stat/ChangeLog
+++ b/sys-apps/freebsd-stat/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/freebsd-stat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/freebsd-stat/ChangeLog,v 1.1 2005/02/02 23:42:13 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/freebsd-stat/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 *freebsd-stat-5.3_p20050202 (02 Feb 2005)
 
diff --git a/sys-apps/freebsd-stat/Manifest b/sys-apps/freebsd-stat/Manifest
index f68688301a6f..79fe7b06a97e 100644
--- a/sys-apps/freebsd-stat/Manifest
+++ b/sys-apps/freebsd-stat/Manifest
@@ -1,4 +1,4 @@
-MD5 93c9769d1716194b18873ff8a975365b ChangeLog 285
-MD5 c110ee1bd1ca740e3e47ecb55ad8a039 freebsd-stat-5.3_p20050202.ebuild 465
+MD5 ab47d669ccfd74017499854bfa2483e6 ChangeLog 376
+MD5 c60376bb263feb84534388ca5671e423 freebsd-stat-5.3_p20050202.ebuild 696
 MD5 e526e84277cb8eb1bcf73840117ff45a metadata.xml 220
 MD5 fc11e437607304215c10f7d81f57056f files/digest-freebsd-stat-5.3_p20050202 77
diff --git a/sys-apps/freebsd-stat/freebsd-stat-5.3_p20050202.ebuild b/sys-apps/freebsd-stat/freebsd-stat-5.3_p20050202.ebuild
index f43f37be2cc7..14657756b1e0 100644
--- a/sys-apps/freebsd-stat/freebsd-stat-5.3_p20050202.ebuild
+++ b/sys-apps/freebsd-stat/freebsd-stat-5.3_p20050202.ebuild
@@ -1,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-apps/freebsd-stat/freebsd-stat-5.3_p20050202.ebuild,v 1.1 2005/02/02 23:42:13 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/freebsd-stat/freebsd-stat-5.3_p20050202.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 DESCRIPTION="FreeBSD stat, readlink - display file status"
 HOMEPAGE="http://www.freebsd.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~ppc-macos"
-IUSE=""
+IUSE="build"
 
 DEPEND="virtual/libc"
 
@@ -21,5 +21,11 @@ src_compile() {
 
 src_install() {
 	dobin stat
-	doman stat.1
+	dosym stat /usr/bin/readlink
+
+	if ! use build; then
+		doman stat.1
+		dosym stat.1.gz /usr/share/man/man1/readlink.1.gz
+	fi
+
 }
diff --git a/sys-apps/fwcrv/ChangeLog b/sys-apps/fwcrv/ChangeLog
index a75b1ffe8a64..d6b681db8eb3 100644
--- a/sys-apps/fwcrv/ChangeLog
+++ b/sys-apps/fwcrv/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/fwcrv
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/ChangeLog,v 1.1 2005/01/09 10:22:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/ChangeLog,v 1.1.1.1 2005/11/30 09:55:59 chriswhite Exp $
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> fwcrv-0.1.0.ebuild:
+  Stable on x86, 260 days in ~x86.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
 
 *fwcrv-0.1.0 (09 Jan 2005)
 
   09 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
   +fwcrv-0.1.0.ebuild:
-  Inital submission. Ebuild submitted by Holger Hoffst�tte <holger@wizards.de>.
+  Inital submission. Ebuild submitted by Holger Hoffstätte <holger@wizards.de>.
 
diff --git a/sys-apps/fwcrv/Manifest b/sys-apps/fwcrv/Manifest
index a86618bdef03..bfd084a99a34 100644
--- a/sys-apps/fwcrv/Manifest
+++ b/sys-apps/fwcrv/Manifest
@@ -1,2 +1,4 @@
-MD5 dc28be130d6a0ae7e27eba935c5ad7f8 fwcrv-0.1.0.ebuild 492
+MD5 9958cd3d1bb9fde154ee6544263439e5 ChangeLog 622
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 5967f726caf1bd157ed2e3f7026b492e fwcrv-0.1.0.ebuild 631
 MD5 f28ed20204b04f6721bee52f769da6f9 files/digest-fwcrv-0.1.0 62
diff --git a/sys-apps/fwcrv/fwcrv-0.1.0.ebuild b/sys-apps/fwcrv/fwcrv-0.1.0.ebuild
index a6eb7c404cde..c8d01e626a5e 100644
--- a/sys-apps/fwcrv/fwcrv-0.1.0.ebuild
+++ b/sys-apps/fwcrv/fwcrv-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/sys-apps/fwcrv/fwcrv-0.1.0.ebuild,v 1.1 2005/01/09 10:22:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fwcrv/fwcrv-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:55:59 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.hugovil.com/en/fwcrv/"
 SRC_URI="http://www.hugovil.com/repository/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="sys-libs/libraw1394"
 
diff --git a/sys-apps/fxload/ChangeLog b/sys-apps/fxload/ChangeLog
index 7b1810ef133f..c28430db4b3e 100644
--- a/sys-apps/fxload/ChangeLog
+++ b/sys-apps/fxload/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for sys-apps/hotplug
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/ChangeLog,v 1.1 2002/05/11 00:58:36 wmertens Exp $
+# ChangeLog for sys-apps/fxload
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/ChangeLog,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
+
+  22 Feb 2005; Aron Griffis <agriffis@gentoo.org> fxload-20020411.ebuild:
+  stable on ia64
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*fxload-20020411 (14 July 2002)
+
+  25 Mar 2003; Guy Martin <gmsoft@gentoo.org> fxload-20020411.ebuild :
+  Fixed build using MY_P instead of modifying P. Added ~hppa to KEYWORDS.
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> fxload-20020411.ebuild :
+  Added KEYWORDS, SLOT.
 
 *fxload-20020114 (5 May 2002)
 
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index e69de29bb2d1..5a8199e13518 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -0,0 +1,4 @@
+MD5 cf081cd006dd2ac0f59a8204b4306f94 fxload-20020411.ebuild 735
+MD5 e9bea8f17f939506bba84b77351f370d ChangeLog 774
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c08c29b1d8e9d015adea21c74a99155b files/digest-fxload-20020411 68
diff --git a/sys-apps/fxload/fxload-20020411.ebuild b/sys-apps/fxload/fxload-20020411.ebuild
index d587cf9dccbe..5d5f81e78528 100644
--- a/sys-apps/fxload/fxload-20020411.ebuild
+++ b/sys-apps/fxload/fxload-20020411.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.1 2002/05/11 00:58:36 wmertens Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fxload/fxload-20020411.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 # source maintainers named it fxload-YYYY_MM_DD instead of fxload-YYYYMMDD
-OLDP="$P"
-P=`echo $P|sed 's/-\(....\)\(..\)\(..\)/-\1_\2_\3/'`
-S=${WORKDIR}/${P}
+MY_P="${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}"
 DESCRIPTION="USB firmware uploader"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"
-HOMEPAGE="http://linux-hotplug.sourceforge.net"
+HOMEPAGE="http://linux-hotplug.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz"
 
-# fxload needs pcimodules utility provided by pcitutils-2.1.9-r1
-DEPEND="virtual/glibc
-	sys-apps/hotplug"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86 ia64"
+IUSE=""
 
-src_compile() {
+DEPEND="virtual/libc
+	sys-apps/hotplug"
 
-	# compile fxload program
-	make || die
+S=${WORKDIR}/${MY_P}
 
+src_compile() {
+	make RPM_OPT_FLAGS="${CFLAGS}" || die
 }
 
-src_install () {
-
-	make install prefix=${D}
-
+src_install() {
+	make install prefix=${D} || die
 }
diff --git a/sys-apps/fxload/metadata.xml b/sys-apps/fxload/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/fxload/metadata.xml
+++ b/sys-apps/fxload/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-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index ad81c48cec10..0b0c30c40322 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,292 @@
 # ChangeLog for sys-apps/gawk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
+
+  13 Oct 2005; Kito <kito@gentoo.org> gawk-3.1.5.ebuild:
+  ~ppc-macos keyword
+
+  03 Oct 2005; Hardave Riar <hardave@gentoo.org> gawk-3.1.4-r4.ebuild:
+  Stable on mips.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> gawk-3.1.4-r4.ebuild:
+  Marked Stable on amd64.
+
+  21 Sep 2005; Mike Frysinger <vapier@gentoo.org> gawk-3.1.5.ebuild:
+  Move libexec dir from /usr/libexec to /usr/lib/misc.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> gawk-3.1.4-r4.ebuild:
+  Mark 3.1.4-r4 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> gawk-3.1.4-r4.ebuild:
+  Stable on ppc64
+
+  03 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gawk-3.1.5-gcc4.patch, files/filefuncs/Makefile, gawk-3.1.5.ebuild:
+  Fix by Kito for building with gcc4 #104740 and move a bunch of ugly filefunc
+  details out of the ebuild and into the filefunc Makefile.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gawk-3.1.4-r4.ebuild:
+  Stable on ppc.
+
+  02 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> gawk-3.1.4-r4.ebuild:
+  Stable on sparc
+
+*gawk-3.1.5 (01 Sep 2005)
+
+  01 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gawk-3.1.5-core.patch, +gawk-3.1.5.ebuild:
+  Version bump.
+
+  29 May 2005; <solar@gentoo.org> gawk-3.1.3-r2.ebuild:
+  echangelog - update package to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+  06 May 2005; Mike Frysinger <vapier@gentoo.org>
+  files/filefuncs/filefuncs.c, gawk-3.1.4-r4.ebuild:
+  Add switch capabilities #91182 by Ekatalog and BSD support #90847 by Diego
+  Pettenò.
+
+*gawk-3.1.4-r4 (19 Feb 2005)
+
+  19 Feb 2005; Mike Frysinger <vapier@gentoo.org> -gawk-3.1.4-r3.ebuild,
+  +gawk-3.1.4-r4.ebuild:
+  Update the xml patch to the current version.
+
+*gawk-3.1.4-r3 (14 Feb 2005)
+
+  14 Feb 2005; Mike Frysinger <vapier@gentoo.org> -gawk-3.1.4-r2.ebuild,
+  +gawk-3.1.4-r3.ebuild:
+  Build xmlgawk separately from the normal gawk so we dont link against
+  libexpat (which is in /usr/lib) #81793.
+
+*gawk-3.1.4-r2 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gawk-3.1.3-getpgrp_void.patch, +files/gawk-3.1.4-flonum.patch,
+  +files/gawk-3.1.4-nextc.patch, +files/gawk-3.1.4-uplow.patch,
+  -gawk-3.1.4-r1.ebuild, +gawk-3.1.4-r2.ebuild:
+  Add some patches from Fedora and xmlgawk support #57857 by Alcino Dall Igna
+  Junior.
+
+*gawk-3.1.4-r1 (29 Jan 2005)
+
+  29 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gawk-3.1.4-disable-DFA.patch, +gawk-3.1.4-r1.ebuild,
+  -gawk-3.1.4.ebuild:
+  Version bump with patch from Fedora to fix random LOCALE bugs #78227.
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/filefuncs/Makefile, gawk-3.1.3-r2.ebuild, gawk-3.1.4.ebuild:
+  multilib fixes for filefuncs.
+
+*gawk-3.1.4 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> gawk-3.1.3-r2.ebuild,
+  +gawk-3.1.4.ebuild:
+  Version bump.
+
+*gawk-3.1.3-r2 (22 Nov 2004)
+
+  22 Nov 2004; Mike Frysinger <vapier@gentoo.org> +gawk-3.1.3-r2.ebuild:
+  Use econf/install with DESTDIR.
+
+  14 Nov 2004; Tony Vroon <chainsaw@gentoo.org> gawk-3.1.3-r1.ebuild:
+  Portability update to cp command, change -d to -P, which works on more OS's.
+  Suggested by Chris L. Mason <clmason@mac.com> in bug #66911.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org>
+  files/filefuncs/filefuncs.c:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  01 Sep 2004; Travis Tilley <lv@gentoo.org> gawk-3.1.3-r1.ebuild:
+  made gawk use $(get_libdir)
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> gawk-3.1.3-r1.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> -gawk-3.1.1-r2.ebuild,
+  -gawk-3.1.2-r3.ebuild, gawk-3.1.3-r1.ebuild, -gawk-3.1.3.ebuild:
+  gnuconfig_update in src_unpack; use emake; tidy; clean older ebuilds
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> gawk-3.1.1-r2.ebuild,
+  gawk-3.1.2-r3.ebuild, gawk-3.1.3.ebuild:
+  QA - fix use invocation
+
+  15 Jun 2004; <solar@gentoo.org> gawk-3.1.3-r1.ebuild:
+  run gnuconfig_update when using uclibc
+
+  25 Apr 2004; Tom Gall <tgall@gentoo.org> gawk-3.1.3-r1.ebuild:
+  fix bug 48990 -- affects all 64 bit architectures
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> gawk-3.1.1-r2.ebuild,
+  gawk-3.1.2-r3.ebuild, gawk-3.1.3-r1.ebuild, gawk-3.1.3.ebuild:
+  Marked stable on mips, copyright header fixes.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gawk-3.1.3-r1.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> gawk-3.1.3.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.3-r1.ebuild:
+  Move pgawk and igawk to /usr/bin, bug #36453.
+
+*gawk-3.1.3-r1 (28 Dec 2003)
+
+  28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.3-r1.ebuild:
+  Make sure /bin/pgawk is a symlink as to not have two binaries taking space.
+
+  21 Jul 2003; Christian Birchinger <joker@gentoo.org> gawk-3.1.3.ebuild:
+  Added sparc stable keyword
+
+  20 Jul 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.3.ebuild:
+  Mark stable for x86 and amd64
+
+*gawk-3.1.3 (10 Jul 2003)
+
+  23 Jul 2003; Guy Martin <gmsoft@gentoo.org> gawk-3.1.1-r2.ebuild :
+  Marked stable on hppa.
+
+  22 Jul 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.1-r2.ebuild,
+  gawk-3.1.2-r3.ebuild, gawk-3.1.3.ebuild:
+  Do not copy the filefuncs files with original permissions in tackt, thanks to
+  Tobias Sager <moixa@gmx.ch>, bug #24989.
+
+  10 Jul 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.3.ebuild:
+  Bump
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> gawk-3.1.2-r3.ebuild:
+  Mark stable on alpha
+
+*gawk-3.1.2-r3 (27 Mar 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> gawk-3.1.2-r3.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> gawk-3.1.2-r3.ebuild:
+  Changed ~sparc to sparc in KEYWORDS
+  Changed ~mips to mips in KEYWORDS
+
+  08 Jun 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2-r3.ebuild:
+  Mark unstable, see bug 21713 for reasons, will wait for 3.1.3 to have a new
+  stable gawk
+
+  23 May 2003; Tavis Ormandy <taviso@gentoo.org> gawk-3.1.2-r3.ebuild:
+  support for ccc (alpha).
+
+  20 May 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r3.ebuild :
+  Mark stable for all, as all issues are fixed, and 3.1.1-r2 with filefuncs
+  did not seem to propagate properly.
+
+  11 May 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.1-r2.ebuild :
+  Mark stable for all, as next baselayout will need a gawk with filefuncs.
+
+  26 Apr 2003; Christian Birchinger <joker@gentoo.org> gawk-3.1.2-r3.ebuild :
+  Added stable sparc keyword
+
+  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2-r3.ebuild :
+  Changed x86 keywords
+
+  27 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r3.ebuild :
+  Special files like those in /proc, report themselves as regular files
+  of length 0, when in fact they have data in them if you try to read them.
+  The new record-reading code wasn't quite smart enough to deal with such
+  a bizarre case.  The following patch fixes the problem, thanks to 
+  Arnold D. Robbins (Maintainer of gawk).
+
+*gawk-3.1.1-r2 (26 Mar 2003)
+
+  26 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.1-r2.ebuild :
+  For some reason gawk-3.1.2 is more pain than worth.  Seems this release
+  also borks the ability to specify input files as arguments:
+
+    # gawk '/devfs/ { print }' /proc/filesystems 
+    #
+
+  should have been the same as:
+  
+    # cat /proc/filesystems | gawk '/devfs/ { print }'
+    nodev	devfs
+    nodev	usbdevfs
+    # 
+
+  Thus all this release does, is get the filefuncs module into 3.1.1 as well,
+  so that we can totally mask gawk-3.1.2.
+
+*gawk-3.1.2-r2 (25 Mar 2003)
+
+  25 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r2.ebuild :
+  Add filefuncs module from baselayout, as it is very closly tied to the gawk
+  version running.  While we are at it, version the module (filefuncs.so.0.0.1,
+  with soname of filefuncs.so.0 for now).  Do not install acconfig.h into
+  /usr/include/awk, as it is redundant.  This should fix bug #18127.
+
+*gawk-3.1.2-r1 (25 Mar 2003)
+
+  25 Mar 2003; Martin Schlemmer <azarah@gentoo.org> gawk-3.1.2-r1.ebuild :
+  Version that should not really have hit portage, but I was busy at work
+  and closing time caught me.
+
+*gawk-3.1.2 (24 Mar 2003)
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2.ebuild :
+  -* keyword, and get the -r1 ebuild stuff that I somehow ignored into it, a -r1
+  which will be ~ rather than - will be forthcoming
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org> gawk-3.1.2.ebuild :
+  Bump
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> gawk-3.1.1-r1.ebuild :
+  Added arm to keywords.
+
+  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> gawk-3.1.1-r1.ebuild :
+  Added hppa to keywords.
+
+*gawk-3.1.1-r1 (20 Dec 2002)
+
+  20 Dec 2002; Jan Seidel <tuxus@gentoo.org> gawk-3.1.1-r1.ebuild :
+  Added mips to keywords
+
+  16 Dec 2002; Martin Schlemmmer <azarah@gentoo.org> gawk-3.1.1-r1.ebuild :
+  Fix rare case where gawk do not get installed as /bin/gawk-$PV, but
+  rather /bin/gawk-.  Fix missing docs.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gawk-3.1.1-r1 (14 Nov 2002)
+
+  14 Nov 2002; Martin Schlemmmer <azarah@gentoo.org> :
+  Install gawk headers into /usr/include/awk.
+
+*gawk-3.1.1 (21 Jul 2002)
+
+  21 Jul 2002; Martin Schlemmmer <azarah@gentoo.org> :
+  Update version.
+
+*gawk-3.1.0-r3 (21 Jul 2002)
+
+  21 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Move /usr/bin/awk to /bin/awk for upcomming baselayout.
+
+*gawk-3.1.0-r2 (26 Jun 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> gawk-3.1.0-r2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add /bin/awk compat symlink, closing bug #3288.
+
+*gawk-3.1.0-r1 (12 Mar 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> gawk-3.1.0-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog :
+
+  Added USE dependent nls compilation
 
 *gawk-3.1.0 (1 Feb 2002)
 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 2197ff0052ed..6e4d8486f115 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,12 +1,19 @@
-MD5 4e067c30a6089ea569440e86a795547b gawk-3.1.2-r3.ebuild 2845
-MD5 de51ab659ebf0880cf338b8afd07f66c gawk-3.1.1-r1.ebuild 1886
-MD5 8b3c80662090a2c9448f827bf120ffa8 gawk-3.1.0-r3.ebuild 1535
-MD5 9ad7925856a68140e81b9ae586e68ee1 ChangeLog 4098
-MD5 72077947981cc02260e60666f7c91fc6 gawk-3.1.1-r2.ebuild 2433
-MD5 9f439b073b0d1903a54a04dca5aa44af files/gawk-3.1.2-input-filesize.patch 13485
-MD5 3c0d2169faea02833c01a0630c4eae3a files/digest-gawk-3.1.0-r3 63
-MD5 9ee5f35f388bc0943f9f1df199bdd64d files/digest-gawk-3.1.1-r1 63
-MD5 9ee5f35f388bc0943f9f1df199bdd64d files/digest-gawk-3.1.1-r2 63
-MD5 0a6cc5ae974c8876f6c3e975d7fb95e3 files/digest-gawk-3.1.2-r3 63
-MD5 8b851d91749c9467b5464628db1dcbfb files/filefuncs/Makefile 948
-MD5 6329d35b6c81a6fd70ab4a902af8e0bd files/filefuncs/filefuncs.c 11028
+MD5 d4a449698c2a6ebf4218491456c60d87 ChangeLog 10696
+MD5 c40ec6dfabda5864b7f62fa57d2329bd files/64bitnumfile.patch 340
+MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r2 63
+MD5 e01879d30ddf2eb060f2ba2fa745a922 files/digest-gawk-3.1.4-r4 132
+MD5 214193d03d4c328a4ba33aadc008d301 files/digest-gawk-3.1.5 63
+MD5 7b48ab999f661a00e70da4eb9ede8376 files/filefuncs/Makefile 1192
+MD5 3159f74841ac19ed6237645e562f60c0 files/filefuncs/filefuncs.c 10992
+MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
+MD5 8a25d43ff539b0c949fc5bbce8488e06 files/gawk-3.1.3-getpgrp_void.patch 1225
+MD5 3cca4692ffa1c396bff698d02f1a41e0 files/gawk-3.1.4-disable-DFA.patch 1837
+MD5 6778659e2892fddf115cee2c244e60a8 files/gawk-3.1.4-flonum.patch 3341
+MD5 334e1cf92033c20c5e401f5ae5f498cc files/gawk-3.1.4-nextc.patch 716
+MD5 513af85f3e12197f97b42c3fee7c491c files/gawk-3.1.4-uplow.patch 5636
+MD5 89145324fea9791b0caa1b09f5cee0cb files/gawk-3.1.5-core.patch 643
+MD5 499e2881f167a17f2123ca338836e91d files/gawk-3.1.5-gcc4.patch 826
+MD5 e0f9b7570483cbca8caa3706b334416c gawk-3.1.3-r2.ebuild 2764
+MD5 09fbc4e3606506a36a62d00e0a4a4dea gawk-3.1.4-r4.ebuild 3856
+MD5 2121b89d0dbdf835be64ebf098624652 gawk-3.1.5.ebuild 3090
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.5 b/sys-apps/gawk/files/digest-gawk-3.1.5
index 5a1ad05d144f..73534213282d 100644
--- a/sys-apps/gawk/files/digest-gawk-3.1.5
+++ b/sys-apps/gawk/files/digest-gawk-3.1.5
@@ -1,2 +1 @@
 MD5 4760325489479cac17fe0114b8f62f30 gawk-3.1.5.tar.gz 2310919
-MD5 828fbed5314eab4dd0f75ce32dc28bda patch_3.1.4__xml_20040920 79433
diff --git a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile
index 80ac0e9d92fa..70e5a8808540 100644
--- a/sys-apps/gawk/files/filefuncs/Makefile
+++ b/sys-apps/gawk/files/filefuncs/Makefile
@@ -1,32 +1,57 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.1 2003/03/25 15:27:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/Makefile,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
+
+CC ?= gcc
+LD = $(CC)
 
-CC = gcc
-LD = gcc
 MAJORVER = 0
 MINORVER = 0.1
+
+AWKINCDIR = /usr/include/awk
 DESTDIR =
 
-TARGET = filefuncs.so.$(MAJORVER).$(MINORVER)
+TARGET = filefuncs
+TARGET_LIB = $(TARGET).so.$(MAJORVER).$(MINORVER)
+
+LIBDIR = lib
+
+# Gentoo specific cruft, you like it dont ya idiot
+ifdef D
+DESTDIR = $(D)
+endif
+ifdef S
+AWKINCDIR = $(S)
+endif
 
-all: $(TARGET)
+DOIT = yes
+ifeq ($(USERLAND),Darwin)
+DOIT = no
+endif
 
-filefuncs.o: filefuncs.c
-	$(CC) -shared -Wall -DHAVE_CONFIG_H -c -O2 -fPIC -I/usr/include/awk $^
+ifeq ($(DOIT),yes)
 
-filefuncs.so.$(MAJORVER).$(MINORVER): filefuncs.o
-	$(LD) -o $@ -shared -Wl,-soname -Wl,filefuncs.so.$(MAJORVER) $^
+all: $(TARGET_LIB)
 
-install: $(TARGET)
-	install -m 0755 -d $(DESTDIR)/lib/rcscripts
-	install -m 0755 $(TARGET) $(DESTDIR)/lib/rcscripts
-	ldconfig -l $(DESTDIR)/lib/rcscripts/$(TARGET)
-	rm -f $(DESTDIR)/lib/rcscripts/filefuncs.so
-	ln -s $(TARGET) $(DESTDIR)/lib/rcscripts/filefuncs.so
+$(TARGET).o: $(TARGET).c
+	$(CC) -shared -Wall -DHAVE_CONFIG_H -c -O2 -fPIC -I$(AWKINCDIR) $^
+
+$(TARGET_LIB): $(TARGET).o
+	$(LD) -o $@ -shared -Wl,-soname -Wl,$(TARGET).so.$(MAJORVER) $^
+
+install: $(TARGET_LIB)
+	install -m 0755 -d $(DESTDIR)/$(LIBDIR)/rcscripts
+	install -m 0755 $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts
+	ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so.$(MAJORVER)
+	ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so
 
 clean:
 	rm -f $(TARGET)
 	rm -f *.o *~ core
 
+else
+
+all install clean:
+
+endif
diff --git a/sys-apps/gawk/files/filefuncs/filefuncs.c b/sys-apps/gawk/files/filefuncs/filefuncs.c
index 30907c63e256..e03dbcc2e01c 100644
--- a/sys-apps/gawk/files/filefuncs/filefuncs.c
+++ b/sys-apps/gawk/files/filefuncs/filefuncs.c
@@ -27,10 +27,10 @@
  */
 
 /*
- * Copyright 1999-2003 Gentoo Technologies, Inc.
+ * Copyright 1999-2004 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
  * Author:  Martin Schlemmer <azarah@gentoo.org>, Nov 2002
- * $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/filefuncs.c,v 1.1 2003/03/25 15:27:34 azarah Exp $
+ * $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/files/filefuncs/filefuncs.c,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
  * 
  * Extended with: do_symlink()
  *                do_unlink()
@@ -44,7 +44,6 @@
 #include "awk.h"
 
 #include <unistd.h>
-#include <sys/sysmacros.h>
 
 /*  do_chdir --- provide dynamically loaded chdir() builtin for gawk */
 
diff --git a/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff b/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff
index 06b4461b864c..3807e0178b64 100644
--- a/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff
+++ b/sys-apps/gawk/files/gawk-3.1.2-dec-alpha-compiler.diff
@@ -5,7 +5,7 @@
  extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
  			      const char *__restrict __string, size_t __nmatch,
 -			      regmatch_t __pmatch[__restrict_arr],
-+			      regmatch_t __pmatch[],
++			      regmatch_t __pmatch[__restrict],
  			      int __eflags));
  
  extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
diff --git a/sys-apps/gawk/gawk-3.1.3-r2.ebuild b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
index 5b1b4aeec50e..ce7763311afe 100644
--- a/sys-apps/gawk/gawk-3.1.3-r2.ebuild
+++ b/sys-apps/gawk/gawk-3.1.3-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/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.1 2004/11/22 06:03:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls build"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
@@ -21,7 +21,7 @@ src_unpack() {
 	unpack ${A}
 
 	# Copy filefuncs module's source over ...
-	cp -PR "${FILESDIR}/filefuncs" "${WORKDIR}/" || die "cp failed"
+	cp -PR "${FILESDIR}/filefuncs" "${WORKDIR}" || die "cp failed"
 
 	cd ${S}
 	# support for dec compiler.
@@ -43,6 +43,7 @@ src_install() {
 	make \
 		DESTDIR=${D} \
 		AWKINCDIR=${S} \
+		LIBDIR="$(get_libdir)" \
 		install || die "filefuncs install failed"
 
 	dodir /usr/bin
diff --git a/sys-apps/gawk/gawk-3.1.4-r4.ebuild b/sys-apps/gawk/gawk-3.1.4-r4.ebuild
index 66360fafc25f..82846408b234 100644
--- a/sys-apps/gawk/gawk-3.1.4-r4.ebuild
+++ b/sys-apps/gawk/gawk-3.1.4-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/sys-apps/gawk/gawk-3.1.4-r4.ebuild,v 1.1 2005/02/19 17:56:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4-r4.ebuild,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,96 +12,105 @@ SRC_URI="mirror://gnu/gawk/${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 ppc64 s390 sh sparc x86"
 IUSE="nls build xml"
 
-RDEPEND="virtual/libc
-	xml? ( dev-libs/expat )"
+RDEPEND="xml? ( dev-libs/expat )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+SXML=${WORKDIR}/xmlgawk
+SFFS=${WORKDIR}/filefuncs
+
 src_unpack() {
 	unpack ${P}.tar.gz
 
 	# Copy filefuncs module's source over ...
-	cp -PR "${FILESDIR}"/filefuncs "${WORKDIR}"/ || die "cp failed"
+	cp -pPR "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-disable-DFA.patch #78227
 	epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch #fedora
-	epatch "${FILESDIR}"/${P}-flonum.patch #fedora
 	epatch "${FILESDIR}"/${P}-nextc.patch #fedora
 	epatch "${FILESDIR}"/${P}-uplow.patch #fedora
 	# support for dec compiler.
-	[[ $(tc-getCC) == "ccc" ]] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
+	[[ $(tc-getCC) == "ccc" ]] && epatch "${FILESDIR}"/${PN}-3.1.2-dec-alpha-compiler.diff
 
 	if use xml ; then
-		mkdir xmlgawk
-		cd xmlgawk
-		unpack ${P}.tar.gz
-		epatch "${DISTDIR}"/${XML_PATCH} #57857
+		mkdir "${SXML}"
+		cp -pPR "${S}"/* "${SXML}"/
+		cd "${SXML}"
+		EPATCH_OPTS="-p2 -g0" epatch "${DISTDIR}"/${XML_PATCH} #57857
 	fi
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-flonum.patch #fedora
 }
 
 src_compile() {
-	econf --bindir=/bin $(use_enable nls) || die
+	econf \
+		--bindir=/bin \
+		$(use_enable nls) \
+		--enable-switch \
+		|| die
 	emake || die "emake failed"
 	if use xml ; then
-		cd xmlgawk/${P}
+		cd "${SXML}"
 		econf $(use_enable nls) || die
 		emake || die "xmlgawk make failed"
-		cd ../..
 	fi
 
-	cd ../filefuncs
+	cd "${SFFS}"
 	emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
 }
 
 src_install() {
 	make install DESTDIR="${D}" || die "install failed"
 	if use xml ; then
-		newbin xmlgawk/${P}/gawk xmlgawk || die "xmlgawk failed"
+		newbin "${SXML}"/gawk xmlgawk || die "xmlgawk failed"
 		insinto /usr/include/awk
-		doins xmlgawk/${P}/xml_puller.h || die "xml inc failed"
+		doins "${SXML}"/xml_puller.h || die "xml inc failed"
+	fi
+	if ! use userland_Darwin ; then
+		cd "${SFFS}"
+		make \
+			DESTDIR="${D}" \
+			AWKINCDIR="${S}" \
+			LIBDIR="$(get_libdir)" \
+			install \
+			|| die "filefuncs install failed"
 	fi
-	cd ../filefuncs
-	make \
-		DESTDIR="${D}" \
-		AWKINCDIR="${S}" \
-		LIBDIR="$(get_libdir)" \
-		install \
-		|| die "filefuncs install failed"
 
 	dodir /usr/bin
 	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
-	# (p)gawk-${PV} ..  Also make sure that /bin/(p)gawk is a symlink
+	# (p)gawk-${PV} ...  Also make sure that /bin/(p)gawk is a symlink
 	# to /bin/(p)gawk-${PV}.
-	local x=
+	local binpath x
 	for x in gawk pgawk igawk ; do
-		local binpath
 		[[ ${x} == "gawk" ]] \
 			&& binpath="/bin" \
 			|| binpath="/usr/bin"
 
 		if [[ -f ${D}/bin/${x} && ! -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f ${D}/bin/${x} ${D}/${binpath}/${x}-${PV}
+			mv -f "${D}"/bin/${x} "${D}"/${binpath}/${x}-${PV}
 		elif [[ -f ${D}/bin/${x}- && ! -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f ${D}/bin/${x}- ${D}/${binpath}/${x}-${PV}
+			mv -f "${D}"/bin/${x}- "${D}"/${binpath}/${x}-${PV}
 		elif [[ ${binpath} == "/usr/bin" && -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f ${D}/bin/${x}-${PV} ${D}/${binpath}/${x}-${PV}
+			mv -f "${D}"/bin/${x}-${PV} "${D}"/${binpath}/${x}-${PV}
 		fi
 
-		rm -f ${D}/bin/${x}
+		rm -f "${D}"/bin/${x}
 		dosym ${x}-${PV} ${binpath}/${x}
 		[[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x}
 	done
 
 	rm -f "${D}"/bin/awk
-	dosym gawk-${PV} /bin/awk
-	# Compat symlinks
 	dodir /usr/bin
-	dosym /bin/gawk-${PV} /usr/bin/awk
+	# Compat symlinks
 	dosym /bin/gawk-${PV} /usr/bin/gawk
+	dosym gawk-${PV} /bin/awk
+	dosym /bin/gawk-${PV} /usr/bin/awk
+	[[ ${USERLAND} != "GNU" ]] && rm -f "${D}"/{,usr/}bin/awk{,-${PV}}
 
 	# Install headers
 	insinto /usr/include/awk
@@ -111,7 +120,9 @@ src_install() {
 
 	if ! use build ; then
 		cd "${S}"
-		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
+		rm -f "${D}"/usr/share/man/man1/pgawk.1
+		dosym gawk.1.gz /usr/share/man/man1/pgawk.1.gz
+		[[ ${USERLAND} == "GNU" ]] && dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
 		dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README
 		docinto README_d
 		dodoc README_d/*
diff --git a/sys-apps/gawk/gawk-3.1.5.ebuild b/sys-apps/gawk/gawk-3.1.5.ebuild
index ee93033cbd5e..52158200d66f 100644
--- a/sys-apps/gawk/gawk-3.1.5.ebuild
+++ b/sys-apps/gawk/gawk-3.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/sys-apps/gawk/gawk-3.1.5.ebuild,v 1.1 2005/09/01 06:26:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5.ebuild,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gawk/${P}.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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls build"
 
 RDEPEND=""
@@ -27,6 +27,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-core.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 	epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch #fedora
 	# support for dec compiler.
 	[[ $(tc-getCC) == "ccc" ]] && epatch "${FILESDIR}"/${PN}-3.1.2-dec-alpha-compiler.diff
@@ -35,26 +36,20 @@ src_unpack() {
 src_compile() {
 	econf \
 		--bindir=/bin \
+		--libexec=/usr/lib/misc \
 		$(use_enable nls) \
 		--enable-switch \
 		|| die
 	emake || die "emake failed"
 
 	cd "${SFFS}"
-	emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
+	emake CC=$(tc-getCC) || die "filefuncs emake failed"
 }
 
 src_install() {
 	make install DESTDIR="${D}" || die "install failed"
-	if ! use userland_Darwin ; then
-		cd "${SFFS}"
-		make \
-			DESTDIR="${D}" \
-			AWKINCDIR="${S}" \
-			LIBDIR="$(get_libdir)" \
-			install \
-			|| die "filefuncs install failed"
-	fi
+	cd "${SFFS}"
+	make LIBDIR="$(get_libdir)" install || die "filefuncs install failed"
 
 	dodir /usr/bin
 	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/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-apps/gluelog/ChangeLog b/sys-apps/gluelog/ChangeLog
index bd76969d0d7a..e553de61d020 100644
--- a/sys-apps/gluelog/ChangeLog
+++ b/sys-apps/gluelog/ChangeLog
@@ -1,9 +1,20 @@
 # ChangeLog for sys-apps/gluelog
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/ChangeLog,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
+  14 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> gluelog-1.0-r2.ebuild:
+  don't assign default to S; IUSE; tidy
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gluelog-1.0-r2 (1 Feb 2002)
 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> gluelog-1.0-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/gluelog/Manifest b/sys-apps/gluelog/Manifest
index e69de29bb2d1..dec7ff07db7f 100644
--- a/sys-apps/gluelog/Manifest
+++ b/sys-apps/gluelog/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e5c8550cbea7eeaaeda2c6a7e8a1f0dc ChangeLog 1045
+MD5 d673b17ab4f0180457fc12080f232fec gluelog-1.0-r2.ebuild 923
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 9a55efc56095eb91e07f2e53184d21c6 files/glueklog.c 1651
+MD5 d26c833022a34ce1a9986c580c724f22 files/README 1891
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gluelog-1.0-r2 0
+MD5 2db1fe5583b01969d036e861ca7a36d9 files/gluelog.c 1742
+MD5 101e99eb414ed4e350eb412605f1ec79 files/klog-run 70
+MD5 eb79cca2bbb6f75888fce5ab4bfe26f4 files/svc-klog 487
+MD5 7c7a72502fec5632662a43f048b10bbd files/svc-syslog 489
+MD5 b4197e64e2d56238dc606683ee9b2289 files/syslog-run 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA4iceHTu7gpaalycRAvY5AKCvLVu8rNdoA+Y/tWfwId7YAZUSuACeIkDr
+4nLOk1t3vn7EHhXyFEPaHwc=
+=w6nQ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gluelog/files/svc-klog b/sys-apps/gluelog/files/svc-klog
index eb208512ae0a..129ed7c0af4a 100755
--- a/sys-apps/gluelog/files/svc-klog
+++ b/sys-apps/gluelog/files/svc-klog
@@ -3,17 +3,17 @@
 
 . /etc/rc.d/config/functions
 
-SERVICE=svc-klog
+SERVICE=klog
 opts="start stop"
 
 start() {
-    ebegin "Starting ${SERVICE}"
+    ebegin "Starting supervised ${SERVICE}"
 	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
-    eend $retval
+    eend $?
 }
 
 stop() {
-    ebegin "Stopping ${SERVICE}"
+    ebegin "Stopping supervised ${SERVICE}"
    	if [ -e ${SVCDIR}/control/${SERVICE} ]
 	then
 		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
diff --git a/sys-apps/gluelog/files/svc-syslog b/sys-apps/gluelog/files/svc-syslog
index b3f3791c8b02..3329fcbdfdc7 100755
--- a/sys-apps/gluelog/files/svc-syslog
+++ b/sys-apps/gluelog/files/svc-syslog
@@ -3,17 +3,17 @@
 
 . /etc/rc.d/config/functions
 
-SERVICE=svc-syslog
+SERVICE=syslog
 opts="start stop"
 
 start() {
-    ebegin "Starting ${SERVICE}"
+    ebegin "Starting supervised ${SERVICE}"
 	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
-    eend $retval
+    eend $?
 }
 
 stop() {
-    ebegin "Stopping ${SERVICE}"
+    ebegin "Stopping supervised ${SERVICE}"
    	if [ -e ${SVCDIR}/control/${SERVICE} ]
 	then
 		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
diff --git a/sys-apps/gluelog/gluelog-1.0-r2.ebuild b/sys-apps/gluelog/gluelog-1.0-r2.ebuild
index 44e29dc3cc58..920c4b518938 100644
--- a/sys-apps/gluelog/gluelog-1.0-r2.ebuild
+++ b/sys-apps/gluelog/gluelog-1.0-r2.ebuild
@@ -1,27 +1,30 @@
-# 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-apps/gluelog/gluelog-1.0-r2.ebuild,v 1.1 2001/02/07 15:51:27 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Pipe and socket fittings for the system and kernel logs"
+HOMEPAGE="http://www.linuxuser.co.za/projects.php3"
 SRC_URI=""
 
-DEPEND="virtual/glibc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
-src_compile() {
+DEPEND="virtual/libc"
 
-	mkdir ${S}
+S=${WORKDIR}
 
-	cd ${FILESDIR}
-	try gcc ${CFLAGS} gluelog.c -o ${S}/gluelog
-	try gcc ${CFLAGS} glueklog.c -o ${S}/glueklog
+src_unpack() {
+	cp ${FILESDIR}/{gluelog,glueklog}.c . || die
 }
 
-src_install() {
+src_compile() {
+	emake gluelog glueklog || die
+}
 
-	dodir /usr/sbin
-	dosbin ${S}/gluelog ${S}/glueklog
+src_install() {
+	dosbin gluelog glueklog || die
 	exeopts -m0750 -g wheel
 	dodir /var/log
 	local x
@@ -34,7 +37,5 @@ src_install() {
 		doexe ${FILESDIR}/svc-${x}
 	done
 
-        dodoc ${FILESDIR}/README
-
+	dodoc ${FILESDIR}/README
 }
-
diff --git a/sys-apps/gluelog/metadata.xml b/sys-apps/gluelog/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/gluelog/metadata.xml
+++ b/sys-apps/gluelog/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-apps/gnumaniak/ChangeLog b/sys-apps/gnumaniak/ChangeLog
index fe4b5932c188..d82d3166e11a 100644
--- a/sys-apps/gnumaniak/ChangeLog
+++ b/sys-apps/gnumaniak/ChangeLog
@@ -1,7 +1,22 @@
 # ChangeLog for sys-apps/gnumaniak
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnumaniak/ChangeLog,v 1.1 2002/11/07 07:53:00 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnumaniak/ChangeLog,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnumaniak-1.8.ebuild:
+  Masked gnumaniak-1.8.ebuild stable for ppc
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnumaniak-1.8.ebuild:
+  sync IUSE (missing)
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gnumaniak-1.8.ebuild:
+  Stable on alpha.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *gnumaniak-1.8 (06 Nov 2002)
 
   06 Nov 2002; Seemant Kulleen <seemant@gentoo.org> gnumaniak-1.8.ebuild
diff --git a/sys-apps/gnumaniak/Manifest b/sys-apps/gnumaniak/Manifest
index e69de29bb2d1..89bce045db9e 100644
--- a/sys-apps/gnumaniak/Manifest
+++ b/sys-apps/gnumaniak/Manifest
@@ -0,0 +1,4 @@
+MD5 be50e8cd4c847babf704c654c4f8db02 ChangeLog 1005
+MD5 327596bd5ceccd5208d7e3fc6fb37049 gnumaniak-1.8.ebuild 628
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8f2139a4fb8b6c25657cb48bb9b2098a files/digest-gnumaniak-1.8 65
diff --git a/sys-apps/gnumaniak/gnumaniak-1.8.ebuild b/sys-apps/gnumaniak/gnumaniak-1.8.ebuild
index ed1d0569ab80..73fb4e09499d 100644
--- a/sys-apps/gnumaniak/gnumaniak-1.8.ebuild
+++ b/sys-apps/gnumaniak/gnumaniak-1.8.ebuild
@@ -1,16 +1,16 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnumaniak/gnumaniak-1.8.ebuild,v 1.1 2002/11/07 07:53:00 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnumaniak/gnumaniak-1.8.ebuild,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
 MY_PN=${PN/-/}
-S=${WORKDIR}/${P}
 DESCRIPTION="Up to date man pages for various GNU utils section 1"
 SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
 HOMEPAGE="http://www.linalco.com/ragnar/"
 
 SLOT="0"
 LICENSE="LDP"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+KEYWORDS="x86 amd64 ppc ~sparc alpha"
+IUSE=""
 
 RDEPEND="sys-apps/man"
 
diff --git a/sys-apps/gnumaniak/metadata.xml b/sys-apps/gnumaniak/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/gnumaniak/metadata.xml
+++ b/sys-apps/gnumaniak/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-apps/gradm/ChangeLog b/sys-apps/gradm/ChangeLog
index 7dab3d08c6de..9cf09efaceb1 100644
--- a/sys-apps/gradm/ChangeLog
+++ b/sys-apps/gradm/ChangeLog
@@ -1,9 +1,278 @@
-# ChangeLog for media-gfx/scrot
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.1 2002/05/01 17:39:37 prez Exp $
+# ChangeLog for sys-apps/gradm
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/ChangeLog,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
-*gradm-1.2.1 (1 May 2002)
+  14 Nov 2005; John Mylchreest <johnm@gentoo.org>
+  +files/2.1.7.200511041858-non-lazy-bindings.patch,
+  +gradm-2.1.7.200511041858.ebuild:
+  Adding gradm, suitable for hardened-sources-2.6.13+
 
-  1 May 2002; Preston A. Elder <prez@gentoo.org> ChangeLog :
-  
-  Initial ebuild... Enjoy..
+  17 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +files/2.1.6.200506131347-non-lazy-bindings.patch,
+  gradm-2.1.5.200504081812.ebuild, gradm-2.1.6.200506131347.ebuild:
+  Changed the chpax dependency to a || dependency with paxctl. Modified to
+  use non-lazy bindings for gradm_pam. Added support for the pam USE flag.
+  Pass custom CFLAGS in a nicer way.
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  gradm-2.1.6.200506131347.ebuild:
+  Mark 2.1.6.200506131347 stable on alpha
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  gradm-2.1.6.200506131347.ebuild:
+  stable on ia64
+
+*gradm-2.1.7.200511041858 (14 Nov 2005)
+
+  14 Nov 2005; John Mylchreest <johnm@gentoo.org>
+  +gradm-2.1.7.200511041858.ebuild:
+  Adding gradm, suitable for hardened-sources-2.6.13+
+
+  01 Jul 2005; <solar.@gentoo.org> gradm-2.1.6.200506131347.ebuild:
+  - stable on x86, ppc
+
+*gradm-2.1.6.200506131347 (20 Jun 2005)
+
+  20 Jun 2005; <solar@gentoo.org> -files/gradm2-cvs-20Jun2004.diff,
+  -files/gradm_parse.c-1.9.x.patch, +gradm-2.1.6.200506131347.ebuild:
+  - version bump for 2.1.6 series
+
+  16 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/digest-gradm-2.1.0, -files/digest-gradm-2.1.3.200503070918,
+  -files/digest-gradm-2.1.4.200503221017:
+  strict FEATURES mean that the extra digest files cause breakage. Repoman fix
+  fixes that.
+
+  15 May 2005; <solar@gentoo.org> -files/gradm-2.0.1-install.patch,
+  -gradm-2.1.0.ebuild, -gradm-2.1.3.200503070918.ebuild,
+  -gradm-2.1.4.200503221017.ebuild, gradm-2.1.5.200504081812.ebuild:
+  - stable x86 - use toolchain-funcs vs gcc eclass - cleaned out older versions
+
+  10 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  gradm-2.1.3.200503070918.ebuild:
+  2.1.3.200503070918 keyworded ~alpha
+
+*gradm-2.1.5.200504081812 (12 Apr 2005)
+
+  12 Apr 2005; <solar@gentoo.org> +gradm-2.1.5.200504081812.ebuild:
+  - version bump
+
+*gradm-2.1.4.200503221017 (24 Mar 2005)
+
+  24 Mar 2005; <solar@gentoo.org> +gradm-2.1.4.200503221017.ebuild:
+  - minor version bump
+
+  14 Mar 2005; <solar@gentoo.org> gradm-2.1.3.200503070918.ebuild:
+  - unstable ppc64
+
+  12 Mar 2005; Jason Wever <weeve@gentoo.org>
+  gradm-2.1.3.200503070918.ebuild:
+  Marked back to ~sparc as it doesn't work for sparc64 period and untested on
+  sparc32.
+
+  11 Mar 2005; <solar@gentoo.org> gradm-2.1.3.200503070918.ebuild:
+  - marking 2.1.3 stable for all supporting arches
+
+*gradm-2.1.3.200503070918 (07 Mar 2005)
+
+  07 Mar 2005; <solar@gentoo.org> -files/gradm-2.1.2-non-interactive.patch,
+  -gradm-2.1.2.200503041846.ebuild, +gradm-2.1.3.200503070918.ebuild:
+  - ver bump for grsec-2.1.3
+
+*gradm-2.1.2.200503041846 (06 Mar 2005)
+
+  06 Mar 2005; <solar@gentoo.org> +files/gradm-2.1.2-non-interactive.patch,
+  +gradm-2.1.2.200503041846.ebuild:
+  - version bump for 2.1.2 series. Temp p.masked till kernels are updated to
+  this version.
+
+  25 Feb 2005; <solar@gentoo.org> -gradm-1.9.14.ebuild, -gradm-2.0-r1.ebuild,
+  -gradm-2.0.1-r1.ebuild, -gradm-2.0.1.ebuild, -gradm-2.0.2.ebuild,
+  -gradm-2.0.ebuild, gradm-2.1.0.ebuild:
+  - removed older ebuilds. If somebody needs them they can get them from the
+  viewcvs Attic. Updated /dev/grsec to use ROOT for device nod creation. Thanks
+  carlo for pointing this out.
+
+  25 Jan 2005; Jason Wever <weeve@gentoo.org> gradm-2.1.0.ebuild:
+  Marking back to ~sparc as, to my knowledge, the sparc team didn't change
+  this nor were we consulted.
+
+  11 Jan 2005; <solar@gentoo.org> gradm-2.1.0.ebuild:
+  - marking gradm stable
+
+*gradm-2.1.0 (08 Jan 2005)
+
+  08 Jan 2005; <solar@gentoo.org> gradm-2.0.2.ebuild, +gradm-2.1.0.ebuild:
+  - bump gradm-2.0.2 stable on x86. Add gradm-2.1.0 to ~arch
+
+*gradm-2.0.2 (30 Nov 2004)
+
+  30 Nov 2004; <solar@gentoo.org> +gradm-2.0.2.ebuild:
+  version bump
+
+  19 Aug 2004; <solar@gentoo.org> gradm-2.0.1-r1.ebuild, gradm-2.0.1.ebuild:
+  change device nods to major 1 minor 12 to match current grsecurity kernels
+
+  11 Aug 2004; <solar@gentoo.org> gradm-2.0.1-r1.ebuild, gradm-2.0.1.ebuild:
+  upstream updated the tarball for 2.0.1 but did change revisions, this is going
+  to cause md5sum failures and patch conflicts so we are going to use the gradm
+  from my distfiles/ and push them out to the mirrors and only pull gradm from
+  the mirrors
+
+*gradm-2.0.1-r1 (11 Aug 2004)
+
+  11 Aug 2004; <solar@gentoo.org> gradm-2.0.1-r1.ebuild,
+  files/gradm-2.0.1-install.patch:
+  install updates. adds patch which fixes install problems bug #59996. Added
+  ewarn about needing to do gradm -P before enabling learning mode bug #60056
+
+  10 Aug 2004; <solar@gentoo.org> gradm-2.0.1.ebuild:
+  marking x86 stable
+
+*gradm-2.0.1 (08 Aug 2004)
+
+  08 Aug 2004; <solar@gentoo.org> gradm-2.0.1.ebuild:
+  version bump for 2.4.27/2.6.7 kernels
+
+*gradm-2.0-r1 (20 Jun 2004)
+
+  20 Jun 2004; <pfeifer@gentoo.org> gradm-2.0-r1.ebuild:
+  Added patch to support changes to hardened-dev-sources-2.6.5-r5.
+
+  08 May 2004; <solar@gentoo.org> gradm-2.0.ebuild:
+  removed unneeded dep of paxctl
+
+  07 May 2004; <solar@gentoo.org> gradm-2.0.ebuild:
+  Marked gradm-2.0.ebuild x86 stable
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gradm-1.9.14.ebuild:
+  Add inherit eutils
+
+*gradm-2.0 (18 Apr 2004)
+
+  18 Apr 2004; <solar@gentoo.org> gradm-1.9.11.ebuild, gradm-1.9.12.ebuild,
+  gradm-1.9.13.ebuild, gradm-2.0.ebuild:
+  grsec1 has been deprecated upstream and thus will no longer be supported by
+  gentoo either. This means it's time to flush your old policies and begin using
+  the really nice gradm2 learning mode offers. Note: also that the gradm2
+  package has also been deprecated and is now simply this one. This gradm-2
+  works for both 2.4.x and 2.6.x kernels. Gentoo init.d/conf.d scripts comming
+  in due time.. User contributions welcome for that.
+
+*gradm-1.9.14 (11 Mar 2004)
+
+  11 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> files/grsecurity,
+  files/grsecurity.rc gradm-1.9.14.ebuild:
+  Version bump, and fix the conf.d and init.d scripts to close bug #42750.
+
+  08 Mar 2004; Jon Portnoy <avenj@gentoo.org> gradm-1.9.13.ebuild:
+  Mark stable on AMD64 to make repoman happy.
+
+  02 Jan 2004; <solar@gentoo.org> gradm-1.9.11.ebuild, gradm-1.9.12.ebuild,
+  gradm-1.9.13.ebuild:
+  Better way to get CC version when no CC= is set ( bug #36988 ). Added ssp
+  filtering for gcc CFLAGS as gradm requires static linking and ssp+static is
+  known to break with some versions of gcc-3.3.{1,2}
+
+*gradm-1.9.13 (01 Dec 2003)
+
+  01 Dec 2003; <solar@gentoo.org> gradm-1.9.13.ebuild:
+  New gradm stable series to go with 2.4.23.1.9.13
+
+  27 Oct 2003; <solar@gentoo.org> gradm-1.9.10.ebuild, gradm-1.9.9h-r1.ebuild,
+  files/gradm_parse.c-1.9.9h.patch:
+  cleaned out some older versions of gradm
+
+*gradm-1.9.12 (26 Sep 2003)
+
+  26 Sep 2003; <solar@gentoo.org> gradm-1.9.11.ebuild, gradm-1.9.12.ebuild:
+  version bump, marking stable on all supported arches other than ~ppc
+
+  05 Jul 2003; <solar@gentoo.org> metadata.xml:
+  Added metadata.xml
+
+*gradm-1.9.11 (24 Jun 2003)
+
+  24 Jun 2003; Guy Martin <gmsoft@gentoo.org> gradm-1.9.11.ebuild :
+  Added hppa to KEYWORDS.
+
+  24 Jun 2003; Ned Ludd <solar@gentoo.org> Manifest, gradm-1.9.11.ebuild:
+  version bump
+
+*gradm-1.9.10 (16 Jun 2003)
+
+  16 Jun 2003; <solar@gentoo.org> Manifest, gradm-1.5a.ebuild,
+  gradm-1.5a.ebuild, gradm-1.6.ebuild, gradm-1.6.ebuild, gradm-1.7b.ebuild,
+  gradm-1.7b.ebuild, gradm-1.9.10.ebuild, files/gradm-1.5a-chpax.c,
+  files/gradm-1.6-chpax.c, files/gradm-1.7b-chpax.c, files/gradm-chpax.c,
+  files/grsecurity, files/grsecurity.rc:
+  version bump, removed old versions of gradm from portage and old chpax stuff
+  in files, started the proccess of unmasking gradm for other arches added ~ppc
+  ~sparc as these are known to work
+
+*gradm-1.9.9h-r1 (16 May 2003)
+
+  16 May 2003; Joshua Brindle <method@gentoo.org> Manifest,
+  gradm-1.9.9h-r1.ebuild, files/grsecurity, files/grsecurity.rc:
+  Uses new method of installing ACL's ala sys-apps/grsecurity-base-policy
+  courtesy of solarx <solar@linbsd.net>
+
+*gradm-1.9.9h (11 May 2003)
+
+  11 May 2003; Joshua Brindle <method@gentoo.org> Manifest,
+  gradm-1.9.9h.ebuild:
+  Security version bump, fixes leak in ASLR
+
+*gradm-1.9.9g (20 Apr 2003)
+
+  28 Apr 2003; Joshua Brindle <method@gentoo.org> files/grsecurity:
+  fixed typo
+
+  20 Apr 2003; Joshua Brindle <method@gentoo.org> gradm-1.9.9f.ebuild,
+  gradm-1.9.9f.ebuild, gradm-1.9.9g.ebuild:
+  version bump
+
+*gradm-1.9.9f (11 Apr 2003)
+
+  11 Apr 2003; Joshua Brindle <method@gentoo.org> gradm-1.9.9f.ebuild,
+  files/gradm-chpax.c:
+  major revision bump, added gentoo specific policies
+
+*gradm-1.7b (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*gradm-1.6 (13 Jan 2003)
+
+  13 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump
+
+*gradm-1.5a (28 Oct 2002)
+
+  28 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + move of chpax.c from SRC_URI to FILESDIR
+
+*gradm-1.5 (21 Sep 2002)
+
+  21 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added CFLAG replacement and the example acl file as a doc
+
+*gradm-1.4 (12 Aug 2002)
+
+  17 Oct 2002; Maik Schreiber <blizzy@gentoo.org> gradm-1.4.ebuild:
+  Changed KEYWORDS to phase out of package.mask.
+
+  12 Aug 2002; Maik Schreiber <blizzy@gentoo.org> :
+  new version
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org> :
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> gradm-1.2.1.ebuild:
+  Added KEYWORDS, SLOT.
+
+*gradm-1.2.1 (01 May 2002)
+
+  1 May 2002; Preston A. Elder <prez@gentoo.org> :
+  Initial ebuild.
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 31a615b26738..26f74921af11 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -1,15 +1,22 @@
-MD5 532b41e0dd644dc74f01604807ab6791 gradm-1.5a.ebuild 1059
-MD5 a06e3696bec1c4f6a6d0096dcc05f3cd gradm-1.9.9g.ebuild 1155
-MD5 871b5ca360b8ec8b550519d149376bff ChangeLog 1486
-MD5 a83bd475e9c57d2ee01a6ea8503f3a5a gradm-1.6.ebuild 984
-MD5 2e720d74ab505928c734da3a006579c9 gradm-1.7b.ebuild 983
-MD5 4a018241746366477b1511f3eef5e78e files/grsecurity.rc 1646
-MD5 19f513de16672643532b502ab8c12d46 files/gradm-1.6-chpax.c 7256
-MD5 b8590c75dd3f70a7c45ee7faf7c01f2d files/grsecurity 1481
-MD5 539c2919ef1df87046cf88f9a1674ac0 files/digest-gradm-1.5a 511
-MD5 243a1d9e93c14279bee890ad71d6dd5f files/digest-gradm-1.7b 61
-MD5 fd77d6f0b1ede0d13fd1e802fef41542 files/gradm-1.5a-chpax.c 5769
-MD5 d71d9da7a36e1e0e28a76f2bb5288e3b files/digest-gradm-1.6 60
-MD5 19f513de16672643532b502ab8c12d46 files/gradm-1.7b-chpax.c 7256
-MD5 19f513de16672643532b502ab8c12d46 files/gradm-chpax.c 7256
-MD5 78648cf2cdf8cd32d270c069fbb27f01 files/digest-gradm-1.9.9g 515
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 620d6198c6b652c7368cd143e02900ca ChangeLog 9831
+MD5 0433ac1be1a1e05d61281b7a1ebe377b files/2.1.6.200506131347-non-lazy-bindings.patch 546
+MD5 0433ac1be1a1e05d61281b7a1ebe377b files/2.1.7.200511041858-non-lazy-bindings.patch 546
+MD5 4f610b1a69bb13a22080460f47de34a1 files/digest-gradm-2.1.5.200504081812 75
+MD5 071dc45d1922b65c304d4d8635470c0e files/digest-gradm-2.1.6.200506131347 75
+MD5 85c6a6df28491978d2a0c0c078b0b76b files/digest-gradm-2.1.7.200511041858 75
+MD5 36344ecbd7f54bdd4979c2fe6322c9c7 files/grsecurity 2325
+MD5 f2401396b01c577f727c2da3b694c779 files/grsecurity.rc 1810
+MD5 b98247eb3f77f4eda11cd38125fa734e gradm-2.1.5.200504081812.ebuild 1317
+MD5 d53ba3368011aec360b848c3f09e128b gradm-2.1.6.200506131347.ebuild 1496
+MD5 df07c55c3b470b3a67ac22746f3a82ab gradm-2.1.7.200511041858.ebuild 1497
+MD5 695a3bd3cfb34ea27e7dd493ce9ef398 metadata.xml 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDePRIz7mlh8wQzGMRAuNCAJ9gJuJR/Shv3kqo5aVetrPlTr8DXACfcWbH
+5Tpz0BxCKDBAxQMM5G5IqmI=
+=zE7P
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gradm/files/grsecurity b/sys-apps/gradm/files/grsecurity
index 59e746042c6e..e746201aced4 100644
--- a/sys-apps/gradm/files/grsecurity
+++ b/sys-apps/gradm/files/grsecurity
@@ -1,24 +1,18 @@
 # GR Security toggles.
 #
+# Note: chpax support has been removed from this init script.
+# Configure /etc/conf.d/chpax instead
 
-# Files that we should remove PAGE_EXEC enforcement from
-PAGE_EXEC_EXEMPT="/usr/X11R6/bin/XFree86"
-
-# Files we should turn off trampoline emmulation for
-TRAMPOLINE_EXEMPT=""
-
-# Files we should not restrict mprotect on
-MPROTECT_EXEMPT=""
-
-# Files we should not randomize mmap for
-MMAP_EXEMPT=""
-
-# Kernel options are:
+# Check your running kernel for valid options.
+# "sysctl -a | grep kernel.grsecurity. | cut -d '.' -f 3  | awk '{print $1}'"
+# 
+# Some of the kernel options may be:
 #
 # allow_ptrace_group
 # alt_ipc_perms
 # altered_pings
 # audit_chdir
+# audit_gid
 # audit_group
 # audit_ipc
 # audit_mount
@@ -27,24 +21,33 @@ MMAP_EXEMPT=""
 # chroot_deny_chdir
 # chroot_deny_chmod
 # chroot_deny_chroot
+# chroot_deny_fchdir
 # chroot_deny_mknod
 # chroot_deny_mount
+# chroot_deny_pivot
 # chroot_deny_ptrace
+# chroot_deny_shmat
+# chroot_deny_sysctl
+# chroot_deny_unix
+# chroot_enforce_chdir
 # chroot_execlog
+# chroot_findtask
 # chroot_restrict_nice
 # chroot_restrict_sigs
 # coredump
 # deny_phys_root
-# deny_serial_root
 # deny_pseudo_root
+# deny_serial_root
 # dmesg
 # exec_logging
 # execve_limiting
 # fifo_restrictions
 # fork_bomb_prot
 # forkfail_logging
+# grsec_lock
 # linking_restrictions
 # rand_ip_ids
+# rand_isns
 # rand_pids
 # rand_rpc
 # rand_tcp_src_ports
@@ -62,8 +65,23 @@ MMAP_EXEMPT=""
 # tpe
 # tpe_glibc
 # tpe_restrict_all
+
+# Strict set with negligible performance impact:
+#ENABLED="audit_chdir audit_group audit_ipc audit_mount chroot_caps \
+#         chroot_deny_chmod chroot_deny_chroot chroot_deny_fchdir \
+#         chroot_deny_mknod chroot_deny_mount chroot_deny_pivot \
+#         chroot_deny_shmat chroot_deny_sysctl chroot_deny_unix \
+#         chroot_enforce_chdir chroot_execlog chroot_findtask \
+#         chroot_restrict_nice dmesg exec_logging execve_limiting \
+#         fifo_restrictions forkfail_logging linking_restrictions rand_isns \
+#         rand_ip_ids rand_pids rand_rpc rand_tcp_src_ports signal_logging \
+#         socket_all socket_client socket_server timechange_logging tpe"
+
 ENABLED=""
 
+# Set when audit_group is enabled
+audit_gid=1007
+
 # Set when allow_ptrace_group is enabled
 ptrace_gid=10
 
@@ -77,7 +95,7 @@ fork_bomb_max=20
 
 # Set when one of socket_* is enabled
 socket_all_gid=1004
-socket_cilent_gid=1003
+socket_client_gid=1003
 socket_server_gid=1002
 
 # Lock the above settings on boot
diff --git a/sys-apps/gradm/files/grsecurity.rc b/sys-apps/gradm/files/grsecurity.rc
index 25a93545382c..1125e0fadb91 100644
--- a/sys-apps/gradm/files/grsecurity.rc
+++ b/sys-apps/gradm/files/grsecurity.rc
@@ -1,14 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6,v 1.7 2002/01/20 10:00:55 azarah Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/files/grsecurity.rc,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
+
+# Note: chpax support has been removed from this init script.
+# Configure /etc/conf.d/chpax and add chpax to your default runlevel instead
 
-#NB: Config is in /etc/conf.d/gpm
 
 PROCDIR=/proc/sys/kernel/grsecurity
 
 depend() {
 	need bootmisc localmount
+	after chpax
 }
 
 checkconfig() {
@@ -23,50 +26,47 @@ start() {
 
 	ebegin "Starting grsecurity"
 
-	for x in ${ENABLED} ; do
-		if [ -f ${PROCDIR}/${x} ]; then
-			echo 1 >${PROCDIR}/${x}
-		fi
+	for x in ${ENABLED}; do
+		# [ -f ${PROCDIR}/${x} ] && continue
+		# einfo "\tEnabling kernel.grsecurity.${x}"
 		case "${x}" in
+		audit_group)
+			echo ${audit_gid} > ${PROCDIR}/audit_gid
+			echo 1 > ${PROCDIR}/${x}
+			;;
+		tpe)
+			echo ${tpe_gid} > ${PROCDIR}/tpe_gid
+			echo 1 > ${PROCDIR}/${x}
+			;;
 		allow_ptrace_group)
-			echo ${ptrace_gid} >${PROCDIR}/ptrace_gid
+			echo ${ptrace_gid} > ${PROCDIR}/ptrace_gid
+			echo 1 > ${PROCDIR}/${x}
 			;;
 		fork_bomb_prot)
 			echo ${fork_bomb_gid} >${PROCDIR}/fork_bomb_gid
 			echo ${fork_bomb_sec} >${PROCDIR}/fork_bomb_sec
 			echo ${fork_bomb_max} >${PROCDIR}/fork_bomb_max
+			echo 1 > ${PROCDIR}/${x}
 			;;
 		socket_all)
 			echo ${socket_all_gid} >${PROCDIR}/socket_all_gid
+			echo 1 > ${PROCDIR}/${x}
 			;;
 		socket_client)
 			echo ${socket_client_gid} >${PROCDIR}/socket_client_gid
+			echo 1 > ${PROCDIR}/${x}
 			;;
 		socket_server)
 			echo ${socket_server_gid} >${PROCDIR}/socket_server_gid
+			echo 1 > ${PROCDIR}/${x}
+			;;
+		*)
+			[ -f ${PROCDIR}/${x} ] && echo 1 >${PROCDIR}/${x}
 			;;
 		esac
 	done
 
-	for x in ${PAGE_EXEC_EXEMPT} ; do
-		/sbin/chpax -p ${x}
-	done
-
-	for x in ${TRAMPOLINE_EXEMPT} ; do
-		/sbin/chpax -e ${x}
-	done
-
-	for x in ${MPROTECT_EXEMPT} ; do
-		/sbin/chpax -m ${x}
-	done
-
-	for x in ${MMAP_EXEMPT} ; do
-		/sbin/chpax -r ${x}
-	done
-
-	if [ -d ${PROCDIR}/grsec_lock ] ; then
-		echo ${LOCK} >${PROCDIR}/grsec_lock
-	fi
+	[ -f ${PROCDIR}/grsec_lock ] && echo ${LOCK} >${PROCDIR}/grsec_lock
 
 	eend ${?}
 }
diff --git a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
index 9bafcbae4ec4..011cd7d56c68 100644
--- a/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
+++ b/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild,v 1.1 2005/04/12 17:56:11 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.5.200504081812.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
-inherit flag-o-matic gcc eutils
+inherit flag-o-matic toolchain-funcs versionator
 
-myPV=${PV:0:5}-${PV:6}
+myPV="$(replace_version_separator 3 -)"
 
-MAINTAINER="solar@gentoo.org"
 DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
 HOMEPAGE="http://www.grsecurity.net/"
 SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
@@ -14,45 +13,33 @@ SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
 #RESTRICT=primaryuri
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64 ~ppc64 ~ia64 ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~arm ~amd64 ~ppc64 ~ia64 ~mips ~alpha"
 IUSE=""
 RDEPEND=""
 DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
-	sys-apps/chpax"
+	|| (
+		sys-apps/paxctl
+		sys-apps/chpax
+	)"
 
 S="${WORKDIR}/${PN}2"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#epatch ${FILESDIR}/gradm-2.1.2-non-interactive.patch
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
-}
-
 src_compile() {
-	cd ${S}
-	emake CC="$(gcc-getCC)" || die "compile problem"
-	return 0
+	emake OPT_FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "compile problem"
 }
 
 src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
+	einstall DESTDIR="${D}" || die "einstall failed"
 	fperms 711 /sbin/gradm
-	return 0
 }
 
 pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
+	if [ ! -e "${ROOT}"/dev/grsec ] ; then
 		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 ${ROOT}/dev/
-		mknod -m 0622 ${ROOT}/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
+		mkdir -p -m 755 "${ROOT}"/dev/
+		mknod -m 0622 "${ROOT}"/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
 	fi
 	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
 }
diff --git a/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild b/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild
index a59a81fccca9..744cbf44b24d 100644
--- a/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild
+++ b/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild,v 1.1 2005/06/20 15:23:49 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.6.200506131347.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs eutils versionator
 
-myPV=${PV:0:5}-${PV:6}
+myPV="$(replace_version_separator 3 -)"
 
-MAINTAINER="solar@gentoo.org"
 DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
 HOMEPAGE="http://www.grsecurity.net/"
 SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
@@ -14,45 +13,44 @@ SRC_URI="http://www.grsecurity.net/gradm-${myPV}.tar.gz"
 #RESTRICT=primaryuri
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64 ~ppc64 ~ia64 ~mips ~alpha"
-IUSE=""
+KEYWORDS="alpha ~amd64 ~arm ia64 ~mips ppc ~ppc64 ~sparc x86"
+IUSE="pam"
 RDEPEND=""
 DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
-	sys-apps/chpax"
+	pam? ( virtual/pam )
+	|| (
+		sys-apps/paxctl
+		sys-apps/chpax
+	)"
 
 S="${WORKDIR}/${PN}2"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	#epatch ${FILESDIR}/gradm-2.1.2-non-interactive.patch
-
-	ebegin "Patching Makefile to use gentoo CFLAGS"
-	sed -i -e "s|-O2|${CFLAGS}|" Makefile
-	eend $?
+	epatch "${FILESDIR}"/${PV}-non-lazy-bindings.patch
 }
 
 src_compile() {
-	cd ${S}
-	emake CC="$(tc-getCC)" || die "compile problem"
-	return 0
+	local target=""
+	use pam || target="nopam"
+
+	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}" || die "compile problem"
 }
 
 src_install() {
-	cd ${S}
-	einstall DESTDIR=${D}
+	einstall DESTDIR="${D}" || die "einstall failed"
 	fperms 711 /sbin/gradm
-	return 0
 }
 
 pkg_postinst() {
-	if [ ! -e ${ROOT}/dev/grsec ] ; then
+	if [ ! -e "${ROOT}"/dev/grsec ] ; then
 		einfo "Making character device for grsec2 learning mode"
-		mkdir -p -m 755 ${ROOT}/dev/
-		mknod -m 0622 ${ROOT}/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
+		mkdir -p -m 755 "${ROOT}"/dev/
+		mknod -m 0622 "${ROOT}"/dev/grsec c 1 12 || die "Cant mknod for grsec learning device"
 	fi
 	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode"
 }
diff --git a/sys-apps/gradm/gradm-2.1.7.200511041858.ebuild b/sys-apps/gradm/gradm-2.1.7.200511041858.ebuild
index 7f8ce91b407c..b154e511f522 100644
--- a/sys-apps/gradm/gradm-2.1.7.200511041858.ebuild
+++ b/sys-apps/gradm/gradm-2.1.7.200511041858.ebuild
@@ -1,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-apps/gradm/gradm-2.1.7.200511041858.ebuild,v 1.1 2005/11/14 20:32:30 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.1.7.200511041858.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils versionator
 
diff --git a/sys-apps/gradm/metadata.xml b/sys-apps/gradm/metadata.xml
index 125f41b8096c..ae95b38fe32f 100644
--- a/sys-apps/gradm/metadata.xml
+++ b/sys-apps/gradm/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>solar@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>gradm is the userspace ACL parsing and authentication program for the grsecurity Access Control List System. grsecurity aims to be a complete security system for Linux 2.4. gradm performs several tasks for the ACL system including authenticated via a password to the kernel and parsing ACLs to be passed to the kernel.</longdescription>
+<herd>hardened</herd>
+<maintainer>
+ <email>solar@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 64bc59988a6c..483ba72ea2d0 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,13 +1,220 @@
 # ChangeLog for sys-apps/grep
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r8.ebuild:
+  Mark 2.5.1-r8 stable on alpha
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> grep-2.5.1-r8.ebuild:
+  Stable on mips.
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> grep-2.5.1-r8.ebuild:
+  Stable on ppc64
+
+  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> grep-2.5.1-r8.ebuild:
+  Stable on ppc.
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> grep-2.5.1-r8.ebuild:
+  Stable on sparc
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/grep-2.5.1-libintl.patch, grep-2.5.1-r8.ebuild:
+  Add a patch by Diego Pettenò to fix BSD support #92586.
+
+*grep-2.5.1-r8 (12 Jun 2005)
+
+  12 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/grep-2.5.1-perl-segv.patch, files/grep-2.5.1-restrict_arr.patch,
+  +grep-2.5.1-r8.ebuild:
+  Fix segfault with perl regex usage #95495 by emanuele.giaquinta@gmail.com
+  and update the restrict_arr to be portable #92586.
+
+  29 May 2005; <solar@gentoo.org> grep-2.5.1-r6.ebuild, grep-2.5.1-r7.ebuild:
+  - update sys-apps/grep to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
+
+  22 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  grep-2.5.1-r6.ebuild, grep-2.5.1-r7.ebuild:
+  Set correct path for libpcre.a
+
+  19 Feb 2005; <solar@gentoo.org> grep-2.5.1-r7.ebuild:
+  - bug 76879 broke maketest on uClibc hosts. for now make the patching
+  conditional
+
+  17 Feb 2005; Kito <kito@gentoo.org> grep-2.5.1-r6.ebuild:
+  ~ppc-macos keyword
+
+  07 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/2.5.1-tests.patch:
+  Update tests so that grep+glibc dont get stuck in an infinite loop #76879 by
+  Patrick Lauer.
+
+*grep-2.5.1-r7 (06 Jan 2005)
+
+  06 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.5.1-tests.patch, +files/2.5.1-utf8-case.patch,
+  +grep-2.5.1-r7.ebuild:
+  Fix UTF8 case matching with a patch from Debian #76192 by Michael Mauch.
+  Also update one of the tests to fix #63507 by Daniel Black.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> grep-2.5.1-r6.ebuild:
+  Stable on alpha.
+
+  26 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> grep-2.5.1-r6.ebuild:
+  Marked stable on amd64.
+
+  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> grep-2.5.1-r6.ebuild:
+  Marked stable on mips.
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> grep-2.5.1-r6.ebuild:
+  Stable on sparc
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> grep-2.5.1-r1.ebuild,
+  grep-2.5.1-r4.ebuild, grep-2.5.1-r5.ebuild, grep-2.5.1-r6.ebuild:
+  Removed http://ftp.club.cc.cmu.edu/pub/gnu from SRC_URI as it's already used
+  with mirror://gnu
+
+*grep-2.5.1-r6 (20 Aug 2004)
+
+  20 Aug 2004; Tavis Ormandy <taviso@gentoo.org>
+  +files/2.5.1-manpage-line-buffering.diff, +grep-2.5.1-r6.ebuild:
+  fix manpage reference to --line-buffering
+
+*grep-2.5.1-r5 (19 Aug 2004)
+
+  19 Aug 2004; Heinrich Wendel <lanius@gentoo.org> grep-2.5.1-r5.ebuild,
+  files/grep-2.5.1-fgrep.patch.bz2, files/grep-2.5.1-gofast.patch.bz2,
+  files/grep-2.5.1-i18n.patch.bz2, files/grep-2.5.1-oi.patch.bz2:
+  better performance on utf8 systems
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r4.ebuild:
+  Move uclibc stuff forward from -r1. It appears solar only put it in -r1 for
+  some reason. Mark -r4 stable on alpha and ia64
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r1.ebuild:
+  sync IUSE (+static)
+
+  15 Jun 2004; <solar@gentoo.org> grep-2.5.1-r1.ebuild,
+  files/grep-2.5.1-restrict_arr.patch:
+  added uclibc support
+
+*grep-2.5.1-r4 (11 Jun 2004)
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r3.ebuild,
+  grep-2.5.1-r4.ebuild:
+  agriffis reminded me of the pcre use flag which is much more accurate.
+  Also, link only libpcre statically which should be much nicer for anyone
+  who wants to use pcre.
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r2.ebuild:
+  clean older ebuild
+
+*grep-2.5.1-r3 (11 Jun 2004)
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r3.ebuild:
+  rev bump to get use perl fix
+
+  11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r2.ebuild:
+  compile statically if use perl to address bug #53627
+
+*grep-2.5.1-r2 (10 Jun 2004)
+
+  10 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r2.ebuild:
+  Add support for the -P (perl regex) option (bug #51215) For bootstrap,
+  using -perl should work fine.  For people with /bin and /usr on different
+  partitions USE="static" works fine. (see bug #1638 for discussion)
+  Fixed the formatting for the -P option in the man page.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r1.ebuild:
+  Add inherit eutils
+
+  08 Mar 2004; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r1.ebuild:
+  Use symlinks for egrep and fgrep.. faster, smaller, cleaner, more elegant
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> grep-2.5.1-r1.ebuild:
+  adding initial s390 support
+
+  01 Nov 2003; Seemant Kulleen <seemant@gentoo.org> grep-2.5.1-r1.ebuild:
+  SRC_URI fix to fetch from the one gnu mirror known to have this tarball,
+  falling back to our mirrors, then the gnu mirrors. Closes bug #32519 by Stony
+  Yakovac <stonyy@tek.com>
+
+*grep-2.5.1-r1 (27 Feb 2003)
+
+  21 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add static support #29188.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r1.ebuild:
+  Mark stable on alpha
+
+  06 Jul 2003; Guy Marin <gmsoft@gentoo.org> grep-2.5.1-r1.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> grep-2.5.1-r1.ebuild:
+  Changed ~sparc & ~mips to sparc & mips in KEYWORDS
+
+  20 May 2003; Joshua Kinard <kumba@gentoo.org> grep-2.5.1-r1.ebuild:
+  Added gnuconfig eclass support to properly detect linux-mips systems
+
+  27 Feb 2003; Aron Griffis <agriffis@gentoo.org> grep-2.5.1-r1.ebuild:
+  Close bug #16495 by installing in /bin instead of /usr/bin.  I introduced
+  this error in the 2.5.1 ebuild.  Thanks to Tristan Henderson who noticed it.
+
+*grep-2.5.1 (27 Feb 2003)
+
+  24 Apr 2003; Jason Wever <weeve@gentoo.org> grep-2.5-r1.ebuild,
+  grep-2.5.1-r1.ebuild, grep-2.5.1.ebuild:
+  Added a patch for sparc32 to fix bug #17568. Thanks to Peter Gnodde
+  <peter@gnodde.org> for reporting the problem and solution.
+
+  27 Feb 2003; Aron Griffis <agriffis@gentoo.org> grep-2.5.1.ebuild:
+  Update to 2.5.1, thanks to Michael Sterrett for the heads-up
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> grep-2.5-r1.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> grep-2.5-r1.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*grep-2.4.2-r4.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> grep-2.4.2-r4.ebuild :
+  Added KEYWORDS, SLOT.
+
+*grep-2.5-r1 (12 Apr 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> grep-2.5.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> grep-2.5-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
+  12 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  grep-2.5-r1.ebuild, files/digest-grep-2.5-r1 :
+
+  Fixes bug #1638 by adding --disable-perl-regexp.
+
+*grep-2.5 (21 March 2002)
 
 *grep-2.4.2-r5 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> grep-2.4.2-r5.ebuild :
+  Added KEYWORDS, SLOT.
+
   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
+  updated in any way. This changelog is targeted 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-apps/grep/Manifest b/sys-apps/grep/Manifest
index 173bea996818..64742cd849b4 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,10 +1,29 @@
-MD5 ea39e3eab92f7e3c8cf96e5631d125f6 ChangeLog 2436
-MD5 f6df40fc2568be5b747ae832275b4d9f grep-2.4.2-r5.ebuild 1034
-MD5 180aadbeef0751d77650d04ad58ae62e grep-2.5-r1.ebuild 1332
-MD5 b3ec10e6a9829881688d2a6f14ae1c02 grep-2.5.1-r1.ebuild 1321
-MD5 852254708eaed5d341cd75c5a2accad3 grep-2.5.1.ebuild 1193
-MD5 15500f2e41c3c6340d02b44aac89f242 files/digest-grep-2.4.2-r5 62
-MD5 b6e0b8084f7c5fb0d9fe5d0a5f037417 files/digest-grep-2.5-r1 60
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1 62
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r1 62
-MD5 9b382fe04d2e5d86aea020215ceca879 files/gentoo-sparc32-dfa.patch 383
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8741c3260750de0038a525533c968ee1 ChangeLog 8171
+MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
+MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
+MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
+MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r6 62
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r7 62
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r8 62
+MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678
+MD5 294f8a32ae3036ebbf393610a286d80e files/grep-2.5.1-gofast.patch.bz2 4389
+MD5 f2f8cec983dc49b399880ab8eae882cb files/grep-2.5.1-i18n.patch.bz2 2903
+MD5 af3a45582aa7c857f0500c63c823bd52 files/grep-2.5.1-libintl.patch 2662
+MD5 575345b799197d6c79fe93c757664262 files/grep-2.5.1-oi.patch.bz2 831
+MD5 b6da5288895ddd97074deb10f48b4364 files/grep-2.5.1-perl-segv.patch 410
+MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
+MD5 97b1eaf5feac1593d7085913ce9b5deb grep-2.5.1-r6.ebuild 2240
+MD5 5c1510e20a43c023fa1329fb8ef59efc grep-2.5.1-r7.ebuild 1990
+MD5 9a1871636c1f45f002422424d566cab0 grep-2.5.1-r8.ebuild 2091
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK3mTI1lqEGTUzyQRAsl8AJsGEouqxLQIzA9JmtIR2RtGXJkARwCeIPqT
+E1rYSuWsr6eBPMRlH9bycjY=
+=vGnV
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/files/2.5.1-tests.patch b/sys-apps/grep/files/2.5.1-tests.patch
index c0f98945eaaa..5d29d5924297 100644
--- a/sys-apps/grep/files/2.5.1-tests.patch
+++ b/sys-apps/grep/files/2.5.1-tests.patch
@@ -6,8 +6,40 @@ the glibc regex since that is what we're using ;).
 http://bugs.gentoo.org/show_bug.cgi?id=76192
 http://linuxfromscratch.org/pipermail/lfs-dev/2003-February/032543.html
 
---- tests/spencer1.tests.orig	2005-01-06 00:17:34.550645568 -0500
-+++ tests/spencer1.tests	2005-01-06 00:18:43.682135984 -0500
-@@ -55 +55 @@
+
+glibc has a sweet bug where it can go to town (and never come back) 
+with some complicated regex's.  this has been fixed in glibc cvs, 
+but our latest releases don't have the patch.  so let's add a simple 
+workaround from upstream grep cvs.
+
+http://bugs.gentoo.org/show_bug.cgi?id=76879
+
+Index: tests/spencer1.tests
+===================================================================
+RCS file: /cvsroot/grep/grep/tests/spencer1.tests,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- tests/spencer1.tests	3 Nov 1998 21:39:05 -0000	1.1
++++ tests/spencer1.tests	12 Jun 2003 15:26:15 -0000	1.2
+@@ -52,3 +52,3 @@
+ 0@$*@-
 -1@(*)b@-
 +2@(*)b@-
+ 1@$b@b
+Index: tests/backref.sh
+===================================================================
+RCS file: /cvsroot/grep/grep/tests/backref.sh,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- tests/backref.sh	23 Jul 2003 05:15:51 -0000	1.3
++++ tests/backref.sh	19 Nov 2004 14:00:18 -0000	1.4
+@@ -14,5 +14,6 @@
+ 
+ # hit hard with the `Bond' tests
+-echo "civic" | ${GREP} -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1
++# For now, remove the ``?'' in the last parentheses, so that new glibc can do it.  --Stepan
++echo "civic" | ${GREP} -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1
+ if test $? -ne 0 ; then
+         echo "Options: Bond, test \#2 failed"
diff --git a/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch b/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
index aa71bbcb9db0..2294e9c2372a 100644
--- a/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
+++ b/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
@@ -1,12 +1,11 @@
---- lib/posix/regex.h.mps	2004-06-09 22:00:00.000000000 +0200
-+++ lib/posix/regex.h	2004-06-09 22:00:40.000000000 +0200
-@@ -533,7 +533,9 @@ extern int re_exec _RE_ARGS ((const char
+--- lib/posix/regex.h
++++ lib/posix/regex.h
+@@ -533,7 +533,8 @@ extern int re_exec _RE_ARGS ((const char
  /* For now unconditionally define __restrict_arr to expand to nothing.
     Ideally we would have a test for the compiler which allows defining
     it to restrict.  */
-+#ifndef __restrict_arr
++#undef __restrict_arr
  #define __restrict_arr
-+#endif
  
  /* POSIX compatibility.  */
  extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
diff --git a/sys-apps/grep/grep-2.5.1-r6.ebuild b/sys-apps/grep/grep-2.5.1-r6.ebuild
index 0c5eba177908..17846efad9b3 100644
--- a/sys-apps/grep/grep-2.5.1-r6.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r6.ebuild
@@ -1,19 +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/sys-apps/grep/grep-2.5.1-r6.ebuild,v 1.1 2004/08/20 08:36:03 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r6.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
-inherit gnuconfig flag-o-matic eutils
+inherit gnuconfig flag-o-matic eutils multilib
 
 DESCRIPTION="GNU regular expression matcher"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-SRC_URI="http://ftp.club.cc.cmu.edu/pub/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz
-	mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build nls pcre static uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
+IUSE="build nls pcre static"
 
 RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
@@ -25,17 +24,16 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} && cd ${S} || die
 
-	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc" ] ; then
-		epatch "${FILESDIR}/gentoo-sparc32-dfa.patch"
-	fi
+	# Fix a weird sparc32 compiler bug
+	echo "" >> src/dfa.h
 	epatch "${FILESDIR}/${PV}-manpage.patch"
 
 	# man page describes a --line-buffering option, where as
 	# grep recognises --line-buffered.
 	# 	-taviso (20 Aug 2004)
-	epatch ${FILESDIR}/${PV}-manpage-line-buffering.diff
+	epatch ${FILESDIR}/${PV}-manpage-line-buffering.patch
 
-	use uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
+	use elibc_uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
 
 	epatch ${FILESDIR}/${PN}-${PV}-fgrep.patch.bz2
 	epatch ${FILESDIR}/${PN}-${PV}-i18n.patch.bz2
@@ -56,7 +54,7 @@ src_compile() {
 		append-ldflags -static
 	fi
 
-	if use uclibc ; then
+	if use elibc_uclibc ; then
 		myconf="${myconf} --without-included-regex"
 	else
 		myconf="${myconf} $(use_enable pcre perl-regexp)"
@@ -64,8 +62,8 @@ src_compile() {
 
 	econf ${myconf} || die "econf failed"
 
-	if use pcre && ! use uclibc ; then
-		sed -i -e 's:-lpcre:/usr/lib/libpcre.a:g' {lib,src}/Makefile \
+	if use pcre && ! use elibc_uclibc ; then
+		sed -i -e "s:-lpcre:/usr/$(get_libdir)/libpcre.a:g" {lib,src}/Makefile \
 			|| die "sed Makefile failed"
 	fi
 
diff --git a/sys-apps/grep/grep-2.5.1-r7.ebuild b/sys-apps/grep/grep-2.5.1-r7.ebuild
index f5d13a35f63e..94b87bcedb87 100644
--- a/sys-apps/grep/grep-2.5.1-r7.ebuild
+++ b/sys-apps/grep/grep-2.5.1-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/sys-apps/grep/grep-2.5.1-r7.ebuild,v 1.1 2005/01/06 05:36:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r7.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,15 +11,12 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="build nls pcre static uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="build nls pcre static"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
-	pcre? (
-		>=sys-apps/sed-4
-		dev-libs/libpcre
-	)
+	pcre? (	dev-libs/libpcre )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -37,7 +34,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-oi.patch.bz2
 	epatch "${FILESDIR}"/${P}-restrict_arr.patch
 	epatch "${FILESDIR}"/${PV}-utf8-case.patch
-	epatch "${FILESDIR}"/${PV}-tests.patch
+
+	# uclibc does not suffer from this glibc bug.
+	use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
 }
 
 src_compile() {
@@ -46,24 +45,16 @@ src_compile() {
 		append-ldflags -static
 	fi
 
-	local myconf
-	if use uclibc ; then
-		myconf="${myconf} --without-included-regex"
-	else
-		myconf="${myconf} $(use_enable pcre perl-regexp)"
-	fi
 	econf \
 		--bindir=/bin \
 		$(use_enable nls) \
-		${myconf} \
+		$(use_enable pcre perl-regexp) \
 		|| die "econf failed"
 
-	if use pcre && ! use uclibc ; then
-		sed -i \
-			-e 's:-lpcre:/usr/lib/libpcre.a:g' \
-			{lib,src}/Makefile \
-			|| die "sed Makefile failed"
-	fi
+	# force static linking so we dont have to move it into /
+	sed -i \
+		-e 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' \
+		src/Makefile || die "sed static pcre failed"
 
 	emake || die "emake failed"
 }
diff --git a/sys-apps/grep/grep-2.5.1-r8.ebuild b/sys-apps/grep/grep-2.5.1-r8.ebuild
index bde3182758cc..2ac3684d6400 100644
--- a/sys-apps/grep/grep-2.5.1-r8.ebuild
+++ b/sys-apps/grep/grep-2.5.1-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-apps/grep/grep-2.5.1-r8.ebuild,v 1.1 2005/06/12 22:23:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r8.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.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="build nls pcre static"
 
 RDEPEND=""
@@ -35,6 +35,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-restrict_arr.patch
 	epatch "${FILESDIR}"/${PV}-utf8-case.patch
 	epatch "${FILESDIR}"/${P}-perl-segv.patch #95495
+	epatch "${FILESDIR}"/${P}-libintl.patch #92586
 
 	# uclibc does not suffer from this glibc bug.
 	use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/grep/metadata.xml
+++ b/sys-apps/grep/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-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index aabbcdf3fb7e..68613344a0db 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,9 +1,237 @@
 # ChangeLog for sys-apps/groff
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
+
+*groff-1.19.2 (18 Nov 2005)
+
+  18 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.2-infoext.patch,
+  +files/groff-1.19.2-parallel-make.patch, +groff-1.19.2.ebuild:
+  Version bump thanks to Christian Heim #112819.
+
+*groff-1.18.1.1 (29 Oct 2005)
+
+  29 Oct 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/groff_1.18.1.1-10-fix.patch, +groff-1.18.1.1.ebuild:
+  Version bumped. Thanks to Atsushi Kobayashi <loudear@iswebnet.com>;
+  bug #109769.
+
+  29 Sep 2005; Mamoru KOMACHI <usata@gentoo.org> groff-1.19.1-r2.ebuild:
+  Block man-pages-ja for groff-1.19 since groff-1.19 doesn't support m17n;
+  bug #104692.
+
+  27 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  files/groff-1.18-no-netpbm-depend.patch, groff-1.19.1-r2.ebuild:
+  Update the netpbm to work with shells that suck (like on SunOS) #89174.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.1-parallel-make.patch, groff-1.19.1-r2.ebuild:
+  Clean up the ebuild. Add support for cross-compiling. Try to fix parallel
+  build (works for me :D).
+
+  05 Nov 2004; Hardave Riar <hardave@gentoo.org> groff-1.19.1-r2.ebuild:
+  Stable on mips, bug #68404.
+
+  05 Nov 2004; Lars Weiler <pylon@gentoo.org> groff-1.19.1-r2.ebuild:
+  Stable on ppc, bug #68404.
+
+  04 Nov 2004; Travis Tilley <lv@gentoo.org> groff-1.19.1-r2.ebuild:
+  stable on amd64
+
+  04 Nov 2004; Markus Rothe <corsair@gentoo.org> groff-1.19.1-r2.ebuild:
+  Stable on ppc64, bug #68404
+
+  04 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> groff-1.19.1-r2.ebuild:
+  Stable on sparc wrt #68404
+
+  04 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> groff-1.19.1-r2.ebuild:
+  Stable on alpha, bug 68404.
+
+*groff-1.19.1-r2 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.1-tmpfile.patch, +groff-1.19.1-r2.ebuild:
+  Add patch to resolve tempfile access issues #68404.
+
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> groff-1.19.1-r1.ebuild:
+  Stable on sparc
+
+  01 Nov 2004; Joshua Kinard <kumba@gentoo.org> groff-1.19.1-r1.ebuild:
+  Marked stable on mips.
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org> groff-1.19.1-r1.ebuild:
+  Fix pic2graph again #36842 by Malte S. Stretz.
+
+*groff-1.19.1-r1 (19 Sep 2004)
+
+  19 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.1-stack.patch, +groff-1.19.1-r1.ebuild:
+  Add patch to fix stack issues with X.org and such #64117 by Matteo Settenvini
+  and Stephane LOEUILLET.
+
+  13 Sep 2004; <solar@gentoo.org> groff-1.19.1.ebuild:
+  minor touchups to the ebuild
+
+*groff-1.19.1 (13 Sep 2004)
+
+  13 Sep 2004; <solar@gentoo.org> +groff-1.19.1.ebuild:
+  version bump. bug 63832
+
+  14 Jul 2004; Travis Tilley <lv@gentoo.org> groff-1.19.ebuild:
+  added filter-flags -fnew-ra, fixes bug 57033
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> groff-1.18.1-r1.ebuild:
+  sync IUSE (+X), trim trailing whitespace
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> groff-1.18.1-r1.ebuild,
+  groff-1.18.1-r2.ebuild, groff-1.18.1-r3.ebuild, groff-1.18.1-r4.ebuild,
+  groff-1.19.ebuild:
+  QA - fix use invocation
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> groff-1.19.ebuild:
+  Stable on alpha.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> groff-1.19.ebuild:
+  marked stable on amd64
+
+*groff-1.19 (29 Feb 2004)
+
+  29 Feb 2004; Martin Schlemmer <azarah@gentoo.org> groff-1.19.ebuild:
+  Update version.
+
+*groff-1.18.1-r4 (06 Jan 2004)
+
+  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> groff-1.18.1-r4.ebuild:
+  Fix bug 36008 by replacing -Os with -O on alpha. Additionally make the build
+  more deterministic by using use_enable for cjk instead of only adding
+  --enable-multibyte.
+
+  15 Dec 2003; <agriffis@gentoo.org> groff-1.18.1-r3.ebuild:
+  ia64 keyword disappeared!  Added it to 1.18.1-r3
+
+  30 Oct 2003; Brandy Westcott brandy@gentoo.org groff-1.18.1-r3.ebuild:
+  Fix syntax error in pic2graph. Closes bug #32300.
+
+  28 Sep 2003; Martin Holzer <mholzer@gentoo.org> groff-1.18-r2.ebuild,
+  groff-1.18-r3.ebuild, groff-1.18.1-r1.ebuild, groff-1.18.1-r2.ebuild,
+  groff-1.18.1-r3.ebuild, groff-1.18.1.ebuild:
+  Changed SRC_URI. Closes #29746.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> groff-1.18.1-r3.ebuild :
+  ia64 keywords.
+
+*groff-1.18.1-r3 (04 Aug 2003)
+
+  04 Aug 2003; Martin Schlemmer <azarah@gentoo.org> groff-1.18.1-r3.ebuild,
+  files/groff-man-UTF-8.diff:
+  Fix 'man -t' having a blank page as first (bug #25735), thanks to splite
+  <splite-gentoo@sigint.cs.purdue.edu>.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> groff-1.18.1-r2.ebuild:
+  Mark stable on alpha
+
+*groff-1.18.1-r2 (18 Mar 2003)
+
+  23 Jun 2003; Masatomo Nakano <nakano@gentoo.org> :
+  Fixed digest file for CJK
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> groff-1.18.1-r2.ebuild:
+  Changed ~sparc to sparc in KEYWORDS
+
+  19 Jun 2003; Masatomo Nakano <nakano@gentoo.org> groff-1.18.1-r2.ebuild,
+  files/groff_1.18.1-7-fix.patch:
+  Added Japanese support. #22899. Thanks to MATSUU Takuto <matsuu@7501.net>
+
+  18 May 2003; Tavis Ormandy <taviso@gentoo.org> groff-1.18.1-r1.ebuild:
+  stripping some flags if cxx is being used.
+
+  09 May 2003; Guy Martin <gmsoft@gentoo.org> groff-1.18.1-r2.ebuild :
+  Filter the -march=2.0 on hppa because it gave a b0rked groff.
+  Added hppa to KEYWORDS.
+
+  18 Mar 2003; Markus Bertheau <ska-fan@gentoo.org> groff-1.18.1-r2.ebuild,
+  files/groff-man-UTF-8.diff:
+  Add a patch that fixes display of man pages in UTF-8 locales
+
+  13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> groff-1.18.1-r1.ebuild :
+  Marked ppc stable
+
+*groff-1.18.1-r1 (08 Feb 2003)
+
+  18 Mar 2003; Christian Birchinger <joker@gentoo.org> groff-1.18.1-r1.ebuild:
+  Mark as stable for sparc.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> groff-1.18.1-r1.ebuild :
+  Mark as stable for mips.
+
+  24 Feb 2003; Martin Schlemmer <azarah@gentoo.org> groff-1.18.1-r1.ebuild :
+  Add =sys-apps/texinfo-4.0 to DEPEND, closing bug #16186.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> groff-1.18.1.ebuild :
+  Added arm to keywords.
+
+  08 Feb 2003; Martin Schlemmer <azarah@gentoo.org> groff-1.18.1-r1.ebuild :
+  Do not segfault if no color is defined in input, bug #14329.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> groff-1.18.1.ebuild :
+  Added hppa to keywords.
+
+  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> groff-1.18-r3.ebuild :
+  Mark stable for x86.
+
+*groff-1.18-r3 (27 Dec 2002)
+
+  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> groff-1.18-r3.ebuild :
+  Disable generation of example files requiring us to DEPEND on netpbm.
+  This closes bug #12803.
+
+*groff-1.18-r2 (26 Dec 2002)
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> groff-1.18-r2.ebuild :
+  Changes from Nicholas Wourms <dragon@gentoo.org>, bug #12496.
+
+*groff-1.17.2-r3 (13 Dez 2002)
+
+  12 Dec 2002; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*groff-1.17.2-r3 (19 Oct 2002)
+
+  19 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*groff-1.18-r1 (29 Jul 2002)
+*groff-1.17.2-r2 (29 Jul 2002)
+
+  29 Jul 2002; Martin Schlemmer <azarah@gentoo.org> groff-1.18-r1, groff-1.17.2-r2 :
+  Some build Cleanups.  Enable build of xditview if "X" in USE,
+  and X is actually installed.  We cannot make it depend on X, as
+  X depends on perl, which in turn depend on groff and will cause
+  circular depends.  Enable the install of info pages, and also
+  fix thier extension to .info, else they do not get gzipped.
+  Also fixed 0.18 to install its docs/examples in the right place.
+
+*groff-1.18 (24 Jul 2002)
+
+  24 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> groff-1.18.ebuild :
+
+  New version.
+
+*groff-1.16.1-r1.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> groff-1.16.1-r1.ebuild :
+  Added KEYWORDS, SLOT.
 
 *groff-1.17.2-r1 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> groff-1.17.2-r1.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index e69de29bb2d1..24b0a32d39f4 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -0,0 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76cd621054a0207a7d654c368a3a9c20 ChangeLog 8606
+MD5 b887e99fa5e1252f1bf827af9892a238 files/digest-groff-1.18.1-r4 132
+MD5 5ad2fe2219d24cfa7f9513e0671c0643 files/digest-groff-1.18.1.1 137
+MD5 b79e74dab8ceadf74f153032ad30eea3 files/digest-groff-1.19.1-r2 65
+MD5 2c6ae4e4871d5126cd5fc95461c87d7a files/digest-groff-1.19.2 65
+MD5 c43ddaf604dd389afc6107d79b90ce6c files/groff-1.18-infoext.patch 673
+MD5 790ff4a99ab0dd200eb710d925058fb6 files/groff-1.18-no-netpbm-depend.patch 920
+MD5 98060417290f3c427f5a3406b21f8da9 files/groff-1.18.1-no-color-segfault.patch 896
+MD5 64d15253bef046fc681356d45aecf417 files/groff-1.19.1-parallel-make.patch 1067
+MD5 b70471bdc7015ddf030d176b3a0f2d5f files/groff-1.19.1-stack.patch 3659
+MD5 8f3336cc924f20e480ac76ee94f0611e files/groff-1.19.1-tmpfile.patch 710
+MD5 5a9e270dfa9c3455b6fdfa6ab65dcc7c files/groff-1.19.2-infoext.patch 2779
+MD5 bbe55373a380c38e9bd1da7f76dd4057 files/groff-1.19.2-parallel-make.patch 620
+MD5 e0ea59264695cc68dc9947e4611dde5d files/groff-man-UTF-8.diff 391
+MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1-7-fix.patch 551
+MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1.1-10-fix.patch 551
+MD5 032db38ca66c2fbc5929992a4f313944 groff-1.18.1-r4.ebuild 3142
+MD5 dee06c655e952d21181ff84957b4cc8b groff-1.18.1.1.ebuild 3155
+MD5 f5848d8ffad604e64ae98341f898ba2c groff-1.19.1-r2.ebuild 3191
+MD5 a56500e15e87fe4a693ef6eae2eb18dc groff-1.19.2.ebuild 2206
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfWc6gIKl8Uu19MoRAjRRAJ96Kfevvc+UDBmbW/UBlN1fm5qnLgCeMfNZ
+eH+B0z61hunLptknzldc3jo=
+=vG3Q
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch b/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch
index 50a138568bb0..1ec42fce9616 100644
--- a/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch
+++ b/sys-apps/groff/files/groff-1.18-no-netpbm-depend.patch
@@ -1,5 +1,10 @@
---- groff-1.18/doc/Makefile.sub.orig	2002-12-27 22:10:47.000000000 +0200
-+++ groff-1.18/doc/Makefile.sub	2002-12-27 22:11:18.000000000 +0200
+Don't install the example files.  The second hunk is to workaround 
+shells that suck at life.
+
+http://bugs.gentoo.org/show_bug.cgi?id=89174
+
+--- groff-1.18/doc/Makefile.sub
++++ groff-1.18/doc/Makefile.sub
 @@ -60,12 +60,12 @@
  HTMLDOCIMAGEFILES=\
    pic*
@@ -15,3 +20,17 @@
    webpage.ps \
    gnu.eps \
    gnu.png \
+@@ -170,11 +170,11 @@
+ 	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
+ 	done
+ 	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
+-	for f in $(EXAMPLEFILES); do \
++	list="$(EXAMPLEFILES)"; for f in $${list}; do \
+ 	  rm -f $(exampledir)/$$f; \
+ 	  $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
+ 	done
+-	for f in $(PROCESSEDEXAMPLEFILES); do \
++	list="$(PROCESSEDEXAMPLEFILES)"; for f in $${list}; do \
+ 	  rm -f $(exampledir)/$$f; \
+ 	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+ 	done
diff --git a/sys-apps/groff/files/groff-man-UTF-8.diff b/sys-apps/groff/files/groff-man-UTF-8.diff
index 512171615c8f..7adbc9e7d188 100644
--- a/sys-apps/groff/files/groff-man-UTF-8.diff
+++ b/sys-apps/groff/files/groff-man-UTF-8.diff
@@ -1,11 +1,10 @@
 diff -ur groff-1.18.1.orig/tmac/man.local groff-1.18.1/tmac/man.local
 --- groff-1.18.1.orig/tmac/man.local	2000-10-26 16:15:17.000000000 +0200
 +++ groff-1.18.1/tmac/man.local	2003-03-16 02:15:50.000000000 +0100
-@@ -1,2 +1,7 @@
+@@ -1,2 +1,6 @@
  .\" This file is loaded after an-old.tmac.
  .\" Put any local modifications to an-old.tmac here.
 +.if '\*[.T]'utf8' \{\
 +.  char \- \N'45'
 +.  char  - \N'45'
 +.\}
-+
diff --git a/sys-apps/groff/groff-1.18.1-r4.ebuild b/sys-apps/groff/groff-1.18.1-r4.ebuild
index 44c356336cef..aa29f429e9a4 100644
--- a/sys-apps/groff/groff-1.18.1-r4.ebuild
+++ b/sys-apps/groff/groff-1.18.1-r4.ebuild
@@ -1,32 +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/sys-apps/groff/groff-1.18.1-r4.ebuild,v 1.1 2004/01/06 15:54:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
-IUSE="X cjk"
-
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="Text formatter used for man pages"
 MB_PATCH="${P/-/_}-7"
-SRC_URI="ftp://groff.ffii.org/pub/groff/old/${P}.tar.gz
-	cjk? ( http://people.debian.org/~ukai/groff/${MB_PATCH}.diff.gz )"
+DESCRIPTION="Text formatter used for man pages"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
+SRC_URI="ftp://groff.ffii.org/pub/groff/old/${P}.tar.gz
+	cjk? ( mirror://gentoo/${MB_PATCH}.diff.gz )"
 
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm ia64 ppc64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="X cjk"
 
-DEPEND="virtual/glibc
-	>=sys-apps/texinfo-4.0"
-
+DEPEND=">=sys-apps/texinfo-4.0"
 PDEPEND=">=sys-apps/man-1.5k-r1"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if [ "`use cjk`" ]; then
+	if use cjk; then
 		# multibyte patch contains no-color-segfault
 		epatch ${WORKDIR}/${MB_PATCH}.diff
 		epatch ${FILESDIR}/${MB_PATCH}-fix.patch
@@ -57,8 +53,8 @@ src_compile() {
 	local myconf=""
 
 	# Fix problems with not finding g++
-	[ -z "${CC}" ] && export CC="gcc"
-	[ -z "${CXX}" ] && export CXX="g++"
+	export CC="$(tc-getCC)"
+	export CXX="$(tc-getCXX)"
 
 	case ${ARCH} in
 		alpha)
@@ -86,8 +82,7 @@ src_compile() {
 
 	# Only build X stuff if we have X installed, but do
 	# not depend on it, else we get circular deps.
-	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
-	then
+	if use X && [[ -n $(type -p xmkmf) ]] ; then
 		cd ${S}/src/xditview
 		xmkmf || die
 		make depend all || die
@@ -102,8 +97,7 @@ src_install() {
 		docdir=${D}/usr/share/doc/${PF} \
 		install || die
 
-	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
-	then
+	if use X && [[ -n $(type -p xmkmf) ]] ; then
 		cd ${S}/src/xditview
 		make DESTDIR=${D} \
 			BINDIR=/usr/bin \
@@ -121,4 +115,3 @@ src_install() {
 	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
 		PROBLEMS PROJECTS README REVISION TODO VERSION
 }
-
diff --git a/sys-apps/groff/groff-1.18.1.1.ebuild b/sys-apps/groff/groff-1.18.1.1.ebuild
index d06e4b2a01c7..5d64e3f976e6 100644
--- a/sys-apps/groff/groff-1.18.1.1.ebuild
+++ b/sys-apps/groff/groff-1.18.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/sys-apps/groff/groff-1.18.1.1.ebuild,v 1.1 2005/10/29 02:07:38 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.1.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/sys-apps/groff/groff-1.19.1-r2.ebuild b/sys-apps/groff/groff-1.19.1-r2.ebuild
index b65e7b231066..6faf99f2eab0 100644
--- a/sys-apps/groff/groff-1.19.1-r2.ebuild
+++ b/sys-apps/groff/groff-1.19.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.1 2004/11/04 00:02:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,43 +11,60 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="X"
 
-DEPEND="virtual/libc
-	>=sys-apps/texinfo-4.7-r1"
+DEPEND=">=sys-apps/texinfo-4.7-r1
+	!app-i18n/man-pages-ja"
 PDEPEND=">=sys-apps/man-1.5k-r1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fix the info pages to have .info extensions,
 	# else they do not get gzipped.
-	epatch ${FILESDIR}/groff-1.18-infoext.patch
+	epatch "${FILESDIR}"/groff-1.18-infoext.patch
 
 	# Do not generate example files that require us to
 	# depend on netpbm.
-	epatch ${FILESDIR}/groff-1.18-no-netpbm-depend.patch
+	epatch "${FILESDIR}"/groff-1.18-no-netpbm-depend.patch
 
 	# Make dashes the same as minus on the keyboard so that you
 	# can search for it. Fixes #17580 and #16108
 	# Thanks to James Cloos <cloos@jhcloos.com>
-	epatch ${FILESDIR}/${PN}-man-UTF-8.diff
+	epatch "${FILESDIR}"/${PN}-man-UTF-8.diff
 
 	# Fix stack limit (inifite loop) #64117
-	epatch ${FILESDIR}/${P}-stack.patch
+	epatch "${FILESDIR}"/${P}-stack.patch
 
 	# Fix tempfile usage #68404
-	epatch ${FILESDIR}/${P}-tmpfile.patch
+	epatch "${FILESDIR}"/${P}-tmpfile.patch
+
+	# Fix make dependencies so we can build in parallel
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	# Make sure we can cross-compile this puppy
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e '/^GROFFBIN=/s:=.*:=/usr/bin/groff:' \
+			-e '/^TROFFBIN=/s:=.*:=/usr/bin/troff:' \
+			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+			contrib/mom/Makefile.sub \
+			doc/Makefile.in \
+			doc/Makefile.sub || die "cross-compile sed failed"
+		touch .dont-build-X
+	fi
+	# Only build X stuff if we have X installed, but do 
+	# not depend on it, else we get circular deps :(
+	if ! use X || [[ -z $(type -p xmkmf) ]] ; then
+		touch .dont-build-X
+	fi
 }
 
 src_compile() {
-	local myconf=
-
 	# Fix problems with not finding g++
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
+	tc-export CC CXX
 
 	# -Os causes segfaults, -O is probably a fine replacement
 	# (fixes bug 36008, 06 Jan 2004 agriffis)
@@ -56,26 +73,19 @@ src_compile() {
 	# -march=2.0 makes groff unable to finish the compile process
 	use hppa && replace-cpu-flags 2.0 1.0
 
-#	myconf="${myconf} `use_enable cjk multibyte`"
-
-	# this is incredibly broken, i have no idea why people are trying to use
-	# it... even the documentation on it states that -fnew-ra is "meant only
-	# for testing. Users should not specify this option, since it is not yet
-	# ready for production use."
-	filter-flags -fnew-ra
+	# CJK doesnt work yet with groff-1.19
+	#	$(use_enable cjk multibyte)
 
 	# many fun sandbox errors with econf
-	myconf="${myconf} --host=${CHOST} --prefix=/usr \
-		--mandir=/usr/share/man --infodir=\${inforoot}"
-	./configure ${myconf} || die
-
-	# Parallel build doesn't work. Patched wanted.
-	emake -j1 || die
-
-	# Only build X stuff if we have X installed, but do
-	# not depend on it, else we get circular deps.
-	if use X && [ -x /usr/X11R6/bin/xmkmf ]
-	then
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=\${inforoot} \
+		|| die
+	emake || die
+
+	if [ ! -f .dont-build-X ] ; then
 		cd ${S}/src/xditview
 		xmkmf || die
 		make depend all || die
@@ -84,28 +94,27 @@ src_compile() {
 
 src_install() {
 	dodir /usr /usr/share/doc/${PF}/{examples,html}
-	make prefix=${D}/usr \
-		manroot=${D}/usr/share/man \
-		inforoot=${D}/usr/share/info \
-		docdir=${D}/usr/share/doc/${PF} \
+	make \
+		prefix="${D}"/usr \
+		manroot="${D}"/usr/share/man \
+		inforoot="${D}"/usr/share/info \
+		docdir="${D}"/usr/share/doc/${PF} \
 		install || die
 
-	if use X && [ -x /usr/X11R6/bin/xmkmf ]
-	then
-		cd ${S}/src/xditview
-		make DESTDIR=${D} \
-			BINDIR=/usr/bin \
-			MANPATH=/usr/share/man \
-			install \
-			install.man || die
-	fi
-
 	# The following links are required for xman
 	dosym eqn /usr/bin/geqn
 	dosym tbl /usr/bin/gtbl
 	dosym soelim /usr/bin/zsoelim
 
-	cd ${S}
 	dodoc BUG-REPORT ChangeLog FDL MORE.STUFF NEWS \
 		PROBLEMS PROJECTS README REVISION TODO VERSION
+
+	if [ ! -f .dont-build-X ] ; then
+		cd ${S}/src/xditview
+		make DESTDIR="${D}" \
+			BINDIR=/usr/bin \
+			MANPATH=/usr/share/man \
+			install \
+			install.man || die
+	fi
 }
diff --git a/sys-apps/groff/groff-1.19.2.ebuild b/sys-apps/groff/groff-1.19.2.ebuild
index efde806d5b3f..91e12dc645df 100644
--- a/sys-apps/groff/groff-1.19.2.ebuild
+++ b/sys-apps/groff/groff-1.19.2.ebuild
@@ -1,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-apps/groff/groff-1.19.2.ebuild,v 1.1 2005/11/18 05:30:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.2.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/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-apps/gscanbus/ChangeLog b/sys-apps/gscanbus/ChangeLog
index 63a5540ca84d..280b58408a62 100644
--- a/sys-apps/gscanbus/ChangeLog
+++ b/sys-apps/gscanbus/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-apps/gscanbus
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gscanbus/ChangeLog,v 1.1 2003/10/28 21:50:31 plasmaroo Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gscanbus/ChangeLog,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
+
+  26 May 2004; Danny van Dyk <kugelfang@gentoo.org> gscanbus-0.7.1.ebuild:
+  Marked ~amd64.
+
+  04 Apr 2004; Lars Weiler <pylon@gentoo.org> gscanbus-0.7.1.ebuild:
+  stable on ppc
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gscanbus-0.7.1.ebuild:
+  fix depend (bug #45110); inherit eutils for epatch; patch in src_unpack; tidy
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> gscanbus-0.7.1.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2004; <gustavoz@gentoo.org> gscanbus-0.7.1.ebuild:
+  keyworded ~sparc
 
 *gscanbus-0.7.1 (28 Oct 2003)
 
diff --git a/sys-apps/gscanbus/Manifest b/sys-apps/gscanbus/Manifest
index c1c3d6e0e9da..3fdc0b06444c 100644
--- a/sys-apps/gscanbus/Manifest
+++ b/sys-apps/gscanbus/Manifest
@@ -1,4 +1,5 @@
-MD5 e87ac9898be689ad38a0dcde252b81c4 ChangeLog 365
-MD5 1358390d556d7deb191d9dac7c30260a gscanbus-0.7.1.ebuild 706
+MD5 282676cd08215159a6db590f81d68689 gscanbus-0.7.1.ebuild 784
+MD5 7c4becfb40369dae7b1d0191dd101dfe ChangeLog 952
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 325a51d833e143f51cccb972b4114b3b files/gscanbus-0.71-gcc33.patch 1054
 MD5 07de4a00e351e05697644561222458a4 files/digest-gscanbus-0.7.1 63
diff --git a/sys-apps/gscanbus/gscanbus-0.7.1.ebuild b/sys-apps/gscanbus/gscanbus-0.7.1.ebuild
index 0f0a2fa94586..cc45873eeae1 100644
--- a/sys-apps/gscanbus/gscanbus-0.7.1.ebuild
+++ b/sys-apps/gscanbus/gscanbus-0.7.1.ebuild
@@ -1,36 +1,28 @@
-# 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-apps/gscanbus/gscanbus-0.7.1.ebuild,v 1.1 2003/10/28 21:50:31 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gscanbus/gscanbus-0.7.1.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="gscanbus is a little bus scanning, testing and topology visualizing tool for the Linux IEEE1394 subsystem"
 HOMEPAGE="http://gscanbus.berlios.de/"
-
 SRC_URI="http://download.berlios.de/gscanbus/${P}.tgz"
-LICENSE="GPL-2 LGPL-2.1"
 
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc ppc ~amd64"
 IUSE=""
 
 DEPEND=">=sys-libs/libraw1394-0.9.0
-	>=gtk+-1.2"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
+	>=x11-libs/gtk+-1.2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/gscanbus-0.71-gcc33.patch
-
-	econf || die
-	emake || die
-
 }
 
 src_install() {
-
 	dobin gscanbus
 	dodir /etc
 	cp guid-resolv.conf oui-resolv.conf ${D}/etc
diff --git a/sys-apps/gscanbus/metadata.xml b/sys-apps/gscanbus/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/gscanbus/metadata.xml
+++ b/sys-apps/gscanbus/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-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index d58c98c5110b..5fb459988425 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,216 @@
 # ChangeLog for sys-apps/hal
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.1 2004/08/17 21:01:52 foser Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
+
+  08 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> hal-0.5.4.ebuild:
+  Fixing the deps for doc building.  Resolves bug #108994
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> hal-0.4.8.ebuild:
+  fixed RDEPEND for mips-headers, added ~mips keyword
+
+  17 Oct 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.5.4.ebuild:
+  added usb to HAL groups. Added optional supported depend on mips-headers
+
+  15 Sep 2005; <dang@gentoo.org> hal-0.4.8.ebuild:
+  Make hal not pass /bin/false as a shell to ecommit. Bug #103421
+
+  07 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> hal-0.5.4.ebuild:
+  Added to ~sparc.
+
+  05 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> hal-0.4.8.ebuild:
+  Keyworded ~sparc for the experimental profile
+
+  05 Sep 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.5.4.ebuild:
+  ${D} -> ${ROOT} clean up ebuild
+
+*hal-0.5.4 (27 Aug 2005)
+
+  27 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -files/hal-udev-63.patch,
+  -hal-0.5.2.ebuild, +hal-0.5.4.ebuild:
+  rev bump to 0.5.4, yay for the Gnome herd and mobile herd for new features
+
+  26 Aug 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.5.2.ebuild:
+  -m Fixing bug #103421
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> hal-0.4.7-r2.ebuild:
+  stable on ia64
+
+*hal-0.5.2 (18 Aug 2005)
+
+  18 Aug 2005; Doug Goldstein <cardoe@gentoo.org> metadata.xml,
+  +hal-0.5.2.ebuild, +hal-unmount.dev, +0.5-hald.rc, 
+  +hal-0.5.1-old_storage_policy.patch:
+  added HAL 0.5.2, but masked, as per Gnome herd's request.
+  Added self to maintainership so I can work out 0.5.x issues
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> hal-0.4.7-r2.ebuild:
+  Stable on ppc.
+
+  13 Jun 2005; Heinrich Wendel <lanius@gentoo.org> hal-0.4.7-r2.ebuild:
+  stable on amd64
+
+  07 Jun 2005; Elfyn McBratney <beu@gentoo.org> hal-0.4.5-r2.ebuild,
+  hal-0.4.7-r2.ebuild:
+  Fix DEPEND (sys-kernel/linux26-headers is no longer in the tree).
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> hal-0.4.7-r2.ebuild:
+  Stable on ppc64
+
+*hal-0.4.8 (27 May 2005)
+
+  27 May 2005; foser <foser@gentoo.org> hal-0.4.8.ebuild :
+  New release, add sanity back to pkg_setup
+  Fixed headers dep (#89550)
+  Add patch to fix dvdram detection
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> hal-0.4.5-r2.ebuild:
+  stable on ia64
+
+  24 Apr 2005; Daniel Drake <dsd@gentoo.org> hal-0.4.5-r2.ebuild,
+  hal-0.4.7-r2.ebuild:
+  Add sanity to pkg_setup.. also fixes usage with portage-HEAD
+
+*hal-0.4.7-r2 (17 Apr 2005)
+
+  17 Apr 2005; foser <foser@gentoo.org> hal-0.4.7-r2.ebuild :
+  Fix floppy detection with newer kernels
+  Change policy on mounting removable drives (#83025)
+  Keepdir some policy dirs (#87167)
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> hal-0.4.5-r2.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> hal-0.4.5-r2.ebuild:
+  stable on amd64
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> hal-0.4.5-r2.ebuild:
+  Stable on ppc.
+
+*hal-0.4.7-r1 (21 Mar 2004)
+
+  21 Mar 2005; foser <foser@gentoo.org> hal-0.4.7-r1.ebuild :
+  Add memleak fix & coldplug double add of devices patches
+
+  20 Feb 2005; Heinrich Wendel <lanius@gentoo.org> hal-0.4.5-r2.ebuild:
+  move back to testing, it requires a 2.6.10 kernel which is not yet stable on
+  amd64
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org> hal-0.4.5-r2.ebuild:
+  stable on amd64
+
+*hal-0.4.7 (06 Feb 2005)
+
+  06 Feb 2005; foser <foser@gentoo.org> hal-0.4.7.ebuild :
+  New release (#79968)
+
+*hal-0.4.5-r2 (18 Jan 2005)
+
+  18 Jan 2005; foser <foser@gentoo.org> hal-0.4.5-r2.ebuild :
+  Add fix for #78564, requires some ugly checks for having a 2.6.10 kernel
+  Added some further ntfs/fat label detection fixes
+
+*hal-0.4.5-r1 (17 Jan 2005)
+
+  17 Jan 2005; foser <foser@gentoo.org> hal-0.4.5-r1.ebuild :
+  Add patch to find the gphoto2 usermap (#75799)
+
+*hal-0.4.5 (13 Jan 2005)
+
+  13 Jan 2005; foser <foser@gentoo.org> hal-0.4.5.ebuild :
+  Fresh release (bugfixes)
+
+  12 Jan 2005; foser <foser@gentoo.org> hal-0.4.4-r1.ebuild :
+  Change the iso label patch for a somewhat cleaner one
+
+  12 Jan 2005; foser <foser@gentoo.org> hal-0.4.2-r1.ebuild :
+  Fix SRC_URI (#77478) thnx to Gudleik Rasch for noticing
+
+  11 Jan 2005; John Mylchreest <johnm@gentoo.org> hal-0.2.98-r1.ebuild,
+  hal-0.4.1-r1.ebuild, hal-0.4.2-r1.ebuild, hal-0.4.4-r1.ebuild:
+  fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?
+
+*hal-0.4.4-r1 (09 Jan 2005)
+
+  09 Jan 2005; foser <foser@gentoo.org> hal-0.4.4-r1.ebuild :
+  Add patch to fix #77140 & another patch from the mailinglist
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> hal-0.4.1-r1.ebuild:
+  Stable on amd64.
+
+*hal-0.4.4 (08 Jan 2005)
+
+  08 Jan 2005; foser <foser@gentoo.org> hal-0.4.4.ebuild :
+  New release, dep fixes & add USE doc for doxygen docs
+  Add patch for zip as floppy drive detection
+
+*hal-0.4.2-r1 (22 Dec 2004)
+
+  22 Dec 2004; foser <foser@gentoo.org> hal-0.4.2-r1.ebuild :
+  Add some minor bugfixing patches
+
+  20 Dec 2004; Joe McCann <joem@gentoo.org> hal-0.4.1-r1.ebuild,
+  hal-0.4.1.ebuild, hal-0.4.2.ebuild:
+  Adding intltool depend to 0.4.x releases
+
+  19 Dec 2004; Mike Gardiner <obz@gentoo.org> hal-0.4.1-r1.ebuild:
+  Keyworded x86 and ppc for GNOME 2.8.1
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> hal-0.4.1-r1.ebuild:
+  Stable on ppc64
+
+*hal-0.4.2 (02 Dec 2004)
+
+  02 Dec 2004; foser <foser@gentoo.org> hal-0.4.2.ebuild :
+  New release, add proper debug & pcmcia USE flags
+  Up glib dep to 2.4 because of #71316
+
+*hal-0.4.1-r1 (30 Nov 2004)
+
+  30 Nov 2004; foser <foser@gentoo.org> hal-0.4.1-r1.ebuild :
+  Make use of managed keyword, with updated util-linux dep
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org> hal-0.2.98-r1.ebuild:
+  Keyworded ppc for GNOME 2.8
+
+  08 Nov 2004; Markus Rothe <corsair@gentoo.org> hal-0.4.1.ebuild:
+  Marked ~ppc64
+
+*hal-0.4.1 (02 Nov 2004)
+
+  02 Nov 2004; foser <foser@gentoo.org> hal-0.4.1.ebuild :
+  New release
+  Add patch for device manager
+
+*hal-0.4.0 (29 Oct 2004)
+
+  29 Oct 2004; foser <foser@gentoo.org> hal-0.4.0.ebuild :
+  New release (#68243)
+  Fix LICENSE
+  Add a few patches from RH & some fixes to counter them
+
+*hal-0.2.98-r1 (02 Oct 2004)
+
+  02 Oct 2004; <peter@gentoo.org> +hal-0.2.98-r1.ebuild:
+  Revision bump. hal-device-manager now comes from a seperate package.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/hald:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  21 Sep 2004; foser <foser@gentoo.org> hal-0.2.98.ebuild :
+  Add kernel26-headers dep, because of several reports (#64851)
+
+*hal-0.2.98 (21 Sep 2004)
+
+  21 Sep 2004; foser <foser@gentoo.org> hal-0.2.98.ebuild :
+  New release, fix up the init script to work with the new pid handling
+  Update dbus dep to keep hal-dev-manager working
+  Add libcap dep
+
+  18 Sep 2004; Travis Tilley <lv@gentoo.org> hal-0.2.97.ebuild:
+  added ~amd64 keyword
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> hal-0.2.97.ebuild:
+  Added to ~ppc.
 
 *hal-0.2.97 (17 Aug 2004)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 66a1fa5fd2b9..3b2622ca3d8f 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,3 +1,23 @@
-MD5 12306f9eea2c2799577e92777ab14ca7 hal-0.2.97.ebuild 974
-MD5 a786f25b2d3f1a766bda8bad289dbbd0 files/hald 603
-MD5 9ba9094143c1d09db466d61bb7d7b3d5 files/digest-hal-0.2.97 63
+MD5 d64a1aa1fb6c47e26b067ba48869720d ChangeLog 7381
+MD5 40a7b45f127bfdcacaa142660ad8b5f9 files/0.5-hald.rc 537
+MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
+MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
+MD5 2bbbb519c89110dfec96cf63cf541afc files/digest-hal-0.4.8 62
+MD5 27cab5d91e93d8b692246d0ce4110122 files/digest-hal-0.5.4 62
+MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
+MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817
+MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429
+MD5 442da36fd75002bb8300b0fcb65a1371 files/hal-0.4.5-vat_ntfs_labels.patch 2874
+MD5 c1624c9456f164c1b611e3ab22fb105d files/hal-0.4.7-device_info_leak.patch 2203
+MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.patch 691
+MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch 568
+MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670
+MD5 e3ecbfe57c0833d32f0ea57a0de58aee files/hal-0.4.8-fix_dvdram.patch 465
+MD5 25cb64ec27a48a80126b6de5ff6c3340 files/hal-0.5.1-old_storage_policy.patch 856
+MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
+MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
+MD5 2cf5b3c9219c87b1d9aee01f4f5f19bb hal-0.4.5-r2.ebuild 3118
+MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455
+MD5 8420501e80e55b313d30f4e0309c08dd hal-0.4.8.ebuild 3419
+MD5 4b5c3135d20b391903d7a8e2626313dd hal-0.5.4.ebuild 3443
+MD5 a60767d83157413d549c69b98fac962c metadata.xml 303
diff --git a/sys-apps/hal/files/0.5-hald.rc b/sys-apps/hal/files/0.5-hald.rc
index 7a3ca0ba5242..e476745882a5 100755
--- a/sys-apps/hal/files/0.5-hald.rc
+++ b/sys-apps/hal/files/0.5-hald.rc
@@ -1,7 +1,7 @@
 #!/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/sys-apps/hal/files/0.5-hald.rc,v 1.1 2005/08/18 07:19:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5-hald.rc,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 depend() {
 	need dbus hotplug
diff --git a/sys-apps/hal/files/hald b/sys-apps/hal/files/hald
index 8711523cfb89..745cd0e7ac7d 100644
--- a/sys-apps/hal/files/hald
+++ b/sys-apps/hal/files/hald
@@ -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/sys-apps/hal/files/hald,v 1.1 2004/08/17 21:01:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/hald,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 depend() {
 
@@ -14,7 +14,6 @@ start() {
 	ebegin "Starting Hardware Abstraction Layer daemon"
 
 	start-stop-daemon --start -q --exec /usr/sbin/hald
-	echo `/sbin/pidof hald` > /var/run/hald.pid
 	
 	eend $?
 
@@ -24,7 +23,7 @@ stop() {
 
 	ebegin "Stopping Hardware Abstraction Layer daemon"
 
-	start-stop-daemon --stop -q --pidfile /var/run/hald.pid 
+	start-stop-daemon --stop -q --pidfile /var/run/hald/hald.pid 
 
 	eend $?
 
diff --git a/sys-apps/hal/hal-0.4.5-r2.ebuild b/sys-apps/hal/hal-0.4.5-r2.ebuild
index e9ea56e9e36b..c09d6eb6b453 100644
--- a/sys-apps/hal/hal-0.4.5-r2.ebuild
+++ b/sys-apps/hal/hal-0.4.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-apps/hal/hal-0.4.5-r2.ebuild,v 1.1 2005/01/18 22:27:24 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 inherit eutils python linux-info versionator flag-o-matic
 
@@ -10,8 +10,8 @@ SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
-IUSE="debug pcmcia doc"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
+IUSE="debug pcmcia doc livecd"
 
 RDEPEND=">=dev-libs/glib-2.4
 	>=sys-apps/dbus-0.22-r1
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.4
 	sys-libs/libcap
 	dev-libs/popt
 	>=sys-apps/util-linux-2.12i
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )"
+	>=sys-kernel/linux-headers-2.6"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -33,17 +33,10 @@ DEPEND="${RDEPEND}
 # We need to run at least a 2.6.10 kernel, this is a
 # way to ensure that to some extent
 pkg_setup() {
-
-	if get_version; then
-		kernel_is ge 2.6.10 && break
-	else
-		RKV=$(uname -r)
-		RKV=${RKV///-*}
-		if version_is_at_least "2.6.10" ${RKV}; then
-			break
-		fi
-	fi
-	die "You need a 2.6.10 or newer kernel to build this pack"
+	use livecd && return
+	linux-info_pkg_setup
+	kernel_is ge 2 6 10 \
+		|| die "You need a 2.6.10 or newer kernel to build this package"
 
 }
 
diff --git a/sys-apps/hal/hal-0.4.7-r2.ebuild b/sys-apps/hal/hal-0.4.7-r2.ebuild
index 71ca57a2cb7d..c5c814437dcf 100644
--- a/sys-apps/hal/hal-0.4.7-r2.ebuild
+++ b/sys-apps/hal/hal-0.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.7-r2.ebuild,v 1.1 2005/04/17 19:02:48 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 inherit eutils python linux-info versionator flag-o-matic
 
@@ -10,18 +10,18 @@ SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
-IUSE="debug pcmcia doc"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
+IUSE="debug pcmcia doc livecd"
 
 RDEPEND=">=dev-libs/glib-2.4
-	>=sys-apps/dbus-0.22-r1
+	=sys-apps/dbus-0.23*
 	dev-libs/expat
 	sys-fs/udev
 	sys-apps/hotplug
 	sys-libs/libcap
 	dev-libs/popt
 	>=sys-apps/util-linux-2.12i
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )"
+	>=sys-kernel/linux-headers-2.6"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -34,16 +34,15 @@ DEPEND="${RDEPEND}
 # way to ensure that to some extent
 pkg_setup() {
 
+	use livecd && return
+
 	if get_version; then
-		kernel_is ge 2 6 10 && break
-	else
-		RKV=$(uname -r)
-		RKV=${RKV//-*}
-		if version_is_at_least "2.6.10" ${RKV}; then
-			break
-		fi
+		kernel_is ge 2 6 10 && return
+	elif get_running_version; then
+		kernel_is ge 2 6 10 && return
 	fi
-	die "You need a 2.6.10 or newer kernel to build this pack"
+
+	die "You need to run a 2.6.10 or newer kernel to build & use this pack"
 
 }
 
diff --git a/sys-apps/hal/hal-0.4.8.ebuild b/sys-apps/hal/hal-0.4.8.ebuild
index b4ce0931d5dc..ac40f51d12a3 100644
--- a/sys-apps/hal/hal-0.4.8.ebuild
+++ b/sys-apps/hal/hal-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/sys-apps/hal/hal-0.4.8.ebuild,v 1.1 2005/05/27 21:51:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.8.ebuild,v 1.1.1.1 2005/11/30 09:56:18 chriswhite Exp $
 
 inherit eutils python linux-info versionator flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug pcmcia doc livecd"
 
 RDEPEND=">=dev-libs/glib-2.4
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.4
 	sys-libs/libcap
 	dev-libs/popt
 	>=sys-apps/util-linux-2.12i
-	>=sys-kernel/linux-headers-2.6"
+	||( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -106,7 +106,7 @@ src_install() {
 pkg_preinst() {
 
 	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewuser haldaemon -1 /bin/false /dev/null haldaemon || die "Problem adding haldaemon user"
+	enewuser haldaemon -1 "-1" /dev/null haldaemon || die "Problem adding haldaemon user"
 
 }
 
diff --git a/sys-apps/hal/hal-0.5.4.ebuild b/sys-apps/hal/hal-0.5.4.ebuild
index d4d99e575a3b..f2c4174e752a 100644
--- a/sys-apps/hal/hal-0.5.4.ebuild
+++ b/sys-apps/hal/hal-0.5.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/sys-apps/hal/hal-0.5.4.ebuild,v 1.1 2005/08/27 04:09:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.1.1.1 2005/11/30 09:56:17 chriswhite Exp $
 
-inherit eutils linux-info versionator flag-o-matic
+inherit eutils linux-info
 
 DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
@@ -10,33 +10,27 @@ SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
+KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="debug pcmcia doc pam_console"
 
-
-### We don't technically "need" pam, but without pam_console, stuff 
-### doesn't work (particularly NetworkManager).
-### dep on a specific util-linux version for managed mount patches #70873
 RDEPEND=">=dev-libs/glib-2.6
 	>=sys-apps/dbus-0.33
 	dev-libs/expat
 	>=sys-fs/udev-063
 	sys-apps/hotplug
 	>=sys-apps/util-linux-2.12i
-	>=sys-kernel/linux-headers-2.6
+	||( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
 	dev-libs/libusb
 	pam_console? ( sys-libs/pam )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.29
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
 
 ## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy"
+HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy,usb"
 
-# We need to run at least a 2.6.10 kernel, this is a
-# way to ensure that to some extent
 pkg_setup() {
 
 	linux-info_pkg_setup
@@ -49,7 +43,7 @@ pkg_setup() {
 			die "pam without pam_console detected"
 	fi
 
-	if [ -d ${D}/etc/hal/device.d ]; then
+	if [ -d ${ROOT}/etc/hal/device.d ]; then
 		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
 		eerror "/etc/hal/device.d/ so please remove this directory"
 		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
@@ -67,27 +61,20 @@ src_unpack() {
 }
 
 src_compile() {
-
-	local myconf
-
-	# NOTE: fstab-sync dies at an assert() and is deprecated upstream.
-	# As such, no need to support it.  
 	econf \
-		`use_enable debug verbose-mode` \
-		`use_enable pcmcia pcmcia-support` \
+		$(use_enable debug verbose-mode) \
+		$(use_enable pcmcia pcmcia-support) \
 		--enable-sysfs-carrier \
 		--enable-hotplug-map \
-		`use_enable doc docbook-docs` \
-		`use_enable doc doxygen-docs` \
+		$(use_enable doc docbook-docs) \
+		$(use_enable doc doxygen-docs) \
 		--with-pid-file=/var/run/hald.pid \
 		|| die "configure failed"
 
 	emake || die "make failed"
-
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	# We install this in a seperate package to avoid gnome-python dep
@@ -101,15 +88,9 @@ src_install() {
 	# Script to unmount devices if they are yanked out (from upstream)
 	exeinto /etc/dev.d/default
 	doexe ${FILESDIR}/hal-unmount.dev
-
-
 }
 
 pkg_postinst() {
-	##
-	## The old hal ran as root.  This was *very* bad because of all the user IO that HAL does.
-	## The new hal runs as 'haldaemon', but haldaemon needs to be in the appropriate groups to work.
-	## Below is a hack to make this transition (upgrade from previous versions) smooth.
 	## We need to add the user/groups *after* package compilation/installation, so that we
 	## don't change the user without the package being installed.
 	##
diff --git a/sys-apps/hal/metadata.xml b/sys-apps/hal/metadata.xml
index 3cfad92cea1d..0893f3085eb0 100644
--- a/sys-apps/hal/metadata.xml
+++ b/sys-apps/hal/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<herd>gentopia</herd>
 <maintainer>
   <email>foser@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>cardoe@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index 908be34acd9a..d11175751e12 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,13 +1,278 @@
 # ChangeLog for sys-apps/hdparm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
-*hdparm-4.6 (1 Feb 2002)
+  26 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> hdparm-5.9.ebuild:
+  Stable on sh.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> hdparm-5.9.ebuild:
+  Marked stable on mips.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> hdparm-5.9.ebuild:
+  Stable on alpha.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> hdparm-5.9.ebuild:
+  Stable on ppc64
+
+  31 May 2005; Sven Wegener <swegener@gentoo.org> hdparm-5.7-r1.ebuild,
+  hdparm-5.9.ebuild, hdparm-6.1.ebuild:
+  Let portage handle the stripping of binaries.
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org> hdparm-5.7-r1.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  09 May 2005; Lars Weiler <pylon@gentoo.org> hdparm-5.9.ebuild:
+  Stable on ppc.
+
+  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> hdparm-5.9.ebuild:
+  Stable on sparc
+
+*hdparm-6.1 (24 Apr 2005)
+
+  24 Apr 2005; Heinrich Wendel <lanius@gentoo.org> +hdparm-6.1.ebuild:
+  version bump
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  -files/hdparm-5.4-readahead_rename.patch, -files/hdparm-conf.d,
+  -files/hdparm-init-2, -hdparm-5.4.ebuild:
+  cleanups
+
+  19 Feb 2005; Markus Rothe <corsair@gentoo.org> hdparm-5.7-r1.ebuild:
+  Stable on ppc64
+
+*hdparm-5.9 (19 Feb 2005)
+
+  19 Feb 2005; Heinrich Wendel <lanius@gentoo.org> -files/hdparm-init-6,
+  -hdparm-5.5-r4.ebuild, -hdparm-5.5.ebuild, -hdparm-5.6.ebuild,
+  -hdparm-5.7.ebuild, -hdparm-5.8.ebuild, +hdparm-5.9.ebuild:
+  cleanups, version bump
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*hdparm-5.8 (23 Nov 2004)
+
+  23 Nov 2004; Tony Vroon <chainsaw@gentoo.org> +hdparm-5.8.ebuild:
+  Version bump, closes bug #72155. Dropped inherit on eutils eclass, not
+  required.
+
+  01 Nov 2004; Joshua Kinard <kumba@gentoo.org> hdparm-5.7-r1.ebuild:
+  Marked stable on mips.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> hdparm-5.7-r1.ebuild:
+  Stable on alpha.
+
+  27 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> hdparm-5.7-r1.ebuild:
+  Stable on sparc
+
+  26 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> hdparm-5.7-r1.ebuild:
+  Marked stable on amd64.
+
+  24 Sep 2004; Heinrich Wendel <lanius@gentoo.org> hdparm-5.7-r1.ebuild:
+  stable on x86
+
+*hdparm-5.7-r1 (08 Sep 2004)
+
+  08 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +files/hdparm-init-7,
+  +hdparm-5.7-r1.ebuild:
+  support non-devfs compatible udev systems, bug #62915
+
+  06 Sep 2004; Sven Wegener <swegener@gentoo.org> files/hdparm-conf.d,
+  files/hdparm-conf.d.3:
+  Fixed typos in conf.d files. Thanks to Redshift <gentoo@halffull.org> and
+  Steve Dibb <sdibb@myway.com> in bug #62275.
+
+*hdparm-5.7 (04 Sep 2004)
+
+  04 Sep 2004; Tony Vroon <chainsaw@gentoo.org> +hdparm-5.7.ebuild:
+  Version bump as requested in bug #62599 by Lars (Polynomial-C).
+
+  20 Aug 2004; Jon Portnoy <avenj@gentoo.org> files/hdparm-init-6 :
+  Quote argument to -z.  See bug #60989.
+
+*hdparm-5.6 (16 Aug 2004)
+
+  16 Aug 2004; <solar@gentoo.org> +hdparm-5.6.ebuild:
+  This release removed Major number restrictions in preparation for adding HDIO
+  ioctl support to Linux 2.6 SATA/SCsi drivers. There are other minor changes
+  and fixes.
+
+  11 Aug 2004; Heinrich Wendel <lanius@gentoo.org> hdparm-5.5-r4.ebuild:
+  fix installation of rc.d file, bug #60000
+
+  04 Aug 2004; <agriffis@gentoo.org> hdparm-5.5-r3.ebuild:
+  stable on alpha and ia64
+
+*hdparm-5.5-r4 (05 Aug 2004)
+
+  05 Aug 2004; Heinrich Wendel <lanius@gentoo.org> hdparm-5.5-r3.ebuild,
+  hdparm-5.5-r4.ebuild, files/hdparm-init-5, files/hdparm-init-6:
+  fix another bug with more than one argument, bug #59497
+
+*hdparm-5.5-r3 (04 Aug 2004)
+
+  04 Aug 2004; Heinrich Wendel <lanius@gentoo.org> hdparm-5.5-r2.ebuild,
+  hdparm-5.5-r3.ebuild, files/hdparm-init-4, files/hdparm-init-5:
+  run hdparm quiet for more than one parameter, bug #59388
+
+*hdparm-5.5-r2 (03 Aug 2004)
+
+  03 Aug 2004; Heinrich Wendel <lanius@gentoo.org> hdparm-5.5-r1.ebuild,
+  hdparm-5.5-r2.ebuild, files/hdparm-init-3, files/hdparm-init-4:
+  add udev support
+
+*hdparm-5.5-r1 (01 Aug 2004)
+
+  01 Aug 2004; Heinrich Wendel <lanius@gentoo.org> hdparm-5.3-r2.ebuild,
+  hdparm-5.4.ebuild, hdparm-5.5-r1.ebuild, hdparm-5.5.ebuild,
+  files/hdparm-conf.d.3, files/hdparm-init, files/hdparm-init-2,
+  files/hdparm-init-3, files/hdparm-new-init:
+  great enhancements of the init script, see bug #37755, remove old version
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> hdparm-5.5.ebuild:
+  stable on amd64
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> hdparm-5.4.ebuild:
+  Add inherit eutils
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> hdparm-5.3-r2.ebuild:
+  don't set DEPEND="${RDEPEND}" (bug #45343); IUSE; tidy
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> hdparm-5.5.ebuild:
+  adding initial s390 support
+
+  19 Feb 2004; <tuxus@gentoo.org> hdparm-5.5.ebuild:
+  Marked stable on mips
+
+*hdparm-5.5 (11 Feb 2004)
+
+  11 Feb 2004; Martin Holzer <mholzer@gentoo.org> hdparm-5.5.ebuild:
+  Version bumped.
+
+  08 Feb 2004; Brad House <brad_mssw@gentoo.org> hdparm-5.4.ebuild,
+  files/hdparm-5.4-readahead_rename.patch:
+  Patch provided by James Noble in Bug #40908 to work around glibc
+  2.3.3_pre20040117+ versions which define readahead internally in bits/fcntl.h
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> hdparm-5.4.ebuild:
+  stable on alpha
+
+*hdparm-5.4 (27 Jun 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> hdparm-5.4.ebuild:
+  Added ~mips to KEYWORDS
+
+  28 Aug 2003; Christian Birchinger <joker@gentoo.org> hdparm-5.4.ebuild:
+  Added sparc stable keyword
+
+  26 Aug 2003; Heinrich Wendel <lanius@gentoo.org> files/hdparm-new-init:
+  bug #27282
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> hdparm-5.4.ebuild :
+  Marked stable on hppa.
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> hdparm-5.4.ebuild:
+  Marked stable on x86.
+
+  27 Jun 2003; <msterret@gentoo.org> hdparm-5.4.ebuild:
+  version bump (bug 23593)
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> hdparm-5.3-r2.ebuild:
+  Mark stable on alpha
+
+*hdparm-5.3-r2 (01 Mar 2003)
+
+  16 Apr 2003; Guy Martin <gmsoft@gentoo.org> hdparm-5.3-r2.ebuild :
+  Marked stable on hppa.
+
+  01 Apr 2003; Christian Birchinger <joker@gentoo.org> hdparm-5.3-r2.ebuild:
+  Added sparc stable keyword
+
+  31 Mar 2003; Seemant Kulleen <seemant@gentoo.org> hdparm-5.2-r1.ebuild,
+  hdparm-5.2-r1.ebuild, hdparm-5.2-r2.ebuild, hdparm-5.2-r2.ebuild,
+  hdparm-5.2-r3.ebuild, hdparm-5.3-r2.ebuild:
+  Marked stable, fixed src_uri for 5.2, cleaned old crusty ebuilds.
+
+  01 Mar 2003; Seth Chandler <sethbc@gentoo.org> hdparm-5.3-r2.ebuild,
+  files/hdparm-conf.d, files/hdparm-new-init:
+  updated the rc-scripts for hdparm, thanks to Justin "Nagash" Jones, this fixes
+  bug 16603
+
+*hdparm-5.3-r1 (08 Dec 2002)
+
+  17 Feb 2003; Guy Martin <gmsoft@gentoo.org> hdparm-5.3-r1.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  17 Dec 2002; Seth Chandler <sethbc@gentoo.org> : hdparm-5.3-r1.ebuild
+  masked ebuild for 5.3 and changed the distfiles location, corrupted
+  package on the metalab mirrors  
+
+  08 Dec 2002; Seth Chandler <sethbc@gentoo.org> : hdparm-5.3-r1.ebuild
+  bumped ebuild to 5.3 to fix some BIG_ENDIAN issues, -t for small drives, 
+  and -p output for the SC1200 chipset have been fixed.
+
+
+*hdparm-5.2-r3 (29 Sep 2002)
+
+  11 Jan 2003; Seemant Kulleen <seemant@gentoo.org> hdparm-5.2-r3.ebuild :
+
+  filter -fPIC flag from this ebuild. Interestingly enough, it doesn't
+  affect the 5.3-r1 version, so upstream made some fixes.  Closes bug #13748
+  by jwarren@cheesefoam.dyndns.org (Jeremy Warren)
+
+  30 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Do not add hdparm to default runlevel.  Close bug #8549.
+
+  29 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Braindead me used newins and not newexe to install the
+  rc-script .. Thanks Daniel :D.
+
+*hdparm-5.2-r2 (15 Aug 2002)
+
+  15 Aug 2002; Martin Schlemmer <azarah@gentoo.org> :
   
-  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.
+  Add /etc/init.d/hdparm kindly donated by Daniel Robbins.
+
+  19 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  removed old version, closing bug 1044 the easy way
+
+*hdparm-5.2-r1 (08 Jul 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> hdparm-5.2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  08 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  Fixed installation path, closes bug #3170.
+
+*hdparm-5.2 (22 Jun 2002)
+
+  02 May 2002; Michael Nazaroff <naz@gentoo.org> :
+
+  Upgrade to 5.2
+  
+*hdparm-4.9 (02 May 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> hdparm-4.9.ebuild :
+  Added KEYWORDS.
+
+  02 May 2002; Daniel Robbins <drobbins@gentoo.org> :
+
+  Upgrade to 4.9
+
+*hdparm-4.8 (29 Apr 2002)
+
+  29 Apr 2002; Bruce A. Locke <blocke@shivan.org> :
+
+  Update to 4.8
+
+*hdparm-4.6-r1 (12 Mar 2002)
+
+  12 Mar 2002; Daniel Robbins <drobbins@gentoo.org> :
+
+  New hdparm rev.  Order of sed commands reversed, fixing bug #1044.
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index e69de29bb2d1..ebc6cf4697d3 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -0,0 +1,10 @@
+MD5 e08f57b51abd6ee896b7df3255dcaa4a hdparm-5.7-r1.ebuild 1092
+MD5 423c35d3e91e973112859fc023c4bdbf hdparm-5.9.ebuild 1055
+MD5 d183370a379aac7e5c5d277e8e642a76 ChangeLog 9062
+MD5 80ca0963812c5c976a84b5a843b48ece hdparm-6.1.ebuild 988
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 f76a3e6a488511f6064448be47b6ae47 files/digest-hdparm-5.9 61
+MD5 9bab2bbbb6f1f3d23a72da1834b7ce64 files/digest-hdparm-6.1 61
+MD5 f6e1664cbc73c956c98ba69f05c23615 files/hdparm-init-7 2708
+MD5 5f8df0f54a44a97ccf131b4336698128 files/digest-hdparm-5.7-r1 61
+MD5 5246893ec7894ece9bf7a851d11fa18d files/hdparm-conf.d.3 491
diff --git a/sys-apps/hdparm/files/hdparm-conf.d.3 b/sys-apps/hdparm/files/hdparm-conf.d.3
index f356708750a1..a12f2cb780de 100644
--- a/sys-apps/hdparm/files/hdparm-conf.d.3
+++ b/sys-apps/hdparm/files/hdparm-conf.d.3
@@ -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/sys-apps/hdparm/files/hdparm-conf.d.3,v 1.1 2004/08/01 14:43:43 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-conf.d.3,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 # You can either set hdparm arguments for each drive using hdX_args,
 # discX_args, cdromX_args and genericX_args, e.g.
 #
 # hda_args="-d1 -X66"
-# disc1_args"-d1"
+# disc1_args="-d1"
 # cdrom0_args="-d1"
 
 # or, you can set hdparm options for ALL drives using all_args, e.g.
diff --git a/sys-apps/hdparm/files/hdparm-init-7 b/sys-apps/hdparm/files/hdparm-init-7
index 60236bad6f86..e503928b8449 100644
--- a/sys-apps/hdparm/files/hdparm-init-7
+++ b/sys-apps/hdparm/files/hdparm-init-7
@@ -90,7 +90,7 @@ start() {
 				fi
 			done
 
-			[ -z $args ] && for alias in /dev/cdroms/*
+			[ -z "$args" ] && for alias in /dev/cdroms/*
 			do
 				if [ $alias -ef $device ]
 				then
diff --git a/sys-apps/hdparm/hdparm-5.7-r1.ebuild b/sys-apps/hdparm/hdparm-5.7-r1.ebuild
index 9a3c85620f24..7fd86487ce87 100644
--- a/sys-apps/hdparm/hdparm-5.7-r1.ebuild
+++ b/sys-apps/hdparm/hdparm-5.7-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-apps/hdparm/hdparm-5.7-r1.ebuild,v 1.1 2004/09/08 16:22:46 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Utility to change hard drive performance parameters"
 HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -19,8 +19,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i \
-		-e "/^CC/s:gcc:$(gcc-getCC):" \
+		-e "/^CC/s:gcc:$(tc-getCC):" \
 		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
 		Makefile || die
 }
 
@@ -30,20 +31,13 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin hdparm contrib/idectl || die
+	dosbin hdparm contrib/idectl || die "dosbin"
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/hdparm-init-7 hdparm
-
+	newexe ${FILESDIR}/hdparm-init-7 hdparm || die "init.d"
 	insinto /etc/conf.d
 	newins ${FILESDIR}/hdparm-conf.d.3 hdparm
 
 	doman hdparm.8
 	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
 }
-
-pkg_postinst() {
-	einfo "The rc-script for hdparm has been updated, so make sure "
-	einfo "that you etc-update.  The script is much more configurable"
-	einfo "for details please see /etc/conf.d/hdparm"
-}
diff --git a/sys-apps/hdparm/hdparm-5.9.ebuild b/sys-apps/hdparm/hdparm-5.9.ebuild
index ade3815c26e6..77ce9ce921b1 100644
--- a/sys-apps/hdparm/hdparm-5.9.ebuild
+++ b/sys-apps/hdparm/hdparm-5.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-apps/hdparm/hdparm-5.9.ebuild,v 1.1 2005/02/19 20:47:53 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.9.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,17 +10,20 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile || die "sed"
+	sed -i \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		Makefile || die "sed"
 }
 
 src_compile() {
@@ -37,9 +40,3 @@ src_install() {
 	doman hdparm.8
 	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
 }
-
-pkg_postinst() {
-	einfo "The rc-script for hdparm has been updated, so make sure "
-	einfo "that you etc-update.  The script is much more configurable"
-	einfo "for details please see /etc/conf.d/hdparm"
-}
diff --git a/sys-apps/hdparm/hdparm-6.1.ebuild b/sys-apps/hdparm/hdparm-6.1.ebuild
index 30f2a61b0776..967efb0084b1 100644
--- a/sys-apps/hdparm/hdparm-6.1.ebuild
+++ b/sys-apps/hdparm/hdparm-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/sys-apps/hdparm/hdparm-6.1.ebuild,v 1.1 2005/04/24 22:40:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-6.1.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,15 +10,18 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile || die "sed"
+	sed -i \
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		Makefile || die "sed"
 }
 
 src_compile() {
@@ -35,9 +38,3 @@ src_install() {
 	doman hdparm.8
 	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
 }
-
-pkg_postinst() {
-	einfo "The rc-script for hdparm has been updated, so make sure "
-	einfo "that you etc-update.  The script is much more configurable"
-	einfo "for details please see /etc/conf.d/hdparm"
-}
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/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-apps/hdump/ChangeLog b/sys-apps/hdump/ChangeLog
index 1f7966761778..d22b188f3e7b 100644
--- a/sys-apps/hdump/ChangeLog
+++ b/sys-apps/hdump/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/hdump
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdump/ChangeLog,v 1.1 2005/01/07 23:15:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdump/ChangeLog,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 *hdump-1.12 (07 Jan 2005)
 
diff --git a/sys-apps/hdump/Manifest b/sys-apps/hdump/Manifest
index 3d0a20afbae1..1accc70bde74 100644
--- a/sys-apps/hdump/Manifest
+++ b/sys-apps/hdump/Manifest
@@ -1,4 +1,14 @@
-MD5 b741b788826ca140d24828c44b7a98c6 hdump-1.12.ebuild 504
-MD5 172736a4ed6ac80e63c6a1fbe627d301 ChangeLog 387
-MD5 b569bfa4bf7e5a21b59def541bb4ae83 metadata.xml 369
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bdc8835850a01712d90306e95c23d5ec hdump-1.12.ebuild 598
+MD5 7dc3255c70b0dbdf78264e43d160e80b ChangeLog 395
+MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
 MD5 38a6be2660becd7da052413f02d558e7 files/digest-hdump-1.12 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCmeTwI1lqEGTUzyQRAsgRAJ0X8KtEj00aPaIywrIuzQgDNYhtUwCgote+
+skta5uNU6HJUcSiO2v2kcAY=
+=rSgL
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hdump/hdump-1.12.ebuild b/sys-apps/hdump/hdump-1.12.ebuild
index edc6d5de7926..dee36e7eea1c 100644
--- a/sys-apps/hdump/hdump-1.12.ebuild
+++ b/sys-apps/hdump/hdump-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdump/hdump-1.12.ebuild,v 1.1 2005/01/07 23:15:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdump/hdump-1.12.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hdump/metadata.xml b/sys-apps/hdump/metadata.xml
index fa65af46be4e..71d7ba9c0605 100644
--- a/sys-apps/hdump/metadata.xml
+++ b/sys-apps/hdump/metadata.xml
@@ -4,7 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>stuart@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/sys-apps/help2man/ChangeLog b/sys-apps/help2man/ChangeLog
index 87bd7f201091..e46e5978d532 100644
--- a/sys-apps/help2man/ChangeLog
+++ b/sys-apps/help2man/ChangeLog
@@ -1,9 +1,76 @@
 # ChangeLog for sys-apps/help2man
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/ChangeLog,v 1.1 2003/02/05 02:07:03 nall Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/ChangeLog,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> help2man-1.35.1.ebuild:
+  Mark 1.35.1 stable on alpha
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> help2man-1.35.1.ebuild:
+  stable on ia64
+
+  11 Apr 2005; Markus Rothe <corsair@gentoo.org> help2man-1.35.1.ebuild:
+  Stable on ppc64; bug #88648
+
+  12 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> :
+  Fixing digest.
+
+*help2man-1.35.1 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> help2man-1.33.1.ebuild,
+  +help2man-1.35.1.ebuild:
+  Version bump.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> help2man-1.29.ebuild:
+  Don't set RDEPEND="${DEPEND}"
+
+  11 Aug 2004; Hasan Khalil <gongloo@gentoo.org> help2man-1.29.ebuild:
+  Stable on macos.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> help2man-1.33.1.ebuild:
+  Stable on alpha.
+
+*help2man-1.33.1 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> help2man-1.33.1.ebuild:
+  Update version. New version is done by Mr. Bones. <mr_bones_@gentoo.org>. This
+  closes bug #40162.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> help2man-1.29.ebuild:
+  Mark stable on alpha
 
 *help2man-1.29 (03 Feb 2003)
 
+  13 Jun 2003; Guy Martin <gmsoft@gentoo.org> help2man-1.29.ebuild :
+  Added hppa to KEYWORDS.
+
+  02 Apr 2003; Christian Birchinger <joker@gentoo.org> help2man-1.29.ebuild:
+  Added stable sparc keyword
+
+  02 Apr 2003; Rajiv Manglani <rajiv@gentoo.org> help2man-1.29.ebuild:
+  unmasked for ppc.
+
+  09 Mar 2003; Zach Welch <zwelch@gentoo.org> help2man-1.29.ebuild:
+  add arm keyword; fix changelog
+
+  25 Feb 2003; Nicholas Wourms <dragon@gentoo.org> help2man-1.29.ebuild :
+  Marked as stable on mips.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> help2man-1.29.ebuild :
+  Marked as testing for mips.
+
+  23 Feb 2003; Guy Martin <gmsoft@gentoo.org> help2man-1.29.ebuild :
+  Added ~hppa to keywords.
+
+  06 Feb 2003; Aron Griffis <agriffis@gentoo.org> help2man-1.29.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Feb 2003; Seemant Kulleen <seemant@gentoo.org> help2man-1.29.ebuild :
+
+  Added ~sparc to keywords, to allow diffutils to work on sparc.
+
   03 Feb 2003; Jon Nall <nall@gentoo.org> help2man-1.29.ebuild, 
   files/digest-help2man-1.29 :
   Initial import. 
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index e69de29bb2d1..a89cf8982349 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -0,0 +1,8 @@
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 eef540bfdf955d680d8f461f4361037a ChangeLog 2529
+MD5 4e96980c9b1430edd5fa63e0e4b49be2 help2man-1.29.ebuild 580
+MD5 c174e74cf3fb299cc054ba4c136f9d62 help2man-1.35.1.ebuild 826
+MD5 19cbe181dfcd07d1e1fad820af00e69a help2man-1.33.1.ebuild 791
+MD5 b82f50684175358ea878b6f962d37b48 files/digest-help2man-1.35.1 66
+MD5 174fd92d4b9bde16f1f5a3fb01c069ad files/digest-help2man-1.33.1 66
+MD5 6da3242e041f865b2523b9a12bcad64e files/digest-help2man-1.29 64
diff --git a/sys-apps/help2man/files/digest-help2man-1.33.1 b/sys-apps/help2man/files/digest-help2man-1.33.1
index a2841494d282..2da23276a008 100644
--- a/sys-apps/help2man/files/digest-help2man-1.33.1
+++ b/sys-apps/help2man/files/digest-help2man-1.33.1
@@ -1 +1 @@
-MD5 4fd9c94cda2572735790e22e7fce3928 help2man_1.33.1.tar.gz 75293
+MD5 4fd9c94cda2572735790e22e7fce3928 help2man-1.33.1.tar.gz 75293
diff --git a/sys-apps/help2man/help2man-1.29.ebuild b/sys-apps/help2man/help2man-1.29.ebuild
index 3be561cc82c1..698a0f185786 100644
--- a/sys-apps/help2man/help2man-1.29.ebuild
+++ b/sys-apps/help2man/help2man-1.29.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.29.ebuild,v 1.1 2003/02/05 02:07:03 nall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.29.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="http://www.gnu.org/software/help2man"
 SRC_URI="http://ftp.gnu.org/gnu/help2man/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
 IUSE=""
 
-DEPEND="sys-devel/perl"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="dev-lang/perl"
 
 src_install(){
-	into /usr
-	dobin help2man
+	dobin help2man || die
 }
-
diff --git a/sys-apps/help2man/help2man-1.33.1.ebuild b/sys-apps/help2man/help2man-1.33.1.ebuild
index 625bb0a75190..bca2952ffeb7 100644
--- a/sys-apps/help2man/help2man-1.33.1.ebuild
+++ b/sys-apps/help2man/help2man-1.33.1.ebuild
@@ -1,29 +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/sys-apps/help2man/help2man-1.33.1.ebuild,v 1.1 2004/02/08 13:39:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.33.1.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
-MY_P="${P/-/_}"
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="http://www.gnu.org/software/help2man"
-SRC_URI="http://ftp.gnu.org/gnu/help2man/${MY_P}.tar.gz"
+SRC_URI="http://ftp.gnu.org/gnu/help2man/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
 DEPEND="dev-lang/perl
 	nls? ( dev-perl/Locale-gettext
-	       >=sys-devel/gettext-0.12.1-r1 )"
+		>=sys-devel/gettext-0.12.1-r1 )"
 
 src_compile() {
-	econf \
-		`use_enable nls` \
-			|| die
+	econf $(use_enable nls) || die
 	emake || die "emake failed"
 }
 
 src_install(){
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog NEWS README THANKS || die "dodoc failed"
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc ChangeLog NEWS README THANKS
 }
diff --git a/sys-apps/help2man/help2man-1.35.1.ebuild b/sys-apps/help2man/help2man-1.35.1.ebuild
index 718f6ea6f640..753a10c8e494 100644
--- a/sys-apps/help2man/help2man-1.35.1.ebuild
+++ b/sys-apps/help2man/help2man-1.35.1.ebuild
@@ -1,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-apps/help2man/help2man-1.35.1.ebuild,v 1.1 2005/01/12 18:30:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/help2man/help2man-1.35.1.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 DESCRIPTION="GNU utility to convert program --help output to a man page"
 HOMEPAGE="http://www.gnu.org/software/help2man"
@@ -8,7 +8,7 @@ SRC_URI="http://ftp.gnu.org/gnu/help2man/${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 ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl"
diff --git a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/help2man/metadata.xml
+++ b/sys-apps/help2man/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-apps/hexdump/ChangeLog b/sys-apps/hexdump/ChangeLog
index a6b8a8fad10e..89f20f2b33c1 100644
--- a/sys-apps/hexdump/ChangeLog
+++ b/sys-apps/hexdump/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump/ChangeLog,v 1.1 2004/03/04 22:37:21 twp Exp $
+# ChangeLog for sys-apps/hexdump
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump/ChangeLog,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> hexdump-1.6.ebuild:
+  added ~amd64 to KEYWORDS. fixes #79121
+
+  31 Dec 2004; <gongloo@gentoo.org> hexdump-1.6.ebuild:
+  Added ~ppc-macos.
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> hexdump-1.6.ebuild:
+  Stable on ppc64
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> hexdump-1.6.ebuild:
+  Marked ~ppc64; bug #69502
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> hexdump-1.6.ebuild:
+  Masked hexdump-1.6.ebuild stable for ppc
+
+  25 Apr 2004; Guy Martin <gmsoft@gentoo.org> hexdump-1.6.ebuild:
+  Marked stable on hppa.
+
+  12 Apr 2004; <twp@gentoo.org> hexdump-1.6.ebuild:
+  Added IUSE variable. Stable on x86.
 
 *hexdump-1.6 (04 Mar 2004)
 
diff --git a/sys-apps/hexdump/Manifest b/sys-apps/hexdump/Manifest
index 2fdd514f0da9..27712505355a 100644
--- a/sys-apps/hexdump/Manifest
+++ b/sys-apps/hexdump/Manifest
@@ -1,2 +1,4 @@
-MD5 cc99a10cc8691f00b41b716a6b772c20 hexdump-1.6.ebuild 494
+MD5 7b307b2b6e1203b7add4be965d60bee9 hexdump-1.6.ebuild 627
+MD5 5f3bf20f49bc8b1dfe47d82d8b1daefa ChangeLog 1053
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 ee558ae7d87dc0ea559e54aecb585565 files/digest-hexdump-1.6 62
diff --git a/sys-apps/hexdump/hexdump-1.6.ebuild b/sys-apps/hexdump/hexdump-1.6.ebuild
index fc8b9136fdac..c6f04a3e4de2 100644
--- a/sys-apps/hexdump/hexdump-1.6.ebuild
+++ b/sys-apps/hexdump/hexdump-1.6.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump/hexdump-1.6.ebuild,v 1.1 2004/03/04 22:37:21 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump/hexdump-1.6.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Eric Raymond's hex dumper"
 HOMEPAGE="http://www.catb.org/~esr/hexdump/"
 SRC_URI="http://www.catb.org/~esr/hexdump/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+SLOT="0"
+KEYWORDS="hppa ppc x86 ppc64 ~ppc-macos ~amd64"
+IUSE=""
 
 src_compile() {
-	emake CC="$CC $CFLAGS" || die
+	emake CC="$(tc-getCC) $CFLAGS" || die
 }
 
 src_install() {
-	dobin hexdump
+	dobin hexdump || die
 	doman hexdump.1
-	dodoc COPYING README
+	dodoc README
 	dosym hexdump /usr/bin/hex
 }
diff --git a/sys-apps/hotplug-base/ChangeLog b/sys-apps/hotplug-base/ChangeLog
index 1b5507e3ec69..6037b89c8da6 100644
--- a/sys-apps/hotplug-base/ChangeLog
+++ b/sys-apps/hotplug-base/ChangeLog
@@ -1,6 +1,36 @@
-# ChangeLog for sys-apps/hotplug
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug-base/ChangeLog,v 1.1 2004/03/29 23:58:36 gregkh Exp $
+# ChangeLog for sys-apps/hotplug-base
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug-base/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  hotplug-base-20040401.ebuild:
+  Stable on alpha.
+
+  22 Jul 2004; Tom Gall <tgall@gentoo.org> hotplug-base-20040401.ebuild:
+  stable on ppc64
+
+  28 Jun 2004; Joshua Kinard <kumba@gentoo.org> hotplug-base-20040401.ebuild:
+  Marked stable on mips.
+
+  19 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  hotplug-base-20040401.ebuild:
+  Marked stable on amd64.
+
+*hotplug-base-20040401 (15 Apr 2004)
+
+  15 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  hotplug-base-20040401.ebuild:
+  Stable on sparc
+
+  01 Apr 2004; Greg Kroah-Hartman <gregkh@gentoo.org> :
+  version bump for upstream 2004_04_01 release.
+
+  29 Mar 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  hotplug-base-20040329.ebuild:
+  got rid of the post messages ad as they do not make any sense.
 
 *hotplug-base-20040329 (29 Mar 2004)
 
diff --git a/sys-apps/hotplug-base/Manifest b/sys-apps/hotplug-base/Manifest
index dbc42040cec5..3116a6bb43d0 100644
--- a/sys-apps/hotplug-base/Manifest
+++ b/sys-apps/hotplug-base/Manifest
@@ -1,4 +1,14 @@
-MD5 363ff9c040ac122d7ca863072988660e ChangeLog 214
-MD5 6b231e917a1b9d85a7f26bb2184a5560 hotplug-base-20040329.ebuild 865
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 cdf598564a6f23642c5a1c9518432670 files/digest-hotplug-base-20040329 69
+MD5 883b7deeb50c9767ff5dc1270b4362c9 hotplug-base-20040401.ebuild 733
+MD5 2484b2214147df3549e72b45184ed8eb ChangeLog 1457
+MD5 5be3a96d844a1f0db96e2268b94f6094 files/digest-hotplug-base-20040401 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJgYFgIKl8Uu19MoRAoMSAJ0UV7vUTI7PzPMBmLcC0LArNO82MQCffT4N
+2Y/qQlZmoJfIcilRee3irko=
+=pp0x
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hotplug-base/hotplug-base-20040401.ebuild b/sys-apps/hotplug-base/hotplug-base-20040401.ebuild
index 9dcedff0226e..f8e05598ff82 100644
--- a/sys-apps/hotplug-base/hotplug-base-20040401.ebuild
+++ b/sys-apps/hotplug-base/hotplug-base-20040401.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/sys-apps/hotplug-base/hotplug-base-20040401.ebuild,v 1.1 2004/04/01 18:00:28 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug-base/hotplug-base-20040401.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 inherit eutils
 
 # source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
 MY_P=hotplug-${PV:0:4}_${PV:4:2}_${PV:6:2}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Base Hotplug framework"
 HOMEPAGE="http://linux-hotplug.sourceforge.net"
 SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
 
-src_unpack() {
-	unpack ${A}
-}
+S=${WORKDIR}/${MY_P}
 
 src_install() {
 	into /
-	dosbin sbin/hotplug
-	keepdir /etc/hotplug.d/
+	dosbin sbin/hotplug || die
+	keepdir /etc/hotplug.d
 }
-
diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 4a77c915a32c..3b6a69a0ffb1 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,10 +1,296 @@
 # ChangeLog for sys-apps/hotplug
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.1 2002/02/25 02:13:12 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
+
+*hotplug-20040923-r1 (19 Jul 2005)
+
+  19 Jul 2005; <brix@gentoo.org> +files/hotplug-ifrename.patch,
+  +hotplug-20040923-r1.ebuild:
+  The ifrename utility is now in /sbin/, not /usr/sbin/, bug #96654.
+
+  05 Feb 2005; Markus Rothe <corsair@gentoo.org> hotplug-20040923.ebuild:
+  Stable on ppc64
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/hotplug.rc:
+  Updated hotplug.rc to display a message about unpacking the firmware.
+
+  27 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/hotplug.rc.empty:
+  Fixed typo.
+
+  23 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/hotplug.rc.empty:
+  Updated hotplug.rc.empty to unpack firmware tarball. This is used by the
+  LiveCD to allow /lib/firmware to be tmpfs without losing any firmwares that
+  were installed on the LiveCD and allows users to provide their own
+  firmwares.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> hotplug-20040923.ebuild:
+  Stable on ppc.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Nov 2004; Jason Huebel <jhuebel@gentoo.org> hotplug-20040923.ebuild:
+  stable on amd64
+
+  23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  hotplug-20040923.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> hotplug-20040923.ebuild:
+  Stable on sparc
+
+  12 Nov 2004; Daniel Drake <dsd@gentoo.org> hotplug-20040923.ebuild:
+  Update coldplug warning message to suggest coldplug to go into boot runlevel
+
+  11 Nov 2004; Daniel Drake <dsd@gentoo.org> hotplug-20040923.ebuild:
+  Make coldplug warning message more detailed, bug 70793
+
+  11 Nov 2004; Joshua Kinard <kumba@gentoo.org> hotplug-20040923.ebuild:
+  Marked stable on mips.
+
+  10 Nov 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  hotplug-20040923.ebuild:
+  20040923 marked stable on x86
+
+  22 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> files/hotplug.rc:
+  Added a check for livecd firmware tarball on disk.
+
+  14 Oct 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  hotplug-20040923.ebuild:
+  add ~ppc64 to hotplug-20040923.ebuild
+
+*hotplug-20040923 (23 Sep 2004)
+
+  23 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +files/isapnp.rc.empty,
+  +hotplug-20040923.ebuild:
+  New release, fixes the isapnp.rc bug.
+  Also explicitly call out the coldplug package, and the
+  /lib/firmware move.
+
+*hotplug-20040920 (20 Sep 2004)
+
+  20 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +files/hotplug.rc.empty,
+  +hotplug-20040920.ebuild:
+  Oh yeah, /etc/init.d/hotplug doesn't do anything anymore.
+  Use the coldplug package for loading modules at boot time
+  based on the devices in your system.
+
+*hotplug-20040920 (20 Sep 2004)
+
+  20 Sep 2004; Greg Kroah-Hartman <gregkh@gentoo.org> +files/hotplug.rc.empty,
+  +hotplug-20040920.ebuild:
+  new upstream release.  Fixes lots of Gentoo reported bugs.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  hotplug-20040401.ebuild:
+  Masked hotplug-20040401.ebuild stable for ppc
+
+  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> hotplug-20040401.ebuild:
+  Stable on alpha.
+
+  17 Aug 2004; Guy Martin <gmsoft@gentoo.org> hotplug-20040401.ebuild:
+  Marked stable on hppa.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> hotplug-20030805-r2.ebuild,
+  hotplug-20030805-r3.ebuild, hotplug-20040105.ebuild,
+  hotplug-20040401.ebuild:
+  sync IUSE (missing), trim trailing whitespace
+
+  22 Jun 2004; <malc@gentoo.org> hotplug-20040401.ebuild:
+  Mark stable on amd64
+
+  07 May 2004; Greg Kroah-Hartman <gregkh@gentoo.org> hotplug-20040401.ebuild:
+  fix bug #50376 to the hotplug-20040401.ebuild file
+  (very minor, doesn't deserve a bump.)
+
+  07 May 2004; Greg Kroah-Hartman <gregkh@gentoo.org>
+  -hotplug-20020826-r2.ebuild, -hotplug-20030501-r2.ebuild,
+  -hotplug-20030805-r1.ebuild, -hotplug-20030805.ebuild,
+  -hotplug-20040311.ebuild, -hotplug-20040329.ebuild:
+  removed a bunch of old .ebuilds
+
+  15 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> hotplug-20040401.ebuild:
+  Stable on sparc
+
+  12 Apr 2004; Greg Kroah-Hartman <gregkh@gentoo.org> hotplug-20040401.ebuild:
+  marked stable on x86
+
+*hotplug-20040401 (01 Apr 2004)
+
+  01 Apr 2004; Greg Kroah-Hartman <gregkh@gentoo.org> hotplug-20040401.ebuild:
+  2004_04_01 version bump, which includes all Gentoo specific patches are
+  now pushed into the upstream package, making my life a whole lot easier :)
+  
+  This fixes a number of usb and network hotplug bugs with the previous
+  hotplug package.
+
+  29 Mar 2004; Greg Kroah-Hartman <gregkh@gentoo.org> files/hotplug.rc:
+  Change the hotplug init.d script to show what subsystem it is starting
+  and stopping to help out in finding problems (and letting people know
+  exactly what is happening on their systems.)
+
+*hotplug-20040329 (29 Mar 2004)
+
+  29 Mar 2004; Greg Kroah-Hartman <gregkh@gentoo.org> hotplug-20040329.ebuild,
+  metadata.xml:
+  2004_03_29 updated.  Also split the /sbin/hotplug part off to hotplug-base
+  package.
+
+  22 Mar 2004; Joshua Kinard <kumba@gentoo.org> hotplug-20040311.ebuild:
+  Added ~mips to KEYWORDS.
+
+*hotplug-20040311 (11 Mar 2004)
+
+  11 Mar 2004; Brian Jackson <iggy@gentoo.org> hotplug-20040311.ebuild:
+  version bump
+
+  29 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> hotplug-20040105.ebuild:
+  Stable on sparc
+
+  22 Feb 2004; Aron Griffis <agriffis@gentoo.org> hotplug-20040105.ebuild:
+  stable on alpha
+
+  18 Feb 2004; Aron Griffis <agriffis@gentoo.org> hotplug-20040105.ebuild:
+  stable on ia64
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> hotplug-20030805-r3.ebuild:
+  Marked stable on sparc.
+
+*hotplug-20040105 (06 Jan 2004)
+
+  06 Jan 2004; Martin Schlemmer <azarah@gentoo.org> hotplug-20040105.ebuild:
+  Update version.  Add extra 2.6 patch from Mans Rullgard <mru@kth.se>.
+  Fix copyright date.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> hotplug-20030805-r2.ebuild:
+  Marked stable on hppa.
+
+*hotplug-20030805-r3 (21 Dec 2003)
+
+  21 Dec 2003; Daniel Robbins <drobbins@gentoo.org> hotplug-20030805-r3.ebuild:
+  New patch to allow hotplug to work with kernel 2.6. This is needed to patch
+  around some unfinished code in the hotplug sources.
+
+*hotplug-20030805-r2 (12 Nov 2003)
+
+  12 Nov 2003; Daniel Robbins <drobbins@gentoo.org> hotplug-20030805-r2.ebuild:
+  close bug #32864 (add firmware.agent.) And also remove hotplug code that adds
+  incredibly long timeout on /etc/init.d/hotplug start. I'm unmasking this on
+  x86 since these two fixes are needed by users (firmware.agent for prism54 
+  module users and to avoid the long hotplug startup delay that nearly every
+  Gentoo user is experiencing.)
+
+*hotplug-20030805-r1 (24 Sep 2003)
+
+  24 Sep 2003; Aron Griffis <agriffis@gentoo.org> hotplug-20030805-r1.ebuild,
+  files/hotplug.functions.patch:
+  Add patch to fix bogus error messages from hotplug.functions
+
+*hotplug-20030805 (13 Sep 2003)
+
+  13 Sep 2003; Seemant Kulleen <seemant@gentoo.org> hotplug-20030805.ebuild :
+
+  Version bump.  Thanks to: Jason Andryuk <the_deuce@yahoo.com> in bug
+  #26944
+
+
+
+  07 Aug 2003; Tavis Ormandy <taviso@gentoo.org> hotplug-20020826-r2.ebuild:
+  ~alpha
+
+  02 Jul 2003; Jason Wever <weeve@gentoo.org> hotplug-20030501-r2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  11 Jun 2003; Jason Wever <weeve@gentoo.org> hotplug-20030501-r2.ebuild:
+  Added ~sparc to keywords.
+
+*hotplug-20030501-r2 (11 Jun 2003)
+
+  28 Jul 2003; Guy Martin <gmsoft@gentoo.org> hotplug-20030501-r2.ebuild :
+  Added hppa to KEYWORDS.
+
+  11 Jun 2003; Daniel Robbins <drobbins@gentoo.org> hotplug-20030501-r2.ebuild:
+  Now creates /var/run/usb directory, closing bug #21877. Unmasking on x86.
+  
+  10 Jun 2003; <msterret@gentoo.org> hotplug-20020826-r1.ebuild,
+  hotplug-20020826-r2.ebuild, hotplug-20020826.ebuild: DEPEND on sed >= 4
+
+*hotplug-20030501-r1 (27 May 2003)
+
+  27 May 2003; Zach Welch <zwelch@gentoo.org hotplug-20030501-r1.ebuild:
+  revision bump to add patch to fix bug 20846
+
+*hotplug-20030501 (03 May 2003)
+
+  03 May 2003; Martin Schlemmer <azarah@gentoo.org> hotplug-20030501.ebuild:
+  Update version.
+
+*hotplug-20020826-r2 (26 Mar 2003)
+
+  26 Mar 2003; Wout Mertens <wmertens@gentoo.org> hotplug-20020826-r2.ebuild :
+  fix bug 14175
+  Made the net.agent more sane in dealing with the Gentoo initscripts
+
+*hotplug-20020826-r1 (18 Mar 2003)
+
+  25 Mar 2003; Guy Martin <gmsoft@gentoo.org> hotplug-20020826-r1.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  18 Mar 2003; Zach Welch <zwelch@gentoo.org> hotplug-20020826-r1.ebuild:
+  fix bug 17799
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*hotplug-20020826 (18 Oct 2002)
+
+  14 Mar 2003; Zach Welch <zwelch@gentoo.org> hotplug-20020826.ebuild:
+  mark latest hotplug version stable for x86 and PPC
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> hotplug-20020114.ebuild,
+  hotplug-20020401-r1.ebuild, hotplug-20020401.ebuild,
+  hotplug-20020401.ebuild, hotplug-20020826.ebuild,
+  files/hotplug-20020401-net.agent-gentoo.diff,
+  files/hotplug-20020401-pci.rc-gentoo.diff,
+  files/hotplug-20020401-usb.agent-gentoo.diff,
+  files/hotplug-20020401-usb.rc-gentoo.diff,
+  files/hotplug-20020826-net.agent-gentoo.diff,
+  files/hotplug-20020826-pci.rc-gentoo.diff,
+  files/hotplug-20020826-usb.agent-gentoo.diff,
+  files/hotplug-20020826-usb.rc-gentoo.diff, files/hotplug.rc, files/pci.rc,
+  files/usb.conf, files/usb.rc:
+  moved patches out to mirrors, and better manipulation thanks to carpaski;
+  finally, use epatch instead
+
+  18 Oct 2002; Zach Welch <zwelch@gentoo.org> hotplug-20020826.build :
+  New version; includes gentoo agent fixes in hotplug-20020401-r1
+
+*hotplug-20020401-r1 (18 Oct 2002)
+
+  18 Oct 2002; Zach Welch <zwelch@gentoo.org> hotplug-20020401-r1.ebuild :
+  Fixed bug 8074.  Fix similar bug in usb.agent.  Bump ebuild rev!!
+
+*hotplug-20020401 (5 May 2002)
+
+  11 Aug 2002; phoen][x <phoenix@gentoo.org> hotplug-20020401.ebuild :
+  Fixed bug 6183.
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> hotplug-20020401.ebuild :
+  Added KEYWORDS, SLOT.
+  New version
+
+  11 May 2002; Wout Mertens <wmertens@gentoo.org> files/hotplug.rc :
+  Fixed error condition detection
 
 *hotplug-20020114 (24 Feb 2002)
 
-  24 Feb 2002; Bruce A. Locke <blocke@shivan.org> hotplug-20020114.ebuild :
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> hotplug-20020114.ebuild :
+  Added KEYWORDS, SLOT.
 
+  24 Feb 2002; Bruce A. Locke <blocke@shivan.org> hotplug-20020114.ebuild :
   Hotplug ebuild contributed by folokai@earthlink.net (Scott Worley)
 
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index 774fad7f9c32..2cc6c06ca1c9 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,15 +1,25 @@
-MD5 191555bb6392cc189a213dd76f6e0e93 ChangeLog 2748
-MD5 4add5675ce1bf7372ff9189f27c2317a hotplug-20020114.ebuild 1492
-MD5 ff4869e458ad17b4691293ed22b2fcc7 hotplug-20020401-r1.ebuild 1467
-MD5 02124e816a7016f6bf2e311b2fa77155 hotplug-20020826.ebuild 1451
-MD5 09df0a0f546f1510c00b7d18f2bed59e hotplug-20020826-r1.ebuild 1534
-MD5 7d09501e89c7ce3d827df2c465697e3b hotplug-20020826-r2.ebuild 1544
-MD5 ca9d88bcdd0d17fc4ff1b26537634dd2 hotplug-20030501.ebuild 1493
-MD5 10416619e5f14f1caf896f6308d526c2 files/hotplug.rc 714
-MD5 4983c0405e4fc821845e2c9343a231db files/digest-hotplug-20020114 139
-MD5 33e6f646216d36a204824279969f135c files/digest-hotplug-20030501 151
-MD5 208b61d039c5210217e7e9c850cb33aa files/digest-hotplug-20020401-r1 221
-MD5 64aa2a1e7fb2526bb52c6fd4b5f24608 files/digest-hotplug-20020826 221
-MD5 64aa2a1e7fb2526bb52c6fd4b5f24608 files/digest-hotplug-20020826-r1 221
-MD5 0e5a1a005fcfa0e242be02e9ef99de7a files/digest-hotplug-20020826-r2 224
+MD5 202a004e172f89f30aced13cc1ee5295 hotplug-20040401.ebuild 1519
+MD5 aeb339e3069f34450fae45734f9db531 hotplug-20030805-r2.ebuild 1881
+MD5 3090ae95c340e913c9c10dbf241f09d5 hotplug-20040923.ebuild 2220
+MD5 6479120b47a2391964265eae353dc3af hotplug-20040105.ebuild 1718
+MD5 8ea3943b3d17011f1307236a2d03c89b hotplug-20040920.ebuild 1838
+MD5 522378c432e3f4d6bf3c17a7f23b6659 ChangeLog 10580
+MD5 ea1ab5d6093a49e4e604de8928a5ef77 hotplug-20040923-r1.ebuild 2260
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+MD5 b14f7777f9ac962ce85e6b0ad0a473ec hotplug-20030805-r3.ebuild 1921
+MD5 f9303a2467242ed310370ddcd63414b6 files/digest-hotplug-20040105 151
+MD5 5be3a96d844a1f0db96e2268b94f6094 files/digest-hotplug-20040401 69
+MD5 6038bb8c3af43a0e6f0aa876e4307df6 files/digest-hotplug-20040920 69
+MD5 8cecfadba72f89724706c45119b15e49 files/digest-hotplug-20040923 69
+MD5 8cecfadba72f89724706c45119b15e49 files/digest-hotplug-20040923-r1 69
+MD5 9c876c8880bba306cbf8892253ada03e files/hotplug.rc.empty 1076
+MD5 9f13f3363b85caac03bfb623c652b4fa files/kernel-26-fix.patch 816
+MD5 d41d8cd98f00b204e9800998ecf8427e files/isapnp.rc.empty 0
 MD5 1bd9ddb0959318fe56dec239c8265fb1 files/usb.confd 291
+MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r2 151
+MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r3 151
+MD5 d8a0d8878d8904a779bda401d86268b1 files/firmware.agent 1188
+MD5 7c4681458effb34f299cbc4b9245098c files/hotplug.functions.patch 522
+MD5 13767799826493eb3260822359b35a18 files/hotplug.rc 1017
+MD5 26bdc7a660920610447194535ff8b341 files/hotplug-ifrename.patch 837
+MD5 92547b2263d5423d874565504d2324f7 files/usb.agent.diff 886
diff --git a/sys-apps/hotplug/files/firmware.agent b/sys-apps/hotplug/files/firmware.agent
index 129009fab179..cda3e7b7eb2c 100644
--- a/sys-apps/hotplug/files/firmware.agent
+++ b/sys-apps/hotplug/files/firmware.agent
@@ -12,7 +12,7 @@
  #
  # 24-Jul-2003   Initial version of "new" hotplug agent.
  #
- # $Id: firmware.agent,v 1.1 2003/11/13 04:30:20 drobbins Exp $
+ # $Id: firmware.agent,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
  #
  
  cd /etc/hotplug
diff --git a/sys-apps/hotplug/files/hotplug.rc b/sys-apps/hotplug/files/hotplug.rc
index 7e7c0509ae93..902abc3e7104 100644
--- a/sys-apps/hotplug/files/hotplug.rc
+++ b/sys-apps/hotplug/files/hotplug.rc
@@ -1,51 +1,49 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 depend() {
 	need modules
 }
 
 checkconfig() {
-	if [ ! -d /etc/hotplug ]
-	then
-		eerror "USB Hotplug requires scripts & configs in /etc/hotplug !"
+	if [ ! -d /etc/hotplug ] ; then
+		eerror "Hotplug requires scripts & configs in /etc/hotplug !"
 		return 1
 	fi
 }
 
 start() {
-	local error
 	checkconfig || return 1
-	ebegin "Starting USB Hotplug "
+
+	if [ -e /usr/lib/hotplug/firmware.tar.bz2 ]
+	then
+		ebegin "Unpacking hotplug firmware"
+		tar xjf /usr/lib/hotplug/firmware.tar.bz2 -C \
+			/usr/lib/hotplug/firmware
+		eend 0
+	fi
+
 	for RC in /etc/hotplug/*.rc
 	do
+		NAME=`basename $RC .rc`
+		ebegin "Starting $NAME hotplugging"
+		# We do not want to check the return status, as
+		# some of the scripts may fail due to drivers not
+		# compiled as modules ...
 		$RC start
-		error=$?
-		if [ error ]
-		then
-			eend ${error} "hotplug script $RC failed at start "
-			return 1
-		fi
+		eend 0
 	done
-	touch /var/lock/subsys/hotplug
-	eend
 }
 
 stop() {
 	local error
-	checkconfig || return 1
-	ebegin "Stopping USB Hotplug "
 	for RC in /etc/hotplug/*.rc
 	do
+		NAME=`basename $RC .rc`
+		ebegin "Stopping $NAME hotplugging"
 		$RC stop
-		error=$?
-		if [ error ]
-		then
-			eend ${error} "hot plug script $RC failed at stop "	
-			return 1					
-		fi
+		eend 0
 	done
-	rm -f /var/lock/subsys/hotplug
-	eend
 }
-
-
diff --git a/sys-apps/hotplug/files/hotplug.rc.empty b/sys-apps/hotplug/files/hotplug.rc.empty
index 451e641a0b65..0b8549dd9fc8 100644
--- a/sys-apps/hotplug/files/hotplug.rc.empty
+++ b/sys-apps/hotplug/files/hotplug.rc.empty
@@ -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-apps/hotplug/files/hotplug.rc.empty,v 1.1 2004/09/21 00:13:47 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc.empty,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
 #
 # nothing here anymore. Please use the coldplug package if you really want to
@@ -24,4 +24,11 @@ start () {
 		eerror "CONFIG_HOTPLUG not enabled for this kernel!"
 		return 1
 	fi
+	# This unpacks any firmware tarballs.  Used for LiveCD.
+	if [ -e /lib/firmware.tar.bz2 ]
+	then
+		ebegin "Unpacking hotplug firmware"
+		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
+		eend 0
+	fi
 }
diff --git a/sys-apps/hotplug/hotplug-20030805-r2.ebuild b/sys-apps/hotplug/hotplug-20030805-r2.ebuild
index 6ccba2dfa5f4..124b30cc3b02 100644
--- a/sys-apps/hotplug/hotplug-20030805-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r2.ebuild,v 1.1 2003/11/13 04:30:20 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc ~hppa ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 amd64 ~ppc hppa ~sparc ~alpha ppc64"
+IUSE=""
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9"
@@ -62,4 +63,3 @@ pkg_postinst() {
 	ewarn "WARNING: The fxload program was spliced off this package"
 	ewarn "WARNING: emerge fxload if you need it"
 }
-
diff --git a/sys-apps/hotplug/hotplug-20030805-r3.ebuild b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
index c583a54fe2f6..f204f3b52aa4 100644
--- a/sys-apps/hotplug/hotplug-20030805-r3.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r3.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/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.1 2003/12/22 04:12:36 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc hppa ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 amd64 ~ppc hppa sparc ~alpha"
+IUSE=""
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9"
@@ -63,4 +64,3 @@ pkg_postinst() {
 	ewarn "WARNING: The fxload program was spliced off this package"
 	ewarn "WARNING: emerge fxload if you need it"
 }
-
diff --git a/sys-apps/hotplug/hotplug-20040105.ebuild b/sys-apps/hotplug/hotplug-20040105.ebuild
index 5ec911fd0ed1..07a7a51a9e4d 100644
--- a/sys-apps/hotplug/hotplug-20040105.ebuild
+++ b/sys-apps/hotplug/hotplug-20040105.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-apps/hotplug/hotplug-20040105.ebuild,v 1.1 2004/01/06 00:19:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040105.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~hppa ~sparc ~alpha ~mips ~arm"
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
+IUSE=""
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
 DEPEND=">=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9"
@@ -58,4 +59,3 @@ pkg_postinst() {
 	ewarn "WARNING: The fxload program was spliced off this package"
 	ewarn "WARNING: emerge fxload if you need it"
 }
-
diff --git a/sys-apps/hotplug/hotplug-20040401.ebuild b/sys-apps/hotplug/hotplug-20040401.ebuild
index ac9c5ce944c5..eff976c4c644 100644
--- a/sys-apps/hotplug/hotplug-20040401.ebuild
+++ b/sys-apps/hotplug/hotplug-20040401.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-apps/hotplug/hotplug-20040401.ebuild,v 1.1 2004/04/01 18:13:58 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040401.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
@@ -13,10 +13,13 @@ SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~mips"
+IUSE=""
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
-DEPEND=">=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9 hotplug-base"
+DEPEND=">=sys-apps/pciutils-2.1.9
+	>=sys-apps/usbutils-0.9
+	sys-apps/hotplug-base"
 
 src_unpack() {
 	unpack ${A}
@@ -54,4 +57,3 @@ pkg_postinst() {
 	ewarn "WARNING: The fxload program was spliced off this package"
 	ewarn "WARNING: emerge fxload if you need it"
 }
-
diff --git a/sys-apps/hotplug/hotplug-20040920.ebuild b/sys-apps/hotplug/hotplug-20040920.ebuild
index 0b54bdcf6f75..287f52be561d 100644
--- a/sys-apps/hotplug/hotplug-20040920.ebuild
+++ b/sys-apps/hotplug/hotplug-20040920.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/hotplug/hotplug-20040920.ebuild,v 1.1 2004/09/21 00:13:46 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040920.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20040923-r1.ebuild b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
index f1a725a0b9a7..c1f0567478a0 100644
--- a/sys-apps/hotplug/hotplug-20040923-r1.ebuild
+++ b/sys-apps/hotplug/hotplug-20040923-r1.ebuild
@@ -1,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-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.1 2005/07/19 18:34:28 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hotplug/hotplug-20040923.ebuild b/sys-apps/hotplug/hotplug-20040923.ebuild
index 635ac381f7ed..980c70cfac30 100644
--- a/sys-apps/hotplug/hotplug-20040923.ebuild
+++ b/sys-apps/hotplug/hotplug-20040923.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/hotplug/hotplug-20040923.ebuild,v 1.1 2004/09/23 19:13:35 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit eutils
 
@@ -11,9 +11,9 @@ DESCRIPTION="USB and PCI hotplug scripts"
 HOMEPAGE="http://linux-hotplug.sourceforge.net"
 SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 # hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
@@ -61,12 +61,13 @@ pkg_postinst() {
 	ewarn "WARNING: The hotplug init script is now gone (dead and burried.)"
 	ewarn "WARNING: If you want to load modules for hardware that was already"
 	ewarn "WARNING: discovered at boot time, like the old hotplug init script"
-	ewarn "WARNING: did, then emerge the coldplug package."
-	ewarn ""
+	ewarn "WARNING: did, then emerge the coldplug package, and add coldplug to"
+	ewarn "WARNING: a runlevel, e.g. # rc-update add coldplug boot"
+	echo
 	ewarn "WARNING: All firmware loaded by the hotplug scripts needs to be"
 	ewarn "WARNING: moved to the /lib/firmware directory, as the scripts now"
 	ewarn "WARNING: expect it to be in that location."
-	ewarn ""
+	echo
 	ewarn "If you still have the file /etc/hotplug/isapnp.rc on your system,"
 	ewarn "please delete it by hand, the file /etc/hotplug/pnp.rc superseeds it."
 }
diff --git a/sys-apps/hotplug/metadata.xml b/sys-apps/hotplug/metadata.xml
index f093d416cbb1..1e43b9dfc9ff 100644
--- a/sys-apps/hotplug/metadata.xml
+++ b/sys-apps/hotplug/metadata.xml
@@ -1,7 +1,9 @@
- * 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>
+<maintainer>
+  <email>gregkh@gentoo.org</email>
+  <name>Greg Kroah-Hartman</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/hprofile/ChangeLog b/sys-apps/hprofile/ChangeLog
index 1bb9e66573d8..eab7eec451d7 100644
--- a/sys-apps/hprofile/ChangeLog
+++ b/sys-apps/hprofile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hprofile
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hprofile/ChangeLog,v 1.1 2004/10/10 00:57:59 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hprofile/ChangeLog,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
+
+  14 May 2005; Simon Stelling <blubb@gentoo.org> hprofile-2.0_beta2.ebuild:
+  added ~amd64 keyword
 
 *hprofile-2.0_beta2 (09 Oct 2004)
 
diff --git a/sys-apps/hprofile/Manifest b/sys-apps/hprofile/Manifest
index 85d26f6fa632..e42df0d03a89 100644
--- a/sys-apps/hprofile/Manifest
+++ b/sys-apps/hprofile/Manifest
@@ -1,2 +1,4 @@
-MD5 8d20e7431f41b2063302329e3bf21ff9 hprofile-2.0_beta2.ebuild 2265
+MD5 cdd96d44a4a6697e521c3026d288a937 ChangeLog 454
+MD5 1679f8a86b4204771e2e7f4ace7a4740 hprofile-2.0_beta2.ebuild 1881
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 16e617a2b23310082c5b1b051f27f94b files/digest-hprofile-2.0_beta2 69
diff --git a/sys-apps/hprofile/hprofile-2.0_beta2.ebuild b/sys-apps/hprofile/hprofile-2.0_beta2.ebuild
index 00179655f781..bd0645d06cd8 100644
--- a/sys-apps/hprofile/hprofile-2.0_beta2.ebuild
+++ b/sys-apps/hprofile/hprofile-2.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/hprofile/hprofile-2.0_beta2.ebuild,v 1.1 2004/10/10 00:57:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hprofile/hprofile-2.0_beta2.ebuild,v 1.1.1.1 2005/11/30 09:56:55 chriswhite Exp $
 
 DESCRIPTION="Utility to manage hardware, network, power or other profiles"
 HOMEPAGE="http://hprofile.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/hprofile/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=">=app-shells/bash-2.0
diff --git a/sys-apps/hwdata-knoppix/ChangeLog b/sys-apps/hwdata-knoppix/ChangeLog
index dca0ec39b62e..df109ed8afba 100644
--- a/sys-apps/hwdata-knoppix/ChangeLog
+++ b/sys-apps/hwdata-knoppix/ChangeLog
@@ -1,8 +1,105 @@
-# ChangeLog for sys-apps/bash
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/ChangeLog,v 1.1 2003/03/03 05:08:17 livewire Exp $
+# ChangeLog for sys-apps/hwdata-knoppix
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/ChangeLog,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
-*hwdata-1.0 (02 March 2003)
+  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Added hwdata-gentoo to blocks.
+
+  16 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Added blocker for sys-apps/hwdata.
+
+  12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Added ia64 on request from plasmaroo.
+
+  30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Marking stable on sparc for 2005.1, blame gustavoz.
+
+  23 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Changed to only apply binary_drivers patch on x86/amd64.
+
+  22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Added ~sparc on request of gustavoz.
+
+  31 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Removing Cards link and closing bug #75733.
+
+  31 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -hwdata-knoppix-0.8.ebuild, -hwdata-knoppix-0.95.ebuild:
+  Cleaning up older ebuilds.
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Stable on ppc64
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  hwdata-knoppix-0.107-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*hwdata-knoppix-0.107-r1 (10 Dec 2004)
+
+  10 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +hwdata-knoppix-0.107-r1.ebuild, -hwdata-knoppix-0.107.ebuild:
+  Bumping to latest revision.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  hwdata-knoppix-0.107.ebuild:
+  Masked hwdata-knoppix-0.107.ebuild stable for ppc
+
+  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  hwdata-knoppix-0.107.ebuild:
+  Stable on alpha.
+
+  30 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/hwdata-knoppix-0.107-binary_drivers.patch,
+  hwdata-knoppix-0.107.ebuild:
+  Added a patch to enable support for detection of ati and nvidia binary drivers
+  if both livecd and opengl in USE.
+
+  02 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107.ebuild:
+  Adding ~alpha since it was in previous ebuilds and there is alpha-compatable
+  hardware listed.
+
+  30 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107.ebuild, hwdata-knoppix-0.8.ebuild,
+  hwdata-knoppix-0.95.ebuild:
+  QA cleanup
+
+  21 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  hwdata-knoppix-0.107.ebuild:
+  Stabilizing on x86.
+
+*hwdata-knoppix-0.107 (14 May 2004)
+
+  14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +hwdata-knoppix-0.107.ebuild:
+  Adding 0.107 version.  All arches please test.
+
+  14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
+  Changing maintainers to newly formed livecd herd.
+
+  23 Mar 2004; John Davis <zhen@gentoo.org> hwdata-knoppix-0.95.ebuild:
+  bumping to x86 stable
+
+  21 Mar 2004; David Holm <dholm@gentoo.org> hwdata-knoppix-0.95.ebuild:
+  Added to ~ppc.
+
+*hwdata-knoppix-0.95 (20 Mar 2004)
+
+  20 Mar 2004; John Davis <zhen@gentoo.org> hwdata-knoppix-0.95.ebuild:
+  version bump - thanks too all of the people involved in bug #32218
+
+*hwdata-knoppix-0.8 (02 March 2003)
 
   03 March 2003;  <livewire@gentoo.org>:
 
diff --git a/sys-apps/hwdata-knoppix/Manifest b/sys-apps/hwdata-knoppix/Manifest
index e69de29bb2d1..858f464ab559 100644
--- a/sys-apps/hwdata-knoppix/Manifest
+++ b/sys-apps/hwdata-knoppix/Manifest
@@ -0,0 +1,5 @@
+MD5 f3854d5c462a234f778d22b23af47972 ChangeLog 3511
+MD5 83726b4e2a07fe0c8b3eca8433bf2648 files/digest-hwdata-knoppix-0.107-r1 74
+MD5 66b28b078d17b41b283267375957ec8f files/hwdata-knoppix-0.107-binary_drivers.patch 3363
+MD5 862a5789d71bead5287e2342850421f4 hwdata-knoppix-0.107-r1.ebuild 991
+MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
diff --git a/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107-r1.ebuild b/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107-r1.ebuild
index 0b49beb10734..71fb85ec35f8 100644
--- a/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107-r1.ebuild
+++ b/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107-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/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107-r1.ebuild,v 1.1 2004/12/10 19:55:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-knoppix/hwdata-knoppix-0.107-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
 inherit eutils
 
@@ -10,22 +10,24 @@ SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
 HOMEPAGE="http://www.knopper.net"
 
 IUSE="opengl livecd"
-KEYWORDS="x86 ppc amd64 alpha"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND=""
-RDEPEND=""
+DEPEND="!sys-apps/hwdata
+	!sys-apps/hwdata-gentoo"
 
 src_unpack() {
 	unpack ${A}
-	use livecd && use opengl && epatch ${FILESDIR}/${P}-binary_drivers.patch
+	if use x86 || use amd64; then
+		if use livecd && use opengl; then
+			epatch ${FILESDIR}/${P}-binary_drivers.patch || die "patching"
+		fi
+	fi
 }
 
 src_install() {
 	dodoc debian/README.build debian/changelog debian/control debian/copyright debian/mergepcitable
-	dodir /usr/X11R6/lib/X11/
-	ln -s ../../../share/hwdata/Cards ${D}/usr/X11R6/lib/X11/Cards
 	insinto /usr/share/hwdata
 	doins debian/pcitable-knoppix CardMonitorCombos Cards MonitorsDB pci.ids pcitable upgradelist usb.ids
 }
diff --git a/sys-apps/hwdata-knoppix/metadata.xml b/sys-apps/hwdata-knoppix/metadata.xml
index f093d416cbb1..88653ddd7172 100644
--- a/sys-apps/hwdata-knoppix/metadata.xml
+++ b/sys-apps/hwdata-knoppix/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>livecd</herd>
 </pkgmetadata>
diff --git a/sys-apps/hwinfo/ChangeLog b/sys-apps/hwinfo/ChangeLog
index 947f42775b18..84e09e350e85 100644
--- a/sys-apps/hwinfo/ChangeLog
+++ b/sys-apps/hwinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hwinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.1 2005/07/04 01:01:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
+
+  04 Jul 2005; David Holm <dholm@gentoo.org> hwinfo-8.38.ebuild:
+  Added to ~ppc.
 
 *hwinfo-8.38 (04 Jul 2005)
 
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 5619527459b0..fff0a0f96fb7 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,5 @@
-MD5 df62380a6c05aa90b39a98efa3e6e733 hwinfo-8.38.ebuild 976
-MD5 9bf18c38512621782e2f300bdf133d38 files/hwinfo-8.38-makefile-fixes.patch 2119
+MD5 2fac8e80743197100e580e82a9a495b2 ChangeLog 636
+MD5 e614d3fa834eb77b781bf692a14442b6 hwinfo-8.38.ebuild 1068
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 d2128a1dac4f1bc44f7184145687bd22 files/digest-hwinfo-8.38 63
-MD5 af6da2fef46c9c9a1d0d6b1922b3d534 files/digest-hwinfo-8.51 64
-MD5 42a7b01b1ec6e9d265716552e95d2702 files/digest-hwinfo-10.16 67
+MD5 9bf18c38512621782e2f300bdf133d38 files/hwinfo-8.38-makefile-fixes.patch 2119
diff --git a/sys-apps/hwinfo/hwinfo-8.38.ebuild b/sys-apps/hwinfo/hwinfo-8.38.ebuild
index 37bbff8a5558..0fe94629b45e 100644
--- a/sys-apps/hwinfo/hwinfo-8.38.ebuild
+++ b/sys-apps/hwinfo/hwinfo-8.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-apps/hwinfo/hwinfo-8.38.ebuild,v 1.1 2005/07/04 01:01:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-8.38.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ DEBIAN_PV="3"
 SRC_URI="ftp://ftp.iqchoice.com/pub/people/rail/gmso/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND="sys-fs/sysfsutils"
 
diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index a4d6ffa968ba..198a706be64c 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,109 @@
-# ChangeLog for sys-apps/bash
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.1 2003/03/03 05:07:03 livewire Exp $
+# ChangeLog for sys-apps/hwsetup
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
+
+  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild,
+  hwsetup-1.1.ebuild:
+  Added hwdata* dependencies.
+
+  18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild,
+  hwsetup-1.1.ebuild:
+  Cleaned up dependencies.
+
+*hwsetup-1.1 (17 Nov 2005)
+
+  17 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/hwsetup-1.1-dyn_blacklist.patch,
+  +files/hwsetup-1.1-fastprobe.patch, +files/hwsetup-1.1-gentoo.patch,
+  +hwsetup-1.1.ebuild:
+  Updated to the latest upstream version.
+
+  12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild:
+  Explicitly added items to RDEPEND, rather than having RDEPEND=DEPEND.
+
+  24 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild:
+  Added sys-libs/libkudzu-knoppix to list of possible kudzu* dependencies.
+
+  12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild:
+  Added ia64.
+
+  12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild:
+  Added libkudzu to list of DEPEND that pull in libkudzu, and also adjusting
+  RDEPEND to be correct.
+
+  30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -hwsetup-1.0-r2.ebuild, hwsetup-1.0-r3.ebuild:
+  Removing old version and marking stable.
+
+  22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r2.ebuild,
+  hwsetup-1.0-r3.ebuild:
+  Added ~sparc on request of gustavoz.
+
+*hwsetup-1.0-r3 (14 Jun 2005)
+
+  14 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/hwsetup-1.0-alsa.patch, +files/hwsetup-1.0-dyn_blacklist.patch,
+  +files/hwsetup-1.0-fastprobe.patch, files/hwsetup-1.0-gentoo.patch,
+  +hwsetup-1.0-r3.ebuild:
+  Added blacklist patch from Islam Amer <pharon@gmail.com> and closing bug
+  #90639.
+
+  12 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -hwsetup-1.0-r1.ebuild, hwsetup-1.0-r2.ebuild:
+  Changing DEPEND to allow for either kudzu-knoppix or kudzu and cleaning up
+  older ebuild.
+
+  06 Apr 2005; Markus Rothe <corsair@gentoo.org> hwsetup-1.0-r2.ebuild:
+  Stable on ppc64
+
+  17 Feb 2005; Markus Rothe <corsair@gentoo.org> hwsetup-1.0-r2.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  03 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r2.ebuild:
+  Patch is very trivial.  Marked stable on x86, alpha, and amd64.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  hwsetup-1.0-r1.ebuild, hwsetup-1.0-r2.ebuild:
+  Masked hwsetup-1.0-r2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  hwsetup-1.0-r1.ebuild:
+  Masked hwsetup-1.0-r1.ebuild stable for ppc
+
+*hwsetup-1.0-r2 (27 Jul 2004)
+
+  27 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/hwsetup-1.0-gentoo.patch, +hwsetup-1.0-r2.ebuild:
+  Changed all calls to XFree86 to just X to make it X server agnostic.
+
+  23 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r1.ebuild:
+  Added to ~ppc per dholm.
+
+  01 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0.ebuild:
+  QA cleanup
+
+  30 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r1.ebuild:
+  QA cleanup and masking for ppc.
+
+  30 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0.ebuild:
+  QA cleanup and masking for ppc.
+
+  21 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r1.ebuild:
+  Stabilizing on x86.
+
+*hwsetup-1.0-r1 (14 May 2004)
+
+  14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> +hwsetup-1.0-r1.ebuild:
+  Revision bumped to include latest release.
+
+  14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
+  Changing maintainers to newly formed livecd herd.
+
+  12 Apr 2004; David Holm <dholm@gentoo.org> hwsetup-1.0.ebuild:
+  Added to ~ppc.
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> hwsetup-1.0.ebuild:
+  Wont work with kudzu > 1.0
 
 *hwsetup-1.0 (02 March 2003)
 
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index e69de29bb2d1..b01d972d58b2 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -0,0 +1,13 @@
+MD5 af7e4840cb27c0278615d701c54e5985 ChangeLog 4025
+MD5 70141575b96009e82605b4f86fbe8758 files/digest-hwsetup-1.0-r3 64
+MD5 bc002ab4509c7c318c438f86d6005c71 files/digest-hwsetup-1.1 63
+MD5 eff6f85f9378f9f180386a7c34deb4c3 files/hwsetup-1.0-alsa.patch 3831
+MD5 1112a5e573dbca81b1cdc54e7901510a files/hwsetup-1.0-dyn_blacklist.patch 1870
+MD5 7f857bf4e30d36be2ac0f59e316dfa66 files/hwsetup-1.0-fastprobe.patch 3715
+MD5 5899ca3d018df09b6e2851f3e8c2e294 files/hwsetup-1.0-gentoo.patch 3599
+MD5 331c5c1b01eaee2c066608e8dd1faf71 files/hwsetup-1.1-dyn_blacklist.patch 1949
+MD5 a01ba41c868d97350621a124fece8d25 files/hwsetup-1.1-fastprobe.patch 2802
+MD5 bb521633bf17c370c41a83edbcab2711 files/hwsetup-1.1-gentoo.patch 3805
+MD5 c78ad044d646a8bcd8d5e7fb547abb38 hwsetup-1.0-r3.ebuild 948
+MD5 98fcac889f86acc374cdbb49e788678a hwsetup-1.1.ebuild 987
+MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
diff --git a/sys-apps/hwsetup/files/hwsetup-1.0-gentoo.patch b/sys-apps/hwsetup/files/hwsetup-1.0-gentoo.patch
index 03de58c3eef9..90e030c3f502 100644
--- a/sys-apps/hwsetup/files/hwsetup-1.0-gentoo.patch
+++ b/sys-apps/hwsetup/files/hwsetup-1.0-gentoo.patch
@@ -1,21 +1,103 @@
-diff -urN hwsetup-1.0.orig/hwsetup.c hwsetup-1.0/hwsetup.c
---- hwsetup-1.0.orig/hwsetup.c	2003-06-02 15:01:28.000000000 -0400
-+++ hwsetup-1.0/hwsetup.c	2004-07-24 18:57:36.986337040 -0400
+diff -urN hwsetup-1.0.old/hwsetup.c hwsetup-1.0/hwsetup.c
+--- hwsetup-1.0.old/hwsetup.c	2003-06-02 15:01:28.000000000 -0400
++++ hwsetup-1.0/hwsetup.c	2005-06-10 15:47:07.000000000 -0400
+@@ -25,8 +25,8 @@
+                 "(C) 2002 Klaus Knopper <knoppix@knopper.net>\n\n"
+ 
+ #define CARDSDB "/usr/share/hwdata/Cards"
+-#define XPATH "/usr/X11R6/bin/"
+-#define XMODPATH "/usr/X11R6/lib/modules/drivers/"
++#define XPATH "/usr/bin/"
++#define XMODPATH "/usr/lib/modules/drivers/"
+ 
+ #define VERBOSE_PRINT 1
+ #define VERBOSE_PROMPT 2
 @@ -103,7 +103,7 @@
  
  struct xinfo *getxinfo(struct device *d)
  {
 - const char *xfree4="XFree86", *xvesa4="vesa";
-+ const char *xfree4="X", *xvesa4="vesa";
++ const char *xorg="X", *xvesa="vesa";
   const char *xpath=XPATH;
   static struct xinfo xi;
   int rescanned=0;
-@@ -206,7 +206,7 @@
+@@ -113,10 +113,10 @@
+   {
+    const char *driver[]={"3DLabs",   "Mach64", "Mach32",    "Mach8",     "AGX",
+                    "P9000", "S3 ViRGE",    "S3V",       "S3",     "W32",
+-                   "8514",     "I128",   "SVGA", xfree4, NULL};
++                   "8514",     "I128",   "SVGA", xorg, NULL};
+    const char *server[]={driver[0], driver[1], driver[2], driver[3], driver[4],
+                    driver[5], "S3V",     driver[7], driver[8], driver[9],
+-                   driver[10], driver[11],  driver[12], xfree4, NULL};
++                   driver[10], driver[11],  driver[12], xorg, NULL};
+    if(!strncasecmp(d->driver,"Card:",5)) /* RedHat Cards-DB */
+     { /* Kudzu "Cards" format */
+      FILE *cardsdb;
+@@ -189,9 +189,9 @@
+          if(*xfree3server&&!*xi.xmodule)
+            strncpy(xi.xserver,xfree3server,sizeof(xi.xserver));
+          else
+-           strncpy(xi.xserver,xfree4,sizeof(xi.xserver));
++           strncpy(xi.xserver,xorg,sizeof(xi.xserver));
+         }
+-       if(!*xi.xmodule) strcpy(xi.xmodule,xvesa4);
++       if(!*xi.xmodule) strcpy(xi.xmodule,xvesa);
+        return &xi;
+       }
+     }
+@@ -202,14 +202,14 @@
+      if(strstr(d->driver,driver[i]))
+       {
+        char *xpos;
+-       if((xpos=strstr(d->driver,xfree4))!=NULL) /* Check for XFree 4 */
++       if((xpos=strstr(d->driver,xorg))!=NULL)
          {
           char xm[32]="";
-          strcpy(xi.xserver,xfree4);
+-         strcpy(xi.xserver,xfree4);
 -         if(sscanf(xpos,"XFree86(%30[^)])",xm)==1)
++         strcpy(xi.xserver,xorg);
 +         if(sscanf(xpos,"X(%30[^)])",xm)==1)
            strcpy(xi.xmodule,xm);
           else
-           strcpy(xi.xmodule,xvesa4);
+-          strcpy(xi.xmodule,xvesa4);
++          strcpy(xi.xmodule,xvesa);
+         }
+        else
+         {
+@@ -240,22 +240,22 @@
+    if(strstr(d->desc,"Trident")||strstr(d->desc,"TGUI")
+           ||strstr(d->desc,"Cirrus")||strstr(d->desc,"clgd"))
+     {
+-     if(!strcmp(xi.xserver,xfree4))
++     if(!strcmp(xi.xserver,xorg))
+       strncpy(xi.xopts,"-depth 16",sizeof(xi.xopts)-1);
+      else
+       strncpy(xi.xopts,"-bpp 16",sizeof(xi.xopts)-1);
+     }
+    else if(strstr(d->desc,"Savage 4")) /* S3 Inc.|Savage 4 */
+     {
+-     if(!strcmp(xi.xserver,xfree4))
++     if(!strcmp(xi.xserver,xorg))
+       strncpy(xi.xopts,"-depth 32",sizeof(xi.xopts)-1);
+      else
+       strncpy(xi.xopts,"-bpp 32",sizeof(xi.xopts)-1);
+     }
+   }
+  /* Fallback values */
+- if(!*xi.xserver) strcpy(xi.xserver,xfree4);
+- if(!*xi.xmodule) strcpy(xi.xmodule,xvesa4);
++ if(!*xi.xserver) strcpy(xi.xserver,xorg);
++ if(!*xi.xmodule) strcpy(xi.xmodule,xvesa);
+  return &xi;
+ }
+ 
+@@ -421,7 +421,7 @@
+ int writeconfig(char *name,struct device *d,int verbose)
+ {
+  FILE *f,*k;
+- const char *kconfig="/etc/sysconfig/knoppix";
++ const char *kconfig="/etc/sysconfig/gentoo";
+  unlink(name);
+  if((f=fopen(name,"w"))==NULL)
+   { /* Read-only filesystem on /etc ?! */
diff --git a/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild
index b716381c917e..a124f73d6def 100644
--- a/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.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/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild,v 1.1 2005/06/14 16:27:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
 inherit eutils
 
@@ -11,13 +11,14 @@ SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc -sparc -mips ~alpha ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 ia64 -mips ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="|| (
-	sys-apps/kudzu-knoppix
-	sys-apps/kudzu )"
-RDEPEND="virtual/libc"
+DEPEND="sys-libs/libkudzu"
+RDEPEND="sys-libs/libkudzu
+	|| ( sys-apps/hwdata-gentoo
+		sys-apps/hwdata
+		sys-apps/hwdata-knoppix )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/hwsetup/hwsetup-1.1.ebuild b/sys-apps/hwsetup/hwsetup-1.1.ebuild
index 649fc0a7dd11..c5c280c2531e 100644
--- a/sys-apps/hwsetup/hwsetup-1.1.ebuild
+++ b/sys-apps/hwsetup/hwsetup-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/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.1 2005/11/17 20:26:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
 inherit eutils
 
@@ -15,16 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="|| (
-	sys-libs/libkudzu
-	sys-libs/libkudzu-knoppix
-	sys-apps/kudzu-knoppix
-	sys-apps/kudzu )"
-RDEPEND="|| (
-	sys-libs/libkudzu
-	sys-libs/libkudzu-knoppix
-	sys-apps/kudzu-knoppix
-	sys-apps/kudzu )"
+DEPEND="sys-libs/libkudzu"
+RDEPEND="sys-libs/libkudzu
+	|| ( sys-apps/hwdata-gentoo
+		sys-apps/hwdata
+		sys-apps/hwdata-knoppix )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/hwsetup/metadata.xml b/sys-apps/hwsetup/metadata.xml
index f093d416cbb1..88653ddd7172 100644
--- a/sys-apps/hwsetup/metadata.xml
+++ b/sys-apps/hwsetup/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>livecd</herd>
 </pkgmetadata>
diff --git a/sys-apps/i2c/ChangeLog b/sys-apps/i2c/ChangeLog
index 5cb060cda72f..7f0934c2351a 100644
--- a/sys-apps/i2c/ChangeLog
+++ b/sys-apps/i2c/ChangeLog
@@ -1,8 +1,197 @@
 # ChangeLog for sys-apps/i2c
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.1 2002/12/08 21:30:32 sethbc Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
-*i2c-2.6.5 (08 Dec 2002):
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org> i2c-2.9.2.ebuild:
+  Stable on x86, bug #108270.
+
+*i2c-2.9.2 (06 Sep 2005)
+
+  06 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/i2c-2.9.2-module-path.patch, +i2c-2.9.2.ebuild:
+  Version bump.
+
+  19 Aug 2005; Henrik Brix Andersen <brix@gentoo.org> i2c-2.9.1.ebuild:
+  No linux-2.4.x support for ppc.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> i2c-2.9.1.ebuild:
+  Readded to ~ppc as a temporary fix.
+
+  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> i2c-2.8.7.ebuild,
+  i2c-2.9.0.ebuild, i2c-2.9.1.ebuild:
+  Removed from ppc, which doesn't support 2.4.x kernels anymore. Kernel 2.6.x
+  provides I2C support.
+
+  19 Jul 2005; <brix@gentoo.org> i2c-2.9.1.ebuild:
+  Stable on x86.
+
+  12 Jun 2005; <brix@gentoo.org> i2c-2.8.7.ebuild, i2c-2.9.0.ebuild:
+  Don't SLOT this package.
+
+*i2c-2.9.1 (11 Jun 2005)
+
+  11 Jun 2005; <brix@gentoo.org> +files/i2c-2.9.1-module-path.patch,
+  +i2c-2.9.1.ebuild:
+  Version bump.
+
+  10 May 2005; David Holm <dholm@gentoo.org> i2c-2.9.0.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+  25 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> metadata.xml,
+  -i2c-2.6.5-r1.ebuild, -i2c-2.7.0.ebuild, -i2c-2.8.0.ebuild,
+  -i2c-2.8.1.ebuild, -i2c-2.8.2.ebuild, -i2c-2.8.3.ebuild, -i2c-2.8.4.ebuild,
+  -i2c-2.8.8.ebuild:
+  Pruned old versions, transferred ownership.
+
+  10 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> i2c-2.9.0.ebuild:
+  added ~amd64 to KEYWORDS. fixes bug #77276.
+
+  03 Jan 2005; <plasmaroo@gentoo.org> i2c-2.9.0.ebuild,
+  +files/i2c-2.9.0.fix.patch:
+  Backport upstream CVS fix to allow lm-sensors-2.9.0 to play nice with
+  2.4 kernels.
+
+*i2c-2.9.0 (01 Jan 2005)
+
+  01 Jan 2005; <plasmaroo@gentoo.org> +i2c-2.9.0.ebuild:
+  Version bump. Bug #76164.
+
+  14 Dec 2004; Daniel Drake <dsd@gentoo.org> i2c-2.8.4.ebuild,
+  i2c-2.8.7.ebuild, i2c-2.8.8.ebuild:
+  Fix URL typo, bug 73585
+
+  12 Nov 2004; Daniel Drake <dsd@gentoo.org> i2c-2.6.5-r1.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild, i2c-2.8.3.ebuild,
+  i2c-2.8.4.ebuild, i2c-2.8.7.ebuild, i2c-2.8.8.ebuild:
+  Remove einfo/ewarn/eerror banners, bug #70864
+
+  05 Nov 2004; <plasmaroo@gentoo.org> i2c-2.8.1.ebuild, i2c-2.8.2.ebuild,
+  i2c-2.8.3.ebuild, i2c-2.8.4.ebuild, i2c-2.8.7.ebuild, i2c-2.8.8.ebuild:
+  CC=${CC} >> CC=$(tc-getCC); bug #70120.
+
+*i2c-2.8.8 (23 Oct 2004)
+
+  23 Oct 2004; <plasmaroo@gentoo.org> +i2c-2.8.8.ebuild:
+  Version bump; bug #67587.
+
+  22 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> i2c-2.8.7.ebuild:
+  Marked stable on amd64.
+
+  09 Sep 2004; <blubb@gentoo.org> i2c-2.8.7.ebuild:
+  added ~amd64 keyword
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> i2c-2.8.4.ebuild,
+  i2c-2.8.7.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild, i2c-2.8.3.ebuild,
+  i2c-2.8.4.ebuild, i2c-2.8.7.ebuild:
+  Masked i2c-2.8.7.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild, i2c-2.8.3.ebuild,
+  i2c-2.8.4.ebuild:
+  Masked i2c-2.8.4.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild, i2c-2.8.3.ebuild:
+  Masked i2c-2.8.3.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild:
+  Masked i2c-2.8.2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild:
+  Masked i2c-2.8.1.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild:
+  Masked i2c-2.8.0.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> i2c-2.7.0.ebuild:
+  Masked i2c-2.7.0.ebuild stable for ppc
+
+  20 Jul 2004; <plasmaroo@gentoo.org> i2c-2.8.2.ebuild, i2c-2.8.3.ebuild,
+  i2c-2.8.4.ebuild, i2c-2.8.7.ebuild:
+  "x86" stabilization - should solve bug #52098.
+
+*i2c-2.8.7 (12 Jul 2004)
+
+  12 Jul 2004; <plasmaroo@gentoo.org> i2c-2.8.4.ebuild, +i2c-2.8.7.ebuild:
+  Version bump; closes bug #54606.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> i2c-2.6.5-r1.ebuild,
+  i2c-2.7.0.ebuild, i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild,
+  i2c-2.8.3.ebuild, i2c-2.8.4.ebuild:
+  sync IUSE (missing), trim trailing whitespace
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild, i2c-2.8.2.ebuild, i2c-2.8.3.ebuild,
+  i2c-2.8.4.ebuild:
+  Add inherit eutils
+
+*i2c-2.8.3 (27 Mar 2004)
+*i2c-2.8.4 (27 Mar 2004)
+
+  27 Mar 2004; <plasmaroo@gentoo.org> +i2c-2.8.3.ebuild, +i2c-2.8.4.ebuild:
+  Version bump.
+
+  25 Jan 2004; <plasmaroo@gentoo.org> i2c-2.8.1.ebuild, i2c-2.8.2.ebuild:
+  Added "CC" variable support to the ebuild to enable distcc
+  support. Closes bug #39374.
+
+  26 Dec 2003; <plasmaroo@gentoo.org> i2c-2.8.0.ebuild, i2c-2.8.1.ebuild:
+  Marked stable on 'x86'.
+
+*i2c-2.8.2 (13 Dec 2003)
+
+  13 Dec 2003; <plasmaroo@gentoo.org> i2c-2.8.2.ebuild:
+  Version bump; closes bug #35709
+
+*i2c-2.8.1 (30 Oct 2003)
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild:
+  Version bumped. Closes #31180
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild:
+  Changing Slot to ${KV}
+
+  14 Oct 2003; <plasmaroo@gentoo.org> i2c-2.7.0.ebuild, i2c-2.8.0.ebuild,
+  files/i2c-2.8.0-alphaCompile.patch:
+  Added a patch to get the code to compile on Alpha platforms and added ~alpha
+  flag: Bug 31084.
+
+*i2c-2.8.0 (13 Aug 2003)
+
+  14 Aug 2003; John Mylchreest <johnm@gentoo.orf> i2c-2.8.0.ebuild:
+  ebuild has been masked, and a warning placed into this ebuild.
+  i2c structs have changed and break compatibility with other modules
+  such as bttv, zoran and RivaTV
+  fixes 26597
+
+*i2c-2.8.0 (13 Aug 2003)
+
+  13 Aug 2003; Brandon Low <lostlogic@gentoo.org> i2c-2.8.0.ebuild:
+  New ebuild thanks to plasmaroo <plasmaroo@plasmaroo.squirrelserver.co.uk>
+
+*i2c-2.7.0 (20 Jan 2003)
+
+  02 Mar 2003; Brandon Low <lostlogic@gentoo.org> i2c-2.7.0.ebuild:
+  mark unstable for the time being awaiting some fixage
+
+  01 Mar 2003; Seemant Kulleen <seemant@gentoo.org> i2c-2.7.0.ebuild :
+  Moved 2.7.0 to stable x86  It was causing breakage because lm_sensors depends on this, and
+  that went to stable x86
+
+  20 Jan 2003; Brandon Low <lostlogic@gentoo.org>: i2c-2.7.0.ebuild
+  Update to latest version, unstable marked for a few days, although
+  this code is well tested in the lolo and gentoo-sources.
+
+*i2c-2.6.5-r1 (08 Dec 2002)
   08 Dec 2002; Seth Chandler <sethbc@gentoo.org>: i2c-2.6.5-r1.ebuild
   added to portage, originally contributed by Jonathan Kelly
   <j0n@tpg.com.au>
diff --git a/sys-apps/i2c/Manifest b/sys-apps/i2c/Manifest
index e69de29bb2d1..df6ba3261bf7 100644
--- a/sys-apps/i2c/Manifest
+++ b/sys-apps/i2c/Manifest
@@ -0,0 +1,14 @@
+MD5 c08347cffd5b5375c1b3951ad218307f i2c-2.9.1.ebuild 1710
+MD5 7c2f9708e0d353f08be9add731cb8158 i2c-2.8.7.ebuild 3499
+MD5 12a9de4bbbb793932550f17998be233b i2c-2.9.0.ebuild 2642
+MD5 e9f6293348f61ea1169a77bce14190f8 i2c-2.9.2.ebuild 1711
+MD5 151a113f018da420dac41b690d872c6f ChangeLog 7115
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 853e1c19e54e6adb9cbb4e435f49847e files/i2c-2.9.2-module-path.patch 1792
+MD5 9a742c848861fdb77a2ece979a81edc3 files/i2c-2.8.0-alphaCompile.patch 353
+MD5 3d1523487606d28ad6cb49a5f34b1601 files/digest-i2c-2.8.7 61
+MD5 09a33c917d4a0919bb6aa7d6d83402c0 files/digest-i2c-2.9.0 61
+MD5 719058245870177c6519a7faae4540d4 files/digest-i2c-2.9.1 61
+MD5 966fb4a85b4c37cf171b937f3b60ea78 files/digest-i2c-2.9.2 61
+MD5 bf13f28c20a1fb6338fa2ced6fe4862d files/i2c-2.9.0.fix.patch 2570
+MD5 94e41662a7f774ade36247d658373f85 files/i2c-2.9.1-module-path.patch 1792
diff --git a/sys-apps/i2c/files/i2c-2.8.0-alphaCompile.patch b/sys-apps/i2c/files/i2c-2.8.0-alphaCompile.patch
index cf6ef481a652..fa38a1c5713a 100644
--- a/sys-apps/i2c/files/i2c-2.8.0-alphaCompile.patch
+++ b/sys-apps/i2c/files/i2c-2.8.0-alphaCompile.patch
@@ -2,7 +2,7 @@
 +++ i2c-velleman.c.plasmaroo	2003-10-14 19:31:11.000000000 +0100
 @@ -20,6 +20,8 @@
  
- /* $Id: i2c-2.8.0-alphaCompile.patch,v 1.1 2003/10/14 21:02:42 plasmaroo Exp $ */
+ /* $Id: i2c-2.8.0-alphaCompile.patch,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $ */
  
 +#include <asm/param.h> // Alpha compile fix
 +
diff --git a/sys-apps/i2c/i2c-2.8.7.ebuild b/sys-apps/i2c/i2c-2.8.7.ebuild
index 866233e27bf0..b0a3f350adda 100644
--- a/sys-apps/i2c/i2c-2.8.7.ebuild
+++ b/sys-apps/i2c/i2c-2.8.7.ebuild
@@ -1,43 +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/sys-apps/i2c/i2c-2.8.7.ebuild,v 1.1 2004/07/12 15:04:04 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.8.7.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="I2C Bus support for 2.4.x kernels"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
 SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="amd64 -ppc x86"
 IUSE=""
 
 DEPEND=""
 
 pkg_setup() {
 	echo
-	eerror "*****************************************************************"
-	eerror
 	eerror "WARNING: This i2c support is not recommended for things such as "
 	eerror "WARNING: BTTV"
-	eerror
-	eerror "*****************************************************************"
-	eerror
+	echo
 	eerror "http://www2.lm-sensors.nu/~lm78/cvs/browse.cgi/lm_sensors2/README"
-	eerror
+	echo
 	eerror "40 ADDITIONALLY, i2c-2.8.1 is not API compatible to earlier i2c"
 	eerror "41 releases due to struct changes; therefore you must NOT ENABLE"
 	eerror "42 any other i2c drivers (e.g. bttv) in the kernel."
 	eerror "43 Do NOT use lm-sensors 2.8.0 or i2c-2.8.0 if you require bttv."
-	eerror
-	eerror "Please try out http://khai.linux-fr.org/devel/i2c/ for a kernel"
+	echo
+	eerror "Please try out http://khali.linux-fr.org/devel/i2c/ for a kernel"
 	eerror "patch which will fix this problem. Please note that nor the"
 	eerror "lm_sensors team nor the package maintainers will be able to"
 	eerror "support you if you encounter problems with I2C when using"
 	eerror "other modules with requirements on I2C..."
-	eerror
-	eerror "*****************************************************************"
 	echo
 }
 
@@ -54,18 +48,14 @@ src_compile ()  {
 		echo ${KV} | grep -q 2.4.
 		if [ $? == 1 ]; then
 			echo
-			einfo "*****************************************************************"
-			einfo
 			einfo "For 2.5+ series kernels, use the support already in the kernel"
 			einfo "under 'Character devices' -> 'I2C support'."
-			einfo
+			echo
 			einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
 			einfo "or symlink /usr/src/linux to another kernel."
-			einfo
-			einfo "*****************************************************************"
 			echo
 			ewarn "Non-2.4 kernel detected; doing nothing..."
-			exit 0
+			return
 		else
 			LINUX='/usr/src/linux'
 		fi
@@ -83,7 +73,7 @@ src_compile ()  {
 	einfo "that contain 'No such file' references."
 	echo; echo '>>> Compiling...'
 
-	emake CC=${CC} LINUX=$LINUX clean all
+	emake CC=$(tc-getCC) LINUX=$LINUX clean all
 	if [ $? != 0 ]; then
 		eerror "I2C requires the source of a compatible kernel"
 		eerror "version installed in /usr/src/linux"
@@ -94,16 +84,17 @@ src_compile ()  {
 }
 
 src_install() {
-	if echo ${KV} | grep -q 2.4.; then
+	echo ${KV} | grep -q 2.4.
+	if [ "$?" -eq '0' -o "$LINUX" != '' ]; then
 		emake \
-			CC=${CC} \
+			CC=$(tc-getCC) \
 			LINUX=$LINUX \
 			LINUX_INCLUDE_DIR=/usr/include/linux \
 			DESTDIR=${D} \
 			PREFIX=/usr \
 			MANDIR=/usr/share/man \
 			install || die
-		sleep 5 # Show important warnings from the Makefile
+		epause 5 # Show important warnings from the Makefile
 		dodoc CHANGES INSTALL README
 	fi
 }
@@ -112,13 +103,10 @@ pkg_postinst() {
 	if echo ${KV} | grep -q 2.4.; then
 		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
 
-		einfo
 		einfo "I2C modules installed ..."
-		einfo
+		echo
 		ewarn "IMPORTANT ... if you are installing this package you need to"
 		ewarn "IMPORTANT ... *disable* kernel I2C support OR *modularize it*"
 		ewarn "IMPORTANT ... if your 2.4.x kernel is patched with such support"
-		einfo
-		echo
 	fi
 }
diff --git a/sys-apps/i2c/i2c-2.9.0.ebuild b/sys-apps/i2c/i2c-2.9.0.ebuild
index 0b53c02a0d2c..d3673028e462 100644
--- a/sys-apps/i2c/i2c-2.9.0.ebuild
+++ b/sys-apps/i2c/i2c-2.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.9.0.ebuild,v 1.1 2005/01/01 22:12:04 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.9.0.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,12 +9,17 @@ HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
 SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
 IUSE=""
 
 DEPEND=""
 
+src_unpack () {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}.fix.patch
+}
+
 src_compile ()  {
 	if [ "$LINUX" != "" ]; then
 		einfo "Cross-compiling using:- $LINUX"
diff --git a/sys-apps/i2c/i2c-2.9.1.ebuild b/sys-apps/i2c/i2c-2.9.1.ebuild
index b15a5b4967db..99dd406f9448 100644
--- a/sys-apps/i2c/i2c-2.9.1.ebuild
+++ b/sys-apps/i2c/i2c-2.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/sys-apps/i2c/i2c-2.9.1.ebuild,v 1.1 2005/06/11 11:20:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.9.1.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -10,7 +10,7 @@ SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 -ppc x86"
 
 IUSE=""
 
diff --git a/sys-apps/i2c/i2c-2.9.2.ebuild b/sys-apps/i2c/i2c-2.9.2.ebuild
index 057853b7b35c..ac77ffa86634 100644
--- a/sys-apps/i2c/i2c-2.9.2.ebuild
+++ b/sys-apps/i2c/i2c-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.9.2.ebuild,v 1.1 2005/09/06 21:00:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.9.2.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -10,7 +10,7 @@ SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86"
+KEYWORDS="~amd64 -ppc x86"
 
 IUSE=""
 
diff --git a/sys-apps/i2c/metadata.xml b/sys-apps/i2c/metadata.xml
index f093d416cbb1..cfbdff13bd61 100644
--- a/sys-apps/i2c/metadata.xml
+++ b/sys-apps/i2c/metadata.xml
@@ -1,7 +1,9 @@
- * 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>mobile</herd>
+<maintainer>
+  <email>brix@gentoo.org</email>
+  <name>Henrik Brix Andersen</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/ifd-gempc/ChangeLog b/sys-apps/ifd-gempc/ChangeLog
index 9446660f9440..8f81c6f0627b 100644
--- a/sys-apps/ifd-gempc/ChangeLog
+++ b/sys-apps/ifd-gempc/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for sys-apps/ifd-gempc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ChangeLog,v 1.1 2004/03/23 19:56:09 dragonheart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ChangeLog,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
+
+*ifd-gempc-1.0.0 (29 Jul 2005)
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/ifd-gempc-1.0.0-pcsc-lite-include.patch, +ifd-gempc-1.0.0.ebuild:
+  version bump inspired to help Shawn Rutledge in bug #100654
+
+  21 Jun 2005; Daniel Black <dragonheart@gentoo.org> ifd-gempc-0.9.3.ebuild,
+  ifd-gempc-0.9.1.ebuild:
+  Dependancy changed to libusb0.1.10a as per bug #87125. Thanks Florian Klein
+
+*ifd-gempc-0.9.3 (31 Dec 2004)
+
+  31 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/ifd-gempc-0.9.1.gcc-3.4.patch, ifd-gempc-0.9.1.ebuild,
+  +ifd-gempc-0.9.3.ebuild:
+  fixes to 0.9.1 - Homepage URL change, gcc-3.4 patch by Jos Hickson
+  <jos.hickson@runbox.com> (bug #76150), nolonger mirrored at SRC_URI. Added
+  0.9.3 version bump too
+
+  27 Jun 2004; David Holm <dholm@gentoo.org> ifd-gempc-0.9.1.ebuild:
+  Added to ~ppc.
+
+  07 May 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/ifd-gempc-0.9.1a.gentoo.diff, ifd-gempc-0.9.1.ebuild:
+  x86 KEYWORD added. Removed faulty patch
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ifd-gempc-0.9.1.ebuild:
+  Add inherit eutils
 
 *ifd-gempc-0.9.1 (24 Mar 2004)
 
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index 20e7ed1063fb..777312a71d8c 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,2 +1,21 @@
-MD5 110566135227b875dded082c18ad8ea5 ifd-gempc-0.9.1.ebuild 713
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0186b7fdb054107bc4646596bdaaba08 ifd-gempc-0.9.1.ebuild 927
+MD5 0b0fe070e56e47de1e3459d41c396421 metadata.xml 572
+MD5 a2dd620b9928f3715ed2b3eaabaf245c ChangeLog 1533
+MD5 3e55cd183bb1cf297d1a2f6a3db09d00 ifd-gempc-0.9.3.ebuild 798
+MD5 141923599286d052b7e905932c49e26e ifd-gempc-1.0.0.ebuild 797
 MD5 d3f44139b3c343b492e55f29ed3cb177 files/digest-ifd-gempc-0.9.1 67
+MD5 c1968cf81555cad52e68de30cd1a6c85 files/ifd-gempc-0.9.1.gentoo.diff 671
+MD5 8d641eb25e0b75e86268a3e0f43b4bb4 files/digest-ifd-gempc-0.9.3 67
+MD5 5f2907558e6a4097d8715d901249a0b2 files/ifd-gempc-0.9.1.gcc-3.4.patch 770
+MD5 1f4d6ecc857bf8ea1ebc8511a2f65d7c files/digest-ifd-gempc-1.0.0 67
+MD5 d4f8179d5ef434e0a17dc7cfbfaf2762 files/ifd-gempc-1.0.0-pcsc-lite-include.patch 1394
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC6eQ4mdTrptrqvGERAtPtAKCCOE1LE+GfFzl0VUrfKv1BVrBwfACgk/Ao
+aqhJaWJDWfFt+6Fnboqf/wI=
+=d4p1
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ifd-gempc/ifd-gempc-0.9.1.ebuild b/sys-apps/ifd-gempc/ifd-gempc-0.9.1.ebuild
index 73f1ed36924f..a5b6024f5e7c 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-0.9.1.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-0.9.1.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-0.9.1.ebuild,v 1.1 2004/03/23 19:56:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-0.9.1.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="GemCore based PC/SC reader drivers for pcsc-lite"
-HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/ifd-GemPC.html"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC"
 LICENSE="GPL-2 BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
-SRC_URI="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 IUSE=""
-DEPEND=">=sys-devel/gcc-2.95.3-r5
-	sys-apps/pcsc-lite"
-
-RDEPEND="sys-apps/pcsc-lite"
+DEPEND="sys-apps/pcsc-lite
+	>=dev-libs/libusb-0.1.10a"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	local patch
-	for patch in ${FILESDIR}/${P}*.diff; do
-		epatch ${patch}
+	for patch in ${FILESDIR}/${P}*.diff ${FILESDIR}/${P}*.patch; do
+		epatch ${patch} || die "patch failed"
 	done
 }
 
diff --git a/sys-apps/ifd-gempc/ifd-gempc-0.9.3.ebuild b/sys-apps/ifd-gempc/ifd-gempc-0.9.3.ebuild
index ca7521907d1e..7f2ac575de13 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-0.9.3.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-0.9.3.ebuild
@@ -1,18 +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/sys-apps/ifd-gempc/ifd-gempc-0.9.3.ebuild,v 1.1 2004/12/30 22:41:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-0.9.3.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 DESCRIPTION="GemCore based PC/SC reader drivers for pcsc-lite"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC"
 LICENSE="GPL-2 BSD"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 SLOT="0"
 SRC_URI="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/${P}.tar.gz"
 IUSE=""
-DEPEND=">=sys-devel/gcc-2.95.3-r5
-	>=sys-apps/pcsc-lite-1.2.9_beta5"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9_beta5"
+DEPEND=">=sys-apps/pcsc-lite-1.2.9_beta5
+	>=dev-libs/libusb-0.1.10a"
 
 src_compile() {
 	emake || die
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.0.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.0.ebuild
index 3743753da6ae..f34c4193c27a 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.0.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-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/sys-apps/ifd-gempc/ifd-gempc-1.0.0.ebuild,v 1.1 2005/07/29 08:09:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-1.0.0.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/ifplugd/ChangeLog b/sys-apps/ifplugd/ChangeLog
index f0e3cd964e6e..369d27d87424 100644
--- a/sys-apps/ifplugd/ChangeLog
+++ b/sys-apps/ifplugd/ChangeLog
@@ -1,6 +1,155 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.1 2003/03/21 15:58:05 wmertens Exp $
+# ChangeLog for sys-apps/ifplugd
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
+
+*ifplugd-0.28-r4 (13 Oct 2005)
+
+  13 Oct 2005; Roy Marples <uberlord@gentoo.org> files/ifplugd.action,
+  -ifplugd-0.28-r3.ebuild, +ifplugd-0.28-r4.ebuild:
+  Fixed initng support, #109150
+
+*ifplugd-0.28-r3 (10 Oct 2005)
+
+  10 Oct 2005; Roy Marples <uberlord@gentoo.org>
+  -files/ifplugd-0.26-gentoo.diff, +files/ifplugd-0.28-nlapi.diff,
+  files/ifplugd.init, metadata.xml, -ifplugd-0.28-r2.ebuild,
+  +ifplugd-0.28-r3.ebuild:
+  Fixed init script to work with all options and stop correctly with
+  baselayout<1.12 wrt #108464
+  
+  ifplugd.action is now installed to /etc
+
+*ifplugd-0.28-r2 (08 Sep 2005)
+
+  08 Sep 2005; Roy Marples <uberlord@gentoo.org> files/ifplugd.init,
+  -ifplugd-0.26-r1.ebuild, -ifplugd-0.28-r1.ebuild, +ifplugd-0.28-r2.ebuild:
+  New init script so we don't stop ifplugd processes launched by other
+  scripts and we don't start ifplugd on an interface where it is already
+  running.
+
+  Punted older ebuilds.
+
+  02 Sep 2005; Roy Marples <uberlord@gentoo.org> ifplugd-0.28-r1.ebuild:
+  Install ifplugd.action to /usr/sbin and not /etc/init.d
+
+*ifplugd-0.28-r1 (01 Sep 2005)
+
+  01 Sep 2005; Roy Marples <uberlord@gentoo.org> -files/ifplugd,
+  files/ifplugd.action, +files/ifplugd.conf, +files/ifplugd.init,
+  metadata.xml, -ifplugd-0.13-r1.ebuild, -ifplugd-0.25.ebuild,
+  -ifplugd-0.27.ebuild, ifplugd-0.28.ebuild, +ifplugd-0.28-r1.ebuild:
+  New init script, new configuration options,
+  better integration with baselayout-1.12.0, initng support
+  fixes bugs #42804, #48482 and hopefully #75214
+  
+  Punted older versions
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> ifplugd-0.28.ebuild:
+  Marked ppc stable.
+
+*ifplugd-0.28 (04 Jun 2005)
+
+  04 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/ifplugd-0.28-gentoo.diff, +ifplugd-0.28.ebuild:
+  Version bump.
+
+  06 May 2005; Aaron Walker <ka0ttic@gentoo.org> ifplugd-0.27.ebuild:
+  Stable on x86.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ifplugd-0.26-r1.ebuild:
+  Stable on ppc.
+
+  09 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/gentoo-ifplugd-init-v3:
+  Added depend() to init script as we need pcmcia to start before ifplugd if
+  the user uses pcmcia. Fixes bug 88222.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> ifplugd-0.26-r1.ebuild:
+  stable on amd64
+
+*ifplugd-0.27 (31 Mar 2005)
+
+  31 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +ifplugd-0.27.ebuild:
+  Version bump.
+
+*ifplugd-0.26-r1 (22 Mar 2005)
+
+  22 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/gentoo-ifplugd-conf-v3, -ifplugd-0.26.ebuild,
+  +ifplugd-0.26-r1.ebuild:
+  Revision bump; Default to SHUTDOWN=no in config.
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org> ifplugd-0.25.ebuild,
+  ifplugd-0.26.ebuild:
+  Dependency update: net-www/lynx -> www-client/lynx.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> ifplugd-0.26.ebuild:
+  Marked stable on x86.
+
+  22 Dec 2004; Aaron Walker <ka0ttic@gentoo.org>
+  files/ifplugd-0.26-gentoo.diff:
+  Fix wrong path to ifplugd.action in gentoo patch; closes bug 75264.
+
+*ifplugd-0.26 (20 Dec 2004)
+
+  20 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  -files/gentoo-ifplugd-init-v2, +files/ifplugd-0.26-gentoo.diff,
+  ifplugd-0.13-r1.ebuild, -ifplugd-0.15.ebuild, -ifplugd-0.20.ebuild,
+  -ifplugd-0.24.ebuild, ifplugd-0.25.ebuild, +ifplugd-0.26.ebuild:
+  Version bump; 0.25 stable on x86. Major cleanup and uncrustification; old
+  ebuilds/filesdir cruft removed. Doxygen removed from deps as it was never
+  required in the first place. Also updated metadata.xml.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ifplugd-0.20.ebuild, ifplugd-0.24.ebuild, ifplugd-0.25.ebuild:
+  Masked ifplugd-0.25.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ifplugd-0.20.ebuild, ifplugd-0.24.ebuild:
+  Masked ifplugd-0.24.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  ifplugd-0.20.ebuild:
+  Masked ifplugd-0.20.ebuild stable for ppc
+
+  09 Aug 2004; Seemant Kulleen <seemant@gentoo.org> ifplugd-0.25.ebuild:
+  Add pkgconfig to DEPEND, closing bug #54154 by Greg Andreou
+  <gregorya@dai.ed.ac.uk>
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> ifplugd-0.15.ebuild:
+  sync IUSE (+doc)
+
+*ifplugd-0.25 (18 May 2004)
+
+  18 May 2004; Martin Holzer <mholzer@gentoo.org> ifplugd-0.25.ebuild:
+  Version bumped. Closes 51234
+
+*ifplugd-0.24 (16 May 2004)
+
+  16 May 2004; Martin Holzer <mholzer@gentoo.org> ifplugd-0.24.ebuild:
+  Version bumped. Closes 49082
+
+  22 Feb 2004; David Holm <dholm@gentoo.org> ifplugd-0.20.ebuild:
+  Added to ~ppc.
+
+*ifplugd-0.20 (15 Nov 2003)
+
+  15 Nov 2003; Wout Mertens <wmertens@gentoo.org> ifplugd-0.20.ebuild :
+  Version bump, fixing several issues with ifplugd.
+  New config file format, making it easier to read.
+  Many thanks to everyone who helped on bugs #28388 and #30443
+
+*ifplugd-0.15 (17 Mar 2003)
+
+  06 Aug 2003; Wout Mertens <wmertens@gentoo.org> ebuild, files/gentoo-*-v2 :
+  Version bump, versioned action and init script. Init script now supports
+  suspend and resume.
+  Note: For it to work on my system (eepro100), I need to add -m mii to the
+  options, and add -a. I think. Testers welcome.
+  TODO: add an /etc/apm/event.d/ifplugd script
+
+*ifplugd-0.13-r1 (21 Mar 2003)
 
   21 Mar 2003; Wout Mertens <wmertens@gentoo.org> :
   Fixed the action script, otherwise ifplugd would die when dhcpcd
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index e69de29bb2d1..37eb2dee3fe3 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -0,0 +1,14 @@
+MD5 e6ac7d869a0eb46fcd8069766bcf9370 ifplugd-0.28.ebuild 1445
+MD5 d13433a9981e2386ff10934a71b003a6 metadata.xml 359
+MD5 3d86a886381070a678aaf4ba0058f0c0 ChangeLog 5747
+MD5 c52379d202a3158bcedc6ab98ae0ddbc ifplugd-0.28-r4.ebuild 1329
+MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28-r4 64
+MD5 b85f99eae3afefda5a054752b3b51d5c files/ifplugd.init 3938
+MD5 046da68d6aa7665b0d3a9fd9e5a67b6a files/gentoo-ifplugd-conf-v3 2248
+MD5 e6174a8e4c2c6b451d78267453379a51 files/ifplugd.action 891
+MD5 35e218c1d5eadc7f98f2759eecb9c651 files/gentoo-ifplugd-init-v3 2685
+MD5 e4322329d76406800bd7810f7d1869cd files/ifplugd-0.28-gentoo.diff 1119
+MD5 0f11772693878629fb851b68920004c5 files/gentoo-ifplugd.action-v2 703
+MD5 d16fbcdc0a1c6f5be1aa3bf0c3a932f6 files/ifplugd-0.28-nlapi.diff 639
+MD5 c110adefe6c3d268c4c1e861d120fe3a files/digest-ifplugd-0.28 64
+MD5 aaff46e0cdc7f78ba616e8093700cadf files/ifplugd.conf 2255
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3 b/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3
index 3b4f0c9a0670..d2e2f1bff856 100644
--- a/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3
+++ b/sys-apps/ifplugd/files/gentoo-ifplugd-conf-v3
@@ -1,5 +1,5 @@
 # -*-sh-*-
-# $Id: gentoo-ifplugd-conf-v3,v 1.1 2003/11/15 16:47:58 wmertens Exp $
+# $Id: gentoo-ifplugd-conf-v3,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 # This file is part of ifplugd.
 #
@@ -48,7 +48,7 @@ POLL_TIME="1"
 DELAY_UP="0"
 DELAY_DOWN="0"
 API_MODE="auto"
-SHUTDOWN="yes"
+SHUTDOWN="no"
 WAIT_ON_FORK="no"
 MONITOR="no"
 ARGS=""
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3 b/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3
index 75161744755a..cde9e7dc7728 100644
--- a/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3
+++ b/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3,v 1.1 2003/11/15 16:47:58 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/gentoo-ifplugd-init-v3,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 #NB: Config is in /etc/conf.d/ifplugd
 
@@ -72,7 +72,12 @@ do_all_if() {
 	echo
 	eend $status "Couldn't ${action} ifplugd for ${IF}"
 }
-	
+
+depend()
+{
+	use pcmcia
+}
+
 start() {
 	einfon "Starting ifplugd: "
 	do_all_if "" start
diff --git a/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2 b/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2
index 99d142b8b109..94c75d05ce0b 100644
--- a/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2
+++ b/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2
@@ -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/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2,v 1.1 2003/08/06 18:00:34 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/gentoo-ifplugd.action-v2,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 #
 # Gentoo-specific ifplugd.action
 #
diff --git a/sys-apps/ifplugd/files/ifplugd.action b/sys-apps/ifplugd/files/ifplugd.action
index 80d961e0648a..ba4cfd7d20b9 100644
--- a/sys-apps/ifplugd/files/ifplugd.action
+++ b/sys-apps/ifplugd/files/ifplugd.action
@@ -1,29 +1,55 @@
 #!/bin/sh
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 #
-# This file is part of ifplugd, and adapted for use in Gentoo Linux.
+# Gentoo-specific ifplugd.action
 #
-# ifplugd is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
+# This file gets called by ifplugd when it wants to bring an interface
+# up or down.
 #
-# ifplugd is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with ifplugd; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-set -e
+if grep -q initng /proc/1/cmdline 
+then
+    EXEC="/sbin/ngc"
+    INITNG="yes"
+else
+    EXEC="/etc/init.d/net.$1"
+    INITNG="no"
+fi
 
-if [ -z "$1" ] || [ -z "$2" ] ; then
-	echo "Wrong arguments" > /dev/stderr
+case "$2" in
+    up)
+	if [ "${INITNG}" = "yes" ]
+	then
+	    ARGS="-u net/$1"
+	else
+	    ARGS="--quiet start"
+	fi
+	;;
+    down)
+	if [ "${INITNG}" = "yes" ]
+	then
+	    ARGS="-d net/$1"
+	else
+	    ARGS="--quiet stop"
+	fi
+	;;
+    *)
+	echo "$0: wrong arguments" >&2
+	echo "Call with <interface> <up|down>" >&2
 	exit 1
-fi
+	;;
+esac
 
-[ "$2" = "up" ] && /etc/init.d/net.$1 start > /dev/null
-[ "$2" = "down" ] && /etc/init.d/net.$1 stop > /dev/null
+export IN_BACKGROUND=true
+
+if [ -x "${EXEC}" ]
+then
+    ${EXEC} ${ARGS}
+    exit 0
+else
+    logger -t ifplugd.action "Error: Couldn't configure $1, no ${EXEC} !"
+    exit 1
+fi
 
-exit 0
+# vim: set ts=4
diff --git a/sys-apps/ifplugd/files/ifplugd.conf b/sys-apps/ifplugd/files/ifplugd.conf
index f408e1bde044..344321e248e9 100644
--- a/sys-apps/ifplugd/files/ifplugd.conf
+++ b/sys-apps/ifplugd/files/ifplugd.conf
@@ -1,5 +1,5 @@
 # -*-sh-*-
-# $Id: ifplugd.conf,v 1.1 2005/09/01 15:33:28 uberlord Exp $
+# $Id: ifplugd.conf,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 # This file is part of ifplugd.
 #
diff --git a/sys-apps/ifplugd/files/ifplugd.init b/sys-apps/ifplugd/files/ifplugd.init
index 77558bdc162d..41565fe82ebd 100644
--- a/sys-apps/ifplugd/files/ifplugd.init
+++ b/sys-apps/ifplugd/files/ifplugd.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/sys-apps/ifplugd/files/ifplugd.init,v 1.1 2005/09/01 15:33:28 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/files/ifplugd.init,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 #NB: Config is in /etc/conf.d/ifplugd
 
@@ -23,6 +23,16 @@ get_start_interfaces() {
 	if [[ -f /proc/net/wireless && ${WIRELESS_INTERFACES} == "no" ]]; then
 		exclude=$(sed -ne 's/^[ \t]*\(.*\):.*/\1/p' /proc/net/wireless | xargs)
 	fi
+	
+	# Exclude ifplugd started by other scripts - like net.xxx
+	if [[ -d "${svcdir}/daemons" ]]; then
+		exclude="${exclude} $(
+			grep "\"/var/run/ifplugd.*.pid\"" "${svcdir}"/daemons/* 2>/dev/null \
+			| grep -v "${svcdir}/daemons/ifplugd:" \
+			| sed -n -e 's/.*ifplugd\.\(.*\)\.pid.*/\1/p'
+		)"
+	fi
+	
 	exclude=" lo ${exclude} "
 	for iface in ${exclude}; do
 		INTERFACES="${INTERFACES// ${iface} / }"
@@ -31,7 +41,23 @@ get_start_interfaces() {
 }
 
 get_running_interfaces() {
-	( cd /var/run; ls ifplugd.*.pid | sed -n -e 's/^ifplugd.\(.*\).pid$/\1/p' )
+	local exclude="" INTERFACES=$(
+		cd /var/run
+		ls ifplugd.*.pid 2>/dev/null | sed -n -e 's/^ifplugd.\(.*\).pid$/\1/p' | xargs
+	)
+	if [[ -d "${svcdir}/daemons" ]]; then
+		local exclude=$(
+			grep "\"/var/run/ifplugd.*.pid\"" "${svcdir}"/daemons/* 2>/dev/null \
+			| grep -v "${svcdir}/daemons/ifplugd:" \
+			| sed -n -e 's/.*ifplugd\.\(.*\)\.pid.*/\1/p'
+		)
+	fi
+
+	INTERFACES=" ${INTERFACES} "
+	for iface in ${exclude}; do
+		INTERFACES=${INTERFACES// ${iface} / }
+	done
+	echo "${INTERFACES}"
 }
 
 # Check if an option is set for a given interface.
@@ -57,16 +83,26 @@ start() {
 	
 	for iface in $(get_start_interfaces); do
 		ebegin "${iface}"
-		local args=
+		local args="" pidfile="/var/run/ifplugd.${iface}.pid"
+
+		if [[ -e ${pidfile} ]] ; then
+			if is_daemon_running /usr/sbin/ifplugd "${pidfile}" ; then
+				eindent
+				einfo "ifplugd is already running on ${iface}"
+				eend 0
+				eoutdent
+				oneworked=true
+				continue
+			fi
+		fi
 		
 		is_set "${iface}" AUTO yes || args="${args}a"
 		is_set "${iface}" BEEP yes || args="${args}b"
-		is_set "${iface}" IGNORE_FAIL yes && args="${iargs}f"
-		is_set "${iface}" IGNORE_FAIL_POSITIVE no && args="${iargs}F"
-		is_set "${iface}" IGNORE_RETVAL yes && args="${iargs}I"
-		is_set "${iface}" SHUTDOWN yes || args="${iargs}q"
-		is_set "${iface}" WAIT_ON_FORK yes && args="${iargs}w"
-		is_set "${iface}" MONITOR no && args="${iargs}M"
+		is_set "${iface}" IGNORE_FAIL yes && args="${args}f"
+		is_set "${iface}" IGNORE_FAIL_POSITIVE no && args="${args}F"
+		is_set "${iface}" IGNORE_RETVAL yes && args="${args}I"
+		is_set "${iface}" WAIT_ON_FORK yes && args="${args}w"
+		is_set "${iface}" MONITOR no && args="${args}M"
 
 		[[ -n ${args} ]] && args="-${args}"
 
@@ -100,7 +136,7 @@ stop() {
 	for iface in $(get_running_interfaces); do
 		ebegin "${iface}"
 		start-stop-daemon --stop --exec /usr/sbin/ifplugd \
-			--pidfile "/var/run/ifplugd.${iface}.pid"
+			--pidfile "/var/run/ifplugd.${iface}.pid" --signal 3 
 		eend $? || allstopped=false
 	done
 
@@ -110,6 +146,8 @@ stop() {
 status() {
 	local iface
 
+	service_started "${myservice}" || return 0
+
 	for iface in $(get_running_interfaces); do
 		einfo "$(/usr/sbin/ifplugstatus ${iface})"
 	done
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild
index 6d6a5b5b938d..c0b3f9fd801e 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-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/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild,v 1.1 2005/10/13 16:29:53 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28-r4.ebuild,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/ifplugd/ifplugd-0.28.ebuild b/sys-apps/ifplugd/ifplugd-0.28.ebuild
index 86c3e8c5011d..e695b30a5e12 100644
--- a/sys-apps/ifplugd/ifplugd-0.28.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.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-apps/ifplugd/ifplugd-0.28.ebuild,v 1.1 2005/06/05 10:29:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifplugd/ifplugd-0.28.ebuild,v 1.1.1.1 2005/11/30 09:56:58 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 DEPEND="dev-util/pkgconfig
diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
index f093d416cbb1..4621429df8da 100644
--- a/sys-apps/ifplugd/metadata.xml
+++ b/sys-apps/ifplugd/metadata.xml
@@ -1,7 +1,10 @@
- * 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>base-system</herd>
+	<maintainer>
+		<email>uberlord@gentoo.org</email>
+		<name>Roy Marples</name>
+	</maintainer>
+	<longdescription>Brings up/down ethernet ports automatically with cable detection</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/initng/ChangeLog b/sys-apps/initng/ChangeLog
index 07c30d8b6169..a095161b08e4 100644
--- a/sys-apps/initng/ChangeLog
+++ b/sys-apps/initng/ChangeLog
@@ -1,6 +1,138 @@
 # ChangeLog for sys-apps/initng
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/ChangeLog,v 1.1 2005/05/07 06:44:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/ChangeLog,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
+
+*initng-0.4.0 (09 Nov 2005)
+
+  09 Nov 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.4.0.ebuild:
+  Version bump #111883 by Sonny Lander.
+
+*initng-0.3.5 (02 Nov 2005)
+
+  02 Nov 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.3.5.ebuild:
+  Version bump and delete killall5 #111250.
+
+*initng-0.3.4 (02 Nov 2005)
+
+  02 Nov 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.3.4.ebuild:
+  Version bump #111121 by Enderson Tadeu S. Maia.
+
+*initng-0.3.3 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.3.3.ebuild:
+  Version bump #109308 by jb.
+
+*initng-0.3.2 (10 Oct 2005)
+
+  10 Oct 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.3.2.ebuild:
+  Version bump #108705.
+
+*initng-0.3.1 (06 Oct 2005)
+
+  06 Oct 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.3.1.ebuild,
+  initng-9999.ebuild:
+  Version bump #108172 by Erdroh Moshan and delete scripts that are installed
+  by other packages #108179 by Henrique Ferreiro.
+
+*initng-0.3.0 (27 Sep 2005)
+
+  27 Sep 2005; Mike Frysinger <vapier@gentoo.org> -initng-0.2.3.ebuild,
+  +initng-0.3.0.ebuild:
+  Version bump #107373.
+
+*initng-0.2.5 (26 Sep 2005)
+
+  26 Sep 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.2.5.ebuild:
+  Version bump #107285 by Erdroh Moshan.
+
+*initng-0.2.3 (24 Sep 2005)
+
+  24 Sep 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.2.3.ebuild:
+  Version bump #106934 by Erdroh Moshan.
+
+*initng-9999 (21 Sep 2005)
+
+  21 Sep 2005; Mike Frysinger <vapier@gentoo.org> +initng-9999.ebuild:
+  Developer ebuild #106762 by James Dominy.
+
+*initng-0.2.0 (11 Sep 2005)
+
+  11 Sep 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.2.0.ebuild:
+  Version bump #105575 by Saurabh Singhvi.
+
+*initng-0.1.9 (25 Aug 2005)
+
+  25 Aug 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.9.ebuild:
+  Version bump #103692 by Simon Strandman.
+
+  18 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> initng-0.1.8.ebuild:
+  Keyworded ~sparc
+
+*initng-0.1.8 (12 Aug 2005)
+
+  12 Aug 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.8.ebuild:
+  Version bump #102261 by Erdroh Moshan.
+
+*initng-0.1.7 (06 Aug 2005)
+
+  06 Aug 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.7.ebuild:
+  Version bump #101467 by Erdroh Moshan.
+
+*initng-0.1.6 (29 Jul 2005)
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.6.ebuild:
+  Version bump #100639 by Erdroh Moshan.
+
+*initng-0.1.5 (26 Jul 2005)
+
+  26 Jul 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.5.ebuild:
+  Version bump #100149 by Erdroh Moshan.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> initng-0.1.4.ebuild:
+  added ~ppc64
+
+*initng-0.1.4 (20 Jul 2005)
+
+  20 Jul 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.4.ebuild:
+  Version bump #99496 by Erdroh Moshan.
+
+*initng-0.1.3 (19 Jun 2005)
+
+  19 Jun 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.3.ebuild:
+  Version bump #96482 by Erdroh Moshan.
+
+  08 Jun 2005; David Holm <dholm@gentoo.org> initng-0.1.2.ebuild:
+  Added to ~ppc.
+
+*initng-0.1.2 (08 Jun 2005)
+
+  08 Jun 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.2.ebuild:
+  Version bump #95381 by Christian Schlotter.
+
+*initng-0.1.1 (29 May 2005)
+
+  29 May 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.1.1.ebuild:
+  Version bump #94402 by James Porter.
+
+*initng-0.0.18 (20 May 2005)
+
+  20 May 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.0.18.ebuild:
+  Version bump.
+
+*initng-0.0.16 (13 May 2005)
+
+  13 May 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.0.16.ebuild:
+  Version bump #92379 by Drew Winstel.
+
+*initng-0.0.10 (08 May 2005)
+
+  08 May 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.0.10.ebuild:
+  Version bump #91912 by Andreas Rosander.
+
+*initng-0.0.8 (07 May 2005)
+
+  07 May 2005; Mike Frysinger <vapier@gentoo.org> +initng-0.0.8.ebuild:
+  Version bump #91806 by Daniel Webert.
 
 *initng-0.0.7 (07 May 2005)
 
diff --git a/sys-apps/initng/Manifest b/sys-apps/initng/Manifest
index 80b5c3cd7e96..2cd37b245fb4 100644
--- a/sys-apps/initng/Manifest
+++ b/sys-apps/initng/Manifest
@@ -1,2 +1,20 @@
-MD5 8f2aceb81159fc662e23e3cf0a3d1112 initng-0.0.7.ebuild 624
-MD5 755b038e8610a9f47bf1aeb99c08aa1d files/digest-initng-0.0.7 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4c5f6eda705290a23629a7490b8098da ChangeLog 4121
+MD5 f05719bae9ce3e2fc87b4e6bb41f7588 files/digest-initng-0.3.3 65
+MD5 acabcc6544cec2e9f865cde07450dbfd files/digest-initng-0.3.5 65
+MD5 9ec74eaf66b3ddc00c40fb8ae718ee79 files/digest-initng-0.4.0 65
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-initng-9999 0
+MD5 9abbd5eb7a6fbf79ca086ecead4de36e initng-0.3.3.ebuild 1021
+MD5 83ab52e7e54e208d6eccab804630279a initng-0.3.5.ebuild 1054
+MD5 c2e78975728c47e018643cf5830d0bde initng-0.4.0.ebuild 1045
+MD5 9f58d80fecdef9a298916a25b32e06a6 initng-9999.ebuild 1129
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcVgAgIKl8Uu19MoRAgfRAJ9A9FutXHyECEjEp6u045DQ7sCT1wCfegkB
+lEtowAdFgBqWEdaDRUUSxmk=
+=QNRS
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/initng/initng-0.3.3.ebuild b/sys-apps/initng/initng-0.3.3.ebuild
index d382b863ef71..2dacd49b6ada 100644
--- a/sys-apps/initng/initng-0.3.3.ebuild
+++ b/sys-apps/initng/initng-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/sys-apps/initng/initng-0.3.3.ebuild,v 1.1 2005/10/16 02:47:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-0.3.3.ebuild,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 
 DESCRIPTION="A next generation init replacement"
 HOMEPAGE="http://initng.thinktux.net/"
diff --git a/sys-apps/initng/initng-0.3.5.ebuild b/sys-apps/initng/initng-0.3.5.ebuild
index 74fc218a75b1..a55935ea4592 100644
--- a/sys-apps/initng/initng-0.3.5.ebuild
+++ b/sys-apps/initng/initng-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/sys-apps/initng/initng-0.3.5.ebuild,v 1.1 2005/11/02 23:03:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-0.3.5.ebuild,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 
 DESCRIPTION="A next generation init replacement"
 HOMEPAGE="http://initng.thinktux.net/"
@@ -13,9 +13,10 @@ IUSE="debug"
 
 src_compile() {
 	econf \
+		--prefix=/ \
+		--with-splash \
 		$(use_enable debug) \
 		--with-doc-dir=/usr/share/doc/${PF} \
-		--prefix=/ \
 		|| die
 	emake || die
 }
diff --git a/sys-apps/initng/initng-0.4.0.ebuild b/sys-apps/initng/initng-0.4.0.ebuild
index f66a8d1ea960..98e517a0111b 100644
--- a/sys-apps/initng/initng-0.4.0.ebuild
+++ b/sys-apps/initng/initng-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/sys-apps/initng/initng-0.4.0.ebuild,v 1.1 2005/11/09 01:58:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-0.4.0.ebuild,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 
 DESCRIPTION="A next generation init replacement"
 HOMEPAGE="http://initng.thinktux.net/"
diff --git a/sys-apps/initng/initng-9999.ebuild b/sys-apps/initng/initng-9999.ebuild
index 41a19f5ef322..d5cac1bdf2d2 100644
--- a/sys-apps/initng/initng-9999.ebuild
+++ b/sys-apps/initng/initng-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/sys-apps/initng/initng-9999.ebuild,v 1.1 2005/09/21 23:38:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/initng/initng-9999.ebuild,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 
 ESVN_REPO_URI="http://svn.initng.thinktux.net/initng"
 ESVN_PROJECT="initng"
@@ -25,6 +25,7 @@ src_unpack() {
 src_compile() {
 	econf \
 		--prefix=/ \
+		--with-splash \
 		$(use_enable debug) \
 		--with-doc-dir=/usr/share/doc/${PF} \
 		|| die
@@ -33,6 +34,10 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR="${D}" || die
+	# Dont need libtool linker scripts, so punt em
+	find "${D}" -name '*.la' -exec rm {} \;
+	# other packages install these
+	rm "${D}"/sbin/{{ifplugd,wpa_cli}.action} || die
 	dodoc README FAQ AUTHORS ChangeLog NEWS TEMPLATE_HEADER TODO
 }
 
diff --git a/sys-apps/ipmitool/ChangeLog b/sys-apps/ipmitool/ChangeLog
index e69c0c0b7543..3ca3399c8cd1 100644
--- a/sys-apps/ipmitool/ChangeLog
+++ b/sys-apps/ipmitool/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/ipmitool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ChangeLog,v 1.1 2005/03/01 08:15:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ChangeLog,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
+
+  03 Aug 2005; David Holm <dholm@gentoo.org> ipmitool-1.8.2.ebuild:
+  Added to ~ppc.
+
+*ipmitool-1.8.2 (03 Aug 2005)
+
+  03 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> +ipmitool-1.8.2.ebuild:
+  Version bump, bug #101126.
+
+  24 May 2005; Tom Martin <slarti@gentoo.org> ipmitool-1.6.0.ebuild:
+  Marked ~amd64 for tigger^.
 
 *ipmitool-1.6.0 (01 Mar 2005)
 
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index fb5e4326f516..43ea08a3d4aa 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,2 +1,6 @@
-MD5 a6dea2272cc5e14eb17c371e30a876b9 ipmitool-1.6.0.ebuild 493
+MD5 a406944f04c217901529c872e8cd7422 ChangeLog 742
+MD5 810778c03057c7b602bf8db839167cd7 ipmitool-1.6.0.ebuild 1271
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 954bfbdb3abce22f372773157d44d20a ipmitool-1.8.2.ebuild 1381
 MD5 9e684edfb59e7bdfdf6543de51308e5a files/digest-ipmitool-1.6.0 67
+MD5 189b9507213ce05a1e7e1674b6c95b94 files/digest-ipmitool-1.8.2 66
diff --git a/sys-apps/ipmitool/ipmitool-1.6.0.ebuild b/sys-apps/ipmitool/ipmitool-1.6.0.ebuild
index 9300c4dc5c43..c41068a29b35 100644
--- a/sys-apps/ipmitool/ipmitool-1.6.0.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.6.0.ebuild
@@ -1,20 +1,20 @@
-# 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/sys-apps/ipmitool/ipmitool-1.6.0.ebuild,v 1.1 2005/03/01 08:15:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ipmitool-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="Utility for controlling IPMI enabled devices."
 HOMEPAGE="http://${PN}.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"
 
 RDEPEND="virtual/libc
 		dev-libs/openssl"
 DEPEND="${RDEPEND}
 		virtual/os-headers"
-		
+
 src_compile() {
 	econf \
 		--enable-ipmievd --enable-ipmishell \
diff --git a/sys-apps/ipmitool/ipmitool-1.8.2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.2.ebuild
index 7cab6cd681b1..f79831808e55 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.2.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.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-apps/ipmitool/ipmitool-1.8.2.ebuild,v 1.1 2005/08/03 00:46:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmitool/ipmitool-1.8.2.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="Utility for controlling IPMI enabled devices."
 HOMEPAGE="http://ipmitool.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="BSD"
 
 RDEPEND="virtual/libc
diff --git a/sys-apps/ipmiutil/ChangeLog b/sys-apps/ipmiutil/ChangeLog
index 2d8e864ce803..1fe679d345dc 100644
--- a/sys-apps/ipmiutil/ChangeLog
+++ b/sys-apps/ipmiutil/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/ipmiutil
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.1 2005/03/25 10:12:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ChangeLog,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 *ipmiutil-1.6.0 (25 Mar 2005)
 
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 1f19b91c537c..cf52b9b242b1 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,3 +1,5 @@
-MD5 28c866c17d78597e8fe1ee0b6f2d2aa8 ipmiutil-1.6.0.ebuild 889
+MD5 a2cc0298c99de1f3f5b9946258a00d41 ipmiutil-1.6.0.ebuild 1176
+MD5 6a4dff89de982b1a02e6fc84440abd35 ChangeLog 437
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 26555fccc3acf12bb91ab2b43478209c files/ipmiutil-1.6.0-link-external-freeipmi.diff 1904
 MD5 96a84a3afc0b7d84cd30d6134a389be1 files/digest-ipmiutil-1.6.0 67
diff --git a/sys-apps/ipmiutil/ipmiutil-1.6.0.ebuild b/sys-apps/ipmiutil/ipmiutil-1.6.0.ebuild
index 71b54d6234d7..a69bface0249 100644
--- a/sys-apps/ipmiutil/ipmiutil-1.6.0.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-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-apps/ipmiutil/ipmiutil-1.6.0.ebuild,v 1.1 2005/03/25 10:12:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipmiutil/ipmiutil-1.6.0.ebuild,v 1.1.1.1 2005/11/30 09:57:10 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 8ac38aaf0adc..1f831a92011c 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,13 +1,312 @@
 # ChangeLog for sys-apps/iproute2
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
-
-*iproute2-2.4.7 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  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 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
+
+  31 Oct 2005; Herbie Hopkins <herbs@gentoo.org> iproute2-051007.ebuild:
+  Update multilib fixes
+
+*iproute2-051007 (29 Oct 2005)
+
+  29 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/iproute2-051007-esfq-2.6.13.patch,
+  iproute2-2.6.7.20040608-r1.ebuild, iproute2-2.6.10.20050112-r1.ebuild,
+  iproute2-2.6.10.20050124.ebuild, iproute2-2.6.11.20050310-r1.ebuild,
+  iproute2-2.6.11.20050310-r2.ebuild, iproute2-2.6.11.20050330.ebuild,
+  iproute2-2.6.11.20050330-r1.ebuild, +iproute2-051007.ebuild:
+  Fixed HOMEPAGE.  Version bump.  Updated esfq patch.  Closes bug #110777.
+
+*iproute2-2.6.11.20050330-r1 (07 Oct 2005)
+
+  07 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.11.20050330-tc-check-qdisc-features.patch,
+  +iproute2-2.6.11.20050330-r1.ebuild:
+  Fix segfault when trying to use qdisc_fast #108307 by jens zettelmeyer.
+
+  09 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.11.20050330-stack.patch,
+  iproute2-2.6.11.20050330.ebuild:
+  Fix by solar to prevent stack overflow in build util #99487.
+
+*iproute2-2.6.11.20050330 (19 Jul 2005)
+
+  19 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.11.20050330-wrr.patch,
+  +iproute2-2.6.11.20050330.ebuild:
+  Version bump #99441 by Maciek Ligenza.
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  iproute2-2.6.11.20050310-r1.ebuild:
+  ppc stable
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  iproute2-2.6.11.20050310-r1.ebuild:
+  Stable on ppc64
+
+  05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  iproute2-2.6.11.20050310-r1.ebuild:
+  Stable on hppa.
+
+*iproute2-2.6.11.20050310-r2 (05 Jul 2005)
+
+  05 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/2.6.12-rc1-esfq.patch, +iproute2-2.6.11.20050310-r2.ebuild:
+  Updated esfq patch to latest upstream.
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  iproute2-2.6.11.20050310-r1.ebuild:
+  Stable on sparc
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  iproute2-2.6.11.20050310-r1.ebuild:
+  stable on alpha amd64 ia64 x86
+
+*iproute2-2.6.11.20050310-r1 (29 Mar 2005)
+
+  29 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.11.20050310-dsmark-qdisc.patch,
+  +iproute2-2.6.11.20050310-r1.ebuild:
+  Add patch from upstream to fix dsmark qdiscs adding #86729.
+
+*iproute2-2.6.11.20050310 (12 Mar 2005)
+
+  12 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.11.20050310.ebuild:
+  Version bump.
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  iproute2-2.6.10.20050124.ebuild:
+  Bug #47482, arpd doesn't need to be in /sbin.
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  iproute2-2.6.10.20050112-r1.ebuild, iproute2-2.6.10.20050124.ebuild:
+  Do not build the arpd binary if USE=-berkdb #81660 by Roy Marples.
+
+*iproute2-2.6.10.20050124 (09 Feb 2005)
+
+  09 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.10.20050124.ebuild:
+  Version bump.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org>
+  iproute2-2.6.10.20050112-r1.ebuild:
+  Marked stable on mips.
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  iproute2-2.6.10.20050112-r1.ebuild:
+  Stable on sparc
+
+*iproute2-2.6.10.20050112-r1 (27 Jan 2005)
+
+  27 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/2.6.9.20041019-wrr.patch-r1, +files/2.6.9.20041106-esfq.patch,
+  +iproute2-2.6.10.20050112-r1.ebuild:
+  Revbump to fix esfq and wrr patches to work with the new version. This
+  closes bug #79387.
+
+  21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  iproute2-2.6.10.20050112.ebuild:
+  Multilib fixes.
+
+  13 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  iproute2-2.6.9.20041019-r1.ebuild:
+  Stable on sparc
+
+*iproute2-2.6.10.20050112 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.10.20050112.ebuild:
+  Version bump.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  iproute2-2.6.9.20040831.ebuild:
+  Stable on amd64.
+
+*iproute2-2.6.9.20041019-r1 (05 Dec 2004)
+
+  05 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  files/2.6.9.20041019-esqf.patch, files/2.6.9.20041019-wrr.patch,
+  +iproute2-2.6.9.20041019-r1.ebuild, -iproute2-2.6.9.20041019.ebuild:
+  Version bump to fix esfq/wrr registering with tc #73104 by David Pufer.
+
+  01 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  iproute2-2.6.9.20040831.ebuild:
+  Stable on sparc
+
+*iproute2-2.6.9.20041019 (30 Nov 2004)
+
+  30 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/2.6.9.20041019-esqf.patch, +files/2.6.9.20041019-wrr.patch,
+  +iproute2-2.6.9.20041019.ebuild:
+  Version bump #72961 and include esqf/wrr algorithms #68948.
+
+*iproute2-2.6.9.20040831 (25 Sep 2004)
+
+  25 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/2.6.9.20040831-make-install.patch, +iproute2-2.6.9.20040831.ebuild:
+  Version bump #64957 by David Holm.
+
+*iproute2-2.6.7.20040608-r1 (13 Sep 2004)
+
+  13 Sep 2004; <solar@gentoo.org> +iproute2-2.6.7.20040608-r1.ebuild:
+  added minimal USE flag so we can yeild a build of tc. fixes compile failures
+  in uclibc envionments where we might not have/want a dep of db for the arpd
+  which can be provided elsewhere
+
+*iproute2-2.4.7.20020116-r1 (09 Aug 2004)
+
+  09 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.4.7.20020116-r1.ebuild, -iproute2-2.4.7.20020116.ebuild:
+  Version bump to install correctly more files #59460 by Daniel Black.
+
+  04 Aug 2004; Daniel Black <dragonheart@gentoo.org> :
+  digest fix - files/digest-iproute2-2.4.7.20020116
+
+  09 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  iproute2-2.4.7.20020116.ebuild:
+  Stable on alpha.
+
+  22 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/2.6.7.20040608-misc-deb-fixes.patch,
+  +files/2.6.7.20040608-misc-gentoo-fixes.patch,
+  iproute2-2.6.7.20040608.ebuild:
+  Add some patches to resolve issues with different kernel header versions
+  #54708.
+
+*iproute2-2.6.7.20040608 (21 Jun 2004)
+
+  21 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  iproute2-2.4.7.20020116.ebuild, +iproute2-2.6.7.20040608.ebuild:
+  Version bump for new upstream #54648 by Ed Wildgoose.
+
+*iproute2-2.4.7.20020116 (20 Apr 2004)
+
+  20 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #40589 by tempone@isg.si.
+  Also rename / reversion to fit the way upstream has it.
+
+*iproute2-2.4.7-20010824-r5 (06 Apr 2004)
+
+  06 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to clean up bugs and all that fun stuff.
+  #33831 by Miguel Sousa Filipe - We use /usr/include instead of /usr/src/linux.
+  #34294 by Andrea Barisani - Fix local DoS exploit.
+  #37432 by Radek Podgorny - Update the debian patch that we pull.
+  #40230 by Sebastian Werner - Use system pkt_sched.h instead of bundled.
+  #40510 by valli - Use system glibc headers instead of bundled.
+  #45274 by David Pufer - Add HFSC support.
+  #46978 by Seemant Kulleen - Add a little hack to handle 2.4 linux-headers.
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> iproute-20010824-r4.ebuild:
+  Marked stable on mips.
+
+  02 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> iproute-20010824-r1.ebuild,
+  iproute-20010824-r2.ebuild, iproute-20010824-r3.ebuild,
+  iproute-20010824-r4.ebuild:
+  Changed app-text/tetex to virtual/tetex and tetex IUSE flag to doc
+  IUSE flag. Closing bug #35849
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> iproute-20010824-r4.ebuild:
+  stable on alpha
+
+  09 Jan 2004; root <root@gentoo.org> iproute-20010824-r4.ebuild:
+  Marked stable on hppa.
+
+  19 Nov 2003; Luca Barbato <lu_zero@gentoo.org> iproute-20010824-r4.ebuild:
+  Marked stable on ppc
+
+  18 Nov 2003; <spider@gentoo.org> iproute-20010824-r4.ebuild:
+  Used tetex without any dependency. Added DEPEND="" statement
+
+  25 Sep 2003; Christian Birchinger <joker@gentoo.org>
+  iproute-20010824-r4.ebuild:
+  Added sparc stable keyword
+
+  23 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  iproute-20010824-r4.ebuild:
+  bump to stable on x86
+
+  28 Aug 2003; Robin H. Johnson <robbat2@gentoo.org>
+  iproute-20010824-r4.ebuild:
+  fix trivial ebuild warning
+
+  24 Aug 2003; Martin Holzer <mholzer@gentoo.org> iproute-20010824-r4.ebuild:
+  Now uses -11 debian diff.
+
+*iproute-20010824-r4 (16 Aug 2003)
+
+  16 Aug 2003; Robin H. Johnson <robbat2@gentoo.org>
+  iproute-20010824-r4.ebuild:
+  update to latest debian patch, adds more manpages, also change to depend on
+  kernel headers and not kernel sources
+
+*iproute-20010824-r3 (04 May 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> iproute-20010824-r3.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> iproute-20010824-r3.ebuild:
+  Changed ~sparc to sparc, added ~mips
+
+  27 May 2003; <msterret@gentoo.org> iproute-20010824-r3.ebuild:
+  Added tetex to IUSE since it's `use`d; use sed-4's -i; spell check
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> iproute-20010824-r3.ebuild :
+  Updated to latest Debian patch which includes htb3.
+
+  27 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> iproute-20010824-r2.ebuild :
+  Move binaries to / instead of /usr. Closes #15430.
+
+*iproute-20010824-r2 (30 Aug 2002)
+
+  17 Apr 2003; Guy Martin <gmsoft@gentoo.org> iproute-20010824-r2.ebuild :
+  Added hppa to KEYWORDS.
+
+  30 Mar 2003; Christian Birchinger <joker@gentoo.org>
+  iproute-20010824-r2.ebuild:
+  Added sparc stable keyword
+
+  07 Mar 2003; Aron Griffis <agriffis@gentoo.org> iproute-20010824-r2.ebuild:
+  Mark stable on alpha
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Changed sed expression delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>.  Also, moved the patches from files/ to
+  the mirrors.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  22 Oct 2002; Brandon Low <lostlogic@gentoo.org> iproute-20010824-r2.ebuild :
+
+  This should fix the issues people are having with htb3, just resyncs
+  with the latest patch from debian, which is known to work, briefly
+  in the unstable profile (bug 9329).
+
+*iproute-20010824-r1 (30 Aug 2002)
+
+  05 Oct 2002; Jack Morgan <jmorgan@gentoo.org> :
+  Added sparc/sparc64 to keywords.
+
+  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+  Added ppc to keywords.
+
+*iproute-20010824-r1 (04 Aug 2002)
+
+  04 Aug 2002; Daniel Robbins <drobbins@gentoo.org> New ebuild with htb3
+  support, which is now always enabled.  We include a "pkt_sched.h" Linux
+  kernel header in our patch that has been htb3-enabled.  This allows us to
+  always be able to compile-in htb3 support, even if the local kernel sources
+  don't include such support; this closes bugs #5780, #6018.
+
+  04 Aug 2002; Daniel Robbins <drobbins@gentoo.org> We now install Debian's man
+  pages which are strangely absent from Debian's binary package.
+
+*iproute-20010824 (09 Jul 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> iproute-20010824.ebuild : Added
+  KEYWORDS, SLOT.
+
+  09 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ChangeLog : Added ChangeLog.
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index f289c4e4a99c..cc8d02d02ed2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,8 +1,38 @@
-MD5 8b7337fc87c8b2500f01c90ce0bc2b47 ChangeLog 4961
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7c3cc1de730acd6c0af59957b9cd9598 ChangeLog 11136
+MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
+MD5 2469b9a3673ce5a18fa92cfb7c98a71f files/2.6.12-rc1-esfq.patch 5677
+MD5 d0071e387038661c76eefb2c8e6b5c46 files/2.6.7.20040608-misc-deb-fixes.patch 632
+MD5 24a69d69fb222231a8d0f4358743190f files/2.6.7.20040608-misc-gentoo-fixes.patch 3970
+MD5 15351b34e440824e7d161876d4b01c3c files/2.6.9.20041019-wrr.patch 14150
+MD5 01450900cfa9fb721b061db655723598 files/2.6.9.20041106-esfq.patch 5621
+MD5 cad8ce0c5445ce65dc579867c606179f files/digest-iproute2-051007 67
+MD5 5375310c6504f47ed3050805eb2675bc files/digest-iproute2-2.6.10.20050112-r1 76
+MD5 b44fead085cc41126320e2bde31bc129 files/digest-iproute2-2.6.10.20050124 76
+MD5 9b7de448bf17e80895da676709f9e93e files/digest-iproute2-2.6.11.20050310-r1 74
+MD5 9b7de448bf17e80895da676709f9e93e files/digest-iproute2-2.6.11.20050310-r2 74
+MD5 c697aa743be2a6d8eb675cc5e02877e3 files/digest-iproute2-2.6.11.20050330-r1 74
+MD5 efc13e1a9a4a7bd080305d540ff5d48d files/digest-iproute2-2.6.7.20040608-r1 75
+MD5 9b29094618e58434d24db4cd77edb622 files/iproute2-051007-esfq-2.6.13.patch 6499
+MD5 6076b8af87231defd7a1c2db9473c299 files/iproute2-2.6.11.20050310-dsmark-qdisc.patch 1354
+MD5 fc446e7f6706fb42a81ccb1f6d3f7e92 files/iproute2-2.6.11.20050330-parallel-build.patch 698
+MD5 6cfe7abf202c01359e341709237fc2df files/iproute2-2.6.11.20050330-stack.patch 306
+MD5 6af5cf770337ca0eaad9f75b1c2555bb files/iproute2-2.6.11.20050330-tc-check-qdisc-features.patch 769
+MD5 f2f62bc9b7aa8ad751e47fa11a952976 files/iproute2-2.6.11.20050330-wrr.patch 13574
+MD5 7a7f572cc3ab354a9f913cf10e4d11c5 iproute2-051007.ebuild 1839
+MD5 7f15a8018992803c4ff3c54111311565 iproute2-2.6.10.20050112-r1.ebuild 1797
+MD5 245c23273c5e59ff02c6397c4979f142 iproute2-2.6.10.20050124.ebuild 1885
+MD5 98f90927fdc3642161df7ec9b5abacea iproute2-2.6.11.20050310-r1.ebuild 1954
+MD5 5160918bd877493f7f161c995c71499a iproute2-2.6.11.20050310-r2.ebuild 1960
+MD5 24e2eb8ac403ef2934f26c3f36c479bf iproute2-2.6.11.20050330-r1.ebuild 2055
+MD5 6965651f639e49b593086b4b1e5be994 iproute2-2.6.7.20040608-r1.ebuild 2375
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
-MD5 8022219c0fe250f58e28e553b3aa1b49 iproute2-2.4.7.20020116.ebuild 2789
-MD5 981e299bc39dbc8f1db0ba90e3b9c12b iproute2-2.4.7.20010824-r5.ebuild 2720
-MD5 6430380d9057802a2f24581b2e7e1b3d files/digest-iproute2-2.4.7.20010824-r5 150
-MD5 299a059309d3dbe6202e0380c34bd7e1 files/digest-iproute2-2.4.7.20020116 83
-MD5 7aa13dbeefb733697d49aa63e18d4110 files/2.4.7.20010824-hfsc.patch 9465
-MD5 d762a24b5c857658cc0a06432b122439 files/2.4.7.20010824-local-exploit-fix.patch 666
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZfrd2G5bA0cA/ScRAt3RAKDtOOOVudY2lifzj2yQ0kt36w4OlQCg3q4w
+Fh7t4AYZSGNsNASHiKMRL7E=
+=Nr3Y
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch b/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch
index 7acde047b2d4..ead416350e22 100644
--- a/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch
+++ b/sys-apps/iproute2/files/2.6.7.20040608-misc-gentoo-fixes.patch
@@ -73,7 +73,7 @@ diff -ur iproute2-2.6.7.orig/misc/ss.c iproute2-2.6.7/misc/ss.c
  		if (info->tcpi_snd_ssthresh < 0xFFFF)
  			printf(" ssthresh:%d", info->tcpi_snd_ssthresh);
  		
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,6)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
  		if (info->tcpi_rcv_rtt)
  			printf(" rcv_rtt:%g", (double) info->tcpi_rcv_rtt/1000);
  		if (info->tcpi_rcv_space)
diff --git a/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch b/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch
index d2c16f1b9fc4..62548f62c2ac 100644
--- a/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch
+++ b/sys-apps/iproute2/files/2.6.9.20041019-wrr.patch
@@ -134,7 +134,7 @@ diff -Naur iproute2-2.6.9.orig/tc/Makefile iproute2-2.6.9.wrr/tc/Makefile
 diff -Naur iproute2-2.6.9.orig/tc/q_wrr.c iproute2-2.6.9.wrr/tc/q_wrr.c
 --- iproute2-2.6.9.orig/tc/q_wrr.c	1969-12-31 16:00:00.000000000 -0800
 +++ iproute2-2.6.9.wrr/tc/q_wrr.c	2004-10-26 02:52:12.655006743 -0700
-@@ -0,0 +1,323 @@
+@@ -0,0 +1,322 @@
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
@@ -449,12 +449,11 @@ diff -Naur iproute2-2.6.9.orig/tc/q_wrr.c iproute2-2.6.9.wrr/tc/q_wrr.c
 +}
 +
 +
-+struct qdisc_util wrr_util = {
-+	NULL,
-+	"wrr",
-+	wrr_parse_opt,
-+	wrr_print_opt,
-+	wrr_print_xstats,
-+	wrr_parse_copt,
-+	wrr_print_copt
++struct qdisc_util wrr_qdisc_util = {
++	.id = "wrr",
++	.parse_qopt = wrr_parse_opt,
++	.print_qopt = wrr_print_opt,
++	.print_xstats = wrr_print_xstats,
++	.parse_copt = wrr_parse_copt,
++	.print_copt = wrr_print_copt
 +};
diff --git a/sys-apps/iproute2/files/iproute2-2.6.11.20050330-parallel-build.patch b/sys-apps/iproute2/files/iproute2-2.6.11.20050330-parallel-build.patch
index c14e0e38ba0e..a208fb68a842 100644
--- a/sys-apps/iproute2/files/iproute2-2.6.11.20050330-parallel-build.patch
+++ b/sys-apps/iproute2/files/iproute2-2.6.11.20050330-parallel-build.patch
@@ -17,7 +17,7 @@
  all: $(DISTGEN) $(DISTDATA)
 +
 +$(DISTGEN):
-+	$(HOSTCC) -O1 -o $@ $@.c -lm
++	$(HOSTCC) -I../include -O1 -o $@ $@.c -lm
 +
 +%.dist: %
 +	./$* > $@
diff --git a/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch b/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch
index a6130d754730..1ca6a704f220 100644
--- a/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch
+++ b/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch
@@ -1,16 +1,15 @@
-Add some overflow checks.
-
-Patch by solar.
+Fix from upstream to fix overflow.
 
 http://bugs.gentoo.org/99487
 
 --- netem/paretonormal.c
 +++ netem/paretonormal.c
-@@ -55,6 +55,7 @@
+@@ -51,7 +51,7 @@
+ {
+ 	int i,n;
+ 	double x;
+-	double table[TABLESIZE];
++	double table[TABLESIZE+1];
  
  	for (x = -10.0; x < 10.05; x += .00005) {
  		i = rint(TABLESIZE*normal(x, 0.0, 1.0));
-+		if (i > TABLESIZE) continue;
- 		table[i] = x;
- 	}
- 	printf(
diff --git a/sys-apps/iproute2/iproute2-051007.ebuild b/sys-apps/iproute2/iproute2-051007.ebuild
index 406999f5aee7..c3abf97a51eb 100644
--- a/sys-apps/iproute2/iproute2-051007.ebuild
+++ b/sys-apps/iproute2/iproute2-051007.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/sys-apps/iproute2/iproute2-051007.ebuild,v 1.1 2005/10/29 21:49:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-051007.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -32,7 +32,7 @@ src_unpack() {
 	# Multilib fixes
 	sed -i 's:/usr/local:/usr:' tc/m_ipt.c
 	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
-		netem/Makefile tc/tc.c tc/q_netem.c tc/m_ipt.c || die
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} || die
 }
 
 src_compile() {
diff --git a/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild
index f392c351bf56..91e945775d99 100644
--- a/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild
@@ -1,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-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild,v 1.1 2005/01/28 01:31:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.10.20050112-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:28 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,16 +8,16 @@ MY_PV=${PV%.*}
 SNAP=${PV##*.}
 SNAP=ss${SNAP:2}
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="atm minimal"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="atm berkdb minimal"
 
 RDEPEND="virtual/libc
-	!minimal? ( sys-libs/db )
+	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
 	>=virtual/os-headers-2.4.21
@@ -29,11 +29,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
-	#68948 - esqf/wrr patches
+	#68948 - esfq/wrr patches
 	epatch \
 		${FILESDIR}/2.6.9.20041106-esfq.patch \
-		${FILESDIR}/2.6.9.20041019-wrr.patch-r1
-
+		${FILESDIR}/2.6.9.20041019-wrr.patch
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 	# Multilib fixes
 	sed -i "s:/usr/lib/tc:/usr/$(get_libdir)/tc:g" ${S}/tc/Makefile ${S}/tc/tc.c ${S}/tc/q_netem.c
 }
diff --git a/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild b/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild
index 474ff3072de5..cc07b251fccc 100644
--- a/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild
@@ -1,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-apps/iproute2/iproute2-2.6.10.20050124.ebuild,v 1.1 2005/02/10 02:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.10.20050124.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,16 +8,16 @@ MY_PV=${PV%.*}
 SNAP=${PV##*.}
 SNAP=ss${SNAP:2}
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="atm minimal"
+IUSE="atm berkdb minimal"
 
 RDEPEND="virtual/libc
-	!minimal? ( sys-libs/db )
+	!minimal? ( berkdb? ( sys-libs/db ) )
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
 	>=virtual/os-headers-2.4.21
@@ -33,7 +33,8 @@ src_unpack() {
 	epatch \
 		${FILESDIR}/2.6.9.20041106-esfq.patch \
 		${FILESDIR}/2.6.9.20041019-wrr.patch
-
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 	# Multilib fixes
 	sed -i "s:/usr/lib/tc:/usr/$(get_libdir)/tc:g" \
 		tc/Makefile tc/tc.c tc/q_netem.c
@@ -68,4 +69,7 @@ src_install() {
 		DOCDIR=/usr/share/doc/${PF} \
 		install \
 		|| die "make install failed"
+	# bug 47482, arpd doesn't need to be in /sbin
+	dodir /usr/sbin
+	mv ${D}/sbin/arpd ${D}/usr/sbin/
 }
diff --git a/sys-apps/iproute2/iproute2-2.6.11.20050310-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.11.20050310-r1.ebuild
index bcfb999ff324..3154f0e6e3af 100644
--- a/sys-apps/iproute2/iproute2-2.6.11.20050310-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.11.20050310-r1.ebuild
@@ -1,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-apps/iproute2/iproute2-2.6.11.20050310-r1.ebuild,v 1.1 2005/03/29 03:10:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.11.20050310-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,12 +8,12 @@ MY_PV=${PV%.*}
 SNAP=${PV##*.}
 SNAP=${SNAP:2}
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="atm berkdb minimal"
 
 RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) )
diff --git a/sys-apps/iproute2/iproute2-2.6.11.20050310-r2.ebuild b/sys-apps/iproute2/iproute2-2.6.11.20050310-r2.ebuild
index 5efad987d6cc..c36a2df54f40 100644
--- a/sys-apps/iproute2/iproute2-2.6.11.20050310-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.11.20050310-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-apps/iproute2/iproute2-2.6.11.20050310-r2.ebuild,v 1.1 2005/07/05 19:23:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.11.20050310-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ MY_PV=${PV%.*}
 SNAP=${PV##*.}
 SNAP=${SNAP:2}
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/iproute2/iproute2-2.6.11.20050330-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.11.20050330-r1.ebuild
index ae256117971e..c74c79fb5ca5 100644
--- a/sys-apps/iproute2/iproute2-2.6.11.20050330-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.11.20050330-r1.ebuild
@@ -1,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-apps/iproute2/iproute2-2.6.11.20050330-r1.ebuild,v 1.1 2005/10/07 00:33:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.11.20050330-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ MY_PV=${PV%.*}
 SNAP=${PV##*.}
 SNAP=${SNAP:2}
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild b/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild
index 4da532b454f6..f73aaba9fd17 100644
--- a/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.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/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild,v 1.1 2004/09/13 09:17:17 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.7.20040608-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:28 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 MY_PV="${PV:0:5}"
 SNAP="${PV:${#PV}-6}"
 DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://developer.osdl.org/dev/iproute2/"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
 SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-ss${SNAP}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="atm minimal"
 
 RDEPEND="virtual/libc
@@ -68,7 +68,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="$(gcc-getCC)" KERNEL_INCLUDE=${ROOT}/usr/include SUBDIRS="${SUBDIRS}" || die
+	emake CC="$(tc-getCC)" KERNEL_INCLUDE=${ROOT}/usr/include SUBDIRS="${SUBDIRS}" || die
 }
 
 src_install() {
diff --git a/sys-apps/irqbalance/ChangeLog b/sys-apps/irqbalance/ChangeLog
index 602e8cf1c366..c34b11afdfa1 100644
--- a/sys-apps/irqbalance/ChangeLog
+++ b/sys-apps/irqbalance/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for sys-apps/irqbalance
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/ChangeLog,v 1.1 2004/01/11 13:37:17 azarah Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/ChangeLog,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
+
+*irqbalance-0.12 (16 Jan 2005)
+
+  16 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +irqbalance-0.12.ebuild:
+  Bug #77597, version bump.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> irqbalance-0.09.ebuild:
+  Added to ~ppc.
+
+*irqbalance-0.09 (24 Sep 2004)
+
+  24 Sep 2004; Mike Frysinger <vapier@gentoo.org> +irqbalance-0.09.ebuild:
+  Version bump #58136 by Jim Faulkner.
+
+  24 May 2004; Michael Sterrett <mr_bones_@gentoo.org> irqbalance-0.08.ebuild:
+  fix DESCRIPTION - Peter Jensen (bug #51382); error messages; tidy
+
+  24 May 2004; Travis Tilley <lv@gentoo.org> irqbalance-0.08.ebuild:
+  added ~amd64 keyword
 
 *irqbalance-0.08 (11 Jan 2004)
 
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 87f179ab9021..b935c949aa27 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,4 +1,19 @@
-MD5 9022f87c3077dc7ebe1b02d8324b4536 ChangeLog 3674
-MD5 1fee660ce19d7ee3b08e1e34932e21df .irqbalance-0.08.ebuild.swp 16384
-MD5 fb0fbdbe5e82d69de0bd9bd18c073f17 irqbalance-0.08.ebuild 458
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6cc74b1cdcc2965d8eed6c74076c4921 irqbalance-0.09.ebuild 704
+MD5 fe98921e5f621098c6a532cd0d1a6692 irqbalance-0.12.ebuild 704
+MD5 d9f7d6d9af41cdeeff5a506f9c9f5819 ChangeLog 966
+MD5 451b7d85bff03cb2761abc311f63f619 irqbalance-0.08.ebuild 702
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 995857a736d39db7fe479520cc79387f files/digest-irqbalance-0.08 66
+MD5 ba4df3dffbb3da9f20c39e4dc8aa2aa1 files/digest-irqbalance-0.09 66
+MD5 f29fe20053c7ada0f2a8b16296290d13 files/digest-irqbalance-0.12 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFB6r9TPpIsIjIzwiwRAim9AJ98aPLtorzM42J7r4iKJvTlFz+a0ACeKeeb
+2CKPFQJSgplXg4qS4wSR/oQ=
+=UQ/x
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/irqbalance/irqbalance-0.08.ebuild b/sys-apps/irqbalance/irqbalance-0.08.ebuild
index 450848ffa548..da2fcca95471 100644
--- a/sys-apps/irqbalance/irqbalance-0.08.ebuild
+++ b/sys-apps/irqbalance/irqbalance-0.08.ebuild
@@ -1,30 +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/sys-apps/irqbalance/irqbalance-0.08.ebuild,v 1.1 2004/01/11 13:37:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.08.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
 
-IUSE=
-
-S="${WORKDIR}/irqbalance"
-DESCRIPTION="This is a sample skeleton ebuild file"
-SRC_URI="http://people.redhat.com/arjanv/irqbalance/${P}.tar.gz"
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
 HOMEPAGE="http://people.redhat.com/arjanv/irqbalance/"
+SRC_URI="http://people.redhat.com/arjanv/irqbalance/${P}.tar.gz"
 
 LICENSE="OSL-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+S="${WORKDIR}/irqbalance"
 
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	into /
-	dosbin irqbalance
-
+	dosbin irqbalance || die "dosbin failed"
 	doman irqbalance.1
-
-	dodoc COPYING Changelog TODO
+	dodoc Changelog TODO
 }
-
diff --git a/sys-apps/irqbalance/irqbalance-0.09.ebuild b/sys-apps/irqbalance/irqbalance-0.09.ebuild
index 8113f4dcadfd..49d460edf8b3 100644
--- a/sys-apps/irqbalance/irqbalance-0.09.ebuild
+++ b/sys-apps/irqbalance/irqbalance-0.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/sys-apps/irqbalance/irqbalance-0.09.ebuild,v 1.1 2004/09/25 02:53:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.09.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
 
 DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
 HOMEPAGE="http://people.redhat.com/arjanv/irqbalance/"
@@ -8,7 +8,7 @@ SRC_URI="http://people.redhat.com/arjanv/irqbalance/${P}.tar.gz"
 
 LICENSE="OSL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-apps/irqbalance/irqbalance-0.12.ebuild b/sys-apps/irqbalance/irqbalance-0.12.ebuild
index ecd97c1d4aea..77bc35df98a4 100644
--- a/sys-apps/irqbalance/irqbalance-0.12.ebuild
+++ b/sys-apps/irqbalance/irqbalance-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-apps/irqbalance/irqbalance-0.12.ebuild,v 1.1 2005/01/16 22:02:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.12.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
 
 DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
 HOMEPAGE="http://people.redhat.com/arjanv/irqbalance/"
diff --git a/sys-apps/isapnptools/ChangeLog b/sys-apps/isapnptools/ChangeLog
index 0ab94c1a44c6..a40cd2c3d723 100644
--- a/sys-apps/isapnptools/ChangeLog
+++ b/sys-apps/isapnptools/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for sys-apps/isapnptools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/ChangeLog,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
+
+  21 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  isapnptools-1.26-r1.ebuild:
+  updated keywords (-ppc) - ISA still doesn't exist on PPC..
+
+*isapnptools-1.26-r1 (05 Oct 2004)
+
+  05 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/isapnp.rc,
+ +isapnptools-1.26-r1.ebuild:
+  Move isapnp to /sbin/ to fix init.d dependency problems #63538.
+
+*isapnptools-1.23-r6.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> isapnptools-1.23-r6.ebuild :
+  Added KEYWORDS, SLOT.
+
+*isapnptools-1.23-r1.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> isapnptools-1.23-r1.ebuild :
+  Added KEYWORDS, SLOT.
 
 *isapnptools-1.26 (1 Feb 2002)
 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc) - ISA doesn't exist on PPC
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> isapnptools-1.26.ebuild :
+  Added KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/isapnptools/Manifest b/sys-apps/isapnptools/Manifest
index e69de29bb2d1..dae4ec9c8ebd 100644
--- a/sys-apps/isapnptools/Manifest
+++ b/sys-apps/isapnptools/Manifest
@@ -0,0 +1,5 @@
+MD5 dd767398c51ddec5aeef56457f61b7bd ChangeLog 1512
+MD5 74fec5e308b560bc4117c9bf9933835d isapnptools-1.26-r1.ebuild 982
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 f1915a1decdb9bad292e52fb7ae5e727 files/digest-isapnptools-1.26-r1 65
+MD5 54980db44fa935a4b0c3a04893cd2980 files/isapnp.rc 655
diff --git a/sys-apps/isapnptools/files/isapnp.rc b/sys-apps/isapnptools/files/isapnp.rc
index d3d804d0f421..4a8575c87955 100644
--- a/sys-apps/isapnptools/files/isapnp.rc
+++ b/sys-apps/isapnptools/files/isapnp.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/sys-apps/isapnptools/files/isapnp.rc,v 1.1 2004/10/06 01:41:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/files/isapnp.rc,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 check_config() {
 	if [ ! -e /etc/isapnp.conf ] ; then
diff --git a/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild
index 5525fce0cad2..5529a5abd62c 100644
--- a/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.26-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/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild,v 1.1 2004/10/06 01:41:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Tools for configuring ISA PnP devices"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
@@ -8,7 +8,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 -ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-apps/isapnptools/metadata.xml b/sys-apps/isapnptools/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/isapnptools/metadata.xml
+++ b/sys-apps/isapnptools/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-apps/ivman/ChangeLog b/sys-apps/ivman/ChangeLog
index 1c69ec32eede..da8dfcea9cf0 100644
--- a/sys-apps/ivman/ChangeLog
+++ b/sys-apps/ivman/ChangeLog
@@ -1,6 +1,94 @@
 # ChangeLog for sys-apps/ivman
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ChangeLog,v 1.1 2004/10/19 17:15:33 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ChangeLog,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
+
+  14 Nov 2005; Markus Rothe <corsair@gentoo.org> ivman-0.6.4.ebuild,
+  ivman-0.6.5.ebuild:
+  Added ~ppc64
+
+*ivman-0.6.5 (07 Nov 2005)
+
+  07 Nov 2005; Stefan Schweizer <genstef@gentoo.org> +ivman-0.6.5.ebuild:
+  version bump
+
+  12 Oct 2005; Luis Medinas <metalgod@gentoo.org> ivman-0.5_pre2.ebuild:
+  Marked Stable on amd64. Closes bug #108269.
+
+  15 Sep 2005; Stefan Schweizer <genstef@gentoo.org> ivman-0.6.4.ebuild:
+  Fix enewuser /bin/false shell, bug 103421
+
+*ivman-0.6.4 (13 Sep 2005)
+
+  13 Sep 2005; Stefan Schweizer <genstef@gentoo.org> +ivman-0.6.4.ebuild:
+  Version bump, closes bug 93080 and 105788
+
+  08 May 2005; Stefan Schweizer <genstef@gentoo.org> ivman-0.5_pre2.ebuild,
+  ivman-0.5_pre3.ebuild:
+  Correct hal dep: =sys-apps/hal-0.4*, thanks to Nathaniel McCallum
+  <npmccallum@gentoo.org> in bug 91917
+
+*ivman-0.5_pre3 (26 Apr 2005)
+
+  26 Apr 2005; Stefan Schweizer <genstef@gentoo.org> +ivman-0.5_pre3.ebuild:
+  Version bump thanks to Rohan McGovern <rohan.pm@gmail.com> in bug 90319
+
+  27 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/ivman-0.3-cvs.update, -ivman-0.3-r1.ebuild, -ivman-0.3.ebuild,
+  -ivman-0.4_rc2.ebuild, ivman-0.5_pre2.ebuild:
+  0.5_pre2 stable on x86, cleaned up old ebuilds.
+
+  04 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> ivman-0.5_pre2.ebuild:
+  Added to ~ppc.
+
+*ivman-0.5_pre2 (30 Jan 2005)
+
+  30 Jan 2005; Stefan Schweizer <genstef@gentoo.org> -ivman-0.5_pre1.ebuild,
+  +ivman-0.5_pre2.ebuild:
+  Version bump thanks to rohan in bug 80010
+
+*ivman-0.5_pre1 (20 Jan 2005)
+
+  20 Jan 2005; Stefan Schweizer <genstef@gentoo.org> +ivman-0.5_pre1.ebuild:
+  Version Bump thanks to Rohan <rohan@mizzenblog.com> in bug 78775
+
+*ivman-0.4_rc2 (29 Dec 2004)
+
+  29 Dec 2004; Stefan Schweizer <genstef@gentoo.org> -ivman-0.4_rc1.ebuild,
+  +ivman-0.4_rc2.ebuild:
+  Version bump, fixing bug 76073: doexe -> newexe
+
+  21 Dec 2004; Stefan Schweizer <genstef@gentoo.org> ivman-0.4_rc1.ebuild:
+  Adding missing sudo dep, thanks to Thomas Frase <thomas.frase@gmx.net> in
+  bug 74917
+
+*ivman-0.4_rc1 (17 Dec 2004)
+
+  17 Dec 2004; Stefan Schweizer <genstef@gentoo.org> ivman-0.3.ebuild,
+  +ivman-0.4_rc1.ebuild:
+  Marking version 0.3 stable, updating to latest 0.4_rc1, thanks to rohan
+  <rohan@mizzenblog.com> in bug 74616
+
+  15 Dec 2004; Stefan Schweizer <genstef@gentoo.org> ivman-0.3-r1.ebuild:
+  Make the usb patch only apply on USE=usb
+
+  15 Dec 2004; Stefan Schweizer <genstef@gentoo.org> ivman-0.3-r1.ebuild:
+  Make the usb patch only apply on USE=usb
+
+*ivman-0.3-r1 (14 Dec 2004)
+
+  14 Dec 2004; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  +ivman-0.3-r1.ebuild:
+  Update maintainer to me, add a -r1 with usb automount support based on
+  useflag, closes bug 74341, thanks to Rohan <rohan@mizzenblog.com>.
+
+  28 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> ivman-0.3.ebuild:
+  Versioning the glib dep.
+
+  27 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> ivman-0.3.ebuild:
+  Added libtool DEP per comment in bug #66013.
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org> ivman-0.3.ebuild:
+  added ~amd64
 
 *ivman-0.3 (19 Oct 2004)
 
diff --git a/sys-apps/ivman/Manifest b/sys-apps/ivman/Manifest
index 40b8fef8d888..5a24493b12e5 100644
--- a/sys-apps/ivman/Manifest
+++ b/sys-apps/ivman/Manifest
@@ -1,4 +1,11 @@
-MD5 c830223de99d24d1a0d582921209aca1 ivman-0.3.ebuild 712
-MD5 18fc1db477b55bba40c6bef89d88c91c files/digest-ivman-0.3 61
-MD5 b86d8cf53aa1a20560c30c9ac9db6576 files/ivman-0.3.init 517
-MD5 7a90eb51de967dd0c19d570986156e70 files/ivman-0.3-cvs.update 14770
+MD5 16903ac157e573757e4e920e4590d361 ChangeLog 3532
+MD5 7a702903471226e8942d6d9c8dfdcba5 ivman-0.5_pre2.ebuild 1309
+MD5 217682a6813a0a28a1a7be4b3b6adc54 ivman-0.5_pre3.ebuild 1310
+MD5 94ae54dc83c1b4b61c9edccab725465b metadata.xml 265
+MD5 0a279ef04950ef7acd46341ecb0b0d7d ivman-0.6.4.ebuild 2581
+MD5 b233402a9b0c06809675c49c7290c8b8 ivman-0.6.5.ebuild 2601
+MD5 7b663d58e12a086e30f6eb8e5cf965d3 files/digest-ivman-0.5_pre2 67
+MD5 a561344e43c3fcfab148515b471ecd5a files/digest-ivman-0.5_pre3 67
+MD5 f1e67af6cdf8b51ac4c5cd5e8e7ec298 files/ivman-0.3.init 524
+MD5 4aac9f5d6f83eeda363d051c89933adf files/digest-ivman-0.6.4 64
+MD5 bc91a3cd4a282da93547f727c80d20b6 files/digest-ivman-0.6.5 64
diff --git a/sys-apps/ivman/files/ivman-0.3.init b/sys-apps/ivman/files/ivman-0.3.init
index b1a807652354..13dd8354c654 100644
--- a/sys-apps/ivman/files/ivman-0.3.init
+++ b/sys-apps/ivman/files/ivman-0.3.init
@@ -1,7 +1,7 @@
 #!/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/sys-apps/ivman/files/ivman-0.3.init,v 1.1 2004/10/19 17:15:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/files/ivman-0.3.init,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 depend() {
 	need hald
diff --git a/sys-apps/ivman/ivman-0.5_pre2.ebuild b/sys-apps/ivman/ivman-0.5_pre2.ebuild
index 098344ab2ea0..f245dfa53399 100644
--- a/sys-apps/ivman/ivman-0.5_pre2.ebuild
+++ b/sys-apps/ivman/ivman-0.5_pre2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ivman-0.5_pre2.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 DESCRIPTION="Daemon to mount/unmount devices, based on info from HAL"
 HOMEPAGE="http://ivman.sf.net"
 SRC_URI="mirror://sourceforge/ivman/${P}.tar.bz2"
 LICENSE="QPL"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 SLOT="0"
 
 RDEPEND=">=dev-libs/glib-2.2
 	 dev-libs/libxml2
-	 >=sys-apps/hal-0.2.98"
+	 =sys-apps/hal-0.4*"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5
 	dev-util/pkgconfig"
diff --git a/sys-apps/ivman/ivman-0.5_pre3.ebuild b/sys-apps/ivman/ivman-0.5_pre3.ebuild
index b1fcdc210651..f7cd3bd07930 100644
--- a/sys-apps/ivman/ivman-0.5_pre3.ebuild
+++ b/sys-apps/ivman/ivman-0.5_pre3.ebuild
@@ -1,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-apps/ivman/ivman-0.5_pre3.ebuild,v 1.1 2005/04/26 12:01:57 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ivman-0.5_pre3.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 DESCRIPTION="Daemon to mount/unmount devices, based on info from HAL"
 HOMEPAGE="http://ivman.sf.net"
@@ -12,7 +12,7 @@ SLOT="0"
 
 RDEPEND=">=dev-libs/glib-2.2
 	 dev-libs/libxml2
-	 >=sys-apps/hal-0.2.98"
+	 =sys-apps/hal-0.4*"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-1.5
 	dev-util/pkgconfig"
diff --git a/sys-apps/ivman/ivman-0.6.4.ebuild b/sys-apps/ivman/ivman-0.6.4.ebuild
index e3427c087292..378093b05469 100644
--- a/sys-apps/ivman/ivman-0.6.4.ebuild
+++ b/sys-apps/ivman/ivman-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/sys-apps/ivman/ivman-0.6.4.ebuild,v 1.1 2005/09/13 18:23:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ivman-0.6.4.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Daemon to mount/unmount devices, based on info from HAL"
 HOMEPAGE="http://ivman.sf.net"
 SRC_URI="mirror://sourceforge/ivman/${P}.tar.bz2"
 LICENSE="QPL"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 SLOT="0"
 
@@ -41,7 +41,7 @@ src_install() {
 	# execute...
 	# The group here is intended to be the one needed to use pmount, but Ivman
 	# will still work as long as the group in IvmConfigBase.xml is correct.
-	enewuser ivman -1 /bin/false /dev/null plugdev || die "Problem adding ivman user"
+	enewuser ivman -1 -1 /dev/null plugdev || die "Problem adding ivman user"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/ivman/ivman-0.6.5.ebuild b/sys-apps/ivman/ivman-0.6.5.ebuild
index bea9b582fe4b..4e352b61146b 100644
--- a/sys-apps/ivman/ivman-0.6.5.ebuild
+++ b/sys-apps/ivman/ivman-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/sys-apps/ivman/ivman-0.6.5.ebuild,v 1.1 2005/11/07 02:52:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ivman/ivman-0.6.5.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Daemon to mount/unmount devices, based on info from HAL"
 HOMEPAGE="http://ivman.sf.net"
 SRC_URI="mirror://sourceforge/ivman/${P}.tar.bz2"
 LICENSE="QPL"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 SLOT="0"
 
diff --git a/sys-apps/ivman/metadata.xml b/sys-apps/ivman/metadata.xml
index 15a401e91b43..381858e1973d 100644
--- a/sys-apps/ivman/metadata.xml
+++ b/sys-apps/ivman/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>eradicator@gentoo.org</email>
-</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>genstef@gentoo.org</email>
+    <name>Stefan Schweizer</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 758278aadce5..3e77b35e85d3 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,11 +1,180 @@
 # ChangeLog for sys-apps/kbd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.1 2002/03/23 01:01:19 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
+
+  12 Jul 2005; Joseph Jezak <josejx@gentoo.org> kbd-1.12-r5.ebuild:
+  Marked ppc stable.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> kbd-1.12-r5.ebuild:
+  Stable on ppc64
+
+  04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> kbd-1.12-r5.ebuild:
+  Stable on sparc
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/kbd-1.12-jp-escape.patch, kbd-1.12-r5.ebuild:
+  Touch up the jp106 map #71870 by OKUMURA N. Shin-ya.
+
+  31 May 2005; Sven Wegener <swegener@gentoo.org> kbd-1.12-r3.ebuild,
+  kbd-1.12-r4.ebuild, kbd-1.12-r5.ebuild:
+  Let portage handle the stripping of binaries.
+
+*kbd-1.12-r5 (19 May 2005)
+
+  19 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/kbd-1.12-Meta_utf8.patch, +files/kbd-1.12-alias.patch,
+  +files/kbd-1.12-setfont-man.patch, +kbd-1.12-r5.ebuild:
+  Add patches from fedora.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*kbd-1.12-r4 (29 Dec 2004)
+
+  29 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-it-euro-map.patch,
+  files/kbd-1.12-kbd_repeat-v2.patch, +kbd-1.12-r4.ebuild:
+  Add patch by Tupone Alfredo for italian maps to support the euro #75970.
+
+*kbd-1.12-r3 (26 Oct 2004)
+
+  26 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-debian.patch,
+  +kbd-1.12-r3.ebuild:
+  Fix cz keymaps #19010 by kavol@email.cz. Include svorak keymap #55643 by
+  David Holm. Grab some updates from debian.
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> kbd-1.12-r2.ebuild:
+  use emake
+
+  16 Jun 2004; Aron Griffis <agriffis@gentoo.org> -kbd-1.06-r1.ebuild,
+  -kbd-1.08-r4.ebuild, kbd-1.08-r5.ebuild, -kbd-1.12-r1.ebuild,
+  kbd-1.12-r2.ebuild, -kbd-1.12.ebuild:
+  - Fix bug 53984: Mark 1.12-r2 stable everywhere so we don't have to
+	workaround the /bin/kbd_mode vs. /usr/bin/kbd_mode issue in
+	baselayout
+  - Fix bugs 42859 and 46456: Unpack manually to avoid the issue of a
+    UTF-8 filename in the tarball
+  - Trim old ebuilds
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> kbd-1.12-r2.ebuild:
+  Stable on alpha.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> kbd-1.12-r2.ebuild:
+  stable on amd64
+
+  01 Jun 2004; Tom Gall <tgall@gentoo.org> kbd-1.12-r2.ebuild:
+  stable on ppc64 bug #52651
+
+*kbd-1.12-r2 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r2.ebuild,
+  files/kbd-1.12-kbd_repeat-v2.patch:
+  Update patch from Andries again.
+
+*kbd-1.12-r1 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r1.ebuild,
+  files/kbd-1.12-kbd_repeat.patch:
+  Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'. Patch
+  by Andries Brouwer <Andries.Brouwer@cwi.nl>.
+
+*kbd-1.12 (29 Jan 2004)
+
+  29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12.ebuild,
+  files/kbd-1.12-find-map-fix.patch:
+  Update version.  Add proper patch from Andries for this version.
+
+*kbd-1.08-r5 (29 Jan 2004)
+
+  29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r5.ebuild,
+  files/kbd-1.08-find-map-fix.patch:
+  Fixes a problem where loadkeys matches dvorak the dir, and not the
+  .map file.
+
+  19 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild:
+  Mark stable, as latest stable baselayout depends on it, bug #38585.
+
+  04 Nov 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild:
+  Fix to compile on Sparc again, bug #25517.
+
+*kbd-1.08-r4 (31 Oct 2003)
+
+  31 Oct 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r4.ebuild,
+  files/kbd-1.06-othervt.patch, files/kbd-1.08-nowarn.patch,
+  files/kbd-1.08-sparc.patch, files/kbd-1.08-terminal.patch:
+  Add '--tty' switch to setfont, thanks to Krzysztof Kotlenga
+  <pocek@polbrokers.ods.org>, bug #32279. Also add a few patches from Redhat,
+  and update our Sparc patch with a more simple one.
+
+*kbd-1.08-r3 (24 Sep 2003)
+
+  24 Sep 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r3.ebuild,
+  files/kbd-1.08-po-install-locations.patch:
+  Locales do not use DATADIR corretly, and thus install to /share, and not
+  /usr/share, bug #26384.
+
+*kbd-1.08-r2 (02 Aug 2003)
+
+  06 Aug 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> kbd-1.08-r2.ebuild,
+  marked -ppc for now: loading a non-us keymap fails with 'flex input failed' 
+
+  02 Aug 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r2.ebuild,
+  files/kbd-1.08-kbd_repeat.patch:
+  A better fix from Keith M Wesolowski <wesolows@gentoo.org> (bug #25517).
+
+  02 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  files/kbd-1.08-sparc-fixes.patch:
+  Sparc64 fixes, bug #25517 again.
+
+  31 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild:
+  Fix struct kbd_rate not being fixed for sparc to use 'period' and not 'rate',
+  bug #25517.
+
+*kbd-1.08-r1 (29 Jul 2003)
+
+  06 Aug 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> kbd-1.08-r2.ebuild,
+  marked -ppc for now: loading a non-us keymap fails with 'flex input failed' 
+
+  29 Jul 2003; Martin Schlemmer <azarah@gentoo.org> kbd-1.08-r1.ebuild:
+  New configure script is even more broken than before - we should not add the
+  prefix to the paths we pass --datadir and --mandir, else it looks for data in
+  /usr/usr/share ... (bug #25448).
+  Thanks to Nicolai Lissner <nlissne@linux01.gwdg.de> who did have the right
+  solution (did not check bug again until now, so missed his feedback).
+
+*kbd-1.08 (28 Jul 2003)
+
+  28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> Manifest, kbd-1.08.ebuild:
+  New version.
+
+  20 May 2003; Joshua Kinard <kumba@gentoo.org> kbd-1.06-r1.ebuild:
+  Added fix to ebuild to use CFLAGS from /etc/make.conf.  Fixes Bug #21320.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> kbd-1.06-r1.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> kbd-1.06-r1.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  22 Mar 2002; Daniel Robbins <drobbins@gentoo.org> kbd-1.06-r1.ebuild :
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> kbd-1.06.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> kbd-1.06-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+  Fixed Matthew Kennedy's patch which was totally broken in every way and
+  killed this ebuild.
 
 *kbd-1.06-r1  (22 Mar 2002)
 
-  22 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kbd-1.06-r1.ebuild :
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
 
+  22 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kbd-1.06-r1.ebuild :
   Added USE dependent nls support from a patch sent in by Matthew Kennedy.
 
 *kbd-1.06  (1 Feb 2002)
@@ -18,4 +187,4 @@
   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 copyright and cvs header
-  comments, in exactly the same format as this comment.
+  omments, in exactly the same format as this comment.
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 0349170a61ca..3ea0f29183cd 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,3 +1,18 @@
-MD5 e2d2df82db28950218b8ede63fed72cf ChangeLog 1586
-MD5 67c3e1e173146c18540e608129ba3d57 kbd-1.06-r1.ebuild 1117
-MD5 b1f1dbd569840cc0e1c97a7431466964 files/digest-kbd-1.06-r1 60
+MD5 e8ed67538bae37e1f3e02ab1182beb11 ChangeLog 7195
+MD5 4093a0a61f24616d5ec7548523a2a176 kbd-1.12-r5.ebuild 2723
+MD5 373ac401400870223a0f5c52ed31951b kbd-1.12-r4.ebuild 2412
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c29424ddee16d6f71aa4b5276d4718a4 kbd-1.12-r3.ebuild 2268
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118
+MD5 58617e4171ee3357153c9793be062524 files/kbd-1.12-it-euro-map.patch 501
+MD5 2fff8da17e566c258df2888fbc599c23 files/kbd-1.12-cz-qwerty-map.patch 5821
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r5 118
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r4 118
+MD5 5f28051ad309ee4e481ef3b2b9cc9714 files/kbd-1.12-kbd_repeat-v2.patch 809
+MD5 d03cdb6117cda1a23cb90b91ab133c3e files/kbd-1.12-alias.patch 1129
+MD5 3e2652f1b8451784488b743b6e0dd556 files/kbd-1.12-find-map-fix.patch 957
+MD5 590a77d26b0b25a4217435ffa8bcd18a files/kbd-1.12-debian.patch 2628
+MD5 fa826e223fa8177a8faff98b798cf601 files/kbd-1.12-Meta_utf8.patch 344
+MD5 4063587dde8a52da8b5e66209ee25ae8 files/kbd-1.12-jp-escape.patch 404
+MD5 ff84eec635b7a1578ef1284b994f779b files/kbd-1.12-setfont-man.patch 629
+MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
diff --git a/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch
index 8723b59e5999..a27c88a356f4 100644
--- a/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch
+++ b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch
@@ -1,3 +1,16 @@
+kavol@email.cz writes:
+
+I wanted to use the keymap file /usr/share/keymaps/i386/qwerty/cz.map.gz, 
+but I have found this to be qwertz so I think it should be placed in 
+/usr/share/keymaps/i386/qwertz/ (or, much better, converted to qwerty - 
+I don't understand the masochists who use us-qwerty and cz-qwertz together :-)
+
+http://bugs.gentoo.org/show_bug.cgi?id=19010
+
+Gentoo notes:
+We copy the qwerty/cz.map to qwertz/cz.map and then apply this patch ... 
+that way we end up with both a qwerty and qwertz version of the cz.map
+
 --- data/keymaps/i386/qwerty/cz.map.old	2004-06-21 00:03:22.000000000 +0200
 +++ data/keymaps/i386/qwerty/cz.map	2004-10-24 16:04:44.471056808 +0200
 @@ -1,6 +1,9 @@
diff --git a/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch
index bc924b7d2176..3e7f11dc2358 100644
--- a/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch
+++ b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch
@@ -1,3 +1,5 @@
+Linux is nice and changes around core structures :)
+
 --- kbd-1.12/src/kbdrate.c	Fri Jan 16 20:45:31 2004
 +++ kbd-1.12.kbdrate/src/kbdrate.c	Sun Feb  8 14:52:04 2004
 @@ -164,10 +169,10 @@
diff --git a/sys-apps/kbd/kbd-1.12-r3.ebuild b/sys-apps/kbd/kbd-1.12-r3.ebuild
index 69ac3f05afbc..5472055f4572 100644
--- a/sys-apps/kbd/kbd-1.12-r3.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r3.ebuild,v 1.1 2004/10/26 01:46:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Keyboard and console utilities"
 HOMEPAGE="http://freshmeat.net/projects/kbd/"
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="nls"
 
 DEPEND="virtual/libc
@@ -28,8 +28,12 @@ src_unpack() {
 	done
 
 	cd ${S}
-	# Fixes makefile so that it uses the CFLAGS from portage (bug #21320).
-	sed -i -e "s:-O2:${CFLAGS}:g" src/Makefile.in
+	sed -i \
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:g" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		-e "s:install -s:install:" \
+		src/Makefile.in \
+		openvt/Makefile
 
 	# Other patches from RH
 	epatch ${FILESDIR}/${PN}-1.08-terminal.patch
@@ -60,7 +64,7 @@ src_compile() {
 		--datadir=/usr/share \
 		${myconf} || die
 
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
diff --git a/sys-apps/kbd/kbd-1.12-r4.ebuild b/sys-apps/kbd/kbd-1.12-r4.ebuild
index 70a05eb2cc35..00c1f93d18e3 100644
--- a/sys-apps/kbd/kbd-1.12-r4.ebuild
+++ b/sys-apps/kbd/kbd-1.12-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/sys-apps/kbd/kbd-1.12-r4.ebuild,v 1.1 2004/12/29 20:40:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r4.ebuild,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,47 +12,49 @@ SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	local a
-
 	# Workaround problem on JFS filesystems, see bug 42859
 	for a in ${A} ; do
 		echo ">>> Unpacking ${a} to ${WORKDIR}"
-		gzip -dc ${DISTDIR}/${a} | tar xf -
+		gzip -dc "${DISTDIR}"/${a} | tar xf -
+		assert
 	done
 
-	cd ${S}
+	cd "${S}"
 	sed -i \
-		-e "s:-O2:${CFLAGS}:g" \
-		-e 's:install -s:install:' \
-		src/Makefile.in
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:g" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		-e "s:install -s:install:" \
+		src/Makefile.in \
+		openvt/Makefile
 
 	# Other patches from RH
-	epatch ${FILESDIR}/${PN}-1.08-terminal.patch
+	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
 
 	# Fixes a problem where loadkeys matches dvorak the dir, and not the
 	# .map inside
-	epatch ${FILESDIR}/${P}-find-map-fix.patch
+	epatch "${FILESDIR}"/${P}-find-map-fix.patch
 
 	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'
-	epatch ${FILESDIR}/${P}-kbd_repeat-v2.patch
+	epatch "${FILESDIR}"/${P}-kbd_repeat-v2.patch
 
 	# misc fixes from debian
-	epatch ${FILESDIR}/${P}-debian.patch
+	epatch "${FILESDIR}"/${P}-debian.patch
 
 	# Provide a QWERTZ and QWERTY cz map #19010
 	cp data/keymaps/i386/{qwerty,qwertz}/cz.map || die "cz qwerty"
-	epatch ${FILESDIR}/${P}-cz-qwerty-map.patch
+	epatch "${FILESDIR}"/${P}-cz-qwerty-map.patch
 
 	# The italian keymap is missing euro support #75970
-	epatch ${FILESDIR}/${P}-it-euro-map.patch
+	epatch "${FILESDIR}"/${P}-it-euro-map.patch
 }
 
 src_compile() {
@@ -71,12 +73,12 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	mv ${D}/usr/bin/setfont ${D}/bin/
+	mv "${D}"/usr/bin/setfont "${D}"/bin/
 	dosym /bin/setfont /usr/bin/setfont
 
 	dodoc CHANGES CREDITS README
 	dodir /usr/share/doc/${PF}/html
-	cp -dR doc/* ${D}/usr/share/doc/${PF}/html/
+	cp -dR doc/* "${D}"/usr/share/doc/${PF}/html/
 
 	if use nls ; then
 		cd ${WORKDIR}/mnt/e/SvorakLN
diff --git a/sys-apps/kbd/kbd-1.12-r5.ebuild b/sys-apps/kbd/kbd-1.12-r5.ebuild
index 7916e535fae7..ae789c3e075b 100644
--- a/sys-apps/kbd/kbd-1.12-r5.ebuild
+++ b/sys-apps/kbd/kbd-1.12-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/sys-apps/kbd/kbd-1.12-r5.ebuild,v 1.1 2005/05/19 14:30:38 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r5.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.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=""
@@ -30,9 +30,11 @@ src_unpack() {
 
 	cd "${S}"
 	sed -i \
-		-e "s:-O2:${CFLAGS}:g" \
-		-e 's:install -s:install:' \
-		src/Makefile.in
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:g" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		-e "s:install -s:install:" \
+		src/Makefile.in \
+		openvt/Makefile
 
 	# Other patches from RH
 	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
@@ -54,6 +56,9 @@ src_unpack() {
 	# The italian keymap is missing euro support #75970
 	epatch "${FILESDIR}"/${P}-it-euro-map.patch
 
+	# Fix jp map to recognize Ctrl-[ as Escape #71870
+	epatch "${FILESDIR}"/${P}-jp-escape.patch
+
 	# Patches from Fedora
 	epatch "${FILESDIR}"/${P}-Meta_utf8.patch
 	## Fix runtime with gcc4 (setfont: Input file: trailing garbage)
diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/kbd/metadata.xml
+++ b/sys-apps/kbd/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-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog
index 35dc16683f39..21974e8c1672 100644
--- a/sys-apps/kexec-tools/ChangeLog
+++ b/sys-apps/kexec-tools/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sys-apps/kexec-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.1 2005/01/31 16:19:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  29 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kexec-tools-1.101.ebuild:
+  Stable on x86; bug #110734
+
+*kexec-tools-1.101 (12 Mar 2005)
+
+  12 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
+  +kexec-tools-1.101.ebuild:
+  version bump
+
+*kexec-tools-1.100-r1 (04 Feb 2005)
+
+  04 Feb 2005; Stefan Schweizer <genstef@gentoo.org> files/kexec.init,
+  +kexec-tools-1.100-r1.ebuild:
+  Making initrd support actually work, thanks to mayday147 in
+  http://forums.gentoo.org/viewtopic.php?p=2055679#2055679
 
 *kexec-tools-1.100 (31 Jan 2005)
 
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 114835276eed..188ef83ab01c 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,6 +1,18 @@
-MD5 0b78d0367d3bbc5f4fb1aa5e8fcf3579 kexec-tools-1.100.ebuild 603
-MD5 5a423a4beaa29bc40e659ee07189b141 ChangeLog 640
-MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
-MD5 3346c0b5fcc5f5974c6edb1a43acec3e files/digest-kexec-tools-1.100 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a5a5194bd404c2455789986a3d44813 ChangeLog 1231
+MD5 3346c0b5fcc5f5974c6edb1a43acec3e files/digest-kexec-tools-1.100-r1 69
+MD5 66fbf8cb76d68e3bc10effd7fec63974 files/digest-kexec-tools-1.101 69
 MD5 2fb1b484f2ce28a6f360ca237856b532 files/kexec.conf 267
-MD5 f8b9b340a121eaa017fd3e33aff29535 files/kexec.init 1127
+MD5 9a8673a8d6250ce2cc4d7889fc1852f2 files/kexec.init 1210
+MD5 5ccd33e89ab18e2a83476d6a60fa9030 kexec-tools-1.100-r1.ebuild 692
+MD5 26d1bafcdb0d07abf0dcaa559ccf786b kexec-tools-1.101.ebuild 688
+MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgGtTgIKl8Uu19MoRAqsJAJ4kPcg5yAeD7y5nJ75EqhfEKB1jdQCdFOkr
+1Qizbdo+K6nos+g9e383OvI=
+=E40e
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/kexec-tools/files/kexec.init b/sys-apps/kexec-tools/files/kexec.init
index cb53cda6701c..a78b96f9bb71 100755
--- a/sys-apps/kexec-tools/files/kexec.init
+++ b/sys-apps/kexec-tools/files/kexec.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.1 2005/01/31 16:19:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 depend() {
 	need checkfs
@@ -12,11 +12,11 @@ start() {
 	[ -z "$BOOTPATH" ] && BOOTPATH="/boot"
 	[ -z "$BOOTMOUNT" ] && BOOTMOUNT=1
 	[ -z "$ROOTPART" ] && ROOTPART="`cut -f 1 -d' ' /etc/mtab | grep / | tr '\n' '\t' | cut -f 1`"
-	[ -n "$INITRD" ] && INITRDOPT='--initrd="$INITRD"'
+	[ -n "$INITRD" ] && INITRDOPT="--initrd=$INITRD"
 
 	if [ "$KNAME" != "-" ]
 	then
-		ebegin "Loading kernel $KNAME for Kexec..."
+		ebegin "Loading kernel $KNAME for Kexec"
 		MNT=1
 		LOCS="`cut -f 2 -d' ' /etc/mtab | tr '\n' ' '`" 
 		for x in $LOCS
@@ -46,7 +46,7 @@ start() {
 			fi
 		fi
 	else
-		ebegin "Disabling kexec..."
+		ebegin "Disabling kexec"
 		kexec -u
 		RES=$?
 	fi
diff --git a/sys-apps/kexec-tools/kexec-tools-1.100-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-1.100-r1.ebuild
index 1ca94c746ad9..fc6ea2b9bca4 100644
--- a/sys-apps/kexec-tools/kexec-tools-1.100-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-1.100-r1.ebuild
@@ -1,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-apps/kexec-tools/kexec-tools-1.100-r1.ebuild,v 1.1 2005/02/04 21:15:32 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.100-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/"
diff --git a/sys-apps/kexec-tools/kexec-tools-1.101.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101.ebuild
index c92ad2934ce8..7147eee3aa00 100644
--- a/sys-apps/kexec-tools/kexec-tools-1.101.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-1.101.ebuild
@@ -1,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-apps/kexec-tools/kexec-tools-1.101.ebuild,v 1.1 2005/03/12 16:40:57 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.101.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.xmission.com/~ebiederm/files/kexec/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 src_install() {
diff --git a/sys-apps/lcdsplash/ChangeLog b/sys-apps/lcdsplash/ChangeLog
index e1aafc28c2b0..b003e8cff617 100644
--- a/sys-apps/lcdsplash/ChangeLog
+++ b/sys-apps/lcdsplash/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/lcdsplash
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdsplash/ChangeLog,v 1.1 2004/11/17 02:14:23 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdsplash/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+*lcdsplash-0.3 (29 Mar 2005)
+
+  29 Mar 2005; Mike Frysinger <vapier@gentoo.org> -lcdsplash-0.2.ebuild,
+  +lcdsplash-0.3.ebuild:
+  Add support for some x86-serial lcds.
+
+*lcdsplash-0.2 (22 Nov 2004)
+
+  22 Nov 2004; Mike Frysinger <vapier@gentoo.org> -lcdsplash-0.1.ebuild,
+  +lcdsplash-0.2.ebuild:
+  Version bump.
 
 *lcdsplash-0.1 (16 Nov 2004)
 
diff --git a/sys-apps/lcdsplash/Manifest b/sys-apps/lcdsplash/Manifest
index 8e83e7f06cf9..5012dbab77b2 100644
--- a/sys-apps/lcdsplash/Manifest
+++ b/sys-apps/lcdsplash/Manifest
@@ -1,4 +1,14 @@
-MD5 89ddea510d9b0e568ac43d33931f704e lcdsplash-0.1.ebuild 621
-MD5 5fb50574e1d6d91807c9a754c51dbff6 ChangeLog 187
-MD5 47f411af40b47a83864b6564762c4293 metadata.xml 224
-MD5 19c187ffe980acb824e3bb94415c3232 files/digest-lcdsplash-0.1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9ea7250836ad2c5a0593a8bff1747053 lcdsplash-0.3.ebuild 729
+MD5 ec408e3c1794e964b372c4a7ff71d078 ChangeLog 648
+MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
+MD5 548a0602893ec9b06642267e689a5034 files/digest-lcdsplash-0.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCSYLKI1lqEGTUzyQRAm7TAKDCZF9latrIRDCSGHp21kaAVuqs/ACfYnA5
+XJfKII7g4b43j3Iw3xeIzaQ=
+=zyyq
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lcdsplash/files/digest-lcdsplash-0.3 b/sys-apps/lcdsplash/files/digest-lcdsplash-0.3
index 5e404b63fcb5..3503bfb19b75 100644
--- a/sys-apps/lcdsplash/files/digest-lcdsplash-0.3
+++ b/sys-apps/lcdsplash/files/digest-lcdsplash-0.3
@@ -1 +1 @@
-MD5 675b80b3d20d9c61cdfbaac9d38bef80 lcdsplash-0.2.tar.bz2 7784
+MD5 e4b7f5514ee908085bb60d123caf82a2 lcdsplash-0.3.tar.bz2 8121
diff --git a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
index e23e12728435..d1381bf10a0b 100644
--- a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
+++ b/sys-apps/lcdsplash/lcdsplash-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-apps/lcdsplash/lcdsplash-0.3.ebuild,v 1.1 2005/03/29 05:21:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdsplash/lcdsplash-0.3.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 DESCRIPTION="splash Gentoo boot information on LCD's"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-apps/lcdtest/ChangeLog b/sys-apps/lcdtest/ChangeLog
index f3d7c2baee9f..790c15b5d349 100644
--- a/sys-apps/lcdtest/ChangeLog
+++ b/sys-apps/lcdtest/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/lcdtest
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/ChangeLog,v 1.1 2005/10/01 22:48:31 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/ChangeLog,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
+
+  01 Oct 2005; Andrej Kacian <ticho@gentoo.org> lcdtest-1.01.ebuild:
+  Keyworded ~x86.
 
 *lcdtest-1.01 (01 Oct 2005)
 
diff --git a/sys-apps/lcdtest/Manifest b/sys-apps/lcdtest/Manifest
index 0af623cff311..e465e4824db3 100644
--- a/sys-apps/lcdtest/Manifest
+++ b/sys-apps/lcdtest/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5babe50ca95b86a32bbe8be72ff78f8f lcdtest-1.01.ebuild 674
+MD5 113caaf7358e23cd7d146355f922a448 ChangeLog 498
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
-MD5 7fdec32291bffe61bb37cb1842e84982 ChangeLog 323
-MD5 27923dae6d1d26cd864e9962ebbab6f0 lcdtest-1.01.ebuild 574
 MD5 9709ad40b41ff6bbf92be9f01f464e30 files/digest-lcdtest-1.01 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPxWCQlM6RnzZP+IRAgtSAJwPGEGiiRFaHhKEbfgUd8jUAiUJlQCdESE0
+byTtQGWNT5kBdZI+FSo82Sc=
+=h+2i
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lcdtest/lcdtest-1.01.ebuild b/sys-apps/lcdtest/lcdtest-1.01.ebuild
index 5acfa09524a8..10d542bfac22 100644
--- a/sys-apps/lcdtest/lcdtest-1.01.ebuild
+++ b/sys-apps/lcdtest/lcdtest-1.01.ebuild
@@ -1,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-apps/lcdtest/lcdtest-1.01.ebuild,v 1.1 2005/10/01 22:48:31 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdtest/lcdtest-1.01.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 DESCRIPTION="Displays test patterns to spot dead/hot pixels on LCD screens"
 HOMEPAGE="http://www.brouhaha.com/~eric/software/lcdtest/"
 SRC_URI="http://www.brouhaha.com/~eric/software/lcdtest/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=">=media-libs/libsdl-1.2.7-r2
 	>=media-libs/sdl-image-1.2.3-r1"
diff --git a/sys-apps/lcdutils/ChangeLog b/sys-apps/lcdutils/ChangeLog
index 65272176a376..fa7b404b2806 100644
--- a/sys-apps/lcdutils/ChangeLog
+++ b/sys-apps/lcdutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lcdutils
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdutils/ChangeLog,v 1.1 2004/02/01 07:29:10 kumba Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
+
+  10 Jun 2004; Joshua Kinard <kumba@gentoo.org> lcdutils-0.2.ebuild:
+  Changed the ebuild to allow installation on x86 systems, since newer Cobalt
+  models (i.e. XTR) apparently work with this package.
 
 *lcdutils-0.2 (01 Feb 2004)
 
diff --git a/sys-apps/lcdutils/Manifest b/sys-apps/lcdutils/Manifest
index ae65670cfde2..fc5a5bba1b24 100644
--- a/sys-apps/lcdutils/Manifest
+++ b/sys-apps/lcdutils/Manifest
@@ -1,4 +1,4 @@
-MD5 b822c7449602e69fe2c703c47b5f8569 lcdutils-0.2.ebuild 919
+MD5 a204914cad2ec8ac07035aabc02cddc4 lcdutils-0.2.ebuild 1039
+MD5 7864a53c73f427207e410bde9781fad4 ChangeLog 780
 MD5 959070af74ba35cb8b5317212fbde352 metadata.xml 380
-MD5 4c89fa6c0d4e77a6d67b7cd78d95d43e ChangeLog 494
 MD5 6e620f6f7f21e97284c47c906a03bdd7 files/digest-lcdutils-0.2 63
diff --git a/sys-apps/lcdutils/lcdutils-0.2.ebuild b/sys-apps/lcdutils/lcdutils-0.2.ebuild
index f64a0a3c4c61..3ffff431c032 100644
--- a/sys-apps/lcdutils/lcdutils-0.2.ebuild
+++ b/sys-apps/lcdutils/lcdutils-0.2.ebuild
@@ -1,27 +1,25 @@
-# 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-apps/lcdutils/lcdutils-0.2.ebuild,v 1.1 2004/02/01 07:29:10 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lcdutils/lcdutils-0.2.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
 DESCRIPTION="Cobalt RaQ/Qube LCD Writing and Button reading utilities"
 HOMEPAGE=""
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* mips"
+KEYWORDS="-* mips ~x86"
 IUSE=""
 
 DEPEND=""
 
-S=${WORKDIR}/${P}
-
 pkg_setup() {
-	# See if we're on a cobalt system (must use the cobalt-mips profile)
+	# This package is aimed primarily at Cobalt Microserver systems.  Mips originally, but it
+	# is reported to work on x86-based systems as well.
 	if [ "${PROFILE_ARCH}" != "cobalt" ]; then
 		echo -e ""
-		eerror "This package is only for Cobalt Microserver systems.  It is not"
-		eerror "useful for any other type of system currently."
+		ewarn "This package is only for Cobalt Microserver systems.  Its use on other types of"
+		ewarn "hardware is untested."
 		echo -e ""
-		die "Wrong system!"
 	fi
 }
 
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index 62ed7df62ce3..15804f91e762 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -1,6 +1,171 @@
 # ChangeLog for sys-apps/less
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
+
+*less-385_p4-r2 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh,
+  +less-385_p4-r2.ebuild:
+  Tweak the manpage case in lesspipe.sh to display compressed text files which
+  are named funny #109419.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*less-385_p4-r1 (24 Aug 2005)
+
+  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +files/code2color.patch,
+  +less-385_p4-r1.ebuild:
+  Add support for more filetypes and colorize support #46587 by José Romildo
+  Malaquias.
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> less-382-r2.ebuild,
+  less-385.ebuild, less-385_p4.ebuild:
+  Add a PROVIDE for virtual/pager.
+
+*less-385_p4 (19 Jun 2005)
+
+  19 Jun 2005; Mike Frysinger <vapier@gentoo.org> +less-385_p4.ebuild:
+  Version bump with patch from Charles Levert.
+
+  18 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
+  Import ideas from Redhats lesspipe.sh and add support for more files.
+
+*less-385 (23 May 2005)
+
+  23 May 2005; Mike Frysinger <vapier@gentoo.org> +less-385.ebuild:
+  Version bump which have UTF8 fixes #93656 by Eugene Pavlovsky.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Sep 2004; Bart Lauwers <blauwers@gentoo.org> less-382-r2.ebuild:
+  Fix lesspipe error
+
+  11 Sep 2004; Tom Martin <slarti@gentoo.org> less-382-r2.ebuild:
+  Stable on amd64.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> less-382-r2.ebuild:
+  Stable on hppa.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> less-382-r2.ebuild,
+  less-382.ebuild:
+  Masked less-382.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> less-382-r2.ebuild:
+  Masked less-382-r2.ebuild stable for ppc
+
+  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> less-382-r2.ebuild:
+  Marked stable on mips.
+
+  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> less-382-r2.ebuild:
+  Stable on sparc
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> less-382-r2.ebuild:
+  stable on alpha, ia64 and x86
+
+*less-382-r2 (16 Jun 2004)
+
+  16 Jun 2004; Aron Griffis <agriffis@gentoo.org> files/lesspipe.sh-r2,
+  -less-382-r1.ebuild:
+  Fix a quoting issue in lesspipe.sh-r2 and add a trap to prevent 'Broken pipe'
+  messages. Thanks to Glen in bug 38854
+
+*less-382-r1 (15 Jun 2004)
+
+  15 Jun 2004; Aron Griffis <agriffis@gentoo.org> +files/lesspipe.sh-r2,
+  +less-382-r1.ebuild:
+  Fix bugs 18823 (lesspipe.sh misdetects troff files) and 38854
+  (lesspipe enchancments + cannot see some files with spaces).  Thanks
+  to Niels Teglsbo and Glen for the suggestions.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> less-382.ebuild:
+  Stable on alpha.
+
+  05 Jun 2004; Travis Tilley <lv@gentoo.org> less-382.ebuild:
+  stable on amd64
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> less-382.ebuild:
+  adding initial s390 support
+
+*less-382 (16 Feb 2004)
+
+  16 Feb 2004; Brandon Low <lostlogic@gentoo.org> less-382.ebuild:
+  Bump
+
+*less-381 (26 Mar 2003)
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> less-381.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  23 Jun 2003; Aron Griffis <agriffis@gentoo.org> less-381.ebuild:
+  Mark stable on alpha
+
+  16 Apr 2003; Guy Martin <gmsoft@gentoo.org> less-381.ebuild :
+  Marked stable on hppa.
+
+  02 Apr 2003; Christian Birchinger <joker@gentoo.org> less-381.ebuild:
+  Added stable sparc keyword
+
+  26 Mar 2003; Daniel Robbins <drobbins@gentoo.org> less-381.ebuild:
+  New upstream release; marked ~x86.
+
+*less-378-r2 (08 Feb 2003)
+
+  20 Mar 2003; Rajiv Manglani <rajiv@gentoo.org> less-378-r2.ebuild :
+  Marked stable for ppc and sparc. This version of less (with LESS=-R
+  set in the environment) is needed by groff-1.18 and later. That version
+  of groff is needed by man-1.5l. man-1.5l is needed to fix a security
+  issue in previous versions of man.
+
+  28 Feb 2003; Zach Welch <zwelch@gentoo.org> less-378-r2.ebuild :
+  add arm keyword
+
+  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> less-378-r2.ebuild :
+  Added hppa to keywords.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> less-378-r2.ebuild :
+  Mark as stable for mips.
+
+  08 Feb 2003; Martin Schlemmer <azarah@gentoo.org> less-378-r2.ebuild :
+
+  Change the LESS="-r" env variable to "-R".  This should close bug #13882.
+
+*less-378-r1 (26 Dec 2002)
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> less-378-r1.ebuild :
+  Added hppa to keywords.
+
+ 24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> less-378-r1.ebuild :
+  Mark as stable for mips.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> less-378-r1.ebuild :
+
+  Add /etc/env.d/70less containing 'LESS="-r"' for groff-1.18 and later support.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*less-378 (07 Jul 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  07 Oct 2002; Brandon Low <lostlogic@gentoo.org> less-378.ebuild :
+  
+  Version bump.
+
+*less-376 (03 Jul 2002)
+
+  03 Oct 2002; Brad Cowan <bcowan@gentoo.org> less-376.ebuild :
+  
+  Added --sysconfdir=/etc, fixes bug #8639
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> less-376.ebuild :
+  Added KEYWORDS, SLOT.
+
+  03 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  New version; thanks to Terry Chan.
 
 *less-371-r1 (1 Feb 2002)
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 7c23819a7400..d627f5ad5800 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,13 +1,20 @@
-MD5 f9155cc9df90f05799c386bf1531866f ChangeLog 2746
-MD5 1f746f26c862f847bbe8a167e1e9deec less-376.ebuild 801
-MD5 41a3db9f6da6ae69df843845e46d0cbc less-378-r1.ebuild 934
-MD5 edd445012ab3dedfe7c048eb518b407d less-378-r2.ebuild 935
-MD5 2daf093c3f33ea08fd0bfaa8a70e874e less-378.ebuild 805
-MD5 4c1132ab596a4507f72c888459062fad less-381.ebuild 936
-MD5 7b5bdd5f20fe55f32420ed4b3203c6ff files/digest-less-376 243
-MD5 400d2d4b02a4fda6b5b177877dade4eb files/digest-less-378 243
-MD5 8769c7864189f8c6f30907d60f350789 files/digest-less-378-r1 246
-MD5 f60badb5a4f71f62a360a728d0757ecd files/digest-less-378-r2 246
-MD5 24c3d68ec84e1fcd23ef6d95b0105a76 files/lesspipe.sh 1429
-MD5 0cc555c44c02b9b457e98ed39a63f1a2 files/lesspipe.sh-r1 1429
-MD5 ddd20ba8447e21d2e3d3368833c7180e files/digest-less-381 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ea6992005facd6b91efc55c14699d8a ChangeLog 5929
+MD5 0f015b2ac33a3d039f77c6f15b768895 files/code2color.patch 221
+MD5 6f05cb473c8bd03fb8fb5ba7466aa804 files/digest-less-382-r2 60
+MD5 c9bb99cd4f916916f975c59d38c3d590 files/digest-less-385 60
+MD5 f5d6d65946fd9d3091b3d06bc3615492 files/digest-less-385_p4-r2 181
+MD5 e7d23b3be643f69db9fe6a0c6162dbda files/lesspipe.sh 4129
+MD5 adb0b1124c355f33197454d2be87bfd3 less-382-r2.ebuild 791
+MD5 147e4c10285042fad83d0c3592498e8c less-385.ebuild 800
+MD5 4011fc14d9d06c6e8500ddc95e26ecd2 less-385_p4-r2.ebuild 1528
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcA2ogIKl8Uu19MoRAgH7AJ4qf+BRRNevpBGwAFOwT+Ok+S/wyQCeI3MH
+aLqcNTlxNgXh7HOE/I9TcUY=
+=vmoU
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index f9c77ab580ff..a34827c5f5e7 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -1,41 +1,175 @@
-#!/bin/sh
-
+#!/bin/bash
+# 
 # Preprocessor for 'less'. Used when this environment variable is set:
 # LESSOPEN="|lesspipe.sh %s"
 
+# TODO: handle compressed files better
+
+trap 'exit 0' PIPE
+
+guesscompress() {
+	case "$1" in
+		*.gz)  echo "gunzip -c" ;;
+		*.bz2) echo "bunzip2 -c" ;;
+		*)     echo "cat" ;;
+	esac
+}
+
+lesspipe_file() {
+	local out=$(file -L -- "$1")
+	case ${out} in
+		*" ar archive"*)    lesspipe "$1" ".a" ;;
+		*" tar archive"*)   lesspipe "$1" ".tar" ;;
+		*" CAB-Installer"*) lesspipe "$1" ".cab" ;;
+		*" troff "*)        lesspipe "$1" ".man" ;;
+		*" shared object"*) lesspipe "$1" ".so" ;;
+		*" Zip archive"*)   lesspipe "$1" ".zip" ;;
+		*" LHa"*archive*)   lesspipe "$1" ".lha" ;;
+		*" ELF "*)          readelf -a -- "$1" ;;
+		*": data")          hexdump -C -- "$1" ;;
+		*)                  return 1 ;;
+	esac
+	return 0
+}
+
 lesspipe() {
+	local match=$2
+	[[ -z ${match} ]] && match=$1
+
+	local DECOMPRESSOR=$(guesscompress "$match")
+
+	case "$match" in
+
+	### Doc files ###
+	*.[0-9n]|*.man|\
+	*.[0-9n].bz2|*.man.bz2|\
+	*.[0-9n].gz|*.man.gz|\
+	*.[0-9][a-z].gz|*.[0-9][a-z].gz)
+		local out=$(${DECOMPRESSOR} -- "$1" | file -)
+		case ${out} in
+			*troff*)
+				# Need to make sure we pass path to man or it will try 
+				# to locate "$1" in the man search paths
+				if [[ $1 == /* ]] ; then
+					man -- "$1"
+				else
+					man -- "./$1"
+				fi
+				;;
+			*text*)
+				${DECOMPRESSOR} -- "$1"
+				;;
+			*)
+				# We could have matched a library (libc.so.6), so let
+				# `file` figure out what the hell this thing is
+				lesspipe_file "$1"
+				;;
+		esac
+		;;
+	*.dvi)      dvi2tty "$1" ;;
+	*.ps|*.pdf) ps2ascii "$1" || pstotext "$1" || pdftotext "$1" ;;
+	*.doc)      antiword "$1" || catdoc "$1" ;;
+	*.rtf)      unrtf --nopict --text "$1" ;;
+
+	### URLs ###
+	ftp://*|http://*|*.htm|*.html)
+		for b in links2 links lynx ; do
+			${b} -dump "$1" && exit 0
+		done
+		html2text -style pretty "$1"
+		;;
+
+	### Tar files ###
+	*.tar)                  tar tvvf "$1" ;;
+	*.tar.bz2|*.tbz2|*.tbz) tar tjvvf "$1" ;;
+	*.tar.gz|*.tgz|*.tar.z) tar tzvvf "$1" ;;
+
+	### Misc archives ###
+	*.bz2)        bzip2 -dc -- "$1" ;;
+	*.gz|*.z)     gzip -dc -- "$1"  ;;
+	*.zip)        unzip -l "$1" ;;
+	*.rpm)        rpm -qpivl --changelog -- "$1" ;;
+	*.cpi|*.cpio) cpio -itv < "$1" ;;
+	*.ace)        unace l -- "$1" ;;
+	*.arj)        unarj l -- "$1" ;;
+	*.cab)        cabextract -l -- "$1" ;;
+	*.lha|*.lzh)  lha v "$1" ;;
+	*.zoo)        zoo -list "$1" ;;
+	*.7z)         7z l -- "$1" ;;
+	*.a)          ar tv "$1" ;;
+	*.so)         readelf -h -d -s -- "$1" ;;
+
+	*.rar|.r[0-9][0-9])  unrar l -- "$1" ;;
+
+	*.deb|*.udeb)
+		if type -p dpkg > /dev/null ; then
+			dpkg --info "$1"
+			dpkg --contents "$1"
+		else
+			ar tv "$1"
+			ar p "$1" data.tar.gz | tar tzvvf -
+		fi
+		;;
+
+	### Media ###
+	*.bmp|*.gif|*.jpeg|*.jpg|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif)
+		identify "$1" || file -L -- "$1"
+		;;
+	*.avi|*.mpeg|*.mpg|*.mov|*.qt|*.wmv|*.asf|*.rm|*.ram)
+		midentify "$1" || file -L -- "$1"
+		;;
+	*.mp3)        mp3info "$1" || id3info "$1" ;;
+	*.ogg)        ogginfo "$1" ;;
+	*.flac)       metaflac --list "$1" ;;
+	*.iso)        isoinfo -d -i "$1" ; isoinfo -l -i "$1" ;;
+	*.bin|*.cue)  cd-info --no-header --no-device-info "$1" ;;
+
+	### Source code ###
+	*.awk|*.java|*.js|*.m4|*.pl|*.sh|\
+	*.[ch]|*.[ch]pp|*.[ch]xx|*.cc|*.hh|*.[sS]|\
+	*.patch)
+		# Only colorize if we know less will handle raw codes
+		for opt in ${LESS} ; do
+			if [[ ${opt} == "-r" || ${opt} == "-R" ]] ; then
+				code2color "$1"
+				break
+			fi
+		done
+		;;
+
+# May not be such a good idea :)
+#	### Device nodes ###
+#	/dev/[hs]d[a-z]*)
+#		fdisk -l "${1:0:8}"
+#		[[ $1 == *hd* ]] && hdparm -I "${1:0:8}"
+#		;;
+
+	### Everything else ###
+	*)
+		# Sanity check
+		[[ ${recur} == 2 ]] && exit 0
+
+		# Maybe we didn't match due to case issues ...
+		if [[ ${recur} == 0 ]] ; then
+			recur=1
+			lesspipe "$1" "$(echo $1 | tr '[:upper:]' '[:lower:]')"
+
+		# Maybe we didn't match because the file is named weird ...
+		else
+			recur=2
+			lesspipe_file "$1"
+		fi
 
-  case "$1" in
-
-  *.bz2) bzip2 -dc $1 2>/dev/null ;;
-  *.tar) tar tvvf $1 2>/dev/null ;;
-  *.tar.bz2) tar tjvvf $1 2>/dev/null ;;
-  *.tbz2) tar tjvvf $1 2>/dev/null ;;
-  *.tbz) tar tjvvf $1 2>/dev/null ;;
-  *.tar.gz) tar tzvvf $1 2>/dev/null ;;
-  *.tgz) tar tzvvf $1 2>/dev/null ;;
-  *.z) gzip -dc $1  2>/dev/null ;;
-  *.Z) gzip -dc $1  2>/dev/null ;;
-  *.tar.z) tar tzvvf $1 2>/dev/null ;;
-  *.tar.Z) tar tzvvf $1 2>/dev/null ;;
-  *.zip) unzip -l $1 2>/dev/null ;;
-  *.rpm) rpm -qilp "$1" 2>/dev/null ;;
-  *.[1-9] | *.n | *.man)
-    [ "$(file -L $1 | cut -d ' ' -f 2)" = "troff" -o \
-    "$(file -L $1 | cut -d ' ' -f 2)" = "ASCII" ] &&
-    groff -S -s -p -t -e -Tascii -mandoc "$1" 2>/dev/null ;;
-  *.[1-9].gz | *.n.gz | *.man.gz)
-    [ "$(gzip -dc $1 2>/dev/null|file -|tr -s ' '|cut -d ' ' -f3)" = "troff" -o \
-    "$(gzip -dc $1 2>/dev/null|file -|tr -s ' '|cut -d ' ' -f3)" = "ASCII" ] &&
-    gzip -dc $1 2>/dev/null | groff -S -s -p -t -e -Tascii -mandoc ;;
-  *.gz) gzip -dc $1  2>/dev/null ;; # keep this after the above statement :)
-  *) FILE="$(file -L $1)"
-    FILE1="$(echo $FILE | cut -d ' ' -f 2)"
-    FILE2="$(echo $FILE | cut -d ' ' -f 3)"
-    [ "$FILE1" = "Linux/i386" -o "$FILE2" = "Linux/i386" -o \
-      "$FILE1" = "ELF" -o "$FILE2" = "ELF" ] && strings $1 ;;
-
-  esac
+		exit 0
+		;;
+	esac
 }
 
-lesspipe $1
+if [[ -z $1 ]] ; then
+	echo "Usage: lesspipe.sh <file>"
+elif [[ -d $1 ]] ; then
+	ls -alF -- "$1"
+else
+	recur=0
+	lesspipe "$1" 2> /dev/null
+fi
diff --git a/sys-apps/less/less-382-r2.ebuild b/sys-apps/less/less-382-r2.ebuild
index 27b90279d1f2..6cbe89c12ef2 100644
--- a/sys-apps/less/less-382-r2.ebuild
+++ b/sys-apps/less/less-382-r2.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382-r2.ebuild,v 1.1 2004/06/17 00:03:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2"
+DEPEND=">=sys-libs/ncurses-5.2"
+PROVIDE="virtual/pager"
 
 src_install() {
 	dobin less lessecho lesskey || die
-	newbin ${FILESDIR}/lesspipe.sh-r2 lesspipe.sh
+	newbin "${FILESDIR}"/lesspipe.sh lesspipe.sh
 
 	# Needed for groff-1.18 and later ...
-	dodir /etc/env.d
-	echo "LESS=\"-R\"" > ${D}/etc/env.d/70less
+	echo "LESS=\"-R\"" > 70less
+	doenvd 70less
 
-	newman lesskey.nro lesskey.1
-	newman less.nro less.1
+	for m in *.nro ; do
+		newman ${m} ${m/nro/1}
+	done
 
 	dodoc NEWS README
 }
diff --git a/sys-apps/less/less-385.ebuild b/sys-apps/less/less-385.ebuild
index 7bbe7653483d..33296681133d 100644
--- a/sys-apps/less/less-385.ebuild
+++ b/sys-apps/less/less-385.ebuild
@@ -1,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-apps/less/less-385.ebuild,v 1.1 2005/05/23 22:31:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-385.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
@@ -12,6 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2"
+PROVIDE="virtual/pager"
 
 src_install() {
 	dobin less lessecho lesskey || die
diff --git a/sys-apps/less/less-385_p4-r2.ebuild b/sys-apps/less/less-385_p4-r2.ebuild
index c3dc75b949e2..32fa5e17ed91 100644
--- a/sys-apps/less/less-385_p4-r2.ebuild
+++ b/sys-apps/less/less-385_p4-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-apps/less/less-385_p4-r2.ebuild,v 1.1 2005/10/16 21:46:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-385_p4-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:43 chriswhite Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
+IUSE="unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 PROVIDE="virtual/pager"
@@ -31,6 +31,14 @@ src_unpack() {
 	epatch "${FILESDIR}"/code2color.patch
 }
 
+yesno() { use $1 && echo yes || echo no ; }
+src_compile() {
+	export ac_cv_lib_ncursesw_initscr=$(yesno unicode)
+	export ac_cv_lib_ncurses_initscr=$(yesno !unicode)
+	econf || die
+	emake || die
+}
+
 src_install() {
 	dobin less lessecho lesskey code2color || die "dobin"
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe.sh || die "newbin"
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/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-apps/linux32/ChangeLog b/sys-apps/linux32/ChangeLog
index cf9cdee65780..315b38d292d1 100644
--- a/sys-apps/linux32/ChangeLog
+++ b/sys-apps/linux32/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for sys-apps/linux32 
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux32/ChangeLog,v 1.1 2003/07/13 22:55:22 drobbins Exp $
+# ChangeLog for sys-apps/linux32
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux32/ChangeLog,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
+
+*linux32-2.0 (07 Jul 2005)
+
+  07 Jul 2005; Joshua Kinard <kumba@gentoo.org> metadata.xml,
+  +linux32-2.0.ebuild:
+  Literal re-write of linux32. Based off of a patch from debian's version, this
+  works on multiple archs. Deprecates sys-devel/sparc32 and sys-devel/mips32,
+  and avoids the need for other such variants. Due to the changes, amd64 and x86
+  keywords were dropped to avoid problems. sparc, mips, ppc, and ppc64 are the
+  initial keywords for this newer revision.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> linux32-1.0.ebuild:
+  sync IUSE (missing)
 
 *linux32-1.0 (13 Jul 2003)
 
diff --git a/sys-apps/linux32/Manifest b/sys-apps/linux32/Manifest
index 6baaaf718517..839eb2b75e0d 100644
--- a/sys-apps/linux32/Manifest
+++ b/sys-apps/linux32/Manifest
@@ -1,3 +1,16 @@
-MD5 71492697c714ffe08477abf13bb3a83f linux32-1.0.ebuild 714
-MD5 14884256e35061947235ee5f157a2d7c ChangeLog 244
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 24aabc9796ff8a763f883c35ec0eb65e linux32-1.0.ebuild 725
+MD5 d588572445856f343eba004d660b275a metadata.xml 385
+MD5 e03b01080089e6da9232bd400d58358e ChangeLog 970
+MD5 aceb75775f70992c085a2882f108ac02 linux32-2.0.ebuild 678
+MD5 c791059aae89ff380ce252700e0857bb files/digest-linux32-2.0 62
 MD5 c5a46361e6c1f30e842435a34749acd8 files/digest-linux32-1.0 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCzf86gIKl8Uu19MoRAicEAJ9P/tNCzlRKhopqqxg49HnbdOqsgQCfeK9K
+HuAC8nLtwCOrDPv54DbmJXs=
+=LDXk
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/linux32/linux32-1.0.ebuild b/sys-apps/linux32/linux32-1.0.ebuild
index 2ab18965f955..a63b613210c5 100644
--- a/sys-apps/linux32/linux32-1.0.ebuild
+++ b/sys-apps/linux32/linux32-1.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux32/linux32-1.0.ebuild,v 1.1 2003/07/13 22:55:22 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux32/linux32-1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 DESCRIPTION="A utility that allows AMD64 code to run in an environment so that the uname() call returns non-AMD64-specific info"
 HOMEPAGE="ftp://ftp.x86-64.org/pub/linux-x86_64/tools/linux32/"
-SRC_URI="mirror://${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="-* amd64"
+KEYWORDS="-* amd64 x86"
+IUSE=""
 LICENSE="GPL-2"
 
 src_compile() {
 	cd ${S}
-	gcc ${CFLAGS} linux32.c -o linux32
+	emake linux32
 }
 
 src_install() {
diff --git a/sys-apps/linux32/linux32-2.0.ebuild b/sys-apps/linux32/linux32-2.0.ebuild
index 95285881f6a6..5ffdbcd447b7 100644
--- a/sys-apps/linux32/linux32-2.0.ebuild
+++ b/sys-apps/linux32/linux32-2.0.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux32/linux32-2.0.ebuild,v 1.1 2005/07/08 04:06:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux32/linux32-2.0.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
-DESCRIPTION="A simple utility that tricks uname into returning a 32bit environment identifier."
+DESCRIPTION="A simple utility that tricks uname into returning a 32bit environment identifier"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~mips ~sparc ~ppc ~ppc64"
+KEYWORDS="-* ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-LICENSE="GPL-2"
 
 src_compile() {
-	cd ${S}
 	emake linux32
 }
 
 src_install() {
 	into /
-	cd ${S}
-	dobin linux32
-	ln -s linux32 ${D}/bin/linux64
+	dobin linux32 || die
+	dosym linux32 /bin/linux64
 	doman linux32.8
-	ln -s linux32.8.gz ${D}/usr/share/man/man1/linux64.8.gz
-	dodoc CHANGELOG COPYING CREDITS README
+	dosym linux32.8 /usr/share/man/man1/linux64.8
+	dodoc CHANGELOG CREDITS README
 }
diff --git a/sys-apps/linux32/metadata.xml b/sys-apps/linux32/metadata.xml
index f093d416cbb1..e17e65643087 100644
--- a/sys-apps/linux32/metadata.xml
+++ b/sys-apps/linux32/metadata.xml
@@ -1,7 +1,13 @@
- * 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>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Base System</name>
+	</maintainer>
+
+	<longdescription>
+		A simple utility that tricks uname into returning a 32bit environment identifier.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/lkcdutils/ChangeLog b/sys-apps/lkcdutils/ChangeLog
index d78bfb7e241f..aad463894867 100644
--- a/sys-apps/lkcdutils/ChangeLog
+++ b/sys-apps/lkcdutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lkcdutils
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lkcdutils/ChangeLog,v 1.1 2004/04/18 03:53:40 randy Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lkcdutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> lkcdutils-4.1.1.ebuild:
+  sync IUSE (missing)
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lkcdutils-4.1.1.ebuild:
+  Add inherit eutils
 
 *lkcdutils-4.1.1 (17 Apr 2004)
 
diff --git a/sys-apps/lkcdutils/Manifest b/sys-apps/lkcdutils/Manifest
index 76fe72152f98..dfe3cc6d2cd1 100644
--- a/sys-apps/lkcdutils/Manifest
+++ b/sys-apps/lkcdutils/Manifest
@@ -1,4 +1,4 @@
-MD5 d1a435f10a66e467047aa5c76c96d171 lkcdutils-4.1.1.ebuild 1814
-MD5 de7d167cc728777696ee5c269919e210 ChangeLog 305
+MD5 860c22640574d434f66ee47c48d0c0b2 lkcdutils-4.1.1.ebuild 1935
+MD5 b2d3deb994f1b4a8e40d81b34c752801 ChangeLog 582
 MD5 4e6b1136b128c7d332c13b4202d058bb metadata.xml 302
 MD5 f670700ebad630dced7713f9c08e0ca7 files/digest-lkcdutils-4.1.1 210
diff --git a/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild b/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
index db6610af350d..9d18526882db 100644
--- a/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild
+++ b/sys-apps/lkcdutils/lkcdutils-4.1.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/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild,v 1.1 2004/04/18 03:53:40 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lkcdutils/lkcdutils-4.1.1.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
+
+inherit eutils
 
 
 DESCRIPTION="Linux Kernel Crash Dumps (LKCD) Utilities"
@@ -10,6 +12,7 @@ SRC_URI="http://lkcd.sourceforge.net/download/OLD/4.1.1/lkcdutils/lkcdutils-4.1-
 HOMEPAGE="http://lkcd.sourceforge.net/ http://oss.software.ibm.com/developerworks/opensource/linux390/june2003_recommended.shtml"
 LICENSE="GPL-2"
 KEYWORDS="s390"
+IUSE=""
 SLOT="0"
 DEPEND="app-arch/rpm2targz
 	dev-util/byacc"
diff --git a/sys-apps/lkcp/ChangeLog b/sys-apps/lkcp/ChangeLog
index d828e19f0ba9..681dfa616c0d 100644
--- a/sys-apps/lkcp/ChangeLog
+++ b/sys-apps/lkcp/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for sys-apps/lkcp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lkcp/ChangeLog,v 1.1 2005/07/17 23:00:28 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lkcp/ChangeLog,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
+
+*lkcp-0.5.3-r3 (02 Nov 2005)
+
+  02 Nov 2005; Carlos Silva <r3pek@gentoo.org> -lkcp-0.5.3-r2.ebuild,
+  +lkcp-0.5.3-r3.ebuild:
+  Another rev bump. This time to remove the strange 'Resetting Terminal'
+  stuff. Fixes bug #111234, thx to Erik Zeek for reporting.
+
+  01 Nov 2005; <soulse@gentoo.org> lkcp-0.5.3-r2.ebuild:
+  Stable on x86 wrt bug #111108.
+
+*lkcp-0.5.3-r2 (01 Nov 2005)
+
+  01 Nov 2005; Carlos Silva <r3pek@gentoo.org> -lkcp-0.5.3-r1.ebuild,
+  +lkcp-0.5.3-r2.ebuild:
+  Added =glib-1* as a dep
+
+  01 Nov 2005; Carlos Silva <r3pek@gentoo.org> lkcp-0.5.3-r1.ebuild:
+  Do not install COPYING
+
+*lkcp-0.5.3-r1 (04 Sep 2005)
+
+  04 Sep 2005; Carlos Silva <r3pek@gentoo.org> -lkcp-0.5.3.ebuild,
+  +lkcp-0.5.3-r1.ebuild:
+  Added the doc use flag and fixed some dodoc errors while installing. Thx to
+  Matteo Spreafico for the ebuild. Closes bug #104039
+
+*lkcp-0.5.3 (23 Aug 2005)
+
+  23 Aug 2005; Carlos Silva <r3pek@gentoo.org> -lkcp-0.3.8.ebuild,
+  -lkcp-0.4.0.ebuild, +lkcp-0.5.3.ebuild:
+  Adding version 0.5.3 and removing previous versions
+
+  03 Aug 2005; David Holm <dholm@gentoo.org> lkcp-0.4.0.ebuild:
+  Readded to ~ppc. Please don't remove it without filing a proper bug report.
+
+*lkcp-0.4.0 (26 Jul 2005)
+
+  26 Jul 2005; Carlos Silva <r3pek@gentoo.org> +lkcp-0.4.0.ebuild:
+  New upstream release
+
+  18 Jul 2005; David Holm <dholm@gentoo.org> lkcp-0.3.8.ebuild:
+  Added to ~ppc.
 
 *lkcp-0.3.8 (18 Jul 2005)
 
diff --git a/sys-apps/lkcp/Manifest b/sys-apps/lkcp/Manifest
index 2e895387e1d2..5418bcdb0e7e 100644
--- a/sys-apps/lkcp/Manifest
+++ b/sys-apps/lkcp/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8e8d2d7d5193e9680e6be9d757399cef ChangeLog 369
-MD5 13edcad70ec39669cbd4f79de37c1cb6 files/digest-lkcp-0.3.8 62
-MD5 92d0554660bc1e0e2f0b59e6c9dc00f1 lkcp-0.3.8.ebuild 761
+MD5 4c645bf09d3490d476bffd31eeed7de3 lkcp-0.5.3-r3.ebuild 1220
+MD5 ff0f959767545cf63931e646f4f7ceeb ChangeLog 1756
 MD5 78c1b34edd1399c24d7d9e59212bc17a metadata.xml 221
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD4DBQFC2vDuI1lqEGTUzyQRAlg0AKCdZcHEmTmFRC/SL7Ldj0w4/wb2QQCWLLa7
-8s+UQNEmd+/MKBWe/IfsUw==
-=el0z
------END PGP SIGNATURE-----
+MD5 5dfa0227661465583918e88e7de6d688 files/digest-lkcp-0.5.3-r3 63
diff --git a/sys-apps/lkcp/lkcp-0.5.3-r3.ebuild b/sys-apps/lkcp/lkcp-0.5.3-r3.ebuild
index bff71aa6975b..617998620302 100644
--- a/sys-apps/lkcp/lkcp-0.5.3-r3.ebuild
+++ b/sys-apps/lkcp/lkcp-0.5.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/sys-apps/lkcp/lkcp-0.5.3-r3.ebuild,v 1.1 2005/11/02 23:13:03 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lkcp/lkcp-0.5.3-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 DESCRIPTION="Live Kernel Configuration Panel is an ncurses interface to the run-time Linux kernel configuration data (/proc)"
 HOMEPAGE="http://freshmeat.net/projects/lkcp"
diff --git a/sys-apps/lm_sensors-modules/ChangeLog b/sys-apps/lm_sensors-modules/ChangeLog
index 24054480f490..469cf88d1d24 100644
--- a/sys-apps/lm_sensors-modules/ChangeLog
+++ b/sys-apps/lm_sensors-modules/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for sys-apps/lm_sensors-modules
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/ChangeLog,v 1.1 2005/06/11 11:24:09 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/ChangeLog,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-modules-2.9.1.ebuild, lm_sensors-modules-2.9.2.ebuild:
+  No linux-2.4.x support for AMD64, bug #108270.
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-modules-2.9.2.ebuild:
+  Stable on x86, bug #108270.
+
+*lm_sensors-modules-2.9.2 (06 Sep 2005)
+
+  06 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/lm_sensors-2.9.2-module-path.patch,
+  +files/lm_sensors-2.9.2-modules-only.patch,
+  +lm_sensors-modules-2.9.2.ebuild:
+  Version bump.
+
+  19 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-modules-2.9.1.ebuild:
+  No linux-2.4.x support for ppc.
+
+  19 Jul 2005; <brix@gentoo.org> lm_sensors-modules-2.9.1.ebuild:
+  Stable on x86.
 
 *lm_sensors-modules-2.9.1 (11 Jun 2005)
 
diff --git a/sys-apps/lm_sensors-modules/Manifest b/sys-apps/lm_sensors-modules/Manifest
index 057e63b3ab41..369e22d534c1 100644
--- a/sys-apps/lm_sensors-modules/Manifest
+++ b/sys-apps/lm_sensors-modules/Manifest
@@ -1,6 +1,10 @@
-MD5 1ded1945a9f98137df4b9258cfec9931 lm_sensors-modules-2.9.1.ebuild 1513
-MD5 75b22d72690b76abaad111b7b870a91f ChangeLog 405
+MD5 b2168c95267e91e1e58d7bc1dbe81631 lm_sensors-modules-2.9.2.ebuild 1616
+MD5 be47ba4b0e8344f2a7742c4cfda0be31 lm_sensors-modules-2.9.1.ebuild 1631
+MD5 faa515a278d47fffe017657914677dce ChangeLog 1241
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 bc5cf1f60bec6bdb0fb095a5a361d1c1 files/lm_sensors-2.9.1-module-path.patch 4167
 MD5 3239330829a0de6eb11ba47d95662763 files/lm_sensors-2.9.1-modules-only.patch 524
+MD5 3588d17a38ada4fb0b52694bf5cdfa1b files/lm_sensors-2.9.2-modules-only.patch 462
+MD5 c8107273b4ca9fd900d92782882c4b9d files/lm_sensors-2.9.2-module-path.patch 4167
 MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-modules-2.9.1 68
+MD5 edf2235c80b178421142d5a8d04e50fa files/digest-lm_sensors-modules-2.9.2 68
diff --git a/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild
index 96eb2d106517..3b450be74b5f 100644
--- a/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild
+++ b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.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/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild,v 1.1 2005/06/11 11:24:09 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.1.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -13,7 +13,7 @@ SRC_URI="http://secure.netroedge.com/~lm78/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="-amd64 -ppc x86"
 
 IUSE=""
 DEPEND="sys-apps/i2c"
diff --git a/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild
index b74c5197096f..d06f6e80a921 100644
--- a/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild
+++ b/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild,v 1.1 2005/09/06 21:04:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors-modules/lm_sensors-modules-2.9.2.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -13,7 +13,7 @@ SRC_URI="http://secure.netroedge.com/~lm78/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86"
+KEYWORDS="-amd64 -ppc x86"
 
 IUSE=""
 DEPEND="sys-apps/i2c"
diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog
index 8c63268c7daf..b43b9cea6852 100644
--- a/sys-apps/lm_sensors/ChangeLog
+++ b/sys-apps/lm_sensors/ChangeLog
@@ -1,11 +1,420 @@
 # ChangeLog for sys-apps/lm_sensors
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.1 2002/04/28 00:40:11 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
-*lm_sensors-2.6.3 (27 Apr 2002)
+  27 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.2.ebuild:
+  Make I2C_CHARDEV a soft requirement.
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.2.ebuild:
+  Fix bug #107494... correctly.
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.1-r1.ebuild, lm_sensors-2.9.2.ebuild:
+  No linux-2.4.x support for AMD64, bug #108270.
+
+  23 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.2.ebuild:
+  Stable on x86, bug #108270.
+
+  21 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.2.ebuild:
+  Check for CONFIG_HWMON on kernel 2.6.14+, bug #107494.
+
+*lm_sensors-2.9.2 (06 Sep 2005)
+
+  06 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/lm_sensors-2.9.2-lm_sensors-init.d,
+  +files/lm_sensors-2.9.2-sensord-conf.d,
+  +files/lm_sensors-2.9.2-sensord-init.d,
+  +files/lm_sensors-2.9.2-sensors-detect-gentoo.patch,
+  +lm_sensors-2.9.2.ebuild:
+  Version bump.
+
+  26 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/lm_sensors-2.8.7-sensors-detect-gentoo.diff,
+  -files/lm_sensors-2.8.8-sensors-detect-gentoo.diff,
+  -lm_sensors-2.8.7.ebuild, -lm_sensors-2.9.0.ebuild,
+  -lm_sensors-2.9.1.ebuild:
+  Pruned vulnerable versions, bug #103568.
+
+  25 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  lm_sensors-2.9.1-r1.ebuild:
+  Stable on ppc.
+
+  24 Aug 2005; Olivier Crête <tester@gentoo.org>
+  lm_sensors-2.9.1-r1.ebuild:
+  Stable on amd64 per security bug #103568
+
+  24 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.1-r1.ebuild:
+  Stable on x86, bug #103568.
+
+*lm_sensors-2.9.1-r1 (24 Aug 2005)
+
+  24 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/lm_sensors-2.9.1-pwmconfig.patch, +lm_sensors-2.9.1-r1.ebuild:
+  Fix for bug #103568.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  lm_sensors-2.9.1.ebuild:
+  Stable on ppc.
+
+  19 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  lm_sensors-2.9.0.ebuild, lm_sensors-2.9.1.ebuild:
+  No linux-2.4.x support for ppc.
+
+  21 Jul 2005; Herbie Hopkins <herbs@gentoo.org> lm_sensors-2.9.1.ebuild:
+  Stable on amd64.
+
+  21 Jul 2005; <brix@gentoo.org> lm_sensors-2.9.1.ebuild:
+  Depend on either >=virtual/linux-sources-2.5 or sys-apps/lm_sensors-modules,
+  bug #99772. Thanks to Jakub Moc.
+
+  19 Jul 2005; <brix@gentoo.org> lm_sensors-2.9.1.ebuild:
+  Stable on x86.
+
+  12 Jun 2005; <brix@gentoo.org> lm_sensors-2.9.1.ebuild:
+  Instruct users to run sensors-detect even when upgrading.
+
+  12 Jun 2005; <brix@gentoo.org> lm_sensors-2.8.7.ebuild,
+  lm_sensors-2.9.0.ebuild:
+  Don't SLOT this package.
+
+*lm_sensors-2.9.1 (11 Jun 2005)
+
+  11 Jun 2005; <brix@gentoo.org> +files/lm_sensors-2.9.1-lm_sensors-init.d,
+  +files/lm_sensors-2.9.1-sensord-conf.d,
+  +files/lm_sensors-2.9.1-sensord-init.d,
+  +files/lm_sensors-2.9.1-sensors-detect-gentoo.patch,
+  +lm_sensors-2.9.1.ebuild:
+  Version bump, fixing bug #76357, bug #84673, bug #89077 and bug #92946.
+
+  10 May 2005; David Holm <dholm@gentoo.org> lm_sensors-2.9.0.ebuild:
+  Added to ~ppc.
+
+  01 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  lm_sensors-2.8.7.ebuild, lm_sensors-2.9.0.ebuild:
+  Don't install stuff to the tmp dir and make it multilib friendly.
+
+*lm_sensors-2.9.0 (27 Feb 2005)
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> +metadata.xml,
+  +files/lm_sensors-2.8.7-sensors-detect-gentoo.diff,
+  +files/lm_sensors-2.8.8-sensors-detect-gentoo.diff, +files/rc,
+  +lm_sensors-2.8.7.ebuild, +lm_sensors-2.9.0.ebuild:
+  Moved from sys-apps/lm-sensors to sys-apps/lm_sensors.
+
+  25 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/lm-sensors-2.6.5-hk-longstring.patch,
+  -files/lm-sensors-2.8.0-sensors-detect-gentoo.diff,
+  -files/lm-sensors-2.8.1-sensors-detect-gentoo.diff,
+  -files/lm-sensors-2.8.2-sensors-detect-gentoo.diff,
+  -files/no-isadump-ppc.patch, -files/rc_lm_sensors, -lm-sensors-2.6.5.ebuild,
+  -lm-sensors-2.7.0-r1.ebuild, -lm-sensors-2.8.1.ebuild,
+  -lm-sensors-2.8.2.ebuild, -lm-sensors-2.8.3.ebuild,
+  -lm-sensors-2.8.4.ebuild, -lm-sensors-2.8.5.ebuild,
+  -lm-sensors-2.8.6.ebuild, -lm-sensors-2.8.8.ebuild:
+  Pruned old versions.
+
+  24 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> metadata.xml:
+  Transferred ownership.
+
+  29 Jan 2005; <plasmaroo@gentoo.org> lm-sensors-2.8.7.ebuild:
+  Remove conditional x86 rrdtool depend; bug #79741.
+
+  27 Jan 2005; <plasmaroo@gentoo.org> lm-sensors-2.9.0.ebuild:
+  Removing -fPIC filter; bug #78432.
+
+  15 Jan 2005; <plasmaroo@gentoo.org> files/rc:
+  LOADMODULES >> NOLOADMODULES in the init script; bug #78068.
+
+  10 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> lm-sensors-2.9.0.ebuild:
+  added ~amd64 to KEYWORDS. fixes bug #77276.
+
+*lm-sensors-2.9.0 (01 Jan 2005)
+
+  01 Jan 2005; <plasmaroo@gentoo.org> +lm-sensors-2.9.0.ebuild, files/rc:
+  Version bump. Bug #76164.
+
+  17 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  lm-sensors-2.6.5.ebuild:
+  Removed from ppc, because we no longer have 2.4-kernels.
+
+  30 Nov 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild,
+  lm-sensors-2.8.5.ebuild, lm-sensors-2.8.6.ebuild, lm-sensors-2.8.7.ebuild,
+  lm-sensors-2.8.8.ebuild:
+  Collision fix for /usr/include/linux/i2c-dev.h; bug #72193.
+
+  11 Nov 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild,
+  lm-sensors-2.8.5.ebuild, lm-sensors-2.8.6.ebuild, lm-sensors-2.8.7.ebuild,
+  lm-sensors-2.8.8.ebuild:
+  QA: Fixing einfo usage, bug #70858.
+
+  25 Oct 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild,
+  lm-sensors-2.8.5.ebuild, lm-sensors-2.8.6.ebuild, lm-sensors-2.8.7.ebuild,
+  lm-sensors-2.8.8.ebuild:
+  CC=${CC} >> CC=${tc-getCC}; bug #68382.
+
+*lm-sensors-2.8.8 (24 Oct 2004)
+
+  24 Oct 2004; <plasmaroo@gentoo.org> +lm-sensors-2.8.8.ebuild,
+  +files/lm-sensors-2.8.8-sensors-detect-gentoo.diff:
+  Version bump - bug #67587.
+
+  26 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> lm-sensors-2.8.7.ebuild:
+  Marked stable on amd64.
+
+  17 Sep 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.7.ebuild:
+  Added optional sensord support, bug #63872.
+
+  09 Sep 2004; <blubb@gentoo.org> lm-sensors-2.8.7.ebuild:
+  added ~amd64 keyword
+
+  08 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> lm-sensors-2.8.7.ebuild:
+  Marked ~amd64.
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> lm-sensors-2.8.1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  20 Jul 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.2.ebuild,
+  lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild, lm-sensors-2.8.5.ebuild,
+  lm-sensors-2.8.6.ebuild, lm-sensors-2.8.7.ebuild:
+  "x86" stabilization - should solve bug #52098.
+
+  13 Jul 2004; <plasmaroo@gentoo.org> files/rc:
+  Added a patch to the rc script to run sensors -s at start time. Closes bug
+  #25964.
+
+  12 Jul 2004; <plasmaroo@gentoo.org> lm-sensors-2.6.5.ebuild,
+  +files/lm-sensors-2.6.5-hk-longstring.patch:
+  Added a compile fix for lm-sensors-2.6.5 on newer GCCs. Closes bug #50635.
+
+*lm-sensors-2.8.7 (12 Jul 2004)
+
+  12 Jul 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.2.ebuild,
+  lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild, lm-sensors-2.8.5.ebuild,
+  lm-sensors-2.8.6.ebuild, +lm-sensors-2.8.7.ebuild,
+  +files/lm-sensors-2.8.7-sensors-detect-gentoo.diff:
+  Marking 2.8 series "~x86"; added 2.8.7 - closes bug #54606.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> lm-sensors-2.6.5.ebuild,
+  lm-sensors-2.7.0-r1.ebuild, lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild,
+  lm-sensors-2.8.5.ebuild, lm-sensors-2.8.6.ebuild:
+  sync IUSE (missing)
+
+  28 May 2004; Danny van Dyk <kugelfang@gentoo.org> lm-sensors-2.8.6.ebuild:
+  Handling filter-flags -fPIC now arch-dependant. There are archs
+  that need -fPIC ! Fixes BUG #51942.
+
+  06 May 2004; Travis Tilley <lv@gentoo.org> lm-sensors-2.8.6.ebuild:
+  marking stable on amd64
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> lm-sensors-2.6.5.ebuild,
+  lm-sensors-2.8.1.ebuild, lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild,
+  lm-sensors-2.8.4.ebuild, lm-sensors-2.8.5.ebuild, lm-sensors-2.8.6.ebuild:
+  Add inherit eutils
+
+*lm-sensors-2.8.6 (07 Apr 2004)
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> lm-sensors-2.8.6.ebuild:
+  added 2.8.6, which appears to be a requirement for using lm-sensors with a
+  2.6.4 or later kernel
 
-  27 Apr 2002; Bruce A. Locke <blocke@shivan.org> lm_sensors-2.6.3.ebuild:
+*lm-sensors-2.8.3 (31 Mar 2004)
 
-  First version added to Portage.
+  31 Mar 2004; <plasmaroo@gentoo.org> +lm-sensors-2.8.2.ebuild,
+  +lm-sensors-2.8.3.ebuild, +lm-sensors-2.8.4.ebuild:
+  Restoring removed lm-sensors versions.
 
+  25 Mar 2004; Seemant Kulleen <seemant@gentoo.org> lm-sensors-2.7.0.ebuild,
+  lm-sensors-2.8.0.ebuild, lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild,
+  lm-sensors-2.8.4.ebuild, lm-sensors-2.8.5.ebuild:
+  Fix syntax, thanks to Andy Kriger <andy.kriger@verizon.net> in bug #45759.
+  Also remove crufty versions
+
+*lm-sensors-2.8.5 (06 Mar 2004)
+
+  06 Mar 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.5.ebuild:
+  Version bump; closes bug 43896.
+
+*lm-sensors-2.8.4 (10 Feb 2004)
+
+  10 Feb 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.3.20040202.ebuild,
+  lm-sensors-2.8.4.ebuild:
+  Version bump; closes bug #41043.
+
+*lm-sensors-2.8.3.20040202 (03 Feb 2004)
+
+  03 Feb 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.3.20040202.ebuild:
+  Version bump to a CVS snapshot, this should solve bad temperature offsets
+  on 2.6.2 kernels.
+
+*lm-sensors-2.8.3 (01 Feb 2004)
+
+  01 Feb 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.2.20040111.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild:
+  Version bump; closes bug #40112.
+
+  25 Jan 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.20040111.ebuild, lm-sensors-2.8.2.ebuild:
+  Added "CC" variable support to the ebuild to enable distcc
+  support. Closes bug #39374.
+
+  13 Jan 2004; Guy Martin <gmsoft@gentoo.org> lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.20040111.ebuild, lm-sensors-2.8.2.ebuild:
+  Filter flag -fstack-protector.
+
+*lm-sensors-2.8.2.20040111 (11 Jan 2004)
+
+  11 Jan 2004; Brandon Low <lostlogic@gentoo.org>
+  lm-sensors-2.8.2.20040111.ebuild:
+  Add a CVS snapshot which should work for users of 2.6.1 kernels who were
+  getting errors reading temperatures with 2.8.2
+
+  04 Jan 2004; <plasmaroo@gentoo.org> files/rc:
+  Updated initialization script - closes bug #37083.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> lm-sensors-2.6.5.ebuild:
+  Masked on sparc.
+
+  26 Dec 2003; <plasmaroo@gentoo.org> lm-sensors-2.8.0.ebuild,
+  lm-sensors-2.8.1.ebuild, files/rc:
+  Changed KEYWORDS to reflect the availability of I2C 2.8.1 in
+  gentoo-sources-2.4.22. Also updated the initialization script to support 2.6
+  kernels. This closes bug #36243 and bug #35709.
+
+*lm-sensors-2.8.2 (13 Dec 2003)
+
+  13 Dec 2003; <plasmaroo@gentoo.org> lm-sensors-2.8.2.ebuild:
+  Version bump; this closes bug #35709. This version supports 2.6 kernels.
+
+*lm-sensors-2.8.1 (27 Nov 2003)
+
+  27 Nov 2003; Martin Holzer <mholzer@gentoo.org> lm-sensors-2.8.1.ebuild,
+  files/lm-sensors-2.8.1-sensors-detect-gentoo.diff:
+  Version bumped.
+
+  21 Nov 2003; Martin Holzer <mholzer@gentoo.org> lm-sensors-2.7.0-r1.ebuild,
+  lm-sensors-2.7.0.ebuild:
+  Fixing depend. Closes #26198.
+
+  31 Oct 2003; Martin Holzer <mholzer@gentoo.org> lm-sensors-2.7.0-r1.ebuild,
+  lm-sensors-2.7.0.ebuild, lm-sensors-2.8.0.ebuild:
+  changing slot to ${KV}
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> lm-sensors-2.7.0-r1.ebuild,
+  lm-sensors-2.7.0.ebuild, lm-sensors-2.8.0.ebuild:
+  adding docs. Closes #29720.
+
+  02 Sep 2003; Luca Barbato <lu_zero@gentoo.org> lm-sensors-2.6.5.ebuild,
+  files/no-isadump-ppc.patch:
+  Fixes a ppc related bug
+  
+*lm-sensors-2.8.0 (13 Aug 2003)
+
+  13 Aug 2003; Brandon Low <lostlogic@gentoo.org> lm-sensors-2.8.0.ebuild,
+  files/lm-sensors-2.8.0-sensors-detect-gentoo.diff:
+  New ebuild thanks to plasmaroo <plasmaroo@plasmaroo.squirrelserver.co.uk>
+
+  23 Jun 2003; Patrick Kursawe <phosphan@gentoo.org>
+  lm-sensors-2.7.0-r1.ebuild, files/2.7.0-wrong-headers.patch:
+  The last change made it compile against the linux-headers headers, not against
+  the installed kernel. Should get the latest i2c includes _and_ the correct
+  kernel headers now. No revision bump since this is a compile time issue.
+
+  16 Jun 2003; Patrick Kursawe <phosphan@gentoo.org>
+  lm-sensors-2.7.0-r1.ebuild, files/2.7.0-wrong-headers.patch:
+  Fixed bug 22698 by putting kernel includes after all others - fix found on
+  http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1189
+  by Marius Reiner <marius.reiner@hdev.de>.
+
+*lm-sensors-2.7.0-r1 (08 Jun 2003)
+
+  08 Jun 2003; Brandon Low <lostlogic@gentoo.org> lm-sensors-2.7.0-r1.ebuild:
+  Add fixage from bug #14784, the following is the changelog entry from 
+  the user who's patchage I applied:
+
+  02 Mar 2003; Rudo Thomas <thomr9am@ss1000.ms.mff.cuni.cz>
+  Modified sensors-detect to store the config file into /etc/conf.d
+  Fixed init script (reads MODULE_0 now), added stop()
+
+*lm-sensors-2.6.5 (29 May 2003)
+
+  29 May 2003; Seemant Kulleen <seemant@gentoo.org> lm-sensors-2.6.5.ebuild,
+  lm-sensors-2.7.0.ebuild:
+  renamed to a saner naming scheme
+
+*lm_sensors-2.7.0 (24 Dec 2002)
+
+  02 Mar 2003; Brandon Low <lostlogic@gentoo.org> lm_sensors-2.7.0.ebuild:
+  mark unstable for the time being awaiting some fixage
+
+  27 Feb 2003; Brandon Low <lostlogic@gentoo.org> lm_sensors-2.7.0.ebuild:
+  Move to stable and change dependency order
+
+  20 Jan 2003; Brandon Low <lostlogic@gentoo.org> lm_sensors-2.7.0.ebuild :
+  Change dependency to be specifically on what kernel versions have this
+  support or the appropriate i2c package.
+
+  17 Jan 2003; Brandon Low <lostlogic@gentoo.org> lm_sensors-2.7.0.ebuild :
+  Mark unstable for x86, and filter -fPIC as 2.6.5 does.
+
+  24 Dec 2002; Brandon Low <lostlogic@gentoo.org> lm_sensors-2.7.0.ebuild :
+  This version is going to be marked -arch until kernels have support for it.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*lm_sensors-2.6.5 (30 Oct 2002)
+
+  16 Jan 2003; Seemant Kulleen <seemant@gentoo.org> lm_sensors-2.6.5.ebuild :
+
+  filtered out the -fPIC flag, thanks to trans13nt
+
+  30 Oct 2002; Kevyn Shortell <kevyn@gentoo.org> lm_sensors-2.6.5.ebuild :
+  Update to latest version.
+
+*lm_sensors-2.6.4-r1 (04 Aug 2002)
+
+  04 Aug 2002; Kevyn Shortell <kevyn@gentoo.org> : Added
+  digest that blizzy forgot =P
+
+*lm_sensors-2.6.3-r1 (04 Aug 2002)
+
+  04 Aug 2002; Kevyn Shortell <kevyn@gentoo.org> : Added
+  digest that blizzy forgot =P
+
+*lm_sensors-2.6.4-r1 (04 Aug 2002)
+
+  04 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : Added
+  /etc/init.d/lm_sensors script to automatically load lm_sensors
+  modules on startup.
+
+*lm_sensors-2.6.3-r1 (04 Aug 2002)
+
+  04 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : Added
+  /etc/init.d/lm_sensors script to automatically load lm_sensors
+  modules on startup.
+
+*lm_sensors-2.6.4 (26 May 2002)
+
+  26 May 2002; Michael Nazaroff <naz@gentoo.org> :
+  Ebuild bumped to the newest release.
+  
+  15 Jul 2002; Mark Guertin <gerk@gentoo.org> : Added ppc to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> lm_sensors-2.6.3.ebuild:
+  Added LICENSE, KEYWORDS.
+
+  SRC_URI updated thanks to c.vanfleteren@pandora.be (Christophe
+  Vanfleteren) in bug #3032
+
+*lm_sensors-2.6.3 (27 Apr 2002)
 
+  27 Apr 2002; Bruce A. Locke <blocke@shivan.org> : First version added
+  to Portage.
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index e69de29bb2d1..44fcadc210d3 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -0,0 +1,16 @@
+MD5 1735b9b2cde5194d06f78699571cfb01 lm_sensors-2.9.2.ebuild 4069
+MD5 8ef3e430f414203ee3198b9c8f679ff8 lm_sensors-2.9.1-r1.ebuild 3936
+MD5 90198ea6cdf98e6f680870ec3f9e07ba ChangeLog 15638
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 6caf3a2ef7bd1503aac7e3c8129c88a8 files/rc 2332
+MD5 8c53cf91a74a24b3c2187c551df425aa files/lm_sensors-2.9.2-sensord-conf.d 342
+MD5 2045929b325d2e459a6ab9236d2764eb files/lm_sensors-2.9.1-sensors-detect-gentoo.patch 5526
+MD5 c4ff4510a7e5d2d4e3b9e5e2848f5834 files/lm_sensors-2.9.2-sensord-init.d 739
+MD5 b8924278f856bf6a5d01a476a6c6c017 files/lm_sensors-2.9.1-sensord-conf.d 342
+MD5 2d203b24a5474fe336ae65203c1efe8c files/lm_sensors-2.9.1-lm_sensors-init.d 2451
+MD5 46b6afde1f6a202ceaf607af2d905cd0 files/lm_sensors-2.9.1-sensord-init.d 739
+MD5 512e167e34ba06a004990fc298616a20 files/lm_sensors-2.9.1-pwmconfig.patch 1186
+MD5 669cd7ea438a54d3269ff5e9d06847b6 files/digest-lm_sensors-2.9.1-r1 68
+MD5 edf2235c80b178421142d5a8d04e50fa files/digest-lm_sensors-2.9.2 68
+MD5 1820ac1922d3df87cc3627a3dd587cf6 files/lm_sensors-2.9.2-lm_sensors-init.d 2451
+MD5 ca1a12423f60961873fad394f9bba183 files/lm_sensors-2.9.2-sensors-detect-gentoo.patch 5446
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d
index 5adadecf56e9..785436906e5d 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-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/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d,v 1.1 2005/06/11 11:28:20 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.1-lm_sensors-init.d,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d
index 89672f74d38d..28b23bd7ae98 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-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/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d,v 1.1 2005/06/11 11:28:20 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-conf.d,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 # Extra options to pass to the sensord daemon,
 # see sensord(8) for more information
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d
index b5795e9e982a..b76802e59aa3 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-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/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d,v 1.1 2005/06/11 11:28:20 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.1-sensord-init.d,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 CONFIG=/etc/sensors.conf
 
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
index 730b30df6c09..3447d109e272 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-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/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-lm_sensors-init.d,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 checkconfig() {
 	if [ ! -f /etc/conf.d/lm_sensors ]; then
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d
index a75efbc99d0d..b4eb6ca742a9 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-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/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-conf.d,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 # Extra options to pass to the sensord daemon,
 # see sensord(8) for more information
diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d
index 2d26e045a9a3..a40b087e06db 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d
+++ b/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-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/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d,v 1.1 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-2.9.2-sensord-init.d,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 CONFIG=/etc/sensors.conf
 
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild
index 116d3aa5501a..020ae41da48a 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.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/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild,v 1.1 2005/08/24 14:44:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.9.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -11,12 +11,13 @@ SRC_URI="http://secure.netroedge.com/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="sensord"
 DEPEND="sys-apps/sed
 		ppc? ( >=virtual/linux-sources-2.5 )
-		!ppc? ( || (  >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+		amd64? ( >=virtual/linux-sources-2.5 )
+		x86? ( || (  >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
 RDEPEND="dev-lang/perl
 		sensord? ( net-analyzer/rrdtool )"
 
@@ -24,11 +25,11 @@ pkg_setup() {
 	linux-info_pkg_setup
 
 	if kernel_is 2 4; then
-		if use ppc; then
+		if use ppc || use amd64; then
 			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC."
+			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
 			eerror
-			die "${P} does not support kernel 2.4.x under PPC."
+			die "${P} does not support kernel 2.4.x under PPC and AMD64."
 		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
 			eerror
 			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
diff --git a/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild b/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
index cfb4b6ba22a7..f937264ab010 100644
--- a/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild,v 1.1 2005/09/06 21:06:02 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.9.2.ebuild,v 1.1.1.1 2005/11/30 09:57:07 chriswhite Exp $
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib
 
@@ -11,12 +11,13 @@ SRC_URI="http://secure.netroedge.com/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="sensord"
 DEPEND="sys-apps/sed
 		ppc? ( >=virtual/linux-sources-2.5 )
-		!ppc? ( || (  >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
+		amd64? ( >=virtual/linux-sources-2.5 )
+		x86? ( || (  >=virtual/linux-sources-2.5 sys-apps/lm_sensors-modules ) )"
 RDEPEND="dev-lang/perl
 		sensord? ( net-analyzer/rrdtool )"
 
@@ -24,11 +25,11 @@ pkg_setup() {
 	linux-info_pkg_setup
 
 	if kernel_is 2 4; then
-		if use ppc; then
+		if use ppc || use amd64; then
 			eerror
-			eerror "${P} does not support kernel 2.4.x under PPC."
+			eerror "${P} does not support kernel 2.4.x under PPC and AMD64."
 			eerror
-			die "${P} does not support kernel 2.4.x under PPC."
+			die "${P} does not support kernel 2.4.x under PPC and AMD64."
 		elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then
 			eerror
 			eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed"
@@ -37,17 +38,21 @@ pkg_setup() {
 			die "sys-apps/lm_sensors-modules-${PV} not installed"
 		fi
 	else
-		if ! (linux_chkconfig_present I2C_SENSOR); then
+		if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then
 			eerror
 			eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels."
 			eerror
 			die "CONFIG_I2C_SENSOR not detected"
-		fi
-		if ! (linux_chkconfig_present I2C_CHARDEV); then
+		elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then
 			eerror
-			eerror "${P} requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels."
 			eerror
-			die "CONFIG_I2C_CHARDEV not detected"
+			die "CONFIG_HWMON not detected"
+		fi
+		if ! (linux_chkconfig_present I2C_CHARDEV); then
+			ewarn
+			ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels."
+			ewarn
 		fi
 		if ! (linux_chkconfig_present I2C); then
 			eerror
diff --git a/sys-apps/lmctl/ChangeLog b/sys-apps/lmctl/ChangeLog
index b132dda02d7d..66dde6dff556 100644
--- a/sys-apps/lmctl/ChangeLog
+++ b/sys-apps/lmctl/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for sys-apps/lmctl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lmctl/ChangeLog,v 1.1 2005/01/08 11:25:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lmctl/ChangeLog,v 1.1.1.1 2005/11/30 09:57:06 chriswhite Exp $
+
+*lmctl-0.3.2-r3 (08 Sep 2005)
+
+  08 Sep 2005; Michele Noberasco <s4t4n@gentoo.org> +lmctl-0.3.2-r3.ebuild,
+  +0.3.2-cordless-optical-4-notebooks.diff:
+  Revision bump, with patch that adds support for Logitech Cordless Optical
+  Mouse for Notebooks. Fixed Homepage URL.
+
+  08 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> lmctl-0.3.2-r2.ebuild:
+  added ~amd64 to KEYWORDS. fixes #81189
+
+*lmctl-0.3.2-r2 (23 Jan 2005)
+
+  23 Jan 2005; Benedikt Boehm <hollow@gentoo.org> +files/0.3.2-beautyfix.diff,
+  files/C-BK16A-DUAL.patch, +lmctl-0.3.2-r2.ebuild:
+  Fixed C-BK16A-DUAL.patch. Fixed #79163
+
+*lmctl-0.3.2-r1 (08 Jan 2005)
+
+  08 Jan 2005; Benedikt Boehm <hollow@gentoo.org> lmctl-0.3.2-r1.ebuild:
+  Added fixheadtails
+  Added C-BK16A-DUAL.patch
 
 *lmctl-0.3.2 (08 Jan 2005)
 
diff --git a/sys-apps/lmctl/Manifest b/sys-apps/lmctl/Manifest
index 2be2d37daefb..70b62252d912 100644
--- a/sys-apps/lmctl/Manifest
+++ b/sys-apps/lmctl/Manifest
@@ -1,4 +1,11 @@
-MD5 406a16a5ab0ed8053001c0feeca00dbe lmctl-0.3.2.ebuild 818
+MD5 e8ff161ff91d738e6ee5968736b9b6dd lmctl-0.3.2-r1.ebuild 1041
+MD5 442233542c7331d7bb1eb4e7237bf204 lmctl-0.3.2-r3.ebuild 1145
+MD5 5786d6bea19c9a0d783caf9e8132e807 ChangeLog 1207
+MD5 34801217f8a06223cd0d02a1efb09589 lmctl-0.3.2-r2.ebuild 1092
 MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
-MD5 f8167b2abcaa416699e107fea58ae014 ChangeLog 377
-MD5 9e0da21fd6f234d98d9952777960cda6 files/digest-lmctl-0.3.2 63
+MD5 28632edefbfc4bc5b72659b30ac9320d files/C-BK16A-DUAL.patch 576
+MD5 1a909d8a0ebb516ddf57d7d9c2a95f78 files/0.3.2-beautyfix.diff 432
+MD5 9e0da21fd6f234d98d9952777960cda6 files/digest-lmctl-0.3.2-r1 63
+MD5 9e0da21fd6f234d98d9952777960cda6 files/digest-lmctl-0.3.2-r2 63
+MD5 9e0da21fd6f234d98d9952777960cda6 files/digest-lmctl-0.3.2-r3 63
+MD5 f12d88aca9e5e361d513d39b30eaa0bd files/0.3.2-cordless-optical-4-notebooks.diff 820
diff --git a/sys-apps/lmctl/files/C-BK16A-DUAL.patch b/sys-apps/lmctl/files/C-BK16A-DUAL.patch
index ccb1066c7b24..7271db070873 100644
--- a/sys-apps/lmctl/files/C-BK16A-DUAL.patch
+++ b/sys-apps/lmctl/files/C-BK16A-DUAL.patch
@@ -4,7 +4,7 @@
  	{0xc505, "Receiver for Cordless Elite Duo",        "C-BG17-DUAL", 1, 0, 0, 1},
  	{0xc506, "Receiver for MX700 Optical Mouse",       "C-BF16-MSE",  1, 0, 1, 0},
  	{0xc508, "Receiver for Cordless Optical TrackMan", "C-BA4-MSE",   1, 0, 1, 0},
-+	{0xc50b, "Receiver for Cordless Desktop MX",       "C-BK16A-DUAL",1, 0, 0, 1},
++	{0xc50b, "Receiver for Cordless Desktop MX",       "C-BK16A-DUAL",1, 0, 1, 1},
  	{0xc702, "Receiver for Cordless Presenter",        "C-UF15",      1, 0, 0, 0},
  
  	/* From Markus Wiesner <m_wiesner@gmx.net> */
diff --git a/sys-apps/lmctl/lmctl-0.3.2-r1.ebuild b/sys-apps/lmctl/lmctl-0.3.2-r1.ebuild
index 27086d38355a..9267ed7071e5 100644
--- a/sys-apps/lmctl/lmctl-0.3.2-r1.ebuild
+++ b/sys-apps/lmctl/lmctl-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/sys-apps/lmctl/lmctl-0.3.2-r1.ebuild,v 1.1 2005/01/08 11:59:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lmctl/lmctl-0.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:06 chriswhite Exp $
 
 inherit fixheadtails eutils
 
diff --git a/sys-apps/lmctl/lmctl-0.3.2-r2.ebuild b/sys-apps/lmctl/lmctl-0.3.2-r2.ebuild
index 9303655b0e00..5d99e4606f98 100644
--- a/sys-apps/lmctl/lmctl-0.3.2-r2.ebuild
+++ b/sys-apps/lmctl/lmctl-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/sys-apps/lmctl/lmctl-0.3.2-r2.ebuild,v 1.1 2005/01/23 08:33:10 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lmctl/lmctl-0.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:06 chriswhite Exp $
 
 inherit fixheadtails eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://bedroomlan.dyndns.org/~alexios/coding_lmctl.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/sys-apps/lmctl/lmctl-0.3.2-r3.ebuild b/sys-apps/lmctl/lmctl-0.3.2-r3.ebuild
index 0abc5ee92dc4..021ac17beff2 100644
--- a/sys-apps/lmctl/lmctl-0.3.2-r3.ebuild
+++ b/sys-apps/lmctl/lmctl-0.3.2-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-apps/lmctl/lmctl-0.3.2-r3.ebuild,v 1.1 2005/09/08 13:39:56 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lmctl/lmctl-0.3.2-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:06 chriswhite Exp $
 
 inherit fixheadtails eutils
 
diff --git a/sys-apps/logwatch/ChangeLog b/sys-apps/logwatch/ChangeLog
index f9fbc943fad9..f1df462e620f 100644
--- a/sys-apps/logwatch/ChangeLog
+++ b/sys-apps/logwatch/ChangeLog
@@ -1,8 +1,119 @@
 # ChangeLog for sys-apps/logwatch
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.1 2002/12/20 22:31:04 jhhudso Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/ChangeLog,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
+*logwatch-7.0-r1 (08 Nov 2005)
+
+  08 Nov 2005; Mike Frysinger <vapier@gentoo.org> +logwatch-7.0-r1.ebuild:
+  Fixes by Rod Begbie so that the install actually works #111477.
+
+*logwatch-7.0 (04 Nov 2005)
+
+  04 Nov 2005; Mike Frysinger <vapier@gentoo.org> +logwatch-7.0.ebuild:
+  Version bump #111274 by Dhruba Bandopadhyay.
+
+  23 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> logwatch-6.1.2.ebuild:
+  marked ~alpha wrt bug #109748
+
+  26 Jul 2005; Mike Frysinger <vapier@gentoo.org> logwatch-6.1.2.ebuild:
+  Install logwatch file as 00-logwatch so it will be run before other cronjobs
+  #100243 by Brian G. Peterson.
+
+*logwatch-6.1.2 (18 Jun 2005)
+
+  18 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/logwatch-6.1.2-emerge-applydate.patch, +logwatch-6.1.2.ebuild:
+  Version bump #96362 by Sheldon Hearn.
+
+*logwatch-6.0.2 (29 Apr 2005)
+
+  29 Apr 2005; Mike Frysinger <vapier@gentoo.org> +files/logwatch,
+  +logwatch-6.0.2.ebuild:
+  Version bump and add a cron script #83641 by Meder Bakirov.
+
+  07 Apr 2005; Jason Wever <weeve@gentoo.org> logwatch-5.2.2.ebuild:
+  Stable on SPARC.
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> logwatch-5.2.2.ebuild:
+  Added ~sparc keyword.
+
+  11 Jan 2005; Andrej Kacian <ticho@gentoo.org> logwatch-4.3.2.ebuild,
+  logwatch-5.0.ebuild, logwatch-5.2.2.ebuild:
+  mail-client/mailx -> virtual/mailx in RDEPEND. For bug #73972.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  logwatch-5.0.ebuild, logwatch-5.2.2.ebuild:
+  Masked logwatch-5.2.2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  logwatch-5.0.ebuild:
+  Masked logwatch-5.0.ebuild stable for ppc
+
+  21 Jul 2004; Tom Gall <tgall@gentoo.org> logwatch-5.2.2.ebuild:
+  stable on ppc64, bug #57579
+
+*logwatch-5.2.2 (23 Jun 2004)
+
+  23 Jun 2004; Sven Wegener <swegener@gentoo.org> -logwatch-5.2.1.ebuild,
+  +logwatch-5.2.2.ebuild:
+  Version bump and prune older ebuild as source has disappeared upstream.
+
+*logwatch-5.2.1 (23 Jun 2004)
+
+  23 Jun 2004; Sven Wegener <swegener@gentoo.org> logwatch-4.3.2.ebuild,
+  logwatch-5.0.ebuild, +logwatch-5.2.1.ebuild:
+  Version bump. Switched RDEPEND and DEPEND.
+
+  30 May 2004; Robin H. Johnson <robbat2@gentoo.org> logwatch-4.3.2.ebuild,
+  logwatch-5.0.ebuild:
+  mailx move
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> logwatch-5.0.ebuild:
+  Added to ~ppc.
+
+*logwatch-5.0 (17 Nov 2003)
+
+  17 Nov 2003; Jared Hudson <jhhudso@gentoo.org> : Version bump. Credit goes to
+  Alessandro Pisani <alextxm@tin.it> for the new ebuild.
+	
+  23 Oct 2003; Martin Holzer <mholzer@gentoo.org> logwatch-4.3.2.ebuild:
+  removing auto-adding to cron. Closes #29012.
+
+  01 May 2003; Jared Hudson <jhhudso@gentoo.org> logwatch-4.2.1-r1.ebuild,
+  logwatch-4.3.1-r1.ebuild : Changed pkg_postrm() to remove the symbolic
+  links created in pkg_postinst(). In response to bug #17746, credit goes to
+  Gregorio Guidi <g.guidi@sns.it>.
+	
+  11 Apr 2003; Jared Hudson <jhhudso@gentoo.org> logwatch-4.2.1.ebuild,
+  logwatch-4.3.1.ebuild : Changed pkg_postrm() and pkg_postinst() to fix
+  crontab bug reported in bug # 16576. Credit goes to:
+  Alessandro Pisani <alextxm@tin.it>
+	
+*logwatch-4.3.2 (11 Apr 2003)
+	
+  11 Apr 2003; Jared Hudson <jhhudso@gentoo.org> : IMPORTANT NOTICE: I have
+  changed the location of logwatch and its configuration files and scripts.
+  logwatch.pl is now in /usr/sbin/logwatch.pl, the configuration files
+  and scripts are in /etc/log.d This will match the way the author intended
+  logwatch to be enabled while also allowing the configuration files to be
+  monitored for changed and subject to etc-update when logwatch is upgraded.
+  Credit goes to the following people: Alessandro Pisani <alextxm@tin.it>
+  and Georgi Georgiev <chutz@chubaka.net> Bugs fixed: 13303 16016 16576 17746
+
+  30 Mar 2003; Jared Hudson <jhhudso@gentoo.org> : Provider archived this
+  version of the tarball, so I changed our location in the ebuild.
+	
+*logwatch-4.3.1 (07 Feb 2003)
+
+  07 Feb 2003; Jared Hudson <jhhudso@gentoo.org> : Version bump.
+	
 *logwatch-4.2.1 (20 Dec 2002)
 
+  19 Feb 2003; Martin Holzer <mholzer@gentoo.org> logwatch-4.2.1.ebuild :
+  Marking as stable.
+	
+  07 Feb 2003; Jared Hudson <jhhudso@gentoo.org> : Changed source location,
+  since providing ftp site moved 4.2.1 to old archives.
+	
   20 Dec 2002; Jared Hudson <jhhudso@gentoo.org> : Initial import. Ebuild
   submitted by Alessandro Pisani <alextxm@tin.it>.
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index e69de29bb2d1..a23cac1ca6bb 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5430f6dec4da88527d626205e29fda56 ChangeLog 4602
+MD5 cf548a7143dce1aba3792d0647ae4f90 files/digest-logwatch-4.3.2 65
+MD5 4a5e8c25106385b7e823785f6c61855d files/digest-logwatch-5.0 63
+MD5 e8d38d01460c2fcf26e92e8853bf6c84 files/digest-logwatch-5.2.2 66
+MD5 bdcfb03932e5e0dd4ea2b3eebc6d714e files/digest-logwatch-6.0.2 66
+MD5 bbb413bd38d41f27258575befdb63754 files/digest-logwatch-6.1.2 66
+MD5 55416a8b2b8431979d677d2b8eacfa73 files/digest-logwatch-7.0-r1 64
+MD5 edb003cbc0686ed4cf37db16025635f3 files/logwatch 98
+MD5 6d9bd0a39a1ce3e71cfc95ccd3761604 files/logwatch-6.1.2-emerge-applydate.patch 469
+MD5 4e550750cdcb0a6432c46d259d38e4db logwatch-4.3.2.ebuild 1345
+MD5 70cb3442dbd2bafb307ea09f5eea8d03 logwatch-5.0.ebuild 1398
+MD5 8eb1d712eab6b882df0d6d9e490d73db logwatch-5.2.2.ebuild 1404
+MD5 ea7d9d5b4ba13bf8be8fb325b870a619 logwatch-6.0.2.ebuild 1340
+MD5 225cfc0762705b111d7649aa0c78b77d logwatch-6.1.2.ebuild 1520
+MD5 efbd0439573d9f818cb572da2fed77d0 logwatch-7.0-r1.ebuild 1602
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcB47gIKl8Uu19MoRAsXpAJ98bcv3ZcE7JEejvJYfrG8DWpk3LACfeUzL
+VdXqfnFr5y/vJc602qWenXM=
+=R3qD
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/logwatch/logwatch-4.3.2.ebuild b/sys-apps/logwatch/logwatch-4.3.2.ebuild
index d5816b09916c..ba58c670fb5f 100644
--- a/sys-apps/logwatch/logwatch-4.3.2.ebuild
+++ b/sys-apps/logwatch/logwatch-4.3.2.ebuild
@@ -1,20 +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/sys-apps/logwatch/logwatch-4.3.2.ebuild,v 1.1 2003/04/11 06:06:38 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.2.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org"
+HOMEPAGE="http://www.logwatch.org/"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
-DEPEND="virtual/glibc
+
+RDEPEND="virtual/libc
 	virtual/cron
 	virtual/mta
 	dev-lang/perl
-	net-mail/mailx"
-RDEPEND=""
+	virtual/mailx"
+DEPEND=""
 
 src_install() {
 	dodir /etc/log.d/conf/logfiles
@@ -51,24 +53,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	# this will avoid duplicate entries in the crontab
-	if [ "`grep logwatch.pl ${ROOT}var/spool/cron/crontabs/root`" == "" ];
-	then
-		einfo "adding to cron..."
-		echo "0 0 * * * ${ROOT}usr/sbin/logwatch.pl 2>&1 > /dev/null" \
-			>> ${ROOT}var/spool/cron/crontabs/root
-	fi
-}
-
-pkg_postrm() {
-	# this fixes a bug when logwatch package gets updated
-	if [ "`ls -d ${ROOT}var/db/pkg/sys-apps/logwatch* \
-		| wc -l | tail -c 2`" -lt 2 ];
-	then
-		sed "/^0.*\/usr\/sbin\/logwatch.*null$/d" \
-			${ROOT}var/spool/cron/crontabs/root \
-			> ${ROOT}var/spool/cron/crontabs/root.new
-		mv --force ${ROOT}var/spool/cron/crontabs/root.new \
-			${ROOT}var/spool/cron/crontabs/root
-	fi
+	einfo
+	einfo "you have to manually add ${PN} to cron..."
+	einfo "0 0 * * * /usr/sbin/logwatch.pl 2>&1 > /dev/null"
+	einfo
 }
diff --git a/sys-apps/logwatch/logwatch-5.0.ebuild b/sys-apps/logwatch/logwatch-5.0.ebuild
index 17538730e72f..0ae34ab83dca 100644
--- a/sys-apps/logwatch/logwatch-5.0.ebuild
+++ b/sys-apps/logwatch/logwatch-5.0.ebuild
@@ -1,20 +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/sys-apps/logwatch/logwatch-5.0.ebuild,v 1.1 2003/11/17 07:50:56 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.0.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org"
+HOMEPAGE="http://www.logwatch.org/"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ppc ~amd64"
 IUSE=""
-DEPEND="virtual/glibc
+
+RDEPEND="virtual/libc
 	virtual/cron
 	virtual/mta
 	dev-lang/perl
-	net-mail/mailx"
-RDEPEND=""
+	virtual/mailx"
+DEPEND=""
 
 src_install() {
 	dodir /etc/log.d/lib
diff --git a/sys-apps/logwatch/logwatch-5.2.2.ebuild b/sys-apps/logwatch/logwatch-5.2.2.ebuild
index 33fa7577f3d0..68eb25ae7ee6 100644
--- a/sys-apps/logwatch/logwatch-5.2.2.ebuild
+++ b/sys-apps/logwatch/logwatch-5.2.2.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.2.2.ebuild,v 1.1 2004/06/23 19:28:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.2.2.ebuild,v 1.1.1.1 2005/11/30 09:56:26 chriswhite Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org/"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
-RDEPEND="virtual/glibc
-	virtual/cron
+
+RDEPEND="virtual/cron
 	virtual/mta
 	dev-lang/perl
-	mail-client/mailx"
+	dev-perl/Tie-IxHash
+	dev-perl/Date-Calc
+	virtual/mailx"
 DEPEND=""
 
 src_install() {
@@ -26,10 +29,8 @@ src_install() {
 	newsbin scripts/logwatch.pl logwatch.pl
 
 	for i in scripts/logfiles/* ; do
-		if [ $(ls $i | wc -l) -ne 0 ] ; then
-			exeinto /etc/log.d/$i
-			doexe $i/*
-		fi
+		exeinto /etc/log.d/$i
+		doexe $i/* || die "doexe $i failed"
 	done
 
 	exeinto /etc/log.d/lib
@@ -55,8 +56,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "you have to manually add ${PN} to cron..."
+	einfo "you have to manually add ${PN} to cron ..."
 	einfo "0 0 * * * /usr/sbin/logwatch.pl 2>&1 > /dev/null"
-	einfo
 }
diff --git a/sys-apps/logwatch/logwatch-6.0.2.ebuild b/sys-apps/logwatch/logwatch-6.0.2.ebuild
index 8bd957aa7e0e..cb78627d12cc 100644
--- a/sys-apps/logwatch/logwatch-6.0.2.ebuild
+++ b/sys-apps/logwatch/logwatch-6.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-apps/logwatch/logwatch-6.0.2.ebuild,v 1.1 2005/04/29 01:42:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-6.0.2.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org/"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/cron
@@ -52,7 +52,7 @@ src_install() {
 	doins conf/services/*
 
 	exeinto /etc/cron.daily
-	newexe ${FILESDIR}/logwatch.cron logwatch
+	newexe "${FILESDIR}"/logwatch logwatch
 
 	doman logwatch.8
 	dodoc License project/CHANGES README HOWTO-Make-Filter
diff --git a/sys-apps/logwatch/logwatch-6.1.2.ebuild b/sys-apps/logwatch/logwatch-6.1.2.ebuild
index 4c5ea50eb653..df7a21f98d92 100644
--- a/sys-apps/logwatch/logwatch-6.1.2.ebuild
+++ b/sys-apps/logwatch/logwatch-6.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/sys-apps/logwatch/logwatch-6.1.2.ebuild,v 1.1 2005/06/18 03:48:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-6.1.2.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="virtual/cron
@@ -59,8 +59,9 @@ src_install() {
 	insinto /etc/log.d/conf/services
 	doins conf/services/*
 
+	# Make sure logwatch is run before anything else #100243
 	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch logwatch
+	newexe "${FILESDIR}"/logwatch 00-logwatch
 
 	doman logwatch.8
 	dodoc License project/CHANGES README HOWTO-Make-Filter
diff --git a/sys-apps/logwatch/logwatch-7.0-r1.ebuild b/sys-apps/logwatch/logwatch-7.0-r1.ebuild
index ec3b3c84dd76..292848f9e77a 100644
--- a/sys-apps/logwatch/logwatch-7.0-r1.ebuild
+++ b/sys-apps/logwatch/logwatch-7.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/sys-apps/logwatch/logwatch-7.0-r1.ebuild,v 1.1 2005/11/08 03:40:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-7.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org/"
diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
index c5d67a611520..96a2d586367d 100644
--- a/sys-apps/logwatch/metadata.xml
+++ b/sys-apps/logwatch/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>jhhudso@gentoo.org</email>
-</maintainer>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/lsadb/ChangeLog b/sys-apps/lsadb/ChangeLog
index 4946f2623205..0a1a3ed141e3 100644
--- a/sys-apps/lsadb/ChangeLog
+++ b/sys-apps/lsadb/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/lsadb
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsadb/ChangeLog,v 1.1 2004/10/31 21:54:28 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsadb/ChangeLog,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 *lsadb-0.1.2 (31 Oct 2004)
 
diff --git a/sys-apps/lsadb/Manifest b/sys-apps/lsadb/Manifest
index 3a6af0fbe1fb..bdde038ee1fe 100644
--- a/sys-apps/lsadb/Manifest
+++ b/sys-apps/lsadb/Manifest
@@ -1,2 +1,4 @@
-MD5 f1857ffe265547e29a46c7703761cab4 lsadb-0.1.2.ebuild 588
+MD5 47f446a597d67e76a60675d76fdec694 lsadb-0.1.2.ebuild 682
+MD5 d12960d36e400ed8c7817d08e694ab90 metadata.xml 217
+MD5 b9cc30ce2e5f6d7fb3eaa117b88a0ff7 ChangeLog 368
 MD5 8c17808dddb898462cd2a68093a9b0a7 files/digest-lsadb-0.1.2 61
diff --git a/sys-apps/lsadb/lsadb-0.1.2.ebuild b/sys-apps/lsadb/lsadb-0.1.2.ebuild
index b255a5532575..9bb41acd6e33 100644
--- a/sys-apps/lsadb/lsadb-0.1.2.ebuild
+++ b/sys-apps/lsadb/lsadb-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsadb/lsadb-0.1.2.ebuild,v 1.1 2004/10/31 21:54:28 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsadb/lsadb-0.1.2.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index c8f05541a940..d5472dc3b159 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for sys-apps/lshw
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.1 2003/04/15 15:15:46 mholzer Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> lshw-02.05.01b.ebuild:
+  Stable on ppc.
+
+  08 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.05.01b.ebuild:
+  Stable on sparc
+
+*lshw-02.06b (05 Nov 2005)
+
+  05 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/lshw-02.06b-build.patch, +files/lshw-02.06b-cpuid-PIC.patch,
+  +lshw-02.06b.ebuild:
+  Version bump #111500 by Daniel Webert.
+
+  05 Nov 2005; Mark Loeser <halcy0n@gentoo.org> lshw-02.05.01b.ebuild:
+  Stable on x86; bug #111499
+
+  03 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> lshw-02.05.01b.ebuild:
+  marked ~alpha, wrt bug #104130
+
+*lshw-02.05.01b (22 Jul 2005)
+
+  22 Jul 2005; Mike Frysinger <vapier@gentoo.org> +lshw-02.05.01b.ebuild:
+  Version bump #99838 by Nunatak.
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> lshw-02.03b.ebuild:
+  Stable on ppc.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> lshw-02.03b.ebuild:
+  Stable on SPARC.
+
+*lshw-02.04b (28 Apr 2005)
+
+  28 Apr 2005; Mike Frysinger <vapier@gentoo.org> +lshw-02.04b.ebuild:
+  Version bump #90727 by Daniel Webert.
+
+*lshw-02.03b (05 Feb 2005)
+
+  05 Feb 2005; MATSUU Takuto <matsuu@gentoo.org> +lshw-02.03b.ebuild:
+  Version bumped.
+
+  03 Feb 2005; <solar@gentoo.org> -lshw-01.08a.ebuild, lshw-02.00b.ebuild,
+  lshw-02.02b.ebuild:
+  - removing filter-flags -fPIC from ebuild now that the cpuid patch exists.
+  Removing broken lshw-01.08a
+
+*lshw-02.02b (22 Jan 2005)
+
+  22 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +lshw-02.02b.ebuild:
+  Version bumped.
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/02.00b-cpuid-PIC.patch, lshw-02.00b.ebuild:
+  Add patch to enable PIC building #61947.
+
+  21 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/02.00b-dev.patch,
+  lshw-02.00b.ebuild:
+  Clean up ebuild and add patch to fix includes #75168 by lukenshiro@ngi.it.
+
+*lshw-02.00b (21 Dec 2004)
+
+  21 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> -lshw-01.06a.ebuild,
+  -lshw-01.07a.ebuild, lshw-01.08a.ebuild, +lshw-02.00b.ebuild:
+  Version bumped.
+  Removed old versions.
+
+*lshw-01.08a (06 Sep 2004)
+
+  06 Sep 2004; MATSUU Takuto <matsuu@gentoo.org> +lshw-01.08a.ebuild:
+  Version bumped.
+
+*lshw-01.07a (13 May 2004)
+
+  13 May 2004; <matsuu@gentoo.org> -lshw-01.00.ebuild, +lshw-01.07a.ebuild:
+  Version bumped.
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> lshw-01.06a.ebuild:
+  removed hardened-gcc logic
+
+  25 Apr 2004; <matsuu@gentoo.org> -lshw-01.05a.ebuild, lshw-01.06a.ebuild:
+  Marked as stable.
+
+*lshw-01.06a (29 Feb 2004)
+
+  29 Feb 2004; <matsuu@gentoo.org> lshw-01.06a.ebuild:
+  Version bumped.
+
+*lshw-01.05a (05 Nov 2003)
+
+  05 Nov 2003; Martin Holzer <mholzer@gentoo.org> lshw-01.05a.ebuild:
+  Version bumped.
+
+*lshw-01.04 (04 Oct 2003)
+
+  04 Oct 2003; MATSUU Takuto <matsuu@gentoo.org> lshw-01.04.ebuild:
+  version bump.
+
+  21 Sep 2003; <solar@gentoo.org> lshw-01.03.ebuild:
+  cpuid.cc uses inline asm and can not be linked when position independent code
+  is desired.
+
+*lshw-01.03 (20 Aug 2003)
+
+  20 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> lshw-01.03.ebuild:
+  version bump.
+
+*lshw-01.02 (06 Aug 2003)
+
+  06 Aug 2003; Martin Holzer <mholzer@gentoo.org> lshw-01.02.ebuild:
+  Version bumped. closes #25925.
 
 *lshw-01.00 (15 Apr 2003)
 
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 43a3cf84bf66..93a2cf48a76c 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,2 +1,21 @@
-MD5 73804e9dc7aefacf9f3b949d561f6448 lshw-01.00.ebuild 506
-MD5 f85a623707b313b0bde6003e7a2f608c files/digest-lshw-01.00 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4013a2f14b0bf28966e7942b57cd7a13 ChangeLog 3603
+MD5 555b9015ffbcc8fd484c63ab096069d7 files/02.00b-cpuid-PIC.patch 1098
+MD5 29a53d370bf1395481ea9d8528f410d1 files/digest-lshw-02.04b 64
+MD5 aa4eb15e3a195e90ce0bf111bcd37e2f files/digest-lshw-02.05.01b 67
+MD5 83309023b708d6b03a2cc931a71e2352 files/digest-lshw-02.06b 64
+MD5 7fbeefb274e662632462f5a5465f24d9 files/lshw-02.06b-build.patch 1652
+MD5 5ba7b6610d3d3fa5450d59a99e96694c files/lshw-02.06b-cpuid-PIC.patch 1060
+MD5 8acb70976be17c39d5349c85e31a76f8 lshw-02.04b.ebuild 1384
+MD5 8493c243aa959741074b74c904978b72 lshw-02.05.01b.ebuild 1358
+MD5 f39283f94db7bdb2c0701974246853a1 lshw-02.06b.ebuild 1155
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfsyGgIKl8Uu19MoRApSZAJ4mLny76+vKgoLLccQuu1vC9JCsgACdEHR6
+0EnlMxBCfJwl77H4Z7/L4uk=
+=Yc18
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
index 524b2095780f..b27b3a808d13 100644
--- a/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
+++ b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
@@ -18,7 +18,7 @@ http://bugs.gentoo.org/61947
  static void cpuid(int cpunumber,
  		  unsigned long idx,
  		  unsigned long &eax,
-@@ -96,7 +93,18 @@
+@@ -96,7 +93,21 @@
      edx = (*(unsigned long *) (buffer + 12));
    }
    else
@@ -29,12 +29,15 @@ http://bugs.gentoo.org/61947
 +        "cpuid\n"
 +        "movl %%ebx,%3\n"
 +        "movl %%edi,%%ebx\n"
-+        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx), "edi"
++        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx)
++        : "a" (idx)
++        : "edi"
 +#else
 +        "cpuid\n"
 +        : "=a" (eax), "=c" (ecx), "=d" (edx), "=b" (ebx)
++        : "a" (idx)
 +#endif
-+        : "a" (idx));
++    );
  }
  
  /* Decode Intel TLB and cache info descriptors */
diff --git a/sys-apps/lshw/lshw-02.04b.ebuild b/sys-apps/lshw/lshw-02.04b.ebuild
index ea0e3e0c026e..89b5f7b150fb 100644
--- a/sys-apps/lshw/lshw-02.04b.ebuild
+++ b/sys-apps/lshw/lshw-02.04b.ebuild
@@ -1,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-apps/lshw/lshw-02.04b.ebuild,v 1.1 2005/04/28 23:35:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.04b.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -15,10 +15,11 @@ SRC_URI="http://ezix.sourceforge.net/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="gtk static"
 
-DEPEND="gtk? ( >=x11-libs/gtk+-2 )"
+DEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	>=sys-devel/binutils-2.15"
 
 S=${WORKDIR}/${MY_P}
 
@@ -26,11 +27,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	use static && append-ldflags -static
 	sed -i \
-		-e "/^CXXFLAGS/s/-Os/${CXXFLAGS}/" \
+		-e "/^CXXFLAGS/s:-Os:${CXXFLAGS}:" \
+		-e '/^LDFLAGS=/s:-Os -s::' \
 		-e '/^CXX=/d' -e '/^CC=/d' \
 		src/{gui/,core/,}/Makefile \
 		|| die "sed failed"
+	sed -i \
+		-e "/^LDFLAGS=/s:$: ${LDFLAGS}:" \
+		src/Makefile || die "sed ldflags failed"
 
 	#epatch ${FILESDIR}/${PV}-dev.patch #75168
 	epatch "${FILESDIR}"/02.00b-cpuid-PIC.patch #61947
@@ -51,5 +57,5 @@ src_install() {
 		make DESTDIR="${D}" install-gui || die "install gui failed"
 	fi
 
-	dodoc README TODO docs/*
+	dodoc README docs/*
 }
diff --git a/sys-apps/lshw/lshw-02.05.01b.ebuild b/sys-apps/lshw/lshw-02.05.01b.ebuild
index a1ddc1fd318f..e02219adbece 100644
--- a/sys-apps/lshw/lshw-02.05.01b.ebuild
+++ b/sys-apps/lshw/lshw-02.05.01b.ebuild
@@ -1,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-apps/lshw/lshw-02.05.01b.ebuild,v 1.1 2005/07/22 04:17:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.05.01b.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="http://ezix.sourceforge.net/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="gtk static"
 
 DEPEND="gtk? ( >=x11-libs/gtk+-2 )
diff --git a/sys-apps/lshw/lshw-02.06b.ebuild b/sys-apps/lshw/lshw-02.06b.ebuild
index 11192f8e4cd4..939ca58fa41b 100644
--- a/sys-apps/lshw/lshw-02.06b.ebuild
+++ b/sys-apps/lshw/lshw-02.06b.ebuild
@@ -1,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-apps/lshw/lshw-02.06b.ebuild,v 1.1 2005/11/05 04:28:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.06b.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
index ca26318c7453..96a2d586367d 100644
--- a/sys-apps/lshw/metadata.xml
+++ b/sys-apps/lshw/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>mholzer@gentoo.org</email>
-  <name>Martin Holzer</name>
-</maintainer>
-<longdescription>
-lshw is a small tool to extract detailed information  on  the  hardware configuration of the machine. It can report exact memory configuration, firmware version, mainboard configuration, CPU version and speed, cache configuration,  bus  speed, etc. on DMI-capable x86 systems and on some PowerPC machines (PowerMac G4 is known to work).
-</longdescription>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/man-pages/ChangeLog b/sys-apps/man-pages/ChangeLog
index dd31189977f9..c7a1e1fcce3c 100644
--- a/sys-apps/man-pages/ChangeLog
+++ b/sys-apps/man-pages/ChangeLog
@@ -1,6 +1,176 @@
 # ChangeLog for sys-apps/man-pages
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/ChangeLog,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
+
+*man-pages-2.13 (04 Nov 2005)
+
+  04 Nov 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.13.ebuild:
+  Version bump.
+
+*man-pages-2.11 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.11.ebuild:
+  Version bump.
+
+*man-pages-2.09 (17 Oct 2005)
+
+  17 Oct 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.09.ebuild:
+  Version bump.
+
+*man-pages-2.08 (05 Oct 2005)
+
+  05 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-pages-2.08-updates.patch, +man-pages-2.08.ebuild:
+  Version bump.
+
+*man-pages-2.07 (20 Jul 2005)
+
+  20 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-pages-2.07-updates.patch, +man-pages-2.07.ebuild:
+  Version bump.
+
+*man-pages-2.05 (29 Jun 2005)
+
+  29 Jun 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.05.ebuild:
+  Version bump.
+
+*man-pages-2.03 (17 Jun 2005)
+
+  17 Jun 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.03.ebuild:
+  Version bump.
+
+*man-pages-2.02 (15 Apr 2005)
+
+  15 Apr 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.02.ebuild:
+  Version bump.
+
+*man-pages-2.01 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> +man-pages-2.01.ebuild:
+  Version bump.
+
+*man-pages-2.00 (19 Dec 2004)
+
+  19 Dec 2004; Mike Frysinger <vapier@gentoo.org> +man-pages-2.00.ebuild:
+  Version bump.
+
+*man-pages-1.70 (15 Nov 2004)
+
+  15 Nov 2004; Mike Frysinger <vapier@gentoo.org> +man-pages-1.70.ebuild:
+  Version bump.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> man-pages-1.65.ebuild,
+  man-pages-1.66.ebuild:
+  sync IUSE (missing)
+
+*man-pages-1.67 (21 May 2004)
+
+  25 May 2004; Nicholas Jones <carpaski@gentoo.org> man-pages-1.67.ebuild:
+  Fix for portage-2.0.51_pre9's new default make in src_compile via true.
+
+  21 May 2004; Jon Portnoy <avenj@gentoo.org> man-pages-1.67.ebuild :
+  Version bump.
+
+*man-pages-1.66 (18 Mar 2004)
+
+  18 Mar 2004; Seemant Kulleen <seemant@gentoo.org> man-pages-1.64.ebuild,
+  man-pages-1.66.ebuild:
+  version bump
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> man-pages-1.65.ebuild:
+  adding initial s390 support
+
+*man-pages-1.65 (24 Jan 2004)
+
+  24 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
+
+*man-pages-1.64 (09 Dec 2003)
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> man-pages-1.60.ebuild,
+  man-pages-1.64.ebuild:
+  version bump
+
+*man-pages-1.61 (13 Nov 2003)
+
+  13 Nov 2003; Seemant Kulleen <seemant@gentoo.org> man-pages-1.61.ebuild:
+  version bump
+
+*man-pages-1.60 (13 Oct 2003)
+
+  13 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
+
+*man-pages-1.56 (25 Mar 2003)
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> man-pages-1.54.ebuild,
+  man-pages-1.55.ebuild, man-pages-1.56.ebuild:
+  SRC_URI="mirror://kernel/linux/docs/${MY_PN}/${P}.tar.bz2"now uses
+  mirror://kernel
+
+  25 Mar 2003; Daniel Robbins <drobbins@gentoo.org> man-pages-1.56.ebuild:
+  new upstream release; unmasked on all arches.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> man-pages-1.54.ebuild
+  man-pages-1.55.ebuild : Added arm to keywords.
+
+*man-pages-1.55 (09 Feb 2003)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> man-pages-1.55.ebuild :
+  Mark as stable for mips.  Can man-pages really break?
+
+  22 Feb 2003; Aron Griffis <agriffis@gentoo.org> man-pages-1.55.ebuild :
+  Mark stable on alpha
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> man-pages-1.55.ebuild
+  files/digest-man-pages-1.55 :
+
+  Version bump.
+
+*man-pages-1.54 (30 Dec 2002)
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> man-pages-1.54.ebuild :
+  Added hppa to keywords.
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  30 Dec 2002; Daniel Robbins <drobbins@gentoo.org> man-pages-1.54.ebuild: new
+  release, version bump.
+
+*man-pages-1.53 (29 Dec 2002)
+
+  29 Dec 2002; Daniel Robbins <drobbins@gentoo.org> man-pages-1.53.ebuild: new
+  release, version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*man-pages-1.52 (29 Jul 2002)
+
+  29 Jul 2002; Seemant Kulleen <seemant@gentoo.org> man-pages-1.52.ebuild
+  files/digest-man-pages-1.52 :
+  
+  Version bump.
+
+*man-pages-1.51 (11 Jun 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> man-pages-1.51.ebuild :
+  Added KEYWORDS.
+
+  11 Jun 2002; Seemant Kulleen <seemant@gentoo.org> man-pages-1.51.ebuild
+  files/digtest-man-pages-1.51 :
+
+  Version bump.
+
+*man-pages-1.50 (5 Jun 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> man-pages-1.50.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  5 Jun 2002; Seemant Kulleen <seemant@gentoo.org> man-pages-1.50.ebuild
+  files/digest-man-pages-1.50 :
+
+  Version bump.
 
 *man-pages-1.43-r1 (1 Feb 2002)
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index d99bdb636b9c..bd0e2beb7f3b 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,9 +1,17 @@
-MD5 9dcf4ae6abfa0f083b6255ddf06bdf2e ChangeLog 2733
-MD5 9f6cde22a2f52f29a0bd2c16b12081cd man-pages-1.54.ebuild 714
-MD5 92776a2b0ae00e68b8191e4e8a41315f man-pages-1.55.ebuild 719
-MD5 d9233a40fc55035181cfb1f11b0f5a93 man-pages-1.56.ebuild 715
-MD5 1e44a9b9a9f799a1aa3a6eb2b1f588e7 files/digest-man-pages-1.54 67
-MD5 55e6d977368e779e921380abee79640e files/digest-man-pages-1.55 67
-MD5 af09d031dcee66929510e078d00066f2 files/man2.tar.gz 1982
-MD5 aaf374d3a727c70f6e05df9911f0ea01 files/netman-cvs.tar.gz 48324
-MD5 c8d4aee1769afc97e0f9d7cb616c0dfd files/digest-man-pages-1.56 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cfe851acdcc91638135e604172c7fc26 ChangeLog 5254
+MD5 72801e8fe37462ffc025dc8310181bd8 files/digest-man-pages-2.11 68
+MD5 61a910db5150315546fefff715ffc9a7 files/digest-man-pages-2.13 68
+MD5 078cd80352b7ac508adeda912eba0cc9 files/man-pages-2.08-updates.patch 351
+MD5 65e33483489015cda81ec6fdad4dcf27 man-pages-2.11.ebuild 1258
+MD5 d7b59be2169435ab325153b0e9cc908b man-pages-2.13.ebuild 1425
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDa+2ogIKl8Uu19MoRArwXAJ9tmbS1NVGnsES1KgWuB/274nWSUACfVWnM
+4FYvqmqd8sTdOPwIVodAr68=
+=hMVx
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/man-pages/man-pages-2.11.ebuild b/sys-apps/man-pages/man-pages-2.11.ebuild
index 8ffd54352a82..540040110334 100644
--- a/sys-apps/man-pages/man-pages-2.11.ebuild
+++ b/sys-apps/man-pages/man-pages-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.11.ebuild,v 1.1 2005/10/28 00:04:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.11.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/docs/manpages/${P}.tar.bz2"
 
 LICENSE="freedist"
 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-apps/man"
diff --git a/sys-apps/man-pages/man-pages-2.13.ebuild b/sys-apps/man-pages/man-pages-2.13.ebuild
index 1809a781b10e..f39d1436b331 100644
--- a/sys-apps/man-pages/man-pages-2.13.ebuild
+++ b/sys-apps/man-pages/man-pages-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/sys-apps/man-pages/man-pages-2.13.ebuild,v 1.1 2005/11/04 01:45:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man-pages/man-pages-2.13.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 inherit eutils
 
@@ -41,3 +41,9 @@ src_install() {
 	make install prefix="${D}" || die
 	dodoc man-pages-*.Announce README Changes*
 }
+
+pkg_postinst() {
+	einfo "If you don't have a makewhatis cronjob, then you"
+	einfo "should update the whatis database yourself:"
+	einfo " # makewhatis"
+}
diff --git a/sys-apps/man-pages/metadata.xml b/sys-apps/man-pages/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/man-pages/metadata.xml
+++ b/sys-apps/man-pages/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-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 4a93589d6777..a8e426a57d16 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,7 +1,332 @@
 # ChangeLog for sys-apps/man
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
+*man-1.6b-r2 (15 Nov 2005)
+
+  15 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6b-more-sections.patch, +man-1.6b-r2.ebuild:
+  Search new xorg categories #112480 by Ryan Hill.
+
+*man-1.6b-r1 (13 Nov 2005)
+
+  13 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  files/man-1.6a-makewhatis-config.patch, +man-1.6b-r1.ebuild:
+  Fix makewhatis variable settings #112249 by Guillaume Castagnino.
+
+*man-1.6b (10 Nov 2005)
+
+  10 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5m2-apropos.patch, +files/man-1.5p-man2html.patch,
+  +files/man-1.5p-mandirlist.patch, +files/man-1.6a-makewhatis-config.patch,
+  +files/man-1.6b-build.patch, files/makewhatis.cron, +man-1.6b.ebuild:
+  Version bump and fix makewhatis section hardcode #86863 by OKUMURA N. Shin-ya.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  03 Sep 2005; Mike Frysinger <vapier@gentoo.org> man-1.5p.ebuild,
+  man-1.6-r1.ebuild, man-1.6a.ebuild:
+  Create the man user/group.
+
+*man-1.6a (22 Aug 2005)
+
+  22 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6a-parallel-make.patch, +man-1.6a.ebuild:
+  Version bump.
+
+  11 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6-cross-compile.patch, man-1.6-r1.ebuild:
+  Fix cross-compile support.
+
+*man-1.6-r1 (09 Jul 2005)
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.6-message-order.patch, +man-1.6-r1.ebuild:
+  Add a patch by Martin von Gagern to fix segfaults for non-english users #97541.
+
+  02 Jul 2005; Mike Frysinger <vapier@gentoo.org> man-1.6.ebuild:
+  Only build/install languages as defined by $LINGUAS #97612 by Martin von
+  Gagern.
+
+  30 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/man-1.6-parallel-make.patch, man-1.6.ebuild:
+  Proper fix by Octavio Ruiz (Ta^3) fixes bug #97439.
+
+  30 Jun 2005; Luca Barbato <lu_zero@gentoo.org> man-1.6.ebuild:
+  Forced -j1 in the ebuild
+
+*man-1.6 (30 Jun 2005)
+
+  30 Jun 2005; Mike Frysinger <vapier@gentoo.org> +man-1.6.ebuild:
+  Version bump.
+
+  04 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> man-1.5p.ebuild:
+  Move sys-apps/cronbase -> sys-process/cronbase
+
+*man-1.5p (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5p-defmanpath-symlinks.patch,
+  +files/man-1.5p-parallel-make.patch, +files/man-1.5p-search-order.patch,
+  +man-1.5p.ebuild:
+  Version bump.
+
+*man-1.5o_p2 (07 Jan 2005)
+
+  07 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  files/man-1.5m-groff-1.18.patch, +man-1.5o_p2.ebuild:
+  Version bump.  Also fix the <B7> gremlins #44201 by Chris Smith.
+  Punt redhat fixes since they are outdated and not really useful anymore.
+
+*man-1.5o_p1 (13 Dec 2004)
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  files/man-1.5m-security.patch, +files/man-1.5o_p1-man2html-CFLAGS.patch,
+  +man-1.5o_p1.ebuild:
+  Version bump.
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5m-cross-compile.patch, man-1.5m-r2.ebuild:
+  Fix cross-compiling.
+
+  08 Nov 2004; Mike Frysinger <vapier@gentoo.org> man-1.5m-r2.ebuild:
+  Install manpath symlink #70278 by Heinrich Rebehn.
+
+*man-1.5m-r2 (03 Oct 2004)
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/man-1.5m-locale-order.patch, +man-1.5m-r2.ebuild:
+  Add patch to fix locale support #37778 by Magnus Lind / Antti Mäkelä.
+
+  25 Sep 2004; Joshua Kinard <kumba@gentoo.org> man-1.5m-r1.ebuild:
+  Marked stable on mips.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> man-1.5m-r1.ebuild,
+  man-1.5m.ebuild:
+  Masked man-1.5m.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> man-1.5m-r1.ebuild:
+  Masked man-1.5m-r1.ebuild stable for ppc
+
+  04 Sep 2004; <solar@gentoo.org> man-1.5m-r1.ebuild:
+  use non-lazy bindings for +s apps installed by this package
+
+  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> man-1.5m-r1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  06 Aug 2004; Guy Martin <gmsoft@gentoo.org> man-1.5m-r1.ebuild:
+  Stable on hppa.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> man-1.5m-r1.ebuild:
+  Keyworded sparc
+
+  04 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> man-1.5m-r1.ebuild:
+  tidy; stablize for x86 to fix bug #40322
+
+  15 Jun 2004; <solar@gentoo.org> man-1.5l-r6.ebuild, man-1.5m-r1.ebuild:
+  fixed up nls usage for uclibc
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> man-1.5m-r1.ebuild:
+  Stable on alpha.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> man-1.5m-r1.ebuild:
+  stable on amd64
+
+  10 May 2004; Michael McCabe <randy@gentoo.org> man-1.5m-r1.ebuild:
+  Stable on s390
+
+*man-1.5m-r1 (01 May 2004)
+
+  03 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Install cronjob as makewhatis instead of makewhatis.cron #40506 by Peter Simons.
+
+  01 May 2004; Bryan Østergaard <kloeri@gentoo.org> +man-1.5m-r1.ebuild:
+  Add posix sections to MANSECT, bug #47806.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> man-1.5m.ebuild:
+  added missing ~amd64 keyword
+
+  10 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Make sure cache directories are created with correct permissions #40322.
+
+  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Enable search database updating by default and move it to cron.weekly #38321.
+  Also run niced to help out desktop users #37872.
+
+  01 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> man-1.5i-r3.ebuild,
+  man-1.5k-r1.ebuild, man-1.5l-r5.ebuild, man-1.5l-r6.ebuild, man-1.5m.ebuild:
+  chown user.group -> chown user:group
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> man-1.5m.ebuild :
+  ia64 keywords.
+
+  06 Sep 2003; Tavis Ormandy <taviso@gentoo.org> man-1.5m.ebuild,
+  files/man-1.5m-makewhatis.cron:
+  remove symlinked paths with a patch.
+
+*man-1.5m (06 Sep 2003)
+
+  23 Sep 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5l-r4.ebuild,
+  man-1.5l-r5.ebuild, man-1.5l-r6.ebuild, man-1.5m.ebuild:
+  Add cache directories, bug #29306.
+
+  06 Sep 2003; Tavis Ormandy <taviso@gentoo.org> man-1.5m.ebuild:
+  a new release, which closes #23436
+  makewhatis.cron will usually traverse manpages twice, which 
+  is unnescessary, changing to traverse MANPATH. #23848
+  bump.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> man-1.5l-r6.ebuild:
+  Mark stable on alpha
+
+*man-1.5l-r6 (10 Jun 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> man-1.5l-r6.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> man-1.5l-r6.ebuild:
+  Changed ~sparc & ~mips to sparc & mips in KEYWORDS
+
+  10 Jun 2003; Tavis Ormandy <taviso@gentoo.org> :
+  line length may be overridden by noff mandoc macros, applying 
+  oneliner patch from #21018
+
+*man-1.5l-r5 (08 Jun 2003)
+
+  08 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*man-1.5l-r4 (31 May 2003)
+
+  31 May 2003; <msterret@gentoo.org> man-1.5l-r4.ebuild:
+  Add nls to IUSE
+  Use sed -i and add sed to DEPEND
+  Use emake -j1 so it's clear it doesn't build right in parallel.
+  Error messages for die
+  Rearranged src_install() to cd less
+  Trim trailing white space
+  Masked all archs in case I messed something up
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> man-1.5i-r3.ebuild,
+  man-1.5k-r1.ebuild, man-1.5l-r3.ebuild:
+  now uses mirror://kernel
+
+*man-1.5l-r3 (03 May 2003)
+
+  03 May 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5l-r3.ebuild,
+  files/man-1.5l-wrong-quotes-v2.patch:
+  Remove the DEPEND on util-linux, fixing bug #20314.
+
+  28 Apr 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5l-fix :
+  Updated this patch again.  I did it this time by rather using the hex
+  value than a quoted value, thanks to idea from giggles1 <bevdv@yahoo.com>,
+  bug #19039.
+
+  03 Apr 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5l-r2.ebuild :
+  Mark stable for all other arch's, as -r1 that is, is broken.
+
+*man-1.5l-r2 (30 Mar 2003)
+
+  28 Apr 2003; Tavis Ormandy <taviso@gentoo.org> man-1.5l-r2.ebuild:
+  missing util-linux dependancy
+
+  02 Apr 2003; Christian Birchinger <joker@gentoo.org> man-1.5l-r2.ebuild:
+  Added stable sparc keyword
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5l-r2.ebuild :
+  Cleanup the CC mess, fixing bug #18361.
+
+*man-1.5l-r1 (19 Mar 2003)
+
+  26 Mar 2003; Zach Welch <zwelch@gentoo.org> man-1.5l-r1.ebuild:
+  fix distcc compiles by using CC properly (bug 18242)
+
+  19 Mar 2003; root <root@gentoo.org> man-1.5l-r1.ebuild,
+  files/man-1.5l-redhat-patches.patch:
+  corrected patch. closes #17801.
+
+  18 Mar 2003; Martin Schlemmer <azarah@gentoo.org> *-wrong-quotes.patch :
+  Fix issue where 'man -K' just cause a lot of 'grep errors', bug #16581.
+
+*man-1.5l (18 Mar 2003)
+
+  18 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+  13 mar 2003; Olivier Reisch <doctomoe@gentoo.org> man-1.5k-r1.ebuild :
+  Marked ppc stable
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> man-1.5k-r1.ebuild :
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> man-1.5k-r1.ebuild :
+  Added hppa to keywords.
+
+  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> man-1.5k-r1.ebuild :
+
+  Mark stable for x86.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> man-1.5k.ebuild,
+                                                    man-1.5k-r1.ebuild :
+
+  Bugfixes:
+  - Add man-1.5k-util_c-segfault.patch to fix a crash when calling man
+    with:  man -k "foo bar" (bug #9761).
+  - Add man-1.5k-locale-debug-info.patch to make man not print the
+    'man: No such file or directory' error if 'man -d' was called and
+    the NLS catalogue was not found, as it confuses people, and be
+	more informative ... (bug #6360)
+
+*man-1.5k-r1 (26 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> man-1.5k-r1.ebuild :
+  Mark as stable for mips.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> man-1.5k-r1.ebuild :
+
+  Did the following updates and fixes (bug #12496 mostly):
+  - Add man-1.5k-redhat-patches.patch submited by Nicholas Wourms <dragon@gentoo.org>
+    that fixes various security issues.
+  - Add man-1.5k-search-order.patch submited by Nicholas Wourms <dragon@gentoo.org>
+    to fix man's directory search order.
+  - Add man-1.5k-groff-1.18.patch.  This is a patch I created from
+    Nicholas Wourms <dragon@gentoo.org> 's hack to make man work with groff-1.18
+    and later.
+  - Add man-1.5k-wrong-quotes.patch to fix a rare problem where gcc drops
+    the ' in a -D switch.  This closes bug #5887.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*man-1.5k (29 Jul 2002)
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  27 Sep 2002; Seemant Kulleen <seemant@gentoo.org> man-1.5k.ebuild :
+
+  Fixed compilation of gencat (when "nls" in USE).  Thanks to:
+  chrb@dcs.ed.ac.uk (Chris Bainbridge) in bug #8020.
+
+  29 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version; cleanups.
+
+  24 Apr 2002; t.bangert <bangert@gentoo.org> :
+  
+  added makewhatis.cron and cronbase dependancy
+  
+
+*man-1.5i-r3 (15 Apr 2002)
+
+  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> man-1.5i-r3.ebuild :
+	
+  Changed man to used it's auto-configured man.conf file.
+  man-1.5i-r2's man.conf had paths that didn't exist and options that
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> man-1.5i-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+  caused some man pages, like ps to not format correctly.
+	
 *man-1.5i-r2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index a4712446fecd..ad7436753c1b 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,20 +1,35 @@
-MD5 30a5c5acf004bbd9d54aefb41196b34a ChangeLog 4439
-MD5 3d04d5c091ec8b1358696ed898e3f6ee man-1.5i-r3.ebuild 1725
-MD5 091d6b4d81d001f815f18f86ed7f2cde man-1.5k-r1.ebuild 2566
-MD5 327ce9fe5ee237e00f36eadd550b0566 man-1.5l-r2.ebuild 2310
-MD5 c40cc9207adc44cb98bf59a1e9e90766 files/digest-man-1.5i-r3 61
-MD5 34fd8ac346c17188a9eb54e64276feee files/makewhatis.cron 155
-MD5 c5192bd8b69dea5e3b281950a427d025 files/man-1.5k-wrong-quotes.patch 340
-MD5 df6ae39cf3544b31e1d9e11b74b43d13 files/man-1.5k-groff-1.18.patch 634
-MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5k-search-order.patch 489
-MD5 00f30e0e111b386b879a36f64180026c files/digest-man-1.5k-r1 60
-MD5 eb0c495f1c11036460b98e3b2fd41e0a files/man-1.5k-redhat-patches.patch 7701
-MD5 53e5d8000368e638927ed8f4c0411f18 files/man-1.5k-util_c-segfault.patch 2275
-MD5 3fd69820a5978ad926d9f3583b485e1a files/man-1.5l-groff-1.18.patch 689
-MD5 45544066c9da6e67ca8b7b72525ed185 files/man-1.5k-locale-debug-info.patch 1958
-MD5 7de4684156992ffd479e773a4abc79d7 files/man-1.5l-locale-debug-info.patch 2128
-MD5 08bb9cc46b14ee967cab2354dc1e56a8 files/man-1.5l-redhat-patches.patch 7166
-MD5 cbbd4de51a8359a1ae81f46f2dad6bd8 files/man-1.5l-search-order.patch 489
-MD5 fe9f5db8b8b6feaaac25563cb294c901 files/man-1.5l-util_c-segfault.patch 2276
-MD5 d8990b0dc5c9670156737c7012de3e9e files/man-1.5l-wrong-quotes.patch 411
-MD5 a63bfea0511bb4ea9292d63dc11348b3 files/digest-man-1.5l-r2 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1ad7a0d4dd074702a5bd12e2cf8a6980 ChangeLog 11883
+MD5 6d6e219c5e8357b2d60e92e0ac88d76b files/digest-man-1.5p 60
+MD5 90c01e3cfecc4bc92266780a9be71429 files/digest-man-1.6-r1 59
+MD5 1c3d9a443043b133adbe277b50105123 files/digest-man-1.6a 60
+MD5 bf0f39bbc9dbe51b036a060f0bcc5094 files/digest-man-1.6b-r2 60
+MD5 8b2016cc778ed4e2570b912c0f420266 files/makewhatis.cron 130
+MD5 80f2a25fb0b5692f39a1990527a93271 files/man-1.5m-groff-1.18.patch 923
+MD5 1d6fe29183fbb523a07b877255d686b4 files/man-1.5m2-apropos.patch 450
+MD5 14e1c7533927dfb89900ee788666b342 files/man-1.5p-defmanpath-symlinks.patch 663
+MD5 cb84d324b4b569658496ad13d725be1e files/man-1.5p-man2html.patch 850
+MD5 fe5b3c868ce270c9cc79f42384066a87 files/man-1.5p-mandirlist.patch 460
+MD5 148b7ee661e1e9384930fbd508dd5027 files/man-1.5p-parallel-make.patch 437
+MD5 7b2b00aace5bcdb963286e235eaf22b2 files/man-1.5p-search-order.patch 519
+MD5 331c925e304b56d63aa2c97dcc8e08fc files/man-1.6-cross-compile.patch 1744
+MD5 ecb128fe6db790f05629a8b2eca4c4fa files/man-1.6-message-order.patch 833
+MD5 bc796c3f2d1f9becb3d0bedc1b6dc051 files/man-1.6-parallel-make.patch 1033
+MD5 e2a65941ce02530483bd966c879a8b31 files/man-1.6a-makewhatis-config.patch 1807
+MD5 7b94b85c02df3b66046e3d01827cd173 files/man-1.6a-parallel-make.patch 657
+MD5 90f936cbc365fa88a17525afc2cc0d95 files/man-1.6b-build.patch 175
+MD5 cc5bb9ed7778c068c9154f0f8c6a5e07 files/man-1.6b-more-sections.patch 291
+MD5 816a0222228cedf51e8bc39acb32fa89 man-1.5p.ebuild 2648
+MD5 5c0c422d050f5191b66a7c4ed928835a man-1.6-r1.ebuild 2983
+MD5 9206115cdc98fb8e0d7cbd518ad9476b man-1.6a.ebuild 2897
+MD5 50475a5a73ad68a1abe0e638beac229d man-1.6b-r2.ebuild 3079
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDeS8FgIKl8Uu19MoRAjxbAJd9ntuRbss3W6YCXVEsSUERTSw/AKCBcP6q
+oQT6sO3Ny2WIiKkM3j/cQg==
+=kuBl
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/makewhatis.cron b/sys-apps/man/files/makewhatis.cron
index 38a576829cd9..6bcf1105e5f9 100644
--- a/sys-apps/man/files/makewhatis.cron
+++ b/sys-apps/man/files/makewhatis.cron
@@ -1,10 +1,5 @@
 #!/bin/sh
-#
-# Uncomment the following if you want 
-# your whatis database rebuilt regularly
-#
 # this is part of the man package
-#
-#
+# it updates the search database for manpages
 
-#/usr/sbin/makewhatis
+exec /bin/nice /usr/sbin/makewhatis -u
diff --git a/sys-apps/man/files/man-1.5m-groff-1.18.patch b/sys-apps/man/files/man-1.5m-groff-1.18.patch
index 26a65b8dd8c8..08dff37503bf 100644
--- a/sys-apps/man/files/man-1.5m-groff-1.18.patch
+++ b/sys-apps/man/files/man-1.5m-groff-1.18.patch
@@ -1,3 +1,10 @@
+With newer versions of groff (1.18+), we need to use -c 
+so as to filter color output.
+
+Also, change the -Tlatin1 to -Tascii to get rid of '<B7>' 
+gremlins and output the normal bullets 'o'.
+http://bugs.gentoo.org/show_bug.cgi?id=44201
+
 --- man-1.5k/configure.orig	2002-12-26 06:23:53.000000000 +0200
 +++ man-1.5k/configure	2002-12-26 06:25:14.000000000 +0200
 @@ -473,9 +473,9 @@
@@ -5,10 +12,10 @@
      if test $Fnroff = "missing"
      then
 -      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff -Tlatin1 -c -mandoc"
++      nroff="nroff -Tascii -c -mandoc"
      else
 -      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -Tlatin1 -c -mandoc"
++      nroff="$Fnroff -Tascii -c -mandoc"
      fi
      troff="troff -mandoc"
      echo "Warning: could not find groff"
@@ -17,7 +24,7 @@
        nroff="$Fgroff -Tlatin1 -mandoc"
      else
 -      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -Tlatin1 -c -mandoc"
++      nroff="$Fnroff -Tascii -c -mandoc"
      fi
      troff="$Fgroff -Tps -mandoc"
      jnroff="$Fgroff -Tnippon -mandocj"
diff --git a/sys-apps/man/files/man-1.6-parallel-make.patch b/sys-apps/man/files/man-1.6-parallel-make.patch
index dbf8c8e82bff..172ba5f84fcd 100644
--- a/sys-apps/man/files/man-1.6-parallel-make.patch
+++ b/sys-apps/man/files/man-1.6-parallel-make.patch
@@ -1,6 +1,9 @@
-diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in
---- man-1.6.orig/Makefile.in	2005-06-30 04:38:50.000000000 -0500
-+++ man-1.6/Makefile.in	2005-06-30 04:39:21.000000000 -0500
+Fix parallel building
+
+src/Makefile.in fixes by Octavio Ruiz http://bugs.gentoo.org/97439
+
+--- man-1.6/Makefile.in
++++ man-1.6/Makefile.in
 @@ -33,13 +33,13 @@
  source:	src/Makefile
  	cd src; $(MAKE)
@@ -17,15 +20,14 @@ diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in
  %	cd msgs; $(MAKE)
  
  %gencat/gencat:
-diff -ur man-1.6.orig/src/Makefile.in man-1.6/src/Makefile.in
---- man-1.6.orig/src/Makefile.in	2005-06-30 04:38:50.000000000 -0500
-+++ man-1.6/src/Makefile.in	2005-06-30 04:39:21.000000000 -0500
-@@ -56,7 +56,7 @@
+--- man-1.6/src/Makefile.in
++++ man-1.6/src/Makefile.in
+@@ -52,7 +52,7 @@
+ man-config.o man-getopt.o man.o manpath.o to_cat.o: defs.h
+ different.o man.o: different.h
+ man.o manfile.o: glob.h
+-different.o gripes.o man-config.o man-getopt.o man.o manpath.o util.o: gripes.h gripedefs.h
++different.o gripes.o man-config.o man-getopt.o man.o manfile.o manpath.o util.o: gripes.h gripedefs.h
  different.o man-config.o man-getopt.o man.o manpath.o: man-config.h
  gripes.o man-config.o man-getopt.o man.o manpath.o util.o: man.h
  man-getopt.o man.o manpath.o: man-getopt.h
--man.o manfile.o to_cat.o: manfile.h
-+man.o manfile.o to_cat.o: manfile.h gripes.h gripedefs.h
- man.o man-iconv.o: man-iconv.h
- man.o manpath.o: manpath.h
- man-config.o: paths.h
diff --git a/sys-apps/man/files/man-1.6a-makewhatis-config.patch b/sys-apps/man/files/man-1.6a-makewhatis-config.patch
index b8c3fad87262..bda196f8ef0c 100644
--- a/sys-apps/man/files/man-1.6a-makewhatis-config.patch
+++ b/sys-apps/man/files/man-1.6a-makewhatis-config.patch
@@ -4,6 +4,24 @@ http://bugs.gentoo.org/86863
 
 --- src/makewhatis.sh
 +++ src/makewhatis.sh
+@@ -33,7 +33,7 @@
+ #
+ # Note for Slackware users: "makewhatis -v -w -c" will work.
+ #
+-# makewhatis aeb 030801 (from %version%)
++# makewhatis aeb 030801 (from @version@)
+ 
+ program=`basename $0`
+ 
+@@ -63,7 +63,7 @@
+ # but that leads to problems and bugs.
+ 
+ # AWK=/usr/bin/gawk
+-AWK=%awk%
++AWK=@awk@
+ 
+ # Find a place for our temporary files. If security is not a concern, use
+ #	TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
 @@ -92,7 +92,15 @@
  defmanpath=$DEFMANPATH
  defcatpath=
@@ -14,13 +32,22 @@ http://bugs.gentoo.org/86863
 +else
 +	sections=`$AWK '($1 == "MANSECT") { print $2 }' @man_config_file@`
 +	if [ x"$sections" = x ]; then
-+		sections="1 2 3 4 5 6 7 8 9 n l"
++		sections="@sections@"
 +	fi
 +fi
 +sections=`echo $sections | sed -e 's/:/ /g'`
  
  for name in "$@"
  do
+@@ -111,7 +111,7 @@
+ fi
+ case $name in
+     --version|-V)
+-	echo "$program from %version%"
++	echo "$program from @version@"
+ 	exit 0;;
+     -c) topath=catpath
+ 	defmanpath=
 --- src/Makefile.in
 +++ src/Makefile.in
 @@ -93,8 +93,8 @@
diff --git a/sys-apps/man/man-1.5p.ebuild b/sys-apps/man/man-1.5p.ebuild
index bc2a9b7c3db5..3ded5ec1ce4c 100644
--- a/sys-apps/man/man-1.5p.ebuild
+++ b/sys-apps/man/man-1.5p.ebuild
@@ -1,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-apps/man/man-1.5p.ebuild,v 1.1 2005/01/12 18:29:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5p.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,20 +11,24 @@ SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.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 ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-RDEPEND="sys-apps/cronbase
+DEPEND=""
+RDEPEND="sys-process/cronbase
 	>=sys-apps/groff-1.18
 	nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${PN}-${NV}"
 
+pkg_setup() {
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Make sure we can build with -j :)
 	epatch ${FILESDIR}/man-1.5p-parallel-make.patch
diff --git a/sys-apps/man/man-1.6-r1.ebuild b/sys-apps/man/man-1.6-r1.ebuild
index 330aaadf5ad5..6234ca7fda5f 100644
--- a/sys-apps/man/man-1.6-r1.ebuild
+++ b/sys-apps/man/man-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/sys-apps/man/man-1.6-r1.ebuild,v 1.1 2005/07/09 22:49:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -18,6 +18,11 @@ RDEPEND="sys-process/cronbase
 	>=sys-apps/groff-1.18
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -25,6 +30,9 @@ src_unpack() {
 	# Make sure we can build with -j :)
 	epatch "${FILESDIR}"/man-1.6-parallel-make.patch
 
+	# We love to cross-compile
+	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
+
 	# Fix message order in en lang file which triggers segv's for
 	# non-english users #97541
 	epatch "${FILESDIR}"/man-1.6-message-order.patch
diff --git a/sys-apps/man/man-1.6a.ebuild b/sys-apps/man/man-1.6a.ebuild
index ad6655a88b3b..9ef37de8b316 100644
--- a/sys-apps/man/man-1.6a.ebuild
+++ b/sys-apps/man/man-1.6a.ebuild
@@ -1,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-apps/man/man-1.6a.ebuild,v 1.1 2005/08/22 23:40:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6a.ebuild,v 1.1.1.1 2005/11/30 09:56:26 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -18,6 +18,11 @@ RDEPEND="sys-process/cronbase
 	>=sys-apps/groff-1.18
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -46,7 +51,7 @@ src_unpack() {
 		src/Makefile.in \
 		|| die "failed to edit default LDLFAGS"
 
-cp -a ${S}{,.orig}
+	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
 }
 
 src_compile() {
@@ -54,7 +59,6 @@ src_compile() {
 
 	local myconf=
 	if use nls ; then
-		strip-linguas $(cd man; echo ??)
 		if [[ -z ${LINGUAS} ]] ; then
 			myconf="+lang all"
 		else
diff --git a/sys-apps/man/man-1.6b-r2.ebuild b/sys-apps/man/man-1.6b-r2.ebuild
index f96f60149c5f..265ea478cac6 100644
--- a/sys-apps/man/man-1.6b-r2.ebuild
+++ b/sys-apps/man/man-1.6b-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-apps/man/man-1.6b-r2.ebuild,v 1.1 2005/11/15 00:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6b-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/man/metadata.xml
+++ b/sys-apps/man/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-apps/mawk/ChangeLog b/sys-apps/mawk/ChangeLog
index ad89eae41c7d..caee9b3f1a90 100644
--- a/sys-apps/mawk/ChangeLog
+++ b/sys-apps/mawk/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/mawk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/ChangeLog,v 1.1 2003/06/08 20:47:22 lostlogic Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> mawk-1.3.3.ebuild:
+  Masked mawk-1.3.3.ebuild stable for ppc
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> mawk-1.3.3.ebuild:
+  Don't override MAKEOPTS, pass options directly do emake.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> mawk-1.3.3.ebuild:
+  glibc -> libc, update HOMEPAGE
+
+  29 Mar 2004; Jon Portnoy <avenj@gentoo.org> mawk-1.3.3.ebuild :
+  Set MATHLIB to libm.so.6 in the ebuild to fix bug #45636.
 
 *mawk-1.3.3 (08 Jun 2003)
 
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 089fe3d52b67..053c2eabd7df 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,4 @@
-MD5 336222a73dd7bc981d4390845c6e460e mawk-1.3.3.ebuild 599
-MD5 94aa8835f506d47f7a63c2794f9808cf ChangeLog 256
+MD5 679177be53532887a2139e6758e41605 ChangeLog 815
+MD5 e04aacf48e8c9d7b134d183921c390c9 mawk-1.3.3.ebuild 840
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 422a47be83c17ea21f474137dd4021b2 files/digest-mawk-1.3.3 62
diff --git a/sys-apps/mawk/mawk-1.3.3.ebuild b/sys-apps/mawk/mawk-1.3.3.ebuild
index 9f1c20152a0d..467955cf1373 100644
--- a/sys-apps/mawk/mawk-1.3.3.ebuild
+++ b/sys-apps/mawk/mawk-1.3.3.ebuild
@@ -1,21 +1,23 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/mawk-1.3.3.ebuild,v 1.1 2003/06/08 20:47:22 lostlogic Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/mawk-1.3.3.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
-DESCRIPTION="An (often faster than gawk) awk-interpreter."
+DESCRIPTION="an (often faster than gawk) awk-interpreter"
 SRC_URI="ftp://ftp.whidbey.net/pub/brennan/${P}.tar.gz"
-HOMEPAGE="not avail -- use SRC_URI"
+HOMEPAGE="http://freshmeat.net/projects/mawk/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+KEYWORDS="x86 amd64 ppc ~sparc ~alpha ~hppa ia64"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 IUSE=""
 
 src_compile() {
+	export MATHLIB="/lib/libm.so.6"
+
 	./configure --prefix=/usr || die "Failed to configure"
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	emake -j1 || die "Make failed"
 }
 
 src_install () {
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/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-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 1582c85fb7bd..2e4bbf0b856b 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,11 +1,152 @@
 # ChangeLog for sys-apps/memtest86+
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.1 2004/02/01 16:34:59 spock Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.1.1.1 2005/11/30 09:56:17 chriswhite Exp $
+
+  09 Oct 2005; Luis Medinas <metalgod@gentoo.org> memtest86+-1.60.ebuild:
+  Marked Stable on amd64.
+
+  07 Oct 2005; Michał Januszewski <spock@gentoo.org>
+  +memtest86+-1.65.ebuild:
+  Version bump (bug #108322).
+
+  06 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  memtest86+-1.60.ebuild:
+  Marking stable on x86.  Blame SpanKY.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*memtest86+-1.65 (07 Oct 2005)
+
+  07 Oct 2005; Michał Januszewski <spock@gentoo.org>
+  +memtest86+-1.65.ebuild:
+  Version bump (bug #108322).
+
+*memtest86+-1.60 (03 Aug 2005)
+
+  03 Aug 2005; Mike Frysinger <vapier@gentoo.org> +memtest86+-1.60.ebuild:
+  Version bump.
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  memtest86+-1.55.ebuild:
+  Marked stable on x86.
+
+  16 Jun 2005; Malcolm Lashley <malc@gentoo.org> memtest86+-1.51.ebuild:
+  Stable on amd64 in line with maintainer arch, closes bug #96014
+
+  21 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  memtest86+-1.40.ebuild, memtest86+-1.50.ebuild, memtest86+-1.51.ebuild,
+  memtest86+-1.55.ebuild:
+  marking -ppc
+
+  29 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  memtest86+-1.55.ebuild:
+  Apparently the upstream memtest86+ devs decided to go back to a saner
+  directory naming scheme and renamed 1.55.1 to 1.55. So we're following them.
+  This fixes bug #87115.
+
+*memtest86+-1.55 (29 Mar 2005)
+
+  29 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  +memtest86+-1.55.ebuild:
+  Version bump.
+
+  19 Mar 2005; Michał Januszewski <spock@gentoo.org>
+  memtest86+-1.40.ebuild, memtest86+-1.50.ebuild, memtest86+-1.51.ebuild:
+  Disabled src_test to fix bug #85689. Marked 1.50 and 1.51 stable on x86.
+
+*memtest86+-1.51 (16 Feb 2005)
+
+  16 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  +memtest86+-1.51.ebuild:
+  Version bump.
+
+  12 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> memtest86+-1.50.ebuild:
+  added ~amd64 to KEYWORDS. fixes #81496
+
+  10 Feb 2005; Michał Januszewski <spock@gentoo.org>
+  -memtest86+-1.11.ebuild, -memtest86+-1.30.ebuild, memtest86+-1.50.ebuild:
+  Cleaned the 1.50 ebuild up a little bit. Removed old ebuilds.
+
+  24 Jan 2005; Michał Januszewski <spock@gentoo.org>
+  +files/memtest86+-1.50-hardened.patch, memtest86+-1.40.ebuild,
+  memtest86+-1.50.ebuild:
+  Added a patch that fixes compilation on hardened systems. Closes bug #73383.
+
+*memtest86+-1.50 (22 Jan 2005)
+
+  22 Jan 2005; Michał Januszewski <spock@gentoo.org>
+  -memtest86+-1.26.ebuild, -memtest86+-1.27.ebuild, memtest86+-1.40.ebuild,
+  +memtest86+-1.50.ebuild:
+  Version bump. Marked 1.40 stable on x86. Removed old ebuilds.
+
+*memtest86+-1.40 (01 Dec 2004)
+
+  01 Dec 2004; Tony Vroon <chainsaw@gentoo.org> memtest86+-1.30.ebuild,
+  +memtest86+-1.40.ebuild:
+  Version bump to 1.40 release. 1.30 stable on x86.
+
+*memtest86+-1.30 (09 Nov 2004)
+
+  09 Nov 2004; Michal Januszewski <spock@gentoo.org>
+  +memtest86+-1.30.ebuild:
+  Version bump, closes bug #70499.
+
+*memtest86+-1.27 (13 Oct 2004)
+
+  13 Oct 2004; Michal Januszewski <spock@gentoo.org> -memtest86+-1.0.ebuild,
+  -memtest86+-1.15.ebuild, -memtest86+-1.20.ebuild, -memtest86+-1.25.ebuild,
+  +memtest86+-1.27.ebuild:
+  Version bump. Removed old ebuilds.
+
+*memtest86+-1.26 (02 Sep 2004)
+
+  02 Sep 2004; Michal Januszewski <spock@gentoo.org> +memtest86+-1.26.ebuild:
+  Version bump.
+
+*memtest86+-1.25 (01 Sep 2004)
+
+  01 Sep 2004; Michal Januszewski <spock@gentoo.org> +memtest86+-1.25.ebuild:
+  Version bump.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> memtest86+-1.0.ebuild,
+  memtest86+-1.11.ebuild, memtest86+-1.15.ebuild, memtest86+-1.20.ebuild:
+  glibc -> libc, trim trailing whitespace
+
+*memtest86+-1.20 (28 Jun 2004)
+
+  28 Jun 2004; Michal Januszewski <spock@gentoo.org> +memtest86+-1.20.ebuild:
+  Version bump.
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> memtest86+-1.0.ebuild,
+  memtest86+-1.11.ebuild, memtest86+-1.15.ebuild:
+  QA - fix use invocation
+
+*memtest86+-1.15 (17 May 2004)
+
+  17 May 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.11.ebuild,
+  +memtest86+-1.15.ebuild:
+  Version bump. Moved 1.11 to stable.
+
+*memtest86+-1.11 (26 Feb 2004)
+
+  26 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.11.ebuild:
+  Version bump, closes bug #42023. Thanks to Frank Dörfler and James Slater for
+  their work on the updated ebuild.
+
+  18 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.0.ebuild:
+  Moved to stable on x86.
+
+  01 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.0.ebuild:
+  The ebuild now makes use of the mount-boot eclass.
+
+  01 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.0.ebuild:
+  Added support for the local 'serial' USE flag.
 
 *memtest86+-1.0 (01 Feb 2004)
 
   01 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86+-1.0.ebuild,
   metadata.xml:
-  Initial commit, closes bug #38828, thanks to Frank D�rfler for the original
+  Initial commit, closes bug #38828, thanks to Frank Dörfler for the original
   ebuild.
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a56e30b7c4d6..42f7632f019d 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1,21 @@
-MD5 37f0719c0279a8fe2d5df33da02de87c memtest86+-1.0.ebuild 1947
-MD5 0782c1c3a12f88f4b728016925d26bd3 files/digest-memtest86+-1.0 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2b224b9eb80ef2610994b0403ba266f6 ChangeLog 5138
+MD5 7de34f897fafe96fb35d20b96ccfdd09 memtest86+-1.51.ebuild 2045
+MD5 aab46bfc1008c591ff6353e7338f63b4 memtest86+-1.55.ebuild 1993
+MD5 6e4a562860cd8556ea460ac4682d01e3 metadata.xml 259
+MD5 610ce7f512475074c91d3585f2da6a74 memtest86+-1.60.ebuild 1781
+MD5 73762eb0c8577fb2371feeeee57325e4 memtest86+-1.65.ebuild 1780
+MD5 114b43ff7481ea736edde3e009304dad files/digest-memtest86+-1.51 67
+MD5 b77e0941bf142a172b378ff9dc5170aa files/digest-memtest86+-1.55 67
+MD5 c9888397f49a7e1d3df3a2f5acd5cfad files/memtest86+-1.50-hardened.patch 802
+MD5 4a457f7856f268bf4efef17ca548d351 files/digest-memtest86+-1.60 67
+MD5 f15e70a0d97138728c77add0513422cc files/digest-memtest86+-1.65 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDSWiuwUpWvClEHQoRAuDqAJ4mbJswow+s0NRErhhJqYQayZ8bRgCfXar9
+cgAGLxrD8/akX58eZICjf+s=
+=esTU
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/digest-memtest86+-1.55 b/sys-apps/memtest86+/files/digest-memtest86+-1.55
index f5ef58aa0c65..33aa9d129066 100644
--- a/sys-apps/memtest86+/files/digest-memtest86+-1.55
+++ b/sys-apps/memtest86+/files/digest-memtest86+-1.55
@@ -1 +1 @@
-MD5 037496969e87a0ec1dc11a71d44e8023 memtest86+-1.55.tar.gz 146168
+MD5 944b0d4b2058defb000862d7ee3a3b1c memtest86+-1.55.tar.gz 146172
diff --git a/sys-apps/memtest86+/memtest86+-1.51.ebuild b/sys-apps/memtest86+/memtest86+-1.51.ebuild
index f76c2aed8302..e91802f309e4 100644
--- a/sys-apps/memtest86+/memtest86+-1.51.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.51.ebuild
@@ -1,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-apps/memtest86+/memtest86+-1.51.ebuild,v 1.1 2005/02/16 22:37:22 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.51.ebuild,v 1.1.1.1 2005/11/30 09:56:17 chriswhite Exp $
 
 inherit mount-boot eutils
 
@@ -9,9 +9,10 @@ HOMEPAGE="http://www.memtest.org/"
 SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 -ppc"
 IUSE="serial"
 DEPEND="virtual/libc"
+RESTRICT="test"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/memtest86+/memtest86+-1.55.ebuild b/sys-apps/memtest86+/memtest86+-1.55.ebuild
index d482bf0a319e..a085c24855dd 100644
--- a/sys-apps/memtest86+/memtest86+-1.55.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.55.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.55.ebuild,v 1.1 2005/03/29 12:40:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.55.ebuild,v 1.1.1.1 2005/11/30 09:56:17 chriswhite Exp $
 
 inherit mount-boot eutils
 
 DESCRIPTION="Memory tester based on memtest86"
 HOMEPAGE="http://www.memtest.org/"
 SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="-* amd64 x86"
 IUSE="serial"
-DEPEND="virtual/libc"
-RESTRICT="maketest"
-S="${S}.1"
+RESTRICT="test"
+
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# send the DOS newlines where they belong - /dev/null ;>
 	sed -e 's/\x0d//g' -i Makefile || die
@@ -32,8 +33,8 @@ src_compile() {
 }
 
 src_install() {
-	dodir /boot/memtest86plus
-	cp memtest.bin ${D}/boot/memtest86plus/memtest.bin || die
+	insinto /boot/memtest86plus
+	doins memtest.bin || die
 	dodoc README README.build-process
 }
 
@@ -46,13 +47,14 @@ pkg_postinst() {
 	einfo "    > title=Memtest86Plus"
 
 	# a little magic to make users' life as easy as possible ;)
+	local fstab=${ROOT}/etc/fstab
 	bootpart=0
 	root="(hd0,0)"
-	res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
+	res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
 	if [ -n "${res}" ] ; then
 		bootpart=1
 	else
-		res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | \
+		res=`grep -v '^#' "${fstab}" | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | \
 			awk '{print $1}'`
 	fi
 
diff --git a/sys-apps/memtest86+/memtest86+-1.60.ebuild b/sys-apps/memtest86+/memtest86+-1.60.ebuild
index 31e1cf8093ad..f802d5afd520 100644
--- a/sys-apps/memtest86+/memtest86+-1.60.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.60.ebuild,v 1.1 2005/08/03 22:12:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.60.ebuild,v 1.1.1.1 2005/11/30 09:56:17 chriswhite Exp $
 
 inherit mount-boot eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="serial"
 RESTRICT="test"
 
diff --git a/sys-apps/memtest86+/memtest86+-1.65.ebuild b/sys-apps/memtest86+/memtest86+-1.65.ebuild
index c7162d628560..a6bd753de2ec 100644
--- a/sys-apps/memtest86+/memtest86+-1.65.ebuild
+++ b/sys-apps/memtest86+/memtest86+-1.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/sys-apps/memtest86+/memtest86+-1.65.ebuild,v 1.1 2005/10/07 07:41:36 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.65.ebuild,v 1.1.1.1 2005/11/30 09:56:17 chriswhite Exp $
 
 inherit mount-boot eutils
 
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index daa8053eefc4..fa2cf2c4bd5e 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/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>base-system</herd>
 <maintainer>
   <email>spock@gentoo.org</email>
   <name>Michal Januszewski</name>
diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 8f08a1fa7edd..d24c9319c94c 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,14 +1,97 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.1 2002/06/03 22:11:31 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
+
+  10 Jan 2005; <solar@gentoo.org> +files/memtest86-3.2-solar.patch,
+  memtest86-3.2.ebuild:
+  - fixed problem with missing ssp symbols. bug #76495
+
+  10 Jan 2005; Mike Frysinger <vapier@gentoo.org> memtest86-3.2.ebuild:
+  Disable src_test (since one doesnt exist) #77368 and only add PIC patch if
+  toolchain supports stack-protector #76515.
+
+*memtest86-3.2 (02 Jan 2005)
+
+  02 Jan 2005; Tony Vroon <chainsaw@gentoo.org> -files/memtest86-3.0.patch,
+  -memtest86-3.0-r2.ebuild, memtest86-3.1a.ebuild, +memtest86-3.2.ebuild:
+  Version bump. 3.1a stable on x86. Portability update to no-PIC patching, old
+  ebuild and patch cleaned. Closes bug #76432.
+
+  07 Dec 2004; <solar@gentoo.org> +files/memtest86-3.1a-test-pic.patch,
+  memtest86-3.1a.ebuild:
+  - patched memtest86-3.1a to disable pic on test.c which was causing BREG
+  errors when building. x86 asm guru needed to make the test pic aware someday
+
+*memtest86-3.1a (24 Sep 2004)
+
+  24 Sep 2004; Mike Frysinger <vapier@gentoo.org> +memtest86-3.1a.ebuild:
+  Version bump #49002 by Erinn Looney-Triggs.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> memtest86-3.0-r1.ebuild,
+  memtest86-3.0-r2.ebuild:
+  sync IUSE (missing), glibc -> libc, trim trailing whitespace
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> memtest86-3.0-r2.ebuild:
+  QA - fix use invocation
+
+  18 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  memtest86-3.0-r1.ebuild:
+  This contains 32bit x86 assembly and won't work on amd64.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> memtest86-3.0-r2.ebuild:
+  Add inherit eutils
+
+  05 Feb 2004; <augustus@gentoo.org> memtest86-3.0-r2.ebuild:
+  This won't compile on AMD64 right now. It will need some work. Changed to
+  -amd64.
+
+*memtest86-3.0-r2 (01 Feb 2004)
+
+  01 Feb 2004; Michal Januszewski <spock@gentoo.org> memtest86-3.0-r1.ebuild,
+  memtest86-3.0-r2.ebuild, files/memtest86-3.0.patch:
+  A new revision which: makes memtest86 compile from source and not use the
+  precompiled bin image, adds support for the local ''serial' USE flag and
+  closes bugs #35717 and #28078.
+
+  24 Jan 2003; <woodchip@gentoo.org> : add lilo example snip.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*memtest86-3.0-r1 (06 Sep 2002)
+
+  06 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  memtest86-3.0-r1.ebuild, files/digest-memtest-3.0-r1, ChangeLog :
+
+  Installs the binary distributed with memetest86 rather than
+  compiling it from source (which doesn't work with gcc3.2 at
+  runtime). Upstream has been notified, but no response at the
+  moment. Resolves bug #4088.
 
 *memtest86-3.0 (03 Jun 2002)
 
-  03 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> memtest86-3.0.ebuild files/digest-memtest86-3.0 :
+  29 Sep 2002; Donny Davies <woodchip@gentoo.org> :
+  Now uses mount-boot eclass, #7903.
+
+  25 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org> :
+  Applied hanno's ebuild from http://bugs.gentoo.org/show_bug.cgi?id=4088 to fix my bad.
 
+  24 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org> :
+  Replace patch with mandrake patch. Still doesn't seem to work
+  properly though. Contacting upstream on this...
+
+  22 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  It looks like a patch was developed to fix a bug but then never actually
+  added to the ebuild ... so i put in the patch line in src_compile #8203
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc -sparc -sparc64)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> memtest86-3.0.ebuild :
+  Added KEYWORDS.
+
+  03 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> memtest86-3.0.ebuild files/digest-memtest86-3.0 :
   Memtest86 is thorough, stand alone memory test for x86 architecture 
   computers. BIOS based memory tests are only a quick check and often miss 
   many of the failures that are detected by Memtest86. 
 
   Ebuild submitted by Alastair Nicol <ifni@blueyonder.co.uk>.
-
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index e69de29bb2d1..0222329b5779 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6013644feb6f557d1c302e57622eeea2 memtest86-3.2.ebuild 1944
+MD5 1fe8f6c465d839e2ac1d9d2064f48dd3 ChangeLog 3976
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 9b8f71a15e2d7236b658f1f9e0fb79df files/memtest86-3.2-test-pic.patch 641
+MD5 93e1541e7b5f0da25dc394b281830ba1 files/memtest86-3.2-solar.patch 821
+MD5 64a30db4579e12539572f71ca895e1ed files/digest-memtest86-3.2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iQCVAwUBQeM9D54WFLgrx1GWAQLbqQP8D3dEmnOqZ7nyCxjBP9S36l03HmZ0qi+K
+gB9Uzd1C54O4e3yQFhDmobcPA7u2EGpYjK2QEDUvyV32Gup6hxd1VKxvcwTFUIJd
+a4dTy6on6e0GqM7Sc76NDggqdE4PNBE3TPbthAAVXUVbXbYyy+e/6RyaJ8mXgiAA
+qPGwVreSpiY=
+=ToP5
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/memtest86-3.2.ebuild b/sys-apps/memtest86/memtest86-3.2.ebuild
index 0806d8e35a41..0f523cb15c43 100644
--- a/sys-apps/memtest86/memtest86-3.2.ebuild
+++ b/sys-apps/memtest86/memtest86-3.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/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.1 2005/01/02 19:15:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
-inherit mount-boot eutils
+inherit mount-boot eutils flag-o-matic
 
 DESCRIPTION="A stand alone memory test for x86 computers"
 HOMEPAGE="http://www.memtest86.com/"
@@ -10,26 +10,25 @@ SRC_URI="http://www.memtest86.com/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="serial"
+RESTRICT="maketest"
 
 DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	# bug 66630
-	epatch ${FILESDIR}/${P}-test-pic.patch
+	test_flag -fno-stack-protector && \
+		epatch "${FILESDIR}"/${P}-solar.patch #66630
 
 	sed -i -e '/DISCARD/d' memtest_shared.lds
 
-	if use serial ; then
-		sed -i \
-			-e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' \
-			config.h \
-			|| die
-	fi
+	use serial && \
+	sed -i \
+		-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+		config.h
 }
 
 src_compile() {
diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/memtest86/metadata.xml
+++ b/sys-apps/memtest86/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-apps/memtester/ChangeLog b/sys-apps/memtester/ChangeLog
index d03ea97e910f..d2e8df1b3f3b 100644
--- a/sys-apps/memtester/ChangeLog
+++ b/sys-apps/memtester/ChangeLog
@@ -1,8 +1,41 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtester/ChangeLog,v 1.1 2002/11/07 16:20:06 gerk Exp $
+# ChangeLog for sys-apps/memtester
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtester/ChangeLog,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
-*memtest-2.93.1.ebuild (Nov 7, 2002)
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  memtester-4.0.3.ebuild:
+  Stable on sparc
+
+*memtester-4.0.5 (24 Aug 2005)
+
+  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +memtester-4.0.5.ebuild:
+  Version bump #103467 by Kalin KOZHUHAROV.
+
+  26 Jun 2005; Markus Rothe <corsair@gentoo.org> memtester-4.0.3.ebuild:
+  Added ~ppc64
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  memtester-4.0.3.ebuild:
+  Masked memtester-4.0.3.ebuild stable for ppc
+
+  12 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> memtester-4.0.3.ebuild:
+  needs src_compile for portage 2.0.50-r9 (bug #60123)
+
+*memtester-4.0.3 (11 Aug 2004)
+
+  11 Aug 2004; Mike Frysinger <vapier@gentoo.org> +memtester-4.0.3.ebuild:
+  Version bump #60055 by erkan kaplan.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> memtester-2.93.1.ebuild:
+  sync IUSE (missing)
+
+  13 May 2004; Josh Grebe <squash@gentoo.org> :
+  This memory testor works great on sparc
+
+  29 Mar 2004; Jon Portnoy <avenj@gentoo.org> memtester-2.93.1.ebuild :
+  x86 keywords.
+
+*memtester-2.93.1 (Nov 7 2002)
 
   07 Nov 2002, Mark Guertin <gerk@gentoo.org> memtest-2.93.1.ebuild :
   Added initial build, this works on ppc (there are no other mem testers
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index e69de29bb2d1..9e64be113ccf 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4e731afb260c60b98be024b02aa1b08f memtester-4.0.5.ebuild 810
+MD5 947a86c2241e68409f5f90e5cea91669 memtester-4.0.3.ebuild 813
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c461722e09f300a9d64e5a0920179816 memtester-2.93.1.ebuild 604
+MD5 b62472c4c96824ff784d18e44d973a10 ChangeLog 1454
+MD5 94a91140b48fbb8000a55240eb77c284 files/digest-memtester-4.0.5 66
+MD5 7ced0f46ff9b510c6a49801830223c4b files/digest-memtester-2.93.1 68
+MD5 786cf4e53b2d7e835b564e54f2d80e42 files/digest-memtester-4.0.3 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDDJPvKRy60XGEcJIRAhxeAJ9FqMopDNfNbb1bdnCSSK4cz4GWfwCfWkjn
+RpV8dwzJh/qgk4IYNksHQ4M=
+=/l2N
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/memtester/memtester-2.93.1.ebuild b/sys-apps/memtester/memtester-2.93.1.ebuild
index 20c15f84b5a7..526d44700de4 100644
--- a/sys-apps/memtester/memtester-2.93.1.ebuild
+++ b/sys-apps/memtester/memtester-2.93.1.ebuild
@@ -1,32 +1,24 @@
-# 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-apps/memtester/memtester-2.93.1.ebuild,v 1.1 2002/11/07 16:20:06 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtester/memtester-2.93.1.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 DESCRIPTION="Memory testing utility, ppc safe"
-
 HOMEPAGE="http://www.qcc.sk.ca/~charlesc/software/memtester/"
-
 SRC_URI="http://www.qcc.sk.ca/~charlesc/software/memtester/${P}.tar.bz2"
 
-LICENSE="GPL2"
-
+LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="ppc"
-
+KEYWORDS="~x86 ppc sparc"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${P}"
 
 src_compile() {
 	make || die
 }
 
 src_install() {
-#	make DESTDIR=${D} install || die
-	into /usr
 	dosbin memtest
+	doman memtest.1
+	dodoc CHANGELOG README.test ABOUT BUGS
 }
diff --git a/sys-apps/memtester/memtester-4.0.3.ebuild b/sys-apps/memtester/memtester-4.0.3.ebuild
index 54d9f34a491d..2a76d7ae5ab0 100644
--- a/sys-apps/memtester/memtester-4.0.3.ebuild
+++ b/sys-apps/memtester/memtester-4.0.3.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/sys-apps/memtester/memtester-4.0.3.ebuild,v 1.1 2004/08/12 03:38:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtester/memtester-4.0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
-inherit fixheadtails gcc
+inherit fixheadtails toolchain-funcs
 
-DESCRIPTION="Memory testing utility"
-HOMEPAGE="http://www.qcc.sk.ca/~charlesc/software/memtester/"
-SRC_URI="http://www.qcc.sk.ca/~charlesc/software/memtester/${P}.tar.gz"
+DESCRIPTION="userspace utility for testing the memory subsystem for faults"
+HOMEPAGE="http://pyropus.ca/software/memtester/"
+SRC_URI="http://pyropus.ca/software/memtester/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
@@ -18,12 +18,16 @@ DEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	echo "$(gcc-getCC) ${CFLAGS} -DPOSIX -c" > conf-cc
+	echo "$(tc-getCC) ${CFLAGS} -DPOSIX -c" > conf-cc
 	ht_fix_file Makefile
 }
 
+src_compile() {
+	emake || die "emake failed"
+}
+
 src_install() {
-	dosbin memtester || die
+	dosbin memtester || die "dosbin failed"
 	doman memtester.8
 	dodoc BUGS CHANGELOG README README.tests
 }
diff --git a/sys-apps/memtester/memtester-4.0.5.ebuild b/sys-apps/memtester/memtester-4.0.5.ebuild
index 47f405636fe5..4734c22dd4c5 100644
--- a/sys-apps/memtester/memtester-4.0.5.ebuild
+++ b/sys-apps/memtester/memtester-4.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-apps/memtester/memtester-4.0.5.ebuild,v 1.1 2005/08/24 01:34:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtester/memtester-4.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 inherit fixheadtails toolchain-funcs
 
diff --git a/sys-apps/memtester/metadata.xml b/sys-apps/memtester/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/memtester/metadata.xml
+++ b/sys-apps/memtester/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-apps/metadata.xml b/sys-apps/metadata.xml
index 354b69ed3aa2..436dfc68810b 100644
--- a/sys-apps/metadata.xml
+++ b/sys-apps/metadata.xml
@@ -6,5 +6,31 @@
 		some non-core system applications which have not yet been moved out into
 		other sys- categories.
 	</longdescription>
+	<longdescription lang="es">
+		La categoría sys-apps contiene varios paquetes esenciales del sistema, y
+		algunos paquetes no esenciales que aún no han sido movidos a otras
+		categorías sys-.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie sys-apps enthält sowohl Programme die Bestandteil des Basissystems sind,
+		als auch Applikationen die noch nicht in eine der anderen sys- Kategorien eingeordnet
+		wurden.
+	</longdescription>
+	<longdescription lang="ja">
+		sys-appsカテゴリには様々なコアシステムアプリケーションの他、まだ他のsys-カテゴリに
+		移動されていないシステムアプリケーションが含まれています。				
+	</longdescription>
+	<longdescription lang="nl">
+		De sys-apps categorie bevat kerenbestanddelen van het systeem, en bepaalde
+		niet-kern toepassingen die nog niet in andere categorien zijn geplaatst.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm sys-apps chứa các phần mềm hệ thống cốt lõi, và vài phần mềm
+		hệ thống không phải cốt lõi mà chưa được chuyển sang các nhóm sys- khác.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria sys-apps contiene vari pacchetti essenziali per il sistema, e alcuni pacchetti
+		non essenziali che non sono ancora stati spostati in altre categorie sys-.
+	</longdescription>
 </catmetadata>
 
diff --git a/sys-apps/microcode-ctl/ChangeLog b/sys-apps/microcode-ctl/ChangeLog
index 2efb95b0b043..2fbae449eeb9 100644
--- a/sys-apps/microcode-ctl/ChangeLog
+++ b/sys-apps/microcode-ctl/ChangeLog
@@ -1,8 +1,64 @@
 # ChangeLog for sys-apps/microcode-ctl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.1 2003/02/11 10:38:24 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/ChangeLog,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
-*microcode_ctl-1.06 (30 Apr 2002)
+*microcode-ctl-1.12 (15 Sep 2005)
+
+  15 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +microcode-ctl-1.12.ebuild:
+  Version bump.
+
+  09 Jan 2005; Scott W Taylor <swtaylor@gentoo.org>
+  microcode-ctl-1.11.ebuild:
+  etc/conf.d was not always being created
+
+*microcode-ctl-1.11 (14 Nov 2004)
+
+  14 Nov 2004; Mike Frysinger <vapier@gentoo.org> files/microcode_ctl.rc,
+  +microcode-ctl-1.11.ebuild:
+  Version bump and init.d update #70781 by Christian Skarby.
+
+*microcode-ctl-1.10 (30 Oct 2004)
+
+  30 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +microcode-ctl-1.10.ebuild:
+  Version bump #69360 by Christian Skarby.
+
+*microcode-ctl-1.09 (16 Oct 2004)
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +microcode-ctl-1.09.ebuild:
+  Version bump #67786 by Christian Skarby.
+
+*microcode-ctl-1.08 (31 Aug 2004)
+
+  31 Aug 2004; Mike Frysinger <vapier@gentoo.org> +files/microcode_ctl.conf.d,
+  +files/microcode_ctl.rc, +microcode-ctl-1.08.ebuild:
+  Version bump and init.d scripts #60396 by Michael Cramer.
+
+*microcode-ctl-1.07-r1 (05 Jun 2004)
+
+  05 Jun 2004; Daniel Black <dragonheart@gentoo.org>
+  +microcode-ctl-1.07-r1.ebuild:
+  Fixed to include udev support. Thanks to Jason Wallace
+  <jason_wallace@myrealbox.com> in bug #52982
+
+*microcode-ctl-1.07 (24 May 2004)
+
+  24 May 2004; Daniel Black <dragonheart@gentoo.org>
+  +microcode-ctl-1.07.ebuild, -microcode-ctl-1.06.ebuild,
+  microcode-ctl-1.06-r1.ebuild:
+  Version bump as per bug #51553. Thanks to ryszard <ryszardzonk@yahoo.com>
+  for the notification. QA IUSE fix in microcode-ctl-1.06-r1.ebuild
+
+*microcode-ctl-1.06-r1 (09 Apr 2004)
+
+  09 Apr 2004; Seemant Kulleen <seemant@gentoo.org>
+  microcode-ctl-1.06-r1.ebuild, microcode-ctl-1.06.ebuild:
+  patch to initscript to work with dual booting. Patch provided by: Paul Belt
+  <gaarde@yahoo.com> in bug #33309 by Priit Laes <amd@tt.ee>
+
+*microcode-ctl-1.06 (30 Apr 2002)
  
   11 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
   microcode-ctl-1.06.ebuild :
diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
index e69de29bb2d1..0263da9e2497 100644
--- a/sys-apps/microcode-ctl/Manifest
+++ b/sys-apps/microcode-ctl/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7a07fdb4e83ab7205be0bf0d180d3467 microcode-ctl-1.12.ebuild 1169
+MD5 46861b4fb632e925e1fee37c41c02ee7 microcode-ctl-1.11.ebuild 1186
+MD5 cac2e308eb60e19c1f18e7652af548b5 ChangeLog 2691
+MD5 e8b0bb1b0be1aef5fcb99663b9457b35 files/microcode_ctl.rc 618
+MD5 23438cd1b63d7190967405e42ad1a0f6 files/microcode_ctl.conf.d 267
+MD5 95e076b988c73349d2606d4ecd052a56 files/digest-microcode-ctl-1.11 70
+MD5 717fe335882b48bdae85f62c28883120 files/digest-microcode-ctl-1.12 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKMQjgIKl8Uu19MoRAicZAJ0Q0lrftzn0DTnuD80qLxG0I6wxEgCfeQnJ
+uo3qKlPOn1omyHLFKqDDjms=
+=mQjb
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
index 4bfbe2f40733..9ca8e519d1ec 100644
--- a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
@@ -1,5 +1,5 @@
-# Copyright 1999-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-apps/microcode-ctl/files/microcode_ctl.conf.d,v 1.1 2004/09/01 01:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.conf.d,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 MICROCODE_DEV="/dev/cpu/microcode"
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.rc b/sys-apps/microcode-ctl/files/microcode_ctl.rc
index cac4fc58b9ea..56679ebdf319 100644
--- a/sys-apps/microcode-ctl/files/microcode_ctl.rc
+++ b/sys-apps/microcode-ctl/files/microcode_ctl.rc
@@ -1,14 +1,18 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.rc,v 1.1 2004/09/01 01:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/files/microcode_ctl.rc,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 depend() {
 	need localmount
 }
 
 start() {
+	# Make sure the kernel supports the microcode device ...
+	# if it doesnt, try to modprobe the kernel module
+	grep -qo ' microcode$' /proc/misc || modprobe microcode >& /dev/null
+
 	ebegin "Updating microcode"
-	/usr/sbin/microcode_ctl -iqu -d ${MICROCODE_DEV}
+	/usr/sbin/microcode_ctl -qu -d ${MICROCODE_DEV}
 	eend $? "Failed to update microcode via '${MICROCODE_DEV}'"
 }
diff --git a/sys-apps/microcode-ctl/metadata.xml b/sys-apps/microcode-ctl/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/microcode-ctl/metadata.xml
+++ b/sys-apps/microcode-ctl/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-apps/microcode-ctl/microcode-ctl-1.11.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.11.ebuild
index 4109195ce570..36e2a731832d 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.11.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-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/sys-apps/microcode-ctl/microcode-ctl-1.11.ebuild,v 1.1 2004/11/14 06:47:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.11.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -36,6 +36,7 @@ src_install() {
 	newins intel-ia32microcode-*.txt microcode.dat
 
 	newinitd ${FILESDIR}/microcode_ctl.rc microcode_ctl
+	dodir /etc/conf.d
 	newconfd ${FILESDIR}/microcode_ctl.conf.d microcode_ctl
 }
 
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.12.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.12.ebuild
index a15c87c6902e..2b390cd423dd 100644
--- a/sys-apps/microcode-ctl/microcode-ctl-1.12.ebuild
+++ b/sys-apps/microcode-ctl/microcode-ctl-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.12.ebuild,v 1.1 2005/09/15 00:45:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-ctl/microcode-ctl-1.12.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/mii-diag/ChangeLog b/sys-apps/mii-diag/ChangeLog
index 9f2ea81df2be..f259fb8938d2 100644
--- a/sys-apps/mii-diag/ChangeLog
+++ b/sys-apps/mii-diag/ChangeLog
@@ -1,9 +1,38 @@
 # ChangeLog for sys-apps/mii-diag
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/ChangeLog,v 1.1 2002/11/23 13:31:17 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/ChangeLog,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
-*mii-diag-2.07 (23 Nov 2002)
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> mii-diag-2.09.ebuild:
+  Stable on sparc
+
+*mii-diag-2.11 (12 Jun 2005)
+
+  12 Jun 2005; Mike Frysinger <vapier@gentoo.org> +files/libmii.c-2.11,
+  +files/mii-diag.8-2.11, +files/mii-diag.c-2.11, +mii-diag-2.11.ebuild:
+  Version bump.
+
+  26 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  mii-diag-2.09.ebuild:
+  mark ~ppc
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> mii-diag-2.09.ebuild:
+  Tag as ~mips for my XXS1500.
 
-  23 Nov 2002; Aron Griffis <agriffis@gentoo.org> :
+  24 Dec 2004; Jason Wever <weeve@gentoo.org> mii-diag-2.09.ebuild:
+  Added ~sparc keyword.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mii-diag-2.07.ebuild,
+  mii-diag-2.09.ebuild:
+  Add inherit eutils
+
+*mii-diag-2.09 (19 Sep 2003)
+
+  19 Sep 2003; Aron Griffis <agriffis@gentoo.org> mii-diag-2.07.ebuild,
+  mii-diag-2.09.ebuild:
+  Fix building with gcc-3.3.1, mark stable on alpha, and add some error-checking
+  to the ebuild (bug 29165). Also add version 2.09.
+
+*mii-diag-2.07 (23 Nov 2002)
 
+  23 Nov 2002; Aron Griffis <agriffis@gentoo.org> mii-diag-2.07.ebuild:
   Initial import.
diff --git a/sys-apps/mii-diag/Manifest b/sys-apps/mii-diag/Manifest
index e69de29bb2d1..58df83ff7836 100644
--- a/sys-apps/mii-diag/Manifest
+++ b/sys-apps/mii-diag/Manifest
@@ -0,0 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 28962e2fc95a38c3f0f97433969ea57a mii-diag-2.09.ebuild 1209
+MD5 a216541da13a740c4bbee766fa36c5bd ChangeLog 1292
+MD5 ba5fc28572e78ee0093c9f3c58feeb6d mii-diag-2.07.ebuild 1135
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 2c39bcdd3229e9d01e64021a46e23bd3 mii-diag-2.11.ebuild 1241
+MD5 f7212561b55b42d8c453de375c1e622e files/mii-diag.8-2.11 5033
+MD5 8ccb64a469e4983fc52f168d15bf5ab9 files/mii-diag.c-2.09 20169
+MD5 0d54b1cf88229649250ec60887082af2 files/libmii.c-2.04 18026
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mii-diag-2.11 0
+MD5 a945e8d1734a3cbcf07890a874083937 files/libmii.c-2.11 21592
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mii-diag-2.07 0
+MD5 9609f9720d656e217df601ee3cb4771e files/libmii.c-2.10 21508
+MD5 ccd8d527a04534bdea2e0948e26e5a9e files/mii-diag.c-2.09-gcc33.patch 5037
+MD5 c830d0a359111de4b2a49a73bb909f55 files/mii-diag.c-2.07-gcc33.patch 3257
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mii-diag-2.09 0
+MD5 0d616641e571129e984ee0925e898ddd files/mii-diag.c-2.07 17835
+MD5 64a9a08dd016d02b6af3deef3277ad98 files/mii-diag.c-2.11 20252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDQ92oKRy60XGEcJIRAvRWAJ4jDKLM4DIPIB2kS8rydyI1IBZ2hQCgg4Zx
+5+ip0tszU+S3dFSy0ITWKyg=
+=uLce
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mii-diag/files/mii-diag.8-2.11 b/sys-apps/mii-diag/files/mii-diag.8-2.11
index 30f4d5934cf8..06867f4ffa08 100644
--- a/sys-apps/mii-diag/files/mii-diag.8-2.11
+++ b/sys-apps/mii-diag/files/mii-diag.8-2.11
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" $Revision: 1.1 $ $Date: 2005/06/12 20:34:36 $
+.\" $Revision: 1.1.1.1 $ $Date: 2005/11/30 09:56:10 $
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
diff --git a/sys-apps/mii-diag/metadata.xml b/sys-apps/mii-diag/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/mii-diag/metadata.xml
+++ b/sys-apps/mii-diag/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-apps/mii-diag/mii-diag-2.07.ebuild b/sys-apps/mii-diag/mii-diag-2.07.ebuild
index 32b80849f0e4..7b2a64b86ea8 100644
--- a/sys-apps/mii-diag/mii-diag-2.07.ebuild
+++ b/sys-apps/mii-diag/mii-diag-2.07.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/sys-apps/mii-diag/mii-diag-2.07.ebuild,v 1.1 2002/11/23 13:31:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.07.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 MIIVER=${PV}
 LIBVER=2.04
@@ -9,28 +11,32 @@ DESCRIPTION="MII link status report and diagnostics"
 HOMEPAGE="http://www.scyld.com/diag/"
 # Files below are small and unversioned so I put them in the files dir
 # with version suffixes.
-SRC_URI="" # ftp://ftp.scyld.com/pub/diag/mii-diag.c
-           # ftp://ftp.scyld.com/pub/diag/libmii.c
+SRC_URI=""	# ftp://ftp.scyld.com/pub/diag/mii-diag.c
+			# ftp://ftp.scyld.com/pub/diag/libmii.c
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="alpha amd64 x86"
 IUSE=""
+
 DEPEND=""
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir -p ${S}
-	cp ${FILESDIR}/mii-diag.c-${MIIVER} ${S}/mii-diag.c
-	cp ${FILESDIR}/libmii.c-${LIBVER} ${S}/libmii.c
+	cp ${FILESDIR}/mii-diag.c-${MIIVER} mii-diag.c || die "mii-diag.c"
+	cp ${FILESDIR}/libmii.c-${LIBVER} libmii.c || die "libmii.c"
+	epatch ${FILESDIR}/mii-diag.c-${PV}-gcc33.patch
 }
 
 src_compile() {
 	# Don't change -O below, it is a requirement for building these
 	# programs.  See http://www.scyld.com/diag/#compiling
-	${CC-gcc} -O -c libmii.c
-	${CC-gcc} -O -DLIBMII mii-diag.c libmii.o -o mii-diag
+	$(tc-getCC) -O -c libmii.c || die
+	$(tc-getCC) -O -DLIBMII mii-diag.c libmii.o -o mii-diag || die
 }
 
 src_install() {
 	into /
-	dosbin mii-diag
+	dosbin mii-diag || die
 }
diff --git a/sys-apps/mii-diag/mii-diag-2.09.ebuild b/sys-apps/mii-diag/mii-diag-2.09.ebuild
index 0461ed723b63..3eaaf4784695 100644
--- a/sys-apps/mii-diag/mii-diag-2.09.ebuild
+++ b/sys-apps/mii-diag/mii-diag-2.09.ebuild
@@ -1,37 +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/sys-apps/mii-diag/mii-diag-2.09.ebuild,v 1.1 2003/09/20 03:24:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.09.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 MIIVER=${PV}
 LIBVER=2.10
 
 DESCRIPTION="MII link status report and diagnostics"
-HOMEPAGE="http://www.scyld.com/diag/"
+HOMEPAGE="http://www.scyld.com/ethercard_diag.html"
 # Files below are small and unversioned so I put them in the files dir
 # with version suffixes.
 SRC_URI=""	# ftp://ftp.scyld.com/pub/diag/mii-diag.c
 			# ftp://ftp.scyld.com/pub/diag/libmii.c
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha"
+KEYWORDS="alpha amd64 ~mips ~ppc sparc x86"
 IUSE=""
+
 DEPEND=""
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir -p ${S} || die
-	cd ${S} || die
-	cp ${FILESDIR}/mii-diag.c-${MIIVER} mii-diag.c || die
-	cp ${FILESDIR}/libmii.c-${LIBVER} libmii.c     || die
-	epatch ${FILESDIR}/mii-diag.c-2.09-gcc33.patch # epatch contains die
+	cp "${FILESDIR}"/mii-diag.c-${MIIVER} mii-diag.c || die "mii-diag.c"
+	cp "${FILESDIR}"/libmii.c-${LIBVER} libmii.c || die "libmii.c"
+	epatch "${FILESDIR}"/mii-diag.c-${PV}-gcc33.patch
 }
 
 src_compile() {
 	# Don't change -O below, it is a requirement for building these
-	# programs.  See http://www.scyld.com/diag/#compiling
-	${CC-gcc} -O -c libmii.c || die
-	${CC-gcc} -O -DLIBMII mii-diag.c libmii.o -o mii-diag || die
+	# programs.  See http://www.scyld.com/ethercard_diag.html#compiling
+	$(tc-getCC) -O ${LDFLAGS} -c libmii.c || die
+	$(tc-getCC) -O ${LDFLAGS} -DLIBMII mii-diag.c libmii.o -o mii-diag || die
 }
 
 src_install() {
-	into /; dosbin mii-diag || die
+	into /
+	dosbin mii-diag || die
 }
diff --git a/sys-apps/mii-diag/mii-diag-2.11.ebuild b/sys-apps/mii-diag/mii-diag-2.11.ebuild
index 475ff34743f4..beb6f5854243 100644
--- a/sys-apps/mii-diag/mii-diag-2.11.ebuild
+++ b/sys-apps/mii-diag/mii-diag-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.11.ebuild,v 1.1 2005/06/12 20:34:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mii-diag/mii-diag-2.11.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/mindi-kernel/ChangeLog b/sys-apps/mindi-kernel/ChangeLog
index 5b9c1395b351..d27c28617561 100644
--- a/sys-apps/mindi-kernel/ChangeLog
+++ b/sys-apps/mindi-kernel/ChangeLog
@@ -1,4 +1,24 @@
-# ChangeLog for sys-apps/mindi
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi-kernel/ChangeLog,v 1.1 2003/07/10 14:26:14 johnm Exp $
+# ChangeLog for sys-apps/mindi-kernel
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi-kernel/ChangeLog,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> mindi-kernel-1.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*mindi-kernel-1.0-r1 (12 Aug 2004)
+
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> mindi-kernel-1.0-r1.ebuild:
+  Fixed up ebuild to not install spec file and the depend issue on mindi.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> mindi-kernel-1.0.ebuild:
+  sync IUSE (missing)
+
+  01 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> mindi-kernel-1.0.ebuild:
+  Removing amd64 keyword since this package depends on a package that depends on
+  a package that won't work on amd64.
+
+*mindi-kernel-1.0 (10 Jul 2003)
+
+  10 Jul 2003; John Mylchreest <johnm@gentoo.org>;
+  Fixing missing files - oops
 
diff --git a/sys-apps/mindi-kernel/Manifest b/sys-apps/mindi-kernel/Manifest
index 7aa6ddf1ef4e..95bf117a7ae8 100644
--- a/sys-apps/mindi-kernel/Manifest
+++ b/sys-apps/mindi-kernel/Manifest
@@ -1,2 +1,16 @@
-MD5 15765ff80a572ee2d8655587e26c1da7 mindi-kernel-1.0.ebuild 611
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02a6dc57a111d77ba1bf3a508d94cc98 mindi-kernel-1.0.ebuild 616
+MD5 231f8d191199ae8d61ac2022a99b2b57 ChangeLog 941
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 9ed05c2e557e47b6b138ce49b391d54b mindi-kernel-1.0-r1.ebuild 623
+MD5 7207a622f730721a218a5432c9fa015b files/digest-mindi-kernel-1.0-r1 66
 MD5 7207a622f730721a218a5432c9fa015b files/digest-mindi-kernel-1.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCe4X+I1lqEGTUzyQRAmdaAKC2cFS8IVi0wI0iijBorAF2WdCuBACfe90G
+NU91gcvgFldAV6zTUSZVDs8=
+=UxhO
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mindi-kernel/metadata.xml b/sys-apps/mindi-kernel/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/mindi-kernel/metadata.xml
+++ b/sys-apps/mindi-kernel/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-apps/mindi-kernel/mindi-kernel-1.0-r1.ebuild b/sys-apps/mindi-kernel/mindi-kernel-1.0-r1.ebuild
index 5e6da111a198..9800305e85c5 100644
--- a/sys-apps/mindi-kernel/mindi-kernel-1.0-r1.ebuild
+++ b/sys-apps/mindi-kernel/mindi-kernel-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi-kernel/mindi-kernel-1.0-r1.ebuild,v 1.1 2004/08/12 21:28:10 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi-kernel/mindi-kernel-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 DESCRIPTION="Mindi-kernel is a library of kernel modules, a kernel, and other bits and bobs
 used by Mindi."
diff --git a/sys-apps/mindi-kernel/mindi-kernel-1.0.ebuild b/sys-apps/mindi-kernel/mindi-kernel-1.0.ebuild
index 520129564c77..9cabb500171a 100644
--- a/sys-apps/mindi-kernel/mindi-kernel-1.0.ebuild
+++ b/sys-apps/mindi-kernel/mindi-kernel-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/sys-apps/mindi-kernel/mindi-kernel-1.0.ebuild,v 1.1 2003/07/03 16:21:02 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi-kernel/mindi-kernel-1.0.ebuild,v 1.1.1.1 2005/11/30 09:57:01 chriswhite Exp $
 
 DESCRIPTION="Mindi-kernel provides a basic kernel image for a mindi created bootdisk"
 HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
@@ -8,10 +8,11 @@ SRC_URI="http://www.microwerks.net/~hugo/download/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="x86"
+IUSE=""
 RESTRICT="nouserpriv"
 
-RDEPEND=">=sys-apps/mindi-0.85*"
+RDEPEND=">=sys-apps/mindi-0.85"
 
 src_install() {
 	dodir /usr/share/mindi
diff --git a/sys-apps/mindi/ChangeLog b/sys-apps/mindi/ChangeLog
index d87bd469193c..79d29bd08f1c 100644
--- a/sys-apps/mindi/ChangeLog
+++ b/sys-apps/mindi/ChangeLog
@@ -1,6 +1,88 @@
 # ChangeLog for sys-apps/mindi
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/ChangeLog,v 1.1 2002/07/23 22:09:52 lostlogic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/ChangeLog,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> mindi-0.85.ebuild,
+  mindi-0.86.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*mindi-1.04 (22 Jan 2005)
+
+  22 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> +mindi-1.04.ebuild:
+  version bump of stable 1.0 branch
+
+*mindi-1.11 (22 Jan 2005)
+
+  22 Jan 2005; Wolfram Schlich <wschlich@gentoo.org> metadata.xml,
+  +mindi-1.11.ebuild:
+  version bump, update metadata.xml
+
+  12 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> mindi-1.03.ebuild,
+  mindi-1.10.ebuild:
+  Add depend for sys-fs/dosfstools to ebuilds closing bug #63466
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> mindi-0.86.ebuild:
+  Removed duplicate RESTRICT="nouserpriv" and call dodir only once.
+
+  15 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> mindi-1.10.ebuild:
+  Fixing a digest change for mindi-1.10...
+
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> mindi-1.03.ebuild:
+  Fix sweet little digest and file change for mindi-1.03.tgz.
+
+*mindi-1.10 (12 Aug 2004)
+
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> mindi-1.10.ebuild:
+  Version bump. This is package masked for testing.
+
+*mindi-1.03 (12 Aug 2004)
+
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> mindi-1.03.ebuild:
+  Version bump.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> mindi-0.85.ebuild,
+  mindi-0.86.ebuild:
+  sync IUSE (missing)
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mindi-0.86.ebuild:
+  Add inherit eutils
+
+  16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> mindi-0.67.ebuild,
+  mindi-0.81.ebuild, mindi-0.85.ebuild, mindi-0.86.ebuild:
+  changed depends from app-admin/dosfstools to sys-fs/dosfstools, and cleared
+  out some crusty ebuilds
+
+*mindi-0.86 (02 Sep 2003)
+
+  02 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> mindi-0.86.ebuild:
+  Security update.
+
+*mindi-0.85 (19 Jun 2003)
+
+  19 Jun 2003; John Mylchreest <johnm@gentoo.org> mindi-0.85.ebuild:
+  Bumping version
+
+*mindi-0.81 (17 Jan 2003)
+
+  17 Jan 2003; Brandon Low <lostlogic@gentoo.org> mindi-0.81.ebuild:
+  Bump to latest version.  Still unstable.
+
+  Changes: Mindi now functions more reliably than before for 
+  Debian, **Gentoo**, SuSE, and LFS users.
+
+*mindi-0.80 (14 Jan 2003)
+
+  14 Jan 2003; Brandon Low <lostlogic@gentoo.org> mindi-0.80.ebuild:
+  Update thanks to François-Xavier LAMARE <flx-linuxnews@ifrance.com>
+
+*mindi-0.67 (22 Oct 2002)
+
+  22 Oct 2002; Brandon Low <lostlogic@gentoo.org> mindi-0.67.ebuild:
+
+  Thanks to Andreas Kotowicz <koto@mynetix.de> for this update.
 
 *mindi-0.65 (23 Jul 2002)
 
diff --git a/sys-apps/mindi/Manifest b/sys-apps/mindi/Manifest
index e69de29bb2d1..59fcc81eeaab 100644
--- a/sys-apps/mindi/Manifest
+++ b/sys-apps/mindi/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4fb46540a7a805964281d781d5f0e264 mindi-0.85.ebuild 1216
+MD5 8274689e97bfa4036fd060385cc5ea1f mindi-1.11.ebuild 1844
+MD5 b5e3b488f3cafd186b096b7cd6a8e062 mindi-1.03.ebuild 1849
+MD5 86563d1b856e4666e9862c161b72c0ee mindi-1.10.ebuild 1849
+MD5 06272711593cc37d3bc05ae9f36c3eb7 mindi-0.86.ebuild 1358
+MD5 23e323bb771ee5438043d9855c1b6971 mindi-1.04.ebuild 1844
+MD5 5f07d7fd9cce91c8327e107e1bc7053c metadata.xml 441
+MD5 f5eb07f448c9e499daf56098b6ce8c44 ChangeLog 2976
+MD5 101bf89d7e394be6e50d2a42e756c594 files/digest-mindi-1.04 60
+MD5 a5b7000ca1c0b7c87e463f30963c0e48 files/digest-mindi-1.03 60
+MD5 1816016d2e374827fd0d6fb41fb9361c files/digest-mindi-0.86 59
+MD5 ee1e232f194b4562844a4eac0f91ab49 files/mindi-0.86-security.patch 7683
+MD5 fd82ae181560d7bf2024411068a01567 files/digest-mindi-1.11 60
+MD5 07d70f05ae5cd1b6dff05569a349803c files/digest-mindi-0.85 59
+MD5 8a29bf61bb5419e5f158300cff4c1c5e files/digest-mindi-1.10 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK2ReLLFUmVNQ7rkRAm2nAKCENLkcrJhu2MUSXxLqQbHfKM+pdACfQM0s
+lhOKaEdYc/FV05GDJFjNMwM=
+=CwT3
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mindi/files/digest-mindi-1.03 b/sys-apps/mindi/files/digest-mindi-1.03
index 886bbea77401..330b16c5ddf9 100644
--- a/sys-apps/mindi/files/digest-mindi-1.03
+++ b/sys-apps/mindi/files/digest-mindi-1.03
@@ -1 +1 @@
-MD5 dbff63505af2d7a385ba1f2900f8b2a5 mindi-1.03.tgz 2130833
+MD5 bcb7bbf7c28edaedc8bb3e08a5a9bba6 mindi-1.03.tgz 2130855
diff --git a/sys-apps/mindi/files/digest-mindi-1.10 b/sys-apps/mindi/files/digest-mindi-1.10
index 2e31f1ea653c..3c54920ff5fc 100644
--- a/sys-apps/mindi/files/digest-mindi-1.10
+++ b/sys-apps/mindi/files/digest-mindi-1.10
@@ -1 +1 @@
-MD5 029769bf8721cebe708f8d88d6b89cf1 mindi-1.10.tgz 2130907
+MD5 d6233b9f6d0384ce33e4652452ae6220 mindi-1.10.tgz 2130516
diff --git a/sys-apps/mindi/metadata.xml b/sys-apps/mindi/metadata.xml
index f093d416cbb1..e35a262bfb9d 100644
--- a/sys-apps/mindi/metadata.xml
+++ b/sys-apps/mindi/metadata.xml
@@ -1,7 +1,15 @@
- * 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>
+<maintainer>
+	<email>pfeifer@gentoo.org</email>
+	<name>Jay Pfeifer</name>
+	<description>Primary maintainer</description>
+</maintainer>
+<maintainer>
+	<email>wschlich@gentoo.org</email>
+	<name>Wolfram Schlich</name>
+	<description>Secondary maintainer</description>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mindi/mindi-0.85.ebuild b/sys-apps/mindi/mindi-0.85.ebuild
index 73338e82e43c..d71569d0e411 100644
--- a/sys-apps/mindi/mindi-0.85.ebuild
+++ b/sys-apps/mindi/mindi-0.85.ebuild
@@ -1,22 +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/sys-apps/mindi/mindi-0.85.ebuild,v 1.1 2003/06/19 08:28:46 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.85.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
 HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
 SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
+RESTRICT="nouserpriv"
+
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
+RESTRICT="nouserpriv"
 
-DEPEND=">=sys-apps/bzip2-1.0.1
+DEPEND=">=app-arch/bzip2-1.0.1
 		>=app-cdr/cdrtools-1.11
 		>=sys-libs/ncurses-5
 		>=sys-devel/binutils-2
-		>=sys-apps/syslinux-1.7
-		>=sys-apps/lilo-22
-		>=app-admin/dosfstools-2.8"
+		>=sys-boot/syslinux-1.7
+		>=sys-boot/lilo-22
+		>=sys-fs/dosfstools-2.8
+		>=sys-apps/mindi-kernel-1"
 
 src_unpack() {
 	for i in ${FEATURES} ; do
@@ -33,7 +38,6 @@ src_unpack() {
 	unpack ${A}
 }
 
-
 src_install() {
 	dodir /usr/share/mindi
 	dodir /usr/sbin
diff --git a/sys-apps/mindi/mindi-0.86.ebuild b/sys-apps/mindi/mindi-0.86.ebuild
index 35d467dc9d2e..a1e1b7a3c131 100644
--- a/sys-apps/mindi/mindi-0.86.ebuild
+++ b/sys-apps/mindi/mindi-0.86.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/sys-apps/mindi/mindi-0.86.ebuild,v 1.1 2003/09/02 10:12:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-0.86.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Mindi builds boot/root disk images using your existing kernel, modules, tools and libraries"
 HOMEPAGE="http://www.microwerks.net/~hugo/mindi/"
 SRC_URI="http://www.microwerks.net/~hugo/download/stable/final/${P}.tgz"
-RESTRICT="nouserpriv"
-
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="x86"
+IUSE=""
 RESTRICT="nouserpriv"
 
-DEPEND=">=sys-apps/bzip2-1.0.1
+DEPEND=">=app-arch/bzip2-1.0.1
 		>=app-cdr/cdrtools-1.11
 		>=sys-libs/ncurses-5
 		>=sys-devel/binutils-2
-		>=sys-apps/syslinux-1.7
-		>=sys-apps/lilo-22
-		>=app-admin/dosfstools-2.8
-		>=sys-apps/mindi-kernel-1*"
-		
+		>=sys-boot/syslinux-1.7
+		>=sys-boot/lilo-22
+		>=sys-fs/dosfstools-2.8
+		>=sys-apps/mindi-kernel-1"
+
 src_unpack() {
 	for i in ${FEATURES} ; do
 		if [ "${i}" = "userpriv" ] ; then
@@ -39,8 +40,7 @@ src_unpack() {
 }
 
 src_install() {
-	dodir /usr/share/mindi
-	dodir /usr/sbin
+	dodir /usr/share/mindi /usr/sbin
 	cp * --parents -rdf ${D}/usr/share/mindi/
 	rm ${D}/usr/share/mindi/{CHANGES,INSTALL,LICENSE,README,TODO}
 	dodoc CHANGES INSTALL LICENSE README TODO
diff --git a/sys-apps/mindi/mindi-1.03.ebuild b/sys-apps/mindi/mindi-1.03.ebuild
index d9d33e3615f4..563ef9a71fbd 100644
--- a/sys-apps/mindi/mindi-1.03.ebuild
+++ b/sys-apps/mindi/mindi-1.03.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.03.ebuild,v 1.1 2004/08/12 21:30:21 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.03.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
-RESTRICT="nouserpriv"
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
 HOMEPAGE="http://www.mondorescue.org/"
 SRC_URI="http://www.microwerks.net/~hugo/download/MondoCD/TGZS/${P}.tgz"
@@ -12,28 +11,15 @@ SLOT="0"
 KEYWORDS="~x86 -*"
 IUSE=""
 
-DEPEND=""
+DEPEND="virtual/libc"
 RDEPEND=">=app-arch/bzip2-0.9
 		>=sys-apps/mindi-kernel-1.0-r1
 		app-cdr/cdrtools
 		sys-libs/ncurses
 		sys-devel/binutils
+		sys-fs/dosfstools
 		sys-apps/gawk"
 
-pkg_setup () {
-	for i in ${FEATURES} ; do
-		if [ "${i}" = "userpriv" ] ; then
-			echo
-			ewarn "mindi cannot be installed if userpriv"
-			ewarn "is set within FEATURES."
-			ewarn "Please emerge mindi as follows:"
-			echo
-			ewarn "# FEATURES=\"-userpriv\" emerge mindi"
-			die "userpriv failure"
-		fi
-	done
-}
-
 src_unpack() {
 	unpack ${A} || die "Failed to unpack ${A}"
 	cd ${S}/rootfs || die
@@ -52,9 +38,11 @@ src_install() {
 	doexe analyze-my-lvm mindi parted2fdisk.pl
 
 	dosym /usr/share/mindi/mindi /usr/sbin/
+	dosym /usr/share/mindi/analyze-my-lvm /usr/sbin/
+	dosym /usr/share/mindi/parted2fdisk.pl /usr/sbin/
 
 	insinto /usr/share/mindi
-	doins deplist.txt isolinux-H.cfg isolinux.cfg \
+	doins deplist.txt dev.tgz isolinux-H.cfg isolinux.cfg \
 	msg-txt sys-disk.raw.gz syslinux-H.cfg syslinux.cfg
 
 	cp -a Mindi/ aux-tools/ rootfs/ ${D}/usr/share/mindi/
diff --git a/sys-apps/mindi/mindi-1.04.ebuild b/sys-apps/mindi/mindi-1.04.ebuild
index b30a77f1204d..312036f946b1 100644
--- a/sys-apps/mindi/mindi-1.04.ebuild
+++ b/sys-apps/mindi/mindi-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/sys-apps/mindi/mindi-1.04.ebuild,v 1.1 2005/01/22 10:29:25 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.04.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
 HOMEPAGE="http://www.mondorescue.org/"
diff --git a/sys-apps/mindi/mindi-1.10.ebuild b/sys-apps/mindi/mindi-1.10.ebuild
index eb301f4b8504..7987535a54f5 100644
--- a/sys-apps/mindi/mindi-1.10.ebuild
+++ b/sys-apps/mindi/mindi-1.10.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.10.ebuild,v 1.1 2004/08/12 21:30:21 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.10.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
-RESTRICT="nouserpriv"
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
 HOMEPAGE="http://www.mondorescue.org/"
 SRC_URI="http://www.microwerks.net/~hugo/download/MondoCD/TGZS/${P}.tgz"
@@ -12,28 +11,15 @@ SLOT="0"
 KEYWORDS="~x86 -*"
 IUSE=""
 
-DEPEND=""
+DEPEND="virtual/libc"
 RDEPEND=">=app-arch/bzip2-0.9
 		>=sys-apps/mindi-kernel-1.0-r1
 		app-cdr/cdrtools
 		sys-libs/ncurses
 		sys-devel/binutils
+		sys-fs/dosfstools
 		sys-apps/gawk"
 
-pkg_setup () {
-	for i in ${FEATURES} ; do
-		if [ "${i}" = "userpriv" ] ; then
-			echo
-			ewarn "mindi cannot be installed if userpriv"
-			ewarn "is set within FEATURES."
-			ewarn "Please emerge mindi as follows:"
-			echo
-			ewarn "# FEATURES=\"-userpriv\" emerge mindi"
-			die "userpriv failure"
-		fi
-	done
-}
-
 src_unpack() {
 	unpack ${A} || die "Failed to unpack ${A}"
 	cd ${S}/rootfs || die
@@ -52,9 +38,11 @@ src_install() {
 	doexe analyze-my-lvm mindi parted2fdisk.pl
 
 	dosym /usr/share/mindi/mindi /usr/sbin/
+	dosym /usr/share/mindi/analyze-my-lvm /usr/sbin/
+	dosym /usr/share/mindi/parted2fdisk.pl /usr/sbin/
 
 	insinto /usr/share/mindi
-	doins deplist.txt isolinux-H.cfg isolinux.cfg \
+	doins deplist.txt dev.tgz isolinux-H.cfg isolinux.cfg \
 	msg-txt sys-disk.raw.gz syslinux-H.cfg syslinux.cfg
 
 	cp -a Mindi/ aux-tools/ rootfs/ ${D}/usr/share/mindi/
diff --git a/sys-apps/mindi/mindi-1.11.ebuild b/sys-apps/mindi/mindi-1.11.ebuild
index 415c3eac5604..46b81f16e1c4 100644
--- a/sys-apps/mindi/mindi-1.11.ebuild
+++ b/sys-apps/mindi/mindi-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-apps/mindi/mindi-1.11.ebuild,v 1.1 2005/01/22 10:24:42 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mindi/mindi-1.11.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."
 HOMEPAGE="http://www.mondorescue.org/"
diff --git a/sys-apps/minised/ChangeLog b/sys-apps/minised/ChangeLog
index 555e4a4833bf..b94bcbf85d4b 100644
--- a/sys-apps/minised/ChangeLog
+++ b/sys-apps/minised/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/minised
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/minised/ChangeLog,v 1.1 2005/07/14 04:43:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/minised/ChangeLog,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
+
+  14 Jul 2005; David Holm <dholm@gentoo.org> minised-1.5.ebuild:
+  Added to ~ppc.
 
 *minised-1.5 (12 Jul 2005)
 
diff --git a/sys-apps/minised/Manifest b/sys-apps/minised/Manifest
index b8177d164305..14a417307bca 100644
--- a/sys-apps/minised/Manifest
+++ b/sys-apps/minised/Manifest
@@ -1,2 +1,4 @@
-MD5 2b7db7fc1bcb06153f1c3d813e974872 minised-1.5.ebuild 431
+MD5 9f86015074f9a78ff31ffda136cbe21c ChangeLog 410
+MD5 1f985367b3c825f79bf2828b6b2e354a metadata.xml 186
+MD5 a0b00570893e395d1cc64e8d38aa88e5 minised-1.5.ebuild 555
 MD5 f88d8b9b4197fc6400fcb7c8c7b2b098 files/digest-minised-1.5 58
diff --git a/sys-apps/minised/minised-1.5.ebuild b/sys-apps/minised/minised-1.5.ebuild
index 0539efb5cc79..6d62c04bf9b6 100644
--- a/sys-apps/minised/minised-1.5.ebuild
+++ b/sys-apps/minised/minised-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/sys-apps/minised/minised-1.5.ebuild,v 1.1 2005/07/14 04:43:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/minised/minised-1.5.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
 DESCRIPTION="a smaller, cheaper, faster SED implementation"
 HOMEPAGE="http://www.exactcode.de/oss/minised/"
@@ -8,7 +8,7 @@ SRC_URI="http://dl.exactcode.de/oss/minised/sed-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/minutils/ChangeLog b/sys-apps/minutils/ChangeLog
index bbcf6d271c5c..63ca5a532bbb 100644
--- a/sys-apps/minutils/ChangeLog
+++ b/sys-apps/minutils/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for sys-apps/minutils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/minutils/ChangeLog,v 1.1 2003/08/25 20:39:06 stuart Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/minutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
 *minutils-0.16 (25 Aug 2003)
 
-  25 Aug 2003; root <root@gentoo.org> minutils-0.16.ebuild:
+  25 Aug 2003; stuart <stuart@gentoo.org> minutils-0.16.ebuild:
   Initial import
 
diff --git a/sys-apps/minutils/Manifest b/sys-apps/minutils/Manifest
index b147616be949..9959dda411e0 100644
--- a/sys-apps/minutils/Manifest
+++ b/sys-apps/minutils/Manifest
@@ -1,2 +1,4 @@
-MD5 04389ca899a71d151327a361aad0e4df minutils-0.16.ebuild 479
+MD5 92a39ecaf21cf62bab25b776b617e74a minutils-0.16.ebuild 628
+MD5 f17b31765ca06a31a84964a93fba521e ChangeLog 321
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b194decf1fa65761784980a24bf299f3 files/digest-minutils-0.16 63
diff --git a/sys-apps/minutils/metadata.xml b/sys-apps/minutils/metadata.xml
index 7d54177d2d49..96a2d586367d 100644
--- a/sys-apps/minutils/metadata.xml
+++ b/sys-apps/minutils/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>stuart@gentoo.org</email>
-  <name>Stuart Herbert</name>
-  <description>Maintainer</description>
-</maintainer>
-<longdescription>minutils provides small versions of freeramdisk, halt, swapoff, swapon, mount, pivotroot, poweroff and reboot - suitable for embedded systems or install CDs</longdescription>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/minutils/minutils-0.16.ebuild b/sys-apps/minutils/minutils-0.16.ebuild
index 188a571a3522..c209ffc513ef 100644
--- a/sys-apps/minutils/minutils-0.16.ebuild
+++ b/sys-apps/minutils/minutils-0.16.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/sys-apps/minutils/minutils-0.16.ebuild,v 1.1 2003/08/25 20:39:06 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/minutils/minutils-0.16.ebuild,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
 DESCRIPTION="additional tools for embedded systems"
 HOMEPAGE="http://www.skarnet.org/software/minutils/"
diff --git a/sys-apps/miscfiles/ChangeLog b/sys-apps/miscfiles/ChangeLog
index bea3eeca1908..2cf1e1be0bdc 100644
--- a/sys-apps/miscfiles/ChangeLog
+++ b/sys-apps/miscfiles/ChangeLog
@@ -1,9 +1,80 @@
 # ChangeLog for sys-apps/miscfiles
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  29 May 2005; <solar@gentoo.org> miscfiles-1.3-r1.ebuild:
+  - update sys-apps/miscfiles to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+*miscfiles-1.4.2 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> +miscfiles-1.4.2.ebuild:
+  Version bump.
+
+  22 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> miscfiles-1.3-r1.ebuild:
+  libc is NOT needed, come on people, this only installs textfiles...
+
+  21 Jun 2004; <solar@gentoo.org> miscfiles-1.2-r1.ebuild,
+  miscfiles-1.3-r1.ebuild, miscfiles-1.3.ebuild:
+  clean unneeded things in a native-uclibc envionment. Added dep of gzip and
+  glibc
+
+  27 Jun 2003; Seemant Kulleen <seemant@gentoo.org> miscfiles-1.3-r2.ebuild:
+  masking -- this screws up ispell in general
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> miscfiles-1.3-r2.ebuild:
+  Mark stable on alpha
+
+*miscfiles-1.3-r2 (13 Jun 2003)
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> miscfiles-1.3-r2.ebuild:
+  Changed ~sparc & ~mips to sparc & mips in KEYWORDS
+
+  13 Jun 2003; Seemant Kulleen <seemant@gentoo.org> miscfiles-1.3-r2.ebuild:
+  prevent installing /usr/share/dict/words as ispell's english dictionary
+  becomes a hybrid of British and American. Closes bug #8992 by Arkadiusz
+  Mucha <arkmch@priv4.onet.pl>
+
+*miscfiles-1.3-r1 (08 Mar 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> miscfiles-1.3-r1.ebuild :
+  Marked stable on hppa.
+
+  08 Mar 2003; Seemant Kulleen <seemant@gentoo.org> miscfiles-1.3-r1.ebuild,
+  files/miscfiles-1.3-Makefile.diff:
+  Added extra dict words. Thanks to a patch by anko1894@uosis.mif.vu.lt in bug
+  #17087
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> miscfiles-1.3.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> miscfiles-1.3.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*miscfiles-1.3 (17 Jul 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  08 Aug 2002; Seemant Kulleen <seemant@gentoo.org> miscfiles-1.3.ebuild :
+
+  FHS compliance.
+
+  17 Jul 2002; Seemant Kulleen <seemant@gentoo.org> miscfiles-1.3.ebuild
+  files/digest-miscfiles-1.3 :
+
+  Version bump.
 
 *miscfiles-1.2-r1 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> miscfiles-1.2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> miscfiles-1.2-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index e69de29bb2d1..6cbf3ac60e45 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a61e00d65653ddebe5a27e4f5f0968e6 miscfiles-1.3-r1.ebuild 1068
+MD5 9570b538ef5286d41b40d9caa41ba84c miscfiles-1.4.2.ebuild 942
+MD5 0a4ff42c9bab57ff09afb9c913cd0a99 ChangeLog 3074
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 cc5af235da130a9164ae2f57983988ad files/digest-miscfiles-1.4.2 68
+MD5 ec9de3db6293b9d8525a93a994a31c65 files/miscfiles-1.3-Makefile.diff 637
+MD5 9ca20c5ad8736bbbf7c38e651604a913 files/tasks.info.diff 317
+MD5 f4085cc5ea37dfbbe329ec7e3784cc9d files/digest-miscfiles-1.3-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpp9e54WFLgrx1GWAQIpWQP+JvnuFrw3PcAGTFq3BkbbAKmRNiw2/+96
+steEV7Hk0vAjAFLLpHWEuHnp9M843Gahs+Q6U9s54XYbIqUrr/IMiyAf0dzGFIGM
+K99xV16oLd/Rw7H/hkP2lunEKDHizO9HGGt30Pjgt4eEfsuV1tWZFivztTI5CGhK
+g4vGGirKCS4=
+=5NJF
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/miscfiles/metadata.xml b/sys-apps/miscfiles/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/miscfiles/metadata.xml
+++ b/sys-apps/miscfiles/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-apps/miscfiles/miscfiles-1.3-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
index 5c9f10853d8e..104b180746ff 100644
--- a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.1 2003/03/09 05:36:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit eutils
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Miscellaneous files"
-SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="elibc_uclibc? ( app-arch/gzip )"
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -25,4 +26,19 @@ src_unpack() {
 src_install() {
 	einstall || die
 	dodoc GNU* NEWS ORIGIN README dict-README
+
+	if use elibc_uclibc ; then
+		cd ${D}/usr/share/dict
+		# need to remove the hardlinks, else gzip won't work
+		rm -f words extra.words README
+		gzip -9 *
+		ln -s web2.gz words
+		ln -s web2a.gz extra.words
+		cd ..
+		# which app uses these?
+		rm -rf misc state rfc
+		#rm -f misc/GNU-manifesto
+		#gzip -9 misc/* state/* rfc/*
+		cd ${S}
+	fi
 }
diff --git a/sys-apps/miscfiles/miscfiles-1.4.2.ebuild b/sys-apps/miscfiles/miscfiles-1.4.2.ebuild
index 31ac13424fe1..10fa92ce0f3f 100644
--- a/sys-apps/miscfiles/miscfiles-1.4.2.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.4.2.ebuild,v 1.1 2005/01/12 18:34:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.4.2.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/miscfiles/${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 ppc64 s390 sh sparc x86"
 IUSE="minimal"
 
 DEPEND=""
diff --git a/sys-apps/mkinitrd/ChangeLog b/sys-apps/mkinitrd/ChangeLog
index 0e49aa7913c8..1eb1ff7b4367 100644
--- a/sys-apps/mkinitrd/ChangeLog
+++ b/sys-apps/mkinitrd/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for sys-apps/mkinitrd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.1 2003/08/07 19:59:33 pebenito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
+
+  29 Aug 2005; Mike Frysinger <vapier@gentoo.org> mkinitrd-3.5.7-r3.ebuild,
+  mkinitrd-4.2.0.3.ebuild:
+  Punt USE=diet.
+
+*mkinitrd-4.2.0.3 (12 Feb 2005)
+
+  12 Feb 2005; Mike Frysinger <vapier@gentoo.org> +mkinitrd-4.2.0.3.ebuild:
+  Version bump.
+
+  23 Oct 2004; Aron Griffis <agriffis@gentoo.org> mkinitrd-3.5.7-r2.ebuild,
+  mkinitrd-3.5.7-r3.ebuild:
+  add alpha/ia64 keywords
+
+*mkinitrd-3.5.7-r3 (10 Oct 2004)
+
+  10 Oct 2004; <solar@gentoo.org> +files/mkinitrd-3.5.7-dietssp.patch,
+  +mkinitrd-3.5.7-r3.ebuild:
+  added additional local diet and __guard functions support for mkinitrd. bug
+  35138
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  mkinitrd-3.5.7-r2.ebuild:
+  Masked mkinitrd-3.5.7-r2.ebuild stable for ppc
+
+  20 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> mkinitrd-3.5.7-r2.ebuild:
+  Marked ~amd64.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> mkinitrd-3.5.7.ebuild:
+  Add inherit eutils
+
+*mkinitrd-3.5.7-r2 (31 Oct 2003)
+
+  25 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  dietlibc support seems to be broken so remove it for now #35138.
+
+  31 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r2.ebuild,
+  files/mkinitrd-lvm_statics.diff:
+  Change vgwrapper to static vgscan and vgchange to fix #29694. Using modified
+  patch from Sascha Silbe.
+
+  27 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r1.ebuild,
+  mkinitrd-3.5.7.ebuild:
+  Add linux-headers dependancy to close #31580.
+
+*mkinitrd-3.5.7-r1 (18 Oct 2003)
+
+  18 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7-r1.ebuild:
+  Add fix for coreutils changed tail -1 behavior.
+
+  15 Oct 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7.ebuild:
+  Fix SELinux circular dependancy
+
+  06 Oct 2003; Chris PeBenito <pebenito@gentoo.org> metadata.xml,
+  mkinitrd-3.5.7.ebuild:
+  Mark stable.
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+  07 Aug 2003; Chris PeBenito <pebenito@gentoo.org> mkinitrd-3.5.7.ebuild:
+  Add missing selinux? RDEP
 
 *mkinitrd-3.5.7 (07 Aug 2003)
 
diff --git a/sys-apps/mkinitrd/Manifest b/sys-apps/mkinitrd/Manifest
index 5b46b60f572f..aa26bf235d86 100644
--- a/sys-apps/mkinitrd/Manifest
+++ b/sys-apps/mkinitrd/Manifest
@@ -1,3 +1,21 @@
-MD5 59a8578dfc3ae372e9300bc1dd9cba20 mkinitrd-3.5.7.ebuild 920
-MD5 1a8259233cb009f44a8fe20a8aa828b5 files/digest-mkinitrd-3.5.7 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a0e11176b73cb67f8e565b125ef9a09e mkinitrd-3.5.7-r3.ebuild 1327
+MD5 e1f6d4bd96a8f8b27044e085e77d81d7 mkinitrd-4.2.0.3.ebuild 1104
+MD5 b0dc2e3e804bc6d2cb25e8db5a3259dc ChangeLog 2381
+MD5 9d5706af9849d7f7187d50f3d8075b78 mkinitrd-3.5.7-r2.ebuild 1204
+MD5 d4dd490a2ad812af2c9eb5a285439c0a files/mkinitrd-3.5.7-dietssp.patch 8035
 MD5 0bc4fe62070fcfc54254d0e8c636ef32 files/mkinitrd-selinux.diff 1007
+MD5 1a8259233cb009f44a8fe20a8aa828b5 files/digest-mkinitrd-3.5.7-r3 66
+MD5 9a5d79902ad7c395cb10b251d0c1e4f2 files/digest-mkinitrd-4.2.0.3 68
+MD5 4e09d06fedbff01e9e17219e50873694 files/mkinitrd-lvm_statics.diff 591
+MD5 1a8259233cb009f44a8fe20a8aa828b5 files/digest-mkinitrd-3.5.7-r2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEmt3gIKl8Uu19MoRAtPXAJ9m9w6nnW7wI3m5P0eCQXJIydRHPgCePTYX
+m3Z7d1Exo/xA4AZlAHO6gak=
+=47fE
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch b/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch
index f2a0e5b1a31d..f5ff37020f96 100644
--- a/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch
+++ b/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch
@@ -107,7 +107,7 @@ diff -Nrup mkinitrd-3.5.7.orig/nash/ssp.c mkinitrd-3.5.7/nash/ssp.c
 @@ -0,0 +1,168 @@
 +/*
 + * Distributed under the terms of the GNU General Public License v2
-+ * $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch,v 1.1 2004/10/10 22:44:47 solar Exp $
++ * $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/files/mkinitrd-3.5.7-dietssp.patch,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 + *
 + * This is a modified version of Hiroaki Etoh's stack smashing routines
 + * implemented for glibc.
diff --git a/sys-apps/mkinitrd/metadata.xml b/sys-apps/mkinitrd/metadata.xml
index 76105013afc6..96a2d586367d 100644
--- a/sys-apps/mkinitrd/metadata.xml
+++ b/sys-apps/mkinitrd/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>pebenito@gentoo.org</email>
-	<name>Chris PeBenito</name>
-	<description>SELinux patch maintainer</description>
-</maintainer>
-<longdescription>Mkinitrd creates initial ramdisks for use when the kernel first loads.</longdescription>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild b/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild
index ab0177049874..c179540b0a14 100644
--- a/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild
+++ b/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild
@@ -1,29 +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/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild,v 1.1 2003/11/01 04:46:06 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-3.5.7-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
-IUSE="selinux"
+inherit eutils
 
 DESCRIPTION="Tools for creating initrd images"
 HOMEPAGE="http://www.redhat.com"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc ~amd64 alpha ia64"
+IUSE="selinux"
 
 DEPEND="dev-libs/popt
-	>=sys-kernel/linux-headers-2.4.19-r1
+	virtual/os-headers
 	x86? ( dev-libs/dietlibc )"
-
 RDEPEND="app-shells/bash"
-
 PDEPEND="selinux? ( sys-apps/policycoreutils )"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
 
 	# Fix for coreutils tail behavior
diff --git a/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild b/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild
index 8bf1c20ec14b..ea56c301df50 100644
--- a/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild
+++ b/sys-apps/mkinitrd/mkinitrd-3.5.7-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/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild,v 1.1 2004/10/10 22:44:47 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-3.5.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,12 +10,11 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="diet selinux"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64"
+IUSE="selinux"
 
 DEPEND="dev-libs/popt
-	virtual/os-headers
-	x86? ( diet? ( dev-libs/dietlibc ) )"
+	virtual/os-headers"
 RDEPEND="app-shells/bash"
 PDEPEND="selinux? ( sys-apps/policycoreutils )"
 
@@ -36,7 +35,7 @@ src_unpack() {
 	use selinux && epatch ${FILESDIR}/mkinitrd-selinux.diff
 
 	# we don't always need diet support.
-	use diet || sed -i -e s/'=diet '/=/g ${S}/nash/Makefile
+	sed -i -e s/'=diet '/=/g ${S}/nash/Makefile
 }
 
 src_compile() {
diff --git a/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild b/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild
index 7a3c8a7dae6a..8ff9bae828f9 100644
--- a/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild
+++ b/sys-apps/mkinitrd/mkinitrd-4.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-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild,v 1.1 2005/02/12 05:54:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkinitrd/mkinitrd-4.2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,11 +11,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="diet selinux"
+IUSE="selinux"
 
 DEPEND="dev-libs/popt
-	virtual/os-headers
-	diet? ( dev-libs/dietlibc )"
+	virtual/os-headers"
 RDEPEND="app-shells/bash"
 PDEPEND="selinux? ( sys-apps/policycoreutils )"
 
@@ -31,8 +30,6 @@ src_unpack() {
 }
 
 src_compile() {
-	use diet && append-flags -DUSE_DIET
-
 	cd "${S}"/nash
 	emake || die "nash compile failed."
 	cd "${S}"/grubby
diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 508736392096..472df8c042eb 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,452 @@
 # ChangeLog for sys-apps/module-init-tools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.1 2002/12/11 00:47:06 lostlogic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  module-init-tools-3.1-r1.ebuild:
+  Mark 3.1-r1 stable on alpha
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org>
+  module-init-tools-3.1-r1.ebuild:
+  Stable on ppc64
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  module-init-tools-3.1-r1.ebuild:
+  stable on ia64
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-no-nested-function.patch:
+  Fix by the PaX guys to remove executable stack markings.
+
+  26 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.2_pre7-r1.ebuild:
+  Disable tests since they clear our the results of src_compile().
+
+  17 Jul 2005; MATSUU Takuto <matsuu@gentoo.org>
+  module-init-tools-3.0-r2.ebuild:
+  Stable on sh.
+
+  15 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-3.2_pre7-r1.ebuild:
+  Add manpage back.
+
+*module-init-tools-3.2_pre7-r1 (15 Jul 2005)
+
+  15 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch,
+  module-init-tools-3.0-r2.ebuild, module-init-tools-3.1-r1.ebuild,
+  +module-init-tools-3.2_pre7-r1.ebuild:
+  Abort generate-modprobe.conf if modprobe fails, bug #68689.
+
+*module-init-tools-3.2_pre7 (27 Jun 2005)
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +module-init-tools-3.2_pre7.ebuild:
+  Bump to 3.2-pre7
+
+  12 May 2005; <solar@gentoo.org> module-init-tools-3.2_pre4.ebuild:
+  - fix typo in patch, only 3.1 exists.. add die statements around file i/o
+  statements to keep this bug from happening again
+
+*module-init-tools-3.2_pre4 (11 May 2005)
+
+  11 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  +module-init-tools-3.2_pre4.ebuild:
+  Add -pre version that support loading of all aliases - maybe that will urge
+  gregkh in getting hotplug-ng in/ready for the tree 8)
+
+*module-init-tools-3.1-r1 (20 Mar 2005)
+
+  20 Mar 2005; <solar@gentoo.org> module-init-tools-3.0-r2.ebuild,
+  +module-init-tools-3.1-r1.ebuild:
+  - Our zlib.so is in /lib vs /usr/lib so it should be safe for us to link with
+  just -lz - By not linking with -Wl,-Bstatic -lz -Wl,-Bsynamic we save a few
+  bytes on the final linked elf executable binary sizes. This also fixes text
+  relocations that were showing up in this package.
+
+  18 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/modutils-2.4.27-gcc4.patch, module-init-tools-3.1.ebuild:
+  GCC 4 compatability update; closes bug #80588
+
+  16 Feb 2005; <solar@gentoo.org> module-init-tools-3.1.ebuild:
+  - filtering pic is no longer needed
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.0-r2.ebuild, module-init-tools-3.1.ebuild:
+  Remove USE=no-old-linux until modules-update can be updated to use 2.6 depmod.
+
+  23 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-gcc34.patch, module-init-tools-3.0-r2.ebuild,
+  module-init-tools-3.1.ebuild:
+  Add patch to fix gcc-3.4.x building #74538 by splite.
+
+  07 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-PATH_MAX.patch, module-init-tools-3.1.ebuild:
+  PATH_MAX can be found in sys/param.h.
+
+  22 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/3.1-modprobe.d.5.bz2, module-init-tools-3.1.ebuild:
+  Make sure we dont try to regen manpages.
+
+*module-init-tools-3.1 (22 Nov 2004)
+
+  22 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch,
+  +module-init-tools-3.1.ebuild:
+  version bump - bug #71958.
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.0-r2.ebuild:
+  Allow users to compile without old modutils via USE=no-old-linux #43671 by
+  Christophe Saout.
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.0-r2.ebuild:
+  Fix the ksyms links #35601.
+
+  02 Sep 2004; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.0-r1.ebuild, module-init-tools-3.0-r2.ebuild,
+  module-init-tools-3.0.ebuild:
+  Start blocking modutils.
+
+  04 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  module-init-tools-3.0-r2.ebuild:
+  Stable everywhere since baselayout-1.9.4 depends on it
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> module-init-tools-3.0-r2.ebuild:
+  stable on amd64
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> module-init-tools-3.0.ebuild:
+  Marked stable on mips.
+
+*module-init-tools-3.0-r2 (07 May 2004)
+
+  07 May 2004; Aron Griffis <agriffis@gentoo.org>
+  +module-init-tools-3.0-r2.ebuild:
+  Add patch to allow --assume-kernel option to generate-modprobe.conf for bug
+  49926
+
+*module-init-tools-3.0-r1 (03 May 2004)
+
+  03 May 2004; Jon Portnoy <avenj@gentoo.org> module-init-tools-3.0-r1.ebuild :
+  Install static insmod for 2.4 kernels. Fix from Sascha Silbe in bug
+  #45279.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  module-init-tools-0.9.15_pre4.ebuild, module-init-tools-3.0.ebuild,
+  module-init-tools-3.0_pre10.ebuild, module-init-tools-3.0_pre5.ebuild,
+  module-init-tools-3.0_pre9.ebuild:
+  Add die following econf for bug 48950
+
+  23 Apr 2004; Guy Martin <gmsoft@gentoo.org> module-init-tools-3.0.ebuild:
+  Added a guess fix for modutils on hppa.
+
+  23 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  module-init-tools-3.0.ebuild:
+  Stable on sparc (blame me), x86, amd64, ppc64 (blame johnm)
+
+*module-init-tools-3.0 (29 Mar 2004)
+
+  29 Mar 2004; Jon Portnoy <avenj@gentoo.org>
+  module-init-tools-3.0.ebuild :
+  Version bump. Bug 43087.
+
+  29 Mar 2004; Jon Portnoy <avenj@gentoo.org> 
+  module-init-tools-3.0_pre10.ebuild, 
+  module-init-tools-3.0_pre9.ebuild,
+  module-init-tools-3.0_pre4.ebuild, 
+  module-init-tools-0.9.15_pre4.ebuild :
+  Update ebuilds to use automake 1.6, fixes bug 37743.
+  Marked 3.0_pre10 stable on AMD64.
+
+*module-init-tools-3.0_pre10 (19 Feb 2004)
+
+  19 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-3.0_pre10.ebuild:
+  Update version.
+
+*module-init-tools-3.0_pre9 (02 Feb 2004)
+
+  02 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-3.0_pre9.ebuild,
+  files/module-init-tools-3.0_pre9-properly-handle-alias_off.patch:
+  Update version.  Handle cases where generate-modprobe.conf do not detect an
+  alias set to 'off' due to trailing space.
+
+  01 Feb 2004; Joshua Kinard <kumba@gentoo.org>
+  module-init-tools-0.9.15_pre4.ebuild:
+  Bump to mips stable (needed for upcoming stageballs)
+
+*module-init-tools-3.0_pre8 (30 Jan 2004)
+                                                                                                                             
+  30 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-3.0_pre8.ebuild:
+  Update version, fixing bug #39397.
+
+*module-init-tools-3.0_pre7 (26 Jan 2004)
+  
+  26 Jan 2004; Leandro Dorileo <dorileo@gentoo.org>
+  module-init-tools-3.0_pre7.ebuild:
+  Update version.
+
+*module-init-tools-3.0_pre6 (25 Jan 2004)
+
+  25 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-3.0_pre6.ebuild:
+  Update version.
+
+  15 Jan 2004; <agriffis@gentoo.org> module-init-tools-0.9.15_pre4.ebuild:
+  stable on ia64
+
+  07 Jan 2004; Jon Portnoy <avenj@gentoo.org> 
+  module-init-tools-0.9.15_pre4.ebuild :
+  Some emergency keywording.
+
+*module-init-tools-3.0_pre5 (07 Jan 2004)
+
+  07 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-3.0_pre5.ebuild:
+  Update version.  Fix copyright of all ebuilds.
+
+  17 Dec 2003; Guy Martin <gmsoft@gentoo.org>
+  module-init-tools-0.9.15_pre4.ebuild:
+  Marked stable on hppa.
+
+  14 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  module-init-tools-0.9.15_pre4.ebuild:
+  mark stable on amd64
+
+*module-init-tools-0.9.15_pre4 (09 Dec 2003)
+
+  09 Dec 2003; <plasmaroo@gentoo.org> module-init-tools-0.9.15_pre4.ebuild:
+  Version bumped to -pre4, closes bug #35396.
+
+  26 Nov 2003; Brad House <brad_mssw@gentoo.org>
+  module-init-tools-0.9.15_pre3.ebuild:
+  Marked stable on 'amd64'.
+
+*module-init-tools-0.9.15_pre3 (02 Nov 2003)
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.15_pre3.ebuild:
+  Update version.  Update modutils to 2.4.26.  Enable zlib for module-init-tools.
+
+*module-init-tools-0.9.15_pre2 (18 Oct 2003)
+
+  20 Oct 2003; Joshua Kinard <kumba@gentoo.org>
+  module-init-tools-0.9.15_pre2.ebuild:
+  Added gnuconfig support for 'mips64'.
+
+  18 Oct 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.15_pre2.ebuild:
+  Update version.
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> :
+  filter-flags -fPIC will introduce -yet_exec for hardened-gcc
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org>
+  module-init-tools-0.9.12-r1.ebuild, module-init-tools-0.9.13_pre2.ebuild:
+  added hardened-gcc hppa behaviour
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org>
+  module-init-tools-0.9.15_pre1.ebuild :
+  ia64 keywords.
+
+*module-init-tools-0.9.15_pre1 (17 Sep 2003)
+
+  23 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.12-r1.ebuild, module-init-tools-0.9.13_pre2.ebuild,
+  module-init-tools-0.9.14.ebuild, module-init-tools-0.9.15_pre1.ebuild:
+  Update SRC_URI to hangle older tarballs moved to old/, bug #29315.
+
+  17 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.15_pre1.ebuild,
+  files/module-init-tools-0.9.15-legacy-modext-support.patch:
+  New version.  Add support for legacy modules (.o). bug #28831.
+
+*module-init-tools-0.9.14 (15 Sep 2003)
+
+  15 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.14.ebuild,
+  files/module-init-tools-0.9.14-be-quiet-for-devfsd.patch:
+  New version.  Update patch to quiet output when called from devfsd
+
+  06 Sep 2003; Alexander Gabert <pappy@gentoo.org>
+  module-init-tools-0.9.12-r1.ebuild, module-init-tools-0.9.13_pre2.ebuild:
+  added hardened-gcc exclude flags
+
+  10 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.12-r1.ebuild:
+  Bump to stable on x86.
+
+*module-init-tools-0.9.13_pre2 (10 Aug 2003)
+
+  10 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.13_pre2.ebuild,
+  files/module-init-tools-0.9.13-quiet-on-devfsd-probe-aliases.patch,
+  files/module-init-tools-0.9.7-export-gpl.patch:
+  New version. Add export-gpl.patch from MDK. Cleanup the
+  be-quiet-for-devfsd.patch and rename to quiet-on-devfsd-probe-aliases.patch.
+
+*module-init-tools-0.9.12-r1 (12 Jul 2003)
+
+  03 Aug 2003; Joshua Kinard <kumba@gentoo.org> module-init-tools-0.9.12-r1.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  12 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  module-init-tools-0.9.12-r1.ebuild,
+  files/module-init-tools-0.9.12-includes-should-override.patch:
+  Module options/aliases already accuired, should be replaced by
+  newer if they are aquired from a file 'included' after the original
+  options/aliases ...
+
+*module-init-tools-0.9.12 (02 Jun 2003)
+
+  02 Jun 2003; Martin Schlemmer <azarah@gentoo.org> Manifest,
+  module-init-tools-0.9.12.ebuild:
+  New version.
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org>
+  module-init-tools-0.9.10-r3.ebuild, module-init-tools-0.9.10-r4.ebuild,
+  module-init-tools-0.9.10-r5.ebuild, module-init-tools-0.9.11-r1.ebuild,
+  module-init-tools-0.9.11-r2.ebuild, module-init-tools-0.9.11-r3.ebuild,
+  module-init-tools-0.9.11.ebuild, module-init-tools-0.9.11a.ebuild,
+  module-init-tools-0.9.9.ebuild:
+  now uses mirror://kernel
+
+*module-init-tools-0.9.11a (26 Apr 2003)
+
+  26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.11a.ebuild :
+  Version update.
+
+*module-init-tools-0.9.11-r3 (21 Apr 2003)
+
+  21 Apr 2003; Daniel Robbins <drobbins@gentoo.org>: removed pkg_setup "check
+  for kernel" vestige, closing bug #19183.
+  
+  21 Apr 2003; Daniel Robbins <drobbins@gentoo.org> two fixes: first, include a
+  modinfo.old for 2.4 modinfo compatibility. Second, add a /bin/lsmod.old
+  symlink to allow a normal user to list loaded modules rather than return a
+  "lsmod.old" not found error. These symlinks can be confusing, but it appears
+  to be working well now.
+
+*module-init-tools-0.9.11-r2 (30 Mar 2003)
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.11-r2.ebuild :
+  The moving of /sbin/lsmod to /bin, causes some breakage, so install a compat
+  symlink.
+
+*module-init-tools-0.9.11-r1 (30 Mar 2003)
+
+  30 Mar 2003; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.11-r1.ebuild :
+  Update modutils to 2.4.25
+
+*module-init-tools-0.9.11 (30 Mar 2003)
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.11.ebuild :
+  Update version.  Really get the ${P}-be-quiet-for-devfsd.patch to be
+  effective.  Move manpages for insmod, modprobe, etc to <name>.old.8 so that
+  they are still available.
+
+*module-init-tools-0.9.10-r5 (24 Mar 2003)
+
+  24 Mar 2003; Daniel Robbins <drobbins@gentoo.org>: new rev to include a 
+  PROVIDE="virtual/module-tools" and an unmasking for x86. Bumped modutils
+  to 2.4.24.
+
+  15 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-be-quiet-for-devfsd.patch :
+  Tweak slightly to be more effective on recursive calls.
+
+*module-init-tools-0.9.10-r4 (15 March 2003)
+
+  15 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-r4 :
+  - Fix modprobe to handle calls from devfsd more like modprobe from modutils ...
+    it basically do not output and do not fail for invalid modules if:
+    1) It was called with '-C /etc/modprobe.devfs'
+    2) The module starts with '/dev'
+  - Redo the /sbin/modprobe.conf stuff to not build both modutils-2.4.22 and
+	2.4.21.
+
+*module-init-tools-0.9.10-r3 (10 March 2003)
+
+  10 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-r3 :
+  Fix recursive calls to modprobe not honoring -s, -q, -v and -C.  Use older
+  modprobe that we install as modprobe.conf when calling generate-modprobe.conf,
+  as the newer modprobe (2.4.22 and later) generate /etc/modprobe.conf with
+  invalid modules ...  Fix modprobe to _only_ log to syslog if -s was given.
+
+*module-init-tools-0.9.10-r2 (09 March 2003)
+
+  09 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-r2 :
+  Fix -s when modprobe calls itself recursive.  Do the same for -v and -C.  Also
+  let commandline override env variables.
+
+*module-init-tools-0.9.10-r1 (02 March 2003)
+
+  06 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-r1 :
+  Add pkg_setup() to check for a valid kernel, bug #15568.
+
+  02 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-r1 :
+  Fix '-q' to be really quiet.  Patch generate-modprobe.conf to create sub
+  install commands with 'modprobe -q'.
+
+*module-init-tools-0.9.10 (27 Feb 2003)
+
+  27 Feb 2003; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.10 :
+  Bump, and drop a patch that is now merged mainline
+
+*module-init-tools-0.9.9 (01 Feb 2003)
+
+  18 Feb Feb 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.9 :
+  Hack modprobe to look at /etc/modprobe.devfs rather than /etc/modules.devfs
+  ... this is to support a later modules-update that should generate this and
+  fix the lot of errors/warnings during devfs/hotplug startup.
+
+  09 Feb 2003; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.9 :
+  Make not die if the user doesn't have a modules.conf file already...
+
+  01 Feb 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.9 :
+  New version.
+
+*module-init-tools-0.9.9_pre1 (17 Jan 2003)
+
+  17 Jan 2003; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.9_pre1.ebuild;
+  Filter -fPIC from flags.  It breaks.
+
+  17 Jan 2003; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.9_pre1.ebuild;
+  Update to latest version needed for >=development-sources-2.5.59.
+
+*module-init-tools-0.9.7 (28 Dec 2002)
+
+  28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.7 :
+
+  Fix generate-modprobe.conf not adding the last ';' to commands in braces,
+  causing modprobe to fail do to its calling 'sh -c ...' failing ...
+
+  28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.7 :
+  New version.  Also generate-modprobe.conf not accepting 2 parameters, it
+  replaced the modules.conf2modprobe.conf tool.
+
+*module-init-tools-0.9.5 (19 Dec 2002)
+
+  19 Dec 2002; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.5 :
+  Bump.
+
+*module-init-tools-0.9.4 (19 Dec 2002)
+
+  19 Dec 2002; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.4 :
+  Changes as submitted by Tony Murray <murrant@bvu.edu>:
+  added modules.conf2modprobe.conf tool
+  made warning after emerge visible
+  added IUSE
+  fixed spacing
+
+*module-init-tools-0.9.3 (11 Dec 2002)
+
+  11 Dec 2002; Brandon Low <lostlogic@gentoo.org> module-init-tools-0.9.3 :
+  Updated to version 0.9.3
+  Removed extra keyword.
+  Update thanks again to Tony Murray <murrant@bvu.edu>.
 
 *module-init-tools-0.9.1 (10 Dec 2002)
 
@@ -8,3 +454,5 @@
   New unstable package for managing modules in 2.5 series kernels.  A
   bit complicated as it does overwrite the modutils system package,
   we'll need to take another look at this before 2.6 comes out.
+
+  This ebuild is thanks to Tony Murray <murrant@bvu.edu> for this :)
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index cb962545171f..9825d4e22911 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,24 +1,19 @@
-MD5 9d643bff1158c72d579d4f6a4a56c4b6 module-init-tools-0.9.11.ebuild 4339
-MD5 25d7258103285ce3b904f1d082fdc180 module-init-tools-0.9.11-r1.ebuild 4345
-MD5 90f26820c148dbdbbc5d0fb680abb72a module-init-tools-0.9.10-r4.ebuild 6915
-MD5 979470443b5b58099df35707accf02b5 module-init-tools-0.9.11-r3.ebuild 4739
-MD5 9510ec2b9e28197673e8506721ae152a module-init-tools-0.9.9.ebuild 3543
-MD5 3d0f6ffdd9f8e37af0d5837192edfba4 module-init-tools-0.9.10-r3.ebuild 5881
-MD5 f6cb30ffe6cd682250bf4e04e1f61b3b ChangeLog 5708
-MD5 9a8de615c2fbfbbd0780685307faf093 module-init-tools-0.9.11-r2.ebuild 4402
-MD5 057ef6cb48a6f56dc81d09052b71af40 module-init-tools-0.9.10-r5.ebuild 4743
-MD5 37092cae20ec7562f89aea0205bda5c0 files/module-init-tools-0.9.10-use-modprobe_conf.patch 431
-MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
-MD5 390b29c0fb86f31f1c290de3448f1ea3 files/digest-module-init-tools-0.9.9 143
-MD5 3bdd37447e200b986159c090991bd6be files/module-init-tools-0.9.10-no-stdout-on-log.patch 787
-MD5 45ebc93263c86224eb12c3f2c71d9275 files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch 4208
-MD5 9dc24220b1e193887a65b75aa066c5c0 files/module-init-tools-0.9.9-devfs-hack.patch 597
-MD5 28295a2b93ba19ae91062a0078c078f6 files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch 3327
-MD5 35dcc4aa984b7d408549db9141f8de53 files/digest-module-init-tools-0.9.11 144
-MD5 4df8ab0d7f4afe4d13b11732b8eb5508 files/module-init-tools-0.9.10-fix-recursion.patch 1986
-MD5 e20f41be805ddc7b8a6b74d52683a170 files/digest-module-init-tools-0.9.10-r3 212
-MD5 e20f41be805ddc7b8a6b74d52683a170 files/digest-module-init-tools-0.9.10-r4 212
-MD5 cef78844d070f59100d7f47b62ecf5d8 files/digest-module-init-tools-0.9.10-r5 144
-MD5 f507e70d4eca484c4fa0eb2750db617a files/digest-module-init-tools-0.9.11-r1 883
-MD5 8fa0146b2762a25ceb1784a898ff3bc8 files/digest-module-init-tools-0.9.11-r2 144
-MD5 8fa0146b2762a25ceb1784a898ff3bc8 files/digest-module-init-tools-0.9.11-r3 144
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a1bd63bad6a702a8e1a6c19097318595 module-init-tools-3.2_pre7.ebuild 5472
+MD5 3c8ec7a124886ded8ae47b7f6f33ec2c ChangeLog 17248
+MD5 3e2546d3dcec80540a104faf7767b449 module-init-tools-3.0-r2.ebuild 5628
+MD5 2876dc74934f041152f6010a0c724beb module-init-tools-3.1-r1.ebuild 5578
+MD5 5f3650d3eb5b8c088397c6cb623c8127 module-init-tools-3.2_pre7-r1.ebuild 5871
+MD5 0562a7a338175d0b6100ef7958b0ef5e files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
+MD5 27a62130de1c51fc678efc0e9ad67ddd files/modutils-2.4.27-flex.patch 805
+MD5 4f6eb067ab56884adab12c53346dc793 files/modutils-2.4.27-no-nested-function.patch 1422
+MD5 95f5372a9e15db429a6db167289d7d6e files/digest-module-init-tools-3.2_pre7-r1 147
+MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
+MD5 95f5372a9e15db429a6db167289d7d6e files/digest-module-init-tools-3.2_pre7 147
+MD5 34f20e2837caff74cef9cca766e1e0c4 files/3.1-modprobe.d.5.bz2 2288
+MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1-r1 142
+MD5 d179298a960a2576683689fe19818c8b files/generate-modprobe-assume-kernel.patch 3767
+MD5 5428d53f18b5fac287741b23634d84dc files/modutils-2.4.27-alias.patch 2246
+MD5 29011f0616cd17a10a27839141238a98 files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425
+MD5 8ecc5aa24faa96fe32a15688f3e023ac files/modutils-2.4.27-gcc.patch 6963
+MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r2 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r2
index 43cd7b6234e9..52675e0906cd 100644
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r2
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r2
@@ -1,2 +1,2 @@
 MD5 f8bfc480c4168978eca7037cd341da07 module-init-tools-3.0.tar.bz2 120768
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
+MD5 bac989c74ed10f3bf86177fc5b4b89b6 modutils-2.4.27.tar.bz2 234963
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch b/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch
index af89c4d29a66..2d4c48e491c0 100644
--- a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch
+++ b/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch
@@ -1,3 +1,5 @@
+Abort generate-modprobe.conf if modprobe fails, bug #68689.
+
 --- module-init-tools-3.2-pre7/generate-modprobe.conf	2005-07-15 11:21:54.000000000 +0200
 +++ module-init-tools-3.2-pre7.az/generate-modprobe.conf	2005-07-15 11:24:33.000000000 +0200
 @@ -35,22 +35,28 @@
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch
index df92d51753fe..1fefffb62f85 100644
--- a/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch
+++ b/sys-apps/module-init-tools/files/modutils-2.4.27-alias.patch
@@ -36,28 +36,6 @@ Update misc alias cruft.
  	"char-major-10-200 tun",	/* Universal TUN/TAP device driver */
  	"char-major-10-250 hci_vhci",
  
-@@ -153,6 +162,21 @@
- 	"char-major-206 osst",  /* OnStream SCSI tape */
- 	"char-major-216 rfcomm",
- 
-+        /* agpgart like 2.6 */
-+	"ali-agp agpgart",
-+	"ati-agp agpgart",
-+	"amd-k7-agp agpgart",
-+	"amd64-agp agpgart",
-+	"alpha-agp agpgart",
-+	"hp-agp agpgart",
-+	"i460-agp agpgart",
-+	"intel-agp agpgart",
-+	"nvidia-agp agpgart",
-+	"sis-agp agpgart",
-+	"sworks-agp agpgart",
-+	"uninorth-agp agpgart",
-+	"via-agp agpgart",
-+
- 	"dos msdos",
- 	"dummy0 dummy",
- 	"dummy1 dummy",
 @@ -179,6 +203,11 @@
  	/* next two from <dairiki@matthews.dairiki.org>  Thanks! */
  	"net-pf-17 af_packet",
diff --git a/sys-apps/module-init-tools/metadata.xml b/sys-apps/module-init-tools/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/module-init-tools/metadata.xml
+++ b/sys-apps/module-init-tools/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-apps/module-init-tools/module-init-tools-3.0-r2.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
index 70393ec19012..557518693b6e 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
@@ -1,28 +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/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.1 2004/05/07 22:00:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
 
 inherit flag-o-matic eutils gnuconfig
 
 MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
-MODUTILS_PV="2.4.26"
+MODUTILS_PV="2.4.27"
 DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
 	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
+#	!no-old-linux? ( mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2 )"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ~arm ~ppc64 ~hppa ~s390"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+#IUSE="no-old-linux"
 
-DEPEND="virtual/glibc
-	sys-libs/zlib"
-
+DEPEND="sys-libs/zlib
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
@@ -36,8 +37,12 @@ src_unpack() {
 	# together.
 	#
 	# <drobbins@gentoo.org> (26 Mar 2003)
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
+#	if ! use no-old-linux ; then
+		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
+		epatch "${FILESDIR}"/modutils-2.4.27-alias.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
+#	fi
 
 	# Support legacy .o modules
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
@@ -48,94 +53,97 @@ src_unpack() {
 	# the same flag to modules-update.
 	cd ${S}; epatch ${FILESDIR}/generate-modprobe-assume-kernel.patch
 
+	# Abort if we fail to run modprobe, bug #68689
+	cd ${S}; epatch ${FILESDIR}/${PN}-3.2_pre7-abort-on-modprobe-failure.patch
+
 	cd ${S}
 	rm -f missing
 	export WANT_AUTOMAKE=1.6
 	automake --add-missing
+
+	cd ${S}
+	gnuconfig_update
+#	if ! use no-old-linux ; then
+		cp config.{guess,sub} ${WORKDIR}/modutils-${MODUTILS_PV}/
+#	fi
 }
 
 src_compile() {
 
-	# If running mips64, we need updated configure data
-	use mips && gnuconfig_update
+#	if ! use no-old-linux ; then
+		einfo "Building modutils..."
+		cd ${WORKDIR}/modutils-${MODUTILS_PV}
+		econf \
+			--disable-strip \
+			--prefix=/ \
+			--enable-insmod-static \
+			--disable-zlib \
+			|| die "econf failed"
+		local mymake=""
+		[ "${ARCH}" = "hppa" ] && mymake="ARCH=hppa"
+		emake ${mymake} || die "emake modutils failed"
+#	fi
 
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf} || die "econf failed"
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	emake ${mymake} || die "emake modutils failed"
 	einfo "Building module-init-tools..."
 	cd ${S}
-
 	econf \
 		--prefix=/ \
 		--enable-zlib \
-		${myconf} || die "econf failed"
-
+		|| die "econf failed"
 	emake || die "emake module-init-tools failed"
 }
 
-src_install () {
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}" ${mymake}
-
-	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
+src_install() {
+#	if ! use no-old-linux ; then
+		local mymake=""
+		[ "${ARCH}" = "hppa" ] && mymake="ARCH=hppa"
+		cd ${WORKDIR}/modutils-${MODUTILS_PV}
+		einstall prefix="${D}" ${mymake}
+
+		docinto modutils-${MODUTILS_PV}
+		dodoc CREDITS ChangeLog NEWS README TODO
+
+		cd ${S}
+		# This copies the old version of modutils to *.old so it still works
+		# with kernels <= 2.4; new versions will execve() the .old version if
+		# a 2.4 kernel is running...
+		# This code was borrowed from the module-init-tools Makefile
+		local runme=
+		local f=
+		for f in lsmod modprobe rmmod depmod insmod insmod.static modinfo
+		do
+			if [ -L ${D}/sbin/${f} ]
+			then
+				einfo "Moving symlink $f to ${f}.old"
+				#runme = the target of the symlink with a .old tagged on.
+				runme="`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old"
+				[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
+				dosym $runme /sbin/${f} || die
+			elif [ -e ${D}/sbin/${f} ]
+			then
+				einfo "Moving executable $f to ${f}.old"
+			fi
+			mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old
+		done
+		# Move the man pages as well.  We only do this for the man pages of the
+		# tools that module-init-tools will replace.
+		for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
+		do
+			mv -f ${f} ${f%\.*}.old.${f##*\.}
+		done
+		# Fix the ksyms links #35601
+		for f in ksyms kallsyms ; do
+			dosym insmod.old /sbin/${f}
+			dosym insmod.static.old /sbin/${f}.static
+		done
+#	fi
 
 	cd ${S}
-	# This copies the old version of modutils to *.old so it still works
-	# with kernels <= 2.4; new versions will execve() the .old version if
-	# a 2.4 kernel is running...
-	# This code was borrowed from the module-init-tools Makefile
-	local runme=
-	local f=
-	for f in lsmod modprobe rmmod depmod insmod insmod.static modinfo
-	do
-		if [ -L ${D}/sbin/${f} ]
-		then
-			einfo "Moving symlink $f to ${f}.old"
-			#runme = the target of the symlink with a .old tagged on.
-			runme="`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old"
-			[ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
-			dosym $runme /sbin/${f} || die
-		elif [ -e ${D}/sbin/${f} ]
-		then
-			einfo "Moving executable $f to ${f}.old"
-		fi
-		mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old
-	done
-	# Move the man pages as well.  We only do this for the man pages of the
-	# tools that module-init-tools will replace.
-	for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
-	do
-		mv -f ${f} ${f%\.*}.old.${f##*\.}
-	done
-
 	einstall prefix=${D}
 
 	# Install compat symlink
 	dosym ../bin/lsmod /sbin/lsmod
+	#use no-old-linux || 
 	dosym ../sbin/insmod.old /bin/lsmod.old
 	# Install the modules.conf2modprobe.conf tool, so we can update
 	# modprobe.conf.
@@ -158,7 +166,7 @@ src_install () {
 
 	doman *.[1-8]
 	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
 
 pkg_postinst() {
@@ -177,4 +185,3 @@ pkg_postinst() {
 		fi
 	fi
 }
-
diff --git a/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild
index ce30b160e00e..18452516ab4a 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.1-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-apps/module-init-tools/module-init-tools-3.1-r1.ebuild,v 1.1 2005/03/20 23:00:12 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
-inherit flag-o-matic eutils gnuconfig toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs
 
 MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
@@ -16,32 +16,23 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc ~x86"
 IUSE=""
 #IUSE="no-old-linux"
 
-DEPEND="virtual/libc
-	sys-libs/zlib
+DEPEND="sys-libs/zlib
 	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
 	unpack ${A}
 
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
 #	if ! use no-old-linux ; then
-		cd ${WORKDIR}/modutils-${MODUTILS_PV}
-		epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-		epatch ${FILESDIR}/modutils-2.4.27-PATH_MAX.patch
-		epatch ${FILESDIR}/modutils-2.4.27-gcc34.patch
-		epatch ${FILESDIR}/modutils-2.4.27-gcc4.patch
+		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
+		epatch "${FILESDIR}"/modutils-2.4.27-alias.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch
 #	fi
 
 	# Support legacy .o modules
@@ -53,6 +44,9 @@ src_unpack() {
 	# the same flag to modules-update.
 	cd ${S}; epatch ${FILESDIR}/${PN}-3.1_generate-modprobe-assume-kernel.patch
 
+	# Abort if we fail to run modprobe, bug #68689
+	cd ${S}; epatch ${FILESDIR}/${PN}-3.2_pre7-abort-on-modprobe-failure.patch
+
 	cd ${S}
 	# make sure we don't try to regen the manpages
 	cp ${FILESDIR}/${PV}-modprobe.d.5.bz2 modprobe.d.5.bz2
@@ -61,16 +55,13 @@ src_unpack() {
 
 	rm -f missing
 	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-
-	cd ${S}
-	gnuconfig_update
-#	if ! use no-old-linux ; then
-		cp config.{guess,sub} ${WORKDIR}/modutils-${MODUTILS_PV}/
-#	fi
+	automake --add-missing || die
 }
 
 src_compile() {
+	# Configure script uses BUILDCFLAGS for cross-compiles but this
+	# defaults to CFLAGS which can be bad mojo
+	export BUILDCFLAGS=-pipe
 	export BUILDCC="$(tc-getBUILD_CC)"
 
 #	if ! use no-old-linux ; then
diff --git a/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild
index 9984d9419530..c1b78636d178 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.2_pre7-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-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild,v 1.1 2005/07/15 09:42:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:59 chriswhite Exp $
 
-inherit flag-o-matic eutils gnuconfig toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs fixheadtails
 
 MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
@@ -16,9 +16,11 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 #IUSE="no-old-linux"
+# The test code runs `make clean && configure` and screws up src_compile()
+RESTRICT="test"
 
 DEPEND="sys-libs/zlib
 	!virtual/modutils"
@@ -27,21 +29,19 @@ PROVIDE="virtual/modutils"
 src_unpack() {
 	unpack ${A}
 
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
+	# Patches for old modutils
 #	if ! use no-old-linux ; then
 		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
 		epatch "${FILESDIR}"/modutils-2.4.27-alias.patch
 		epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch
 		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch
 #	fi
 
+	ht_fix_file "${S}"/tests/test-depmod/10badcommand.sh
+	# Test fails due since it needs to write to /lib/modules so disable it
+	rm -f "${S}"/tests/test-depmod/01backcompat.sh
+
 	# Support legacy .o modules
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
 
@@ -56,19 +56,18 @@ src_unpack() {
 
 	cd ${S}
 	# make sure we don't try to regen the manpages
+	cp ${FILESDIR}/3.1-modprobe.d.5.bz2 modprobe.d.5.bz2 || die
+	bunzip2 modprobe.d.5.bz2 || die
 	touch *.5
 
 	rm -f missing
-	automake --add-missing
-
-	cd ${S}
-	gnuconfig_update
-#	if ! use no-old-linux ; then
-		cp config.{guess,sub} ${WORKDIR}/modutils-${MODUTILS_PV}/
-#	fi
+	automake --add-missing || die
 }
 
 src_compile() {
+	# Configure script uses BUILDCFLAGS for cross-compiles but this
+	# defaults to CFLAGS which can be bad mojo
+	export BUILDCFLAGS=-pipe
 	export BUILDCC="$(tc-getBUILD_CC)"
 
 #	if ! use no-old-linux ; then
diff --git a/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild
index 0b97d8da6fcd..cfbcab2b2645 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.2_pre7.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-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild,v 1.1 2005/06/27 16:19:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild,v 1.1.1.1 2005/11/30 09:55:59 chriswhite Exp $
 
-inherit flag-o-matic eutils gnuconfig toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs
 
 MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
@@ -16,32 +16,23 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 #IUSE="no-old-linux"
 
-DEPEND="virtual/libc
-	sys-libs/zlib
+DEPEND="sys-libs/zlib
 	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
 	unpack ${A}
 
-	# With the b0rked modutils, "modprobe hid" does work. But if something
-	# (like hotplug) tries to auto-load hid (because another module needs it,
-	# via the kernel module auto-loader) and keybdev.o or mousedev.o don't
-	# exist, then the "above" clause fails and the hid module never gets
-	# loaded, and then things like USB will fail.  Thus we remove it all
-	# together.
-	#
-	# <drobbins@gentoo.org> (26 Mar 2003)
 #	if ! use no-old-linux ; then
-		cd ${WORKDIR}/modutils-${MODUTILS_PV}
-		epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
-		epatch ${FILESDIR}/modutils-2.4.27-PATH_MAX.patch
-		epatch ${FILESDIR}/modutils-2.4.27-gcc34.patch
-		epatch ${FILESDIR}/modutils-2.4.27-gcc4.patch
+		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
+		epatch "${FILESDIR}"/modutils-2.4.27-alias.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch
 #	fi
 
 	# Support legacy .o modules
@@ -61,16 +52,13 @@ src_unpack() {
 
 	rm -f missing
 	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-
-	cd ${S}
-	gnuconfig_update
-#	if ! use no-old-linux ; then
-		cp config.{guess,sub} ${WORKDIR}/modutils-${MODUTILS_PV}/
-#	fi
+	automake --add-missing || die
 }
 
 src_compile() {
+	# Configure script uses BUILDCFLAGS for cross-compiles but this
+	# defaults to CFLAGS which can be bad mojo
+	export BUILDCFLAGS=-pipe
 	export BUILDCC="$(tc-getBUILD_CC)"
 
 #	if ! use no-old-linux ; then
diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog
index c5c396e5c27a..0bf49902eee8 100644
--- a/sys-apps/modutils/ChangeLog
+++ b/sys-apps/modutils/ChangeLog
@@ -1,11 +1,219 @@
 # ChangeLog for sys-apps/modutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:45 chriswhite Exp $
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> modutils-2.4.27.ebuild:
+  Stable on ppc64
+
+*modutils-2.4.27-r1 (18 Aug 2005)
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-no-nested-function.patch,
+  +modutils-2.4.27-r1.ebuild:
+  Fix by the PaX guys to remove executable stack markings.
+
+  14 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-alias.patch, +files/modutils-2.4.27-flex.patch,
+  +files/modutils-2.4.27-gcc.patch, modutils-2.4.27.ebuild:
+  Grab changes from Debian to fix building with newer gcc / flex.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> modutils-2.4.27.ebuild:
+  Marked stable on mips.
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  modutils-2.4.27.ebuild:
+  Stable on ppc.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> modutils-2.4.27.ebuild:
+  Stable on alpha.
+
+  07 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> modutils-2.4.27.ebuild:
+  Stable on sparc
+
+  23 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/2.4.27-gcc34.patch,
+  modutils-2.4.27.ebuild:
+  Add patch to fix gcc-3.4.x building #74538 by splite.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  modutils-2.4.23.ebuild:
+  Masked modutils-2.4.23.ebuild stable for ppc
+
+  02 Sep 2004; Mike Frysinger <vapier@gentoo.org> modutils-2.4.23.ebuild,
+  modutils-2.4.24.ebuild, modutils-2.4.25.ebuild, modutils-2.4.26.ebuild,
+  modutils-2.4.27.ebuild:
+  Start blocking module-init-tools.
+
+*modutils-2.4.27 (25 Aug 2004)
+
+  25 Aug 2004; <plasmaroo@gentoo.org> +modutils-2.4.27.ebuild:
+  Version bump, closes bug #60975.
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> modutils-2.4.26.ebuild:
+  stable on alpha and ia64
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> modutils-2.4.16-r2.ebuild,
+  modutils-2.4.16-r3.ebuild, modutils-2.4.19.ebuild, modutils-2.4.20.ebuild,
+  modutils-2.4.22.ebuild, modutils-2.4.23.ebuild, modutils-2.4.24.ebuild,
+  modutils-2.4.25.ebuild:
+  sync IUSE (missing), trim trailing whitespace
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> modutils-2.4.16-r2.ebuild:
+  QA - fix use invocation
+
+  19 May 2004; <solar@gentoo.org> modutils-2.4.26.ebuild:
+  modutils-2.4.26 no longer needs to filter-flags -fPIC
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> modutils-2.4.26.ebuild:
+  Add inherit eutils
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> modutils-2.4.26.ebuild:
+  adding s390 keywords
+
+*modutils-2.4.26 (02 Nov 2003)
+
+  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org> modutils-2.4.26.ebuild:
+  Update version.  Some cleanups.
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
+  filter-flags -fPIC will introduce -yet_exec for hardened-gcc
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
+  changed hardened-gcc behaviour in respect to hppa
+
+  08 Oct 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
+  hppa does not needs fstackprot with hcc
+
+  25 Sep 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
+  bugfixes for hardened-gcc
+
+  06 Sep 2003; Alexander Gabert <pappy@gentoo.org> modutils-2.4.25.ebuild:
+  added hardened-gcc exclude flags
+
+*modutils-2.4.25 (31 Mar 2003)
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> modutils-2.4.25.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> modutils-2.4.25.ebuild:
+  Mark stable on alpha
+
+  20 May 2003; Joshua Kinard <kumba@gentoo.org> modutils-2.4.23.ebuild,
+  modutils-2.4.24.ebuild, modutils-2.4.25.ebuild:
+  Added ~mips to KEYWORDS
+
+  09 May 2003; Martin Holzer <mholzer@gentoo.org> modutils-2.4.16-r2.ebuild,
+  modutils-2.4.16-r3.ebuild, modutils-2.4.19.ebuild, modutils-2.4.20.ebuild,
+  modutils-2.4.22.ebuild, modutils-2.4.23.ebuild, modutils-2.4.24.ebuild,
+  modutils-2.4.25.ebuild:
+  Updated SRC_URI to use mirror://kernel
+
+  16 Apr 2003; Guy Martin <gmsoft@gentoo.org> modutils-2.4.24.ebuild,
+  modutils-2.4.25.ebuild :
+  Marked stable on hppa.
+
+  07 Apr 2003; Brandon Low <lostlogic@gentoo.org> modutils-2.4.24.ebuild,
+  modutils-2.4.25.ebuild:
+  Mark stable on ppc
+
+  07 Apr 2003; Brandon Low <lostlogic@gentoo.org> modutils-2.4.24.ebuild,
+  modutils-2.4.25.ebuild:
+  Fix virtual/module-tools - virtual/modutils in PROVIDE
+
+  31 Mar 2003; Brandon Low <lostlogic@gentoo.org> modutils-2.4.25.ebuild:
+  bump
+
+*modutils-2.4.24 (24 Mar 2003)
+
+  29 Mar 2003; Christian Birchinger <joker@gentoo.org> modutils-2.4.24.ebuild:
+  Added sparc stable keyword
+
+  24 Mar 2003; Daniel Robbins <drobbins@gentoo.org> modutils-2.4.24.ebuild:
+  New upstream version. New alias.h.diff to close bug #11886. New PROVIDE
+  "virtual/modutils" to allow closing of bug #16294, which will happen
+  in the x86 profile initially. 
+
+*modutils-2.4.23 (13 Mar 2003)
+
+  13 Mar 2003; Brandon Low <lostlogic@gentoo.org> modutils-2.4.23.ebuild:
+  Version bump, should be very minor stuff, and mostly bug fixes.
+
+*modutils-2.4.22 (25 Nov 2002)
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> modutils-2.4.22.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> modutils-2.4.22.ebuild :
+  Patched for hppa.
+  Added hppa to keywords.
+
+  09 Jan 2002; Seemant Kulleen <seemant@gentoo.org> modutils-2.4.22.ebuild :
+  filter-flags to remove -fPIC, which causes compilation to fail, since
+  insmod needs to be compiled static.
+
+  10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> modutils-2.4.22.ebuild :
+  Mark as stable.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords
+ 
+  25 Nov 2002; Brandon Low <lostlogic@gentoo.org> modutils-2.4.22.ebuild
+  files/digest-modutils-2.4.22 :
+  Version bump still unstable for the moment, lets try to stabilize
+  this quickly.
+
+*modutils-2.4.20 (02 Nov 2002)
+
+  02 Nov 2002; Seemant Kulleen <seemant@gentoo.org> modutils-2.4.20.ebuild
+  files/digest-modutils-2.4.20 :
+  Version bump thanks to Doug Goldstein <cardoe@cardoe.com>
+
+*modutils-2.4.19 (21 Aug 2002)
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  21 Aug 2002; phoen][x <phoenix@gentoo.org> modutils-2.4.19.ebuild,
+  files/digest-modutils-2.4.19 :
+  Bumped to new version - this should take care of bug #6730.
+
+*modutils-2.4.16-r3 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> modutils-2.4.16-r3.ebuild :
+  Added LICENSE, KEYWORDS.
+
+*modutils-2.4.16-r2 (7 Jul 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> modutils-2.4.16.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> modutils-2.4.16-r2.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  7 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Resolve bug #4619, by also installing insmod.static.
+
+*modutils-2.4.16-r2 (24 Jun 2002)
+
+  24 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Seems like a statically linked insmod do not load modules
+  on demand :(
+
+*modutils-2.4.16-r1 (20 Jun 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> modutils-2.4.16-r1.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  20 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Resolve bug #3897.
+
+*modutils-2.4.16 (6 May 2002)
+
+  6 May 2002; Martin Schlemmer <azarah@gentoo.org> modutils-2.4.16.ebuild :
+  Enable zlib compression if in use.  Slotify.
 
 *modutils-2.4.12 (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-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index 439666246b4a..2c88d7e829c0 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -1,18 +1,20 @@
-MD5 fbcd19b84c6491fb2c3eb77a2460be47 ChangeLog 4346
-MD5 1dfba4ae6627431a1adcbd0579271064 modutils-2.4.16-r2.ebuild 1472
-MD5 51d2f42ff666784a8ae962ee87648fd3 modutils-2.4.16-r3.ebuild 1200
-MD5 6ea09218232ef8e94e55cffd3c9a2db0 modutils-2.4.19.ebuild 1118
-MD5 e11e3a9dae8bf1e3ff4bb29a09f6979e modutils-2.4.20.ebuild 1033
-MD5 b9ea9245cd3c462aadb4b2ca4ffdb908 modutils-2.4.22.ebuild 1367
-MD5 af4f2c5c8aa6933b39d06cd329ae32c8 modutils-2.4.23.ebuild 1379
-MD5 84533c75db621eeeda1dc7c59bdb3ff8 modutils-2.4.24.ebuild 1314
-MD5 30fd6dec53d7d0c820bdbf2937263b27 modutils-2.4.25.ebuild 1314
-MD5 15611447c25c4be74563a4808c96aa9e files/alias.h.diff 255
-MD5 2a538675787b2c0d36e17a54b7205ada files/digest-modutils-2.4.16-r2 68
-MD5 2a538675787b2c0d36e17a54b7205ada files/digest-modutils-2.4.16-r3 68
-MD5 367a98cfc9d6b4ad4b87dd1a40731082 files/digest-modutils-2.4.19 68
-MD5 93cde80b9a788050c8da89dd00438190 files/digest-modutils-2.4.20 68
-MD5 b6bb8c373b7dd0be26864cac80b0b11f files/digest-modutils-2.4.22 68
-MD5 e2f752d73846ca0f1a0c6bef4e6cea96 files/digest-modutils-2.4.23 68
-MD5 440c0a070f677ba12ecc3a8d59af57c8 files/digest-modutils-2.4.24 195
-MD5 bd23ddb87317bad29c6d70b7f0bfcede files/digest-modutils-2.4.25 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 10767a4fc679685d49ae17cf44ba515b modutils-2.4.27.ebuild 1035
+MD5 f9c1fc6910a58e9d13b7ba8c657da022 ChangeLog 7847
+MD5 958a439e80de284a2aace67567bdffc8 modutils-2.4.27-r1.ebuild 1084
+MD5 5428d53f18b5fac287741b23634d84dc files/modutils-2.4.27-alias.patch 2246
+MD5 27a62130de1c51fc678efc0e9ad67ddd files/modutils-2.4.27-flex.patch 805
+MD5 4f6eb067ab56884adab12c53346dc793 files/modutils-2.4.27-no-nested-function.patch 1422
+MD5 8ecc5aa24faa96fe32a15688f3e023ac files/modutils-2.4.27-gcc.patch 6963
+MD5 123430bcca454dfee74acef6f3525a17 files/digest-modutils-2.4.27 68
+MD5 123430bcca454dfee74acef6f3525a17 files/digest-modutils-2.4.27-r1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDP3rUgIKl8Uu19MoRAuZcAJ0V8yZwGIWu4JIj2UC5VEhX68zFYACfQYdp
+YV/Xsq6ErMWxFSxhWMdn8SU=
+=OEbf
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/modutils/files/modutils-2.4.27-alias.patch b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
index df92d51753fe..1fefffb62f85 100644
--- a/sys-apps/modutils/files/modutils-2.4.27-alias.patch
+++ b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
@@ -36,28 +36,6 @@ Update misc alias cruft.
  	"char-major-10-200 tun",	/* Universal TUN/TAP device driver */
  	"char-major-10-250 hci_vhci",
  
-@@ -153,6 +162,21 @@
- 	"char-major-206 osst",  /* OnStream SCSI tape */
- 	"char-major-216 rfcomm",
- 
-+        /* agpgart like 2.6 */
-+	"ali-agp agpgart",
-+	"ati-agp agpgart",
-+	"amd-k7-agp agpgart",
-+	"amd64-agp agpgart",
-+	"alpha-agp agpgart",
-+	"hp-agp agpgart",
-+	"i460-agp agpgart",
-+	"intel-agp agpgart",
-+	"nvidia-agp agpgart",
-+	"sis-agp agpgart",
-+	"sworks-agp agpgart",
-+	"uninorth-agp agpgart",
-+	"via-agp agpgart",
-+
- 	"dos msdos",
- 	"dummy0 dummy",
- 	"dummy1 dummy",
 @@ -179,6 +203,11 @@
  	/* next two from <dairiki@matthews.dairiki.org>  Thanks! */
  	"net-pf-17 af_packet",
diff --git a/sys-apps/modutils/metadata.xml b/sys-apps/modutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/modutils/metadata.xml
+++ b/sys-apps/modutils/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-apps/modutils/modutils-2.4.27-r1.ebuild b/sys-apps/modutils/modutils-2.4.27-r1.ebuild
index b23b08d7b5f8..6c71780a2015 100644
--- a/sys-apps/modutils/modutils-2.4.27-r1.ebuild
+++ b/sys-apps/modutils/modutils-2.4.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-apps/modutils/modutils-2.4.27-r1.ebuild,v 1.1 2005/08/18 22:30:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:45 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="!virtual/modutils"
diff --git a/sys-apps/modutils/modutils-2.4.27.ebuild b/sys-apps/modutils/modutils-2.4.27.ebuild
index eb633ca77d32..1212531260d5 100644
--- a/sys-apps/modutils/modutils-2.4.27.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27.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-apps/modutils/modutils-2.4.27.ebuild,v 1.1 2004/08/24 23:37:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27.ebuild,v 1.1.1.1 2005/11/30 09:56:45 chriswhite Exp $
 
-inherit flag-o-matic eutils
+inherit eutils
 
 DESCRIPTION="Standard kernel module utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
@@ -10,44 +10,32 @@ SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa -amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="alpha -amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	!virtual/modutils"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
 	unpack ${A}
-
-	EPATCH_OPTS="-d ${S}/util" \
-	epatch ${FILESDIR}/alias.h.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-alias.patch
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	epatch "${FILESDIR}"/${P}-flex.patch
 }
 
 src_compile() {
-	local myconf=
-	local mymake=
-
-	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
-	#
-	# Final resolution ... dont make it link against zlib, as the static
-	# version do not want to autoload modules :(
-	myconf="${myconf} --disable-zlib"
-
-	[ ${ARCH} = "hppa" ] && mymake="ARCH=hppa"
-
 	econf \
 		--prefix=/ \
 		--disable-strip \
 		--enable-insmod-static \
-		${myconf} || die "./configure failed"
-
-	emake ${mymake} || die "emake failed"
+		--disable-zlib \
+		|| die "./configure failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	local mymake=
-	[ ${ARCH} = "hppa" ] && mymake="ARCH=hppa"
-	einstall prefix="${D}" ${mymake} || die "make install failed"
-
+	einstall prefix="${D}" || die "make install failed"
 	dodoc CREDITS ChangeLog NEWS README TODO
 }
diff --git a/sys-apps/mondo/ChangeLog b/sys-apps/mondo/ChangeLog
index b9965da609e3..dcbbdfa17504 100644
--- a/sys-apps/mondo/ChangeLog
+++ b/sys-apps/mondo/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for sys-apps/mondo
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/ChangeLog,v 1.1 2002/05/15 19:32:06 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/ChangeLog,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> mondo-0.9.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+*mondo-0.9a (27 Feb 2005)
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> mondo-0.9a.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  12 Aug 2004; Tavis Ormandy <taviso@gentoo.org> :
+  *bump* new version
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> mondo-0.6.ebuild,
+  mondo-0.9.ebuild:
+  sync IUSE (missing)
+
+*mondo-0.9 (30 Oct 2002)
+
+  30 Oct 2002; Brandon Low <lostlogic@gentoo.org> mondo-0.9.ebuild:
+
+  Version update from upstream, ebuild fixes.
 
 *mondo-0.6 (15 May 2002)
 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> mondo-0.6.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
   15 May 2002; Arcady Genkin <agenkin@thpoon.com> mondo-0.6.ebuild:
 
-  Initial version, submitted by MvOstheim@web.de (Michael v.Ostheim).
\ No newline at end of file
+  Initial version, submitted by MvOstheim@web.de (Michael v.Ostheim).
diff --git a/sys-apps/mondo/Manifest b/sys-apps/mondo/Manifest
index 99d5f613085c..361531f0372c 100644
--- a/sys-apps/mondo/Manifest
+++ b/sys-apps/mondo/Manifest
@@ -1,6 +1,17 @@
-MD5 d5c8860e3166ec38b9ff589cd4a7657b mondo-0.9.ebuild 1003
-MD5 8df14433e1ac0f089ca3a0e247d360cf mondo-0.6.ebuild 1168
-MD5 e692d21288bd5b44bf6551a055bca80f ChangeLog 688
-MD5 387259331a4710262fba847d2574cbe7 files/mondo.sh 707
-MD5 a665ddb5e8e50b2d0715b181e2c5d8b1 files/digest-mondo-0.6 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6cdd17500c27fc133c3ea6977843aa3a mondo-0.9a.ebuild 1070
+MD5 d6b2b440bea903881099df4fffd67295 mondo-0.9.ebuild 986
+MD5 b38919a3c4bde3506472ab7bd02e4b36 ChangeLog 1166
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 132f0055743c53c2748b6f0e7b8ad2bb files/mondo.sh 643
+MD5 5722aa0fa20a3f7a76b2dad8860a1f50 files/digest-mondo-0.9a 63
 MD5 31a789bf3b48f4401438830acf457686 files/digest-mondo-0.9 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCIeHDI1lqEGTUzyQRAkmKAKC6Ue0lGLE8GPeDjP4+DrQyvXmb4wCfaYkQ
+Y0Vc2mYehMcs09rb1YXvsIE=
+=jcP/
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mondo/files/mondo.sh b/sys-apps/mondo/files/mondo.sh
index e289a690e7b3..e95689ddcc3b 100644
--- a/sys-apps/mondo/files/mondo.sh
+++ b/sys-apps/mondo/files/mondo.sh
@@ -1,8 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Author: Michael v.Ostheim <MvOstheim@web.de>
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/files/mondo.sh,v 1.1 2002/05/15 19:32:06 agenkin Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/files/mondo.sh,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 depend() {
 	need modules
diff --git a/sys-apps/mondo/metadata.xml b/sys-apps/mondo/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/mondo/metadata.xml
+++ b/sys-apps/mondo/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-apps/mondo/mondo-0.9.ebuild b/sys-apps/mondo/mondo-0.9.ebuild
index d3ac5cd2ae36..7dc6eb0862e1 100644
--- a/sys-apps/mondo/mondo-0.9.ebuild
+++ b/sys-apps/mondo/mondo-0.9.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.9.ebuild,v 1.1 2002/10/30 20:51:29 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.9.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 DESCRIPTION="A System Health Monitor"
 HOMEPAGE="http://mondo-daemon.sourceforge.net/"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 amd64 -ppc"
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=sys-apps/lm_sensors-2.6.3"
 
 SRC_URI="mirror://sourceforge/mondo-daemon/${P}.tar.bz2"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	econf || die "Configure failed"
diff --git a/sys-apps/mondo/mondo-0.9a.ebuild b/sys-apps/mondo/mondo-0.9a.ebuild
index b0bf6fcc87c4..9f79735898ac 100644
--- a/sys-apps/mondo/mondo-0.9a.ebuild
+++ b/sys-apps/mondo/mondo-0.9a.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-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-apps/mondo/mondo-0.9a.ebuild,v 1.1 2004/08/12 15:47:09 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mondo/mondo-0.9a.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 DESCRIPTION="A System Health Monitor"
 HOMEPAGE="http://mondo-daemon.sourceforge.net/"
-KEYWORDS="~x86"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
+SRC_URI="mirror://sourceforge/mondo-daemon/${P}.tar.bz2"
 
-DEPEND=">=sys-apps/lm-sensors-2.6.3"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-SRC_URI="mirror://sourceforge/mondo-daemon/${P}.tar.bz2"
+DEPEND=">=sys-apps/lm_sensors-2.6.3"
 
-src_compile() {
-	econf || die "Configure failed"
-	emake || die
+pkg_setup() {
+	if [[ ${KV:0:3} != "2.4" ]] ; then
+		eerror "Sorry, but mondo only works with linux-2.4."
+		eerror "http://bugs.gentoo.org/show_bug.cgi?id=72467"
+		die "kernel not supported"
+	fi
 }
 
 src_install() {
 	einstall || die "Install failed"
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mondo.sh mondo
+	newinitd ${FILESDIR}/mondo.sh mondo
+	dodoc AUTHORS ChangeLog INSTALL README TODO
 }
 
 pkg_postinst() {
-	einfo
 	einfo "The mondo system health monitor has been installed."
 	einfo
 	einfo "Don't forget to setup lm_sensors before starting mondo."
 	einfo "Run mondo-setup or edit /etc/mondo.conf manually and run"
 	einfo "'rc-update add mondo <runlevel>' to add mondo to a runlevel."
-	einfo
 }
diff --git a/sys-apps/most/ChangeLog b/sys-apps/most/ChangeLog
index 1d666cf5fe61..5a83ad891436 100644
--- a/sys-apps/most/ChangeLog
+++ b/sys-apps/most/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for sys-apps/most
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/ChangeLog,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> most-4.9.5.ebuild:
+  Mark 4.9.5 stable on alpha
+
+  19 Aug 2005; Luis Medinas <metalgod@gentoo.org> most-4.9.5.ebuild:
+  Marked Stable on AMD64.
+
+  18 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> most-4.10.2-r1.ebuild:
+  Use tc-arch() instead of ${ARCH}.
+
+  17 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> most-4.9.5.ebuild:
+  Stable on x86,sparc,mips.
+
+*most-4.10.2-r1 (14 Aug 2005)
+
+  14 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/most-4.10.2-fix-goto-line.diff, -most-4.10.2.ebuild,
+  +most-4.10.2-r1.ebuild:
+  Revision bump; added patch to fix the 'g' (goto line) command. Also removed
+  src_compile() completely since the MOST_SYSINIT defaults to what we were
+  using previously (/etc/most.conf). Also updated the dodoc list to include
+  the sample most.rc.
+
+  13 Aug 2005; Joshua Kinard <kumba@gentoo.org> metadata.xml,
+  most-4.10.2.ebuild:
+  Moved to shell-tools herd; removed use of gnuconfig eclass (users should
+  enable 'autoconfig' instead); changed configure/make to use econf and emake.
+
+  05 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> most-4.9.5.ebuild,
+  most-4.10.2.ebuild:
+  marked ~alpha, wrt bug #97609. Fix header date on most-4.9.2.ebuild
+
+  28 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> most-4.9.5.ebuild,
+  most-4.10.2.ebuild:
+  Run gnuconfig-update, otherwise the config.{sub,guess} will be too old to
+  recognize certain mips64 machines.
+
+*most-4.10.2 (22 Jul 2005)
+
+  22 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -most-4.10.1.ebuild,
+  +most-4.10.2.ebuild:
+  Version bump.
+
+*most-4.10.1 (28 Jun 2005)
+
+  28 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +most-4.10.1.ebuild:
+  Version bump.
+
+  31 Dec 2004; <gongloo@gentoo.org> most-4.9.5.ebuild:
+  Added ~ppc-macos.
+
+  06 Nov 2004; Lars Weiler <pylon@gentoo.org> most-4.9.5.ebuild:
+  Stable on ppc.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> most-4.9.2.ebuild,
+  most-4.9.4.ebuild:
+  sync IUSE (missing), trim trailing whitespace
+
+  28 Jun 2004; David Holm <dholm@gentoo.org> most-4.9.5.ebuild:
+  Added ppc support.
+
+*most-4.9.5 (28 Jun 2004)
+
+  28 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> +most-4.9.5.ebuild:
+  Version bump. Changed the src_install around a bit to make things simpler for
+  arch people. Added in ~sparc ~mips to the supported arch list.
+
+*most-4.9.4 (06 Apr 2004)
+
+  06 Apr 2004; Jon Portnoy <avenj@gentoo.org> most-4.9.4.ebuild :
+  Version bump, bug #46314.
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> most-4.9.2.ebuild:
+  Add binary depending on arch. Closing #38900.
+
+*most-4.9.2 (13 May 2002)
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc), this relies on x86 objects
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> most-4.9.2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  13 May 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Update to latest.  Close #2225.  Thanks Wout ;)
+
+*most-4.9.0-r3 (12 May 2002)
+
+  12 May 2002; Wout Mertens <wmertens@gentoo.org> :
+
+  actually copy the binary :)
 
 *most-4.9.0-r2 (1 Feb 2002)
 
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index e69de29bb2d1..0f666309c94f 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -0,0 +1,11 @@
+MD5 48e912be5783e336359539d19f31a1c6 most-4.10.2-r1.ebuild 1528
+MD5 e2d614fd87eac1a4402def83a459af86 metadata.xml 164
+MD5 206eedb4803a765ff04b561b4992c4a5 ChangeLog 3658
+MD5 33d52b232f3c2d985010021f9a98c55c most-4.9.5.ebuild 1526
+MD5 1f3b29668972289ae7d1434746126f96 most-4.9.4.ebuild 936
+MD5 8e44bf156727af67aeeaa8344dc8f278 most-4.9.2.ebuild 935
+MD5 472794b01f4d3b05bb43788c16776853 files/most-4.10.2-fix-goto-line.diff 529
+MD5 a23dcc37cb7e0fb3d5fde35a36d9f270 files/digest-most-4.9.2 61
+MD5 fca955f15889eb7ffb4639dd1484ccfa files/digest-most-4.9.4 62
+MD5 f50722839e33523b309eda86c46e465d files/digest-most-4.9.5 62
+MD5 92687eb187b1e9a13f22c1d593123f14 files/digest-most-4.10.2-r1 63
diff --git a/sys-apps/most/metadata.xml b/sys-apps/most/metadata.xml
index f093d416cbb1..80ac69d9c2f2 100644
--- a/sys-apps/most/metadata.xml
+++ b/sys-apps/most/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>shell-tools</herd>
 </pkgmetadata>
diff --git a/sys-apps/most/most-4.10.2-r1.ebuild b/sys-apps/most/most-4.10.2-r1.ebuild
index 569fd7a061f7..be2bd04197d9 100644
--- a/sys-apps/most/most-4.10.2-r1.ebuild
+++ b/sys-apps/most/most-4.10.2-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-apps/most/most-4.10.2-r1.ebuild,v 1.1 2005/08/14 11:25:03 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.10.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="An extremely excellent text file reader"
 HOMEPAGE="http://freshmeat.net/projects/most/"
@@ -30,7 +30,7 @@ src_install() {
 	# Changing this to use src/${ARCH}objs/most probably isn't a good
 	# idea...
 	local objsdir
-	case ${ARCH} in
+	case $(tc-arch) in
 		x86)
 			objsdir=x86objs
 		;;
diff --git a/sys-apps/most/most-4.9.2.ebuild b/sys-apps/most/most-4.9.2.ebuild
index 7e6677edf974..e244b844d154 100644
--- a/sys-apps/most/most-4.9.2.ebuild
+++ b/sys-apps/most/most-4.9.2.ebuild
@@ -1,36 +1,41 @@
-# 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-apps/most/most-4.9.2.ebuild,v 1.1 2002/05/14 06:04:41 woodchip Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.2.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="An extremely excellent text file reader"
-
-SRC_URI="ftp://space.mit.edu/pub/davis/most/${A}"
+HOMEPAGE="http://freshmeat.net/projects/most/"
+KEYWORDS="x86 amd64 -ppc"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+SRC_URI="ftp://space.mit.edu/pub/davis/most/${P}.tar.gz"
 
 DEPEND=">=sys-libs/slang-1.4.2
-        >=sys-libs/ncurses-5.2-r2"
+	>=sys-libs/ncurses-5.2-r2"
 
 src_compile() {
-
-    try ./configure 	\
-	--host=${CHOST} \
-	--prefix=/usr \
-	--sysconfdir=/etc
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc || die
 
 	#*possible* (not definite) pmake problems, let's not risk it.
 	make SYS_INITFILE="/etc/most.conf" || die
 }
 
 src_install() {
+	case ${ARCH} in
+		x86)
+			dobin src/x86objs/most
+		;;
+		amd64)
+			dobin src/amd64objs/most
+		;;
+	esac
 
-	dobin src/x86objs/most
 	doman most.1
 
 	dodoc COPYING COPYRIGHT README changes.txt
-	docinto txt 
+	docinto txt
 	dodoc default.rc lesskeys.rc most-fun.txt
 }
-
-
diff --git a/sys-apps/most/most-4.9.4.ebuild b/sys-apps/most/most-4.9.4.ebuild
index 21d037c9c024..cc2a132aa04b 100644
--- a/sys-apps/most/most-4.9.4.ebuild
+++ b/sys-apps/most/most-4.9.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.4.ebuild,v 1.1 2004/04/06 17:48:07 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.4.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An extremely excellent text file reader"
 HOMEPAGE="http://freshmeat.net/projects/most/"
 KEYWORDS="~x86 ~amd64 -ppc"
+IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
 SRC_URI="ftp://space.mit.edu/pub/davis/most/${P}.tar.gz"
diff --git a/sys-apps/most/most-4.9.5.ebuild b/sys-apps/most/most-4.9.5.ebuild
index 3836e3c5d814..13bf69dfc348 100644
--- a/sys-apps/most/most-4.9.5.ebuild
+++ b/sys-apps/most/most-4.9.5.ebuild
@@ -1,8 +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/sys-apps/most/most-4.9.5.ebuild,v 1.1 2004/06/27 23:49:01 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.5.ebuild,v 1.1.1.1 2005/11/30 09:55:58 chriswhite Exp $
+
+inherit gnuconfig
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An extremely excellent text file reader"
 HOMEPAGE="http://freshmeat.net/projects/most/"
 SLOT="0"
@@ -13,12 +14,14 @@ IUSE=""
 # Note to arch maintainers: you'll need to add to src_install() for your
 # arch, since the app's Makefile does strange things with different
 # directories for each arch. -- ciaranm, 27 June 2004
-KEYWORDS="~x86 ~amd64 -ppc ~sparc ~mips"
+KEYWORDS="alpha amd64 mips ppc ~ppc-macos sparc x86"
 
 DEPEND=">=sys-libs/slang-1.4.2
 	>=sys-libs/ncurses-5.2-r2"
 
 src_compile() {
+	gnuconfig_update
+
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
@@ -45,6 +48,13 @@ src_install() {
 		mips)
 			objsdir=mipsobjs
 		;;
+		ppc)
+			# This should also be the case of ppc-macos
+			objsdir=ppcobjs
+		;;
+		alpha)
+			objsdir=alphaobjs
+		;;
 	esac
 	dobin src/${objsdir:-objs}/most || die "Couldn't install binary"
 
@@ -54,4 +64,3 @@ src_install() {
 	docinto txt
 	dodoc default.rc lesskeys.rc most-fun.txt
 }
-
diff --git a/sys-apps/mouseemu/ChangeLog b/sys-apps/mouseemu/ChangeLog
index 3f88116cfc4d..6a4d0acc3d17 100644
--- a/sys-apps/mouseemu/ChangeLog
+++ b/sys-apps/mouseemu/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/ChangeLog,v 1.1 2004/08/20 00:02:35 pvdabeel Exp $
+# ChangeLog for sys-apps/mouseemu
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/ChangeLog,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
+
+*mouseemu-0.15 (08 May 2005)
+
+  08 May 2005; Lars Weiler <pylon@gentoo.org> +mouseemu-0.15.ebuild:
+  Version bump.
+
+*mouseemu-0.14 (05 Mar 2005)
+
+  05 Mar 2005; Joseph Jezak <josejx@gentoo.org> +metadata.xml,
+  +mouseemu-0.14.ebuild:
+  Added metadata.xml and bumped to the latest version to fix issues with
+  scroll emulation. See bug #81961.
+
+*mouseemu-0.13 (14 Feb 2005)
+
+  14 Feb 2005; David Holm <dholm@gentoo.org> +files/mouseemu-0.13-fix.patch,
+  +mouseemu-0.13.ebuild:
+  Version bump (Bug #81961)
+
+  06 Nov 2004; <pyrania@gentoo.org> mouseemu-0.12.ebuild:
+  Unneeded RDEPEND.
+
+  03 Nov 2004; Luca Barbato <lu_zero@gentoo.org> mouseemu-0.12.ebuild:
+  Minor fixes
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *mouseemu-0.12 (20 Aug 2004)
   20 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> all:
diff --git a/sys-apps/mouseemu/Manifest b/sys-apps/mouseemu/Manifest
index f0907328b871..792f5d990387 100644
--- a/sys-apps/mouseemu/Manifest
+++ b/sys-apps/mouseemu/Manifest
@@ -1,3 +1,12 @@
-MD5 f43b22502181ee7572eb0d047b043966 mouseemu-0.12.ebuild 1129
-MD5 5cf2e359f02c75045868db291495d638 files/mouseemu-0.12-fix.diff 1715
+MD5 e2fa5694800abe974f2861cf3366587f mouseemu-0.12.ebuild 1145
+MD5 63d88f689a3ebfccf8528f1cf45c5e57 mouseemu-0.13.ebuild 1152
+MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
+MD5 0e6062fbcdc75856c0474641aab2ffc7 mouseemu-0.14.ebuild 1159
+MD5 f75bd14620d4f12c835a73218d405cd8 mouseemu-0.15.ebuild 1158
+MD5 188116a3ebea14f92dc081907a5939cb ChangeLog 1073
 MD5 674625ad158047d3662e040b63ff15d3 files/digest-mouseemu-0.12 59
+MD5 5cf2e359f02c75045868db291495d638 files/mouseemu-0.12-fix.diff 1715
+MD5 834a802c9f28f7cf383962eb9f64d63d files/digest-mouseemu-0.13 64
+MD5 ac4f4b40caa890b2b445440f53fc4781 files/mouseemu-0.13-fix.patch 707
+MD5 51217dcc704131eb254ba8b2fde2a80a files/digest-mouseemu-0.14 64
+MD5 8e8b2484e4016148ecc4097da88bc1c5 files/digest-mouseemu-0.15 64
diff --git a/sys-apps/mouseemu/mouseemu-0.12.ebuild b/sys-apps/mouseemu/mouseemu-0.12.ebuild
index c8a817d3d944..1a05116b4087 100644
--- a/sys-apps/mouseemu/mouseemu-0.12.ebuild
+++ b/sys-apps/mouseemu/mouseemu-0.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/sys-apps/mouseemu/mouseemu-0.12.ebuild,v 1.1 2004/08/20 00:02:35 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/mouseemu-0.12.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,6 @@ SLOT="0"
 KEYWORDS="-* ppc"
 IUSE=""
 DEPEND=""
-RDEPEND="$DEPEND"
 
 src_unpack() {
 	unpack ${A}
@@ -25,12 +24,12 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
-	dobin mouseemu
+	dosbin mouseemu
 	dodoc README COPYING
-	exeinto /etc/init.d/; doexe mouseemu.init.gentoo
-	mv /etc/init.d/mouseemu.init.gentoo /etc/init.d/mouseemu
-	insinto /etc; doins mouseemu.conf
+	exeinto /etc/init.d/
+	newexe mouseemu.init.gentoo mouseemu
+	insinto /etc
+	doins mouseemu.conf
 }
 
 pkg_postinst() {
diff --git a/sys-apps/mouseemu/mouseemu-0.13.ebuild b/sys-apps/mouseemu/mouseemu-0.13.ebuild
index 05ceb778e3e3..a64f6c389a48 100644
--- a/sys-apps/mouseemu/mouseemu-0.13.ebuild
+++ b/sys-apps/mouseemu/mouseemu-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/sys-apps/mouseemu/mouseemu-0.13.ebuild,v 1.1 2005/02/14 08:14:48 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/mouseemu-0.13.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/mouseemu/mouseemu-0.14.ebuild b/sys-apps/mouseemu/mouseemu-0.14.ebuild
index d7b43c264da4..248797496131 100644
--- a/sys-apps/mouseemu/mouseemu-0.14.ebuild
+++ b/sys-apps/mouseemu/mouseemu-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/sys-apps/mouseemu/mouseemu-0.14.ebuild,v 1.1 2005/03/05 11:37:10 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/mouseemu-0.14.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/mouseemu/mouseemu-0.15.ebuild b/sys-apps/mouseemu/mouseemu-0.15.ebuild
index 0715e086538b..b6df9da84975 100644
--- a/sys-apps/mouseemu/mouseemu-0.15.ebuild
+++ b/sys-apps/mouseemu/mouseemu-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/sys-apps/mouseemu/mouseemu-0.15.ebuild,v 1.1 2005/05/08 23:46:10 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mouseemu/mouseemu-0.15.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog
index b3abbd073c64..4f3bbaa6202c 100644
--- a/sys-apps/mtree/ChangeLog
+++ b/sys-apps/mtree/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/mtree
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.1 2003/09/09 13:12:30 tigger Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
+
+  07 May 2004; David Holm <dholm@gentoo.org> mtree-1.5.ebuild:
+  Added to ~ppc.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> mtree-1.5.ebuild:
+  Add die following econf for bug 48950
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> mtree-1.5.ebuild:
+  adding s390 keywords
 
 *mtree-1.5 (09 Sep 2003)
 
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
index 460c5d39598f..866a67fa70eb 100644
--- a/sys-apps/mtree/Manifest
+++ b/sys-apps/mtree/Manifest
@@ -1,2 +1,4 @@
-MD5 9011fdd509fddc80fca233187e214ef2 mtree-1.5.ebuild 554
+MD5 715722fc225f8924b73139613caf2d7f ChangeLog 594
+MD5 164a15f9b7f43f7f7a202c62a2cd5634 mtree-1.5.ebuild 740
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 32078685fbbdab1173b28e5539156eac files/digest-mtree-1.5 69
diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 19ec4d6532bf..96a2d586367d 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/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></herd>
-<maintainer>
-  <email>tigger@gentoo.org</email>
-</maintainer>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/mtree/mtree-1.5.ebuild b/sys-apps/mtree/mtree-1.5.ebuild
index ddcb6d5d30e4..55f915dc8ee4 100644
--- a/sys-apps/mtree/mtree-1.5.ebuild
+++ b/sys-apps/mtree/mtree-1.5.ebuild
@@ -1,13 +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/sys-apps/mtree/mtree-1.5.ebuild,v 1.1 2003/09/09 13:12:30 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.5.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 DESCRIPTION="mtree is used to check the permissions of a file system against a spec file"
 HOMEPAGE="http://www.netbsd.org/"
 SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/packages/bootstrap-pkgsrc.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 s390 ~ppc"
 IUSE=""
 DEPEND=""
 
@@ -16,11 +16,11 @@ S=${WORKDIR}/bootstrap-pkgsrc
 src_compile() {
 	cd digest
 	chmod +x configure
-	econf
+	econf || die "econf failed"
 	emake || die
 	cd ../mtree
 	chmod +x configure
-	econf
+	econf || die "econf failed"
 	emake || die
 }
 
diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 94d997914204..4d269b1cef0d 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,11 +1,239 @@
 # ChangeLog for sys-apps/net-tools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> net-tools-1.60-r11.ebuild:
+  Marked stable on mips.
+
+  29 May 2005; <solar@gentoo.org> net-tools-1.60-r9.ebuild:
+  - update sys-apps/net-tools to use libc expanded variable elibc_uclibc vs
+  uclibc so USE=-* works
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> net-tools-1.60-r11.ebuild:
+  Stable on ppc64
+
+  28 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  net-tools-1.60-r11.ebuild:
+  Stable on ppc.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  net-tools-1.60-r11.ebuild:
+  Stable on alpha.
+
+  14 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  net-tools-1.60-r11.ebuild:
+  Stable on sparc
+
+*net-tools-1.60-r11 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60-r11.ebuild:
+  Move to using a patch tarball, add some updates from Fedora, add ipv6
+  hostname fix by pasi.valminen@hut.fi #42650, and add support for infiniband
+  to ifconfig by Tom Duffy #81180.
+
+  10 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.60-Makefile.patch, net-tools-1.60-r10.ebuild:
+  Remove all references to config.h so the configure script will never run
+  again #77348.
+
+*net-tools-1.60-r10 (06 Jan 2005)
+
+  06 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.60-appletalk.patch, files/1.60-man.patch,
+  +files/1.60-numeric-ports.patch, +files/1.60-wide.patch,
+  +net-tools-1.60-r10.ebuild:
+  Add patch by comabug@gmail.com for the -w flag (dont truncate hostnames)
+  #53731. Fix numeric translation with patch by Mads Martin Joergensen #76756.
+  Ad patch from Debian to parse the appletalk format.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Oct 2004; Tom Gall <tgall@gentoo.org> net-tools-1.60-r9.ebuild:
+  stable on ppc64, bug #58633
+
+  30 Oct 2004; Michael Imhof <tantive@gentoo.org> net-tools-1.60-r9.ebuild:
+  Marked stable on s390. Closes #58633.
+
+  19 Oct 2004; Simon Stelling <blubb@gentoo.org> net-tools-1.60-r9.ebuild:
+  stable on amd64
+
+  18 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  net-tools-1.60-r9.ebuild:
+  Stable on alpha, bug 58633.
+
+  18 Oct 2004; Guy Martin <gmsoft@gentoo.org> net-tools-1.60-r9.ebuild:
+  Stable on hppa.
+
+  17 Oct 2004; Hardave Riar <hardave@gentoo.org> net-tools-1.60-r9.ebuild:
+  Stable on mips, bug #58633.
+
+  17 Oct 2004; Jason Wever <weeve@gentoo.org> net-tools-1.60-r9.ebuild:
+  Stable on sparc wrt security bug #58633.
+
+  17 Oct 2004; Michael Hanselmann <hansmi@gentoo.org>
+  net-tools-1.60-r9.ebuild:
+  Stable on PowerPC.
+
+  17 Oct 2004; <solar@gentoo.org> net-tools-1.60-r9.ebuild:
+  marked stable x86
+
+  17 Aug 2004; <solar@gentoo.org> files/net-tools-1.60-get_name.patch:
+  updated the get_name patch a little as per comment 16/17 bug 58633
+
+*net-tools-1.60-r9 (12 Aug 2004)
+
+  12 Aug 2004; <solar@gentoo.org> net-tools-1.60-r9.ebuild,
+  files/net-tools-1.60-get_name.patch:
+  get_name() scans past the first ':' looking for <digit>*: - however if the
+  bytes field has grown far enough to butt right up to the interface name it
+  will cause get_name to parse over the bytes field thinking it may be an alias
+  thus triggering an overflow. bug 58633
+
+  17 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  net-tools-1.60-r8.ebuild:
+  use emake (work around buggy makefiles); error check; tidy
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -net-tools-1.60-r7.ebuild:
+  clean older ebuild
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> net-tools-1.60-r7.ebuild:
+  QA - fix use invocation
+
+  15 Jun 2004; <solar@gentoo.org> net-tools-1.60-r8.ebuild:
+  added uclibc support
+
+  19 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.4 patch #48167 by George L. Emigh.
+
+  29 Mar 2004; Sven Blumenstein <bazik@gentoo.org>
+  files/net-tools-1.60-cleanup-list-handling.patch:
+  Fixed net-tools-1.60-cleanup-list-handling.patch, closes bug #46082,
+  blameseemant! :)
+
+*net-tools-1.60-r8 (28 Mar 2004)
+
+  28 Mar 2004; Seemant Kulleen <seemant@gentoo.org> net-tools-1.60-r6.ebuild,
+  net-tools-1.60-r8.ebuild, files/net-tools-1.60-cleanup-list-handling.patch:
+  fix for nameif segfaulting on larger mtabs, thanks to: Tony Vroon
+  <tony@vroon.org> in bug #37769
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> net-tools-1.60-r7.ebuild:
+  adding initial s390 support
+
+  19 Oct 2003; <plasmaroo@gentoo.org> net-tools-1.60-r7.ebuild,
+  files/net-tools-1.60-2.6-compilefix.patch:
+  Added patch to get net-tools to go on 2.6 headers: Bug #31240.
+  Thanks to Peter Gnodde <peter@gnodde.org> for the patch.
+
+*net-tools-1.60-r7 (18 May 2003)
+
+  29 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add small manpage patch #29677.
+
+  23 Jun 2003; Aron Griffis <agriffis@gentoo.org> net-tools-1.60-r7.ebuild:
+  Mark stable on alpha
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> net-tools-1.60-r7.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> net-tools-1.60-r7.ebuild:
+  Changed ~sparc & ~mips to sparc & mips
+
+  18 Jun 2003; <msterret@gentoo.org> net-tools-1.60-r7.ebuild:
+  Add support for use static (bug 22450) based on code from Sascha Silbe
+  Use sed -i
+
+
+  18 May 2003; Nicholas Wourms <dragon@gentoo.org> net-tools-1.60-r7.ebuild:
+  Version bump. Add Manifest. Update ether-wake to Donald Becker's latest
+  version (1.08). Add an english manpage for ether-wake. Add newline characters
+  to various multi-line string literals in order to fix gcc-3.3 compile errors.
+  Update lib/masq_info.c to support ipvs configurations. Update netstat to fix
+  interface name output and to support modifying the statistics refresh delay as
+  a command-line argument.
+
+*net-tools-1.60-r6 (18 Mar 2003)
+
+  18 Mar 2003; Martin Holzer <mholzer@gentoo.org> net-tools-1.60-r5.ebuild,
+  net-tools-1.60-r5.ebuild, net-tools-1.60-r6.ebuild:
+  Fixed manpages are not installed cause of nls use flag.
+
+*net-tools-1.60-r5 (16 Jul 2002)
+
+  18 Mar 2003; Martin Holzer <mholzer@gentoo.org> net-tools-1.60-r5.ebuild:
+  Now installing man pages. Closes #17562.
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> net-tools-1.60-r5.ebuild :
+  Marked as stable for mips.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> net-tools-1.60-r5.ebuild :
+  Added arm to keywords.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> net-tools-1.60-r4.ebuild
+  net-tools-1.60-r5.ebuild :
+
+  Many things -- moved the files and patches from files/ subdirectory into a
+  tarball and sent it to the mirrors.  Also, changed sed expression
+  delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> net-tools-1.60-r5.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  19 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Under heavy loads the timestamps on the config files may cause
+  the config process to be re-run requiring user input
+  Both files are now touched at the same time (#10799)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag
+
+  16 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+  added some RH patches
+
+*net-tools-1.60-r4 (21 Jun 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  19 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Under heavy loads the timestamps on the config files may cause
+  the config process to be re-run requiring user input.
+  Both files are now touched at the same time (#10799)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> net-tools-1.60-r4.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  21 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Only install /bin/hostname during USE=build.
+
+*net-tools-1.60-r3 (20 Mar 2002)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed bootcd USE flag
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> net-tools-1.60-r3.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  20 Mar 2002; Seemant Kulleen <seemant@gentoo.org> net-tools-1.60-r3 :
+  Alternate implementation of USE dependent nls compilation.
+
+*net-tools-1.60-r2 (12 Mar 2002)
+  
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> net-tools-1.60-r2 :
+  Added USE dependent nls compilation
 
 *net-tools-1.60-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/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 4005893422d8..177ab13e9b15 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,5 +1,11 @@
-MD5 358f13b3d3431b89a33377972047fdf4 ChangeLog 3841
-MD5 6bd4de209644fc174d806cdc022d8215 net-tools-1.60-r7.ebuild 2440
-MD5 97c6879f072588bdaa14c894380672f4 net-tools-1.60-r6.ebuild 2278
-MD5 a959c1cde872578cac11854c55ab9d55 files/digest-net-tools-1.60-r6 145
-MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r7 148
+MD5 d7179d0b79fdc01831668bf6e27d2efb ChangeLog 8920
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 525ce366a2cad86e72c01e2cfe84ef2c net-tools-1.60-r11.ebuild 2103
+MD5 f2d060ba7da394a61bdd8510cd205b6b net-tools-1.60-r9.ebuild 3311
+MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
+MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
+MD5 05ebbcad45030e806f8be710defa0aac files/digest-net-tools-1.60-r11 145
+MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
+MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
+MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
+MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
diff --git a/sys-apps/net-tools/files/1.60-man.patch b/sys-apps/net-tools/files/1.60-man.patch
index ebcb09a40b8d..61e53416a9f0 100644
--- a/sys-apps/net-tools/files/1.60-man.patch
+++ b/sys-apps/net-tools/files/1.60-man.patch
@@ -1,3 +1,10 @@
+splite writes:
+The netstat(8) man page in sys-apps/net-tools states that the "-i" and
+"--interfaces" flags to netstat take an optional argument denoting a 
+particular interface when it in fact does not.
+
+http://bugs.gentoo.org/show_bug.cgi?id=29677
+
 --- man/en_US/netstat.8.orig	2003-09-26 10:08:19.000000000 -0500
 +++ man/en_US/netstat.8	2003-09-26 10:25:39.000000000 -0500
 @@ -44,7 +44,6 @@
diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r11 b/sys-apps/net-tools/files/digest-net-tools-1.60-r11
index 72ffcede8ffa..90342c23c551 100644
--- a/sys-apps/net-tools/files/digest-net-tools-1.60-r11
+++ b/sys-apps/net-tools/files/digest-net-tools-1.60-r11
@@ -1,2 +1,2 @@
 MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520
-MD5 2dc2754baac85bfa639a516ba138e22a net-tools-1.60-patches-1.0.tar.bz2 26098
+MD5 186451136f7f088fad14c124c9a8b599 net-tools-1.60-patches-1.1.tar.bz2 26847
diff --git a/sys-apps/net-tools/files/net-tools-1.60-cleanup-list-handling.patch b/sys-apps/net-tools/files/net-tools-1.60-cleanup-list-handling.patch
index 93bc59461ee4..d8971585fcaa 100644
--- a/sys-apps/net-tools/files/net-tools-1.60-cleanup-list-handling.patch
+++ b/sys-apps/net-tools/files/net-tools-1.60-cleanup-list-handling.patch
@@ -1,56 +1,6 @@
-Received: (at 178209) by bugs.debian.org; 6 Mar 2003 23:41:35 +0000
-From ecki@lina.inka.de Thu Mar 06 17:41:35 2003
-Return-path: <ecki@lina.inka.de>
-Received: from quechua.inka.de (mail.inka.de) [193.197.184.2] (mail)
-	by master.debian.org with esmtp (Exim 3.12 1 (Debian))
-	id 18r4zW-0005lZ-00; Thu, 06 Mar 2003 17:41:34 -0600
-Received: from calista.inka.de (p508b2614.dip.t-dialin.net [80.139.38.20])
-	by mail.inka.de with asmtp 
-	id 18r4zU-0003YP-00; Fri, 07 Mar 2003 00:41:32 +0100
-Received: from ecki by calista.inka.de with local   (Exim 3.35 #1 (Debian))
-	id 18r4zS-0007tr-00; Fri, 07 Mar 2003 00:41:30 +0100
-Date: Fri, 7 Mar 2003 00:41:30 +0100
-To: Matt Domsch <Matt_Domsch@dell.com>
-Cc: 178209@bugs.debian.org
-Subject: Re: nameif segfault in net-tools-1.60
-Message-ID: <20030306234130.GB29359@lina.inka.de>
-References: <1046982565.1712.30.camel@localhost.localdomain> <20030306230708.GA29359@lina.inka.de> <1046992495.4526.19.camel@localhost.localdomain>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <1046992495.4526.19.camel@localhost.localdomain>
-User-Agent: Mutt/1.4i
-From: Bernd Eckenfels <ecki@lina.inka.de>
-Delivered-To: 178209@bugs.debian.org
-X-Spam-Status: No, hits=-4.2 required=4.0
-	tests=IN_REP_TO,PATCH_UNIFIED_DIFF,QUOTED_EMAIL_TEXT,REFERENCES,
-	      SIGNATURE_SHORT_DENSE,SPAM_PHRASE_00_01,USER_AGENT,
-	      USER_AGENT_MUTT
-	version=2.44
-X-Spam-Level: 
-
-On Thu, Mar 06, 2003 at 05:14:55PM -0600, Matt Domsch wrote:
-> 85748, filed against the Phoebe public beta so you can see it.
-
-I think the following will do it:
-
-Index: nameif.c
-===================================================================
-RCS file: /cvs/net-tools/nameif.c,v
-retrieving revision 1.1
-retrieving revision 1.3
 diff -u -r1.1 -r1.3
 --- nameif.c	18 Oct 2000 17:26:29 -0000	1.1
 +++ nameif.c	6 Mar 2003 23:26:52 -0000	1.3
-@@ -3,7 +3,7 @@
-  * Writen 2000 by Andi Kleen.
-  * Subject to the Gnu Public License, version 2.  
-  * TODO: make it support token ring etc.
-- * $Id: net-tools-1.60-cleanup-list-handling.patch,v 1.1 2004/03/29 07:34:04 seemant Exp $
-+ * $Id: net-tools-1.60-cleanup-list-handling.patch,v 1.1 2004/03/29 07:34:04 seemant Exp $
-  */ 
- #ifndef _GNU_SOURCE 
- #define _GNU_SOURCE
 @@ -117,7 +117,8 @@
  }
  
@@ -106,8 +56,6 @@ diff -u -r1.1 -r1.3
 +			warning(_("interface '%s' not found"), ch->ifname); 
  		free(ch); 
  	}
- 
-
 
 
 
diff --git a/sys-apps/net-tools/files/net-tools-1.60-get_name.patch b/sys-apps/net-tools/files/net-tools-1.60-get_name.patch
index fdde46e7ec8b..1371c672ce0e 100644
--- a/sys-apps/net-tools/files/net-tools-1.60-get_name.patch
+++ b/sys-apps/net-tools/files/net-tools-1.60-get_name.patch
@@ -42,7 +42,7 @@ diff -Nrup net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c
 +	if ((nameend-namestart)<IFNAMSIZ) {
 +	    memcpy(name,&p[namestart],nameend-namestart);
 +	    name[nameend-namestart]='\0';
-+	    p=&p[nameend];
++	    p=&p[nameend+1];
 +	} else {
 +	    /* Interface name too large */
 +	    name[0]='\0';
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/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-apps/net-tools/net-tools-1.60-r11.ebuild b/sys-apps/net-tools/net-tools-1.60-r11.ebuild
index 4a68e50190e9..5d8a49729cd0 100644
--- a/sys-apps/net-tools/net-tools-1.60-r11.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r11.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/sys-apps/net-tools/net-tools-1.60-r11.ebuild,v 1.1 2005/02/12 03:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r11.ebuild,v 1.1.1.1 2005/11/30 09:56:31 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
+PVER=1.1
 DESCRIPTION="Standard Linux networking tools"
 HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-1.0.tar.bz2"
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
 
 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 ppc64 s390 sh sparc x86"
 IUSE="nls build static"
 
 RDEPEND=""
-DEPEND="nls? ( sys-devel/gettext )
-	>=sys-apps/sed-4"
+DEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/net-tools/net-tools-1.60-r9.ebuild b/sys-apps/net-tools/net-tools-1.60-r9.ebuild
index 2408f1d87a20..0b0507ba16d8 100644
--- a/sys-apps/net-tools/net-tools-1.60-r9.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r9.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-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.1 2004/08/12 10:28:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
-inherit flag-o-matic gcc eutils
+inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Standard Linux networking tools"
 HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
@@ -11,18 +11,14 @@ SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="nls build static uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="nls build static"
 
+RDEPEND=""
 DEPEND="nls? ( sys-devel/gettext )
 	>=sys-apps/sed-4"
 
 src_unpack() {
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
 	PATCHDIR=${WORKDIR}/${P}-gentoo
 
 	unpack ${A}
@@ -53,6 +49,11 @@ src_unpack() {
 	cp ${PATCHDIR}/net-tools-1.60-config.h config.h
 	cp ${PATCHDIR}/net-tools-1.60-config.make config.make
 
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+
 	sed -i \
 		-e 's/^libdir:/libdir: version.h/' \
 		-e "s:-O2 -Wall -g:${CFLAGS}:" \
@@ -62,7 +63,7 @@ src_unpack() {
 	sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile \
 		|| die "sed man/Makefile failed"
 
-	if ! use uclibc ; then
+	if ! use elibc_uclibc ; then
 		cp -f ${PATCHDIR}/ether-wake.c ${S}
 		cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
 	fi
@@ -79,7 +80,8 @@ src_unpack() {
 }
 
 src_compile() {
-	#configure shouldn't run anymore so bug #820 shouldn't apply...
+	# configure shouldn't run anymore so bug #820 shouldn't apply...
+	tc-export CC
 	emake libdir || die "emake libdir failed"
 	emake || die "emake failed"
 
@@ -87,21 +89,21 @@ src_compile() {
 		emake i18ndir || die "emake i18ndir failed"
 	fi
 
-	if ! use uclibc ; then
-		$(gcc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
+	if ! use elibc_uclibc ; then
+		$(tc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
 	fi
 }
 
 src_install() {
 	make BASEDIR="${D}" install || die "make install failed"
 
-	if ! use uclibc ; then
+	if ! use elibc_uclibc ; then
 		dosbin ether-wake || die "dosbin failed"
 	fi
 	mv ${D}/bin/* ${D}/sbin || die "mv failed"
 	mv ${D}/sbin/{hostname,domainname,netstat,dnsdomainname,ypdomainname,nisdomainname} ${D}/bin \
 		|| die "mv failed"
-	use uclibc && rm -f ${D}/bin/{yp,nis}domainname
+	use elibc_uclibc && rm -f ${D}/bin/{yp,nis}domainname
 	dodir /usr/bin
 	dosym /bin/hostname /usr/bin/hostname
 
diff --git a/sys-apps/netboot-base/ChangeLog b/sys-apps/netboot-base/ChangeLog
index 12acdc6dac90..fbd9ee57615f 100644
--- a/sys-apps/netboot-base/ChangeLog
+++ b/sys-apps/netboot-base/ChangeLog
@@ -1,8 +1,13 @@
-# ChangeLog for 
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netboot-base/ChangeLog,v 1.1 2004/10/06 18:27:01 vapier Exp $
+# ChangeLog for sys-apps/netboot-base
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netboot-base/ChangeLog,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
-* (
+*netboot-base-20050110 (11 Jan 2005)
 
-  ; Mike Frysinger <vapier@gentoo.org> :
-  Initial import.  Ebuild submitted by 
+  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> +netboot-base-20050110.ebuild:
+  Fix syntax errors in functions.sh and fix kill of syslogd and devfsd.
+
+*netboot-base-* (06 Oct 2004)
+
+  06 Oct 2004; Mike Frysinger <vapier@gentoo.org> :
+  Initial import.  Ebuild submitted by me.
diff --git a/sys-apps/netboot-base/Manifest b/sys-apps/netboot-base/Manifest
index bdee59eeeb02..59cc0f2261dc 100644
--- a/sys-apps/netboot-base/Manifest
+++ b/sys-apps/netboot-base/Manifest
@@ -1,3 +1,6 @@
-MD5 95d40561a05913c0ba37896c4c6d63d5 netboot-base-20041006.ebuild 478
-MD5 5bb15e9c541d69a0c39c878fd6947fef files/digest-netboot-base-20041004 72
-MD5 bc230c15850cb66aee1f3015d6f88348 files/digest-netboot-base-20041006 72
+MD5 76a183fd3197ac28c86291ca22507c5a ChangeLog 529
+MD5 607dc51d1f0bcebda4b8fe238ddb7734 metadata.xml 286
+MD5 f75b672a5201cd146f46c712cb576445 netboot-base-20041007.ebuild 977
+MD5 c8cc5e8e688dd32d689b71fa086fca91 netboot-base-20050110.ebuild 977
+MD5 70bab51ddf543bb3c33317914b4c5fa3 files/digest-netboot-base-20041007 72
+MD5 8b9d4de8e410cd177be0fc1e26005ac4 files/digest-netboot-base-20050110 72
diff --git a/sys-apps/netboot-base/netboot-base-20041007.ebuild b/sys-apps/netboot-base/netboot-base-20041007.ebuild
index f11f76c04fa9..e5bf2703ad93 100644
--- a/sys-apps/netboot-base/netboot-base-20041007.ebuild
+++ b/sys-apps/netboot-base/netboot-base-20041007.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-apps/netboot-base/netboot-base-20041007.ebuild,v 1.1 2004/10/07 21:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netboot-base/netboot-base-20041007.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
 DESCRIPTION="Baselayout for netboot systems"
 HOMEPAGE="http://www.gentoo.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~vapier/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="arm hppa x86"
+KEYWORDS="alpha arm hppa mips ppc sparc x86"
 IUSE=""
 
 DEPEND=""
@@ -19,24 +19,25 @@ DEPEND=""
 S=${WORKDIR}
 
 pkg_setup() {
-	[ "${ROOT}" == "/" ] && die "refusing to emerge to /"
+	[[ ${ROOT} = "/" ]] && die "refusing to emerge to /"
 }
 
 src_compile() {
-	$(gcc-getCC) ${CFLAGS} src/consoletype.c -o sbin/consoletype || die
-	strip --strip-unneeded sbin/consoletype
+	$(tc-getCC) ${CFLAGS} src/consoletype.c -o sbin/consoletype || die
+	$(tc-getSTRIP) --strip-unneeded sbin/consoletype
 }
 
 src_install() {
-	[ "${ROOT}" == "/" ] && die "refusing to install to /"
+	[[ ${ROOT} = "/" ]] && die "refusing to install to /"
 	rm -r src
 	cp -r * ${D}/
 }
 
 pkg_postinst() {
-	cd ${ROOT}
+	cd "${ROOT}"
 	mkdir -p bin dev etc lib mnt proc sbin var
 	mkdir -p var/log
 	mkdir -p mnt/gentoo
 	ln -s . usr
+	ln -s . share
 }
diff --git a/sys-apps/netboot-base/netboot-base-20050110.ebuild b/sys-apps/netboot-base/netboot-base-20050110.ebuild
index f59a1f82714c..1367f537e7a8 100644
--- a/sys-apps/netboot-base/netboot-base-20050110.ebuild
+++ b/sys-apps/netboot-base/netboot-base-20050110.ebuild
@@ -1,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-apps/netboot-base/netboot-base-20050110.ebuild,v 1.1 2005/01/10 23:40:02 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netboot-base/netboot-base-20050110.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/netkit-base/ChangeLog b/sys-apps/netkit-base/ChangeLog
index a5d5d5ce920b..bb0c277c2332 100644
--- a/sys-apps/netkit-base/ChangeLog
+++ b/sys-apps/netkit-base/ChangeLog
@@ -1,7 +1,105 @@
 # ChangeLog for sys-apps/netkit-base
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
+  29 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/003_all_netkit-base-0.17-gcc4.patch.bz2,
+  +files/004_all_netkit-base-0.17-misc-fixes.patch.bz2:
+  Add gcc4 patch from bug #89345.  Add some other misc fixes from my own.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> netkit-base-0.17-r8.ebuild:
+  sync IUSE (+build)
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> netkit-base-0.17-r6.ebuild,
+  netkit-base-0.17-r7.ebuild, netkit-base-0.17-r8.ebuild:
+  QA - fix use invocation
+
+  12 Aug 2003; Jason Wever <weeve@gentoo.org> netkit-base-0.17-r8.ebuild:
+  Added sparc to keywords.
+
+*netkit-base-0.17-r8 (19 Jun 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> netkit-base-0.17-r8.ebuild :
+  Added hppa to KEYWORDS.
+
+  04 Jul 2003; Joshua Kinard <kumba@gentoo.org> netkit-base-0.17-r8.ebuild:
+  Adding mips to KEYWORDS to comply with profile changes
+
+  30 Jun 2003; Jon Portnoy <avenj@gentoo.org> netkit-base-0.17-r8.ebuild:
+  Stable on alpha + ppc, necessary for netkit-base -> iputils move.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> netkit-base-0.17-r7.ebuild:
+  Mark stable on alpha
+
+  19 Jun 2003; Jon Portnoy <avenj@gentoo.org> netkit-base-0.17-r8 :
+  This revision no longer provides the 'ping' utility. Ping now
+  comes from iputils instead. NOTE FOR OTHER ARCHs: do _NOT_
+  add KEYWORDS for your arch here unless you have iputils
+  in your default profile!
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+*netkit-base-0.17-r7 (22 Dec 2002)
+
+  26 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  netkit-base-0.17-r6.ebuild, netkit-base-0.17-r7.ebuild,
+  files/001_alpha_netkit-base-0.17-ping-fix.patch.bz2,
+  files/002_all_netkit-base-0.17-wrong-byte-fix.patch.bz2,
+  files/netkit-base-0.17-alpha-ping-fix.patch,
+  files/netkit-base-0.17-wrong-byte-fix.patch:
+  compressed and renamed patches to allow epatch's intelligent patching to
+  happen. Also, provides virtual/inetd
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-base-0.17-r7.ebuild :
+  Marked as stable for mips.
+
+  02 Jan 2002; Nick Hadaway <raker@gentoo.org> netkit-base-0.17-r7.ebuild :
+  Now using epatch.
+
+  22 Dec 2002; Nick Hadaway <raker@gentoo.org>
+  netkit-base-0.17-r7.ebuild,
+  files/digest-netkit-base-0.17-r7,
+  files/netkit-base-0.17-wrong-byte-fix.patch :
+  Updated ebuild with a patch for ping posted by
+  ragnar@linalco.com (Ragnar Hojland Espinosa) on bug # 12023.
+  Currently marked unstable.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*netkit-base-0.17-r6 (1 May 2002)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  netkit-base-0.17-r6.ebuild:
+  use epatch instead
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-base-0.17-r6.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  1 May 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  files/netkit-base-0.17-r6.ebuild, files/digest-netkit-base-0.17-r6,
+  ChangeLog :
+
+  Default to using telnetlogin in the inetd.conf sample. Resolves bug
+  #1898.
+
+*netkit-base-0.17-r5 (8 Feb 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> netkit-base-0.17-r5.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  8 Feb 2002; Donny Davies <woodchip@gentoo.org> files/inetd.rc6,
+  files/netkit-base-0.17-r5.ebuild, files/digest-netkit-base-0.17-r5 :
+
+  Added initscript /etc/init.d/inetd.  Thanks to Travis Tilley for
+  the submission (lordviram@nesit.org).
+  
 *netkit-base-0.17-r4 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
@@ -11,3 +109,4 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest
index e69de29bb2d1..ad55aaa63743 100644
--- a/sys-apps/netkit-base/Manifest
+++ b/sys-apps/netkit-base/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16f9f6cfe937e7f3bcf6a52d9d1c2f17 ChangeLog 4213
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e1fb4407613c7df9285bc22e6903d869 netkit-base-0.17-r8.ebuild 1311
+MD5 a6d426736cbb3c0534504a6e2d041b36 files/001_alpha_netkit-base-0.17-ping-fix.patch.bz2 686
+MD5 a770366b91d1b0e666ed61ccfff827bc files/digest-netkit-base-0.17-r8 67
+MD5 93d4bc3300be01ea835abfc46863d005 files/002_all_netkit-base-0.17-wrong-byte-fix.patch.bz2 425
+MD5 9fd363583a8d1e68d34ff81fcf74c034 files/inetd.rc6 580
+MD5 809c07c7f0ff80b272ee8e2b1249c63c files/004_all_netkit-base-0.17-misc-fixes.patch.bz2 722
+MD5 1e5771fef89d824942c9b812bf03a4cf files/003_all_netkit-base-0.17-gcc4.patch.bz2 286
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCchDG1ZcsMnZjRyIRAtQpAKCGU595cNFRC08QcD0wsTH/ZVa0cwCfYcnR
+xVc606Qs6PQ1i+DcsXc+GCo=
+=GZz9
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/netkit-base/files/inetd.rc6 b/sys-apps/netkit-base/files/inetd.rc6
index bd5ebd391323..e08fc6aeb23b 100644
--- a/sys-apps/netkit-base/files/inetd.rc6
+++ b/sys-apps/netkit-base/files/inetd.rc6
@@ -1,15 +1,19 @@
 #!/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-apps/netkit-base/files/inetd.rc6,v 1.1 2002/02/09 00:22:34 woodchip Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/files/inetd.rc6,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
 	ebegin "Starting inetd"
+	(
+	# workaround for #25754
+	unset -f `declare -F | sed 's:declare -f::g'`
 	start-stop-daemon --start --quiet --pidfile /var/run/inetd.pid --exec /usr/sbin/inetd
+	)
 	eend $?
 }
 
diff --git a/sys-apps/netkit-base/metadata.xml b/sys-apps/netkit-base/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/netkit-base/metadata.xml
+++ b/sys-apps/netkit-base/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-apps/netkit-base/netkit-base-0.17-r8.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
index 5ffbe738205b..c746506ef089 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
@@ -1,29 +1,28 @@
-# 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-apps/netkit-base/netkit-base-0.17-r8.ebuild,v 1.1 2003/06/19 20:25:24 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild,v 1.1.1.1 2005/11/30 09:56:07 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Old-style inetd"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 
-# Only keyword for your arch if you have iputils in your default profile!
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
-
+DEPEND=""
 PROVIDE="virtual/inetd"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	
+	cd "${S}"
+
 	# Note that epatch will intelligently patch architecture specific
 	# patches as well
-	epatch ${FILESDIR}
+	epatch "${FILESDIR}"
 }
 
 src_compile() {
@@ -38,30 +37,14 @@ src_compile() {
 }
 
 src_install() {
-	exeopts -m 4755
-
-	# avenj@gentoo.org 19 June 03:
-	# Uncomment for the (obsolete) version of ping.
-	# Most people should merge iputils instead.
-#	exeinto /bin
-#	doexe ping/ping
+	sed -i \
+		-e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \
+		etc.sample/inetd.conf
 
-	if [ -z "`use build`" ]
-	then
-		cd ${S}/etc.sample
-		sed -e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \
-			< inetd.conf > inetd.conf.new
-		mv inetd.conf.new inetd.conf
-		cd ${S}
+	dosbin inetd/inetd
+	doman inetd/inetd.8
+	newinitd "${FILESDIR}"/inetd.rc6 inetd
 
-		exeopts -m 755
-		exeinto /usr/bin
-		dosbin inetd/inetd
-		doman inetd/inetd.8 inetd/daemon.3
-#		doman inetd/inetd.8 inetd/daemon.3 ping/ping.8
-		
-		dodoc BUGS ChangeLog README
-		docinto samples ; dodoc etc.sample/*
-		exeinto /etc/init.d ; newexe ${FILESDIR}/inetd.rc6 inetd
-	fi
+	dodoc BUGS ChangeLog README
+	docinto samples ; dodoc etc.sample/*
 }
diff --git a/sys-apps/netplug/ChangeLog b/sys-apps/netplug/ChangeLog
index 3441609b6704..1cd5dde06615 100644
--- a/sys-apps/netplug/ChangeLog
+++ b/sys-apps/netplug/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/netplug
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.1 2005/09/02 11:11:20 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  19 Oct 2005; Doug Goldstein <cardoe@gentoo.org> netplug-1.2.9-r1.ebuild:
+  adding ~ppc keyword
+
+*netplug-1.2.9-r1 (13 Oct 2005)
+
+  13 Oct 2005; Roy Marples <uberlord@gentoo.org> files/netplug,
+  -netplug-1.2.9.ebuild, +netplug-1.2.9-r1.ebuild:
+  Fixed initng support.
+
+  10 Oct 2005; Roy Marples <uberlord@gentoo.org> netplug-1.2.9.ebuild:
+  Stable on amd64 and x86.
 
 *netplug-1.2.9 (02 Sep 2005)
 
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index a200fd7e7cce..543aba6e1ef3 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -1,5 +1,16 @@
-MD5 e3697dcef5a16afbda7b03a69e96d9de netplug-1.2.9.ebuild 1035
-MD5 019c37ba80d6e01ea4d01f93e0565bd3 metadata.xml 333
-MD5 bbf36ab8c5d2299554b436930e93722f files/netplug 1118
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 38d5cc50578b87c1995cd2b6ae03cdaf ChangeLog 763
+MD5 e5ca23da76196da2b350d78793138426 files/digest-netplug-1.2.9-r1 65
+MD5 ab668235065a75c98fb3896a70bab40f files/netplug 1000
 MD5 a310e86707b8f304165f61160b3ce215 files/netplug-1.2.9-gcc4.patch 362
-MD5 e5ca23da76196da2b350d78793138426 files/digest-netplug-1.2.9 65
+MD5 019c37ba80d6e01ea4d01f93e0565bd3 metadata.xml 333
+MD5 67cf72afba42e89e1f5714846b75e517 netplug-1.2.9-r1.ebuild 1142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVl8yBtvusYtCZMsRAiHlAJ4l8gxtP7Hi/4VTvkK+TAld20NlSgCfXT9d
+PLfks/nB4zOVgjiyvtZVnAg=
+=D7bW
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/netplug/files/netplug b/sys-apps/netplug/files/netplug
index 7b4094954c7d..6ae0dcd1b542 100755
--- a/sys-apps/netplug/files/netplug
+++ b/sys-apps/netplug/files/netplug
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/files/netplug,v 1.1 2005/09/02 11:11:21 uberlord Exp $
 #
 # Gentoo-specific netplug script 
 #
@@ -14,7 +13,7 @@ ACTION="$2"
 
 if grep -q initng /proc/1/cmdline 
 then
-    EXEC="ngc"
+    EXEC="/sbin/ngc"
     INITNG="yes"
 else
     EXEC="/etc/init.d/net.${IFACE}"
diff --git a/sys-apps/netplug/netplug-1.2.9-r1.ebuild b/sys-apps/netplug/netplug-1.2.9-r1.ebuild
index 697aeeb8020c..406495ec356d 100644
--- a/sys-apps/netplug/netplug-1.2.9-r1.ebuild
+++ b/sys-apps/netplug/netplug-1.2.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/sys-apps/netplug/netplug-1.2.9-r1.ebuild,v 1.1 2005/10/13 16:41:50 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netplug/netplug-1.2.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit eutils
 DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.red-bean.com/~bos/"
 SRC_URI="http://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 hax_bitkeeper() {
diff --git a/sys-apps/nictools/ChangeLog b/sys-apps/nictools/ChangeLog
index 415238273b38..c5291d9acd9d 100644
--- a/sys-apps/nictools/ChangeLog
+++ b/sys-apps/nictools/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-apps/nictools
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nictools/ChangeLog,v 1.1 2003/07/20 04:07:37 robbat2 Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nictools/ChangeLog,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nictools-20030719.ebuild:
+  Add inherit eutils
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  nictools-20030719.ebuild:
+  update metadata.xml. correct bug #37284.
+
+  25 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> nictools-20030719.ebuild:
+  forgot to add patch to distfiles list
+
+  23 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> nictools-20030719.ebuild:
+  fix for gcc3.3 multiline string literals
 
 *nictools-20030719 (19 Jul 2003)
 
diff --git a/sys-apps/nictools/Manifest b/sys-apps/nictools/Manifest
index 871cf949bdd0..d813387c3181 100644
--- a/sys-apps/nictools/Manifest
+++ b/sys-apps/nictools/Manifest
@@ -1,3 +1,4 @@
-MD5 9b5c4519049e02019508793782609356 nictools-20030719.ebuild 1835
-MD5 99006529bbe06e04898406f36893aaad ChangeLog 358
-MD5 c6c7fffb17e5b59f0b920a3e44f0406e files/digest-nictools-20030719 67
+MD5 e269935cf3307f883c3462ab42f8d8c3 nictools-20030719.ebuild 1960
+MD5 b9afcb7a5eaa634e6311ec00d6c9d996 ChangeLog 865
+MD5 e25e70948beb656da0b6fa0b48124f16 metadata.xml 227
+MD5 6e0941cbc700e8778d79aac72edcefc1 files/digest-nictools-20030719 156
diff --git a/sys-apps/nictools/files/digest-nictools-20030719 b/sys-apps/nictools/files/digest-nictools-20030719
index 2a6fcedf5cdc..92aff462afe2 100644
--- a/sys-apps/nictools/files/digest-nictools-20030719
+++ b/sys-apps/nictools/files/digest-nictools-20030719
@@ -1 +1,2 @@
 MD5 af92d4c7d5c8d6b12cd7ff9148f89ae6 nictools-20030719.tbz2 110252
+MD5 625b99f0d2395b75b6f085332c5a19cf nictools-20030719-gcc33-multilinestring.patch 54747
diff --git a/sys-apps/nictools/metadata.xml b/sys-apps/nictools/metadata.xml
index f093d416cbb1..035bc6b0e2cd 100644
--- a/sys-apps/nictools/metadata.xml
+++ b/sys-apps/nictools/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>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/nictools/nictools-20030719.ebuild b/sys-apps/nictools/nictools-20030719.ebuild
index d238f50abf0e..d630c8428798 100644
--- a/sys-apps/nictools/nictools-20030719.ebuild
+++ b/sys-apps/nictools/nictools-20030719.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/sys-apps/nictools/nictools-20030719.ebuild,v 1.1 2003/07/20 04:07:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nictools/nictools-20030719.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="nictools - diagnostic tools for a variety of ISA and PCI network cards"
 HOMEPAGE="http://www.scyld.com/diag/index.html"
@@ -8,15 +10,14 @@ HOMEPAGE="http://www.scyld.com/diag/index.html"
 # of the files from all of the debian package, and the entirely of the Scyld
 # website.
 # It has a vastly modified Makefile to make it easy to build on Gentoo
-SRC_URI="mirrors:/gentoo/${P}.tbz2"
+SRC_URI="mirror://gentoo/${P}.tbz2
+		 mirror://gentoo/${P}-gcc33-multilinestring.patch"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="static"
 DEPEND=""
 
-S=${WORKDIR}/${P}
-
 nictools_grabvar() {
 	gmake VAR="${1}" printvar
 }
@@ -39,6 +40,11 @@ pkg_setup() {
 	einfo "do: 'NICTOOLS_CARDS=\"pci\" emerge nictools' or 'NICTOOLS_CARDS=\"isa\" emerge nictools'"
 }
 
+src_unpack() {
+	unpack ${P}.tbz2
+	epatch ${DISTDIR}/${P}-gcc33-multilinestring.patch
+}
+
 src_compile() {
 	nictools_setupcards
 	use static && CFLAGS="${CFLAGS} -static"
@@ -56,4 +62,3 @@ src_install() {
 	into /usr
 	doman netdiag.8
 }
-
diff --git a/sys-apps/noexec/ChangeLog b/sys-apps/noexec/ChangeLog
index ba36feec4372..ac130b29efa3 100644
--- a/sys-apps/noexec/ChangeLog
+++ b/sys-apps/noexec/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/noexec
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/noexec/ChangeLog,v 1.1 2004/02/22 09:35:21 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/noexec/ChangeLog,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
+
+  26 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  noexec-1.1.0.ebuild:
+  mark ~ppc
+
+  06 Nov 2004; <pyrania@gentoo.org> noexec-1.1.0.ebuild:
+  Marked stable on x86.
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> noexec-1.1.0.ebuild:
+  sync IUSE (missing)
 
 *noexec-1.1.0 (22 Feb 2004)
 
diff --git a/sys-apps/noexec/Manifest b/sys-apps/noexec/Manifest
index 387db6ba4911..3fa751ab14e1 100644
--- a/sys-apps/noexec/Manifest
+++ b/sys-apps/noexec/Manifest
@@ -1,3 +1,3 @@
+MD5 f8c502c5214fbdf3552bbb9357cd2bd8 ChangeLog 614
+MD5 ab78de1d43c51eef45bb46136f664822 noexec-1.1.0.ebuild 593
 MD5 5ba454a6dac51ece89aa6772aa467223 files/digest-noexec-1.1.0 64
-MD5 18d0c4c795d78fdeec4ecdd089f503c3 noexec-1.1.0.ebuild 591
-MD5 ee190b9dd1fc61529bd78f3c01f4c0b8 ChangeLog 352
diff --git a/sys-apps/noexec/noexec-1.1.0.ebuild b/sys-apps/noexec/noexec-1.1.0.ebuild
index 8cb035b9960a..f8390d4fb955 100644
--- a/sys-apps/noexec/noexec-1.1.0.ebuild
+++ b/sys-apps/noexec/noexec-1.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/sys-apps/noexec/noexec-1.1.0.ebuild,v 1.1 2004/02/22 09:35:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/noexec/noexec-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:27 chriswhite Exp $
 
 DESCRIPTION="a package for preventing processes from using exec system calls"
 HOMEPAGE="http://noexec.sourceforge.net/"
@@ -8,7 +8,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND=">=sys-libs/glibc-2.3.2-r9"
 
diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index a4cb81852349..cef7016aee93 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,244 @@
 # ChangeLog for sys-apps/pam-login
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.1 2002/04/28 14:19:31 azarah Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.1.1.1 2005/11/30 09:56:06 chriswhite Exp $
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  pam-login-4.0.12.ebuild:
+  Use bindnow-flags instead of -Wl,-z,now.
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  pam-login-4.0.12.ebuild:
+  Call autoconf before elibtoolizing (and use eautoconf instead). Add missing
+  skey useflag. Added pam-bugs@gentoo.org as mail address for pam herd.
+
+*pam-login-4.0.12 (24 Aug 2005)
+
+  24 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/pam-login-4.0.12-dots-in-usernames.patch,
+  +files/pam-login-4.0.12-long-groupnames.patch, +pam-login-4.0.12.ebuild:
+  Update version.
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  pam-login-4.0.11.1-r2.ebuild:
+  Don't use cp -a.
+
+  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> pam-login-3.17.ebuild:
+  Stable on mips.
+
+*pam-login-4.0.11.1-r2 (03 Aug 2005)
+
+  03 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/login.defs-4.0,
+  +files/pam-login-4.0.5-skey.patch, +files/pam-login-4.0.11.1-SUPATH.patch,
+  +files/pam-login-4.0.11.1-ngettext.patch,
+  +files/pam-login-4.0.11.1-uclibc-missing-l64a.patch,
+  +pam-login-4.0.11.1-r2.ebuild:
+  Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047).
+  Fix building on UCLIBC.
+
+*pam-login-4.0.11.1-r1 (01 Aug 2005)
+
+  01 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/login.pamd-4.0,
+  +pam-login-4.0.11.1-r1.ebuild:
+  Add needed entry for selinux, thanks pebenito.
+
+*pam-login-4.0.11.1 (01 Aug 2005)
+
+  01 Aug 2005; Martin Schlemmer <azarah@gentoo.org> +files/login.defs-4.0,
+  +files/login.pamd-4.0, +files/pam-login-4.0.10-fix-configure.patch,
+  +pam-login-4.0.11.1.ebuild:
+  Sync with Shadow ... too many changes these days to keep track. Redo pamd
+  file, as the PAM enabled version no longer use LASTLOG, etc.
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pam-login-3.17.ebuild:
+  Stable on alpha.
+
+  10 Jul 2005; Joseph Jezak <josejx@gentoo.org> pam-login-3.17.ebuild:
+  Marked ppc stable.
+
+  08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> pam-login-3.17.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> pam-login-3.17.ebuild:
+  Stable on sparc
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> pam-login-3.17.ebuild:
+  Stable on ppc64
+
+  07 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> pam-login-3.17.ebuild:
+  Stable on amd64
+
+  20 May 2005; Diego Pettenò <flameeyes@gentoo.org> pam-login-3.17.ebuild:
+  Inherit pam for newpamd file.
+
+*pam-login-3.17 (25 Feb 2005)
+
+  25 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +files/login.pamd,
+  +files/pam-login-3.17-query_user_context.patch, +pam-login-3.17.ebuild:
+  Update version. Add pam.d login file. Add pam_console comments to login
+  pam.d file. DEPEND on shadow-4.0.7-r1, as that do no longer install the
+  login pam.d file.
+
+  29 Nov 2004; Mike Frysinger <vapier@gentoo.org> pam-login-3.14.ebuild:
+  Doesnt actually require shadow #67815.
+
+  01 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> pam-login-3.14.ebuild:
+  gnuconfig_update in src_unpack; tidy
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> pam-login-3.10.ebuild,
+  pam-login-3.11-r1.ebuild, pam-login-3.11.ebuild, pam-login-3.12-r1.ebuild,
+  pam-login-3.12.ebuild, pam-login-3.14.ebuild, pam-login-3.6-r1.ebuild,
+  pam-login-3.6-r2.ebuild, pam-login-3.7.ebuild:
+  sync IUSE (+nls), glibc -> libc, trim trailing whitespace
+
+  27 Jun 2004; Chris PeBenito <pebenito@gentoo.org> pam-login-3.14.ebuild:
+  Change the query_user_context patch to not apply with USE=livecd, since it can
+  cause login timeouts if the user isn't ready.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pam-login-3.11-r1.ebuild,
+  pam-login-3.12.ebuild, pam-login-3.14.ebuild:
+  Add inherit eutils
+
+  30 Mar 2004; Tom Gall <tgall@gentoo.org> pam-login-3.14.ebuild:
+  stable on ppc64 and minor fix 
+
+  09 Mar 2004; <agriffis@gentoo.org> pam-login-3.14.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> pam-login-3.14.ebuild:
+  Marked stable on mips.
+
+  09 Feb 2004; <gustavoz@gentoo.org> pam-login-3.14.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Guy Martin <gmsoft@gentoo.org> pam-login-3.14.ebuild:
+  Marked stable on hppa.
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> pam-login-3.14.ebuild:
+  Bump to stable for x86.
+
+  03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> pam-login-3.14.ebuild:
+  set ppc in keywords
+
+  21 Dec 2003; Brad House <brad_mssw@gentoo.org> pam-login-3.14.ebuild:
+  mark stable on amd64
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> pam-login-3.11-r1.ebuild,
+  pam-login-3.11.ebuild, pam-login-3.12-r1.ebuild, pam-login-3.12.ebuild,
+  files/pam-login-3.11-selinux-gcc33.patch, files/pam-login-3.11-selinux.diff:
+  Remove old API SELinux patches.
+
+  19 Oct 2003; Chris PeBenito <pebenito@gentoo.org> pam-login-3.14.ebuild,
+  files/pam-login-3.14-query_user_context.diff:
+  Patch to re-enable query_user_context SELinux code.
+
+*pam-login-3.14 (19 Oct 2003)
+
+  19 Oct 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.14.ebuild:
+  Update version.  Selinux changes from Chris PeBenito <pebenito@gentoo.org>.
+
+*pam-login-3.12-r1 (26 Sep 2003)
+
+  26 Sep 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.12-r1.ebuild:
+  Do not install /etc/pam.d/login.
+
+  25 Sep 2003; <rac@gentoo.org> pam-login-3.12.ebuild:
+  Emergency keywording -* due to reports of this version locking people out: see
+  http://forums.gentoo.org/viewtopic.php?t=89507
+
+*pam-login-3.12 (25 Sep 2003)
+
+  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.12.ebuild,
+  files/pam-login-3.11-lastlog-fix.patch:
+  Add version 3.12 to fix bug #27706 (fails to auth if credentials are
+  required). Add pam-login-3.11-lastlog-fix.patch to fix bug #28736, thanks to
+  bartron <bartron@gmx.net> (prints tty used wrong with lastlog).
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> pam-login-3.11-r1.ebuild,
+  pam-login-3.11.ebuild:
+  GCC 3.3 patch is required to amd64
+
+  13 Jul 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.11-r1.ebuild,
+  files/pam-login-3.11-selinux-gcc33.patch:
+  Fix gcc-3.3 patch to play nice with selinux.
+
+*pam-login-3.11-r1 (13 Jul 2003)
+
+  13 Jul 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.11-r1.ebuild,
+  files/pam-login-3.11-gcc33.patch:
+  Fix inlining issues with gcc-3.3, bug #21213, thanks to Andrew Bevitt
+  <andrew@volutin.net>.
+
+  28 Jun 2003; Chris PeBenito <pebenito@gentoo.org> pam-login-3.11.ebuild,
+  files/pam-login-3.11-selinux.diff:
+  Added patch for selinux.  Added missing IUSE.
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> pam-login-3.11.ebuild:
+  Mark stable on alpha
+
+*pam-login-3.11 (19 May 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> pam-login-3.11.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> pam-login-3.11.ebuild:
+  Changed ~sparc & ~mips to sparc & mips
+
+  20 May 2003; Joshua Kinard <kumba@gentoo.org> pam-login-3.11.ebuild:
+  Added gnuconfig eclass to support linux-mips targets
+
+  19 May 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.11.ebuild:
+  Fix gcc-3.3 compile issues, bug #21213.
+
+  24 Mar 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.10.ebuild :
+  Mark stable for x86.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+*pam-login-3.10 (30 Jan 2003)
+
+  28 Mar 2003; Christian Birchinger <joker@gentoo.org> pam-login-3.10.ebuild:
+  Added sparc stable keyword
+
+  30 Jan 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.10.ebuild :
+  New version, closing bug #14028.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords
+ 
+*pam-login-3.7 (2 Sep 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  2 Sep 2002; Martin Schlemmer <azarah@gentoo.org> pam-login-3.7.ebuild :
+  Update version.  This is basically just a bugfix release that fixes
+  the issues with 3.6 that was fixed in -r1 and -r2, namely bugs #3147,
+  #3643 and it not compiling with USE="-nls".  This closes bug #7328.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pam-login-3.6.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pam-login-3.6-r1.ebuild :
+  Added LICENSE, KEYWORDS.
+
+*pam-login-3.6-r2 (17 Jun 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pam-login-3.6-r2.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  17 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Add ENV_SUPATH support.  Should close bugs #3147, #3643.
+
+*pam-login-3.6 (26 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Resolve USE="-nls" compile issues.
 
 *pam-login-3.6 (28 Apr 2002)
 
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index a034de145106..aa554b6f9cc8 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,13 +1,26 @@
-MD5 93a7bd2fa4b0d6804920852f28526783 ChangeLog 1860
-MD5 4252dabdab49bb4d709610a75dae72b4 pam-login-3.6-r1.ebuild 1824
-MD5 a06af999a15ab19e9478fecdca3ee477 pam-login-3.6-r2.ebuild 1931
-MD5 e1eee071c059786d7d32c969c2264dec pam-login-3.7.ebuild 1977
-MD5 7af49aad99179b74a5d5ea72879ab2ed pam-login-3.10.ebuild 1984
-MD5 7af49aad99179b74a5d5ea72879ab2ed pam-login-3.11.ebuild 1984
-MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r1 66
-MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r2 66
-MD5 7febd6315d85fcd5196b602732789573 files/digest-pam-login-3.7 66
+MD5 15d112a169586b4b1c3db5e7b3f9e5ed ChangeLog 8940
+MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
+MD5 e7f9dde204926c73a570b344556e4b1e files/digest-pam-login-3.17 67
+MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r2 69
+MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-pam-login-4.0.12 67
 MD5 21df4caf263fa2ed75e574f9a067b72e files/login.defs 3229
-MD5 b3602716045d7154356137da6f5dcbad files/pam-login-3.6-SUPATH.patch 438
-MD5 387e811b73906d5f0e5d4417cccfed0e files/digest-pam-login-3.11 67
-MD5 a5e9be8a38e1b8f784d3cf558cff7a6b files/digest-pam-login-3.10 67
+MD5 9470faa54b704ceebd949da53eed5ccc files/login.defs-4.0 6255
+MD5 2e7603feaff187884dd9b1e66601f02b files/login.pamd 382
+MD5 e01e197ed3b6d2ec6ae83d23b33088b8 files/login.pamd-4.0 1019
+MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
+MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
+MD5 128c7d12948df01d7348a7edede0c2fb files/pam-login-3.14-query_user_context.diff 635
+MD5 2fdbabc344539e9dfd4955c061596a27 files/pam-login-3.17-query_user_context.patch 423
+MD5 95f7b8980169e81352229bd548909ea7 files/pam-login-4.0.10-fix-configure.patch 579
+MD5 44f064b586ea49c8e2dc1fca8b9e4599 files/pam-login-4.0.11.1-SUPATH.patch 1614
+MD5 450a2289f2a383296ad9af005e46da74 files/pam-login-4.0.11.1-ngettext.patch 1038
+MD5 c87c0968ace90b32753b91f93ad7bab1 files/pam-login-4.0.11.1-uclibc-missing-l64a.patch 1269
+MD5 b52179dd78e6b6d207600184022114db files/pam-login-4.0.12-dots-in-usernames.patch 1466
+MD5 804242385ef14139f4b46167396f26f8 files/pam-login-4.0.12-long-groupnames.patch 923
+MD5 636f233fa173a998195016c3808173d4 files/pam-login-4.0.5-skey.patch 395
+MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
+MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
+MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
+MD5 15f16bbb5e752541cd8346d7aa5d5904 pam-login-3.17.ebuild 2874
+MD5 b14a60034b1653ab8897c834b7b2d26d pam-login-4.0.11.1-r2.ebuild 3988
+MD5 df176d893e727f84defe9cab73658e23 pam-login-4.0.12.ebuild 3995
diff --git a/sys-apps/pam-login/files/login.defs b/sys-apps/pam-login/files/login.defs
index 9e42cfbf1079..c8e087703884 100644
--- a/sys-apps/pam-login/files/login.defs
+++ b/sys-apps/pam-login/files/login.defs
@@ -66,6 +66,11 @@ ENV_PATH                /usr/local/bin:/usr/bin:/bin
 ENV_ROOTPATH            /sbin:/bin:/usr/sbin:/usr/bin
 
 #
+# The default PATH settings when su'ing to root:
+#
+ENV_SUPATH              /sbin:/bin:/usr/sbin:/usr/bin
+
+#
 # Terminal permissions
 #
 #	TTYGROUP	Login tty will be assigned this group ownership.
diff --git a/sys-apps/pam-login/files/login.defs-4.0 b/sys-apps/pam-login/files/login.defs-4.0
index a59ba6834b26..54b27cb7edc2 100644
--- a/sys-apps/pam-login/files/login.defs-4.0
+++ b/sys-apps/pam-login/files/login.defs-4.0
@@ -1,7 +1,7 @@
 #
 # /etc/login.defs - Configuration control definitions for the login package.
 #
-#	$Id: login.defs-4.0,v 1.1 2005/08/01 11:48:13 azarah Exp $
+#	$Id: login.defs-4.0,v 1.1.1.1 2005/11/30 09:56:06 chriswhite Exp $
 #
 # Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
 # If unspecified, some arbitrary (and possibly incorrect) value will
@@ -78,6 +78,13 @@ HUSHLOGIN_FILE	.hushlogin
 #HUSHLOGIN_FILE	/etc/hushlogins
 
 #
+# *REQUIRED*  The default PATH settings, for superuser and normal users.
+#
+# (they are minimal, add the rest in the shell startup files)
+ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ENV_PATH	PATH=/bin:/usr/bin
+
+#
 # Terminal permissions
 #
 #	TTYGROUP	Login tty will be assigned this group ownership.
diff --git a/sys-apps/pam-login/files/login.pamd b/sys-apps/pam-login/files/login.pamd
index 077521b22b81..8ee3b724f0ce 100644
--- a/sys-apps/pam-login/files/login.pamd
+++ b/sys-apps/pam-login/files/login.pamd
@@ -9,8 +9,3 @@ account    required	/lib/security/pam_stack.so service=system-auth
 password   required	/lib/security/pam_stack.so service=system-auth
 
 session    required	/lib/security/pam_stack.so service=system-auth
-
-# If you want to enable pam_console, uncomment the following line
-# and read carefully README.pam_console in /usr/share/doc/pam*
-#session    optional    /lib/security/pam_console.so
-
diff --git a/sys-apps/pam-login/files/login.pamd-4.0 b/sys-apps/pam-login/files/login.pamd-4.0
index 6676526a9cb4..f8f1f86fbc8e 100644
--- a/sys-apps/pam-login/files/login.pamd-4.0
+++ b/sys-apps/pam-login/files/login.pamd-4.0
@@ -12,6 +12,9 @@ account    required	pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_m
 
 password   include	system-auth
 
+@selinux@# pam_selinux.so close should be the first session rule
+@selinux@session    required	pam_selinux.so close
+@selinux@
 session    include	system-auth
 session    required	pam_env.so
 session    optional	pam_lastlog.so
@@ -22,3 +25,6 @@ session    optional	pam_mail.so
 # and read carefully README.pam_console in /usr/share/doc/pam*
 #session    optional	pam_console.so
 
+@selinux@# pam_selinux.so open should be the last session rule
+@selinux@session    required	pam_selinux.so multiple open
+@selinux@
diff --git a/sys-apps/pam-login/metadata.xml b/sys-apps/pam-login/metadata.xml
index f093d416cbb1..b3bf86cd59b4 100644
--- a/sys-apps/pam-login/metadata.xml
+++ b/sys-apps/pam-login/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-apps/pam-login/pam-login-3.14.ebuild b/sys-apps/pam-login/pam-login-3.14.ebuild
index 30914646a2af..d4820ec78a55 100644
--- a/sys-apps/pam-login/pam-login-3.14.ebuild
+++ b/sys-apps/pam-login/pam-login-3.14.ebuild
@@ -1,11 +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/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.1 2003/10/19 00:03:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.14.ebuild,v 1.1.1.1 2005/11/30 09:56:06 chriswhite Exp $
 
-
-inherit gnuconfig
-
-IUSE="nls selinux"
+inherit gnuconfig eutils
 
 # Do we want to backup an old login.defs, and forcefully
 # install a new version?
@@ -14,16 +11,16 @@ FORCE_LOGIN_DEFS="no"
 MY_PN="${PN/pam-/pam_}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Based on the sources from util-linux, with added pam and shadow features"
-SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="livecd nls selinux"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/pam
-	>=sys-apps/shadow-4.0.2-r5
 	selinux? ( sys-libs/libselinux )"
 
 src_unpack() {
@@ -34,21 +31,26 @@ src_unpack() {
 	# Do not warn on inlining for gcc-3.3, bug #21213
 	epatch ${FILESDIR}/${PN}-3.11-gcc33.patch
 	epatch ${FILESDIR}/pam-login-3.11-lastlog-fix.patch
-}
 
-src_compile() {
-	local myconf=
+	# enable query_user_context selinux code (only affects selinux)
+	# but we dont want it on the selinux livecd, since it can
+	# cause the login to timeout if the user isnt ready
+	use livecd || epatch ${FILESDIR}/pam-login-3.14-query_user_context.diff
 
+	use ppc64 && epatch ${FILESDIR}/pam_login-Werror-off-ppc64.patch
 	# Fix configure scripts to recognize linux-mips
 	# (imports updated config.sub and config.guess)
 	gnuconfig_update
+}
+
+src_compile() {
+	local myconf=
 
 	use nls || myconf="${myconf} --disable-nls"
 	use selinux && myconf="${myconf} --enable-selinux"
 
 	econf ${myconf} || die
-
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -59,18 +61,18 @@ src_install() {
 
 	insinto /etc
 	insopts -m0644
+	doins "${FILESDIR}/login.defs"
 
-	doins ${FILESDIR}/login.defs
 	# Also install another one that we can use to check if
 	# we need to update it if FORCE_LOGIN_DEFS = "yes"
 	[ "${FORCE_LOGIN_DEFS}" = "yes" ] \
-		&& newins ${FILESDIR}/login.defs login.defs.new
+		&& newins "${FILESDIR}/login.defs" login.defs.new
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 }
 
 pkg_preinst() {
-	rm -f ${ROOT}/etc/login.defs.new
+	rm -f "${ROOT}/etc/login.defs.new"
 }
 
 pkg_postinst() {
@@ -95,4 +97,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/etc/login.defs.new
 	fi
 }
-
diff --git a/sys-apps/pam-login/pam-login-3.17.ebuild b/sys-apps/pam-login/pam-login-3.17.ebuild
index 9f98b0ad5bd1..a61f449b4809 100644
--- a/sys-apps/pam-login/pam-login-3.17.ebuild
+++ b/sys-apps/pam-login/pam-login-3.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/sys-apps/pam-login/pam-login-3.17.ebuild,v 1.1 2005/02/25 15:05:16 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.17.ebuild,v 1.1.1.1 2005/11/30 09:56:06 chriswhite Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils pam
 
 # Do we want to backup an old login.defs, and forcefully
 # install a new version?
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2
 
 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 ppc64 s390 sh sparc x86"
 IUSE="livecd nls selinux"
 
 DEPEND="virtual/libc
@@ -34,9 +34,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-3.11-gcc33.patch
 	epatch ${FILESDIR}/${PN}-3.11-lastlog-fix.patch
 
-	# enable query_user_context selinux code (only affects selinux)
-	# but we dont want it on the selinux livecd, since it can
-	# cause the login to timeout if the user isnt ready
+	# Disable query_user_context selinux code (only affects selinux)
+	# if on the selinux livecd, since it can cause the login to timeout
+	# if the user isnt ready
 	use livecd && epatch ${FILESDIR}/${PN}-3.17-query_user_context.patch
 
 	use ppc64 && epatch ${FILESDIR}/${PN/-/_}-Werror-off-ppc64.patch
diff --git a/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild b/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
index 8a12f243d7d3..af61872198e2 100644
--- a/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
+++ b/sys-apps/pam-login/pam-login-4.0.11.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/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild,v 1.1 2005/08/03 18:57:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:06 chriswhite Exp $
 
 inherit eutils libtool flag-o-matic pam
 
@@ -130,7 +130,7 @@ pkg_postinst() {
 
 	if [ "${CHECK1}" != "${CHECK2}" ]
 	then
-		cp -a ${ROOT}/etc/login.defs ${ROOT}/etc/login.defs.bak
+		cp -pPR ${ROOT}/etc/login.defs ${ROOT}/etc/login.defs.bak
 		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
 	elif [ ! -f ${ROOT}/etc/login.defs ]
 	then
diff --git a/sys-apps/pam-login/pam-login-4.0.12.ebuild b/sys-apps/pam-login/pam-login-4.0.12.ebuild
index 8cbc308738ba..4027d747605b 100644
--- a/sys-apps/pam-login/pam-login-4.0.12.ebuild
+++ b/sys-apps/pam-login/pam-login-4.0.12.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-apps/pam-login/pam-login-4.0.12.ebuild,v 1.1 2005/08/24 09:44:29 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.12.ebuild,v 1.1.1.1 2005/11/30 09:56:06 chriswhite Exp $
 
-inherit eutils libtool flag-o-matic pam
+inherit eutils libtool flag-o-matic pam autotools
 
 # Do we want to backup an old login.defs, and forcefully
 # install a new version?
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="livecd nls selinux"
+IUSE="livecd nls selinux skey"
 
 DEPEND="virtual/libc
 	sys-libs/pam
@@ -44,15 +44,15 @@ src_unpack() {
 	# Some UCLIBC patches
 	epatch "${FILESDIR}"/${PN}-4.0.11.1-uclibc-missing-l64a.patch
 
+	# Needed by the UCLIBC patches
+	eautoconf
+
 	elibtoolize
 	epunt_cxx
-
-	# Needed by the UCLIBC patches
-	autoconf
 }
 
 src_compile() {
-	append-ldflags -Wl,-z,now
+	append-ldflags $(bindnow-flags)
 	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
 		&& export ac_cv_func_setpgrp_void=yes
 	econf \
diff --git a/sys-apps/parted/ChangeLog b/sys-apps/parted/ChangeLog
index 74ac674a6f69..2ebf4a65c669 100644
--- a/sys-apps/parted/ChangeLog
+++ b/sys-apps/parted/ChangeLog
@@ -1,11 +1,340 @@
 # ChangeLog for sys-apps/parted
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
+
+*parted-1.6.25 (06 Nov 2005)
+
+  06 Nov 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +parted-1.6.25.ebuild:
+  version bump, fixes #111465
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> parted-1.6.23.ebuild:
+  Mark 1.6.23 stable on alpha
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> parted-1.6.23.ebuild:
+  Stable on ppc.
+
+  12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> -parted-1.6.6.ebuild,
+  -parted-1.6.10-r2.ebuild, -parted-1.6.15.ebuild, -parted-1.6.18.ebuild,
+  parted-1.6.23.ebuild:
+  Marking 1.6.23 stable on x86 and cleaning up older ebuilds.
+
+  08 Sep 2005; Aron Griffis <agriffis@gentoo.org> parted-1.6.23.ebuild:
+  Mark 1.6.23 stable on ia64
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> parted-1.6.23.ebuild:
+  Stable on ppc64
+
+  01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> parted-1.6.23.ebuild:
+  Stable on sparc
+
+*parted-1.6.23 (12 Jul 2005)
+
+  12 Jul 2005; Aron Griffis <agriffis@gentoo.org> parted-1.6.22.ebuild,
+  +parted-1.6.23.ebuild:
+  1.6.22 stable on alpha; bump to 1.6.23
+
+  14 May 2005; Guy Martin <gmsoft@gentoo.org> parted-1.6.20.ebuild:
+  Stable on hppa.
+
+  13 May 2005; Joseph Jezak <josejx@gentoo.org> parted-1.6.20.ebuild:
+  Marked ppc stable.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> parted-1.6.22.ebuild:
+  stable on ia64
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> parted-1.6.20.ebuild:
+  Stable on alpha.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> parted-1.6.20.ebuild:
+  Stable on ppc64
+
+  05 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> parted-1.6.22.ebuild:
+  Stable on sparc - this one seems to be good
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> parted-1.6.20.ebuild:
+  stable on ia64
+
+  20 Mar 2005; John N. Laliberte <allanonjl@gentoo.org> parted-1.6.20.ebuild,
+  parted-1.6.22.ebuild:
+  changed gettext to >=0.12.1-r2 in 1.6.20 and 1.6.22. Fixes bug 85999
+
+*parted-1.6.22 (19 Mar 2005)
+
+  19 Mar 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/005_all_parted-1.6.3-pyparted.patch, +parted-1.6.22.ebuild:
+  Updated ebuild from <agaffney@gentoo.org>. removed HFS patch ( in upstream ),
+  removed aclocal/libtoolize/automake/autoconf ( no longer needed ), removed
+  myconf from econf line
+
+  21 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> parted-1.6.20.ebuild:
+  Marking stable on x86 and amd64.
+
+  12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> parted-1.6.20.ebuild:
+  Keyworded ~sparc, please test extensively before going stable
+
+*parted-1.6.20 (24 Dec 2004)
+
+  24 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +parted-1.6.20.ebuild:
+  New version, patchset updates by Andrew Gaffney <agaffney@gentoo.org>
+
+  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> parted-1.6.15.ebuild,
+  parted-1.6.18.ebuild:
+  Keyworded ~sparc - this does NOT mean it can do proper sun disklabels.
+  Feedback is welcome.
+
+  16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
+  Changing ownership to livecd herd.
+
+*parted-1.6.18 (21 Dec 2004)
+
+  21 Dec 2004; Luca Barbato <lu_zero@gentoo.org> +parted-1.6.18.ebuild:
+  New version, amiga partitions supported by upstream
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org> parted-1.6.15.ebuild:
+  Clean up and push into stable.
+
+  30 Nov 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.15.ebuild:
+  Fix libtool, research and fix from Joe Jezak <josejx@gentoo.org>, solves bug
+  #67310
+
+  11 Oct 2004; Tom Gall <tgall@gentoo.org> parted-1.6.15.ebuild:
+  stable on ppc64
+
+  06 Oct 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.15.ebuild:
+  Set a different fallback SRC_URI
+
+*parted-1.6.15 (25 Sep 2004)
+
+  25 Sep 2004; Luca Barbato <lu_zero@gentoo.org> +parted-1.6.15.ebuild:
+  New version, updated patchset.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  parted-1.6.6.ebuild:
+  Masked parted-1.6.6.ebuild stable for ppc
+
+  18 Aug 2004; <agriffis@gentoo.org> -parted-1.6.10-r1.ebuild,
+  parted-1.6.10-r2.ebuild, -parted-1.6.10.ebuild, -parted-1.6.5-r1.ebuild,
+  -parted-1.6.6-r1.ebuild, -parted-1.6.8-r1.ebuild, -parted-1.6.8.ebuild,
+  -parted-1.6.9.ebuild:
+  Add missing keywords ~x86 ~amd64 ~ia64 ~alpha to parted-1.6.10-r2.ebuild. Trim
+  old versions.
+
+  26 Jun 2004; Tom Gall <tgall@gentoo.org> parted-1.6.10-r2.ebuild:
+  stable on ppc64
+
+  15 Jun 2004; Travis Tilley <lv@gentoo.org> parted-1.6.10-r1.ebuild,
+  parted-1.6.6.ebuild, parted-1.6.9.ebuild:
+  it seems that >=sys-apps/parted-1.6.9 are masked in package.mask, so i'm
+  marking 1.6.10-r1 ~amd64 and 1.6.6 stable on amd64
+
+  10 Jun 2004; Travis Tilley <lv@gentoo.org> parted-1.6.10-r1.ebuild:
+  stable on amd64 for gcc 3.4 fixes
+
+  10 Jun 2004; <dostrow@gentoo.org> parted-1.6.10-r2.ebuild:
+  Stable on ppc.
+
+  05 Jun 2004; Mike Frysinger <vapier@gentoo.org> parted-1.6.10-r1.ebuild,
+  parted-1.6.10-r2.ebuild, parted-1.6.10.ebuild, parted-1.6.5-r1.ebuild,
+  parted-1.6.6-r1.ebuild, parted-1.6.6.ebuild, parted-1.6.8-r1.ebuild,
+  parted-1.6.8.ebuild, parted-1.6.9.ebuild:
+  Remove dependency on progsreiserfs since it is so broken #51773.
+
+*parted-1.6.10-r2 (02 Jun 2004)
+
+  02 Jun 2004; David Holm <dholm@gentoo.org> +parted-1.6.10-r2.ebuild:
+  Added the missing Amiga partition support, and keyworded ~ppc.
+
+  01 Jun 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.10-r1.ebuild:
+  Missing amiga partition support, marking again -ppc
+
+  01 Jun 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.10-r1.ebuild:
+  Marked ~ppc
+
+  29 May 2004; Travis Tilley <lv@gentoo.org> parted-1.6.10-r1.ebuild,
+  parted-1.6.10.ebuild, parted-1.6.6-r1.ebuild, parted-1.6.6.ebuild,
+  parted-1.6.8-r1.ebuild, parted-1.6.8.ebuild, parted-1.6.9.ebuild:
+  added --disable-Werror so that silly little warnings dont make parted fail to
+  compile using gcc 3.4 and added ~amd64 keyword to parted 1.6.10-r1
+
+  03 May 2004; Tom Gall <tgall@gentoo.org>  parted-1.6.8-r1.ebuild:
+  stable on ppc64, slight change to get rid of -Werror on ppc64 (useless *&*(T^)
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> parted-1.6.10-r1.ebuild,
+  parted-1.6.10.ebuild, parted-1.6.5-r1.ebuild, parted-1.6.6-r1.ebuild,
+  parted-1.6.6.ebuild, parted-1.6.8-r1.ebuild, parted-1.6.8.ebuild,
+  parted-1.6.9.ebuild:
+  Add inherit eutils
+
+*parted-1.6.10-r1 (25 Apr 2004)
+
+  25 Apr 2004; Nathaniel McCallum <npmccallum@gentoo.org> 
+  +parted-1.6.10-r1.ebuild:
+  there is a new hfs patch out (revision 10)
+
+*parted-1.6.10 (23 Apr 2004)
+
+  23 Apr 2004; Nathaniel McCallum <npmccallum@gentoo.org>
+  +parted-1.6.10.ebuild:
+  added parted-1.6.10
+  fixed hfs patch so it will apply to parted-1.6.10
+
+*parted-1.6.9 (23 Apr 2004)
+
+  23 Apr 2004; Nathaniel McCallum <npmccallum@gentoo.org>
+  +parted-1.6.9.ebuild:
+  Added parted-1.6.9 (which now has the pyparted patch!)
+
+  12 Apr 2004; David Holm <dholm@gentoo.org> parted-1.6.8-r1.ebuild:
+  Bumped to stable on ppc.
+
+*parted-1.6.8-r1 (09 Apr 2004)
+
+  09 Apr 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.8-r1.ebuild:
+  Added Amiga support
+
+  06 Apr 2004; Seemant Kulleen <seemant@gentoo.org> parted-1.6.8.ebuild:
+  added ~x86 to KEYWORDS
+
+*parted-1.6.8 (05 Apr 2004)
+
+  05 Apr 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.8.ebuild:
+  New version
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> parted-1.6.5-r1.ebuild:
+  fix depend (bug # 45110)
+
+  14 Mar 2004; Tom Gall <tgall@gentoo.org> parted-1.6.6.ebuild:
+  stable on ppc64 + fix for gnuconfig_update
+
+  11 Mar 2004; Lars Weiler <pylon@gentoo.org> parted-1.6.6-r1.ebuild:
+  stable on ppc.  Removed mips from keywords due to a missing dependency on
+  sys-fs/progsreiserfs-0.3.0*
+
+  07 Mar 2004; Seemant Kulleen <seemant@gentoo.org> parted-1.6.5-r1.ebuild,
+  parted-1.6.5.ebuild, parted-1.6.6-r1.ebuild, parted-1.6.6.ebuild,
+  files/parted-1.6.5-gcc-3.3.patch, files/parted-1.6.5-hfs-8.patch,
+  files/parted-1.6.6-2-6headers.patch, files/parted-1.6.6-assert.patch,
+  files/parted-1.6.6-gcc-3.3.patch, files/parted-1.6.6-hfs-8.patch,
+  files/parted-1.6.6-hfs-9.patch:
+  move patches to tarballs on gentoo mirrors. Also switch to the use_enable and
+  use_with syntax in econf
+
+  06 Mar 2004; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+  parted-1.6.6-r1.ebuild:
+  mark as ~mips
+
+*parted-1.6.6-r1 (20 Feb 2004)
+
+  20 Feb 2004; Luca Barbato <lu_zero@gentoo.org> parted-1.6.6-r1.ebuild,
+  files/parted-1.6.6-assert.patch, files/parted-1.6.6-hfs-9.patch:
+  hfsplus patch updated
+
+  02 Feb 2004; <plasmaroo@gentoo.org> parted-1.6.6.ebuild,
+  files/parted-1.6.6-2-6headers.patch:
+  Added a patch to solve compilation issues on 2.6 headers, closes bug
+  #39276.
+
+  30 Jan 2004; <gustavoz@gentoo.org> parted-1.6.6.ebuild:
+  Marked stable on sparc.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> parted-1.6.6.ebuild:
+  Marked stable on alpha.
+
+  19 Dec 2003; Guy Martin <gmsoft@gentoo.org> parted-1.6.6.ebuild:
+  Marked stable on hppa.
+
+  18 Nov 2003; Caleb Tennis <caleb@gentoo.org> parted-1.6.6.ebuild:
+  Marking x86 stable.
+
+  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> parted-1.6.5-r1.ebuild,
+  parted-1.6.5.ebuild, parted-1.6.6.ebuild:
+  Now uses mirror://gnu.
+
+  11 Aug 2003; Will Woods <wwoods@gentoo.org> parted-1.6.5-r1.ebuild,
+  parted-1.6.5.ebuild, parted-1.6.6.ebuild:
+  Marked 1.6.5 stable for alpha (Mandrake uses it and it works fine) and marked
+  1.6.6 ~alpha. Also fixed a mistake in the ebuild: 
+    "use debug && myconf="${myconf} --disable-debug" 
+  should have been "use debug || ...". This fix doesn't really change the 
+  functionality of the program so I am not bumping the rev number.
+
+  07 Aug 2003; Aron Griffis <agriffis@gentoo.org> parted-1.6.5-r1.ebuild:
+  Add ~alpha to KEYWORDS
+
+*parted-1.6.6 (27 Jul 2003)
+
+  27 Jul 2003; Brandon Low <lostlogic@gentoo.org> parted-1.6.6.ebuild,
+  files/parted-1.6.6-gcc-3.3.patch, files/parted-1.6.6-hfs-8.patch:
+  Bump, fixed patches
+
+  27 Jun 2003; lu_zero <lu_zero@gentoo.org> parted-1.6.5-r1.ebuild,
+  files/parted-1.6.5-gcc-3.3.patch:
+  GCC-3.3 related fixes
+
+*parted-1.6.5-r1 (29 May 2003)
+
+  29 May 2003; root <root@gentoo.org> parted-1.6.5-r1.ebuild,
+  files/parted-1.6.5-hfs-8.patch:
+  HFS resizing support. Emerged fine on my box.
+
+*parted-1.6.3 (25 Mar 2003)
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> parted-1.6.3.ebuild,
+  parted-1.6.3.ebuild, parted-1.6.5.ebuild:
+  Moved to stable.
+
+*parted-1.6.5 (24 Feb 2003)
+
+  25 Mar 2003; Guy Martin <gmsoft@gentoo.org> parted-1.6.5.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  24 Feb 2003; Brandon Low <lostlogic@gentoo.org> parted-1.6.5.ebuild files/digest-parted-1.6.5 :
+  Bump, ebuild fixage, keywords to ~
+
+*parted-1.6.4 (08 Dec 2002)
+
+  08 Dec 2002; Brandon Low <lostlogic@gentoo.org> parted-1.6.4.ebuild :
+  Bump...  Unstable for the time being.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*parted-1.6.1 (8 Jun 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> parted-1.6.1.ebuild :
+  Added KEYWORDS.
+
+  8 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+  New 1.6 release + small install patch.  This one can use dev-libs/progsreiserfs
+  optionally at runtime; not installed per default at the moment.  Testing/feedback
+  on this welcome.
+
+*parted-1.4.24-r3 (16 Apr 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> parted-1.4.24-r3.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> parted-1.4.24-r3.ebuild :
+  Closes bug #1690 and related bugs.  Thanks to everyone for the patches and
+  fixes.
+
+*parted-1.4.24-r2 (29 Mar 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> parted-1.4.24-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  29 Mar 2002; Seemant Kulleen <seemant@gentoo.org> parted-1.4.24-r2.ebuild :
+  Matthew Kennedy submitted some fixes for USE flag based compilation -- to
+  explicitly enable if in USE and explicitly disable if not.
+
+*parted-1.4.24-r1 (27 Mar 2002)
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> parted-1.4.24-r1.ebuild :
+  man page/LFH fixes submitted by Matthew Kennedy.
 
 *parted-1.4.24 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  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-apps/parted/Manifest b/sys-apps/parted/Manifest
index e69de29bb2d1..fb1c9512c79f 100644
--- a/sys-apps/parted/Manifest
+++ b/sys-apps/parted/Manifest
@@ -0,0 +1,11 @@
+MD5 3a48cae57e2172c05268982440a251ab parted-1.6.23.ebuild 1214
+MD5 af6b0852d283ff4dfeb51fa600875a7a parted-1.6.25.ebuild 1221
+MD5 48a1f3c931b8ffc893588624278f457b parted-1.6.20.ebuild 1477
+MD5 d31b34ae74a31ae5db978c45716176f2 parted-1.6.22.ebuild 1217
+MD5 798f27845f81f27f89403661176b18c2 ChangeLog 12532
+MD5 2b0b0623d889932d22c276713b4b8d7d metadata.xml 223
+MD5 5e556d20415f027814924e2a17b18ccb files/digest-parted-1.6.20 138
+MD5 d766d64a911c4a7efc8b87e16bf84aa6 files/digest-parted-1.6.22 66
+MD5 0a7083e4e182e3bf230f20d1b0c54ff2 files/digest-parted-1.6.23 66
+MD5 fbe240e70ef86bc6742ebedaf10e65e0 files/digest-parted-1.6.25 66
+MD5 b2b5bb6b91f1db8dd5b437e74c2153bc files/005_all_parted-1.6.3-pyparted.patch 433
diff --git a/sys-apps/parted/metadata.xml b/sys-apps/parted/metadata.xml
index f093d416cbb1..779904a349b8 100644
--- a/sys-apps/parted/metadata.xml
+++ b/sys-apps/parted/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>livecd</herd>
+<maintainer>
+	<email>allanonjl@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/parted/parted-1.6.20.ebuild b/sys-apps/parted/parted-1.6.20.ebuild
index dba68bf1f621..6f4ad42a81c4 100644
--- a/sys-apps/parted/parted-1.6.20.ebuild
+++ b/sys-apps/parted/parted-1.6.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/parted/parted-1.6.20.ebuild,v 1.1 2004/12/24 14:47:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.20.ebuild,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
 
 inherit eutils
 
@@ -13,12 +13,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="nls static readline debug"
 
+# specific version for gettext needed
+# to fix bug 85999
 DEPEND=">=sys-fs/e2fsprogs-1.27
 	>=sys-libs/ncurses-5.2
-	nls? ( sys-devel/gettext )
+	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-4.1-r4 )"
 
 src_unpack() {
diff --git a/sys-apps/parted/parted-1.6.22.ebuild b/sys-apps/parted/parted-1.6.22.ebuild
index 18a7ccf6246d..24d7c5d039e2 100644
--- a/sys-apps/parted/parted-1.6.22.ebuild
+++ b/sys-apps/parted/parted-1.6.22.ebuild
@@ -1,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-apps/parted/parted-1.6.22.ebuild,v 1.1 2005/03/20 04:24:22 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.22.ebuild,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
 
 inherit eutils
 
@@ -11,12 +11,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 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 static readline debug"
 
+# specific version for gettext needed
+# to fix bug 85999
 DEPEND=">=sys-fs/e2fsprogs-1.27
 	>=sys-libs/ncurses-5.2
-	nls? ( sys-devel/gettext )
+	nls? ( >=sys-devel/gettext-0.12.1-r2 )
 	readline? ( >=sys-libs/readline-4.1-r4 )"
 
 src_unpack() {
diff --git a/sys-apps/parted/parted-1.6.23.ebuild b/sys-apps/parted/parted-1.6.23.ebuild
index 98bc19a76341..4150d5e1186b 100644
--- a/sys-apps/parted/parted-1.6.23.ebuild
+++ b/sys-apps/parted/parted-1.6.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/sys-apps/parted/parted-1.6.23.ebuild,v 1.1 2005/07/12 20:45:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.23.ebuild,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 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 static readline debug"
 
 # specific version for gettext needed
diff --git a/sys-apps/parted/parted-1.6.25.ebuild b/sys-apps/parted/parted-1.6.25.ebuild
index fae769f95c87..68244a4ec49d 100644
--- a/sys-apps/parted/parted-1.6.25.ebuild
+++ b/sys-apps/parted/parted-1.6.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.25.ebuild,v 1.1 2005/11/06 04:09:48 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.25.ebuild,v 1.1.1.1 2005/11/30 09:56:59 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/paxctl/ChangeLog b/sys-apps/paxctl/ChangeLog
index 80b06719c5cc..dd8cf19fca0e 100644
--- a/sys-apps/paxctl/ChangeLog
+++ b/sys-apps/paxctl/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for sys-apps/paxctl
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/ChangeLog,v 1.1 2004/02/18 07:58:03 solar Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/ChangeLog,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
+
+  18 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> paxctl-0.3.ebuild:
+  Stable on sparc
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> paxctl-0.3.ebuild:
+  stable on ia64
+
+*paxctl-0.3-r1 (13 Jun 2005)
+
+  13 Jun 2005; Kevin F. Quinn <kevquinn@gentoo.org>
+  +files/paxctl-0.3-error-codes.patch, +paxctl-0.3-r1.ebuild:
+  - return EXIT_FAILURE when paxctl fails to do as requested
+
+  10 Jun 2005; <solar@gentoo.org> paxctl-0.3.ebuild:
+  - stable on x86/ppc/amd64
+
+*paxctl-0.3 (03 May 2005)
+
+  03 May 2005; <solar@gentoo.org> +paxctl-0.3.ebuild:
+  - new paxctl release. new version includes ability to reuse/rename existing
+  unneeded program header into PT_PAX_FLAGS
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> paxctl-0.2.ebuild:
+  stable on ia64
+
+  17 Mar 2005; Daniel Ostrow <dostrow@gentoo.org> paxctl-0.2.ebuild:
+  ~ppc64 for testing
+
+  22 Jul 2004; <solar@gentoo.org> paxctl-0.2.ebuild:
+  marked paxctl stable on x86 now that min-version binutils is in stable
+
+  21 Jul 2004; Travis Tilley <lv@gentoo.org> paxctl-0.2.ebuild:
+  stable on amd64
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> paxctl-0.2.ebuild:
+  sync IUSE (missing), glibc -> libc
+
+*paxctl-0.2 (18 Feb 2004)
 
   18 Feb 2004; <solar@gentoo.org> :
   This is paxctl for controlling PaX flags on a per binary basis. PaX
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index b372e7b3638a..0b8dc61d25fd 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,4 +1,19 @@
-MD5 b1708e26e77ec9211c80121ea133870a paxctl-0.2.ebuild 704
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e49b8ea4699fedff7e6626e81ebfc4c8 ChangeLog 262
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d7aceeffef35cb0a42a723e00538f7d4 ChangeLog 2316
 MD5 7cd8adc34a7c0e7b400dcd24793ff4cf files/digest-paxctl-0.2 60
+MD5 a0ea6419bb80b6a3650accc386c91847 files/digest-paxctl-0.3 60
+MD5 a0ea6419bb80b6a3650accc386c91847 files/digest-paxctl-0.3-r1 60
+MD5 3fc2f5499fe5630cab3a2c01e4bdbbe7 files/paxctl-0.3-error-codes.patch 11421
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 9af9b79a175a826ed1ddbf58c2746fc0 paxctl-0.2.ebuild 727
+MD5 b7baf2626ffe222baedb846eea3a54ff paxctl-0.3-r1.ebuild 803
+MD5 c07f98ef40a8fe547ac6f4e6123da971 paxctl-0.3.ebuild 725
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDVTpZKRy60XGEcJIRAlZqAJ9dyHT8Ek99gWawtdFJy8wKmq5mOwCeIoGE
+5R7jydNRQSamGTHZMPM8858=
+=qnVh
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/paxctl/paxctl-0.2.ebuild b/sys-apps/paxctl/paxctl-0.2.ebuild
index cd901c2eef0b..59a12811e14e 100644
--- a/sys-apps/paxctl/paxctl-0.2.ebuild
+++ b/sys-apps/paxctl/paxctl-0.2.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/sys-apps/paxctl/paxctl-0.2.ebuild,v 1.1 2004/02/18 07:58:03 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/paxctl-0.2.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries."
 SRC_URI="http://pax.grsecurity.net/paxctl-${PV}.tar.gz"
 HOMEPAGE="http://pax.grsecurity.net"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa ~ia64" ; # "~mips"
+KEYWORDS="x86 amd64 ~sparc ~ppc ~hppa ia64 ~mips ~ppc64"
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc >=sys-devel/binutils-2.14.90.0.8-r1"
+DEPEND="virtual/libc >=sys-devel/binutils-2.14.90.0.8-r1"
 
 #S=${WORKDIR}/${P}
 
diff --git a/sys-apps/paxctl/paxctl-0.3-r1.ebuild b/sys-apps/paxctl/paxctl-0.3-r1.ebuild
index 7290f5c3222d..17e5b79c0422 100644
--- a/sys-apps/paxctl/paxctl-0.3-r1.ebuild
+++ b/sys-apps/paxctl/paxctl-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/sys-apps/paxctl/paxctl-0.3-r1.ebuild,v 1.1 2005/06/13 21:29:30 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/paxctl-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/sys-apps/paxctl/paxctl-0.3.ebuild b/sys-apps/paxctl/paxctl-0.3.ebuild
index 9ca025df44b3..9414c93f67e5 100644
--- a/sys-apps/paxctl/paxctl-0.3.ebuild
+++ b/sys-apps/paxctl/paxctl-0.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/sys-apps/paxctl/paxctl-0.3.ebuild,v 1.1 2005/05/04 00:58:08 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paxctl/paxctl-0.3.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64, binaries."
 SRC_URI="http://pax.grsecurity.net/paxctl-${PV}.tar.gz"
 HOMEPAGE="http://pax.grsecurity.net"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa ~ia64 ~mips ~ppc64"
+KEYWORDS="amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pcfclock/ChangeLog b/sys-apps/pcfclock/ChangeLog
index d5679c5a4db9..26d7a9edddae 100644
--- a/sys-apps/pcfclock/ChangeLog
+++ b/sys-apps/pcfclock/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-apps/pcfclock
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/ChangeLog,v 1.1 2004/07/18 07:01:22 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/ChangeLog,v 1.1.1.1 2005/11/30 09:56:19 chriswhite Exp $
+
+*pcfclock-0.44-r1 (05 Nov 2005)
+
+  05 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/pcfclock-0.44-udev-gentoo.patch, +metadata.xml,
+  +pcfclock-0.44-r1.ebuild:
+  rewrite of ebuild using linux-mod.eclass, adding patch + rules for udev support
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> pcfclock-0.44.ebuild:
+  Added to ~ppc.
 
 *pcfclock-0.44 (18 Jul 2004)
 
diff --git a/sys-apps/pcfclock/Manifest b/sys-apps/pcfclock/Manifest
index 70b19f341121..f9a54d0e7faf 100644
--- a/sys-apps/pcfclock/Manifest
+++ b/sys-apps/pcfclock/Manifest
@@ -1,2 +1,8 @@
-MD5 3cf63cc8a34eab0a9fe8ff1a2c980e84 pcfclock-0.44.ebuild 1076
+MD5 8e6796e60c8d9413c4601dae21934b79 ChangeLog 799
 MD5 7481cda919930a3db6d92e0b4ab47420 files/digest-pcfclock-0.44 64
+MD5 7481cda919930a3db6d92e0b4ab47420 files/digest-pcfclock-0.44-r1 64
+MD5 4c6c8a463bd6f58471a661cbd07604d7 files/pcfclock-0.44-udev-gentoo.patch 2124
+MD5 b60ea900b74d4f577955d7bbe079a376 files/pcfclock.modules.d 127
+MD5 dfd8fb7bae22002954771c4bbf209e44 metadata.xml 643
+MD5 400aedc3f7b7db52cae0de25212e8592 pcfclock-0.44-r1.ebuild 1443
+MD5 aa50ecdd0ce20833ba71e846ec861028 pcfclock-0.44.ebuild 852
diff --git a/sys-apps/pcfclock/pcfclock-0.44-r1.ebuild b/sys-apps/pcfclock/pcfclock-0.44-r1.ebuild
index 03e48fbb877f..2b3b10218b04 100644
--- a/sys-apps/pcfclock/pcfclock-0.44-r1.ebuild
+++ b/sys-apps/pcfclock/pcfclock-0.44-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/pcfclock-0.44-r1.ebuild,v 1.1 2005/11/05 22:43:57 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/pcfclock-0.44-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:19 chriswhite Exp $
 
 inherit eutils linux-mod
 
diff --git a/sys-apps/pcfclock/pcfclock-0.44.ebuild b/sys-apps/pcfclock/pcfclock-0.44.ebuild
index d4cc9b5ac0c1..bf61c5756719 100644
--- a/sys-apps/pcfclock/pcfclock-0.44.ebuild
+++ b/sys-apps/pcfclock/pcfclock-0.44.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-apps/pcfclock/pcfclock-0.44.ebuild,v 1.1 2004/07/18 07:01:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcfclock/pcfclock-0.44.ebuild,v 1.1.1.1 2005/11/30 09:56:19 chriswhite Exp $
 
 DESCRIPTION="driver for the parallel port radio clock sold by Conrad Electronic"
 HOMEPAGE="http://www-stud.ims.uni-stuttgart.de/~voegelas/pcf.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www-stud.ims.uni-stuttgart.de/~voegelas/pcfclock/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/linux-sources"
diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 1b5335336eb4..0a7e0011f633 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,11 +1,249 @@
 # ChangeLog for sys-apps/pciutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.1 2002/02/25 01:43:19 blocke Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:31 chriswhite Exp $
+
+  11 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/pciutils-2.1.11-bsd.patch, +files/pciutils-2.1.11-malloc.patch,
+  pciutils-2.1.11-r5.ebuild, pciutils-2.2.0-r1.ebuild:
+  Split out malloc patch from the rest of bsd patch. Apply it on 2.2.0 that
+  still needs it.
+
+*pciutils-2.2.0-r1 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.2.0-shared-lib.patch, +pciutils-2.2.0-r1.ebuild:
+  Build and install a shared library instead of just forcing -fPIC on the
+  static lib.
+
+*pciutils-2.2.0 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pcimodules-pciutils-2.2.0.patch, +pciutils-2.2.0.ebuild:
+  Version bump #109352 by Daniel Drake.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org> pciutils-2.1.11-r5.ebuild:
+  Stable on mips.
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> pciutils-2.1.11-r5.ebuild:
+  Mark 2.1.11-r5 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> pciutils-2.1.11-r5.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pciutils-2.1.11-r5.ebuild:
+  Stable on ppc.
+
+  22 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.1.11-bsd.patch, pciutils-2.1.11-r5.ebuild:
+  Add FreeBSD support to shut Diego Pettenò up #103241.
+
+  22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pciutils-2.1.11-r5.ebuild:
+  Stable on sparc
+
+  09 Aug 2005; Luis Medinas <metalgod@gentoo.org> pciutils-2.1.11-r4.ebuild:
+  Marked Stable on AMD64.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pciutils-2.1.11-r4.ebuild:
+  Stable on alpha.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> pciutils-2.1.11-r4.ebuild:
+  Marked stable on mips.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pciutils-2.1.11-r4.ebuild:
+  Stable on ppc.
+
+  13 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pciutils-2.1.11-r4.ebuild:
+  Stable on sparc
+
+*pciutils-2.1.11-r5 (12 Jun 2005)
+
+  12 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.1.11-gentoo-paths.patch,
+  +files/pciutils-2.1.11-sysfs.patch, +pciutils-2.1.11-r5.ebuild:
+  Clean up sharedir logic, fix version reporting, and update sysfs patch from
+  Debian.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> pciutils-2.1.11-r4.ebuild:
+  stable on ia64
+
+  07 Apr 2005; Tom Gall <tgall@gentoo.org> pciutils-2.1.11-r4.ebulid:
+  stable on ppc64
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pciutils-2.1.11-r3.ebuild:
+  Stable on alpha.
+
+  02 Mar 2005; Daniel Goller <morfic@gentoo.org> pciutils-2.1.11-r3.ebuild:
+  Stable on ppc
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> pciutils-2.1.11-r3.ebuild:
+  Marked stable on mips.
+
+*pciutils-2.1.11-r4 (30 Jan 2005)
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.1.11-fix-pci-ids-location-refs.patch, +files/2.1.11-scan.patch,
+  +pciutils-2.1.11-r4.ebuild:
+  Clean up the pci.ids location patch, add a tiny patch from fedora to fix
+  segfault when pci bus is missing, and make sure pciutils respects
+  $AR/$CC/$RANLIB.
+
+  20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pciutils-2.1.11-r3.ebuild:
+  Stable on sparc
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Oct 2004; Mike Frysinger <vapier@gentoo.org> pciutils-2.1.11-r3.ebuild:
+  Try to grab latest pci.ids file, but if that fails, use a cached version
+  #43484 by Spider.
+
+  14 Oct 2004; <plasmaroo@gentoo.org> pciutils-2.1.11-r3.ebuild:
+  Fixing the position of "emake lib" since under certain conditions lspci and
+  friends get compiled without the /usr/share/misc/pci.ids sed getting run.
+
+*pciutils-2.1.11-r3 (09 Oct 2004)
+
+  09 Oct 2004; Doug Goldstein <cardoe@gentoo.org>
+  +files/pciutils-2.1.11-fix-pci-ids-location-refs.patch,
+  +pciutils-2.1.11-r3.ebuild:
+  path fixing bug #62786
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  pciutils-2.1.11-r1.ebuild:
+  Masked pciutils-2.1.11-r1.ebuild stable for ppc
+
+*pciutils-2.1.11-r2 (30 Aug 2004)
+
+  30 Aug 2004; Guy Martin <gmsoft@gentoo.org> +pciutils-2.1.11-r2.ebuild:
+  Unconditionally use -fPIC for libs (#55238).
+
+  26 Jul 2004; <solar@gentoo.org> pciutils-2.1.11-r1.ebuild:
+  fix command line overflow which did not allow for null terminator when using
+  lspci -vvv (AGPx1 and AGPx2 and AGPx4) bug #41422
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  pciutils-2.1.11-r1.ebuild:
+  make parallel-safe; error check sed; use emake; error messages
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> pciutils-2.1.11-r1.ebuild,
+  pciutils-2.1.11.ebuild:
+  sync IUSE (missing), glibc -> libc
+
+  22 Jun 2004; <malc@gentoo.org> pciutils-2.1.11-r1.ebuild:
+  Mark stable on amd64
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pciutils-2.1.11-r1.ebuild:
+  Stable on alpha.
+
+  09 May 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  pciutils-2.1.11-r1.ebuild:
+  Stable on mips
+
+  29 Apr 2004; Guy Martin <gmsoft@gentoo.org> pciutils-2.1.11-r1.ebuild:
+  Marked stable on hppa.
+
+  01 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> pciutils-2.1.11-r1.ebuild:
+  Stable on sparc
+
+  06 Mar 2004; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+  pciutils-2.1.11-r1.ebuild:
+  ~mips pciutils - tested on SGI O2
+
+  02 Mar 2004; Tom Gall <tgall@gentoo.org> pciutils-2.1.11-r1.ebuild:
+  Stable on ppc64
+
+  07 Feb 2004; Lars Weiler <pylon@gentoo.org> pciutils-2.1.11.ebuild:
+  Stable on ppc
+
+*pciutils-2.1.11-r1 (18 Jan 2004)
+
+  18 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add sysfs support (patch from the deb guys) #38645.
+  Move libpci.a into /usr/lib/ #36453.
+
+  24 Jan 2004; <plasmaroo@gentoo.org> files/2.1.11-sysfs.patch:
+  Fixed the sysfs patch to happily co-exist on both < 2.4 and 2.6 systems, and not
+  use sysfs on < 2.4 kernels.
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> pciutils-2.1.11.ebuild :
+  Stable on AMD64.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> pciutils-2.1.11.ebuild:
+  stable on alpha
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> pciutils-2.1.11.ebuild:
+  Marked stable on hppa.
+
+  19 Sep 2003; Christian Birchinger <joker@gentoo.org> pciutils-2.1.11.ebuild:
+  Added sparc stable keyword
+
+  05 Sep 2003; Martin Holzer <mholzer@gentoo.org> pciutils-2.1.11.ebuild:
+  Marked x86 stable.
+
+*pciutils-2.1.11 (05 Aug 2003)
+
+  05 Aug 2003; Martin Holzer <mholzer@gentoo.org> pciutils-2.1.11.ebuild,
+  files/pcimodules-pciutils-2.1.11.diff:
+  Version bumped. Ebuild submitted by Jeff Ames <jca@cwru.edu> in #25670.
+
+  12 Feb 2003; Guy Martin <gmsoft@gentoo.org> pciutils-2.1.10-r1.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pciutils-2.1.10-r1 (03 Aug 2002)
+
+  03 Apr 2003; Zach Welch <zwelch@gentoo.org> pciutils-2.1.10-r1.ebuild:
+  add arm keyword
+
+  03 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> pciutils-2.1.10-r1.ebuild:
+  Made pcimodule patch apply cleanly.
+
+*pciutils-2.1.10 (02 Aug 2002)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> pciutils-2.1.10-r1.ebuild,
+  pciutils-2.1.10.ebuild, pciutils-2.1.10.ebuild, pciutils-2.1.9-r1.ebuild,
+  pciutils-2.1.9-r1.ebuild, pciutils-2.1.9-r2.ebuild,
+  pciutils-2.1.9-r2.ebuild:
+  use epatch instead
+
+  02 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> pciutils-2.1.10.ebuild:
+  Version bump. Updates the pci.ids before compiling.
+
+*pciutils-2.1.9-r1.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pciutils-2.1.9.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pciutils-2.1.9-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+*pciutils-2.1.9-r2 (2 June 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pciutils-2.1.9-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  2 June; Matthew Kennedy <mkennedy@gentoo.org>
+  pciutils-2.1.9-r2.ebuild, files/digest-pciutils-2.1.9-r2, ChangeLog :
+
+  Fixed -Werror breakage for GCC3.1. Thanks to
+  lostlogic@lostlogicx.com (Brandon Low) for the corrected ebuild.
 
 *pciutils-2.1.9 (24 Feb 2002)
 
   22 Feb 2002; Bruce A. Locke <blocke@shivan.org> pciutils-2.1.9.ebuild :
 
+  Now installs the header files and the lib, as per bug #2366.
+
+  22 Feb 2002; Bruce A. Locke <blocke@shivan.org> pciutils-2.1.9.ebuild :
+
   - app-admin/pciutils moved to sys-apps/pciutils
   - Updated ebuild contributed by folokai@earthlink.net (scott worley)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index e69de29bb2d1..0a9266466728 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 825702ffb2b6dcb185031992c5f8b065 ChangeLog 8497
+MD5 60d79fbf53038186b939f83841d5f318 files/2.1.11-scan.patch 277
+MD5 a6be9cf60dc5043160d757c9772b1e57 files/digest-pciutils-2.1.11-r5 131
+MD5 ae29f04095b43ceb06e6b0cc94653c36 files/digest-pciutils-2.2.0-r1 130
+MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
+MD5 d3c7e97420324c1d5d1dc032fc39006e files/pcimodules-pciutils-2.2.0.patch 10872
+MD5 05277cd33401a99ed9fe18fe614231d0 files/pciutils-2.1.11-bsd.patch 921
+MD5 6a0ae94d528195517f54f66653f8322e files/pciutils-2.1.11-gentoo-paths.patch 521
+MD5 d4b9ca6816f7e4310f2ed629531361fe files/pciutils-2.1.11-malloc.patch 272
+MD5 f4d220c568a00c1ceafe6dc129ae6e95 files/pciutils-2.1.11-sysfs.patch 10374
+MD5 cf455fe33057e081ba7aaec93e481642 files/pciutils-2.2.0-shared-lib.patch 496
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 61778080ed55196416ece68570ba885a pciutils-2.1.11-r5.ebuild 2298
+MD5 f40e1a53499bf0a736e364daf9a0a2ed pciutils-2.2.0-r1.ebuild 1671
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdPUuAiZjviIA2XgRAmNEAKCM/9GM+9hIc/p0rMHiWbmTj/FDKQCeKZSo
+MXp9EAG2Z8zH0D19jl3h4Wo=
+=/r/2
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch b/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch
index dae78712c4dd..d2668366f372 100644
--- a/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch
+++ b/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch
@@ -4,16 +4,6 @@ Patch by Diego Petten�.
 
 http://bugs.gentoo.org/103241
 
---- pcimodules.c
-+++ pcimodules.c
-@@ -16,7 +16,6 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/utsname.h>
 --- lib/fbsd-device.c
 +++ lib/fbsd-device.c
 @@ -13,10 +13,21 @@
diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-sysfs.patch b/sys-apps/pciutils/files/pciutils-2.1.11-sysfs.patch
index 4a123c85f695..483e708efc39 100644
--- a/sys-apps/pciutils/files/pciutils-2.1.11-sysfs.patch
+++ b/sys-apps/pciutils/files/pciutils-2.1.11-sysfs.patch
@@ -68,7 +68,7 @@
 +++ pciutils-2.1.11/lib/sysfs.c
 @@ -0,0 +1,292 @@
 +/*
-+ *	$Id: pciutils-2.1.11-sysfs.patch,v 1.1 2005/06/12 21:17:43 vapier Exp $
++ *	$Id: pciutils-2.1.11-sysfs.patch,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 + *
 + *	The PCI Library -- Configuration Access via /sys/bus/pci
 + *
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/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-apps/pciutils/pciutils-2.1.11-r5.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild
index d67ebd40b8da..feba8370df8b 100644
--- a/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-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/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild,v 1.1 2005/06/12 21:17:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r5.ebuild,v 1.1.1.1 2005/11/30 09:56:31 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -12,19 +12,21 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/pcimodules-${P}.diff
-	epatch ${FILESDIR}/${P}-sysfs.patch #38645
-	epatch ${FILESDIR}/${P}-gentoo-paths.patch
-	epatch ${FILESDIR}/${PV}-scan.patch #from fedora
+	epatch "${FILESDIR}"/pcimodules-${P}.diff
+	epatch "${FILESDIR}"/${P}-sysfs.patch #38645
+	epatch "${FILESDIR}"/${P}-gentoo-paths.patch
+	epatch "${FILESDIR}"/${PV}-scan.patch #from fedora
+	epatch "${FILESDIR}"/${P}-bsd.patch #103241
+	epatch "${FILESDIR}"/${P}-malloc.patch
 
 	# Unconditionally use -fPIC for libs (#55238)
 	# Make sure we respect $AR / $RANLIB / $CFLAGS
@@ -43,10 +45,11 @@ src_unpack() {
 	sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c \
 		|| die "sed failed on lspci.c"
 
-	ebegin "Updating pci.ids"
+	sed -i 's:wget -O:wget --connect-timeout=60 -O:' update-pciids.sh
+	ebegin "Updating pci.ids from the web"
 	if ! ./update-pciids.sh &> /dev/null ; then
 		# if we cant update, use a cached version
-		mv ${WORKDIR}/pci.ids-${STAMP} ${S}/pci.ids
+		mv "${WORKDIR}"/pci.ids-${STAMP} "${S}"/pci.ids
 	fi
 	eend 0
 }
diff --git a/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
index 7db00d25b6e2..b31a11aca6c4 100644
--- a/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-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/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild,v 1.1 2005/10/16 11:38:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:31 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -23,6 +23,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/pcimodules-${P}.patch
 	epatch "${FILESDIR}"/${P}-shared-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.1.11-malloc.patch
 
 	# Set Gentoo paths
 	sed -i \
@@ -37,10 +38,11 @@ src_unpack() {
 		lib/Makefile \
 		|| die "sed lib/Makefile failed"
 
+	sed -i 's:wget -O:wget --connect-timeout=60 -O:' update-pciids.sh
 	ebegin "Updating pci.ids from the web"
 	if ! ./update-pciids.sh &> /dev/null ; then
 		# if we cant update, use a cached version
-		mv ${WORKDIR}/pci.ids-${STAMP} ${S}/pci.ids
+		mv "${WORKDIR}"/pci.ids-${STAMP} "${S}"/pci.ids
 	fi
 	eend 0
 }
diff --git a/sys-apps/pcmcia-cs-cis/ChangeLog b/sys-apps/pcmcia-cs-cis/ChangeLog
index 87126162117c..ff59bc747702 100644
--- a/sys-apps/pcmcia-cs-cis/ChangeLog
+++ b/sys-apps/pcmcia-cs-cis/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-apps/pcmcia-cs-cis
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-cis/ChangeLog,v 1.1 2005/06/30 09:13:56 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-cis/ChangeLog,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
+
+  10 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  pcmcia-cs-cis-3.2.8-r1.ebuild:
+  Stable on x86.
+
+  02 Jul 2005; <brix@gentoo.org> -pcmcia-cs-cis-3.2.8.ebuild:
+  Pruned old ebuild.
+
+*pcmcia-cs-cis-3.2.8-r1 (30 Jun 2005)
+
+  30 Jun 2005; <brix@gentoo.org> +pcmcia-cs-cis-3.2.8-r1.ebuild:
+  The kernel expects files ending in .cis, not .dat - thanks to Dominik
+  Brodowski for the heads up.
 
 *pcmcia-cs-cis-3.2.8 (30 Jun 2005)
 
diff --git a/sys-apps/pcmcia-cs-cis/Manifest b/sys-apps/pcmcia-cs-cis/Manifest
index 55e8d9477737..51e5bc405001 100644
--- a/sys-apps/pcmcia-cs-cis/Manifest
+++ b/sys-apps/pcmcia-cs-cis/Manifest
@@ -1,2 +1,4 @@
-MD5 528268e7629952868312a829494f3ec7 pcmcia-cs-cis-3.2.8.ebuild 711
-MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-cis-3.2.8 68
+MD5 73a78d4268bc947f430c4b622521b13b pcmcia-cs-cis-3.2.8-r1.ebuild 878
+MD5 dba25df63e532f4ab3191b0145d3d3c6 ChangeLog 791
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-cis-3.2.8-r1 68
diff --git a/sys-apps/pcmcia-cs-cis/pcmcia-cs-cis-3.2.8-r1.ebuild b/sys-apps/pcmcia-cs-cis/pcmcia-cs-cis-3.2.8-r1.ebuild
index 76e6dcc73166..fb42fa38b7a5 100644
--- a/sys-apps/pcmcia-cs-cis/pcmcia-cs-cis-3.2.8-r1.ebuild
+++ b/sys-apps/pcmcia-cs-cis/pcmcia-cs-cis-3.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/sys-apps/pcmcia-cs-cis/pcmcia-cs-cis-3.2.8-r1.ebuild,v 1.1 2005/06/30 09:43:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-cis/pcmcia-cs-cis-3.2.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
 inherit linux-info
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pcmcia-cs/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 DEPEND=">=sys-apps/hotplug-20040920
diff --git a/sys-apps/pcmcia-cs-modules/ChangeLog b/sys-apps/pcmcia-cs-modules/ChangeLog
index 8b161cb0d39d..d14406d911fe 100644
--- a/sys-apps/pcmcia-cs-modules/ChangeLog
+++ b/sys-apps/pcmcia-cs-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pcmcia-cs-modules
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-modules/ChangeLog,v 1.1 2005/04/25 12:00:25 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-modules/ChangeLog,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
+
+  27 May 2005; <brix@gentoo.org> pcmcia-cs-modules-3.2.8.ebuild:
+  Stable on x86.
+
+  04 May 2005; <brix@gentoo.org> pcmcia-cs-modules-3.2.8.ebuild:
+  Bail out if linux-2.6.x detected.
 
 *pcmcia-cs-modules-3.2.8 (25 Apr 2005)
 
diff --git a/sys-apps/pcmcia-cs-modules/Manifest b/sys-apps/pcmcia-cs-modules/Manifest
index cb73ee53d506..86a1f5b27967 100644
--- a/sys-apps/pcmcia-cs-modules/Manifest
+++ b/sys-apps/pcmcia-cs-modules/Manifest
@@ -1,4 +1,6 @@
-MD5 193f1beffa803b6ead96be599692a4e9 pcmcia-cs-modules-3.2.8.ebuild 2754
+MD5 dcc5e3fdd9535b2deb7a4b5e770bdf29 pcmcia-cs-modules-3.2.8.ebuild 2912
+MD5 e950da8acb6c874ac1f248b25cf7b87c ChangeLog 672
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 6e7a371dbbc428966bcfda0029a7b6ef files/pcmcia-cs-3.2.8-modules-only.patch 1165
 MD5 29a2be33a201c160660048fb2f119915 files/digest-pcmcia-cs-modules-3.2.8 131
 MD5 791ff98a3aedc7a9c1c179156ed8fc7c files/pcmcia-cs-3.2.8-orinoco-gcc34.patch 753
diff --git a/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild b/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild
index 5c1acd0de848..270db399304e 100644
--- a/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild
+++ b/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.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/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild,v 1.1 2005/04/25 12:00:25 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs-modules/pcmcia-cs-modules-3.2.8.ebuild,v 1.1.1.1 2005/11/30 09:56:33 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
 MY_P=${P/-modules/}
 S=${WORKDIR}/${MY_P}
 
-DESCRIPTION="PCMCIA modules for Linux"
+DESCRIPTION="PCMCIA modules for Linux 2.4.x"
 HOMEPAGE="http://pcmcia-cs.sourceforge.net"
 SRC_URI="mirror://sourceforge/pcmcia-cs/${MY_P}.tar.gz
 		http://ozlabs.org/people/dgibson/dldwd/monitor-0.13e.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="cardbus"
 DEPEND="virtual/linux-sources
@@ -26,11 +26,11 @@ pkg_setup() {
 	linux-info_pkg_setup
 
 	if kernel_is gt 2 4; then
-		ewarn
-		ewarn "The recommended PCMCIA configuration for linux-2.6.x is to"
-		ewarn "use the in-kernel PCMCIA drivers."
-		ewarn
-		ebeep 5
+		eerror
+		eerror "This package only works with linux-2.4.x"
+		eerror "For newer kernels, please use the in-kernel PCMCIA drivers."
+		eerror
+		die "linux-${KV_FULL} detected"
 	fi
 
 	if (linux_chkconfig_present PCMCIA || linux_chkconfig_present PCCARD); then
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 1bab761f7534..6288dae03114 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,532 @@
 # ChangeLog for sys-apps/pcmcia-cs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
+
+  15 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  pcmcia-cs-3.2.8-r2.ebuild:
+  Only build CardBus support if CONFIG_PCI is enabled, bug #110929.
+
+  09 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  pcmcia-cs-3.2.8-r2.ebuild:
+  Adding modular X dependencies.
+
+  22 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch,
+  -files/pcmcia-cs-3.2.8-includes.patch, -pcmcia-cs-3.2.8.ebuild,
+  pcmcia-cs-3.2.8-r2.ebuild:
+  Always build with GTK+-2 support with USE=gtk, bug #106560.
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pcmcia-cs-3.2.8-r2.ebuild:
+  Stable on ppc.
+
+  10 Jul 2005; <brix@gentoo.org> -files/cardinfo-install-3.2.7.patch,
+  -pcmcia-cs-3.2.5-r2.ebuild, -pcmcia-cs-3.2.5-r3.ebuild,
+  -pcmcia-cs-3.2.7-r4.ebuild, -pcmcia-cs-3.2.8-r1.ebuild:
+  Pruned old ebuilds.
+
+  07 Jul 2005; <brix@gentoo.org> pcmcia-cs-3.2.8-r2.ebuild:
+  Stable on x86.
+
+  07 Jul 2005; <brix@gentoo.org> pcmcia-cs-3.2.7-r3.ebuild,
+  pcmcia-cs-3.2.7-r4.ebuild, pcmcia-cs-3.2.8.ebuild,
+  pcmcia-cs-3.2.8-r1.ebuild, pcmcia-cs-3.2.8-r2.ebuild:
+  Fixed DEPEND/RDEPEND issue.
+
+  05 Jul 2005; <brix@gentoo.org> pcmcia-cs-3.2.7-r3.ebuild,
+  pcmcia-cs-3.2.7-r4.ebuild:
+  Removed mips keywords as per bug #90359.
+
+  05 Jul 2005; <brix@gentoo.org> pcmcia-cs-3.2.5-r2.ebuild:
+  Removed alpha keyword since USE=pcmcia is masked on alpha.
+
+*pcmcia-cs-3.2.8-r2 (02 Jul 2005)
+
+  02 Jul 2005; <brix@gentoo.org>
+  +files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch,
+  +pcmcia-cs-3.2.8-r2.ebuild:
+  Backported CS_EVENT_RESET_COMPLETE fix from upstream, fixes bug #95111.
+
+  30 Jun 2005; <brix@gentoo.org> pcmcia-cs-3.2.5-r2.ebuild,
+  pcmcia-cs-3.2.5-r3.ebuild, pcmcia-cs-3.2.7-r3.ebuild,
+  pcmcia-cs-3.2.7-r4.ebuild, pcmcia-cs-3.2.8.ebuild,
+  pcmcia-cs-3.2.8-r1.ebuild:
+  Provide virtual/pcmcia for preparation of sys-apps/pcmciautils.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pcmcia-cs-3.2.8.ebuild:
+  Stable on ppc.
+
+*pcmcia-cs-3.2.8-r1 (11 Jun 2005)
+
+  11 Jun 2005; <brix@gentoo.org> +pcmcia-cs-3.2.8-r1.ebuild:
+  Introduce USE="vanilla" for using the original network script instead of the
+  Gentoo specific one, thanks to Kelly Price. This fixes bug #1990 and bug #95072.
+  Also add debugging output for Configure arguments.
+
+  27 May 2005; <brix@gentoo.org> pcmcia-cs-3.2.8.ebuild:
+  Stable on x86.
+
+  27 May 2005; Joseph Jezak <josejx@gentoo.org> pcmcia-cs-3.2.8.ebuild:
+  Marked ~ppc for bug #90359.
+
+  21 May 2005; Homer Parker <hparker@gentoo.org> pcmcia-cs-3.2.8.ebuild:
+  Added ~amd64 to fix bug #90359
+
+  09 May 2005; <brix@gentoo.org> files/pcmcia-cs-3.2.8-init.d:
+  Start pcmcia init script after coldplug, bug #91981.
+
+  08 May 2005; <brix@gentoo.org> +files/pcmcia-cs-3.2.8-gcc4.patch,
+  -files/pcmcia-cs-3.2.8-man-pages.patch, pcmcia-cs-3.2.8.ebuild:
+  Removed unused man-pages patch, added gcc4 patch as per bug #90359.
+
+  04 May 2005; <brix@gentoo.org> pcmcia-cs-3.2.8.ebuild:
+  Require in-kernel PCMCIA support for 2.6.x, warn users about in-kernel
+  PCMCIA support under 2.4.x
+
+  29 Apr 2005; <brix@gentoo.org> files/pcmcia-cs-3.2.8-ppc.config.opts:
+  Fixed bug #90463.
+
+*pcmcia-cs-3.2.8 (25 Apr 2005)
+
+  25 Apr 2005; <brix@gentoo.org> +files/pcmcia-cs-3.2.8-conf.d,
+  +files/pcmcia-cs-3.2.8-includes.patch, +files/pcmcia-cs-3.2.8-init.d,
+  +files/pcmcia-cs-3.2.8-ldflags.patch,
+  +files/pcmcia-cs-3.2.8-man-pages.patch,
+  +files/pcmcia-cs-3.2.8-move-pnp-ids.patch, +files/pcmcia-cs-3.2.8-network,
+  +files/pcmcia-cs-3.2.8-ppc.config.opts,
+  +files/pcmcia-cs-3.2.8-tools-only.patch, +files/pcmcia-cs-3.2.8-x11.patch,
+  +pcmcia-cs-3.2.8.ebuild:
+  Version bump. Fixes bug #28130, bug #60291, bug #61356, bug #67722, bug
+  #69293, bug #72551, bug #78276, bug #86109 and bug #88959.
+
+  15 Apr 2005; <brix@gentoo.org> -pcmcia-cs-3.2.5.ebuild,
+  -pcmcia-cs-3.2.5-r1.ebuild, -pcmcia-cs-3.2.7.ebuild,
+  -pcmcia-cs-3.2.7-r2.ebuild:
+  Pruned old ebuilds.
+
+*pcmcia-cs-3.2.7-r4 (12 Apr 2005)
+*pcmcia-cs-3.2.7-r3 (12 Apr 2005)
+*pcmcia-cs-3.2.5-r3 (12 Apr 2005)
+*pcmcia-cs-3.2.5-r2 (12 Apr 2005)
+
+  12 Apr 2005; <brix@gentoo.org> metadata.xml, +pcmcia-cs-3.2.5-r2.ebuild,
+  +pcmcia-cs-3.2.5-r3.ebuild, +pcmcia-cs-3.2.7-r3.ebuild,
+  +pcmcia-cs-3.2.7-r4.ebuild:
+  Install a tarball of the configured pcmcia-cs source to /usr/src/pcmcia-cs
+  for external module ebuilds, use linux-info.eclass to handle kernel info.
+
+  12 Apr 2005; <brix@gentoo.org> -files/gentoo-pcmcia-cs-3.1.34.patch,
+  -files/hermes.conf, -files/network.orig, -pcmcia-cs-3.1.34-r8.ebuild,
+  -pcmcia-cs-3.2.4.ebuild, -pcmcia-cs-3.2.7-r1.ebuild:
+  Pruned old versions
+
+  17 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  pcmcia-cs-3.2.7-r2.ebuild:
+  ~mips for my XXS1500 hardware.
+
+  08 Jan 2005; Daniel Black <dragonheart@gentoo.org> files/ppc.config.opts:
+  Bad char in config file as per bug #77085. Thanks to Hugo Herbelin
+  <Hugo.Herbelin@inria.fr>
+
+  21 Oct 2004; <peter@gentoo.org> files/pcmcia.conf:
+  Make yenta_socket the socket driver to try first when starting pcmcia services.
+
+*pcmcia-cs-3.2.7-r2 (09 Oct 2004)
+
+  09 Oct 2004; Doug Goldstein <cardoe@gentoo.org>
+  +files/pcmcia-cs-3.2.7-move-pnp-ids-to-usr-share-misc.patch,
+  +pcmcia-cs-3.2.7-r2.ebuild:
+  path fixing bug #62786
+
+  04 Oct 2004; <iggy@gentoo.org> pcmcia-cs-3.2.7-r1.ebuild:
+  switched custom ARCH setting code to use set_arch_to_* from eutils
+
+  27 Sep 2004; Doug Goldstein <cardoe@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild,
+  pcmcia-cs-3.2.5.ebuild, pcmcia-cs-3.2.7-r1.ebuild, pcmcia-cs-3.2.7.ebuild:
+  added note about CRC32 library functions that need to be modules or compiled in
+
+*pcmcia-cs-3.2.7-r1 (10 Sep 2004)
+
+  10 Sep 2004; Doug Goldstein <cardoe@gentoo.org>
+  +files/cardinfo-install-3.2.7.patch, +pcmcia-cs-3.2.7-r1.ebuild:
+  QA issue: install cardinfo & xcardinfo into /usr/bin rather then /usr/X11R6/bin
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  pcmcia-cs-3.2.7.ebuild:
+  Masked pcmcia-cs-3.2.7.ebuild stable for ppc
+
+  30 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> pcmcia-cs-3.2.7.ebuild:
+  Add ~mips for the XXS1500 unit.
+
+  09 Jul 2004; Travis Tilley <lv@gentoo.org> pcmcia-cs-3.1.34-r8.ebuild,
+  pcmcia-cs-3.2.4.ebuild, pcmcia-cs-3.2.5-r1.ebuild, pcmcia-cs-3.2.5.ebuild,
+  pcmcia-cs-3.2.7.ebuild:
+  switch linux-headers dependency to virtual/os-headers
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> pcmcia-cs-3.1.34-r8.ebuild:
+  sync IUSE (+apm, +build, +nocardbus, +pnp, +trusted, +wavelan)
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> pcmcia-cs-3.1.34-r8.ebuild,
+  pcmcia-cs-3.2.4.ebuild:
+  QA - fix use invocation
+
+  18 Mar 2004; Peter Johanson <latexer@gentoo.org> files/pcmcia.rc:
+  Added a slightly smarter check for pcmcia present in the kernel before
+  attempting to modprobe things. Thanks to Scott Taylor <swtaylor@gentoo.org>
+  for the suggestion.
+
+  18 Feb 2004; Brad House <brad_mssw@gentoo.org> pcmcia-cs-3.2.7.ebuild:
+  amd64 stable
+
+  10 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.7.ebuild:
+  Small fix for integer test
+
+  08 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
+  Marking stable on x86. Lots of fixes for module-init-tools, SMP, etc. and
+  3.2.5 has been in for ages.
+
+  08 Feb 2004; Luca Barbato <lu_zero@gentoo.org> pcmcia-cs-3.2.7.ebuild:
+  Marked ~ppc
+
+*pcmcia-cs-3.2.7 (07 Feb 2004)
+
+  07 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.7.ebuild:
+  New version! has much better detection for 2.6 and newer 2.4 kernels. Using
+  dgibson's monitor mode patch. Includes PPC fix.
+
+  07 Feb 2004; Luca Barbato <lu_zero@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
+  Marked ~ppc
+
+  07 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
+  Added patch to fix compiling when we have CONFIG_SMP. Mainly so liveCDs can
+  have SMP and get pcmcia working.
+
+  07 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
+  Added a fix for compilation on ppc with recent kernels (bug #40293). Thanks to
+  rommel for all the testing.
+
+  06 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.4.ebuild:
+  Added a check for 2.6 kernels so we die and give the user useful info for
+  getting things working
+
+  04 Feb 2004; Peter Johanson <latexer@gentoo.org> files/pcmcia.conf,
+  files/pcmcia.rc:
+  Added ability to have two different PCIC modules attempted to the init system.
+  This should be useful for liveCDs as well as for people switching between 2.6
+  and 2.4 kernels potentially.
+
+  03 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild,
+  pcmcia-cs-3.2.5.ebuild:
+  Fix to build orinoco drivers. Bug #35912 (thanks jeremy)
+
+  02 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild,
+  pcmcia-cs-3.2.5.ebuild:
+  Added depmods in pkg_postinst()
+
+  02 Feb 2004; Eric Sammer <esammer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
+  Fixed bad URI for one of the patch files.
+
+*pcmcia-cs-3.2.5-r1 (01 Feb 2004)
+
+  01 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild,
+  pcmcia-cs-3.2.5.ebuild:
+  Added a fix for module-init-tools systems
+
+  19 Jan 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  pcmcia-cs-3.1.34-r8.ebuild, pcmcia-cs-3.2.4.ebuild, pcmcia-cs-3.2.5.ebuild:
+  Marking as -sparc. The only vaguely non-broken sparc PCMCIA implementation
+  comes with its own set of pcmcia-cs patches that are marked "for developers
+  only".
+
+  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> pcmcia-cs-3.2.5.ebuild:
+  Stable on alpha for bug 34771
+
+  19 Dec 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5.ebuild:
+  Fixes for ARCH and cleanup (bug #34773 and 34771)
+
+  15 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  <herd>base-system</herd> -> <herd>mobile</herd>
+
+  02 Dec 2003; Aron Griffis <agriffis@gentoo.org> pcmcia-cs-3.2.5.ebuild:
+  Mark stable on alpha
+
+*pcmcia-cs-3.2.5 (09 Oct 2003)
+
+  09 Oct 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5.ebuild,
+  files/pcmcia.conf:
+  Fixed files/pcmcia.conf to only have one entry in TCIC for bug #22462.
+  pcmcia-cs-3.2.5 ebuild now fixes modversions.h path if using 2.6.x. Fix for
+  using module-init-tools coming soon.
+
+  08 Jun 2003; Peter Johanson <latexer@gentoo.org> files/pcmcia.rc:
+  Little fix to pcmcia init script. bug #22396
+
+*pcmcia-cs-3.2.4 (15 Apr 2003)
+
+  15 Apr 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.4.ebuild:
+  Marked stable for x86
+
+  8 Mar 2003; Peter Johanson <latexer@gentoo.org> files/pcmcia.conf :
+  Added two socket drivers to PCIC by default.
+
+  7 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.1-r4.ebuild :
+  Added --force configure option when USE="build"
+
+  5 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.3-r2.ebuild, pcmcia-cs-3.2.3-r2.ebuild :
+  Added IUSE.
+
+  4 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.3-r2.ebuild :
+  Fixed permissions so that src_unpack works with FEATURES="userpriv" enabled.
+
+  4 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.1-r4.ebuild :
+  Changed "wavelan?" to "!wavelan?" to fix bug #16838.
+
+  2 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.1-r4.ebuild :
+  Fixed permissions so that src_unpack works with FEATURES="userpriv" enabled.
+  Also added wavelan? to SRC_URI to prevent extraneous downloads of orinoco stuff.
+
+  2 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.1-r4.ebuild :
+  Fixed orinoco patch line.
+
+  1 Mar 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.1-r4.ebuild :
+  Marked as stable for x86
+
+*pcmcia-cs-3.2.3-r4 (25 Feb 2003)
+
+  25 Feb 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.1-r4 :
+  Version bump to use latest ornico driver (0.13b)
+
+  27 Jan 2003; Chad Huneycutt <chadh@gentoo.org> : old ebuilds
+  Removed old ebuilds.  If you really need something, let me know, and I will
+  rescue it.
+
+  23 Jan 2003; Chad Huneycutt <chadh@gentoo.org> : files/pcmcia.rc
+  fixed bugs in init script as reported in bug #13017
+
+  15 Dec 2002; Chad Huneycutt <chadh@gentoo.org> : pcmcia-cs-3.1.33-r5.ebuild, pcmcia-cs-3.1.34-r6.ebuild, pcmcia-cs-3.1.34-r7.ebuild, pcmcia-cs-3.1.34-r8.ebuild, pcmcia-cs-3.2.0.ebuild, pcmcia-cs-3.2.1-r1.ebuild, pcmcia-cs-3.2.1-r2.ebuild, pcmcia-cs-3.2.1.ebuild, pcmcia-cs-3.2.2.ebuild, pcmcia-cs-3.2.3.ebuild :
+  Changed the ebuilds to use new init script name (see below).
+
+  15 Dec 2002; Chad Huneycutt <chadh@gentoo.org> : files/pcmcia.rc6, files/pcmcia.conf :
+  Updated init script to load pcmcia modules (according to pcmcia.conf, aka
+  /etc/conf.d/pcmcia) and changed filename to pcmcia.rc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*pcmcia-cs-3.2.3-r2 (22 Feb 2003)
+
+  22 Feb 2003; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.3-r2.ebuild files/digest-pcmcia-cs-3.2.3-r2 :
+  Version bump to include the latest orinoco driver with monitor mode patch (0.13b)
+
+*pcmcia-cs-3.2.3-r1 (27 Jan 2003)
+
+  27 Jan 2003; Chad Huneycutt <chadh@gentoo.org> : pcmcia-cs-3.2.3-r1.ebuild
+  One ebuild to rule them all ;-).  Added the local USE var "monitor" to choose
+  whether to install the 0.11b orinoco driver with shmoo patch or the newer
+  0.13a orinoco drivers and no monitor patch.
+ 
+*pcmcia-cs-3.2.3 (17 Nov 2002)
+
+  17 Nov 2002; Hanno Boeck <hanno@gentoo.org> pcmcia-cs-3.2.3.ebuild :
+  New version. Cleaned up ebuild a lot.
+  Changes:
+  - Updated orinoco-driver to 0.13a
+  - Removed use of wavelan-keyword, orinoco-driver should be updated always.
+  - Remove replacement of ide_cs with ide-cs, this is fixed upstream.
+  - Some cleanups to make ebuild more readable and some lintool-fixes.
+
+*pcmcia-cs-3.2.2 (28 Oct 2002)
+
+  11 Nov 2002; Chad Huneycutt <chadh@gentoo.org> pcmcia-cs-3.2.2.ebuild:
+  Revision bump.
+
+*pcmcia-cs-3.2.1-r3 (27 Jan 2003)
+
+  27 Jan 2003; Chad Huneycutt <chadh@gentoo.org> : pcmcia-cs-3.2.1-r3.ebuild
+  Fixes to apply the orinoco shmoo patch properly.  wavelan is no longer needed
+  in your USE.  Also downgraded orinoco version to latest that there is shmoo
+  patch for (0.11b).  For later orinoco drivers, try the pcmcia-cs-3.2.3 ebuilds
+
+*pcmcia-cs-3.2.1-r2 (28 Oct 2002)
+
+  28 Oct 2002; Chad Huneycutt <chadh@gentoo.org> pcmcia-cs-3.2.1-r2.ebuild :
+  This is a patch to make airsnort/kismet work with our package.  Added in
+  response to bug 7242 by jrray@gentoo.org
+
+*pcmcia-cs-3.2.1-r1 (28 Oct 2002)
+
+  28 Oct 2002; Chad Huneycutt <chadh@gentoo.org> pcmcia-cs-3.2.1-r1.ebuild :
+  Version bump and a fix for an xforms bug
+
+*pcmcia-cs-3.2.0 (25 July 2002)
+
+  25 Jul 2002; Doug Goldstein <cardoe@gentoo.org> pcmcia-cs-3.2.0.ebuild :
+  Version bump
+
+*pcmcia-cs-3.1.34-r4 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.34-r4.ebuild :
+  Added KEYWORDS.
+
+*pcmcia-cs-3.1.34-r3 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.34-r3.ebuild :
+  Added KEYWORDS.
+
+*pcmcia-cs-3.1.34-r8 (13 July 2002)
+  
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  13 July 2002; Doug Goldstein <cardoe@gentoo.org> pcmcia-cs-3.1.34-r8.ebuild
+
+  Corrected an issue where we were attempting "sed"ing the Configure file from the wrong directory so it
+  never happened. 
+  Includes chadh's cardmgr with -f patch (this was included in -r7 but someone didn't edit the ChangeLog)
+  Added the use of the wavelan USE var to disable the use of the Orinoco drivers if +wavelan is set.
+  Corrected a problem where pkg_postinst() was called src_postinst() so our post install info was never
+  being displayed 
+
+*pcmcia-cs-3.1.35_beta2 (12 July 2002)
+
+  12 July 2002; Doug Goldstein <cardoe@gentoo.org> pcmcia-cs-3.1.35_beta2.ebuild
+  
+  Since .34 and lower have some very very annoying and dibilitating (sp) bugs in them I'm creating this..
+  It carries over my fixes from .34-r6 still as they haven't been made upstream yet
+  There is no beta1 ebuild, only beta2 as the file this ebuild uses is the 2nd beta file released
+
+*pcmcia-cs-3.1.34 (12 July 2002)
+
+  12 July 2002; Doug Goldstein <cardoe@gentoo.org> pcmcia-cs-3.1.34-r6.ebuild
+
+  Addressed bug #3400 about /etc/pcmcia/config needing all "ide_cs" renamed to "ide-cs"
+  It was also a bug on PCMCIA-CS's official site.
+  Updated orinoco to 0.12b and corrected another ebuild typo.
+
+*pcmcia-cs-3.1.34 (05 July 2002)
+
+  05 July 2002; Doug Goldstein <cardoe@gentoo.org> pcmcia-cs-3.1.34-r5.ebuild
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.34-r5.ebuild :
+  Added KEYWORDS.
+  
+  Updated to orinoco 0.12a and got rid of the errors about gentoo-3.1.34.patch missing and correted with lintool
+
+*pcmcia-cs-3.1.34 (01 July 2002)
+
+  02 July 2002; Chad Huneycutt <chadh@gentoo.org> pcmcia-cs-3.1.34-r2.ebuild
+
+  Well, it appears that there is bug in cardmgr.  This is an attempted fix.
+
+  01 July 2002; Chad Huneycutt <chadh@gentoo.org> pcmcia-cs-3.1.34-r1.ebuild
+
+  Updated orinoco drivers to version 0.12
+
+  01 July 2002; Chad Huneycutt <chadh@gentoo.org> pcmcia-cs-3.1.34.ebuild
+
+  New version.
+
+*pcmcia-cs-3.1.33-r5 (09 June 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.33-r5.ebuild :
+  Added KEYWORDS.
+
+  08 June 2002; Mark Guertin <gerk@gentoo.org>
+
+  Added ppc fixes to this ebuild.  Left new orinoco driver section in (but commented as it is still testing)
+
+
+*pcmcia-cs-3.1.33-r4 (01 May 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.33-r4.ebuild :
+  Added KEYWORDS, SLOT.
+
+  01 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> pcmcia-cs-3.1.33-r4.ebuild files/digest-pcmcia-cs-3.1.33-r4 :
+
+  Added new version of the orinoco_cs driver. The SMC2632W card now works
+  again.
+
+  Cleaned up this horrid ChangeLog somewhat.
+
+  Old revision kept, new revision masked, as the new orinoco driver 
+  hasn't recived adequate testing.
+
+*pcmcia-cs-3.1.33-r3,pcmcia-cs-3.1.31-r7 (28 Mar 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.33-r3.ebuild :
+  Added KEYWORDS, SLOT.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> pcmcia-cs-3.1.31-r7.ebuild :
+  Added KEYWORDS, SLOT.
+
+  30 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : 
+
+  removed X support, a much-requested change.  No rev bump.
+
+  28 Mar 2002; Chad Huneycutt <chadh@gentoo.org> :
+
+  changed doins to doexe for installing the network script executably
+
+  28 Mar 2002; Chad Huneycutt <chadh@gentoo.org> :
+
+  typo in the stop code.
+
+*pcmcia-cs-3.1.33-r2, pcmcia-cs-3.1.31-r6 (19 Mar 2002)
+
+  19 Mar 2002; Chad Huneycutt <chadh@gentoo.org> :
+
+  hacked up the /etc/pcmcia/network script that cardmgr uses to start network
+  iterfaces to call Gentoo's network init scripts
+
+*pcmcia-cs-3.1.33-r1 (18 Mar 2002)
+
+  18 Mar 2002; Chad Huneycutt <chadh@gentoo.org> :
+
+  newest version of pcmcia-cs
+
+*pcmcia-cs-3.1.31-r5 (14 Mar 2002)
+
+  14 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org>: pcmcia-cs-3.1.31-r5.ebuild :
+
+  The test for the nocardbus USE flag was reversed. Fixed.
+
+*pcmcia-cs-3.1.31-r4 (14 Mar 2002)
+
+  14 Mar 2002; Chad Huneycutt <chadh@gentoo.org> : 
+
+  many fixes:
+  1. added USE variables for trusted apps, apm, cardbus, and pnp
+  2. updated init script to die slightly more gracefully when cardmgr
+     cannot start
+  3. changed configuration settings for init script (previously
+     /etc/pcmcia.conf) to install instead to /etc/conf.d as the Gentoo-specific
+     config
+  4. Undid drobbins "-f" fix below, as it is not a very good default behavior,
+     if , say, cardmgr starts dhcpcd, which can take a while to obtain
+     information.  There is a CARDMGR_OPTS variable in /etc/conf.d/pcmcia where
+     users can specify this if they want.
+  5. I also put hermes.conf in ${FILESDIR}, but I am not installing it, as it
+     causes cardmgr to choose the orinoco_cs driver over wvlan_cs, which may not
+     be what the user wants.  It is documented pretty well that it must be
+     downloaded, so I think it is safe to leave it out.
+
+*pcmcia-cs-3.1.31-r3 (05 Mar 2002)
+
+  05 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : 
+
+  properly install the pcmcia rc script into /etc/init.d; add -f option 
+  to cardmgr so that it stays in the foreground until it's done doing its 
+  thing.  This ensures that any network interfaces are set up after it 
+  detaches.  This closes bug #972.
+
+*pcmcia-cs-3.1.31-r2 (10 Feb 2002)
+
+  10 Feb 2002; Daniel Robbins <drobbins@gentoo.org> : 
+
+  Configure --srctree option added to tell pcmcia-cs to configure for 
+  kernel described in /usr/src/linux rather than the currently-running 
+  kernel (which is otherwise the default). We're now doing this the "right"
+  way. 
 
 *pcmcia-cs-3.1.31-r1 (1 Feb 2002)
 
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index e69de29bb2d1..ff51bea0ba0d 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -0,0 +1,20 @@
+MD5 0bfee4ba21dccf419e0b31c05c27c5f7 pcmcia-cs-3.2.7-r3.ebuild 4953
+MD5 31c8d881e07b845e8e2db2180e80860c pcmcia-cs-3.2.8-r2.ebuild 4052
+MD5 dfbe65ddd83b325405598203171e2eea ChangeLog 21127
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 310551d0852ba9c1fe5c0f8c231c3589 files/digest-pcmcia-cs-3.2.7-r3 287
+MD5 89130d20833db1421e8f624c90d19516 files/digest-pcmcia-cs-3.2.8-r2 68
+MD5 8df7f8fac6931504e84e1c13acfe92e6 files/pcmcia-cs-3.2.8-x11.patch 874
+MD5 33c110d98480f8c994d902995356cda2 files/pcmcia-cs-3.2.8-move-pnp-ids.patch 1648
+MD5 c913e8e351070fda2dd49be2802d9128 files/pcmcia-cs-3.2.8-ldflags.patch 944
+MD5 adfa3588f2c81c2c97fa0fffa18c6bed files/pcmcia-cs-3.2.8-conf.d 524
+MD5 693d508b7dd24e64735b5ba4a16e699b files/pcmcia.rc 2038
+MD5 2303a317f3ab3ae698cd51fadaa7d998 files/pcmcia-cs-3.2.8-init.d 2244
+MD5 da3f5dc50768f0a5d9868dd5bd227329 files/network 768
+MD5 fb59203b176eea34b5969d465efb85a9 files/ppc.config.opts 1687
+MD5 8938df25626d18aa4493d26dea7e00eb files/pcmcia-cs-3.2.8-ppc.config.opts 1657
+MD5 4aff8abc0109d71184f648e2cc87eb51 files/pcmcia-cs-3.2.8-CS_EVENT_RESET_COMPLETE.patch 1402
+MD5 e4879f03bbdbfbdc094c1f1b6486846b files/pcmcia.conf 549
+MD5 d5958e695d20fb3bcd14c11121ba27a4 files/pcmcia-cs-3.2.8-gcc4.patch 902
+MD5 18e1f0bdc6612842839a2b2888ea16ad files/pcmcia-cs-3.2.8-tools-only.patch 1230
+MD5 3934f1302fe4fe19a9f0f7624526d923 files/pcmcia-cs-3.2.8-network 784
diff --git a/sys-apps/pcmcia-cs/files/network b/sys-apps/pcmcia-cs/files/network
index 077627daa357..4cb4ceef1f28 100644
--- a/sys-apps/pcmcia-cs/files/network
+++ b/sys-apps/pcmcia-cs/files/network
@@ -1,14 +1,34 @@
-#! /bin/sh
+#!/bin/sh
 
-action=$1
-device=$2
+if [ -r ./shared ] ; then . ./shared ; else . /etc/pcmcia/shared ; fi
 
-case "${action:?}" in
+# Get device attributes
+get_info $DEVICE
+HWADDR=`/sbin/ifconfig $DEVICE | sed -ne 's/.*\(..:..:..:..:..:..\).*/\1/p'`
+
+# Load site-specific settings
+ADDRESS="$SCHEME,$SOCKET,$INSTANCE,$HWADDR"
+
+RESOLV=/etc/resolv.conf
+
+# Now, run the specific script for Wireless LAN interfaces
+# Note : we need the wireless parameters to be set up before IP parameters,
+# so that we can perform DHCP over the Wireless link if needed. Jean II
+O_INFO=$INFO ; INFO=
+if [ -x ./wireless ] ; then
+    . ./wireless
+else
+    . /etc/pcmcia/wireless
+fi
+INFO=$O_INFO
+
+
+case "${ACTION}" in
 	"start" | "resume" )
-		/etc/init.d/net.$2 start
+		/etc/init.d/net.$DEVICE start
 		;;
 	"stop")
-		/sbin/ifconfig $2 stop
+		/etc/init.d/net.$DEVICE stop
 		;;
 	"check")
 		;;
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d
index 966dcee8b66d..0f3ac1558691 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d
@@ -1,11 +1,15 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d,v 1.1 2005/04/25 12:09:18 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-init.d,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
 
 RUN=/var/run
 SCHEME_FILE=${RUN}/pcmcia-scheme
 
+depend() {
+	use coldplug
+}
+
 cleanup() {
 	while read SN CLASS MOD INST DEV EXTRA; do
 		if [[ "${SN}" != "Socket" ]]; then
diff --git a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ppc.config.opts b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ppc.config.opts
index 9c835b7704bc..a89546adb8d2 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ppc.config.opts
+++ b/sys-apps/pcmcia-cs/files/pcmcia-cs-3.2.8-ppc.config.opts
@@ -50,9 +50,8 @@ include memory 0x90000000-0x9003ffff
 
 #Powerbook G4 AlBook
 #http://lists.debian.org/debian-powerpc/2004/01/msg00248.html
-#include port 0x1000-0x10ff
-#include port 0x1400-0x14ff
-#include memory 0x80000000-0x80ffffff
+#include port 0x800-0x8ff
+#include memory 0x80080000-0x80ffffff
 
 
 # all other modules should be kernel modules on ppc
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.conf b/sys-apps/pcmcia-cs/files/pcmcia.conf
index 10f964e7fd88..87a40b809097 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia.conf
+++ b/sys-apps/pcmcia-cs/files/pcmcia.conf
@@ -1,10 +1,19 @@
-# Should be either i82365 or tcic
-PCIC=""
+# Put cardmgr options here
+CARDMGR_OPTS="-f"
+# To set the PCMCIA scheme at startup...
+SCHEME="home"
+
+# If using kernel PCMCIA drivers, PCIC should be "yenta_socket". If 
+# using the pcmcia-cs drivers, this shhould be either "i82365" or "tcic",
+# depending on your pcmcia hardware.
+# If using kernel drivers not as modules, set PCIC to ""
+PCIC="yenta_socket"
 # Put socket driver timing parameters here
 PCIC_OPTS=""
+
+# Alternative PCIC driver to use if PCIC driver fails
+PCIC_ALT="i82365"
+PCIC_ALT_OPTS=""
+
 # Put pcmcia_core options here
 CORE_OPTS=""
-# Put cardmgr options here
-CARDMGR_OPTS=""
-# To set the PCMCIA scheme at startup...
-SCHEME=""
diff --git a/sys-apps/pcmcia-cs/files/pcmcia.rc b/sys-apps/pcmcia-cs/files/pcmcia.rc
index 1baf8d3d2edb..03c93e22ee71 100644
--- a/sys-apps/pcmcia-cs/files/pcmcia.rc
+++ b/sys-apps/pcmcia-cs/files/pcmcia.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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-apps/pcmcia-cs/files/pcmcia.rc,v 1.1 2002/12/17 17:10:32 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/files/pcmcia.rc,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
 
 RUN=/var/run
 SC=${RUN}/pcmcia-scheme
@@ -15,6 +15,16 @@ cleanup()
 	done
 }
 
+pcmcia_probe()
+{
+	MODULE=$1
+	OPTS=$2
+
+	/sbin/modprobe $MODULE $OPTS 2>/dev/null
+
+	return $?
+}
+
 start() {
 	local code
 	# Scheme is set for the /etc/pcmcia/shared script
@@ -33,10 +43,18 @@ start() {
 		rm -rf /var/lib/pcmcia
 	fi
 
-	if [ -z `fgrep "ds " /proc/modules` ] ; then
-		/sbin/modprobe pcmcia_core $CORE_OPTS 2> /dev/null
-		/sbin/modprobe $PCIC $PCIC_OPTS 2> /dev/null
-		/sbin/modprobe ds
+	if [ -e /proc/bus/pccard ]; then
+		einfo "PCMCIA support detected."
+	else
+		pcmcia_probe pcmcia_core $CORE_OPTS
+		if [ -n "${PCIC}" ]; then
+			pcmcia_probe $PCIC $PCIC_OPTS || {
+				ewarn "'modprobe ${PCIC}' failed"
+				ewarn "Trying alternative PCIC driver: ${PCIC_ALT}"
+				pcmcia_probe $PCIC_ALT $PCIC_ALT_OPTS
+			}
+		fi
+		pcmcia_probe ds
 	fi
 
 	ebegin "Starting pcmcia"
@@ -58,7 +76,7 @@ stop() {
 	start-stop-daemon --stop --quiet --pidfile /var/run/cardmgr.pid --retry 5
 	code=$?	
 
-	if [ -z `fgrep -q "ds " /proc/modules` ]; then
+	if [ -n `fgrep "ds " /proc/modules | head -n1 | cut -c1` ]; then
 		/sbin/rmmod ds 2> /dev/null
 		/sbin/rmmod $PCIC 2> /dev/null
 		/sbin/rmmod pcmcia_core 2> /dev/null
diff --git a/sys-apps/pcmcia-cs/files/ppc.config.opts b/sys-apps/pcmcia-cs/files/ppc.config.opts
index 3df34ee7529b..9c835b7704bc 100644
--- a/sys-apps/pcmcia-cs/files/ppc.config.opts
+++ b/sys-apps/pcmcia-cs/files/ppc.config.opts
@@ -2,8 +2,57 @@
 # Local PCMCIA Configuration File
 #
 #----------------------------------------------------------------------
-
+#
+#
 include port 0x1000-0x1fff
 include memory 0x90000000-0x9003ffff
+#
+# As noted in the howto (bug #27753)
+#
+# include port 0x100-0x4ff, port 0x1000-0x17ff
+# include memory 0x80000000-0x80ffffff
+
+
+#Powerbook G4 867
+#http://www.staikos.net/~staikos/tibook/
+#include memory 0xa0003000-0xa0ffffff
+#include port 0x9100-0x9fff
+
+#Powerbook G3
+#http://homepage.mac.com/pauljlucas/personal/powerbook/wireless.html
+#include memory 0x80000000-0x80ffffff
+#include port 0x100-0x1ff
+
+#G4 Powerbook?
+#http://lists.samba.org/archive/linux/2002-April/003044.html
+#include port 0x100-0x4ff, port 0x1000-0x17ff
+#include memory 0xa7000000-0xa7ffffff
+
+#G3 Powerbook Pismo
+#http://pcmcia-cs.sourceforge.net/cgi-bin/HyperNews/get/pcmcia/ports/10/1.html?nogifs
+#include port 0x1000-0x1fff
+#include memory 0x90000000-0x90ffffff
+
+#Powerbook defaults in pcmcia-cs
+#http://pcmcia-cs.sourceforge.net/ftp/doc/PCMCIA-HOWTO-2.html
+#include port 0x100-0x4ff, port 0x1000-0x17ff
+#include memory 0x80000000-0x80ffffff
+
+#Powerbook G3 Wallstreet, Lombard and Pismo
+#http://www.mpifr-bonn.mpg.de/div/iri/Archiv/LinuxPPC/PCMCIA.html
+#include port 0x1000-0x1fff
+#include memory 0x90000000-0x9003ffff
+
+#Powerbook G4 TiBook
+#http://www.yellowdoglinux.com/support/solutions/ydl_general/pcmcia-nic.shtml
+#include memory 0x80000000-0x80ffffff
+#include port 0x100-0x4ff, port 0x1000-0x17ff
+
+#Powerbook G4 AlBook
+#http://lists.debian.org/debian-powerpc/2004/01/msg00248.html
+#include port 0x1000-0x10ff
+#include port 0x1400-0x14ff
+#include memory 0x80000000-0x80ffffff
+
 
 # all other modules should be kernel modules on ppc
diff --git a/sys-apps/pcmcia-cs/metadata.xml b/sys-apps/pcmcia-cs/metadata.xml
index ff1da43252ed..cfbdff13bd61 100644
--- a/sys-apps/pcmcia-cs/metadata.xml
+++ b/sys-apps/pcmcia-cs/metadata.xml
@@ -1,7 +1,9 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mobile</herd>
+<maintainer>
+  <email>brix@gentoo.org</email>
+  <name>Henrik Brix Andersen</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
index 86569f752271..ab0b34f91cd0 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.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/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild,v 1.1 2005/04/12 19:09:07 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
 inherit linux-info eutils
 
@@ -14,13 +14,14 @@ SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
 
 HOMEPAGE="http://pcmcia-cs.sourceforge.net"
 IUSE="X trusted build apm pnp nocardbus"
-DEPEND="virtual/os-headers
+RDEPEND="!sys-apps/pcmcia-cs-cis
 		>=sys-apps/sed-4
 		X? ( virtual/x11 )"
-RDEPEND=""
+DEPEND="${RDEPEND} virtual/os-headers"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc amd64 ~mips"
+KEYWORDS="~x86 ppc amd64"
+PROVIDE="virtual/pcmcia"
 
 src_unpack() {
 	unpack ${P}.tar.gz || die "unpack failed"
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
index 53f9527eb29e..700f3efac0d6 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.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-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.1 2005/07/02 19:05:23 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -10,17 +10,20 @@ SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 
-IUSE="gtk gtk2 vanilla trusted X xforms"
-DEPEND="virtual/linux-sources
-		>=sys-apps/sed-4"
+IUSE="gtk vanilla trusted X xforms"
 RDEPEND="!sys-apps/pcmcia-cs-cis
-			X? ( virtual/x11
-			gtk? ( gtk2? ( =x11-libs/gtk+-2*
-						   dev-util/pkgconfig )
-				    !gtk2? ( =x11-libs/gtk+-1* ) )
-			xforms? ( x11-libs/xforms ) )"
+			X? ( || ( ( x11-libs/libX11
+						x11-libs/libXpm
+						x11-libs/libXaw )
+						virtual/x11 )
+				 gtk? ( =x11-libs/gtk+-2*
+				   		 dev-util/pkgconfig )
+				 xforms? ( x11-libs/xforms ) )"
+DEPEND="${RDEPEND}
+		virtual/linux-sources
+		>=sys-apps/sed-4"
 PROVIDE="virtual/pcmcia"
 
 pkg_setup() {
@@ -41,7 +44,6 @@ pkg_setup() {
 	fi
 }
 
-
 src_unpack() {
 	unpack ${A}
 
@@ -82,6 +84,14 @@ src_compile() {
 		config="${config} --nopnp"
 	fi
 
+	if linux_chkconfig_present PCI; then
+		einfo "CardBus support enabled"
+		config="${config} --cardbus"
+	else
+		einfo "CardBus support disabled"
+		config="${config} --nocardbus"
+	fi
+
 	# cardctl, cardinfo and xcardinfo are setUID
 	append-ldflags -Wl,-z,now
 
@@ -108,14 +118,8 @@ src_compile() {
 
 		if use gtk; then
 			echo "HAS_GTK=y" >> ${CONFIG_FILE}
-
-			if use gtk2; then
-				echo "GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0)" >> ${CONFIG_FILE}
-				echo "GTK_LIBS=$(pkg-config --libs gtk+-2.0)" >> ${CONFIG_FILE}
-			else
-				echo "GTK_CFLAGS=$(gtk-config --cflags)" >> ${CONFIG_FILE}
-				echo "GTK_LIBS=$(gtk-config --libs)" >> ${CONFIG_FILE}
-			fi
+			echo "GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0)" >> ${CONFIG_FILE}
+			echo "GTK_LIBS=$(pkg-config --libs gtk+-2.0)" >> ${CONFIG_FILE}
 		fi
 
 		if use xforms; then
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 4064e3ffcc61..767815187c0f 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.1 2005/06/30 09:21:50 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
+
+  10 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+  pcmciautils-010.ebuild:
+  Updated HOMEPAGE.
+
+  22 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -pcmciautils-007.ebuild, -pcmciautils-008.ebuild:
+  Pruned old versions.
+
+*pcmciautils-010 (20 Oct 2005)
+
+  20 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +pcmciautils-010.ebuild:
+  Version bump. This version installs as an udev handler when USE=udev, and as
+  a hotplug handler when USE=-udev.
+
+*pcmciautils-008 (29 Aug 2005)
+
+  29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +pcmciautils-008.ebuild:
+  Version bump.
+
+  26 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -pcmciautils-004.ebuild, -pcmciautils-005.ebuild, -pcmciautils-006.ebuild:
+  Pruned old versions.
+
+*pcmciautils-007 (29 Jul 2005)
+
+  29 Jul 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +pcmciautils-007.ebuild:
+  Version bump.
+
+*pcmciautils-006 (18 Jul 2005)
+
+  18 Jul 2005; <brix@gentoo.org> +pcmciautils-006.ebuild:
+  Version bump.
+
+  07 Jul 2005; <brix@gentoo.org> pcmciautils-004.ebuild,
+  pcmciautils-005.ebuild:
+  Fixed DEPEND/RDEPEND issue.
+
+*pcmciautils-005 (03 Jul 2005)
+
+  03 Jul 2005; <brix@gentoo.org> +pcmciautils-005.ebuild:
+  Version bump.
 
 *pcmciautils-004 (30 Jun 2005)
 
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 583dad2bb9e8..90b3f93021b1 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,2 +1,4 @@
-MD5 73d606c09e37b486d49448f8c5c844a7 pcmciautils-004.ebuild 1993
-MD5 a05c18e20e1f29790f87ab132a81cafb files/digest-pcmciautils-004 67
+MD5 d5967437f1850e59373d30c19647c90a pcmciautils-010.ebuild 2262
+MD5 3ef6688251bf3852a69f18f01f7cbbd5 ChangeLog 1649
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 f0b6ef73c257acea57b05a10e0019fc2 files/digest-pcmciautils-010 67
diff --git a/sys-apps/pcmciautils/pcmciautils-010.ebuild b/sys-apps/pcmciautils/pcmciautils-010.ebuild
index f7925e3fe90d..edf4f283e13f 100644
--- a/sys-apps/pcmciautils/pcmciautils-010.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-010.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/sys-apps/pcmciautils/pcmciautils-010.ebuild,v 1.1 2005/10/20 15:01:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-010.ebuild,v 1.1.1.1 2005/11/30 09:56:38 chriswhite Exp $
 
 inherit toolchain-funcs linux-info
 
 DESCRIPTION="PCMCIA userspace utilities for Linux kernel 2.6.13 and beyond"
 
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 SRC_URI="mirror://kernel/linux/utils/kernel/pcmcia/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 1483c7bece5f..5ca60299db89 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,53 @@
-# ChangeLog for sys-devel/pcsc-lite
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.1 2002/11/16 23:21:51 zwelch Exp $
+# ChangeLog for sys-apps/pcsc-lite
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
+
+*pcsc-lite-1.2.9_beta8 (04 Oct 2005)
+
+  04 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +pcsc-lite-1.2.9_beta8.ebuild:
+  Version bump #108051 by Alon Bar-Lev.
+
+*pcsc-lite-1.2.9_beta7 (20 Jul 2005)
+
+  20 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +pcsc-lite-1.2.9_beta7.ebuild:
+  Version bump #95951 by Alon Bar-Lev.
+
+  20 Jul 2005; Mike Frysinger <vapier@gentoo.org> +files/pcscd-confd,
+  files/pcscd-init, pcsc-lite-1.2.9_beta6.ebuild:
+  Make sure we remove run files before trying to start or pcscd will abort
+  #99505 by Alon Bar-Lev.
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> pcsc-lite-1.2.0.ebuild,
+  pcsc-lite-1.2.9_beta6.ebuild:
+  added ~ppc64 to KEYWORDS
+
+*pcsc-lite-1.2.9_beta6 (30 Oct 2004)
+
+  30 Oct 2004; Mike Frysinger <vapier@gentoo.org> +pcsc-lite-1.2.9_beta6.ebuild:
+  Version bump #69419 by Sebastian Spaeth.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pcsc-lite-1.2.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; David Holm <dholm@gentoo.org> pcsc-lite-1.2.0.ebuild:
+  Added to ~ppc.
+
+  24 Mar 2004; Daniel Black <dragonheart@gentoo.org> pcsc-lite-1.2.0.ebuild:
+  Changed driver directory to /usr/lib/readers to be consistant with
+  pcsc-slb-rf72-drv
+
+*pcsc-lite-1.2.0 (22 Mar 2004)
+
+  22 Mar 2004; Daniel Black <dragonheart@gentoo.org> pcsc-lite-1.1.1.ebuild,
+  pcsc-lite-1.2.0.ebuild:
+  Version bump - 1.2.0. Thanks to Cicero (Robert Thomas) <rwt@cc.gatech.edu> bug
+  #45166 for pointing it out
+
+  02 Aug 2003; <iggy@gentoo.org> pcsc-lite-1.1.1.ebuild, files/pcscd-init:
+  Gentoo style init script fixes bug # 15524 thanks to Alberto Ornaghi <alor@antifork.org> 
 
 *pcsc-lite-1.1.1 (16 Nov 2002)
 
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index e69de29bb2d1..90ab3a141320 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e274b90633c12d9a1ba6bedf6e468964 pcsc-lite-1.2.0.ebuild 1263
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 82811656dccbbcf284fce911c74927a5 pcsc-lite-1.2.9_beta8.ebuild 1296
+MD5 fc3f52c720b3701befff44cf746725a6 pcsc-lite-1.2.9_beta7.ebuild 1281
+MD5 8402afd20bf316cb4bd70cc055aac1fc ChangeLog 2073
+MD5 52deea7f2003badde6eb9c112bcc9645 files/pcscd-init 485
+MD5 4a6af6338f7bf5bdc3b2488aa9fd3ea4 files/pcscd-confd 84
+MD5 b92c5548172bf19ad5f25561b649982d files/digest-pcsc-lite-1.2.9_beta8 74
+MD5 aa81afb9cffef205c955fc1ab2a9bfd1 files/digest-pcsc-lite-1.2.0 67
+MD5 6adc5afb1e8bbcb17a292f8232f9fea8 files/digest-pcsc-lite-1.2.9_beta7 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQxbfgIKl8Uu19MoRAo5LAJ4limcZpezFeRukQMNwPIAE9D402ACcDBUw
++Q+Jj0FJHicrOqmVOuvUS44=
+=sg1m
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/files/pcscd-init b/sys-apps/pcsc-lite/files/pcscd-init
index 3a63bc80b2af..09fea210ecb5 100644
--- a/sys-apps/pcsc-lite/files/pcscd-init
+++ b/sys-apps/pcsc-lite/files/pcscd-init
@@ -1,11 +1,13 @@
 #!/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/sys-apps/pcsc-lite/files/pcscd-init,v 1.1 2003/08/03 04:37:47 iggy Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
 
 start() {
+	# pcscd won't start if these exist
+	rm -f /var/run/pcscd.{comm,pub}
 	ebegin "Starting pcscd"
-	start-stop-daemon --start --quiet --background --exec /usr/sbin/pcscd
+	/usr/sbin/pcscd ${PCSCD_OPTS}
 	eend $?
 }
 
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/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-apps/pcsc-lite/pcsc-lite-1.2.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.2.0.ebuild
index c9bca31b8da7..66f8988cc4fc 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.2.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.2.0.ebuild,v 1.1 2004/03/22 08:33:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.2.0.ebuild,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
 
 inherit eutils
 
@@ -9,13 +9,12 @@ HOMEPAGE="http://www.linuxnet.com/middle.html"
 SRC_URI="https://alioth.debian.org/download.php/419/pcsc-lite-${PV}.tar.gz"
 
 LICENSE="as-is"
-KEYWORDS="~x86 ~amd64"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="static"
 
-RDEPEND="!static? ( virtual/glibc )
+RDEPEND="!static? ( virtual/libc )
 	!static? ( dev-libs/libusb )"
-
 DEPEND="sys-devel/make
 	sys-devel/libtool
 	sys-apps/sed
@@ -24,11 +23,12 @@ DEPEND="sys-devel/make
 	dev-libs/libusb
 	dev-util/pkgconfig
 	sys-devel/gcc
-	${RDEPEND}"
+	virtual/libc
+	dev-libs/libusb"
 
 src_compile() {
 	econf \
-		--enable-usbdropdir=/usr/share/pcsc/drivers \
+		--enable-usbdropdir=/usr/lib/readers/usb \
 		--enable-muscledropdir=/usr/share/pcsc/services \
 		`use_enable static` || die "./configure failed"
 	emake || die
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta7.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta7.ebuild
index 499eca2ec875..c647d18d6173 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta7.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.2.9_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/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta7.ebuild,v 1.1 2005/07/20 01:29:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta7.ebuild,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
 
 NUM=975
 MY_P="${PN}-${PV/_/-}"
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta8.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta8.ebuild
index c9b030381476..3ca38f086f1c 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta8.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.2.9_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/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta8.ebuild,v 1.1 2005/10/04 23:55:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta8.ebuild,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
 
 STUPID_NUM=1133
 MY_P="${PN}-${PV/_/-}"
diff --git a/sys-apps/pcsc-slb-rf72-drv/ChangeLog b/sys-apps/pcsc-slb-rf72-drv/ChangeLog
index 6f566385fa69..16a001d0e72d 100644
--- a/sys-apps/pcsc-slb-rf72-drv/ChangeLog
+++ b/sys-apps/pcsc-slb-rf72-drv/ChangeLog
@@ -1,8 +1,9 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/ChangeLog,v 1.1 2002/11/16 23:24:09 zwelch Exp $
+# ChangeLog for sys-apps/pcsc-slb-rf72-drv
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/ChangeLog,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 *pcsc-slb-rf72-drv-1.1.0 (15 Nov 2002)
+
   15 Nov 2002; Zach Welch <zwelch@gentoo.org> :
   Relocated, mask for testing, and commited.  See bug 8449 for more info.
 
diff --git a/sys-apps/pcsc-slb-rf72-drv/Manifest b/sys-apps/pcsc-slb-rf72-drv/Manifest
index e69de29bb2d1..b20c8ba01900 100644
--- a/sys-apps/pcsc-slb-rf72-drv/Manifest
+++ b/sys-apps/pcsc-slb-rf72-drv/Manifest
@@ -0,0 +1,4 @@
+MD5 01a075622910012628b191d7e07df60e pcsc-slb-rf72-drv-1.1.0.ebuild 832
+MD5 0849d72ac09e1d5ea2e6e2a07926f0a4 ChangeLog 833
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 4ff10cfe375a944a7db0113db9587224 files/digest-pcsc-slb-rf72-drv-1.1.0 69
diff --git a/sys-apps/pcsc-slb-rf72-drv/metadata.xml b/sys-apps/pcsc-slb-rf72-drv/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/pcsc-slb-rf72-drv/metadata.xml
+++ b/sys-apps/pcsc-slb-rf72-drv/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-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild
index 36d426841d36..b24f1093edde 100644
--- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild
+++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild
@@ -1,13 +1,14 @@
-# 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-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild,v 1.1 2002/11/16 23:24:09 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 MY_P="slb_rf72"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Schlumberger Reflex 72 Serial Smartcard Reader"
 HOMEPAGE="http://www.linuxnet.com/sourcedrivers.html"
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
+IUSE=""
 SLOT="0"
 SRC_URI="http://www.linuxnet.com/drivers/readers/files/slb_rf72-drv-1.1.0.tar.gz"
 DEPEND=">=sys-devel/gcc-2.95.3-r5
@@ -19,12 +20,12 @@ src_compile() {
 
 src_install () {
 
-	insinto /usr/share/doc/${MY_P} 
+	insinto /usr/share/doc/${MY_P}
 	doins doc/*.html doc/*.gif ERRATA LICENSE README
-	
-	insinto /usr/share/doc/${MY_P}/sample 
+
+	insinto /usr/share/doc/${MY_P}/sample
 	doins sample/*
-	
+
 	insinto /usr/lib/readers
 	insopts -m755
 	doins *.so
diff --git a/sys-apps/perfctr/ChangeLog b/sys-apps/perfctr/ChangeLog
index 8bb2c95ea39e..5095cd14d49d 100644
--- a/sys-apps/perfctr/ChangeLog
+++ b/sys-apps/perfctr/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/perfctr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/perfctr/ChangeLog,v 1.1 2005/08/23 05:49:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/perfctr/ChangeLog,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
 *perfctr-2.7.18 (23 Aug 2005)
 
diff --git a/sys-apps/perfctr/Manifest b/sys-apps/perfctr/Manifest
index 11efeb1532e8..2435bfa8dfc3 100644
--- a/sys-apps/perfctr/Manifest
+++ b/sys-apps/perfctr/Manifest
@@ -1,2 +1,4 @@
-MD5 09b8111bf5366f294038870c76d6bc40 perfctr-2.7.18.ebuild 912
+MD5 e08bb2f433ce71ce0a6a119751b6b5d5 perfctr-2.7.18.ebuild 915
+MD5 d69c31f037df1d260092afa7416a31a7 ChangeLog 368
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 d4939ca469d6ed1dde695d319302beff files/digest-perfctr-2.7.18 66
diff --git a/sys-apps/perfctr/perfctr-2.7.18.ebuild b/sys-apps/perfctr/perfctr-2.7.18.ebuild
index 981ebb49788c..e71f2194bcc2 100644
--- a/sys-apps/perfctr/perfctr-2.7.18.ebuild
+++ b/sys-apps/perfctr/perfctr-2.7.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-apps/perfctr/perfctr-2.7.18.ebuild,v 1.1 2005/08/23 05:49:34 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/perfctr/perfctr-2.7.18.ebuild,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
 inherit multilib
 
diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index 8a8543906d84..cae62a25ab57 100644
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,9 +1,52 @@
 # ChangeLog for sys-apps/pmount
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.1 2005/05/09 18:31:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
-*pmount-0.8.9.31 (09 May 2005)
+  02 Nov 2005; Steev Klimaszewski <steev@gentoo.org> pmount-0.9.6.ebuild:
+  CHANGES became ChangeLog.  Re-emerge if you really want to read the 
+  file.  Not going to force a recompile for the ChangeLog
 
-  09 May 2005; <cardoe@gentoo.org> +metadata.xml, +pmount-0.8.9.31.ebuild:
-  Initial revisions of the pmount package
+*pmount-0.9.6 (30 Oct 2005)
+
+  30 Oct 2005; Steev Klimaszewski <steev@gentoo.org>
+  -pmount-0.9.3-r3.ebuild, +pmount-0.9.6.ebuild:
+  Version bump.  Doing this in Cardoe's absence with his permission.
+
+  17 Oct 2005; Brent Baude <ranger@gentoo.org> pmount-0.9.3-r3.ebuild:
+  Marking  pmount-0.9.3-r3 ~ppc64 for gnome-volume-manager dep
+
+  25 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  pmount-0.9.3-r3.ebuild:
+  Added to ~ppc
+
+  20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pmount-0.9.3-r3.ebuild:
+  Keyworded ~sparc
+
+  31 Aug 2005; Herbie Hopkins <herbs@gentoo.org> pmount-0.9.3-r3.ebuild:
+  Marked ~amd64.
+
+*pmount-0.9.3-r3 (31 Aug 2005)
+
+  31 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -pmount-0.9.3-r2.ebuild,
+  +pmount-0.9.3-r3.ebuild:
+  I must be a little dee-dee-dee. Should be working 100% now.
+
+*pmount-0.9.3-r2 (28 Aug 2005)
+
+  28 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -pmount-0.9.3-r1.ebuild,
+  +pmount-0.9.3-r2.ebuild:
+  Some small security related concerns
+
+*pmount-0.9.3-r1 (25 Aug 2005)
+
+  25 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -pmount-0.9.3.ebuild,
+  +pmount-0.9.3-r1.ebuild:
+  cleaned up ebuild with suggestions from Betelgeuse
+
+*pmount-0.9.3 (24 Aug 2005)
+
+  24 Aug 2005; Doug Goldstein <cardoe@gentoo.org> +metadata.xml,
+  +pmount-0.9.3.ebuild:
+  Added new pmount package from Gentopia to allow for auto-mounting of devices
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 9302e92fb7a9..e3c01d4d00d3 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,3 +1,4 @@
-MD5 a4f8566f5830bdf3f47d7e4091692330 pmount-0.8.9.31.ebuild 1103
-MD5 3eab41332e6c5d3dde55d953e407e30f files/digest-pmount-0.8 61
-MD5 f2cbb69e1b640e949cbe2c4b4863b82b files/digest-pmount-0.8.9.31 66
+MD5 3225f0dc2f9c4f602a990d40af01f8e9 ChangeLog 1787
+MD5 0460e313c5378e4ac58402a91e1b130e files/digest-pmount-0.9.6 64
+MD5 aac86bf5e50eb9cef83a6f6800c560af metadata.xml 253
+MD5 303ad83214f47136244144ceb6af112d pmount-0.9.6.ebuild 1463
diff --git a/sys-apps/pmount/metadata.xml b/sys-apps/pmount/metadata.xml
index f07ca72ac5fd..06ad8c23d7d2 100644
--- a/sys-apps/pmount/metadata.xml
+++ b/sys-apps/pmount/metadata.xml
@@ -1,15 +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>npmccallum@gentoo.org</email>
-</maintainer>
+<herd>gentopia</herd>
 <maintainer>
   <email>cardoe@gentoo.org</email>
+  <name>Doug Goldstein</name>
 </maintainer>
-<maintainer>
-  <email>genstef@gentoo.org</email>
-</maintainer>
-<longdescription>Policy based Mounter for HAL</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/pmount/pmount-0.9.6.ebuild b/sys-apps/pmount/pmount-0.9.6.ebuild
index f6a61d23a5f9..d7e271df7f67 100644
--- a/sys-apps/pmount/pmount-0.9.6.ebuild
+++ b/sys-apps/pmount/pmount-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.6.ebuild,v 1.1 2005/10/30 03:05:34 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.6.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -43,7 +43,7 @@ src_install () {
 	exeopts -m 4710 -g plugdev
 	doexe src/pmount src/pumount src/pmount-hal
 
-	dodoc AUTHORS CHANGES TODO
+	dodoc AUTHORS ChangeLog TODO
 	doman man/pmount.1 man/pumount.1 man/pmount-hal.1
 
 	insinto /etc
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 9141decf445b..0dc44a3c9398 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,236 @@
 # ChangeLog for sys-apps/policycoreutils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.1 2003/08/04 04:31:34 pebenito Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+*policycoreutils-1.24-r1 (09 Sep 2005)
+
+  09 Sep 2005; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.24-r1.ebuild:
+  Update for fixed selinuxconfig source policy path.
+
+  11 Jul 2005; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.22.ebuild, policycoreutils-1.24.ebuild:
+  Fix RDEPEND for building stages.  Libsepol is required now.
+
+*policycoreutils-1.24 (25 Jun 2005)
+
+  25 Jun 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.24-genhomedircon-quiet.diff,
+  -policycoreutils-1.20-r1.ebuild, +policycoreutils-1.24.ebuild:
+  New upstream release.
+
+  10 May 2005; Stephen Bennett <spb@gentoo.org> policycoreutils-1.22.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@gentoo.org> policycoreutils-1.22.ebuild:
+  Added ~mips.
+
+  01 May 2005; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.22.ebuild:
+  Mark stable.
+
+*policycoreutils-1.22 (13 Mar 2005)
+
+  13 Mar 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.22-genhomedircon-quiet.diff,
+  +policycoreutils-1.22.ebuild:
+  New upstream release.
+
+*policycoreutils-1.20-r1 (13 Feb 2005)
+
+  13 Feb 2005; Chris PeBenito <pebenito@gentoo.org>
+  -policycoreutils-1.16.ebuild, +policycoreutils-1.20-r1.ebuild,
+  -policycoreutils-1.20.ebuild:
+  Add back some tools deleted from upstream libselinux.
+
+*policycoreutils-1.20 (07 Jan 2005)
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.18-r1.ebuild, +policycoreutils-1.20.ebuild:
+  New upstream release. Mark 1.18-r1 stable.
+
+*policycoreutils-1.18-r1 (03 Jan 2005)
+
+  03 Jan 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-nonls.diff, +policycoreutils-1.18-r1.ebuild:
+  Make pam and nls optional for embedded systems use.
+
+  22 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.18.ebuild:
+  Ensure a few dirs and perms during stage1 build.
+
+  15 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.18.ebuild:
+  Fix libsepol dep.
+
+*policycoreutils-1.18 (14 Nov 2004)
+
+  14 Nov 2004; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.18.ebuild:
+  New upstream release.
+
+*policycoreutils-1.16 (07 Sep 2004)
+
+  07 Sep 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.16-genhomedircon-compat.diff,
+  +policycoreutils-1.16.ebuild:
+  New upstream release.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> policycoreutils-1.12-r1.ebuild,
+  policycoreutils-1.12-r2.ebuild, policycoreutils-1.14.ebuild,
+  policycoreutils-1.4-r1.ebuild:
+  Typo in DESCRIPTION: utilites -> utilities. Bug 59717.
+
+  06 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.14.ebuild:
+  Bump extras to fix free() bug in runscript_selinux.so.
+
+*policycoreutils-1.12-r2 (06 Jul 2004)
+
+  06 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/runscript-selinux.diff, +policycoreutils-1.12-r2.ebuild:
+  Fix free() error in runscript_selinux.so.
+
+  03 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.14.ebuild:
+  Update extras.
+
+*policycoreutils-1.14 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/policycoreutils-1.14-genhomedircon-compat.diff,
+  +policycoreutils-1.14.ebuild:
+  New upstream version.
+
+*policycoreutils-1.12-r1 (28 Jun 2004)
+
+  28 Jun 2004; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.12-r1.ebuild:
+  Add toggle_bool to extras.
+
+  11 Jun 2004; Chris PeBenito <pebenito@gentoo.org>
+  -policycoreutils-1.10-r1.ebuild, policycoreutils-1.12.ebuild:
+  Mark stable
+
+*policycoreutils-1.12 (14 May 2004)
+
+  14 May 2004; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.12.ebuild:
+  New upstream release.
+
+*policycoreutils-1.10-r1 (28 Apr 2004)
+
+  28 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.10-r1.ebuild, -policycoreutils-1.10.ebuild,
+  -policycoreutils-1.8.ebuild:
+  Update extras and mark stable.
+
+*policycoreutils-1.10 (20 Apr 2004)
+
+  08 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4-r1.ebuild, policycoreutils-1.8.ebuild:
+  More specific versioning for libselinux.
+
+  08 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.8.ebuild:
+  Mark stable for 2004.1
+
+  15 Mar 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.8.ebuild:
+  Update extras.
+
+*policycoreutils-1.8 (12 Mar 2004)
+
+  12 Mar 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.8.ebuild:
+  New upstream release.
+
+*policycoreutils-1.6 (24 Feb 2004)
+
+  24 Feb 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4-r1.ebuild, policycoreutils-1.6.ebuild:
+  New upstream release.  Mark 1.4-r1 stable.
+
+*policycoreutils-1.4-r1 (09 Feb 2004)
+
+  09 Feb 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4-r1.ebuild:
+  Move extras to mirrors, and add runscript_selinux.so.
+
+  31 Jan 2004; Chris PeBenito <pebenito@gentoo.org> files/rlpkg:
+  Switch to portageq from inline python.  Add missing quotes for completeness.
+
+  16 Dec 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4.ebuild:
+  Mark stable.
+
+*policycoreutils-1.4 (06 Dec 2003)
+
+  06 Dec 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.4.ebuild:
+  New upstream version.
+
+*policycoreutils-1.2-r2 (23 Nov 2003)
+
+  23 Nov 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.2-r2.ebuild:
+  Bump to add /sbin/seinit.
+
+  29 Oct 2003; Joshua Brindle <method@gentoo.org>
+  policycoreutils-1.2-r1.ebuild:
+  added sparc
+
+*policycoreutils-1.2-r1 (20 Oct 2003)
+
+  20 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.2-r1.ebuild:
+  Remove unneeded -lattr linking from Makefiles.
+
+  07 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.2.ebuild:
+  Mark stable.
+
+*policycoreutils-1.2 (03 Oct 2003)
+
+  03 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.2.ebuild, files/policycoreutils-1.2-gentoo.diff:
+  New upstream version.
+
+  29 Sep 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.1-r1.ebuild:
+  Add build USE flag; when asserted, only setfiles is built and merged.
+
+  22 Sep 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.1-r1.ebuild:
+  Move selinux-base-policy RDEPEND to checkpolicy. No longer RDEPEND on
+  checkpolicy.
+
+  22 Sep 2003; <paul@gentoo.org> metadata.xml:
+  Fix metadata.xml
+
+  24 Aug 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.1-r1.ebuild, policycoreutils-1.1.ebuild:
+  Mark stable
+
+*policycoreutils-1.1-r1 (18 Aug 2003)
+
+  18 Aug 2003; Chris PeBenito <pebenito@gentoo.org> metadata.xml,
+  policycoreutils-1.0.ebuild, policycoreutils-1.1-r1.ebuild,
+  files/avc_enforcing, files/avc_toggle,
+  files/policycoreutils-1.1-setfiles.diff:
+  Add setfiles patch for alternate root. Add avc_enforcing and avc_toggle
+  scripts for ease of use for old API users. Use package description from RPM
+  spec file in metadata.xml long description.
+
+*policycoreutils-1.1 (14 Aug 2003)
+
+  14 Aug 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.1.ebuild:
+  New upstream version
+
+  10 Aug 2003; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.0.ebuild, files/rlpkg:
+  Add mkinitrd RDEP, add rlpkg.
 
 *policycoreutils-1.0 (03 Aug 2003)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 900416d11ba2..f6e7f2fb4455 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,2 +1,10 @@
-MD5 548c21fbd3fc5fe72e26dbaa7ce1a099 policycoreutils-1.0.ebuild 727
-MD5 a70bb20f56dfca63475bea2bc811927a files/digest-policycoreutils-1.0 67
+MD5 574f5af1bf84a124e183e0266d921a51 ChangeLog 7533
+MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
+MD5 1c03a495acacf417638cc547adbbc501 policycoreutils-1.22.ebuild 3374
+MD5 702eb4a6b2116791692149f231ba414c policycoreutils-1.24.ebuild 3515
+MD5 0006b388362baf89836fbf530046ecf6 policycoreutils-1.24-r1.ebuild 3549
+MD5 7a74a3135f746668eccc7a1521bd11cb files/digest-policycoreutils-1.22 146
+MD5 e4fae02aa0cf1196385194111e1a482c files/policycoreutils-1.22-genhomedircon-quiet.diff 670
+MD5 2afb35c97fdfb93d2c5ee049f1f43b10 files/policycoreutils-1.24-genhomedircon-quiet.diff 1236
+MD5 d06739056091e12b1c2e37c134ecfee8 files/digest-policycoreutils-1.24 146
+MD5 888c48de2a246f60017c7d2f3b6eccd0 files/digest-policycoreutils-1.24-r1 146
diff --git a/sys-apps/policycoreutils/metadata.xml b/sys-apps/policycoreutils/metadata.xml
index 9508cb1dc25b..e3e9d7102af8 100644
--- a/sys-apps/policycoreutils/metadata.xml
+++ b/sys-apps/policycoreutils/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,16 @@
 	<name>Chris PeBenito</name>
 	<description>Primary Maintainer</description>
 </maintainer>
-<longdescription>SELinux core policy utilities and userland</longdescription>
+<longdescription>
+Policycoreutils contains the policy core utilities that are required
+for basic operation of a SELinux system.  These utilities include
+load_policy to load policies, setfiles to label filesystems, newrole
+to switch roles, and run_init to run /etc/init.d scripts in the proper
+context.
+
+Gentoo-specific tools include rlpkg for relabeling packages by name,
+avc_toggle to toggle between enforcing and permissive modes, and
+avc_enforcing to query the current mode of the system, enforcing or
+permissive.
+</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/policycoreutils/policycoreutils-1.22.ebuild b/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
index 28d87f139c51..00f5da3435df 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
@@ -1,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-apps/policycoreutils/policycoreutils-1.22.ebuild,v 1.1 2005/03/13 13:41:29 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.22.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 IUSE="build nls pam"
 
@@ -15,10 +15,11 @@ SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64 mips"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
-	!build? ( pam? ( sys-libs/pam ) >=sys-libs/libsepol-${SEPOL_VER} )
+	>=sys-libs/libsepol-${SEPOL_VER}
+	!build? ( pam? ( sys-libs/pam ) )
 	build? ( sys-apps/baselayout )"
 
 DEPEND="${RDEPEND}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.24-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.24-r1.ebuild
index 9040f86f3cbe..dd8803e116d5 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.24-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.24-r1.ebuild
@@ -1,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-apps/policycoreutils/policycoreutils-1.24-r1.ebuild,v 1.1 2005/09/09 03:01:51 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.24-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 IUSE="build nls pam"
 
diff --git a/sys-apps/policycoreutils/policycoreutils-1.24.ebuild b/sys-apps/policycoreutils/policycoreutils-1.24.ebuild
index 7ef58a30006a..1088bffe9d6c 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.24.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-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-apps/policycoreutils/policycoreutils-1.24.ebuild,v 1.1 2005/06/25 23:43:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.24.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 IUSE="build nls pam"
 
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
-	!build? ( pam? ( sys-libs/pam ) >=sys-libs/libsepol-${SEPOL_VER} )
+	>=sys-libs/libsepol-${SEPOL_VER}
+	!build? ( pam? ( sys-libs/pam ) )
 	build? ( sys-apps/baselayout )"
 
 DEPEND="${RDEPEND}
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 8b858064d0ba..e185c9e8f8e2 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,13 +1,27 @@
 # ChangeLog for sys-apps/portage
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
-
-*portage-1.8.7 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  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 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
+
+# See the gentoo-src Portage ChangeLog for up-to-date release information:
+# http://www.gentoo.org/cgi-bin/viewcvs.cgi/portage/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  portage-2.1.0_alpha20050718.ebuild:
+  Mark 2.1.0_alpha20050718 ~ia64
+
+  17 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  portage-2.1.0_alpha20050718.ebuild:
+  Marked ~mips.
+
+*portage-2.1.0_alpha20050718 (11 Aug 2005)
+
+  11 Aug 2005; Marius Mauch <genone@gentoo.org>
+  +portage-2.1.0_alpha20050718.ebuild:
+  New pre alpha snapshot for 2.1 which is NOT the one with the new dep
+  resolver, you'll have to wait for the rewrite for that. It's in the works,
+  really. Meanwhile, enjoy this gapfiller. No release notes yet, so here a
+  *very* short and incomplete list of new features: ebuild-daemon, elog,
+  confcache, verify-rdepend, fakeroot, autotools, extended bashrc, set
+  framework, transport framework. All bugreports should go to bug #102126.
+  Have fun with it.
+
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 2259c2cf5ee1..37068e2e1384 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,16 +1,11 @@
-MD5 d88eb7be0ee6f5641fa00b247bccd127 portage-2.0.47-r14.ebuild 8901
-MD5 1cb34892de7da3cdcbf6fbd92ee742e3 portage-2.0.47-r16.ebuild 8901
-MD5 c6362293bffae3034fdaf9e02c0a0c77 manifest 905
-MD5 9d8eeadd510a609a0cf6714d458a9b10 portage-2.0.47-r13.ebuild 8901
-MD5 3925827b013d3ed3cd8cc6a2a3eae039 portage-2.0.47-r15.ebuild 8901
-MD5 a90435c5b02c6561a04aab8b2755fd1b portage-2.0.47-r10.ebuild 8844
-MD5 30286e3aa7a1e245e2a6ddaa35a090c5 ChangeLog 409
-MD5 898f9a4a3b9a43e1e33caada4b17582c files/digest-portage-2.0.47-r10 436
-MD5 9017b63d6072924350bb62a9dcd7d856 files/digest-portage-2.0.47-r13 436
-MD5 d90411c6855119b48108d667d0e50ca1 files/digest-portage-2.0.47-r14 71
-MD5 b43a87e6c6283a5e2c7927bbbfb82b2a files/digest-portage-2.0.47-r15 71
-MD5 fef514c78898628e6b480b9b5006a5b8 files/digest-portage-2.0.47-r16 71
-MD5 73094a2d75dca36817b40611589ea226 files/portage-rescue-2.0.44-ppc.tbz2 168027
-MD5 6d52937c08dd84e08cc195f5bb9984e8 files/portage-rescue-2.0.44-x86.tbz2 162695
-MD5 e2a623024faebb00c3d4120211535774 files/repoman-headers.diff 1398
-MD5 c8ae76ad8a54697327ff0b6fe6d1b74b files/README.RESCUE 811
+MD5 bee328fe9e36c1f64e2052f82a84caa3 ChangeLog 1231
+MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
+MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
+MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
+MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70
+MD5 9810b1d302285468110fd25a77ced635 files/digest-portage-2.0.53_rc7 71
+MD5 87eff9b432487777e55298413c33ab4a files/digest-portage-2.1.0_alpha20050718 80
+MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
+MD5 bba85ff036aa02b78b73c54217ad2964 portage-2.0.51.22-r3.ebuild 5734
+MD5 c5f316eaec0aebda59a7b7646f0c0505 portage-2.0.53_rc7.ebuild 3650
+MD5 c4a51b54711010fb3d04467732fa586a portage-2.1.0_alpha20050718.ebuild 2598
diff --git a/sys-apps/portage/files/2.0.51.22-fixes.patch b/sys-apps/portage/files/2.0.51.22-fixes.patch
index 8eb32288b5ec..ea0975847043 100644
--- a/sys-apps/portage/files/2.0.51.22-fixes.patch
+++ b/sys-apps/portage/files/2.0.51.22-fixes.patch
@@ -1,7 +1,7 @@
-diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r1/ChangeLog
---- portage-2.0.51.22/ChangeLog	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r1/ChangeLog	2005-05-19 00:37:12.000000000 +0900
-@@ -1,12 +1,40 @@
+diff -uNr portage-2.0.51.22-orig/ChangeLog portage-2.0.51.22/ChangeLog
+--- portage-2.0.51.22-orig/ChangeLog	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/ChangeLog	2005-10-06 01:08:51.000000000 +0900
+@@ -1,12 +1,46 @@
  # ChangeLog for Portage; the Gentoo Linux ports system 
  # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
 -# $Id: ChangeLog,v 1.796.2.125 2005/05/15 09:37:49 jstubbs Exp $
@@ -12,6 +12,12 @@ diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r1/ChangeLog
      2. /var/cache/edb/world is now /var/lib/portage/world.
      3. /etc/portage/profile/virtuals is _USER_ configs only.
  
++  06 Oct 2005; Jason Stubbs <jstubbs@gentoo.org> bin/dispatch-conf: Ensure that
++  dispatch-conf's log file is 0600 permissions when enabled. Patch by TGL.
++
++  19 Jul 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild.sh: Skip protecting
++  ownership of symlinks. Patch by truedfx #94199
++
 +  19 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Disabled
 +  userpriv as a user globally instead of only in fetch.
 +
@@ -43,9 +49,59 @@ diff -uNr portage-2.0.51.22/ChangeLog portage-2.0.51.22-r1/ChangeLog
    15 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Made --newuse
    take priority over --usepkg.
  
-diff -uNr portage-2.0.51.22/bin/emake portage-2.0.51.22-r1/bin/emake
---- portage-2.0.51.22/bin/emake	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r1/bin/emake	2005-05-19 00:19:52.000000000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/dispatch-conf portage-2.0.51.22/bin/dispatch-conf
+--- portage-2.0.51.22-orig/bin/dispatch-conf	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/dispatch-conf	2005-10-06 01:02:51.000000000 +0900
+@@ -64,9 +64,12 @@
+         self.options = dispatch_conf.read_config(MANDATORY_OPTS)
+ 
+         if self.options.has_key("log-file"):
+-            if os.path.exists(self.options["log-file"]):
+-                shutil.copyfile(self.options["log-file"], self.options["log-file"] + '.old')
+-                os.remove(self.options["log-file"])
++            if os.path.isfile(self.options["log-file"]):
++                shutil.copy(self.options["log-file"], self.options["log-file"] + '.old')
++            if os.path.isfile(self.options["log-file"]) \
++               or not os.path.exists(self.options["log-file"]):
++                open(self.options["log-file"], 'w').close()  # Truncate it
++                os.chmod(self.options["log-file"], 0600)
+         else:
+             self.options["log-file"] = "/dev/null"
+ 
+diff -uNr portage-2.0.51.22-orig/bin/ebuild.sh portage-2.0.51.22/bin/ebuild.sh
+--- portage-2.0.51.22-orig/bin/ebuild.sh	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/ebuild.sh	2005-10-06 01:02:11.000000000 +0900
+@@ -1075,9 +1075,9 @@
+ 	local count=0
+ 	find "${D}/" -user  portage | while read file; do
+ 		count=$(( $count + 1 ))
+-		s=$(stat_perms $file)
++		[[ ! -L ${file} ]] && s=$(stat_perms $file)
+ 		chown root "$file"
+-		chmod "$s" "$file"
++		[[ ! -L ${file} ]] && chmod "$s" "$file"
+ 	done
+ 	if (( $count > 0 )); then
+ 		ewarn "$count files were installed with user portage!"
+@@ -1086,13 +1086,13 @@
+ 	count=0
+ 	find "${D}/" -group portage | while read file; do
+ 		count=$(( $count + 1 ))
+-		s=$(stat_perms "$file")
++		[[ ! -L ${file} ]] && s=$(stat_perms "$file")
+ 		if [ "$USERLAND" == "BSD" ] || [ "$USERLAND" == "Darwin" ];then
+ 			chgrp wheel "$file"
+ 		else
+ 			chgrp root "$file"
+ 		fi
+-		chmod "$s" "$file"
++		[[ ! -L ${file} ]] && chmod "$s" "$file"
+ 	done
+ 	if (( $count > 0 )); then
+ 		ewarn "$count files were installed with group portage!"
+diff -uNr portage-2.0.51.22-orig/bin/emake portage-2.0.51.22/bin/emake
+--- portage-2.0.51.22-orig/bin/emake	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/emake	2005-10-06 01:02:11.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/bin/bash
  # Copyright 1999-2004 Gentoo Foundation
@@ -61,9 +117,9 @@ diff -uNr portage-2.0.51.22/bin/emake portage-2.0.51.22-r1/bin/emake
  
 -make ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
 +${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
-diff -uNr portage-2.0.51.22/bin/emerge portage-2.0.51.22-r1/bin/emerge
---- portage-2.0.51.22/bin/emerge	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r1/bin/emerge	2005-05-19 00:19:52.000000000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/emerge portage-2.0.51.22/bin/emerge
+--- portage-2.0.51.22-orig/bin/emerge	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/emerge	2005-10-06 01:02:11.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/usr/bin/python -O
  # Copyright 1999-2004 Gentoo Foundation
@@ -82,9 +138,9 @@ diff -uNr portage-2.0.51.22/bin/emerge portage-2.0.51.22-r1/bin/emerge
  				iuses=string.split(portage.portdb.aux_get(mykey, ["IUSE"])[0])
  				old_use=string.split(vardbapi.aux_get(mykey, ["USE"])[0])
  				now_use=string.split(self.pkgsettings["USE"])
-diff -uNr portage-2.0.51.22/bin/repoman portage-2.0.51.22-r1/bin/repoman
---- portage-2.0.51.22/bin/repoman	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r1/bin/repoman	2005-05-19 00:19:52.000000000 +0900
+diff -uNr portage-2.0.51.22-orig/bin/repoman portage-2.0.51.22/bin/repoman
+--- portage-2.0.51.22-orig/bin/repoman	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/bin/repoman	2005-10-06 01:02:11.000000000 +0900
 @@ -1,7 +1,7 @@
  #!/usr/bin/python -O
  # Copyright 1999-2005 Gentoo Foundation
@@ -120,9 +176,9 @@ diff -uNr portage-2.0.51.22/bin/repoman portage-2.0.51.22-r1/bin/repoman
  				del myfiles[x]
  		mydone=[]
  		if repolevel==3:   # In a package dir
-diff -uNr portage-2.0.51.22/pym/portage.py portage-2.0.51.22-r1/pym/portage.py
---- portage-2.0.51.22/pym/portage.py	2005-05-15 19:20:58.000000000 +0900
-+++ portage-2.0.51.22-r1/pym/portage.py	2005-05-19 00:38:25.000000000 +0900
+diff -uNr portage-2.0.51.22-orig/pym/portage.py portage-2.0.51.22/pym/portage.py
+--- portage-2.0.51.22-orig/pym/portage.py	2005-05-15 19:20:58.000000000 +0900
++++ portage-2.0.51.22/pym/portage.py	2005-10-06 01:03:48.000000000 +0900
 @@ -1,10 +1,10 @@
  # portage.py -- core Portage functionality
  # Copyright 1998-2004 Gentoo Foundation
@@ -133,7 +189,7 @@ diff -uNr portage-2.0.51.22/pym/portage.py portage-2.0.51.22-r1/pym/portage.py
 +cvs_id_string="$Id: portage.py,v 1.524.2.75 2005/05/18 15:33:49 jstubbs Exp $"[5:-2]
  
 -VERSION="2.0.51.22"
-+VERSION="2.0.51.22-r1"
++VERSION="2.0.51.22-r3"
  
  # ===========================================================================
  # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
index 4f08b7953349..ab77ebfd6e43 100644
--- a/sys-apps/portage/files/README.RESCUE
+++ b/sys-apps/portage/files/README.RESCUE
@@ -1,11 +1,55 @@
 If your version of Portage dies for some reason, try using the
-portage-rescue package as follows:
+portage-rescue package as follows for Gentoo systems:
 
-# tar xjpUvf portage-rescue-1.8.8-r1.tbz2 -C /
+SUBSTITUTE A FILE THAT EXISTS FOR THE EXAMPLE VERSION BELOW.
+IF AN ARCHITECTURE IS SPECIFIED IN THE FILENAME BE SURE IT IS
+THE CORRECT ONE FOR YOUR ARCH.
+
+**************************************************************
+NOTE: This may overwrite make.conf. Please copy your original
+      somewhere safe if you wish to keep it for reference.
+**************************************************************
+
+If you are not in this directory, you need to change to:
+# cd /usr/portage/sys-apps/portage/files/
+
+# You must download a portage rescue tarball to perform a
+# recovery of your portage installation.
+# ===> http://dev.gentoo.org/~carpaski/portage_rescue/
+
+Download the version closest to the one you have installed.
+
+emerge -V
+portage 2.0.50-r9 (.......)
+
+Suggests that you should download a 2.0.50 version of portage.
+It is generally best to use higher versions and revisions
+than what you have installed, but ensure it is for the same
+architecture that your system is built with.
+
+Run the following to extract the tarball (substitute your arch for 'x86')
+# tar xjpUvf portage-rescue-2.0.50-r1-x86.tbz2 -C /
+
+You'll see a warning about garbage at the end of the tarball/bzip2.  That's
+normal and not a problem.  That should get Portage up and running again.
+
+It may be necessary to disable sandbox temporarily while you work out
+the issues on your system. To do this just run:
+# export FEATURES="-sandbox"
+and when you finish getting everything fixed either close the shell or type:
+# unset FEATURES
+
+After the rescue portage is extracted do the following:
+# emerge sync
+# emerge portage
+
+Everything should be fine from this point on.
+
+For >=portage-2.0.50, this is optional, but will speed up
+interactions with portage from this point on.
+# emerge metadata
 
-That should get Portage up and running again.
 
 Best Regards,
+  Gentoo Linux
 
-Daniel Robbins
-13 Mar 2002
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index f093d416cbb1..e1a1a0a2a499 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -1,7 +1,7 @@
- * 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>no-herd</herd>
+<maintainer><email>jstubbs@gentoo.org</email></maintainer>
 </pkgmetadata>
+
diff --git a/sys-apps/portage/portage-2.0.51.22-r3.ebuild b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
index d65316edbb56..4f9d8030fd8d 100644
--- a/sys-apps/portage/portage-2.0.51.22-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51.22-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-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.1 2005/10/05 16:13:48 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -15,6 +15,7 @@ SLOT="0"
 IUSE="build selinux"
 DEPEND=">=dev-lang/python-2.2.1"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) !x86-fbsd? ( !ppc-macos? ( sys-apps/sandbox ) ) selinux? ( >=dev-python/python-selinux-2.15 )"
+PROVIDE="virtual/portage"
 
 S=${WORKDIR}/${PN}-${PV}
 
diff --git a/sys-apps/portage/portage-2.0.53_rc7.ebuild b/sys-apps/portage/portage-2.0.53_rc7.ebuild
index 96f27de833b4..3a452a8101ce 100644
--- a/sys-apps/portage/portage-2.0.53_rc7.ebuild
+++ b/sys-apps/portage/portage-2.0.53_rc7.ebuild
@@ -1,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-apps/portage/portage-2.0.53_rc7.ebuild,v 1.1 2005/10/31 02:52:00 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc7.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/portage/portage-2.1.0_alpha20050718.ebuild b/sys-apps/portage/portage-2.1.0_alpha20050718.ebuild
index 59680006efdd..dd2eb979b850 100644
--- a/sys-apps/portage/portage-2.1.0_alpha20050718.ebuild
+++ b/sys-apps/portage/portage-2.1.0_alpha20050718.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.0_alpha20050718.ebuild,v 1.1 2005/08/11 17:06:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.0_alpha20050718.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 inherit eutils
 
@@ -14,9 +14,10 @@ DESCRIPTION="Portage ports system"
 SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org"
 RESTRICT=""
+PROVIDE="virtual/portage"
 
 #KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~mips ~x86"
 
 LICENSE="GPL-2"
 RDEPEND="!build? ( >=sys-apps/sed-4.0.5
diff --git a/sys-apps/powerpc-utils/ChangeLog b/sys-apps/powerpc-utils/ChangeLog
index 9e9fa97bcda3..2f20347070c2 100644
--- a/sys-apps/powerpc-utils/ChangeLog
+++ b/sys-apps/powerpc-utils/ChangeLog
@@ -1,9 +1,71 @@
 # ChangeLog for sys-apps/powerpc-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Id: 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/sys-apps/powerpc-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org>
+  powerpc-utils-1.1.3-r12.ebuild:
+  Stable on ppc64
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  powerpc-utils-1.1.3.ebuild, powerpc-utils-1.1.3-r12.ebuild:
+  Fixed HOMEPAGE, stable on ppc.
+
+  17 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  powerpc-utils-1.1.3-r12.ebuild:
+  ppc64 -> ~ppc64
+
+*powerpc-utils-1.1.3-r12 (17 Dec 2004)
+
+  17 Dec 2004; Michael Hanselmann <hansmi@gentoo.org>
+  +powerpc-utils-1.1.3-r12.ebuild:
+  New revision 12, thanks to Keri Harris for providing the ebuild. See bug 74339.
+
+  15 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  powerpc-utils-1.1.3-r10.ebuild:
+  Stable on ppc64; bug #69447
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  powerpc-utils-1.1.3-r10.ebuild:
+  Masked powerpc-utils-1.1.3-r10.ebuild stable for ppc
+
+*powerpc-utils-1.1.3-r10 (25 Aug 2004)
+
+  25 Aug 2004; Luca Barbato <lu_zero@gentoo.org> +files/hotfix.patch,
+  +powerpc-utils-1.1.3-r10.ebuild:
+  New version
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  powerpc-utils-1.1.3-r7.ebuild, powerpc-utils-1.1.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  09 Dec 2003; <spider@gentoo.org> powerpc-utils-1.1.3-r7.ebuild,
+  powerpc-utils-1.1.3.ebuild:
+  fixing chown 0.0 to 0:0
+
+*powerpc-utils-1.1.3-r7 (12 Mar 2003)
+
+  12 Mar 2003; Mark Guertin <gerk@gentoo.org> powerpc-utils-1.1.3-r7.ebuild:
+  updated upstream version and added some tools from build that were missing
+  previously
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *powerpc-utils-1.1.3 (21 June 2002)
 
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> powerpc-utils-1.1.3.ebuild :
+  This is definitely not for mips.
+
+  20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Removed pkg_setup() check for ARCH due to the fact that portage masks
+  packages that dont work with your ARCH
+
+  20 Jul 2002; Mark Guertin <gerk@gentoo.org> powerpc-utils-1.1.3.ebuild :
+  Fixed keywords.  Please read the titles, changelog, and descriptions of
+  pkgs you are marking with keywords :)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> powerpc-utils-1.1.3.ebuild :
+  Added KEYWORDS.
+
 21 June 2002; Gerk (gerk@gentoo.org)
 
 	Adjusted ARCH check, didn't bump revision (no need to rebuild)
diff --git a/sys-apps/powerpc-utils/Manifest b/sys-apps/powerpc-utils/Manifest
index e69de29bb2d1..101c2cbf076a 100644
--- a/sys-apps/powerpc-utils/Manifest
+++ b/sys-apps/powerpc-utils/Manifest
@@ -0,0 +1,11 @@
+MD5 6a2261a2bb90644e083e7d7fed2008c0 ChangeLog 2690
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1532317f761c4fa8793f087838311ba2 powerpc-utils-1.1.3-r10.ebuild 1149
+MD5 3bbaa127470e00f00bcd3fdda7531976 powerpc-utils-1.1.3-r12.ebuild 1170
+MD5 d01cdd3c6fc9f7436feead4c85babc66 powerpc-utils-1.1.3-r7.ebuild 1078
+MD5 2da864b7f1dfba2491262b9ff43bd9fa powerpc-utils-1.1.3.ebuild 1003
+MD5 9caf6dde05ea19e1e6a7faf874a36e56 files/digest-powerpc-utils-1.1.3 148
+MD5 dba77925be12207eeca0c9c40ca89505 files/digest-powerpc-utils-1.1.3-r10 149
+MD5 949015925ad77622cbc2826f0ccb723f files/digest-powerpc-utils-1.1.3-r12 149
+MD5 daaf465bff716bd05e3658328d428105 files/digest-powerpc-utils-1.1.3-r7 148
+MD5 35fd1c8ff99d95e177294ee69e36bfe8 files/hotfix.patch 809
diff --git a/sys-apps/powerpc-utils/metadata.xml b/sys-apps/powerpc-utils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/powerpc-utils/metadata.xml
+++ b/sys-apps/powerpc-utils/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-apps/powerpc-utils/powerpc-utils-1.1.3-r10.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r10.ebuild
index 7ca925e2c6b9..c770b09d573c 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r10.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r10.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-apps/powerpc-utils/powerpc-utils-1.1.3-r10.ebuild,v 1.1 2004/08/25 14:57:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r10.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="PowerPC utils; nvsetenv"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}.orig.tar.gz
 	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}-${DEBRV}.diff.gz"
 HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
-KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc ~ppc64"
+KEYWORDS="ppc -x86 -amd64 -alpha -hppa -mips -sparc ppc64"
 IUSE=""
 DEPEND="virtual/libc"
 RDEPEND=""
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r12.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r12.ebuild
index 3fe505f8ce91..68b85ad86dd4 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r12.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/powerpc-utils/powerpc-utils-1.1.3-r12.ebuild,v 1.1 2004/12/17 18:04:03 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r12.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="PowerPC utils; nvsetenv"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}.orig.tar.gz
 	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}-${DEBRV}.diff.gz"
 HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
-KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc ppc64"
+KEYWORDS="-alpha -amd64 -hppa -mips ppc ppc64 -sparc -x86"
 IUSE=""
 DEPEND="virtual/libc"
 RDEPEND=""
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild
index 7527e5b7eb35..947142f98ade 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild,v 1.1 2003/03/12 18:28:30 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3-r7.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DEBRV=7
 MY_P="${PN}_${PV}"
 DESCRIPTION="PowerPC utils; nvsetenv"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}.orig.tar.gz
 	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/${MY_P}-${DEBRV}.diff.gz"
 HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
-KEYWORDS="ppc -x86 -sparc -mips"
-DEPEND="virtual/glibc"
+KEYWORDS="ppc -x86 -amd64 -alpha -hppa -mips -sparc ppc64"
+IUSE=""
+DEPEND="virtual/libc"
 RDEPEND=""
 SLOT="0"
 LICENSE="GPL-2"
@@ -22,7 +22,7 @@ src_unpack() {
 	cd ${S}
 	cat ${DISTDIR}/powerpc-utils_${PV}-${DEBRV}.diff.gz | gzip -dc | patch -p1 || die
 	cd ${WORKDIR}
-	chown -R 0.0 *
+	chown -R 0:0 *
 	chmod -R a+r-w+X,u+w *
 }
 
diff --git a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild
index 571fad60a33a..8b5e05068233 100644
--- a/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild
+++ b/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Kain X <kain@kain.org>
-# $Id: powerpc-utils-1.1.3.ebuild,v 1.1 2002/04/27 10:36:20 pvdabeel Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/powerpc-utils/powerpc-utils-1.1.3.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DEBRV=3
 DESCRIPTION="PowerPC utils; nvsetenv"
 SRC_URI="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_${PV}.orig.tar.gz
 	http://http.us.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_${PV}-${DEBRV}.diff.gz"
-#HOMEPAGE=""
-DEPEND="virtual/glibc"
+HOMEPAGE="http://http.us.debian.org/debian/pool/main/p/powerpc-utils/"
+KEYWORDS="ppc -x86 -amd64 -alpha -hppa -mips -sparc"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND=""
+SLOT="0"
+LICENSE="GPL-2"
 
 src_unpack() {
 	cd ${WORKDIR}
@@ -18,7 +21,7 @@ src_unpack() {
 	cd ${S}
 	cat ${DISTDIR}/powerpc-utils_${PV}-${DEBRV}.diff.gz | gzip -dc | patch -p1 || die
 	cd ${WORKDIR}
-	chown -R 0.0 *
+	chown -R 0:0 *
 	chmod -R a+r-w+X,u+w *
 }
 
@@ -26,8 +29,7 @@ src_compile() {
 	emake nvsetenv || die
 }
 
-src_install () {
+src_install() {
 	into /usr
 	dosbin nvsetenv || die
-
 }
diff --git a/sys-apps/ppc64-utils/ChangeLog b/sys-apps/ppc64-utils/ChangeLog
index e48a85d1b8fa..c8e23a9c2681 100644
--- a/sys-apps/ppc64-utils/ChangeLog
+++ b/sys-apps/ppc64-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/ppc64-utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ppc64-utils/ChangeLog,v 1.1 2005/04/08 21:36:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ppc64-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
+
+  29 Jul 2005; <dostrow@gentoo.org> ppc64-utils-1.4.ebuild:
+  Stable on ppc64.
 
 *ppc64-utils-1.4 (08 Apr 2005)
 
diff --git a/sys-apps/ppc64-utils/Manifest b/sys-apps/ppc64-utils/Manifest
index 7072261ce38a..09ab152a888d 100644
--- a/sys-apps/ppc64-utils/Manifest
+++ b/sys-apps/ppc64-utils/Manifest
@@ -1,2 +1,4 @@
-MD5 63e5ffb2f673b8a955a23eb3eea9cf9a ppc64-utils-1.4.ebuild 515
+MD5 5bac5e0a60dddfeaf711383b94504e73 ppc64-utils-1.4.ebuild 620
+MD5 ea8ae97c0582260b752aa39adfa79ee3 ChangeLog 475
+MD5 6286050b597a5f71af76b59b2d5b383f metadata.xml 159
 MD5 baedd72c5f21285e9e1e97e58b09840e files/digest-ppc64-utils-1.4 66
diff --git a/sys-apps/ppc64-utils/ppc64-utils-1.4.ebuild b/sys-apps/ppc64-utils/ppc64-utils-1.4.ebuild
index c5f39e75ea52..290e3028f234 100644
--- a/sys-apps/ppc64-utils/ppc64-utils-1.4.ebuild
+++ b/sys-apps/ppc64-utils/ppc64-utils-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-apps/ppc64-utils/ppc64-utils-1.4.ebuild,v 1.1 2005/04/08 21:36:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ppc64-utils/ppc64-utils-1.4.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
 DESCRIPTION="Utilities for maintaining and servicing IBM PPC64 systems:
 accessing NVRAM, flashing firmware, start/stopping virtual IO servers, etc."
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="-* ~ppc64"
+KEYWORDS="-* ppc64"
 IUSE=""
 
 src_install() {
diff --git a/sys-apps/qingy/ChangeLog b/sys-apps/qingy/ChangeLog
index 72d11bc0079f..4b4376aad521 100644
--- a/sys-apps/qingy/ChangeLog
+++ b/sys-apps/qingy/ChangeLog
@@ -1,6 +1,101 @@
-# ChangeLog for x11-misc/qingy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.1 2003/10/17 20:24:09 avenj Exp $
+# ChangeLog for sys-apps/qingy
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
+
+  04 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-0.6.0.ebuild:
+  Stable for x86.
+
+  31 May 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-0.6.0.ebuild,
+  qingy-0.5.3.ebuild:
+  Modified pkg_postinst() to point users to more up to date documentation.
+
+*qingy-0.6.0 (30 May 2005)
+
+  30 May 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-0.6.0.ebuild:
+  Version bump. Also fixes bug #92785
+
+  24 March 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-0.5.2.ebuild:
+  Wiped out old version.
+
+  16 January 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-0.5.3.ebuild:
+  Stable for x86.
+
+*qingy-0.5.3 (11 January 2005)
+
+  11 January 2005; Michele Noberasco <s4t4n@gentoo.org> qingy-0.5.3.ebuild:
+  Version bump. Also fixes bug #77016
+  qingy-0.5.2.ebuild:
+  Update Copyright header...
+
+*qingy-0.5.2 (19 August 2004)
+
+  19 August 2004; Michele Noberasco <s4t4n@gentoo.org> qingy-0.5.2.ebuild:
+  Got too much feedback ;-)
+  Version bump. This fixes bug introduced in 0.5.1 that didn't allow to
+  run qingy anymore due to incorrect handling of command line arguments!
+  qingy-0.5.1.ebuild, files/digest-qingy-0.5.1:
+  Remove older ebuild...
+
+*qingy-0.5.1 (18 August 2004)
+
+  18 August 2004; Michele Noberasco <s4t4n@gentoo.org> qingy-0.5.1.ebuild:
+  Version bump. This fixes minor issues introduced by 0.5.0...
+  qingy-0.2.1.ebuild, qingy-0.2.2.ebuild, qingy-0.2.3.ebuild,
+  qingy-0.3.0.ebuild, qingy-0.4.0.ebuild, qingy-0.4.1.ebuild, 
+  qingy-0.5.0.ebuild and their digests:
+  Wipe out all older versions: I want as much feedback as possible
+  on this release, plus it should be the best version ever
+  (unless other bugs come out...).
+
+*qingy-0.5.0 (17 August 2004)
+
+  17 August 2004; Michele Noberasco <s4t4n@gentoo.org> qingy-0.5.0.ebuild:
+  Version bump. Closes #60402. I'm directly marking this stable for x86
+  as it specifically addresses issues with 2.6.8 kernels...
+
+  15 August 2004; Michele Noberasco <s4t4n@gentoo.org> qingy-0.4.1.ebuild:
+  Add big fat warning against using qingy with kernels > 2.6.5...
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
+  Corrected metadata.xml to match DTD.
+
+  31 July 2004; Michele Noberasco <s4t4n@gentoo.org> qingy-0.4.1.ebuild:
+  Stable for x86.
+
+*qingy-0.4.1 (28 July 2004)
+
+  28 July 2004; Michele Noberasco <s4t4n@gentoo.org> qingy-0.4.1.ebuild:
+  Version bump. This is going to be the next unmasked version ;-)
+
+  19 Jul 2004; <malc@gentoo.org> qingy-0.4.0.ebuild:
+  Add ~amd64 keyword, fixes bug #55461
+
+*qingy-0.4.0 (20 Mar 2004)
+
+  20 Mar 2004; Markus Nigbur <pyrania@gentoo.org> qingy-0.4.0.ebuild:
+  Version bump. Closing #45072.
+
+*qingy-0.3.0 (25 Feb 2004)
+
+  25 Feb 2004; Markus Nigbur <pyrania@gentoo.org> qingy-0.3.0.ebuild:
+  Version bump.
+
+  06 Dec 2003; Markus Nigbur <pyrania@gentoo.org> qingy-0.2.3.ebuild:
+  Added DEPEND to pkgconfig
+
+  25 Oct 2003; Markus Nigbur <pyrania@gentoo.org> qingy-0.2.1.ebuild,
+  qingy-0.2.2.ebuild, qingy-0.2.3.ebuild:
+  Added ~ppc keyword.
+
+*qingy-0.2.3 (21 Oct 2003)
+
+  21 Oct 2003; Markus Nigbur <pyrania@gentoo.org> qingy-0.2.3.ebuild:
+  Version bump. Thanks to Noberasco Michele (#31667).
+
+*qingy-0.2.2 (17 Oct 2003)
+
+  17 Oct 2003; Jon Portnoy <avenj@gentoo.org> qingy-0.2.2.ebuild :
+  Version bump + moved to sys-apps, bugs 29903 and 29594.
 
 *qingy-0.2.1 (06 Sep 2003)
 
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index 7b5664ed7a7f..685a58b0b331 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -1,5 +1,6 @@
-MD5 1873e86e306318ac7d78ee715ac1846c qingy-0.2.1.ebuild 1075
-MD5 1f780b97dcf06aa09e570846608504dd ChangeLog 400
-MD5 1873e86e306318ac7d78ee715ac1846c qingy-0.2.2.ebuild 1075
-MD5 d2c2a387643e5c0930982bbc58adb529 files/digest-qingy-0.2.1 64
-MD5 eea835254d6473eb82299eca77e9f219 files/digest-qingy-0.2.2 64
+MD5 fe68c1cfcbad540ed1bc6e94619e0b2e qingy-0.5.3.ebuild 1752
+MD5 dd85e08982e4b2fd093801c488e10796 ChangeLog 3660
+MD5 40051d4be23df0dc23c2dadbaa168415 metadata.xml 258
+MD5 11292309139c5f9ead00700d1d1bf04e qingy-0.6.0.ebuild 1826
+MD5 1e14b167f302dedd5250acc1d233fad6 files/digest-qingy-0.5.3 64
+MD5 f207760d2b2235e1b53324b87f21962a files/digest-qingy-0.6.0 64
diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index f093d416cbb1..379461ff2086 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -1,7 +1,9 @@
- * 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>
+<maintainer>
+  <email>s4t4n@gentoo.org</email>
+  <name>Michele Noberasco</name>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/qingy/qingy-0.5.3.ebuild b/sys-apps/qingy/qingy-0.5.3.ebuild
index ae1c56c8d75e..cc4cebdfd8fb 100644
--- a/sys-apps/qingy/qingy-0.5.3.ebuild
+++ b/sys-apps/qingy/qingy-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.5.3.ebuild,v 1.1 2005/01/11 08:32:08 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.5.3.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 DESCRIPTION="a DirectFB getty replacement"
 HOMEPAGE="http://qingy.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="emacs gpm pam static"
 
 DEPEND=">=dev-libs/DirectFB-0.9.18
@@ -42,8 +42,8 @@ src_install() {
 
 pkg_postinst() {
 	einfo "In order to use qingy you must first edit your /etc/inittab"
-	einfo "Check files INSTALL and README in /usr/share/doc/${P}"
-	einfo "for instructions on how to do that. Or issue an 'info qingy'."
+	einfo "Check the documentation at ${HOMEPAGE}"
+	einfo "for instructions on how to do that."
 	echo
 	ewarn "Also note that qingy doesn't seem to work realiably with"
 	ewarn "2.6.7 kernels due to problems with the DirectFB library."
diff --git a/sys-apps/qingy/qingy-0.6.0.ebuild b/sys-apps/qingy/qingy-0.6.0.ebuild
index f22d86b1dbcb..7fe96cf34266 100644
--- a/sys-apps/qingy/qingy-0.6.0.ebuild
+++ b/sys-apps/qingy/qingy-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.6.0.ebuild,v 1.1 2005/05/30 08:15:28 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.6.0.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 DESCRIPTION="a DirectFB getty replacement"
 HOMEPAGE="http://qingy.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="crypt emacs gpm pam static"
 
 DEPEND=">=dev-libs/DirectFB-0.9.18
@@ -44,8 +44,8 @@ src_install() {
 
 pkg_postinst() {
 	einfo "In order to use qingy you must first edit your /etc/inittab"
-	einfo "Check files INSTALL and README in /usr/share/doc/${P}"
-	einfo "for instructions on how to do that. Or issue an 'info qingy'."
+	einfo "Check the documentation at ${HOMEPAGE}"
+	einfo "for instructions on how to do that."
 	echo
 	ewarn "Also note that qingy doesn't seem to work realiably with"
 	ewarn "2.6.7 kernels due to problems with the DirectFB library."
diff --git a/sys-apps/qpage/ChangeLog b/sys-apps/qpage/ChangeLog
index 8ec9bff26301..88a28fe43929 100644
--- a/sys-apps/qpage/ChangeLog
+++ b/sys-apps/qpage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/qpage
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qpage/ChangeLog,v 1.1 2003/08/08 18:05:35 agriffis Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qpage/ChangeLog,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> qpage-3.3.ebuild:
+  don't use deprecated ?: use syntax
 
 *qpage-3.3 (08 Aug 2003)
 
diff --git a/sys-apps/qpage/Manifest b/sys-apps/qpage/Manifest
index 09b93b92c729..3df44960c439 100644
--- a/sys-apps/qpage/Manifest
+++ b/sys-apps/qpage/Manifest
@@ -1,4 +1,6 @@
-MD5 9dace5deda07e8c46730ef4a1192d11a qpage-3.3.ebuild 1456
-MD5 3e996d1790cff929235c0a839e8ec4f3 files/qpage 700
+MD5 107fd11cf54731892e429eaf840ec97b qpage-3.3.ebuild 1897
+MD5 69a41723402f4ff7bebd871937c95f2f ChangeLog 540
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c83c7ad21cc06145316f2725e8d07cbf files/qpage 671
 MD5 e8298db8d15de50d701f0cdcb29c86c7 files/qpage-3.3-gentoo.patch 1764
 MD5 55f62becd8c8b17a893657b3f59d4aa5 files/digest-qpage-3.3 60
diff --git a/sys-apps/qpage/files/qpage b/sys-apps/qpage/files/qpage
index 281383ee44d2..9cb9cf2da2cb 100644
--- a/sys-apps/qpage/files/qpage
+++ b/sys-apps/qpage/files/qpage
@@ -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/sys-apps/qpage/files/qpage,v 1.1 2003/08/08 18:05:35 agriffis Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qpage/files/qpage,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/sys-apps/qpage/metadata.xml b/sys-apps/qpage/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/qpage/metadata.xml
+++ b/sys-apps/qpage/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-apps/qpage/qpage-3.3.ebuild b/sys-apps/qpage/qpage-3.3.ebuild
index d3c93b7abaab..8edf8ed36ac2 100644
--- a/sys-apps/qpage/qpage-3.3.ebuild
+++ b/sys-apps/qpage/qpage-3.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/sys-apps/qpage/qpage-3.3.ebuild,v 1.1 2003/08/08 18:05:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qpage/qpage-3.3.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ LICENSE="qpage"
 SLOT="0"
 KEYWORDS="~x86 ~alpha"
 
-DEPEND="tcpd? ( sys-apps/tcp-wrappers ) : ( >=sys-apps/sed-4 )"
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!tcpd? ( >=sys-apps/sed-4 )"
 RDEPEND="
 	tcpd? ( sys-apps/tcp-wrappers )
 	virtual/mta"
@@ -33,7 +34,7 @@ src_compile() {
 		sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile
 		echo '#undef TCP_WRAPPERS' >> config.h
 	fi
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/sys-apps/qtparted/ChangeLog b/sys-apps/qtparted/ChangeLog
index d1e720586bb6..98967004fc4a 100644
--- a/sys-apps/qtparted/ChangeLog
+++ b/sys-apps/qtparted/ChangeLog
@@ -1,6 +1,83 @@
-# ChangeLog for x11-libs/qt
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/ChangeLog,v 1.1 2003/07/22 02:43:28 caleb Exp $
+# ChangeLog for sys-apps/qtparted
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/ChangeLog,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
+
+  02 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
+  Assigning to maintainer-needed, since I don't have any qt libraries
+  installed and have no interest in this package.
+
+  11 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> qtparted-0.4.4-r1.ebuild:
+  Define src_compile() properly to avoid bug #27959.
+
+  26 Jul 2005; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.4.ebuild,
+  qtparted-0.4.4-r1.ebuild:
+  Fix my earlier change to inherit kde instead of qt3
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.4.ebuild,
+  qtparted-0.4.4-r1.ebuild:
+  Change Qt dep per bug #100235
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> -qtparted-0.4.0.ebuild:
+  Remove old version
+
+  04 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  qtparted-0.4.4-r1.ebuild:
+  Added x11-libs/gksu to RDEPEND.
+
+*qtparted-0.4.4-r1 (11 Mar 2005)
+
+  11 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +qtparted-0.4.4-r1.ebuild:
+  enabled label support, QA: call need-qt after R/DEPEND, don't use einstall
+
+  21 Dec 2004; Karol Wojtaszek <sekretarz@gentoo.org> qtparted-0.4.4.ebuild:
+  Added to ~amd64, bug #75170
+
+*qtparted-0.4.4 (30 Apr 2004)
+
+  30 Apr 2004; Martin Holzer <mholzer@gentoo.org> qtparted-0.4.4.ebuild:
+  Verison bumped. Closes 49352
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> qtparted-0.4.3.ebuild:
+  Added to ~ppc.
+
+*qtparted-0.4.3 (18 Mar 2004)
+
+  18 Mar 2004; Dominik Stadler <centic@gentoo.org> qtparted-0.4.3.ebuild:
+  Add current Version 0.4.3, maybe fixes Bug 27959.
+
+*qtparted-0.4.1 (21 Jan 2004)
+
+  21 Jan 2004; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.1.ebuild:
+  New version, from bug #37892
+  Note that qtparted uses progsreiserfs and not reiserfsprogs.
+
+  21 Nov 2003; Martin Holzer <mholzer@gentoo.org> qtparted-0.3.2.ebuild,
+  qtparted-0.4.0.ebuild:
+  Adding RESTRICT="nomirror"
+
+  18 Nov 2003; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.0.ebuild:
+  Mark x86 stable
+
+  15 Oct 2003; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.0.ebuild:
+  Changed dep back to >=3.1 as it builds ok with Qt 3.2
+
+*qtparted-0.4.0 (14 Oct 2003)
+
+  14 Oct 2003; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.0.ebuild,
+  qtparted-0.4.0_rc1.ebuild:
+  Version bump, remove rc1 version
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> qtparted-0.3.2.ebuild,
+  qtparted-0.4.0_rc1.ebuild:
+  changed dep to qt 3.1
+
+*qtparted-0.4.0_rc1 (07 Sep 2003)
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> qtparted-0.4.0_rc1.ebuild:
+  Version bump, closes bug #28089 - thanks Carlo!
+
+  11 Aug 2003; Caleb Tennis <caleb@gentoo.org> qtparted-0.3.2.ebuild:
+  Changed dependency order to fix bug # 26203
 
 *qtparted-0.3.2 (19 Jul 2003)
 
diff --git a/sys-apps/qtparted/Manifest b/sys-apps/qtparted/Manifest
index 528cbe83aff0..3573c06d89ff 100644
--- a/sys-apps/qtparted/Manifest
+++ b/sys-apps/qtparted/Manifest
@@ -1,2 +1,6 @@
-MD5 69be71dff12e8a8fd6ccf2c9587db679 qtparted-0.3.2.ebuild 426
-MD5 babc9fa62e3147a05db290b1957c9570 files/digest-qtparted-0.3.2 67
+MD5 1a7c8f8a8a18a7bd8df3e82d4776c6c2 qtparted-0.4.4.ebuild 736
+MD5 a7f3b834f57d2a671dae8e2af59bf228 qtparted-0.4.4-r1.ebuild 931
+MD5 4cf391148b287687d0d1c3451150d447 ChangeLog 2948
+MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
+MD5 bd75fd4cc142dbf238fdb44969bfb98e files/digest-qtparted-0.4.4-r1 67
+MD5 bd75fd4cc142dbf238fdb44969bfb98e files/digest-qtparted-0.4.4 67
diff --git a/sys-apps/qtparted/metadata.xml b/sys-apps/qtparted/metadata.xml
index dc439f7e84f5..d52c9e243149 100644
--- a/sys-apps/qtparted/metadata.xml
+++ b/sys-apps/qtparted/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<herd>maintainer-needed</herd>
 </pkgmetadata>
diff --git a/sys-apps/qtparted/qtparted-0.4.4-r1.ebuild b/sys-apps/qtparted/qtparted-0.4.4-r1.ebuild
index 107ff47cf7be..7a3a080ee33a 100644
--- a/sys-apps/qtparted/qtparted-0.4.4-r1.ebuild
+++ b/sys-apps/qtparted/qtparted-0.4.4-r1.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/qtparted-0.4.4-r1.ebuild,v 1.1 2005/03/11 21:05:18 carlo Exp $
-
-inherit kde
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/qtparted-0.4.4-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
+inherit qt3
 
 DESCRIPTION="nice Qt partition tool for Linux"
 HOMEPAGE="http://qtparted.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qtparted/${P}.tar.bz2"
-
 LICENSE="GPL-2"
+
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-3.1.0
+DEPEND="$(qt_min_version 3.1)
 	>=sys-apps/parted-1.6.7
 	>=sys-fs/e2fsprogs-1.33
 	>=sys-fs/xfsprogs-2.3.9
 	>=sys-fs/jfsutils-1.1.2
 	>=sys-fs/ntfsprogs-1.7.1"
-need-qt 3.1
 
-myconf="--disable-reiserfs --enable-labels"
+RDEPEND="${DEPEND}
+	x11-libs/gksu"
+
+src_compile() {
+	local myconf="--disable-reiserfs --enable-labels"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
diff --git a/sys-apps/qtparted/qtparted-0.4.4.ebuild b/sys-apps/qtparted/qtparted-0.4.4.ebuild
index 751e476ecb16..c6ec3a7fc180 100644
--- a/sys-apps/qtparted/qtparted-0.4.4.ebuild
+++ b/sys-apps/qtparted/qtparted-0.4.4.ebuild
@@ -1,30 +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/sys-apps/qtparted/qtparted-0.4.4.ebuild,v 1.1 2004/04/30 12:11:02 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/qtparted-0.4.4.ebuild,v 1.1.1.1 2005/11/30 09:56:13 chriswhite Exp $
 
 inherit kde
-need-qt 3.1
 
-DESCRIPTION="QtParted is a nice Qt partition tool for Linux"
-HOMEPAGE="http://qtparted.sourceforge.net"
+DESCRIPTION="nice Qt partition tool for Linux"
+HOMEPAGE="http://qtparted.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-DEPEND=">=x11-libs/qt-3.1.0
+DEPEND="$(qt_min_version 3.1.0)
 	>=sys-apps/parted-1.6.6
 	>=sys-fs/e2fsprogs-1.33
-	>=sys-fs/progsreiserfs-0.3.0.4
 	>=sys-fs/xfsprogs-2.3.9
 	>=sys-fs/jfsutils-1.1.2
 	>=sys-fs/ntfsprogs-1.7.1"
 
+myconf="--disable-reiserfs"
 
 src_install() {
 	einstall || die
 	dodoc doc/README doc/README.Debian doc/TODO.txt doc/BUGS doc/DEVELOPER-FAQ
 }
-
diff --git a/sys-apps/raidutils/ChangeLog b/sys-apps/raidutils/ChangeLog
index 0a03fe991500..78e39ffbfde3 100644
--- a/sys-apps/raidutils/ChangeLog
+++ b/sys-apps/raidutils/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for sys-apps/raidutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.1 2005/01/10 21:59:01 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
+
+  01 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> raidutils-0.0.5.ebuild,
+  raidutils-0.0.6.ebuild:
+  fixed bug #89550.
+
+  20 Apr 2005; Christian Zoffoli <xmerlin@gentoo.org> raidutils-0.0.6.ebuild:
+  Stable x86.
+
+*raidutils-0.0.6 (26 Feb 2005)
+
+  26 Feb 2005; Christian Zoffoli <xmerlin@gentoo.org> raidutils-0.0.5.ebuild,
+  +raidutils-0.0.6.ebuild:
+  raidutils-0.0.6 added to portage
+
+  26 Feb 2005; Christian Zoffoli <xmerlin@gentoo.org> raidutils-0.0.5.ebuild:
+  raidutils-0.0.5 marked stable on x86
+
+  12 Jan 2005; John Mylchreest <johnm@gentoo.org> raidutils-0.0.5.ebuild:
+  fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?
 
 *raidutils-0.0.5 (10 Jan 2005)
 
diff --git a/sys-apps/raidutils/Manifest b/sys-apps/raidutils/Manifest
index f045ec9d1fbd..78f79c362de9 100644
--- a/sys-apps/raidutils/Manifest
+++ b/sys-apps/raidutils/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6b2a95b826d212207a259717f1c7c6e2 metadata.xml 643
-MD5 4daf0a98b5b13944940e93bb8ce9e971 raidutils-0.0.5.ebuild 652
+MD5 2317a595cb0ee3201204264c2a9128d9 raidutils-0.0.5.ebuild 759
+MD5 b10de6b10232d2961de92b382b90522a ChangeLog 1101
+MD5 fc303540b646edb17f354cae777e7f80 raidutils-0.0.6.ebuild 759
 MD5 4099a4c6960a610930541d55d9bb4e5d files/raidutils-0.0.5-i2octl-fixpath.patch 1597
 MD5 2e881a5176df7cf66a9c291521480d9b files/digest-raidutils-0.0.5 68
+MD5 ba1b41b51ca66f21326f777218441336 files/digest-raidutils-0.0.6 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCnXbRgMUyd/cdjWsRAvBJAJ98z22NzuQ+2zfSt9ye47ck4QwS6ACgg8I4
+TmKtyT9TIx06TildEEabY7o=
+=fjjn
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/raidutils/raidutils-0.0.5.ebuild b/sys-apps/raidutils/raidutils-0.0.5.ebuild
index 7815041e8a9d..1e80ab090ba0 100644
--- a/sys-apps/raidutils/raidutils-0.0.5.ebuild
+++ b/sys-apps/raidutils/raidutils-0.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.5.ebuild,v 1.1 2005/01/10 21:59:01 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 inherit eutils
 
@@ -8,13 +8,13 @@ DESCRIPTION="Utilities to manage i2o/dtp RAID controllers."
 SRC_URI="http://i2o.shadowconnect.com/raidutils/${P}.tar.bz2"
 HOMEPAGE="http://i2o.shadowconnect.com/"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 SLOT="0"
 LICENSE="Adaptec"
 
-DEPEND="sys-kernel/linux26-headers"
+DEPEND=">=sys-kernel/linux-headers-2.6"
 RDEPEND=""
 
 src_unpack () {
diff --git a/sys-apps/raidutils/raidutils-0.0.6.ebuild b/sys-apps/raidutils/raidutils-0.0.6.ebuild
index 4b8c3023b2bf..962c370a05e7 100644
--- a/sys-apps/raidutils/raidutils-0.0.6.ebuild
+++ b/sys-apps/raidutils/raidutils-0.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/sys-apps/raidutils/raidutils-0.0.6.ebuild,v 1.1 2005/02/25 13:46:42 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.6.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 inherit eutils
 
@@ -8,13 +8,13 @@ DESCRIPTION="Utilities to manage i2o/dtp RAID controllers."
 SRC_URI="http://i2o.shadowconnect.com/raidutils/${P}.tar.bz2"
 HOMEPAGE="http://i2o.shadowconnect.com/"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 SLOT="0"
 LICENSE="Adaptec"
 
-DEPEND="|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )"
+DEPEND=">=sys-kernel/linux-headers-2.6"
 RDEPEND=""
 
 src_unpack () {
diff --git a/sys-apps/readahead-list/ChangeLog b/sys-apps/readahead-list/ChangeLog
index ad9a707ea88b..856c629bcb38 100644
--- a/sys-apps/readahead-list/ChangeLog
+++ b/sys-apps/readahead-list/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for sys-apps/readahead-list
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/ChangeLog,v 1.1 2005/03/21 07:22:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/ChangeLog,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  readahead-list-0.20050517.0220.ebuild:
+  Stable on x86, 132 days in ~x86.
+
+  17 Jul 2005; Jared Hudson <jhhudso@gentoo.org>
+  readahead-list-0.20050517.0220.ebuild:
+  Added ~amd64 to ebuild
+
+*readahead-list-0.20050517.0220 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +readahead-list-0.20050517.0220.ebuild:
+  New release, fixing bug #92714.
+
+*readahead-list-0.20050425.1452 (25 Apr 2005)
+
+  25 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +readahead-list-0.20050425.1452.ebuild:
+  New production-quality release.
+
+  18 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  readahead-list-0.20050328.0142.ebuild:
+  Bug #89550 - cleanup linux26-headers DEPEND.
+
+*readahead-list-0.20050328.0142 (28 Mar 2005)
+
+  28 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +readahead-list-0.20050328.0142.ebuild:
+  New upstream version. Add manpages. Build filelist-order with large file
+  support. Code cleanup.
+
+*readahead-list-0.20050323.0658 (23 Mar 2005)
+
+  23 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +readahead-list-0.20050323.0658.ebuild:
+  New upstream release, adds filelist-order tool in a similar vein to the
+  Ubuntu readahead.
 
 *readahead-list-0.20050320.2320 (20 Mar 2005)
 
diff --git a/sys-apps/readahead-list/Manifest b/sys-apps/readahead-list/Manifest
index b5de2c08c53b..57af200e48ba 100644
--- a/sys-apps/readahead-list/Manifest
+++ b/sys-apps/readahead-list/Manifest
@@ -1,5 +1,12 @@
-MD5 e459a529f365dcc189b34b70e0ee90c0 readahead-list-0.20050320.2320.ebuild 957
+MD5 98d39a3e2ac8773ea9a71fd51e936fd0 readahead-list-0.20050320.2320.ebuild 1081
+MD5 5e12fa85d7a41a4a79f28a02f7667c93 readahead-list-0.20050328.0142.ebuild 1484
+MD5 b5915784fc4515c4002334dc2347c118 readahead-list-0.20050323.0658.ebuild 1327
+MD5 053823ecdd88a7bc983d471c9702e44a readahead-list-0.20050517.0220.ebuild 1799
+MD5 a680da6ec6582ca0398a22744687264d ChangeLog 1731
 MD5 9fed7d835204a85cc1da8ae9b3a81e10 metadata.xml 306
-MD5 144ea8467548eb1203e8fae0de99f07e files/digest-readahead-list-0.20050320.2240 78
-MD5 5939ae974453c4f25dc34fccefc1d8d5 files/digest-readahead-list-0.20050320.2311 82
+MD5 57bd4015c59ef440cd209a1029d94f49 readahead-list-0.20050425.1452.ebuild 1786
+MD5 c4c89e5f3dc2baf2a606874014fd1362 files/digest-readahead-list-0.20050425.1452 83
 MD5 a30a550753bc067a2cf24fd8f2c106ba files/digest-readahead-list-0.20050320.2320 82
+MD5 12838347caea6c623cfa189d8eeca91c files/digest-readahead-list-0.20050323.0658 83
+MD5 705c1a581218476779280f4af399247c files/digest-readahead-list-0.20050328.0142 83
+MD5 9448ecc752e78d34c0ae592042934774 files/digest-readahead-list-0.20050517.0220 83
diff --git a/sys-apps/readahead-list/readahead-list-0.20050320.2320.ebuild b/sys-apps/readahead-list/readahead-list-0.20050320.2320.ebuild
index a52a207d9642..88dcb98f538f 100644
--- a/sys-apps/readahead-list/readahead-list-0.20050320.2320.ebuild
+++ b/sys-apps/readahead-list/readahead-list-0.20050320.2320.ebuild
@@ -1,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-apps/readahead-list/readahead-list-0.20050320.2320.ebuild,v 1.1 2005/03/21 07:22:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/readahead-list-0.20050320.2320.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Perform readahead(2) to pre-cache files."
 HOMEPAGE="http://tirpitz.iat.sfu.ca/"
diff --git a/sys-apps/readahead-list/readahead-list-0.20050323.0658.ebuild b/sys-apps/readahead-list/readahead-list-0.20050323.0658.ebuild
index d7655a7fd4c9..4908341709bc 100644
--- a/sys-apps/readahead-list/readahead-list-0.20050323.0658.ebuild
+++ b/sys-apps/readahead-list/readahead-list-0.20050323.0658.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/sys-apps/readahead-list/readahead-list-0.20050323.0658.ebuild,v 1.1 2005/03/23 08:33:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/readahead-list-0.20050323.0658.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
-DESCRIPTION="Perform readahead(2) to pre-cache files."
-HOMEPAGE="http://tirpitz.iat.sfu.ca/"
-SRC_URI="${HOMEPAGE}/custom-software/${PN}/${P}.tar.bz2"
+DESCRIPTION="Preloads files into the page cache to accelerate program loading."
+
+HOMEPAGE="http://www.orbis-terrarum.net"
+SRC_URI="http://tirpitz.iat.sfu.ca/custom-software/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
@@ -12,7 +13,9 @@ IUSE="doc"
 
 # I'm not entirely certain about this
 # need to check if other libc variants provide readahead(2)
-DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+		virtual/os-headers"
 
 src_compile() {
 	econf --sbindir=/sbin || die "econf failed"
@@ -33,7 +36,7 @@ src_install() {
 	newins readahead.runlevel-default.list runlevel-default
 	newins readahead.runlevel-boot.list runlevel-boot
 	newins readahead._sbin_rc.list exec_sbin_rc
-	
+
 	# docs
 	cd ${S}
 	dodoc README
diff --git a/sys-apps/readahead-list/readahead-list-0.20050328.0142.ebuild b/sys-apps/readahead-list/readahead-list-0.20050328.0142.ebuild
index 63fe4106ffb3..bf0731250828 100644
--- a/sys-apps/readahead-list/readahead-list-0.20050328.0142.ebuild
+++ b/sys-apps/readahead-list/readahead-list-0.20050328.0142.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/sys-apps/readahead-list/readahead-list-0.20050328.0142.ebuild,v 1.1 2005/03/28 10:01:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/readahead-list-0.20050328.0142.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Preloads files into the page cache to accelerate program loading."
 
 HOMEPAGE="http://www.orbis-terrarum.net"
-SRC_URI="${HOMEPAGE}/custom-software/${PN}/${P}.tar.bz2"
+SRC_URI="http://tirpitz.iat.sfu.ca/custom-software/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
@@ -18,7 +18,7 @@ RDEPEND="virtual/libc"
 # they don't compile properly!
 DEPEND="${RDEPEND}
 		virtual/os-headers
-		!=sys-kernel/linux26-headers-2.6.8.1*"
+		!=sys-kernel/linux-headers-2.6.8.1*"
 
 src_compile() {
 	econf --sbindir=/sbin || die "econf failed"
diff --git a/sys-apps/readahead-list/readahead-list-0.20050425.1452.ebuild b/sys-apps/readahead-list/readahead-list-0.20050425.1452.ebuild
index e42ec570ed7b..ecc2b7173b74 100644
--- a/sys-apps/readahead-list/readahead-list-0.20050425.1452.ebuild
+++ b/sys-apps/readahead-list/readahead-list-0.20050425.1452.ebuild
@@ -1,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-apps/readahead-list/readahead-list-0.20050425.1452.ebuild,v 1.1 2005/04/25 22:26:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/readahead-list-0.20050425.1452.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Preloads files into the page cache to accelerate program loading."
 
diff --git a/sys-apps/readahead-list/readahead-list-0.20050517.0220.ebuild b/sys-apps/readahead-list/readahead-list-0.20050517.0220.ebuild
index d58218e2f3c5..6b834a280aa7 100644
--- a/sys-apps/readahead-list/readahead-list-0.20050517.0220.ebuild
+++ b/sys-apps/readahead-list/readahead-list-0.20050517.0220.ebuild
@@ -1,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-apps/readahead-list/readahead-list-0.20050517.0220.ebuild,v 1.1 2005/05/17 02:47:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/readahead-list/readahead-list-0.20050517.0220.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Preloads files into the page cache to accelerate program loading."
 HOMEPAGE="http://www.orbis-terrarum.net"
 SRC_URI="http://tirpitz.iat.sfu.ca/custom-software/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="doc"
 
 # I'm not entirely certain about this
diff --git a/sys-apps/realtime-lsm/ChangeLog b/sys-apps/realtime-lsm/ChangeLog
index 3d14a4b3b324..5213a6d25a26 100644
--- a/sys-apps/realtime-lsm/ChangeLog
+++ b/sys-apps/realtime-lsm/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for sys-apps/realtime-lsm
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/ChangeLog,v 1.1 2004/10/23 05:31:00 fafhrd Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+  24 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  -files/realtime-lsm-0.8.5-allcaps.patch, -realtime-lsm-0.8.5-r2.ebuild:
+  Yes, my additions to -r2 were indeed security concerns; a workaround for
+  jack has been discovered (use jackd instead of jackstart); removing this
+
+*realtime-lsm-0.8.5-r2 (24 Jun 2005)
+
+  24 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/realtime-lsm-0.8.5-allcaps.patch, +realtime-lsm-0.8.5-r2.ebuild:
+  added 0.8.5-r2 which re-adds the 'allcaps' module param; package masked for
+  now, until I can prove this isn't a security issue
+
+  14 Mar 2005; Eric Shattow <jnc@gentoo.org> metadata.xml,
+  realtime-lsm-0.8.5-r1.ebuild:
+  Reported stable on x86, ppc, and amd64. This is needed to effectively use the
+  now-stable qjackctl, jack-audio-connection-kit, etc. plus minor correction to
+  eerror output. Closes bugs #80994, #83220, #83364, #83364, #85201.
+
+*realtime-lsm-0.8.5-r1 (05 Jan 2005)
+
+  05 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +realtime-lsm-0.8.5-r1.ebuild:
+  Updated ebuild to support linux-mod eclass.
+
+*realtime-lsm-0.8.5 (05 Jan 2005)
+
+  05 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  realtime-lsm-0.8.3.ebuild, +realtime-lsm-0.8.5.ebuild:
+  Fixed removed keyword that was inadvertently removed in 0.8.3; version bump
+  to 0.8.5
+
+*realtime-lsm-0.8.3 (31 Oct 2004)
+
+  31 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
+  realtime-lsm-0.8.2_pre20041022.ebuild, +realtime-lsm-0.8.3.ebuild:
+  Kernel config depend on SELinux support =y removed; version bump as well
+
+  23 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org> metadata.xml,
+  realtime-lsm-0.8.2_pre20041022.ebuild:
+  Made error output about kernel configuration much more informative; updated
+  metadata.xml for latest module features explanation.
+
+  23 Oct 2004; Chris White <chriswhite@gentoo.org>
+  realtime-lsm-0.8.2_pre20041022.ebuild:
+  Added ~x86 keywords as per testing with realtime module and jackd (with
+  realtime module setup for the audio group).
 
 *realtime-lsm-0.8.2_pre20041022 (23 Oct 2004)
 
diff --git a/sys-apps/realtime-lsm/Manifest b/sys-apps/realtime-lsm/Manifest
index 83dd1b52fbff..659052af5486 100644
--- a/sys-apps/realtime-lsm/Manifest
+++ b/sys-apps/realtime-lsm/Manifest
@@ -1,6 +1,21 @@
-MD5 430e802509431a9b1aae68296057856f metadata.xml 1440
-MD5 a3e726d3e63b815dca4eb581ba0512f4 realtime-lsm-0.1.1.ebuild 1920
-MD5 a8c8b1248ccd73e0889408d4fa711466 realtime-lsm-0.8.2_pre20041022.ebuild 1905
-MD5 fd36ad6dc09a39a100583ec1af3b4698 files/digest-realtime-lsm-0.1.1 69
-MD5 85ed7b4c01ed723a59be23a24df3d4c6 files/kmisc.patch 560
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0a239287e8ba72cf1474bcbb5bd852d1 ChangeLog 2449
 MD5 c2a4f8c235326082b353136c6393b4f0 files/digest-realtime-lsm-0.8.2_pre20041022 81
+MD5 2ed4d388f1dcb7e905726ac4203fd666 files/digest-realtime-lsm-0.8.3 69
+MD5 82204df30e7add750c918a1d2fd2246c files/digest-realtime-lsm-0.8.5 69
+MD5 82204df30e7add750c918a1d2fd2246c files/digest-realtime-lsm-0.8.5-r1 69
+MD5 bd10dcd7b669d837d013107c02b4d17d files/kmisc.patch-0.8.2_pre20041022 679
+MD5 6c47fd8303924a51fea25d882d2e222b metadata.xml 1598
+MD5 4b60714faf775ac4137488504ed3839d realtime-lsm-0.8.2_pre20041022.ebuild 2525
+MD5 5a42994eaa05d48743fd051377224c92 realtime-lsm-0.8.3.ebuild 2536
+MD5 42c5b36597dc53d5b857cc47d17182cf realtime-lsm-0.8.5-r1.ebuild 1748
+MD5 98a8e7dd0f688c5686b065232c8ae780 realtime-lsm-0.8.5.ebuild 2567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0FCuI1lqEGTUzyQRAkBJAJ4+Dp3cUIpf92ZItES5a13dmXUgEgCgrEgB
+EOa4O4wLt1z+lgknzPE/5j0=
+=VVov
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/realtime-lsm/metadata.xml b/sys-apps/realtime-lsm/metadata.xml
index 82797fcc0da4..8830a5eddecf 100644
--- a/sys-apps/realtime-lsm/metadata.xml
+++ b/sys-apps/realtime-lsm/metadata.xml
@@ -6,6 +6,11 @@
   <email>fafhrd@gentoo.org</email>
   <description>My main herd is gnustep, and I'm developing audio backends for that; I use jack-audio-connection-kit heavily, and this module makes its realtime capability use quite straight-forward w/o kernel hackery.</description>
 </maintainer>
+<maintainer>
+  <email>jnc@gentoo.org</email>
+  <description>I am working to make the Gentoo musician's JACK setup a reliable
+platform, and have been asked to help mantain realtime-lsm stable.</description>
+</maintainer>
 <longdescription>
 Realtime Linux Security Module
 
@@ -30,13 +35,6 @@ Grants realtime scheduling privileges without the ability to lock
 memory using mlock() or mlockall() system calls.  This option can be
 used in conjunction with any of the other options.
 
-# modprobe realtime allcaps=1
-
-Enables all capabilities, including CAP_SETPCAP.  This is equivalent
-to the 2.4 kernel capabilities patch.  It is needed for root
-programs to assign realtime capabilities to other processes.  This
-option can be used in conjunction with any of the other options.
-
 The JACK Audio Connection Kit (jackit.sourceforge.net) includes a
 jackstart program which uses CAP_SETPCAP to run the JACK daemon
 and its clients with realtime capabilities.
diff --git a/sys-apps/realtime-lsm/realtime-lsm-0.8.2_pre20041022.ebuild b/sys-apps/realtime-lsm/realtime-lsm-0.8.2_pre20041022.ebuild
index d1dfd420eda6..68d58939b657 100644
--- a/sys-apps/realtime-lsm/realtime-lsm-0.8.2_pre20041022.ebuild
+++ b/sys-apps/realtime-lsm/realtime-lsm-0.8.2_pre20041022.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-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-apps/realtime-lsm/realtime-lsm-0.8.2_pre20041022.ebuild,v 1.1 2004/10/23 05:31:00 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.2_pre20041022.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 inherit kernel-mod eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND="virtual/linux-sources
@@ -24,6 +24,8 @@ src_unpack() {
 	then
 		eerror ""
 		eerror "${PN} requires support for modules in your kernel."
+		eerror "In your .config: CONFIG_MODULES=y"
+		eerror "Through 'make menuconfig': Loadable module support-> [*] Enable loadable module support"
 		eerror ""
 		die "Module support not detected."
 	fi
@@ -32,6 +34,8 @@ src_unpack() {
 	then
 		eerror ""
 		eerror "${PN} requires you to compile in the 'different security models option."
+		eerror "In your .config: CONFIG_SECURITY=y"
+		eerror "Through 'make menuconfig': Security options-> [*] Enable different security models"
 		eerror ""
 		die "Security support not detected."
 	fi
@@ -40,18 +44,12 @@ src_unpack() {
 	then
 		eerror ""
 		eerror "${PN} requires that 'Default Linux Capabilities' be compiled as a module."
+		eerror "In your .config: CONFIG_SECURITY_CAPABILITIES=m"
+		eerror "Through 'make menuconfig': Security options-> <M> Default Linux Capabilties"
 		eerror ""
 		die "Default Linux capabilities (security) not detected."
 	fi
 
-	if ! kernel-mod_configoption_present SECURITY_SELINUX
-	then
-		eerror ""
-		eerror "${PN} requires that 'NSA SELinux Support' be compiled into your kernel."
-		eerror ""
-		die "NSA SELinux support not detected."
-	fi
-
 	unpack ${A}
 
 	kernel-mod_getversion
@@ -89,4 +87,3 @@ pkg_postinst() {
 	test -r "${ROOT}/usr/src/linux/System.map" && \
 		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
 }
-
diff --git a/sys-apps/realtime-lsm/realtime-lsm-0.8.3.ebuild b/sys-apps/realtime-lsm/realtime-lsm-0.8.3.ebuild
index b22c1f75ce15..da2a3a9f66cc 100644
--- a/sys-apps/realtime-lsm/realtime-lsm-0.8.3.ebuild
+++ b/sys-apps/realtime-lsm/realtime-lsm-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/sys-apps/realtime-lsm/realtime-lsm-0.8.3.ebuild,v 1.1 2004/11/01 04:30:51 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.3.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 inherit kernel-mod eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.joq.us/realtime/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND="virtual/linux-sources
@@ -87,4 +87,3 @@ pkg_postinst() {
 	test -r "${ROOT}/usr/src/linux/System.map" && \
 		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
 }
-
diff --git a/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild b/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild
index dba9e16b1141..dd48f92603a1 100644
--- a/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild
+++ b/sys-apps/realtime-lsm/realtime-lsm-0.8.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-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild,v 1.1 2005/01/05 18:15:22 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 inherit linux-mod eutils
 
@@ -12,11 +12,9 @@ SRC_URI="http://www.joq.us/realtime/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc x86 amd64"
 
 IUSE=""
-DEPEND="${DEPEND}"
-RDEPEND="${RDEPEND}"
 
 MODULE_NAMES="realtime(extra:)"
 BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} TOUT=${TMP}/tmp-gas-check"
@@ -29,7 +27,9 @@ src_unpack() {
 		eerror ""
 		eerror "${PN} requires you to compile in the 'different security models option."
 		eerror "In your .config: CONFIG_SECURITY=y"
+		eerror "                 CONFIG_SECURITY_CAPABILITIES=m"
 		eerror "Through 'make menuconfig': Security options-> [*] Enable different security models"
+		eerror "                           Security options-> <M> Default Linux Capabilties"
 		eerror ""
 		die "Security support not detected."
 	fi
@@ -54,4 +54,3 @@ src_unpack() {
 	epatch ${FILESDIR}/kmisc.patch-0.8.2_pre20041022
 	convert_to_m Makefile
 }
-
diff --git a/sys-apps/realtime-lsm/realtime-lsm-0.8.5.ebuild b/sys-apps/realtime-lsm/realtime-lsm-0.8.5.ebuild
index ed28eb180b69..00fa769b62a8 100644
--- a/sys-apps/realtime-lsm/realtime-lsm-0.8.5.ebuild
+++ b/sys-apps/realtime-lsm/realtime-lsm-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/sys-apps/realtime-lsm/realtime-lsm-0.8.5.ebuild,v 1.1 2005/01/05 17:52:00 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/realtime-lsm/realtime-lsm-0.8.5.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 inherit kernel-mod eutils
 
@@ -88,4 +88,3 @@ pkg_postinst() {
 	test -r "${ROOT}/usr/src/linux/System.map" && \
 		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
 }
-
diff --git a/sys-apps/ren/ChangeLog b/sys-apps/ren/ChangeLog
index 24c7f0fd8a42..8fccece4610f 100644
--- a/sys-apps/ren/ChangeLog
+++ b/sys-apps/ren/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for sys-apps/ren
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ren/ChangeLog,v 1.1 2002/05/31 03:05:42 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ren/ChangeLog,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
 
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> ren-1.0.ebuild:
+  Mark 1.0 stable on alpha
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> ren-1.0.ebuild:
+  Add ~alpha keyword, bug 63725.
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> ren-1.0.ebuild:
+  stable on ppc64, bug #58300
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Stable macos per bug # 58306
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ren-1.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ren-1.0 (30 May 2002)
 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> ren-1.0.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   30 May 2002; Arcady Genkin <agenkin@thpoon.com> ren-1.0.ebuild :
 
-  Initial version, submitted by elnix@yahoo.com (Austin Johnson).
\ No newline at end of file
+  Initial version, submitted by elnix@yahoo.com (Austin Johnson).
diff --git a/sys-apps/ren/Manifest b/sys-apps/ren/Manifest
index e69de29bb2d1..5acf5e3a79c0 100644
--- a/sys-apps/ren/Manifest
+++ b/sys-apps/ren/Manifest
@@ -0,0 +1,4 @@
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 87c3ea110309219b552a5f08a8627c2a ChangeLog 1187
+MD5 48aa1d83dba35496e3b646ee7ea1c471 ren-1.0.ebuild 561
+MD5 0bbfd5f275487396aaf264f30c4dd5c6 files/digest-ren-1.0 57
diff --git a/sys-apps/ren/metadata.xml b/sys-apps/ren/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/ren/metadata.xml
+++ b/sys-apps/ren/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-apps/ren/ren-1.0.ebuild b/sys-apps/ren/ren-1.0.ebuild
index 0b9b3f320179..65db1e281d54 100644
--- a/sys-apps/ren/ren-1.0.ebuild
+++ b/sys-apps/ren/ren-1.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-apps/ren/ren-1.0.ebuild,v 1.1 2002/05/31 03:05:42 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ren/ren-1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:49 chriswhite Exp $
 
 DESCRIPTION="Renames multiple files"
 HOMEPAGE="http://freshmeat.net/projects/ren"
-
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/${P}.tar.gz"
 
-S="${WORKDIR}/${P}"
+KEYWORDS="alpha amd64 ppc ppc-macos ppc64 sparc x86"
+IUSE=""
+SLOT="0"
+LICENSE="as-is"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake || die
@@ -17,6 +19,6 @@ src_compile() {
 
 src_install() {
 	dobin ren
-	dodoc README 
+	dodoc README
 	doman ren.1
 }
diff --git a/sys-apps/rename/ChangeLog b/sys-apps/rename/ChangeLog
index 8fce7646ce2d..54b2c0dd6ced 100644
--- a/sys-apps/rename/ChangeLog
+++ b/sys-apps/rename/ChangeLog
@@ -1,8 +1,33 @@
 # ChangeLog for sys-apps/rename
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/ChangeLog,v 1.1 2003/09/09 16:17:22 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/ChangeLog,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
+
+  10 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> rename-1.3.ebuild:
+  Fix SRC_URI, bug #102038
+
+  13 Jun 2005; Andrej Kacian <ticho@gentoo.org> rename-1.3.ebuild:
+  Stable on amd64.
+
+  19 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> rename-1.3.ebuild:
+  Added ~amd64 keyword, closing bug #89630.
+
+  11 Dec 2004; Mike Frysinger <vapier@gentoo.org> rename-1.3.ebuild:
+  Rename the binary to xmrename and clean up the Makefile #46834 by Jeroen Hoek.
+
+  12 Sep 2004; Ian Leitch <port001@gentoo.org> rename-1.3.ebuild:
+  Updated DESCRIPTION, #62779. Stable on x86
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> rename-1.3.ebuild:
+  Masked rename-1.3.ebuild stable for ppc
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> rename-1.3.ebuild:
+  stable on ppc64, bug #58296
+
+  23 Jun 2004; Alexander Plank <alexander@gentoo.org> rename-1.3.ebuild:
+  Stable on macos
 
 *rename-1.3 (09 Sep 2003)
 
   09 Sep 2003; <port001@gentoo.org> rename-1.3.ebuild:
   New package, thanks to Patrick Heneise <gentoo@l-c-f.net> in bug #27644
+
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index fc4d96b697bc..e6c04a1812a9 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -1,3 +1,14 @@
-MD5 495f52bcd79e7b52aab56a7c18140e82 rename-1.3.ebuild 848
-MD5 32402c77e944d5e332e284ab12416527 ChangeLog 369
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7120bb481476a39bd1dceb19a301aa64 rename-1.3.ebuild 820
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d430fdbd02dfdbd8dcd3e0c9135232bb ChangeLog 1235
 MD5 422775298804a7adef3bc0ad71ef0d77 files/digest-rename-1.3 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC+lT5LLFUmVNQ7rkRAsQzAJ903gUzaTJD+4bq5ME9YueFEalr8wCgtsJq
+wFrn3iJOhfjAnKc7MAOGY5M=
+=mZ81
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/rename/metadata.xml b/sys-apps/rename/metadata.xml
index 6459017cfff6..96a2d586367d 100644
--- a/sys-apps/rename/metadata.xml
+++ b/sys-apps/rename/metadata.xml
@@ -1,13 +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>port001@gentoo.org</email>
-    <name>Ian Leitch</name>
-</maintainer>
-<longdescription>
-    Rename is a command-line rename tool. It can substitute, lowcase, upcase large numbers of file names, or change their ownerships. This is a quick and powerful tool written in C with extended regular expression support for searching and substituting pattern strings in filenames.    
-</longdescription>
+<herd>base-system</herd>
 </pkgmetadata>
-
diff --git a/sys-apps/rename/rename-1.3.ebuild b/sys-apps/rename/rename-1.3.ebuild
index ac7861348e77..74b2be0930b8 100644
--- a/sys-apps/rename/rename-1.3.ebuild
+++ b/sys-apps/rename/rename-1.3.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/sys-apps/rename/rename-1.3.ebuild,v 1.1 2003/09/09 16:17:22 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rename/rename-1.3.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
-DESCRIPTION=" Rename is a command-line rename tool. It can substitute, lowcase, upcase large numbers of file names, or change their ownerships. This is a quick and powerful tool written in C with extended regular expression support for searching and substituting pattern strings in filenames."
-SRC_URI="http://rename.berlios.de/rename-1.3.tar.gz"
+inherit toolchain-funcs
+
+DESCRIPTION="tool for easily renaming files"
 HOMEPAGE="http://rename.berlios.de/"
+SRC_URI="http://download.berlios.de/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+SLOT="0"
+KEYWORDS="ppc ppc64 ppc-macos x86 amd64"
 IUSE=""
 
-src_compile() {
-  econf --prefix=/usr || die "Failed to configure"
-  emake || die "Failed to compile"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i \
+		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
+		-e '/strip /s:.*::' \
+		Makefile.in
+	tc-export CC
 }
 
 src_install() {
-  dobin rename
-  doman rename.1
-  dodoc README ChangeLog
-}  
+	newbin rename renamexm || die
+	newman rename.1 renamexm.1
+	dodoc README ChangeLog
+}
+
+pkg_postinst() {
+	ewarn "This has been renamed to 'renamexm' to avoid"
+	ewarn "a naming conflict with sys-apps/util-linux."
+}
diff --git a/sys-apps/renameutils/ChangeLog b/sys-apps/renameutils/ChangeLog
index 61e3f8e68a3d..3b016c11c0a1 100644
--- a/sys-apps/renameutils/ChangeLog
+++ b/sys-apps/renameutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/renameutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/ChangeLog,v 1.1 2005/07/30 06:38:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
+
+*renameutils-0.8.1 (29 Aug 2005)
+
+  29 Aug 2005; Mike Frysinger <vapier@gentoo.org> +renameutils-0.8.1.ebuild:
+  Version bump #104184 by Brian Hall.
+
+  31 Jul 2005; David Holm <dholm@gentoo.org> renameutils-0.6.0.ebuild:
+  Added to ~ppc.
 
 *renameutils-0.6.0 (30 Jul 2005)
 
diff --git a/sys-apps/renameutils/Manifest b/sys-apps/renameutils/Manifest
index bbc0a5363c4a..6ec1ee00227c 100644
--- a/sys-apps/renameutils/Manifest
+++ b/sys-apps/renameutils/Manifest
@@ -1,2 +1,13 @@
-MD5 3d7b2966116c15e4d3b6edc187fd2999 renameutils-0.6.0.ebuild 588
-MD5 c1343b4747e27ed1136ab3e6cba70938 files/digest-renameutils-0.6.0 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f393232e2e0d2a16370a734a926324eb renameutils-0.8.1.ebuild 700
+MD5 0f638769cee15d7c66aa76d998c20d06 ChangeLog 611
+MD5 d6985c761b4c70398be49000fd773fb5 files/digest-renameutils-0.8.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDE5g9gIKl8Uu19MoRAsjnAJ928UZD7sA0gubTH8PnVTZ1t6DGbQCfXUu/
+5dYnb/tX1RPs04bS4jhfiO8=
+=Qmvv
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/renameutils/renameutils-0.8.1.ebuild b/sys-apps/renameutils/renameutils-0.8.1.ebuild
index 58a5971e1bf5..8e2931c6b9f8 100644
--- a/sys-apps/renameutils/renameutils-0.8.1.ebuild
+++ b/sys-apps/renameutils/renameutils-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/sys-apps/renameutils/renameutils-0.8.1.ebuild,v 1.1 2005/08/29 23:20:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/renameutils-0.8.1.ebuild,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
 
 DESCRIPTION="Use your favorite text editor to rename files"
 HOMEPAGE="http://www.nongnu.org/renameutils/"
diff --git a/sys-apps/resmgr/ChangeLog b/sys-apps/resmgr/ChangeLog
index 29ef8b705508..06bdd836c39b 100644
--- a/sys-apps/resmgr/ChangeLog
+++ b/sys-apps/resmgr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/resmgr
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/resmgr/ChangeLog,v 1.1 2004/10/31 02:03:29 pylon Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/resmgr/ChangeLog,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
+
+  03 Sep 2005; Simon Stelling <blubb@gentoo.org> resmgr-1.0.ebuild:
+  make multilib-strict aware and keyword ~amd64
 
 *resmgr-1.0 (31 Oct 2004)
 
diff --git a/sys-apps/resmgr/Manifest b/sys-apps/resmgr/Manifest
index a034ada39533..389b1c1aac1c 100644
--- a/sys-apps/resmgr/Manifest
+++ b/sys-apps/resmgr/Manifest
@@ -1,6 +1,8 @@
-MD5 f7794634bb4542d966e768f928bb21b4 resmgr-1.0.ebuild 1492
-MD5 7070484a957c6df9a2596c47b2e1e57e files/resmgrd.confd 16
-MD5 394244f9bd1bc2471fb7c9e02fe597e6 files/resmgrd.rc 492
-MD5 b7e1e7081f910cac837bc24c429cfac5 files/digest-resmgr-1.0 62
+MD5 4d2f89e69eca2cb0c99599d7f2b4eff3 ChangeLog 575
+MD5 035613e4ea415232c9b9fea9783994ce metadata.xml 221
+MD5 1ff0c720e22ca1f7a0f2942e1445d9e0 resmgr-1.0.ebuild 1651
 MD5 e42318eac112c1bd4d4e2645a6f094fe files/README.gentoo 1294
 MD5 ee1fd044e65e19dba48dcf15ae0b21c1 files/desktopdev 364
+MD5 b7e1e7081f910cac837bc24c429cfac5 files/digest-resmgr-1.0 62
+MD5 7070484a957c6df9a2596c47b2e1e57e files/resmgrd.confd 16
+MD5 1dc16a2e50e5ca1248142513f13e687e files/resmgrd.rc 490
diff --git a/sys-apps/resmgr/files/resmgrd.rc b/sys-apps/resmgr/files/resmgrd.rc
index 4509ea402ec7..3a925e0adc0c 100644
--- a/sys-apps/resmgr/files/resmgrd.rc
+++ b/sys-apps/resmgr/files/resmgrd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/resmgr/files/resmgrd.rc,v 1.1 2004/10/31 02:03:29 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/resmgr/files/resmgrd.rc,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
 
 depend() {
 	before cron
diff --git a/sys-apps/resmgr/resmgr-1.0.ebuild b/sys-apps/resmgr/resmgr-1.0.ebuild
index d1aa52e2227f..630abc50e18a 100644
--- a/sys-apps/resmgr/resmgr-1.0.ebuild
+++ b/sys-apps/resmgr/resmgr-1.0.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/sys-apps/resmgr/resmgr-1.0.ebuild,v 1.1 2004/10/31 02:03:29 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/resmgr/resmgr-1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:56 chriswhite Exp $
+
+inherit multilib
 
 DESCRIPTION="Resource manager that will provide unprivileged users access to device files"
 HOMEPAGE="http://rechner.lst.de/~okir/resmgr/"
 SRC_URI="ftp://ftp.lst.de/pub/people/okir/resmgr/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="sys-apps/hotplug
 	sys-libs/pam"
@@ -15,20 +17,20 @@ DEPEND="sys-apps/hotplug
 IUSE=""
 
 src_compile() {
-    emake CFLAGS="$CFLAGS" || die
+	emake CFLAGS="$CFLAGS" || die
 }
 
 src_install() {
-    make DESTDIR="${D}" install || die
-    dosym $(basename ${D}/lib/libresmgr.so.*) /lib/libresmgr.so
-    exeinto /etc/init.d
-    newexe "${FILESDIR}/resmgrd.rc" resmgrd
-    insinto /etc/conf.d
-    newins "${FILESDIR}/resmgrd.confd" resmgrd
-    exeinto /etc/hotplug/usb
-    newexe "${FILESDIR}/desktopdev" desktopdev
-    dodoc ANNOUNCE COPYING INSTALL README TODO
-    dodoc "${FILESDIR}/README.gentoo"
+	make LIBDIR="${D}/$(get_libdir)" PAMDIR="${D}/$(get_libdir)" DESTDIR="${D}" install || die
+	dosym $(basename ${D}/$(get_libdir)/libresmgr.so.*) /$(get_libdir)/libresmgr.so
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/resmgrd.rc" resmgrd
+	insinto /etc/conf.d
+	newins "${FILESDIR}/resmgrd.confd" resmgrd
+	exeinto /etc/hotplug/usb
+	newexe "${FILESDIR}/desktopdev" desktopdev
+	dodoc ANNOUNCE COPYING INSTALL README TODO
+	dodoc "${FILESDIR}/README.gentoo"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/restartd/ChangeLog b/sys-apps/restartd/ChangeLog
index 322cbc2a8f52..cd9e45d4a446 100644
--- a/sys-apps/restartd/ChangeLog
+++ b/sys-apps/restartd/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/restartd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/restartd/ChangeLog,v 1.1 2005/10/14 04:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/restartd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 *restartd-0.1_alpha3 (14 Oct 2005)
 
diff --git a/sys-apps/restartd/Manifest b/sys-apps/restartd/Manifest
index ea8620921e79..476083722fea 100644
--- a/sys-apps/restartd/Manifest
+++ b/sys-apps/restartd/Manifest
@@ -1,2 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f1369a2d144717ba0fc0a88963cce8bd ChangeLog 351
 MD5 6a4a22e408a9a5cba0aad29071e7bc43 files/digest-restartd-0.1_alpha3 67
-MD5 2623a5464838530c22f40f4b42c1a5ac restartd-0.1_alpha3.ebuild 784
+MD5 f92deaa3f53bb96b4745a6065c21180a restartd-0.1_alpha3.ebuild 796
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTzXAgIKl8Uu19MoRAotwAKCAAwX5Vz6vGSw6IEG3WfLNZ87cbACdFrgY
+JLPFJV0u68iQ/I362cjt6VQ=
+=Un7E
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/restartd/restartd-0.1_alpha3.ebuild b/sys-apps/restartd/restartd-0.1_alpha3.ebuild
index 7762d32b022f..76f951bd41cd 100644
--- a/sys-apps/restartd/restartd-0.1_alpha3.ebuild
+++ b/sys-apps/restartd/restartd-0.1_alpha3.ebuild
@@ -1,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-apps/restartd/restartd-0.1_alpha3.ebuild,v 1.1 2005/10/14 04:34:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/restartd/restartd-0.1_alpha3.ebuild,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/rlocate/ChangeLog b/sys-apps/rlocate/ChangeLog
index 26f45a9e2a8d..6e0e3535987a 100644
--- a/sys-apps/rlocate/ChangeLog
+++ b/sys-apps/rlocate/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for sys-apps/rlocate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/ChangeLog,v 1.1 2005/05/27 22:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/ChangeLog,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
+
+  23 Oct 2005; Malcolm Lashley <malc@gentoo.org> rlocate-0.3.2.ebuild:
+  Added to ~amd64 per bug #109312
+
+  29 Jul 2005; David Holm <dholm@gentoo.org> rlocate-0.3.2.ebuild:
+  Added to ~ppc.
+
+*rlocate-0.3.2 (29 Jul 2005)
+
+  29 Jul 2005; Chris White <chriswhite@gentoo.org> +rlocate-0.3.2.ebuild:
+  Version bump.  Upstream bug fixes mainly.  Released to work with kernel 2.6.13.
+
+*rlocate-0.3.1-r1 (10 Jul 2005)
+
+  10 Jul 2005; Daniel Drake <dsd@gentoo.org> +rlocate-0.3.1-r1.ebuild:
+  Convert to linux-mod, closes bug #98563
+
+*rlocate-0.3.1 (09 Jul 2005)
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> +rlocate-0.3.1.ebuild:
+  Version bump #97055 by Daniel Webert.
 
 *rlocate-0.3.0 (27 May 2005)
 
diff --git a/sys-apps/rlocate/Manifest b/sys-apps/rlocate/Manifest
index 44754d580079..d0d64a6f31ef 100644
--- a/sys-apps/rlocate/Manifest
+++ b/sys-apps/rlocate/Manifest
@@ -1,2 +1,10 @@
-MD5 84bb4b131d77f144b5c410e441d7e06e rlocate-0.3.0.ebuild 417
+MD5 d800a90030e4162d90d79eba0b0abe3c ChangeLog 1004
 MD5 3df7d026a132a54c32b590868c901eee files/digest-rlocate-0.3.0 65
+MD5 de57aa1ae3c55df794f8a28eaea3a826 files/digest-rlocate-0.3.1 65
+MD5 de57aa1ae3c55df794f8a28eaea3a826 files/digest-rlocate-0.3.1-r1 65
+MD5 6bc94ee4d9a01c7bb0f8d5f7fd22ef40 files/digest-rlocate-0.3.2 65
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 7864056c1293832c38d25cce49a1ed33 rlocate-0.3.0.ebuild 1094
+MD5 bdf37b226b9c579b537fc9e8675a431b rlocate-0.3.1-r1.ebuild 1383
+MD5 982f66ba9fc3ee72519efd2e9d81803b rlocate-0.3.1.ebuild 1094
+MD5 96bc3068a386e5303d172f2e82b3669c rlocate-0.3.2.ebuild 1393
diff --git a/sys-apps/rlocate/rlocate-0.3.0.ebuild b/sys-apps/rlocate/rlocate-0.3.0.ebuild
index a6aa3ab117c8..87ac0bc25732 100644
--- a/sys-apps/rlocate/rlocate-0.3.0.ebuild
+++ b/sys-apps/rlocate/rlocate-0.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/sys-apps/rlocate/rlocate-0.3.0.ebuild,v 1.1 2005/05/27 22:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/rlocate-0.3.0.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="locate implementation that is always up-to-date"
 HOMEPAGE="http://rlocate.sourceforge.net/"
@@ -13,9 +13,29 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/kernel"
+DEPEND="virtual/linux-sources"
 RDEPEND="!sys-apps/slocate"
 
+pkg_setup() {
+	enewgroup locate
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/^RLOCATE_GRP/s:=.*:=locate:' \
+		Makefile.in || die "sed group"
+	rm -f rlocate-scripts/Makefile
+	sed -i \
+		-e '/groupadd/d' \
+		-e '/chown/s/root:$(rlocate)/root:locate/g' \
+		Makefile.in rlocate-scripts/Makefile.in
+	sed -i \
+		-e '/DRLOCATE_GRP/s:$(rlocate):locate:' \
+		rlocate-daemon/Makefile.in
+}
+
 src_compile() {
 	econf --enable-sandboxed || die
 	ARCH=$(tc-arch-kernel) emake || die
diff --git a/sys-apps/rlocate/rlocate-0.3.1-r1.ebuild b/sys-apps/rlocate/rlocate-0.3.1-r1.ebuild
index d74450225bce..92731ae84050 100644
--- a/sys-apps/rlocate/rlocate-0.3.1-r1.ebuild
+++ b/sys-apps/rlocate/rlocate-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/sys-apps/rlocate/rlocate-0.3.1-r1.ebuild,v 1.1 2005/07/10 21:32:36 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/rlocate-0.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 inherit eutils linux-mod
 
diff --git a/sys-apps/rlocate/rlocate-0.3.1.ebuild b/sys-apps/rlocate/rlocate-0.3.1.ebuild
index 0899b2453ce0..b025f11803a4 100644
--- a/sys-apps/rlocate/rlocate-0.3.1.ebuild
+++ b/sys-apps/rlocate/rlocate-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/sys-apps/rlocate/rlocate-0.3.1.ebuild,v 1.1 2005/07/09 22:39:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/rlocate-0.3.1.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/kernel"
+DEPEND="virtual/linux-sources"
 RDEPEND="!sys-apps/slocate"
 
 pkg_setup() {
diff --git a/sys-apps/rlocate/rlocate-0.3.2.ebuild b/sys-apps/rlocate/rlocate-0.3.2.ebuild
index b210dae92dc9..7aaebd2a1e15 100644
--- a/sys-apps/rlocate/rlocate-0.3.2.ebuild
+++ b/sys-apps/rlocate/rlocate-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/sys-apps/rlocate/rlocate-0.3.2.ebuild,v 1.1 2005/07/28 23:22:41 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rlocate/rlocate-0.3.2.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
 inherit eutils linux-mod
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/rlocate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="!sys-apps/slocate"
diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog
index eb5f7f8fb417..150bbf456b32 100644
--- a/sys-apps/rng-tools/ChangeLog
+++ b/sys-apps/rng-tools/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for sys-apps/rng-tools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.1 2003/08/20 14:06:58 hanno Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
+
+  01 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> rng-tools-1.1.ebuild:
+  Add ~alpha + ~ia64 keywords.
+
+  12 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> rng-tools-1.1.ebuild:
+  1.1 stable on x86.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  rng-tools-1.1.ebuild:
+  Masked rng-tools-1.1.ebuild stable for ppc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rng-tools-1.0.ebuild,
+  rng-tools-1.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> rng-tools-1.1.ebuild:
+  Added to ~ppc.
+
+*rng-tools-1.1 (07 Apr 2004)
+
+  07 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> rng-tools-1.1.ebuild,
+  files/rngd:
+  bump version, add in change from bug #47107 to use urandom as a feedback input.
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> rng-tools-1.0.ebuild:
+  added ~amd64 keyword
+
+*rng-tools-1.0 (05 Oct 2003)
+
+  05 Oct 2003; Hanno Boeck <hanno@gentoo.org> rng-tools-1.0.ebuild,
+  files/rngd:
+  Fix for latest 2.6 kernels. Mark as x86 stable.
 
   20 Aug 2003; Hanno Boeck <hanno@gentoo.org> files/rngd:
   New package for using random number generators.
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index ce1bc0f21dd0..9991232d9410 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,4 +1,17 @@
-MD5 eb24309eaa35b5dfd63ceeb541a07c03 rng-tools-1.0.ebuild 644
-MD5 84863570fa4efa6a8c74fcdfe1552eaf ChangeLog 326
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2622d8b7d52a1b3370406d852235fbd0 ChangeLog 1329
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 68969238ecde22a27b010488adfd490b rng-tools-1.0.ebuild 625
+MD5 6d3c2f84ade60cdcf1e2e4c461af069b rng-tools-1.1.ebuild 765
 MD5 25da430ad0aab2964839df1b25d14d45 files/digest-rng-tools-1.0 64
-MD5 ab3e84cda9340b2a5427ce46e84a2937 files/rngd 910
+MD5 ff1ccf65909bb96c328b0c5b5261b3ee files/digest-rng-tools-1.1 64
+MD5 8a54d06ce57e0986d7ec3978f267795e files/rngd 1176
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPrFyKf2g/qXtneoRAjX8AJ9YpVDaYVuo87k532gXyznSLmWVLgCeIUhF
+QrV2a29X0gBM7DAdMA21gk0=
+=IE7T
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/rng-tools/files/rngd b/sys-apps/rng-tools/files/rngd
index 738f8fe63068..5ec3f194930b 100644
--- a/sys-apps/rng-tools/files/rngd
+++ b/sys-apps/rng-tools/files/rngd
@@ -1,30 +1,33 @@
 #!/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-apps/rng-tools/files/rngd,v 1.1 2003/08/20 14:06:58 hanno Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/files/rngd,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 depend() {
 	need localmount
-	after random		
+	after random
 }
  
 start() {
-    ebegin "Starting hardware RNG daemon"
-    if [ -e /dev/hwrandom ]; then
-	start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -b -r /dev/hwrandom
-	eend $? "Failed to start hardware RNG daemon"
-    elif [ -e /dev/i810_rng ]; then
-	start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -b -r /dev/i810_rng
-	eend $? "Failed to start hardware RNG daemon"
-    else
-      	eerror "No hardware RNG found!"
-        return 1
-    fi
+	ebegin "Starting hardware RNG daemon"
+	if [ -e /dev/hw_random ]; then
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -b -r /dev/hw_random
+		eend $? "Failed to start hardware RNG daemon"
+	elif [ -e /dev/hwrandom ]; then
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -b -r /dev/hwrandom
+		eend $? "Failed to start hardware RNG daemon"
+	elif [ -e /dev/i810_rng ]; then
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -b -r /dev/i810_rng
+		eend $? "Failed to start hardware RNG daemon"
+	else
+		einfo "No hardware RNG found, using /dev/urandom as feedback input"
+		start-stop-daemon --start --quiet --exec /usr/sbin/rngd -- -b -r /dev/urandom
+		eend $? "Failed to start hardware RNG daemon"
+	fi
 }
- 
+
 stop() {
-    ebegin "Stopping hardware RNG daemon"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/rngd
-    eend $? "Failed to stop hardware RNG daemon"
+	ebegin "Stopping hardware RNG daemon"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/rngd
+	eend $? "Failed to stop hardware RNG daemon"
 }
-
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/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-apps/rng-tools/rng-tools-1.0.ebuild b/sys-apps/rng-tools/rng-tools-1.0.ebuild
index 4c2ef1eeb04d..9e46e76603b7 100644
--- a/sys-apps/rng-tools/rng-tools-1.0.ebuild
+++ b/sys-apps/rng-tools/rng-tools-1.0.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-1.0.ebuild,v 1.1 2003/08/20 14:06:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-1.0.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Daemon to use hardware random number generators."
 HOMEPAGE="http://gkernel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
-DEPEND="virtual/glibc"
-S=${WORKDIR}/${P}
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf || die
diff --git a/sys-apps/rng-tools/rng-tools-1.1.ebuild b/sys-apps/rng-tools/rng-tools-1.1.ebuild
index 7ef2060d1893..7a46a1674761 100644
--- a/sys-apps/rng-tools/rng-tools-1.1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-1.1.ebuild
@@ -1,15 +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/sys-apps/rng-tools/rng-tools-1.1.ebuild,v 1.1 2004/04/08 04:10:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-1.1.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
 DESCRIPTION="Daemon to use hardware random number generators."
 HOMEPAGE="http://gkernel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc x86"
 IUSE=""
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog
index f04785061b30..66e7c4b84509 100644
--- a/sys-apps/rsbac-admin/ChangeLog
+++ b/sys-apps/rsbac-admin/ChangeLog
@@ -1,10 +1,104 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.1 2003/02/07 19:38:20 rphillips Exp $
+# ChangeLog for sys-apps/rsbac-admin
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
-*rsbac-admin-1.2.1 (07 Dic 2002)
+  17 Nov 2005; Guillaume Destuynder <kang@gentoo.org>
+  -files/rsbac-bugfix-v1.2.3-5.diff, files/nsswitch.conf,
+  -rsbac-admin-1.2.3.ebuild, rsbac-admin-1.2.5.ebuild,
+  rsbac-admin-1.2.99.ebuild:
+  marked 1.2.5 ~amd64. Updated SVN ebuild to match the new, new server.
+  updated nsswitch file to use rsbac or fallback on compat.
+  removed old 1.2.3 ebuilds.
 
-  07 Dic 2002; Quequero <quequero@bitchx.it> rsbac-admin-1.2.1.ebuild:
+  30 Oct 2005; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.5.ebuild:
+  Marked 1.2.5 stable. Added user audit and info how to setup logging
+
+*rsbac-admin-1.2.5 (07 Oct 2005)
+
+  07 Oct 2005; Guillaume Destuynder <kang@gentoo.org>
+  +rsbac-admin-1.2.5.ebuild:
+  Bump to 1.2.5. This release removes the kernel dependencies problem. Also
+  rklogd is not installed by default anymore, as upstream recommands syslog-ng
+  http://rsbac.org/documentation/administration_examples/syslog-ng
+
+*rsbac-admin-1.2.99 (09 May 2005)
+
+  09 May 2005; Guillaume Destuynder <kang@gentoo.org>
+  +rsbac-admin-1.2.99.ebuild:
+  Added SVN ebuild (hardmasked), see sys-kernel/rsbac-sources ChangeLog about
+  using it.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> rsbac-admin-1.2.4.ebuild:
+  Added missing parentheses to *DEPEND.
+
+  28 Apr 2005; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.4.ebuild:
+  Fixed pam_rsbac installation and added pam USE keyword
+
+  04 Apr 2005; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.4.ebuild:
+  Space typo in ebuild
+
+  04 Apr 2005; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.4.ebuild:
+  Fixes possible lib error from #87843 and changed enewgroup/enewuser to conform
+  new eclass possibilities;)
+
+*rsbac-admin-1.2.4 (21 Mar 2005)
+
+  21 Mar 2005; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.4.ebuild:
+  Marked rsbac-admin 1.2.4 stable.
+
+  24 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
+  +files/rsbac-bugfix-v1.2.3-5.diff, rsbac-admin-1.2.3.ebuild:
+  Fixed DEPEND and added bugfix for PaX (rsbac bugfix-5)
+
+  19 Jan 2005; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-admin-1.2.1.ebuild, rsbac-admin-1.2.3.ebuild,
+  -rsbac-admin-1.2.3_pre5.ebuild:
+  Cleaned dir, marked ~ppc
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  01 Aug 2004; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.3.ebuild:
+  Now uses newinitd instead of newexe. Also makes sure of setting the secoff
+  rights at postinst, even if it is only an upgrade, to prevent problems.
+
+*rsbac-admin-1.2.3 (26 Jun 2004)
+
+  26 Jul 2004; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.3.ebuild,
+  files/rsbac.conf:
+  Added PAX module as default setting.
+  Marked stabled on x86.
+
+  26 Jun 2004; Guillaume Destuynder <kang@gentoo.org> rsbac-admin-1.2.3.ebuild
+  Version bump. Minor modifications: now using egroup, now depending on
+  corresponding kernels.
+
+*rsbac-admin-1.2.3_pre5 (15 Jun 2004)
+
+  17 Jun 2004; Guillaume Destuynder <kang@gentoo.org> files/rsbac.conf,
+  rsbac-admin-1.2.3_pre5.ebuild:
+  Fixed rsbac.conf to conform documentation.
+  Fixed ebuild to add this rsbac.conf to the installation
+
+  15 Jun 2004; Guillaume Destuynder <kang@gentoo.org>
+  rsbac-admin-1.2.3_pre5.ebuild, files/rsbac.conf, files/rklogd.init:
+  Version bump, new ebuild submitted by Michal Purzynski <albeiro@gentoo.pl>
+  Now supports rklogd.
+
+*rsbac-admin-1.2.1 (07 Dec 2002)
+
+  11 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> rsbac-admin-1.2.1.ebuild
+  ChangeLog: fixed a dependency, and changed two variables to maybe ease
+  version bumbs.
+
+  07 Dec 2002; Quequero <quequero@bitchx.it> rsbac-admin-1.2.1.ebuild:
   First import. Ebuild submitted by Quequero <quequero@bitchx.it>.
   rsbac-admin is a set of tools needed for the administration of rsbac
   kernel, you need this packet if you have installed rsbac-sources
diff --git a/sys-apps/rsbac-admin/Manifest b/sys-apps/rsbac-admin/Manifest
index e69de29bb2d1..5f565817b6c1 100644
--- a/sys-apps/rsbac-admin/Manifest
+++ b/sys-apps/rsbac-admin/Manifest
@@ -0,0 +1,11 @@
+MD5 77c60ec76b025f959fe003baabc58d97 ChangeLog 3992
+MD5 1b8e1b375f69babf1fd8b370c33aa4bf files/digest-rsbac-admin-1.2.4 71
+MD5 5b133f0238ddfd21834460d1b7ea1b99 files/digest-rsbac-admin-1.2.5 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rsbac-admin-1.2.99 0
+MD5 3bb29214fbb05d3caca8e842adee3fd0 files/nsswitch.conf 487
+MD5 5bba238d756a6695447f1bb0264a01a3 files/rklogd.init 1014
+MD5 3b63c2f46e9c0531be23e630133fe6a7 files/rsbac.conf 209
+MD5 035ff78da2388cc0585f93ef2247332d metadata.xml 161
+MD5 2af626ad2bd32bd1a95f45b88c18f545 rsbac-admin-1.2.4.ebuild 2771
+MD5 4a97cb1d0da2e2c4232e5fa5e8add24f rsbac-admin-1.2.5.ebuild 2103
+MD5 aa36edcdd84f6c38802b10a813fed3cc rsbac-admin-1.2.99.ebuild 2171
diff --git a/sys-apps/rsbac-admin/files/nsswitch.conf b/sys-apps/rsbac-admin/files/nsswitch.conf
index 33344a664bff..43c5b172f0ab 100644
--- a/sys-apps/rsbac-admin/files/nsswitch.conf
+++ b/sys-apps/rsbac-admin/files/nsswitch.conf
@@ -1,8 +1,8 @@
 # /etc/nsswitch.conf:
 
-passwd:      compat [NOTFOUND=continue SUCCESS=continue]
-shadow:      compat
-group:       compat [NOTFOUND=continue SUCCESS=continue]
+passwd:      compat rsbac [NOTFOUND=continue SUCCESS=continue]
+shadow:      compat rsbac
+group:       compat rsbac [NOTFOUND=continue SUCCESS=continue]
 
 # passwd:    db files nis
 # shadow:    db files nis
diff --git a/sys-apps/rsbac-admin/files/rklogd.init b/sys-apps/rsbac-admin/files/rklogd.init
index 87f54d263b55..3cdecefedde6 100644
--- a/sys-apps/rsbac-admin/files/rklogd.init
+++ b/sys-apps/rsbac-admin/files/rklogd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/files/rklogd.init,v 1.1 2004/06/15 20:03:45 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/files/rklogd.init,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 opts="depend checkconfig start stop reload"
 
diff --git a/sys-apps/rsbac-admin/files/rsbac.conf b/sys-apps/rsbac-admin/files/rsbac.conf
index 18e9e06f2407..e646c003898a 100644
--- a/sys-apps/rsbac-admin/files/rsbac.conf
+++ b/sys-apps/rsbac-admin/files/rsbac.conf
@@ -1,5 +1,6 @@
 # RSBAC menu configuration
-RSBACMOD="GEN FF RC AUTH CAP JAIL "
+# Thu Jun 17 01:36:19 CEST 2004
+RSBACMOD="PAX DAZ FF RC ACL AUTH CAP JAIL RES "
 DIALOG="dialog"
 # RSBACLANG is not set
 TMPDIR="/tmp"
diff --git a/sys-apps/rsbac-admin/metadata.xml b/sys-apps/rsbac-admin/metadata.xml
index f093d416cbb1..191d9d0695c5 100644
--- a/sys-apps/rsbac-admin/metadata.xml
+++ b/sys-apps/rsbac-admin/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>hardened</herd>
 </pkgmetadata>
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.4.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.4.ebuild
index acaca054945d..d640e6fd75cb 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.4.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.4.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/sys-apps/rsbac-admin/rsbac-admin-1.2.4.ebuild,v 1.1 2005/02/10 11:24:55 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.4.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 inherit eutils
 
-IUSE="debug"
+IUSE="debug pam"
 
 # RSBAC Adming packet name
 ADMIN=rsbac-admin-v${PV}
@@ -15,14 +15,16 @@ SRC_URI="http://rsbac.org/download/code/v${PV}/rsbac-admin-v${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+NSS="1.2.4"
 
 DEPEND="dev-util/dialog
-	sys-libs/pam
+	pam? ( sys-libs/pam )
 	sys-apps/baselayout
-	|| ( >=sys-kernel/rsbac-sources-2.4.29-r1
-	>=sys-kernel/rsbac-dev-sources-2.6.10-r3 )"
-
+	|| (
+		>=sys-kernel/rsbac-sources-2.4.29-r1
+		>=sys-kernel/rsbac-dev-sources-2.6.10-r3
+	)"
 
 RDEPEND=">=sys-libs/ncurses-5.2"
 
@@ -42,8 +44,13 @@ src_compile() {
 	a RSBAC-enabled kernel ? Please check the documentation at:
 	http://hardened.gentoo.org/rsbac"
 	emake -C contrib/rsbac-klogd-2.0 || die "cannot make rsbac-klogd"
+	cd contrib/nss_rsbac
+	LD="../../src/librsbac.so.$NSS" econf  || die "cannot conf nss_rsbac"
+	cd ${WORKDIR}/${ADMIN}
 	emake -C contrib/nss_rsbac || die "cannot make nss_rsbac"
-	emake -C contrib/pam_rsbac || die "cannot make pam_rsbac"
+	use pam && {
+		emake -C contrib/pam_rsbac || die "cannot make pam_rsbac"
+	}
 	if use debug; then
 		emake -C contrib/regression || die "cannot make regression"
 	fi
@@ -62,9 +69,10 @@ src_install() {
 	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
 	exeinto /etc/init.d
 	newinitd ${FILESDIR}/rklogd.init rklogd
-	insinto /lib/security
-	newins ${WORKDIR}/${ADMIN}/contrib/pam_rsbac/pam_rsbac.so
-
+	use pam && {
+		insinto /lib/security
+		newins ${WORKDIR}/${ADMIN}/contrib/pam_rsbac/pam_rsbac.so pam_rsbac.so
+	}
 	dodir /secoff
 	keepdir /secoff
 	dodir /secoff/log
@@ -72,13 +80,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! groupmod secoff; then
-		enewgroup secoff 400 || die "problem adding group secoff"
-	fi
-
-	if ! id secoff; then
-		enewuser secoff 400 /bin/bash /secoff secoff || die "problem adding user secoff"
-	fi
+	enewgroup secoff 400 || die "problem adding group secoff"
+	enewuser secoff 400 /bin/bash /secoff secoff || die "problem adding user secoff"
 
 	chmod 700 /secoff /secoff/log || die "problem changing permissions of /secoff and/or /secoff/log"
 	chown secoff:secoff -R /secoff || die "problem changing ownership of /secoff"
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
index 08c6a84c35c0..f3dd27b66144 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-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/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild,v 1.1 2005/10/07 15:39:05 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.5.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://download.rsbac.org/code/${PV}/rsbac-admin-${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 NSS="1.2.5"
 
 DEPEND="dev-util/dialog
@@ -30,7 +30,7 @@ src_compile() {
 	use pam && {
 		rsbacmakeargs="${makeargs} pam nss"
 	}
-	emake PREFIX=/usr ${rsbacmakeargs} || "cannot build (${rsbacmakeargs})"
+	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
@@ -39,19 +39,30 @@ src_install() {
 	use pam && {
 		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
-	make PREFIX=${D}/usr DESTDIR=${D} ${rsbacinstallargs}
+	make PREFIX=${D}/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	die "cannot install (${rsbacinstallargs})"
 	insinto /etc
 	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
 	dodir /secoff
 	keepdir /secoff
-	dodir /secoff/log
-	keepdir /secoff/log
+	dodir /var/log/rsbac
+	keepdir /var/log/rsbac
 }
 
 pkg_postinst() {
 	enewgroup secoff 400 || die "problem adding group secoff"
-	enewuser secoff 400 /bin/bash /secoff secoff || die "problem adding user secoff"
+	enewuser secoff 400 /bin/bash /secoff secoff || \
+	die "problem adding user secoff"
+	enewgroup audit 404 || die "problem adding group audit"
+	enewuser audit 404 /bin/false /dev/null audit || \
+	die "problem adding user audit"
 
-	chmod 700 /secoff /secoff/log || die "problem changing permissions of /secoff and/or /secoff/log"
-	chown secoff:secoff -R /secoff || die "problem changing ownership of /secoff"
+	chmod 700 /secoff /var/log/rsbac ||  \
+	die "problem changing permissions of /secoff and/or /secoff/log"
+	chown secoff:secoff -R /secoff || \
+	die "problem changing ownership of /secoff"
+	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
+	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
+	einfo "rklogd. See http://rsbac.org/documentation/administration_examples/syslog-ng"
+	einfo "for more information."
 }
diff --git a/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild b/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild
index 6626b8e31dfa..b58ce7a38163 100644
--- a/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild
+++ b/sys-apps/rsbac-admin/rsbac-admin-1.2.99.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/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild,v 1.1 2005/05/09 23:19:48 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/rsbac-admin-1.2.99.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
+inherit eutils
 inherit subversion
 
-IUSE="debug pam"
+IUSE="pam"
 
 # RSBAC Adming packet name
-ADMIN=rsbac-admin-v${PV}
+#ADMIN=rsbac-admin-v${PV}
 
 DESCRIPTION="Rule Set Based Access Control (RSBAC) Admin Tools"
 HOMEPAGE="http://www.rsbac.org/ http://hardened.gentoo.org/rsbac"
@@ -19,69 +20,57 @@ NSS="1.2.5"
 
 DEPEND="dev-util/dialog
 	pam? ( sys-libs/pam )
-	sys-apps/baselayout
-	|| (
-		>=sys-kernel/rsbac-sources-2.4.99
-		>=sys-kernel/rsbac-dev-sources-2.6.99
-	)"
+	sys-apps/baselayout"
 
 RDEPEND=">=sys-libs/ncurses-5.2"
 
+
 src_unpack() {
-	ESVN_REPO_URI="svn://rsbac.mprivacy-update.de/rsbac/rsbac-admin-v1.2.5"
+	ESVN_REPO_URI="svn://rsbac.de/rsbac1/rsbac-admin/trunk"
 	subversion_src_unpack
 	cd ${WORKDIR}/${P}/${ADMIN}
 }
 
+
 src_compile() {
-	cd ${WORKDIR}/${P}/${ADMIN}
-	econf || die "cannot ./configure RSBAC Admin Tools."
-	cd ${WORKDIR}/${ADMIN}/contrib/rsbac-klogd-2.0; econf || die "cannot ./configure rsbac-klogd"
-	cd ${WORKDIR}/${ADMIN}/contrib/nss_rsbac; econf || die "cannot ./configure nss_rsbac"
-	cd ${WORKDIR}/${ADMIN}
-	emake || die "cannot make RSBAC Admin tools: Did you really already compiled
-	a RSBAC-enabled kernel ? Please check the documentation at:
-	http://hardened.gentoo.org/rsbac"
-	emake -C contrib/rsbac-klogd-2.0 || die "cannot make rsbac-klogd"
-	cd contrib/nss_rsbac
-	LD="../../src/librsbac.so.$NSS" econf  || die "cannot conf nss_rsbac"
-	cd ${WORKDIR}/${ADMIN}
-	emake -C contrib/nss_rsbac || die "cannot make nss_rsbac"
+	local rsbacmakeargs
+	rsbacmakeargs="libs tools"
 	use pam && {
-		emake -C contrib/pam_rsbac || die "cannot make pam_rsbac"
+		rsbacmakeargs="${makeargs} pam nss"
 	}
-	if use debug; then
-		emake -C contrib/regression || die "cannot make regression"
-	fi
+	emake PREFIX=/usr ${rsbacmakeargs} || die "cannot build (${rsbacmakeargs})"
 }
 
 src_install() {
-	cd ${WORKDIR}/${ADMIN}
-	einstall || die "cannot make install"
-	einstall -C contrib/rsbac-klogd-2.0 || die "cannot install rsbac-klogd"
-	einstall -C contrib/nss_rsbac || die "cannot install nss_rsbac"
-	if use debug; then
-		exeinto /usr/share/rsbac-admin-dev/regression
-		doexe contrib/regression/*_test
-	fi
-	insinto /etc
-	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
-	exeinto /etc/init.d
-	newinitd ${FILESDIR}/rklogd.init rklogd
+	local rsabacinstallargs
+	rsbacinstallargs="headers-install libs-install tools-install"
 	use pam && {
-		insinto /lib/security
-		newins ${WORKDIR}/${ADMIN}/contrib/pam_rsbac/pam_rsbac.so pam_rsbac.so
+		rsbacinstallargs="${rsbacinstallargs} pam-install nss-install"
 	}
+	make PREFIX=${D}/usr DESTDIR=${D} ${rsbacinstallargs} || \
+	die "cannot install (${rsbacinstallargs})"
+	insinto /etc
+	newins ${FILESDIR}/rsbac.conf rsbac.conf ${FILESDIR}/nsswitch.conf
 	dodir /secoff
 	keepdir /secoff
-	dodir /secoff/log
-	keepdir /secoff/log
+	dodir /var/log/rsbac
+	keepdir /var/log/rsbac
 }
 
 pkg_postinst() {
 	enewgroup secoff 400 || die "problem adding group secoff"
-	enewuser secoff 400 /bin/bash /secoff secoff || die "problem adding user secoff"
+	enewuser secoff 400 /bin/bash /secoff secoff || \
+	die "problem adding user secoff"
+	enewgroup audit 404 || die "problem adding group audit"
+	enewuser audit 404 /bin/false /dev/null audit || \
+	die "problem adding user audit"
 
-	chmod 700 /secoff /secoff/log || die "problem changing permissions of /secoff and/or /secoff/log"
-	chown secoff:secoff -R /secoff || die "problem changing ownership of /secoff"
+	chmod 700 /secoff /var/log/rsbac ||  \
+	die "problem changing permissions of /secoff and/or /secoff/log"
+	chown secoff:secoff -R /secoff || \
+	die "problem changing ownership of /secoff"
+	einfo "It is suggested to run (for example) a separate copy of syslog-ng to"
+	einfo "log RSBAC messages, as user audit (uid 404) instead of using the deprecated"
+	einfo "rklogd. See http://rsbac.org/documentation/administration_examples/syslog-ng"
+	einfo "for more information."
 }
diff --git a/sys-apps/s390-oco/ChangeLog b/sys-apps/s390-oco/ChangeLog
index 92579ded03af..e3bcb521fc59 100644
--- a/sys-apps/s390-oco/ChangeLog
+++ b/sys-apps/s390-oco/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for sys-apps/s390-oco
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/ChangeLog,v 1.1 2004/04/18 04:12:09 randy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+*s390-oco-2.4.21-r1 (22 Jan 2005)
+
+  22 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
+  +s390-oco-2.4.21-r1.ebuild, -s390-oco-2.4.21.ebuild,
+  s390-oco-2.6.5.ebuild:
+  Fixed digests wrt BUG #72954. Version bump to s390-oco-2.4.21-r1 as IBM
+  only publishes version 2 of the 2.4.21 tape driver.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> s390-oco-2.4.21.ebuild,
+  s390-oco-2.6.5.ebuild:
+  Added missing IUSE=""
+
+*s390-oco-2.6.5 (11 May 2004)
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> +s390-oco-2.6.5.ebuild:
+  Added s390-oco-2.6.5.ebuild to support the new kernel
+
+*s390-oco-2.4.21 (18 Apr 2004)
 
   18 Apr 2004; Michael McCabe <randy@gentoo.org> :
   New ebuild submitted by Jochen Eisinger <jochen@penguin-breeder.org>
diff --git a/sys-apps/s390-oco/Manifest b/sys-apps/s390-oco/Manifest
index 55bc9fae26ab..7a4bf67959e8 100644
--- a/sys-apps/s390-oco/Manifest
+++ b/sys-apps/s390-oco/Manifest
@@ -1,3 +1,17 @@
-MD5 72f6dc5b5f253eb16fde02269dd7bc41 s390-oco-2.4.21.ebuild 900
-MD5 675f5721308622d9bb8c5de38bca7d14 files/digest-s390-oco-2.4.21 83
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 04903ee85a4cc5273646eca776969064 ChangeLog 946
+MD5 440db7d822a493f9b4c0dc14d0885bb7 files/digest-s390-oco-2.4.21-r1 83
+MD5 700694cda50a18f342978f1e84c6e2a7 files/digest-s390-oco-2.6.5 81
 MD5 b43c4c5b51c43d85b1aab3939e18ea03 files/s390-oco 65
+MD5 64ff0642bc91fe55820a19224b0f6cd4 metadata.xml 300
+MD5 429ba8558e6415fd8364af6045e4ed76 s390-oco-2.4.21-r1.ebuild 1122
+MD5 19054bd0384dc94a101c53f2d4a3afe4 s390-oco-2.6.5.ebuild 1128
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1Q4yI1lqEGTUzyQRAtPKAJ9UCtZ1Fe0ih3UCYCpmh4tAhIr5bgCdGu0n
+IVeT8BehI5dP/xe6kzelAro=
+=rkmc
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-oco/files/digest-s390-oco-2.4.21-r1 b/sys-apps/s390-oco/files/digest-s390-oco-2.4.21-r1
index c231e5d20607..06a16264bdd1 100644
--- a/sys-apps/s390-oco/files/digest-s390-oco-2.4.21-r1
+++ b/sys-apps/s390-oco/files/digest-s390-oco-2.4.21-r1
@@ -1,2 +1 @@
-MD5 9ecfbe3af373fbbded0317ace4936a25 tape3590-2.4.21-s390x-02-june2003.tar.gz 13237
 MD5 d1ac5dc5e664d5927f571320ccd21136 tape3590-2.4.21-s390-02-june2003.tar.gz 12588
diff --git a/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild b/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild
index 9e96f51c614b..5bb0471b7ab0 100644
--- a/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild
+++ b/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild
@@ -1,24 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild,v 1.1 2005/01/22 01:18:04 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.4.21-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 DESCRIPTION="Object-code only (OCO) modules for s390"
-SRC_URI="s390x? ( tape3590-2.4.21-s390x-02-june2003.tar.gz )
-	!s390x? ( tape3590-2.4.21-s390-02-june2003.tar.gz )"
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/june2003_recommended.shtml"
+if [[ ${CTARGET:-${CHOST}} == s390x-* ]] ; then
+SRC_URI="tape3590-2.4.21-s390x-02-june2003.tar.gz"
+else
+SRC_URI="tape3590-2.4.21-s390-02-june2003.tar.gz"
+fi
+
 LICENSE="IBM-ILNWP"
-KEYWORDS="~s390"
 SLOT="${KV}"
-DEPEND="=sys-kernel/vanilla-sources-2.4.21"
+KEYWORDS="~s390"
 IUSE=""
-
 RESTRICT="fetch"
 
+DEPEND="~sys-kernel/vanilla-sources-2.4.21"
+
+S=${WORKDIR}
+
 pkg_nofetch() {
 	einfo "Please download ${A} from"
-	einfo ""
+	einfo
 	einfo " o ${HOMEPAGE}"
-	einfo ""
+	einfo
 	einfo "and put it into ${DISTDIR}"
 }
 
@@ -28,19 +34,15 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${WORKDIR}
-	mv tape3590-2.4.21-s390*-02-june2003.o tape_3590.o
+	mv tape3590-2.4.21-s390*-02-june2003.o tape_3590.o || die
 }
 
 src_install() {
-	dodir /etc/modules.d
 	insinto /etc/modules.d
-	doins ${FILESDIR}/s390-oco
+	doins "${FILESDIR}"/s390-oco || die
 
-	cd ${WORKDIR}
-	dodir /lib/modules/${KV}/OCO
 	insinto /lib/modules/${KV}/OCO
-	doins tape_3590.o
+	doins tape_3590.o || die
 
-	dodoc README LICENSE
+	dodoc README
 }
diff --git a/sys-apps/s390-oco/s390-oco-2.6.5.ebuild b/sys-apps/s390-oco/s390-oco-2.6.5.ebuild
index 497995f1b145..d7da8dcd2001 100644
--- a/sys-apps/s390-oco/s390-oco-2.6.5.ebuild
+++ b/sys-apps/s390-oco/s390-oco-2.6.5.ebuild
@@ -1,23 +1,30 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.6.5.ebuild,v 1.1 2004/05/11 20:30:54 randy Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-oco/s390-oco-2.6.5.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 DESCRIPTION="Object-code only (OCO) modules for s390"
-SRC_URI="s390x?( tape_3590-2.6.5-s390x-april2004.tar.gz ) :( tape_3590-2.6.5-s390-april2004.tar.gz )"
 HOMEPAGE="http://www10.software.ibm.com/developerworks/opensource/linux390/tape_3590-2.6.5-s390-april2004.shtml"
+if [[ ${CTARGET:-${CHOST}} == s390x-* ]] ; then
+SRC_URI="tape_3590-2.6.5-s390x-april2004.tar.gz"
+else
+SRC_URI="tape_3590-2.6.5-s390-april2004.tar.gz"
+fi
+
 LICENSE="IBM-ILNWP"
-KEYWORDS="~s390"
 SLOT="${KV}"
-DEPEND="=sys-kernel/development-sources-2.6.5"
-
+KEYWORDS="~s390"
+IUSE=""
 RESTRICT="fetch"
 
+DEPEND="~sys-kernel/vanilla-sources-2.6.5"
+
+S=${WORKDIR}
+
 pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from"
-	einfo ""
+	einfo "Please download ${A} from"
+	einfo
 	einfo " o ${HOMEPAGE}"
-	einfo ""
+	einfo
 	einfo "and put it into ${DISTDIR}"
 }
 
@@ -27,21 +34,15 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${WORKDIR}
-	mv tape3590-2.6.5-s390*-01-april2004.ko tape_3590.ko
+	mv tape3590-2.6.5-s390*-01-april2004.ko tape_3590.ko || die
 }
 
 src_install() {
-	dodir /etc/modules.d
 	insinto /etc/modules.d
-	doins ${FILESDIR}/s390-oco
+	doins "${FILESDIR}"/s390-oco || die
 
-	cd ${WORKDIR}
-	dodir /lib/modules/${KV}/OCO
 	insinto /lib/modules/${KV}/OCO
-	doins tape_3590.ko
+	doins tape_3590.ko || die
 
-	dodoc README LICENSE
+	dodoc README
 }
-
-
diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index bc5bc70b74ac..0f4ad83987ac 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for sys-apps/s390-tools
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.1 2004/04/18 03:18:26 randy Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
+
+*s390-tools-1.3.2 (28 Sep 2004)
+
+  28 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> +s390-tools-1.3.2.ebuild:
+  Version bump to 1.3.2. This version is recommended by April 2004 Stream. As
+  such, marked stable.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> s390-tools-1.2.4.ebuild,
+  s390-tools-1.3.0.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  s390-tools-1.2.4.ebuild, s390-tools-1.3.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 May 2004; Michael McCabe <randy@gentoo.org> s390-tools-1.3.0.ebuild:
+  Marked ~s390 due to problems with zipl and added indent as a depend
+
+*s390-tools-1.3.0 (11 May 2004)
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> +s390-tools-1.3.0.ebuild:
+  Added s390-tools-1.3.0 from the april 2004 stream
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> s390-tools-1.2.4.ebuild:
+  Add inherit eutils
 
 *s390-tools-1.2.4 (17 Apr 2004)
 
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 51ffd39cab2d..8973be362d43 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,5 +1,14 @@
-MD5 201f813970084c2d239cf72fb7c119f8 s390-tools-1.2.4.ebuild 1316
-MD5 34ba30d69799537fb145c648510ed074 ChangeLog 436
-MD5 d27d451e8020585ffb997a66a96b30e4 files/digest-s390-tools-1.2.4 278
-MD5 5237af379f668ca4e112dd27e11ecfa1 files/s390-tools-1.2.4-ucdsnmp.diff 436
-MD5 2de7c8793f6dbffe92910ab4ab08e318 files/s390-tools-1.2.4-vtoc.diff 2102
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 16e59a218300b52b3f9034cac540fe02 ChangeLog 1426
+MD5 42ffb90609e1047c3d2938530eecb2e9 metadata.xml 377
+MD5 a55b82cdacafaeb34b5872ae9e8489f9 s390-tools-1.3.2.ebuild 1323
+MD5 f01bfa0d5b9f01bd2a71e521655378f7 files/digest-s390-tools-1.3.2 278
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD4DBQFCGUramdTrptrqvGERAnk7AJdCNDzGJ8A9wxpmBKhrGFyYSm8wAJ0RCnLM
+7gR7rGBGTd0fCw1+cOeI+Q==
+=3wxz
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index 32a1ee41f548..f112e0711b51 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!-- 
-
-This is the example metadata file.
-The root element of this file is <pkgmetadata>. Within this element a 
-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
-
-
-Before committing, please remove the comments from this file. They are 
-not relevant for general metadata.xml files.
--->
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
   <email>randy@gentoo.org</email>
 </maintainer>
-<!-- <longdescription>A set of user space utilities that should be used 
-together with the  zSeries (s390) Linux kernel and device drivers</longdescription> -->
+<longdescription>A set of user space utilities that should be used 
+together with the  zSeries (s390) Linux kernel and device drivers</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/s390-tools/s390-tools-1.3.2.ebuild b/sys-apps/s390-tools/s390-tools-1.3.2.ebuild
index c1abe1dbfa34..501ee4dae5c1 100644
--- a/sys-apps/s390-tools/s390-tools-1.3.2.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.3.2.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.3.2.ebuild,v 1.1 2004/09/28 19:57:54 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.3.2.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 inherit eutils
 
 STREAM="april2004"
-
 KERNEL="linux-2.6.5"
 BBOX="busybox-0.60.5"
 E2FS_PROGS="e2fsprogs-1.35"
 
 DESCRIPTION="A set of user space utilities that should be used together with the zSeries (s390) Linux kernel and device drivers"
-# must be downloaded from IBM
+HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/april2004_recommended.shtml"
 SRC_URI="mirror://gentoo/${PN}-${PV}-${STREAM}.tar.gz
 	http://www.busybox.net/downloads/${BBOX}.tar.bz2
 	mirror://sourceforge/e2fsprogs/${E2FS_PROGS}.tar.gz
 	mirror://kernel/linux/kernel/v2.6/${KERNEL}.tar.bz2"
-HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/linux390/april2004_recommended.shtml"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="s390"
 IUSE=""
-SLOT="0"
+
 DEPEND="virtual/libc
-	>=net-analyzer/ucd-snmp-4.2.3
+	net-analyzer/net-snmp
 	app-admin/genromfs
 	dev-util/indent"
-
 PROVIDE="virtual/bootloader"
 
 src_unpack() {
@@ -42,6 +41,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall INSTROOT="${D}" USRBINDIR="${D}/sbin"
+	einstall INSTROOT="${D}" USRBINDIR="${D}/sbin" || die
 	prepall
 }
diff --git a/sys-apps/s3switch/ChangeLog b/sys-apps/s3switch/ChangeLog
index 8b334abcb2b3..94fa9e36ef70 100644
--- a/sys-apps/s3switch/ChangeLog
+++ b/sys-apps/s3switch/ChangeLog
@@ -1,8 +1,21 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/ChangeLog,v 1.1 2002/07/09 12:16:05 aliz Exp $
+# ChangeLog for sys-apps/s3switch
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/ChangeLog,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  s3switch-19990826.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> s3switch-19990826.ebuild:
+  fixing depend qa issue. see 45343.
 
 *s3switch-19990826 (28 May 2002)
 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> s3switch-19990826.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   28 May 2002; Wout Mertens <wmertens@gentoo.org> s3switch-19990826.ebuild:
   Initial ebuild of tool that allows you to select the output on an S3 video chipset
diff --git a/sys-apps/s3switch/Manifest b/sys-apps/s3switch/Manifest
index e69de29bb2d1..7f1407168446 100644
--- a/sys-apps/s3switch/Manifest
+++ b/sys-apps/s3switch/Manifest
@@ -0,0 +1,4 @@
+MD5 5a337e4c44607872dd67249413aa8991 ChangeLog 818
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 29440a743957e7f823822271ddbba9ca s3switch-19990826.ebuild 546
+MD5 d044ed2d1d20a47c0406b04c5439121c files/digest-s3switch-19990826 53
diff --git a/sys-apps/s3switch/files/digest-s3switch-19990826 b/sys-apps/s3switch/files/digest-s3switch-19990826
index cfbaad465ff2..898899417ccf 100644
--- a/sys-apps/s3switch/files/digest-s3switch-19990826
+++ b/sys-apps/s3switch/files/digest-s3switch-19990826
@@ -1 +1 @@
-MD5 9cb6018e0b1c3db278451cc2a43b8285 s3ssrc.zip 27124
+MD5 1328b070343ac79c5ed4c613a1113754 s3ssrc.zip 8854
diff --git a/sys-apps/s3switch/metadata.xml b/sys-apps/s3switch/metadata.xml
index f093d416cbb1..20ce219711a2 100644
--- a/sys-apps/s3switch/metadata.xml
+++ b/sys-apps/s3switch/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>no-herd</herd>
 </pkgmetadata>
diff --git a/sys-apps/s3switch/s3switch-19990826.ebuild b/sys-apps/s3switch/s3switch-19990826.ebuild
index fc5a78032bf1..2e8cda324bfc 100644
--- a/sys-apps/s3switch/s3switch-19990826.ebuild
+++ b/sys-apps/s3switch/s3switch-19990826.ebuild
@@ -1,25 +1,22 @@
-#Copyright 2002 Gentoo Technologies, Inc.
-#Distributed under the terms of the GNU General Public License, v2 or later
-#$Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/s3switch-19990826.ebuild,v 1.1 2002/05/28 19:57:25 wmertens Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s3switch/s3switch-19990826.ebuild,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
 DESCRIPTION="S3 video chipset output selection utility"
 HOMEPAGE="http://www.probo.com/timr/savage40.html"
-
 SRC_URI="http://www.probo.com/timr/s3ssrc.zip"
-A=s3ssrc.zip
-S=${WORKDIR}
 
-RDEPEND="virtual/glibc"
-DEPEND="$RDEPEND"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
 
-src_compile() {
-	make || die
-}
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
 
-src_install () {
-	dobin s3switch
+src_install() {
+	dobin s3switch || die
 	doman s3switch.1x
 }
-
-
-
diff --git a/sys-apps/sal-client/ChangeLog b/sys-apps/sal-client/ChangeLog
index b3d6abb9ed3c..7223512d2972 100644
--- a/sys-apps/sal-client/ChangeLog
+++ b/sys-apps/sal-client/ChangeLog
@@ -1,10 +1,41 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/ChangeLog,v 1.1 2003/06/08 18:06:20 zhen Exp $
+# ChangeLog for sys-apps/sal-client
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/ChangeLog,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> sal-client-1.0_rc3.ebuild:
+  Changed SRC_URI to use mirror:// syntax and removed RDEPEND="${DEPEND}"
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sal-client-1.0_rc3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jul 2003; <zhen@gentoo.org> sal-client-1.0_rc3.ebuild:
+  Fixing the amd64 mark messup, just remarking unstable...
+
+  08 Jun 2003; root <root@gentoo.org> sal-client-1.0_rc3.ebuild:
+  changed server side to client side in package desc
+
+  08 Jun 2003; zhen <zhen@gentoo.org> sal-client-1.0_rc3.ebuild,
+  files/auditd.confd, files/sal-client-init:
+	I fixed most of the stuffs in the TODO (see below)
+	as well as adding a pkg_config() to the ebuild. Additionally,
+	I added some warnings about security in regard to storing the
+	buffered log files on the local macine. Lastly, I changed the
+	openssl dep to >=0.9.6j, because 0.9.7b is p.masked, and it b0rks
+	the user's system
+	TODO: 	rc-script 		(Done)
+		pkg_config 		(Done)
+		double check auditd.conf(Done)
+		warning messages	(Done)
 
 *sal-client-1.0_rc3 (08 Jun 2003)
 
   08 Jun 2003; zhen <zhen@gentoo.org> sal-client-1.0_rc3.ebuild,
   files/auditd.confd, files/sal-client-init:
   initial package add, NOT STABLE YET - DO NOT UNMASK
+  TODO: rc-script
+  	pkg_config that creates /var/lib/auditd for logs; perms 0600
+	double check auditd.confd
+	necesary warning messages about log storage
+
 
diff --git a/sys-apps/sal-client/Manifest b/sys-apps/sal-client/Manifest
index e12e03089e3b..6a382da288c8 100644
--- a/sys-apps/sal-client/Manifest
+++ b/sys-apps/sal-client/Manifest
@@ -1,2 +1,16 @@
-MD5 d66a7ff46d8f315979cdc94ae9df5d73 sal-client-1.0_rc3.ebuild 714
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 22febd920d54747a197529d4e6e8dcaf ChangeLog 1625
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 59daaf591e6883e0b55ded7111028ff1 sal-client-1.0_rc3.ebuild 1936
+MD5 f1ab7751c6cf0f5df11e339c9edbf684 files/auditd.confd 434
 MD5 5aa22bbbe3279a7d60625851d5e92f4a files/digest-sal-client-1.0_rc3 69
+MD5 1a23102cb32ba31a45396a908d17c320 files/sal-client-init 704
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBKrcCI1lqEGTUzyQRAqdOAKDW9ICN5q8vfdX+XY2xODmsTF5K+ACggJgD
+tLJBsRZ5Hk0Sfhmy1HziTc0=
+=zLt0
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sal-client/files/auditd.confd b/sys-apps/sal-client/files/auditd.confd
index 9ee6d6ac3018..d2a0411ff8be 100644
--- a/sys-apps/sal-client/files/auditd.confd
+++ b/sys-apps/sal-client/files/auditd.confd
@@ -1,7 +1,12 @@
-# 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-apps/sal-client/files/auditd.confd,v 1.1 2003/06/08 18:06:20 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/files/auditd.confd,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
+# DO NOT CHANGE THIS UNLESS YOU KNOW WHAT YOU ARE DOING!!
+# Temporary log storage directory
 TMP_DIR="/var/lib/auditd"
+
+#Base file name for temporary logfiles
 FILE="audit"
 
+AUDITD_OPTS=" -d $TMP_DIR -b $FILE -r"
diff --git a/sys-apps/sal-client/files/sal-client-init b/sys-apps/sal-client/files/sal-client-init
index e0975b1dd8b9..acc5a4eda691 100644
--- a/sys-apps/sal-client/files/sal-client-init
+++ b/sys-apps/sal-client/files/sal-client-init
@@ -1,24 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+#! /sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/files/sal-client-init,v 1.1 2003/06/08 18:06:20 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/files/sal-client-init,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
-TMP_DIR="tmp"
-FILE="audit"
+# NB: Config is in /etc/conf.d/auditd
 
-# forcibly delete the temporary directory if needed
-if [ -e $TMP_DIR ] 
-then
-  rm -rf $TMP_DIR
-fi
+depend() {
+	use net
+}
 
-# the below assumes that the certificate authority directory is /CA
+start() {
+	ebegin "Starting auditd"
+	
+	# forcibly delete the temporary files if needed
+  	if [ -e $TMP_DIR ]; then
+		rm -rf $TMP_DIR/*
+	fi
 
-# the audit daemon run as a background process
-# automatically creates the temporary directory if needed
-./daemon/auditd -d $TMP_DIR -b $FILE -r &
-
-# the audit client run as a foreground process
-# sends the audit data to the terminal (stdout)
-# to send audit data to a server replace -v with -a x.x.x.x
-./client/auditclient -e -d $TMP_DIR -b $FILE -v
+	start-stop-daemon --start --quiet --exec /usr/sbin/auditd -- ${AUDITD_OPTS} &
+	/bin/pidof auditd > /var/run/auditd.pid
+	eend $? "Failed to start auditd"
+				
+}
 
+stop() {
+	ebegin "Stopping auditd"
+	/bin/killall -s9 auditd
+	eend $? "Failed to stop auditd"
+}
diff --git a/sys-apps/sal-client/metadata.xml b/sys-apps/sal-client/metadata.xml
index 1917f83e5e10..96a2d586367d 100644
--- a/sys-apps/sal-client/metadata.xml
+++ b/sys-apps/sal-client/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>hardened</herd>
-<maintainer>
-  <email>zhen@gentoo.org</email>
-  <name>John Davis</name>
-  <description>Full time maintainer, please post all bugs to me.</description>
-</maintainer>
-<longdescription>sal-client is the client side logging utility for SAL, the Secure
-Audting for Linux, projec</longdescription>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/sal-client/sal-client-1.0_rc3.ebuild b/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
index c36378db80da..a894ca7c60a2 100644
--- a/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
+++ b/sys-apps/sal-client/sal-client-1.0_rc3.ebuild
@@ -1,24 +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/sys-apps/sal-client/sal-client-1.0_rc3.ebuild,v 1.1 2003/06/08 18:06:20 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sal-client/sal-client-1.0_rc3.ebuild,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
 MY_P=${P/_/-}
-
-DESCRIPTION="Server side programs for SAL, the Secure Auditing for Linux project."
+DESCRIPTION="Client side programs for SAL, the Secure Auditing for Linux project."
 HOMEPAGE="http://secureaudit.sourceforge.net/"
-
-SRC_URI="http://belnet.dl.sourceforge.net/sourceforge/secureaudit/${MY_P/rc3/RC3}.tar.gz"
+SRC_URI="mirror://sourceforge/secureaudit/${MY_P/rc3/RC3}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="-x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc \
-		>=dev-libs/openssl-0.9.6j"
+DEPEND="virtual/libc
+	dev-libs/openssl"
 
-RDEPEND="${DEPEND} \
-		>=sys-kernel/hardened-sources-2.4.20-r2"
+# put a depend on hardened sources -- repoman doesn't like it, and we've got
+# critical issues so blah
 
 S=${WORKDIR}/sal-client
 
@@ -33,7 +31,7 @@ src_install() {
 
 
 	exeinto /etc/init.d; newexe ${FILESDIR}/sal-client-init auditd
-	insinto /etc/conf.d; newins ${FILESDIR}/auditd.confd auditd 
+	insinto /etc/conf.d; newins ${FILESDIR}/auditd.confd auditd
 
 	mv ${S}/patches/README ${S}/patches/README.patches
 	mv ${S}/patches/README.todo ${S}/patches/README.todo.patches
@@ -43,3 +41,26 @@ src_install() {
 	dodoc ${S}/patches/README.todo.patches
 
 }
+
+pkg_postinst() {
+	echo
+	einfo "To create the necessary secure directory to hold your buffered logs,"
+	einfo "please remember to configure using the following line:"
+	echo
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	echo
+	ewarn "Please note that using the above method is NOT secure. You will need to explore"
+	ewarn "either a crypto loopback filesystem, or other means of creating a secure jail"
+	ewarn "for these temporary log files. We assume no responsibility for security breaches"
+	ewarn "if you just use the above configure script."
+
+}
+
+pkg_config() {
+	einfo "Creating default temporary log directory in ${ROOT}/var/lib/auditd"
+	/bin/mkdir ${ROOT}/var/lib/auditd
+	/bin/chown root:root ${ROOT}/var/lib/auditd
+	/bin/chmod 0600 ${ROOT}/var/lib/auditd
+}
+
+
diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 18ed8ab0cfe1..0d851a5aab4a 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,198 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# ChangeLog for sys-apps/sandbox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.1 2005/04/23 07:26:14 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
+
+  14 Nov 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.13.ebuild:
+  Simplify multilib building logic.  Other cleanups.
+
+  13 Oct 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.12.ebuild,
+  sandbox-1.2.13.ebuild:
+  Add workaround for bug #109036.
+
+  07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  sandbox-1.2.9.ebuild, sandbox-1.2.10.ebuild, sandbox-1.2.11.ebuild,
+  sandbox-1.2.12.ebuild, sandbox-1.2.13.ebuild:
+  Some changes for amd64 2006.0.
+
+*sandbox-1.2.13 (12 Sep 2005)
+
+  12 Sep 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.13.ebuild:
+  New release.
+
+  30 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> sandbox-1.2.12.ebuild:
+  stable on alpha wrt bug #101433
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.12.ebuild:
+  Stable on sparc wrt #101433
+
+  15 Aug 2005; Danny van Dyk <kugelfang@gentoo.org> sandbox-1.2.12.ebuild:
+  Marked stable on amd64.
+
+  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> sandbox-1.2.12.ebuild:
+  Stable on ppc and hppa.
+
+  15 Aug 2005; Ian Leitch <port001@gentoo.org> sandbox-1.2.12.ebuild:
+  Stable on x86, #101433
+
+  15 Aug 2005; Markus Rothe <corsair@gentoo.org> sandbox-1.2.12.ebuild:
+  Stable on ppc64 (bug #101433)
+
+*sandbox-1.2.12 (05 Aug 2005)
+
+  05 Aug 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.12.ebuild:
+  New release.
+
+  23 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> sandbox-1.2.11.ebuild:
+  Stable on sh.
+
+  22 Jul 2005; Jason Stubbs <jstubbs@gentoo.org> sandbox-1.2.11.ebuild:
+  Stable on mips per hardave's request. #96782
+
+  21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> sandbox-1.2.11.ebuild:
+  Stable on hppa. bug #96782
+
+  21 Jul 2005; Aron Griffis <agriffis@gentoo.org> sandbox-1.2.11.ebuild:
+  stable on alpha
+
+  21 Jul 2005; Aron Griffis <agriffis@gentoo.org> sandbox-1.2.11.ebuild:
+  stable on ia64
+
+  21 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> sandbox-1.2.11.ebuild:
+  Marking stable on x86 for bug #96782.
+
+  21 Jul 2005; Joseph Jezak <josejx@gentoo.org> sandbox-1.2.11.ebuild:
+  Marked ppc stable for bug #96782.
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> sandbox-1.2.11.ebuild:
+  Stable on ppc64 (bug #96782)
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.11.ebuild:
+  Stable on sparc wrt #96782
+
+  20 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> sandbox-1.2.11.ebuild:
+  Marked stable on amd64.
+
+  18 Jul 2005; Guy Martin <gmsoft@gentoo.org> sandbox-1.2.10.ebuild:
+  Stable on hppa.
+
+  15 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> sandbox-1.2.10.ebuild:
+  Stable on alpha + ia64, bug 99019.
+
+  14 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.10.ebuild:
+  Stable on sparc wrt #99019
+
+  14 Jul 2005; Joseph Jezak <josejx@gentoo.org> sandbox-1.2.10.ebuild:
+  Marked ppc stable for bug #99019.
+
+  15 Jul 2005; Jason Stubbs <jstubbs@gentoo.org> sandbox-1.2.9.ebuild,
+  sandbox-1.2.10.ebuild, sandbox-1.2.11.ebuild:
+  Removed ppc-macos from keywords as sandbox does not work there yet.
+
+*sandbox-1.2.11 (14 Jul 2005)
+
+  14 Jul 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.11.ebuild:
+  New release.
+
+  14 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  sandbox-1.2.10.ebuild:
+  Stable amd64.
+
+  12 Jul 2005; Markus Rothe <corsair@gentoo.org> sandbox-1.2.10.ebuild:
+  Stable on ppc64
+
+  10 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/sandbox-1.2.9-uclibc-getcwd.patch,
+  +files/sandbox-1.2.10-uclibc-getcwd.patch, sandbox-1.2.9.ebuild,
+  sandbox-1.2.10.ebuild:
+  Add some fixes to the getcwd implementation, bug #98419.
+
+  05 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  sandbox-1.2.9.ebuild:
+  Stable amd64 for 2005.1
+
+*sandbox-1.2.10 (03 Jul 2005)
+
+  03 Jul 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.10.ebuild:
+  Update version.
+
+*sandbox-1.2.9 (09 Jun 2005)
+
+  09 Jun 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.9.ebuild:
+  Update version.
+
+*sandbox-1.2.8 (13 May 2005)
+
+  13 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.8.ebuild:
+  Cleanups and hopefully finally kill bug #91541.  Fix bug #92478.
+
+*sandbox-1.2.7 (12 May 2005)
+
+  12 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.7.ebuild:
+  Lots of cleanups and fixes - see ChangeLog in /usr/share/doc.
+
+*sandbox-1.2.6 (10 May 2005)
+
+  10 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.6.ebuild:
+  Workaround for tsocks incompatability, bug #91541.
+
+*sandbox-1.2.5-r2 (09 May 2005)
+
+  09 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +sandbox-1.2.5-r2.ebuild:
+  On some versions of portage, CFLAGS_* do not survive across ebuild.sh
+  stages, so we must ensure the multilib setup always gets rerun for each
+  stage.
+
+*sandbox-1.2.5-r1 (06 May 2005)
+
+  06 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +sandbox-1.2.5-r1.ebuild:
+  Revbump to fix problems with amd64 2004.3's multilib. Cleaned up multilib
+  handling in general. 2004.3 amd64 users should have working 32bit sandbox
+  again.
+
+  04 May 2005; Mike Frysinger <vapier@gentoo.org> sandbox-1.2.5.ebuild:
+  Fix multilib building on amd64/2004.3 profiles.
+
+*sandbox-1.2.5 (04 May 2005)
+
+  04 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.5.ebuild:
+  General fixes.  Fix for bug #91431.
+
+*sandbox-1.2.4 (03 May 2005)
+
+  03 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.4.ebuild:
+  Some speedups (bug #91040) and uclibc fixes.
+
+*sandbox-1.2.3 (29 Apr 2005)
+
+  29 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.3.ebuild:
+  Fixup libc detection.  Fix bug or two.
+
+*sandbox-1.2.2 (28 Apr 2005)
+
+  28 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.2.ebuild:
+  Bug fixes for bug #90592.
+
+*sandbox-1.2.1-r3 (24 Apr 2005)
+
+  24 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +sandbox-1.2.1-r3.ebuild:
+  Fix multilib.
+
+*sandbox-1.2.1 (24 Apr 2005)
+  24 Apr 2005; Brian Harring <ferringb@gentoo.org> +sandbox-1.2.1-r2.ebuild:
+  Amd64 fix for 90135.
+
+*sandbox-1.2.1 (24 Apr 2005)
+
+  24 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> +sandbox-1.2.1-r1.ebuild:
+  Added missing check_multilib function.
+
+*sandbox-1.2.1 (23 Apr 2005)
+
+  23 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.1.ebuild:
+  Fix for bug #90153.
 
 *sandbox-1.2 (Apr 23 2005)
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 466333b01885..ac70956bf4b9 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,4 +1,24 @@
-MD5 968e2965b0b6f620634dae6d28d8b4c4 metadata.xml 455
-MD5 958ed710056bf1be8433d5dbaa185892 sandbox-1.2.ebuild 1670
-MD5 72b52138220f3a25144359fc1464db89 ChangeLog 316
-MD5 06ad9881ad2610487c66565ee5b39389 files/digest-sandbox-1.2 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1167f4447fc3e0fb31f2a156de853755 ChangeLog 6602
+MD5 9fe5eef00b6290f1c9fb750c3bfc1fad files/digest-sandbox-1.2.10 67
+MD5 a3b2897eb709807fa36afb0c7b23c01d files/digest-sandbox-1.2.11 67
+MD5 97d135bb57b8e72a00cb615055d919cc files/digest-sandbox-1.2.12 67
+MD5 b82ec2a608295a15c019aa485cfceb37 files/digest-sandbox-1.2.13 67
+MD5 0b9d8a3302f89af8fcb328f02eb16824 files/digest-sandbox-1.2.9 66
+MD5 36e3d59477310a00b5b240377e4e47dd files/sandbox-1.2.10-uclibc-getcwd.patch 751
+MD5 76e3fe575f6739c3a9de06eb2dcdd1ac files/sandbox-1.2.9-uclibc-getcwd.patch 508
+MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337
+MD5 9ad9f72791d00e4ecaf1d022821a25f3 sandbox-1.2.10.ebuild 2913
+MD5 b30e1ca75642855f73ec2bb819f3f0c2 sandbox-1.2.11.ebuild 3023
+MD5 ca2729f214a5c4c02a7ebb406b67f139 sandbox-1.2.12.ebuild 3159
+MD5 c855214654d3eba85dbfd119417e203c sandbox-1.2.13.ebuild 3000
+MD5 316ac3ed1bdc5b458df0a3ef64ce9e56 sandbox-1.2.9.ebuild 3012
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeNts1ZcsMnZjRyIRAi5tAKC0xAqn3TzUZbxt4DsxhEuY3L+KmwCcC5yW
+dZsq/xoSShOombwTH1T3d6w=
+=gNva
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml
index cf7aa40a0c1d..6df346c02e48 100644
--- a/sys-apps/sandbox/metadata.xml
+++ b/sys-apps/sandbox/metadata.xml
@@ -6,11 +6,7 @@
 <!-- portage lacks a herd.  correct this when we have one. -->
 
 <maintainer>
-  <email>dev-portage@gentoo.org</email>
-  <description>Primary contact</description>
-</maintainer>
-<maintainer>
-  <email>azarah@gentoo.org</email>
-  <description>Sandbox guru extraordinare</description>
+  <email>sandbox@gentoo.org</email>
+  <description>Sandbox Maintainers</description>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/sandbox/sandbox-1.2.10.ebuild b/sys-apps/sandbox/sandbox-1.2.10.ebuild
index 61b5f80d5f5f..613fc6858d3e 100644
--- a/sys-apps/sandbox/sandbox-1.2.10.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.10.ebuild
@@ -1,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-apps/sandbox/sandbox-1.2.10.ebuild,v 1.1 2005/07/03 19:06:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.10.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic eutils toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -16,8 +16,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS=" alpha  amd64  arm  hppa  ia64  m68k  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+#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=""
 RESTRICT="multilib-pkg-force"
 
@@ -29,6 +29,8 @@ setup_multilib() {
 		export MULTILIB_ABIS="x86 amd64"
 		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
 		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
 		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
 		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
 	fi
@@ -37,10 +39,13 @@ setup_multilib() {
 src_unpack() {
 	setup_multilib
 	for ABI in $(get_install_abis) ; do
-		unpack ${A}
 		cd ${WORKDIR}
+		unpack ${A}
 		einfo "Unpacking sandbox for ABI=${ABI}..."
 		mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}"
+		cd ${S%/}-${ABI}
+		# Fix getcwd, bug #98419.
+		epatch ${FILESDIR}/${P}-uclibc-getcwd.patch
 	done
 }
 
@@ -65,9 +70,15 @@ src_compile() {
 	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
 	ewarn "FEATURES=-sandbox emerge sandbox"
 
+	local iscross=0
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscros=1
+
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
 		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
 		cd ${S}-${ABI}
 
 		einfo "Configuring sandbox for ABI=${ABI}..."
@@ -86,7 +97,6 @@ src_install() {
 
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
-		export ABI
 		cd ${S}-${ABI}
 		einfo "Installing sandbox for ABI=${ABI}..."
 		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
diff --git a/sys-apps/sandbox/sandbox-1.2.11.ebuild b/sys-apps/sandbox/sandbox-1.2.11.ebuild
index 49710f0bfe70..952ed05ae111 100644
--- a/sys-apps/sandbox/sandbox-1.2.11.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.11.ebuild,v 1.1 2005/07/14 11:36:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.11.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -16,8 +16,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS=" alpha  amd64  arm  hppa  ia64  m68k  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+#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=""
 RESTRICT="multilib-pkg-force"
 
@@ -29,6 +29,8 @@ setup_multilib() {
 		export MULTILIB_ABIS="x86 amd64"
 		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
 		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
 		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
 		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
 	fi
@@ -65,9 +67,15 @@ src_compile() {
 	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
 	ewarn "FEATURES=-sandbox emerge sandbox"
 
+	local iscross=0
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscros=1
+
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
 		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
 		cd ${S}-${ABI}
 
 		einfo "Configuring sandbox for ABI=${ABI}..."
@@ -86,7 +94,6 @@ src_install() {
 
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
-		export ABI
 		cd ${S}-${ABI}
 		einfo "Installing sandbox for ABI=${ABI}..."
 		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
@@ -106,4 +113,3 @@ pkg_preinst() {
 	chown root:portage ${IMAGE}/var/log/sandbox
 	chmod 0770 ${IMAGE}/var/log/sandbox
 }
-
diff --git a/sys-apps/sandbox/sandbox-1.2.12.ebuild b/sys-apps/sandbox/sandbox-1.2.12.ebuild
index a2271dcab852..0b1533d1fe85 100644
--- a/sys-apps/sandbox/sandbox-1.2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-1.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/sys-apps/sandbox/sandbox-1.2.12.ebuild,v 1.1 2005/08/05 15:13:16 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.12.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 #KEYWORDS=" alpha  amd64  arm  hppa  ia64  m68k  mips  ppc  ppc64  s390  sh  sparc  x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 RESTRICT="multilib-pkg-force"
 
@@ -29,6 +29,8 @@ setup_multilib() {
 		export MULTILIB_ABIS="x86 amd64"
 		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
 		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
 		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
 		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
 	fi
@@ -65,9 +67,18 @@ src_compile() {
 	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
 	ewarn "FEATURES=-sandbox emerge sandbox"
 
+	local iscross=0
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscros=1
+
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
 		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+		# Needed for older broken portage versions (bug #109036)
+		portageq has_version "${ROOT}" '<portage-2.0.51.22' && \
+			unset EXTRA_ECONF
+
 		cd ${S}-${ABI}
 
 		einfo "Configuring sandbox for ABI=${ABI}..."
@@ -86,7 +97,6 @@ src_install() {
 
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
-		export ABI
 		cd ${S}-${ABI}
 		einfo "Installing sandbox for ABI=${ABI}..."
 		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
@@ -106,4 +116,3 @@ pkg_preinst() {
 	chown root:portage ${IMAGE}/var/log/sandbox
 	chmod 0770 ${IMAGE}/var/log/sandbox
 }
-
diff --git a/sys-apps/sandbox/sandbox-1.2.13.ebuild b/sys-apps/sandbox/sandbox-1.2.13.ebuild
index f2ca466b8652..715c387a707c 100644
--- a/sys-apps/sandbox/sandbox-1.2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-1.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/sys-apps/sandbox/sandbox-1.2.13.ebuild,v 1.1 2005/09/12 07:19:03 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.13.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -29,19 +29,15 @@ setup_multilib() {
 		export MULTILIB_ABIS="x86 amd64"
 		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
 		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
 		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
 		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
 	fi
 }
 
 src_unpack() {
-	setup_multilib
-	for ABI in $(get_install_abis) ; do
-		cd ${WORKDIR}
-		unpack ${A}
-		einfo "Unpacking sandbox for ABI=${ABI}..."
-		mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}"
-	done
+	unpack ${A}
 }
 
 abi_fail_check() {
@@ -65,12 +61,23 @@ src_compile() {
 	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
 	ewarn "FEATURES=-sandbox emerge sandbox"
 
+	local iscross=0
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscros=1
+
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
 		export ABI
-		cd ${S}-${ABI}
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+		# Needed for older broken portage versions (bug #109036)
+		portageq has_version "${ROOT}" '<portage-2.0.51.22' && \
+			unset EXTRA_ECONF
+
+		mkdir "${S}-${ABI}"
+		cd "${S}-${ABI}"
 
 		einfo "Configuring sandbox for ABI=${ABI}..."
+		ECONF_SOURCE="../${P}/" \
 		econf --libdir="/usr/$(get_libdir)"
 		einfo "Building sandbox for ABI=${ABI}..."
 		emake || {
@@ -86,7 +93,6 @@ src_install() {
 
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
-		export ABI
 		cd ${S}-${ABI}
 		einfo "Installing sandbox for ABI=${ABI}..."
 		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
@@ -97,8 +103,8 @@ src_install() {
 	fowners root:portage /var/log/sandbox
 	fperms 0770 /var/log/sandbox
 
-	for x in "${S}-${ABI}"/{AUTHORS,COPYING,ChangeLog,NEWS,README} ; do
-		[[ -f ${x} && $(stat -c "%s" "${x}") -gt 0 ]] && dodoc "${x}"
+	for x in "${S}"/{AUTHORS,COPYING,ChangeLog,NEWS,README} ; do
+		[[ -s ${x} ]] && dodoc "${x}"
 	done
 }
 
@@ -106,4 +112,3 @@ pkg_preinst() {
 	chown root:portage ${IMAGE}/var/log/sandbox
 	chmod 0770 ${IMAGE}/var/log/sandbox
 }
-
diff --git a/sys-apps/sandbox/sandbox-1.2.9.ebuild b/sys-apps/sandbox/sandbox-1.2.9.ebuild
index e370e6bc7822..2977aefae986 100644
--- a/sys-apps/sandbox/sandbox-1.2.9.ebuild
+++ b/sys-apps/sandbox/sandbox-1.2.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/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.1 2005/06/09 17:34:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.9.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic eutils toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -16,8 +16,9 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS=" alpha  amd64  arm  hppa  ia64  m68k  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+#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"
+KEYWORDS="~alpha  amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 RESTRICT="multilib-pkg-force"
 
@@ -29,6 +30,8 @@ setup_multilib() {
 		export MULTILIB_ABIS="x86 amd64"
 		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
 		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
 		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
 		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
 	fi
@@ -37,10 +40,13 @@ setup_multilib() {
 src_unpack() {
 	setup_multilib
 	for ABI in $(get_install_abis) ; do
-		unpack ${A}
 		cd ${WORKDIR}
+		unpack ${A}
 		einfo "Unpacking sandbox for ABI=${ABI}..."
 		mv ${S} ${S%/}-${ABI} || die "failed moving \$S to ${ABI}"
+		cd ${S%/}-${ABI}
+		# Fix getcwd, bug #98419.
+		epatch ${FILESDIR}/${P}-uclibc-getcwd.patch
 	done
 }
 
@@ -65,9 +71,15 @@ src_compile() {
 	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
 	ewarn "FEATURES=-sandbox emerge sandbox"
 
+	local iscross=0
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscros=1
+
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
 		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
 		cd ${S}-${ABI}
 
 		einfo "Configuring sandbox for ABI=${ABI}..."
@@ -86,7 +98,6 @@ src_install() {
 
 	OABI="${ABI}"
 	for ABI in $(get_install_abis); do
-		export ABI
 		cd ${S}-${ABI}
 		einfo "Installing sandbox for ABI=${ABI}..."
 		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
diff --git a/sys-apps/sdd/ChangeLog b/sys-apps/sdd/ChangeLog
index d7d7917aff7a..29f1db0911be 100644
--- a/sys-apps/sdd/ChangeLog
+++ b/sys-apps/sdd/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for sys-apps/sss
+# ChangeLog for sys-apps/sdd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdd/ChangeLog,v 1.1 2005/01/07 23:04:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
+
+  23 Mar 2005; Sven Wegener <swegener@gentoo.org> sdd-1.52.ebuild:
+  Marked stable on x86.
+
+  08 Jan 2005; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  sdd-1.52.ebuild:
+  Taking over primary maintainership. Moved package to ~arch. Fixed ChangeLog
+  header. Removed comments from metadata.xml. Use emake in src_compile.
+  Removed unneeded inherit eutils. Added error checking.
 
 *sdd-1.52 (07 Jan 2005)
 
diff --git a/sys-apps/sdd/Manifest b/sys-apps/sdd/Manifest
index 616ffd8be949..796b000edf3a 100644
--- a/sys-apps/sdd/Manifest
+++ b/sys-apps/sdd/Manifest
@@ -1,4 +1,14 @@
-MD5 9d2573b8a721f69b1c724fc484aaaf7c sdd-1.52.ebuild 516
-MD5 40afb744a173a6a3c4834d3a3eefb9f8 ChangeLog 391
-MD5 b569bfa4bf7e5a21b59def541bb4ae83 metadata.xml 369
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ed083f6866ff4eb1ebfff810733ff1e3 ChangeLog 772
+MD5 ad40c884c43300600c338439dc6102de metadata.xml 224
+MD5 94c641cd6f32a01fbcd66b71a089eccd sdd-1.52.ebuild 626
 MD5 46c111f07238d92fb6c4711bdf23e8e6 files/digest-sdd-1.52 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCQMmAI1lqEGTUzyQRAv2QAJ9EcnqBRmslVtbRh383T8MNQRo87ACdH3Z+
+72L13ZH2U6a1dXHkuiS1QY0=
+=szm9
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sdd/metadata.xml b/sys-apps/sdd/metadata.xml
index fa65af46be4e..f4e4f141dd8f 100644
--- a/sys-apps/sdd/metadata.xml
+++ b/sys-apps/sdd/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>stuart@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
+  <email>swegener@gentoo.org</email>
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
 </pkgmetadata>
diff --git a/sys-apps/sdd/sdd-1.52.ebuild b/sys-apps/sdd/sdd-1.52.ebuild
index f944c7a3cd4e..315c76e04b26 100644
--- a/sys-apps/sdd/sdd-1.52.ebuild
+++ b/sys-apps/sdd/sdd-1.52.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/sys-apps/sdd/sdd-1.52.ebuild,v 1.1 2005/01/07 23:04:23 stuart Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdd/sdd-1.52.ebuild,v 1.1.1.1 2005/11/30 09:56:37 chriswhite Exp $
 
 DESCRIPTION="A fast and enhanced 'dd' replacement for UNIX"
-HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/"
+HOMEPAGE="http://ftp.berlios.de/pub/sdd/"
 SRC_URI="http://ftp.berlios.de/pub/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND=""
+
 src_compile() {
-	make
+	emake || die "emake failed"
 }
 
 src_install() {
-	OBJ=${PN}/OBJ/`ls ${PN}/OBJ`
-	dobin ${OBJ}/${PN}
-	doman ${PN}/${PN}.1
+	dobin ${PN}/OBJ/*/${PN} || die "dobin failed"
+	doman ${PN}/${PN}.1 || die "doman failed"
+	dodoc README || die "dodoc failed"
 }
diff --git a/sys-apps/sdparm/ChangeLog b/sys-apps/sdparm/ChangeLog
index 0509f861ddbb..733efec5e9eb 100644
--- a/sys-apps/sdparm/ChangeLog
+++ b/sys-apps/sdparm/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for sys-apps/sdparm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v 1.1 2005/05/08 06:35:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/ChangeLog,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
+
+*sdparm-0.95 (22 Sep 2005)
+
+  22 Sep 2005; Joshua Kinard <kumba@gentoo.org> -sdparm-0.92.ebuild,
+  sdparm-0.94.ebuild, +sdparm-0.95.ebuild:
+  Import new version of sdparm (0.95), remove 0.92, and stable 0.94 on mips,
+  sparc, and x86.
+
+  29 Jul 2005; David Holm <dholm@gentoo.org> sdparm-0.94.ebuild:
+  Added to ~ppc.
+
+  29 Jul 2005; Joshua Kinard <kumba@gentoo.org> metadata.xml:
+  Metadata update.
+
+*sdparm-0.94 (29 Jul 2005)
+
+  29 Jul 2005; Joshua Kinard <kumba@gentoo.org> -sdparm-0.91.ebuild,
+  sdparm-0.92.ebuild, sdparm-0.93.ebuild, +sdparm-0.94.ebuild:
+  Removed 0.91; Marked 0.92 and 0.93 stable on x86, sparc, and mips (amd64 needs
+  to test); Imported 0.94 into unstable.
+
+*sdparm-0.93 (04 Jun 2005)
+
+  04 Jun 2005; Joshua Kinard <kumba@gentoo.org> +sdparm-0.93.ebuild:
+  Version Bump.
+
+  28 May 2005; <dang@gentoo.org> sdparm-0.92.ebuild:
+  Marking ~amd64
+
+*sdparm-0.92 (28 May 2005)
+
+  28 May 2005; Joshua Kinard <kumba@gentoo.org> +sdparm-0.92.ebuild:
+  Version bump.
 
 *sdparm-0.91 (08 May 2005)
 
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index 6a457970df27..2b8a65500c82 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,4 +1,8 @@
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 5608bc34fcfd4eef475249931dd4b579 sdparm-0.91.ebuild 781
-MD5 e41dd4c523e758c0865c3772b5d69299 ChangeLog 350
-MD5 acdb60c4b5bbc94e30f3342b5faeb233 files/digest-sdparm-0.91 60
+MD5 787f39be0e7a8235660895d8e01d03d7 metadata.xml 371
+MD5 4b0764238a44394839a058e37dcfc62b sdparm-0.95.ebuild 898
+MD5 ef5b3c1f39e78fbd0e9c146f963c0ba8 ChangeLog 1419
+MD5 d87cbee4b3e0e0076f59aa8bc5bead5b sdparm-0.93.ebuild 880
+MD5 2422c4a3c577f4bb9b0a03e2b05bcfe3 sdparm-0.94.ebuild 885
+MD5 a282869403fdef1f44db68500f0647ad files/digest-sdparm-0.95 60
+MD5 34ab4d85b3e4c972e442e58a621bf744 files/digest-sdparm-0.93 60
+MD5 477adacd20572a22d97d601b16602b91 files/digest-sdparm-0.94 60
diff --git a/sys-apps/sdparm/metadata.xml b/sys-apps/sdparm/metadata.xml
index 96a2d586367d..06212d5cc3b1 100644
--- a/sys-apps/sdparm/metadata.xml
+++ b/sys-apps/sdparm/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
+
+	<maintainer>
+		<email>kumba@gentoo.org</email>
+		<name>Joshua Kinard</name>
+	</maintainer>
+
+	<longdescription>
+		Utility to output and modify parameters on a SCSI device, like hdparm.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/sdparm/sdparm-0.93.ebuild b/sys-apps/sdparm/sdparm-0.93.ebuild
index 8bca280cfd46..2c7152a13ea1 100644
--- a/sys-apps/sdparm/sdparm-0.93.ebuild
+++ b/sys-apps/sdparm/sdparm-0.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-0.93.ebuild,v 1.1 2005/06/04 06:12:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-0.93.ebuild,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
 
 DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
 HOMEPAGE="http://sg.torque.net/sg/sdparm.html"
@@ -8,7 +8,7 @@ SRC_URI="http://sg.torque.net/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~amd64"
+KEYWORDS="x86 sparc mips ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-apps/sdparm/sdparm-0.94.ebuild b/sys-apps/sdparm/sdparm-0.94.ebuild
index 57ac631b9fc1..8056770c54a6 100644
--- a/sys-apps/sdparm/sdparm-0.94.ebuild
+++ b/sys-apps/sdparm/sdparm-0.94.ebuild
@@ -1,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-apps/sdparm/sdparm-0.94.ebuild,v 1.1 2005/07/29 04:39:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-0.94.ebuild,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
 
 DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
 HOMEPAGE="http://sg.torque.net/sg/sdparm.html"
@@ -8,7 +8,7 @@ SRC_URI="http://sg.torque.net/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~amd64"
+KEYWORDS="~amd64 mips ~ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-apps/sdparm/sdparm-0.95.ebuild b/sys-apps/sdparm/sdparm-0.95.ebuild
index ae8a875088ff..6ee1aac3ecde 100644
--- a/sys-apps/sdparm/sdparm-0.95.ebuild
+++ b/sys-apps/sdparm/sdparm-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-0.95.ebuild,v 1.1 2005/09/22 03:08:53 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sdparm/sdparm-0.95.ebuild,v 1.1.1.1 2005/11/30 09:56:47 chriswhite Exp $
 
 DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
 HOMEPAGE="http://sg.torque.net/sg/sdparm.html"
diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index 2f2f2bb82a36..298d6e877d38 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,9 +1,262 @@
 # ChangeLog for sys-apps/sed
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.1.1.1 2005/11/30 09:56:11 chriswhite Exp $
+
+  09 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> sed-4.1.4.ebuild:
+  Make use of userland_GNU useflag instead of checking for x86-fbsd and
+  ppc-macos keywords.
+
+  17 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> sed-4.1.4.ebuild:
+  Fix for Bug 96321.
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/sed-4.1.4-fix-invalid-ref-error.patch, sed-4.1.4.ebuild:
+  Add patch from upstream to fix typo in error msg #96009.
+
+  12 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> sed-4.1.4.ebuild:
+  Removed renaming of doc files on ppc-macos and fbsd. Stable ppc-macos to
+  force the changes.
+
+  26 Mar 2005; <gongloo@gentoo.org> sed-4.1.4.ebuild:
+  Updated for collision-protect on ppc-macos.
+
+*sed-4.1.4 (19 Feb 2005)
+
+  19 Feb 2005; Mike Frysinger <vapier@gentoo.org> +sed-4.1.4.ebuild:
+  Version bump.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org> sed-4.0.9.ebuild,
+  sed-4.1.2.ebuild:
+  Make sure sed can compile even if system sed is broken #40786 by Brian Harring.
+
+*sed-4.1.2 (21 Sep 2004)
+
+  21 Sep 2004; Mike Frysinger <vapier@gentoo.org> +sed-4.1.2.ebuild:
+  Version bump #64897 by Anthony Giorgio.
+
+  18 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> sed-4.0.9.ebuild:
+  tidy the macos stuff
+
+  16 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> sed-4.0.9.ebuild:
+  Fixed use invocation; bug #64260.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> sed-4.0.8.ebuild,
+  sed-4.0.9.ebuild:
+  Masked sed-4.0.9.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> sed-4.0.8.ebuild:
+  Masked sed-4.0.8.ebuild stable for ppc
+
+  05 Aug 2004; Lina Pezzella <j4rg0n@gentoo.org> sed-4.0.9.ebuild:
+  Added changes for macos gsed. Stable macos.
+
+  03 Jul 2004; Guy Martin <gmsoft@gentoo.org> sed-4.0.9.ebuild:
+  Marked stable on hppa.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sed-4.0.5.ebuild,
+  sed-4.0.7.ebuild, sed-4.0.8.ebuild, sed-4.0.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 Jun 2004; Joshua Kinard <kumba@gentoo.org> sed-4.0.9.ebuild:
+  Marked stable on sparc.
+
+  29 Jun 2004; Joshua Kinard <kumba@gentoo.org> sed-4.0.9.ebuild:
+  Marked stable on mips.
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> sed-4.0.5.ebuild,
+  sed-4.0.7.ebuild, sed-4.0.8.ebuild, sed-4.0.9.ebuild:
+  QA - fix use invocation. Run gnuconfig_update everywhere instead of just on
+  mips. Mark 4.0.9 stable on x86 and ia64.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> sed-4.0.9.ebuild:
+  Stable on alpha.
+
+  08 Jun 2004; Stephen P. Becker <geoman@gentoo.org> sed-4.0.7.ebuild:
+  Added inherit gnuconfig to sed-4.0.7 for mips.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> sed-4.0.9.ebuild:
+  stable on amd64
+
+  16 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> sed-4.0.8.ebuild:
+  move inherit to the right place
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> sed-4.0.8.ebuild:
+  stable on amd64
+
+  16 Jan 2004; Joshua Kinard <kumba@gentoo.org> sed-4.0.5.ebuild,
+  sed-4.0.7.ebuild:
+  Added gnuconfig support for properly detecting mips systems and moved
+  sed-4.0.5 back into arm unstable to work around bad deps.
+
+*sed-4.0.9 (10 Jan 2004)
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org> sed-4.0.9.ebuild:
+  Version bumped.
+
+  10 Jan 2004; Martin Holzer <mholzer@gentoo.org> sed-4.0.5.ebuild,
+  sed-4.0.7.ebuild, sed-4.0.8.ebuild:
+  changing src to use mirror
+
+*sed-4.0.8 (01 Nov 2003)
+
+  21 Nov 2003; Joshua Kinard <kumba@gentoo.org> sed-4.0.8.ebuild:
+  Fixed typo in "inherit gnuconfig"
+
+  17 Nov 2003; Joshua Kinard <kumba@gentoo.org> sed-4.0.8.ebuild:
+  Added a gnuconfig tweak to detect mips systems properly
+
+  01 Nov 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.5-r1.ebuild,
+  sed-4.0.6.ebuild, sed-4.0.8.ebuild:
+  Bump, and cleanup unneeded
+  This is almost entirely a bugfix release, so please move to stable 
+  rapidly.
+
+*sed-4.0.7 (11 Apr 2003)
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> sed-4.0.7.ebuild :
+  ia64 keywords.
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> sed-4.0.7.ebuild :
+  Marked stable on hppa.
+
+  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> sed-4.0.7.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  26 Apr 2003; Christian Birchinger <joker@gentoo.org> sed-4.0.7.ebuild:
+  Added stable sparc keyword
+
+  18 Apr 2003; Aron Griffis <agriffis@gentoo.org> sed-4.0.7.ebuild:
+  Mark stable on alpha because otherwise bootstrap is failing due to a linking
+  problem with the older sed
+
+  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.7.ebuild:
+  Move to stable x86
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.7.ebuild:
+  Bump to latest GNU stable
+
+*sed-4.0.6 (24 Mar 2003)
+
+  02 Apr 2003; Guy Martin <gmsoft@gentoo.org> sed-4.0.6.ebuild :
+  Marked stable for hppa.
+
+  01 Apr 2003; Graham Forest <vladimir@gentoo.org> sed-4.0.6.ebuild:
+  set ppc in keywords
+
+  31 Mar 2003; Seemant Kulleen <seemant@gentoo.org> sed-4.0.6.ebuild:
+  changed use_enable to old style for the moment
+
+  28 Mar 2003; Christian Birchinger <joker@gentoo.org> sed-4.0.6.ebuild:
+  Added sparc stable keyword
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.6.ebuild:
+  This version should be stable, and fix some problems on non-x86 arches, please
+  test. Also test NLS and bootstrap builds
+
+  24 Mar 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.6.ebuild:
+  Bump to latest GNU stable
+
+*sed-4.0.5-r1 (04 Mar 2003)
+
+  05 May 2003; Jan Seidel <tuxus@gentoo.org> sed-4.0.5-r1.ebuild :
+  Marked stable on mips.
+
+  02 Apr 2003; Guy Martin <gmsoft@gentoo.org> sed-4.0.5-r1.ebuild :
+  Marked stable on hppa.
+
+  05 Mar 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.5-r1.ebuild:
+  Fix static use variables, and add appropriate die messages
+
+  04 Mar 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.5-r1.ebuild:
+  Add examples to installed docs
+
+  04 Mar 2003; Brandon Low <lostlogic@gentoo.org> sed-4.0.5-r1.ebuild :
+  Install nls files with sed, clean up the install for USE=build.
+  This is marked unstable on all arches, but can and should VERY quickly 
+  be moved to stable.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> sed-4.0.5.ebuild :
+  Added arm to keywords.
+
+  11 Feb 2003; Mark Guertin <gerk@gentoo.org> sed-4.0.5.ebuild :
+  Added ppc to keywords, beat on this extensively and it seems 
+  previous issues are resolved.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> sed-4.0.5.ebuild :
+  Added hppa to keywords.
+
+*sed-4.0.5 (22 Dec 2002)
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> sed-4.0.5.ebuild :
+  Mark as stable for mips.  Tidy up Changelog for echangelog support.
+
+  22 Dec 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.5.ebuild :
+  Stable
+
+  17 Dec 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.5.ebuild :
+  Another upstream bump.
+
+*sed-4.0.4 (13 Dec 2002)
+
+  13 Dec 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.4.ebuild :
+
+  Minor bug fix release over 4.0.3, unstable for a moment.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*sed-4.0.3 (20 Nov 2002)
+
+  20 Nov 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.3.ebuild :
+
+  Minor bug fix release over 4.0.2
+
+*sed-4.0.2 (20 Nov 2002)
+
+  20 Nov 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.2.ebuild :
+
+  Minor bug fix release over 4.0.1
+
+  12 Nov 2002; Mark Guertin <gerk@gentoo.org> sed-4.0.ebuild, sed-4.0.1.ebuild :
+  set both of these as -ppc.  PLEASE DONT UPGRADE TO STABLE WITHOUT TESTING.
+  There are problems with this version of sed on ppc, see bug #10325 for
+  details.
+
+*sed-4.0.1 (06 Nov 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  06 Nov 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.1.ebuild :
+
+  Minor bug fix release over 4.0.
+
+*sed-4.0 (27 Oct 2002)
+
+  27 Oct 2002; Brandon Low <lostlogic@gentoo.org> sed-4.0.ebuild :
+
+  The lovely people at gnu.org have blessed us with 4.0, so far I like
+  it.
+
+*sed-3.02.80-r3 (23 Aug 2002)
+
+  23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> sed-3.02.80-r3.ebuild :
+
+  Forced upgrade, so that people who got clobbered by supersed, will now
+  install this again.
+
+*sed-3.02.80-r2 (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> sed-3.02.80-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
 
 *sed-3.02.80-r3 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> sed-3.02.80-r3.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index adf26787c0d7..71bd4f6df9cf 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,11 +1,20 @@
-MD5 eba5e60712ff9499349f58d0f5ddf111 sed-4.0.6.ebuild 1152
-MD5 6ee85d78a6a6748f35ce9b32d6b05ada sed-4.0.5.ebuild 954
-MD5 eba5e60712ff9499349f58d0f5ddf111 sed-4.0.7.ebuild 1152
-MD5 4f9a8ae4b665dbfeaddb72b12dc7ef46 ChangeLog 4234
-MD5 2c6bc627ad547d2e936cad3935dfa5ef sed-4.0.5-r1.ebuild 1084
-MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7aa38153484ff3469e3bb8b4ee60bf1e ChangeLog 8997
+MD5 ceac4c4a3a356201f7540e95ab08408e sed-4.0.9.ebuild 1788
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7f9ff8769e644860e6be1eeeb5b4d680 sed-4.1.4.ebuild 2110
 MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
-MD5 9b3e86e395686a7671a545d114aa2dd2 files/digest-sed-4.0.5-r1 61
-MD5 9b3e86e395686a7671a545d114aa2dd2 files/digest-sed-4.0.5 61
-MD5 f13587e662841cb7a5b46170aaf85d1e files/digest-sed-4.0.6 61
-MD5 907f3c9e854e4367dffb4b9074c08056 files/digest-sed-4.0.7 61
+MD5 ef7b5747c59d83996a62825c915805cb files/digest-sed-4.1.4 61
+MD5 3ea67fdbcfe6288bb7e03a47b5801a04 files/sed-4.1.4-makeinfo-c-locale.patch 617
+MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
+MD5 a244109e1adcbd40a02446fb23df33c1 files/digest-sed-4.0.9 61
+MD5 c78a7215447859226a24305ab7eebb24 files/sed-4.1.4-fix-invalid-ref-error.patch 574
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+OuHj5H05b2HAEkRAtt4AJ4pyb0IRia6Qnb4+2LEr0saEhdf5gCbBn/Y
+0O1HHJVqMX+LepE3A4QZE20=
+=caQt
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/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-apps/sed/sed-4.0.9.ebuild b/sys-apps/sed/sed-4.0.9.ebuild
index bc95fa995ebb..408aeb14e44e 100644
--- a/sys-apps/sed/sed-4.0.9.ebuild
+++ b/sys-apps/sed/sed-4.0.9.ebuild
@@ -1,53 +1,79 @@
-# Copyright 1999-2004 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-apps/sed/sed-4.0.9.ebuild,v 1.1 2004/01/10 22:59:10 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.0.9.ebuild,v 1.1.1.1 2005/11/30 09:56:11 chriswhite Exp $
+
+inherit gnuconfig flag-o-matic
 
 DESCRIPTION="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/"
 SRC_URI="mirror://gnu/sed/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/sed/sed.html"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64 ~ppc64"
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="nls static build"
-
-inherit gnuconfig
+SLOT="0"
+KEYWORDS="alpha arm amd64 hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
+IUSE="nls static build bootstrap"
 
-DEPEND="virtual/glibc
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
-	local myconf
-
-	# Allow sed to detect mips systems properly
-	use mips && gnuconfig_update
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
 
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
+src_compile() {
+	# make sure system-sed works #40786
+	export NO_SYS_SED=""
+	if ! use bootstrap && ! use build ; then
+		if ! type -p sed ; then
+			NO_SYS_SED="!!!"
+			./bootstrap.sh || die "couldnt bootstrap"
+			cp sed/sed ${T}/ || die "couldnt copy"
+			export PATH="${PATH}:${T}"
+		fi
+	fi
 
-	econf ${myconf} || die "Configure failed"
-	if [ -z `use static` ] ; then
-		emake || die "Shared build failed"
-	else
-		emake LDFLAGS=-static || die "Static build failed"
+	local myconf=""
+	use ppc-macos && myconf="--program-prefix=g"
+	econf \
+		$(use_enable nls) \
+		${myconf} \
+		|| die "Configure failed"
+	if [ ! -z "${NO_SYS_SED}" ] ; then
+		make clean || die "couldnt clean"
 	fi
+
+	use static && append-ldflags -static
+	emake LDFLAGS="${LDFLAGS}" || die "build failed"
 }
 
 src_install() {
+	[ ! -z "${NO_SYS_SED}" ] && export PATH="${PATH}:${T}"
+
 	into /
-	dobin sed/sed
-	if [ -z "`use build`" ]
+	dobin sed/sed || die "dobin"
+	if ! use build
 	then
 		einstall || die "Install failed"
-		dodoc COPYING NEWS README* THANKS TODO AUTHORS BUGS ANNOUNCE ChangeLog
+		dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
 		docinto examples
-		dodoc ${FILESDIR}/dos2unix ${FILESDIR}/unix2dos
-
+		dodoc "${FILESDIR}/dos2unix" "${FILESDIR}/unix2dos"
 	else
 		dodir /usr/bin
 	fi
 
-	rm -f ${D}/usr/bin/sed
-	dosym ../../bin/sed /usr/bin/sed
+	rm -f "${D}/usr/bin/sed"
+	if use ppc-macos ; then
+		cd "${D}"
+		local x
+		for x in $(find . -name 'sed*' -print);
+		do
+			mv "$x" "${x//sed/gsed}"
+		done
+		dosym ../../bin/gsed /usr/bin/gsed
+	else
+		dosym ../../bin/sed /usr/bin/sed
+	fi
 }
diff --git a/sys-apps/sed/sed-4.1.4.ebuild b/sys-apps/sed/sed-4.1.4.ebuild
index 1cf4fca8202c..d457c1e7bf66 100644
--- a/sys-apps/sed/sed-4.1.4.ebuild
+++ b/sys-apps/sed/sed-4.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-apps/sed/sed-4.1.4.ebuild,v 1.1 2005/02/19 18:26:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.4.ebuild,v 1.1.1.1 2005/11/30 09:56:11 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://gnu/sed/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha arm amd64 hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="nls static build bootstrap"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
@@ -35,24 +35,41 @@ src_bootstrap_cleanup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makeinfo-c-locale.patch
+	epatch "${FILESDIR}"/${P}-fix-invalid-ref-error.patch
+	sed -i \
+		-e "/docdir =/s:/doc:/doc/${PF}/html:" \
+		doc/Makefile.in || die "sed html doc"
+}
+
 src_compile() {
 	src_bootstrap_sed
 
 	local myconf=""
-	use ppc-macos && myconf="--program-prefix=g"
+	if ! use userland_GNU; then
+		myconf="--program-prefix=g"
+	fi
 	econf \
 		$(use_enable nls) \
 		${myconf} \
 		|| die "Configure failed"
 
-	src_bootstrap_sed
+	src_bootstrap_cleanup
 	use static && append-ldflags -static
 	emake LDFLAGS="${LDFLAGS}" || die "build failed"
 }
 
 src_install() {
 	into /
-	dobin sed/sed || die "dobin"
+	if ! use userland_GNU; then
+		newbin sed/sed gsed || die "dobin"
+	else
+		dobin sed/sed || die "dobin"
+	fi
+
 	if ! use build ; then
 		make install DESTDIR="${D}" || die "Install failed"
 		dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
@@ -62,15 +79,13 @@ src_install() {
 		dodir /usr/bin
 	fi
 
-	rm -f "${D}"/usr/bin/sed
-	if use ppc-macos ; then
+	if ! use userland_GNU; then
 		cd "${D}"
-		local x
-		for x in $(find . -name 'sed*' -print) ; do
-			mv "$x" "${x//sed/gsed}"
-		done
+		rm -f "${D}"/usr/bin/gsed
 		dosym /bin/gsed /usr/bin/gsed
+		rm "${D}"/usr/lib/charset.alias "${D}"/usr/share/locale/locale.alias
 	else
+		rm -f "${D}"/usr/bin/sed
 		dosym /bin/sed /usr/bin/sed
 	fi
 }
diff --git a/sys-apps/setserial/ChangeLog b/sys-apps/setserial/ChangeLog
index c7e0500fc67f..cca7ffde3ed4 100644
--- a/sys-apps/setserial/ChangeLog
+++ b/sys-apps/setserial/ChangeLog
@@ -1,9 +1,32 @@
 # ChangeLog for sys-apps/setserial
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/ChangeLog,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
+*setserial-2.17-r3 (21 Feb 2005)
+
+  21 Feb 2005; Mike Frysinger <vapier@gentoo.org> +files/serial,
+  +files/setserial-2.17-manpage-updates.patch,
+  +files/setserial-2.17-spelling.patch, -setserial-2.17-r2.ebuild,
+  +setserial-2.17-r3.ebuild:
+  Move the init.d script out of baselayout and touchup the manpage #81946.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  setserial-2.17-r2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> setserial-2.17-r2.ebuild:
+  adding initial s390 support
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> setserial-2.17-r2.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *setserial-2.17-r2 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> setserial-2.17-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index e69de29bb2d1..939d4d52df10 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -0,0 +1,7 @@
+MD5 e23d74c2192a3308ac0c8cc916c67293 ChangeLog 1502
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 f5906cab88b80916b9681b8ba7b399d5 setserial-2.17-r3.ebuild 967
+MD5 0682f2f5228b0463da3d2405a301c132 files/setserial-2.17-spelling.patch 283
+MD5 33e5a769e532d070876a18ece512dd2f files/setserial-2.17-manpage-updates.patch 1041
+MD5 4a3c53fc994998ba959e123b697d6d97 files/serial 1041
+MD5 752580a351299fe15119ebcdaa13b3ea files/digest-setserial-2.17-r3 65
diff --git a/sys-apps/setserial/files/serial b/sys-apps/setserial/files/serial
index d1b35dbf1c18..77e0892a2d61 100755
--- a/sys-apps/setserial/files/serial
+++ b/sys-apps/setserial/files/serial
@@ -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/sys-apps/setserial/files/serial,v 1.1 2005/02/21 15:53:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/files/serial,v 1.1.1.1 2005/11/30 09:56:01 chriswhite Exp $
 
 depend() {
 	need localmount
diff --git a/sys-apps/setserial/metadata.xml b/sys-apps/setserial/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/setserial/metadata.xml
+++ b/sys-apps/setserial/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-apps/setserial/setserial-2.17-r3.ebuild b/sys-apps/setserial/setserial-2.17-r3.ebuild
index f022ade20bc7..69745e74fcac 100644
--- a/sys-apps/setserial/setserial-2.17-r3.ebuild
+++ b/sys-apps/setserial/setserial-2.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/sys-apps/setserial/setserial-2.17-r3.ebuild,v 1.1 2005/02/21 15:53:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/sg3_utils/ChangeLog b/sys-apps/sg3_utils/ChangeLog
index 4298a0afc685..aad73a530a2d 100644
--- a/sys-apps/sg3_utils/ChangeLog
+++ b/sys-apps/sg3_utils/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for sys-apps/sg3_utils
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.1 2004/02/10 22:33:46 plasmaroo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/ChangeLog,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
+
+  31 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> sg3_utils-1.11.ebuild:
+  Stable on sparc
+
+*sg3_utils-1.15 (06 Jun 2005)
+
+  06 Jun 2005; Mike Frysinger <vapier@gentoo.org> +sg3_utils-1.15.ebuild:
+  Version bump and clean up stupid RPATH.
+
+*sg3_utils-1.11 (28 Nov 2004)
+
+  28 Nov 2004; <plasmaroo@gentoo.org> -sg3_utils-1.10.ebuild,
+  +sg3_utils-1.11.ebuild:
+  Version bump, bug #72575.
+
+*sg3_utils-1.10 (07 Nov 2004)
+
+  07 Nov 2004; <plasmaroo@gentoo.org> -sg3_utils-1.06.ebuild,
+  sg3_utils-1.08.ebuild, +sg3_utils-1.10.ebuild:
+  Added "Contains rescan_scsi_bus." to ${DESCRIPTION} and added 1.10 - bugs
+  #70012, #70019. Marked 1.08 stable on x86.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> sg3_utils-1.08.ebuild:
+  Added to ~ppc.
+
+*sg3_utils-1.08 (14 Aug 2004)
+
+  14 Aug 2004; <plasmaroo@gentoo.org> -sg3_utils-1.07.ebuild,
+  +sg3_utils-1.08.ebuild:
+  1.07 is broken on 2.4 headers; 1.08 seems to rectify this issue.
+
+*sg3_utils-1.07 (13 Aug 2004)
+
+  13 Aug 2004; <plasmaroo@gentoo.org> +sg3_utils-1.07.ebuild:
+  Version bump, also added Kurt Garloff's rescan-scsi-bus.sh script by request.
+
+  09 Aug 2004; <plasmaroo@gentoo.org> sg3_utils-1.06.ebuild,
+  +files/sg3_utils-llseek.patch:
+  Added a patch to solve PIC issues; bug #59832.
+
+  09 Aug 2004; Travis Tilley <lv@gentoo.org> sg3_utils-1.06.ebuild:
+  Added ~amd64 keyword.
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> sg3_utils-1.06.ebuild:
+  Added ~sparc keyword.
 
 *sg3_utils-1.06 (10 Feb 2004)
 
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 32bda1ab51d2..4fb87651fb38 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,4 +1,19 @@
-MD5 50117d7ce317218fb4a744917113caa9 sg3_utils-1.06.ebuild 588
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c961881764f66b8f51ee5049c2d246fc sg3_utils-1.11.ebuild 871
+MD5 eae70fd0e48273e4a0443cfa34919c44 sg3_utils-1.15.ebuild 954
+MD5 d5959d5cb2439b78b3c1d20fc555f047 sg3_utils-1.08.ebuild 938
+MD5 ec0f8a991b8b52f84941270689694a62 ChangeLog 1776
 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228
-MD5 4658c725c54b83ad3bbf5bdef3e72d5b ChangeLog 351
-MD5 3af5fc8f087f13f98ea90cc5b007690f files/digest-sg3_utils-1.06 63
+MD5 415ccd09bf2a67e4ccc39d50059b8c14 files/sg3_utils-llseek.patch 1948
+MD5 e309d737cc7ca64e5d5beb764d1ba316 files/digest-sg3_utils-1.08 124
+MD5 3fcc23751b641786325f54e9df3fca05 files/digest-sg3_utils-1.11 124
+MD5 8dcedd2980cb1b56ed8e0a60b13f8c48 files/digest-sg3_utils-1.15 124
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDFbPgKRy60XGEcJIRAg+SAJ9qhhGSEW48PsTouIihxI+EdEjsdACePYwy
+KhGH9skIxaw0DxVv9HVgijY=
+=R2g3
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sg3_utils/sg3_utils-1.08.ebuild b/sys-apps/sg3_utils/sg3_utils-1.08.ebuild
index 2882b95e71d2..9626187ac1b8 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.08.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.08.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/sys-apps/sg3_utils/sg3_utils-1.08.ebuild,v 1.1 2004/08/14 22:48:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.08.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface"
+DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface. Contains rescan_scsi_bus.sh."
 HOMEPAGE="http://www.torque.net/sg/"
 SRC_URI="http://www.torque.net/sg/p/${P}.tgz
 	http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh"
@@ -12,7 +12,7 @@ SRC_URI="http://www.torque.net/sg/p/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/sg3_utils/sg3_utils-1.11.ebuild b/sys-apps/sg3_utils/sg3_utils-1.11.ebuild
index 650ef5c28fe7..4e6c3cdc4b97 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.11.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.11.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.11.ebuild,v 1.1 2004/11/28 19:16:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.11.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils
 
-DESCRIPTION="Sg3_utils provide a collection of programs that use the sg SCSI interface. Contains rescan_scsi_bus.sh."
+DESCRIPTION="apps for querying the sg SCSI interface (contains rescan_scsi_bus.sh)"
 HOMEPAGE="http://www.torque.net/sg/"
 SRC_URI="http://www.torque.net/sg/p/${P}.tgz
 	http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh"
 
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 DEPEND=""
 
 src_unpack() {
 	unpack ${P}.tgz
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-llseek.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-llseek.patch
 	sed -i "s:-O2:$CFLAGS:g" Makefile
 }
 
@@ -30,7 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe ${DISTDIR}/rescan-scsi-bus.sh || die 'Failed to install rescan-scsi-bus.sh!'
-	einstall DESTDIR=${D} PREFIX=/usr || die 'Failed to install sg3_utils!'
+	dobin ${DISTDIR}/rescan-scsi-bus.sh || die 'Failed to install rescan-scsi-bus.sh!'
+	einstall DESTDIR="${D}" PREFIX=/usr || die 'Failed to install sg3_utils!'
 }
diff --git a/sys-apps/sg3_utils/sg3_utils-1.15.ebuild b/sys-apps/sg3_utils/sg3_utils-1.15.ebuild
index fe72dd533426..1e08760a6e4e 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.15.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.15.ebuild,v 1.1 2005/06/06 22:16:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sg3_utils/sg3_utils-1.15.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 		-e "s:-g -O2:${CFLAGS}:g" \
 		-e '/^PREFIX=/s:/local::' \
 		-e 's:$(DESTDIR)/:$(DESTDIR):' \
+		-e 's:/man:/share/man:' \
 		Makefile
 }
 
diff --git a/sys-apps/sh-utils/ChangeLog b/sys-apps/sh-utils/ChangeLog
index 24a872c7ccc5..91bc5c16c715 100644
--- a/sys-apps/sh-utils/ChangeLog
+++ b/sys-apps/sh-utils/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for sys-apps/sh-utils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:26 chriswhite Exp $
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> sh-utils-2.0.15.ebuild:
+  QA - fix use invocation
+
+  19 Apr 2004; Michael McCabe <randy@gentoo.org> sh-utils-2.0.15-r1.ebuild:
+  Added s390 keywords
+
+  24 Jan 2004; <gustavoz@gentoo.org> sh-utils-2.0.15-r1.ebuild:
+  stable on sparc - less than -r1 can cause problems
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> sh-utils-2.0.15-r1.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> sh-utils-2.0.15-r1.ebuild:
+  Marked stable on hppa.
+
+  01 Oct 2003; Aron Griffis <agriffis@gentoo.org> sh-utils-2.0.15-r1.ebuild:
+  Stable on alpha to handle the coreutils changeover (see bug 30032)
+
+*sh-utils-2.0.15-r1 (18 Jul 2003)
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org> sh-utils-2.0.11-r4.ebuild,
+  sh-utils-2.0.11-r5.ebuild, sh-utils-2.0.15-r1.ebuild:
+  upgrade to coreutils
+
+*sh-utils-2.0.15 (24 Aug 2002)
+
+  23 Jun 2003; Joshua Kinard <kumba@gentoo.org> files/sh-utils-2.0.15-gentoo.diff:
+  Tweaked patch so 'uname -a' on MIPS systems accurately displays cpuinfo
+  It looked for "processor" when it should be looking for "cpu model" in /proc/cpuinfo
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> sh-utils-2.0.15.ebuild :
+  Not applying patch for arm because it breaks uname.
+  Added arm to keywords.
+
+  11 Feb 2003; Guy Martin <gmsoft@gentoo.org> sh-utils-2.0.15.ebuild :
+  Not applying patch for hppa because it breaks uname.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> sh-utils-2.0.15.ebuild :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org>
+  files/sh-utils-2.0.15-gentoo.diff :
+
+  upgraded the diff with Carlos's new version which he e-mailed to me today.
+  The second "unknown" is now gone.
+
+  27 Aug 2002; Seemant Kulleen <seemant@gentoo.org>
+  files/sh-utils-2.0.15-gentoo.diff :
+
+  upgraded the diff to Carlos Georges' version. Still in beta, so more
+  updates to that patch expected.
+
+  24 Aug 2002; Joachim Blaabjerg <styx@gentoo.org> sh-utils-2.0.15.ebuild :
+
+  Version bump, finally wrote a new uname.c patch. Even looks like it works.
+  Fixes bug #6579, masked for testing.
+
+*sh-utils-2.0.14 (14 Aug 2002)
+
+  14 Aug 2002; Seemant Kulleen <seemant@gentoo.org> sh-utils-2.0.14.ebuild :
+
+  Version bump, as requested by: klebermass@limtec.de (Martin Klebermass) in
+  bug #6035.  The uname function has undergone some changes, so while this
+  is masked for testing, I am waiting for a patch from Carlos for uname.
+
+*sh-utils-2.0.11-r5 (21 Jun 2002)
+
+  09 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
+  files/sh-utils-2.0.11-gentoo.patch :
+
+  Added one line to the Carlos E Gorges <carlos@techlinux.com.br> patch to
+  show correct output for ppc as well.
+
+  21 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Remove /usr/bin/hostname to install if "build" in USE, as it do not get
+  removed during "emerge system", and breaks some packages (gnome2 among
+  things).
+
+  06 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : updated the mtime of
+  src/uname.c in order to thwart a perl dependency (bad mtime was triggering
+  man page regeneration, creating a perl dep and breaking new build image
+  creation)
+
+*sh-utils-2.0.11-r4 (20 Mar 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> sh-utils-2.0.11-r4.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  20 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sh-utils-2.0.11-r4.ebuild :
+
+  Found an updated patch for processor name in uname output from digiwano in
+  #fluxbox and LKML.  New patch in ${FILESDIR} combines this and the rant-patch.
+  Now this should compile cleanly with "-* build" as well as normally.
+
+*sh-utils-2.0.11-r3 (18 Mar 2002)
+
+  18 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sh-utils-2.0.11-r3.ebuild :
+
+  Patch in ${FILESDIR} removes RMS's rant about su and the wheel group and
+  fascism.
+
+*sh-utils-2.0.11-r2 (12 Mar 2002)
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sh-utils-2.0.11-r2.ebuild :
+
+  Added a patch to uname.c from the nuname package.  This allows display in the
+  uname output of more kinds of processors (AuthenticAMD, Cyrix, and possibly
+  Alpha, even though Gentoo does not exist for Alphas yet :).
 
 *sh-utils-2.0.11-r1 (1 Feb 2002)
 
diff --git a/sys-apps/sh-utils/Manifest b/sys-apps/sh-utils/Manifest
index e69de29bb2d1..f70c1e06abf2 100644
--- a/sys-apps/sh-utils/Manifest
+++ b/sys-apps/sh-utils/Manifest
@@ -0,0 +1,8 @@
+MD5 e69d303af9f75b33c0f1d2b8959c0f36 sh-utils-2.0.15.ebuild 2286
+MD5 5f9179ad3d3168736729083de76e81bd sh-utils-2.0.15-r1.ebuild 490
+MD5 b815112851c9ab47b9157a4f41d72c65 ChangeLog 4973
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 b0454d28beed9edd23c9facdd154174f files/sh-utils-2.0.15-gentoo.diff 2585
+MD5 3862186589a94a3a12eec30eb838bd0a files/sh-utils-2.0.11-gentoo.diff 3922
+MD5 5fdc646eb14d3f40c0a6f81eb897d339 files/digest-sh-utils-2.0.15 68
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sh-utils-2.0.15-r1 0
diff --git a/sys-apps/sh-utils/files/sh-utils-2.0.11-gentoo.diff b/sys-apps/sh-utils/files/sh-utils-2.0.11-gentoo.diff
index 6d7d5fa13af5..6d5519b3dc49 100644
--- a/sys-apps/sh-utils/files/sh-utils-2.0.11-gentoo.diff
+++ b/sys-apps/sh-utils/files/sh-utils-2.0.11-gentoo.diff
@@ -1,5 +1,6 @@
---- sh-utils.texi	Mon Mar 18 04:50:39 2002
-+++ sh-utils.texi.new	Mon Mar 18 04:56:40 2002
+diff -ur ./doc/sh-utils.texi ./doc/sh-utils.texi.new
+--- ./doc/sh-utils.texi	Wed Oct 18 13:42:43 2000
++++ ./doc/sh-utils.texi.new	Wed Mar 20 20:15:13 2002
 @@ -47,7 +47,6 @@
  * seq: (sh-utils)seq invocation.                Print numeric sequences
  * sleep: (sh-utils)sleep invocation.            Delay for a specified time.
@@ -52,3 +53,64 @@
  @node Delaying
  @chapter Delaying
  
+diff -ur ./src/uname.c ./src/uname.c.new
+--- ./src/uname.c	Sat May  6 07:17:53 2000
++++ ./src/uname.c.new	Wed Mar 20 20:15:43 2002
+@@ -48,6 +48,7 @@
+ #define AUTHORS "David MacKenzie"
+ 
+ static void print_element PARAMS ((unsigned int mask, char *element));
++void __sysinfo_processor_type(char*);
+ 
+ /* Values that are bitwise or'd into `toprint'. */
+ /* Operating system name. */
+@@ -118,7 +119,7 @@
+ {
+   struct utsname name;
+   int c;
+-  char processor[256];
++  char processor[BUFSIZ];
+ 
+   program_name = argv[0];
+   setlocale (LC_ALL, "");
+@@ -183,12 +184,7 @@
+   if (uname (&name) == -1)
+     error (1, errno, _("cannot get system name"));
+ 
+-#if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE)
+-  if (sysinfo (SI_ARCHITECTURE, processor, sizeof (processor)) == -1)
+-    error (1, errno, _("cannot get processor type"));
+-#else
+-  strcpy (processor, "unknown");
+-#endif
++  __sysinfo_processor_type(processor);
+ 
+   print_element (PRINT_SYSNAME, name.sysname);
+   print_element (PRINT_NODENAME, name.nodename);
+@@ -213,3 +209,25 @@
+       printf ("%s%c", element, toprint ? ' ' : '\n');
+     }
+ }
++
++
++/* Carlos E. Gorges
++return vendor_id from proc cpuinfo
++*/
++
++void
++__sysinfo_processor_type (char* proc_info) {
++	FILE *ffd;
++	char temp_string[BUFSIZ],final_string[BUFSIZ]="unknown";
++	
++	if ((ffd=fopen("/proc/cpuinfo", "r") )!=NULL) {
++		while ( fscanf(ffd, "%s :", temp_string) != EOF)
++			if ( (!(strcmp(temp_string, "vendor_id"))) || 
++				(!(strcmp(temp_string, "machine" ))) ) {
++					fscanf(ffd, "%s", final_string);
++					break;
++			}
++		fclose(ffd);
++	}
++	strncpy(proc_info,final_string,BUFSIZ);
++}
++
diff --git a/sys-apps/sh-utils/files/sh-utils-2.0.15-gentoo.diff b/sys-apps/sh-utils/files/sh-utils-2.0.15-gentoo.diff
index dfc8cf067342..d102022e1c61 100644
--- a/sys-apps/sh-utils/files/sh-utils-2.0.15-gentoo.diff
+++ b/sys-apps/sh-utils/files/sh-utils-2.0.15-gentoo.diff
@@ -1,104 +1,120 @@
-diff -Naurb sh-utils-2.0.15/src/uname.c sh-utils-2.0.15-fixed/src/uname.c
---- sh-utils-2.0.15/src/uname.c	Thu Jul 18 20:32:33 2002
-+++ sh-utils-2.0.15-fixed/src/uname.c	Sat Aug 24 18:47:00 2002
-@@ -81,6 +81,9 @@
- /* The name this program was run with, for error messages. */
- char *program_name;
+--- sh-utils-2.0.15/src/uname.c	Thu Jul 18 15:32:33 2002
++++ sh-utils-2.0.15-carlos/src/uname.c	Wed Sep  4 15:02:01 2002
+@@ -44,6 +44,11 @@
+ # endif
+ #endif
  
-+/* Prototype for __sysinfo_processor_type */
-+void __sysinfo_processor_type (char *proc_info);
++#if defined (__linux__)
++#define USE_PROCINFO	
++#define UNAME_HARDWARE_PLATFORM
++#endif
 +
- static struct option const long_options[] =
- {
-   {"all", no_argument, NULL, 'a'},
-@@ -120,7 +123,6 @@
-   -v, --kernel-version     print the kernel version\n\
-   -m, --machine            print the machine hardware name\n\
-   -p, --processor          print the processor type\n\
--  -i, --hardware-platform  print the hardware platform\n\
-   -o, --operating-system   print the operating system\n\
- "), stdout);
-       fputs (HELP_OPTION_DESCRIPTION, stdout);
-@@ -193,10 +195,6 @@
- 	  toprint |= PRINT_PROCESSOR;
- 	  break;
+ #include "system.h"
+ #include "error.h"
+ #include "closeout.h"
+@@ -130,6 +135,65 @@
+   exit (status);
+ }
+ 
++/* Carlos E. Gorges <carlos@techlinux.com.br> - return vendor_id from proc cpuinfo */
++#if defined(USE_PROCINFO)
++/* x==0, processor type | x==1, hardware-platform */
++int
++__linux_procinfo (int x, char *fstr) 
++{
++	FILE *ffd;
++	char 	*cstr=calloc(64,sizeof(char)),
++		*dstr=calloc(257,sizeof(char)),
++		*retr=NULL;
++
++	if ( ffd=fopen("/proc/cpuinfo", "r") )
++	{
++		while ( fscanf(ffd, "%[^:\t]\t: %[^\n]\n", cstr, dstr) != EOF )
++		{
++			char *sdata[] = 
++			{
++				#if defined(__i386__)
++					"model name", "vendor_id"
++				#endif
++				#if defined(__ia64__) || defined(__x86_64__)
++					"model", "vendor"
++				#endif
++				#if defined(__alpha__)
++					"cpu model", "???"
++				#endif
++				#if defined(sparc) || defined(__sparc__)
++					"type", "cpu"
++				#endif
++				#if defined(__mips__)
++					"cpu model", "system type"
++				#endif
++				#if defined(PPC)
++					"processor", "cpu"
++				#endif
++			};
++				
++			if(!retr)
++			{
++				if (!strcmp(cstr, sdata[x])) 
++						retr = strdup(dstr);
++			} else
++				break;
++			
++		}
++		fclose(ffd);
++
++		if(retr)
++		{
++			strncpy(fstr,retr,257);
++			return 1;
++		}
++	}
++	return 0;
++}
++
++#endif
++
++
+ /* Print ELEMENT, preceded by a space if something has already been
+    printed.  */
  
--	case 'i':
--	  toprint |= PRINT_HARDWARE_PLATFORM;
--	  break;
--
- 	case 'o':
- 	  toprint |= PRINT_OPERATING_SYSTEM;
- 	  break;
-@@ -240,15 +238,13 @@
+@@ -240,13 +304,19 @@
    if (toprint & PRINT_PROCESSOR)
      {
        char const *element = unknown;
 -#if HAVE_SYSINFO && defined SI_ARCHITECTURE
++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
        {
--	static char processor[257];
--	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+		static char processor[BUFSIZ];
-+		__sysinfo_processor_type(processor);
+ 	static char processor[257];
++#if HAVE_SYSINFO && defined SI_ARCHITECTURE
+ 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
++#endif
++#if defined(USE_PROCINFO)
++	if( 0 <= __linux_procinfo(0, processor))
++#endif
  	  element = processor;
        }
--#endif
+ #endif
++
  #ifdef UNAME_PROCESSOR
--      if (element == unknown)
-+      if (element == "unknown")
+       if (element == unknown)
  	{
- 	  static char processor[257];
- 	  size_t s = sizeof processor;
-@@ -260,30 +256,6 @@
-       print_element (element);
-     }
- 
--  if (toprint & PRINT_HARDWARE_PLATFORM)
--    {
--      char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_PLATFORM
--      {
--	static char hardware_platform[257];
--	if (0 <= sysinfo (SI_PLATFORM,
--			  hardware_platform, sizeof hardware_platform))
--	  element = hardware_platform;
--      }
--#endif
--#ifdef UNAME_HARDWARE_PLATFORM
--      if (element == unknown)
--	{
--	  static char hardware_platform[257];
--	  size_t s = sizeof hardware_platform;
--	  static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
--	  if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
--	    element = hardware_platform;
--	}
--#endif
--      print_element (element);
--    }
--
-   if (toprint & PRINT_OPERATING_SYSTEM)
-     print_element (HOST_OPERATING_SYSTEM);
- 
-@@ -291,3 +263,21 @@
+@@ -275,9 +345,13 @@
+       if (element == unknown)
+ 	{
+ 	  static char hardware_platform[257];
++#if ! defined (USE_PROCINFO)
+ 	  size_t s = sizeof hardware_platform;
+ 	  static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
+ 	  if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
++#else
++	  if( 0 <= __linux_procinfo(1, hardware_platform))
++#endif
+ 	    element = hardware_platform;
+ 	}
+ #endif
+@@ -291,3 +365,4 @@
  
    exit (0);
  }
 +
-+/* Originally written by Carlos Gorges, ported to 2.0.15 by <styx@gentoo.org>
-+ * Return return vendor_id from proc cpuinfo */
-+void __sysinfo_processor_type (char *proc_info) {
-+	FILE *ffd;
-+	char temp_string[BUFSIZ], final_string[BUFSIZ] = "unknown";
-+
-+	if((ffd=fopen("/proc/cpuinfo", "r")) != NULL) {
-+		while(fscanf(ffd, "%s :", temp_string) != EOF)
-+			if((!(strcmp(temp_string, "vendor_id"))) ||
-+				(!(strcmp(temp_string, "machine" )))) {
-+					fscanf(ffd, "%s", final_string);
-+					break;
-+			}
-+		fclose(ffd);
-+	}
-+	strncpy(proc_info, final_string, BUFSIZ);
-+}
diff --git a/sys-apps/sh-utils/metadata.xml b/sys-apps/sh-utils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/sh-utils/metadata.xml
+++ b/sys-apps/sh-utils/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-apps/sh-utils/sh-utils-2.0.15-r1.ebuild b/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild
index 5ef57017e060..4673aa1d2bd3 100644
--- a/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0.15-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/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild,v 1.1 2003/07/18 12:49:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:26 chriswhite Exp $
 
 DESCRIPTION="textutils, sh-utils and fileutils moved to coreutils"
 HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
 
-DEPEND="sys-apps/coreutils"
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ppc64 s390"
+IUSE=""
+
+DEPEND=">=sys-apps/coreutils-5.0-r3"
diff --git a/sys-apps/sh-utils/sh-utils-2.0.15.ebuild b/sys-apps/sh-utils/sh-utils-2.0.15.ebuild
index 8b8d20969518..d4215659f8d3 100644
--- a/sys-apps/sh-utils/sh-utils-2.0.15.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0.15.ebuild
@@ -1,8 +1,9 @@
-# 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-apps/sh-utils/sh-utils-2.0.15.ebuild,v 1.1 2002/08/24 22:18:57 styx Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.15.ebuild,v 1.1.1.1 2005/11/30 09:56:26 chriswhite Exp $
+
+IUSE="nls static build"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Your standard GNU shell utilities"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
@@ -11,7 +12,7 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc alpha mips hppa "
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -19,11 +20,14 @@ src_unpack() {
 
 	# patch to remove Stallman's su/wheel group rant and to add processor
 	# information in uname output
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
-	#rm doc/coreutils.info
-	#This next line prevents our patched (and updated-mtime) uname.c from forcing a
-	#uname.1 man page regeneration, which requires perl (not available when creating
-	#a new build image... and we don't want this package dependent on perl anyway.
+
+	# note: this patch is b0rked on hppa and arm  -- gm and ztw
+	use hppa || use arm || patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
+
+	# This next line prevents our patched (and updated-mtime) uname.c
+	# from forcing a uname.1 man page regeneration, which requires perl
+	# (not available when creating a new build image... and we don't want
+	# this package dependent on perl anyway.
 	#This problem can be fixed by fixing our patch at a future date.
 	touch -d "20 Aug 1999" src/uname.c
 }
@@ -31,13 +35,13 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
-	
+
 	CFLAGS="${CFLAGS}" \
 		econf \
 			--without-included-regex \
 			${myconf} || die
-	
-	if [ -z "`use static`" ]
+
+	if ! use static
 	then
 		emake || die
 	else
@@ -47,13 +51,13 @@ src_compile() {
 
 src_install() {
 	einstall || die
-		
+
 	rm -rf ${D}/usr/lib
 	dodir /bin
 	cd ${D}/usr/bin
 	mv date echo false pwd stty su true uname sleep ${D}/bin
 
-	if [ -z "`use build`" ]
+	if ! use build
 	then
 		cd ${S}
 		dodoc AUTHORS COPYING ChangeLog ChangeLog.0 NEWS README THANKS TODO
@@ -65,10 +69,10 @@ src_install() {
 	rm ${D}/usr/bin/hostname
 	#we use the /bin/su from the sys-apps/shadow package
 	rm ${D}/bin/su
-	rm ${D}/usr/share/man/man1/su.1.gz
+	rm ${D}/usr/share/man/man1/su*
 	#we use the /usr/bin/uptime from the sys-apps/procps package
 	rm ${D}/usr/bin/uptime
-	rm ${D}/usr/share/man/man1/uptime.1.gz
+	rm ${D}/usr/share/man/man1/uptime*
 }
 
 pkg_postinst() {
@@ -79,4 +83,3 @@ pkg_postinst() {
 		rm -f ${ROOT}/usr/bin/hostname
 	fi
 }
-
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index f4f4fa52f519..9f31112bac84 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,625 @@
 # ChangeLog for sys-apps/shadow
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.1.1.1 2005/11/30 09:57:03 chriswhite Exp $
+
+*shadow-4.0.13 (10 Oct 2005)
+
+  10 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.13-dots-in-usernames.patch,
+  +files/shadow-4.0.13-login.defs.patch,
+  +files/shadow-4.0.13-long-groupnames.patch,
+  +files/shadow-4.0.13-nonis.patch,
+  +files/shadow-4.0.13-su-fix-environment.patch, +shadow-4.0.13.ebuild:
+  Version bump.
+
+  24 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.12-gcc2.patch, shadow-4.0.12.ebuild:
+  Fix compiling with gcc-2.95.x
+
+*shadow-4.0.12 (23 Aug 2005)
+
+  23 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.12-dots-in-usernames.patch,
+  +files/shadow-4.0.12-long-groupnames.patch, +shadow-4.0.12.ebuild:
+  Version bump.
+
+  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> shadow-4.0.7-r3.ebuild:
+  Stable on mips.
+
+*shadow-4.0.11.1-r2 (04 Aug 2005)
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.11.1-su-fix-environment.patch,
+  +shadow-4.0.11.1-r2.ebuild:
+  Patch from upstream enables the new environment too early for PAM, causing
+  segfaults in some cases.
+
+*shadow-4.0.11.1-r1 (03 Aug 2005)
+
+  03 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.11.1-SUPATH.patch,
+  +files/shadow-4.0.11.1-ngettext.patch,
+  +files/shadow-4.0.11.1-uclibc-missing-l64a.patch,
+  +shadow-4.0.11.1-r1.ebuild:
+  Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047).
+  Fix building on UCLIBC.
+
+*shadow-4.0.11.1 (01 Aug 2005)
+
+  01 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.11.1-perms.patch, +shadow-4.0.11.1.ebuild:
+  Update version. Remove login.access, related manpages, etc for PAM enabled,
+  as its not used.
+
+*shadow-4.0.7-r4 (25 Jul 2005)
+
+  25 Jul 2005; <solar.@gentoo.org> +files/shadow-4.0.7-perms.patch,
+  shadow-4.0.10.ebuild, +shadow-4.0.7-r4.ebuild:
+  - added no /usr/bin suid option as local use flag nousuid for single user
+  systems
+
+  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> shadow-4.0.7-r3.ebuild:
+  Stable on alpha.
+
+  10 Jul 2005; Joseph Jezak <josejx@gentoo.org> shadow-4.0.7-r3.ebuild:
+  Marked ppc stable.
+
+  10 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> shadow-4.0.7-r3.ebuild:
+  Change check for ppc64 and securetty from tc-arch to tc-arch-kernel.
+
+  08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  shadow-4.0.7-r3.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shadow-4.0.7-r3.ebuild:
+  Stable on sparc
+
+  08 Jul 2005; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.10.ebuild:
+  Add NSCD patches from 4.0.7-r3 as well.
+
+*shadow-4.0.7-r3 (08 Jul 2005)
+
+  08 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.7-nscd-EPIPE-failure.patch,
+  +files/shadow-4.0.7-nscd-socket-path.patch, shadow-4.0.7-r3.ebuild:
+  Fix EPIPE when nscd is used, bug #80413.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> shadow-4.0.7-r2.ebuild:
+  Stable on ppc64
+
+  07 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> shadow-4.0.7-r2.ebuild:
+  Stable on amd64
+
+*shadow-4.0.10 (30 Jun 2005)
+
+  30 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.10-dots-in-usernames.patch,
+  +files/shadow-4.0.10-fix-configure.patch,
+  +files/shadow-4.0.10-long-groupnames.patch,
+  +files/shadow-4.0.10-nls-manpages.patch, +files/shadow-4.0.10-nonis.patch,
+  +shadow-4.0.10.ebuild:
+  Version bump.
+
+  16 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/pam.d/system-auth-1.1, files/pam.d-include/system-auth-1.1,
+  files/pam.d/login, files/pam.d/other, files/pam.d/passwd,
+  files/pam.d/shadow, files/pam.d/su, files/pam.d/system-auth:
+  Make all pam.d files use just the modules' filenames instead of full path to
+  fix multilib setups.
+
+  10 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/securetty:
+  Added vc/0 tty0 for uml.  Blame rocket.
+
+*shadow-4.0.7-r2 (03 Jun 2005)
+
+  03 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pam.d-include/system-auth-1.1, +files/pam.d-include/login,
+  +files/pam.d-include/other, +files/pam.d-include/passwd,
+  +files/pam.d-include/shadow, +files/pam.d-include/su,
+  +files/pam.d-include/su-openpam, +files/pam.d-include/system-auth,
+  +shadow-4.0.7-r2.ebuild:
+  New revision depending on virtual/pam and using include syntax. Fixes
+  OpenPAM and AMD64 compatibility.
+
+  29 May 2005; <solar@gentoo.org> shadow-4.0.4.1-r4.ebuild:
+  - update sys-apps/shadow to use libc expanded variable elibc_uclibc vs uclibc
+  so USE=-* works
+
+  23 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/securetty:
+  Added hvc0 to securetty for ppc64 serial console.
+
+  22 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/shadow-4.0.7-lastlog.patch, shadow-4.0.7-r1.ebuild:
+  Fix last login logging for tty's - patch from upstream via
+  Robert Connolly <robert@linuxfromscratch.org>.
+
+*shadow-4.0.7-r1 (25 Feb 2005)
+
+  25 Feb 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/pam.d/system-auth-1.1, +shadow-4.0.7-r1.ebuild:
+  No longer DEPEND on pam-login, but PDEPEND on pam-login-3.17 or later, as we
+  move the login pam.d file there. Remove the pam_console comments from
+  pam.d/system-auth-1.1, as it is needed in pam.d/login. Do not install other
+  and system-auth pam.d files if we have pam-0.78 or later.
+
+  10 Feb 2005; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.5-r3.ebuild:
+  Basically -r3 is the same as -r2, just with fix for the MAIL issue with su,
+  so mark stable for all that have -r2 stable.
+
+*shadow-4.0.7 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.7-iswheel.patch, +shadow-4.0.7.ebuild:
+  Version bump with wheel patch by Gregorio Guidi #80345.
+
+*shadow-4.0.6-r1 (11 Jan 2005)
+
+  11 Jan 2005; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.6-r1.ebuild:
+  Fix patch to nscd socket #74395 by Phil Pennock.
+
+  10 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.6-dots-in-usernames.patch,
+  +files/shadow-4.0.6-long-groupnames.patch, shadow-4.0.6.ebuild:
+  Add patches to enable long group names #3485 and usernames with a . in them
+  #22920.
+
+  06 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.6-manpages.patch, shadow-4.0.6.ebuild:
+  Add minor patch by Eric Brown to SEE ALSO in manpages #70880.
+
+  04 Jan 2005; Markus Rothe <corsair@gentoo.org> shadow-4.0.5-r3.ebuild:
+  Stable on ppc64
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  25 Nov 2004; <solar@gentoo.org> shadow-4.0.5-r2.ebuild,
+  shadow-4.0.5-r3.ebuild, shadow-4.0.6.ebuild:
+  Fix RDEPEND's for bug #67815 again
+
+  23 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5-r2.ebuild,
+  shadow-4.0.5-r3.ebuild, shadow-4.0.6.ebuild:
+  Update DEPENDs so that we either require pam-login or block it depending on
+  USE=pam #67815.
+
+*shadow-4.0.6 (11 Nov 2004)
+
+  11 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.6-fix-configure.patch, +shadow-4.0.6.ebuild:
+  Version bump #70757 by Lindsay Jack.
+
+*shadow-4.0.5-r3 (07 Nov 2004)
+
+  07 Nov 2004; Martin Schlemmer <azarah@gentoo.org> :
+  Fix configure not detecting maildir, etc properly. Fix pam_env set variables
+  not being set.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> shadow-4.0.5-r2.ebuild:
+  Marked stable on mips.
+
+*shadow-4.0.5-r2 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.5-hack-X-envvars.patch, +shadow-4.0.5-r2.ebuild:
+  Restore DISPLAY/XAUTHORITY env passing hack for now #69925.
+
+*shadow-4.0.5-r1 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.5-remove-else.patch, +shadow-4.0.5-r1.ebuild,
+  shadow-4.0.5.ebuild:
+  Small security patch from upstream cvs #69212 and install more pam.d files
+  #69895.
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  shadow-4.0.5.ebuild:
+  Stable amd64.
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> shadow-4.0.5.ebuild:
+  Stable on ppc64, bug #69212
+
+  02 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5.ebuild:
+  Mark arm/hppa/ia64/s390/x86 stable for security, fix duplicate manpage
+  install #69781, and block virtual/login when USE=-pam.
+
+  02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.5.ebuild:
+  Stable on sparc wrt #69212
+
+  02 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> shadow-4.0.5.ebuild:
+  Stable on alpha, bug 69212.
+
+  02 Nov 2004; Lars Weiler <pylon@gentoo.org> shadow-4.0.5.ebuild:
+  Stable on ppc.  Bug #69212.
+
+  01 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5.ebuild, 
+  +files/shadow-4.0.5-skey.patch:
+  Add patch by Mark Wagner to fix skey support #69741 by Thomas Matthijs.
+
+  28 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r4.ebuild,
+  shadow-4.0.5.ebuild, +files/shadow-4.0.4.1-passwd-typo.patch:
+  Fix small glitch in passwd.1 #68150 by rob holland.
+
+*shadow-4.0.5 (28 Oct 2004)
+
+  28 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.5-nls-manpages.patch, +shadow-4.0.5.ebuild:
+  Version bump #69212 by me.
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.4.1-nls-manpages.patch:
+  Add a small patch I made to not install manpages if USE=-nls.
+
+  15 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  shadow-4.0.4.1-r4.ebuild:
+  Stable on sparc
+
+  10 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r3.ebuild,
+  shadow-4.0.4.1-r4.ebuild:
+  Move /usr/bin/passwd -> /bin/passwd to aid system recovery #64441.
+
+  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r4.ebuild:
+  Clean up the manpage fixes and change setuid perms to 4711 by default #47208.
+
+*shadow-4.0.4.1-r4 (07 Oct 2004)
+
+  07 Oct 2004; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.4.1-r4.ebuild
+  +files/shadow-4.0.4.1-userdel-missing-brackets.patch:
+  Add patch to fix exit status while using pam #66687 by Scott Beck/Jason
+  Rhinelander.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  shadow-4.0.4.1-r1.ebuild, shadow-4.0.4.1-r2.ebuild:
+  Masked shadow-4.0.4.1-r2.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  shadow-4.0.4.1-r1.ebuild:
+  Masked shadow-4.0.4.1-r1.ebuild stable for ppc
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  shadow-4.0.4.1-r3.ebuild:
+  Stable on sparc
+
+  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> shadow-4.0.4.1-r3.ebuild:
+  Stable on hppa.
+
+  12 Jul 2004; Tom Gall <tgall@gentoo.org> shadow-4.0.3-r10:ebuild:
+  stable on ppc64, add ttyS0 to ppc64 securetty, and add in
+  epatch for gcc 34 Ibug #47455  (bug #56273)
+
+  03 Jul 2004; Guy Martin <gmsoft@gentoo.org> shadow-4.0.4.1-r2.ebuild:
+  Marked stable on hppa.
+
+*shadow-4.0.4.1-r3 (03 Jul 2004)
+
+  03 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  files/shadow-4.0.4.1-selinux.diff, +shadow-4.0.4.1-r3.ebuild:
+  Fix /etc/passwd labeling issue in SELinux patch caught by Petre Rodan in
+  #55781. Otherwise same as 4.0.4.1-r2.
+
+  03 Jul 2004; Joshua Kinard <kumba@gentoo.org> shadow-4.0.4.1-r2.ebuild:
+  Marked stable on mips.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> shadow-4.0.4.1-r2.ebuild:
+  stable on x86, alpha, ia64
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> shadow-4.0.3-r10.ebuild,
+  shadow-4.0.3-r9.ebuild, shadow-4.0.4.1-r1.ebuild, shadow-4.0.4.1.ebuild:
+  QA - fix use invocation
+
+  15 Jun 2004; <solar@gentoo.org> shadow-4.0.4.1-r2.ebuild,
+  files/shadow-4.0.4.1-nonis.patch:
+  added nonis patch and uclibc USE to allow shadow to be compiled under uclibc
+  envs
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> shadow-4.0.4.1-r1.ebuild:
+  Stable on alpha.
+
+*shadow-4.0.4.1-r2 (28 May 2004)
+
+  28 May 2004; Aron Griffis <agriffis@gentoo.org> +shadow-4.0.4.1-r2.ebuild:
+  Remove libshadow and libmisc from the shadow package. They shouldn't be
+  installed; they're for package internal use only. Installing them breaks
+  packages that check for libshadow such as freeradius. See bug 37725 for more
+  information. Thanks to Hans W. Wurst for providing some good information in
+  that bug.
+
+*shadow-4.0.4.1-r1 (06 May 2004)
+
+  06 May 2004; Aron Griffis <agriffis@gentoo.org> +shadow-4.0.4.1-r1.ebuild,
+  shadow-4.0.4.1.ebuild:
+  Fix bug 35736: Use -fPIC when building on 64-bit systems so that other
+  packages which link shadow into their shared objects will build, for example
+  freeradius. Normally this is something to fix globally, but don't want to hurt
+  performance for other arches.
+
+  04 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.3-r10.ebuild,
+  shadow-4.0.4.1.ebuild:
+  hppa consoles added to securetty, sparc cleanup, for non-stable ebuilds
+
+  04 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.3-r9.ebuild:
+  hppa consoles added to securetty, sparc cleanup
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/shadow-4.0.3-gcc34-xmalloc.patch,
+  +files/shadow-4.0.4.1-gcc34-xmalloc.patch, shadow-4.0.3-r9.ebuild,
+  shadow-4.0.4.1.ebuild:
+  fixes for compiling with gcc 3.4 - bug #47455
+
+  29 Mar 2004; Jon Portnoy <avenj@gentoo.org> shadow-4.0.3-r9.ebuild,
+  shadow-4.0.3-r10.ebuild, shadow-4.0.4.1.ebuild :
+  Need nls in IUSE, referenced in DEPEND. Bug #44548.
+
+  16 Feb 2004; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r9.ebuild,
+  shadow-4.0.4.1.ebuild:
+  Fix sg, adduser and vigr symlinks (make them relative not absolute), bug
+  #41178.
+
+  23 Jan 2004; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.4.1.ebuild,
+  files/shadow-4.0.4.1-selinux.diff:
+  Update SELinux patch.
+
+*shadow-4.0.4.1 (22 Jan 2004)
+
+  22 Jan 2004; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.4.1.ebuild,
+  files/shadow-4.0.4.1-su-pam_open_session.patch,
+  files/shadow-4.0.4.1-useradd-manpage-update.patch:
+  Update version.
+
+*shadow-4.0.3-r10 (09 Jan 2004)
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> shadow-4.0.3-r10.ebuild:
+  Enable building of shared objects.  Thanks to Nico Baggus in bug 37725.
+  This also closes bug 37719 since freeradius should be able to build with
+  libshadow.so
+
+  15 Dec 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r9.ebuild:
+  Install the correct version of /etc/pam.d/system-auth, and do not install
+  system-auth-1.1. Do not force update anymore.
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild:
+  don't install man 5 passwd either, man-pages again
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild:
+  don't install the getspnam manpage -- man-pages package handles that and does
+  it with a better version, to boot
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild:
+  don't install the id man page, coreutils does that
+
+*shadow-4.0.3-r9 (06 Dec 2003)
+
+  06 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild:
+  version bump to force /bin/groups to be on the system -- /bin/groups has been
+  removed from coreutils, and now only shadow will provide it. Note that
+  coreutils used to compile su and not install it.  This behaviour was
+  changed in the bumped coreutils as well (not that that has any effect on
+  this, but thought I'd mention it anyway)
+
+*shadow-4.0.3-r8 (17 Nov 2003)
+
+  17 Nov 2003; Joshua Brindle <method@gentoo.org> shadow-4.0.3-r8.ebuild:
+  added optional pam support
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.3-r7.ebuild,
+  files/shadow-4.0.3-selinux.diff:
+  Add new API SELinux patch
+
+  26 Sep 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r7.ebuild:
+  Mark stable.
+
+  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> shadow-4.0.3-r3.ebuild,
+  shadow-4.0.3-r4.ebuild, shadow-4.0.3-r5.ebuild, shadow-4.0.3-r6.ebuild,
+  shadow-4.0.3-r7.ebuild:
+  Added nls? sys-devel/gettext. Closes #29236.
+
+*shadow-4.0.3-r7 (04 Aug 2003)
+
+  04 Aug 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r7.ebuild,
+  files/pam.d/system-auth-1.1:
+  Remove the 'nodelay' option from authentication (/etc/pam.d/system-auth), bug
+  #24081.
+
+  29 Jun 2003; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.3-r6.ebuild:
+  Remove selinux stuff, as its no longer needed.  Using pam-login again.
+
+*shadow-4.0.3-r6 (18 May 2003)
+
+  18 May 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r6.ebuild:
+  Get the fixed version that do not exclude selinux in as latest stable.
+
+*shadow-4.0.3-r5 (13 May 2003)
+
+  14 May 2003; Joshua Kinard <kumba@gentoo.org> shadow-4.0.3-r5.ebuild:
+  Added "gnuconfig" to inherit and "gnuconfig_update" to src_compile()
+  to make it detect mips systems correctly
+
+  13 May 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Added nodelay to second line of pam.d/system-auth.
+
+*shadow-4.0.3-r4 (23 Feb 2003)
+
+  24 Feb 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r4.ebuild :
+  Remove the patch again, as it could be a security risk.  Users can use:
+
+     # sudo -u nobody ls
+
+  If they need to run commands as user with '/bin/false' as login ...
+
+  23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r4.ebuild :
+  If su should not simulate a login shell, use '/bin/sh' as shell to enable
+  running of commands as user with /bin/false as shell, closing bug #15015.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> shadow-4.0.3-r3.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> shadow-4.0.3-r3.ebuild :
+  Added hppa to keywords.
+
+  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r3.ebuild :
+  
+  Patch the useradd manpage to be a bit more clear, closing bug #13203.
+  Thanks to Guy <guycad@mindspring.com>.
+
+
+*shadow-4.0.3-r3 (25 Dec 2002)
+
+  24 Mar 2003; Joshua Brindle <method@gentoo.org> shadow-4.0.3-r3.ebuild:
+  added pam.d files for selinux builds
+
+  23 Mar 2003; Joshua Brindle <method@gentoo.org> shadow-4.0.3-r3.ebuild:
+  added selinux support, thanks sindian
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+
+  Added mips to keywords
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r3.ebuild :
+
+  Added /etc/default/useradd with default shell of /bin/bash, closing bug #5629.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  
+  Changed sparc ~sparc keywords.
+ 
+  03 Dec 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r2.ebuild :
+
+  Mark as stable.  Update pam.d/su to use pam_filelist.so if uncommented.
+  This can be used as a type of /etc/suauth.  Should close bug #4210.
+
+  Fix an issue where /etc/pam.d/system-auth.new was still being installed.
+
+*shadow-4.0.3-r1 (20 Oct 2002)
+
+  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r2.ebuild :
+
+  Update the su-pam_open_session.patch, as the old one did not export
+  XAUTHORITY, or call pam_close_session().
+
+*shadow-4.0.3-r1 (19 Oct 2002)
+
+  19 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r1.ebuild :
+
+  Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY,
+  else the session entries in /etc/pam.d/su never get executed, and
+  pam_xauth for one, is then never used.  This should close bug #8831.
+
+
+  12 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3.ebuild :
+
+  Fix bug #9031 (add /etc/default/ to fix adduser -D).
+
+*shadow-4.0.2-r4.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.2-r4.ebuild :
+  Added KEYWORDS, SLOT.
+
+*shadow-4.0.1-r2.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.1-r2.ebuild :
+  Added KEYWORDS, SLOT.
+
+  29 Jun 2002; M.Schlemmer <azarah@gentoo.org>
+  Update to use libtool.eclass.  This fix the compile problems without
+  having custom $LIBS and $LDFLAGS.
+
+*shadow-4.0.2-r5 (28 Apr 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.2-r5.ebuild :
+  Added KEYWORDS.
+
+  28 Apr 2002; M.Schlemmer <azarah@gentoo.org>
+
+  Remove /etc/login.defs.
+
+  8 Apr 2002; M.Schlemmer <azarah@gentoo.org>
+
+  Removed /bin/login in favour of the one in util-linux, as the one
+  included here have a root exploit if pam_limits is in use.
+
+  Libtoolized to fix .la files.  Build is pretty broken if libtoolized, so had
+  to put a unortodox LIBS= and LDFLAGS= there.
+
+*shadow-4.0.3 (3 Apr 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.3.ebuild :
+  Added KEYWORDS.
+
+  3 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org>
+
+  Added new shadow version, currently masked out until it's been
+  tested better.
+	
+*shadow-4.0.2-r3 (3 Apr 2002)
+
+  3 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org>
+
+  Cleaned up earlier fix to account for all possibilities, such as
+  binary packages, different ROOT's, and an already existing good
+  system-auth file.
+	
+*shadow-4.0.2-r2 (3 Apr 2002)
+
+  3 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org>
+
+  Fixed /etc/pam.d/system-auth to use pam_unix instead of pam_pwdb due
+  to security bug.
+  
+*shadow-4.0.2-r1 (25 Mar 2002)
+
+  25 Mar 2002; M.Schlemmer <azarah@gentoo.org>
+
+  Fix the "libdir" in /usr/lib/libmisc.la.
+
+*shadow-20001016-r10 (12 Mar 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r10.ebuild :
+  Added KEYWORDS, SLOT.
+
+  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> 
+
+  Added USE dependent nls compilation.
+
+*shadow-20001016-r9 (26 Feb 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r9.ebuild :
+  Added KEYWORDS, SLOT.
+
+  26 Feb 2002; T.Neidt <tod@gentoo.org> shadow-20001016-r9.ebuild, login.defs
+
+  Changed 'CREATE_HOME yes' to 'CREATE_HOME no' in login.defs.
+  CREATE_HOME is a RedHat'ism and is not supported by the stock shadow
+  package (see src/useradd.c).  When CREATE_HOME is set to 'yes',
+  adduser generates a warning meassage. 
+
+  Bumped ebuild revision so login.defs will be updated by emerge updates.
+  
+  Note to users:  'useradd -m <user>' will create the home directory and
+  add any files in /etc/skel (see 'man adduser')
+  
+
+*shadow-20001016-r8 (25 Feb 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r8.ebuild :
+  Added KEYWORDS, SLOT.
+
+  25 Feb 2002; M.Schlemmer <azarah@gentoo.org> shadow-20001016-r8.ebuild
+
+  Added a 'rm -rf ${D}/usr/share/man/*' to Chris's man fix to clean the
+  Polish pages.  Added the line for installing /etc/pam.d/chage again, which
+  should close bug #837.
+
+*shadow-20001016-r7 (20 Feb 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r7.ebuild :
+  Added KEYWORDS, SLOT.
+
+  20 Feb 2002; Chris Houser <chouser@gentoo.org> shadow-20001016-r7.ebuild
+  files/digest-shadow-20001016-r7 ChangeLog :
+
+  Changed man page installation.  More man pages are now included, and all
+  should be in English (instead of the occasional Polish page).  This closes
+  bug #594.
 
 *shadow-20001016-r6 (1 Feb 2002)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 76456d5fca0c..038ee673510d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,18 +1,95 @@
-MD5 c7c2bea497f9ee42446f711e7d4ec8a5 ChangeLog 6693
-MD5 30c77e651f99dcb1d87124902fdf9fbf shadow-4.0.3-r3.ebuild 4859
-MD5 1a2a50a92e21cfb5821dea16ce3b9969 shadow-4.0.3-r4.ebuild 4865
-MD5 339cea30980a3a6f44c7e9415116bf07 shadow-4.0.3-r5.ebuild 4857
-MD5 03fbcf7c3c68fbd445550092e4df9933 files/digest-shadow-4.0.3-r3 140
-MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r4 65
-MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230
-MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972
-MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
-MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804
-MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r5 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bfd8f50ac41f57089f41a37427f15b33 ChangeLog 22972
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
-MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
-MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
-MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
-MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247
+MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r1 69
+MD5 9375147f78a25196b654616c969af9a5 files/digest-shadow-4.0.11.1-r2 69
+MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-shadow-4.0.12 67
+MD5 2832ae3af9a1f70243c65802597ae825 files/digest-shadow-4.0.13 67
+MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6-r1 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r1 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r3 66
+MD5 46c2be2ed8b26ec007e3ed1f476491d8 files/digest-shadow-4.0.7-r4 66
+MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/pam.d-include/login 245
+MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d-include/other 142
+MD5 5df27e06de913de76e24790642eecfd2 files/pam.d-include/passwd 104
+MD5 50d7c96eab701fd6ddbf4b283e493b4c files/pam.d-include/shadow 152
+MD5 97b4f01b65fd3b8caa8983489e9b6848 files/pam.d-include/su 1059
+MD5 e3a7d5b7abee1ba6e7f09ee607da87ba files/pam.d-include/su-openpam 249
+MD5 caa5f36d54cb7a75ce5728f7f1badafb files/pam.d-include/system-auth 380
+MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d-include/system-auth-1.1 365
+MD5 987d0bd2e5dd1f96dc28ae2963054022 files/pam.d/login 333
+MD5 5bff4f2134b72dabc4afa5bb296e874d files/pam.d/other 142
+MD5 8a59937d720a19824db6e4a8cd173a4b files/pam.d/passwd 172
+MD5 a5721c39446539b751dceae4b054542b files/pam.d/shadow 171
+MD5 a1fc81dbd0d41face776fba4ca929d8f files/pam.d/su 1142
+MD5 deed69f8fa52ca844f3669414bd5cf01 files/pam.d/system-auth 373
+MD5 33d9efd092b6999143ea42c99a59bfb1 files/pam.d/system-auth-1.1 365
+MD5 a744152ec905f4c06f3b92142b7fec8a files/securetty 253
+MD5 6355d65b618395c4adf46f733269546c files/shadow-4.0.10-dots-in-usernames.patch 1894
+MD5 95f7b8980169e81352229bd548909ea7 files/shadow-4.0.10-fix-configure.patch 579
+MD5 aaedecd7edcccff66f962fd82928eec9 files/shadow-4.0.10-long-groupnames.patch 1205
+MD5 f9846ea2aeefba54443ef5d6796f0bbc files/shadow-4.0.10-nls-manpages.patch 367
+MD5 fdb23bff28b70bd53f200379c33dd27c files/shadow-4.0.10-nonis.patch 1434
+MD5 44f064b586ea49c8e2dc1fca8b9e4599 files/shadow-4.0.11.1-SUPATH.patch 1614
+MD5 450a2289f2a383296ad9af005e46da74 files/shadow-4.0.11.1-ngettext.patch 1038
+MD5 ae5d078bc6b651b5f081dcfc64b5df69 files/shadow-4.0.11.1-perms.patch 1659
+MD5 f4ae7cde924d5d91ce4010760439b836 files/shadow-4.0.11.1-su-fix-environment.patch 966
+MD5 c87c0968ace90b32753b91f93ad7bab1 files/shadow-4.0.11.1-uclibc-missing-l64a.patch 1269
+MD5 b52179dd78e6b6d207600184022114db files/shadow-4.0.12-dots-in-usernames.patch 1466
+MD5 e1c86a7766f97cff8d5196821b6b1913 files/shadow-4.0.12-gcc2.patch 962
+MD5 804242385ef14139f4b46167396f26f8 files/shadow-4.0.12-long-groupnames.patch 923
+MD5 fc7dcebbbe2fae05629e848bc886f454 files/shadow-4.0.13-dots-in-usernames.patch 917
+MD5 08f11e5b0c4a987e49367f245f475728 files/shadow-4.0.13-login.defs.patch 672
+MD5 acdc5a5ac62bfd3495bde25438b49734 files/shadow-4.0.13-long-groupnames.patch 398
+MD5 dfa169094cacf64d4980b0c8d76374d8 files/shadow-4.0.13-nonis.patch 1795
+MD5 223a6d64e1635462fcca48217644cfd0 files/shadow-4.0.13-su-fix-environment.patch 1070
+MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
+MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
+MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
+MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
+MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
+MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
+MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
+MD5 b4d0fc0f54800978591791493d6b2ec3 files/shadow-4.0.6-dots-in-usernames.patch 1993
+MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
+MD5 8bf11ce0e8ee683fe290462473871dab files/shadow-4.0.6-long-groupnames.patch 1625
+MD5 d15398f7d8c06b906abdf73ae3a55f54 files/shadow-4.0.6-manpages.patch 564
+MD5 d06833980d79d4f001b6064a3f52f938 files/shadow-4.0.7-iswheel.patch 416
+MD5 a63ee37286c486567191c7c6b24432e2 files/shadow-4.0.7-lastlog.patch 455
+MD5 70b7c7f1725841e335e5f2361fc9ebab files/shadow-4.0.7-nscd-EPIPE-failure.patch 947
+MD5 e32464f2df5a85f4f6c67bc78e9a23d1 files/shadow-4.0.7-nscd-socket-path.patch 1081
+MD5 13cddd2e24cbcaf5164e13f9105c222c files/shadow-4.0.7-perms.patch 1768
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 30c0eb4f3ffb1e531659cf9b69cffa14 shadow-4.0.11.1-r1.ebuild 7084
+MD5 75f60cacddf580b22250ec244749116c shadow-4.0.11.1-r2.ebuild 7215
+MD5 0528fcbf64cb6383f23308d400e3d58a shadow-4.0.12.ebuild 7110
+MD5 fa13313b6a644f6be0fd0374cec0a4d4 shadow-4.0.13.ebuild 7147
+MD5 dd33182f75e512eacdf6652e505359eb shadow-4.0.4.1-r4.ebuild 5963
+MD5 bbedc15fb467b91796456cd032199535 shadow-4.0.5-r2.ebuild 5443
+MD5 69b75fc8b3df89e5da434f35f6db5e31 shadow-4.0.5-r3.ebuild 5616
+MD5 a0d8e3f6fb0895bc2cc023898a48e81c shadow-4.0.6-r1.ebuild 5621
+MD5 41c23ed0904ed9071c85d13aa76d0a42 shadow-4.0.7-r1.ebuild 6582
+MD5 588bb10a6f777e71c67c552906d186a7 shadow-4.0.7-r3.ebuild 7053
+MD5 02b151abd6ca7f518c23e6890f201e43 shadow-4.0.7-r4.ebuild 7174
+MD5 314bf4f7ce691287c74208fe9719f146 shadow-4.0.7.ebuild 5582
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdpEwgIKl8Uu19MoRAhdwAJ4+7dpl2EjFwMi24tElqIPmMMR3BwCfa/Jv
+dXl7WDetGW1Hm6KNeDHBrhM=
+=eBda
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sys-apps/shadow/files/pam.d-include/system-auth-1.1
index 795f0fe723f0..fe80483120ae 100644
--- a/sys-apps/shadow/files/pam.d-include/system-auth-1.1
+++ b/sys-apps/shadow/files/pam.d-include/system-auth-1.1
@@ -1,14 +1,14 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_env.so
-auth       sufficient	/lib/security/pam_unix.so likeauth nullok
-auth       required	/lib/security/pam_deny.so
+auth       required	pam_env.so
+auth       sufficient	pam_unix.so likeauth nullok
+auth       required	pam_deny.so
 
-account    required	/lib/security/pam_unix.so
+account    required	pam_unix.so
 
-password   required	/lib/security/pam_cracklib.so retry=3
-password   sufficient	/lib/security/pam_unix.so nullok md5 shadow use_authtok
-password   required	/lib/security/pam_deny.so
+password   required	pam_cracklib.so retry=3
+password   sufficient	pam_unix.so nullok md5 shadow use_authtok
+password   required	pam_deny.so
 
-session    required	/lib/security/pam_limits.so
-session    required	/lib/security/pam_unix.so
+session    required	pam_limits.so
+session    required	pam_unix.so
diff --git a/sys-apps/shadow/files/pam.d/login b/sys-apps/shadow/files/pam.d/login
index 6adeff7bbf57..31a664b302ae 100644
--- a/sys-apps/shadow/files/pam.d/login
+++ b/sys-apps/shadow/files/pam.d/login
@@ -1,8 +1,12 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_securetty.so
-auth       required	/lib/security/pam_stack.so service=system-auth
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_stack.so service=system-auth
-password   required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth
-#session    optional	/lib/security/pam_console.so
+
+auth       required	pam_securetty.so
+auth       required	pam_stack.so service=system-auth
+auth       required	pam_nologin.so
+
+account    required	pam_stack.so service=system-auth
+
+password   required	pam_stack.so service=system-auth
+
+session    required	pam_stack.so service=system-auth
+session    optional	pam_console.so
diff --git a/sys-apps/shadow/files/pam.d/other b/sys-apps/shadow/files/pam.d/other
index 0b1f6a887248..bb0b9647c076 100644
--- a/sys-apps/shadow/files/pam.d/other
+++ b/sys-apps/shadow/files/pam.d/other
@@ -1,5 +1,9 @@
 #%PAM-1.0
-auth     required       /lib/security/pam_deny.so
-account  required       /lib/security/pam_deny.so
-password required       /lib/security/pam_deny.so
-session  required       /lib/security/pam_deny.so
+
+auth       required	pam_deny.so
+
+account    required	pam_deny.so
+
+password   required	pam_deny.so
+
+session    required	pam_deny.so
diff --git a/sys-apps/shadow/files/pam.d/passwd b/sys-apps/shadow/files/pam.d/passwd
index d1a1c3b88340..c09409bb3a16 100644
--- a/sys-apps/shadow/files/pam.d/passwd
+++ b/sys-apps/shadow/files/pam.d/passwd
@@ -1,4 +1,7 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_stack.so service=system-auth
-account    required	/lib/security/pam_stack.so service=system-auth
-password   required	/lib/security/pam_stack.so service=system-auth
+
+auth       required	pam_stack.so service=system-auth
+
+account    required	pam_stack.so service=system-auth
+
+password   required	pam_stack.so service=system-auth
diff --git a/sys-apps/shadow/files/pam.d/shadow b/sys-apps/shadow/files/pam.d/shadow
index c7f064396b7e..28db08c25c6f 100644
--- a/sys-apps/shadow/files/pam.d/shadow
+++ b/sys-apps/shadow/files/pam.d/shadow
@@ -1,5 +1,8 @@
 #%PAM-1.0 
-auth		sufficient	/lib/security/pam_rootok.so
-auth		required	/lib/security/pam_permit.so
-account		required	/lib/security/pam_permit.so
-password	required	/lib/security/pam_permit.so
+
+auth       sufficient	pam_rootok.so
+auth       required	pam_permit.so
+
+account    required	pam_stack.so service=system-auth
+
+password   required	pam_permit.so
diff --git a/sys-apps/shadow/files/pam.d/su b/sys-apps/shadow/files/pam.d/su
index 71d16e907a15..e5b1d834f3f1 100644
--- a/sys-apps/shadow/files/pam.d/su
+++ b/sys-apps/shadow/files/pam.d/su
@@ -1,8 +1,32 @@
 #%PAM-1.0
-auth       sufficient   /lib/security/pam_rootok.so
-auth       required     /lib/security/pam_wheel.so use_uid
-auth       required	/lib/security/pam_stack.so service=system-auth
-account    required	/lib/security/pam_stack.so service=system-auth
-password   required	/lib/security/pam_stack.so service=system-auth
-session    required	/lib/security/pam_stack.so service=system-auth
-session    optional	/lib/security/pam_xauth.so
+
+auth       sufficient	pam_rootok.so
+
+# If you want to restrict users begin allowed to su even more,
+# create /etc/security/suauth.allow (or to that matter) that is only
+# writable by root, and add users that are allowed to su to that
+# file, one per line.
+#auth       required     pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
+
+# Uncomment this to allow users in the wheel group to su without
+# entering a passwd.
+#auth       sufficient   pam_wheel.so use_uid trust
+
+# Alternatively to above, you can implement a list of users that do
+# not need to supply a passwd with a list.
+#auth       sufficient   pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
+
+# Comment this to allow any user, even those not in the 'wheel'
+# group to su
+auth       required     pam_wheel.so use_uid
+
+auth       required	pam_stack.so service=system-auth
+
+account    required	pam_stack.so service=system-auth
+
+password   required	pam_stack.so service=system-auth
+
+session    required	pam_stack.so service=system-auth
+session    required     pam_env.so
+session    optional	pam_xauth.so
+
diff --git a/sys-apps/shadow/files/pam.d/system-auth b/sys-apps/shadow/files/pam.d/system-auth
index 888138809e18..d6d008f69bde 100644
--- a/sys-apps/shadow/files/pam.d/system-auth
+++ b/sys-apps/shadow/files/pam.d/system-auth
@@ -1,13 +1,14 @@
 #%PAM-1.0
-auth        required      /lib/security/pam_env.so
-auth        sufficient    /lib/security/pam_pwdb.so likeauth nullok
-auth        required      /lib/security/pam_deny.so
 
-account     required      /lib/security/pam_pwdb.so
+auth       required	pam_env.so
+auth       sufficient	pam_unix.so likeauth nullok nodelay
+auth       required	pam_deny.so
 
-#password    required      /lib/security/pam_cracklib.so retry=3
-password    sufficient    /lib/security/pam_pwdb.so nullok md5 shadow #use_authtok
-password    required      /lib/security/pam_deny.so
+account    required	pam_unix.so
 
-session     required      /lib/security/pam_limits.so
-session     required      /lib/security/pam_pwdb.so
+password   required	pam_cracklib.so retry=3
+password   sufficient	pam_unix.so nullok md5 shadow use_authtok
+password   required	pam_deny.so
+
+session    required	pam_limits.so
+session    required	pam_unix.so
diff --git a/sys-apps/shadow/files/pam.d/system-auth-1.1 b/sys-apps/shadow/files/pam.d/system-auth-1.1
index 795f0fe723f0..fe80483120ae 100644
--- a/sys-apps/shadow/files/pam.d/system-auth-1.1
+++ b/sys-apps/shadow/files/pam.d/system-auth-1.1
@@ -1,14 +1,14 @@
 #%PAM-1.0
 
-auth       required	/lib/security/pam_env.so
-auth       sufficient	/lib/security/pam_unix.so likeauth nullok
-auth       required	/lib/security/pam_deny.so
+auth       required	pam_env.so
+auth       sufficient	pam_unix.so likeauth nullok
+auth       required	pam_deny.so
 
-account    required	/lib/security/pam_unix.so
+account    required	pam_unix.so
 
-password   required	/lib/security/pam_cracklib.so retry=3
-password   sufficient	/lib/security/pam_unix.so nullok md5 shadow use_authtok
-password   required	/lib/security/pam_deny.so
+password   required	pam_cracklib.so retry=3
+password   sufficient	pam_unix.so nullok md5 shadow use_authtok
+password   required	pam_deny.so
 
-session    required	/lib/security/pam_limits.so
-session    required	/lib/security/pam_unix.so
+session    required	pam_limits.so
+session    required	pam_unix.so
diff --git a/sys-apps/shadow/files/securetty b/sys-apps/shadow/files/securetty
index 1875081b5cbc..ca604be5f86d 100644
--- a/sys-apps/shadow/files/securetty
+++ b/sys-apps/shadow/files/securetty
@@ -1,5 +1,6 @@
 # /etc/securetty: list of terminals on which root is allowed to login.
 # See securetty(5) and login(1).
+vc/0
 vc/1
 vc/2
 vc/3
@@ -12,6 +13,7 @@ vc/9
 vc/10
 vc/11
 vc/12
+tty0
 tty1
 tty2
 tty3
@@ -24,3 +26,6 @@ tty9
 tty10
 tty11
 tty12
+
+tts/0
+ttyS0
diff --git a/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch b/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch
index 9ea7d23f3230..5380675fd1e5 100644
--- a/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch
+++ b/sys-apps/shadow/files/shadow-4.0.4.1-gcc34-xmalloc.patch
@@ -1,7 +1,7 @@
 --- libmisc/old/xmalloc.c	2004-04-21 09:15:20.000000000 +0000
 +++ libmisc/xmalloc.c	2004-04-21 09:32:50.000000000 +0000
 @@ -13,7 +13,7 @@
- RCSID ("$Id: shadow-4.0.4.1-gcc34-xmalloc.patch,v 1.1 2004/04/22 11:22:43 lv Exp $")
+ RCSID ("$Id: shadow-4.0.4.1-gcc34-xmalloc.patch,v 1.1.1.1 2005/11/30 09:57:05 chriswhite Exp $")
  #include <stdio.h>
  #include "defines.h"
 -extern char *malloc ();
diff --git a/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff b/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff
index c2a15f80fd20..678f40a4c064 100644
--- a/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff
+++ b/sys-apps/shadow/files/shadow-4.0.4.1-selinux.diff
@@ -10,6 +10,18 @@ diff -urN shadow-4.0.3.orig/lib/Makefile.am shadow-4.0.3/lib/Makefile.am
  INCLUDES =
  
  lib_LTLIBRARIES = libshadow.la
+diff -urN shadow-4.0.3.orig/lib/Makefile.in shadow-4.0.3/lib/Makefile.in
+--- shadow-4.0.3.orig/lib/Makefile.in	2004-01-14 16:15:26.000000000 +0200
++++ shadow-4.0.3/lib/Makefile.in 	2004-07-03 21:34:31.815854072 +0300
+@@ -56,7 +56,7 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ 
+-DEFS = 
++DEFS = -DWITH_SELINUX
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
 diff -urN shadow-4.0.3.orig/lib/commonio.c shadow-4.0.3/lib/commonio.c
 --- shadow-4.0.3.orig/lib/commonio.c	2001-11-17 07:15:52.000000000 -0600
 +++ shadow-4.0.3/lib/commonio.c	2003-08-07 08:38:20.000000000 -0500
@@ -110,7 +122,7 @@ diff -urN shadow-4.0.3.orig/lib/commonio.h shadow-4.0.3/lib/commonio.h
 --- shadow-4.0.3.orig/lib/commonio.h	2001-08-14 16:09:54.000000000 -0500
 +++ shadow-4.0.3/lib/commonio.h	2003-08-07 08:38:20.000000000 -0500
 @@ -1,5 +1,8 @@
- /* $Id: shadow-4.0.4.1-selinux.diff,v 1.1 2004/01/23 19:51:06 pebenito Exp $ */
+ /* $Id: shadow-4.0.4.1-selinux.diff,v 1.1.1.1 2005/11/30 09:57:05 chriswhite Exp $ */
  
 +#ifdef WITH_SELINUX
 +#include <selinux/selinux.h>
diff --git a/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch b/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
index 444a26236a87..02a8e55d27e3 100644
--- a/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
+++ b/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
@@ -7,7 +7,7 @@ diff -u -B -U0 -r1.14 login.defs.linux
 +++ etc/login.defs.linux	29 Oct 2004 02:02:48 -0000
 @@ -46 +46 @@
 -MAIL_CHECK_ENAB		yes
-+#MAIL_CHECK_ENAB		no
++MAIL_CHECK_ENAB		no
 @@ -93 +93 @@
 -#ISSUE_FILE	/etc/issue
 +ISSUE_FILE	/etc/issue
@@ -16,7 +16,7 @@ diff -u -B -U0 -r1.14 login.defs.linux
 +SU_WHEEL_ONLY	yes
 @@ -228 +228 @@
 -CRACKLIB_DICTPATH	/var/cache/cracklib/cracklib_dict
-+CRACKLIB_DICTPATH	/usr/lib
++CRACKLIB_DICTPATH	/usr/lib/cracklib_dict
 @@ -245 +245 @@
 -LOGIN_RETRIES		5
 +LOGIN_RETRIES		3
diff --git a/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch
index c02fd8a656f3..2d8f0a7cc49f 100644
--- a/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch
+++ b/sys-apps/shadow/files/shadow-4.0.6-dots-in-usernames.patch
@@ -22,7 +22,38 @@ diff -u -r1.8 chkname.c
  		if (!((*name >= 'a' && *name <= 'z') ||
  		      (*name >= '0' && *name <= '9') ||
  		      *name == '_' || *name == '-' ||
-+		      *Name == '.' ||
++		      *name == '.' ||
  		      (*name == '$' && *(name + 1) == '\0')))
  			return 0;
  	}
+Index: man/useradd.8
+===================================================================
+RCS file: /cvsroot/shadow/man/useradd.8,v
+retrieving revision 1.23
+diff -u -r1.23 useradd.8
+--- man/useradd.8	11 Dec 2004 20:05:01 -0000	1.23
++++ man/useradd.8	10 Jan 2005 06:40:15 -0000
+@@ -128,6 +128,23 @@
+ .PP
+ If no options are specified, \fBuseradd\fR displays the current default
+ values.
++.SH RESTRICTS
++Currently,  the  shadow  suite  enforces  the following restrictions on 
++user names:
++
++.nf
++\- must begin with a lower case letter or underscore
++\- can only contain lower case letters, underscores, and dashes
++\- may end with a dollar sign
++\- regex for these requirements: [a\-z_][a\-z0-9_\-$]*
++.fi
++
++The length of usernames is restricted by glibc (via the UT_NAMESIZE define 
++in the utmp header file).  This may range from 8 characters on older 
++systems to 32 characters on newer systems.
++
++Note Gentoo adds a patch which allows people to create usernames with a 
++dot in them.
+ .SH NOTES
+ The system administrator is responsible for placing the default user files
+ in the \fI/etc/skel/\fR directory.
diff --git a/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch b/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch
index 4ca93018a37d..411dc5d40b68 100644
--- a/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch
+++ b/sys-apps/shadow/files/shadow-4.0.6-long-groupnames.patch
@@ -21,3 +21,29 @@ diff -u -r1.8 chkname.c
  
  	return good_name (name);
  }
+Index: man/groupadd.8
+===================================================================
+RCS file: /cvsroot/shadow/man/groupadd.8,v
+retrieving revision 1.21
+diff -u -r1.21 groupadd.8
+--- man/groupadd.8	4 Nov 2004 03:06:31 -0000	1.21
++++ man/groupadd.8	10 Jan 2005 06:36:51 -0000
+@@ -46,6 +46,18 @@
+ \fB-o\fR option is used. The value must be non-negative. The default is to
+ use the smallest ID value greater than 999 and greater than every other
+ group. Values between 0 and 999 are typically reserved for system accounts.
++.SH RESTRICTIONS
++Currently, the shadow suite enforces the following restrictions on group 
++names:
++
++.nf
++\- must begin with a lower case letter or underscore
++\- can only contain lower case letters, underscores, and dashes
++\- regex for these requirements: [a\-z_][a\-z0\-9_\-]*
++.fi
++
++Normally shadow enforces a 16 character limit, but Gentoo adds patches to 
++remove it.
+ .SH FILES
+ \fI/etc/group\fR	\- group account information
+ .br
diff --git a/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch b/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch
index 95533fb1a87d..04dc491c027b 100644
--- a/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch
+++ b/sys-apps/shadow/files/shadow-4.0.7-lastlog.patch
@@ -1,24 +1,15 @@
-===================================================================

-RCS file: /cvsroot/shadow/libmisc/log.c,v

-retrieving revision 1.7

-retrieving revision 1.8

-diff -u -r1.7 -r1.8

---- shadow/libmisc/log.c	2003/12/17 12:52:25	1.7

-+++ shadow/libmisc/log.c	2005/03/09 04:55:31	1.8

-@@ -30,7 +30,7 @@

- #include <config.h>

- 

- #include "rcsid.h"

--RCSID ("$Id: shadow-4.0.7-lastlog.patch,v 1.1 2005/03/22 15:17:47 azarah Exp $")

-+RCSID ("$Id: shadow-4.0.7-lastlog.patch,v 1.1 2005/03/22 15:17:47 azarah Exp $")

- #include <sys/types.h>

- #include <pwd.h>

- #include <fcntl.h>

-@@ -89,6 +89,7 @@

- 

- 	ll_time = newlog.ll_time;

- 	time (&ll_time);

-+	newlog.ll_time = ll_time;

- 	strncpy (newlog.ll_line, line, sizeof newlog.ll_line);

- #if HAVE_LL_HOST

- 	strncpy (newlog.ll_host, host, sizeof newlog.ll_host);
\ No newline at end of file
+===================================================================
+RCS file: /cvsroot/shadow/libmisc/log.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- shadow/libmisc/log.c
++++ shadow/libmisc/log.c
+@@ -89,6 +89,7 @@
+ 
+ 	ll_time = newlog.ll_time;
+ 	time (&ll_time);
++	newlog.ll_time = ll_time;
+ 	strncpy (newlog.ll_line, line, sizeof newlog.ll_line);
+ #if HAVE_LL_HOST
+ 	strncpy (newlog.ll_host, host, sizeof newlog.ll_host);
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/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-apps/shadow/shadow-4.0.11.1-r1.ebuild b/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild
index 18a9d86a6b84..0cb006adc1d7 100644
--- a/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.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/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild,v 1.1 2005/08/03 18:56:46 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.11.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:03 chriswhite Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -65,17 +65,16 @@ src_unpack() {
 	# lock down setuid perms #47208
 	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
 
-	elibtoolize
-	epunt_cxx
-
 	# Needed by the UCLIBC patches
 	autoconf
+
+	elibtoolize
+	epunt_cxx
 }
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -225,7 +224,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
diff --git a/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild b/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild
index 77fa391d5163..dfe552c44e29 100644
--- a/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.11.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/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild,v 1.1 2005/08/04 10:48:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.11.1-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -67,17 +67,16 @@ src_unpack() {
 	# lock down setuid perms #47208
 	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
 
-	elibtoolize
-	epunt_cxx
-
 	# Needed by the UCLIBC patches
 	autoconf
+
+	elibtoolize
+	epunt_cxx
 }
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -227,7 +226,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
diff --git a/sys-apps/shadow/shadow-4.0.12.ebuild b/sys-apps/shadow/shadow-4.0.12.ebuild
index 53436456c14d..0558f128cb2b 100644
--- a/sys-apps/shadow/shadow-4.0.12.ebuild
+++ b/sys-apps/shadow/shadow-4.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-apps/shadow/shadow-4.0.12.ebuild,v 1.1 2005/08/23 01:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.12.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -55,6 +55,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-4.0.12-dots-in-usernames.patch
 	epatch "${FILESDIR}"/${PN}-4.0.12-long-groupnames.patch
 
+	# Fix compiling with gcc-2.95.x
+	epatch "${FILESDIR}"/${PN}-4.0.12-gcc2.patch
+
 	# Patch from upstream enables the new environment too early for PAM
 	epatch "${FILESDIR}"/${PN}-4.0.11.1-su-fix-environment.patch
 
@@ -223,7 +226,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
diff --git a/sys-apps/shadow/shadow-4.0.13.ebuild b/sys-apps/shadow/shadow-4.0.13.ebuild
index 801d296373cd..5a82de77bc75 100644
--- a/sys-apps/shadow/shadow-4.0.13.ebuild
+++ b/sys-apps/shadow/shadow-4.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/sys-apps/shadow/shadow-4.0.13.ebuild,v 1.1 2005/10/10 22:42:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.13.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 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 pam selinux skey nousuid"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
@@ -193,7 +193,7 @@ src_install() {
 	else
 		insinto /etc
 		insopts -m0644
-		newins etc/login.defs.linux login.defs
+		newins etc/login.defs login.defs
 	fi
 
 	# Remove manpages that are handled by other packages
@@ -201,10 +201,11 @@ src_install() {
 		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
 		-exec rm {} \;
 
-	cd "${S}"/doc
-	dodoc INSTALL README WISHLIST
-	docinto txt
-	dodoc HOWTO LSM README.* *.txt
+	cd "${S}"
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc
+	dodoc HOWTO LSM README* WISHLIST *.txt
 }
 
 pkg_preinst() {
@@ -212,11 +213,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	use pam || return 0;
+	use pam || return 0
 
 	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)"
+		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)
 
 		if [ "${CHECK1}" != "${CHECK2}" ]; then
 			ewarn "Due to a security issue, ${ROOT}etc/pam.d/system-auth "
@@ -226,13 +227,13 @@ pkg_postinst() {
 			ewarn "  ${ROOT}etc/pam.d/system-auth.bak"
 			echo
 
-			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
-			rm -f ${ROOT}/etc/pam.d/._cfg????_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
+			rm -f "${ROOT}"/etc/pam.d/._cfg????_system-auth
 		else
-			rm -f ${ROOT}/etc/pam.d/system-auth.new
+			rm -f "${ROOT}"/etc/pam.d/system-auth.new
 		fi
 	fi
 }
diff --git a/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild b/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
index 2f30b9f30948..fd5e36700b4b 100644
--- a/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.0.4.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/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild,v 1.1 2004/10/08 00:01:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.4.1-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -13,8 +13,8 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="pam selinux nls uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="pam selinux nls"
 
 DEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 )
@@ -36,7 +36,7 @@ src_unpack() {
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 
 	# uclibc support, corrects NIS usage
-	use uclibc && epatch ${FILESDIR}/shadow-4.0.4.1-nonis.patch
+	use elibc_uclibc && epatch ${FILESDIR}/shadow-4.0.4.1-nonis.patch
 
 	# Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY,
 	# else the session entries in /etc/pam.d/su never get executed, and
@@ -64,9 +64,16 @@ src_unpack() {
 	# with an exit status of 1 #66687
 	epatch ${FILESDIR}/${P}-userdel-missing-brackets.patch
 
+	# don't install manpages if USE=-nls
+	epatch ${FILESDIR}/${P}-nls-manpages.patch
+
+	# fix small graphical typo in passwd.1 #68150
+	epatch ${FILESDIR}/${P}-passwd-typo.patch
+
 	# Allows shadow configure detect newer systems properly
 	gnuconfig_update
 	elibtoolize
+	epunt_cxx
 }
 
 src_compile() {
@@ -89,7 +96,9 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "install problem"
 
-#	dodir /etc/default /etc/skel
+	# lock down setuid perms #47208
+	fperms go-r /bin/su /usr/bin/ch{fn,sh,age} \
+		/usr/bin/{expiry,newgrp,passwd,gpasswd} || die "fperms"
 
 	# Remove libshadow and libmisc; see bug 37725 and the following
 	# comment from shadow's README.linux:
@@ -123,6 +132,10 @@ src_install() {
 	# From sys-apps/pam-login now
 	#insopts -m0644 ; doins ${FILESDIR}/login.defs
 
+	# move passwd to / to help recover broke systems #64441
+	mv ${D}/usr/bin/passwd ${D}/bin/
+	dosym ../../bin/passwd /usr/bin/passwd
+
 	if use pam; then
 		insinto /etc/pam.d ; insopts -m0644
 		for x in ${FILESDIR}/pam.d/*; do
@@ -139,16 +152,13 @@ src_install() {
 		newins shadow groupadd
 	fi
 
+	# Remove manpages that are handled by other packages
+	cd ${D}/usr/share/man
+	find \
+		-name 'id.1' \
+		-o -name 'passwd.5' \
+		-exec rm {} \;
 	cd ${S}
-	# The manpage install is beyond my comprehension, and
-	# also broken. Just do it over.
-	rm -rf ${D}/usr/share/man/*
-
-	rm -f man/id.1 man/getspnam.3 man/passwd.5
-	for x in man/*.[0-9]
-	do
-		[ -f ${x} ] && doman ${x}
-	done
 
 	if ! use pam; then
 		# Dont install the manpage, since we dont use
@@ -159,25 +169,14 @@ src_install() {
 	fi
 
 	cd ${S}/doc
-	dodoc ANNOUNCE INSTALL README WISHLIST
+	dodoc INSTALL README WISHLIST
 	docinto txt
 	dodoc HOWTO LSM README.* *.txt
 
-	# Fix sparc serial console
-	if [ "${ARCH}" = "sparc" ]
-	then
-		# ttyS0 and its devfsd counterpart (Sparc serial port "A")
-		dosed 's:\(vc/1\)$:tts/0\n\1:' /etc/securetty
-		dosed 's:\(tty1\)$:ttyS0\n\1:' /etc/securetty
-	fi
-
-	# fix hppa serial console
+	# ttyB0 is the PDC software console
 	if [ "${ARCH}" = "hppa" ]
 	then
-		# ttyB0 is the PDC software console
-		dosed 's:\(vc/1\)$:tts/0\n\1:' /etc/securetty
-		dosed 's:\(tty1\)$:ttyS0\n\1:' /etc/securetty
-		dosed 's:\(tty1\)$:ttyB0\n\1:' /etc/securetty
+		echo "ttyB0" >> ${D}/etc/securetty
 	fi
 }
 
@@ -195,7 +194,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
diff --git a/sys-apps/shadow/shadow-4.0.5-r2.ebuild b/sys-apps/shadow/shadow-4.0.5-r2.ebuild
index 2e269a1da275..0e7ac21a4276 100644
--- a/sys-apps/shadow/shadow-4.0.5-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.5-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/sys-apps/shadow/shadow-4.0.5-r2.ebuild,v 1.1 2004/11/03 23:48:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -13,19 +13,17 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
-	pam? ( >=sys-libs/pam-0.75-r4 )
-	!pam? ( !virtual/login )
+	pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
+	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51-r2
 	nls? ( sys-devel/gettext )"
-#this requires a newer portage (>2.0.51-r2)
-#PROVIDE="!pam? ( virtual/login )"
 
 pkg_preinst() {
 	rm -f ${ROOT}/etc/pam.d/system-auth.new
@@ -66,6 +64,7 @@ src_unpack() {
 	# Allows shadow configure detect newer systems properly
 	gnuconfig_update
 	elibtoolize
+	epunt_cxx
 }
 
 src_compile() {
@@ -177,7 +176,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
diff --git a/sys-apps/shadow/shadow-4.0.5-r3.ebuild b/sys-apps/shadow/shadow-4.0.5-r3.ebuild
index 76a9048a82cc..9dea349b0ca8 100644
--- a/sys-apps/shadow/shadow-4.0.5-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.0.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r3.ebuild,v 1.1 2004/11/07 19:56:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
-inherit eutils libtool gnuconfig flag-o-matic
+inherit eutils libtool toolchain-funcs flag-o-matic
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 SELINUX_PATCH="shadow-4.0.4.1-selinux.diff"
@@ -13,19 +13,17 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
-	pam? ( >=sys-libs/pam-0.75-r4 )
-	!pam? ( !virtual/login )
+	pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
+	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51-r2
 	nls? ( sys-devel/gettext )"
-#this requires a newer portage (>2.0.51-r2)
-#PROVIDE="!pam? ( virtual/login )"
 
 pkg_preinst() {
 	rm -f ${ROOT}/etc/pam.d/system-auth.new
@@ -66,9 +64,8 @@ src_unpack() {
 	# actually end up in the environment
 	epatch ${FILESDIR}/shadow-${PV}-fix-adding-of-pam_env-set-env-vars.patch
 
-	# Allows shadow configure detect newer systems properly
-	gnuconfig_update
 	elibtoolize
+	epunt_cxx
 }
 
 src_compile() {
@@ -113,6 +110,11 @@ src_install() {
 	insopts -m0600 ; doins ${FILESDIR}/securetty
 	insopts -m0600 ; doins etc/login.access
 	insopts -m0644 ; doins etc/limits
+	# Only output hvc ibm cruft for ppc64 machines
+	if [[ $(tc-arch) == "ppc64" ]] ; then
+		echo "hvc0" >> "${D}"/etc/securetty
+		echo "hvsi0" >> "${D}"/etc/securetty
+	fi
 
 	# needed for 'adduser -D'
 	insinto /etc/default
@@ -180,7 +182,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
diff --git a/sys-apps/shadow/shadow-4.0.6-r1.ebuild b/sys-apps/shadow/shadow-4.0.6-r1.ebuild
index dc9fb9b3512e..0c6c445f0d8e 100644
--- a/sys-apps/shadow/shadow-4.0.6-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.6-r1.ebuild,v 1.1 2005/01/12 03:27:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.6-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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 selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
@@ -21,7 +21,7 @@ RDEPEND=">=sys-libs/cracklib-2.7-r3
 	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51-r2
 	nls? ( sys-devel/gettext )"
 
@@ -68,12 +68,12 @@ src_unpack() {
 	# Allows shadow configure detect newer systems properly
 	gnuconfig_update
 	elibtoolize
+	epunt_cxx
 }
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -181,7 +181,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
diff --git a/sys-apps/shadow/shadow-4.0.7-r1.ebuild b/sys-apps/shadow/shadow-4.0.7-r1.ebuild
index 08d829e57a89..d1ec42396612 100644
--- a/sys-apps/shadow/shadow-4.0.7-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.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/sys-apps/shadow/shadow-4.0.7-r1.ebuild,v 1.1 2005/02/25 15:04:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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 selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
@@ -61,6 +61,9 @@ src_unpack() {
 	# Fix SU_WHEEL_ONLY behavior #80345
 	epatch ${FILESDIR}/${P}-iswheel.patch
 
+	# Fix lastlog not logged for tty's
+	epatch ${FILESDIR}/${P}-lastlog.patch
+
 	# Make user/group names more flexible #3485 / #22920
 	epatch "${FILESDIR}"/shadow-4.0.6-dots-in-usernames.patch
 	epatch "${FILESDIR}"/shadow-4.0.6-long-groupnames.patch
@@ -76,8 +79,7 @@ src_unpack() {
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -214,7 +216,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
diff --git a/sys-apps/shadow/shadow-4.0.7-r3.ebuild b/sys-apps/shadow/shadow-4.0.7-r3.ebuild
index 61d09d065d20..fd7fe37e2d39 100644
--- a/sys-apps/shadow/shadow-4.0.7-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.0.7-r3.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-apps/shadow/shadow-4.0.7-r3.ebuild,v 1.1 2005/07/08 13:16:40 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
-inherit eutils libtool toolchain-funcs flag-o-matic
+inherit eutils libtool toolchain-funcs flag-o-matic multilib
 
 # We should remove this login after pam-0.78 goes stable.
 FORCE_SYSTEMAUTH_UPDATE="no"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
@@ -33,46 +33,46 @@ pkg_preinst() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# uclibc support, corrects NIS usage
-	epatch ${FILESDIR}/shadow-4.0.4.1-nonis.patch
+	epatch "${FILESDIR}"/shadow-4.0.4.1-nonis.patch
 
 	# If su should not simulate a login shell, use '/bin/sh' as shell to enable
 	# running of commands as user with /bin/false as shell, closing bug #15015.
 	# *** This one could be a security hole; disable for now ***
-	#epatch ${FILESDIR}/${P}-nologin-run-sh.patch
+	#epatch "${FILESDIR}"/${P}-nologin-run-sh.patch
 
 	# don't install manpages if USE=-nls
-	epatch ${FILESDIR}/shadow-4.0.5-nls-manpages.patch
+	epatch "${FILESDIR}"/shadow-4.0.5-nls-manpages.patch
 
 	# tweak the default login.defs
-	epatch ${FILESDIR}/shadow-4.0.5-login.defs.patch
+	epatch "${FILESDIR}"/shadow-4.0.5-login.defs.patch
 
 	# skeychallenge call needs updating #69741
-	epatch ${FILESDIR}/shadow-4.0.5-skey.patch
+	epatch "${FILESDIR}"/shadow-4.0.5-skey.patch
 
 	# The new configure changes do not detect utmp/logdir properly
-	epatch ${FILESDIR}/shadow-4.0.6-fix-configure.patch
+	epatch "${FILESDIR}"/shadow-4.0.6-fix-configure.patch
 
 	# Tweak manpages #70880
-	epatch ${FILESDIR}/shadow-4.0.6-manpages.patch
+	epatch "${FILESDIR}"/shadow-4.0.6-manpages.patch
 
 	# Fix SU_WHEEL_ONLY behavior #80345
-	epatch ${FILESDIR}/${P}-iswheel.patch
+	epatch "${FILESDIR}"/${P}-iswheel.patch
 
 	# Fix lastlog not logged for tty's
-	epatch ${FILESDIR}/${P}-lastlog.patch
+	epatch "${FILESDIR}"/${P}-lastlog.patch
 
 	# Make user/group names more flexible #3485 / #22920
 	epatch "${FILESDIR}"/shadow-4.0.6-dots-in-usernames.patch
 	epatch "${FILESDIR}"/shadow-4.0.6-long-groupnames.patch
 
 	# Newer glibc's have a different nscd socket location #74395
-	epatch ${FILESDIR}/${P}-nscd-socket-path.patch
+	epatch "${FILESDIR}"/${P}-nscd-socket-path.patch
 
 	# Fix EPIPE failure when writing to nscd, bug #80413
-	epatch ${FILESDIR}/${P}-nscd-EPIPE-failure.patch
+	epatch "${FILESDIR}"/${P}-nscd-EPIPE-failure.patch
 
 	elibtoolize
 	epunt_cxx
@@ -80,8 +80,7 @@ src_unpack() {
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -97,7 +96,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install problem"
+	make DESTDIR="${D}" install || die "install problem"
 	dosym useradd /usr/sbin/adduser
 
 	# lock down setuid perms #47208
@@ -109,17 +108,17 @@ src_install() {
 	#   Currently, libshadow.a is for internal use only, so if you see
 	#   -lshadow in a Makefile of some other package, it is safe to
 	#   remove it.
-	rm -f ${D}/lib/lib{misc,shadow}.{a,la}
+	rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
 
 	if use pam; then
 		# These is now shipped with pam-login, and login
 		# had/have a serious root exploit with pam support
 		# enabled.
-		for x in ${D}/bin/login \
-		         ${D}/usr/bin/faillog ${D}/usr/bin/lastlog \
-		         ${D}/usr/share/man/man5/faillog.5* \
-		         ${D}/usr/share/man/man8/lastlog.8* \
-		         ${D}/usr/share/man/man8/faillog.8*; do
+		for x in "${D}"/bin/login \
+		         "${D}"/usr/bin/faillog "${D}"/usr/bin/lastlog \
+		         "${D}"/usr/share/man/man5/faillog.5* \
+		         "${D}"/usr/share/man/man8/lastlog.8* \
+		         "${D}"/usr/share/man/man8/faillog.8*; do
 				 [[ -f ${x} ]] && rm -f ${x}
 		done
 	fi
@@ -127,22 +126,24 @@ src_install() {
 	insinto /etc
 	# Using a securetty with devfs device names added
 	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins ${FILESDIR}/securetty
+	insopts -m0600 ; doins "${FILESDIR}"/securetty
 	insopts -m0600 ; doins etc/login.access
 	insopts -m0644 ; doins etc/limits
-	# Only output hvc ibm cruft for ppc64 machines
-	if [[ $(tc-arch) == "ppc64" ]] ; then
-		echo "hvc0" >> "${D}"/etc/securetty
-		echo "hvsi0" >> "${D}"/etc/securetty
-	fi
+	# Output arch-specific cruft
+	case $(tc-arch) in
+		ppc64) echo "hvc0" >> "${D}"/etc/securetty
+		       echo "hvsi0" >> "${D}"/etc/securetty;;
+		hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
+		arm)   echo "ttyFB0" >> "${D}"/etc/securetty;;
+	esac
 
 	# needed for 'adduser -D'
 	insinto /etc/default
 	insopts -m0600
-	doins ${FILESDIR}/default/useradd
+	doins "${FILESDIR}"/default/useradd
 
 	# move passwd to / to help recover broke systems #64441
-	mv ${D}/usr/bin/passwd ${D}/bin/
+	mv "${D}"/usr/bin/passwd "${D}"/bin/
 	dosym /bin/passwd /usr/bin/passwd
 
 	if use pam ; then
@@ -152,7 +153,7 @@ src_install() {
 		portageq has_version / '>=sys-libs/pam-0.78' && \
 			INSTALL_SYSTEM_PAMD="no"
 
-		for x in ${FILESDIR}/pam.d-include/*; do
+		for x in "${FILESDIR}"/pam.d-include/*; do
 			case "${x##*/}" in
 				"login")
 					# We do no longer install this one, as its from
@@ -178,19 +179,19 @@ src_install() {
 		done
 		for x in chage chsh chfn chpasswd newusers \
 		         user{add,del,mod} group{add,del,mod} ; do
-			newpamd ${FILESDIR}/pam.d-include/shadow ${x}
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
 		done
 
 		# Only add this one if needed.
 		if [ "${FORCE_SYSTEMAUTH_UPDATE}" = "yes" ]; then
-			newpamd ${FILESDIR}/pam.d-include/system-auth-1.1 system-auth.new || \
+			newpamd "${FILESDIR}"/pam.d-include/system-auth-1.1 system-auth.new || \
 				die "Failed to install system-auth.new!"
 		fi
 
 		# remove manpages that pam will install for us
 		# and/or don't apply when using pam
 
-		find ${D}/usr/share/man \
+		find "${D}"/usr/share/man \
 			'(' -name 'login.1' -o -name 'suauth.5' ')' \
 			-exec rm {} \;
 	else
@@ -200,19 +201,14 @@ src_install() {
 	fi
 
 	# Remove manpages that are handled by other packages
-	find ${D}/usr/share/man \
+	find "${D}"/usr/share/man \
 		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
 		-exec rm {} \;
 
-	cd ${S}/doc
+	cd "${S}"/doc
 	dodoc INSTALL README WISHLIST
 	docinto txt
 	dodoc HOWTO LSM README.* *.txt
-
-	# ttyB0 is the PDC software console
-	if [ "${ARCH}" = "hppa" ]; then
-		echo "ttyB0" >> ${D}/etc/securetty
-	fi
 }
 
 pkg_postinst() {
@@ -230,7 +226,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
diff --git a/sys-apps/shadow/shadow-4.0.7-r4.ebuild b/sys-apps/shadow/shadow-4.0.7-r4.ebuild
index d291c255b813..27caa37a4ac0 100644
--- a/sys-apps/shadow/shadow-4.0.7-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.0.7-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/sys-apps/shadow/shadow-4.0.7-r4.ebuild,v 1.1 2005/07/25 12:02:21 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.7-r4.ebuild,v 1.1.1.1 2005/11/30 09:57:04 chriswhite Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic multilib
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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="pam selinux nls skey nousuid"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
@@ -83,8 +83,7 @@ src_unpack() {
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -231,7 +230,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
diff --git a/sys-apps/shadow/shadow-4.0.7.ebuild b/sys-apps/shadow/shadow-4.0.7.ebuild
index 5bf0b5cc43da..4f86dad2c691 100644
--- a/sys-apps/shadow/shadow-4.0.7.ebuild
+++ b/sys-apps/shadow/shadow-4.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/sys-apps/shadow/shadow-4.0.7.ebuild,v 1.1 2005/02/06 23:41:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.7.ebuild,v 1.1.1.1 2005/11/30 09:57:05 chriswhite Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 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 selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
@@ -20,7 +20,7 @@ RDEPEND=">=sys-libs/cracklib-2.7-r3
 	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51-r2
 	nls? ( sys-devel/gettext )"
 
@@ -73,8 +73,7 @@ src_unpack() {
 
 src_compile() {
 	append-ldflags -Wl,-z,now
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
-		&& export ac_cv_func_setpgrp_void=yes
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
 	econf \
 		--disable-desrpc \
 		--with-libcrypt \
@@ -182,7 +181,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
diff --git a/sys-apps/slocate/ChangeLog b/sys-apps/slocate/ChangeLog
index d25727c641c0..bd5245790624 100644
--- a/sys-apps/slocate/ChangeLog
+++ b/sys-apps/slocate/ChangeLog
@@ -1,9 +1,199 @@
 # ChangeLog for sys-apps/slocate
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.1 2002/07/09 20:25:59 aliz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  13 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/slocate-2.7-really-long-paths.patch, slocate-2.7-r8.ebuild:
+  Patch from Fedora to fix #104378.
+
+  05 Aug 2005; Ciaran McCreesh <ciaranm@gentoo.org> files/updatedb.conf:
+  Exclude /root/.ccache, bug #90344
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
+  Clean up updatedb.conf as directed by Nikolai Weibull in #97377.
+
+*slocate-2.7-r8 (31 May 2005)
+
+  31 May 2005; Mike Frysinger <vapier@gentoo.org> +slocate-2.7-r8.ebuild:
+  Use a common "locate" group instead of "slocate" to work with rlocate.
+
+*slocate-2.7-r7 (20 Oct 2004)
+
+  20 Oct 2004; Sven Wegener <swegener@gentoo.org> -slocate-2.7-r6.ebuild,
+  +slocate-2.7-r7.ebuild:
+  Revision bump to distribute a fixed version for the suid root issue.
+
+  20 Oct 2004; Sven Wegener <swegener@gentoo.org> slocate-2.7-r6.ebuild:
+  Don't install slocate suid root but sgid slocate.
+
+*slocate-2.7-r6 (14 Oct 2004)
+
+  14 Oct 2004; Mike Frysinger <vapier@gentoo.org> +slocate-2.7-r6.ebuild:
+  Version bump with debian patch #65560 by Johannes Günther.
+
+  14 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf,
+  slocate-2.7-r5.ebuild:
+  Prune ramfs (since we kill tmpfs and such) #54080.
+
+  27 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> slocate-2.7-r5.ebuild:
+  Use ROOT in pkg_postinst; error messages; error check sed
+
+  27 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> -slocate-2.7-r2.ebuild,
+  -slocate-2.7-r3.ebuild, -slocate-2.7-r4.ebuild:
+  prune ebuilds
+
+  22 Jul 2004; Mike Frysinger <vapier@gentoo.org> files/updatedb.conf:
+  Add subfs to the prune list #56432 by Andreas Simon.
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> slocate-2.7-r5.ebuild:
+  uclibc patch is in DISTDIR. Thanks Mr Bones
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org> slocate-2.7-r5.ebuild:
+  uclibc patch thanks to Peter S. Mazinger <ps.m@gmx.net>
+
+  15 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> files/updatedb.conf:
+  Added nnpfs to the PRUNEFS line. (bug #54035)
+
+  22 May 2004; Robert Coie <rac@gentoo.org> slocate-2.7-r5.ebuild:
+  Add shadow to RDEPEND, it's used in postinst
+
+  19 Apr 2004; Jon Portnoy <avenj@gentoo.org> slocate-2.7-r5.ebuild :
+  Update DEPEND to contain automake. Add RDEPEND to not contain 
+  automake. Bug #46084. Also marked stable on AMD64.
+
+  15 Mar 2004; Joshua Kinard <kumba@gentoo.org> slocate-2.7-r5.ebuild:
+  Marked stable on mips.
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> slocate-2.7-r5.ebuild:
+  adding initial s390 support
+
+  01 Mar 2004; Tom Gall <tgall@gentoo.org> slocate-2.7-r5.ebuild:
+  ppc64 needs sys-devel/automake
+
+  17 Jan 2004; Christian Birchinger <joker@gentoo.org> slocate-2.7-r5.ebuild:
+  Added sparc stable keyword
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r5.ebuild:
+  nice updatedb for #37871, and clean up the ebuild
+
+*slocate-2.7-r5 (10 Jan 2004)
+
+  11 Jan 2003; Guy Martin <gmsoft@gentoo.org> slocate-2.7-r5.ebuild :
+  Marked stable on hppa.
+
+  10 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> slocate-2.7-r5.ebuild,
+  files/updatedb.conf:
+  Add devpts and usbfs to the list of pruned filesystems. Bump revision as this
+  is a runtime change.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r4.ebuild:
+  stable on x86, alpha, ia64
+
+*slocate-2.7-r4 (06 Jan 2004)
+
+  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r4.ebuild:
+  Bump revision to carry in config file change below (which is a run-time
+  change)
+
+  06 Jan 2004; Aron Griffis <agriffis@gentoo.org> files/updatedb.conf:
+  Add supermount to the list of pruned filesystems
+
+  01 Nov 2003; Douglas Russell <puggy@gentoo.org> slocate-2.7-r2.ebuild,
+  slocate-2.7-r3.ebuild:
+  Fixed a couple of user.group chown bugs to user:chown to work with usernames
+  containing a "."
+
+*slocate-2.7-r3 (31 Oct 2003)
+
+  31 Oct 2003; Brian Jackson <iggy@gentoo.org> slocate-2.7-r3.ebuild
+  files/updatedb.conf:
+  adding sysfs to PRUNEFS, closes bug 32345, thanks to jforman@austin.rr.com
+
+  08 Oct 2003; <solar@gentoo.org> slocate-2.7-r2.ebuild:
+  permission fix for when sfperms is found in FEATURES, added a metadata.xml
+
+*slocate-2.7-r2 (17 Apr 2003)
+
+  18 Aug 2003; Joshua Kinard <kumba@gentoo.org> slocate-2.7-r2.ebuild:
+  Changed ~mips to mips in KEYWORDS
+
+  05 Jun 2003; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r2.ebuild:
+  Add dependency on sed-4
+
+  05 Jun 2003; Aron Griffis <agriffis@gentoo.org> slocate-2.7-r2.ebuild:
+  Mark stable on alpha
+
+  06 May 2003; Guy Martin <gmsoft@gentoo.org> slocate-2.7-r2.ebuild :
+  Added sys-apps/shadow to DEPEND since pkg_postinst() use groupmod and
+  groupadd.
+
+  19 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r2.ebuild:
+  Make the group existance checking smarter
+
+  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> files/updatedb.conf:
+  Add ncpfs to default pruned filesystems
+
+  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r2.ebuild:
+  Apply patch from bug 19279, ebuild fixes, and install a working updatedb.conf
+  file
+
+*slocate-2.7-r1 (12 Apr 2003)
+
+  13 Apr 2003; Guy Martin <gmsoft@gentoo.org> slocate-2.7-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  13 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  slocate-2.7-r1.ebuild:
+  Fixing entry in updatedb.conf (now points to right doc dir)
+
+  12 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r1.ebuild:
+  Additional cleanups (no functional changes)
+
+  12 Apr 2003; Brandon Low <lostlogic@gentoo.org> slocate-2.7-r1.ebuild:
+  Fixage for sandbox and comments
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  slocate-2.7-r1.ebuild:
+  OK, I bumped the version just because of people worrying about the bogus error
+  messages that slocate puts out when first run. For instance without a db file,
+  locate will error out. With a blank db file, it will report nothing, as
+  expected. So, we check if a db file exists, if not, we install a blank one.
+  Additionally, slocate cries about an update.conf file, so we just create a
+  blank one with a note pointing to the sample one in the doc folder.
+
+*slocate-2.7 (02 Feb 2003)
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> slocate-2.7.ebuild,
+  files/updatedb.conf:
+  some cleanups, and install a blank config file with a note about the doc'd
+  sample config file
+
+  12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest,
+  slocate-2.6.ebuild, slocate-2.7.ebuild:
+  added other arches
+
+  30 Mar 2003; Martin Holzer <mholzer@gentoo.org> slocate-2.7.ebuild, files/updatedb.conf:
+  Added updatedb.conf. Closes #18440.
+
+  02 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
 
 *slocate-2.6 (09 Jul 2002)
 
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> : slocate-2.6.ebuild :
+  Fixed Permissions for crontab file.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  20 Jul 2002; Mark Guertin <gerk@gentoo.org> slocate-2.6.ebuild :
+  Added ppc to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> slocate-2.6.ebuild :
+  Added KEYWORDS, SLOT.
+
   09 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ChangeLog :
 
   Added ChangeLog.
diff --git a/sys-apps/slocate/Manifest b/sys-apps/slocate/Manifest
index b7432563d318..26948c5d157a 100644
--- a/sys-apps/slocate/Manifest
+++ b/sys-apps/slocate/Manifest
@@ -1,6 +1,19 @@
-MD5 09eff9b946dad0ddad42ac46da1772d7 slocate-2.7.ebuild 1627
-MD5 e8cb974a036ec6a013317e6b48af8010 slocate-2.6.ebuild 1516
-MD5 9ea73a4b416c358d147f5b46d8bcad10 ChangeLog 926
-MD5 2831adc800599b2ae5ee340beafc4e31 files/digest-slocate-2.6 62
-MD5 f03ed3063ac796dbf26187038a928db8 files/digest-slocate-2.7 62
-MD5 f2c61fd26cb4497626447746ac9189c6 files/updatedb.conf 634
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dee5b345681e427079a764929aaf4d91 ChangeLog 7425
+MD5 4109d0757229d079e30f8ea33b676f00 files/digest-slocate-2.7-r7 211
+MD5 4109d0757229d079e30f8ea33b676f00 files/digest-slocate-2.7-r8 211
+MD5 6cd691d75d501eb87ed12cf31c1e1ff6 files/slocate-2.7-bounds.patch 305
+MD5 798bd427c87de3cfdb9ecd6854f2e56b files/slocate-2.7-really-long-paths.patch 538
+MD5 708503ec255083a2b20b230070147a62 files/updatedb.conf 567
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 1711c302c7546e0a7210bce15849fa43 slocate-2.7-r7.ebuild 2323
+MD5 bdaca2b2b98155458643f4c5d1fdc58e slocate-2.7-r8.ebuild 2772
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDcrL6gIKl8Uu19MoRAoxhAJ91pHXofG6d+xIyE80pDBZxrRfggQCfdn+G
+WMZxLWXc2KCtSK+BL1rt64g=
+=VkzH
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/slocate/files/updatedb.conf b/sys-apps/slocate/files/updatedb.conf
index 89a67c2f91a2..166c527aec3d 100644
--- a/sys-apps/slocate/files/updatedb.conf
+++ b/sys-apps/slocate/files/updatedb.conf
@@ -1,16 +1,11 @@
-# This file sets environment variables which are used by updatedb
+# /etc/updatedb.conf: config file for slocate
+# $Id: updatedb.conf,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
-# filesystems which are pruned from updatedb database
-PRUNEFS="NFS nfs afs proc smbfs autofs auto iso9660 devfs tmpfs"
-export PRUNEFS
-# paths which are pruned from updatedb database
-PRUNEPATHS="/tmp /var/tmp"
-export PRUNEPATHS
-# netpaths which are added
-NETPATHS=""
-export NETPATHS
+# This file sets variables that are used by updatedb.
+# For more info, see the updatedb(1) manpage.
 
- netpaths which are added
-NETPATHS=""
-export NETPATHS
+# Filesystems that are pruned from updatedb database
+PRUNEFS="afs auto autofs cifs devfs devpts eventpollfs futexfs hugetlbfs iso9660 mqueue ncpfs nfs NFS nfsd nnpfs pipefs proc ramfs rpc_pipefs sfs shfs smbfs sockfs subfs supermount sysfs tmpfs udf usbfs vperfctrfs"
 
+# Paths which are pruned from updatedb database
+PRUNEPATHS="/tmp /var/tmp /root/.ccache"
diff --git a/sys-apps/slocate/metadata.xml b/sys-apps/slocate/metadata.xml
index fb3a8fc65264..96a2d586367d 100644
--- a/sys-apps/slocate/metadata.xml
+++ b/sys-apps/slocate/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This Package Lacks Primary Maintainer</description>
-	</maintainer>
-	<longdescription>Secure locate provides a secure way to index and quickly search for files on your system. A drop-in replacement for locate</longdescription>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/slocate/slocate-2.7-r7.ebuild b/sys-apps/slocate/slocate-2.7-r7.ebuild
index 514810186152..fe9a0555018d 100644
--- a/sys-apps/slocate/slocate-2.7-r7.ebuild
+++ b/sys-apps/slocate/slocate-2.7-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r7.ebuild,v 1.1 2004/10/20 16:55:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r7.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -8,15 +8,14 @@ DESCRIPTION="Secure way to index and quickly search for files on your system (dr
 HOMEPAGE="http://www.geekreview.org/slocate/"
 SRC_URI="ftp://ftp.geekreview.org/slocate/src/slocate-${PV}.tar.gz
 	mirror://gentoo/${P}-debian.patch.bz2
-	mirror://gentoo/${P}-uclibc-sl_fts.patch.bz2"
+	elibc_uclibc? ( mirror://gentoo/${P}-uclibc-sl_fts.patch.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="uclibc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
 
 DEPEND="sys-apps/shadow"
-RDEPEND="sys-apps/shadow"
 
 pkg_setup() {
 	enewgroup slocate
@@ -24,17 +23,19 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	use uclibc && epatch ${WORKDIR}/${P}-uclibc-sl_fts.patch
-	epatch ${WORKDIR}/${P}-debian.patch
+	cd "${S}"
+	use elibc_uclibc && epatch "${WORKDIR}"/${P}-uclibc-sl_fts.patch
+	epatch "${WORKDIR}"/${P}-debian.patch
+	epatch "${FILESDIR}"/${P}-bounds.patch
 
-	append-ldflags -Wl,-z,now
 	filter-lfs-flags
+	# this is safe since slocate only has 1 binary
+	append-ldflags -Wl,-z,now
 
 	sed -i \
 		-e "/groupadd/s/^/#/" \
 		-e "/chown.*slocate/s/^/#/" \
-		-e "/^CFLAGS/s:-g3:${CFLAGS}:" \
+		-e '/^CFLAGS/d' \
 		Makefile.in || die
 }
 
@@ -54,7 +55,7 @@ src_install() {
 	dodoc AUTHORS README ChangeLog
 
 	# man page fixing
-	rm -f "${D}/usr/share/man/man1/locate.1.gz"
+	rm -f "${D}"/usr/share/man/man1/locate.1.gz
 	dosym slocate.1.gz /usr/share/man/man1/locate.1.gz
 
 	insinto /etc
@@ -71,12 +72,10 @@ src_install() {
 pkg_postinst() {
 	touch "${ROOT}/var/lib/slocate/slocate.db"
 
-	if [[ -f "${ROOT}/etc/cron.daily/slocate.cron" ]]; then
-		ewarn
+	if [[ -f ${ROOT}/etc/cron.daily/slocate.cron ]]; then
 		ewarn "If you merged slocate-2.7.ebuild, please remove"
 		ewarn "/etc/cron.daily/slocate.cron since .cron has been removed"
 		ewarn "from the filename"
-		ewarn
 		echo
 	fi
 	einfo "Note that the /etc/updatedb.conf file is generic"
diff --git a/sys-apps/slocate/slocate-2.7-r8.ebuild b/sys-apps/slocate/slocate-2.7-r8.ebuild
index c2a5f011fbfe..6a074188fd67 100644
--- a/sys-apps/slocate/slocate-2.7-r8.ebuild
+++ b/sys-apps/slocate/slocate-2.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/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.1 2005/05/31 22:47:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/slocate/slocate-2.7-r8.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -24,10 +24,10 @@ pkg_setup() {
 		eerror "The 'slocate' group has been renamed to 'locate'."
 		eerror "You seem to already have a 'slocate' group."
 		eerror "Please rename it:"
-		eerror "sed -i s/^slocate:/locate:/ /etc/group"
+		eerror "groupmod -n locate slocate"
 		die "Change 'slocate' to 'locate'"
 	fi
-	enewgroup locate
+	enewgroup locate 245
 }
 
 src_unpack() {
@@ -36,6 +36,7 @@ src_unpack() {
 	use elibc_uclibc && epatch "${WORKDIR}"/${P}-uclibc-sl_fts.patch
 	epatch "${WORKDIR}"/${P}-debian.patch
 	epatch "${FILESDIR}"/${P}-bounds.patch
+	epatch "${FILESDIR}"/${P}-really-long-paths.patch
 
 	sed -i \
 		-e '/SLOC_GRP/s:slocate:locate:' \
diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index 4ba9f2bd142e..7768b0cfd80d 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,184 @@
 # ChangeLog for sys-apps/smartmontools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.1 2002/11/28 00:30:45 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
+
+  05 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  smartmontools-5.33.ebuild:
+  Marked ~ppc-macos (bug #109130)
+
+  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> smartmontools-5.33.ebuild:
+  Add support for USE=static #103390 by Sascha Silbe.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> smartmontools-5.33.ebuild:
+  stable on ia64
+
+  19 Apr 2005; <plasmaroo@gentoo.org> smartmontools-5.33.ebuild:
+  Add ~ia64 keyword, bug #89548.
+
+  06 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  smartmontools-5.33.ebuild:
+  Marked stable on amd64.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  smartmontools-5.33.ebuild:
+  Stable on alpha.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> smartmontools-5.33.ebuild:
+  Stable on ppc.
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  smartmontools-5.33.ebuild:
+  Stable on sparc
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> files/smartd.rc,
+  smartmontools-5.33.ebuild:
+  Update docs #76337 by Daniel Holth.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*smartmontools-5.33 (09 Oct 2004)
+
+  09 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/smartd.confd,
+  files/smartd.rc, +smartmontools-5.33.ebuild:
+  Version bump #62717 by Ziga Boehm.
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> smartmontools-5.30.ebuild:
+  Keyworded ~alpha, requested in bug #51550.
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> smartmontools-5.30.ebuild:
+  Added to ~ppc.
+
+*smartmontools-5.30 (31 Mar 2004)
+
+  31 Mar 2004; Martin Holzer <mholzer@gentoo.org> smartmontools-5.30.ebuild:
+  Version bumped.
+
+*smartmontools-5.29 (24 Feb 2004)
+
+  24 Feb 2004; Martin Holzer <mholzer@gentoo.org> smartmontools-5.29.ebuild:
+  Version bumped.
+
+  14 Feb 2004; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.26.ebuild:
+  Added sparc stable keyword
+
+  13 Feb 2004; Martin Holzer <mholzer@gentoo.org> smartmontools-5.26.ebuild:
+  x86 stable
+
+*smartmontools-5.27 (13 Feb 2004)
+
+  13 Feb 2004; Martin Holzer <mholzer@gentoo.org> smartmontools-5.27.ebuild:
+  Version bumped.
+
+  20 Dec 2003; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.25.ebuild:
+  Added sparc stable keyword
+
+*smartmontools-5.26 (01 Dec 2003)
+
+  01 Dec 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.26.ebuild:
+  Version bumped.
+
+*smartmontools-5.25 (29 Nov 2003)
+
+  29 Nov 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.25.ebuild:
+  Version bumped.
+
+*smartmontools-5.23 (05 Nov 2003)
+
+  05 Nov 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.23.ebuild:
+  Version bumped.
+
+  02 Nov 2003; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.21.ebuild:
+  Added sparc stable keyword
+
+*smartmontools-5.21 (18 Oct 2003)
+
+  18 Oct 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.21.ebuild:
+  Version bumped.
+
+*smartmontools-5.20 (09 Oct 2003)
+
+  09 Oct 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.20.ebuild:
+  Version bumped.
+
+*smartmontools-5.19 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.19.ebuild:
+  Version bumped.
+
+  19 Sep 2003; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.1.18.ebuild:
+  Added sparc stable keyword
+
+  12 Sep 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.18.ebuild:
+  Marked x86 stable.
+
+  28 Aug 2003; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.1.16.ebuild:
+  Added sparc stable keyword
+
+*smartmontools-5.1.18 (22 Aug 2003)
+
+  22 Aug 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.18.ebuild:
+  Version bumped.
+
+  20 Aug 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.16.ebuild:
+  Marked x86 stable.
+
+*smartmontools-5.1.17 (20 Aug 2003)
+
+  20 Aug 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.17.ebuild:
+  Version bumped.
+
+*smartmontools-5.1.16 (06 Aug 2003)
+
+  06 Aug 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.16.ebuild:
+  Version bumped.
+
+  16 Jul 2003; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.1.14.ebuild:
+  Added sparc stable keyword
+
+  16 Jul 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.14.ebuild:
+  Marked x86 stable
+
+*smartmontools-5.1.14 (01 Jul 2003)
+
+  01 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  smartmontools-5.1.14.ebuild:
+  Version bump
+
+  03 Jun 2003; Christian Birchinger <joker@gentoo.org>
+  smartmontools-5.1.11.ebuild:
+  Added sparc stable keyword
+
+  27 May 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.11.ebuild:
+  Marked stable on x86
+
+*smartmontools-5.1.11 (19 May 2003)
+
+  19 May 2003; Martin Holzer <mholzer@gentoo.org> smartmontools-5.1.10.ebuild,
+  smartmontools-5.1.10.ebuild, smartmontools-5.1.11.ebuild,
+  smartmontools-5.1.9.ebuild, smartmontools-5.1.9.ebuild:
+  Version bumped & cleanup
+
+*smartmontools-5.1.10 (22 Apr 2003)
+
+  22 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  smartmontools-5.1.10.ebuild:
+  Version bumped.
+
+*smartmontools-5.1.9 (15 Apr 2003)
+
+  15 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  smartmontools-5.1.9.ebuild:
+  Version bumped.
+
+  30 Jan 2002; Christian Birchinger <joker@gentoo.org> : 
+  Added sparc keyword.
 
 *smartmontools-5.0.45 (27 Nov 2002)
 
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 04aaaffeb5b1..7137edfbeedc 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,6 +1,6 @@
-MD5 95334c4a1f6c64c12d0ba77ff689b8a9 ChangeLog 621
-MD5 074069c5166bba1996556eed87872081 smartmontools-5.0.45.ebuild 960
-MD5 36a8ed618ed933830734c1e19ed1a9c6 smartmontools-5.1.9.ebuild 1002
-MD5 274bf91846f51fc5e93f303e5d4710f9 files/smartd.rc 518
-MD5 5dafe6c5d2381ddd1e48877419a22372 files/digest-smartmontools-5.1.9 71
-MD5 432ca1c6b0ccb2ce8c44f223aebd61af files/digest-smartmontools-5.0.45 71
+MD5 8dd9af44eabe5f971efd45b592627817 smartmontools-5.33.ebuild 1038
+MD5 8f73ec2effe7970e6f149e59d9d25c2a ChangeLog 5537
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 79699d2f3e2d148b1d5498b00792cd33 files/smartd.confd 273
+MD5 17aee6cd24fc0842f02c255e128dafaf files/smartd.rc 806
+MD5 3a3bbcc1d33c8f4e7b8831ee0027dae8 files/digest-smartmontools-5.33 70
diff --git a/sys-apps/smartmontools/files/smartd.confd b/sys-apps/smartmontools/files/smartd.confd
index 762e3847c790..6363e9c87368 100644
--- a/sys-apps/smartmontools/files/smartd.confd
+++ b/sys-apps/smartmontools/files/smartd.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/sys-apps/smartmontools/files/smartd.confd,v 1.1 2004/10/10 01:19:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd.confd,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
 # Insert any other options needed
 SMARTD_OPTS=""
diff --git a/sys-apps/smartmontools/files/smartd.rc b/sys-apps/smartmontools/files/smartd.rc
index 823717825250..3cf562354a3e 100644
--- a/sys-apps/smartmontools/files/smartd.rc
+++ b/sys-apps/smartmontools/files/smartd.rc
@@ -1,20 +1,35 @@
 #!/sbin/runscript
-# 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-apps/smartmontools/files/smartd.rc,v 1.1 2002/11/28 00:30:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/files/smartd.rc,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
 
-depend() {
-	need localmount
+opts="${opts} reload"
+
+checkconfig() {
+	if [ ! -f "/etc/smartd.conf" ] ; then
+		eerror "You should setup your /etc/smartd.conf file!"
+		eerror "See the smartd.conf(5) manpage."
+		return 1
+	fi
+	return 0
 }
 
 start() {
+	checkconfig || return 1
+
 	ebegin "Starting S.M.A.R.T. monitoring daemon"
-	start-stop-daemon --start --exec /usr/sbin/smartd
+	/usr/sbin/smartd -p /var/run/smartd.pid ${SMARTD_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping S.M.A.R.T. monitoring daemon"
-	start-stop-daemon --stop --exec /usr/sbin/smartd
+	start-stop-daemon --stop --pid /var/run/smartd.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	killall -HUP smartd &>/dev/null
 	eend $?
 }
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/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-apps/smartmontools/smartmontools-5.33.ebuild b/sys-apps/smartmontools/smartmontools-5.33.ebuild
index 55a777f575bb..3b2a431e0c31 100644
--- a/sys-apps/smartmontools/smartmontools-5.33.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.33.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/sys-apps/smartmontools/smartmontools-5.33.ebuild,v 1.1 2004/10/10 01:19:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.33.ebuild,v 1.1.1.1 2005/11/30 09:56:40 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="control and monitor storage systems using the Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.)"
 HOMEPAGE="http://smartmontools.sourceforge.net/"
@@ -8,17 +10,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 ia64 ppc ~ppc-macos sparc x86"
+IUSE="static"
+
+RDEPEND=""
+DEPEND=">=sys-apps/portage-2.0.51"
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	emake || die
+}
 
 src_install() {
 	dosbin smart{ctl,d} || die "dosbin"
 	doman *.[58]
 	dodoc AUTHORS CHANGELOG NEWS README TODO WARNINGS
+	newdoc smartd.conf smartd.conf.example
+	docinto examplescripts
+	dodoc examplescripts/*
 
 	insinto /etc
 	doins smartd.conf
 
-	exeinto /etc/init.d; newexe ${FILESDIR}/smartd.rc smartd
-	insinto /etc/conf.d; newins ${FILESDIR}/smartd.confd smartd
+	newinitd "${FILESDIR}"/smartd.rc smartd
+	newconfd "${FILESDIR}"/smartd.confd smartd
 }
diff --git a/sys-apps/sparc-utils/ChangeLog b/sys-apps/sparc-utils/ChangeLog
index 544f5a557e83..c17c6f85c6a9 100644
--- a/sys-apps/sparc-utils/ChangeLog
+++ b/sys-apps/sparc-utils/ChangeLog
@@ -1,9 +1,60 @@
-# ChangeLog for sys-apps/sed
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/ChangeLog,v 1.1 2002/04/16 02:01:00 murphy Exp $
+# ChangeLog for sys-apps/sparc-utils
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
+  23 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  sparc-utils-1.9-r2.ebuild:
+  Use correct toolchain compiler.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> sparc-utils-1.9-r1.ebuild,
+  sparc-utils-1.9-r2.ebuild, sparc-utils-1.9.ebuild:
+  Typo in DESCRIPTION: utilites -> utilities. Bug 59717.
+
+  09 Jul 2004; Travis Tilley <lv@gentoo.org> sparc-utils-1.9-r1.ebuild,
+  sparc-utils-1.9-r2.ebuild, sparc-utils-1.9.ebuild:
+  switch linux-headers dependency to virtual/os-headers
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sparc-utils-1.9-r1.ebuild, sparc-utils-1.9-r2.ebuild,
+  sparc-utils-1.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> files/audioctl.init:
+  Forgot to add the audioctl init script for the 1.9-r2 bump.
+
+*sparc-utils-1.9-r2 (01 Nov 2003)
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> sparc-utils-1.9-r2.ebuild:
+  another rev bump, more ebuild cleanups from Matsuu Takuto <matsuu@gentoo.org>.
+  closes bug #30744.
+
+  16 Aug 2003; Jason Wever <weeve@gentoo.org> metadata.xml,
+  sparc-utils-1.9-r1.ebuild, sparc-utils-1.9.ebuild:
+  Ebuild updates and addition of metadata.xml
+
+  22 Jun 2003; Jason Wever <weeve@gentoo.org> sparc-utils-1.9-r1.ebuild,
+  sparc-utils-1.9.ebuild:
+  Re-added sparc keywords, not sure why they went missing.
+
+*sparc-utils-1.9-r1 (22 Mar 2003)
+
+  22 Mar 2003; Jason Wever <weeve@gentoo.org> sparc-utils-1.9-r1.ebuild:
+  Version bump, fixed up ebuild so man pages are now installed with software.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *sparc-utils-1.9 (15 Feb 2002)
 
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> sparc-utils-1.9.ebuild,
+  files/sparc-utils_1.9-2.diff:
+  moved patch to mirrors, and use epatch instead
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> sparc-utils-1.9.ebuild :
+  This is definitely not for mips.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> sparc-utils-1.9.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   15 Feb 2002; M.Thibaut <murphy@gentoo.org> ChangeLog :
   
   Initial version of SPARC-specific binaries for linux. The sparc32
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index e69de29bb2d1..6f93b4651496 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3bb872114d9133dec68bd48af1f78d62 ChangeLog 2410
+MD5 1281e21ae801232cac21628092fbc7f9 metadata.xml 420
+MD5 34f88d015c2239fb052e42cfc0de6acb sparc-utils-1.9-r1.ebuild 1997
+MD5 8beee5ee89b91aea98e55a5db7ad3df7 sparc-utils-1.9-r2.ebuild 2164
+MD5 a83a7925b21e56602f33941e061b7867 sparc-utils-1.9.ebuild 1819
+MD5 90419bd873d8ef797f6ac6f982c3bcbf files/audioctl.init 571
+MD5 783037e3661cca44a73e38b5fd112166 files/digest-sparc-utils-1.9 141
+MD5 783037e3661cca44a73e38b5fd112166 files/digest-sparc-utils-1.9-r1 141
+MD5 783037e3661cca44a73e38b5fd112166 files/digest-sparc-utils-1.9-r2 141
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCQa9VArHZZzCEUG0RAg37AJsFeaLbgVe2UR47uMaChug6es7wBwCfbful
+dZZ1fo5N4vMIEy/iGbjbyKs=
+=CqME
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sparc-utils/files/audioctl.init b/sys-apps/sparc-utils/files/audioctl.init
index 37c9a4c5a8cc..f20b2f2f7612 100644
--- a/sys-apps/sparc-utils/files/audioctl.init
+++ b/sys-apps/sparc-utils/files/audioctl.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/files/audioctl.init,v 1.1 2003/11/01 13:06:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/files/audioctl.init,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
 checkconfig() {
 	if [ -z "${PARAMS}" ]
diff --git a/sys-apps/sparc-utils/files/digest-sparc-utils-1.9 b/sys-apps/sparc-utils/files/digest-sparc-utils-1.9
index 082fe1e46f12..0366076fa938 100644
--- a/sys-apps/sparc-utils/files/digest-sparc-utils-1.9
+++ b/sys-apps/sparc-utils/files/digest-sparc-utils-1.9
@@ -1 +1,2 @@
 MD5 08bf3f6d8433a1f4981a2afaa6b49a6c sparc-utils_1.9.orig.tar.gz 110080
+MD5 50bd3e4749473b3effdb00981220f09f sparc-utils_1.9-2.diff.bz2 7992
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild
index fe950785b6f0..a99cc950f484 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r1.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/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild,v 1.1 2003/03/22 23:14:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
 inherit eutils
 
 S=${WORKDIR}/${P}.orig
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
 HOMEPAGE="http://www.debian.org/"
 SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
 	mirror://gentoo/${PN}_${PV}-2.diff.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="sparc -x86 -ppc -alpha -mips -hppa -arm"
+KEYWORDS="-* sparc"
+IUSE=""
 
-DEPEND="sys-kernel/linux-headers"
-RDEPEND="virtual/glibc"
+DEPEND="virtual/os-headers"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r2.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r2.ebuild
index 35bef1787f19..370b32c0b367 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r2.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r2.ebuild
@@ -1,10 +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/sys-apps/sparc-utils/sparc-utils-1.9-r2.ebuild,v 1.1 2003/11/01 12:01:36 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-DESCRIPTION="Various sparc utilites from Debian GNU/Linux"
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
 HOMEPAGE="http://www.debian.org/"
 SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
 	mirror://gentoo/${PN}_${PV}-2.diff.bz2"
@@ -14,8 +14,8 @@ LICENSE="GPL-2"
 KEYWORDS="~sparc -x86 -ppc"
 IUSE=""
 
-DEPEND="sys-kernel/linux-headers"
-RDEPEND="virtual/glibc
+DEPEND="virtual/os-headers"
+RDEPEND="virtual/libc
 	sys-devel/sparc32"
 
 S="${WORKDIR}/${P}.orig"
@@ -28,10 +28,10 @@ src_unpack() {
 src_compile() {
 	local CFLAGS="-O3"
 
-	emake -C elftoaout-2.3 CFLAGS="${CFLAGS}" || die
-	emake -C src piggyback piggyback64 CFLAGS="${CFLAGS}" || die
-	emake -C prtconf-1.3 all || die
-	emake -C audioctl-1.3 || die
+	emake -C elftoaout-2.3 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+	emake -C src piggyback piggyback64 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+	emake -C prtconf-1.3 CC="$(tc-getCC)" all || die
+	emake -C audioctl-1.3 CC="$(tc-getCC)" || die
 
 	# sparc32 is in sys-devel/sparc32
 	# emake -C sparc32-1.1
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
index a89fad9f95a3..48b5a3507aa7 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9.ebuild
@@ -1,47 +1,59 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Maarten Thibaut <murphy@gentoo.org>
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9.ebuild,v 1.1.1.1 2005/11/30 09:56:30 chriswhite Exp $
+
+inherit eutils
 
-A=`echo ${P}|sed 's/sparc-utils-/sparc-utils_/'`.orig.tar.gz
 S=${WORKDIR}/${P}.orig
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="http://http.us.debian.org/debian/pool/main/s/sparc-utils/${A}"
-HOMEPAGE="http://www.debian.org"
-RDEPEND="virtual/glibc"
+DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://gentoo/${PN}_${PV}-2.diff.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* sparc"
+IUSE=""
+
+DEPEND="virtual/os-headers"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cat ${FILESDIR}/sparc-utils_1.9-2.diff | patch -p0 -l || die
+	epatch ${WORKDIR}/${PN}_${PV}-2.diff
 }
 
 src_compile() {
-
-	CFLAGS="-O2"
-	cd ${S}
-	emake -C elftoaout-2.3 CFLAGS="$CFLAGS"
-	emake -C src piggyback piggyback64 CFLAGS="$CFLAGS"
-	emake -C prtconf-1.3 all
-	# Not compiling at this time
+	CFLAGS="-O3"
+	emake -C elftoaout-2.3 CFLAGS="$CFLAGS" || die
+	emake -C src piggyback piggyback64 CFLAGS="$CFLAGS" || die
+	emake -C prtconf-1.3 all || die
+	# TODO: Fix compile issue
+	# Not compiling at this time, commented out
 	#emake -C sparc32-1.1
-	emake -C audioctl-1.3
-
+	emake -C audioctl-1.3 || die
 }
 
 src_install() {
-
-	mkdir -p ${D}/usr/bin ${D}/usr/sbin ${D}/etc/init.d ${D}/etc/default
-	dodir /usr/bin
+	dodir /usr/bin /usr/sbin /etc/init.d /etc/default
 	install -s elftoaout-2.3/elftoaout ${D}/usr/bin
 	install -s src/piggyback src/piggyback64 ${D}/usr/bin
 	#install -s sparc32-1.1/sparc32 ${D}/usr/bin
-	dodir /usr/sbin
+
 	install -s prtconf-1.3/prtconf ${D}/usr/sbin/prtconf
 	install -s prtconf-1.3/eeprom ${D}/usr/sbin/eeprom
-	#ln -sf sparc32 ${D}/usr/bin/sparc64
+	#ln -sf sparc32 ${D}/usr/bin/
 	install -s audioctl-1.3/audioctl ${D}/usr/bin
 	# install /etc/init.d script & /etc/default scripts
 	install -d -m 755 ${D}/etc ${D}/etc/init.d ${D}/etc/default
-    #install -m 755 debian/audioctl ${D}/etc/init.d
-    install -m 755 debian/audioctl.def ${D}/etc/default/audioctl
+	#install -m 755 debian/audioctl ${D}/etc/init.d
+	install -m 755 debian/audioctl.def ${D}/etc/default/audioctl
+}
 
+pkg_postinst() {
+	# Todo: Somehow set this automatically
+	ewarn "Make sure /dev/openprom exists. If you're not using devfs and"
+	ewarn "/dev/openprom does not exist, run"
+	ewarn ""
+	ewarn "\tcd /dev ; mknod openprom c 10 139"
 }
diff --git a/sys-apps/stat/ChangeLog b/sys-apps/stat/ChangeLog
index edf51d075ce6..519050958fe3 100644
--- a/sys-apps/stat/ChangeLog
+++ b/sys-apps/stat/ChangeLog
@@ -1,9 +1,32 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# ChangeLog for sys-apps/stat
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/ChangeLog,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
+
+  05 Aug 2004; Ciaran McCreesh <ciaranm@gentoo.org> stat-2.5.ebuild,
+  stat-3.3.ebuild:
+  Added ~sparc, bug #59467
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> stat-2.5.ebuild,
+  stat-3.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 Oct 2003; Chris PeBenito <pebenito@gentoo.org> stat-2.5.ebuild,
+  stat-3.3.ebuild:
+  Remove deprecated selinux patch
+
+*stat-3.3 (07 Sep 2003)
+
+  07 Sep 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Version bump.  Closees #27803.
 
 *stat-2.5 (2002-02-08)
 
+  23 Mar 2003; Joshua Brindle <method@gentoo.org> stat-2.5.ebuild:
+  added selinux support, thanks pebenito
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> stat-2.5.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   8 Feb 2002; Arcady Genkin <agenkin@thpoon.com> stat-2.5.ebuild, ChangeLog:
   
-  Initial version of stat utility.
\ No newline at end of file
+  Initial version of stat utility.
diff --git a/sys-apps/stat/Manifest b/sys-apps/stat/Manifest
index e69de29bb2d1..38c460ee4b9e 100644
--- a/sys-apps/stat/Manifest
+++ b/sys-apps/stat/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3c9e1512e877b6673af452b583991c4e ChangeLog 1022
+MD5 111eb75396709b50c9103824bbbf509f stat-2.5.ebuild 713
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 37b8b452ce907987c5cd9f4babb38e3f stat-3.3.ebuild 714
+MD5 f06efb316d7c0f809c3d779bd8746ebe files/digest-stat-3.3 59
+MD5 b1a58147efb1230fc1d85cb20f14d5d8 files/digest-stat-2.5 59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBEggvLLFUmVNQ7rkRAiuvAJ9R+XPYcrdV/tY/sogaPaC6eXhouwCfczKG
+tRvJzQVthcKNPTo8ipZPC5s=
+=eEGK
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/stat/metadata.xml b/sys-apps/stat/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/stat/metadata.xml
+++ b/sys-apps/stat/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-apps/stat/stat-2.5.ebuild b/sys-apps/stat/stat-2.5.ebuild
index 8ce69ff640ae..c6ceb70db6a6 100644
--- a/sys-apps/stat/stat-2.5.ebuild
+++ b/sys-apps/stat/stat-2.5.ebuild
@@ -1,17 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Arcady Genkin <agenkin@thpoon.com>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/stat-2.5.ebuild,v 1.1 2002/02/09 05:53:10 drobbins Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/stat-2.5.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A command-line stat() wrapper."
+inherit eutils
+
+DESCRIPTION="A command-line stat() wrapper"
 SRC_URI="ftp://metalab.unc.edu/pub/linux/utils/file/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/stat.html"
-DEPEND="virtual/glibc"
+
+KEYWORDS="x86 amd64 ~sparc"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	cp Makefile Makefile.orig
 	sed -e "s:-O2 -g:${CFLAGS}:" Makefile.orig > Makefile
 }
@@ -20,7 +27,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin stat
 	doman stat.1
 	dodoc COPYRIGHT GPL README Changelog
diff --git a/sys-apps/stat/stat-3.3.ebuild b/sys-apps/stat/stat-3.3.ebuild
index f04052811b75..09517c93c087 100644
--- a/sys-apps/stat/stat-3.3.ebuild
+++ b/sys-apps/stat/stat-3.3.ebuild
@@ -1,28 +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/sys-apps/stat/stat-3.3.ebuild,v 1.1 2003/09/07 06:43:20 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/stat/stat-3.3.ebuild,v 1.1.1.1 2005/11/30 09:55:57 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A command-line stat() wrapper"
-SRC_URI="ftp://metalab.unc.edu/pub/linux/utils/file/${P}.tar.gz
-	 selinux? mirror://gentoo/${P}-selinux.patch.bz2"
+SRC_URI="ftp://metalab.unc.edu/pub/linux/utils/file/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/directory/stat.html"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="selinux"
+IUSE=""
 
-DEPEND="virtual/glibc
-	selinux? ( sys-apps/selinux-small )"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
-
 	cp Makefile Makefile.orig
 	sed -e "s:-O2 -g:${CFLAGS}:" Makefile.orig > Makefile
 }
diff --git a/sys-apps/suspend2-userui/ChangeLog b/sys-apps/suspend2-userui/ChangeLog
index 1f2006d9748a..64c01bfbac14 100644
--- a/sys-apps/suspend2-userui/ChangeLog
+++ b/sys-apps/suspend2-userui/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-apps/suspend2-userui
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.1 2005/07/06 10:54:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  31 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  suspend2-userui-0.6.1.ebuild:
+  Stable on x86.
+
+*suspend2-userui-0.6.1 (29 Aug 2005)
+
+  29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +suspend2-userui-0.6.1.ebuild:
+  Added version for use with >=sys-kernel/suspend2-sources-2.6.13.
+
+  29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  suspend2-userui-0.5.1.ebuild:
+  Stable on x86.
 
 *suspend2-userui-0.5.1 (06 Jul 2005)
 
diff --git a/sys-apps/suspend2-userui/Manifest b/sys-apps/suspend2-userui/Manifest
index abbc8df613c3..0a3237fd0a8d 100644
--- a/sys-apps/suspend2-userui/Manifest
+++ b/sys-apps/suspend2-userui/Manifest
@@ -1,3 +1,6 @@
-MD5 be557edcefbc040ac3b6a0e5daff98b6 suspend2-userui-0.5.1.ebuild 1380
+MD5 ad8919bff0ea00c51745dda765242636 suspend2-userui-0.5.1.ebuild 1492
+MD5 35f318a7f8db274bf76c983159a66ee9 suspend2-userui-0.6.1.ebuild 1492
+MD5 c7b080617c7971fc790b93f7a021d357 ChangeLog 825
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 9189b784d36ef34bf204fc33245c0980 files/digest-suspend2-userui-0.5.1 72
+MD5 8c01c12e7560cac8c27088d6f90f647b files/digest-suspend2-userui-0.6.1 72
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.5.1.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.5.1.ebuild
index d5321d3022fa..9a3b9c644dc9 100644
--- a/sys-apps/suspend2-userui/suspend2-userui-0.5.1.ebuild
+++ b/sys-apps/suspend2-userui/suspend2-userui-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/sys-apps/suspend2-userui/suspend2-userui-0.5.1.ebuild,v 1.1 2005/07/06 10:54:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.5.1.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="fbsplash"
 DEPEND="virtual/libc
diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.1.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.1.ebuild
index c24a8ad70dfc..07d7d0af58ad 100644
--- a/sys-apps/suspend2-userui/suspend2-userui-0.6.1.ebuild
+++ b/sys-apps/suspend2-userui/suspend2-userui-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/sys-apps/suspend2-userui/suspend2-userui-0.6.1.ebuild,v 1.1 2005/08/29 20:09:00 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.6.1.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="fbsplash"
 DEPEND="virtual/libc
diff --git a/sys-apps/syscriptor/ChangeLog b/sys-apps/syscriptor/ChangeLog
index 585e96aa938e..349d31e2ae89 100644
--- a/sys-apps/syscriptor/ChangeLog
+++ b/sys-apps/syscriptor/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-apps/syscriptor
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syscriptor/ChangeLog,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  syscriptor-1.5.12.ebuild:
+  Masked syscriptor-1.5.12.ebuild stable for ppc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  syscriptor-1.5.12.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> syscriptor-1.5.12.ebuild:
+  Added to ~ppc.
+
+  12 Jun 2003; <msterret@gentoo.org> syscriptor-1.5.12.ebuild:
+  fix Header
 
 *syscriptor-1.5.12 (6 Nov 2002)
   
diff --git a/sys-apps/syscriptor/Manifest b/sys-apps/syscriptor/Manifest
index e69de29bb2d1..98d0ac1ab76b 100644
--- a/sys-apps/syscriptor/Manifest
+++ b/sys-apps/syscriptor/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0c050f6082cab5af88c0b51af2a43d48 ChangeLog 883
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d3d8e7e553f200defed411bd9cbde5d9 syscriptor-1.5.12.ebuild 654
+MD5 f9cf219e9fe17e8c41097d61c684a6f9 files/digest-syscriptor-1.5.12 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBXsq6I1lqEGTUzyQRAhtNAJ0eAkwkrTEa7uQJn59Y8djhHr+pegCfegZV
+8q5xqJQDV6NiyRfE9i0l3NQ=
+=DHxv
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/syscriptor/metadata.xml b/sys-apps/syscriptor/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/syscriptor/metadata.xml
+++ b/sys-apps/syscriptor/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-apps/syscriptor/syscriptor-1.5.12.ebuild b/sys-apps/syscriptor/syscriptor-1.5.12.ebuild
index b495d34b91a7..b1a26e1607fa 100644
--- a/sys-apps/syscriptor/syscriptor-1.5.12.ebuild
+++ b/sys-apps/syscriptor/syscriptor-1.5.12.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
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/syscriptor/syscriptor-1.5.12.ebuild,v 1.1.1.1 2005/11/30 09:56:41 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Program that displays information about your hardware"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://syscriptor.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc"
 SLOT="0"
 
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 
 	econf || die
 	emake || die
-	
+
 }
 
 src_install () {
diff --git a/sys-apps/sysutils/ChangeLog b/sys-apps/sysutils/ChangeLog
index dea28ab7d83b..1837c2a8cbf0 100644
--- a/sys-apps/sysutils/ChangeLog
+++ b/sys-apps/sysutils/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-apps/sysutils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysutils/ChangeLog,v 1.1 2003/11/23 23:29:42 plasmaroo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
+
+  02 Jun 2005; <dang@gentoo.org> sysutils-0.1.0.ebuild:
+  Added ~amd64
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  sysutils-0.1.0.ebuild:
+  Masked sysutils-0.1.0.ebuild stable for ppc
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> sysutils-0.1.0.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sysutils-0.1.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> sysutils-0.1.0.ebuild:
+  adding s390 keywords
 
 *sysutils-0.1.0 (23 Nov 2003)
 
diff --git a/sys-apps/sysutils/Manifest b/sys-apps/sysutils/Manifest
index 4583244a99bf..04f029cced14 100644
--- a/sys-apps/sysutils/Manifest
+++ b/sys-apps/sysutils/Manifest
@@ -1,3 +1,14 @@
-MD5 2e1768e4c44addd3c4d1937798c793d6 ChangeLog 330
-MD5 bdc9b2feaa3781b870aab1af77b0d73f sysutils-0.1.0.ebuild 673
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 419e6718d2570b26ef8f483757bf59df ChangeLog 847
+MD5 d8b60fd56aea8dc13f1417fe99403dae sysutils-0.1.0.ebuild 664
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 4747a0ef688ca4c2c1ca0c06841020a4 files/digest-sysutils-0.1.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCnzfXomPajV0RnrERAuw2AJwIwmcEx2UQ22pNC8IdL462Y+5qlgCfY+lS
+Hh1AaaiEuLykqSF8ZMACkko=
+=snJ1
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sysutils/metadata.xml b/sys-apps/sysutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/sysutils/metadata.xml
+++ b/sys-apps/sysutils/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-apps/sysutils/sysutils-0.1.0.ebuild b/sys-apps/sysutils/sysutils-0.1.0.ebuild
index ebec7c0813f7..7ff3d3189e9f 100644
--- a/sys-apps/sysutils/sysutils-0.1.0.ebuild
+++ b/sys-apps/sysutils/sysutils-0.1.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/sys-apps/sysutils/sysutils-0.1.0.ebuild,v 1.1 2003/11/23 23:29:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysutils/sysutils-0.1.0.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 DESCRIPTION="A small program and library to access the sysfs interface in 2.5+ kernels."
-SRC_URI="http://www.kernel.org/pub/linux/utils/kernel/hotplug/${P}.tar.gz"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.gz"
 HOMEPAGE="http://www.kernel.org"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc s390 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 
diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 8b550abc0b44..b4317f3c291b 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,9 +1,101 @@
 # ChangeLog for sys-apps/sysvinit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.1 2002/07/09 20:25:59 aliz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
+
+*sysvinit-2.86-r3 (20 Nov 2005)
+
+  20 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/sysvinit-2.86-POSIX-1003.1e.patch,
+  +files/sysvinit-2.86-execl.patch, +files/sysvinit-2.86-utmp-64bit.patch,
+  +sysvinit-2.86-r3.ebuild:
+  Fix some warnings and add support for POSIX capabilites #5818 by Sascha Silbe.
+
+*sysvinit-2.86-r2 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/sysvinit-2.86-off-by-one.patch, +sysvinit-2.86-r2.ebuild:
+  Fix display bug in starting some processes #110420 by Kir Kolyshkin.
+
+  04 Oct 2005; Martin Schlemmer <azarah@gentoo.org> files/inittab:
+  Update inittab to bind agetty at least to tty1 for single mode. Noted by
+  RiverRat.
+
+*sysvinit-2.86-r1 (04 Aug 2005)
+
+  04 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/inittab,
+  +sysvinit-2.86-r1.ebuild:
+  Update inittab to not spawn agetty for runlevel 1 (single mode), bug #66834.
+
+  10 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> sysvinit-2.86.ebuild:
+  Add ibm use flag check for extra ttys on IBM hardware.
+
+  09 Jun 2005; Mike Frysinger <vapier@gentoo.org> sysvinit-2.86.ebuild:
+  Stabilize for all arches.
+
+  22 May 2005; Mike Frysinger <vapier@gentoo.org> sysvinit-2.86.ebuild:
+  Add support for kexec #80220 by Stefan Schweizer.
+
+  07 Jan 2005; Chris PeBenito <pebenito@gentoo.org> sysvinit-2.86.ebuild:
+  Fix libselinux dep.  The updated SELinux patch needs 1.18.
+
+  03 Jan 2005; Chris PeBenito <pebenito@gentoo.org>
+  files/2.86-selinux.patch, -files/sysvinit-2.86-selinux.patch,
+  sysvinit-2.86.ebuild:
+  Fix up SELinux patch for 2.86.
+
+*sysvinit-2.86 (21 Dec 2004)
+
+  21 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/2.86-gentoo.patch,
+  +files/2.86-selinux.patch, files/inittab,
+  +files/sysvinit-2.86-selinux.patch, +sysvinit-2.86.ebuild:
+  Version bump #75007.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> sysvinit-2.85-r1.ebuild:
+  Sync IUSE (build and bootstrap missing)
+
+  23 Jul 2004; Aron Griffis <agriffis@gentoo.org> sysvinit-2.85-r1.ebuild:
+  Bring pkg_postinst over from pre-split baselayout ebuilds
+
+*sysvinit-2.85-r1 (09 Jul 2004)
+
+  09 Jul 2004; Aron Griffis <agriffis@gentoo.org> +sysvinit-2.85-r1.ebuild:
+  Build sulogin in any case, since it's always possible to link against
+  /lib/libcrypt.so even when the static lib is unavailable
+
+  02 Jul 2004; Aron Griffis <agriffis@gentoo.org> sysvinit-2.84.ebuild,
+  sysvinit-2.85.ebuild:
+  Uncomment sed line for USE=build to keep compile from failing during
+  stage-building
+
+*sysvinit-2.85 (02 Jul 2004)
+
+  02 Jul 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/sysvinit-2.85-selinux.patch, +sysvinit-2.85.ebuild:
+  Bump, along with new SELinux patch, from #55701.
+
+  30 Jun 2004; Chris PeBenito <pebenito@gentoo.org> sysvinit-2.84.ebuild:
+  Inherit eutils and fix SELinux patch versioning.
+
+*sysvinit-2.84 (29 Jun 2004)
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> +files/inittab,
+  +files/sysvinit-2.84-selinux.patch, +files/sysvinit-2.84-selinux1.patch,
+  +sysvinit-2.84.ebuild:
+  Update to version used in baselayout-1.10.1 in preparation for
+  baselayout/sysvinit split
 
 *sysvinit-2.83-r1 (09 Jul 2002)
 
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Changed sed expression delimiter from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
   09 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ChangeLog :
 
   Added ChangeLog.
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index e69de29bb2d1..d691b7dbdf18 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d031983ceb19d8f45f3be18b316cfa7 ChangeLog 3739
+MD5 5f94105e0b503a39fda5fb65d885e16c files/2.86-gentoo.patch 641
+MD5 3ba9251f1f4f0ae0dd30d682b28183dd files/2.86-selinux.patch 6525
+MD5 38c0059ecfaa1b09e59a75cc2780aa94 files/digest-sysvinit-2.85-r1 64
+MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86 132
+MD5 89c112138ee2f33829ad80c3dcc18328 files/digest-sysvinit-2.86-r3 132
+MD5 0e94e6657416b0d48d13abf86297f2e4 files/inittab 1667
+MD5 3c171d9c843284ce606663e4e6da26e9 files/sysvinit-2.85-selinux.patch 6448
+MD5 055f0a982433c7f7a58a6fd4e091cedc files/sysvinit-2.86-POSIX-1003.1e.patch 1358
+MD5 b956965acd5408afa0a3937001b2d55e files/sysvinit-2.86-docs.patch 1899
+MD5 907ffbfe16ebfb13e0f34cb377bf1c67 files/sysvinit-2.86-execl.patch 323
+MD5 701137886382265cf08d69a20fb89627 files/sysvinit-2.86-off-by-one.patch 310
+MD5 180a4654bbd070b1264a440c753e6cc0 files/sysvinit-2.86-shutdown-usage.patch 235
+MD5 eff3665594ef25bf70220d6cf0c84dcb files/sysvinit-2.86-utmp-64bit.patch 1112
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 4bb35af95759582d45324cdf3bc237b7 sysvinit-2.85-r1.ebuild 2545
+MD5 c149ca4aec518d6a6f9b97b4bfe0c078 sysvinit-2.86-r3.ebuild 2729
+MD5 cb1165247fe26db95505195995ecac1b sysvinit-2.86.ebuild 2501
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgG5ygIKl8Uu19MoRAlkQAJ0VTwt0jkfICuLdqo3EmuUUPgHfkwCeP6PW
+9eNc/02OTbOBtDgwiwnkWO8=
+=mY7Z
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sysvinit/files/2.86-selinux.patch b/sys-apps/sysvinit/files/2.86-selinux.patch
index 9bda14ef63a7..3110bc52befb 100644
--- a/sys-apps/sysvinit/files/2.86-selinux.patch
+++ b/sys-apps/sysvinit/files/2.86-selinux.patch
@@ -1,24 +1,31 @@
---- sysvinit-2.85/src/Makefile.selinux	2004-06-09 15:28:47.439412648 -0400
-+++ sysvinit-2.85/src/Makefile	2004-06-09 15:28:47.517400792 -0400
-@@ -12,2 +12,4 @@
+diff -urN sysvinit-2.86.orig/src/Makefile sysvinit-2.86/src/Makefile
+--- sysvinit-2.86.orig/src/Makefile	2004-06-09 08:47:45.000000000 -0400
++++ sysvinit-2.86/src/Makefile	2005-01-03 20:25:59.922659928 -0500
+@@ -12,6 +12,8 @@
+ CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+ LDFLAGS	= -s
  STATIC	=
 +CFLAGS	+= -DWITH_SELINUX
-+LDFLAGS	+= -lselinux
++LDFLAGS	+= -lselinux -lsepol
  
---- sysvinit-2.85/src/init.c.selinux	2004-06-09 15:28:47.478406720 -0400
-+++ sysvinit-2.85/src/init.c	2004-06-09 15:29:03.208015456 -0400
-@@ -48,6 +48,10 @@
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN	=
+diff -urN sysvinit-2.86.orig/src/init.c sysvinit-2.86/src/init.c
+--- sysvinit-2.86.orig/src/init.c	2004-07-30 08:16:20.000000000 -0400
++++ sysvinit-2.86/src/init.c	2005-01-03 20:46:39.485217776 -0500
+@@ -42,6 +42,11 @@
  #include <stdarg.h>
  #include <sys/syslog.h>
  #include <sys/time.h>
 +#include <sys/mman.h>
 +#include <selinux/selinux.h>
++#include <sepol/sepol.h>
 +#include <sys/mount.h>
 +
  
  #ifdef __i386__
  #  if (__GLIBC__ >= 2)
-@@ -103,6 +107,7 @@
+@@ -104,6 +109,7 @@
  int dfl_level = 0;		/* Default runlevel */
  sig_atomic_t got_cont = 0;	/* Set if we received the SIGCONT signal */
  sig_atomic_t got_signals;	/* Set if we received a signal. */
@@ -26,9 +33,9 @@
  int emerg_shell = 0;		/* Start emergency shell? */
  int wrote_wtmp_reboot = 1;	/* Set when we wrote the reboot record */
  int wrote_utmp_reboot = 1;	/* Set when we wrote the reboot record */
-@@ -187,6 +192,130 @@
- 	{NULL,0}
- };
+@@ -192,6 +198,142 @@
+ char *extra_env[NR_EXTRA_ENV];
+ 
  
 +/* Mount point for selinuxfs. */
 +#define SELINUXMNT "/selinux/"
@@ -36,12 +43,11 @@
 +static int load_policy(int *enforce) 
 +{
 +	int fd=-1,ret=-1;
-+	int rc=0;
++	int rc=0, orig_enforce;
 +	struct stat sb;
 +	void *map;
 +	char policy_file[PATH_MAX];
 +	int policy_version=0;
-+	extern char *selinux_mnt;
 +	FILE *cfg;
 +	char buf[4096];
 +	int seconfig = -2;
@@ -69,25 +75,25 @@
 +	
 +	if (mount("none", SELINUXMNT, "selinuxfs", 0, 0) < 0) {
 +		if (errno == ENODEV) {
-+			log(L_VB, "SELinux not supported by kernel: %s\n",SELINUXMNT,strerror(errno));
++			initlog(L_VB, "SELinux not supported by kernel: %s\n",SELINUXMNT,strerror(errno));
 +			*enforce = 0;
 +		} else {
-+			log(L_VB, "Failed to mount %s: %s\n",SELINUXMNT,strerror(errno));
++			initlog(L_VB, "Failed to mount %s: %s\n",SELINUXMNT,strerror(errno));
 +		}
 +		return ret;
 +	}
 +
-+	selinux_mnt = SELINUXMNT; /* set manually since we mounted it */
++	set_selinuxmnt(SELINUXMNT); /* set manually since we mounted it */
 +
 +	policy_version=security_policyvers();
 +	if (policy_version < 0) {
-+		log(L_VB,  "Can't get policy version: %s\n", strerror(errno));
++		initlog(L_VB,  "Can't get policy version: %s\n", strerror(errno));
 +		goto UMOUNT;
 +	}
 +  
-+	rc = security_getenforce();
++	orig_enforce = rc = security_getenforce();
 +	if (rc < 0) {
-+		log(L_VB,  "Can't get SELinux enforcement flag: %s\n", strerror(errno));
++		initlog(L_VB,  "Can't get SELinux enforcement flag: %s\n", strerror(errno));
 +		goto UMOUNT;
 +	}
 +	if (enforcing >= 0) {
@@ -99,7 +105,7 @@
 +		if (rc < 0) {
 +			rc = security_setenforce(0);
 +			if (rc < 0) {
-+				log(L_VB, "Can't disable SELinux: %s\n", strerror(errno));
++				initlog(L_VB, "Can't disable SELinux: %s\n", strerror(errno));
 +				goto UMOUNT;
 +			}
 +		}
@@ -107,10 +113,12 @@
 +		goto UMOUNT;
 +	} else if (seconfig >= 0) {
 +		*enforce = seconfig;
-+		rc = security_setenforce(seconfig);
-+		if (rc < 0) {
-+			log(L_VB, "Can't set SELinux enforcement flag: %s\n", strerror(errno));
-+			goto UMOUNT;
++		if (orig_enforce != *enforce) {
++			rc = security_setenforce(seconfig);
++			if (rc < 0) {
++				initlog(L_VB, "Can't set SELinux enforcement flag: %s\n", strerror(errno));
++				goto UMOUNT;
++			}
 +		}
 +	}
 +
@@ -122,28 +130,39 @@
 +		snprintf(policy_file,sizeof(policy_file),"%s.%d",selinux_binary_policy_path(),policy_version-1);
 +		fd = open(policy_file, O_RDONLY);
 +		if (fd < 0) {
-+			log(L_VB,  "Can't open '%s.%d':  %s\n",
++			initlog(L_VB,  "Can't open '%s.%d':  %s\n",
 +			    selinux_binary_policy_path(),policy_version,strerror(errno));
 +			goto UMOUNT;
 +		}
 +	}
 +  
 +	if (fstat(fd, &sb) < 0) {
-+		log(L_VB, "Can't stat '%s':  %s\n",
++		initlog(L_VB, "Can't stat '%s':  %s\n",
 +		    policy_file, strerror(errno));
 +		goto UMOUNT;
 +	}
 +  
-+	map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
++	map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 +	if (map == MAP_FAILED) {
-+		log(L_VB,  "Can't map '%s':  %s\n",
++		initlog(L_VB,  "Can't map '%s':  %s\n",
 +		    policy_file, strerror(errno));
 +		goto UMOUNT;
 +	}
-+	log(L_VB, "Loading security policy\n");
++
++
++	/* Set booleans based on a booleans configuration file. */
++	ret = sepol_genbools(map, sb.st_size, selinux_booleans_path());
++	if (ret < 0) {
++		if (errno != ENOENT && errno != EINVAL) {
++			initlog(L_VB,"Error while setting booleans:  %s\n", 
++			    strerror(errno));
++			goto UMOUNT;
++		}
++	}
++	initlog(L_VB, "Loading security policy\n");
 +	ret=security_load_policy(map, sb.st_size);
 +	if (ret < 0) {
-+		log(L_VB, "security_load_policy failed\n");
++		initlog(L_VB, "security_load_policy failed\n");
 +	}
 +
 +UMOUNT:
@@ -157,7 +176,7 @@
  /*
   *	Sleep a number of seconds.
   *
-@@ -2513,6 +2642,7 @@
+@@ -2599,6 +2741,7 @@
  	char			*p;
  	int			f;
  	int			isinit;
@@ -165,7 +184,7 @@
  
  	/* Get my own name */
  	if ((p = strrchr(argv[0], '/')) != NULL)
-@@ -2576,6 +2706,20 @@
+@@ -2662,6 +2805,20 @@
  		maxproclen += strlen(argv[f]) + 1;
  	}
  
@@ -177,7 +196,7 @@
 +	    if (enforce > 0) {
 +	      /* SELinux in enforcing mode but load_policy failed */
 +	      /* At this point, we probably can't open /dev/console, so log() won't work */
-+	      printf("Enforcing mode requested but no policy loaded. Halting now.\n");
++		    fprintf(stderr,"Enforcing mode requested but no policy loaded. Halting now.\n");
 +	      exit(1);
 +	    }
 +	  }
@@ -186,9 +205,10 @@
  	/* Start booting. */
  	argv0 = argv[0];
  	argv[1] = NULL;
---- sysvinit-2.85/src/sulogin.c.selinux	2004-06-09 15:28:47.321430584 -0400
-+++ sysvinit-2.85/src/sulogin.c	2004-06-09 15:28:47.523399880 -0400
-@@ -28,7 +28,10 @@
+diff -urN sysvinit-2.86.orig/src/sulogin.c sysvinit-2.86/src/sulogin.c
+--- sysvinit-2.86.orig/src/sulogin.c	2004-07-30 07:40:28.000000000 -0400
++++ sysvinit-2.86/src/sulogin.c	2005-01-03 20:30:48.746751992 -0500
+@@ -27,7 +27,10 @@
  #if defined(__GLIBC__)
  #  include <crypt.h>
  #endif
@@ -200,7 +220,7 @@
  #define CHECK_DES	1
  #define CHECK_MD5	1
  
-@@ -332,6 +335,16 @@
+@@ -335,6 +338,16 @@
  	signal(SIGINT, SIG_DFL);
  	signal(SIGTSTP, SIG_DFL);
  	signal(SIGQUIT, SIG_DFL);
diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.86 b/sys-apps/sysvinit/files/digest-sysvinit-2.86
index 54a6379cb3f0..36e59eb1e93b 100644
--- a/sys-apps/sysvinit/files/digest-sysvinit-2.86
+++ b/sys-apps/sysvinit/files/digest-sysvinit-2.86
@@ -1 +1,2 @@
 MD5 7d5d61c026122ab791ac04c8a84db967 sysvinit-2.86.tar.gz 99009
+MD5 650af823f937d386e81520b1741d4d45 sysvinit-2.86-kexec.patch 4139
diff --git a/sys-apps/sysvinit/files/inittab b/sys-apps/sysvinit/files/inittab
index 95be8f10ca95..b0ccab5e205a 100644
--- a/sys-apps/sysvinit/files/inittab
+++ b/sys-apps/sysvinit/files/inittab
@@ -7,9 +7,8 @@
 # Modified by:  Daniel Robbins, <drobbins@gentoo.org>
 # Modified by:  Martin Schlemmer, <azarah@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab,v 1.1 2004/06/29 19:32:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab,v 1.1.1.1 2005/11/30 09:56:35 chriswhite Exp $
 
-#
 # Default runlevel.
 id:3:initdefault:
 
@@ -30,11 +29,15 @@ l6:6:wait:/sbin/rc reboot
 
 # TERMINALS
 c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:12345:respawn:/sbin/agetty 38400 tty2 linux
-c3:12345:respawn:/sbin/agetty 38400 tty3 linux
-c4:12345:respawn:/sbin/agetty 38400 tty4 linux
-c5:12345:respawn:/sbin/agetty 38400 tty5 linux
-c6:12345:respawn:/sbin/agetty 38400 tty6 linux
+c2:2345:respawn:/sbin/agetty 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty 38400 tty6 linux
+
+# SERIAL CONSOLES
+#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
 
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/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-apps/sysvinit/sysvinit-2.85-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
index eed1803e9072..20b422b5796a 100644
--- a/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild,v 1.1 2004/07/09 18:57:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
 SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
 	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="selinux build"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux bootstrap build"
 
-DEPEND="virtual/os-headers
-	selinux? ( >=sys-libs/libselinux-1.14 )"
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.14 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
 
 src_unpack() {
 	unpack ${A}
@@ -33,7 +35,7 @@ src_compile() {
 	# the shared obj by default anyway!  The other option is to
 	# refrain from building sulogin, but that isn't a good option.
 	# (09 Jul 2004 agriffis)
-	emake -C ${S}/src CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" \
 		LCRYPT="-lcrypt" || die
 }
@@ -41,9 +43,9 @@ src_compile() {
 src_install() {
 	cd ${S}/src
 	into /
-	dosbin init halt killall5 runlevel shutdown sulogin
+	dosbin init halt killall5 runlevel shutdown sulogin || die "dosbin"
 	dosym init /sbin/telinit
-	dobin last mesg utmpdump wall
+	dobin last mesg utmpdump wall || die "dobin"
 	dosym killall5 /sbin/pidof
 	dosym halt /sbin/reboot
 	dosym halt /sbin/poweroff
@@ -54,7 +56,7 @@ src_install() {
 	# sysvinit docs
 	cd ${S}
 	doman man/*.[1-9]
-	dodoc COPYRIGHT README doc/*
+	dodoc README doc/*
 
 	# install our inittab
 	insinto /etc
@@ -62,10 +64,20 @@ src_install() {
 
 	# Add serial console for arches that typically have it
 	case ${ARCH} in
-		sparc|mips|hppa|alpha|ia64)
+		sparc|mips|hppa|alpha|ia64|arm)
 			sed -i -e \
 				's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n&"' \
 				${D}/etc/inittab || die
 			;;
 	esac
 }
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		# Do not return an error if this fails
+		/sbin/init U &>/dev/null
+	fi
+}
diff --git a/sys-apps/sysvinit/sysvinit-2.86-r3.ebuild b/sys-apps/sysvinit/sysvinit-2.86-r3.ebuild
index d8256aaab58d..81ac985a7884 100644
--- a/sys-apps/sysvinit/sysvinit-2.86-r3.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86-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-apps/sysvinit/sysvinit-2.86-r3.ebuild,v 1.1 2005/11/20 12:37:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
diff --git a/sys-apps/sysvinit/sysvinit-2.86.ebuild b/sys-apps/sysvinit/sysvinit-2.86.ebuild
index dd3e1cd19272..582446cf8aa4 100644
--- a/sys-apps/sysvinit/sysvinit-2.86.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.86.ebuild
@@ -1,33 +1,47 @@
-# Copyright 1999-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-apps/sysvinit/sysvinit-2.86.ebuild,v 1.1 2004/12/22 03:25:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.86.ebuild,v 1.1.1.1 2005/11/30 09:56:34 chriswhite Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
 SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz"
+	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz
+	http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="-*"
-IUSE="selinux bootstrap build"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="selinux bootstrap build ibm static"
 
-RDEPEND="selinux? ( >=sys-libs/libselinux-1.14 )"
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.18 sys-libs/libsepol )"
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}/src
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/${P}-shutdown-usage.patch
+	epatch "${DISTDIR}"/sysvinit-2.86-kexec.patch
+	cd src
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	use selinux && epatch "${FILESDIR}"/${PV}-selinux.patch
+	cp "${FILESDIR}"/inittab "${WORKDIR}"/ || die "cp inittab"
 
-	epatch ${FILESDIR}/${PV}-gentoo.patch
-	use selinux && epatch ${FILESDIR}/${PV}-selinux.patch
+	if use ibm ; then
+		cat <<-EOF >> "${WORKDIR}"/inittab
+		#HVC / HVSI CONSOLE
+		#hvc0:12345:respawn:/sbin/agetty -L 9600 hvc0
+		#hvsi:12345:respawn:/sbin/agetty -L	19200 hvsi0
+		EOF
+	fi
 }
 
 src_compile() {
+	use static && append-ldflags -static
+
 	# Note: The LCRYPT define below overrides the test in
 	# sysvinit's Makefile.  This is because sulogin must be linked
 	# to libcrypt in any case, but when building stage2 in
@@ -37,7 +51,7 @@ src_compile() {
 	# refrain from building sulogin, but that isn't a good option.
 	# (09 Jul 2004 agriffis)
 	emake -C src \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		DISTRO="Gentoo" \
 		LCRYPT="-lcrypt" \
 		|| die
@@ -50,7 +64,7 @@ src_install() {
 	make install DISTRO="Gentoo" ROOT="${D}" || die "make install"
 
 	insinto /etc
-	doins ${FILESDIR}/inittab || die "inittab"
+	doins "${WORKDIR}"/inittab || die "inittab"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/tcb/ChangeLog b/sys-apps/tcb/ChangeLog
index cca7ed8ad3e5..4a72b537ddd9 100644
--- a/sys-apps/tcb/ChangeLog
+++ b/sys-apps/tcb/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for sys-apps/tcb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/ChangeLog,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
+
+  18 Jul 2005; David Holm <dholm@gentoo.org> tcb-0.9.8.8.ebuild:
+  Added to ~ppc.
+
+*tcb-0.9.8.8 (17 Jul 2005)
+
+  17 Jul 2005; Mike Frysinger <vapier@gentoo.org> +tcb-0.9.8.8.ebuild:
+  Version bump.
+
+*tcb-0.9.8.7 (08 Jan 2004)
+
+  08 Jan 2004; Joshua Brindle <method@gentoo.org> tcb-0.9.7.4.ebuild,
+  tcb-0.9.7.4.ebuild, tcb-0.9.8.3.ebuild, tcb-0.9.8.3.ebuild,
+  tcb-0.9.8.7.ebuild:
+  This one should actually work, and is an upstream bump also
+
+*tcb-0.9.8.3 (18 Dec 2002)
+
+  18 Dec 2002; Joachim Blaabjerg <styx@gentoo.org> tcb-0.9.8.3.ebuild :
+
+  New version, ~x86 masked.
 
 *tcb-0.9.7.4 (13 Aug 2002)
 
diff --git a/sys-apps/tcb/Manifest b/sys-apps/tcb/Manifest
index e69de29bb2d1..96f1d4339c72 100644
--- a/sys-apps/tcb/Manifest
+++ b/sys-apps/tcb/Manifest
@@ -0,0 +1,6 @@
+MD5 740e799b040164b1e010c36a989e50b4 ChangeLog 988
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d0919623162be8eedd96bfbdd7e500ec tcb-0.9.8.7.ebuild 879
+MD5 5eaf691c9f202e623aa123711fcc4099 tcb-0.9.8.8.ebuild 885
+MD5 efd6f409cc1a1bd237628142daeb2382 files/digest-tcb-0.9.8.7 62
+MD5 552f0e0d083f75a5fa2b6418c3f8b4c6 files/digest-tcb-0.9.8.8 62
diff --git a/sys-apps/tcb/metadata.xml b/sys-apps/tcb/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/tcb/metadata.xml
+++ b/sys-apps/tcb/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-apps/tcb/tcb-0.9.8.7.ebuild b/sys-apps/tcb/tcb-0.9.8.7.ebuild
index 4ffd1c541a53..45ee56ce7c7c 100644
--- a/sys-apps/tcb/tcb-0.9.8.7.ebuild
+++ b/sys-apps/tcb/tcb-0.9.8.7.ebuild
@@ -1,35 +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-apps/tcb/tcb-0.9.8.7.ebuild,v 1.1 2004/01/08 22:41:43 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.8.7.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Libraries and tools implementing the tcb password shadowing scheme."
+DESCRIPTION="Libraries and tools implementing the tcb password shadowing scheme"
+HOMEPAGE="http://www.openwall.com/"
 SRC_URI="ftp://ftp.openwall.com/pub/projects/tcb/${P}.tar.gz"
-HOMEPAGE="http://www.openwall.com"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
 
 DEPEND=">=sys-libs/pam-0.75"
-SLOT="0"
-KEYWORDS="x86 amd64"
 
 pkg_setup() {
 	# might want to add these into baselayout eventually...
-	for group in auth chkpwd shadow; do
-			 enewgroup ${group} || die "error adding group ${group}"
+	for group in auth chkpwd shadow ; do
+		enewgroup ${group}
 	done
 }
 
-src_compile () {
-	emake || die
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog
 }
 
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog LICENSE
-
+pkg_postinst() {
 	einfo "You must now run /sbin/tcb_convert to convert your shadow to tcb"
 	einfo "To remove this you must first run /sbin/tcp_unconvert and then unmerge"
 }
diff --git a/sys-apps/tcb/tcb-0.9.8.8.ebuild b/sys-apps/tcb/tcb-0.9.8.8.ebuild
index a680ef530631..e8c4d99c02c7 100644
--- a/sys-apps/tcb/tcb-0.9.8.8.ebuild
+++ b/sys-apps/tcb/tcb-0.9.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/sys-apps/tcb/tcb-0.9.8.8.ebuild,v 1.1 2005/07/17 13:36:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-0.9.8.8.ebuild,v 1.1.1.1 2005/11/30 09:56:14 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.openwall.com/pub/projects/tcb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=sys-libs/pam-0.75"
diff --git a/sys-apps/tcng/ChangeLog b/sys-apps/tcng/ChangeLog
index bd809d2e7fad..8d9fa58217f8 100644
--- a/sys-apps/tcng/ChangeLog
+++ b/sys-apps/tcng/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for sys-apps/tcng
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/ChangeLog,v 1.1 2003/11/15 06:53:43 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/ChangeLog,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
+
+  18 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> tcng-9m.ebuild:
+  Bug #89550 - cleanup linux26-headers DEPEND.
+
+*tcng-9m (12 Feb 2005)
+
+  12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +tcng-9m.ebuild:
+  Bug #57737, new version from upstream.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> tcng-9h.ebuild,
+  tcng-9i.ebuild, tcng-9l.ebuild:
+  Changed SRC_URI to use mirror:// syntax.
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> tcng-9h.ebuild,
+  tcng-9i.ebuild, tcng-9l.ebuild:
+  Changed app-text/tetex to virtual/tetex, see bug #50865
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tcng-9h.ebuild,
+  tcng-9i.ebuild, tcng-9l.ebuild:
+  Add inherit eutils
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> tcng-9l.ebuild:
+  Added to ~ppc.
+
+*tcng-9l (24 Apr 2004)
+
+  24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> tcng-9i.ebuild,
+  tcng-9l.ebuild, files/tcng-9l-fixes.patch:
+  fix bug #48609, and version bump.
+
+*tcng-9i (17 Dec 2003)
+
+  17 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> tcng-9h.ebuild,
+  tcng-9i.ebuild, files/tcng-9i-fixes.patch, files/tcng-9i-gentoo.patch:
+  new version upstream, major fixes, fix bug #35851, full tcsim support, block
+  old version out as it was badly badly broken
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> tcng-9h.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
 
 *tcng-9h (14 Nov 2003)
 
diff --git a/sys-apps/tcng/Manifest b/sys-apps/tcng/Manifest
index 29f9a734a324..3c8de9c4ad99 100644
--- a/sys-apps/tcng/Manifest
+++ b/sys-apps/tcng/Manifest
@@ -1,2 +1,13 @@
-MD5 b4f1320da9e6bb6e71894cf0413da049 tcng-9h.ebuild 1764
-MD5 452318324f0c5e0571d8db1a63ee78d2 files/digest-tcng-9h 270
+MD5 8ecd15f57c7a02e4d7d763b509088508 tcng-9l.ebuild 4317
+MD5 5ac78bc7824307147166e806e1e2f0b7 tcng-9i.ebuild 4031
+MD5 ea3150c673d623b6d60d214a12f7d0a8 tcng-9m.ebuild 4410
+MD5 69db3debeb719f2733077c33ee2d60c2 tcng-9h.ebuild 2507
+MD5 d23372edd0fe809f9d22f9f7d5ca1800 ChangeLog 1752
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 055bee9ec58b1f245bee0772dda0b807 files/tcng-9i-gentoo.patch 410
+MD5 801eefdefb3e7784dceff74052cd7a88 files/tcng-9l-fixes.patch 413
+MD5 1c8ca5acddcaf944dc6ea6c9e26f7e24 files/digest-tcng-9h 209
+MD5 bba07d9e3d5362bf04936fd2450b2d27 files/digest-tcng-9i 276
+MD5 ddfe867819ede95d01effbd33bedec14 files/digest-tcng-9l 276
+MD5 deae4e9275dbe0c488457ae9016c5df5 files/digest-tcng-9m 276
+MD5 95bc941a647639a523cea5fc6b8ae92a files/tcng-9i-fixes.patch 2949
diff --git a/sys-apps/tcng/files/digest-tcng-9h b/sys-apps/tcng/files/digest-tcng-9h
index 6d093976527e..0a3427250713 100644
--- a/sys-apps/tcng/files/digest-tcng-9h
+++ b/sys-apps/tcng/files/digest-tcng-9h
@@ -1,4 +1,3 @@
 MD5 9b7c520f92b312a5a00da12bad35f57d tcng-9h.tar.gz 509887
 MD5 b05a4e375d9468be3a1dd3f0e83daee8 iproute2-2.4.7-now-ss010824.tar.gz 140139
 MD5 ac343233aa5d745341da9e4ec22475af iproute_20010824-11.diff.gz 44736
-MD5 3064fd8642ce6a7e155a29c5205b99d4 htb3.6-020525.tgz 64218
diff --git a/sys-apps/tcng/metadata.xml b/sys-apps/tcng/metadata.xml
index f093d416cbb1..5d9f5be9d49d 100644
--- a/sys-apps/tcng/metadata.xml
+++ b/sys-apps/tcng/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>no-herd</herd>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/tcng/tcng-9h.ebuild b/sys-apps/tcng/tcng-9h.ebuild
index 9c4226ad3b71..d208683935bf 100644
--- a/sys-apps/tcng/tcng-9h.ebuild
+++ b/sys-apps/tcng/tcng-9h.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/sys-apps/tcng/tcng-9h.ebuild,v 1.1 2003/11/15 06:53:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9h.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="tcng - Traffic Control Next Generation"
 HOMEPAGE="http://tcng.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="doc? ( app-text/ghostscript app-text/tetex media-gfx/transfig )
+# block this to phase it out very shortly
+KEYWORDS="-*"
+IUSE="doc tcsim"
+DEPEND="doc? ( virtual/ghostscript virtual/tetex media-gfx/transfig )
 	dev-lang/perl
 	virtual/os-headers
-	sys-apps/iproute"
+	sys-apps/iproute2"
 RDEPEND="sys-devel/gcc
-	tcng-tcsim? ( media-gfx/gnuplot )
+	tcsim? ( media-gfx/gnuplot )
 	dev-lang/perl
-	sys-apps/iproute"
+	sys-apps/iproute2"
 
 IPROUTE_PN="iproute"
 IPROUTE_PV="20010824"
@@ -26,8 +29,8 @@ IPROUTE_SRCFILE="iproute2-2.4.7-now-ss${IPROUTE_PV/20}.tar.gz"
 
 # note this project does NOT use the SF mirroring system
 SRC_URI="http://tcng.sourceforge.net/dist/${P}.tar.gz
-	tcng-tcsim? ( ftp://ftp.inr.ac.ru/ip-routing/${IPROUTE_SRCFILE}
-	http://ftp.debian.org/debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH} )"
+	tcsim? ( ftp://ftp.inr.ac.ru/ip-routing/${IPROUTE_SRCFILE}
+	mirror://debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH} )"
 
 S=${WORKDIR}/tcng
 IPROUTE_S=${WORKDIR}/${IPROUTE_P}
@@ -36,7 +39,7 @@ src_unpack() {
 	#unpack tcng
 	unpack ${P}.tar.gz
 
-	if use tcng-tcsim; then
+	if use tcsim; then
 		#unpack iproute
 		unpack ${IPROUTE_SRCFILE}
 		mv iproute2 iproute-20010824
@@ -50,9 +53,11 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use tcng-tcsim && myconf="${myconf} --with-tcsim" || myconf="${myconf} --no-tcsim"
+	use tcsim && myconf="${myconf} --with-tcsim" || myconf="${myconf} --no-tcsim"
+	dodir /usr/bin
+	# configure is NONSTANDARD
 	./configure \
-		--install-directory /usr \
+		--install-directory ${D}/usr \
 		--no-manual \
 		${myconf} \
 		|| die "configure failed"
@@ -69,9 +74,9 @@ src_install() {
 	dodir /usr
 	dodir /usr/bin
 	# fix the install location
-	sed 's;INSTALL_DIR=\(.*\);INSTALL_DIR=${D}\1;g' -i config
-	make install-tcc || die "make install-tcc failed"
-	if use tcng-tcsim; then
+	export TCNG_INSTALL_CWD="/usr"
+	einstall install-tcc || die "make install-tcc failed"
+	if use tcsim; then
 		make install-tcsim install-tests || die "make install-tcsim install-tests failed"
 	fi
 
diff --git a/sys-apps/tcng/tcng-9i.ebuild b/sys-apps/tcng/tcng-9i.ebuild
index 974a06ebb3ae..91733e6a7c7a 100644
--- a/sys-apps/tcng/tcng-9i.ebuild
+++ b/sys-apps/tcng/tcng-9i.ebuild
@@ -1,26 +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/sys-apps/tcng/tcng-9i.ebuild,v 1.1 2003/12/17 11:58:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9i.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
-DESCRIPTION="tcng - Traffic Control Next Generation"
+inherit eutils
+
+DESCRIPTION="Traffic Control Next Generation"
 HOMEPAGE="http://tcng.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc tcsim"
+IUSE="debug doc tcsim"
 
 # perl because stuff is written in it
 # iproute,linux-atm as the output needs that
 # os-headers as it compiles stuff with them
 # gcc/binutils as it compiles stuff
 DEPEND_COMMON="dev-lang/perl
-				sys-apps/iproute
-				net-dialup/linux-atm
-				virtual/os-headers
-				sys-devel/gcc
-				sys-devel/binutils"
+	sys-apps/iproute2
+	net-dialup/linux-atm
+	virtual/os-headers
+	sys-devel/gcc
+	sys-devel/binutils"
 
-DEPEND="doc? ( virtual/ghostscript app-text/tetex media-gfx/transfig )
+DEPEND="doc? ( virtual/ghostscript virtual/tetex media-gfx/transfig )
 	sys-devel/make
 	dev-util/yacc
 	sys-devel/flex
@@ -48,7 +51,7 @@ KERNEL_P=${KERNEL_PN}-${KERNEL_PV}
 # note this project does NOT use the SF mirroring system
 SRC_URI="http://tcng.sourceforge.net/dist/${P}.tar.gz
 	tcsim? ( ftp://ftp.inr.ac.ru/ip-routing/${IPROUTE_SRCFILE}
-	http://ftp.debian.org/debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH}
+	mirror://debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH}
 	mirror://kernel/linux/kernel/v2.4/${KERNEL_P}.tar.bz2 )"
 
 S=${WORKDIR}/tcng
@@ -83,6 +86,8 @@ src_compile() {
 		myconf="${myconf} --with-tcsim"
 		myconf="${myconf} --kernel ${KERNEL_S}"
 		myconf="${myconf} --iproute2 ${IPROUTE_S}"
+	else
+		myconf="${myconf} --no-tcsim"
 	fi
 
 	# i know this is before install stage, but the build needs it
diff --git a/sys-apps/tcng/tcng-9l.ebuild b/sys-apps/tcng/tcng-9l.ebuild
index b9cf52c114a3..e9895d81f9b7 100644
--- a/sys-apps/tcng/tcng-9l.ebuild
+++ b/sys-apps/tcng/tcng-9l.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/sys-apps/tcng/tcng-9l.ebuild,v 1.1 2004/04/24 10:37:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9l.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="tcng - Traffic Control Next Generation"
 HOMEPAGE="http://tcng.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc tcsim"
+KEYWORDS="~x86 ~ppc"
+IUSE="debug doc tcsim"
 
 # perl because stuff is written in it
 # iproute,linux-atm as the output needs that
@@ -20,7 +22,7 @@ DEPEND_COMMON="dev-lang/perl
 				sys-devel/gcc
 				sys-devel/binutils"
 
-DEPEND="doc? ( virtual/ghostscript app-text/tetex media-gfx/transfig )
+DEPEND="doc? ( virtual/ghostscript virtual/tetex media-gfx/transfig )
 	sys-devel/make
 	dev-util/yacc
 	sys-devel/flex
@@ -48,7 +50,7 @@ KERNEL_P=${KERNEL_PN}-${KERNEL_PV}
 # note this project does NOT use the SF mirroring system
 SRC_URI="http://tcng.sourceforge.net/dist/${P}.tar.gz
 	tcsim? ( ftp://ftp.inr.ac.ru/ip-routing/${IPROUTE_SRCFILE}
-	http://ftp.debian.org/debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH}
+	mirror://debian/pool/main/i/iproute/${IPROUTE_DEBIAN_PATCH}
 	mirror://kernel/linux/kernel/v2.4/${KERNEL_P}.tar.bz2 )"
 
 S=${WORKDIR}/tcng
diff --git a/sys-apps/tcng/tcng-9m.ebuild b/sys-apps/tcng/tcng-9m.ebuild
index 4acc66b23a2e..c541d067da22 100644
--- a/sys-apps/tcng/tcng-9m.ebuild
+++ b/sys-apps/tcng/tcng-9m.ebuild
@@ -1,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-apps/tcng/tcng-9m.ebuild,v 1.1 2005/02/13 04:56:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcng/tcng-9m.ebuild,v 1.1.1.1 2005/11/30 09:56:39 chriswhite Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ IUSE="debug doc tcsim"
 DEPEND_COMMON="dev-lang/perl
 				sys-apps/iproute2
 				net-dialup/linux-atm
-				tcsim? ( !=sys-kernel/linux-headers-2.6* !sys-kernel/linux26-headers )
+				tcsim? ( !=sys-kernel/linux-headers-2.6* )
 				virtual/os-headers
 				sys-devel/gcc
 				sys-devel/binutils"
diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index b200578de175..0a551000352e 100644
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,9 +1,143 @@
 # ChangeLog for sys-apps/tcp-wrappers
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
+  15 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  get_libdir love for multilib archs.
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  Fix cross-compiling and remove USE=static ... always build shared libraries.
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  error check sed; use emake; modify Makefile to make parallel-friendly
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  tcp-wrappers-7.6-r3.ebuild, tcp-wrappers-7.6-r4.ebuild,
+  tcp-wrappers-7.6-r6.ebuild, tcp-wrappers-7.6-r8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> tcp-wrappers-7.6-r6.ebuild:
+  QA - fix use invocation
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> tcp-wrappers-7.6-r8.ebuild:
+  stable on amd64
+
+  29 Mar 2004; <randy@gentoo.org> tcp-wrappers-7.6-r8.ebuild:
+  adding s390 keywords
+
+  09 Mar 2004; <agriffis@gentoo.org> tcp-wrappers-7.6-r8.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> tcp-wrappers-7.6-r3.ebuild,
+  tcp-wrappers-7.6-r4.ebuild, tcp-wrappers-7.6-r8.ebuild:
+  Marked stable on mips, copyright header fixes.
+
+  09 Feb 2004; <gustavoz@gentoo.org> tcp-wrappers-7.6-r8.ebuild:
+  stable on sparc
+
+  09 Feb 2004; Guy Martin <gmsoft@gentoo.org> tcp-wrappers-7.6-r8.ebuild:
+  Marked stable on hppa.
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  Bump to stable for x86.
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> tcp-wrappers-7.6-r6.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> tcp-wrappers-7.6-r6.ebuild:
+  Move to mips stable (~mips -> mips)
+
+*tcp-wrappers-7.6-r8 (28 Dec 2003)
+
+  28 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  Move libwrap.a to /usr/lib/ where it belongs.
+
+*tcp-wrappers-7.6-r7 (21 Dec 2003)
+
+  21 Dec 2003; Robin H. Johnson <robbat2@gentoo.org>
+  tcp-wrappers-7.6-r7.ebuild:
+  move libs from /usr/lib to /lib, per bug 27064
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> tcp-wrappers-7.6-r6.ebuild:
+  Marked stable on hppa.
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org>
+  tcp-wrappers-7.6-r6.ebuild:
+  set ppc in keywords
+
+  20 Oct 2003; Christian Birchinger <joker@gentoo.org>
+  tcp-wrappers-7.6-r6.ebuild:
+  Added sparc stable keyword
+
+  13 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  tcp-wrappers-7.6-r6.ebuild:
+  bump tcp-wrappers to x86
+
+*tcp-wrappers-7.6-r6 (05 Aug 2003)
+
+  05 Aug 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  New version that has optional shared and ipv6 support. Patches are based on RedHat's tcp-wrappers
+  patches Hopefully closes #12014, #16091 and #25604.
+
+*tcp-wrappers-7.6-r5.ebuild (16 Dec 2002)
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> :
+  Added arm to keywords.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  tcp-wrappers-7.6-r3.ebuild :
+
+  Added back (with similar fixes as in -r4 and -r5 with sed statement and
+  patch tarball on mirrors), because the 1.0 x86 profile still needs this.
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Moved patchsets to tarballs on the gentoo mirrors.  Also, sed expression
+  delimiters converted from / to : closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  16 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> tcp-wrappers-7.6-r5.ebuild :
+  Added compilation and installation of libwrap.so, closes #12014. 
+  Rewrote parts of ebuild switched to epatch (from eutils) to handle patch files.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*tcp-wrappers-7.6-r2.ebuild (14 July 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> tcp-wrappers-7.6-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+*tcp-wrappers-7.6-r4 (06 Apr 2002)
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  17 Nov 2002; Steafn Jones <cretin@gentoo.org> tcp-wrappers-7.6-r4.ebuild :
+  Removed alpha patch and added -fPIC to CFLAGS. This is to aid linking
+  shared libraries and get prelink working.
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> tcp-wrappers-7.6-r4.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  06 Apr 2002; G.Bevin <gbevin@gentoo.org> tcp-wrappers-7.6-r4.ebuild,
+  files/tcp_wrappers_7.6-stdc.diff files/digest-tcp-wrappers-7.6-r4 :
+  
+  Patches to make the tcp-wrappers header by stdc compliant and work without
+  problems with gcc 3.
+  
 *tcp-wrappers-7.6-r3 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> tcp-wrappers-7.6-r3.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index e69de29bb2d1..44fa4112d0a7 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 6d18f99c16ad26d8b91004b1ef55ed01 tcp-wrappers-7.6-r8.ebuild 2300
+MD5 7c1b5a456c24914918646016a95c0697 ChangeLog 5302
+MD5 b4d27b4d9d3d841a7199217735e52049 files/digest-tcp-wrappers-7.6-r8 146
+MD5 da6fe337f8e6ddda00b5d52c588ca70a files/hosts.allow.example 585
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0AEvgIKl8Uu19MoRAlfJAJwLabL3TjjOG3jLuslNCYEb11Py3ACfc+KJ
+A9LBaCEPJz95WgbRg9PNa+w=
+=jpXF
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8 b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8
index cf41066fb0fd..4d5cad355600 100644
--- a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8
+++ b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8
@@ -1,2 +1,2 @@
 MD5 e6fa25f71226d090f34de3f6b122fb5a tcp_wrappers_7.6.tar.gz 99438
-MD5 faaced29890e6095a3667edc21ce8d2b tcp-wrappers-7.6-r7-patches.tar.bz2 18987
+MD5 3050aa30cb6f4e3aa8f3d6ccefc2bef8 tcp-wrappers-7.6-r8-patches.tar.bz2 19279
diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/tcp-wrappers/metadata.xml
+++ b/sys-apps/tcp-wrappers/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-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
index d303cc89ecd2..de5669907b97 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
@@ -1,64 +1,70 @@
-# 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-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.1 2003/12/28 11:06:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.1.1.1 2005/11/30 09:57:00 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P="${P//-/_}"
-
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="TCP Wrappers"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://gentoo/${P}-r7-patches.tar.bz2"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-IUSE="ipv6 static"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
+	mirror://gentoo/${PF}-patches.tar.bz2"
+
+LICENSE="tcp_wrappers_license"
 SLOT="0"
-LICENSE="freedist"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="ipv6"
 
-DEPEND="virtual/glibc
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
-RDEPEND="virtual/glibc"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd ${S}
 
 	chmod ug+w Makefile
-	sed -i -e "s:-O:${CFLAGS}:" \
+	sed -i \
+		-e "s:-O:${CFLAGS}:" \
 		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \
-	Makefile
+		Makefile || die "makefile patch prep"
 
 	PATCHDIR=${WORKDIR}/${PV}-patches
-
 	epatch ${PATCHDIR}/${P}-makefile.patch.bz2
-
 	epatch ${PATCHDIR}/generic
-
-	use static || epatch ${PATCHDIR}/${P}-shared.patch.bz2
+	epatch ${PATCHDIR}/${P}-shared.patch.bz2
 	use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff.bz2
+
+	# make it parallel/cross-compile friendly.
+	sed -i \
+		-e 's:gcc:$(CC):' \
+		-e 's:@make :@$(MAKE) :' \
+		-e 's:make;:$(MAKE);:' \
+		Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
-	local myconf=
+	tc-export CC
 
-	use static || myconf="${myconf} -DHAVE_WEAKSYMS"
+	local myconf="-DHAVE_WEAKSYMS"
 	use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
 
-	make ${MAKEOPTS} \
+	emake \
 		REAL_DAEMON_DIR=/usr/sbin \
 		GENTOO_OPT="${myconf}" \
 		MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
-		config-check || die
+		config-check || die "emake config-check failed"
 
-	make ${MAKEOPTS} \
+	emake \
 		REAL_DAEMON_DIR=/usr/sbin \
 		GENTOO_OPT="${myconf}" \
 		MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
-		linux || die
+		linux || die "emake linux failed"
 }
 
 src_install() {
-	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
+	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die
 
 	doman *.[358]
 	dosym hosts_access.5.gz /usr/share/man/man5/hosts.allow.5.gz
@@ -70,15 +76,12 @@ src_install() {
 	into /usr
 	dolib.a libwrap.a
 
-	if [ -z `use static` ]; then
-		into /
-		newlib.so libwrap.so libwrap.so.0.${PV}
-		dosym /lib/libwrap.so.0.${PV} /lib/libwrap.so.0
-		dosym /lib/libwrap.so.0 /lib/libwrap.so
-		# bug #4411
-		gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed"
-	fi
+	into /
+	newlib.so libwrap.so libwrap.so.0.${PV}
+	dosym /$(get_libdir)/libwrap.so.0.${PV} /$(get_libdir)/libwrap.so.0
+	dosym /$(get_libdir)/libwrap.so.0 /$(get_libdir)/libwrap.so
+	# bug #4411
+	gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed"
 
-	dodoc BLURB CHANGES DISCLAIMER README*
+	dodoc BLURB CHANGES DISCLAIMER README* ${FILESDIR}/hosts.allow.example
 }
-
diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index 6c57b53cd9bb..9047fa417eee 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,8 +1,221 @@
 # ChangeLog for sys-apps/texinfo
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.1 2002/05/19 18:26:47 spider Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
+*texinfo-4.8-r2 (08 Oct 2005)
 
+  08 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  files/texinfo-4.8-tempfile.patch, +texinfo-4.8-r2.ebuild:
+  Fix segfault in previous tempfile fix #108416.
+
+*texinfo-4.8-r1 (29 Sep 2005)
+
+  29 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.8-tempfile.patch, +texinfo-4.8-r1.ebuild:
+  Fix insecure tempfile usage #106105.
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> texinfo-4.8.ebuild:
+  Marked stable on mips.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> texinfo-4.8.ebuild:
+  Stable on ppc.
+
+  13 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.8-freebsd.patch, texinfo-4.8.ebuild:
+  Add a FreeBSD compatibility patch by Diego Pettenò #92434.
+
+  25 Apr 2005; Mike Frysinger <vapier@gentoo.org> texinfo-4.8.ebuild:
+  Add a workaround for broken dependencies until it can be fixed properly in
+  the makefile #85540.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> texinfo-4.8.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> texinfo-4.8.ebuild:
+  Marked stable on amd64.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> texinfo-4.8.ebuild:
+  Stable on alpha.
+
+  15 Mar 2005; Christian Birchinger <joker@gentoo.org> texinfo-4.8.ebuild:
+  Added sparc stable keyword
+
+  15 Feb 2005; Kito <kito@gentoo.org> texinfo-4.8.ebuild:
+  ~ppc-macos keyword
+
+  30 Jan 2005; Mike Frysinger <vapier@gentoo.org> texinfo-4.8.ebuild:
+  Don't install texi2pdf anymore since tetex does #76812 by Marius Mauch.
+
+*texinfo-4.8 (03 Jan 2005)
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> +texinfo-4.8.ebuild:
+  Version bump.  Magically fixes #74926 by spiritus in the process.
+
+  24 Aug 2004; Sven Wegener <swegener@gentoo.org> texinfo-4.6.ebuild,
+  texinfo-4.7-r1.ebuild, texinfo-4.7.ebuild:
+  WANT_AUTOMAKE_1_6=1 -> WANT_AUTOMAKE=1.6
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org> texinfo-4.7-r1.ebuild:
+  stable on alpha and ia64
+
+*texinfo-4.7-r1 (22 Jul 2004)
+
+  22 Jul 2004; Jon Portnoy <avenj@gentoo.org> texinfo-4.7.ebuild,
+  texinfo-4.7-r1.ebuild, files/makeinfo.patch :
+  Added patch from bug #57960 to fix groff compilation.
+
+*texinfo-4.7 (19 Jul 2004)
+
+  19 Jul 2004; <solar@gentoo.org> texinfo-4.7.ebuild:
+  version bump and added gnuconfig_update call, needed for atleast uclibc and
+  maybe others
+
+  04 Jul 2004; <solar@gentoo.org> texinfo-4.6.ebuild:
+  added static USE flag to help assist when porting to new arches/libc's
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> texinfo-4.5.ebuild,
+  texinfo-4.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 Jun 2004; Guy Martin <gmsoft@gentoo.org> texinfo-4.6.ebuild:
+  Marked stable on hppa.
+
+  29 Jun 2004; Joshua Kinard <kumba@gentoo.org> texinfo-4.6.ebuild:
+  Marked stable on sparc and mips.
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> texinfo-4.3-r1.ebuild,
+  texinfo-4.5.ebuild:
+  QA - fix use invocation
+
+  28 May 2004; Aron Griffis <agriffis@gentoo.org> texinfo-4.6.ebuild:
+  Stable on alpha and x86
+
+  09 Apr 2004; Travis Tilley <lv@gentoo.org> texinfo-4.6.ebuild:
+  stable on amd64
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> texinfo-4.6.ebuild:
+  set ppc in keywords
+
+  08 Sep 2003; Martin Schlemmer <azarah@gentoo.org> texinfo-4.3-r1.ebuild,
+  texinfo-4.5.ebuild, texinfo-4.6.ebuild:
+  Bootstrap fixes
+
+*texinfo-4.6 (02 Sep 2003)
+
+  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> texinfo-4.5.ebuild,
+  texinfo-4.6.ebuild:
+  Version bumped.
+
+  16 Jul 2003; root <root@gentoo.org> texinfo-4.5.ebuild:
+  Mark stable on ppc
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> texinfo-4.5.ebuild:
+  Mark stable on alpha
+
+*texinfo-4.5 (19 Feb 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> texinfo-4.5.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> texinfo-4.5.ebuild:
+  Changed ~sparc to sparc in KEYWORDS
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> texinfo-4.5.ebuild :
+  Marked ebuild as stable for mips.
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> texinfo-4.3-r1.ebuild :
+  Added arm to keywords.
+
+  19 Feb 2003; Martin Schlemmer <azarah@gentoo.org texinfo-4.5.ebuild :
+  Update version, closing bug #15075.
+
+  15 Feb 2003; Jan Seidel <tuxus@gentoo.org> texinfo-4.3.ebuild :
+  Added mips to keywords
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> texinfo-4.3-r1.ebuild :
+  Added hppa to keywords.
+
+  08 Jan 2003; Jared Hudson <jhhudso@gentoo.org> texinfo-4.3-r1.ebuild : Fixed
+  bug where install-info wasn't being installed during bootstrap
+  (when USE contained 'build')
+	
+  07 Jan 2003; Martin Schlemmer <azarah@gentoo.org> texinfo-4.3-r1.ebuild :
+  Mark stable for all.  Sorry guys (other arch devs), I have a few bugs for
+  things that fails with earlier texinfo, so please forgive me for this :-)
+
+*texinfo-4.3-r1 (21 Nov 2002)
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> texinfo-4.2-r5.ebuild,
+  texinfo-4.2-r5.ebuild, texinfo-4.3-r1.ebuild, texinfo-4.3.ebuild,
+  texinfo-4.3.ebuild:
+  use epatch instead
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> texinfo-4.3-r1.ebuild :
+  Marked ebuild as stable for mips.
+
+  20 Nov 2002; Ingo Krabbe <ikrabbe@dokom.net> :
+  apply localization bugfix for install-info.
+  committed by satai@gentoo.org.
+
+*texinfo-4.3 (18 Nov 2002)
+
+  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.
+
+*texinfo-4.2b (20 Oct 2002)
+
+  20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.
+
+*texinfo-4.2-r5 (8 Jul 2002)
+
+  06 Jan 2003; Jan Seidel <tuxus@gentoo.org> texinfo-4.2-r5.ebuild :
+  Added mips to keywords.
+
+  1 Aug 2002; Martin Schlemmer <azarah@gentoo.org> texinfo-4.2-r5.ebuild :
+  Fix DEPEND.
+
+  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> texinfo-4.2-r5.ebuild :
+  Added KEYWORDS.
+
+  5 Jul 2002; Martin Schlemmer <azarah@gentoo.org> texinfo-4.2-r5.ebuild :
+
+  Remove the part in src_install() that renames "texinfo" and "texinfo-*"
+  (the info files) to "texinfo.info" and "texinfo.info-*".  This is replaced
+  by changing the Makefile.in to update the files that should be installed,
+  and modifying texinfo.txi to change the files being generated.  This should
+  resolve an issue where the info pages was not readable, closing bug #4672.
+
+*texinfo-4.2-r4 (1 Jul 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> texinfo-4.2-r4.ebuild :
+  Added KEYWORDS.
+
+  Remove automake DEPEND, as it is not needed, and pulls in perl during
+  bootstrap.
+
+*texinfo-4.2-r3 (27 Jun 2002)
+
+  27 Jun 2002; Seemant Kulleen <seemant@gentoo.org> texinfo-4.2-r3.ebuild
+  files/digest-texinfo-4.2-r3 :
+
+  info pages now get merged into /usr/share/info instead of /var/tmp/..
+  Thanks to vadim@berezniker.com (Vadim Berezniker) in bug #4241
+
+*texinfo-4.2-r2 (5 June 2002)
+  5 June 2002; Verwilst <verwilst@gentoo.org> texinfo-4.2-r2.ebuild
+  activated the use build stuff, so i could enable texinfo in our gcc 3.1 
+  stage1 tarball. try/die fixes as well.
+
+*texinfo-4.2-r1 (22 May 2002)
+  22 May 2002; Spider <spider@gentoo.org> texinfo-4.2-r1.ebuild
+  Comment out all "use build" stuff and fix tabulation
 
 *texinfo-4.2 (18 May 2002)
   18 May 2002; Spider <spider@gentoo.org> texinfo-4.2.ebuild :
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 4e3e26933a53..2a624cc27035 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,7 +1,24 @@
-MD5 f35899d792cd9c605297824fa4c7a2dd ChangeLog 3766
-MD5 2da62ad7b736635552bf97e8e59ad7ab texinfo-4.3-r1.ebuild 1764
-MD5 bcb7409ffe72b0f10012dcd8e93267cd texinfo-4.5.ebuild 1733
-MD5 3173c3b67a3ef4e594cf5ce1b8253504 files/digest-texinfo-4.3-r1 64
-MD5 e5c1b120747cf28d4ff1885b64f608a6 files/digest-texinfo-4.5 64
-MD5 b8ed9b84ca8ab4c2ac4e628a8f928dcb files/install-info.patch 729
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 046cd32319d1a54845012f175d325695 ChangeLog 7686
+MD5 a2c21c53079eb65c306a08d230d15b2b files/digest-texinfo-4.7-r1 65
+MD5 1c6181fd6a19db98315a1f737a5ae839 files/digest-texinfo-4.8 65
+MD5 1c6181fd6a19db98315a1f737a5ae839 files/digest-texinfo-4.8-r1 65
+MD5 1c6181fd6a19db98315a1f737a5ae839 files/digest-texinfo-4.8-r2 65
+MD5 a0df107ca9e3036e2ee2d501343cbf2b files/makeinfo.patch 790
 MD5 690fb86d0c0215155b1d18671099115a files/mkinfodir 7318
+MD5 7246b5d34e673e1eb937186e4f18f56d files/texinfo-4.8-freebsd.patch 3787
+MD5 a30131625cc3b1393c59b9603e982f24 files/texinfo-4.8-tempfile.patch 708
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 75c60847c4f9b9d75375567cd1a3ba81 texinfo-4.7-r1.ebuild 1979
+MD5 85306271dc0f544e3b5da1761895b881 texinfo-4.8-r1.ebuild 1963
+MD5 7b944058f6712de4dec1796d99f5ebfc texinfo-4.8-r2.ebuild 1962
+MD5 51d0756296f7f75f5a8cf3ec558fe1aa texinfo-4.8.ebuild 1909
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDSAFOgIKl8Uu19MoRAiZkAJ41VcRv7W+wXHyGgKhWUOjHOytLhwCVG2r2
+ugcb4K8MxZHiCwTZKEtJZA==
+=CMt8
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/texinfo/files/mkinfodir b/sys-apps/texinfo/files/mkinfodir
index db825de09741..d91c63f5b1f3 100755
--- a/sys-apps/texinfo/files/mkinfodir
+++ b/sys-apps/texinfo/files/mkinfodir
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $
+# $Id: mkinfodir,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 # Generate the top-level Info node, given a directory of Info files
 # and (optionally) a skeleton file.  The output will be suitable for a
 # top-level dir file.  The skeleton file contains info topic names in the
@@ -51,7 +51,7 @@ echo "This version was generated on `date`"
 echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`"
 
 cat << moobler
-\$Id: mkinfodir,v 1.1 2000/08/03 16:16:11 achim Exp $
+\$Id: mkinfodir,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 This is the file .../info/dir, which contains the topmost node of the
 Info hierarchy.  The first time you invoke Info you start off
 looking at that node, which is (dir)Top.
diff --git a/sys-apps/texinfo/files/texinfo-4.8-tempfile.patch b/sys-apps/texinfo/files/texinfo-4.8-tempfile.patch
index c3c9e93d7a5e..95a8c3f19142 100644
--- a/sys-apps/texinfo/files/texinfo-4.8-tempfile.patch
+++ b/sys-apps/texinfo/files/texinfo-4.8-tempfile.patch
@@ -1,60 +1,34 @@
+Patch based off code from: Martin Pitt <martin.pitt at ubuntu.com>
+
 http://bugs.gentoo.org/106105
 
 --- util/texindex.c
 +++ util/texindex.c
-@@ -99,6 +99,9 @@ long nlines;
- /* Directory to use for temporary files.  On Unix, it ends with a slash.  */
- char *tempdir;
- 
-+/* Basename for temp files inside of tempdir.  */
-+char *tempbase;
-+
- /* Number of last temporary file.  */
- int tempcount;
- 
-@@ -190,6 +193,11 @@ main (int argc, char **argv)
- 
-   decode_command (argc, argv);
- 
-+  /* XXX mkstemp not appropriate, as we need to have somewhat predictable
-+   * names. But race condition was fixed, see maketempname. 
-+   */
-+  tempbase = mktemp ("txidxXXXXXX");
-+
-   /* Process input files completely, one by one.  */
- 
-   for (i = 0; i < num_infiles; i++)
-@@ -392,21 +400,21 @@ For more information about these matters
- static char *
+@@ -390,11 +390,12 @@
  maketempname (int count)
  {
--  static char *tempbase = NULL;
+   static char *tempbase = NULL;
++  char *tempname;
    char tempsuffix[10];
--
--  if (!tempbase)
--    {
--      int fd;
--      tempbase = concat (tempdir, "txidxXXXXXX");
--
--      fd = mkstemp (tempbase);
--      if (fd == -1)
--        pfatal_with_name (tempbase);
--    }
-+  char *name, *tmp_name;
 +  int fd;
  
+   if (!tempbase)
+     {
+-      int fd;
+       tempbase = concat (tempdir, "txidxXXXXXX");
+ 
+       fd = mkstemp (tempbase);
+@@ -403,7 +404,12 @@
+     }
+ 
    sprintf (tempsuffix, ".%d", count);
 -  return concat (tempbase, tempsuffix);
-+  tmp_name = concat (tempdir, tempbase);
-+  name = concat (tmp_name, tempsuffix);
-+  free(tmp_name);
-+
-+  fd = open (name, O_CREAT|O_EXCL|O_WRONLY, 0600);
++  tempname = concat (tempbase, tempsuffix);
++  fd = open (tempname, O_CREAT|O_EXCL|O_WRONLY, 0600);
 +  if (fd == -1)
-+    pfatal_with_name (name);
-+
-+  close(fd);
-+  return name;
++    pfatal_with_name (tempname);
++  close (fd);
++  return tempname;
  }
  
  
diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/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-apps/texinfo/texinfo-4.7-r1.ebuild b/sys-apps/texinfo/texinfo-4.7-r1.ebuild
index dacf42c96007..1446b459af81 100644
--- a/sys-apps/texinfo/texinfo-4.7-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-4.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/sys-apps/texinfo/texinfo-4.7-r1.ebuild,v 1.1 2004/07/23 02:07:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.7-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 inherit flag-o-matic gnuconfig eutils
 
@@ -10,16 +10,16 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls build static"
 
-DEPEND="virtual/libc
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	>=sys-apps/sed-4.0.5
-	nls? ( sys-devel/gettext ) )"
-
 RDEPEND="virtual/libc
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+DEPEND="${RDEPEND}
+	!build? (
+		>=sys-apps/sed-4.0.5
+		nls? ( sys-devel/gettext )
+	)"
 
 src_unpack() {
 	unpack ${A}
@@ -49,7 +49,7 @@ src_compile() {
 
 	use static && append-ldflags -static
 
-	export WANT_AUTOMAKE_1_6=1
+	export WANT_AUTOMAKE=1.6
 	econf ${myconf} || die
 	emake || die
 }
diff --git a/sys-apps/texinfo/texinfo-4.8-r1.ebuild b/sys-apps/texinfo/texinfo-4.8-r1.ebuild
index 50b5f9b3c281..de56c36e4426 100644
--- a/sys-apps/texinfo/texinfo-4.8-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-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/sys-apps/texinfo/texinfo-4.8-r1.ebuild,v 1.1 2005/09/29 08:51:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.8-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="nls build static"
 
 RDEPEND="!build? ( >=sys-libs/ncurses-5.2-r2 )"
diff --git a/sys-apps/texinfo/texinfo-4.8-r2.ebuild b/sys-apps/texinfo/texinfo-4.8-r2.ebuild
index 6807160d3d28..f72875425a47 100644
--- a/sys-apps/texinfo/texinfo-4.8-r2.ebuild
+++ b/sys-apps/texinfo/texinfo-4.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-apps/texinfo/texinfo-4.8-r2.ebuild,v 1.1 2005/10/08 17:24:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.8-r2.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/sys-apps/texinfo/texinfo-4.8.ebuild b/sys-apps/texinfo/texinfo-4.8.ebuild
index efa4201d242d..0303775b5b1b 100644
--- a/sys-apps/texinfo/texinfo-4.8.ebuild
+++ b/sys-apps/texinfo/texinfo-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/sys-apps/texinfo/texinfo-4.8.ebuild,v 1.1 2005/01/04 03:24:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.8.ebuild,v 1.1.1.1 2005/11/30 09:56:16 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,24 +10,21 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 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="nls build static"
 
-RDEPEND="virtual/libc
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+RDEPEND="!build? ( >=sys-libs/ncurses-5.2-r2 )"
 DEPEND="${RDEPEND}
-	!build? (
-		>=sys-apps/sed-4.0.5
-		nls? ( sys-devel/gettext )
-	)"
+	!build? ( nls? ( sys-devel/gettext ) )"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-freebsd.patch
 
-	cd "${S}"/doc
+	cd doc
 	# Get the texinfo info page to have a proper name of texinfo.info
 	sed -i 's:setfilename texinfo:setfilename texinfo.info:' texinfo.txi
-
 	sed -i \
 		-e 's:INFO_DEPS = texinfo:INFO_DEPS = texinfo.info:' \
 		-e 's:texinfo\::texinfo.info\::' \
@@ -42,7 +39,12 @@ src_compile() {
 	use static && append-ldflags -static
 
 	econf ${myconf} || die
-	emake || die
+
+	# work around broken dependency's in info/Makefile.am #85540
+	emake -C lib || die "emake lib"
+	emake -C info makedoc || die "emake makedoc"
+	emake -C info doc.c || die "emake doc.c"
+	emake || die "emake"
 }
 
 src_install() {
@@ -52,6 +54,8 @@ src_install() {
 	else
 		make DESTDIR="${D}" install || die "install failed"
 		dosbin ${FILESDIR}/mkinfodir
+		# tetex installs this guy #76812
+		has_version '<app-text/tetex-3' && rm -f "${D}"/usr/bin/texi2pdf
 
 		if [[ ! -f ${D}/usr/share/info/texinfo.info ]] ; then
 			die "Could not install texinfo.info!!!"
diff --git a/sys-apps/textutils/ChangeLog b/sys-apps/textutils/ChangeLog
index dbf6bbda713d..95bc325fcbd8 100644
--- a/sys-apps/textutils/ChangeLog
+++ b/sys-apps/textutils/ChangeLog
@@ -1,6 +1,82 @@
 # ChangeLog for sys-apps/textutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> textutils-2.0.21.ebuild,
+  textutils-2.1.ebuild:
+  QA - fix use invocation
+
+  19 Apr 2004; Michael McCabe <randy@gentoo.org> textutils-2.1-r1.ebuild:
+  added s390 keywords
+
+  24 Jan 2004; <gustavoz@gentoo.org> textutils-2.1-r1.ebuild:
+  stable on sparc - less than -r1 can cause problems
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> textutils-2.1-r1.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> textutils-2.1-r1.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> textutils-2.1-r1.ebuild:
+  Marked stable on hppa.
+
+  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> textutils-2.1.ebuild:
+  Now uses mirror://gnu.
+
+*textutils-2.1-r1 (18 Jul 2003)
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org>
+  textutils-2.0.19-r1.ebuild, textutils-2.0.19-r2.ebuild,
+  textutils-2.1-r1.ebuild, textutils-2.1.ebuild,
+  files/textutils-2.0.19-gentoo.diff:
+  upgrade to coreutils
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> textutils-2.1.ebuild :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> textutils-2.1.ebuild :
+  Added hppa to keywords.
+
+*textutils-2.1 (20 Dec 2002)
+
+  20 Dec 2002; Jan Seidel <tuxus@gentoo.org> textutils-2.1.ebuild :
+  Added mips to keywords
+
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*textutils-2.1 (25 Sep 2002)
+
+  25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update version.
+
+*textutils-2.0.21 (26 Aug 2002)
+
+  26 Aug 2002; Seemant Kulleen <seemant@gentoo.org> textutils-2.0.21.ebuild
+  files/digest-textutils-2.0.21 :
+
+  rossm@nist.gov (Ross J. Micheals) in bug #6842 reports that od gives
+  incorrect output in the 2.0.19 version.  This release fixes that problem.
+
+*textutils-2.0.19-r1 (21 Jul 2002)
+
+  21 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Move /usr/bin/wc to /bin/wc for upcomming baselayout.
+
+*textutils-2.0.19-r1 (18 Mar 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> textutils-2.0.19.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> textutils-2.0.19-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  18 Mar 2002; Seemant Kulleen <seemant@gentoo.org> textutils-2.0.19-r1 :
+
+  The patch in ${FILESDIR} is to remove RMS's rant about fascism and the
+  wheel group with regards to su.  Please see bug #1095 by
+  jboyens@iastate.edu (JR Boyens) for details.
 
 *textutils-2.0.19 (1 Feb 2002)
 
diff --git a/sys-apps/textutils/Manifest b/sys-apps/textutils/Manifest
index e69de29bb2d1..865ce2fc29f4 100644
--- a/sys-apps/textutils/Manifest
+++ b/sys-apps/textutils/Manifest
@@ -0,0 +1,9 @@
+MD5 90483f0f83033c082ad3a779659f04ab textutils-2.1.ebuild 1035
+MD5 f380b1e6a9265fbf5a82090b5356dfc1 textutils-2.0.21.ebuild 1201
+MD5 19496cfe15390d08a2a1c01cf60ba120 textutils-2.1-r1.ebuild 481
+MD5 419fabf7ac795f20373225c612a385eb ChangeLog 3119
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fa618c23a88a25c243798aacf2db59a6 files/textutils-2.0.21-gentoo.diff 1278
+MD5 912d3e77416726cfd0e4fbe8b53a3468 files/digest-textutils-2.1 66
+MD5 7ffe6874d60801287cacb37785919e0e files/digest-textutils-2.0.21 69
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-textutils-2.1-r1 0
diff --git a/sys-apps/textutils/metadata.xml b/sys-apps/textutils/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/textutils/metadata.xml
+++ b/sys-apps/textutils/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-apps/textutils/textutils-2.0.21.ebuild b/sys-apps/textutils/textutils-2.0.21.ebuild
index 5cd010934f80..4f0fe999c352 100644
--- a/sys-apps/textutils/textutils-2.0.21.ebuild
+++ b/sys-apps/textutils/textutils-2.0.21.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.21.ebuild,v 1.1 2002/08/26 17:08:03 seemant Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.21.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
+
+IUSE="nls static build"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU text utilities"
 SRC_URI="http://fetish.sf.net/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
 
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="nls?  ( sys-devel/gettext )"
 
-
 src_unpack() {
 	unpack ${P}.tar.gz
-	
+
 	cd ${S}
 	# patch to remove Stallman's su rant
 	patch doc/coreutils.texi ${FILESDIR}/${P}-gentoo.diff || die
 	rm doc/coreutils.info
 }
 
-
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
-	
+
 	econf \
 		--build=${CHOST} \
 		--without-included-regex \
 		${myconf} || die
-		
-	if [ "`use static`" ]
+
+	if use static
 	then
 		emake LDFLAGS=-static || die
 	else
@@ -43,17 +42,17 @@ src_compile() {
 
 src_install() {
 	einstall || die
-		
+
 	dodir /bin
 	mv ${D}/usr/bin/cat ${D}/bin
 	dosym /bin/cat /usr/bin/cat
 	# For baselayout
 	mv ${D}/usr/bin/wc ${D}/bin
 	dosym /bin/wc /usr/bin/wc
-	
+
 	rmdir ${D}/usr/lib
-	
-	if [ -z "`use build`" ]
+
+	if ! use build
 	then
 		dodoc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO
 	else
diff --git a/sys-apps/textutils/textutils-2.1-r1.ebuild b/sys-apps/textutils/textutils-2.1-r1.ebuild
index d3bf88a1ed5c..01b045381d41 100644
--- a/sys-apps/textutils/textutils-2.1-r1.ebuild
+++ b/sys-apps/textutils/textutils-2.1-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/sys-apps/textutils/textutils-2.1-r1.ebuild,v 1.1 2003/07/18 12:50:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
 
 DESCRIPTION="textutils, sh-utils and fileutils are replaced by coreutils"
 HOMEPAGE="http://www.gnu.org/software/coreutils/"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ppc64 s390"
+IUSE=""
 
-RDEPEND="sys-apps/coreutils"
+RDEPEND=">=sys-apps/coreutils-5.0-r3"
diff --git a/sys-apps/textutils/textutils-2.1.ebuild b/sys-apps/textutils/textutils-2.1.ebuild
index 24905aad8929..d55f06bb7ab8 100644
--- a/sys-apps/textutils/textutils-2.1.ebuild
+++ b/sys-apps/textutils/textutils-2.1.ebuild
@@ -1,29 +1,29 @@
-# 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-apps/textutils/textutils-2.1.ebuild,v 1.1 2002/09/25 15:20:39 azarah Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1.ebuild,v 1.1.1.1 2005/11/30 09:56:48 chriswhite Exp $
+
+IUSE="nls static build"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU text utilities"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
 
-KEYWORDS="x86 ppc sparc sparc64 alpha"
+KEYWORDS="x86 ppc sparc alpha mips hppa "
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="nls? ( sys-devel/gettext )"
 
-
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"
-	
+
 	econf \
 		--build=${CHOST} \
 		--without-included-regex \
 		${myconf} || die
-		
-	if [ "`use static`" ]
+
+	if use static
 	then
 		emake LDFLAGS=-static || die
 	else
@@ -33,21 +33,20 @@ src_compile() {
 
 src_install() {
 	einstall || die
-		
+
 	dodir /bin
 	mv ${D}/usr/bin/cat ${D}/bin
 	dosym /bin/cat /usr/bin/cat
 	# For baselayout
 	mv ${D}/usr/bin/wc ${D}/bin
 	dosym /bin/wc /usr/bin/wc
-	
+
 	rmdir ${D}/usr/lib
-	
-	if [ -z "`use build`" ]
+
+	if ! use build
 	then
 		dodoc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO
 	else
 		rm -rf ${D}/usr/share
 	fi
 }
-
diff --git a/sys-apps/tinylogin/ChangeLog b/sys-apps/tinylogin/ChangeLog
index ea93e879e556..d9751622b09c 100644
--- a/sys-apps/tinylogin/ChangeLog
+++ b/sys-apps/tinylogin/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for sys-apps/tinylogin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tinylogin/ChangeLog,v 1.1 2002/12/30 20:05:24 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tinylogin/ChangeLog,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
+
+  26 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  tinylogin-1.4.ebuild:
+  mark ~ppc
+
+  27 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> tinylogin-1.4.ebuild:
+  closed bug #61251, added some dep., added possibility to compile tinylogic
+  static or shared
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> tinylogin-1.2.ebuild,
+  tinylogin-1.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+*tinylogin-1.4 (09 Jul 2003)
+
+  15 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add local use flag uclibc.
+
+  09 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *tinylogin-1.2 (30 Dec 2002)
 
diff --git a/sys-apps/tinylogin/Manifest b/sys-apps/tinylogin/Manifest
index e69de29bb2d1..0e55f1dc5ddd 100644
--- a/sys-apps/tinylogin/Manifest
+++ b/sys-apps/tinylogin/Manifest
@@ -0,0 +1,4 @@
+MD5 e0985bf6552181ca794e12ef8b78a110 ChangeLog 923
+MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
+MD5 09bea035b9829065e0b4f1567f50e964 tinylogin-1.4.ebuild 928
+MD5 f205e4d830aea7ebd7633fc6ba5816ce files/digest-tinylogin-1.4 65
diff --git a/sys-apps/tinylogin/metadata.xml b/sys-apps/tinylogin/metadata.xml
index f093d416cbb1..5c40e771595f 100644
--- a/sys-apps/tinylogin/metadata.xml
+++ b/sys-apps/tinylogin/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>embedded</herd>
 </pkgmetadata>
diff --git a/sys-apps/tinylogin/tinylogin-1.4.ebuild b/sys-apps/tinylogin/tinylogin-1.4.ebuild
index 5167e690f8fc..3cff3109142e 100644
--- a/sys-apps/tinylogin/tinylogin-1.4.ebuild
+++ b/sys-apps/tinylogin/tinylogin-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/sys-apps/tinylogin/tinylogin-1.4.ebuild,v 1.1 2003/07/07 20:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tinylogin/tinylogin-1.4.ebuild,v 1.1.1.1 2005/11/30 09:56:03 chriswhite Exp $
 
 DESCRIPTION="worlds smallest login/passwd/getty/etc"
 HOMEPAGE="http://tinylogin.busybox.net/"
@@ -8,24 +8,28 @@ SRC_URI="http://tinylogin.busybox.net/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 arm x86 ~ppc"
+IUSE="static make-symlinks"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	local myconf=""
 	use static && myconf="${myconf} DOSTATIC=true"
+	type -p ${CHOST}-ar && export CROSS=${CHOST}-
 	emake ${myconf} || die
 }
 
 src_install() {
-	into /
-	dobin tinylogin
-	into /usr
-	dodoc Changelog README TODO
+	make PREFIX="${D}" install || die
+	if ! use make-symlinks ; then
+		rm -r "${D}"/sbin "${D}"/usr/bin "${D}"/bin/{add*,del*,login,su}
+	fi
+
+	doman docs/*.{1,8}
 
+	dodoc Changelog README TODO
 	cd docs
-	doman *.1 *.8
 	dodoc *.txt
 	dohtml -r tinylogin.busybox.net
 	docinto pod
diff --git a/sys-apps/turbotail/ChangeLog b/sys-apps/turbotail/ChangeLog
index 8e40b904ed98..f96a875e32ae 100644
--- a/sys-apps/turbotail/ChangeLog
+++ b/sys-apps/turbotail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/turbotail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/turbotail/ChangeLog,v 1.1 2005/08/05 19:55:26 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/turbotail/ChangeLog,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
+
+*turbotail-0.2-r1 (08 Aug 2005)
+
+  08 Aug 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/turbotail-0.2-munmap.patch, +turbotail-0.2-r1.ebuild:
+  adding munmap patch (see bug #101694)
+
+  06 Aug 2005; David Holm <dholm@gentoo.org> turbotail-0.2.ebuild:
+  Added to ~ppc.
 
 *turbotail-0.2 (05 Aug 2005)
 
diff --git a/sys-apps/turbotail/Manifest b/sys-apps/turbotail/Manifest
index 4611f25d4ae2..e02189ef632c 100644
--- a/sys-apps/turbotail/Manifest
+++ b/sys-apps/turbotail/Manifest
@@ -1,3 +1,7 @@
-MD5 1bb07a806db3066f70b38077acaf01e6 turbotail-0.2.ebuild 576
+MD5 fd88470064409fe2d753b023dbfb58fa turbotail-0.2.ebuild 681
+MD5 d051bc03259bf5a874bf835de24e51d5 turbotail-0.2-r1.ebuild 809
+MD5 bc4fd16c1016cd0f689cba3518d60e68 ChangeLog 648
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 92a0255cbb3e1575323119175be61a46 files/digest-turbotail-0.2-r1 60
+MD5 2eae56efaff3b112abc369cdcaf90b77 files/turbotail-0.2-munmap.patch 320
 MD5 92a0255cbb3e1575323119175be61a46 files/digest-turbotail-0.2 60
diff --git a/sys-apps/turbotail/turbotail-0.2-r1.ebuild b/sys-apps/turbotail/turbotail-0.2-r1.ebuild
index 6a0cacea78d2..36b3c3e3540c 100644
--- a/sys-apps/turbotail/turbotail-0.2-r1.ebuild
+++ b/sys-apps/turbotail/turbotail-0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/turbotail/turbotail-0.2-r1.ebuild,v 1.1 2005/08/08 17:03:52 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/turbotail/turbotail-0.2-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/turbotail/turbotail-0.2.ebuild b/sys-apps/turbotail/turbotail-0.2.ebuild
index 48a507f6790d..5c81b1d4d0f6 100644
--- a/sys-apps/turbotail/turbotail-0.2.ebuild
+++ b/sys-apps/turbotail/turbotail-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-apps/turbotail/turbotail-0.2.ebuild,v 1.1 2005/08/05 19:55:26 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/turbotail/turbotail-0.2.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.vanheusden.com/Linux/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/sys-apps/ucspi-proxy/ChangeLog b/sys-apps/ucspi-proxy/ChangeLog
index dc5eb7ac3559..7df12d7dc2f1 100644
--- a/sys-apps/ucspi-proxy/ChangeLog
+++ b/sys-apps/ucspi-proxy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ucspi-proxy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-proxy/ChangeLog,v 1.1 2003/08/11 09:46:58 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-proxy/ChangeLog,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ucspi-proxy-0.95.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> ucspi-proxy-0.95.ebuild:
+  bump to stable
 
 *ucspi-proxy-0.95 (11 Aug 2003)
 
diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index 0f4be8d4cf95..2aa6a47be501 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,2 +1,4 @@
-MD5 ab69dd6846d988c64fadee535c521ad4 ucspi-proxy-0.95.ebuild 648
+MD5 cfc247fa80951a0c63a505bd83880129 ucspi-proxy-0.95.ebuild 709
+MD5 5135823da700c79d7e227a0e1a6a3ca1 ChangeLog 620
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 949a21e84e0d5aa0adeccc0df2cf174a files/digest-ucspi-proxy-0.95 67
diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/ucspi-proxy/metadata.xml
+++ b/sys-apps/ucspi-proxy/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-apps/ucspi-proxy/ucspi-proxy-0.95.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.95.ebuild
index e24e27ead307..b500efd1d3a4 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.95.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-0.95.ebuild
@@ -1,18 +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-apps/ucspi-proxy/ucspi-proxy-0.95.ebuild,v 1.1 2003/08/11 09:46:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-proxy/ucspi-proxy-0.95.ebuild,v 1.1.1.1 2005/11/30 09:56:04 chriswhite Exp $
 
 DESCRIPTION="A proxy program that passes data back and forth between two connections set up by a UCSPI server and a UCSPI client."
 HOMEPAGE="http://untroubled.org/ucspi-proxy/"
 SRC_URI="http://untroubled.org/ucspi-proxy/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="sys-devel/gcc-config"
-RDEPEND="virtual/glibc"
-
-S=${WORKDIR}/${P}
+RDEPEND="virtual/libc"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
@@ -20,5 +18,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO 
+	dodoc ANNOUNCEMENT NEWS README TODO
 }
diff --git a/sys-apps/ucspi-ssl/ChangeLog b/sys-apps/ucspi-ssl/ChangeLog
index d0abdc7b114b..55f8eeba9012 100644
--- a/sys-apps/ucspi-ssl/ChangeLog
+++ b/sys-apps/ucspi-ssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ucspi-ssl
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.1 2004/01/04 00:29:11 aliz Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ucspi-ssl-0.50.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ucspi-ssl-0.50.ebuild:
+  Add inherit eutils
 
 *ucspi-ssl-0.50 (04 Jan 2004)
 
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 9425742f738d..6e17ee22bc4a 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,2 +1,4 @@
-MD5 0d7063c9efa756cef95e620398a967f3 ucspi-ssl-0.50.ebuild 954
+MD5 60daa93f671daae057fecdc70eb0ccb8 ucspi-ssl-0.50.ebuild 907
+MD5 5ae53d7768bc5aa88f46f191f03fe75b ChangeLog 593
 MD5 b96f687f81d5f2e53b52357bd20516ec files/digest-ucspi-ssl-0.50 65
+MD5 6e8ff4bc92ca237cdbf7946baacdda84 files/ucspi-ssl-0.50-errno.patch 238
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild
index 72421953fabb..c3a7454d696f 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild
@@ -1,13 +1,14 @@
-# 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-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild,v 1.1 2004/01/04 00:29:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.50.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="Command-line tools for building SSL client-server applications."
 HOMEPAGE="http://www.superscript.com/ucspi-ssl/intro.html"
 SRC_URI="http://www.superscript.com/ucspi-ssl/${P}.tar.gz"
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6g
 	sys-apps/ucspi-tcp"
 
@@ -36,5 +37,3 @@ src_install() {
 
 	dodoc CHANGES FILES README SYSDEPS TARGETS TODO UCSPI-SSL VERSION
 }
-
-
diff --git a/sys-apps/ucspi-tcp/ChangeLog b/sys-apps/ucspi-tcp/ChangeLog
index a407a4543af1..51f103396318 100644
--- a/sys-apps/ucspi-tcp/ChangeLog
+++ b/sys-apps/ucspi-tcp/ChangeLog
@@ -1,12 +1,167 @@
 # ChangeLog for sys-apps/ucspi-tcp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ChangeLog,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
+
+  19 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ucspi-tcp-0.88-r13.ebuild:
+  Moved the tcprules patch so it only gets applied when using IPv6. The
+  non-ipv6 version isn't affected by this bug.
+
+*ucspi-tcp-0.88-r13 (15 Oct 2005)
+
+  15 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/0.88-tcprules.patch, +ucspi-tcp-0.88-r13.ebuild:
+  Added patch from bug 90679 when having lines without a colon.
+
+  11 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ucspi-tcp-0.88-r12.ebuild:
+  Apply errno patch if ipv6 patch is not applied.
+
+*ucspi-tcp-0.88-r12 (09 Sep 2005)
+
+  09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ucspi-tcp-0.88-r12.ebuild:
+  Update to latest version of fefe's ipv6 patch, to fix Gentoo/FreeBSD.
+
+*ucspi-tcp-0.88-r11 (28 Aug 2005)
+
+  28 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/0.88-limits.patch, metadata.xml, +ucspi-tcp-0.88-r11.ebuild:
+  Added patch from bug 98726. Changed herd to qmail, added description to
+  metadata.
+
+  14 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch:
+  Bug #80071. rblsmtpd-ignore-on-RELAYCLIENT.patch.
+
+*ucspi-tcp-0.88-r10 (13 Feb 2005)
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +ucspi-tcp-0.88-r10.ebuild:
+  Bug #34983, finally a fix from upstream to deal with IPv4-in-IPv6 addresses!.
+
+  07 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ucspi-tcp-0.88-r9.ebuild:
+  Apply big endian patch only when using IPv6.
+
+*ucspi-tcp-0.88-r9 (06 Jan 2005)
+
+  06 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +ucspi-tcp-0.88-r9.ebuild:
+  Fixed bug 18892 which affected big endian systems.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  ucspi-tcp-0.88-r8.ebuild:
+  Stable on sparc
+
+  31 Aug 2004; Michael Hanselmann <hansmi@gentoo.org>
+  ucspi-tcp-0.88-r8.ebuild:
+  Added to ~macos.
+
+  29 Aug 2004; Tom Gall <tgall@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
+  stable on ppc64, bug #61744
+
+  29 Aug 2004; Mike Frysinger <vapier@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
+  Provide virtual/inetd #62032 by Sascha Silbe.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ucspi-tcp-0.88-r5.ebuild, ucspi-tcp-0.88-r6.ebuild,
+  ucspi-tcp-0.88-r7.ebuild, ucspi-tcp-0.88-r8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
+  Stable on alpha.
+
+  09 Apr 2004; Joshua Kinard <kumba@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
+  Marked stable on mips.
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org> ucspi-tcp-0.88-r5.ebuild,
+  ucspi-tcp-0.88-r8.ebuild:
+  added selinux policy to rdepend
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> ucspi-tcp-0.88-r5.ebuild,
+  ucspi-tcp-0.88-r6.ebuild, ucspi-tcp-0.88-r7.ebuild,
+  ucspi-tcp-0.88-r8.ebuild:
+  Added ~mips to KEYWORDS.
+
+  18 Feb 2004; Aron Griffis <agriffis@gentoo.org> ucspi-tcp-0.88-r5.ebuild,
+  ucspi-tcp-0.88-r6.ebuild, ucspi-tcp-0.88-r7.ebuild,
+  ucspi-tcp-0.88-r8.ebuild:
+  add ia64/~ia64 keywords
+
+*ucspi-tcp-0.88-r8 (20 Jan 2004)
+
+  20 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> ucspi-tcp-0.88-r8.ebuild:
+  Added support for SSL when using IPv6 via a new patch, thanks to Stephen
+  Olesen <slepp.netmonks.ca>, bug #32007.
+
+*ucspi-tcp-0.88-r7 (03 Sep 2003)
+
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Install manpages and add head -1 patch.
+
+*ucspi-tcp-0.88-r6 (12 Aug 2003)
+
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add head -1 patch.
+
+  12 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> ucspi-tcp-0.88-r6.ebuild:
+  Add support for newer RBL zones and custom error responses, also increase max
+  response size
+
+*ucspi-tcp-0.88-r5 (05 Mar 2003)
+
+  03 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add head -1 patch.
+
+  16 Mar 2003; Will Woods <wwoods@gentoo.org> ucspi-tcp-0.88-r5.ebuild:
+  Added alpha to KEYWORDS
+
+  05 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix glibc errno issue #16267.
+
+*ucspi-tcp-0.88-r4 (25 Sep 2002)
+
+  01 Jan 2002; Nick Hadaway <raker@gentoo.org> ucspi-tcp-0.88-r4.ebuild :
+  Marked stable.
+
+  31 Dec 2002; Nick Hadaway <raker@gentoo.org> ucspi-tcp-0.88-r4.ebuild :
+  Now using epatch. Put in logic so you can install either the ipv6
+  patch or the ssl patch with ipv6 taking preference.
+
+  25 Sep 2002; Nick Hadaway <raker@gentoo.org> ucspi-tcp-0.88-r4.ebuild, 
+  files/digest-ucspi-tcp-0.88-r4 :
+  New ipv6 patch.  It squashes the ssl patch though. :~| Masked.
+
+*ucspi-tcp-0.88-r3 (02 Sep 2002)
+
+  08 Oct 2002; Nick Hadaway <raker@gentoo.org> ucspi-tcp-0.88-r3.ebuild,
+  files/digest-ucspi-tcp-0.88-r3 :
+  Recreated digest file to hopefully resolve bug #8314 and add RDEPEND.
+
+  04 Sep 2002; Nick Hadaway <raker@gentoo.org> ucspi-tcp-0.88-r3.ebuild :
+  Updated SRC_URI stanza to support conditional URLs as suggested in bug
+  #7424.
+
+  02 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  ucspi-tcp-0.88-r3.ebuild, files/digest-ucspi-tcp-0.88-r3 :
+  Added a patch for ssl support in tcpserver.
+
+*ucspi-tcp-0.88-r2 (12 Jul 2002)
+
+  12 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+  added ipv6 patch if ipv6 in USE; thanks to Sascha Silbe for the suggestion
 
 *ucspi-tcp-0.88-r1 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> ucspi-tcp-0.88-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
+    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
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index e69de29bb2d1..141f03a48726 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -0,0 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5d439633e96c5f5a7837cd407a693490 ChangeLog 6015
+MD5 fb41d7c55db5124d7488a923e4223576 files/0.88-bigendian.patch 478
+MD5 0479a09fdd4ce855d35e36563cab4743 files/0.88-errno.patch 239
+MD5 b36e99b422384451ac68b3a9b31b7ed6 files/0.88-head-1.patch 1403
+MD5 a52d1d668b5486fde8f138eaab047e70 files/0.88-limits.patch 12356
+MD5 72b6cd8b1b829a6a6939255fdc0b76a3 files/0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch 462
+MD5 b260fe81e9593e965ccb539b0dcfc4bd files/0.88-tcprules.patch 463
+MD5 07405ee0d3385bc58a5cc3f2034de90a files/digest-ucspi-tcp-0.88-r10 350
+MD5 07405ee0d3385bc58a5cc3f2034de90a files/digest-ucspi-tcp-0.88-r11 350
+MD5 57161a76734c44c65d46f0f93826aaf3 files/digest-ucspi-tcp-0.88-r12 350
+MD5 280de8eb44681996de47516ea0413be0 files/digest-ucspi-tcp-0.88-r13 350
+MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r8 350
+MD5 9eab9910e2978160e33f6c4e9b227efa files/digest-ucspi-tcp-0.88-r9 350
+MD5 64eb2b26c9c0e5d6b4042fd36b74dbb8 files/tcprules-Makefile 168
+MD5 66ed278686866a3187b68d81fe47fa24 metadata.xml 592
+MD5 38badb1189a3476d5066e21ab764aef1 ucspi-tcp-0.88-r10.ebuild 2341
+MD5 e01f5cc6f4c8c36cde32a1f14dfe8ba0 ucspi-tcp-0.88-r11.ebuild 2427
+MD5 9b7edefc3244d63241311cb3b66b1a44 ucspi-tcp-0.88-r12.ebuild 2574
+MD5 372c88767590e7ba12d21e64908afccc ucspi-tcp-0.88-r13.ebuild 2623
+MD5 f28315c57485584788c9824481bc7603 ucspi-tcp-0.88-r8.ebuild 2148
+MD5 76034b124658a585b29a772acbf2b798 ucspi-tcp-0.88-r9.ebuild 2246
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWf/WgIKl8Uu19MoRAhnYAJ9ZZAPWHVQeipEeXIld0SGfEQu6GACfeC4q
+VsYXCmreHpjwG/kn4DRZjoQ=
+=Zc5X
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
index 807f2623b597..fb21c1db7aca 100644
--- a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r10
@@ -1,5 +1,5 @@
-MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
-MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
 MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
-MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
 MD5 2dfc47b1a142e1021a49c678dfbb7a03 ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
+MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
diff --git a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11 b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11
index 807f2623b597..fb21c1db7aca 100644
--- a/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11
+++ b/sys-apps/ucspi-tcp/files/digest-ucspi-tcp-0.88-r11
@@ -1,5 +1,5 @@
-MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
-MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
 MD5 554ec0eb60f619667efde3fb5325310d ucspi-rss.diff 1828
-MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
 MD5 2dfc47b1a142e1021a49c678dfbb7a03 ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 3212
+MD5 67de66745001ddb48563a1d4e92262c2 ucspi-tcp-0.88-ipv6.diff14.bz2 21917
+MD5 39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.tar.gz 53019
+MD5 10d5074c18d00e5c62c76ce69d7c975b ucspi-tcp-ssl-20020705.patch.gz 3084
diff --git a/sys-apps/ucspi-tcp/metadata.xml b/sys-apps/ucspi-tcp/metadata.xml
index f093d416cbb1..692f0c880548 100644
--- a/sys-apps/ucspi-tcp/metadata.xml
+++ b/sys-apps/ucspi-tcp/metadata.xml
@@ -1,7 +1,13 @@
- * 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>qmail</herd>
+	<longdescription>
+		ucspi-tcp is a replacement for inetd. It consists of tcpserver and
+		tcpclient. tcpserver can listen on sockets and start programs in an
+		inetd like fashion except that information like the IP address and
+		remote port are communicated via environment variables. tcpclient makes
+		a TCP connection and runs a program of your choice. It sets up the same
+		environment variables as tcpserver.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild
index 3c6415ca8211..f73010b04e72 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-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-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild,v 1.1 2005/02/14 06:13:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r10.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -47,9 +47,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-errno.patch
 	epatch ${DISTDIR}/ucspi-rss.diff
 	epatch ${FILESDIR}/${PV}-head-1.patch
+	epatch ${FILESDIR}/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
 
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	tc-export CC
+	echo "${CC} ${CFLAGS}" > conf-cc
+	echo "${CC} ${LDFLAGS}" > conf-ld
 	echo "/usr/" > conf-home
 
 	# allow larger responses
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r11.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r11.ebuild
index 9306e0f17825..bcf3acdd1657 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r11.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-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-apps/ucspi-tcp/ucspi-tcp-0.88-r11.ebuild,v 1.1 2005/08/28 12:40:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r11.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r12.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r12.ebuild
index f75ce9a43bd4..9999ccbfa357 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r12.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-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/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r12.ebuild,v 1.1 2005/09/09 11:19:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r12.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,6 +37,9 @@ src_unpack() {
 		epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6.${IPV6_PATCH}
 		# Fixes bug 18892
 		epatch ${FILESDIR}/${PV}-bigendian.patch
+	else
+		# This is already present in ipv6 patch
+		epatch ${FILESDIR}/${PV}-errno.patch
 	fi
 	if use ssl; then
 		# this is a merged thingy. Thanks to Stephen Olesen <slepp.netmonks.ca>
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild
index 140a027ec9fa..50664d503b71 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild
@@ -1,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-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild,v 1.1 2005/10/15 21:54:54 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r13.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,7 +19,7 @@ SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ssl ipv6 selinux doc"
 
 DEPEND="virtual/libc
@@ -37,6 +37,7 @@ src_unpack() {
 		epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6.${IPV6_PATCH}
 		# Fixes bug 18892
 		epatch ${FILESDIR}/${PV}-bigendian.patch
+		epatch ${FILESDIR}/${PV}-tcprules.patch
 	else
 		# This is already present in ipv6 patch
 		epatch ${FILESDIR}/${PV}-errno.patch
@@ -54,7 +55,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-head-1.patch
 	epatch ${FILESDIR}/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
 	epatch ${FILESDIR}/${PV}-limits.patch
-	epatch ${FILESDIR}/${PV}-tcprules.patch
 
 	tc-export CC
 	echo "${CC} ${CFLAGS}" > conf-cc
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
index 7eb9ca86b973..74b2576d99f8 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
@@ -1,24 +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/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild,v 1.1 2004/02/04 04:45:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild,v 1.1.1.1 2005/11/30 09:57:09 chriswhite Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
 SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
-		ipv6? ( http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff13.bz2 )
-		mirror://qmail/ucspi-rss.diff
-		ssl? (  http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20020705.patch.gz
-				http://www.netmonks.ca/gentoo/patches/ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2  )"
+	ipv6? ( http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff13.bz2 )
+	mirror://qmail/ucspi-rss.diff
+	ssl? ( http://www.nrg4u.com/qmail/ucspi-tcp-ssl-20020705.patch.gz
+		http://www.netmonks.ca/gentoo/patches/ucspi-tcp-0.88-ipv6-ssl-nm1.patch.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha"
-IUSE="ssl ipv6"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc s390 x86"
+IUSE="ssl ipv6 selinux"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ucspi-tcp )"
+PROVIDE="virtual/inetd"
 
 src_unpack() {
 	unpack ${A}
@@ -39,8 +42,8 @@ src_unpack() {
 	epatch ${DISTDIR}/ucspi-rss.diff
 	epatch ${FILESDIR}/${PV}-head-1.patch
 
-	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 	echo "/usr/" > conf-home
 
 	# allow larger responses
@@ -48,11 +51,11 @@ src_unpack() {
 }
 
 src_compile() {
-	pmake || die
+	emake || die
 }
 
 src_install() {
-	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
+	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd || die
 	doman *.[15]
 	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 	insinto /etc/tcprules.d/
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild
index 919a07c0c9a2..9814fb4a9eae 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-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/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild,v 1.1 2005/01/06 20:10:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r9.ebuild,v 1.1.1.1 2005/11/30 09:57:08 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,19 +15,23 @@ SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc s390 x86"
-IUSE="ssl ipv6 selinux"
+IUSE="ssl ipv6 selinux doc"
 
 DEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
 RDEPEND="${DEPEND}
+	doc? ( app-doc/ucspi-tcp-man )
 	selinux? ( sec-policy/selinux-ucspi-tcp )"
 PROVIDE="virtual/inetd"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	if use ipv6; then
 		epatch ${WORKDIR}/ucspi-tcp-0.88-ipv6.diff13
+		# Fixes bug 18892
+		epatch ${FILESDIR}/${PV}-bigendian.patch
 	fi
 	if use ssl; then
 		# this is a merged thingy. Thanks to Stephen Olesen <slepp.netmonks.ca>
@@ -41,8 +45,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-errno.patch
 	epatch ${DISTDIR}/ucspi-rss.diff
 	epatch ${FILESDIR}/${PV}-head-1.patch
-	# Fixes bug 18892
-	epatch ${FILESDIR}/${PV}-bigendian.patch
 
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
diff --git a/sys-apps/ucspi-unix/ChangeLog b/sys-apps/ucspi-unix/ChangeLog
index fe96a54dbbab..be1599850acf 100644
--- a/sys-apps/ucspi-unix/ChangeLog
+++ b/sys-apps/ucspi-unix/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for sys-apps/ucspi-unix
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ChangeLog,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> ucspi-unix-0.36-r1.ebuild:
+  Added to ~ppc.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> ucspi-unix-0.36-r1.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ucspi-unix-0.36-r1.ebuild,
+  ucspi-unix-0.36.ebuild:
+  Add inherit eutils
+
+*ucspi-unix-0.36-r1 (07 Jan 2004)
+
+  07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> ucspi-unix-0.34.ebuild,
+  ucspi-unix-0.36-r1.ebuild, ucspi-unix-0.36.ebuild:
+  fix copyright headers and correct accept keywords tree stuff
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> ucspi-unix-0.34.ebuild,
+  ucspi-unix-0.36.ebuild, files/ucspi-unix-gentoo-head.patch:
+  Added ~sparc keyword and a patch for 0.36 to fix the change in head syntax.
+
+*ucspi-unix-0.36 (23 Apr 2003)
+
+  23 Apr 2003; Seth Chandler <sethbc@gentoo.org>; ucspi-unix-0.36.ebuild:
+  version bump
+
+  13 Mar 2002; Thilo Bangert <bangert@gentoo.org> ucspi-unix-0.34.ebuild:
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> ucspi-unix-0.34.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+  
+  SRC_URI fixor
+
 
 *ucspi-unix-0.34 (13 Mar 2002)
 
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index b5e9c0217012..3ac653d0648b 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -1,5 +1,15 @@
-MD5 1b2e8e921bd2620d7a7b2f6c9a027a00 ucspi-unix-0.34.ebuild 602
-MD5 3d55806525f8e403cdbfc5918b7c2297 ucspi-unix-0.36.ebuild 867
-MD5 f22adcd4ee4d88ad21188d66293abd41 ChangeLog 534
-MD5 e0fc8a98fedb5d900457d5aed2bed98b files/digest-ucspi-unix-0.34 66
-MD5 c396752e0797bbc620084ed823f71f3d files/digest-ucspi-unix-0.36 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e8e3b247e2bc6866dabced26a067e5b2 ChangeLog 1395
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e02067feda07429a4d5041017b9561a9 ucspi-unix-0.36-r1.ebuild 955
+MD5 d394904cc3e745742643933bc090d382 files/ucspi-unix-gentoo-head.patch 1097
+MD5 c396752e0797bbc620084ed823f71f3d files/digest-ucspi-unix-0.36-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBiti5HTu7gpaalycRAqjSAKC8o9+we8pnv722tabeqRaNV48SxACg1qde
+TEeVlUCKn1d4PfksmYgTpFQ=
+=cNVx
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/ucspi-unix/metadata.xml b/sys-apps/ucspi-unix/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/ucspi-unix/metadata.xml
+++ b/sys-apps/ucspi-unix/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-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
index 2e05291670c2..713696b3b8fc 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
@@ -1,35 +1,34 @@
-# 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-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.1 2004/01/07 22:14:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:36 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A ucspi implementation for unix sockets."
-SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
+inherit eutils toolchain-funcs
 
-DEPEND=">=dev-libs/bglibs-1.009-r1"
+DESCRIPTION="A ucspi implementation for unix sockets"
 HOMEPAGE="http://untroubled.org/ucspi-unix/"
-KEYWORDS="x86 amd64 ~sparc"
-SLOT="0"
+SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.009-r1"
 
 src_unpack() {
 	unpack ${A}
-
-	# Fix for head syntax in Makefile
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gentoo-head.patch
 }
 
 src_compile() {
-	echo "${CC} ${CFLAGS} -I/usr/lib/bglibs/include" > conf-cc
-	echo "${CC} -s -L/usr/lib/bglibs/lib" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS} -I${ROOT}/usr/lib/bglibs/include" > conf-cc
+	echo "$(tc-getCC) -s -L${ROOT}/usr/lib/bglibs/lib" > conf-ld
 	make || die  #don't use emake b/c of jobserver
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe unixserver unixclient unixcat
+src_install() {
+	dobin unixserver unixclient unixcat || die
 	doman unixserver.1 unixclient.1
-
 	dodoc ANNOUNCEMENT ChangeLog NEWS PROTOCOL README TODO
 }
diff --git a/sys-apps/uhinv/ChangeLog b/sys-apps/uhinv/ChangeLog
index b5fd809d133b..483e0e0bd2ad 100644
--- a/sys-apps/uhinv/ChangeLog
+++ b/sys-apps/uhinv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/uhinv
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/uhinv/ChangeLog,v 1.1 2004/12/22 17:12:43 pvdabeel Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/uhinv/ChangeLog,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> uhinv-0.4.ebuild:
+  Stable on ppc64
+
+  31 Dec 2004; Markus Rothe <corsair@gentoo.org> uhinv-0.4.ebuild:
+  Added ~ppc64 to KEYWORDS
 
 * uhinv-0.4 (22 Dec 2004)
 
diff --git a/sys-apps/uhinv/Manifest b/sys-apps/uhinv/Manifest
index 283e980d1dcb..11531dda543b 100644
--- a/sys-apps/uhinv/Manifest
+++ b/sys-apps/uhinv/Manifest
@@ -1,3 +1,4 @@
-MD5 2a182d77417e1642dc376f9a02a321f2 uhinv-0.4.ebuild 542
-MD5 174bd2740746a24b14ccc169ca3ea275 ChangeLog 328
+MD5 52302a52aba04cd0b1a8efda38bfbe37 ChangeLog 596
+MD5 f771ec5e8f277ad4d47d4339d412ba85 metadata.xml 257
+MD5 9141ed262e8f7e1cafdbf09d148d6e74 uhinv-0.4.ebuild 546
 MD5 0ca11047f074725880969bed9ca68f40 files/digest-uhinv-0.4 61
diff --git a/sys-apps/uhinv/uhinv-0.4.ebuild b/sys-apps/uhinv/uhinv-0.4.ebuild
index a8618372b692..d5f909233693 100644
--- a/sys-apps/uhinv/uhinv-0.4.ebuild
+++ b/sys-apps/uhinv/uhinv-0.4.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/sys-apps/uhinv/uhinv-0.4.ebuild,v 1.1 2004/12/22 17:12:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/uhinv/uhinv-0.4.ebuild,v 1.1.1.1 2005/11/30 09:56:42 chriswhite Exp $
 
 DESCRIPTION="Universal Hardware Inventory Tool, uhinv displays operating system and hardware info"
 HOMEPAGE="http://developer.berlios.de/projects/uhinv/"
 SRC_URI="http://download.berlios.de/uhinv/${P}.tar.gz"
 
-KEYWORDS="x86 sparc mips hppa ppc amd64 arm"
+KEYWORDS="x86 sparc mips hppa ppc amd64 arm ppc64"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/usbd/ChangeLog b/sys-apps/usbd/ChangeLog
index d94dcb848bba..71439a12087b 100644
--- a/sys-apps/usbd/ChangeLog
+++ b/sys-apps/usbd/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for sys-apps/usbd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbd/ChangeLog,v 1.1 2003/01/16 07:27:45 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/usbd:
+  Dont pass the full path to killall to make busybox happy #102818 by Natanael
+  Copa.
+
+  19 Mar 2005; <plasmaroo@gentoo.org> usbd-0.1.ebuild,
+  +files/usbd-gcc-3.4.patch:
+  Fix #78402 compile issue.
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> usbd-0.1.ebuild:
+  Masked usbd-0.1.ebuild stable for ppc
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/usbd:
+  Fixed CVS Header.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> usbd-0.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> usbd-0.1.ebuild:
+  Added to ~ppc.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> usbd-0.1.ebuild:
+  Add die following econf for bug 48950
 
 *usbd-0.1 (15 Jan 2003)
 
diff --git a/sys-apps/usbd/Manifest b/sys-apps/usbd/Manifest
index e69de29bb2d1..30df356350d4 100644
--- a/sys-apps/usbd/Manifest
+++ b/sys-apps/usbd/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 08d7aaf9884cc15a93fcd56e122a3883 usbd-0.1.ebuild 950
+MD5 5816bea86cde94d632d4085f6fa9b201 ChangeLog 1165
+MD5 44582f35ae2f6b3765620c92aabba729 files/digest-usbd-0.1 60
+MD5 cd512f356018c4f3df27a9476167eba0 files/usbd-gcc-3.4.patch 238
+MD5 2b3a69a1ad06df68015258e6f1036f00 files/usbd 388
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDA9V9gIKl8Uu19MoRAvKhAJ406bN2slcUoF9UFTmLr7IBHjEb7QCeOZwM
+yktzTQn2rv7JtGv14CW6gkk=
+=rMa5
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/usbd/files/usbd b/sys-apps/usbd/files/usbd
index 2b402040edca..39aa80193f4c 100644
--- a/sys-apps/usbd/files/usbd
+++ b/sys-apps/usbd/files/usbd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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-apps/usbd/files/usbd,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
 
 depend() {
 	need localmount
@@ -15,6 +15,6 @@ start() {
 
 stop() {
 	ebegin "Stopping usb daemon"
-	killall /usr/sbin/usbd
+	killall usbd
 	eend $?
 }
diff --git a/sys-apps/usbd/metadata.xml b/sys-apps/usbd/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/usbd/metadata.xml
+++ b/sys-apps/usbd/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-apps/usbd/usbd-0.1.ebuild b/sys-apps/usbd/usbd-0.1.ebuild
index 3b49a38c4000..534b93fdefb3 100644
--- a/sys-apps/usbd/usbd-0.1.ebuild
+++ b/sys-apps/usbd/usbd-0.1.ebuild
@@ -1,20 +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-apps/usbd/usbd-0.1.ebuild,v 1.1 2003/01/16 07:27:45 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbd/usbd-0.1.ebuild,v 1.1.1.1 2005/11/30 09:56:57 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="USB Daemon"
 HOMEPAGE="http://usb.cs.tum.edu"
 SRC_URI="http://usb.cs.tum.edu/download/usbd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc"
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/usbutils-0.11"
-S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/usbd-gcc-3.4.patch || die 'Failed to apply GCC 3.4 patch!'
+}
 
 src_compile() {
-	econf --prefix=/usr --sysconfdir=/etc/usbd
+	econf --prefix=/usr --sysconfdir=/etc/usbd || die "econf failed"
 	mv Makefile Makefile.orig
 	sed s/example1/''/ Makefile.orig > Makefile
 	emake || die
diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 41ee45aea647..155e607c892a 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,9 +1,138 @@
 # ChangeLog for sys-apps/usbutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.1 2002/02/25 01:17:01 blocke Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
+
+*usbutils-0.71 (12 Jul 2005)
+
+  12 Jul 2005; Mike Frysinger <vapier@gentoo.org> +usbutils-0.71.ebuild:
+  Version bump #80268 by Keri Harris and Douglas Russell.
+
+*usbutils-0.11-r6 (08 May 2005)
+
+  08 May 2005; Alastair Tse <liquidx@gentoo.org> -usbutils-0.11-r3.ebuild,
+  -usbutils-0.11-r4.ebuild, +usbutils-0.11-r6.ebuild:
+  version bump. fix multilib issues (#90777). updated usb.ids to 20050408
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> usbutils-0.11-r5.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> usbutils-0.11-r5.ebuild:
+  stable on amd64
+
+  14 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> usbutils-0.11-r5.ebuild:
+  Stable on sparc
+
+  12 Mar 2005; Aron Griffis <agriffis@gentoo.org> usbutils-0.11-r5.ebuild:
+  Stable on alpha, ia64, x86
+
+  20 Nov 2004; Daniel Black <dragonheart@gentoo.org> usbutils-0.11-r5.ebuild:
+  ppc keyword
+
+  11 Nov 2004; Joshua Kinard <kumba@gentoo.org> usbutils-0.11-r5.ebuild:
+  Marked stable on mips.
+
+*usbutils-0.11-r5 (09 Oct 2004)
+
+  09 Oct 2004; Doug Goldstein <cardoe@gentoo.org>
+  +files/usbutils-0.11-fix-usb-ids-man-page-ref.patch,
+  +usbutils-0.11-r5.ebuild:
+  path fixing bug #62786
+
+*usbutils-0.11-r4 (22 Sep 2004)
+
+  22 Sep 2004; Alastair Tse <liquidx@gentoo.org> +usbutils-0.11-r4.ebuild:
+  new sanitised usb.ids (#59411)
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  usbutils-0.11-r1.ebuild, usbutils-0.11.ebuild:
+  Masked usbutils-0.11.ebuild stable for ppc
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  usbutils-0.11-r1.ebuild:
+  Masked usbutils-0.11-r1.ebuild stable for ppc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  usbutils-0.11-r1.ebuild, usbutils-0.11-r3.ebuild, usbutils-0.11.ebuild,
+  usbutils-0.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  15 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
+  +files/0.11/lsusb-endian.patch, usbutils-0.11-r3.ebuild:
+  Patched a big-endian-issue. See bug 43565.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> usbutils-0.11-r3.ebuild:
+  Add inherit eutils
+
+  22 Mar 2004; Joshua Kinard <kumba@gentoo.org> usbutils-0.11-r3.ebuild,
+  usbutils-0.11.ebuild, usbutils-0.9.ebuild:
+  Added ~mips to KEYWORDS.
+
+  05 Mar 2004; Tom Gall <tgall@gentoo.org> usbutils-0.11-r3.ebuild:
+  stable on ppc64 + slight fix to take into account 2.6 kernel 
+  header madness
+
+  18 Feb 2004; Aron Griffis <agriffis@gentoo.org> usbutils-0.11-r3.ebuild:
+  stable on alpha and ia64
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> usbutils-0.11-r3.ebuild:
+  Marked ppc
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> usbutils-0.11-r3.ebuild:
+  Marked stable on hppa.
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> usbutils-0.11-r3.ebuild:
+  mark stable on amd64
+
+  17 Nov 2003; Jason Wever <weeve@gentoo.org> usbutils-0.11-r3.ebuild:
+  Marked stable on sparc.
+
+  24 Sep 2003; Hanno Boeck <hanno@gentoo.org> usbutils-0.11-r3.ebuild:
+  Move to x86 stable.
+
+*usbutils-0.11-r3 (07 Sep 2003)
+
+  07 Sep 2003; Alastair Tse <liquidx@gentoo.org> usbutils-0.11-r3.ebuild:
+  remove dynamic fetching of usb.ids and replace it with a versioned copy on
+  gentoo mirrors.
+
+*usbutils-0.11-r2 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> usbutils-0.11-r2.ebuild:
+  remove libusb* from usbutils. this is provided by dev-libs/libusb which is
+  actively maintained. no other distros include libusb* from usbutils (#25571)
+
+  07 Aug 2003; Tavis Ormandy <taviso@gentoo.org> usbutils-0.11-r1.ebuild:
+  stable on alpha
+
+  18 Jul 2003; Olivier Crete <tester@gentoo.org> usbutils-0.11-r1.ebuild:
+  Update gnuconfig on amd64 too
+
+*usbutils-0.11-r1 (04 Jun 2003)
+
+  28 Jul 2003; Guy Martin <gmsoft@gentoo.org> usbutils-0.11-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  04 Jun 2003; Hanno Boeck <hanno@gentoo.org> usbutils-0.11-r1.ebuild:
+  Changed ebuild to download most current usb.ids.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*usbutils-0.11 (02 Nov 2002)
+
+  25 Mar 2003; Guy Martin <gmsoft@gentoo.org> usbutils-0.11.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  02 Nov 2002; Hanno Boeck <hanno@gentoo.org> usbutils-0.11.ebuild :
+  New version.
 
 *usbutils-0.9 (24 Feb 2002)
 
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (ppc)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> usbutils-0.9.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   24 Feb 2002; Bruce A. Locke <blocke@gentoo.org> usbutils-0.9.ebuild :
 
   Ebuild contributed by Scott Worley (folokai@earthlink.net)
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index e69de29bb2d1..515768034e49 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2f96f4804743b4736dc41cd054df0d12 usbutils-0.71.ebuild 1215
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3bf5ce706718e4c6b91aa5399624c849 usbutils-0.11-r6.ebuild 1486
+MD5 126fca63244365009de4c30b6b0c41d2 usbutils-0.11-r5.ebuild 1440
+MD5 9ce5195f1a313270008f53c42b740a88 ChangeLog 4683
+MD5 ab0f2b4ad3bb0eaf089d8538ec6586de files/digest-usbutils-0.11-r6 128
+MD5 f703ade59119743d4225df9fb4623aa8 files/digest-usbutils-0.11-r5 128
+MD5 85ab89963a7fd11f8611547fb202cd72 files/digest-usbutils-0.71 65
+MD5 d20a32b2ea8220b81490216ee51cba82 files/usbutils-0.11-fix-usb-ids-man-page-ref.patch 384
+MD5 02a749d768d2c60df972e04643b4a071 files/0.11/lsusb-endian.patch 1834
+MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0z0qgIKl8Uu19MoRAo7vAJ0frpmBhOlMNJODp0NAeUXSDL22NQCfSxxh
+QD68C52RjVe/u/HxymVKWn0=
+=D3xJ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/usbutils/metadata.xml b/sys-apps/usbutils/metadata.xml
index 84eb41a5d2e8..96a2d586367d 100644
--- a/sys-apps/usbutils/metadata.xml
+++ b/sys-apps/usbutils/metadata.xml
@@ -1,7 +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>
-<maintainer><email>liquidx@gentoo.org</email></maintainer>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/usbutils/usbutils-0.11-r5.ebuild b/sys-apps/usbutils/usbutils-0.11-r5.ebuild
index d14cb3837597..2b199a486b20 100644
--- a/sys-apps/usbutils/usbutils-0.11-r5.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11-r5.ebuild
@@ -1,52 +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/sys-apps/usbutils/usbutils-0.11-r5.ebuild,v 1.1 2004/10/09 08:42:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r5.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
-inherit eutils gnuconfig
+inherit eutils multilib
 
 # note: update these regularly from http://www.linux-usb.org/usb.ids
 #       and upload to gentoo mirrors - <liquidx@gentoo.org>
 USB_IDS_VER="20040902"
 
 DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="http://usb.cs.tum.edu/"
 SRC_URI="http://usb.cs.tum.edu/download/usbutils/${P}.tar.gz
 	mirror://gentoo/usb.ids-${USB_IDS_VER}.gz"
-HOMEPAGE="http://usb.cs.tum.edu/"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~ia64 ~ppc64 ~mips"
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	gnuconfig_update
+	cd "${S}"
 
 	# replace usb.ids with an updated version
-	mv ${WORKDIR}/usb.ids-${USB_IDS_VER} ${S}/usb.ids || die "unable to replace usb.ids"
+	mv "${WORKDIR}"/usb.ids-${USB_IDS_VER} ${S}/usb.ids || die "unable to replace usb.ids"
 
-	use ppc64 && ( cd ${S}; epatch ${FILESDIR}/0.11/ppc64-usbutils-kheaderfix.patch )
+	use ppc64 && epatch ${FILESDIR}/0.11/ppc64-usbutils-kheaderfix.patch
 
 	# Fix endian-issues
-	( cd "${S}" && epatch "${FILESDIR}/0.11/lsusb-endian.patch" )
+	epatch "${FILESDIR}/0.11/lsusb-endian.patch"
 
-	epatch ${FILESDIR}/usbutils-0.11-fix-usb-ids-man-page-ref.patch	#bug #62786
+	epatch "${FILESDIR}"/usbutils-0.11-fix-usb-ids-man-page-ref.patch #62786
 }
 
 src_compile() {
 	# put usb.ids in same place as pci.ids (/usr/share/misc)
 	econf \
-		--datadir=/usr/share/misc || die "./configure failed"
+		--datadir=/usr/share/misc \
+		|| die "./configure failed"
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	# we don't need libusb.* from usbutils because it conflicts
 	# with dev-libs/libusb
-	rm -rf ${D}/usr/lib
-	rm -rf ${D}/usr/include
+	rm -r "${D}"/usr/$(get_libdir)
+	rm -r "${D}"/usr/include
 }
diff --git a/sys-apps/usbutils/usbutils-0.11-r6.ebuild b/sys-apps/usbutils/usbutils-0.11-r6.ebuild
index ec7986e7a0ec..d66ed8a701ea 100644
--- a/sys-apps/usbutils/usbutils-0.11-r6.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11-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-apps/usbutils/usbutils-0.11-r6.ebuild,v 1.1 2005/05/09 11:09:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r6.ebuild,v 1.1.1.1 2005/11/30 09:56:44 chriswhite Exp $
 
 inherit eutils gnuconfig
 
diff --git a/sys-apps/usbutils/usbutils-0.71.ebuild b/sys-apps/usbutils/usbutils-0.71.ebuild
index d1819152f08c..ca6331de0d7e 100644
--- a/sys-apps/usbutils/usbutils-0.71.ebuild
+++ b/sys-apps/usbutils/usbutils-0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.71.ebuild,v 1.1 2005/07/12 03:45:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.71.ebuild,v 1.1.1.1 2005/11/30 09:56:45 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/usermode-utilities/ChangeLog b/sys-apps/usermode-utilities/ChangeLog
index 51a376299847..abc201e38ce2 100644
--- a/sys-apps/usermode-utilities/ChangeLog
+++ b/sys-apps/usermode-utilities/ChangeLog
@@ -1,36 +1,101 @@
-# ChangeLog for dev-util/usermode
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.1 2002/10/10 10:10:57 tantive Exp $
+# ChangeLog for sys-apps/usermode-utilities
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/ChangeLog,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
+  13 Apr 2005; John Mylchreest <johnm@gentoo.org>
+  +files/20040406-CAN-2004-1295.patch:
+  missing patch!
 
-*usermode-utilities-* (10 Oct 2002)
+  13 Apr 2005; John Mylchreest <johnm@gentoo.org> :
+  fixing net_slip vuln. #74482
 
-  10 Oct 2002; Michael Imhof <tantive@gentoo.org>
-  Moved dev-util/usermode to sys-apps/usermode-utilities
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  usermode-utilities-20020906.ebuild, usermode-utilities-20030118.ebuild,
+  usermode-utilities-20030120.ebuild, usermode-utilities-20030122.ebuild,
+  usermode-utilities-20030202.ebuild, usermode-utilities-20030205-r1.ebuild,
+  usermode-utilities-20030205.ebuild, usermode-utilities-20030903.ebuild,
+  usermode-utilities-20040114.ebuild, usermode-utilities-20040406.ebuild:
+  virtual/glibc -> virtual/libc
 
-*usermode-20020906 (08 Oct 2002)
+*usermode-utilities-20040406 (30 Apr 2004)
 
-  08 Oct 2002; Michael Imhof <tantive@gentoo.org>
-  Version bump thanks to sasquach
-  
-*usermode-20020821 (08 Oct 2002)
+  30 Apr 2004; Michael Imhof <tantive@gentoo.org> usermode-utilities-20040406.ebuild:
+  Version bumped. Closes #47470.
 
-  08 Oct 2002; Michael Imhof <tantive@gentoo.org>
-  Version bump thanks to sasquach
+  07 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  usermode-utilities-20020906.ebuild, usermode-utilities-20030118.ebuild,
+  usermode-utilities-20030120.ebuild, usermode-utilities-20030122.ebuild,
+  usermode-utilities-20030202.ebuild, usermode-utilities-20030205-r1.ebuild,
+  usermode-utilities-20030205.ebuild, usermode-utilities-20030903.ebuild,
+  usermode-utilities-20040114.ebuild:
+  -sparc all, um linux doesn't work on sparc yet
 
-*usermode-20020729 (08 Oct 2002)
+*usermode-utilities-20040114 (28 Jan 2004)
 
-  08 Oct 2002; Michael Imhof <tantive@gentoo.org>
-  Version bump thanks to sasquach
+  28 Jan 2004; Michal Januszewski <spock@gentoo.org>
+  usermode-utilities-20020906.ebuild, usermode-utilities-20030118.ebuild,
+  usermode-utilities-20030120.ebuild, usermode-utilities-20030122.ebuild,
+  usermode-utilities-20030202.ebuild, usermode-utilities-20030205-r1.ebuild,
+  usermode-utilities-20030205.ebuild, usermode-utilities-20030903.ebuild,
+  usermode-utilities-20040114.ebuild:
+  Version bump, fixed headers in all ebuilds.
+
+*usermode-utilities-20030903 (22 Sep 2003)
+
+  22 Sep 2003; Michael Imhof <tantive@gentoo.org>
+  Version bumped. Should close #28693.
+
+*usermode-utilities-20030205-r1 (12 Mar 2003)
+
+  12 Mar 2003; Michael Imhof <tantive@gentoo.org>
+  Unmasked
+
+  12 Mar 2003; Michael Imhof <tantive@gentoo.org>
+  Added -DTUNTAP to emake. Should close #16384.
+
+*usermode-utilities-20030205 (02 Mar 2003)
+
+  02 Mar 2003; Michael Imhof <tantive@gentoo.org>
+  Version bumped. Cleaned out old ebuilds.
 
-*usermode-20020718 (23 Jul 2002)
+*usermode-utilities-20030202 (02 Mar 2003)
 
-  23 Jul 2002; Seemant Kulleen <seemant@gentoo.org> usermode-20020718.ebuild :
-  Version bump thanks to sasquach in #gentoo
+  02 Mar 2003; Michael Imhof <tantive@gentoo.org>
+  Version bumped.
 
-*usermode-20020415 (27 Apr 2002)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 
-  27 Apr 2002; Bruce A. Locke <blocke@shivan.org> usermode-20020415.ebuild:
+*usermode-utilities-20030122 (27 Jan 2003)
 
-  Bumped to new version and quick change to ebuild to make it more version
-  independent.
+  27 Jan 2003; Michael Imhof <tantive@gentoo.org>
+  Version bumped.
+
+*usermode-utilities-20030120 (27 Jan 2003)
+
+  27 Jan 2003; Michael Imhof <tantive@gentoo.org>
+  Version bumped.
+
+*usermode-utilities-20030118 (27 Jan 2003)
+
+  27 Jan 2003; Michael Imhof <tantive@gentoo.org>
+  Version bumped.
+ 
+*usermode-utilities-20021103 (06 Nov 2002)
+
+  06 Nov 2002; Michael Imhof <tantive@gentoo.org>
+  Version bumped.
+
+*usermode-utilities-20021102 (03 Nov 2002)
+
+  03 Nov 2002; Michael Imhof <tantive@gentoo.org>
+  Version bumped.
+
+*usermode-utilities-* (10 Oct 2002)
+
+  10 Oct 2002; Michael Imhof <tantive@gentoo.org>
+  Moved dev-util/usermode to sys-apps/usermode-utilities
+
+*usermode-utilities-20020906 (08 Oct 2002)
+
+  08 Oct 2002; Michael Imhof <tantive@gentoo.org>
+  Version bump thanks to sasquach
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
index e69de29bb2d1..268c5071f887 100644
--- a/sys-apps/usermode-utilities/Manifest
+++ b/sys-apps/usermode-utilities/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ae3e4ac36da680421c53e9546a39c62 usermode-utilities-20040406-r1.ebuild 808
+MD5 c28a0f61ed79ffaf2c6570ddcab8b568 ChangeLog 3479
+MD5 f072be5f18ac238e1d79313d5bbaa5b0 files/20040406-CAN-2004-1295.patch 668
+MD5 2782a27c43120892c13ad8cd39ced876 files/digest-usermode-utilities-20040406-r1 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7oZOgIKl8Uu19MoRAna9AKCAkcEXHnv5tYhSpDgmjkQjKVenxwCfXfyh
+W+AnWQpPgZO1NkNRTDwA76c=
+=3a7q
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild
index 714ee98060d9..eb3a38a9c556 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild
@@ -1,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-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild,v 1.1 2005/04/13 15:07:40 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode-utilities/usermode-utilities-20040406-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:46 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/utempter/ChangeLog b/sys-apps/utempter/ChangeLog
index ebdeabc6875d..66ffe79fbe4c 100644
--- a/sys-apps/utempter/ChangeLog
+++ b/sys-apps/utempter/ChangeLog
@@ -1,9 +1,150 @@
 # ChangeLog for sys-apps/utempter
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v 1.1 2002/12/03 13:30:54 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/ChangeLog,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
+
+  16 Sep 2005; Aron Griffis <agriffis@gentoo.org> utempter-0.5.5.6.ebuild:
+  Mark 0.5.5.6 stable on alpha
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> utempter-0.5.5.6.ebuild:
+  Stable on ppc64
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  utempter-0.5.5.6.ebuild:
+  ppc stable
+
+  28 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  utempter-0.5.5.6.ebuild:
+  Stable on sparc
+
+  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org> utempter-0.5.5.6.ebuild:
+  clean up src_uri and keyword to x86 and amd64
+
+  14 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  utempter-0.5.5.5-r1.ebuild:
+  blocking both virtuals against each other for now -- warrants closer
+  attention though
+
+  13 May 2005; Seemant Kulleen <seemant@gentoo.org>
+  utempter-0.5.5.5-r1.ebuild, utempter-0.5.5.6.ebuild:
+  this will now provide virtual/utempter as well as sys-libs/libutempter
+
+  12 May 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Stick Seemant in as primary maintainer.
+
+*utempter-0.5.5.6 (15 Apr 2005)
+
+  15 Apr 2005; Seemant Kulleen <seemant@gentoo.org>
+  +files/utempter-0.5.5.6-no_utmpx.patch,
+  +files/utempter-0.5.5.6-soname-makefile-fix.patch,
+  +utempter-0.5.5.6.ebuild:
+  version bump, that's allegedly compilable with gcc-4. Also, this adds a
+  patch so that utempter can be compiled against uclibc. Patch provided by
+  Peter S. Mazinger <ps.m@gmx.net> in bug #69470 by Daniel Black
+  <dragonheart@gentoo.org>
+
+  15 Apr 2005; Seemant Kulleen <seemant@gentoo.org>
+  utempter-0.5.5.5-r1.ebuild:
+  description fix thanks to: Andreas Kling <keso@impul.se> in bug #82009
+
+  31 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  utempter-0.5.5.5-r1.ebuild:
+  Fixed BUG #87283 (multilib-strict).
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*utempter-0.5.5.5-r1 (17 Dec 2004)
+
+  17 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/utempter-0.5.3.2-soname-makefile-fix.patch,
+  -files/utempter-0.5.5.4-soname-makefile-fix.patch,
+  -utempter-0.5.5.4.ebuild, +utempter-0.5.5.5-r1.ebuild,
+  -utempter-0.5.5.5.ebuild:
+  Revision bump for security reasons. Set utempter to sgid utmp instead of
+  suid root. Use non-lazy bindings. Removed old ebuild.
+
+  24 Jul 2004; Stephen P. Becker <geoman@gentoo.org> utempter-0.5.5.5.ebuild:
+  Stable on mips.
+
+  16 Jul 2004; Tom Gall <tgall@gentoo.org> utempter-0.5.5.5.ebuild:
+  stable on ppc64
+
+*utempter-0.5.5.5 (12 Jul 2004)
+
+  12 Jul 2004; Seemant Kulleen <seemant@gentoo.org> :
+  version bump to the rebuilded src.rpm -- no feature additions or any other
+  changes. Also, refer the SRC_URI to gentoo mirrors instead. Should close bug
+  #51185 by Joe Gallo <jsg8pitt@yahoo.com>
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  utempter-0.5.5.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> utempter-0.5.5.4.ebuild:
+  stable on ia64
+
+  14 Jun 2004; Tom Gall <tgall@gentoo.org> utempter-0.5.5.4.ebuild:
+  marking ~ppc64 for initial x support bug #53763
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> utempter-0.5.5.4.ebuild:
+  Stable on alpha.
+
+  16 May 2004; Ferris McCormick <fmccor@gentoo.org> utempter-0.5.5.4.ebuild:
+  Marked stable for sparc.
+
+  11 May 2004; Seemant Kulleen <seemant@gentoo.org> -utempter-0.5.2.ebuild,
+  -utempter-0.5.3.2-r1.ebuild, utempter-0.5.5.4.ebuild:
+  stable on x86, and removed cruft versions
+
+  10 May 2004; Jon Portnoy <avenj@gentoo.org> utempter-0.5.5.4.ebuild :
+  Stable on AMD64.
+
+  05 May 2004; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Add xfree herd to metadata.
+
+*utempter-0.5.5.4 (03 May 2004)
+
+  03 May 2004; Seemant Kulleen <seemant@gentoo.org>
+  +files/utempter-0.5.5.4-soname-makefile-fix.patch, +utempter-0.5.5.4.ebuild:
+  version bump, for security fix in bug #49536 by gen2daniel <gen2daniel@gmx.net>
+
+  18 Apr 2004; Travis Tilley <lv@gentoo.org> utempter-0.5.3.2-r1.ebuild:
+  marking stable on amd64 as a needed dependency for xorg-x11. see bug 48261 for
+  more details.
+
+  09 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; utempter-0.5.2.ebuild:
+  Fix incorrect x86, sparc and amd64 keywords to ~arch.
+
+  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  utempter-0.5.3.2-r1.ebuild,
+  files/utempter-0.5.3.2-soname-makefile-fix.patch:
+  Add patch to ensure all versioned shared library symlinks are created.
+
+*utempter-0.5.3.2-r1 (13 Mar 2004)
+
+  13 Mar 2004; Seemant Kulleen <seemant@gentoo.org>
+  utempter-0.5.3.2-r1.ebuild, utempter-0.5.3.2.ebuild:
+  FIx to install libs in /usr/lib and not /. Thanks to: Bob Bell <bbell@hp.com>
+  in bug #40985
+
+*utempter-0.5.3.2 (17 Jan 2004)
+
+  17 Jan 2004; Seemant Kulleen <seemant@gentoo.org> utempter-0.5.3.2.ebuild :
+
+  Using the rpm eclass for this version.
+
+  19 Oct 2003; Sven Blumenstein <bazik@gentoo.org> utempter-0.5.2.ebuild:
+  Added sparc keyword.
 
 *utempter-0.5.2 (03 Dec 2002)
 
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> utempter-0.5.2.ebuild:
+  Mark as x86 stable.
+
+  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> utempter-0.5.2.ebuild:
+  homepage syntax fix thanks to Frantz Dhin <tragedy_rm@hotmail.com> in bug
+  #18145
+
   03 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
   Utempter is a utility which allows some non-privileged programs to have
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index e69de29bb2d1..828c1e633084 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -0,0 +1,9 @@
+MD5 1fe2f84f5f9d41bc80bb795ef8845ff2 metadata.xml 244
+MD5 4ddc16963442727d37f7dd077fc04650 ChangeLog 5636
+MD5 19c3fe47542ffd5d59ad5f082f2c6a61 utempter-0.5.5.6.ebuild 1314
+MD5 3548d7d9f8c92fe30e12fc980096c311 utempter-0.5.5.5-r1.ebuild 1302
+MD5 396ef6fc60078c73be6790271ca67bde files/utempter-0.5.5.6-no_utmpx.patch 768
+MD5 750feafe77d6007602c6abbacdce262f files/digest-utempter-0.5.5.6 68
+MD5 d3293569252b4437ee84ef41b158aa00 files/digest-utempter-0.5.5.5-r1 68
+MD5 b2dc09a11b51ceac5735f963a718fa32 files/utempter-0.5.5.5-soname-makefile-fix.patch 932
+MD5 e23f853248988e2aff2ada1ae20a335c files/utempter-0.5.5.6-soname-makefile-fix.patch 839
diff --git a/sys-apps/utempter/metadata.xml b/sys-apps/utempter/metadata.xml
index f093d416cbb1..e0681d72487b 100644
--- a/sys-apps/utempter/metadata.xml
+++ b/sys-apps/utempter/metadata.xml
@@ -1,7 +1,9 @@
- * 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>X11</herd>
+<maintainer>
+  <email>seemant@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild b/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
index cc5b2d4d4f53..db3282d41f48 100644
--- a/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
@@ -1,15 +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/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild,v 1.1 2004/12/17 17:50:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 
 inherit rpm eutils flag-o-matic
 
 MY_P=${P%.*}-${PV##*.}
 S=${WORKDIR}/${P%.*}
-DESCRIPTION="App that allows non-privileged apps to write utmp (login) info, which needs root access"
+DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="http://www.redhat.com/"
-SRC_URI="mirror://gentoo/${MY_P}.src.rpm
-	http://dev.gentoo.org/~seemant/${MY_P}.src.rpm"
+SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
 
 LICENSE="|| ( MIT LGPL-2 )"
 SLOT="0"
@@ -17,6 +16,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
+DEPEND="!virtual/utempter"
+
+PROVIDE="virtual/utempter"
 
 pkg_setup() {
 	enewgroup utmp 406
@@ -37,7 +39,7 @@ src_compile() {
 src_install() {
 	make \
 		RPM_BUILD_ROOT="${D}" \
-		LIBDIR=/usr/lib \
+		LIBDIR=/usr/$(get_libdir) \
 		install || die
 	dobin utmp
 
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 0eb23250324b..77de41170b3b 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild,v 1.1 2005/04/15 13:03:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.6.ebuild,v 1.1.1.1 2005/11/30 09:56:32 chriswhite Exp $
 
 inherit rpm eutils flag-o-matic
 
@@ -8,16 +8,17 @@ MY_P=${P%.*}-${PV##*.}
 S=${WORKDIR}/${P%.*}
 DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="http://www.redhat.com/"
-SRC_URI="mirror://gentoo/${MY_P}.src.rpm
-	http://dev.gentoo.org/~seemant/distfiles/${MY_P}.src.rpm"
+SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
 
 LICENSE="|| ( MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
 
+PROVIDE="virtual/utempter"
+
 pkg_setup() {
 	enewgroup utmp 406
 }
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 547242d42ac3..21610454fff6 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,568 @@
 # ChangeLog for sys-apps/util-linux
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
+
+*util-linux-2.12r-r1 (15 Oct 2005)
+
+  15 Oct 2005; <solar.@gentoo.org>
+  +files/util-linux-2.12r-fdisk-frame-pointers.patch,
+  +util-linux-2.12r-r1.ebuild:
+  - bug #108988 fdisk is unable to always lseek when omiting frame pointers
+
+*util-linux-2.12r (05 Oct 2005)
+
+  05 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  -util-linux-2.12q-r2.ebuild, +util-linux-2.12r.ebuild:
+  Version bump #108042 by Alon Bar-Lev.
+
+  20 Sep 2005; Hardave Riar <hardave@gentoo.org> util-linux-2.12q-r3.ebuild:
+  Stable on mips, bug #105805.
+
+  19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  util-linux-2.12q-r3.ebuild:
+  Stable on hppa and ppc.
+
+  19 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  util-linux-2.12q-r3.ebuild:
+  stable on alph, wrt bug #105805
+
+  19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> util-linux-2.12q-r3.ebuild:
+  Stable on x86
+
+  19 Sep 2005; Jason Wever <weeve@gentoo.org> util-linux-2.12q-r3.ebuild:
+  Stable on SPARC wrt security bug #105805.
+
+  19 Sep 2005; Luis Medinas <metalgod@gentoo.org>
+  util-linux-2.12q-r3.ebuild:
+  Marked Stable on amd64. Bug #105805.
+
+  18 Sep 2005; Markus Rothe <corsair@gentoo.org> util-linux-2.12q-r3.ebuild:
+  Stable on ppc64 (bug #105805)
+
+*util-linux-2.12q-r3 (14 Sep 2005)
+
+  14 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/util-linux-2.12q-use-update_mtab-for-fake.patch,
+  +util-linux-2.12q-r3.ebuild:
+  Fix 'mount -f' adding dups in mtab.  Bump rev for security fix to umount
+  (bug #105805).
+
+  14 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/util-linux-2.12q-update_mtab-fixes.patch:
+  Do not leak memory.
+
+  14 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/util-linux-2.12q-update-mtab-when-moving.patch:
+  Use xstrdup() instead of strdup() to catch out of memory issues.
+
+  14 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/util-linux-2.12q-update_mtab-fixes.patch,
+  util-linux-2.12q-r2.ebuild:
+  Fix various issues with update_mtab(), causing 'mount -f' to not update mtab
+  as expected, bug #105641.
+
+  14 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch,
+  util-linux-2.12q-r2.ebuild:
+  Fix by Derick Swanepoel to have umount respect -n when using -r #98675.
+
+  13 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12-only-root-can-remount.patch,
+  util-linux-2.12i-r1.ebuild, util-linux-2.12q-r2.ebuild:
+  Fix small security issue with umount and remount #105805.
+
+*util-linux-2.12q-r2 (13 Sep 2005)
+
+  13 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/util-linux-2.12q-more-fake-checks-v2.patch,
+  +util-linux-2.12q-r2.ebuild:
+  Fix 'mount -f' not updating /etc/mtab, bug #105641.
+
+  05 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-update-mtab-when-moving.patch,
+  util-linux-2.12q-r1.ebuild:
+  Fix `mount --move` mtab updating #104697 by Jakub Jozwicki.
+
+  03 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-more-fake-checks.patch,
+  util-linux-2.12q-r1.ebuild:
+  Add some fixes for -f handling.
+
+  18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-dont-umask.patch, util-linux-2.12q-r1.ebuild:
+  Dont force umask to 022 all the time #93671 by Clock / Daniel Drake.
+
+*util-linux-2.12q-r1 (13 Jun 2005)
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +util-linux-2.12q-r1.ebuild:
+  Update loop-aes patch #95939 by Alon Bar-Lev.
+
+  30 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-i18n-update.patch, util-linux-2.12q.ebuild:
+  Fix typo in french translation #75693 by DELACOUR Guillaume.
+
+  29 Apr 2005; Mike Frysinger <vapier@gentoo.org> +files/crypto-loop.confd,
+  +files/crypto-loop.initd, util-linux-2.12i-r1.ebuild,
+  util-linux-2.12p-r1.ebuild, util-linux-2.12q.ebuild:
+  Move the crypto-loop script from baselayout to here.
+
+*util-linux-2.12q (21 Feb 2005)
+
+  21 Feb 2005; Mike Frysinger <vapier@gentoo.org> +util-linux-2.12q.ebuild:
+  Version bump.
+
+*util-linux-2.12p-r1 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  files/util-linux-2.12p-swapon-check-symlinks.patch:
+  Touchup the swapon patch to work properly.
+
+  14 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  util-linux-2.12i-r1.ebuild, util-linux-2.12p.ebuild:
+  Added virtual/os-headers to DEPEND. It was missing and as such util-linux
+  was trying to update before linux-headers... thus missing the fix I placed
+  in 2.6.8.1-r4 for 2.12p.
+
+  11 Jan 2005; Stephen P. Becker <geoman@gentoo.org>
+  util-linux-2.12i-r1.ebuild:
+  stable on mips
+
+  10 Jan 2005; Aron Griffis <agriffis@gentoo.org> util-linux-2.12i-r1.ebuild:
+  stable on alpha (needed now that 2.12-r5 is pmasked)
+
+*util-linux-2.12p (09 Jan 2005)
+
+  09 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12p-fat-LABEL-support.patch,
+  +files/util-linux-2.12p-swapon-check-symlinks.patch,
+  +util-linux-2.12p.ebuild:
+  Version bump. Change default crypto to loop-aes (since its actually
+  maintained upstream) #69082 by Arnvid L. Karstad.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> util-linux-2.12i-r1.ebuild:
+  Stable on sparc, resolves bug #77295.
+
+  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  util-linux-2.12i-r1.ebuild:
+  Stable on amd64.
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org> util-linux-2.12i-r1.ebuild:
+  Stable on ppc64
+
+  15 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  util-linux-2.12i-r1.ebuild:
+  Only include compiler.h if using 2.6 headers #71330.
+
+*util-linux-2.12i-r1 (14 Nov 2004)
+
+  14 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +util-linux-2.12i-r1.ebuild, -util-linux-2.12i.ebuild:
+  Disable aes-loop and forward port the cryptoapi patch. Devices encrypted
+  with the old cryptoapi arent compatible with the aes-loop work.
+
+*util-linux-2.12i (11 Nov 2004)
+
+  11 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  files/util-linux-2.12b-pic.patch,
+  +files/util-linux-2.12i-fat-LABEL-support.patch,
+  +files/util-linux-2.12i-ignore-managed.patch,
+  +files/util-linux-2.12i-nfsv4.patch, +files/util-linux-2.12i-pic.patch,
+  +files/util-linux-2.12i-swapon-check-symlinks.patch,
+  +util-linux-2.12i.ebuild:
+  Version bump. Add loop-aes patch (#24458 / #25192). Punt gcloop/cryptoapi
+  patches. Add patch to ignore managed/kudzu options #70873.
+
+*util-linux-2.12b-r1 (30 Oct 2004)
+
+  30 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-swapon-check-symlinks.patch,
+  +util-linux-2.12b-r1.ebuild:
+  Add a fallback routine to swapon -a that checks symlinks #69162.
+
+  15 Sep 2004; Martin Schlemmer <azarah@gentoo.org> util-linux-2.12b.ebuild:
+  Add >=sys-fs/e2fsprogs-1.34 dependency (blkid_known_fstype in
+  /usr/include/blkid/blkid.h introduced in 1.34).
+  Pointed out by Maximilian Decker <burbon04@gmx.de>.
+
+  04 Sep 2004; <solar@gentoo.org> files/util-linux-2.12b-pic.patch,
+  util-linux-2.12-r4.ebuild, util-linux-2.12b.ebuild:
+  updated util-linux-2.12b-pic.patch to fix BREG problem that just showed up the
+  the new partx to util-linux. use non-lazy bindings for +s apps installed by
+  util-linux
+
+*util-linux-2.12b (03 Sep 2004)
+
+  03 Sep 2004; Martin Schlemmer <azarah@gentoo.org>
+  +files/util-linux-2.12b-fat-LABEL-support.patch,
+  +files/util-linux-2.12b-gcloop-with-crypt.patch,
+  +files/util-linux-2.12b-gcloop.patch, +files/util-linux-2.12b-pic.patch,
+  +util-linux-2.12b.ebuild:
+  Update version; also build partx. SELinux users should erify support, as it
+  seems it was merged upstream.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  util-linux-2.11z-r8.ebuild, util-linux-2.11z-r9.ebuild,
+  util-linux-2.12-r2.ebuild, util-linux-2.12-r3.ebuild,
+  util-linux-2.12-r4.ebuild, util-linux-2.12-r5.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> util-linux-2.12-r5.ebuild:
+  stable on alpha and ia64
+
+  28 Jun 2004; Luca Barbato <lu_zero@gentoo.org> util-linux-2.12-r5.ebuild:
+  Marked ppc
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> util-linux-2.11z-r8.ebuild,
+  util-linux-2.11z-r9.ebuild, util-linux-2.12-r2.ebuild,
+  util-linux-2.12-r3.ebuild, util-linux-2.12-r4.ebuild:
+  QA - fix use invocation
+
+  16 Jun 2004; Daniel Black <dragonheart@gentoo.org>
+  util-linux-2.12-r4.ebuild, util-linux-2.12-r5.ebuild:
+  uclibc fixes thanks to Peter S. Mazinger <ps.m@gmx.net>
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> util-linux-2.12-r5.ebuild:
+  stable on amd64
+
+  08 May 2004; <solar@gentoo.org> util-linux-2.12-r4.ebuild,
+  util-linux-2.12-r5.ebuild, files/util-linux-2.12-swapon-unistd.patch:
+  access() is a macro which uses R_OK. However R_OK is not defined on sparc
+  during a bootstrap unless we actually include unistd.h
+
+  19 Apr 2004; Travis Tilley <lv@gentoo.org> util-linux-2.11z-r9.ebuild,
+  util-linux-2.12-r2.ebuild, util-linux-2.12-r3.ebuild,
+  util-linux-2.12-r4.ebuild:
+  filtering -fPIC on amd64 is a dumb idea
+
+  07 Apr 2004; Joshua Kinard <kumba@gentoo.org> util-linux-2.12-r5.ebuild:
+  Marked stable on mips.
+
+  02 Apr 2004; <solar@gentoo.org> util-linux-2.12-r5.ebuild:
+  util-linux gives additional -fPIC errors on amd64 with -pie. Bugzilla Bug 46366
+
+  01 Apr 2004; Jon Portnoy <avenj@gentoo.org> util-linux-2.12-r4.ebuild :
+  Stable on AMD64.
+
+  09 Mar 2004; <agriffis@gentoo.org> util-linux-2.12-r4.ebuild:
+  stable on alpha and ia64
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> util-linux-2.12-r4.ebuild:
+  Marked stable on mips.
+
+  27 Feb 2004; Seemant Kulleen <seemant@gentoo.org>
+  util-linux-2.11z-r8.ebuild:
+  move the filter-flags statement into src_compile
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.12-r5.ebuild:
+  Add installation of rdev on amd64. Closing #35902.
+
+*util-linux-2.12-r5 (17 Feb 2004)
+
+  17 Feb 2004; Luca Barbato <lu_zero@gentoo.org> util-linux-2.12-r5.ebuild,
+  files/util-linux-2.12-gcloop.patch:
+  Added support for gcloop in losetup
+
+  09 Feb 2004; <gustavoz@gentoo.org> util-linux-2.12-r4.ebuild:
+  stable on hppa and sparc
+
+  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> util-linux-2.12-r4.ebuild:
+  Bump to stable for x86.
+
+  03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  util-linux-2.12-r3.ebuild:
+  set ppc in keywords
+
+*util-linux-2.12-r4 (30 Dec 2003)
+
+  30 Dec 2003; Martin Schlemmer <azarah@gentoo.org> util-linux-2.12-r4.ebuild,
+  files/util-linux-2.12-fat-LABEL-support.patch:
+  Add support to read fat/fat32 labels, bug #36722.
+
+  11 Dec 2003; Mike Frysinger <vapier@gentoo.org> util-linux-2.12-r3.ebuild :
+  Add patch to compile against 2.6.x headers #31286.
+
+*util-linux-2.11z-r9 (06 Dec 2003)
+*util-linux-2.11z-r8 (08 Dec 2003)
+*util-linux-2.12-r2 (08 Dec 2003)
+*util-linux-2.12-r3 (08 Dec 2003)
+
+  06 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  util-linux-2.11z-r6.ebuild, util-linux-2.11z-r7.ebuild,
+  util-linux-2.11z-r8.ebuild, util-linux-2.11z-r9.ebuild,
+  util-linux-2.12-r1.ebuild, util-linux-2.12-r2.ebuild,
+  util-linux-2.12-r3.ebuild, util-linux-2.12.ebuild,
+  files/util-linux-no-kill.patch:
+  /bin/kill used to be part of this package. procps will now be the only one
+  providing that
+
+*util-linux-2.12-r1 (02 Dec 2003)
+
+  02 Dec 2003; Brad House <brad_mssw@gentoo.org> util-linux-2.12-r1.ebuild:
+  Add cryptoapi support to util-linux-2.12
+  Mailing list post with info:
+  http://www.kerneli.org/pipermail/cryptoapi-devel/2003-September/000634.html
+  Follow thread for usage.
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> util-linux-2.12.ebuild,
+  files/util-linux-2.12-selinux.diff.bz2:
+  Add new API SELinux patch
+
+  09 Oct 2003; Alexander Gabert <pappy@gentoo.org> util-linux-2.11z-r6.ebuild:
+  removed hardened-gcc appendix flags again
+
+  03 Oct 2003; Alexander Gabert <pappy@gentoo.org> util-linux-2.11z-r6.ebuild:
+  added libgcc.a problem evasion and removed overwriting of LDFLAGS in ebuild
+
+  20 Sep 2003; Alexander Gabert <pappy@gentoo.org> util-linux-2.11z-r6.ebuild:
+  removed check again, only caused by problems with __libc_csu in hardened-gcc
+
+  20 Sep 2003; Alexander Gabert <pappy@gentoo.org> util-linux-2.11z-r6.ebuild:
+  added yet_exec exclusion flag for hardened-gcc
+
+  19 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
+  util-linux-2.11z-r6.ebuild, util-linux-2.11z-r7.ebuild,
+  util-linux-2.12.ebuild:
+  fix for USE=static, thanks to: Sascha Silbe <sascha-gentoo-bugzilla@silbe.org>
+  in bug #29160
+
+  10 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
+  util-linux-2.11z-r6.ebuild:
+  Mark stable.
+
+*util-linux-2.12 (24 Jul 2003)
+
+  28 Jul 2003; <solar@gentoo.org> util-linux-2.12.ebuild:
+  util-linux was overriding all LDFLAGS for when use static was enabled, please
+  dont export LDFLAGS=-static alone in this or any other packages
+
+  24 Jul 2003; Martin Schlemmer <azarah@gentoo.org> util-linux-2.12.ebuild:
+  New version, bug #24880.
+
+  21 Jul 2003; <solar@gentoo.org> util-linux-2.11z-r7.ebuild:
+  verified -fPIC works with this pkg on x86, sparc64, ppc and hppa
+
+  20 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  util-linux-2.11z-r7.ebuild, files/util-linux-2.11z-01-nfsv4-crypt.dif:
+  Fix NFS4 patch to work with crypt in USE.
+
+*util-linux-2.11z-r7 (20 Jul 2003)
+
+  04 Aug 2003; Joshua Kinard <kumba@gentoo.org> util-linux-2.11z-r7.ebuild:
+  Changed ~mips to mips in KEYWORDS
+  Added mips to the list of archs that can use -fPIC
+
+  20 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  util-linux-2.11z-r7.ebuild, files/util-linux-2.11z-01-nfsv4.dif:
+  Add NFS4 support (kernel 2.5/2.6).  Notified by Michael Locher
+  <locher@iam.unibe.ch>.
+
+*util-linux-2.11z-r6 (17 Jul 2003)
+
+  17 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  util-linux-2.11z-r6.ebuild,
+  files/util-linux-2.11z-agetty-domainname-option.patch:
+  Add the O option to agetty to display DNS domainname in the issue file, thanks
+  to Marius Mauch <genone@genone.de>, bug #22275.
+
+  13 Jul 2003; <solar@gentoo.org> util-linux-2.11z-r5.ebuild:
+  verified -fPIC works with this pkg on sparc,ppc and hppa
+
+*util-linux-2.11z-r5 (12 Jul 2003)
+
+  12 Jul 2003; <solar@gentoo.org> util-linux-2.11z-r5.ebuild,
+  files/util-linux-2.11z-pic.patch:
+  Added defines for fPIC code to avoid the use the of old __NR* inline assembly
+  construction of syscalls
+
+  05 Jul 2003; Luca Barbato <lu_zero@gentoo.org> util-linux-2.11z-r4.ebuild:
+  Keyworded ppc
+
+  29 Jun 2003; Chris PeBenito <pebenito@gentoo.org>
+  util-linux-2.11z-r4.ebuild:
+  Remove selinux stuff, as its no longer needed.  Using pam-login again.
+
+  26 Jun 2003; Joshua Brindle <method@gentoo.org> util-linux-2.11z-r4.ebuild:
+  Added -e s:SUIDMODE=.*4755:SUIDMODE=4711: for more secure suid permissions
+
+  24 Jun 2003; Aron Griffis <agriffis@gentoo.org> util-linux-2.11z-r4.ebuild:
+  Mark stable on alpha
+
+*util-linux-2.11z-r4 (01 Jun 2003)
+
+  06 Jul 2003; Guy Martin <gmsoft@gentoo.org> util-linux-2.11z-r4.ebuild :
+  Marked stable on hppa.
+
+  22 Jun 2003; Joshua Kinard <kumba@gentoo.org> util-linux-2.11z-r4.ebuild:
+  Changed ~sparc & ~mips to sparc & mips
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> util-linux-2.11z-r4.ebuild:
+  If pam was disabled in IUSE, src_unpack would fail.  Fixed the logic.
+
+  01 Jun 2003; Brandon Low <lostlogic@gentoo.org> util-linux-2.11z-r4.ebuild:
+  Add enhancement to script command from bug 21147
+
+  26 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  util-linux-2.11z-r3.ebuild:
+  category was missing with sed dependency
+
+  25 May 2003; Martin Holzer <mholzer@gentoo.org> util-linux-2.11o-r3.ebuild,
+  util-linux-2.11y.ebuild, util-linux-2.11z-r1.ebuild,
+  util-linux-2.11z-r2.ebuild, util-linux-2.11z-r3.ebuild:
+  now uses mirror://kernel
+
+  25 May 2003; Seemant Kulleen <seemant@gentoo.org>
+  util-linux-2.11z-r3.ebuild:
+  pam fix
+
+*util-linux-2.11z-r3 (24 May 2003)
+
+  29 May 2003; Joshua Brindle <method@gentoo.org> util-linux-2.11z-r3.ebuild:
+  fixed selinux dependancy issue
+
+  24 May 2003; Joshua Brindle <method@gentoo.org> util-linux-2.11z-r3.ebuild:
+  added support for pam optionally
+
+*util-linux-2.11z-r2 (24 Apr 2003)
+
+  24 Apr 2003; Brandon Low <lostlogic@gentoo.org> util-linux-2.11z-r2.ebuild:
+  Several changes, including support for USE=static the use of sed -i, proper
+  die messages, econf instead of ./configure. Please test this and let me know
+  if there are any regressions
+
+  See bug 19597
+
+*util-linux-2.11z (03 Feb 2003)
+
+  22 Apr 2003; Joshua Kinard <kumba@gentoo.org> util-linux-2.11z-r1.ebuild:
+  added patch from util-linux maintainer that makes fdisk function correctly on mips
+  patch only gets added on "mips" archs, but will be standard in util-linux 2.12
+
+  23 Mar 2003; Joshua Brindle <method@gentoo.org> util-linux-2.11z-r1.ebuild:
+  added selinux support, thanks sindian
+  
+  27 Feb 2003; Jan Seidel <tuxus@gentoo.org>  util-linux-2.11z-r1.ebuild :
+  Mark as unstable for mips
+
+  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> util-linux-2.11z-r1.ebuild :
+  Mark as stable for mips.
+
+  21 Feb 2003; Zach Welch <zwelch@gentoo.org> :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  07 Feb 2003; Jon Portnoy <avenj@gentoo.org>
+  util-linux-2.11z-r1.ebuild files/no-symlink-resolve.patch :
+
+  Added a patch to keep mount from resolving symlinks, which
+  makes the output of programs like `df` unreadable with devfs.
+
+  03 Feb 2003; Seemant Kulleen <seemant@gentoo.org>
+  util-linux-2.11z.ebuild files/util-linux-2.11z-parallel-make.patch
+  files/digest-util-linux-2.11z :
+
+  Version bump.  Closes bug #14955 by lone_iguana@hotmail.com
+
+*util-linux-2.11y (27 Oct 2002)
+
+  11 Jan 2003; Seemant Kulleen <seemant@gentoo.org> util-linux-2.11y.ebuild :
+
+  filtered out -fPIC from user's CFLAGS
+
+  16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> util-linux-2.11y.ebuild :
+  Fix rare failures with parallel makes.  Update to use epatch.
+
+  10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> util-linux-2.11y.ebuild :
+  Mark stable.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  Changed sparc ~sparc keywords
+ 
+  13 Dec 2002; Martin Holzer <mholzer@gentoo.org> util-linux-2.11y.ebuild files/digest-util-linux-2.11y Changelog :
+	Changed from tar.gz to tar.bz2
+
+  29 Nov 2002; Nicholas Jones <carpaski@gentoo.org> :
+	Latest release. Patched 2.11r crypto patch for this version.
+	On mirrors as util-linux-2.11y-crypt-gentoo.patch.gz
+	Updates are mostly cleanups.
+
+*util-linux-2.11w (27 Oct 2002)
+
+  27 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+  Chase latest release.  Fixes potential root exploit.
+
+*util-linux-2.11u (14 Aug 2002)
+
+  14 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.11u.ebuild:
+  Version bump.  Added patch for chfn.
+
+*util-linux-2.11t (05 Aug 2002)
+
+  05 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.11t.ebuild:
+  Version bump.  
+
+*util-linux-2.11r-r1 (9 Jul 2002)
+
+  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.11r-r1.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.11r.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  9 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.11r-r1.ebuild files/digest-util-linux-2.11r-r1 :
+
+  Crypto patch only applied if USE setting "crypt" is enabled.
+
+*util-linux-2.11r (7 Jul 2002)
+
+  7 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Version update.
+
+*util-linux-2.11o-r3 (28 Apr 2002)
+
+  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> util-linux-2.11o-r3.ebuild :
+  Added LICENSE, KEYWORDS.
+
+  28 Apr 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Removed /bin/login in favour of pam-login.
+
+*util-linux-2.11o-r2 (25 Apr 2002)
+
+  25 Apr 2002; Ryan Phillips <rphillips@gentoo.org> util-linux-2.11o-r2.ebuild
+  files/digest-util-linux-2.11o-r2
+
+  patch util-linux with the international crypto patch.  This patch
+  does not contain any cryptographic components. (#1607)
+
+*util-linux-2.11o-r1 (11 Apr 2002)
+
+  11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> util-linux-2.11o-r1.ebuild
+  files/digest-util-linux-2.11o-r1
+
+  USE dependent nls compilation.
+
+*util-linux-2.11o (8 Apr 2002)
+  
+  8 Apr 2002; M.Schlemmer <azarah@gentoo.org> util-linux-2.11o :
+
+  /bin/login that comes with sys-apps/shadow has a bug that gives a normal
+  user root priviliges in certain (usually if pam_limits is used).
+
+*util-linux-2.11l-r1 (1 Apr 2002)
+
+  1 Apr 2002; Seemant Kulleen <seemant@gentoo.org> util-linux-2.11l-r1.ebuild :
+
+  USE dependent nls compilation.
 
 *util-linux-2.11l (1 Feb 2002)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a6a745157612..d23a40da944a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,12 +1,54 @@
-MD5 897b3f3d414c7ed899c97b242eedc429 ChangeLog 4895
-MD5 f57fa14eb16fc800e4aa7a32802a3bd7 util-linux-2.11o-r3.ebuild 1718
-MD5 565d1b898a530f0b451df4f0c4555239 util-linux-2.11y.ebuild 2111
-MD5 59486f0e0487356259342c9f48af09a6 util-linux-2.11z-r1.ebuild 2334
-MD5 939305c630f0d2196de84e79f220dd8d files/digest-util-linux-2.11o-r3 138
-MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152
-MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r1 153
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 49b60453751eddd960be9f59881eadc8 ChangeLog 21027
+MD5 0b95e856fd2f375270cf2ec4eaa69c8a files/crypto-loop.confd 505
+MD5 d20405e12353610b3ef8fbc2e1d57f2a files/crypto-loop.initd 1625
+MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156
+MD5 e2d566b683bb1b9b1c3e127b2bbd258b files/digest-util-linux-2.12q 294
+MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r3 292
+MD5 3f20c16ba5d68bfe7518f72d771170ce files/digest-util-linux-2.12r 292
+MD5 a1e7cbf002a6dd8bb39f2f533a3807a4 files/digest-util-linux-2.12r-r1 292
 MD5 6aa1c240dd789327ea92e36309052950 files/no-symlink-resolve.patch 316
-MD5 50b088dbe0471cb0a49ad1f9b967ee04 files/util-linux-2.11u-gentoo.patch 367
-MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11y-parallel-make.patch 369
+MD5 0be8df03dae23c81a0e929e58a4114e0 files/util-linux-2.11z-01-nfsv4.dif 13442
+MD5 7d35ae646b52391076f7a329af8265bc files/util-linux-2.11z-agetty-domainname-option.patch 1810
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
-MD5 6dc0134d8d5f325a86257698d2184718 files/util-linux-2.11z-mips-fdisk-fix.patch 1698
+MD5 18371db840b08f5782e3f8f96c4efe8d files/util-linux-2.11z-pic.patch 3056
+MD5 7ce604460c5607e6eb5d894b6c8b2064 files/util-linux-2.12-fat-LABEL-support.patch 11583
+MD5 4460875a6ebcf24a7ca5b41ed12f9fe5 files/util-linux-2.12-gcloop.patch 3806
+MD5 d927611f34139a40f1fc9f4162c61f8a files/util-linux-2.12-kernel-2.6.patch 2964
+MD5 9d4c2454a6506ec913d901830ab06a22 files/util-linux-2.12-only-root-can-remount.patch 294
+MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
+MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
+MD5 a9bc06c292401d6f2d27e8e4ebf7e6ae files/util-linux-2.12i-fat-LABEL-support.patch 2304
+MD5 61beee95fb4696a6af11ffb84ddb055c files/util-linux-2.12i-ignore-managed.patch 506
+MD5 73c0cb6f9aa5fa84e701fc68d0478aac files/util-linux-2.12i-nfsv4.patch 12854
+MD5 c9c2c92d7bba0652f22b638127c2107e files/util-linux-2.12i-pic.patch 2457
+MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875
+MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlinks.patch 864
+MD5 bc90959c4718e7dc5d53dcddac1172f5 files/util-linux-2.12q-debian-10cfdisk.patch 1888
+MD5 b360252f16d707f668b605d7a2abb791 files/util-linux-2.12q-dont-umask.patch 439
+MD5 570b9b148cbb60ec16de30940990ab53 files/util-linux-2.12q-i18n-update.patch 344
+MD5 99fa2ff2cb56217b6971e76e275923f9 files/util-linux-2.12q-more-fake-checks-v2.patch 1176
+MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239
+MD5 8a13c61b447c1533df4b919cf2646fea files/util-linux-2.12q-umount-dont-write-mtab-with-remount.patch 467
+MD5 3708f6eda344a2aa0a4d85d49f69dcee files/util-linux-2.12q-update-mtab-when-moving.patch 1036
+MD5 f182d2c3c90cdc74c816a4656a8f3bbf files/util-linux-2.12q-update_mtab-fixes.patch 2636
+MD5 202b78b99074c7c91faea44d1de6e1bd files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
+MD5 badd26600f4c31ecb524385ea1b7030c files/util-linux-2.12r-fdisk-frame-pointers.patch 355
+MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 5497e9050dc8cde95a0e015edcd59c81 util-linux-2.12i-r1.ebuild 3960
+MD5 5caff498045d46b5ee7afbb9aad0a357 util-linux-2.12q-r3.ebuild 5853
+MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785
+MD5 61496c2ccd898b689d10b06e01d81c72 util-linux-2.12r-r1.ebuild 5689
+MD5 0fa072288048ab73c7da495402392575 util-linux-2.12r.ebuild 5546
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iQCVAwUBQ1EjWJ4WFLgrx1GWAQIR3wP+NKQKMVpPtLz5f3L+dMosj2EL+vaiv2U5
+ReSl+b/xGAHdzWq6z/lhgwmi5svHkHH8Y7hi3pIAWzjujkgV9Nh7oYB1zG8TSML2
+fq0rnQj1HVo16OR8hzDqRcIvowHhGb0O/K/lR5lBZDPBOQCunHaElOv29IL80Avr
+Vqthij2xjZ8=
+=sUj2
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/crypto-loop.confd b/sys-apps/util-linux/files/crypto-loop.confd
index 3b9d005cf32c..1b002c220094 100644
--- a/sys-apps/util-linux/files/crypto-loop.confd
+++ b/sys-apps/util-linux/files/crypto-loop.confd
@@ -1,5 +1,5 @@
 # /etc/conf.d/crypto-loop
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.confd,v 1.1 2005/04/29 23:54:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.confd,v 1.1.1.1 2005/11/30 09:56:23 chriswhite Exp $
 
 # Configuration file for /etc/init.d/crypto-loop
 
diff --git a/sys-apps/util-linux/files/crypto-loop.initd b/sys-apps/util-linux/files/crypto-loop.initd
index ff5f63b0f97d..f246919d59df 100755
--- a/sys-apps/util-linux/files/crypto-loop.initd
+++ b/sys-apps/util-linux/files/crypto-loop.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.1 2005/04/29 23:54:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.1.1.1 2005/11/30 09:56:24 chriswhite Exp $
 
 depend() {
 	 need checkroot modules
diff --git a/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch b/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch
index b0e0caa76bd7..d94d8b81c2a1 100644
--- a/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch
+++ b/sys-apps/util-linux/files/util-linux-2.11z-agetty-domainname-option.patch
@@ -39,7 +39,7 @@
 +			struct hostent *hp = NULL;
 +			
 +			if (gethostname(host, HOSTNAME_LENGTH) || !(hp = gethostbyname(host))) {
-+				domain = "unknown_domain";
++				domain = " unknown_domain";
 +			} else {
 +				/* get the substring after the first . */
 +				domain = strchr(hp->h_name, '.');
diff --git a/sys-apps/util-linux/files/util-linux-2.12i-pic.patch b/sys-apps/util-linux/files/util-linux-2.12i-pic.patch
index 2725682ad9f3..8fb91be8b795 100644
--- a/sys-apps/util-linux/files/util-linux-2.12i-pic.patch
+++ b/sys-apps/util-linux/files/util-linux-2.12i-pic.patch
@@ -17,7 +17,7 @@ diff -ur util-linux-2.12i.orig/fdisk/llseek.c util-linux-2.12i/fdisk/llseek.c
  
 -#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
 +/* do not use assembler to put together syscalls at compile time (for llseek for example) when using PIC */
-+#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) || defined(__hppa__) \
++#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) \
 +    || defined(__PIC__) || defined(__pic__)
  
  #define my_llseek lseek
@@ -39,7 +39,7 @@ diff -ur util-linux-2.12i.orig/fdisk/sfdisk.c util-linux-2.12i/fdisk/sfdisk.c
  #undef use_lseek
 -#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__)
 +/* do not use the assembler constructed syscalls for seeking if compiled as PIC */
-+#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__) || defined (__hppa__) \
++#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__) \
 +    || defined(__PIC__) && defined(__pic__)
  #define use_lseek
  #endif
@@ -52,7 +52,7 @@ diff -ur util-linux-2.12i.orig/partx/partx.c util-linux-2.12i/partx/partx.c
   * sseek: seek to specified sector
   */
 -#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__)
-+#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__) && !defined(__hppa__) \
++#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__) \
 +    && !defined(__PIC__) && !defined(__pic__)
  #define NEED__llseek
  #endif
diff --git a/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch b/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch
index e53b84e83da4..f421458049f1 100644
--- a/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch
+++ b/sys-apps/util-linux/files/util-linux-2.12p-swapon-check-symlinks.patch
@@ -1,10 +1,10 @@
---- util-linux-2.12b/mount/swapon.c.orig	2004-10-28 10:02:44.320023600 -0400
-+++ util-linux-2.12b/mount/swapon.c	2004-10-28 10:02:14.384574000 -0400
+--- util-linux-2.12b/mount/swapon.c
++++ util-linux-2.12b/mount/swapon.c
 @@ -7,2 +7,3 @@
  #include <stdlib.h>
 +#include <sys/param.h>
  #include <stdio.h>
-@@ -137,10 +138,26 @@
+@@ -137,10 +138,27 @@
  static int
  is_in_proc_swaps(const char *fname) {
  	int i;
@@ -22,9 +22,10 @@
 +	if (!lstat(fname, &fstatbuf))
 +		if (S_ISLNK(fstatbuf.st_mode)) {
 +			struct stat swapstatbuf;
++			stat(fname, &fstatbuf);
 +			for (i = 0; i < numSwaps; i++)
 +				if (swapFiles[i] && !stat(swapFiles[i], &swapstatbuf) && \
-+				    swapstatbuf.st_dev == fstatbuf.st_dev)
++				    swapstatbuf.st_rdev == fstatbuf.st_rdev)
 +					return 1;
 +		}
 +
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch b/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch
index 34927d4d8a7f..aa921f5edc2c 100644
--- a/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch
+++ b/sys-apps/util-linux/files/util-linux-2.12q-update-mtab-when-moving.patch
@@ -3,8 +3,8 @@ and create a new /bar entry with wrong info.
 
 http://bugs.gentoo.org/104697
 
---- mount/mount.c
-+++ mount/mount.c
+--- 1/mount/mount.c
++++ 2/mount/mount.c
 @@ -665,6 +665,25 @@
  		else {
  			mntFILE *mfp;
@@ -17,7 +17,7 @@ http://bugs.gentoo.org/104697
 +				const char *olddir = mnt.mnt_fsname;
 +				struct mntentchn *oldmc = oldmc = getmntfile(olddir);
 +				if (oldmc != NULL) {
-+					mnt.mnt_fsname = strdup(oldmc->m.mnt_fsname);
++					mnt.mnt_fsname = xstrdup(oldmc->m.mnt_fsname);
 +					mnt.mnt_type = oldmc->m.mnt_type;
 +					mnt.mnt_opts = oldmc->m.mnt_opts;
 +					mnt.mnt_freq = oldmc->m.mnt_freq;
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch b/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch
index 15969461f2f0..7e1c9db6bf86 100644
--- a/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch
+++ b/sys-apps/util-linux/files/util-linux-2.12q-update_mtab-fixes.patch
@@ -13,19 +13,22 @@ This fixes a few issues with update_mtab():
   mtab.
 - If mtab is empty, absent->prev should be set to mc0, and not mc0->prev, as
   it will be NULL.
+- Memory leak if we have to abort before mc0 and co are freed.
 
-Patch by Martin Schlemmer <azarah@gentoo.za.org>
+Patch by Martin Schlemmer <azarah@gentoo.org>
 
 
---- util-linux-2.12q/mount/fstab.c	2005-09-14 08:22:34.000000000 +0200
-+++ util-linux-2.12q.az/mount/fstab.c	2005-09-14 10:37:54.000000000 +0200
-@@ -604,15 +604,30 @@ update_mtab (const char *dir, struct my_
+--- util-linux-2.12q/mount/fstab.c	2005-09-14 15:30:10.000000000 +0200
++++ util-linux-2.12q.az/mount/fstab.c	2005-09-14 15:31:48.000000000 +0200
+@@ -604,15 +604,32 @@ update_mtab (const char *dir, struct my_
  				free(mc);
  			}
  		} else {
 -			/* A remount */
 -			mc->m.mnt_opts = instead->mnt_opts;
-+			/* A remount.  Need to alloc memory, else we might
++			/* A remount. */
++			my_free(mc->m.mnt_opts);
++			/* Need to alloc memory, else we might
 +			 * run into issues if both we and the caller frees
 +			 * mnt_opts ... */
 +			mc->m.mnt_opts = xstrdup(instead->mnt_opts);
@@ -54,3 +57,12 @@ Patch by Martin Schlemmer <azarah@gentoo.za.org>
  		mc0->prev = absent;
  		if (mc0->nxt == NULL)
  			mc0->nxt = absent;
+@@ -624,6 +641,8 @@ update_mtab (const char *dir, struct my_
+ 		int errsv = errno;
+ 		error (_("cannot open %s (%s) - mtab not updated"),
+ 		       MOUNTED_TEMP, strerror (errsv));
++		/* Do not leak memory */
++		discard_mntentchn(mc0);
+ 		goto leave;
+ 	}
+ 
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/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-apps/util-linux/util-linux-2.12i-r1.ebuild b/sys-apps/util-linux/util-linux-2.12i-r1.ebuild
index 96a383199054..c5ac318e8298 100644
--- a/sys-apps/util-linux/util-linux-2.12i-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12i-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/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.1 2004/11/14 08:46:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -16,18 +16,18 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${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 mips ppc ppc64 s390 sh sparc x86"
 IUSE="crypt nls static pam selinux perl"
 
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2
 	>=sys-fs/e2fsprogs-1.34
 	selinux? ( sys-libs/libselinux )
 	pam? ( sys-apps/pam-login )
-	crypt? ( app-crypt/hashalot )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )
-	nls? ( sys-devel/gettext )"
+	crypt? ( app-crypt/hashalot )
+	perl? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
 
 yesno() { useq $1 && echo yes || echo no; }
 
@@ -42,8 +42,11 @@ src_unpack() {
 	# Fix rare failures with -j4 or higher
 	epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch
 
+	# Disable the -r option for non-root users #105805
+	epatch "${FILESDIR}"/${PN}-2.12-only-root-can-remount.patch
+
 	# Fix unreadable df output
-	epatch ${FILESDIR}/no-symlink-resolve.patch
+	[[ -e /dev/.devfsd ]] && epatch ${FILESDIR}/no-symlink-resolve.patch
 
 	# Add the O option to agetty to display DNS domainname in the issue
 	# file, thanks to Marius Mauch <genone@genone.de>, bug #22275.
@@ -67,9 +70,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-fat-LABEL-support.patch
 	epatch ${S}/mount-2.12-fat.patch
 
-	# Install rdev on amd64 platform
-	epatch ${FILESDIR}/${PN}-2.12-amd64_rdev_installation.patch
-
 	# swapon gets confused by symlinks in /dev #69162
 	epatch ${FILESDIR}/${P}-swapon-check-symlinks.patch
 
@@ -103,7 +103,8 @@ src_compile() {
 	emake || die "emake failed"
 
 	cd partx
-	emake CFLAGS="${CFLAGS} -include linux/compiler.h" || die "make partx failed"
+	has_version '>=sys-kernel/linux-headers-2.6' && append-flags -include linux/compiler.h
+	emake CFLAGS="${CFLAGS}" || die "make partx failed"
 }
 
 src_install() {
@@ -111,6 +112,12 @@ src_install() {
 	dosbin partx/{addpart,delpart,partx} || die "dosbin"
 	use perl || rm -f "${D}"/usr/bin/chkdupexe
 
+	newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop
+	newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop
+
+	# man-pages installs renice(1p) but util-linux does renice(8)
+	dosym ../man8/renice.8 /usr/share/man/man1/renice.1
+
 	dodoc HISTORY MAINTAINER README VERSION
 	docinto examples
 	dodoc example.files/*
diff --git a/sys-apps/util-linux/util-linux-2.12q-r3.ebuild b/sys-apps/util-linux/util-linux-2.12q-r3.ebuild
index 33bfad97a49d..d1c3e15d9e1c 100644
--- a/sys-apps/util-linux/util-linux-2.12q-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12q-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-apps/util-linux/util-linux-2.12q-r3.ebuild,v 1.1 2005/09/14 13:45:56 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12q-r3.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/${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 ppc64 s390 sh sparc x86"
 IUSE="crypt old-crypt nls static pam selinux perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2
@@ -163,8 +163,9 @@ src_install() {
 	if use old-crypt ; then
 		cd "${OLD_CRYPT_P}"/mount
 		into /
-		newsbin mount mount-old-crypt || die
-		newsbin losetup losetup-old-crypt || die
+		newbin mount mount-old-crypt || die
+		newbin losetup losetup-old-crypt || die
+		fperms 4711 /bin/{mount,losetup}-old-crypt
 	fi
 }
 
diff --git a/sys-apps/util-linux/util-linux-2.12q.ebuild b/sys-apps/util-linux/util-linux-2.12q.ebuild
index cd12b3e98942..b04c1811ac4f 100644
--- a/sys-apps/util-linux/util-linux-2.12q.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12q.ebuild
@@ -1,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-apps/util-linux/util-linux-2.12q.ebuild,v 1.1 2005/02/21 16:30:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12q.ebuild,v 1.1.1.1 2005/11/30 09:56:21 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -45,7 +45,6 @@ src_unpack() {
 	cd "${S}"
 
 	# crypto support
-	! use old-crypt && \
 	use crypt && epatch ${WORKDIR}/util-linux-2.12p.diff
 
 	# Fix rare failures with -j4 or higher
@@ -64,6 +63,9 @@ src_unpack() {
 	# <azarah@gentoo.org> (17 Jul 2003)
 	epatch ${FILESDIR}/${PN}-2.11z-agetty-domainname-option.patch
 
+	# Fix french translation typo #75693
+	epatch ${FILESDIR}/${P}-i18n-update.patch
+
 	# Add NFS4 support (kernel 2.5/2.6)
 	epatch ${FILESDIR}/${PN}-2.12i-nfsv4.patch
 
@@ -76,6 +78,12 @@ src_unpack() {
 	# swapon gets confused by symlinks in /dev #69162
 	epatch ${FILESDIR}/${PN}-2.12p-swapon-check-symlinks.patch
 
+	# fix simple buffer overflow (from Debian)
+	epatch ${FILESDIR}/${PN}-2.12q-debian-10cfdisk.patch
+
+	# don't build fdisk on m68k
+	epatch ${FILESDIR}/${PN}-2.12q-no-m68k-fdisk.patch
+
 	# Enable random features
 	local mconfigs="MCONFIG"
 	use old-crypt && mconfigs="${mconfigs} ${OLD_CRYPT_P}/MCONFIG"
@@ -101,7 +109,7 @@ src_compile() {
 	emake || die "emake failed"
 
 	cd partx
-	has_version sys-kernel/linux26-headers && append-flags -include linux/compiler.h
+	has_version '>=sys-kernel/linux-headers-2.6' && append-flags -include linux/compiler.h
 	emake CFLAGS="${CFLAGS}" || die "make partx failed"
 
 	if use old-crypt ; then
@@ -118,6 +126,12 @@ src_install() {
 	dosbin partx/{addpart,delpart,partx} || die "dosbin"
 	use perl || rm -f "${D}"/usr/bin/chkdupexe
 
+	newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop
+	newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop
+
+	# man-pages installs renice(1p) but util-linux does renice(8)
+	dosym ../man8/renice.8 /usr/share/man/man1/renice.1
+
 	dodoc HISTORY MAINTAINER README VERSION
 	docinto examples
 	dodoc example.files/*
diff --git a/sys-apps/util-linux/util-linux-2.12r-r1.ebuild b/sys-apps/util-linux/util-linux-2.12r-r1.ebuild
index fb46bd42d677..bdcf0b00f43f 100644
--- a/sys-apps/util-linux/util-linux-2.12r-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r-r1.ebuild
@@ -1,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-apps/util-linux/util-linux-2.12r-r1.ebuild,v 1.1 2005/10/15 15:42:58 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/sys-apps/util-linux/util-linux-2.12r.ebuild b/sys-apps/util-linux/util-linux-2.12r.ebuild
index d57216cbd55b..02f3a6ef6927 100644
--- a/sys-apps/util-linux/util-linux-2.12r.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r.ebuild
@@ -1,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-apps/util-linux/util-linux-2.12r.ebuild,v 1.1 2005/10/05 00:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r.ebuild,v 1.1.1.1 2005/11/30 09:56:22 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/sys-apps/vbetool/ChangeLog b/sys-apps/vbetool/ChangeLog
index baea03dd479a..43cdbb4a11dd 100644
--- a/sys-apps/vbetool/ChangeLog
+++ b/sys-apps/vbetool/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/vbetool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/ChangeLog,v 1.1 2005/04/30 01:10:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/ChangeLog,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
+
+  20 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  files/vbetool-0.3-pci-compile-fix.patch:
+  Bug #103062, use a slightly better PCI bug patch.
+
+*vbetool-0.3 (08 Aug 2005)
+
+  08 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/vbetool-0.3-pci-compile-fix.patch, +vbetool-0.3.ebuild:
+  Bug #101449, version bump.
 
 *vbetool-0.2 (29 Apr 2005)
 
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index 784a626b41a0..b64895292e08 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1,2 +1,6 @@
-MD5 46929e03da30ea595edf01c49e39f78a vbetool-0.2.ebuild 542
+MD5 dfb470d2e1a173e4b6fb430b4b154fb6 vbetool-0.3.ebuild 860
+MD5 06ee3a4fe0b980f06e777bc58abc8440 vbetool-0.2.ebuild 673
+MD5 74d76716f1f0c13081a3379871d4817d ChangeLog 709
 MD5 89ebebeb9c5c2b6c17c6c40ee47f9fd8 files/digest-vbetool-0.2 67
+MD5 53d0e3504f394287725e25a17e5931bf files/digest-vbetool-0.3 64
+MD5 158469d0af387781c599d6c16bd2eef6 files/vbetool-0.3-pci-compile-fix.patch 479
diff --git a/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch b/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch
index 26e3cc9e7525..2470ddce34be 100644
--- a/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch
+++ b/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch
@@ -1,28 +1,19 @@
 diff -Nuar vbetool-0.3.orig/vbetool.c vbetool-0.3/vbetool.c
---- vbetool-0.3.orig/vbetool.c	2005-03-01 17:39:21.000000000 -0800
-+++ vbetool-0.3/vbetool.c	2005-08-08 14:36:01.000000000 -0700
-@@ -8,18 +8,18 @@
+--- vbetool-0.3.orig/vbetool.c	2005-03-02 02:39:21.000000000 +0100
++++ vbetool-0.3/vbetool.c	2005-08-19 17:10:05.000000000 +0200
+@@ -8,7 +8,6 @@
  version 2
  */
  
 -#include <pci/pci.h>
--#include <assert.h>
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <unistd.h>
+ #include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -17,6 +16,7 @@
  #include <sys/ioctl.h>
  #include <sys/types.h>
  #include <sys/io.h>
++#include <pci/pci.h>
  #include <sys/kd.h>
  #include <sys/stat.h>
  #include <errno.h>
-+#include <assert.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <pci/pci.h>
- 
- #include "lrmi.h"
- #include "vbetool.h"
diff --git a/sys-apps/vbetool/vbetool-0.2.ebuild b/sys-apps/vbetool/vbetool-0.2.ebuild
index bdf0e668cb83..d1efa3841271 100644
--- a/sys-apps/vbetool/vbetool-0.2.ebuild
+++ b/sys-apps/vbetool/vbetool-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-apps/vbetool/vbetool-0.2.ebuild,v 1.1 2005/04/30 01:10:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.2.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
 HOMEPAGE="http://www.srcf.ucam.org/~mjg59/vbetool/"
diff --git a/sys-apps/vbetool/vbetool-0.3.ebuild b/sys-apps/vbetool/vbetool-0.3.ebuild
index 69ca9788d7ce..f7743884023b 100644
--- a/sys-apps/vbetool/vbetool-0.3.ebuild
+++ b/sys-apps/vbetool/vbetool-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-apps/vbetool/vbetool-0.3.ebuild,v 1.1 2005/08/08 21:39:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.3.ebuild,v 1.1.1.1 2005/11/30 09:56:00 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/which/ChangeLog b/sys-apps/which/ChangeLog
index 668f8b4fcf00..0963f7b720d6 100644
--- a/sys-apps/which/ChangeLog
+++ b/sys-apps/which/ChangeLog
@@ -1,13 +1,70 @@
 # ChangeLog for sys-apps/which
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.1 2002/02/01 21:53:37 gbevin Exp $
-
-*which-2.13 (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-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> which-2.14.ebuild,
+  which-2.16.ebuild:
+  virtual/glibc -> virtual/libc
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> which-2.14.ebuild:
+  fixing depend qa issue. see 45343.
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> which-2.16.ebuild:
+  adding initial s390 support
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> which-2.16.ebuild :
+  Stable on AMD64.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> which-2.16.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> which-2.16.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> which-2.16.ebuild:
+  Marked stable on hppa.
+
+  27 Nov 2003; Christian Birchinger <joker@gentoo.org> which-2.16.ebuild:
+  Added sparc stable keyword
+
+*which-2.16 (15 Sep 2003)
+
+  15 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> which-2.16.ebuild:
+  Version bump
+
+*which-2.15 (12 Sep 2003)
+
+  12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> which-2.15.ebuild:
+  version bump
+
+  20 Feb 2003; Zach Welch <zwelch@gentoo.org> which-2.14 :
+  Added arm to keywords.
+
+  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> which-2.14 :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*which-2.14 (26 Jul 2002)
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
+  04 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> which-2.12-r2.ebuild
+  which-2.13.ebuild  which-2.14.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  26 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  New version.
+
+*which-2.12-r2.ebuild (14 Jul 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> which-2.12-r2.ebuild:
+  Added LICENSE, KEYWORDS, SLOT.
+
+*which-2.13 (14 Jul 2002)
+
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> which-2.13.ebuild:
+  Added LICENSE, KEYWORDS, SLOT.
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index e69de29bb2d1..d1e66f37779a 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 48aae7a8c77a517aa2874b726e21a6e2 ChangeLog 2068
+MD5 eab57ca255ec36db2f32b4b85a436c7a files/digest-which-2.16 62
+MD5 96aac684502b2a9affae1d965834dd21 files/which-gentoo.patch 340
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c245adb47cf6e4e1bd7cd6b8b0f04336 which-2.16.ebuild 741
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYrA7gIKl8Uu19MoRAp+NAJ9sGqW6+SmqItItYYKbnkpGI9dHCwCfad1s
+liYjfiHrqNtML41Dq/qLACk=
+=eIup
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/which/metadata.xml
+++ b/sys-apps/which/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-apps/which/which-2.16.ebuild b/sys-apps/which/which-2.16.ebuild
index 7b261b554dd3..00b8918e2b68 100644
--- a/sys-apps/which/which-2.16.ebuild
+++ b/sys-apps/which/which-2.16.ebuild
@@ -1,38 +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-apps/which/which-2.16.ebuild,v 1.1 2003/09/15 08:02:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.16.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Prints out location of specified executables that are in your path"
 HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
 SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
-
-RDEPEND="virtual/glibc
-	sys-apps/texinfo"
-
-DEPEND="${RDEPEND}"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
 
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/which-gentoo.patch
-}
-
-src_compile() {
-	./configure --prefix=/usr || die
-	make || die
+	cd "${S}"
+	epatch "${FILESDIR}"/which-gentoo.patch
 }
 
 src_install() {
-	dobin which
-	doman which.1
-	doinfo which.info
-	dodoc AUTHORS COPYING EXAMPLES NEWS README*
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS EXAMPLES NEWS README*
 }
diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog
index 00e055532be1..42bdd576d72a 100644
--- a/sys-apps/x86info/ChangeLog
+++ b/sys-apps/x86info/ChangeLog
@@ -1,9 +1,42 @@
 # ChangeLog for sys-apps/x86info
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.1 2003/05/04 20:20:20 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.1.1.1 2005/11/30 09:56:19 chriswhite Exp $
+
+*x86info-1.15 (02 Sep 2005)
+
+  02 Sep 2005; Mike Frysinger <vapier@gentoo.org> +x86info-1.15.ebuild:
+  Version bump #103577 by Ulrich Mueller.
+
+*x86info-1.14 (24 Aug 2005)
+
+  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +x86info-1.14.ebuild:
+  Version bump.
+
+*x86info-1.13 (02 May 2005)
+
+  02 May 2005; Olivier Crête <tester@gentoo.org> +x86info-1.13.ebuild:
+  Version bump (bug #91211)
+
+  13 Oct 2004; Mike Frysinger <vapier@gentoo.org> x86info-1.12b.ebuild:
+  Add a pic patch to fix #67365.
+
+  05 May 2004; Travis Tilley <lv@gentoo.org> x86info-1.11.ebuild,
+  x86info-1.12b.ebuild:
+  I have no idea what the person who marked these as installable on amd64 was
+  thinking, but 32bit assembly just doesnt work with a 64bit compiler, and we
+  dont support multilib.
+
+*x86info-1.12b (14 Nov 2003)
+
+  14 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+  x86info-1.12b.ebuild:
+  version bump per bug #33426, and metadata.xml
 
 *x86info-1.11 (04 May 2003)
 
+  11 May 2003; Robin Johnson <robbat2@gentoo.org> x86info-1.11.ebuild:
+  Moved to x86
+
   04 May 2003; Robin Johnson <robbat2@gentoo.org> x86info-1.11.ebuild,
   files/x86info-modules.conf-rc:
   Initial import. Ebuild submitted by Robin Johnson <robbat2@gentoo.org>.
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 7facb06d59cf..260d6f4d5487 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,4 +1,22 @@
-MD5 9b09698892f36bf3949d62ea67bcf3ea x86info-1.11.ebuild 1826
-MD5 fe1041424b3a13236b73d4c15d83960e ChangeLog 330
-MD5 14514d85680a44ebe1a0625f76262b3a files/digest-x86info-1.11 60
-MD5 1d79be846b8d5d7a2242c91370584540 files/x86info-modules.conf-rc 215
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 8e5a72c55161ad43ffb79744aa82293b x86info-1.14.ebuild 1174
+MD5 8d44b44ef122e1c4f86b4b672e6790e8 x86info-1.15.ebuild 1174
+MD5 28879059969f8547055db13367423471 x86info-1.12b.ebuild 1222
+MD5 8b111ccd0ea1a8306caffb742b2ca4c7 x86info-1.13.ebuild 1221
+MD5 55d7b8ee8e77db8561a0c05118c494dd ChangeLog 1439
+MD5 e622e47087f8556df73aae8e3c4dd896 files/x86info-modules.conf-rc 330
+MD5 1759a81bcf65ea2266520c18b934df09 files/digest-x86info-1.12b 61
+MD5 2314117f5dd2e812f0e8276bd04b0364 files/digest-x86info-1.13 60
+MD5 3190b800901b8f28e375fd20b89100f6 files/1.12b-pic.patch 517
+MD5 af728070175dcb308ae6d5aa7db7f102 files/digest-x86info-1.15 60
+MD5 d802a4048f32812d16b2fb081991db26 files/digest-x86info-1.14 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGNGUgIKl8Uu19MoRAjnDAJ0UdKKDUaYjSoVfxqW0MmBqxMvaDwCbBkYj
+FbfNOc64VTvpELOZ4KX3KSM=
+=Pwox
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/x86info/files/1.12b-pic.patch b/sys-apps/x86info/files/1.12b-pic.patch
index 2fab551ba426..e89c5456ec55 100644
--- a/sys-apps/x86info/files/1.12b-pic.patch
+++ b/sys-apps/x86info/files/1.12b-pic.patch
@@ -1,13 +1,13 @@
---- bench/benchmarks.c.orig	2004-10-13 19:20:11.348776048 -0400
-+++ bench/benchmarks.c	2004-10-13 19:22:16.880692296 -0400
+--- bench/benchmarks.c
++++ bench/benchmarks.c
 @@ -14,7 +14,10 @@
  		return;
  
  	TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (__NR_getppid)), "int 0x80");
 -	TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
-+	TIME(asm volatile("movl %%edi,%%ebx\n"
++	TIME(asm volatile("movl %%ebx,%%edi\n"
 +	                  "cpuid\n"
-+	                  "movl %%ebx,%%edi\n"
++	                  "movl %%edi,%%ebx\n"
 +	                  : : :"%eax", "%edx", "%ecx", "%edi"), "cpuid");
  
  	TIME(asm volatile("addl $1,0(%esp)"), "addl");
diff --git a/sys-apps/x86info/files/x86info-modules.conf-rc b/sys-apps/x86info/files/x86info-modules.conf-rc
index 5389f135fb22..fc35f98c2948 100644
--- a/sys-apps/x86info/files/x86info-modules.conf-rc
+++ b/sys-apps/x86info/files/x86info-modules.conf-rc
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/files/x86info-modules.conf-rc,v 1.1 2003/05/04 20:20:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/files/x86info-modules.conf-rc,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 #
 # Aliases needed for x86info to probe data
 # these are so the modules auto-load as needed
diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index 5d9f5be9d49d..96a2d586367d 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/sys-apps/x86info/x86info-1.12b.ebuild b/sys-apps/x86info/x86info-1.12b.ebuild
index af8c2f0d3039..63cdab46e7b9 100644
--- a/sys-apps/x86info/x86info-1.12b.ebuild
+++ b/sys-apps/x86info/x86info-1.12b.ebuild
@@ -1,19 +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/sys-apps/x86info/x86info-1.12b.ebuild,v 1.1 2003/11/15 01:44:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.12b.ebuild,v 1.1.1.1 2005/11/30 09:56:19 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
-HOMEPAGE="http://www.codemonkey.org.uk/projects/${PN}/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 -ppc -sparc -mips -alpha -arm -hppa"
-DEPEND="virtual/kernel"
-RDEPEND=""
+KEYWORDS="-* x86"
 IUSE=""
-S=${WORKDIR}/${P}
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-pic.patch
+}
 
 src_compile() {
 	emake x86info CFLAGS="${CFLAGS}" || die "emake failed"
@@ -21,16 +28,16 @@ src_compile() {
 
 src_install() {
 	# binaries first
-	into /usr
 	dobin x86info
+
 	# modules stuff next
 	insinto /etc/modules.d
 	newins ${FILESDIR}/x86info-modules.conf-rc x86info
+
 	# now we all all the docs
-	dodoc TODO README COPYING ChangeLog
+	dodoc TODO README ChangeLog
 	doman x86info.1
-	cp -a results ${D}/usr/share/doc/${PF}
-	# prepalldocs rocks! I saw it in net-fs/samba/samba-2.2.8
+	cp -pPR results ${D}/usr/share/doc/${PF}
 	prepalldocs
 }
 
@@ -40,22 +47,4 @@ pkg_postinst() {
 	ewarn "     Processor type and features ->"
 	ewarn "         [*] /dev/cpu/*/msr - Model-specific register support"
 	ewarn "         [*] /dev/cpu/*/cpuid - CPU information support"
-	# copied from media-libs/svgalib/svgalib-1.9.17
-	if [ "${ROOT}" = "/" ]; then
-		/sbin/modules-update &> /dev/null
-
-		# create device nodes for x86info
-		# based off the scripts/makenode
-		# there isn't any proper devfs support in cpuid/msr
-		einfo "Creating device nodes for x86info"
-		mkdir -p ${ROOT}/dev/cpu
-		local numprocs
-		#subtract one because we are using a 0-based count
-		numprocs=$((`grep -c '^processor' /proc/cpuinfo`-1))
-		for i in `seq 0 $numprocs`; do
-			mkdir ${ROOT}/dev/cpu/$i
-			mknod ${ROOT}/dev/cpu/$i/cpuid c 203 $i 2>/dev/null
-			mknod ${ROOT}/dev/cpu/$i/msr c 202 $i 2>/dev/null
-		done
-	fi
 }
diff --git a/sys-apps/x86info/x86info-1.13.ebuild b/sys-apps/x86info/x86info-1.13.ebuild
index 2539f7a27de5..fb654a3c0aa2 100644
--- a/sys-apps/x86info/x86info-1.13.ebuild
+++ b/sys-apps/x86info/x86info-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.13.ebuild,v 1.1 2005/05/02 20:35:09 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.13.ebuild,v 1.1.1.1 2005/11/30 09:56:19 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 DEPEND=""
@@ -37,7 +37,7 @@ src_install() {
 	# now we all all the docs
 	dodoc TODO README ChangeLog
 	doman x86info.1
-	cp -a results ${D}/usr/share/doc/${PF}
+	cp -pPR results ${D}/usr/share/doc/${PF}
 	prepalldocs
 }
 
diff --git a/sys-apps/x86info/x86info-1.14.ebuild b/sys-apps/x86info/x86info-1.14.ebuild
index 3f25a72f4349..972a14f28eb1 100644
--- a/sys-apps/x86info/x86info-1.14.ebuild
+++ b/sys-apps/x86info/x86info-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.14.ebuild,v 1.1 2005/08/24 00:33:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.14.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/x86info/x86info-1.15.ebuild b/sys-apps/x86info/x86info-1.15.ebuild
index 9948c5a8442e..62ecfbf296c8 100644
--- a/sys-apps/x86info/x86info-1.15.ebuild
+++ b/sys-apps/x86info/x86info-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.15.ebuild,v 1.1 2005/09/02 22:25:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.15.ebuild,v 1.1.1.1 2005/11/30 09:56:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog
index cb110542ccbb..0611ecd8f36a 100644
--- a/sys-apps/xinetd/ChangeLog
+++ b/sys-apps/xinetd/ChangeLog
@@ -1,9 +1,150 @@
 # ChangeLog for sys-apps/xinetd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/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-apps/xinetd/ChangeLog,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
+
+*xinetd-2.3.14 (30 Oct 2005)
+
+  30 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/xinetd-2.3.14-DESTDIR.patch, +files/xinetd-2.3.14-config.patch,
+  +files/xinetd-2.3.14-install-contrib.patch, +xinetd-2.3.14.ebuild:
+  Version bump #110806 by Skywalker.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  xinetd-2.3.12.ebuild:
+  Masked xinetd-2.3.12.ebuild stable for ppc
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> xinetd-2.3.11.ebuild,
+  xinetd-2.3.12.ebuild, xinetd-2.3.13.ebuild:
+  virtual/glibc -> virtual/libc
+
+  25 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> xinetd-2.3.12.ebuild:
+  Marked stable on amd64.
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> xinetd-2.3.13.ebuild:
+  Stable on alpha.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> xinetd-2.3.11.ebuild,
+  xinetd-2.3.12.ebuild, xinetd-2.3.13.ebuild:
+  Add die following econf for bug 48950
+
+  29 Mar 2004; <randy@gentoo.org> xinetd-2.3.13.ebuild:
+  adding s390 keywords
+
+*xinetd-2.3.13 (02 Feb 2004)
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> xinetd-2.3.13.ebuild:
+  Version bumped.
+
+  22 Jan 2004; Guy Martin <gmsoft@gentoo.org> xinetd-2.3.12.ebuild:
+  Marked stable on hppa.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> xinetd-2.3.12.ebuild:
+  stable on alpha
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> xinetd-2.3.12.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  28 Aug 2003; Christian Birchinger <joker@gentoo.org> xinetd-2.3.12.ebuild:
+  Added sparc stable keyword
+
+*xinetd-2.3.12 (06 Aug 2003)
+
+  06 Aug 2003; Martin Holzer <mholzer@gentoo.org> xinetd-2.3.12.ebuild:
+  Version bumped.
+
+  19 May 2003; Martin Holzer <mholzer@gentoo.org> xinetd-2.3.10.ebuild,
+  xinetd-2.3.10.ebuild, xinetd-2.3.11.ebuild, xinetd-2.3.7.ebuild,
+  xinetd-2.3.7.ebuild, xinetd-2.3.9.ebuild, xinetd-2.3.9.ebuild,
+  files/xinetd.rc6, files/2.3.9/xinetd.conf, files/2.3.9/xinetd.confd,
+  files/2.3.9/xinetd.rc6, files/2.3.9/etc.xinetd.d/README.services,
+  files/2.3.9/etc.xinetd.d/chargen-tcp, files/2.3.9/etc.xinetd.d/chargen-udp,
+  files/2.3.9/etc.xinetd.d/daytime-tcp, files/2.3.9/etc.xinetd.d/daytime-udp,
+  files/2.3.9/etc.xinetd.d/echo-tcp, files/2.3.9/etc.xinetd.d/echo-udp,
+  files/2.3.9/etc.xinetd.d/time-tcp, files/2.3.9/etc.xinetd.d/time-udp:
+  Cleanup
+
+  18 May 2003; Daniel Ahlberg <aliz@gentoo.org> xinetd-2.3.11.ebuild :
+  Unmasked on all archs. Security update.
+
+*xinetd-2.3.11 (16 Apr 2003)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  xinetd-2.3.11.ebuild:
+  Version bumped.
+
+*xinetd-2.3.10 (26 Mar 2003)
+
+  06 Apr 2003; Guy Martin <gmsoft@gentoo.org> xinetd-2.3.10.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  26 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xinetd-2.3.10.ebuild,
+  xinetd-2.3.7.ebuild, xinetd-2.3.9.ebuild:
+  provide virtual/inetd
+
+  26 Mar 2003; Daniel Robbins <drobbins@gentoo.org>: new upstream release, unstable for
+  x86.
+  
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*xinetd-2.3.9 (24 Oct 2002)
+
+  06 Apr 2003; Guy Martin <gmsoft@gentoo.org> xinetd-2.3.9.ebuild :
+  Added hppa to KEYWORDS.
+
+  30 Mar 2003; Christian Birchinger <joker@gentoo.org> xinetd-2.3.9.ebuild:
+  Added sparc stable keyword
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> xinetd-2.3.7.ebuild, xinetd-2.3.9.ebuild :
+  Changed sparc64 to sparc keyword xinetd-2.3.7.ebuild
+  Changed ~sparc64 to ~sparc keyword xinetd-2.3.9.ebuild
+
+  24 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild contributed by Maurizio Disimino <kevin@aptbasilicata.it> in #7792.
+
+*xinetd-2.3.7 (14 Aug 2002)
+
+  14 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> xinetd-2.3.7.ebuild :
+  Changed tcp-wrappers dependency to -r2. Closes #8210.
+
+  19 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> xinetd-2.3.7.ebuild :
+  Fixed dependencies as pointed out in #7792. Version bump has to wait until the freeze is over.
+
+  14 Aug 2002; Jack Morgan <jmorgan@gentoo.org> xinetd-2.3.7.ebuild :
+  added KEYWORDS sparc64
+
+14 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> xinetd-2.3.7.ebuild :
+  Version bump, includes security fix. Ebuild submitted by 
+  Maurizio Disimino <kevin@aptbasilicata.it>.
+
+*xinetd-2.3.5 (20 Jun 2002)
+
+  25 Jul 2002; Mark Guertin <gerk@gentoo.org> xinetd-2.3.5.ebuild :
+  Added ppc to keywords
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> xinetd-2.3.5.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  20 Jun 2002; Seemant Kulleen <seemant@gentoo.org> xinetd-2.3.5.ebuild :
+
+  Version bump -- copied the 2.3.4 ebuild over.
+
+*xinetd-2.3.4 (30 Mar 2002)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> xinetd-2.3.4.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  30 Mar 2002; Seemant Kulleen <seemant@gentoo.org> xinetd-2.3.4.ebuild :
+
+  Version bump -- copied the 2.3.3-r7 ebuild over.
 
 *xinetd-2.3.3-r7 (1 Feb 2002)
 
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> xinetd-2.3.3-r7.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index fe00ddb4f505..17939154d5e4 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,21 +1,9 @@
-MD5 e000abd8453846e7d972527b38d8074f ChangeLog 3004
-MD5 a170af6ab45e1e9d7ac75e42e09523dc xinetd-2.3.7.ebuild 1777
-MD5 b0733c48d522654c89d7eff07d491c5a xinetd-2.3.9.ebuild 2032
-MD5 cf8b3e9d572b075519ca2fa8d399186a xinetd-2.3.10.ebuild 2124
-MD5 cf8b3e9d572b075519ca2fa8d399186a xinetd-2.3.11.ebuild 2124
-MD5 29e7449ffc4ddaecf18694bf8863804e files/digest-xinetd-2.3.7 64
-MD5 606b483b66ae9a568747b4574f4f8e19 files/digest-xinetd-2.3.9 64
-MD5 41406ad0e85906703ed6e0def5b42bed files/svc-xinetd 827
-MD5 897e24c3c7cc5a08093dfcb3a71fc0ee files/xconv.pl 3030
-MD5 300b0b4bf4741ed50e7978d3361e5666 files/xinetd-run 463
-MD5 8d2e4c58ac55be113ffdeb972b8faaec files/xinetd.conf 241
-MD5 3f783283f84bcbd83ef6a5ea683c8752 files/xinetd.confd 70
-MD5 bf5bf13ee147b5f5f74f0648121a494c files/xinetd.rc6 546
-MD5 f57d25d67f98e2026980193bb748b38f files/digest-xinetd-2.3.10 65
-MD5 469ecc467df958570cae2caad4391dd1 files/digest-xinetd-2.3.11 65
-MD5 8d2e4c58ac55be113ffdeb972b8faaec files/2.3.9/xinetd.conf 241
-MD5 3f783283f84bcbd83ef6a5ea683c8752 files/2.3.9/xinetd.confd 70
-MD5 b4a8f4958ec5ae62d4d692d24c8484bc files/2.3.9/xinetd.rc6 854
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ab68f826254e9a7c9e80dad789730460 ChangeLog 5626
+MD5 3b6428878ffb5338d7eaff85ccbe6f6a files/digest-xinetd-2.3.13 65
+MD5 1664118097dcca0bdd6c3f9dc6da4b86 files/digest-xinetd-2.3.14 65
 MD5 f9591814c08ab763ace5c8969ce6d457 files/etc.xinetd.d/README.services 643
 MD5 7d04f6175ae493c8aa988e3728e959b3 files/etc.xinetd.d/chargen-tcp 246
 MD5 a26dbc5cae6b20e71846bff26600eb89 files/etc.xinetd.d/chargen-udp 266
@@ -25,12 +13,20 @@ MD5 6eb573e86ba7cad19ea240848a88767a files/etc.xinetd.d/echo-tcp 238
 MD5 15e73cb0db884334cef7ac44ced9fa6c files/etc.xinetd.d/echo-udp 263
 MD5 02bc3d5745432ee4b5b11b9c2e03c731 files/etc.xinetd.d/time-tcp 270
 MD5 70829ea9fe03a6e343efa635c9f263e0 files/etc.xinetd.d/time-udp 272
-MD5 f9591814c08ab763ace5c8969ce6d457 files/2.3.9/etc.xinetd.d/README.services 643
-MD5 7d04f6175ae493c8aa988e3728e959b3 files/2.3.9/etc.xinetd.d/chargen-tcp 246
-MD5 a26dbc5cae6b20e71846bff26600eb89 files/2.3.9/etc.xinetd.d/chargen-udp 266
-MD5 2444f1a969860075d1d7fe9974a62575 files/2.3.9/etc.xinetd.d/daytime-tcp 246
-MD5 79665fc4e88391cc1d5f8f0f4fd391d8 files/2.3.9/etc.xinetd.d/daytime-udp 272
-MD5 6eb573e86ba7cad19ea240848a88767a files/2.3.9/etc.xinetd.d/echo-tcp 238
-MD5 15e73cb0db884334cef7ac44ced9fa6c files/2.3.9/etc.xinetd.d/echo-udp 263
-MD5 02bc3d5745432ee4b5b11b9c2e03c731 files/2.3.9/etc.xinetd.d/time-tcp 270
-MD5 70829ea9fe03a6e343efa635c9f263e0 files/2.3.9/etc.xinetd.d/time-udp 272
+MD5 04e66e7da7e59b3282511ec586d14035 files/xinetd-2.3.13-gcc4.patch 893
+MD5 a45cfc68a8e7dde7901a14589922e7d0 files/xinetd-2.3.14-DESTDIR.patch 1725
+MD5 fdf790b5a295391a26ef6ac67326fec5 files/xinetd-2.3.14-config.patch 154
+MD5 94bb9c3595723d892b66f3b6bbb27916 files/xinetd-2.3.14-install-contrib.patch 728
+MD5 ccad3f7878ea7a1e078796419717c4b2 files/xinetd.conf 459
+MD5 1f24b28f485355ae6fa0f9e4008553c5 files/xinetd.confd 289
+MD5 5e5499c1d0e11aa5ef488642d7c3e5db files/xinetd.rc6 868
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0ab919c245efca6ef554559091b2ae33 xinetd-2.3.13.ebuild 1999
+MD5 804e49475d669a2796fca33ed68113d9 xinetd-2.3.14.ebuild 1631
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaWClgIKl8Uu19MoRAkJNAJ9E5IsCFK86GzOc4lCuUmp2Vgy/EwCeMVFY
+SmOJmQ3YfnIEYwYeEvJHsDI=
+=IeHG
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/xinetd/files/etc.xinetd.d/chargen-udp b/sys-apps/xinetd/files/etc.xinetd.d/chargen-udp
index 4b34e94c64e2..462ba78cd9cf 100644
--- a/sys-apps/xinetd/files/etc.xinetd.d/chargen-udp
+++ b/sys-apps/xinetd/files/etc.xinetd.d/chargen-udp
@@ -1,7 +1,7 @@
 # default: off
 # description: A chargen server. This is the udp version.
 
-service chargen-udp
+service chargen
 {
 	type        = INTERNAL UNLISTED
 	id          = chargen-dgram
diff --git a/sys-apps/xinetd/files/etc.xinetd.d/daytime-udp b/sys-apps/xinetd/files/etc.xinetd.d/daytime-udp
index 30926dd6706d..f007611c7cd1 100644
--- a/sys-apps/xinetd/files/etc.xinetd.d/daytime-udp
+++ b/sys-apps/xinetd/files/etc.xinetd.d/daytime-udp
@@ -1,7 +1,7 @@
 # default: off
 # description: A daytime server. This is the udp version.
 
-service daytime-udp
+service daytime
 {
 	type        = INTERNAL UNLISTED
 	id          = daytime-dgram
diff --git a/sys-apps/xinetd/files/etc.xinetd.d/echo-udp b/sys-apps/xinetd/files/etc.xinetd.d/echo-udp
index 29cec3fdb8ed..2c29096d018a 100644
--- a/sys-apps/xinetd/files/etc.xinetd.d/echo-udp
+++ b/sys-apps/xinetd/files/etc.xinetd.d/echo-udp
@@ -1,7 +1,7 @@
 # default: off
 # description: An echo server. This is the udp version.
 
-service echo-udp
+service echo
 {
 	type        = INTERNAL UNLISTED
 	id          = echo-dgram
diff --git a/sys-apps/xinetd/files/etc.xinetd.d/time-udp b/sys-apps/xinetd/files/etc.xinetd.d/time-udp
index e6650439a136..1124655cd56e 100644
--- a/sys-apps/xinetd/files/etc.xinetd.d/time-udp
+++ b/sys-apps/xinetd/files/etc.xinetd.d/time-udp
@@ -1,7 +1,7 @@
 # default: off
 # description: An RFC 868 time server. This is the udp version.
 
-service time-udp
+service time
 {
 	type        = INTERNAL UNLISTED
 	id          = time-dgram
diff --git a/sys-apps/xinetd/files/xinetd.conf b/sys-apps/xinetd/files/xinetd.conf
index 1a914d050813..6c2cf6867e48 100644
--- a/sys-apps/xinetd/files/xinetd.conf
+++ b/sys-apps/xinetd/files/xinetd.conf
@@ -1,103 +1,17 @@
-# This file generated by xconv.pl, included with the xinetd
-# package.  xconv.pl was written by Rob Braun (bbraun@synack.net)
-#
-# The file is merely a translation of your inetd.conf file into
-# the equivalent in xinetd.conf syntax.  xinetd has many 
-# features that may not be taken advantage of with this translation.
-# Please refer to the xinetd.conf man page for more information 
-# on how to properly configure xinetd.
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.conf,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
+# Sample configuration file for xinetd
 
-# The defaults section sets some information for all services
 defaults
 {
-	#The maximum number of requests a particular service may handle
-	# at once.
-	instances   = 25
-
-	# The type of logging.  This logs to a file that is specified.
-	# Another option is: SYSLOG syslog_facility [syslog_level]
-	log_type    = FILE /var/log/servicelog
-
-	# What to log when the connection succeeds.
-	# PID logs the pid of the server processing the request.
-	# HOST logs the remote host's ip address.
-	# USERID logs the remote user (using RFC 1413)
-	# EXIT logs the exit status of the server.
-	# DURATION logs the duration of the session.
+	only_from      = localhost
+	instances      = 60
+	log_type       = SYSLOG authpriv info
 	log_on_success = HOST PID
-
-	# What to log when the connection fails.  Same options as above
-	log_on_failure = HOST RECORD
-
-	# The maximum number of connections a specific IP address can
-	# have to a specific service.  
-	per_source  = 5
-}
-
-service time
-{
-	flags       = REUSE NAMEINARGS
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = root
-	type        = INTERNAL
-	id          = time-stream
-}
-
-service time
-{
-	flags       = REUSE NAMEINARGS
-	socket_type = dgram
-	protocol    = udp
-	wait        = yes
-	user        = root
-	type        = INTERNAL
-	id          = time-dgram
-}
-
-service ftp
-{
-	flags       = REUSE NAMEINARGS
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = root
-	server      = /usr/sbin/tcpd
-	server_args = proftpd 
-}
-
-service smtp
-{
-	flags       = REUSE NAMEINARGS
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = root
-	server      = /var/qmail/bin/tcp-env
-	server_args = tcp-env /var/qmail/bin/qmail-smtpd 
-}
-
-service pop-3
-{
-	flags       = REUSE NAMEINARGS
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = root
-	server      = /var/qmail/bin/qmail-popup
-	server_args = qmail-popup localhost /bin/checkpassword /var/qmail/bin/qmail-pop3d Maildir 
-}
-
-service swat
-{
-	flags       = REUSE NAMEINARGS
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = root
-	server      = /usr/sbin/swat
-	server_args = swat 
+	log_on_failure = HOST
+	cps            = 25 30
 }
 
+includedir /etc/xinetd.d
diff --git a/sys-apps/xinetd/files/xinetd.confd b/sys-apps/xinetd/files/xinetd.confd
index dd6da7488ad2..64609ecb16cd 100644
--- a/sys-apps/xinetd/files/xinetd.confd
+++ b/sys-apps/xinetd/files/xinetd.confd
@@ -1,3 +1,7 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.confd,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
+
 # Config file for /etc/init.d/xinetd
 
 XINETD_OPTS="-stayalive -reuse"
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index f8fbf94aeaa6..ba0440de5170 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,40 +1,44 @@
-#!/bin/sh
-#RCUPDATE:3 4:72: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/sys-apps/xinetd/files/xinetd.rc6,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
-. /etc/rc.d/config/functions
+opts="start stop reload restart dump check"
 
-SERVICE=xinetd
-EXE="/usr/sbin/xinetd"
-opts="start stop"
-
-prepconfig() {
-	if [ ! -e /etc/xinetd.conf ] ; then
-		einfo "Creating new config from inetd..."
-		/usr/sbin/xconv.pl < /etc/inetd.conf > /etc/xinetd.conf
-	fi
-	if [ /etc/inetd.conf -nt /etc/xinetd.conf ] ; then
-		einfo "Creating new config from inetd..."
-		/usr/sbin/xconv.pl < /etc/inetd.conf > /etc/xinetd.conf
-	fi
-	if [ ! -e /etc/xinetd.conf ]
-	then
-		eerror "Xinetd not started.  Config file not found."
-		exit 1
-	fi
+depend() {
+	use net
 }
 
 start() {
-	prepconfig
-	ebegin "Starting ${SERVICE}"
-	start-stop-daemon --start --quiet --exec $EXE 1>&2
-	eend $? 
+	ebegin "Starting xinetd"
+	(
+	# workaround for #25754
+	unset -f `declare -F | sed 's:declare -f::g'`
+	/usr/sbin/xinetd -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
+	)
+	eend $?
 }
 
 stop() {
-	ebegin "Stopping ${SERVICE}"
-	start-stop-daemon --stop --quiet -u root -n $SERVICE 1>&2
-	eend $? 
+	ebegin "Stopping xinetd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/xinetd.pid
+	eend $?
 }
 
-doservice ${@}
+reload(){
+	ebegin "Reloading configuration"
+	killall -HUP xinetd &>/dev/null
+	eend $?
+}
 
+dump(){
+	ebegin "Dumping configuration"
+	killall -USR1 xinetd &>/dev/null
+	eend $?
+}
+
+check(){
+	ebegin "Performing Consistency Check"
+	killall -IOT xinetd &>/dev/null
+	eend $?
+}
diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/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-apps/xinetd/xinetd-2.3.13.ebuild b/sys-apps/xinetd/xinetd-2.3.13.ebuild
index 2561306bbcb9..6fb96adc2b33 100644
--- a/sys-apps/xinetd/xinetd-2.3.13.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.13.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/sys-apps/xinetd/xinetd-2.3.13.ebuild,v 1.1 2004/02/02 17:38:44 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.13.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
-DESCRIPTION="Xinetd is a powerful replacement for inetd, with advanced features"
-HOMEPAGE="http://www.xinetd.org"
+inherit eutils
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="http://www.xinetd.org/"
 SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~ppc64"
-
-DEPEND="virtual/glibc
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="${DEPEND} dev-lang/perl"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="tcpd"
 
+DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
 PROVIDE="virtual/inetd"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+}
+
 src_compile() {
 	local myconf
 	use tcpd && myconf="--with-libwrap"
-
-	# the --with-inet6 is now obsolete. Services will default to IPv4 unless configured otherwise.
-
-	econf --with-loadavg ${myconf}
+	econf --with-loadavg ${myconf} || die "econf failed"
 
 	# Fix CFLAGS
 	sed -i -e "/^CFLAGS/s/+=/=/" Makefile
-
 	emake || die "Failed to compile"
 }
 
 src_install() {
-	into /usr ; dosbin xinetd/xinetd xinetd/itox
+	into /usr ; dosbin xinetd/xinetd xinetd/itox || die
 	exeinto /usr/sbin ; doexe xinetd/xconv.pl
 
 	newman xinetd/xinetd.conf.man xinetd.conf.5
@@ -49,7 +53,7 @@ src_install() {
 	insinto /etc ; doins ${FILESDIR}/xinetd.conf || die
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	einfo "This ebuild introduces the /etc/xinetd.d includedir with a default"
 	einfo "/etc/xinetd.conf file. Check your config files if you're upgrading from an older"
 	einfo "ebuild version. You should browse /etc/xinetd.conf and the files in /etc/xinetd.d."
diff --git a/sys-apps/xinetd/xinetd-2.3.14.ebuild b/sys-apps/xinetd/xinetd-2.3.14.ebuild
index 1cc36cdbf7d4..817efd23040d 100644
--- a/sys-apps/xinetd/xinetd-2.3.14.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.14.ebuild,v 1.1 2005/10/30 03:37:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.14.ebuild,v 1.1.1.1 2005/11/30 09:56:25 chriswhite Exp $
 
 inherit eutils
 
@@ -21,7 +21,6 @@ PROVIDE="virtual/inetd"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	cp Makefile.in{,.orig}
 	epatch "${FILESDIR}"/${P}-DESTDIR.patch
 	epatch "${FILESDIR}"/${P}-install-contrib.patch
 	epatch "${FILESDIR}"/${P}-config.patch
diff --git a/sys-apps/xmbmon/ChangeLog b/sys-apps/xmbmon/ChangeLog
index 34a7ded4dd07..8b5d50cb7783 100644
--- a/sys-apps/xmbmon/ChangeLog
+++ b/sys-apps/xmbmon/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for sys-apps/xmbmon
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/ChangeLog,v 1.1 2003/06/01 04:50:44 lostlogic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/ChangeLog,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
+
+*xmbmon-2.0.5-r1 (18 Jun 2005)
+
+  18 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/xmbmon-2.0.5-loopback.patch, +files/xmbmon-2.0.5-pid.patch,
+  +files/mbmon.confd, +files/mbmon.rc, +xmbmon-2.0.5-r1.ebuild:
+  Add init.d script by Pedro Algarvio #96324 and some custom patches to bind
+  daemon to loopback/write pid file.
+
+*xmbmon-2.0.5 (05 Feb 2005)
+
+  05 Feb 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/xmbmon-2.0.5-amd64.patch, +xmbmon-2.0.5.ebuild:
+  Version bumped. Removed setuid. Fixed amd64 compile problem.
+
+  21 Jul 2004; Travis Tilley <lv@gentoo.org> +files/xmbmon-2.0.3-gcc34.patch,
+  xmbmon-2.0.3.ebuild:
+  added a gcc 3.4 fix
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> xmbmon-2.0.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> xmbmon-2.0.3.ebuild:
+  QA - fix use invocation
+
+  01 Apr 2004; Jason Eric Huebel <jhuebel@gentoo.org> xmbmon-2.0.3.ebuild:
+  added DEFS=" -DLINUX" to emake lines and included gnuconfig_update
+
+*xmbmon-2.0.3 (29 Aug 2003)
+  29 Aug 2003; Tim Yamin <plasmaroo@gentoo.org> xmbmon-2.0.3.ebuild:
+  Version bumped in accordance with bug 16478, thanks to Bruce Guenter
 
 *xmbmon-2.0.1 (31 May 2003)
 
diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest
index 10cdc8ba5d88..024fca505b28 100644
--- a/sys-apps/xmbmon/Manifest
+++ b/sys-apps/xmbmon/Manifest
@@ -1,3 +1,24 @@
-MD5 e10dd4d03356c12e460ceb699f6000d4 xmbmon-2.0.1.ebuild 1124
-MD5 10176a230162f8ecf7b6e2e35bd26d30 ChangeLog 391
-MD5 0c84fd7edf198ccac16658e81a11848a files/digest-xmbmon-2.0.1 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1ac020de05308a507db43d8a16c91b55 ChangeLog 1554
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c64efab0f0a18fa4a17711f31a9ba405 xmbmon-2.0.3.ebuild 1510
+MD5 f924b4529d447126126533c75c6d27b6 xmbmon-2.0.5.ebuild 1631
+MD5 495469e39e1df68b8c60b7ea7dcaf1a3 xmbmon-2.0.5-r1.ebuild 1808
+MD5 bcbf7a71b0097dda70c0ca258cf00c84 files/digest-xmbmon-2.0.3 61
+MD5 9c27e9d00e4c46cdac30f402fc3092c0 files/xmbmon-2.0.3-gcc34.patch 702
+MD5 8e27c8cca2ba525771b72a602b821d19 files/mbmon.rc 489
+MD5 0c353771c30cbc519c6e0691ff79a0ad files/digest-xmbmon-2.0.5 125
+MD5 7cd8051a9606fc6b11bdb465b0e676b2 files/xmbmon-2.0.5-amd64.patch 674
+MD5 d94cced51ed9cc01b86bb1ce4e22cd62 files/mbmon.confd 280
+MD5 3c8f0268ab51de0a52f5969f1c42af33 files/xmbmon-2.0.5-loopback.patch 1181
+MD5 00bb33e41041d97c8a371e193368b65d files/xmbmon-2.0.5-pid.patch 505
+MD5 0c353771c30cbc519c6e0691ff79a0ad files/digest-xmbmon-2.0.5-r1 125
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCs6g5gIKl8Uu19MoRAmu1AJ4gGpo0jeMlwrF39AlfqlfZCfRM4ACZARJi
+JjvnQWvS1RVHspLjsca7IUI=
+=8Iw0
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/xmbmon/files/mbmon.confd b/sys-apps/xmbmon/files/mbmon.confd
index 807821b9b397..94119995a6a4 100644
--- a/sys-apps/xmbmon/files/mbmon.confd
+++ b/sys-apps/xmbmon/files/mbmon.confd
@@ -1,5 +1,5 @@
 # /etc/conf.d/mbmon
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/files/mbmon.confd,v 1.1 2005/06/18 04:48:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/files/mbmon.confd,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 # Port to listen on.
 
diff --git a/sys-apps/xmbmon/files/mbmon.rc b/sys-apps/xmbmon/files/mbmon.rc
index 06b22a9871fb..6f7fd636c110 100644
--- a/sys-apps/xmbmon/files/mbmon.rc
+++ b/sys-apps/xmbmon/files/mbmon.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/sys-apps/xmbmon/files/mbmon.rc,v 1.1 2005/06/18 04:48:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/files/mbmon.rc,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 start() {
 	einfo "Start Mother Board Monitor"
diff --git a/sys-apps/xmbmon/metadata.xml b/sys-apps/xmbmon/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/xmbmon/metadata.xml
+++ b/sys-apps/xmbmon/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-apps/xmbmon/xmbmon-2.0.3.ebuild b/sys-apps/xmbmon/xmbmon-2.0.3.ebuild
index 08e01d472762..4a644f29945e 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.3.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.3.ebuild
@@ -1,44 +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/sys-apps/xmbmon/xmbmon-2.0.3.ebuild,v 1.1 2003/08/29 12:45:43 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.3.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
+
+inherit gnuconfig eutils
 
 MY_P="${PN}${PV//.}"
 DESCRIPTION="Mother Board Monitor Program for X Window System"
 HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html"
 SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/${MY_P}.tar.gz"
+
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="x86 amd64"
 IUSE="X"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	X? ( virtual/x11 )"
-RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xmbmon-2.0.3-gcc34.patch
+}
+
 src_compile() {
+	gnuconfig_update
 
 	econf || die "Configure failed"
-	emake CFLAGS="$CFLAGS \$(INCLUDES) \$(DEFS)" mbmon || die "Make mbmon failed"
-	if use X; then
-		emake CFLAGSX="$CFLAGS \$(INCLUDES) \$(DEFS)" xmbmon || die "Make xmbmon failed"
+	emake DEFS="$DEFS -DLINUX" CFLAGS="$CFLAGS \$(INCLUDES) \$(DEFS)" mbmon || die "Make mbmon failed"
+	if use X ; then
+		emake DEFS="$DEFS -DLINUX" CFLAGSX="$CFLAGS \$(INCLUDES) \$(DEFS)" xmbmon || die "Make xmbmon failed"
 	fi
 }
 
 src_install() {
-
 	dosbin mbmon
 	fperms 4555 /usr/sbin/mbmon
-	fowners root.wheel /usr/sbin/mbmon
+	fowners root:wheel /usr/sbin/mbmon
 
-	if use X; then
+	if use X ; then
 		dosbin xmbmon
-        	fperms 4555 /usr/sbin/xmbmon
-		fowners root.wheel /usr/sbin/xmbmon
-        fi
-	
-	dodoc 00README*	
+		fperms 4555 /usr/sbin/xmbmon
+		fowners root:wheel /usr/sbin/xmbmon
+	fi
+
+	dodoc 00README*
 }
 
 pkg_postinst() {
@@ -47,7 +55,7 @@ pkg_postinst() {
 	einfo "of checking.  It is, therefore, very dangerous and may cause"
 	einfo "a system-crash. Make sure you read 00README.txt,"
 	einfo "section 4, 'How to use!'"
-	echo	
+	echo
 	ewarn "Binaries are setuid root!"
 	echo
 }
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
index 7e8ace592862..427a17e4efea 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild,v 1.1 2005/06/18 04:48:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 inherit eutils
 
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5.ebuild
index 7ba09fb15390..9de870d62085 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.5.ebuild
+++ b/sys-apps/xmbmon/xmbmon-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/sys-apps/xmbmon/xmbmon-2.0.5.ebuild,v 1.1 2005/02/05 03:32:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xmbmon/xmbmon-2.0.5.ebuild,v 1.1.1.1 2005/11/30 09:57:02 chriswhite Exp $
 
 inherit gnuconfig eutils
 
diff --git a/sys-apps/yard/ChangeLog b/sys-apps/yard/ChangeLog
index 48567f1bc26b..3034cc36a9e8 100644
--- a/sys-apps/yard/ChangeLog
+++ b/sys-apps/yard/ChangeLog
@@ -1,9 +1,32 @@
 # ChangeLog for sys-apps/yard
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/ChangeLog,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
+
+*yard-2.2 (25 Aug 2002)
+
+  02 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> yard-2.2.ebuild :
+  Moved files from files/ to ibiblio mirror.
+
+  25 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> yard-2.2.ebuild :
+  Version bump. Closes #6790.
 
 *yard-2.0-r1 (1 Feb 2002)
 
+  02 Sep 2002; Daniel Ahlberg <aliz@gentoo.org> yard-2.0-r1.ebuild :
+  Moved files from files/ to ibiblio mirror.
+
+  24 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> yard-2.0-r1.ebuild :
+
+  Fixed configuration and installation, econf and einstall doesnt seem to work
+  with this package. Closes bug #5499.
+
+  20 Jul 2002; Mark Guertin <gerk@gentoo.org> yard-2.0-r1.ebuild :
+  adjusted keywords, and fixed missing DEPEND and RDEPEND (this is
+  a perl suite).  All devs should be using repoman to commit
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> yard-2.0-r1.ebuild :
+  Added 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-apps/yard/Manifest b/sys-apps/yard/Manifest
index e69de29bb2d1..500b40457e5b 100644
--- a/sys-apps/yard/Manifest
+++ b/sys-apps/yard/Manifest
@@ -0,0 +1,11 @@
+MD5 cfa1efd3823fae36c87b566bfb419f33 yard-2.2.ebuild 1754
+MD5 627b814f045c18e849768c5ccef0e2d5 yard-2.0-r1.ebuild 2102
+MD5 f0ca82b2e9b8046b59d873e685d1824b ChangeLog 1479
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 eda34ea95eabf113081ec403aed70a0b files/digest-yard-2.2 189
+MD5 44856cd22652caae3ceb10e80f67ede9 files/yard-2.0-doc-Makefile.in-gentoo.diff 607
+MD5 7ed8f631615f61edb17aa0c7b4b438e7 files/configure 8803
+MD5 e46a919d11b886399ba4b98df28d016d files/yard-2.0-extras-Makefile.in-gentoo.diff 422
+MD5 a36f501e02832272137a33c3786f0ef6 files/yard-2.2-gentoo.patch 4520
+MD5 13aa005d1c7816b36afa35b6a1494cc6 files/yard-2.0-Makefile.in-gentoo.diff 2638
+MD5 0d6193ebfb7238cec0350eb69fe32d0c files/digest-yard-2.0-r1 189
diff --git a/sys-apps/yard/files/configure b/sys-apps/yard/files/configure
index 1794c1be7143..e3aef9f56eb0 100755
--- a/sys-apps/yard/files/configure
+++ b/sys-apps/yard/files/configure
@@ -18,7 +18,7 @@ $lib_dest       =  "lib/yard";
 $config_dest = "etc/yard";
 
 #  Destination for documentation files (in Doc subdirectory)
-$doc_dest	=  "share/doc/yard-${yard_version}";
+$doc_dest	=  "usr/doc/yard-${yard_version}";
 
 
 ##############################################################################
@@ -41,9 +41,9 @@ my($arch_iX86) = $archname =~ /^i\d86-/;
 
 #  These are to test for old bugs.  Probably unnecessary, but  may as
 #  well keep them.
-test_cp();
-test_lstat();
-test_ldconfig();
+#test_cp();
+#test_lstat();
+#test_ldconfig();
 
 ##############################################################################
 #  Convert all paths to use PREFIX
@@ -57,7 +57,7 @@ print "PREFIX = \"$PREFIX\"\n";
 
 #  Prepend PREFIX onto all of these
 $scripts_dest  = "$PREFIX/$scripts_dest";
-$config_dest   = "/$config_dest";
+$config_dest   = "$PREFIX/$config_dest";
 $lib_dest      = "$PREFIX/$lib_dest";
 $doc_dest      = "$PREFIX/$doc_dest";
 
@@ -274,11 +274,11 @@ sub test_ldconfig {
       print "ERROR, cannot execute ldconfig.  Please put it in your path.\n";
       exit;
 
-   } elsif (($CHILD_ERROR ) != 0) {
+   } elsif (($CHILD_ERROR >> 8) != 128) {
       print "ERROR, trouble with ldconfig.  Maybe it's very old?\n";
       exit;
 
-   } elsif ($ldconfig_help =~ /\-r\sROOT/m) {
+   } elsif ($ldconfig_help =~ /\-r\sroot/m) {
       print "Your ldconfig accepts a -r option -- good.\n";
 
    } else {
diff --git a/sys-apps/yard/files/digest-yard-2.0-r1 b/sys-apps/yard/files/digest-yard-2.0-r1
index 41f5511082f8..72eded1a142a 100644
--- a/sys-apps/yard/files/digest-yard-2.0-r1
+++ b/sys-apps/yard/files/digest-yard-2.0-r1
@@ -1 +1,3 @@
-MD5 c2d115e0a12945b6057a30e2c47532ae yard-2.0.tar.gz
+MD5 c2d115e0a12945b6057a30e2c47532ae yard-2.0.tar.gz 173234
+MD5 7f73cd82a014d29dcf91413863795294 yard-2.0-extra.tar.bz2 37773
+MD5 a60d928b6c0e40cc62233e27313506e0 diet-utils.tar.bz2 495927
diff --git a/sys-apps/yard/files/digest-yard-2.2 b/sys-apps/yard/files/digest-yard-2.2
index 89cd50c1fc61..4380374d5c8c 100644
--- a/sys-apps/yard/files/digest-yard-2.2
+++ b/sys-apps/yard/files/digest-yard-2.2
@@ -1 +1,3 @@
 MD5 fae84867b8c76dc7abedfe62f1db3181 yard-2.2.tar.gz 175414
+MD5 a4081a630116e42c176b3ce33f992bb0 yard-2.2-extra.tar.bz2 37785
+MD5 a60d928b6c0e40cc62233e27313506e0 diet-utils.tar.bz2 495927
diff --git a/sys-apps/yard/metadata.xml b/sys-apps/yard/metadata.xml
index f093d416cbb1..96a2d586367d 100644
--- a/sys-apps/yard/metadata.xml
+++ b/sys-apps/yard/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-apps/yard/yard-2.0-r1.ebuild b/sys-apps/yard/yard-2.0-r1.ebuild
index f2b136f5cdc2..e17db8010d33 100644
--- a/sys-apps/yard/yard-2.0-r1.ebuild
+++ b/sys-apps/yard/yard-2.0-r1.ebuild
@@ -1,67 +1,86 @@
-# 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/sys-apps/yard/yard-2.0-r1.ebuild,v 1.1 2001/04/09 03:03:13 achim Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="Yard is a suite of Perl scripts for creating rescue disks (also
 called bootdisks) for Linux."
-SRC_URI="http://www.croftj.net/~fawcett/yard/${A}"
-HOMEPAGE="http://www.croftj.net/~fawcett/yard/"
+SRC_URI="http://www.croftj.net/~fawcett/yard/${P}.tar.gz
+	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${P}-extra.tar.bz2
+	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/diet-utils.tar.bz2"
+HOMEPAGE="http://www.linuxlots.com/~fawcett/yard/"
+SLOT="0"
+LICENSE="GPL-2 Artistic"
+KEYWORDS="x86 amd64 -ppc"
+IUSE=""
+DEPEND="dev-lang/perl"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    cp ${FILESDIR}/configure .
-    #cp Makefile.in makefile.in.orig
-    patch -p0 < ${FILESDIR}/${P}-Makefile.in-gentoo.diff
-    patch -p0 < ${FILESDIR}/${P}-doc-Makefile.in-gentoo.diff
-    patch -p0 < ${FILESDIR}/${P}-extras-Makefile.in-gentoo.diff
+	unpack ${P}-extra.tar.bz2
+	mv ${S} ${S}-extra
+	unpack ${P}.tar.gz
+	cd ${S}
+	cp ${FILESDIR}/configure .
+	cp Makefile.in Makefile.in.orig
+	patch -p0 < ${FILESDIR}/${P}-Makefile.in-gentoo.diff
+	patch -p0 < ${FILESDIR}/${P}-doc-Makefile.in-gentoo.diff
+	patch -p0 < ${FILESDIR}/${P}-extras-Makefile.in-gentoo.diff
 }
 
 src_compile() {
+	cd ${S}
+	./configure --prefix=/usr || die
+	make || die
+}
 
-    cd ${S}
-    try ./configure --prefix=/usr
-    try make
+src_install() {
+	cd ${S}
+	make DESTDIR=${D} install || die
+#customize
+	rm -rf ${D}/usr/share/doc/${P}
+	cd doc
+	docinto txt
+	dodoc *.txt Broken*
+	docinto html
+	dodoc *.html
+	docinto sgml
+	dodoc *.sgml
+	docinto print
+	gunzip Yard_doc.ps.gz
+	dodoc *.ps
 
-}
+	# Now overwrite to make it usable under gentoo
 
-src_install () {
+	# configure stuff
 
-    cd ${S}
-    try make DESTDIR=${D} install customize
+	cd ${S}-extra
+	insinto /etc/yard
+	doins etc/Bootdisk* etc/Config.pl
+	insinto /etc/yard/Replacements/etc
+	doins etc/Replacements/etc/[a-z]*
+	chmod +x ${D}/etc/yard/Replacements/etc/rc
+	insinto /etc/yard/Replacements/etc/pam.d
+	doins etc/Replacements/pam.d/other
+	insinto /etc/yard/Replacements/root
+	doins etc/Replacements/root/profile
 
-    cd doc
-    docinto txt
-    dodoc *.txt Broken*
-    docinto html
-    dodoc *.html
-    docinto sgml
-    dodoc *.sgml
-    docinto print
-    gunzip *.ps.gz
-    dodoc *.ps
+	# modified scripts
 
-    # Now overwrite to make it usable under gentoo
+	exeinto /usr/sbin
+	doexe sbin/{*_root_fs,mklibs.sh,write_rescue_disk,reduce_libs_root_fs}
 
-    # configure stuff
+	# devices
 
-    cd ${FILESDIR}/${P}
-    insinto /etc/yard
-    doins etc/Bootdisk* etc/Config.pl
-    insinto /etc/yard/Replacements/etc
-    doins etc/Replacements/[a-z]*
-    chmod +x ${D}/etc/yard/Replacements/rc
-    insinto /etc/yard/Replacements/etc/pam.d
-    doins etc/Replacements/pam.d/other
-    insinto /etc/yard/Replacements/root
-    doins etc/Replacements/root/profile
+	dodir /etc/yard/Replacements/dev
+	cd ${D}/etc/yard/Replacements/dev
+	for i in hda hdb hdc hdd hde hdf hdg hdh scd
+	do
+	  MAKEDEV $i
+	done
 
-    # modified scripts
+	# diet-utils
+	cd ..
+	mkdir bin
+	cd bin
+	tar xjpf ${DISTDIR}/diet-utils.tar.bz2
 
-    exeinto /usr/sbin
-    doins sbin/{*_root_fs,mklibs.sh,write_rescue_disk,reduce_libs_root_fs}
 }
-
diff --git a/sys-apps/yard/yard-2.2.ebuild b/sys-apps/yard/yard-2.2.ebuild
index cbb37abcdb46..7e4cc6171f26 100644
--- a/sys-apps/yard/yard-2.2.ebuild
+++ b/sys-apps/yard/yard-2.2.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.2.ebuild,v 1.1 2002/08/25 20:17:19 aliz Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.2.ebuild,v 1.1.1.1 2005/11/30 09:56:15 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Yard is a suite of Perl scripts for creating rescue disks (also
 called bootdisks) for Linux."
-SRC_URI="http://www.linuxlots.com/~fawcett/yard/${P}.tar.gz"
+SRC_URI="http://www.linuxlots.com/~fawcett/yard/${P}.tar.gz
+	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${P}-extra.tar.bz2
+	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/diet-utils.tar.bz2"
 HOMEPAGE="http://www.linuxlots.com/~fawcett/yard/"
 SLOT="0"
 LICENSE="GPL-2 Artistic"
-KEYWORDS="x86 -ppc"
-DEPEND="sys-devel/perl"
+KEYWORDS="x86 amd64 -ppc"
+IUSE=""
+DEPEND="dev-lang/perl"
 RDEPEND=""
 
 src_unpack() {
-	unpack ${A}
+	unpack ${P}-extra.tar.bz2
+	mv ${S} ${S}-extra
+	unpack ${P}.tar.gz
 	cd ${S}
 	patch -p0 -l < ${FILESDIR}/${P}-gentoo.patch
 }
@@ -30,7 +34,7 @@ src_install() {
 	dodoc 0_* README VERSION
 	dohtml doc/*.html
 
-	cd ${FILESDIR}/${P}
+	cd ${S}-extra
 	insinto /etc/yard
 	doins etc/Bootdisk* etc/Config.pl
 	insinto /etc/yard/Replacements/etc
@@ -41,12 +45,12 @@ src_install() {
 	insinto /etc/yard/Replacements/root
 	doins etc/Replacements/root/profile
 
-        # modified scripts
+	# modified scripts
 
 	exeinto /usr/sbin
 	doexe sbin/{*_root_fs,mklibs.sh,write_rescue_disk,reduce_libs_root_fs}
 
-        # devices
+	# devices
 
 	dodir /etc/yard/Replacements/dev
 	cd ${D}/etc/yard/Replacements/dev
@@ -58,5 +62,5 @@ src_install() {
 	# diet-utils
 	dodir /etc/yard/Replacements/bin
 	cd ${D}/etc/yard/Replacements/bin
-	tar xjpf ${FILESDIR}/diet-utils.tar.bz2
+	tar xjpf ${DISTDIR}/diet-utils.tar.bz2
 }